demux: ts: split PES header parsing

[vlc] / modules / gui / macosx / open.h

diff --git a/modules/gui/macosx/open.h b/modules/gui/macosx/open.h
index 17ffd2d103012c1d046e4560b1bb67b026311e82..3b7886a6c326876b696d3b9c12a02aee06e773e5 100644 (file)
--- a/modules/gui/macosx/open.h
+++ b/modules/gui/macosx/open.h
@@ -24,14 +24,14 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
  *****************************************************************************/
 
-#define kVLCMediaAudioCD "AudioCD"
-#define kVLCMediaDVD "DVD"
-#define kVLCMediaVCD "VCD"
-#define kVLCMediaSVCD "SVCD"
-#define kVLCMediaBD "Bluray"
-#define kVLCMediaVideoTSFolder "VIDEO_TS"
-#define kVLCMediaBDMVFolder "BDMV"
-#define kVLCMediaUnknown "Unknown"
+#define kVLCMediaAudioCD @"AudioCD"
+#define kVLCMediaDVD @"DVD"
+#define kVLCMediaVCD @"VCD"
+#define kVLCMediaSVCD @"SVCD"
+#define kVLCMediaBD @"Blu-ray"
+#define kVLCMediaVideoTSFolder @"VIDEO_TS"
+#define kVLCMediaBDMVFolder @"BDMV"
+#define kVLCMediaUnknown @"Unknown"
 
 /*****************************************************************************
  * Intf_Open interface
@@ -77,25 +77,21 @@
     IBOutlet id o_disc_nodisc_view;
     IBOutlet id o_disc_nodisc_lbl;
     IBOutlet id o_disc_nodisc_videots_btn;
-    IBOutlet id o_disc_nodisc_bdmv_btn;
 
     IBOutlet id o_disc_audiocd_view;
     IBOutlet id o_disc_audiocd_lbl;
     IBOutlet id o_disc_audiocd_trackcount_lbl;
     IBOutlet id o_disc_audiocd_videots_btn;
-    IBOutlet id o_disc_audiocd_bdmv_btn;
 
     IBOutlet id o_disc_dvd_view;
     IBOutlet id o_disc_dvd_lbl;
     IBOutlet id o_disc_dvd_disablemenus_btn;
     IBOutlet id o_disc_dvd_videots_btn;
-    IBOutlet id o_disc_dvd_bdmv_btn;
 
     IBOutlet id o_disc_dvdwomenus_view;
     IBOutlet id o_disc_dvdwomenus_lbl;
     IBOutlet id o_disc_dvdwomenus_enablemenus_btn;
     IBOutlet id o_disc_dvdwomenus_videots_btn;
-    IBOutlet id o_disc_dvdwomenus_bdmv_btn;
     IBOutlet id o_disc_dvdwomenus_title;
     IBOutlet id o_disc_dvdwomenus_title_lbl;
     IBOutlet id o_disc_dvdwomenus_title_stp;
@@ -106,7 +102,6 @@
     IBOutlet id o_disc_vcd_view;
     IBOutlet id o_disc_vcd_lbl;
     IBOutlet id o_disc_vcd_videots_btn;
-    IBOutlet id o_disc_vcd_bdmv_btn;
     IBOutlet id o_disc_vcd_title;
     IBOutlet id o_disc_vcd_title_lbl;
     IBOutlet id o_disc_vcd_title_stp;
@@ -117,7 +112,6 @@
     IBOutlet id o_disc_bd_view;
     IBOutlet id o_disc_bd_lbl;
     IBOutlet id o_disc_bd_videots_btn;
-    IBOutlet id o_disc_bd_bdmv_btn;
 
     /* open network */
     IBOutlet id o_net_http_url;
@@ -210,15 +204,15 @@
     IBOutlet id o_screen_height_lbl;
     IBOutlet id o_screen_height_stp;
     IBOutlet id o_screen_follow_mouse_ckb;
+    IBOutlet id o_screen_qtk_audio_pop;
+    IBOutlet id o_screen_qtk_audio_ckb;
 
     /* QTK support */
     IBOutlet id o_qtk_view;
-    IBOutlet id o_qtk_long_lbl;
-    IBOutlet id o_qtk_device_pop;
-    IBOutlet id o_qtk_label_view;
-    IBOutlet id o_qtkaudio_view;
-    IBOutlet id o_qtkaudio_long_lbl;
-    IBOutlet id o_qtkaudio_device_pop;
+    IBOutlet id o_qtk_video_device_pop;
+    IBOutlet id o_qtk_video_ckb;
+    IBOutlet id o_qtk_audio_device_pop;
+    IBOutlet id o_qtk_audio_ckb;
     IBOutlet id o_capture_width_lbl;
     IBOutlet id o_capture_width_fld;
     IBOutlet id o_capture_width_stp;
@@ -235,26 +229,29 @@
     BOOL b_nodvdmenus;
     id o_currentOpticalMediaView;
     id o_currentOpticalMediaIconView;
-    NSMutableArray *o_opticalDevices;
+    NSMutableArray *o_allMediaDevices;
+    NSArray *o_opticalDevices;
     NSMutableArray *o_specialMediaFolders;
     NSString *o_file_path;
     id o_currentCaptureView;
     NSString *o_file_slave_path;
     NSString *o_sub_path;
     NSString *o_mrl;
-    intf_thread_t * p_intf;
     NSMutableArray *o_displayInfos;
 }
 
 + (VLCOpen *)sharedInstance;
 
-- (void)setMRL:(NSString *)mrl;
-- (NSString *)MRL;
+@property (readwrite, assign) NSString *MRL;
+@property (readonly) NSArray *qtkvideoDevices;
+@property (readonly) NSArray *qtkaudioDevices;
+
+/* text field / stepper binding values - subs panel */
+@property (nonatomic) float fileSubDelay;
+@property (nonatomic) float fileSubFps;
 
-- (NSArray *)qtkvideoDevices;
-- (void)qtkrefreshVideoDevices;
 
-- (NSArray *)qtkaudioDevices;
+- (void)qtkrefreshVideoDevices;
 - (void)qtkrefreshAudioDevices;
 
 - (void)setSubPanel;
@@ -268,7 +265,6 @@
 - (void)openFileGeneric;
 - (void)openFilePathChanged:(NSNotification *)o_notification;
 - (IBAction)openFileBrowse:(id)sender;
-- (void)pathChosenInPanel: (NSOpenPanel *)sheet withReturn:(int)returnCode contextInfo:(void *)contextInfo;
 - (IBAction)openFileStreamChanged:(id)sender;
 
 - (void)openDisc;
@@ -277,8 +273,10 @@
 - (IBAction)openSpecialMediaFolder:(id)sender;
 - (IBAction)dvdreadOptionChanged:(id)sender;
 - (IBAction)vcdOptionChanged:(id)sender;
-- (char *)getVolumeTypeFromMountPath:(NSString *)mountPath;
-- (NSString *)getBSDNodeFromMountPath:(NSString *)mountPath;
+
+// static helper functions
++ (NSString *)getVolumeTypeFromMountPath:(NSString *)mountPath;
++ (NSString *)getBSDNodeFromMountPath:(NSString *)mountPath;
 
 - (void)openNet;
 - (IBAction)openNetModeChanged:(id)sender;
@@ -291,6 +289,7 @@
 - (IBAction)openCaptureModeChanged:(id)sender;
 - (IBAction)qtkChanged:(id)sender;
 - (IBAction)qtkAudioChanged:(id)sender;
+- (IBAction)qtkToggleUIElements:(id)sender;
 - (IBAction)screenChanged:(id)sender;
 - (IBAction)eyetvSwitchChannel:(id)sender;
 - (IBAction)eyetvLaunch:(id)sender;
@@ -303,8 +302,7 @@
 - (IBAction)subSettings:(id)sender;
 - (IBAction)subFileBrowse:(id)sender;
 - (IBAction)subOverride:(id)sender;
-- (IBAction)subDelayStepperChanged:(id)sender;
-- (IBAction)subFpsStepperChanged:(id)sender;
+
 - (IBAction)subCloseSheet:(id)sender;
 
 - (IBAction)panelCancel:(id)sender;
@@ -314,7 +312,5 @@
 @end
 
 @interface VLCOpenTextField : NSTextField
-{
-}
 - (void)mouseDown:(NSEvent *)theEvent;
 @end