Skip to content

V
vlc-gpu
Commit c62a73d1 authored by Felix Paul Kühne's avatar Felix Paul Kühne
Browse files
Options

macosx: resized to the open dialogue again and cleaned-up the screen input section

parent c5f610c9
Hide whitespace changes
Inline Side-by-side
Showing with 253 additions and 422 deletions
extras/package/macosx/Resources/English.lproj/Open.nib/classes.nib
View file @ c62a73d1
<?xml version="1.0" encoding="UTF-8"?> {
<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd"> IBClasses = (
<plist version="1.0"> {
<dict> CLASS = FirstResponder;
<key>IBClasses</key> LANGUAGE = ObjC;
<array> SUPERCLASS = NSObject;
<dict> },
<key>ACTIONS</key> {
<dict> ACTIONS = {
<key>eyetvGetPlugin</key> eyetvGetPlugin = id;
<string>id</string> eyetvLaunch = id;
<key>eyetvLaunch</key> eyetvSwitchChannel = id;
<string>id</string> openCaptureModeChanged = id;
<key>eyetvSwitchChannel</key> openDisc = id;
<string>id</string> openDiscMenusChanged = id;
<key>openCaptureModeChanged</key> openDiscStepperChanged = id;
<string>id</string> openDiscTypeChanged = id;
<key>openDisc</key> openFile = id;
<string>id</string> openFileBrowse = id;
<key>openDiscMenusChanged</key> openFileGeneric = id;
<string>id</string> openFileStreamChanged = id;
<key>openDiscStepperChanged</key> openNet = id;
<string>id</string> openNetModeChanged = id;
<key>openDiscTypeChanged</key> openNetStepperChanged = id;
<string>id</string> openVTSBrowse = id;
<key>openFile</key> panelCancel = id;
<string>id</string> panelOk = id;
<key>openFileBrowse</key> screenStepperChanged = id;
<string>id</string> subCloseSheet = id;
<key>openFileGeneric</key> subDelayStepperChanged = id;
<string>id</string> subFileBrowse = id;
<key>openFileStreamChanged</key> subFpsStepperChanged = id;
<string>id</string> subOverride = id;
<key>openNet</key> subSettings = id;
<string>id</string> subsChanged = id;
<key>openNetModeChanged</key> };
<string>id</string> CLASS = VLCOpen;
<key>openNetStepperChanged</key> LANGUAGE = ObjC;
<string>id</string> OUTLETS = {
<key>openVTSBrowse</key> "o_btn_cancel" = id;
<string>id</string> "o_btn_ok" = id;
<key>panelCancel</key> "o_capture_label_view" = id;
<string>id</string> "o_capture_lbl" = id;
<key>panelOk</key> "o_capture_long_lbl" = id;
<string>id</string> "o_capture_mode_pop" = id;
<key>screenStepperChanged</key> "o_disc_chapter" = id;
<string>id</string> "o_disc_chapter_lbl" = id;
<key>subCloseSheet</key> "o_disc_chapter_stp" = id;
<string>id</string> "o_disc_device" = id;
<key>subDelayStepperChanged</key> "o_disc_device_lbl" = id;
<string>id</string> "o_disc_dvd_menus" = id;
<key>subFileBrowse</key> "o_disc_title" = id;
<string>id</string> "o_disc_title_lbl" = id;
<key>subFpsStepperChanged</key> "o_disc_title_stp" = id;
<string>id</string> "o_disc_type" = id;
<key>subOverride</key> "o_disc_videots_btn_browse" = id;
<string>id</string> "o_disc_videots_folder" = id;
<key>subSettings</key> "o_eyetv_channels_pop" = id;
<string>id</string> "o_eyetv_chn_bgbar" = id;
<key>subsChanged</key> "o_eyetv_chn_status_txt" = id;
<string>id</string> "o_eyetv_currentChannel_lbl" = id;
</dict> "o_eyetv_getPlugin_btn" = id;
<key>CLASS</key> "o_eyetv_launchEyeTV_btn" = id;
<string>VLCOpen</string> "o_eyetv_nextProgram_btn" = id;
<key>LANGUAGE</key> "o_eyetv_noInstanceLong_lbl" = id;
<string>ObjC</string> "o_eyetv_noInstance_lbl" = id;
<key>OUTLETS</key> "o_eyetv_notLaunched_view" = id;
<dict> "o_eyetv_previousProgram_btn" = id;
<key>o_btn_cancel</key> "o_eyetv_running_view" = id;
<string>id</string> "o_file_btn_browse" = id;
<key>o_btn_ok</key> "o_file_path" = id;
<string>id</string> "o_file_stream" = id;
<key>o_capture_label_view</key> "o_file_sub_align_lbl" = id;
<string>id</string> "o_file_sub_align_pop" = id;
<key>o_capture_lbl</key> "o_file_sub_btn_browse" = id;
<string>id</string> "o_file_sub_btn_settings" = id;
<key>o_capture_long_lbl</key> "o_file_sub_ckbox" = id;
<string>id</string> "o_file_sub_delay" = id;
<key>o_capture_mode_pop</key> "o_file_sub_delay_lbl" = id;
<string>id</string> "o_file_sub_delay_stp" = id;
<key>o_disc_chapter</key> "o_file_sub_encoding_lbl" = id;
<string>id</string> "o_file_sub_encoding_pop" = id;
<key>o_disc_chapter_lbl</key> "o_file_sub_file_box" = id;
<string>id</string> "o_file_sub_font_box" = id;
<key>o_disc_chapter_stp</key> "o_file_sub_fps" = id;
<string>id</string> "o_file_sub_fps_lbl" = id;
<key>o_disc_device</key> "o_file_sub_fps_stp" = id;
<string>id</string> "o_file_sub_ok_btn" = id;
<key>o_disc_device_lbl</key> "o_file_sub_override" = id;
<string>id</string> "o_file_sub_path" = id;
<key>o_disc_dvd_menus</key> "o_file_sub_sheet" = id;
<string>id</string> "o_file_sub_size_lbl" = id;
<key>o_disc_title</key> "o_file_sub_size_pop" = id;
<string>id</string> "o_mrl" = id;
<key>o_disc_title_lbl</key> "o_mrl_lbl" = id;
<string>id</string> "o_net_http_url" = id;
<key>o_disc_title_stp</key> "o_net_http_url_lbl" = id;
<string>id</string> "o_net_mode" = id;
<key>o_disc_type</key> "o_net_timeshift_ckbox" = id;
<string>id</string> "o_net_udp_port" = id;
<key>o_disc_videots_btn_browse</key> "o_net_udp_port_lbl" = id;
<string>id</string> "o_net_udp_port_stp" = id;
<key>o_disc_videots_folder</key> "o_net_udpm_addr" = id;
<string>id</string> "o_net_udpm_addr_lbl" = id;
<key>o_eyetv_channels_pop</key> "o_net_udpm_port" = id;
<string>id</string> "o_net_udpm_port_lbl" = id;
<key>o_eyetv_chn_bgbar</key> "o_net_udpm_port_stp" = id;
<string>id</string> "o_output_ckbox" = id;
<key>o_eyetv_chn_status_txt</key> "o_panel" = id;
<string>id</string> "o_playlist" = id;
<key>o_eyetv_currentChannel_lbl</key> "o_screen_follow_mouse_ckb" = id;
<string>id</string> "o_screen_fps_fld" = id;
<key>o_eyetv_getPlugin_btn</key> "o_screen_fps_lbl" = id;
<string>id</string> "o_screen_fps_stp" = id;
<key>o_eyetv_launchEyeTV_btn</key> "o_screen_height_fld" = id;
<string>id</string> "o_screen_height_lbl" = id;
<key>o_eyetv_nextProgram_btn</key> "o_screen_height_stp" = id;
<string>id</string> "o_screen_lbl" = id;
<key>o_eyetv_noInstanceLong_lbl</key> "o_screen_left_fld" = id;
<string>id</string> "o_screen_left_lbl" = id;
<key>o_eyetv_noInstance_lbl</key> "o_screen_left_stp" = id;
<string>id</string> "o_screen_long_lbl" = id;
<key>o_eyetv_notLaunched_view</key> "o_screen_top_fld" = id;
<string>id</string> "o_screen_top_lbl" = id;
<key>o_eyetv_previousProgram_btn</key> "o_screen_top_stp" = id;
<string>id</string> "o_screen_view" = id;
<key>o_eyetv_running_view</key> "o_screen_width_fld" = id;
<string>id</string> "o_screen_width_lbl" = id;
<key>o_file_btn_browse</key> "o_screen_width_stp" = id;
<string>id</string> "o_sout_options" = id;
<key>o_file_path</key> "o_tabview" = id;
<string>id</string> };
<key>o_file_stream</key> SUPERCLASS = NSObject;
<string>id</string> },
<key>o_file_sub_align_lbl</key> {
<string>id</string> CLASS = VLCOpenTextField;
<key>o_file_sub_align_pop</key> LANGUAGE = ObjC;
<string>id</string> SUPERCLASS = NSTextField;
<key>o_file_sub_btn_browse</key> },
<string>id</string> {
<key>o_file_sub_btn_settings</key> ACTIONS = {
<string>id</string> announceChanged = id;
<key>o_file_sub_ckbox</key> outputChanged = id;
<string>id</string> outputCloseSheet = id;
<key>o_file_sub_delay</key> outputFileBrowse = id;
<string>id</string> outputInfoChanged = id;
<key>o_file_sub_delay_lbl</key> outputMethodChanged = id;
<string>id</string> outputSettings = id;
<key>o_file_sub_delay_stp</key> streamPortStepperChanged = id;
<string>id</string> streamTTLStepperChanged = id;
<key>o_file_sub_encoding_lbl</key> transcodeChanged = id;
<string>id</string> transcodeInfoChanged = id;
<key>o_file_sub_encoding_pop</key> };
<string>id</string> CLASS = VLCOutput;
<key>o_file_sub_file_box</key> LANGUAGE = ObjC;
<string>id</string> OUTLETS = {
<key>o_file_sub_font_box</key> "o_btn_browse" = id;
<string>id</string> "o_btn_ok" = id;
<key>o_file_sub_fps</key> "o_channel_name" = id;
<string>id</string> "o_channel_name_lbl" = id;
<key>o_file_sub_fps_lbl</key> "o_display" = id;
<string>id</string> "o_dump_chkbox" = id;
<key>o_file_sub_fps_stp</key> "o_file_chkbox" = id;
<string>id</string> "o_file_field" = id;
<key>o_file_sub_ok_btn</key> "o_http_chkbox" = id;
<string>id</string> "o_method" = id;
<key>o_file_sub_override</key> "o_misc_lbl" = id;
<string>id</string> "o_mux_lbl" = id;
<key>o_file_sub_path</key> "o_mux_selector" = id;
<string>id</string> "o_open_panel" = id;
<key>o_file_sub_sheet</key> "o_options_lbl" = id;
<string>id</string> "o_output_ckbox" = id;
<key>o_file_sub_size_lbl</key> "o_output_settings" = id;
<string>id</string> "o_output_sheet" = id;
<key>o_file_sub_size_pop</key> "o_rtsp_chkbox" = id;
<string>id</string> "o_sap_chkbox" = id;
<key>o_mrl</key> "o_sdp_url" = id;
<string>id</string> "o_sdp_url_lbl" = id;
<key>o_mrl_lbl</key> "o_stream_address" = id;
<string>id</string> "o_stream_address_lbl" = id;
<key>o_net_http_url</key> "o_stream_port" = id;
<string>id</string> "o_stream_port_lbl" = id;
<key>o_net_http_url_lbl</key> "o_stream_port_stp" = id;
<string>id</string> "o_stream_ttl" = id;
<key>o_net_mode</key> "o_stream_ttl_lbl" = id;
<string>id</string> "o_stream_ttl_stp" = id;
<key>o_net_timeshift_ckbox</key> "o_stream_type" = id;
<string>id</string> "o_stream_type_lbl" = id;
<key>o_net_udp_port</key> "o_transcode_audio_bitrate" = id;
<string>id</string> "o_transcode_audio_bitrate_lbl" = id;
<key>o_net_udp_port_lbl</key> "o_transcode_audio_channels" = id;
<string>id</string> "o_transcode_audio_channels_lbl" = id;
<key>o_net_udp_port_stp</key> "o_transcode_audio_chkbox" = id;
<string>id</string> "o_transcode_audio_selector" = id;
<key>o_net_udpm_addr</key> "o_transcode_lbl" = id;
<string>id</string> "o_transcode_video_bitrate" = id;
<key>o_net_udpm_addr_lbl</key> "o_transcode_video_bitrate_lbl" = id;
<string>id</string> "o_transcode_video_chkbox" = id;
<key>o_net_udpm_port</key> "o_transcode_video_scale" = id;
<string>id</string> "o_transcode_video_scale_lbl" = id;
<key>o_net_udpm_port_lbl</key> "o_transcode_video_selector" = id;
<string>id</string> };
<key>o_net_udpm_port_stp</key> SUPERCLASS = NSObject;
<string>id</string> },
<key>o_output_ckbox</key> {
<string>id</string> CLASS = VLCPlaylist;
<key>o_panel</key> LANGUAGE = ObjC;
<string>id</string> SUPERCLASS = NSObject;
<key>o_playlist</key> }
<string>id</string> );
<key>o_screen_follow_mouse_btn</key> IBVersion = 1;
<string>id</string> }
<key>o_screen_fps_fld</key> \ No newline at end of file
<string>id</string>
<key>o_screen_fps_lbl</key>
<string>id</string>
<key>o_screen_fps_stp</key>
<string>id</string>
<key>o_screen_height_fld</key>
<string>id</string>
<key>o_screen_height_lbl</key>
<string>id</string>
<key>o_screen_lbl</key>
<string>id</string>
<key>o_screen_left_fld</key>
<string>id</string>
<key>o_screen_left_lbl</key>
<string>id</string>
<key>o_screen_long_lbl</key>
<string>id</string>
<key>o_screen_top_fld</key>
<string>id</string>
<key>o_screen_top_lbl</key>
<string>id</string>
<key>o_screen_view</key>
<string>id</string>
<key>o_screen_width_fld</key>
<string>id</string>
<key>o_screen_width_lbl</key>
<string>id</string>
<key>o_sout_options</key>
<string>id</string>
<key>o_tabview</key>
<string>id</string>
</dict>
<key>SUPERCLASS</key>
<string>NSObject</string>
</dict>
<dict>
<key>CLASS</key>
<string>VLCOpenTextField</string>
<key>LANGUAGE</key>
<string>ObjC</string>
<key>SUPERCLASS</key>
<string>NSTextField</string>
</dict>
<dict>
<key>ACTIONS</key>
<dict>
<key>announceChanged</key>
<string>id</string>
<key>outputChanged</key>
<string>id</string>
<key>outputCloseSheet</key>
<string>id</string>
<key>outputFileBrowse</key>
<string>id</string>
<key>outputInfoChanged</key>
<string>id</string>
<key>outputMethodChanged</key>
<string>id</string>
<key>outputSettings</key>
<string>id</string>
<key>streamPortStepperChanged</key>
<string>id</string>
<key>streamTTLStepperChanged</key>
<string>id</string>
<key>transcodeChanged</key>
<string>id</string>
<key>transcodeInfoChanged</key>
<string>id</string>
</dict>
<key>CLASS</key>
<string>VLCOutput</string>
<key>LANGUAGE</key>
<string>ObjC</string>
<key>OUTLETS</key>
<dict>
<key>o_btn_browse</key>
<string>id</string>
<key>o_btn_ok</key>
<string>id</string>
<key>o_channel_name</key>
<string>id</string>
<key>o_channel_name_lbl</key>
<string>id</string>
<key>o_display</key>
<string>id</string>
<key>o_dump_chkbox</key>
<string>id</string>
<key>o_file_chkbox</key>
<string>id</string>
<key>o_file_field</key>
<string>id</string>
<key>o_http_chkbox</key>
<string>id</string>
<key>o_method</key>
<string>id</string>
<key>o_misc_lbl</key>
<string>id</string>
<key>o_mux_lbl</key>
<string>id</string>
<key>o_mux_selector</key>
<string>id</string>
<key>o_open_panel</key>
<string>id</string>
<key>o_options_lbl</key>
<string>id</string>
<key>o_output_ckbox</key>
<string>id</string>
<key>o_output_settings</key>
<string>id</string>
<key>o_output_sheet</key>
<string>id</string>
<key>o_rtsp_chkbox</key>
<string>id</string>
<key>o_sap_chkbox</key>
<string>id</string>
<key>o_sdp_url</key>
<string>id</string>
<key>o_sdp_url_lbl</key>
<string>id</string>
<key>o_stream_address</key>
<string>id</string>
<key>o_stream_address_lbl</key>
<string>id</string>
<key>o_stream_port</key>
<string>id</string>
<key>o_stream_port_lbl</key>
<string>id</string>
<key>o_stream_port_stp</key>
<string>id</string>
<key>o_stream_ttl</key>
<string>id</string>
<key>o_stream_ttl_lbl</key>
<string>id</string>
<key>o_stream_ttl_stp</key>
<string>id</string>
<key>o_stream_type</key>
<string>id</string>
<key>o_stream_type_lbl</key>
<string>id</string>
<key>o_transcode_audio_bitrate</key>
<string>id</string>
<key>o_transcode_audio_bitrate_lbl</key>
<string>id</string>
<key>o_transcode_audio_channels</key>
<string>id</string>
<key>o_transcode_audio_channels_lbl</key>
<string>id</string>
<key>o_transcode_audio_chkbox</key>
<string>id</string>
<key>o_transcode_audio_selector</key>
<string>id</string>
<key>o_transcode_lbl</key>
<string>id</string>
<key>o_transcode_video_bitrate</key>
<string>id</string>
<key>o_transcode_video_bitrate_lbl</key>
<string>id</string>
<key>o_transcode_video_chkbox</key>
<string>id</string>
<key>o_transcode_video_scale</key>
<string>id</string>
<key>o_transcode_video_scale_lbl</key>
<string>id</string>
<key>o_transcode_video_selector</key>
<string>id</string>
</dict>
<key>SUPERCLASS</key>
<string>NSObject</string>
</dict>
<dict>
<key>CLASS</key>
<string>FirstResponder</string>
<key>LANGUAGE</key>
<string>ObjC</string>
<key>SUPERCLASS</key>
<string>NSObject</string>
</dict>
<dict>
<key>CLASS</key>
<string>VLCPlaylist</string>
<key>LANGUAGE</key>
<string>ObjC</string>
<key>SUPERCLASS</key>
<string>NSObject</string>
</dict>
</array>
<key>IBVersion</key>
<string>1</string>
</dict>
</plist>
extras/package/macosx/Resources/English.lproj/Open.nib/info.nib
View file @ c62a73d1
...@@ -2,14 +2,28 @@ ...@@ -2,14 +2,28 @@
<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd"> <!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
<plist version="1.0"> <plist version="1.0">
<dict> <dict>
<key>IBDocumentLocation</key>
<string>171 127 356 240 0 0 1280 778 </string>
<key>IBEditorPositions</key>
<dict>
<key>2297</key>
<string>366 400 548 264 0 0 1280 778 </string>
<key>2301</key>
<string>366 417 548 264 0 0 1280 778 </string>
<key>2304</key>
<string>366 380 547 264 0 0 1280 778 </string>
<key>2346</key>
<string>366 400 548 264 0 0 1280 778 </string>
</dict>
<key>IBFramework Version</key> <key>IBFramework Version</key>
<string>677</string> <string>489.0</string>
<key>IBOldestOS</key> <key>IBOldestOS</key>
<integer>5</integer> <integer>5</integer>
<key>IBOpenObjects</key> <key>IBOpenObjects</key>
<array> <array>
<integer>678</integer> <integer>636</integer>
<integer>2346</integer> <integer>2346</integer>
<integer>2297</integer>
</array> </array>
<key>IBSystem Version</key> <key>IBSystem Version</key>
<string>9G55</string> <string>9G55</string>
......
modules/gui/macosx/open.h
View file @ c62a73d1
...@@ -123,23 +123,28 @@ NSArray *GetEjectableMediaOfClass( const char *psz_class ); ...@@ -123,23 +123,28 @@ NSArray *GetEjectableMediaOfClass( const char *psz_class );
/* screen support */ /* screen support */
IBOutlet id o_screen_view; IBOutlet id o_screen_view;
IBOutlet id o_screen_fps_fld;
IBOutlet id o_screen_lbl; IBOutlet id o_screen_lbl;
IBOutlet id o_screen_long_lbl; IBOutlet id o_screen_long_lbl;
IBOutlet id o_screen_fps_stp; IBOutlet id o_screen_fps_fld;
IBOutlet id o_screen_fps_lbl; IBOutlet id o_screen_fps_lbl;
IBOutlet id o_screen_fps_stp;
IBOutlet id o_screen_left_fld; IBOutlet id o_screen_left_fld;
IBOutlet id o_screen_left_lbl; IBOutlet id o_screen_left_lbl;
IBOutlet id o_screen_left_stp;
IBOutlet id o_screen_top_fld; IBOutlet id o_screen_top_fld;
IBOutlet id o_screen_top_lbl; IBOutlet id o_screen_top_lbl;
IBOutlet id o_screen_top_stp;
IBOutlet id o_screen_width_fld; IBOutlet id o_screen_width_fld;
IBOutlet id o_screen_width_lbl; IBOutlet id o_screen_width_lbl;
IBOutlet id o_screen_width_stp;
IBOutlet id o_screen_height_fld; IBOutlet id o_screen_height_fld;
IBOutlet id o_screen_height_lbl; IBOutlet id o_screen_height_lbl;
IBOutlet id o_screen_follow_mouse_btn; IBOutlet id o_screen_height_stp;
IBOutlet id o_screen_follow_mouse_ckb;
BOOL b_autoplay; BOOL b_autoplay;
id o_currentCaptureView; id o_currentCaptureView;
intf_thread_t * p_intf;
} }
+ (VLCOpen *)sharedInstance; + (VLCOpen *)sharedInstance;
......
modules/gui/macosx/open.m
View file @ c62a73d1
...@@ -152,6 +152,7 @@ static VLCOpen *_o_sharedMainInstance = nil; ...@@ -152,6 +152,7 @@ static VLCOpen *_o_sharedMainInstance = nil;
[self dealloc]; [self dealloc];
} else { } else {
_o_sharedMainInstance = [super init]; _o_sharedMainInstance = [super init];
p_intf = VLCIntf;
} }
return _o_sharedMainInstance; return _o_sharedMainInstance;
...@@ -159,8 +160,6 @@ static VLCOpen *_o_sharedMainInstance = nil; ...@@ -159,8 +160,6 @@ static VLCOpen *_o_sharedMainInstance = nil;
- (void)awakeFromNib - (void)awakeFromNib
{ {
intf_thread_t * p_intf = VLCIntf;
[o_panel setTitle: _NS("Open Source")]; [o_panel setTitle: _NS("Open Source")];
[o_mrl_lbl setTitle: _NS("Media Resource Locator (MRL)")]; [o_mrl_lbl setTitle: _NS("Media Resource Locator (MRL)")];
...@@ -283,7 +282,6 @@ static VLCOpen *_o_sharedMainInstance = nil; ...@@ -283,7 +282,6 @@ static VLCOpen *_o_sharedMainInstance = nil;
- (void)setSubPanel - (void)setSubPanel
{ {
intf_thread_t * p_intf = VLCIntf;
int i_index; int i_index;
module_config_t * p_item; module_config_t * p_item;
...@@ -352,7 +350,6 @@ static VLCOpen *_o_sharedMainInstance = nil; ...@@ -352,7 +350,6 @@ static VLCOpen *_o_sharedMainInstance = nil;
- (void)openTarget:(int)i_type - (void)openTarget:(int)i_type
{ {
int i_result; int i_result;
intf_thread_t * p_intf = VLCIntf;
b_autoplay = config_GetInt( VLCIntf, "macosx-autoplay" ); b_autoplay = config_GetInt( VLCIntf, "macosx-autoplay" );
...@@ -412,14 +409,15 @@ static VLCOpen *_o_sharedMainInstance = nil; ...@@ -412,14 +409,15 @@ static VLCOpen *_o_sharedMainInstance = nil;
if( [[[o_tabview selectedTabViewItem] label] isEqualToString: _NS("Capture")] ) if( [[[o_tabview selectedTabViewItem] label] isEqualToString: _NS("Capture")] )
{ {
if( [[[o_capture_mode_pop selectedItem] title] isEqualToString: _NS("Screen")] ) if( [[[o_capture_mode_pop selectedItem] title] isEqualToString: _NS("Screen")] )
[o_options addObject: [NSString stringWithFormat: @"screen-fps=%i", [o_screen_fps_fld intValue]]]; [o_options addObject: [NSString stringWithFormat: @"screen-fps=%f", [o_screen_fps_fld floatValue]]];
[o_options addObject: [NSString stringWithFormat: @"screen-left=%i", [o_screen_left_fld intValue]]]; [o_options addObject: [NSString stringWithFormat: @"screen-left=%i", [o_screen_left_fld intValue]]];
[o_options addObject: [NSString stringWithFormat: @"screen-top=%i", [o_screen_top_fld intValue]]]; [o_options addObject: [NSString stringWithFormat: @"screen-top=%i", [o_screen_top_fld intValue]]];
[o_options addObject: [NSString stringWithFormat: @"screen-width=%i", [o_screen_width_fld intValue]]]; [o_options addObject: [NSString stringWithFormat: @"screen-width=%i", [o_screen_width_fld intValue]]];
[o_options addObject: [NSString stringWithFormat: @"screen-height=%i", [o_screen_height_fld intValue]]]; [o_options addObject: [NSString stringWithFormat: @"screen-height=%i", [o_screen_height_fld intValue]]];
if ([o_screen_follow_mouse_btn state]) { if( [o_screen_follow_mouse_ckb intValue] == YES )
[o_options addObject: @"screen-follow-mouse"]; [o_options addObject: @"screen-follow-mouse"];
} else
[o_options addObject: @"no-screen-follow-mouse"];
} }
/* apply the options to our item(s) */ /* apply the options to our item(s) */
...@@ -490,7 +488,7 @@ static VLCOpen *_o_sharedMainInstance = nil; ...@@ -490,7 +488,7 @@ static VLCOpen *_o_sharedMainInstance = nil;
if( b_dir ) if( b_dir )
{ {
o_mrl_string = [NSString stringWithFormat: @"directory://%@", o_filename]; o_mrl_string = [NSString stringWithFormat: @"directory://%@/", o_filename];
} }
else if( [o_ext isEqualToString: @"bin"] || else if( [o_ext isEqualToString: @"bin"] ||
[o_ext isEqualToString: @"cue"] || [o_ext isEqualToString: @"cue"] ||
...@@ -768,7 +766,6 @@ static VLCOpen *_o_sharedMainInstance = nil; ...@@ -768,7 +766,6 @@ static VLCOpen *_o_sharedMainInstance = nil;
{ {
NSString *o_mode; NSString *o_mode;
NSString *o_mrl_string = [NSString string]; NSString *o_mrl_string = [NSString string];
intf_thread_t * p_intf = VLCIntf;
o_mode = [[o_net_mode selectedCell] title]; o_mode = [[o_net_mode selectedCell] title];
...@@ -850,7 +847,7 @@ static VLCOpen *_o_sharedMainInstance = nil; ...@@ -850,7 +847,7 @@ static VLCOpen *_o_sharedMainInstance = nil;
[o_currentCaptureView removeFromSuperviewWithoutNeedingDisplay]; [o_currentCaptureView removeFromSuperviewWithoutNeedingDisplay];
[o_currentCaptureView release]; [o_currentCaptureView release];
} }
[theView setFrame: NSMakeRect( 0, 10, o_view_rect.size.width, o_view_rect.size.height)]; [theView setFrame: NSMakeRect( 0, -10, o_view_rect.size.width, o_view_rect.size.height)];
[theView setNeedsDisplay: YES]; [theView setNeedsDisplay: YES];
[theView setAutoresizesSubviews: YES]; [theView setAutoresizesSubviews: YES];
[[[o_tabview tabViewItemAtIndex: 3] view] addSubview: theView]; [[[o_tabview tabViewItemAtIndex: 3] view] addSubview: theView];
...@@ -883,6 +880,12 @@ static VLCOpen *_o_sharedMainInstance = nil; ...@@ -883,6 +880,12 @@ static VLCOpen *_o_sharedMainInstance = nil;
{ {
[self showCaptureView: o_screen_view]; [self showCaptureView: o_screen_view];
[o_mrl setStringValue: @"screen://"]; [o_mrl setStringValue: @"screen://"];
[o_screen_height_fld setIntValue: config_GetInt( p_intf, "screen-height" )];
[o_screen_width_fld setIntValue: config_GetInt( p_intf, "screen-width" )];
[o_screen_fps_fld setFloatValue: config_GetFloat( p_intf, "screen-fps" )];
[o_screen_left_fld setIntValue: config_GetInt( p_intf, "screen-left" )];
[o_screen_top_fld setIntValue: config_GetInt( p_intf, "screen-top" )];
[o_screen_follow_mouse_ckb setIntValue: config_GetInt( p_intf, "screen-follow-mouse" )];
} }
else if( [[[o_capture_mode_pop selectedItem] title] isEqualToString: @"iSight"] ) else if( [[[o_capture_mode_pop selectedItem] title] isEqualToString: @"iSight"] )
{ {
...@@ -898,16 +901,16 @@ static VLCOpen *_o_sharedMainInstance = nil; ...@@ -898,16 +901,16 @@ static VLCOpen *_o_sharedMainInstance = nil;
- (IBAction)screenStepperChanged:(id)sender - (IBAction)screenStepperChanged:(id)sender
{ {
[o_screen_fps_fld setIntValue: [o_screen_fps_stp intValue]]; [o_screen_fps_fld setFloatValue: [o_screen_fps_stp floatValue]];
[o_panel makeFirstResponder: o_screen_fps_fld]; [o_panel makeFirstResponder: o_screen_fps_fld];
[o_mrl setStringValue: @"screen://"]; [o_mrl setStringValue: @"screen://"];
} }
- (void)screenFPSfieldChanged:(NSNotification *)o_notification - (void)screenFPSfieldChanged:(NSNotification *)o_notification
{ {
[o_screen_fps_stp setIntValue: [o_screen_fps_fld intValue]]; [o_screen_fps_stp setFloatValue: [o_screen_fps_fld floatValue]];
if( [[o_screen_fps_fld stringValue] isEqualToString: @""] ) if( [[o_screen_fps_fld stringValue] isEqualToString: @""] )
[o_screen_fps_fld setIntValue: 1]; [o_screen_fps_fld setFloatValue: 1.0];
[o_mrl setStringValue: @"screen://"]; [o_mrl setStringValue: @"screen://"];
} }
......
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