Commit 721aa357 authored by Felix Paul Kühne's avatar Felix Paul Kühne

macosx: re-written the 'Open Disc' tab in the open panel

it automatically detects inserted disks and their type, so type selector by the user is no longer needed, which allows a much cleaner GUI
parent e6f62b35
...@@ -24,8 +24,6 @@ ...@@ -24,8 +24,6 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA. * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
*****************************************************************************/ *****************************************************************************/
NSArray *GetEjectableMediaOfClass( const char *psz_class );
/***************************************************************************** /*****************************************************************************
* Intf_Open interface * Intf_Open interface
*****************************************************************************/ *****************************************************************************/
...@@ -57,18 +55,53 @@ NSArray *GetEjectableMediaOfClass( const char *psz_class ); ...@@ -57,18 +55,53 @@ NSArray *GetEjectableMediaOfClass( const char *psz_class );
IBOutlet id o_file_slave_filename_txt; IBOutlet id o_file_slave_filename_txt;
/* open disc */ /* open disc */
IBOutlet id o_disc_type; IBOutlet id o_disc_icon_well;
IBOutlet id o_disc_device; IBOutlet id o_disc_selector_pop;
IBOutlet id o_disc_device_lbl;
IBOutlet id o_disc_title; IBOutlet id o_disc_nodisc_view;
IBOutlet id o_disc_title_lbl; IBOutlet id o_disc_nodisc_lbl;
IBOutlet id o_disc_title_stp; IBOutlet id o_disc_nodisc_videots_btn;
IBOutlet id o_disc_chapter; IBOutlet id o_disc_nodisc_bdmv_btn;
IBOutlet id o_disc_chapter_lbl;
IBOutlet id o_disc_chapter_stp; IBOutlet id o_disc_audiocd_view;
IBOutlet id o_disc_videots_folder; IBOutlet id o_disc_audiocd_lbl;
IBOutlet id o_disc_videots_btn_browse; IBOutlet id o_disc_audiocd_trackcount_lbl;
IBOutlet id o_disc_dvd_menus; 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;
IBOutlet id o_disc_dvdwomenus_chapter;
IBOutlet id o_disc_dvdwomenus_chapter_lbl;
IBOutlet id o_disc_dvdwomenus_chapter_stp;
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;
IBOutlet id o_disc_vcd_chapter;
IBOutlet id o_disc_vcd_chapter_lbl;
IBOutlet id o_disc_vcd_chapter_stp;
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 */ /* open network */
IBOutlet id o_net_http_url; IBOutlet id o_net_http_url;
...@@ -170,6 +203,10 @@ NSArray *GetEjectableMediaOfClass( const char *psz_class ); ...@@ -170,6 +203,10 @@ NSArray *GetEjectableMediaOfClass( const char *psz_class );
NSString *qtk_currdevice_uid; NSString *qtk_currdevice_uid;
BOOL b_autoplay; BOOL b_autoplay;
BOOL b_nodvdmenus;
id o_currentOpticalMediaView;
NSMutableArray *o_opticalDevices;
NSMutableArray *o_specialMediaFolders;
id o_currentCaptureView; id o_currentCaptureView;
NSString *o_file_slave_path; NSString *o_file_slave_path;
NSString *o_mrl; NSString *o_mrl;
...@@ -198,11 +235,11 @@ NSArray *GetEjectableMediaOfClass( const char *psz_class ); ...@@ -198,11 +235,11 @@ NSArray *GetEjectableMediaOfClass( const char *psz_class );
- (IBAction)openFileStreamChanged:(id)sender; - (IBAction)openFileStreamChanged:(id)sender;
- (void)openDisc; - (void)openDisc;
- (IBAction)openDiscTypeChanged:(id)sender; - (void)scanOpticalMedia:(NSNotification *)o_notification;
- (IBAction)openDiscStepperChanged:(id)sender; - (IBAction)discSelectorChanged:(id)sender;
- (void)openDiscInfoChanged:(NSNotification *)o_notification; - (IBAction)openSpecialMediaFolder:(id)sender;
- (IBAction)openDiscMenusChanged:(id)sender; - (IBAction)dvdreadOptionChanged:(id)sender;
- (IBAction)openVTSBrowse:(id)sender; - (IBAction)vcdOptionChanged:(id)sender;
- (void)openNet; - (void)openNet;
- (IBAction)openNetModeChanged:(id)sender; - (IBAction)openNetModeChanged:(id)sender;
......
This diff is collapsed.
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