From: Rafaël Carré Date: Thu, 13 Sep 2007 19:12:49 +0000 (+0000) Subject: Fix macosx gui compilation (shame on me i broke it in [21943]) X-Git-Tag: 0.9.0-test0~5634 X-Git-Url: https://git.sesse.net/?a=commitdiff_plain;h=ed3227e6bca97c66d8128e170ffa8683633185c5;p=vlc Fix macosx gui compilation (shame on me i broke it in [21943]) --- diff --git a/modules/gui/macosx/AppleRemote.h b/modules/gui/macosx/AppleRemote.h index 3179cb63c8..28dce49d4f 100644 --- a/modules/gui/macosx/AppleRemote.h +++ b/modules/gui/macosx/AppleRemote.h @@ -86,23 +86,23 @@ The class is not thread safe IOHIDQueueInterface** queue; NSMutableArray* allCookies; NSMutableDictionary* cookieToButtonMapping; - + BOOL openInExclusiveMode; BOOL simulatePlusMinusHold; BOOL processesBacklog; - + /* state for simulating plus/minus hold */ BOOL lastEventSimulatedHold; AppleRemoteEventIdentifier lastPlusMinusEvent; NSTimeInterval lastPlusMinusEventTime; - + int remoteId; unsigned int clickCountEnabledButtons; NSTimeInterval maxClickTimeDifference; NSTimeInterval lastClickCountEventTime; AppleRemoteEventIdentifier lastClickCountEvent; unsigned int eventClickCount; - + IBOutlet id delegate; } @@ -196,3 +196,4 @@ The class is not thread safe - (id) initWithApplicationDelegate: (id) delegate; - (id) applicationDelegate; +@end diff --git a/modules/gui/macosx/AppleRemote.m b/modules/gui/macosx/AppleRemote.m index 47e36baa57..2918f23c5c 100644 --- a/modules/gui/macosx/AppleRemote.m +++ b/modules/gui/macosx/AppleRemote.m @@ -713,3 +713,4 @@ static void QueueCallbackFunction(void* target, IOReturn result, void* refcon, [invocation invokeWithTarget:applicationDelegate]; } +@end diff --git a/modules/gui/macosx/about.h b/modules/gui/macosx/about.h index b29fdc8066..2d1001983d 100644 --- a/modules/gui/macosx/about.h +++ b/modules/gui/macosx/about.h @@ -32,13 +32,13 @@ IBOutlet id o_copyright_field; IBOutlet id o_credits_textview; IBOutlet id o_credits_scrollview; - + NSTimer *o_scroll_timer; float f_current; float f_end; NSTimeInterval i_start; BOOL b_restart; - + NSString *o_credits_path; NSString *o_credits; NSString *o_thanks; diff --git a/modules/gui/macosx/applescript.h b/modules/gui/macosx/applescript.h index e47907cdd6..a47a3324ba 100644 --- a/modules/gui/macosx/applescript.h +++ b/modules/gui/macosx/applescript.h @@ -40,4 +40,4 @@ - (BOOL) scriptFullscreenMode; - (void) setScriptFullscreenMode: (BOOL) mode; - +@end diff --git a/modules/gui/macosx/bookmarks.h b/modules/gui/macosx/bookmarks.h index 3cf5318e58..3470c73fe4 100644 --- a/modules/gui/macosx/bookmarks.h +++ b/modules/gui/macosx/bookmarks.h @@ -34,7 +34,7 @@ IBOutlet id o_btn_extract; IBOutlet id o_btn_rm; IBOutlet id o_tbl_dataTable; - + /* edit window */ IBOutlet id o_edit_window; IBOutlet id o_edit_btn_ok; @@ -45,7 +45,7 @@ IBOutlet id o_edit_fld_name; IBOutlet id o_edit_fld_time; IBOutlet id o_edit_fld_bytes; - + input_thread_t *p_old_input; } diff --git a/modules/gui/macosx/controls.h b/modules/gui/macosx/controls.h index 92136bf5d2..4af6fec0ba 100644 --- a/modules/gui/macosx/controls.h +++ b/modules/gui/macosx/controls.h @@ -35,7 +35,7 @@ IBOutlet id o_btn_fullscreen; IBOutlet id o_volumeslider; - + IBOutlet id o_btn_shuffle; IBOutlet id o_btn_addNode; IBOutlet id o_btn_repeat; @@ -48,7 +48,7 @@ IBOutlet id o_specificTime_sec_lbl; IBOutlet id o_specificTime_stepper; IBOutlet id o_specificTime_mi; - + VLCFSPanel *o_fs_panel; } diff --git a/modules/gui/macosx/extended.h b/modules/gui/macosx/extended.h index 35e6f8bbc8..c5fc0cccef 100644 --- a/modules/gui/macosx/extended.h +++ b/modules/gui/macosx/extended.h @@ -35,7 +35,7 @@ IBOutlet id o_audioFlts_view; IBOutlet id o_videoFilters_view; IBOutlet id o_extended_window; - + /* window content */ IBOutlet id o_expBtn_adjustImage; IBOutlet id o_expBtn_audioFlts; @@ -48,7 +48,7 @@ IBOutlet id o_box_vidFlts; IBOutlet id o_box_audFlts; IBOutlet id o_box_adjImg; - + /* video filters */ IBOutlet id o_btn_vidFlts_mrInfo; IBOutlet id o_ckb_blur; @@ -63,13 +63,13 @@ IBOutlet id o_ckb_gradient; IBOutlet id o_lbl_general; IBOutlet id o_lbl_distort; - + /* audio filters */ IBOutlet id o_ckb_vlme_norm; IBOutlet id o_ckb_hdphnVirt; IBOutlet id o_lbl_maxLevel; IBOutlet id o_sld_maxLevel; - + /* adjust image */ IBOutlet id o_btn_rstrDefaults; IBOutlet id o_ckb_enblAdjustImg; @@ -85,12 +85,12 @@ IBOutlet id o_sld_hue; IBOutlet id o_sld_saturation; IBOutlet id o_sld_opaque; - + /* global variables */ BOOL o_adjImg_expanded; BOOL o_audFlts_expanded; BOOL o_vidFlts_expanded; - + BOOL o_config_changed; } diff --git a/modules/gui/macosx/eyetv.h b/modules/gui/macosx/eyetv.h index 1c82c355e9..e362eb20fe 100644 --- a/modules/gui/macosx/eyetv.h +++ b/modules/gui/macosx/eyetv.h @@ -24,7 +24,7 @@ #import -@interface VLCEyeTVController : NSObject +@interface VLCEyeTVController : NSObject { BOOL b_eyeTVactive; BOOL b_deviceConnected; diff --git a/modules/gui/macosx/fspanel.h b/modules/gui/macosx/fspanel.h index 56eb354ae5..6344aba3e1 100644 --- a/modules/gui/macosx/fspanel.h +++ b/modules/gui/macosx/fspanel.h @@ -11,7 +11,7 @@ * it under the terms of the GNU General Public License as published by * the Free Software Foundation; either version 2 of the License, or * (at your option) any later version. - * + * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the @@ -36,8 +36,8 @@ BOOL b_voutWasUpdated; int i_device; } -- (id)initWithContentRect: (NSRect)contentRect - styleMask: (unsigned int)aStyle +- (id)initWithContentRect: (NSRect)contentRect + styleMask: (unsigned int)aStyle backing: (NSBackingStoreType)bufferingType defer: (BOOL)flag; - (void)awakeFromNib; @@ -87,7 +87,7 @@ - (void)setPause; - (void)setStreamTitle: (NSString *)o_title; - (void)setStreamPos: (float)f_pos andTime: (NSString *)o_time; -- (void)setSeekable: (BOOL)b_seekable; +- (void)setSeekable: (BOOL)b_seekable; - (void)setVolumeLevel: (float)f_volumeLevel; - (IBAction)play:(id)sender; - (IBAction)prev:(id)sender; diff --git a/modules/gui/macosx/misc.h b/modules/gui/macosx/misc.h index bd81f28668..479e8ee10d 100644 --- a/modules/gui/macosx/misc.h +++ b/modules/gui/macosx/misc.h @@ -124,7 +124,7 @@ /***************************************************************************** * ITSliderCell *****************************************************************************/ - + @interface ITSlider : NSSlider { } @@ -134,7 +134,7 @@ /***************************************************************************** * ITSliderCell *****************************************************************************/ - + @interface ITSliderCell : NSSliderCell { NSImage *_knobOff; diff --git a/modules/gui/macosx/open.h b/modules/gui/macosx/open.h index d636a3e391..1c95fa6aa9 100644 --- a/modules/gui/macosx/open.h +++ b/modules/gui/macosx/open.h @@ -114,7 +114,7 @@ NSArray *GetEjectableMediaOfClass( const char *psz_class ); IBOutlet id o_eyetv_noEyeTV_lbl; IBOutlet id o_eyetv_noEyeTVLong_lbl; IBOutlet id o_eyetv_previousProgram_btn; - + BOOL b_autoplay; } diff --git a/modules/gui/macosx/playlist.h b/modules/gui/macosx/playlist.h index 7160c3feb8..eb3f080129 100644 --- a/modules/gui/macosx/playlist.h +++ b/modules/gui/macosx/playlist.h @@ -107,7 +107,7 @@ BOOL b_selected_item_met; BOOL b_isSortDescending; id o_tc_sortColumn; - + /* "add node" button and menu entry */ IBOutlet id o_mi_addNode; IBOutlet id o_btn_addNode; diff --git a/modules/gui/macosx/playlistinfo.h b/modules/gui/macosx/playlistinfo.h index 82d166666c..2c36e58640 100644 --- a/modules/gui/macosx/playlistinfo.h +++ b/modules/gui/macosx/playlistinfo.h @@ -41,7 +41,7 @@ IBOutlet id o_btn_delete_group; IBOutlet id o_btn_add_group; IBOutlet id o_outline_view; - + IBOutlet id o_tab_view; IBOutlet id o_collection_lbl; diff --git a/modules/gui/macosx/prefs.h b/modules/gui/macosx/prefs.h index 4ec4811ecf..774a88635f 100644 --- a/modules/gui/macosx/prefs.h +++ b/modules/gui/macosx/prefs.h @@ -57,7 +57,7 @@ VLCTreeItem *o_config_tree; NSView *o_empty_view; NSMutableDictionary *o_save_prefs; - + IBOutlet id o_prefs_window; IBOutlet id o_title; IBOutlet id o_tree; diff --git a/modules/gui/macosx/prefs_widgets.h b/modules/gui/macosx/prefs_widgets.h index 2b0515e1fe..2e1e257861 100644 --- a/modules/gui/macosx/prefs_widgets.h +++ b/modules/gui/macosx/prefs_widgets.h @@ -202,7 +202,7 @@ static NSMenu *o_keys_menu = nil; - (id) initWithItem: (module_config_t *)_p_item withView: (NSView *)o_parent_view; - + @end //#undef CONFIG_ITEM_LIST_STRING diff --git a/modules/gui/macosx/sfilters.h b/modules/gui/macosx/sfilters.h index bafa0cb0fe..a7ab87ae4f 100644 --- a/modules/gui/macosx/sfilters.h +++ b/modules/gui/macosx/sfilters.h @@ -40,7 +40,7 @@ IBOutlet id o_logo_opaque_sld; IBOutlet id o_logo_pos_lbl; IBOutlet id o_logo_pos_radio; - + /* marquee section */ IBOutlet id o_marq_enabled_ckb; IBOutlet id o_marq_color_lbl; @@ -71,7 +71,7 @@ IBOutlet id o_time_size_pop; IBOutlet id o_time_stamp_fld; IBOutlet id o_time_stamp_lbl; - + BOOL o_config_changed; BOOL o_save_settings; NSArray * o_colors; diff --git a/modules/gui/macosx/wizard.h b/modules/gui/macosx/wizard.h index f27234a965..ea52d5c74d 100644 --- a/modules/gui/macosx/wizard.h +++ b/modules/gui/macosx/wizard.h @@ -24,7 +24,7 @@ /***************************************************************************** * VLCWizard *****************************************************************************/ - + #import @interface VLCWizard : NSObject @@ -36,7 +36,7 @@ IBOutlet id o_tab_pageHolder; IBOutlet id o_wizard_window; IBOutlet id o_playlist_wizard; - + /* page one ("Hello") */ IBOutlet id o_t1_btn_mrInfo_strmg; IBOutlet id o_t1_btn_mrInfo_trnscd; @@ -44,7 +44,7 @@ IBOutlet id o_t1_txt_notice; IBOutlet id o_t1_txt_text; IBOutlet id o_t1_txt_title; - + /* page two ("Input") */ IBOutlet id o_t2_box_prtExtrct; IBOutlet id o_t2_ckb_enblPartExtrct; @@ -58,7 +58,7 @@ IBOutlet id o_t2_title; IBOutlet id o_t2_txt_prtExtrctFrom; IBOutlet id o_t2_txt_prtExtrctTo; - + /* page one ("Streaming 1") */ IBOutlet id o_t3_box_dest; IBOutlet id o_t3_box_strmgMthd; @@ -68,7 +68,7 @@ IBOutlet id o_t3_txt_text; IBOutlet id o_t3_txt_title; IBOutlet id o_t3_txt_strgMthdInfo; - + /* page four ("Transcode 1") */ IBOutlet id o_t4_box_audio; IBOutlet id o_t4_box_video; @@ -86,12 +86,12 @@ IBOutlet id o_t4_txt_videoCodec; IBOutlet id o_t4_txt_hintAudio; IBOutlet id o_t4_txt_hintVideo; - + /* page five ("Encap") */ IBOutlet id o_t5_matrix_encap; IBOutlet id o_t5_text; IBOutlet id o_t5_title; - + /* page six ("Streaming 2") */ IBOutlet id o_t6_ckb_sap; IBOutlet id o_t6_fld_sap; @@ -104,7 +104,7 @@ IBOutlet id o_t6_btn_mrInfo_local; IBOutlet id o_t6_ckb_soverlay; IBOutlet id o_t6_ckb_local; - + /* page seven ("Transcode 2") */ IBOutlet id o_t7_btn_chooseFile; IBOutlet id o_t7_fld_filePath; @@ -114,7 +114,7 @@ IBOutlet id o_t7_btn_mrInfo_local; IBOutlet id o_t7_ckb_soverlay; IBOutlet id o_t7_ckb_local; - + /* page eight ("Summary") */ IBOutlet id o_t8_fld_destination; IBOutlet id o_t8_fld_encapFormat; @@ -144,14 +144,14 @@ IBOutlet id o_t8_txt_ttl; IBOutlet id o_t8_txt_mrl; IBOutlet id o_t8_txt_local; - + NSMutableDictionary * o_userSelections; NSArray * o_videoCodecs; NSArray * o_audioCodecs; NSArray * o_encapFormats; NSArray * o_strmgMthds; NSString * o_opts; - + BOOL b_keepSettingsOrNot; } - (IBAction)cancelRun:(id)sender;