]> git.sesse.net Git - vlc/commitdiff
Add subscreen/follow mouse options in open dialog.
authorFUJISAWA Tooru <arai_a@mac.com>
Tue, 13 Jan 2009 16:57:03 +0000 (01:57 +0900)
committerFelix Paul Kühne <fkuehne@videolan.org>
Tue, 13 Jan 2009 18:02:49 +0000 (19:02 +0100)
Signed-off-by: Felix Paul Kühne <fkuehne@videolan.org>
extras/package/macosx/Resources/English.lproj/Open.nib/classes.nib
extras/package/macosx/Resources/English.lproj/Open.nib/info.nib
extras/package/macosx/Resources/English.lproj/Open.nib/keyedobjects.nib
modules/access/screen/mac.c
modules/gui/macosx/open.h
modules/gui/macosx/open.m

index e0a7b6e66b2d6ff47de5154eee09b865b56a46f4..ec197e2deef3c495473806433dd72fae3e509c41 100644 (file)
-{
-    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
+<?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">
+<plist version="1.0">
+<dict>
+       <key>IBClasses</key>
+       <array>
+               <dict>
+                       <key>ACTIONS</key>
+                       <dict>
+                               <key>eyetvGetPlugin</key>
+                               <string>id</string>
+                               <key>eyetvLaunch</key>
+                               <string>id</string>
+                               <key>eyetvSwitchChannel</key>
+                               <string>id</string>
+                               <key>openCaptureModeChanged</key>
+                               <string>id</string>
+                               <key>openDisc</key>
+                               <string>id</string>
+                               <key>openDiscMenusChanged</key>
+                               <string>id</string>
+                               <key>openDiscStepperChanged</key>
+                               <string>id</string>
+                               <key>openDiscTypeChanged</key>
+                               <string>id</string>
+                               <key>openFile</key>
+                               <string>id</string>
+                               <key>openFileBrowse</key>
+                               <string>id</string>
+                               <key>openFileGeneric</key>
+                               <string>id</string>
+                               <key>openFileStreamChanged</key>
+                               <string>id</string>
+                               <key>openNet</key>
+                               <string>id</string>
+                               <key>openNetModeChanged</key>
+                               <string>id</string>
+                               <key>openNetStepperChanged</key>
+                               <string>id</string>
+                               <key>openVTSBrowse</key>
+                               <string>id</string>
+                               <key>panelCancel</key>
+                               <string>id</string>
+                               <key>panelOk</key>
+                               <string>id</string>
+                               <key>screenStepperChanged</key>
+                               <string>id</string>
+                               <key>subCloseSheet</key>
+                               <string>id</string>
+                               <key>subDelayStepperChanged</key>
+                               <string>id</string>
+                               <key>subFileBrowse</key>
+                               <string>id</string>
+                               <key>subFpsStepperChanged</key>
+                               <string>id</string>
+                               <key>subOverride</key>
+                               <string>id</string>
+                               <key>subSettings</key>
+                               <string>id</string>
+                               <key>subsChanged</key>
+                               <string>id</string>
+                       </dict>
+                       <key>CLASS</key>
+                       <string>VLCOpen</string>
+                       <key>LANGUAGE</key>
+                       <string>ObjC</string>
+                       <key>OUTLETS</key>
+                       <dict>
+                               <key>o_btn_cancel</key>
+                               <string>id</string>
+                               <key>o_btn_ok</key>
+                               <string>id</string>
+                               <key>o_capture_label_view</key>
+                               <string>id</string>
+                               <key>o_capture_lbl</key>
+                               <string>id</string>
+                               <key>o_capture_long_lbl</key>
+                               <string>id</string>
+                               <key>o_capture_mode_pop</key>
+                               <string>id</string>
+                               <key>o_disc_chapter</key>
+                               <string>id</string>
+                               <key>o_disc_chapter_lbl</key>
+                               <string>id</string>
+                               <key>o_disc_chapter_stp</key>
+                               <string>id</string>
+                               <key>o_disc_device</key>
+                               <string>id</string>
+                               <key>o_disc_device_lbl</key>
+                               <string>id</string>
+                               <key>o_disc_dvd_menus</key>
+                               <string>id</string>
+                               <key>o_disc_title</key>
+                               <string>id</string>
+                               <key>o_disc_title_lbl</key>
+                               <string>id</string>
+                               <key>o_disc_title_stp</key>
+                               <string>id</string>
+                               <key>o_disc_type</key>
+                               <string>id</string>
+                               <key>o_disc_videots_btn_browse</key>
+                               <string>id</string>
+                               <key>o_disc_videots_folder</key>
+                               <string>id</string>
+                               <key>o_eyetv_channels_pop</key>
+                               <string>id</string>
+                               <key>o_eyetv_chn_bgbar</key>
+                               <string>id</string>
+                               <key>o_eyetv_chn_status_txt</key>
+                               <string>id</string>
+                               <key>o_eyetv_currentChannel_lbl</key>
+                               <string>id</string>
+                               <key>o_eyetv_getPlugin_btn</key>
+                               <string>id</string>
+                               <key>o_eyetv_launchEyeTV_btn</key>
+                               <string>id</string>
+                               <key>o_eyetv_nextProgram_btn</key>
+                               <string>id</string>
+                               <key>o_eyetv_noInstanceLong_lbl</key>
+                               <string>id</string>
+                               <key>o_eyetv_noInstance_lbl</key>
+                               <string>id</string>
+                               <key>o_eyetv_notLaunched_view</key>
+                               <string>id</string>
+                               <key>o_eyetv_previousProgram_btn</key>
+                               <string>id</string>
+                               <key>o_eyetv_running_view</key>
+                               <string>id</string>
+                               <key>o_file_btn_browse</key>
+                               <string>id</string>
+                               <key>o_file_path</key>
+                               <string>id</string>
+                               <key>o_file_stream</key>
+                               <string>id</string>
+                               <key>o_file_sub_align_lbl</key>
+                               <string>id</string>
+                               <key>o_file_sub_align_pop</key>
+                               <string>id</string>
+                               <key>o_file_sub_btn_browse</key>
+                               <string>id</string>
+                               <key>o_file_sub_btn_settings</key>
+                               <string>id</string>
+                               <key>o_file_sub_ckbox</key>
+                               <string>id</string>
+                               <key>o_file_sub_delay</key>
+                               <string>id</string>
+                               <key>o_file_sub_delay_lbl</key>
+                               <string>id</string>
+                               <key>o_file_sub_delay_stp</key>
+                               <string>id</string>
+                               <key>o_file_sub_encoding_lbl</key>
+                               <string>id</string>
+                               <key>o_file_sub_encoding_pop</key>
+                               <string>id</string>
+                               <key>o_file_sub_file_box</key>
+                               <string>id</string>
+                               <key>o_file_sub_font_box</key>
+                               <string>id</string>
+                               <key>o_file_sub_fps</key>
+                               <string>id</string>
+                               <key>o_file_sub_fps_lbl</key>
+                               <string>id</string>
+                               <key>o_file_sub_fps_stp</key>
+                               <string>id</string>
+                               <key>o_file_sub_ok_btn</key>
+                               <string>id</string>
+                               <key>o_file_sub_override</key>
+                               <string>id</string>
+                               <key>o_file_sub_path</key>
+                               <string>id</string>
+                               <key>o_file_sub_sheet</key>
+                               <string>id</string>
+                               <key>o_file_sub_size_lbl</key>
+                               <string>id</string>
+                               <key>o_file_sub_size_pop</key>
+                               <string>id</string>
+                               <key>o_mrl</key>
+                               <string>id</string>
+                               <key>o_mrl_lbl</key>
+                               <string>id</string>
+                               <key>o_net_http_url</key>
+                               <string>id</string>
+                               <key>o_net_http_url_lbl</key>
+                               <string>id</string>
+                               <key>o_net_mode</key>
+                               <string>id</string>
+                               <key>o_net_timeshift_ckbox</key>
+                               <string>id</string>
+                               <key>o_net_udp_port</key>
+                               <string>id</string>
+                               <key>o_net_udp_port_lbl</key>
+                               <string>id</string>
+                               <key>o_net_udp_port_stp</key>
+                               <string>id</string>
+                               <key>o_net_udpm_addr</key>
+                               <string>id</string>
+                               <key>o_net_udpm_addr_lbl</key>
+                               <string>id</string>
+                               <key>o_net_udpm_port</key>
+                               <string>id</string>
+                               <key>o_net_udpm_port_lbl</key>
+                               <string>id</string>
+                               <key>o_net_udpm_port_stp</key>
+                               <string>id</string>
+                               <key>o_output_ckbox</key>
+                               <string>id</string>
+                               <key>o_panel</key>
+                               <string>id</string>
+                               <key>o_playlist</key>
+                               <string>id</string>
+                               <key>o_screen_follow_mouse_btn</key>
+                               <string>id</string>
+                               <key>o_screen_fps_fld</key>
+                               <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>
index 64d3f5f24be20eb80e274f332892a2fb788417c0..4f4512ef6db9f431c9bd6ea275616aa20f08eabe 100644 (file)
@@ -2,36 +2,18 @@
 <!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
 <plist version="1.0">
 <dict>
-       <key>IBDocumentLocation</key>
-       <string>-8 61 505 517 0 0 800 578 </string>
-       <key>IBEditorPositions</key>
-       <dict>
-               <key>2297</key>
-               <string>366 460 548 183 0 0 1280 778 </string>
-               <key>2301</key>
-               <string>366 460 548 183 0 0 1280 778 </string>
-               <key>2304</key>
-               <string>366 460 547 183 0 0 1280 778 </string>
-               <key>2346</key>
-               <string>366 460 548 183 0 0 1280 778 </string>
-       </dict>
        <key>IBFramework Version</key>
-       <string>489.0</string>
-       <key>IBLockedObjects</key>
-       <array>
-               <integer>2203</integer>
-               <integer>2208</integer>
-               <integer>2206</integer>
-               <integer>2199</integer>
-       </array>
+       <string>677</string>
+       <key>IBOldestOS</key>
+       <integer>5</integer>
        <key>IBOpenObjects</key>
        <array>
-               <integer>2304</integer>
-               <integer>2297</integer>
-               <integer>636</integer>
-               <integer>2301</integer>
+               <integer>678</integer>
+               <integer>2346</integer>
        </array>
        <key>IBSystem Version</key>
-       <string>9E17</string>
+       <string>9G55</string>
+       <key>targetFramework</key>
+       <string>IBCocoaFramework</string>
 </dict>
 </plist>
index 544424afc96dd348f88a7a60284a5af7a1e9b41d..45f714553dbba0488e1e2444c02ecb6bfb4ff3be 100644 (file)
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
index f48ccced6eaaf4f7b6b0e9bd5381fb11c9361821..c2aeb535d763a63f1ba69b9df9d4ddebc81ba8e7 100644 (file)
@@ -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;
index 53b7440cd6668755ab4d5ef89c6c47cd46b9cf31..695c0b2e58639ff7ac9b59c6926f332d9fd26e87 100644 (file)
@@ -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;
index 321738ec31aa0804e4aef53bcd040e74e9ac4a45..21a81bcf19932fc7bef0324f15385f2687e2b385 100644 (file)
@@ -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) */