Commit ed3227e6 authored by Rafaël Carré's avatar Rafaël Carré

Fix macosx gui compilation (shame on me i broke it in [21943])

parent bfa9e5bb
...@@ -86,23 +86,23 @@ The class is not thread safe ...@@ -86,23 +86,23 @@ The class is not thread safe
IOHIDQueueInterface** queue; IOHIDQueueInterface** queue;
NSMutableArray* allCookies; NSMutableArray* allCookies;
NSMutableDictionary* cookieToButtonMapping; NSMutableDictionary* cookieToButtonMapping;
BOOL openInExclusiveMode; BOOL openInExclusiveMode;
BOOL simulatePlusMinusHold; BOOL simulatePlusMinusHold;
BOOL processesBacklog; BOOL processesBacklog;
/* state for simulating plus/minus hold */ /* state for simulating plus/minus hold */
BOOL lastEventSimulatedHold; BOOL lastEventSimulatedHold;
AppleRemoteEventIdentifier lastPlusMinusEvent; AppleRemoteEventIdentifier lastPlusMinusEvent;
NSTimeInterval lastPlusMinusEventTime; NSTimeInterval lastPlusMinusEventTime;
int remoteId; int remoteId;
unsigned int clickCountEnabledButtons; unsigned int clickCountEnabledButtons;
NSTimeInterval maxClickTimeDifference; NSTimeInterval maxClickTimeDifference;
NSTimeInterval lastClickCountEventTime; NSTimeInterval lastClickCountEventTime;
AppleRemoteEventIdentifier lastClickCountEvent; AppleRemoteEventIdentifier lastClickCountEvent;
unsigned int eventClickCount; unsigned int eventClickCount;
IBOutlet id delegate; IBOutlet id delegate;
} }
...@@ -196,3 +196,4 @@ The class is not thread safe ...@@ -196,3 +196,4 @@ The class is not thread safe
- (id) initWithApplicationDelegate: (id) delegate; - (id) initWithApplicationDelegate: (id) delegate;
- (id) applicationDelegate; - (id) applicationDelegate;
@end
...@@ -713,3 +713,4 @@ static void QueueCallbackFunction(void* target, IOReturn result, void* refcon, ...@@ -713,3 +713,4 @@ static void QueueCallbackFunction(void* target, IOReturn result, void* refcon,
[invocation invokeWithTarget:applicationDelegate]; [invocation invokeWithTarget:applicationDelegate];
} }
@end
...@@ -32,13 +32,13 @@ ...@@ -32,13 +32,13 @@
IBOutlet id o_copyright_field; IBOutlet id o_copyright_field;
IBOutlet id o_credits_textview; IBOutlet id o_credits_textview;
IBOutlet id o_credits_scrollview; IBOutlet id o_credits_scrollview;
NSTimer *o_scroll_timer; NSTimer *o_scroll_timer;
float f_current; float f_current;
float f_end; float f_end;
NSTimeInterval i_start; NSTimeInterval i_start;
BOOL b_restart; BOOL b_restart;
NSString *o_credits_path; NSString *o_credits_path;
NSString *o_credits; NSString *o_credits;
NSString *o_thanks; NSString *o_thanks;
......
...@@ -40,4 +40,4 @@ ...@@ -40,4 +40,4 @@
- (BOOL) scriptFullscreenMode; - (BOOL) scriptFullscreenMode;
- (void) setScriptFullscreenMode: (BOOL) mode; - (void) setScriptFullscreenMode: (BOOL) mode;
@end
...@@ -34,7 +34,7 @@ ...@@ -34,7 +34,7 @@
IBOutlet id o_btn_extract; IBOutlet id o_btn_extract;
IBOutlet id o_btn_rm; IBOutlet id o_btn_rm;
IBOutlet id o_tbl_dataTable; IBOutlet id o_tbl_dataTable;
/* edit window */ /* edit window */
IBOutlet id o_edit_window; IBOutlet id o_edit_window;
IBOutlet id o_edit_btn_ok; IBOutlet id o_edit_btn_ok;
...@@ -45,7 +45,7 @@ ...@@ -45,7 +45,7 @@
IBOutlet id o_edit_fld_name; IBOutlet id o_edit_fld_name;
IBOutlet id o_edit_fld_time; IBOutlet id o_edit_fld_time;
IBOutlet id o_edit_fld_bytes; IBOutlet id o_edit_fld_bytes;
input_thread_t *p_old_input; input_thread_t *p_old_input;
} }
......
...@@ -35,7 +35,7 @@ ...@@ -35,7 +35,7 @@
IBOutlet id o_btn_fullscreen; IBOutlet id o_btn_fullscreen;
IBOutlet id o_volumeslider; IBOutlet id o_volumeslider;
IBOutlet id o_btn_shuffle; IBOutlet id o_btn_shuffle;
IBOutlet id o_btn_addNode; IBOutlet id o_btn_addNode;
IBOutlet id o_btn_repeat; IBOutlet id o_btn_repeat;
...@@ -48,7 +48,7 @@ ...@@ -48,7 +48,7 @@
IBOutlet id o_specificTime_sec_lbl; IBOutlet id o_specificTime_sec_lbl;
IBOutlet id o_specificTime_stepper; IBOutlet id o_specificTime_stepper;
IBOutlet id o_specificTime_mi; IBOutlet id o_specificTime_mi;
VLCFSPanel *o_fs_panel; VLCFSPanel *o_fs_panel;
} }
......
...@@ -35,7 +35,7 @@ ...@@ -35,7 +35,7 @@
IBOutlet id o_audioFlts_view; IBOutlet id o_audioFlts_view;
IBOutlet id o_videoFilters_view; IBOutlet id o_videoFilters_view;
IBOutlet id o_extended_window; IBOutlet id o_extended_window;
/* window content */ /* window content */
IBOutlet id o_expBtn_adjustImage; IBOutlet id o_expBtn_adjustImage;
IBOutlet id o_expBtn_audioFlts; IBOutlet id o_expBtn_audioFlts;
...@@ -48,7 +48,7 @@ ...@@ -48,7 +48,7 @@
IBOutlet id o_box_vidFlts; IBOutlet id o_box_vidFlts;
IBOutlet id o_box_audFlts; IBOutlet id o_box_audFlts;
IBOutlet id o_box_adjImg; IBOutlet id o_box_adjImg;
/* video filters */ /* video filters */
IBOutlet id o_btn_vidFlts_mrInfo; IBOutlet id o_btn_vidFlts_mrInfo;
IBOutlet id o_ckb_blur; IBOutlet id o_ckb_blur;
...@@ -63,13 +63,13 @@ ...@@ -63,13 +63,13 @@
IBOutlet id o_ckb_gradient; IBOutlet id o_ckb_gradient;
IBOutlet id o_lbl_general; IBOutlet id o_lbl_general;
IBOutlet id o_lbl_distort; IBOutlet id o_lbl_distort;
/* audio filters */ /* audio filters */
IBOutlet id o_ckb_vlme_norm; IBOutlet id o_ckb_vlme_norm;
IBOutlet id o_ckb_hdphnVirt; IBOutlet id o_ckb_hdphnVirt;
IBOutlet id o_lbl_maxLevel; IBOutlet id o_lbl_maxLevel;
IBOutlet id o_sld_maxLevel; IBOutlet id o_sld_maxLevel;
/* adjust image */ /* adjust image */
IBOutlet id o_btn_rstrDefaults; IBOutlet id o_btn_rstrDefaults;
IBOutlet id o_ckb_enblAdjustImg; IBOutlet id o_ckb_enblAdjustImg;
...@@ -85,12 +85,12 @@ ...@@ -85,12 +85,12 @@
IBOutlet id o_sld_hue; IBOutlet id o_sld_hue;
IBOutlet id o_sld_saturation; IBOutlet id o_sld_saturation;
IBOutlet id o_sld_opaque; IBOutlet id o_sld_opaque;
/* global variables */ /* global variables */
BOOL o_adjImg_expanded; BOOL o_adjImg_expanded;
BOOL o_audFlts_expanded; BOOL o_audFlts_expanded;
BOOL o_vidFlts_expanded; BOOL o_vidFlts_expanded;
BOOL o_config_changed; BOOL o_config_changed;
} }
......
...@@ -24,7 +24,7 @@ ...@@ -24,7 +24,7 @@
#import <Cocoa/Cocoa.h> #import <Cocoa/Cocoa.h>
@interface VLCEyeTVController : NSObject @interface VLCEyeTVController : NSObject
{ {
BOOL b_eyeTVactive; BOOL b_eyeTVactive;
BOOL b_deviceConnected; BOOL b_deviceConnected;
......
...@@ -11,7 +11,7 @@ ...@@ -11,7 +11,7 @@
* it under the terms of the GNU General Public License as published by * it under the terms of the GNU General Public License as published by
* the Free Software Foundation; either version 2 of the License, or * the Free Software Foundation; either version 2 of the License, or
* (at your option) any later version. * (at your option) any later version.
* *
* This program is distributed in the hope that it will be useful, * This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of * but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
...@@ -36,8 +36,8 @@ ...@@ -36,8 +36,8 @@
BOOL b_voutWasUpdated; BOOL b_voutWasUpdated;
int i_device; int i_device;
} }
- (id)initWithContentRect: (NSRect)contentRect - (id)initWithContentRect: (NSRect)contentRect
styleMask: (unsigned int)aStyle styleMask: (unsigned int)aStyle
backing: (NSBackingStoreType)bufferingType backing: (NSBackingStoreType)bufferingType
defer: (BOOL)flag; defer: (BOOL)flag;
- (void)awakeFromNib; - (void)awakeFromNib;
...@@ -87,7 +87,7 @@ ...@@ -87,7 +87,7 @@
- (void)setPause; - (void)setPause;
- (void)setStreamTitle: (NSString *)o_title; - (void)setStreamTitle: (NSString *)o_title;
- (void)setStreamPos: (float)f_pos andTime: (NSString *)o_time; - (void)setStreamPos: (float)f_pos andTime: (NSString *)o_time;
- (void)setSeekable: (BOOL)b_seekable; - (void)setSeekable: (BOOL)b_seekable;
- (void)setVolumeLevel: (float)f_volumeLevel; - (void)setVolumeLevel: (float)f_volumeLevel;
- (IBAction)play:(id)sender; - (IBAction)play:(id)sender;
- (IBAction)prev:(id)sender; - (IBAction)prev:(id)sender;
......
...@@ -124,7 +124,7 @@ ...@@ -124,7 +124,7 @@
/***************************************************************************** /*****************************************************************************
* ITSliderCell * ITSliderCell
*****************************************************************************/ *****************************************************************************/
@interface ITSlider : NSSlider @interface ITSlider : NSSlider
{ {
} }
...@@ -134,7 +134,7 @@ ...@@ -134,7 +134,7 @@
/***************************************************************************** /*****************************************************************************
* ITSliderCell * ITSliderCell
*****************************************************************************/ *****************************************************************************/
@interface ITSliderCell : NSSliderCell @interface ITSliderCell : NSSliderCell
{ {
NSImage *_knobOff; NSImage *_knobOff;
......
...@@ -114,7 +114,7 @@ NSArray *GetEjectableMediaOfClass( const char *psz_class ); ...@@ -114,7 +114,7 @@ NSArray *GetEjectableMediaOfClass( const char *psz_class );
IBOutlet id o_eyetv_noEyeTV_lbl; IBOutlet id o_eyetv_noEyeTV_lbl;
IBOutlet id o_eyetv_noEyeTVLong_lbl; IBOutlet id o_eyetv_noEyeTVLong_lbl;
IBOutlet id o_eyetv_previousProgram_btn; IBOutlet id o_eyetv_previousProgram_btn;
BOOL b_autoplay; BOOL b_autoplay;
} }
......
...@@ -107,7 +107,7 @@ ...@@ -107,7 +107,7 @@
BOOL b_selected_item_met; BOOL b_selected_item_met;
BOOL b_isSortDescending; BOOL b_isSortDescending;
id o_tc_sortColumn; id o_tc_sortColumn;
/* "add node" button and menu entry */ /* "add node" button and menu entry */
IBOutlet id o_mi_addNode; IBOutlet id o_mi_addNode;
IBOutlet id o_btn_addNode; IBOutlet id o_btn_addNode;
......
...@@ -41,7 +41,7 @@ ...@@ -41,7 +41,7 @@
IBOutlet id o_btn_delete_group; IBOutlet id o_btn_delete_group;
IBOutlet id o_btn_add_group; IBOutlet id o_btn_add_group;
IBOutlet id o_outline_view; IBOutlet id o_outline_view;
IBOutlet id o_tab_view; IBOutlet id o_tab_view;
IBOutlet id o_collection_lbl; IBOutlet id o_collection_lbl;
......
...@@ -57,7 +57,7 @@ ...@@ -57,7 +57,7 @@
VLCTreeItem *o_config_tree; VLCTreeItem *o_config_tree;
NSView *o_empty_view; NSView *o_empty_view;
NSMutableDictionary *o_save_prefs; NSMutableDictionary *o_save_prefs;
IBOutlet id o_prefs_window; IBOutlet id o_prefs_window;
IBOutlet id o_title; IBOutlet id o_title;
IBOutlet id o_tree; IBOutlet id o_tree;
......
...@@ -202,7 +202,7 @@ static NSMenu *o_keys_menu = nil; ...@@ -202,7 +202,7 @@ static NSMenu *o_keys_menu = nil;
- (id) initWithItem: (module_config_t *)_p_item - (id) initWithItem: (module_config_t *)_p_item
withView: (NSView *)o_parent_view; withView: (NSView *)o_parent_view;
@end @end
//#undef CONFIG_ITEM_LIST_STRING //#undef CONFIG_ITEM_LIST_STRING
......
...@@ -40,7 +40,7 @@ ...@@ -40,7 +40,7 @@
IBOutlet id o_logo_opaque_sld; IBOutlet id o_logo_opaque_sld;
IBOutlet id o_logo_pos_lbl; IBOutlet id o_logo_pos_lbl;
IBOutlet id o_logo_pos_radio; IBOutlet id o_logo_pos_radio;
/* marquee section */ /* marquee section */
IBOutlet id o_marq_enabled_ckb; IBOutlet id o_marq_enabled_ckb;
IBOutlet id o_marq_color_lbl; IBOutlet id o_marq_color_lbl;
...@@ -71,7 +71,7 @@ ...@@ -71,7 +71,7 @@
IBOutlet id o_time_size_pop; IBOutlet id o_time_size_pop;
IBOutlet id o_time_stamp_fld; IBOutlet id o_time_stamp_fld;
IBOutlet id o_time_stamp_lbl; IBOutlet id o_time_stamp_lbl;
BOOL o_config_changed; BOOL o_config_changed;
BOOL o_save_settings; BOOL o_save_settings;
NSArray * o_colors; NSArray * o_colors;
......
...@@ -24,7 +24,7 @@ ...@@ -24,7 +24,7 @@
/***************************************************************************** /*****************************************************************************
* VLCWizard * VLCWizard
*****************************************************************************/ *****************************************************************************/
#import <Cocoa/Cocoa.h> #import <Cocoa/Cocoa.h>
@interface VLCWizard : NSObject @interface VLCWizard : NSObject
...@@ -36,7 +36,7 @@ ...@@ -36,7 +36,7 @@
IBOutlet id o_tab_pageHolder; IBOutlet id o_tab_pageHolder;
IBOutlet id o_wizard_window; IBOutlet id o_wizard_window;
IBOutlet id o_playlist_wizard; IBOutlet id o_playlist_wizard;
/* page one ("Hello") */ /* page one ("Hello") */
IBOutlet id o_t1_btn_mrInfo_strmg; IBOutlet id o_t1_btn_mrInfo_strmg;
IBOutlet id o_t1_btn_mrInfo_trnscd; IBOutlet id o_t1_btn_mrInfo_trnscd;
...@@ -44,7 +44,7 @@ ...@@ -44,7 +44,7 @@
IBOutlet id o_t1_txt_notice; IBOutlet id o_t1_txt_notice;
IBOutlet id o_t1_txt_text; IBOutlet id o_t1_txt_text;
IBOutlet id o_t1_txt_title; IBOutlet id o_t1_txt_title;
/* page two ("Input") */ /* page two ("Input") */
IBOutlet id o_t2_box_prtExtrct; IBOutlet id o_t2_box_prtExtrct;
IBOutlet id o_t2_ckb_enblPartExtrct; IBOutlet id o_t2_ckb_enblPartExtrct;
...@@ -58,7 +58,7 @@ ...@@ -58,7 +58,7 @@
IBOutlet id o_t2_title; IBOutlet id o_t2_title;
IBOutlet id o_t2_txt_prtExtrctFrom; IBOutlet id o_t2_txt_prtExtrctFrom;
IBOutlet id o_t2_txt_prtExtrctTo; IBOutlet id o_t2_txt_prtExtrctTo;
/* page one ("Streaming 1") */ /* page one ("Streaming 1") */
IBOutlet id o_t3_box_dest; IBOutlet id o_t3_box_dest;
IBOutlet id o_t3_box_strmgMthd; IBOutlet id o_t3_box_strmgMthd;
...@@ -68,7 +68,7 @@ ...@@ -68,7 +68,7 @@
IBOutlet id o_t3_txt_text; IBOutlet id o_t3_txt_text;
IBOutlet id o_t3_txt_title; IBOutlet id o_t3_txt_title;
IBOutlet id o_t3_txt_strgMthdInfo; IBOutlet id o_t3_txt_strgMthdInfo;
/* page four ("Transcode 1") */ /* page four ("Transcode 1") */
IBOutlet id o_t4_box_audio; IBOutlet id o_t4_box_audio;
IBOutlet id o_t4_box_video; IBOutlet id o_t4_box_video;
...@@ -86,12 +86,12 @@ ...@@ -86,12 +86,12 @@
IBOutlet id o_t4_txt_videoCodec; IBOutlet id o_t4_txt_videoCodec;
IBOutlet id o_t4_txt_hintAudio; IBOutlet id o_t4_txt_hintAudio;
IBOutlet id o_t4_txt_hintVideo; IBOutlet id o_t4_txt_hintVideo;
/* page five ("Encap") */ /* page five ("Encap") */
IBOutlet id o_t5_matrix_encap; IBOutlet id o_t5_matrix_encap;
IBOutlet id o_t5_text; IBOutlet id o_t5_text;
IBOutlet id o_t5_title; IBOutlet id o_t5_title;
/* page six ("Streaming 2") */ /* page six ("Streaming 2") */
IBOutlet id o_t6_ckb_sap; IBOutlet id o_t6_ckb_sap;
IBOutlet id o_t6_fld_sap; IBOutlet id o_t6_fld_sap;
...@@ -104,7 +104,7 @@ ...@@ -104,7 +104,7 @@
IBOutlet id o_t6_btn_mrInfo_local; IBOutlet id o_t6_btn_mrInfo_local;
IBOutlet id o_t6_ckb_soverlay; IBOutlet id o_t6_ckb_soverlay;
IBOutlet id o_t6_ckb_local; IBOutlet id o_t6_ckb_local;
/* page seven ("Transcode 2") */ /* page seven ("Transcode 2") */
IBOutlet id o_t7_btn_chooseFile; IBOutlet id o_t7_btn_chooseFile;
IBOutlet id o_t7_fld_filePath; IBOutlet id o_t7_fld_filePath;
...@@ -114,7 +114,7 @@ ...@@ -114,7 +114,7 @@
IBOutlet id o_t7_btn_mrInfo_local; IBOutlet id o_t7_btn_mrInfo_local;
IBOutlet id o_t7_ckb_soverlay; IBOutlet id o_t7_ckb_soverlay;
IBOutlet id o_t7_ckb_local; IBOutlet id o_t7_ckb_local;
/* page eight ("Summary") */ /* page eight ("Summary") */
IBOutlet id o_t8_fld_destination; IBOutlet id o_t8_fld_destination;
IBOutlet id o_t8_fld_encapFormat; IBOutlet id o_t8_fld_encapFormat;
...@@ -144,14 +144,14 @@ ...@@ -144,14 +144,14 @@
IBOutlet id o_t8_txt_ttl; IBOutlet id o_t8_txt_ttl;
IBOutlet id o_t8_txt_mrl; IBOutlet id o_t8_txt_mrl;
IBOutlet id o_t8_txt_local; IBOutlet id o_t8_txt_local;
NSMutableDictionary * o_userSelections; NSMutableDictionary * o_userSelections;
NSArray * o_videoCodecs; NSArray * o_videoCodecs;
NSArray * o_audioCodecs; NSArray * o_audioCodecs;
NSArray * o_encapFormats; NSArray * o_encapFormats;
NSArray * o_strmgMthds; NSArray * o_strmgMthds;
NSString * o_opts; NSString * o_opts;
BOOL b_keepSettingsOrNot; BOOL b_keepSettingsOrNot;
} }
- (IBAction)cancelRun:(id)sender; - (IBAction)cancelRun:(id)sender;
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment