]> git.sesse.net Git - vlc/commitdiff
macosx: Remove VLCEmbeddedDetachedVout because it's not used. (Or at leat doesn't...
authorPierre d'Herbemont <pdherbemont@videolan.org>
Sat, 12 Jul 2008 10:55:33 +0000 (12:55 +0200)
committerPierre d'Herbemont <pdherbemont@videolan.org>
Sat, 12 Jul 2008 15:36:27 +0000 (17:36 +0200)
extras/package/macosx/Resources/English.lproj/MainMenu.nib/classes.nib
extras/package/macosx/Resources/English.lproj/MainMenu.nib/info.nib
extras/package/macosx/Resources/English.lproj/MainMenu.nib/keyedobjects.nib
modules/gui/macosx/vout.h
modules/gui/macosx/vout.m

index cf8f96f4d7f8916407d4ea9a2cd0ee5c60d7d0e5..cf8b18b5ab7d638978063c981babbf0ba5566eb4 100644 (file)
-{
-    IBClasses =     (
-                {
-            CLASS = FirstResponder;
-            LANGUAGE = ObjC;
-            SUPERCLASS = NSObject;
-        },
-                {
-            CLASS = ITSlider;
-            LANGUAGE = ObjC;
-            SUPERCLASS = NSSlider;
-        },
-                {
-            CLASS = MPSlider;
-            LANGUAGE = ObjC;
-            SUPERCLASS = NSSlider;
-        },
-                {
-            CLASS = NSApplication;
-            LANGUAGE = ObjC;
-            SUPERCLASS = NSResponder;
-        },
-                {
-            CLASS = NSObject;
-            LANGUAGE = ObjC;
-        },
-                {
-            CLASS = VLBrushedMetalImageView;
-            LANGUAGE = ObjC;
-            SUPERCLASS = NSImageView;
-        },
-                {
-            ACTIONS =             {
-                add = id;
-                clear = id;
-                edit = id;
-                "edit_cancel" = id;
-                "edit_ok" = id;
-                extract = id;
-                goToBookmark = id;
-                remove = id;
-            };
-            CLASS = VLCBookmarks;
-            LANGUAGE = ObjC;
-            OUTLETS =             {
-                "o_bookmarks_window" = id;
-                "o_btn_add" = id;
-                "o_btn_clear" = id;
-                "o_btn_edit" = id;
-                "o_btn_extract" = id;
-                "o_btn_rm" = id;
-                "o_edit_btn_cancel" = id;
-                "o_edit_btn_ok" = id;
-                "o_edit_fld_bytes" = id;
-                "o_edit_fld_name" = id;
-                "o_edit_fld_time" = id;
-                "o_edit_lbl_bytes" = id;
-                "o_edit_lbl_name" = id;
-                "o_edit_lbl_time" = id;
-                "o_edit_window" = id;
-                "o_tbl_dataTable" = id;
-            };
-            SUPERCLASS = NSObject;
-        },
-                {
-            CLASS = VLCControllerView;
-            LANGUAGE = ObjC;
-            SUPERCLASS = NSView;
-        },
-                {
-            CLASS = VLCControllerWindow;
-            LANGUAGE = ObjC;
-            SUPERCLASS = NSWindow;
-        },
-                {
-            ACTIONS =             {
-                backward = id;
-                faster = id;
-                forward = id;
-                goToSpecificTime = id;
-                loop = id;
-                mute = id;
-                next = id;
-                pause = id;
-                play = id;
-                position = id;
-                prev = id;
-                random = id;
-                repeat = id;
-                repeatButtonAction = id;
-                showPosition = id;
-                slower = id;
-                stop = id;
-                toggleVar = id;
-                toogleFullscreen = id;
-                volumeDown = id;
-                volumeSliderUpdated = id;
-                volumeUp = id;
-                windowAction = id;
-            };
-            CLASS = VLCControls;
-            LANGUAGE = ObjC;
-            OUTLETS =             {
-                "o_btn_addNode" = id;
-                "o_btn_repeat" = id;
-                "o_btn_shuffle" = id;
-                "o_fs_panel" = id;
-                "o_main" = id;
-                "o_specificTime_cancel_btn" = id;
-                "o_specificTime_enter_fld" = id;
-                "o_specificTime_goTo_lbl" = id;
-                "o_specificTime_mi" = id;
-                "o_specificTime_ok_btn" = id;
-                "o_specificTime_sec_lbl" = id;
-                "o_specificTime_stepper" = id;
-                "o_specificTime_win" = id;
-                "o_volumeslider" = id;
-            };
-            SUPERCLASS = NSObject;
-        },
-                {
-            CLASS = VLCDetachedEmbeddedVoutView;
-            LANGUAGE = ObjC;
-            OUTLETS =             {
-                "o_embeddedwindow" = id;
-            };
-            SUPERCLASS = VLCEmbeddedVoutView;
-        },
-                {
-            CLASS = VLCEmbeddedVoutView;
-            LANGUAGE = ObjC;
-            SUPERCLASS = VLCVoutView;
-        },
-                {
-            CLASS = VLCEmbeddedWindow;
-            LANGUAGE = ObjC;
-            OUTLETS =             {
-                "o_btn_backward" = id;
-                "o_btn_forward" = id;
-                "o_btn_fullscreen" = id;
-                "o_btn_play" = id;
-                "o_slider" = id;
-                "o_time" = id;
-                "o_view" = id;
-            };
-            SUPERCLASS = NSWindow;
-        },
-                {
-            ACTIONS =             {
-                bandSliderUpdated = id;
-                changePreset = id;
-                enable = id;
-                preampSliderUpdated = id;
-                toggleWindow = id;
-                twopass = id;
-            };
-            CLASS = VLCEqualizer;
-            LANGUAGE = ObjC;
-            OUTLETS =             {
-                "o_btn_equalizer" = id;
-                "o_ckb_2pass" = id;
-                "o_ckb_enable" = id;
-                "o_fld_preamp" = id;
-                "o_popup_presets" = id;
-                "o_slider_band1" = id;
-                "o_slider_band10" = id;
-                "o_slider_band2" = id;
-                "o_slider_band3" = id;
-                "o_slider_band4" = id;
-                "o_slider_band5" = id;
-                "o_slider_band6" = id;
-                "o_slider_band7" = id;
-                "o_slider_band8" = id;
-                "o_slider_band9" = id;
-                "o_slider_preamp" = id;
-                "o_window" = id;
-            };
-            SUPERCLASS = NSObject;
-        },
-                {
-            CLASS = VLCFSPanel;
-            LANGUAGE = ObjC;
-            SUPERCLASS = NSWindow;
-        },
-                {
-            ACTIONS =             {
-                checkForUpdate = id;
-                clearRecentItems = id;
-                intfOpenCapture = id;
-                intfOpenDisc = id;
-                intfOpenFile = id;
-                intfOpenFileGeneric = id;
-                intfOpenNet = id;
-                openCrashLog = id;
-                openDocumentation = id;
-                openDonate = id;
-                openForum = id;
-                openReadMe = id;
-                openRecentItem = id;
-                openWebsite = id;
-                showBookmarks = id;
-                showExtended = id;
-                showInformationPanel = id;
-                showLicense = id;
-                showMessagesPanel = id;
-                showWizard = id;
-                timesliderUpdate = id;
-                togglePlaylist = id;
-                viewAbout = id;
-                viewErrorsAndWarnings = id;
-                viewHelp = id;
-                viewPreferences = id;
-            };
-            CLASS = VLCMain;
-            LANGUAGE = ObjC;
-            OUTLETS =             {
-                "o_about" = id;
-                "o_bookmarks" = id;
-                "o_btn_equalizer" = id;
-                "o_btn_ff" = id;
-                "o_btn_fullscreen" = id;
-                "o_btn_next" = id;
-                "o_btn_play" = id;
-                "o_btn_playlist" = id;
-                "o_btn_prev" = id;
-                "o_btn_rewind" = id;
-                "o_btn_stop" = id;
-                "o_controls" = id;
-                "o_dmi_mute" = id;
-                "o_dmi_next" = id;
-                "o_dmi_play" = id;
-                "o_dmi_previous" = id;
-                "o_dmi_stop" = id;
-                "o_embedded_list" = id;
-                "o_embedded_window" = id;
-                "o_extended" = id;
-                "o_eyetv" = id;
-                "o_info" = id;
-                "o_interaction_list" = id;
-                "o_main_pgbar" = id;
-                "o_messages" = id;
-                "o_mi_about" = id;
-                "o_mi_add_intf" = id;
-                "o_mi_aspect_ratio" = id;
-                "o_mi_audiotrack" = id;
-                "o_mi_bookmarks" = id;
-                "o_mi_bring_atf" = id;
-                "o_mi_bwd" = id;
-                "o_mi_bwd1m" = id;
-                "o_mi_bwd5m" = id;
-                "o_mi_channels" = id;
-                "o_mi_chapter" = id;
-                "o_mi_checkForUpdate" = id;
-                "o_mi_clear" = id;
-                "o_mi_close_window" = id;
-                "o_mi_controller" = id;
-                "o_mi_copy" = id;
-                "o_mi_crop" = id;
-                "o_mi_cut" = id;
-                "o_mi_deinterlace" = id;
-                "o_mi_device" = id;
-                "o_mi_documentation" = id;
-                "o_mi_donation" = id;
-                "o_mi_double_window" = id;
-                "o_mi_equalizer" = id;
-                "o_mi_errorsAndWarnings" = id;
-                "o_mi_extended" = id;
-                "o_mi_faster" = id;
-                "o_mi_ffmpeg_pp" = id;
-                "o_mi_fittoscreen" = id;
-                "o_mi_floatontop" = id;
-                "o_mi_forum" = id;
-                "o_mi_fullscreen" = id;
-                "o_mi_fwd" = id;
-                "o_mi_fwd1m" = id;
-                "o_mi_fwd5m" = id;
-                "o_mi_half_window" = id;
-                "o_mi_help" = id;
-                "o_mi_hide" = id;
-                "o_mi_hide_others" = id;
-                "o_mi_info" = id;
-                "o_mi_license" = id;
-                "o_mi_loop" = id;
-                "o_mi_messages" = id;
-                "o_mi_minimize" = id;
-                "o_mi_mute" = id;
-                "o_mi_next" = id;
-                "o_mi_normal_window" = id;
-                "o_mi_open_capture" = id;
-                "o_mi_open_disc" = id;
-                "o_mi_open_file" = id;
-                "o_mi_open_generic" = id;
-                "o_mi_open_net" = id;
-                "o_mi_open_recent" = id;
-                "o_mi_open_recent_cm" = id;
-                "o_mi_open_wizard" = id;
-                "o_mi_paste" = id;
-                "o_mi_play" = id;
-                "o_mi_playlist" = id;
-                "o_mi_prefs" = id;
-                "o_mi_previous" = id;
-                "o_mi_program" = id;
-                "o_mi_quit" = id;
-                "o_mi_random" = id;
-                "o_mi_readme" = id;
-                "o_mi_repeat" = id;
-                "o_mi_screen" = id;
-                "o_mi_select_all" = id;
-                "o_mi_services" = id;
-                "o_mi_show_all" = id;
-                "o_mi_slower" = id;
-                "o_mi_snapshot" = id;
-                "o_mi_sprefs" = id;
-                "o_mi_stop" = id;
-                "o_mi_subtitle" = id;
-                "o_mi_title" = id;
-                "o_mi_videotrack" = id;
-                "o_mi_visual" = id;
-                "o_mi_vol_down" = id;
-                "o_mi_vol_up" = id;
-                "o_mi_website" = id;
-                "o_msgs_btn_crashlog" = id;
-                "o_msgs_panel" = id;
-                "o_mu_add_intf" = id;
-                "o_mu_aspect_ratio" = id;
-                "o_mu_audio" = id;
-                "o_mu_audiotrack" = id;
-                "o_mu_channels" = id;
-                "o_mu_chapter" = id;
-                "o_mu_controls" = id;
-                "o_mu_crop" = id;
-                "o_mu_deinterlace" = id;
-                "o_mu_device" = id;
-                "o_mu_edit" = id;
-                "o_mu_ffmpeg_pp" = id;
-                "o_mu_file" = id;
-                "o_mu_help" = id;
-                "o_mu_program" = id;
-                "o_mu_screen" = id;
-                "o_mu_subtitle" = id;
-                "o_mu_title" = id;
-                "o_mu_video" = id;
-                "o_mu_videotrack" = id;
-                "o_mu_visual" = id;
-                "o_mu_window" = id;
-                "o_open" = id;
-                "o_playlist" = id;
-                "o_playlist_view" = id;
-                "o_prefs" = id;
-                "o_scrollfield" = id;
-                "o_sprefs" = id;
-                "o_timefield" = id;
-                "o_timeslider" = id;
-                "o_update" = id;
-                "o_vmi_fullscreen" = id;
-                "o_vmi_mute" = id;
-                "o_vmi_next" = id;
-                "o_vmi_play" = id;
-                "o_vmi_prev" = id;
-                "o_vmi_snapshot" = id;
-                "o_vmi_stop" = id;
-                "o_vmi_voldown" = id;
-                "o_vmi_volup" = id;
-                "o_volumeslider" = id;
-                "o_vout_menu" = id;
-                "o_window" = id;
-                "o_wizard" = id;
-            };
-            SUPERCLASS = NSObject;
-        },
-                {
-            ACTIONS =             {
-                addNode = id;
-                deleteItem = id;
-                playItem = id;
-                preparseItem = id;
-                recursiveExpandNode = 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_info" = id;
-                "o_mi_play" = id;
-                "o_mi_preparse" = id;
-                "o_mi_recursive_expand" = 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_services" = id;
-                "o_mm_mu_services" = id;
-                "o_mu_services" = id;
-                "o_outline_view" = id;
-                "o_playlist_view" = id;
-                "o_playlist_wizard" = id;
-                "o_random_ckb" = 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_author" = id;
-                "o_tc_duration" = id;
-                "o_tc_name" = 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;
-        },
-                {
-            CLASS = VLCPlaylistView;
-            LANGUAGE = ObjC;
-            SUPERCLASS = NSOutlineView;
-        },
-                {
-            CLASS = VLCTimeField;
-            LANGUAGE = ObjC;
-            SUPERCLASS = NSTextField;
-        },
-                {
-            CLASS = VLCVoutView;
-            LANGUAGE = ObjC;
-            OUTLETS =             {
-                "o_window" = id;
-            };
-            SUPERCLASS = NSView;
-        }
-    );
-    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>CLASS</key>
+                       <string>VLCTimeField</string>
+                       <key>LANGUAGE</key>
+                       <string>ObjC</string>
+                       <key>SUPERCLASS</key>
+                       <string>NSTextField</string>
+               </dict>
+               <dict>
+                       <key>CLASS</key>
+                       <string>VLCControllerView</string>
+                       <key>LANGUAGE</key>
+                       <string>ObjC</string>
+                       <key>SUPERCLASS</key>
+                       <string>NSView</string>
+               </dict>
+               <dict>
+                       <key>CLASS</key>
+                       <string>VLCEmbeddedWindow</string>
+                       <key>LANGUAGE</key>
+                       <string>ObjC</string>
+                       <key>OUTLETS</key>
+                       <dict>
+                               <key>o_btn_backward</key>
+                               <string>id</string>
+                               <key>o_btn_forward</key>
+                               <string>id</string>
+                               <key>o_btn_fullscreen</key>
+                               <string>id</string>
+                               <key>o_btn_play</key>
+                               <string>id</string>
+                               <key>o_slider</key>
+                               <string>id</string>
+                               <key>o_time</key>
+                               <string>id</string>
+                               <key>o_view</key>
+                               <string>id</string>
+                       </dict>
+                       <key>SUPERCLASS</key>
+                       <string>NSWindow</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>ACTIONS</key>
+                       <dict>
+                               <key>checkForUpdate</key>
+                               <string>id</string>
+                               <key>clearRecentItems</key>
+                               <string>id</string>
+                               <key>intfOpenCapture</key>
+                               <string>id</string>
+                               <key>intfOpenDisc</key>
+                               <string>id</string>
+                               <key>intfOpenFile</key>
+                               <string>id</string>
+                               <key>intfOpenFileGeneric</key>
+                               <string>id</string>
+                               <key>intfOpenNet</key>
+                               <string>id</string>
+                               <key>openCrashLog</key>
+                               <string>id</string>
+                               <key>openDocumentation</key>
+                               <string>id</string>
+                               <key>openDonate</key>
+                               <string>id</string>
+                               <key>openForum</key>
+                               <string>id</string>
+                               <key>openReadMe</key>
+                               <string>id</string>
+                               <key>openRecentItem</key>
+                               <string>id</string>
+                               <key>openWebsite</key>
+                               <string>id</string>
+                               <key>showBookmarks</key>
+                               <string>id</string>
+                               <key>showExtended</key>
+                               <string>id</string>
+                               <key>showInformationPanel</key>
+                               <string>id</string>
+                               <key>showLicense</key>
+                               <string>id</string>
+                               <key>showMessagesPanel</key>
+                               <string>id</string>
+                               <key>showWizard</key>
+                               <string>id</string>
+                               <key>timesliderUpdate</key>
+                               <string>id</string>
+                               <key>togglePlaylist</key>
+                               <string>id</string>
+                               <key>viewAbout</key>
+                               <string>id</string>
+                               <key>viewErrorsAndWarnings</key>
+                               <string>id</string>
+                               <key>viewHelp</key>
+                               <string>id</string>
+                               <key>viewPreferences</key>
+                               <string>id</string>
+                       </dict>
+                       <key>CLASS</key>
+                       <string>VLCMain</string>
+                       <key>LANGUAGE</key>
+                       <string>ObjC</string>
+                       <key>OUTLETS</key>
+                       <dict>
+                               <key>o_about</key>
+                               <string>id</string>
+                               <key>o_bookmarks</key>
+                               <string>id</string>
+                               <key>o_btn_equalizer</key>
+                               <string>id</string>
+                               <key>o_btn_ff</key>
+                               <string>id</string>
+                               <key>o_btn_fullscreen</key>
+                               <string>id</string>
+                               <key>o_btn_next</key>
+                               <string>id</string>
+                               <key>o_btn_play</key>
+                               <string>id</string>
+                               <key>o_btn_playlist</key>
+                               <string>id</string>
+                               <key>o_btn_prev</key>
+                               <string>id</string>
+                               <key>o_btn_rewind</key>
+                               <string>id</string>
+                               <key>o_btn_stop</key>
+                               <string>id</string>
+                               <key>o_controls</key>
+                               <string>id</string>
+                               <key>o_dmi_mute</key>
+                               <string>id</string>
+                               <key>o_dmi_next</key>
+                               <string>id</string>
+                               <key>o_dmi_play</key>
+                               <string>id</string>
+                               <key>o_dmi_previous</key>
+                               <string>id</string>
+                               <key>o_dmi_stop</key>
+                               <string>id</string>
+                               <key>o_embedded_list</key>
+                               <string>id</string>
+                               <key>o_embedded_window</key>
+                               <string>id</string>
+                               <key>o_extended</key>
+                               <string>id</string>
+                               <key>o_eyetv</key>
+                               <string>id</string>
+                               <key>o_info</key>
+                               <string>id</string>
+                               <key>o_interaction_list</key>
+                               <string>id</string>
+                               <key>o_main_pgbar</key>
+                               <string>id</string>
+                               <key>o_messages</key>
+                               <string>id</string>
+                               <key>o_mi_about</key>
+                               <string>id</string>
+                               <key>o_mi_add_intf</key>
+                               <string>id</string>
+                               <key>o_mi_aspect_ratio</key>
+                               <string>id</string>
+                               <key>o_mi_audiotrack</key>
+                               <string>id</string>
+                               <key>o_mi_bookmarks</key>
+                               <string>id</string>
+                               <key>o_mi_bring_atf</key>
+                               <string>id</string>
+                               <key>o_mi_bwd</key>
+                               <string>id</string>
+                               <key>o_mi_bwd1m</key>
+                               <string>id</string>
+                               <key>o_mi_bwd5m</key>
+                               <string>id</string>
+                               <key>o_mi_channels</key>
+                               <string>id</string>
+                               <key>o_mi_chapter</key>
+                               <string>id</string>
+                               <key>o_mi_checkForUpdate</key>
+                               <string>id</string>
+                               <key>o_mi_clear</key>
+                               <string>id</string>
+                               <key>o_mi_close_window</key>
+                               <string>id</string>
+                               <key>o_mi_controller</key>
+                               <string>id</string>
+                               <key>o_mi_copy</key>
+                               <string>id</string>
+                               <key>o_mi_crop</key>
+                               <string>id</string>
+                               <key>o_mi_cut</key>
+                               <string>id</string>
+                               <key>o_mi_deinterlace</key>
+                               <string>id</string>
+                               <key>o_mi_device</key>
+                               <string>id</string>
+                               <key>o_mi_documentation</key>
+                               <string>id</string>
+                               <key>o_mi_donation</key>
+                               <string>id</string>
+                               <key>o_mi_double_window</key>
+                               <string>id</string>
+                               <key>o_mi_equalizer</key>
+                               <string>id</string>
+                               <key>o_mi_errorsAndWarnings</key>
+                               <string>id</string>
+                               <key>o_mi_extended</key>
+                               <string>id</string>
+                               <key>o_mi_faster</key>
+                               <string>id</string>
+                               <key>o_mi_ffmpeg_pp</key>
+                               <string>id</string>
+                               <key>o_mi_fittoscreen</key>
+                               <string>id</string>
+                               <key>o_mi_floatontop</key>
+                               <string>id</string>
+                               <key>o_mi_forum</key>
+                               <string>id</string>
+                               <key>o_mi_fullscreen</key>
+                               <string>id</string>
+                               <key>o_mi_fwd</key>
+                               <string>id</string>
+                               <key>o_mi_fwd1m</key>
+                               <string>id</string>
+                               <key>o_mi_fwd5m</key>
+                               <string>id</string>
+                               <key>o_mi_half_window</key>
+                               <string>id</string>
+                               <key>o_mi_help</key>
+                               <string>id</string>
+                               <key>o_mi_hide</key>
+                               <string>id</string>
+                               <key>o_mi_hide_others</key>
+                               <string>id</string>
+                               <key>o_mi_info</key>
+                               <string>id</string>
+                               <key>o_mi_license</key>
+                               <string>id</string>
+                               <key>o_mi_loop</key>
+                               <string>id</string>
+                               <key>o_mi_messages</key>
+                               <string>id</string>
+                               <key>o_mi_minimize</key>
+                               <string>id</string>
+                               <key>o_mi_mute</key>
+                               <string>id</string>
+                               <key>o_mi_next</key>
+                               <string>id</string>
+                               <key>o_mi_normal_window</key>
+                               <string>id</string>
+                               <key>o_mi_open_capture</key>
+                               <string>id</string>
+                               <key>o_mi_open_disc</key>
+                               <string>id</string>
+                               <key>o_mi_open_file</key>
+                               <string>id</string>
+                               <key>o_mi_open_generic</key>
+                               <string>id</string>
+                               <key>o_mi_open_net</key>
+                               <string>id</string>
+                               <key>o_mi_open_recent</key>
+                               <string>id</string>
+                               <key>o_mi_open_recent_cm</key>
+                               <string>id</string>
+                               <key>o_mi_open_wizard</key>
+                               <string>id</string>
+                               <key>o_mi_paste</key>
+                               <string>id</string>
+                               <key>o_mi_play</key>
+                               <string>id</string>
+                               <key>o_mi_playlist</key>
+                               <string>id</string>
+                               <key>o_mi_prefs</key>
+                               <string>id</string>
+                               <key>o_mi_previous</key>
+                               <string>id</string>
+                               <key>o_mi_program</key>
+                               <string>id</string>
+                               <key>o_mi_quit</key>
+                               <string>id</string>
+                               <key>o_mi_random</key>
+                               <string>id</string>
+                               <key>o_mi_readme</key>
+                               <string>id</string>
+                               <key>o_mi_repeat</key>
+                               <string>id</string>
+                               <key>o_mi_screen</key>
+                               <string>id</string>
+                               <key>o_mi_select_all</key>
+                               <string>id</string>
+                               <key>o_mi_services</key>
+                               <string>id</string>
+                               <key>o_mi_show_all</key>
+                               <string>id</string>
+                               <key>o_mi_slower</key>
+                               <string>id</string>
+                               <key>o_mi_snapshot</key>
+                               <string>id</string>
+                               <key>o_mi_sprefs</key>
+                               <string>id</string>
+                               <key>o_mi_stop</key>
+                               <string>id</string>
+                               <key>o_mi_subtitle</key>
+                               <string>id</string>
+                               <key>o_mi_title</key>
+                               <string>id</string>
+                               <key>o_mi_videotrack</key>
+                               <string>id</string>
+                               <key>o_mi_visual</key>
+                               <string>id</string>
+                               <key>o_mi_vol_down</key>
+                               <string>id</string>
+                               <key>o_mi_vol_up</key>
+                               <string>id</string>
+                               <key>o_mi_website</key>
+                               <string>id</string>
+                               <key>o_msgs_btn_crashlog</key>
+                               <string>id</string>
+                               <key>o_msgs_panel</key>
+                               <string>id</string>
+                               <key>o_mu_add_intf</key>
+                               <string>id</string>
+                               <key>o_mu_aspect_ratio</key>
+                               <string>id</string>
+                               <key>o_mu_audio</key>
+                               <string>id</string>
+                               <key>o_mu_audiotrack</key>
+                               <string>id</string>
+                               <key>o_mu_channels</key>
+                               <string>id</string>
+                               <key>o_mu_chapter</key>
+                               <string>id</string>
+                               <key>o_mu_controls</key>
+                               <string>id</string>
+                               <key>o_mu_crop</key>
+                               <string>id</string>
+                               <key>o_mu_deinterlace</key>
+                               <string>id</string>
+                               <key>o_mu_device</key>
+                               <string>id</string>
+                               <key>o_mu_edit</key>
+                               <string>id</string>
+                               <key>o_mu_ffmpeg_pp</key>
+                               <string>id</string>
+                               <key>o_mu_file</key>
+                               <string>id</string>
+                               <key>o_mu_help</key>
+                               <string>id</string>
+                               <key>o_mu_program</key>
+                               <string>id</string>
+                               <key>o_mu_screen</key>
+                               <string>id</string>
+                               <key>o_mu_subtitle</key>
+                               <string>id</string>
+                               <key>o_mu_title</key>
+                               <string>id</string>
+                               <key>o_mu_video</key>
+                               <string>id</string>
+                               <key>o_mu_videotrack</key>
+                               <string>id</string>
+                               <key>o_mu_visual</key>
+                               <string>id</string>
+                               <key>o_mu_window</key>
+                               <string>id</string>
+                               <key>o_open</key>
+                               <string>id</string>
+                               <key>o_playlist</key>
+                               <string>id</string>
+                               <key>o_playlist_view</key>
+                               <string>id</string>
+                               <key>o_prefs</key>
+                               <string>id</string>
+                               <key>o_scrollfield</key>
+                               <string>id</string>
+                               <key>o_sprefs</key>
+                               <string>id</string>
+                               <key>o_timefield</key>
+                               <string>id</string>
+                               <key>o_timeslider</key>
+                               <string>id</string>
+                               <key>o_update</key>
+                               <string>id</string>
+                               <key>o_vmi_fullscreen</key>
+                               <string>id</string>
+                               <key>o_vmi_mute</key>
+                               <string>id</string>
+                               <key>o_vmi_next</key>
+                               <string>id</string>
+                               <key>o_vmi_play</key>
+                               <string>id</string>
+                               <key>o_vmi_prev</key>
+                               <string>id</string>
+                               <key>o_vmi_snapshot</key>
+                               <string>id</string>
+                               <key>o_vmi_stop</key>
+                               <string>id</string>
+                               <key>o_vmi_voldown</key>
+                               <string>id</string>
+                               <key>o_vmi_volup</key>
+                               <string>id</string>
+                               <key>o_volumeslider</key>
+                               <string>id</string>
+                               <key>o_vout_menu</key>
+                               <string>id</string>
+                               <key>o_window</key>
+                               <string>id</string>
+                               <key>o_wizard</key>
+                               <string>id</string>
+                       </dict>
+                       <key>SUPERCLASS</key>
+                       <string>NSObject</string>
+               </dict>
+               <dict>
+                       <key>CLASS</key>
+                       <string>NSApplication</string>
+                       <key>LANGUAGE</key>
+                       <string>ObjC</string>
+                       <key>SUPERCLASS</key>
+                       <string>NSResponder</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>ITSlider</string>
+                       <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>
index 059d2068b55afee72cf7b1a55d53e8834e788e5d..f71a76960a73e689b4dc038193d56843d9d3f9e5 100644 (file)
@@ -2,27 +2,18 @@
 <!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
 <plist version="1.0">
 <dict>
-       <key>IBDocumentLocation</key>
-       <string>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>
-       <string>489.0</string>
+       <string>667</string>
        <key>IBLastKnownRelativeProjectPath</key>
        <string>../../vlc.xcodeproj</string>
        <key>IBOldestOS</key>
        <integer>5</integer>
        <key>IBOpenObjects</key>
        <array>
+               <integer>29</integer>
                <integer>21</integer>
-               <integer>2416</integer>
+               <integer>2417</integer>
                <integer>915</integer>
-               <integer>29</integer>
        </array>
        <key>IBSystem Version</key>
        <string>9E17</string>
index 8ec2dec5477dc1f516d3f712f30a4a11f28a8178..4e7966638157abf2e01f43f8cd4bfd3e5219c652 100644 (file)
Binary files a/extras/package/macosx/Resources/English.lproj/MainMenu.nib/keyedobjects.nib and b/extras/package/macosx/Resources/English.lproj/MainMenu.nib/keyedobjects.nib differ
index cd12b2b33246010a3eae5110b83abed1774980fc..38c3025f91c0584659af4d671a8c3e0c5a8c9c3c 100644 (file)
@@ -99,6 +99,7 @@
 @interface VLCEmbeddedVoutView : VLCVoutView
 {
     BOOL b_used;
+    id o_embeddedwindow;
 }
 
 - (BOOL)setVout: (vout_thread_t *) p_arg_vout subView: (NSView *) view
 
 @end
 
-/*****************************************************************************
- * VLCDetachedEmbeddedView interface
- *****************************************************************************/
-
-@interface VLCDetachedEmbeddedVoutView : VLCEmbeddedVoutView
-{
-    id o_embeddedwindow;
-}
-
-@end
-
 /*****************************************************************************
  * VLCVoutWindow interface
  *****************************************************************************/
index 883040988faea1c5b59c5aa9df1ea1d13e514fdb..1aef599d4e75b3d7d463331fb58e9bd22a5ad553 100644 (file)
@@ -819,7 +819,6 @@ int DeviceCallback( vlc_object_t *p_this, const char *psz_variable,
         [o_window setLevel: NSStatusWindowLevel];
     }
 
-
     [o_window setAcceptsMouseMovedEvents: TRUE];
     return b_return;
 }
@@ -884,11 +883,19 @@ int DeviceCallback( vlc_object_t *p_this, const char *psz_variable,
 
 @implementation VLCEmbeddedVoutView
 
+- (void)awakeFromNib
+{
+    o_embeddedwindow = [self window];
+}
+
 - (id)initWithFrame: (NSRect)frameRect
 {
-    [super initWithFrame: frameRect];
-    b_used = NO;
-    [[[VLCMain sharedInstance] getEmbeddedList] addEmbeddedVout: self];
+    if(self = [super initWithFrame: frameRect])
+    {
+        b_used = NO;
+        [[[VLCMain sharedInstance] getEmbeddedList] addEmbeddedVout: self];
+        o_embeddedwindow = nil; /* Filled later on in -awakeFromNib */
+    }
     return self;
 }
 
@@ -914,46 +921,6 @@ int DeviceCallback( vlc_object_t *p_this, const char *psz_variable,
 
         [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
      * 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,
         [o_window unlockFullscreenAnimation];
 
     }
+
     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
 {
     /* 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,
         [o_window performSelector:@selector(orderOut:) withObject:nil afterDelay:1.5];
 
     [super closeVout];
+    [o_window setAcceptsMouseMovedEvents: NO];
+    [[[VLCMain sharedInstance] getEmbeddedList] releaseEmbeddedVout: self];
 }
 
 - (void)enterFullscreen