Skip to content

V
vlc
Commit 621be0e2 authored by Felix Paul Kühne's avatar Felix Paul Kühne
Browse files
Options

macosx: backport [b20a12f3], updated news

parent 4d0438ba
Show whitespace changes
Inline Side-by-side
Showing with 634 additions and 310 deletions
NEWS
View file @ 621be0e2
......@@ -5,8 +5,16 @@ Decoders:
* Fix issues in subtitles, especially SSA ones
* Various fixes on theora and ogg
Mac OS:
* Fix a crash when updating VLC
Mac OS X Interface:
* Fixed a crash when updating VLC
* Added the ability to play 2nd media in sync to the primary item (input-slave)
* Added the "Quit after Playback" feature
Mac OS X Port:
* Full 64bit runtime compatibility on both Mac OS X 10.5 and 10.6
- no support for Goom and SDL
- limited text rendering support
- This port is still considered as EXPERIMENTAL despite its binary release.
Changes between 1.0.0 and 1.0.1:
......
extras/package/macosx/Resources/English.lproj/Open.nib/classes.nib
View file @ 621be0e2
{
IBClasses = (
{
CLASS = FirstResponder;
LANGUAGE = ObjC;
SUPERCLASS = NSObject;
},
{
CLASS = NSApplication;
LANGUAGE = ObjC;
SUPERCLASS = NSResponder;
},
{
CLASS = NSObject;
LANGUAGE = ObjC;
},
{
ACTIONS = {
expandMRLfieldAction = id;
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;
openNetUDPButtonAction = 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_currentCaptureView" = 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_btn" = id;
"o_mrl_lbl" = id;
"o_mrl_view" = id;
"o_net_help_lbl" = id;
"o_net_help_udp_lbl" = id;
"o_net_http_url" = id;
"o_net_http_url_lbl" = id;
"o_net_mode" = id;
"o_net_openUDP_btn" = id;
"o_net_udp_address_lbl" = id;
"o_net_udp_cancel_btn" = id;
"o_net_udp_mode_lbl" = id;
"o_net_udp_ok_btn" = id;
"o_net_udp_panel" = id;
"o_net_udp_port" = id;
"o_net_udp_port_lbl" = id;
"o_net_udp_port_stp" = id;
"o_net_udp_protocol_lbl" = id;
"o_net_udp_protocol_mat" = 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_ckb" = 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_height_stp" = id;
"o_screen_lbl" = id;
"o_screen_left_fld" = id;
"o_screen_left_lbl" = id;
"o_screen_left_stp" = id;
"o_screen_long_lbl" = id;
"o_screen_top_fld" = id;
"o_screen_top_lbl" = id;
"o_screen_top_stp" = id;
"o_screen_view" = id;
"o_screen_width_fld" = id;
"o_screen_width_lbl" = id;
"o_screen_width_stp" = 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;
},
{
ACTIONS = {
addNode = id;
deleteItem = id;
downloadCoverArt = id;
playItem = id;
preparseItem = id;
recursiveExpandNode = id;
revealItemInFinder = id;
savePlaylist = id;
searchItem = id;
selectAll = id;
servicesChange = id;
sortNodeByAuthor = id;
sortNodeByName = id;
};
CLASS = VLCPlaylist;
LANGUAGE = ObjC;
OUTLETS = {
"o_btn_addNode" = id;
"o_btn_playlist" = id;
"o_controller" = id;
"o_ctx_menu" = id;
"o_mi_addNode" = id;
"o_mi_delete" = id;
"o_mi_dl_cover_art" = id;
"o_mi_info" = id;
"o_mi_play" = id;
"o_mi_preparse" = id;
"o_mi_recursive_expand" = id;
"o_mi_revealInFinder" = id;
"o_mi_save_playlist" = id;
"o_mi_selectall" = id;
"o_mi_services" = id;
"o_mi_sort_author" = id;
"o_mi_sort_name" = id;
"o_mm_mi_revealInFinder" = id;
"o_mm_mi_services" = id;
"o_mm_mu_services" = id;
"o_mu_services" = id;
"o_playlist_view" = id;
"o_playlist_wizard" = id;
"o_save_accessory_popup" = id;
"o_save_accessory_text" = id;
"o_save_accessory_view" = id;
"o_search_field" = id;
"o_status_field" = id;
"o_tc_sortColumn" = id;
};
SUPERCLASS = VLCPlaylistCommon;
},
{
CLASS = VLCPlaylistCommon;
LANGUAGE = ObjC;
OUTLETS = {
"o_outline_view" = id;
"o_tc_author" = id;
"o_tc_duration" = id;
"o_tc_name" = 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>expandMRLfieldAction</key>
<string>id</string>
<key>eyetvGetPlugin</key>
<string>id</string>
<key>eyetvLaunch</key>
<string>id</string>
<key>eyetvSwitchChannel</key>
<string>id</string>
<key>inputSlaveAction</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>openNetUDPButtonAction</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_currentCaptureView</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_slave_ckbox</key>
<string>id</string>
<key>o_file_slave_filename_txt</key>
<string>id</string>
<key>o_file_slave_select_btn</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_btn</key>
<string>id</string>
<key>o_mrl_lbl</key>
<string>id</string>
<key>o_mrl_view</key>
<string>id</string>
<key>o_net_help_lbl</key>
<string>id</string>
<key>o_net_help_udp_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_openUDP_btn</key>
<string>id</string>
<key>o_net_udp_address_lbl</key>
<string>id</string>
<key>o_net_udp_cancel_btn</key>
<string>id</string>
<key>o_net_udp_mode_lbl</key>
<string>id</string>
<key>o_net_udp_ok_btn</key>
<string>id</string>
<key>o_net_udp_panel</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_udp_protocol_lbl</key>
<string>id</string>
<key>o_net_udp_protocol_mat</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_ckb</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_height_stp</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_left_stp</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_top_stp</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_screen_width_stp</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>VLCPlaylistCommon</string>
<key>LANGUAGE</key>
<string>ObjC</string>
<key>OUTLETS</key>
<dict>
<key>o_outline_view</key>
<string>id</string>
<key>o_tc_author</key>
<string>id</string>
<key>o_tc_duration</key>
<string>id</string>
<key>o_tc_name</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>CLASS</key>
<string>NSApplication</string>
<key>LANGUAGE</key>
<string>ObjC</string>
<key>SUPERCLASS</key>
<string>NSResponder</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>NSObject</string>
<key>LANGUAGE</key>
<string>ObjC</string>
</dict>
<dict>
<key>ACTIONS</key>
<dict>
<key>addNode</key>
<string>id</string>
<key>deleteItem</key>
<string>id</string>
<key>downloadCoverArt</key>
<string>id</string>
<key>playItem</key>
<string>id</string>
<key>preparseItem</key>
<string>id</string>
<key>recursiveExpandNode</key>
<string>id</string>
<key>revealItemInFinder</key>
<string>id</string>
<key>savePlaylist</key>
<string>id</string>
<key>searchItem</key>
<string>id</string>
<key>selectAll</key>
<string>id</string>
<key>servicesChange</key>
<string>id</string>
<key>sortNodeByAuthor</key>
<string>id</string>
<key>sortNodeByName</key>
<string>id</string>
</dict>
<key>CLASS</key>
<string>VLCPlaylist</string>
<key>LANGUAGE</key>
<string>ObjC</string>
<key>OUTLETS</key>
<dict>
<key>o_btn_addNode</key>
<string>id</string>
<key>o_btn_playlist</key>
<string>id</string>
<key>o_controller</key>
<string>id</string>
<key>o_ctx_menu</key>
<string>id</string>
<key>o_mi_addNode</key>
<string>id</string>
<key>o_mi_delete</key>
<string>id</string>
<key>o_mi_dl_cover_art</key>
<string>id</string>
<key>o_mi_info</key>
<string>id</string>
<key>o_mi_play</key>
<string>id</string>
<key>o_mi_preparse</key>
<string>id</string>
<key>o_mi_recursive_expand</key>
<string>id</string>
<key>o_mi_revealInFinder</key>
<string>id</string>
<key>o_mi_save_playlist</key>
<string>id</string>
<key>o_mi_selectall</key>
<string>id</string>
<key>o_mi_services</key>
<string>id</string>
<key>o_mi_sort_author</key>
<string>id</string>
<key>o_mi_sort_name</key>
<string>id</string>
<key>o_mm_mi_revealInFinder</key>
<string>id</string>
<key>o_mm_mi_services</key>
<string>id</string>
<key>o_mm_mu_services</key>
<string>id</string>
<key>o_mu_services</key>
<string>id</string>
<key>o_playlist_view</key>
<string>id</string>
<key>o_playlist_wizard</key>
<string>id</string>
<key>o_save_accessory_popup</key>
<string>id</string>
<key>o_save_accessory_text</key>
<string>id</string>
<key>o_save_accessory_view</key>
<string>id</string>
<key>o_search_field</key>
<string>id</string>
<key>o_status_field</key>
<string>id</string>
<key>o_tc_sortColumn</key>
<string>id</string>
</dict>
<key>SUPERCLASS</key>
<string>VLCPlaylistCommon</string>
</dict>
</array>
<key>IBVersion</key>
<string>1</string>
</dict>
</plist>
extras/package/macosx/Resources/English.lproj/Open.nib/info.nib
View file @ 621be0e2
......@@ -2,31 +2,22 @@
<!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>129 203 356 240 0 0 1280 778 </string>
<key>IBEditorPositions</key>
<dict>
<key>2297</key>
<string>366 401 548 264 0 0 1280 778 </string>
<key>2346</key>
<string>366 401 548 264 0 0 1280 778 </string>
<key>2837</key>
<string>353 528 573 94 0 0 1280 778 </string>
</dict>
<key>IBFramework Version</key>
<string>489.0</string>
<string>677</string>
<key>IBLastKnownRelativeProjectPath</key>
<string>../../vlc.xcodeproj</string>
<key>IBOldestOS</key>
<integer>5</integer>
<key>IBOpenObjects</key>
<array>
<integer>2792</integer>
<integer>636</integer>
<integer>2297</integer>
<integer>2837</integer>
<integer>636</integer>
<integer>2346</integer>
<integer>2297</integer>
<integer>2792</integer>
</array>
<key>IBSystem Version</key>
<string>9G55</string>
<string>9L30</string>
<key>targetFramework</key>
<string>IBCocoaFramework</string>
</dict>
......
modules/gui/macosx/open.h
View file @ 621be0e2
......@@ -44,6 +44,7 @@ NSArray *GetEjectableMediaOfClass( const char *psz_class );
IBOutlet id o_btn_ok;
IBOutlet id o_btn_cancel;
/* bottom-line items */
IBOutlet id o_output_ckbox;
IBOutlet id o_sout_options;
......@@ -51,6 +52,9 @@ NSArray *GetEjectableMediaOfClass( const char *psz_class );
IBOutlet id o_file_path;
IBOutlet id o_file_btn_browse;
IBOutlet id o_file_stream;
IBOutlet id o_file_slave_ckbox;
IBOutlet id o_file_slave_select_btn;
IBOutlet id o_file_slave_filename_txt;
/* open disc */
IBOutlet id o_disc_type;
......@@ -157,6 +161,7 @@ NSArray *GetEjectableMediaOfClass( const char *psz_class );
BOOL b_autoplay;
id o_currentCaptureView;
NSString *o_file_slave_path;
intf_thread_t * p_intf;
}
......@@ -167,6 +172,7 @@ NSArray *GetEjectableMediaOfClass( const char *psz_class );
- (void)tabView:(NSTabView *)o_tv didSelectTabViewItem:(NSTabViewItem *)o_tvi;
- (void)textFieldWasClicked:(NSNotification *)o_notification;
- (IBAction)expandMRLfieldAction:(id)sender;
- (IBAction)inputSlaveAction:(id)sender;
- (void)openFileGeneric;
- (void)openFilePathChanged:(NSNotification *)o_notification;
......
modules/gui/macosx/open.m
View file @ 621be0e2
......@@ -160,6 +160,13 @@ static VLCOpen *_o_sharedMainInstance = nil;
return _o_sharedMainInstance;
}
- (void)dealloc
{
if( o_file_slave_path )
[o_file_slave_path release];
[super dealloc];
}
- (void)awakeFromNib
{
[o_panel setTitle: _NS("Open Source")];
......@@ -175,6 +182,9 @@ static VLCOpen *_o_sharedMainInstance = nil;
[o_file_btn_browse setTitle: _NS("Browse...")];
[o_file_stream setTitle: _NS("Treat as a pipe rather than as a file")];
[o_file_slave_ckbox setTitle: _NS("Play another media synchronously")];
[o_file_slave_select_btn setTitle: _NS("Choose...")];
[o_file_slave_filename_txt setStringValue: @""];
[o_disc_device_lbl setStringValue: _NS("Device name")];
[o_disc_title_lbl setStringValue: _NS("Title")];
......@@ -409,6 +419,8 @@ static VLCOpen *_o_sharedMainInstance = nil;
[[(VLCOutput *)o_sout_options mrl] objectAtIndex: i]]];
}
}
if( [o_file_slave_ckbox state] && o_file_slave_path )
[o_options addObject: [NSString stringWithFormat: @"input-slave=%@", o_file_slave_path]];
if( [[[o_tabview selectedTabViewItem] label] isEqualToString: _NS("Capture")] )
{
if( [[[o_capture_mode_pop selectedItem] title] isEqualToString: _NS("Screen")] )
......@@ -486,6 +498,35 @@ static VLCOpen *_o_sharedMainInstance = nil;
[o_panel displayIfNeeded];
}
- (IBAction)inputSlaveAction:(id)sender
{
if( sender == o_file_slave_ckbox )
[o_file_slave_select_btn setEnabled: [o_file_slave_ckbox state]];
else
{
NSOpenPanel *o_open_panel;
o_open_panel = [NSOpenPanel openPanel];
[o_open_panel setCanChooseFiles: YES];
[o_open_panel setCanChooseDirectories: NO];
if( [o_open_panel runModalForDirectory: nil file: nil types: nil] == NSOKButton )
{
if( o_file_slave_path )
[o_file_slave_path release];
o_file_slave_path = [[o_open_panel filenames] objectAtIndex: 0];
[o_file_slave_path retain];
}
else
[o_file_slave_filename_txt setStringValue: @""];
}
if( o_file_slave_path )
{
NSFileWrapper *o_file_wrapper;
o_file_wrapper = [[NSFileWrapper alloc] initWithPath: o_file_slave_path];
[o_file_slave_filename_txt setStringValue: [NSString stringWithFormat: @"\"%@\"", [o_file_wrapper preferredFilename]]];
[o_file_wrapper release];
}
}
- (void)openFileGeneric
{
[self openFilePathChanged: nil];
......
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