Commit 6a5fc04e authored by Felix Paul Kühne's avatar Felix Paul Kühne

Redesign the Capture Device panel

Complete l10n to be done later on
parent 566d7d2f
...@@ -186,6 +186,7 @@ ...@@ -186,6 +186,7 @@
ACTIONS = { ACTIONS = {
checkForUpdate = id; checkForUpdate = id;
clearRecentItems = id; clearRecentItems = id;
intfOpenCapture = id;
intfOpenDisc = id; intfOpenDisc = id;
intfOpenFile = id; intfOpenFile = id;
intfOpenFileGeneric = id; intfOpenFileGeneric = id;
...@@ -286,6 +287,7 @@ ...@@ -286,6 +287,7 @@
"o_mi_mute" = id; "o_mi_mute" = id;
"o_mi_next" = id; "o_mi_next" = id;
"o_mi_normal_window" = id; "o_mi_normal_window" = id;
"o_mi_open_capture" = id;
"o_mi_open_disc" = id; "o_mi_open_disc" = id;
"o_mi_open_file" = id; "o_mi_open_file" = id;
"o_mi_open_generic" = id; "o_mi_open_generic" = id;
......
...@@ -4,6 +4,11 @@ ...@@ -4,6 +4,11 @@
<dict> <dict>
<key>IBDocumentLocation</key> <key>IBDocumentLocation</key>
<string>429 441 496 337 0 0 1280 778 </string> <string>429 441 496 337 0 0 1280 778 </string>
<key>IBEditorPositions</key>
<dict>
<key>29</key>
<string>64 734 438 44 0 0 1280 778 </string>
</dict>
<key>IBFramework Version</key> <key>IBFramework Version</key>
<string>489.0</string> <string>489.0</string>
<key>IBLastKnownRelativeProjectPath</key> <key>IBLastKnownRelativeProjectPath</key>
...@@ -12,6 +17,7 @@ ...@@ -12,6 +17,7 @@
<integer>5</integer> <integer>5</integer>
<key>IBOpenObjects</key> <key>IBOpenObjects</key>
<array> <array>
<integer>29</integer>
<integer>21</integer> <integer>21</integer>
<integer>2416</integer> <integer>2416</integer>
</array> </array>
......
{ {
IBClasses = ( IBClasses = (
{CLASS = FirstResponder; LANGUAGE = ObjC; SUPERCLASS = NSObject; }, {
{CLASS = MPSlider; LANGUAGE = ObjC; SUPERCLASS = NSSlider; }, CLASS = FirstResponder;
{ LANGUAGE = ObjC;
ACTIONS = {showPanel = id; }; SUPERCLASS = NSObject;
CLASS = VLAboutBox; },
LANGUAGE = ObjC; {
SUPERCLASS = NSObject; CLASS = MPSlider;
}, LANGUAGE = ObjC;
{CLASS = VLBrushedMetalImageView; LANGUAGE = ObjC; SUPERCLASS = NSImageView; }, SUPERCLASS = NSSlider;
{CLASS = VLCApplication; LANGUAGE = ObjC; SUPERCLASS = NSApplication; }, },
{CLASS = VLCControllerView; LANGUAGE = ObjC; SUPERCLASS = NSView; }, {
{CLASS = VLCControllerWindow; LANGUAGE = ObjC; SUPERCLASS = NSWindow; }, ACTIONS = {
{ showPanel = id;
ACTIONS = { };
backward = id; CLASS = VLAboutBox;
faster = id; LANGUAGE = ObjC;
forward = id; SUPERCLASS = NSObject;
loop = id; },
mute = id; {
next = id; CLASS = VLBrushedMetalImageView;
pause = id; LANGUAGE = ObjC;
play = id; SUPERCLASS = NSImageView;
position = id; },
prev = id; {
random = id; CLASS = VLCApplication;
repeat = id; LANGUAGE = ObjC;
slower = id; SUPERCLASS = NSApplication;
stop = id; },
toggleVar = id; {
volumeDown = id; CLASS = VLCControllerView;
volumeSliderUpdated = id; LANGUAGE = ObjC;
volumeUp = id; SUPERCLASS = NSView;
windowAction = id; },
}; {
CLASS = VLCControls; CLASS = VLCControllerWindow;
LANGUAGE = ObjC; LANGUAGE = ObjC;
OUTLETS = { SUPERCLASS = NSWindow;
"o_btn_fullscreen" = id; },
"o_main" = id; {
"o_open" = id; ACTIONS = {
"o_volumeslider" = id; backward = id;
}; faster = id;
SUPERCLASS = NSObject; forward = id;
}, loop = id;
{ mute = id;
ACTIONS = { next = id;
bandSliderUpdated = id; pause = id;
changePreset = id; play = id;
enable = id; position = id;
preampSliderUpdated = id; prev = id;
toggleWindow = id; random = id;
twopass = id; repeat = id;
}; slower = id;
CLASS = VLCEqualizer; stop = id;
LANGUAGE = ObjC; toggleVar = id;
OUTLETS = { volumeDown = id;
"o_btn_equalizer" = id; volumeSliderUpdated = id;
"o_ckb_2pass" = id; volumeUp = id;
"o_ckb_enable" = id; windowAction = id;
"o_fld_preamp" = id; };
"o_popup_presets" = id; CLASS = VLCControls;
"o_slider_band1" = id; LANGUAGE = ObjC;
"o_slider_band10" = id; OUTLETS = {
"o_slider_band2" = id; "o_btn_fullscreen" = id;
"o_slider_band3" = id; "o_main" = id;
"o_slider_band4" = id; "o_open" = id;
"o_slider_band5" = id; "o_volumeslider" = id;
"o_slider_band6" = id; };
"o_slider_band7" = id; SUPERCLASS = NSObject;
"o_slider_band8" = id; },
"o_slider_band9" = id; {
"o_slider_preamp" = id; ACTIONS = {
"o_window" = id; bandSliderUpdated = id;
}; changePreset = id;
SUPERCLASS = NSObject; enable = id;
}, preampSliderUpdated = id;
{ toggleWindow = id;
ACTIONS = { twopass = id;
createOutlineGroup = id; };
deleteOutlineGroup = id; CLASS = VLCEqualizer;
infoCancel = id; LANGUAGE = ObjC;
infoOk = id; OUTLETS = {
toggleInfoPanel = id; "o_btn_equalizer" = id;
togglePlaylistInfoPanel = id; "o_ckb_2pass" = id;
}; "o_ckb_enable" = id;
CLASS = VLCInfo; "o_fld_preamp" = id;
LANGUAGE = ObjC; "o_popup_presets" = id;
OUTLETS = { "o_slider_band1" = id;
"o_author_lbl" = id; "o_slider_band10" = id;
"o_author_txt" = id; "o_slider_band2" = id;
"o_btn_cancel" = id; "o_slider_band3" = id;
"o_btn_ok" = id; "o_slider_band4" = id;
"o_info_window" = id; "o_slider_band5" = id;
"o_outline_view" = id; "o_slider_band6" = id;
"o_title_lbl" = id; "o_slider_band7" = id;
"o_title_txt" = id; "o_slider_band8" = id;
"o_uri_lbl" = id; "o_slider_band9" = id;
"o_uri_txt" = id; "o_slider_preamp" = id;
}; "o_window" = id;
SUPERCLASS = NSObject; };
}, SUPERCLASS = NSObject;
{ },
ACTIONS = { {
clearRecentItems = id; ACTIONS = {
closeError = id; createOutlineGroup = id;
openCrashLog = id; deleteOutlineGroup = id;
openDocumentation = id; infoCancel = id;
openLicense = id; infoOk = id;
openReadMe = id; toggleInfoPanel = id;
openRecentItem = id; togglePlaylistInfoPanel = id;
openWebsite = id; };
reportABug = id; CLASS = VLCInfo;
timesliderUpdate = id; LANGUAGE = ObjC;
viewAbout = id; OUTLETS = {
viewPreferences = id; "o_author_lbl" = id;
}; "o_author_txt" = id;
CLASS = VLCMain; "o_btn_cancel" = id;
LANGUAGE = ObjC; "o_btn_ok" = id;
OUTLETS = { "o_info_window" = id;
"o_btn_ff" = id; "o_outline_view" = id;
"o_btn_fullscreen" = id; "o_title_lbl" = id;
"o_btn_next" = id; "o_title_txt" = id;
"o_btn_play" = id; "o_uri_lbl" = id;
"o_btn_prev" = id; "o_uri_txt" = id;
"o_btn_rewind" = id; };
"o_btn_stop" = id; SUPERCLASS = NSObject;
"o_controls" = id; },
"o_dmi_mute" = id; {
"o_dmi_next" = id; ACTIONS = {
"o_dmi_play" = id; clearRecentItems = id;
"o_dmi_previous" = id; closeError = id;
"o_dmi_stop" = id; openCrashLog = id;
"o_err_btn_dismiss" = id; openDocumentation = id;
"o_err_btn_msgs" = id; openLicense = id;
"o_err_bug_lbl" = id; openReadMe = id;
"o_err_ckbk_surpress" = id; openRecentItem = id;
"o_err_lbl" = id; openWebsite = id;
"o_err_msg" = id; reportABug = id;
"o_error" = id; timesliderUpdate = id;
"o_info" = id; viewAbout = id;
"o_messages" = id; viewPreferences = id;
"o_mi_about" = id; };
"o_mi_add_intf" = id; CLASS = VLCMain;
"o_mi_audiotrack" = id; LANGUAGE = ObjC;
"o_mi_bring_atf" = id; OUTLETS = {
"o_mi_bwd" = id; "o_btn_ff" = id;
"o_mi_channels" = id; "o_btn_fullscreen" = id;
"o_mi_chapter" = id; "o_btn_next" = id;
"o_mi_clear" = id; "o_btn_play" = id;
"o_mi_close_window" = id; "o_btn_prev" = id;
"o_mi_controller" = id; "o_btn_rewind" = id;
"o_mi_copy" = id; "o_btn_stop" = id;
"o_mi_cut" = id; "o_controls" = id;
"o_mi_deinterlace" = id; "o_dmi_mute" = id;
"o_mi_device" = id; "o_dmi_next" = id;
"o_mi_documentation" = id; "o_dmi_play" = id;
"o_mi_double_window" = id; "o_dmi_previous" = id;
"o_mi_equalizer" = id; "o_dmi_stop" = id;
"o_mi_faster" = id; "o_err_btn_dismiss" = id;
"o_mi_ffmpeg_pp" = id; "o_err_btn_msgs" = id;
"o_mi_fittoscreen" = id; "o_err_bug_lbl" = id;
"o_mi_floatontop" = id; "o_err_ckbk_surpress" = id;
"o_mi_fullscreen" = id; "o_err_lbl" = id;
"o_mi_fwd" = id; "o_err_msg" = id;
"o_mi_half_window" = id; "o_error" = id;
"o_mi_hide" = id; "o_info" = id;
"o_mi_hide_others" = id; "o_messages" = id;
"o_mi_info" = id; "o_mi_about" = id;
"o_mi_license" = id; "o_mi_add_intf" = id;
"o_mi_loop" = id; "o_mi_audiotrack" = id;
"o_mi_messages" = id; "o_mi_bring_atf" = id;
"o_mi_minimize" = id; "o_mi_bwd" = id;
"o_mi_mute" = id; "o_mi_channels" = id;
"o_mi_next" = id; "o_mi_chapter" = id;
"o_mi_normal_window" = id; "o_mi_clear" = id;
"o_mi_open_disc" = id; "o_mi_close_window" = id;
"o_mi_open_file" = id; "o_mi_controller" = id;
"o_mi_open_generic" = id; "o_mi_copy" = id;
"o_mi_open_net" = id; "o_mi_cut" = id;
"o_mi_open_recent" = id; "o_mi_deinterlace" = id;
"o_mi_open_recent_cm" = id; "o_mi_device" = id;
"o_mi_paste" = id; "o_mi_documentation" = id;
"o_mi_play" = id; "o_mi_double_window" = id;
"o_mi_playlist" = id; "o_mi_equalizer" = id;
"o_mi_prefs" = id; "o_mi_faster" = id;
"o_mi_previous" = id; "o_mi_ffmpeg_pp" = id;
"o_mi_program" = id; "o_mi_fittoscreen" = id;
"o_mi_quit" = id; "o_mi_floatontop" = id;
"o_mi_random" = id; "o_mi_fullscreen" = id;
"o_mi_readme" = id; "o_mi_fwd" = id;
"o_mi_repeat" = id; "o_mi_half_window" = id;
"o_mi_reportabug" = id; "o_mi_hide" = id;
"o_mi_screen" = id; "o_mi_hide_others" = id;
"o_mi_select_all" = id; "o_mi_info" = id;
"o_mi_services" = id; "o_mi_license" = id;
"o_mi_show_all" = id; "o_mi_loop" = id;
"o_mi_slower" = id; "o_mi_messages" = id;
"o_mi_snapshot" = id; "o_mi_minimize" = id;
"o_mi_stop" = id; "o_mi_mute" = id;
"o_mi_subtitle" = id; "o_mi_next" = id;
"o_mi_title" = id; "o_mi_normal_window" = id;
"o_mi_videotrack" = id; "o_mi_open_disc" = id;
"o_mi_visual" = id; "o_mi_open_file" = id;
"o_mi_vol_down" = id; "o_mi_open_generic" = id;
"o_mi_vol_up" = id; "o_mi_open_net" = id;
"o_mi_website" = id; "o_mi_open_recent" = id;
"o_msgs_btn_crashlog" = id; "o_mi_open_recent_cm" = id;
"o_msgs_panel" = id; "o_mi_paste" = id;
"o_mu_add_intf" = id; "o_mi_play" = id;
"o_mu_audio" = id; "o_mi_playlist" = id;
"o_mu_audiotrack" = id; "o_mi_prefs" = id;
"o_mu_channels" = id; "o_mi_previous" = id;
"o_mu_chapter" = id; "o_mi_program" = id;
"o_mu_controls" = id; "o_mi_quit" = id;
"o_mu_deinterlace" = id; "o_mi_random" = id;
"o_mu_device" = id; "o_mi_readme" = id;
"o_mu_edit" = id; "o_mi_repeat" = id;
"o_mu_ffmpeg_pp" = id; "o_mi_reportabug" = id;
"o_mu_file" = id; "o_mi_screen" = id;
"o_mu_help" = id; "o_mi_select_all" = id;
"o_mu_program" = id; "o_mi_services" = id;
"o_mu_screen" = id; "o_mi_show_all" = id;
"o_mu_subtitle" = id; "o_mi_slower" = id;
"o_mu_title" = id; "o_mi_snapshot" = id;
"o_mu_video" = id; "o_mi_stop" = id;
"o_mu_videotrack" = id; "o_mi_subtitle" = id;
"o_mu_visual" = id; "o_mi_title" = id;
"o_mu_window" = id; "o_mi_videotrack" = id;
"o_playlist" = id; "o_mi_visual" = id;
"o_scrollfield" = id; "o_mi_vol_down" = id;
"o_timefield" = id; "o_mi_vol_up" = id;
"o_timeslider" = id; "o_mi_website" = id;
"o_volumeslider" = id; "o_msgs_btn_crashlog" = id;
"o_window" = id; "o_msgs_panel" = id;
}; "o_mu_add_intf" = id;
SUPERCLASS = NSObject; "o_mu_audio" = id;
}, "o_mu_audiotrack" = id;
{ "o_mu_channels" = id;
ACTIONS = { "o_mu_chapter" = id;
eyetvLaunch = id; "o_mu_controls" = id;
eyetvSwitchChannel = id; "o_mu_deinterlace" = id;
openDisc = id; "o_mu_device" = id;
openDiscMenusChanged = id; "o_mu_edit" = id;
openDiscStepperChanged = id; "o_mu_ffmpeg_pp" = id;
openDiscTypeChanged = id; "o_mu_file" = id;
openFile = id; "o_mu_help" = id;
openFileBrowse = id; "o_mu_program" = id;
openFileGeneric = id; "o_mu_screen" = id;
openFileStreamChanged = id; "o_mu_subtitle" = id;
openNet = id; "o_mu_title" = id;
openNetModeChanged = id; "o_mu_video" = id;
openNetStepperChanged = id; "o_mu_videotrack" = id;
openVTSBrowse = id; "o_mu_visual" = id;
panelCancel = id; "o_mu_window" = id;
panelOk = id; "o_playlist" = id;
subCloseSheet = id; "o_scrollfield" = id;
subDelayStepperChanged = id; "o_timefield" = id;
subFileBrowse = id; "o_timeslider" = id;
subFpsStepperChanged = id; "o_volumeslider" = id;
subOverride = id; "o_window" = id;
subSettings = id; };
subsChanged = id; SUPERCLASS = NSObject;
}; },
CLASS = VLCOpen; {
LANGUAGE = ObjC; ACTIONS = {
OUTLETS = { eyetvLaunch = id;
"o_btn_cancel" = id; eyetvSwitchChannel = id;
"o_btn_ok" = id; openCaptureModeChanged = id;
"o_disc_chapter" = id; openCaptureStepperChanged = id;
"o_disc_chapter_lbl" = id; openDisc = id;
"o_disc_chapter_stp" = id; openDiscMenusChanged = id;
"o_disc_device" = id; openDiscStepperChanged = id;
"o_disc_device_lbl" = id; openDiscTypeChanged = id;
"o_disc_dvd_menus" = id; openFile = id;
"o_disc_title" = id; openFileBrowse = id;
"o_disc_title_lbl" = id; openFileGeneric = id;
"o_disc_title_stp" = id; openFileStreamChanged = id;
"o_disc_type" = id; openNet = id;
"o_disc_videots_btn_browse" = id; openNetModeChanged = id;
"o_disc_videots_folder" = id; openNetStepperChanged = id;
"o_eyetv_channels_pop" = id; openVTSBrowse = id;
"o_eyetv_chn_bgbar" = id; panelCancel = id;
"o_eyetv_chn_status_txt" = id; panelOk = id;
"o_eyetv_currentChannel_lbl" = id; subCloseSheet = id;
"o_eyetv_launchEyeTV_btn" = id; subDelayStepperChanged = id;
"o_eyetv_nextProgram_btn" = id; subFileBrowse = id;
"o_eyetv_noDeviceLong_lbl" = id; subFpsStepperChanged = id;
"o_eyetv_noDevice_lbl" = id; subOverride = id;
"o_eyetv_noEyeTVLong_lbl" = id; subSettings = id;
"o_eyetv_noEyeTV_lbl" = id; subsChanged = id;
"o_eyetv_previousProgram_btn" = id; };
"o_eyetv_tabView" = id; CLASS = VLCOpen;
"o_file_btn_browse" = id; LANGUAGE = ObjC;
"o_file_path" = id; OUTLETS = {
"o_file_stream" = id; "o_btn_cancel" = id;
"o_file_sub_align_lbl" = id; "o_btn_ok" = id;
"o_file_sub_align_pop" = id; "o_capture_label_view" = id;
"o_file_sub_btn_browse" = id; "o_capture_lbl" = id;
"o_file_sub_btn_settings" = id; "o_capture_long_lbl" = id;
"o_file_sub_ckbox" = id; "o_capture_mode_pop" = id;
"o_file_sub_delay" = id; "o_disc_chapter" = id;
"o_file_sub_delay_lbl" = id; "o_disc_chapter_lbl" = id;
"o_file_sub_delay_stp" = id; "o_disc_chapter_stp" = id;
"o_file_sub_encoding_lbl" = id; "o_disc_device" = id;
"o_file_sub_encoding_pop" = id; "o_disc_device_lbl" = id;
"o_file_sub_file_box" = id; "o_disc_dvd_menus" = id;
"o_file_sub_font_box" = id; "o_disc_title" = id;
"o_file_sub_fps" = id; "o_disc_title_lbl" = id;
"o_file_sub_fps_lbl" = id; "o_disc_title_stp" = id;
"o_file_sub_fps_stp" = id; "o_disc_type" = id;
"o_file_sub_ok_btn" = id; "o_disc_videots_btn_browse" = id;
"o_file_sub_override" = id; "o_disc_videots_folder" = id;
"o_file_sub_path" = id; "o_eyetv_channels_pop" = id;
"o_file_sub_sheet" = id; "o_eyetv_chn_bgbar" = id;
"o_file_sub_size_lbl" = id; "o_eyetv_chn_status_txt" = id;
"o_file_sub_size_pop" = id; "o_eyetv_currentChannel_lbl" = id;
"o_mrl" = id; "o_eyetv_launchEyeTV_btn" = id;
"o_mrl_lbl" = id; "o_eyetv_nextProgram_btn" = id;
"o_net_http_url" = id; "o_eyetv_noInstanceLong_lbl" = id;
"o_net_http_url_lbl" = id; "o_eyetv_noInstance_lbl" = id;
"o_net_mode" = id; "o_eyetv_notLaunched_view" = id;
"o_net_timeshift_ckbox" = id; "o_eyetv_previousProgram_btn" = id;
"o_net_udp_port" = id; "o_eyetv_running_view" = id;
"o_net_udp_port_lbl" = id; "o_file_btn_browse" = id;
"o_net_udp_port_stp" = id; "o_file_path" = id;
"o_net_udpm_addr" = id; "o_file_stream" = id;
"o_net_udpm_addr_lbl" = id; "o_file_sub_align_lbl" = id;
"o_net_udpm_port" = id; "o_file_sub_align_pop" = id;
"o_net_udpm_port_lbl" = id; "o_file_sub_btn_browse" = id;
"o_net_udpm_port_stp" = id; "o_file_sub_btn_settings" = id;
"o_output_ckbox" = id; "o_file_sub_ckbox" = id;
"o_panel" = id; "o_file_sub_delay" = id;
"o_playlist" = id; "o_file_sub_delay_lbl" = id;
"o_sout_options" = id; "o_file_sub_delay_stp" = id;
"o_tabview" = id; "o_file_sub_encoding_lbl" = id;
}; "o_file_sub_encoding_pop" = id;
SUPERCLASS = NSObject; "o_file_sub_file_box" = id;
}, "o_file_sub_font_box" = id;
{CLASS = VLCOpenTextField; LANGUAGE = ObjC; SUPERCLASS = NSTextField; }, "o_file_sub_fps" = id;
{ "o_file_sub_fps_lbl" = id;
ACTIONS = { "o_file_sub_fps_stp" = id;
announceChanged = id; "o_file_sub_ok_btn" = id;
outputChanged = id; "o_file_sub_override" = id;
outputCloseSheet = id; "o_file_sub_path" = id;
outputFileBrowse = id; "o_file_sub_sheet" = id;
outputInfoChanged = id; "o_file_sub_size_lbl" = id;
outputMethodChanged = id; "o_file_sub_size_pop" = id;
outputSettings = id; "o_mrl" = id;
streamPortStepperChanged = id; "o_mrl_lbl" = id;
streamTTLStepperChanged = id; "o_net_http_url" = id;
transcodeChanged = id; "o_net_http_url_lbl" = id;
transcodeInfoChanged = id; "o_net_mode" = id;
}; "o_net_timeshift_ckbox" = id;
CLASS = VLCOutput; "o_net_udp_port" = id;
LANGUAGE = ObjC; "o_net_udp_port_lbl" = id;
OUTLETS = { "o_net_udp_port_stp" = id;
"o_btn_browse" = id; "o_net_udpm_addr" = id;
"o_btn_ok" = id; "o_net_udpm_addr_lbl" = id;
"o_channel_name" = id; "o_net_udpm_port" = id;
"o_channel_name_lbl" = id; "o_net_udpm_port_lbl" = id;
"o_display" = id; "o_net_udpm_port_stp" = id;
"o_dump_chkbox" = id; "o_output_ckbox" = id;
"o_file_chkbox" = id; "o_panel" = id;
"o_file_field" = id; "o_playlist" = id;
"o_http_chkbox" = id; "o_screen_fps_fld" = id;
"o_method" = id; "o_screen_fps_stp" = id;
"o_misc_lbl" = id; "o_screen_lbl" = id;
"o_mux_lbl" = id; "o_screen_long_lbl" = id;
"o_mux_selector" = id; "o_screen_view" = id;
"o_open_panel" = id; "o_sout_options" = id;
"o_options_lbl" = id; "o_tabview" = id;
"o_output_ckbox" = id; };
"o_output_settings" = id; SUPERCLASS = NSObject;
"o_output_sheet" = id; },
"o_rtsp_chkbox" = id; {
"o_sap_chkbox" = id; CLASS = VLCOpenTextField;
"o_sdp_url" = id; LANGUAGE = ObjC;
"o_sdp_url_lbl" = id; SUPERCLASS = NSTextField;
"o_stream_address" = id; },
"o_stream_address_lbl" = id; {
"o_stream_port" = id; ACTIONS = {
"o_stream_port_lbl" = id; announceChanged = id;
"o_stream_port_stp" = id; outputChanged = id;
"o_stream_ttl" = id; outputCloseSheet = id;
"o_stream_ttl_lbl" = id; outputFileBrowse = id;
"o_stream_ttl_stp" = id; outputInfoChanged = id;
"o_stream_type" = id; outputMethodChanged = id;
"o_stream_type_lbl" = id; outputSettings = id;
"o_transcode_audio_bitrate" = id; streamPortStepperChanged = id;
"o_transcode_audio_bitrate_lbl" = id; streamTTLStepperChanged = id;
"o_transcode_audio_channels" = id; transcodeChanged = id;
"o_transcode_audio_channels_lbl" = id; transcodeInfoChanged = id;
"o_transcode_audio_chkbox" = id; };
"o_transcode_audio_selector" = id; CLASS = VLCOutput;
"o_transcode_lbl" = id; LANGUAGE = ObjC;
"o_transcode_video_bitrate" = id; OUTLETS = {
"o_transcode_video_bitrate_lbl" = id; "o_btn_browse" = id;
"o_transcode_video_chkbox" = id; "o_btn_ok" = id;
"o_transcode_video_scale" = id; "o_channel_name" = id;
"o_transcode_video_scale_lbl" = id; "o_channel_name_lbl" = id;
"o_transcode_video_selector" = id; "o_display" = id;
}; "o_dump_chkbox" = id;
SUPERCLASS = NSObject; "o_file_chkbox" = id;
}, "o_file_field" = id;
{CLASS = VLCPlaylist; LANGUAGE = ObjC; SUPERCLASS = NSObject; }, "o_http_chkbox" = id;
{CLASS = VLCPlaylistView; LANGUAGE = ObjC; SUPERCLASS = NSOutlineView; }, "o_method" = id;
{ "o_misc_lbl" = id;
ACTIONS = {advancedToggle = id; closePrefs = id; resetAll = id; savePrefs = id; }; "o_mux_lbl" = id;
CLASS = VLCPrefs; "o_mux_selector" = id;
LANGUAGE = ObjC; "o_open_panel" = id;
OUTLETS = { "o_options_lbl" = id;
"o_advanced_ckb" = id; "o_output_ckbox" = id;
"o_cancel_btn" = id; "o_output_settings" = id;
"o_prefs_view" = id; "o_output_sheet" = id;
"o_prefs_window" = id; "o_rtsp_chkbox" = id;
"o_reset_btn" = id; "o_sap_chkbox" = id;
"o_save_btn" = id; "o_sdp_url" = id;
"o_tree" = id; "o_sdp_url_lbl" = id;
}; "o_stream_address" = id;
SUPERCLASS = NSObject; "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; IBVersion = 1;
} }
\ No newline at end of file
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE plist PUBLIC "-//Apple Computer//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> <key>IBDocumentLocation</key>
<string>-8 61 505 517 0 0 800 578 </string> <string>-8 61 505 517 0 0 800 578 </string>
<key>IBEditorPositions</key>
<dict>
<key>2297</key>
<string>366 463 548 183 0 0 1280 778 </string>
<key>2301</key>
<string>646 594 548 183 0 0 1280 778 </string>
<key>2304</key>
<string>427 454 547 183 0 0 1280 778 </string>
<key>2346</key>
<string>366 464 548 183 0 0 1280 778 </string>
</dict>
<key>IBFramework Version</key> <key>IBFramework Version</key>
<string>489.0</string> <string>489.0</string>
<key>IBLockedObjects</key> <key>IBLockedObjects</key>
...@@ -15,9 +26,12 @@ ...@@ -15,9 +26,12 @@
</array> </array>
<key>IBOpenObjects</key> <key>IBOpenObjects</key>
<array> <array>
<integer>2301</integer>
<integer>2297</integer>
<integer>636</integer> <integer>636</integer>
<integer>2346</integer>
</array> </array>
<key>IBSystem Version</key> <key>IBSystem Version</key>
<string>8R3032</string> <string>9D34</string>
</dict> </dict>
</plist> </plist>
...@@ -182,6 +182,7 @@ struct intf_sys_t ...@@ -182,6 +182,7 @@ struct intf_sys_t
IBOutlet id o_mi_open_generic; IBOutlet id o_mi_open_generic;
IBOutlet id o_mi_open_disc; IBOutlet id o_mi_open_disc;
IBOutlet id o_mi_open_net; IBOutlet id o_mi_open_net;
IBOutlet id o_mi_open_capture;
IBOutlet id o_mi_open_recent; IBOutlet id o_mi_open_recent;
IBOutlet id o_mi_open_recent_cm; IBOutlet id o_mi_open_recent_cm;
IBOutlet id o_mi_open_wizard; IBOutlet id o_mi_open_wizard;
...@@ -358,6 +359,7 @@ struct intf_sys_t ...@@ -358,6 +359,7 @@ struct intf_sys_t
- (IBAction)intfOpenFileGeneric:(id)sender; - (IBAction)intfOpenFileGeneric:(id)sender;
- (IBAction)intfOpenDisc:(id)sender; - (IBAction)intfOpenDisc:(id)sender;
- (IBAction)intfOpenNet:(id)sender; - (IBAction)intfOpenNet:(id)sender;
- (IBAction)intfOpenCapture:(id)sender;
- (IBAction)showWizard:(id)sender; - (IBAction)showWizard:(id)sender;
- (IBAction)showExtended:(id)sender; - (IBAction)showExtended:(id)sender;
......
...@@ -673,6 +673,7 @@ static VLCMain *_o_sharedMainInstance = nil; ...@@ -673,6 +673,7 @@ static VLCMain *_o_sharedMainInstance = nil;
[o_mi_open_file setTitle: _NS("Quick Open File...")]; [o_mi_open_file setTitle: _NS("Quick Open File...")];
[o_mi_open_disc setTitle: _NS("Open Disc...")]; [o_mi_open_disc setTitle: _NS("Open Disc...")];
[o_mi_open_net setTitle: _NS("Open Network...")]; [o_mi_open_net setTitle: _NS("Open Network...")];
[o_mi_open_capture setTitle: _NS("Open Capture Device...")];
[o_mi_open_recent setTitle: _NS("Open Recent")]; [o_mi_open_recent setTitle: _NS("Open Recent")];
[o_mi_open_recent_cm setTitle: _NS("Clear Menu")]; [o_mi_open_recent_cm setTitle: _NS("Clear Menu")];
[o_mi_open_wizard setTitle: _NS("Streaming/Exporting Wizard...")]; [o_mi_open_wizard setTitle: _NS("Streaming/Exporting Wizard...")];
...@@ -1910,6 +1911,18 @@ static VLCMain *_o_sharedMainInstance = nil; ...@@ -1910,6 +1911,18 @@ static VLCMain *_o_sharedMainInstance = nil;
} }
} }
- (IBAction)intfOpenCapture:(id)sender
{
if( !nib_open_loaded )
{
nib_open_loaded = [NSBundle loadNibNamed:@"Open" owner:self];
[o_open awakeFromNib];
[o_open openCapture];
} else {
[o_open openCapture];
}
}
- (IBAction)showWizard:(id)sender - (IBAction)showWizard:(id)sender
{ {
if( !nib_wizard_loaded ) if( !nib_wizard_loaded )
......
/***************************************************************************** /*****************************************************************************
* open.h: MacOS X module for vlc * open.h: MacOS X module for vlc
***************************************************************************** *****************************************************************************
* Copyright (C) 2002-2007 the VideoLAN team * Copyright (C) 2002-2008 the VideoLAN team
* $Id$ * $Id$
* *
* Authors: Jon Lech Johansen <jon-vl@nanocrew.net> * Authors: Jon Lech Johansen <jon-vl@nanocrew.net>
...@@ -101,21 +101,34 @@ NSArray *GetEjectableMediaOfClass( const char *psz_class ); ...@@ -101,21 +101,34 @@ NSArray *GetEjectableMediaOfClass( const char *psz_class );
IBOutlet id o_file_sub_font_box; IBOutlet id o_file_sub_font_box;
IBOutlet id o_file_sub_file_box; IBOutlet id o_file_sub_file_box;
/* open eyetv support */ /* generic capturing stuff */
IBOutlet id o_eyetv_tabView; IBOutlet id o_capture_lbl;
IBOutlet id o_capture_long_lbl;
IBOutlet id o_capture_mode_pop;
IBOutlet id o_capture_label_view;
/* eyetv support */
IBOutlet id o_eyetv_notLaunched_view;
IBOutlet id o_eyetv_running_view;
IBOutlet id o_eyetv_channels_pop; IBOutlet id o_eyetv_channels_pop;
IBOutlet id o_eyetv_currentChannel_lbl; IBOutlet id o_eyetv_currentChannel_lbl;
IBOutlet id o_eyetv_chn_status_txt; IBOutlet id o_eyetv_chn_status_txt;
IBOutlet id o_eyetv_chn_bgbar; IBOutlet id o_eyetv_chn_bgbar;
IBOutlet id o_eyetv_launchEyeTV_btn; IBOutlet id o_eyetv_launchEyeTV_btn;
IBOutlet id o_eyetv_nextProgram_btn; IBOutlet id o_eyetv_nextProgram_btn;
IBOutlet id o_eyetv_noDevice_lbl; IBOutlet id o_eyetv_noInstance_lbl;
IBOutlet id o_eyetv_noDeviceLong_lbl; IBOutlet id o_eyetv_noInstanceLong_lbl;
IBOutlet id o_eyetv_noEyeTV_lbl;
IBOutlet id o_eyetv_noEyeTVLong_lbl;
IBOutlet id o_eyetv_previousProgram_btn; IBOutlet id o_eyetv_previousProgram_btn;
/* screen support */
IBOutlet id o_screen_view;
IBOutlet id o_screen_fps_fld;
IBOutlet id o_screen_lbl;
IBOutlet id o_screen_long_lbl;
IBOutlet id o_screen_fps_stp;
BOOL b_autoplay; BOOL b_autoplay;
id o_currentCaptureView;
} }
+ (VLCOpen *)sharedInstance; + (VLCOpen *)sharedInstance;
...@@ -143,6 +156,10 @@ NSArray *GetEjectableMediaOfClass( const char *psz_class ); ...@@ -143,6 +156,10 @@ NSArray *GetEjectableMediaOfClass( const char *psz_class );
- (IBAction)openNetStepperChanged:(id)sender; - (IBAction)openNetStepperChanged:(id)sender;
- (void)openNetInfoChanged:(NSNotification *)o_notification; - (void)openNetInfoChanged:(NSNotification *)o_notification;
- (void)openCapture;
- (void)showCaptureView: theView;
- (IBAction)openCaptureStepperChanged:(id)sender;
- (IBAction)openCaptureModeChanged:(id)sender;
- (IBAction)eyetvSwitchChannel:(id)sender; - (IBAction)eyetvSwitchChannel:(id)sender;
- (IBAction)eyetvLaunch:(id)sender; - (IBAction)eyetvLaunch:(id)sender;
- (void)eyetvChanged:(NSNotification *)o_notification; - (void)eyetvChanged:(NSNotification *)o_notification;
......
/***************************************************************************** /*****************************************************************************
* open.m: MacOS X module for vlc * open.m: MacOS X module for vlc
***************************************************************************** *****************************************************************************
* Copyright (C) 2002-2007 the VideoLAN team * Copyright (C) 2002-2008 the VideoLAN team
* $Id$ * $Id$
* *
* Authors: Jon Lech Johansen <jon-vl@nanocrew.net> * Authors: Jon Lech Johansen <jon-vl@nanocrew.net>
...@@ -45,6 +45,14 @@ ...@@ -45,6 +45,14 @@
#import "output.h" #import "output.h"
#import "eyetv.h" #import "eyetv.h"
#define setEyeTVUnconnected \
[o_capture_lbl setStringValue: _NS("No device connected")]; \
[o_capture_long_lbl setStringValue: _NS("VLC could not detect any EyeTV compatible device.\n\nCheck the device's connection, make sure that the latest EyeTV software is installed and try again.")]; \
[o_capture_lbl displayIfNeeded]; \
[o_capture_long_lbl displayIfNeeded]; \
[self showCaptureView: o_capture_label_view]
/***************************************************************************** /*****************************************************************************
* GetEjectableMediaOfClass * GetEjectableMediaOfClass
*****************************************************************************/ *****************************************************************************/
...@@ -162,6 +170,7 @@ static VLCOpen *_o_sharedMainInstance = nil; ...@@ -162,6 +170,7 @@ static VLCOpen *_o_sharedMainInstance = nil;
[[o_tabview tabViewItemAtIndex: 0] setLabel: _NS("File")]; [[o_tabview tabViewItemAtIndex: 0] setLabel: _NS("File")];
[[o_tabview tabViewItemAtIndex: 1] setLabel: _NS("Disc")]; [[o_tabview tabViewItemAtIndex: 1] setLabel: _NS("Disc")];
[[o_tabview tabViewItemAtIndex: 2] setLabel: _NS("Network")]; [[o_tabview tabViewItemAtIndex: 2] setLabel: _NS("Network")];
[[o_tabview tabViewItemAtIndex: 3] setLabel: _NS("Capture")];
[o_file_btn_browse setTitle: _NS("Browse...")]; [o_file_btn_browse setTitle: _NS("Browse...")];
[o_file_stream setTitle: _NS("Treat as a pipe rather than as a file")]; [o_file_stream setTitle: _NS("Treat as a pipe rather than as a file")];
...@@ -191,8 +200,16 @@ static VLCOpen *_o_sharedMainInstance = nil; ...@@ -191,8 +200,16 @@ static VLCOpen *_o_sharedMainInstance = nil;
[o_net_udp_port_stp setIntValue: config_GetInt( p_intf, "server-port" )]; [o_net_udp_port_stp setIntValue: config_GetInt( p_intf, "server-port" )];
[o_eyetv_chn_bgbar setUsesThreadedAnimation: YES]; [o_eyetv_chn_bgbar setUsesThreadedAnimation: YES];
/* FIXME: implement EyeTV l10n here */
/* FIXME: implement Capturing l10n here completely */
[o_capture_mode_pop removeAllItems];
if( MACOS_VERSION > 10.4f )
[o_capture_mode_pop addItemWithTitle: _NS("iSight")];
[o_capture_mode_pop addItemWithTitle: _NS("Screen")];
[o_capture_mode_pop addItemWithTitle: @"EyeTV"];
[o_screen_lbl setStringValue: _NS("Screen Capture Input")];
[o_screen_long_lbl setStringValue: _NS("This facility allows you to process your screen's output.")];
[self setSubPanel]; [self setSubPanel];
...@@ -235,19 +252,10 @@ static VLCOpen *_o_sharedMainInstance = nil; ...@@ -235,19 +252,10 @@ static VLCOpen *_o_sharedMainInstance = nil;
name: NSControlTextDidChangeNotification name: NSControlTextDidChangeNotification
object: o_net_http_url]; object: o_net_http_url];
/* wake up with the correct EyeTV GUI */ [[NSNotificationCenter defaultCenter] addObserver: self
if( [[[VLCMain sharedInstance] getEyeTVController] isEyeTVrunning] == YES ) selector: @selector(screenFPSChanged:)
{ name: NSControlTextDidChangeNotification
if( [[[VLCMain sharedInstance] getEyeTVController] isDeviceConnected] == YES ) object: o_screen_fps_fld];
{
[o_eyetv_tabView selectTabViewItemWithIdentifier:@"eyetvup"];
[self setupChannelInfo];
}
else
[o_eyetv_tabView selectTabViewItemWithIdentifier:@"nodevice"];
}
else
[o_eyetv_tabView selectTabViewItemWithIdentifier:@"noeyetv"];
[[NSDistributedNotificationCenter defaultCenter] addObserver: self [[NSDistributedNotificationCenter defaultCenter] addObserver: self
selector: @selector(eyetvChanged:) selector: @selector(eyetvChanged:)
...@@ -414,9 +422,9 @@ static VLCOpen *_o_sharedMainInstance = nil; ...@@ -414,9 +422,9 @@ static VLCOpen *_o_sharedMainInstance = nil;
{ {
[self openNetInfoChanged: nil]; [self openNetInfoChanged: nil];
} }
else if( [o_label isEqualToString: _NS("EyeTV")] ) else if( [o_label isEqualToString: _NS("Capture")] )
{ {
[o_mrl setStringValue: @"eyetv://"]; [self openCaptureModeChanged: nil];
} }
} }
...@@ -438,6 +446,13 @@ static VLCOpen *_o_sharedMainInstance = nil; ...@@ -438,6 +446,13 @@ static VLCOpen *_o_sharedMainInstance = nil;
[self openTarget: 2]; [self openTarget: 2];
} }
- (void)openCapture
{
[self openCaptureModeChanged: nil];
[self showCaptureView: o_capture_label_view];
[self openTarget: 3];
}
- (void)openFilePathChanged:(NSNotification *)o_notification - (void)openFilePathChanged:(NSNotification *)o_notification
{ {
NSString *o_mrl_string; NSString *o_mrl_string;
...@@ -801,6 +816,68 @@ static VLCOpen *_o_sharedMainInstance = nil; ...@@ -801,6 +816,68 @@ static VLCOpen *_o_sharedMainInstance = nil;
} }
} }
- (void)showCaptureView: theView
{
NSRect o_view_rect;
o_view_rect = [theView frame];
if( o_currentCaptureView )
{
[o_currentCaptureView removeFromSuperviewWithoutNeedingDisplay];
[o_currentCaptureView release];
}
[theView setFrame: NSMakeRect( 0, 10, o_view_rect.size.width, o_view_rect.size.height)];
[theView setNeedsDisplay: YES];
[theView setAutoresizesSubviews: YES];
[[[o_tabview tabViewItemAtIndex: 3] view] addSubview: theView];
[theView displayIfNeeded];
o_currentCaptureView = theView;
[o_currentCaptureView retain];
}
- (IBAction)openCaptureModeChanged:(id)sender
{
if( [[[o_capture_mode_pop selectedItem] title] isEqualToString: @"EyeTV"] )
{
if( [[[VLCMain sharedInstance] getEyeTVController] isEyeTVrunning] == YES )
{
if( [[[VLCMain sharedInstance] getEyeTVController] isDeviceConnected] == YES )
{
[self showCaptureView: o_eyetv_running_view];
[self setupChannelInfo];
}
else
{
setEyeTVUnconnected;
}
}
else
[self showCaptureView: o_eyetv_notLaunched_view];
[o_mrl setStringValue: @""];
}
else if( [[[o_capture_mode_pop selectedItem] title] isEqualToString: @"Screen"] )
{
[self showCaptureView: o_screen_view];
[o_mrl setStringValue: [NSString stringWithFormat:@"screen:// :screen-fps=%@", [o_screen_fps_fld stringValue]]];
}
else if( [[[o_capture_mode_pop selectedItem] title] isEqualToString: @"iSight"] )
{
[o_capture_lbl setStringValue: _NS("iSight Capture Input")];
[o_capture_long_lbl setStringValue: _NS("This facility allows you to process your iSight's input signal.\n\nNo settings are available in this version, so you will be provided a 640px*480px raw video stream.\n\nLive Audio input is not supported.")];
[o_capture_lbl displayIfNeeded];
[o_capture_long_lbl displayIfNeeded];
[self showCaptureView: o_capture_label_view];
[o_mrl setStringValue: @"qtcapture://"];
}
}
- (IBAction)openCaptureStepperChanged:(id)sender
{
[o_screen_fps_fld setIntValue: [o_screen_fps_stp intValue]];
[o_panel makeFirstResponder: o_screen_fps_fld];
[o_mrl setStringValue: [NSString stringWithFormat:@"screen:// :screen-fps=%@", [o_screen_fps_fld stringValue]]];
}
- (IBAction)eyetvSwitchChannel:(id)sender - (IBAction)eyetvSwitchChannel:(id)sender
{ {
if( sender == o_eyetv_nextProgram_btn ) if( sender == o_eyetv_nextProgram_btn )
...@@ -835,7 +912,7 @@ static VLCOpen *_o_sharedMainInstance = nil; ...@@ -835,7 +912,7 @@ static VLCOpen *_o_sharedMainInstance = nil;
if( [[o_notification name] isEqualToString: @"DeviceAdded"] ) if( [[o_notification name] isEqualToString: @"DeviceAdded"] )
{ {
msg_Dbg( VLCIntf, "eyetv device was added" ); msg_Dbg( VLCIntf, "eyetv device was added" );
[o_eyetv_tabView selectTabViewItemWithIdentifier:@"eyetvup"]; [self showCaptureView: o_eyetv_running_view];
[self setupChannelInfo]; [self setupChannelInfo];
} }
else if( [[o_notification name] isEqualToString: @"DeviceRemoved"] ) else if( [[o_notification name] isEqualToString: @"DeviceRemoved"] )
...@@ -843,19 +920,19 @@ static VLCOpen *_o_sharedMainInstance = nil; ...@@ -843,19 +920,19 @@ static VLCOpen *_o_sharedMainInstance = nil;
/* leave the channel selection like that, /* leave the channel selection like that,
* switch to our "no device" tab */ * switch to our "no device" tab */
msg_Dbg( VLCIntf, "eyetv device was removed" ); msg_Dbg( VLCIntf, "eyetv device was removed" );
[o_eyetv_tabView selectTabViewItemWithIdentifier:@"nodevice"]; setEyeTVUnconnected;
} }
else if( [[o_notification name] isEqualToString: @"PluginQuit"] ) else if( [[o_notification name] isEqualToString: @"PluginQuit"] )
{ {
/* switch to the "launch eyetv" tab */ /* switch to the "launch eyetv" tab */
msg_Dbg( VLCIntf, "eyetv was terminated" ); msg_Dbg( VLCIntf, "eyetv was terminated" );
[o_eyetv_tabView selectTabViewItemWithIdentifier:@"noeyetv"]; [self showCaptureView: o_eyetv_notLaunched_view];
} }
else if( [[o_notification name] isEqualToString: @"PluginInit"] ) else if( [[o_notification name] isEqualToString: @"PluginInit"] )
{ {
/* we got no device yet */ /* we got no device yet */
msg_Dbg( VLCIntf, "eyetv was launched, no device yet" ); msg_Dbg( VLCIntf, "eyetv was launched, no device yet" );
[o_eyetv_tabView selectTabViewItemWithIdentifier:@"nodevice"]; setEyeTVUnconnected;
} }
else else
msg_Warn( VLCIntf, "unknown external notify '%s' received", [[o_notification name] UTF8String] ); msg_Warn( VLCIntf, "unknown external notify '%s' received", [[o_notification name] UTF8String] );
......
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