Skip to content

V
vlc-gpu
Commit 4168ec37 authored by Pierre d'Herbemont's avatar Pierre d'Herbemont
Browse files
Options

macosx: Remove VLCEmbeddedDetachedVout because it's not used. (Or at leat... 

macosx: Remove VLCEmbeddedDetachedVout because it's not used. (Or at leat doesn't bring more than its superclass).
parent fd964450
Hide whitespace changes
Inline Side-by-side
Showing with 873 additions and 520 deletions
extras/package/macosx/Resources/English.lproj/MainMenu.nib/classes.nib
View file @ 4168ec37
{ <?xml version="1.0" encoding="UTF-8"?>
IBClasses = ( <!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
{ <plist version="1.0">
CLASS = FirstResponder; <dict>
LANGUAGE = ObjC; <key>IBClasses</key>
SUPERCLASS = NSObject; <array>
}, <dict>
{ <key>CLASS</key>
CLASS = ITSlider; <string>VLCTimeField</string>
LANGUAGE = ObjC; <key>LANGUAGE</key>
SUPERCLASS = NSSlider; <string>ObjC</string>
}, <key>SUPERCLASS</key>
{ <string>NSTextField</string>
CLASS = MPSlider; </dict>
LANGUAGE = ObjC; <dict>
SUPERCLASS = NSSlider; <key>CLASS</key>
}, <string>VLCControllerView</string>
{ <key>LANGUAGE</key>
CLASS = NSApplication; <string>ObjC</string>
LANGUAGE = ObjC; <key>SUPERCLASS</key>
SUPERCLASS = NSResponder; <string>NSView</string>
}, </dict>
{ <dict>
CLASS = NSObject; <key>CLASS</key>
LANGUAGE = ObjC; <string>VLCEmbeddedWindow</string>
}, <key>LANGUAGE</key>
{ <string>ObjC</string>
CLASS = VLBrushedMetalImageView; <key>OUTLETS</key>
LANGUAGE = ObjC; <dict>
SUPERCLASS = NSImageView; <key>o_btn_backward</key>
}, <string>id</string>
{ <key>o_btn_forward</key>
ACTIONS = { <string>id</string>
add = id; <key>o_btn_fullscreen</key>
clear = id; <string>id</string>
edit = id; <key>o_btn_play</key>
"edit_cancel" = id; <string>id</string>
"edit_ok" = id; <key>o_slider</key>
extract = id; <string>id</string>
goToBookmark = id; <key>o_time</key>
remove = id; <string>id</string>
}; <key>o_view</key>
CLASS = VLCBookmarks; <string>id</string>
LANGUAGE = ObjC; </dict>
OUTLETS = { <key>SUPERCLASS</key>
"o_bookmarks_window" = id; <string>NSWindow</string>
"o_btn_add" = id; </dict>
"o_btn_clear" = id; <dict>
"o_btn_edit" = id; <key>CLASS</key>
"o_btn_extract" = id; <string>VLCPlaylistCommon</string>
"o_btn_rm" = id; <key>LANGUAGE</key>
"o_edit_btn_cancel" = id; <string>ObjC</string>
"o_edit_btn_ok" = id; <key>OUTLETS</key>
"o_edit_fld_bytes" = id; <dict>
"o_edit_fld_name" = id; <key>o_outline_view</key>
"o_edit_fld_time" = id; <string>id</string>
"o_edit_lbl_bytes" = id; <key>o_tc_author</key>
"o_edit_lbl_name" = id; <string>id</string>
"o_edit_lbl_time" = id; <key>o_tc_duration</key>
"o_edit_window" = id; <string>id</string>
"o_tbl_dataTable" = id; <key>o_tc_name</key>
}; <string>id</string>
SUPERCLASS = NSObject; </dict>
}, <key>SUPERCLASS</key>
{ <string>NSObject</string>
CLASS = VLCControllerView; </dict>
LANGUAGE = ObjC; <dict>
SUPERCLASS = NSView; <key>ACTIONS</key>
}, <dict>
{ <key>checkForUpdate</key>
CLASS = VLCControllerWindow; <string>id</string>
LANGUAGE = ObjC; <key>clearRecentItems</key>
SUPERCLASS = NSWindow; <string>id</string>
}, <key>intfOpenCapture</key>
{ <string>id</string>
ACTIONS = { <key>intfOpenDisc</key>
backward = id; <string>id</string>
faster = id; <key>intfOpenFile</key>
forward = id; <string>id</string>
goToSpecificTime = id; <key>intfOpenFileGeneric</key>
loop = id; <string>id</string>
mute = id; <key>intfOpenNet</key>
next = id; <string>id</string>
pause = id; <key>openCrashLog</key>
play = id; <string>id</string>
position = id; <key>openDocumentation</key>
prev = id; <string>id</string>
random = id; <key>openDonate</key>
repeat = id; <string>id</string>
repeatButtonAction = id; <key>openForum</key>
showPosition = id; <string>id</string>
slower = id; <key>openReadMe</key>
stop = id; <string>id</string>
toggleVar = id; <key>openRecentItem</key>
toogleFullscreen = id; <string>id</string>
volumeDown = id; <key>openWebsite</key>
volumeSliderUpdated = id; <string>id</string>
volumeUp = id; <key>showBookmarks</key>
windowAction = id; <string>id</string>
}; <key>showExtended</key>
CLASS = VLCControls; <string>id</string>
LANGUAGE = ObjC; <key>showInformationPanel</key>
OUTLETS = { <string>id</string>
"o_btn_addNode" = id; <key>showLicense</key>
"o_btn_repeat" = id; <string>id</string>
"o_btn_shuffle" = id; <key>showMessagesPanel</key>
"o_fs_panel" = id; <string>id</string>
"o_main" = id; <key>showWizard</key>
"o_specificTime_cancel_btn" = id; <string>id</string>
"o_specificTime_enter_fld" = id; <key>timesliderUpdate</key>
"o_specificTime_goTo_lbl" = id; <string>id</string>
"o_specificTime_mi" = id; <key>togglePlaylist</key>
"o_specificTime_ok_btn" = id; <string>id</string>
"o_specificTime_sec_lbl" = id; <key>viewAbout</key>
"o_specificTime_stepper" = id; <string>id</string>
"o_specificTime_win" = id; <key>viewErrorsAndWarnings</key>
"o_volumeslider" = id; <string>id</string>
}; <key>viewHelp</key>
SUPERCLASS = NSObject; <string>id</string>
}, <key>viewPreferences</key>
{ <string>id</string>
CLASS = VLCDetachedEmbeddedVoutView; </dict>
LANGUAGE = ObjC; <key>CLASS</key>
OUTLETS = { <string>VLCMain</string>
"o_embeddedwindow" = id; <key>LANGUAGE</key>
}; <string>ObjC</string>
SUPERCLASS = VLCEmbeddedVoutView; <key>OUTLETS</key>
}, <dict>
{ <key>o_about</key>
CLASS = VLCEmbeddedVoutView; <string>id</string>
LANGUAGE = ObjC; <key>o_bookmarks</key>
SUPERCLASS = VLCVoutView; <string>id</string>
}, <key>o_btn_equalizer</key>
{ <string>id</string>
CLASS = VLCEmbeddedWindow; <key>o_btn_ff</key>
LANGUAGE = ObjC; <string>id</string>
OUTLETS = { <key>o_btn_fullscreen</key>
"o_btn_backward" = id; <string>id</string>
"o_btn_forward" = id; <key>o_btn_next</key>
"o_btn_fullscreen" = id; <string>id</string>
"o_btn_play" = id; <key>o_btn_play</key>
"o_slider" = id; <string>id</string>
"o_time" = id; <key>o_btn_playlist</key>
"o_view" = id; <string>id</string>
}; <key>o_btn_prev</key>
SUPERCLASS = NSWindow; <string>id</string>
}, <key>o_btn_rewind</key>
{ <string>id</string>
ACTIONS = { <key>o_btn_stop</key>
bandSliderUpdated = id; <string>id</string>
changePreset = id; <key>o_controls</key>
enable = id; <string>id</string>
preampSliderUpdated = id; <key>o_dmi_mute</key>
toggleWindow = id; <string>id</string>
twopass = id; <key>o_dmi_next</key>
}; <string>id</string>
CLASS = VLCEqualizer; <key>o_dmi_play</key>
LANGUAGE = ObjC; <string>id</string>
OUTLETS = { <key>o_dmi_previous</key>
"o_btn_equalizer" = id; <string>id</string>
"o_ckb_2pass" = id; <key>o_dmi_stop</key>
"o_ckb_enable" = id; <string>id</string>
"o_fld_preamp" = id; <key>o_embedded_list</key>
"o_popup_presets" = id; <string>id</string>
"o_slider_band1" = id; <key>o_embedded_window</key>
"o_slider_band10" = id; <string>id</string>
"o_slider_band2" = id; <key>o_extended</key>
"o_slider_band3" = id; <string>id</string>
"o_slider_band4" = id; <key>o_eyetv</key>
"o_slider_band5" = id; <string>id</string>
"o_slider_band6" = id; <key>o_info</key>
"o_slider_band7" = id; <string>id</string>
"o_slider_band8" = id; <key>o_interaction_list</key>
"o_slider_band9" = id; <string>id</string>
"o_slider_preamp" = id; <key>o_main_pgbar</key>
"o_window" = id; <string>id</string>
}; <key>o_messages</key>
SUPERCLASS = NSObject; <string>id</string>
}, <key>o_mi_about</key>
{ <string>id</string>
CLASS = VLCFSPanel; <key>o_mi_add_intf</key>
LANGUAGE = ObjC; <string>id</string>
SUPERCLASS = NSWindow; <key>o_mi_aspect_ratio</key>
}, <string>id</string>
{ <key>o_mi_audiotrack</key>
ACTIONS = { <string>id</string>
checkForUpdate = id; <key>o_mi_bookmarks</key>
clearRecentItems = id; <string>id</string>
intfOpenCapture = id; <key>o_mi_bring_atf</key>
intfOpenDisc = id; <string>id</string>
intfOpenFile = id; <key>o_mi_bwd</key>
intfOpenFileGeneric = id; <string>id</string>
intfOpenNet = id; <key>o_mi_bwd1m</key>
openCrashLog = id; <string>id</string>
openDocumentation = id; <key>o_mi_bwd5m</key>
openDonate = id; <string>id</string>
openForum = id; <key>o_mi_channels</key>
openReadMe = id; <string>id</string>
openRecentItem = id; <key>o_mi_chapter</key>
openWebsite = id; <string>id</string>
showBookmarks = id; <key>o_mi_checkForUpdate</key>
showExtended = id; <string>id</string>
showInformationPanel = id; <key>o_mi_clear</key>
showLicense = id; <string>id</string>
showMessagesPanel = id; <key>o_mi_close_window</key>
showWizard = id; <string>id</string>
timesliderUpdate = id; <key>o_mi_controller</key>
togglePlaylist = id; <string>id</string>
viewAbout = id; <key>o_mi_copy</key>
viewErrorsAndWarnings = id; <string>id</string>
viewHelp = id; <key>o_mi_crop</key>
viewPreferences = id; <string>id</string>
}; <key>o_mi_cut</key>
CLASS = VLCMain; <string>id</string>
LANGUAGE = ObjC; <key>o_mi_deinterlace</key>
OUTLETS = { <string>id</string>
"o_about" = id; <key>o_mi_device</key>
"o_bookmarks" = id; <string>id</string>
"o_btn_equalizer" = id; <key>o_mi_documentation</key>
"o_btn_ff" = id; <string>id</string>
"o_btn_fullscreen" = id; <key>o_mi_donation</key>
"o_btn_next" = id; <string>id</string>
"o_btn_play" = id; <key>o_mi_double_window</key>
"o_btn_playlist" = id; <string>id</string>
"o_btn_prev" = id; <key>o_mi_equalizer</key>
"o_btn_rewind" = id; <string>id</string>
"o_btn_stop" = id; <key>o_mi_errorsAndWarnings</key>
"o_controls" = id; <string>id</string>
"o_dmi_mute" = id; <key>o_mi_extended</key>
"o_dmi_next" = id; <string>id</string>
"o_dmi_play" = id; <key>o_mi_faster</key>
"o_dmi_previous" = id; <string>id</string>
"o_dmi_stop" = id; <key>o_mi_ffmpeg_pp</key>
"o_embedded_list" = id; <string>id</string>
"o_embedded_window" = id; <key>o_mi_fittoscreen</key>
"o_extended" = id; <string>id</string>
"o_eyetv" = id; <key>o_mi_floatontop</key>
"o_info" = id; <string>id</string>
"o_interaction_list" = id; <key>o_mi_forum</key>
"o_main_pgbar" = id; <string>id</string>
"o_messages" = id; <key>o_mi_fullscreen</key>
"o_mi_about" = id; <string>id</string>
"o_mi_add_intf" = id; <key>o_mi_fwd</key>
"o_mi_aspect_ratio" = id; <string>id</string>
"o_mi_audiotrack" = id; <key>o_mi_fwd1m</key>
"o_mi_bookmarks" = id; <string>id</string>
"o_mi_bring_atf" = id; <key>o_mi_fwd5m</key>
"o_mi_bwd" = id; <string>id</string>
"o_mi_bwd1m" = id; <key>o_mi_half_window</key>
"o_mi_bwd5m" = id; <string>id</string>
"o_mi_channels" = id; <key>o_mi_help</key>
"o_mi_chapter" = id; <string>id</string>
"o_mi_checkForUpdate" = id; <key>o_mi_hide</key>
"o_mi_clear" = id; <string>id</string>
"o_mi_close_window" = id; <key>o_mi_hide_others</key>
"o_mi_controller" = id; <string>id</string>
"o_mi_copy" = id; <key>o_mi_info</key>
"o_mi_crop" = id; <string>id</string>
"o_mi_cut" = id; <key>o_mi_license</key>
"o_mi_deinterlace" = id; <string>id</string>
"o_mi_device" = id; <key>o_mi_loop</key>
"o_mi_documentation" = id; <string>id</string>
"o_mi_donation" = id; <key>o_mi_messages</key>
"o_mi_double_window" = id; <string>id</string>
"o_mi_equalizer" = id; <key>o_mi_minimize</key>
"o_mi_errorsAndWarnings" = id; <string>id</string>
"o_mi_extended" = id; <key>o_mi_mute</key>
"o_mi_faster" = id; <string>id</string>
"o_mi_ffmpeg_pp" = id; <key>o_mi_next</key>
"o_mi_fittoscreen" = id; <string>id</string>
"o_mi_floatontop" = id; <key>o_mi_normal_window</key>
"o_mi_forum" = id; <string>id</string>
"o_mi_fullscreen" = id; <key>o_mi_open_capture</key>
"o_mi_fwd" = id; <string>id</string>
"o_mi_fwd1m" = id; <key>o_mi_open_disc</key>
"o_mi_fwd5m" = id; <string>id</string>
"o_mi_half_window" = id; <key>o_mi_open_file</key>
"o_mi_help" = id; <string>id</string>
"o_mi_hide" = id; <key>o_mi_open_generic</key>
"o_mi_hide_others" = id; <string>id</string>
"o_mi_info" = id; <key>o_mi_open_net</key>
"o_mi_license" = id; <string>id</string>
"o_mi_loop" = id; <key>o_mi_open_recent</key>
"o_mi_messages" = id; <string>id</string>
"o_mi_minimize" = id; <key>o_mi_open_recent_cm</key>
"o_mi_mute" = id; <string>id</string>
"o_mi_next" = id; <key>o_mi_open_wizard</key>
"o_mi_normal_window" = id; <string>id</string>
"o_mi_open_capture" = id; <key>o_mi_paste</key>
"o_mi_open_disc" = id; <string>id</string>
"o_mi_open_file" = id; <key>o_mi_play</key>
"o_mi_open_generic" = id; <string>id</string>
"o_mi_open_net" = id; <key>o_mi_playlist</key>
"o_mi_open_recent" = id; <string>id</string>
"o_mi_open_recent_cm" = id; <key>o_mi_prefs</key>
"o_mi_open_wizard" = id; <string>id</string>
"o_mi_paste" = id; <key>o_mi_previous</key>
"o_mi_play" = id; <string>id</string>
"o_mi_playlist" = id; <key>o_mi_program</key>
"o_mi_prefs" = id; <string>id</string>
"o_mi_previous" = id; <key>o_mi_quit</key>
"o_mi_program" = id; <string>id</string>
"o_mi_quit" = id; <key>o_mi_random</key>
"o_mi_random" = id; <string>id</string>
"o_mi_readme" = id; <key>o_mi_readme</key>
"o_mi_repeat" = id; <string>id</string>
"o_mi_screen" = id; <key>o_mi_repeat</key>
"o_mi_select_all" = id; <string>id</string>
"o_mi_services" = id; <key>o_mi_screen</key>
"o_mi_show_all" = id; <string>id</string>
"o_mi_slower" = id; <key>o_mi_select_all</key>
"o_mi_snapshot" = id; <string>id</string>
"o_mi_sprefs" = id; <key>o_mi_services</key>
"o_mi_stop" = id; <string>id</string>
"o_mi_subtitle" = id; <key>o_mi_show_all</key>
"o_mi_title" = id; <string>id</string>
"o_mi_videotrack" = id; <key>o_mi_slower</key>
"o_mi_visual" = id; <string>id</string>
"o_mi_vol_down" = id; <key>o_mi_snapshot</key>
"o_mi_vol_up" = id; <string>id</string>
"o_mi_website" = id; <key>o_mi_sprefs</key>
"o_msgs_btn_crashlog" = id; <string>id</string>
"o_msgs_panel" = id; <key>o_mi_stop</key>
"o_mu_add_intf" = id; <string>id</string>
"o_mu_aspect_ratio" = id; <key>o_mi_subtitle</key>
"o_mu_audio" = id; <string>id</string>
"o_mu_audiotrack" = id; <key>o_mi_title</key>
"o_mu_channels" = id; <string>id</string>
"o_mu_chapter" = id; <key>o_mi_videotrack</key>
"o_mu_controls" = id; <string>id</string>
"o_mu_crop" = id; <key>o_mi_visual</key>
"o_mu_deinterlace" = id; <string>id</string>
"o_mu_device" = id; <key>o_mi_vol_down</key>
"o_mu_edit" = id; <string>id</string>
"o_mu_ffmpeg_pp" = id; <key>o_mi_vol_up</key>
"o_mu_file" = id; <string>id</string>
"o_mu_help" = id; <key>o_mi_website</key>
"o_mu_program" = id; <string>id</string>
"o_mu_screen" = id; <key>o_msgs_btn_crashlog</key>
"o_mu_subtitle" = id; <string>id</string>
"o_mu_title" = id; <key>o_msgs_panel</key>
"o_mu_video" = id; <string>id</string>
"o_mu_videotrack" = id; <key>o_mu_add_intf</key>
"o_mu_visual" = id; <string>id</string>
"o_mu_window" = id; <key>o_mu_aspect_ratio</key>
"o_open" = id; <string>id</string>
"o_playlist" = id; <key>o_mu_audio</key>
"o_playlist_view" = id; <string>id</string>
"o_prefs" = id; <key>o_mu_audiotrack</key>
"o_scrollfield" = id; <string>id</string>
"o_sprefs" = id; <key>o_mu_channels</key>
"o_timefield" = id; <string>id</string>
"o_timeslider" = id; <key>o_mu_chapter</key>
"o_update" = id; <string>id</string>
"o_vmi_fullscreen" = id; <key>o_mu_controls</key>
"o_vmi_mute" = id; <string>id</string>
"o_vmi_next" = id; <key>o_mu_crop</key>
"o_vmi_play" = id; <string>id</string>
"o_vmi_prev" = id; <key>o_mu_deinterlace</key>
"o_vmi_snapshot" = id; <string>id</string>
"o_vmi_stop" = id; <key>o_mu_device</key>
"o_vmi_voldown" = id; <string>id</string>
"o_vmi_volup" = id; <key>o_mu_edit</key>
"o_volumeslider" = id; <string>id</string>
"o_vout_menu" = id; <key>o_mu_ffmpeg_pp</key>
"o_window" = id; <string>id</string>
"o_wizard" = id; <key>o_mu_file</key>
}; <string>id</string>
SUPERCLASS = NSObject; <key>o_mu_help</key>
}, <string>id</string>
{ <key>o_mu_program</key>
ACTIONS = { <string>id</string>
addNode = id; <key>o_mu_screen</key>
deleteItem = id; <string>id</string>
playItem = id; <key>o_mu_subtitle</key>
preparseItem = id; <string>id</string>
recursiveExpandNode = id; <key>o_mu_title</key>
savePlaylist = id; <string>id</string>
searchItem = id; <key>o_mu_video</key>
selectAll = id; <string>id</string>
servicesChange = id; <key>o_mu_videotrack</key>
sortNodeByAuthor = id; <string>id</string>
sortNodeByName = id; <key>o_mu_visual</key>
}; <string>id</string>
CLASS = VLCPlaylist; <key>o_mu_window</key>
LANGUAGE = ObjC; <string>id</string>
OUTLETS = { <key>o_open</key>
"o_btn_addNode" = id; <string>id</string>
"o_btn_playlist" = id; <key>o_playlist</key>
"o_controller" = id; <string>id</string>
"o_ctx_menu" = id; <key>o_playlist_view</key>
"o_mi_addNode" = id; <string>id</string>
"o_mi_delete" = id; <key>o_prefs</key>
"o_mi_info" = id; <string>id</string>
"o_mi_play" = id; <key>o_scrollfield</key>
"o_mi_preparse" = id; <string>id</string>
"o_mi_recursive_expand" = id; <key>o_sprefs</key>
"o_mi_save_playlist" = id; <string>id</string>
"o_mi_selectall" = id; <key>o_timefield</key>
"o_mi_services" = id; <string>id</string>
"o_mi_sort_author" = id; <key>o_timeslider</key>
"o_mi_sort_name" = id; <string>id</string>
"o_mm_mi_services" = id; <key>o_update</key>
"o_mm_mu_services" = id; <string>id</string>
"o_mu_services" = id; <key>o_vmi_fullscreen</key>
"o_outline_view" = id; <string>id</string>
"o_playlist_view" = id; <key>o_vmi_mute</key>
"o_playlist_wizard" = id; <string>id</string>
"o_random_ckb" = id; <key>o_vmi_next</key>
"o_save_accessory_popup" = id; <string>id</string>
"o_save_accessory_text" = id; <key>o_vmi_play</key>
"o_save_accessory_view" = id; <string>id</string>
"o_search_field" = id; <key>o_vmi_prev</key>
"o_status_field" = id; <string>id</string>
"o_tc_author" = id; <key>o_vmi_snapshot</key>
"o_tc_duration" = id; <string>id</string>
"o_tc_name" = id; <key>o_vmi_stop</key>
"o_tc_sortColumn" = id; <string>id</string>
}; <key>o_vmi_voldown</key>
SUPERCLASS = VLCPlaylistCommon; <string>id</string>
}, <key>o_vmi_volup</key>
{ <string>id</string>
CLASS = VLCPlaylistCommon; <key>o_volumeslider</key>
LANGUAGE = ObjC; <string>id</string>
OUTLETS = { <key>o_vout_menu</key>
"o_outline_view" = id; <string>id</string>
"o_tc_author" = id; <key>o_window</key>
"o_tc_duration" = id; <string>id</string>
"o_tc_name" = id; <key>o_wizard</key>
}; <string>id</string>
SUPERCLASS = NSObject; </dict>
}, <key>SUPERCLASS</key>
{ <string>NSObject</string>
CLASS = VLCPlaylistView; </dict>
LANGUAGE = ObjC; <dict>
SUPERCLASS = NSOutlineView; <key>CLASS</key>
}, <string>NSApplication</string>
{ <key>LANGUAGE</key>
CLASS = VLCTimeField; <string>ObjC</string>
LANGUAGE = ObjC; <key>SUPERCLASS</key>
SUPERCLASS = NSTextField; <string>NSResponder</string>
}, </dict>
{ <dict>
CLASS = VLCVoutView; <key>CLASS</key>
LANGUAGE = ObjC; <string>FirstResponder</string>
OUTLETS = { <key>LANGUAGE</key>
"o_window" = id; <string>ObjC</string>
}; <key>SUPERCLASS</key>
SUPERCLASS = NSView; <string>NSObject</string>
} </dict>
); <dict>
IBVersion = 1; <key>CLASS</key>
} <string>ITSlider</string>
\ No newline at end of file <key>LANGUAGE</key>
<string>ObjC</string>
<key>SUPERCLASS</key>
<string>NSSlider</string>
</dict>
<dict>
<key>CLASS</key>
<string>NSObject</string>
<key>LANGUAGE</key>
<string>ObjC</string>
</dict>
<dict>
<key>ACTIONS</key>
<dict>
<key>backward</key>
<string>id</string>
<key>faster</key>
<string>id</string>
<key>forward</key>
<string>id</string>
<key>goToSpecificTime</key>
<string>id</string>
<key>loop</key>
<string>id</string>
<key>mute</key>
<string>id</string>
<key>next</key>
<string>id</string>
<key>pause</key>
<string>id</string>
<key>play</key>
<string>id</string>
<key>position</key>
<string>id</string>
<key>prev</key>
<string>id</string>
<key>random</key>
<string>id</string>
<key>repeat</key>
<string>id</string>
<key>repeatButtonAction</key>
<string>id</string>
<key>showPosition</key>
<string>id</string>
<key>slower</key>
<string>id</string>
<key>stop</key>
<string>id</string>
<key>toggleVar</key>
<string>id</string>
<key>toogleFullscreen</key>
<string>id</string>
<key>volumeDown</key>
<string>id</string>
<key>volumeSliderUpdated</key>
<string>id</string>
<key>volumeUp</key>
<string>id</string>
<key>windowAction</key>
<string>id</string>
</dict>
<key>CLASS</key>
<string>VLCControls</string>
<key>LANGUAGE</key>
<string>ObjC</string>
<key>OUTLETS</key>
<dict>
<key>o_btn_addNode</key>
<string>id</string>
<key>o_btn_repeat</key>
<string>id</string>
<key>o_btn_shuffle</key>
<string>id</string>
<key>o_fs_panel</key>
<string>id</string>
<key>o_main</key>
<string>id</string>
<key>o_specificTime_cancel_btn</key>
<string>id</string>
<key>o_specificTime_enter_fld</key>
<string>id</string>
<key>o_specificTime_goTo_lbl</key>
<string>id</string>
<key>o_specificTime_mi</key>
<string>id</string>
<key>o_specificTime_ok_btn</key>
<string>id</string>
<key>o_specificTime_sec_lbl</key>
<string>id</string>
<key>o_specificTime_stepper</key>
<string>id</string>
<key>o_specificTime_win</key>
<string>id</string>
<key>o_volumeslider</key>
<string>id</string>
</dict>
<key>SUPERCLASS</key>
<string>NSObject</string>
</dict>
<dict>
<key>CLASS</key>
<string>VLCPlaylistView</string>
<key>LANGUAGE</key>
<string>ObjC</string>
<key>SUPERCLASS</key>
<string>NSOutlineView</string>
</dict>
<dict>
<key>CLASS</key>
<string>VLCVoutView</string>
<key>LANGUAGE</key>
<string>ObjC</string>
<key>OUTLETS</key>
<dict>
<key>o_window</key>
<string>id</string>
</dict>
<key>SUPERCLASS</key>
<string>NSView</string>
</dict>
<dict>
<key>CLASS</key>
<string>VLCControllerWindow</string>
<key>LANGUAGE</key>
<string>ObjC</string>
<key>SUPERCLASS</key>
<string>NSWindow</string>
</dict>
<dict>
<key>CLASS</key>
<string>MPSlider</string>
<key>LANGUAGE</key>
<string>ObjC</string>
<key>SUPERCLASS</key>
<string>NSSlider</string>
</dict>
<dict>
<key>CLASS</key>
<string>VLCFSPanel</string>
<key>LANGUAGE</key>
<string>ObjC</string>
<key>SUPERCLASS</key>
<string>NSWindow</string>
</dict>
<dict>
<key>CLASS</key>
<string>VLCEmbeddedVoutView</string>
<key>LANGUAGE</key>
<string>ObjC</string>
<key>SUPERCLASS</key>
<string>VLCVoutView</string>
</dict>
<dict>
<key>ACTIONS</key>
<dict>
<key>bandSliderUpdated</key>
<string>id</string>
<key>changePreset</key>
<string>id</string>
<key>enable</key>
<string>id</string>
<key>preampSliderUpdated</key>
<string>id</string>
<key>toggleWindow</key>
<string>id</string>
<key>twopass</key>
<string>id</string>
</dict>
<key>CLASS</key>
<string>VLCEqualizer</string>
<key>LANGUAGE</key>
<string>ObjC</string>
<key>OUTLETS</key>
<dict>
<key>o_btn_equalizer</key>
<string>id</string>
<key>o_ckb_2pass</key>
<string>id</string>
<key>o_ckb_enable</key>
<string>id</string>
<key>o_fld_preamp</key>
<string>id</string>
<key>o_popup_presets</key>
<string>id</string>
<key>o_slider_band1</key>
<string>id</string>
<key>o_slider_band10</key>
<string>id</string>
<key>o_slider_band2</key>
<string>id</string>
<key>o_slider_band3</key>
<string>id</string>
<key>o_slider_band4</key>
<string>id</string>
<key>o_slider_band5</key>
<string>id</string>
<key>o_slider_band6</key>
<string>id</string>
<key>o_slider_band7</key>
<string>id</string>
<key>o_slider_band8</key>
<string>id</string>
<key>o_slider_band9</key>
<string>id</string>
<key>o_slider_preamp</key>
<string>id</string>
<key>o_window</key>
<string>id</string>
</dict>
<key>SUPERCLASS</key>
<string>NSObject</string>
</dict>
<dict>
<key>CLASS</key>
<string>VLBrushedMetalImageView</string>
<key>LANGUAGE</key>
<string>ObjC</string>
<key>SUPERCLASS</key>
<string>NSImageView</string>
</dict>
<dict>
<key>ACTIONS</key>
<dict>
<key>addNode</key>
<string>id</string>
<key>deleteItem</key>
<string>id</string>
<key>playItem</key>
<string>id</string>
<key>preparseItem</key>
<string>id</string>
<key>recursiveExpandNode</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_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_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_services</key>
<string>id</string>
<key>o_mm_mu_services</key>
<string>id</string>
<key>o_mu_services</key>
<string>id</string>
<key>o_outline_view</key>
<string>id</string>
<key>o_playlist_view</key>
<string>id</string>
<key>o_playlist_wizard</key>
<string>id</string>
<key>o_random_ckb</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_author</key>
<string>id</string>
<key>o_tc_duration</key>
<string>id</string>
<key>o_tc_name</key>
<string>id</string>
<key>o_tc_sortColumn</key>
<string>id</string>
</dict>
<key>SUPERCLASS</key>
<string>VLCPlaylistCommon</string>
</dict>
<dict>
<key>ACTIONS</key>
<dict>
<key>add</key>
<string>id</string>
<key>clear</key>
<string>id</string>
<key>edit</key>
<string>id</string>
<key>edit_cancel</key>
<string>id</string>
<key>edit_ok</key>
<string>id</string>
<key>extract</key>
<string>id</string>
<key>goToBookmark</key>
<string>id</string>
<key>remove</key>
<string>id</string>
</dict>
<key>CLASS</key>
<string>VLCBookmarks</string>
<key>LANGUAGE</key>
<string>ObjC</string>
<key>OUTLETS</key>
<dict>
<key>o_bookmarks_window</key>
<string>id</string>
<key>o_btn_add</key>
<string>id</string>
<key>o_btn_clear</key>
<string>id</string>
<key>o_btn_edit</key>
<string>id</string>
<key>o_btn_extract</key>
<string>id</string>
<key>o_btn_rm</key>
<string>id</string>
<key>o_edit_btn_cancel</key>
<string>id</string>
<key>o_edit_btn_ok</key>
<string>id</string>
<key>o_edit_fld_bytes</key>
<string>id</string>
<key>o_edit_fld_name</key>
<string>id</string>
<key>o_edit_fld_time</key>
<string>id</string>
<key>o_edit_lbl_bytes</key>
<string>id</string>
<key>o_edit_lbl_name</key>
<string>id</string>
<key>o_edit_lbl_time</key>
<string>id</string>
<key>o_edit_window</key>
<string>id</string>
<key>o_tbl_dataTable</key>
<string>id</string>
</dict>
<key>SUPERCLASS</key>
<string>NSObject</string>
</dict>
</array>
<key>IBVersion</key>
<string>1</string>
</dict>
</plist>
extras/package/macosx/Resources/English.lproj/MainMenu.nib/info.nib
View file @ 4168ec37
...@@ -2,27 +2,18 @@ ...@@ -2,27 +2,18 @@
<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd"> <!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
<plist version="1.0"> <plist version="1.0">
<dict> <dict>
<key>IBDocumentLocation</key>
<string>69 71 356 240 0 0 1280 778 </string>
<key>IBEditorPositions</key>
<dict>
<key>29</key>
<string>220 380 438 44 0 0 1280 778 </string>
<key>915</key>
<string>69 316 187 285 0 0 1280 778 </string>
</dict>
<key>IBFramework Version</key> <key>IBFramework Version</key>
<string>489.0</string> <string>667</string>
<key>IBLastKnownRelativeProjectPath</key> <key>IBLastKnownRelativeProjectPath</key>
<string>../../vlc.xcodeproj</string> <string>../../vlc.xcodeproj</string>
<key>IBOldestOS</key> <key>IBOldestOS</key>
<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>2417</integer>
<integer>915</integer> <integer>915</integer>
<integer>29</integer>
</array> </array>
<key>IBSystem Version</key> <key>IBSystem Version</key>
<string>9E17</string> <string>9E17</string>
......
modules/gui/macosx/vout.h
View file @ 4168ec37
...@@ -99,6 +99,7 @@ ...@@ -99,6 +99,7 @@
@interface VLCEmbeddedVoutView : VLCVoutView @interface VLCEmbeddedVoutView : VLCVoutView
{ {
BOOL b_used; BOOL b_used;
id o_embeddedwindow;
} }
- (BOOL)setVout: (vout_thread_t *) p_arg_vout subView: (NSView *) view - (BOOL)setVout: (vout_thread_t *) p_arg_vout subView: (NSView *) view
...@@ -109,17 +110,6 @@ ...@@ -109,17 +110,6 @@
@end @end
/*****************************************************************************
* VLCDetachedEmbeddedView interface
*****************************************************************************/
@interface VLCDetachedEmbeddedVoutView : VLCEmbeddedVoutView
{
id o_embeddedwindow;
}
@end
/***************************************************************************** /*****************************************************************************
* VLCVoutWindow interface * VLCVoutWindow interface
*****************************************************************************/ *****************************************************************************/
......
modules/gui/macosx/vout.m
View file @ 4168ec37
...@@ -819,7 +819,6 @@ int DeviceCallback( vlc_object_t *p_this, const char *psz_variable, ...@@ -819,7 +819,6 @@ int DeviceCallback( vlc_object_t *p_this, const char *psz_variable,
[o_window setLevel: NSStatusWindowLevel]; [o_window setLevel: NSStatusWindowLevel];
} }
[o_window setAcceptsMouseMovedEvents: TRUE]; [o_window setAcceptsMouseMovedEvents: TRUE];
return b_return; return b_return;
} }
...@@ -884,11 +883,19 @@ int DeviceCallback( vlc_object_t *p_this, const char *psz_variable, ...@@ -884,11 +883,19 @@ int DeviceCallback( vlc_object_t *p_this, const char *psz_variable,
@implementation VLCEmbeddedVoutView @implementation VLCEmbeddedVoutView
- (void)awakeFromNib
{
o_embeddedwindow = [self window];
}
- (id)initWithFrame: (NSRect)frameRect - (id)initWithFrame: (NSRect)frameRect
{ {
[super initWithFrame: frameRect]; if(self = [super initWithFrame: frameRect])
b_used = NO; {
[[[VLCMain sharedInstance] getEmbeddedList] addEmbeddedVout: self]; b_used = NO;
[[[VLCMain sharedInstance] getEmbeddedList] addEmbeddedVout: self];
o_embeddedwindow = nil; /* Filled later on in -awakeFromNib */
}
return self; return self;
} }
...@@ -914,46 +921,6 @@ int DeviceCallback( vlc_object_t *p_this, const char *psz_variable, ...@@ -914,46 +921,6 @@ int DeviceCallback( vlc_object_t *p_this, const char *psz_variable,
[view setFrameSize: [self frame].size]; [view setFrameSize: [self frame].size];
} }
return b_return;
}
- (BOOL)setVout: (vout_thread_t *) p_arg_vout subView: (NSView *) view
frame: (NSRect *) s_arg_frame
{
return [self setVout: p_arg_vout subView: view frame:s_arg_frame showWindow: YES];
}
- (void)setUsed: (BOOL)b_new_used
{
b_used = b_new_used;
}
- (BOOL)isUsed
{
return b_used;
}
- (void)closeVout
{
[super closeVout];
[o_window setAcceptsMouseMovedEvents: NO];
[[[VLCMain sharedInstance] getEmbeddedList] releaseEmbeddedVout: self];
}
@end
@implementation VLCDetachedEmbeddedVoutView
- (void)awakeFromNib
{
o_embeddedwindow = [self window];
}
- (BOOL)setVout: (vout_thread_t *) p_arg_vout subView: (NSView *) view
frame: (NSRect *) s_arg_frame
{
BOOL b_return = [super setVout: p_arg_vout subView: view frame: s_arg_frame showWindow: NO];
/* o_window needs to point to our o_embeddedwindow, super might have set it /* o_window needs to point to our o_embeddedwindow, super might have set it
* to the fullscreen window that o_embeddedwindow setups during fullscreen */ * to the fullscreen window that o_embeddedwindow setups during fullscreen */
...@@ -983,9 +950,27 @@ int DeviceCallback( vlc_object_t *p_this, const char *psz_variable, ...@@ -983,9 +950,27 @@ int DeviceCallback( vlc_object_t *p_this, const char *psz_variable,
[o_window unlockFullscreenAnimation]; [o_window unlockFullscreenAnimation];
} }
return b_return; return b_return;
} }
- (BOOL)setVout: (vout_thread_t *) p_arg_vout subView: (NSView *) view
frame: (NSRect *) s_arg_frame
{
return [self setVout: p_arg_vout subView: view frame:s_arg_frame showWindow: YES];
}
- (void)setUsed: (BOOL)b_new_used
{
b_used = b_new_used;
}
- (BOOL)isUsed
{
return b_used;
}
- (void)closeVout - (void)closeVout
{ {
/* Don't close the window yet, wait a bit to see if a new input is poping up */ /* Don't close the window yet, wait a bit to see if a new input is poping up */
...@@ -995,6 +980,8 @@ int DeviceCallback( vlc_object_t *p_this, const char *psz_variable, ...@@ -995,6 +980,8 @@ int DeviceCallback( vlc_object_t *p_this, const char *psz_variable,
[o_window performSelector:@selector(orderOut:) withObject:nil afterDelay:1.5]; [o_window performSelector:@selector(orderOut:) withObject:nil afterDelay:1.5];
[super closeVout]; [super closeVout];
[o_window setAcceptsMouseMovedEvents: NO];
[[[VLCMain sharedInstance] getEmbeddedList] releaseEmbeddedVout: self];
} }
- (void)enterFullscreen - (void)enterFullscreen
......
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