From: FUJISAWA Tooru Date: Tue, 13 Jan 2009 16:57:03 +0000 (+0900) Subject: Add subscreen/follow mouse options in open dialog. X-Git-Tag: 1.0.0-pre1~1359 X-Git-Url: https://git.sesse.net/?a=commitdiff_plain;h=71042a865e237e082058cdf993e9e5926c55194b;p=vlc Add subscreen/follow mouse options in open dialog. Signed-off-by: Felix Paul Kühne --- diff --git a/extras/package/macosx/Resources/English.lproj/Open.nib/classes.nib b/extras/package/macosx/Resources/English.lproj/Open.nib/classes.nib index e0a7b6e66b..ec197e2dee 100644 --- a/extras/package/macosx/Resources/English.lproj/Open.nib/classes.nib +++ b/extras/package/macosx/Resources/English.lproj/Open.nib/classes.nib @@ -1,482 +1,403 @@ -{ - IBClasses = ( - { - CLASS = FirstResponder; - LANGUAGE = ObjC; - SUPERCLASS = NSObject; - }, - { - CLASS = MPSlider; - LANGUAGE = ObjC; - SUPERCLASS = NSSlider; - }, - { - ACTIONS = { - showPanel = id; - }; - CLASS = VLAboutBox; - LANGUAGE = ObjC; - SUPERCLASS = NSObject; - }, - { - CLASS = VLBrushedMetalImageView; - LANGUAGE = ObjC; - SUPERCLASS = NSImageView; - }, - { - CLASS = VLCApplication; - LANGUAGE = ObjC; - SUPERCLASS = NSApplication; - }, - { - CLASS = VLCControllerView; - LANGUAGE = ObjC; - SUPERCLASS = NSView; - }, - { - CLASS = VLCControllerWindow; - LANGUAGE = ObjC; - SUPERCLASS = NSWindow; - }, - { - ACTIONS = { - backward = id; - faster = id; - forward = id; - loop = id; - mute = id; - next = id; - pause = id; - play = id; - position = id; - prev = id; - random = id; - repeat = id; - slower = id; - stop = id; - toggleVar = id; - volumeDown = id; - volumeSliderUpdated = id; - volumeUp = id; - windowAction = id; - }; - CLASS = VLCControls; - LANGUAGE = ObjC; - OUTLETS = { - "o_btn_fullscreen" = id; - "o_main" = id; - "o_open" = id; - "o_volumeslider" = id; - }; - SUPERCLASS = NSObject; - }, - { - ACTIONS = { - bandSliderUpdated = id; - changePreset = id; - enable = id; - preampSliderUpdated = id; - toggleWindow = id; - twopass = id; - }; - CLASS = VLCEqualizer; - LANGUAGE = ObjC; - OUTLETS = { - "o_btn_equalizer" = id; - "o_ckb_2pass" = id; - "o_ckb_enable" = id; - "o_fld_preamp" = id; - "o_popup_presets" = id; - "o_slider_band1" = id; - "o_slider_band10" = id; - "o_slider_band2" = id; - "o_slider_band3" = id; - "o_slider_band4" = id; - "o_slider_band5" = id; - "o_slider_band6" = id; - "o_slider_band7" = id; - "o_slider_band8" = id; - "o_slider_band9" = id; - "o_slider_preamp" = id; - "o_window" = id; - }; - SUPERCLASS = NSObject; - }, - { - ACTIONS = { - createOutlineGroup = id; - deleteOutlineGroup = id; - infoCancel = id; - infoOk = id; - toggleInfoPanel = id; - togglePlaylistInfoPanel = id; - }; - CLASS = VLCInfo; - LANGUAGE = ObjC; - OUTLETS = { - "o_author_lbl" = id; - "o_author_txt" = id; - "o_btn_cancel" = id; - "o_btn_ok" = id; - "o_info_window" = id; - "o_outline_view" = id; - "o_title_lbl" = id; - "o_title_txt" = id; - "o_uri_lbl" = id; - "o_uri_txt" = id; - }; - SUPERCLASS = NSObject; - }, - { - ACTIONS = { - clearRecentItems = id; - closeError = id; - openCrashLog = id; - openDocumentation = id; - openLicense = id; - openReadMe = id; - openRecentItem = id; - openWebsite = id; - reportABug = id; - timesliderUpdate = id; - viewAbout = id; - viewPreferences = id; - }; - CLASS = VLCMain; - LANGUAGE = ObjC; - OUTLETS = { - "o_btn_ff" = id; - "o_btn_fullscreen" = id; - "o_btn_next" = id; - "o_btn_play" = id; - "o_btn_prev" = id; - "o_btn_rewind" = id; - "o_btn_stop" = id; - "o_controls" = id; - "o_dmi_mute" = id; - "o_dmi_next" = id; - "o_dmi_play" = id; - "o_dmi_previous" = id; - "o_dmi_stop" = id; - "o_err_btn_dismiss" = id; - "o_err_btn_msgs" = id; - "o_err_bug_lbl" = id; - "o_err_ckbk_surpress" = id; - "o_err_lbl" = id; - "o_err_msg" = id; - "o_error" = id; - "o_info" = id; - "o_messages" = id; - "o_mi_about" = id; - "o_mi_add_intf" = id; - "o_mi_audiotrack" = id; - "o_mi_bring_atf" = id; - "o_mi_bwd" = id; - "o_mi_channels" = id; - "o_mi_chapter" = id; - "o_mi_clear" = id; - "o_mi_close_window" = id; - "o_mi_controller" = id; - "o_mi_copy" = id; - "o_mi_cut" = id; - "o_mi_deinterlace" = id; - "o_mi_device" = id; - "o_mi_documentation" = id; - "o_mi_double_window" = id; - "o_mi_equalizer" = id; - "o_mi_faster" = id; - "o_mi_ffmpeg_pp" = id; - "o_mi_fittoscreen" = id; - "o_mi_floatontop" = id; - "o_mi_fullscreen" = id; - "o_mi_fwd" = id; - "o_mi_half_window" = id; - "o_mi_hide" = id; - "o_mi_hide_others" = id; - "o_mi_info" = id; - "o_mi_license" = id; - "o_mi_loop" = id; - "o_mi_messages" = id; - "o_mi_minimize" = id; - "o_mi_mute" = id; - "o_mi_next" = id; - "o_mi_normal_window" = id; - "o_mi_open_disc" = id; - "o_mi_open_file" = id; - "o_mi_open_generic" = id; - "o_mi_open_net" = id; - "o_mi_open_recent" = id; - "o_mi_open_recent_cm" = id; - "o_mi_paste" = id; - "o_mi_play" = id; - "o_mi_playlist" = id; - "o_mi_prefs" = id; - "o_mi_previous" = id; - "o_mi_program" = id; - "o_mi_quit" = id; - "o_mi_random" = id; - "o_mi_readme" = id; - "o_mi_repeat" = id; - "o_mi_reportabug" = id; - "o_mi_screen" = id; - "o_mi_select_all" = id; - "o_mi_services" = id; - "o_mi_show_all" = id; - "o_mi_slower" = id; - "o_mi_snapshot" = id; - "o_mi_stop" = id; - "o_mi_subtitle" = id; - "o_mi_title" = id; - "o_mi_videotrack" = id; - "o_mi_visual" = id; - "o_mi_vol_down" = id; - "o_mi_vol_up" = id; - "o_mi_website" = id; - "o_msgs_btn_crashlog" = id; - "o_msgs_panel" = id; - "o_mu_add_intf" = id; - "o_mu_audio" = id; - "o_mu_audiotrack" = id; - "o_mu_channels" = id; - "o_mu_chapter" = id; - "o_mu_controls" = id; - "o_mu_deinterlace" = id; - "o_mu_device" = id; - "o_mu_edit" = id; - "o_mu_ffmpeg_pp" = id; - "o_mu_file" = id; - "o_mu_help" = id; - "o_mu_program" = id; - "o_mu_screen" = id; - "o_mu_subtitle" = id; - "o_mu_title" = id; - "o_mu_video" = id; - "o_mu_videotrack" = id; - "o_mu_visual" = id; - "o_mu_window" = id; - "o_playlist" = id; - "o_scrollfield" = id; - "o_timefield" = id; - "o_timeslider" = id; - "o_volumeslider" = id; - "o_window" = id; - }; - SUPERCLASS = NSObject; - }, - { - ACTIONS = { - eyetvGetPlugin = id; - eyetvLaunch = id; - eyetvSwitchChannel = id; - openCaptureModeChanged = id; - openDisc = id; - openDiscMenusChanged = id; - openDiscStepperChanged = id; - openDiscTypeChanged = id; - openFile = id; - openFileBrowse = id; - openFileGeneric = id; - openFileStreamChanged = id; - openNet = id; - openNetModeChanged = id; - openNetStepperChanged = id; - openVTSBrowse = id; - panelCancel = id; - panelOk = id; - screenStepperChanged = id; - subCloseSheet = id; - subDelayStepperChanged = id; - subFileBrowse = id; - subFpsStepperChanged = id; - subOverride = id; - subSettings = id; - subsChanged = id; - }; - CLASS = VLCOpen; - LANGUAGE = ObjC; - OUTLETS = { - "o_btn_cancel" = id; - "o_btn_ok" = id; - "o_capture_label_view" = id; - "o_capture_lbl" = id; - "o_capture_long_lbl" = id; - "o_capture_mode_pop" = id; - "o_disc_chapter" = id; - "o_disc_chapter_lbl" = id; - "o_disc_chapter_stp" = id; - "o_disc_device" = id; - "o_disc_device_lbl" = id; - "o_disc_dvd_menus" = id; - "o_disc_title" = id; - "o_disc_title_lbl" = id; - "o_disc_title_stp" = id; - "o_disc_type" = id; - "o_disc_videots_btn_browse" = id; - "o_disc_videots_folder" = id; - "o_eyetv_channels_pop" = id; - "o_eyetv_chn_bgbar" = id; - "o_eyetv_chn_status_txt" = id; - "o_eyetv_currentChannel_lbl" = id; - "o_eyetv_getPlugin_btn" = id; - "o_eyetv_launchEyeTV_btn" = id; - "o_eyetv_nextProgram_btn" = id; - "o_eyetv_noInstanceLong_lbl" = id; - "o_eyetv_noInstance_lbl" = id; - "o_eyetv_notLaunched_view" = id; - "o_eyetv_previousProgram_btn" = id; - "o_eyetv_running_view" = id; - "o_file_btn_browse" = id; - "o_file_path" = id; - "o_file_stream" = id; - "o_file_sub_align_lbl" = id; - "o_file_sub_align_pop" = id; - "o_file_sub_btn_browse" = id; - "o_file_sub_btn_settings" = id; - "o_file_sub_ckbox" = id; - "o_file_sub_delay" = id; - "o_file_sub_delay_lbl" = id; - "o_file_sub_delay_stp" = id; - "o_file_sub_encoding_lbl" = id; - "o_file_sub_encoding_pop" = id; - "o_file_sub_file_box" = id; - "o_file_sub_font_box" = id; - "o_file_sub_fps" = id; - "o_file_sub_fps_lbl" = id; - "o_file_sub_fps_stp" = id; - "o_file_sub_ok_btn" = id; - "o_file_sub_override" = id; - "o_file_sub_path" = id; - "o_file_sub_sheet" = id; - "o_file_sub_size_lbl" = id; - "o_file_sub_size_pop" = id; - "o_mrl" = id; - "o_mrl_lbl" = id; - "o_net_http_url" = id; - "o_net_http_url_lbl" = id; - "o_net_mode" = id; - "o_net_timeshift_ckbox" = id; - "o_net_udp_port" = id; - "o_net_udp_port_lbl" = id; - "o_net_udp_port_stp" = id; - "o_net_udpm_addr" = id; - "o_net_udpm_addr_lbl" = id; - "o_net_udpm_port" = id; - "o_net_udpm_port_lbl" = id; - "o_net_udpm_port_stp" = id; - "o_output_ckbox" = id; - "o_panel" = id; - "o_playlist" = id; - "o_screen_fps_fld" = id; - "o_screen_fps_lbl" = id; - "o_screen_fps_stp" = id; - "o_screen_lbl" = id; - "o_screen_long_lbl" = id; - "o_screen_view" = id; - "o_sout_options" = id; - "o_tabview" = id; - }; - SUPERCLASS = NSObject; - }, - { - CLASS = VLCOpenTextField; - LANGUAGE = ObjC; - SUPERCLASS = NSTextField; - }, - { - ACTIONS = { - announceChanged = id; - outputChanged = id; - outputCloseSheet = id; - outputFileBrowse = id; - outputInfoChanged = id; - outputMethodChanged = id; - outputSettings = id; - streamPortStepperChanged = id; - streamTTLStepperChanged = id; - transcodeChanged = id; - transcodeInfoChanged = id; - }; - CLASS = VLCOutput; - LANGUAGE = ObjC; - OUTLETS = { - "o_btn_browse" = id; - "o_btn_ok" = id; - "o_channel_name" = id; - "o_channel_name_lbl" = id; - "o_display" = id; - "o_dump_chkbox" = id; - "o_file_chkbox" = id; - "o_file_field" = id; - "o_http_chkbox" = id; - "o_method" = id; - "o_misc_lbl" = id; - "o_mux_lbl" = id; - "o_mux_selector" = id; - "o_open_panel" = id; - "o_options_lbl" = id; - "o_output_ckbox" = id; - "o_output_settings" = id; - "o_output_sheet" = id; - "o_rtsp_chkbox" = id; - "o_sap_chkbox" = id; - "o_sdp_url" = id; - "o_sdp_url_lbl" = id; - "o_stream_address" = id; - "o_stream_address_lbl" = id; - "o_stream_port" = id; - "o_stream_port_lbl" = id; - "o_stream_port_stp" = id; - "o_stream_ttl" = id; - "o_stream_ttl_lbl" = id; - "o_stream_ttl_stp" = id; - "o_stream_type" = id; - "o_stream_type_lbl" = id; - "o_transcode_audio_bitrate" = id; - "o_transcode_audio_bitrate_lbl" = id; - "o_transcode_audio_channels" = id; - "o_transcode_audio_channels_lbl" = id; - "o_transcode_audio_chkbox" = id; - "o_transcode_audio_selector" = id; - "o_transcode_lbl" = id; - "o_transcode_video_bitrate" = id; - "o_transcode_video_bitrate_lbl" = id; - "o_transcode_video_chkbox" = id; - "o_transcode_video_scale" = id; - "o_transcode_video_scale_lbl" = id; - "o_transcode_video_selector" = id; - }; - SUPERCLASS = NSObject; - }, - { - CLASS = VLCPlaylist; - LANGUAGE = ObjC; - SUPERCLASS = NSObject; - }, - { - CLASS = VLCPlaylistView; - LANGUAGE = ObjC; - SUPERCLASS = NSOutlineView; - }, - { - ACTIONS = { - advancedToggle = id; - closePrefs = id; - resetAll = id; - savePrefs = id; - }; - CLASS = VLCPrefs; - LANGUAGE = ObjC; - OUTLETS = { - "o_advanced_ckb" = id; - "o_cancel_btn" = id; - "o_prefs_view" = id; - "o_prefs_window" = id; - "o_reset_btn" = id; - "o_save_btn" = id; - "o_tree" = id; - }; - SUPERCLASS = NSObject; - } - ); - IBVersion = 1; -} \ No newline at end of file + + + + + IBClasses + + + ACTIONS + + eyetvGetPlugin + id + eyetvLaunch + id + eyetvSwitchChannel + id + openCaptureModeChanged + id + openDisc + id + openDiscMenusChanged + id + openDiscStepperChanged + id + openDiscTypeChanged + id + openFile + id + openFileBrowse + id + openFileGeneric + id + openFileStreamChanged + id + openNet + id + openNetModeChanged + id + openNetStepperChanged + id + openVTSBrowse + id + panelCancel + id + panelOk + id + screenStepperChanged + id + subCloseSheet + id + subDelayStepperChanged + id + subFileBrowse + id + subFpsStepperChanged + id + subOverride + id + subSettings + id + subsChanged + id + + CLASS + VLCOpen + LANGUAGE + ObjC + OUTLETS + + o_btn_cancel + id + o_btn_ok + id + o_capture_label_view + id + o_capture_lbl + id + o_capture_long_lbl + id + o_capture_mode_pop + id + o_disc_chapter + id + o_disc_chapter_lbl + id + o_disc_chapter_stp + id + o_disc_device + id + o_disc_device_lbl + id + o_disc_dvd_menus + id + o_disc_title + id + o_disc_title_lbl + id + o_disc_title_stp + id + o_disc_type + id + o_disc_videots_btn_browse + id + o_disc_videots_folder + id + o_eyetv_channels_pop + id + o_eyetv_chn_bgbar + id + o_eyetv_chn_status_txt + id + o_eyetv_currentChannel_lbl + id + o_eyetv_getPlugin_btn + id + o_eyetv_launchEyeTV_btn + id + o_eyetv_nextProgram_btn + id + o_eyetv_noInstanceLong_lbl + id + o_eyetv_noInstance_lbl + id + o_eyetv_notLaunched_view + id + o_eyetv_previousProgram_btn + id + o_eyetv_running_view + id + o_file_btn_browse + id + o_file_path + id + o_file_stream + id + o_file_sub_align_lbl + id + o_file_sub_align_pop + id + o_file_sub_btn_browse + id + o_file_sub_btn_settings + id + o_file_sub_ckbox + id + o_file_sub_delay + id + o_file_sub_delay_lbl + id + o_file_sub_delay_stp + id + o_file_sub_encoding_lbl + id + o_file_sub_encoding_pop + id + o_file_sub_file_box + id + o_file_sub_font_box + id + o_file_sub_fps + id + o_file_sub_fps_lbl + id + o_file_sub_fps_stp + id + o_file_sub_ok_btn + id + o_file_sub_override + id + o_file_sub_path + id + o_file_sub_sheet + id + o_file_sub_size_lbl + id + o_file_sub_size_pop + id + o_mrl + id + o_mrl_lbl + id + o_net_http_url + id + o_net_http_url_lbl + id + o_net_mode + id + o_net_timeshift_ckbox + id + o_net_udp_port + id + o_net_udp_port_lbl + id + o_net_udp_port_stp + id + o_net_udpm_addr + id + o_net_udpm_addr_lbl + id + o_net_udpm_port + id + o_net_udpm_port_lbl + id + o_net_udpm_port_stp + id + o_output_ckbox + id + o_panel + id + o_playlist + id + o_screen_follow_mouse_btn + id + o_screen_fps_fld + id + o_screen_fps_lbl + id + o_screen_fps_stp + id + o_screen_height_fld + id + o_screen_height_lbl + id + o_screen_lbl + id + o_screen_left_fld + id + o_screen_left_lbl + id + o_screen_long_lbl + id + o_screen_top_fld + id + o_screen_top_lbl + id + o_screen_view + id + o_screen_width_fld + id + o_screen_width_lbl + id + o_sout_options + id + o_tabview + id + + SUPERCLASS + NSObject + + + CLASS + VLCOpenTextField + LANGUAGE + ObjC + SUPERCLASS + NSTextField + + + ACTIONS + + announceChanged + id + outputChanged + id + outputCloseSheet + id + outputFileBrowse + id + outputInfoChanged + id + outputMethodChanged + id + outputSettings + id + streamPortStepperChanged + id + streamTTLStepperChanged + id + transcodeChanged + id + transcodeInfoChanged + id + + CLASS + VLCOutput + LANGUAGE + ObjC + OUTLETS + + o_btn_browse + id + o_btn_ok + id + o_channel_name + id + o_channel_name_lbl + id + o_display + id + o_dump_chkbox + id + o_file_chkbox + id + o_file_field + id + o_http_chkbox + id + o_method + id + o_misc_lbl + id + o_mux_lbl + id + o_mux_selector + id + o_open_panel + id + o_options_lbl + id + o_output_ckbox + id + o_output_settings + id + o_output_sheet + id + o_rtsp_chkbox + id + o_sap_chkbox + id + o_sdp_url + id + o_sdp_url_lbl + id + o_stream_address + id + o_stream_address_lbl + id + o_stream_port + id + o_stream_port_lbl + id + o_stream_port_stp + id + o_stream_ttl + id + o_stream_ttl_lbl + id + o_stream_ttl_stp + id + o_stream_type + id + o_stream_type_lbl + id + o_transcode_audio_bitrate + id + o_transcode_audio_bitrate_lbl + id + o_transcode_audio_channels + id + o_transcode_audio_channels_lbl + id + o_transcode_audio_chkbox + id + o_transcode_audio_selector + id + o_transcode_lbl + id + o_transcode_video_bitrate + id + o_transcode_video_bitrate_lbl + id + o_transcode_video_chkbox + id + o_transcode_video_scale + id + o_transcode_video_scale_lbl + id + o_transcode_video_selector + id + + SUPERCLASS + NSObject + + + CLASS + FirstResponder + LANGUAGE + ObjC + SUPERCLASS + NSObject + + + CLASS + VLCPlaylist + LANGUAGE + ObjC + SUPERCLASS + NSObject + + + IBVersion + 1 + + diff --git a/extras/package/macosx/Resources/English.lproj/Open.nib/info.nib b/extras/package/macosx/Resources/English.lproj/Open.nib/info.nib index 64d3f5f24b..4f4512ef6d 100644 --- a/extras/package/macosx/Resources/English.lproj/Open.nib/info.nib +++ b/extras/package/macosx/Resources/English.lproj/Open.nib/info.nib @@ -2,36 +2,18 @@ - IBDocumentLocation - -8 61 505 517 0 0 800 578 - IBEditorPositions - - 2297 - 366 460 548 183 0 0 1280 778 - 2301 - 366 460 548 183 0 0 1280 778 - 2304 - 366 460 547 183 0 0 1280 778 - 2346 - 366 460 548 183 0 0 1280 778 - IBFramework Version - 489.0 - IBLockedObjects - - 2203 - 2208 - 2206 - 2199 - + 677 + IBOldestOS + 5 IBOpenObjects - 2304 - 2297 - 636 - 2301 + 678 + 2346 IBSystem Version - 9E17 + 9G55 + targetFramework + IBCocoaFramework diff --git a/extras/package/macosx/Resources/English.lproj/Open.nib/keyedobjects.nib b/extras/package/macosx/Resources/English.lproj/Open.nib/keyedobjects.nib index 544424afc9..45f714553d 100644 Binary files a/extras/package/macosx/Resources/English.lproj/Open.nib/keyedobjects.nib and b/extras/package/macosx/Resources/English.lproj/Open.nib/keyedobjects.nib differ diff --git a/modules/access/screen/mac.c b/modules/access/screen/mac.c index f48ccced6e..c2aeb535d7 100644 --- a/modules/access/screen/mac.c +++ b/modules/access/screen/mac.c @@ -106,11 +106,9 @@ int screen_InitCapture( demux_t *p_demux ) p_data->left = p_sys->i_left; p_data->top = p_sys->i_top; p_data->src_width = var_CreateGetInteger( p_demux, "screen-width" ); - if (p_data->src_width <= 0) { - p_data->src_width = p_data->screen_width; - } p_data->src_height = var_CreateGetInteger( p_demux, "screen-height" ); - if (p_data->src_height <= 0) { + if (p_data->src_width <= 0 || p_data->src_height <= 0) { + p_data->src_width = p_data->screen_width; p_data->src_height = p_data->screen_height; } p_data->dest_width = p_data->src_width; diff --git a/modules/gui/macosx/open.h b/modules/gui/macosx/open.h index 53b7440cd6..695c0b2e58 100644 --- a/modules/gui/macosx/open.h +++ b/modules/gui/macosx/open.h @@ -128,6 +128,15 @@ NSArray *GetEjectableMediaOfClass( const char *psz_class ); IBOutlet id o_screen_long_lbl; IBOutlet id o_screen_fps_stp; IBOutlet id o_screen_fps_lbl; + IBOutlet id o_screen_left_fld; + IBOutlet id o_screen_left_lbl; + IBOutlet id o_screen_top_fld; + IBOutlet id o_screen_top_lbl; + IBOutlet id o_screen_width_fld; + IBOutlet id o_screen_width_lbl; + IBOutlet id o_screen_height_fld; + IBOutlet id o_screen_height_lbl; + IBOutlet id o_screen_follow_mouse_btn; BOOL b_autoplay; id o_currentCaptureView; diff --git a/modules/gui/macosx/open.m b/modules/gui/macosx/open.m index 321738ec31..21a81bcf19 100644 --- a/modules/gui/macosx/open.m +++ b/modules/gui/macosx/open.m @@ -209,6 +209,10 @@ static VLCOpen *_o_sharedMainInstance = nil; [o_screen_lbl setStringValue: _NS("Screen Capture Input")]; [o_screen_long_lbl setStringValue: _NS("This facility allows you to process your screen's output.")]; [o_screen_fps_lbl setStringValue: _NS("Frames per Second:")]; + [o_screen_left_lbl setStringValue: _NS("Subscreen left:")]; + [o_screen_top_lbl setStringValue: _NS("Subscreen top:")]; + [o_screen_width_lbl setStringValue: _NS("Subscreen width:")]; + [o_screen_height_lbl setStringValue: _NS("Subscreen height:")]; [o_eyetv_currentChannel_lbl setStringValue: _NS("Current channel:")]; [o_eyetv_previousProgram_btn setTitle: _NS("Previous Channel")]; [o_eyetv_nextProgram_btn setTitle: _NS("Next Channel")]; @@ -409,6 +413,13 @@ static VLCOpen *_o_sharedMainInstance = nil; { 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-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-width=%i", [o_screen_width_fld intValue]]]; + [o_options addObject: [NSString stringWithFormat: @"screen-height=%i", [o_screen_height_fld intValue]]]; + if ([o_screen_follow_mouse_btn state]) { + [o_options addObject: @"screen-follow-mouse"]; + } } /* apply the options to our item(s) */