]> git.sesse.net Git - vlc/commitdiff
Removed broken, unmaintained and unfinished code. May be restored after 0.9.0 if...
authorFelix Paul Kühne <fkuehne@videolan.org>
Sat, 5 Jul 2008 12:02:04 +0000 (14:02 +0200)
committerFelix Paul Kühne <fkuehne@videolan.org>
Sat, 5 Jul 2008 12:02:04 +0000 (14:02 +0200)
12 files changed:
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
extras/package/macosx/Resources/English.lproj/SFilters.nib/classes.nib [deleted file]
extras/package/macosx/Resources/English.lproj/SFilters.nib/info.nib [deleted file]
extras/package/macosx/Resources/English.lproj/SFilters.nib/keyedobjects.nib [deleted file]
extras/package/macosx/vlc.xcodeproj/project.pbxproj
modules/gui/macosx/Modules.am
modules/gui/macosx/intf.h
modules/gui/macosx/intf.m
modules/gui/macosx/sfilters.h [deleted file]
modules/gui/macosx/sfilters.m [deleted file]

index bf66f39f92ad9b1a276f14b4e8d6a073b9ec0477..cf8f96f4d7f8916407d4ea9a2cd0ee5c60d7d0e5 100644 (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>showSFilters</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_sfilters</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>VLCDetachedEmbeddedVoutView</string>
-                       <key>LANGUAGE</key>
-                       <string>ObjC</string>
-                       <key>OUTLETS</key>
-                       <dict>
-                               <key>o_embeddedwindow</key>
-                               <string>id</string>
-                       </dict>
-                       <key>SUPERCLASS</key>
-                       <string>VLCEmbeddedVoutView</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>
+{
+    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
index b4df0481413c83439c3e953383fcc955e5519db3..28be9821b1c023e7a604eab55dabcdb31927c1eb 100644 (file)
@@ -2,23 +2,34 @@
 <!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>31 299 356 240 0 0 1280 778 </string>
+       <key>IBEditorPositions</key>
+       <dict>
+               <key>2197</key>
+               <string>342 506 596 123 0 0 1280 778 </string>
+               <key>29</key>
+               <string>69 316 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>667</string>
+       <string>489.0</string>
        <key>IBLastKnownRelativeProjectPath</key>
        <string>../../vlc.xcodeproj</string>
        <key>IBOldestOS</key>
        <integer>5</integer>
        <key>IBOpenObjects</key>
        <array>
-               <integer>2197</integer>
+               <integer>282</integer>
                <integer>915</integer>
                <integer>2416</integer>
-               <integer>282</integer>
                <integer>29</integer>
+               <integer>2197</integer>
                <integer>21</integer>
        </array>
        <key>IBSystem Version</key>
-       <string>9D34</string>
+       <string>9E17</string>
        <key>targetFramework</key>
        <string>IBCocoaFramework</string>
 </dict>
index d9e0fa3014dffb4a3ba47a446997863e78d3fa2e..ba671302d5296e8b38fc981246d789f3163691ef 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
diff --git a/extras/package/macosx/Resources/English.lproj/SFilters.nib/classes.nib b/extras/package/macosx/Resources/English.lproj/SFilters.nib/classes.nib
deleted file mode 100644 (file)
index c046bed..0000000
+++ /dev/null
@@ -1,52 +0,0 @@
-{
-    IBClasses = (
-        {CLASS = FirstResponder; LANGUAGE = ObjC; SUPERCLASS = NSObject; }, 
-        {
-            ACTIONS = {enableFilter = id; "logo_selectFile" = id; propertyChanged = id; }; 
-            CLASS = VLCsFilters; 
-            LANGUAGE = ObjC; 
-            OUTLETS = {
-                "o_logo_enabled_ckb" = id; 
-                "o_logo_image_btn" = id; 
-                "o_logo_image_fld" = id; 
-                "o_logo_image_lbl" = id; 
-                "o_logo_opaque_lbl" = id; 
-                "o_logo_opaque_sld" = id; 
-                "o_logo_pos_lbl" = id; 
-                "o_logo_pos_radio" = id; 
-                "o_marq_color_lbl" = id; 
-                "o_marq_color_pop" = id; 
-                "o_marq_enabled_ckb" = id; 
-                "o_marq_marq_fld" = id; 
-                "o_marq_marq_lbl" = id; 
-                "o_marq_opaque_lbl" = id; 
-                "o_marq_opaque_sld" = id; 
-                "o_marq_pos_lbl" = id; 
-                "o_marq_pos_radio" = id; 
-                "o_marq_size_inPx_lbl" = id; 
-                "o_marq_size_lbl" = id; 
-                "o_marq_size_pop" = id; 
-                "o_marq_tmOut_fld" = id; 
-                "o_marq_tmOut_lbl" = id; 
-                "o_marq_tmOut_ms_lbl" = id; 
-                "o_sfilter_saveSettings_ckb" = id; 
-                "o_sfilter_tabView" = id; 
-                "o_sfilter_win" = id; 
-                "o_time_color_lbl" = id; 
-                "o_time_color_pop" = id; 
-                "o_time_enabled_ckb" = id; 
-                "o_time_opaque_lbl" = id; 
-                "o_time_opaque_sld" = id; 
-                "o_time_pos_lbl" = id; 
-                "o_time_pos_radio" = id; 
-                "o_time_size_inPx_lbl" = id; 
-                "o_time_size_lbl" = id; 
-                "o_time_size_pop" = id; 
-                "o_time_stamp_fld" = id; 
-                "o_time_stamp_lbl" = id; 
-            }; 
-            SUPERCLASS = NSObject; 
-        }
-    ); 
-    IBVersion = 1; 
-}
\ No newline at end of file
diff --git a/extras/package/macosx/Resources/English.lproj/SFilters.nib/info.nib b/extras/package/macosx/Resources/English.lproj/SFilters.nib/info.nib
deleted file mode 100644 (file)
index 9b5cd07..0000000
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-       <key>IBDocumentLocation</key>
-       <string>63 19 356 240 0 0 1440 878 </string>
-       <key>IBFramework Version</key>
-       <string>446.1</string>
-       <key>IBOpenObjects</key>
-       <array>
-               <integer>5</integer>
-       </array>
-       <key>IBSystem Version</key>
-       <string>8I127</string>
-</dict>
-</plist>
diff --git a/extras/package/macosx/Resources/English.lproj/SFilters.nib/keyedobjects.nib b/extras/package/macosx/Resources/English.lproj/SFilters.nib/keyedobjects.nib
deleted file mode 100644 (file)
index 7f2914e..0000000
Binary files a/extras/package/macosx/Resources/English.lproj/SFilters.nib/keyedobjects.nib and /dev/null differ
index 10fe55e290e1f534584d2f6836e2d47864188314..e9cdc17f5a1dc4b17f93642093a0b03cb442a736 100644 (file)
@@ -75,7 +75,6 @@
                CC402EF10E00ABBB006A4BA4 /* Extended.nib in Resources */ = {isa = PBXBuildFile; fileRef = DC7F46EB08A183FC0027DB24 /* Extended.nib */; };
                CC402EF20E00ABBB006A4BA4 /* Bookmarks.nib in Resources */ = {isa = PBXBuildFile; fileRef = DCE7BD0308A56C8B007B10AE /* Bookmarks.nib */; };
                CC402EF30E00ABBB006A4BA4 /* about_bg.png in Resources */ = {isa = PBXBuildFile; fileRef = DCDA5E6408F94518009D93A8 /* about_bg.png */; };
-               CC402EF40E00ABBB006A4BA4 /* SFilters.nib in Resources */ = {isa = PBXBuildFile; fileRef = CCF3C64A0923B99D00401862 /* SFilters.nib */; };
                CC402EF50E00ABBB006A4BA4 /* skip_forward_active_embedded.png in Resources */ = {isa = PBXBuildFile; fileRef = C2F2A6FA0958A6E600018C74 /* skip_forward_active_embedded.png */; };
                CC402EF60E00ABBB006A4BA4 /* play_embedded.png in Resources */ = {isa = PBXBuildFile; fileRef = C2F2A6FC0958A94500018C74 /* play_embedded.png */; };
                CC402EF70E00ABBB006A4BA4 /* pause_embedded.png in Resources */ = {isa = PBXBuildFile; fileRef = C2F2A6FE0958AA9300018C74 /* pause_embedded.png */; };
                8ED6C27E03E2EB1C0059A3A7 /* macosx.m */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.objc; name = macosx.m; path = ../../../modules/gui/macosx/macosx.m; sourceTree = SOURCE_ROOT; };
                8ED6C27F03E2EB1C0059A3A7 /* misc.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = misc.h; path = ../../../modules/gui/macosx/misc.h; sourceTree = SOURCE_ROOT; };
                8ED6C28003E2EB1C0059A3A7 /* misc.m */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.objc; name = misc.m; path = ../../../modules/gui/macosx/misc.m; sourceTree = SOURCE_ROOT; };
-               8ED6C28103E2EB1C0059A3A7 /* open.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = open.h; path = ../../../modules/gui/macosx/open.h; sourceTree = SOURCE_ROOT; };
-               8ED6C28203E2EB1C0059A3A7 /* open.m */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.objc; name = open.m; path = ../../../modules/gui/macosx/open.m; sourceTree = SOURCE_ROOT; };
+               8ED6C28103E2EB1C0059A3A7 /* open.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = open.h; path = ../../../modules/gui/macosx/open.h; sourceTree = SOURCE_ROOT; };
+               8ED6C28203E2EB1C0059A3A7 /* open.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = open.m; path = ../../../modules/gui/macosx/open.m; sourceTree = SOURCE_ROOT; };
                8ED6C28303E2EB1C0059A3A7 /* playlist.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = playlist.h; path = ../../../modules/gui/macosx/playlist.h; sourceTree = SOURCE_ROOT; };
                8ED6C28403E2EB1C0059A3A7 /* playlist.m */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.objc; name = playlist.m; path = ../../../modules/gui/macosx/playlist.m; sourceTree = SOURCE_ROOT; };
                8ED6C28503E2EB1C0059A3A7 /* prefs.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = prefs.h; path = ../../../modules/gui/macosx/prefs.h; sourceTree = SOURCE_ROOT; };
                CC33C24F0D2578F5008C4683 /* volumeslider_graphite.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = volumeslider_graphite.png; path = Resources/volumeslider_graphite.png; sourceTree = "<group>"; };
                CC33C2500D2578F5008C4683 /* fullscreen_graphite.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = fullscreen_graphite.png; path = Resources/fullscreen_graphite.png; sourceTree = "<group>"; };
                CC3DC89B0A7CDB9600B53F32 /* ApplicationServices.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = ApplicationServices.framework; path = /System/Library/Frameworks/ApplicationServices.framework; sourceTree = "<absolute>"; };
-               CC402F4A0E00ABBB006A4BA4 /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
                CC402F4B0E00ABBB006A4BA4 /* VLC.bundle */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = VLC.bundle; sourceTree = BUILT_PRODUCTS_DIR; };
                CC4ED9AC0ABE07C800CA4CC5 /* add_embedded_blue.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = add_embedded_blue.png; path = Resources/add_embedded_blue.png; sourceTree = "<group>"; };
                CC4ED9AD0ABE07C800CA4CC5 /* add_embedded.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = add_embedded.png; path = Resources/add_embedded.png; sourceTree = "<group>"; };
                CCCB86D80ACFDFB300CF1E10 /* fs_stop_highlight.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = fs_stop_highlight.png; path = Resources/fs_stop_highlight.png; sourceTree = "<group>"; };
                CCCB86D90ACFDFB300CF1E10 /* fs_stop.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = fs_stop.png; path = Resources/fs_stop.png; sourceTree = "<group>"; };
                CCCB86DA0ACFDFB300CF1E10 /* fs_background.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = fs_background.png; path = Resources/fs_background.png; sourceTree = "<group>"; };
-               CCF3C64B0923B99D00401862 /* English */ = {isa = PBXFileReference; lastKnownFileType = wrapper.nib; name = English; path = Resources/English.lproj/SFilters.nib; sourceTree = "<group>"; };
-               CCF3C6500923B9D100401862 /* sfilters.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = sfilters.h; path = ../../../modules/gui/macosx/sfilters.h; sourceTree = SOURCE_ROOT; };
-               CCF3C6510923B9D100401862 /* sfilters.m */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.objc; name = sfilters.m; path = ../../../modules/gui/macosx/sfilters.m; sourceTree = SOURCE_ROOT; };
                DC769AB7085DF0DB001A838D /* wizard.m */ = {isa = PBXFileReference; fileEncoding = 5; indentWidth = 4; lastKnownFileType = sourcecode.c.objc; name = wizard.m; path = ../../../modules/gui/macosx/wizard.m; sourceTree = SOURCE_ROOT; tabWidth = 4; usesTabs = 0; };
                DC769AB8085DF0DB001A838D /* wizard.h */ = {isa = PBXFileReference; fileEncoding = 5; lastKnownFileType = sourcecode.c.h; name = wizard.h; path = ../../../modules/gui/macosx/wizard.h; sourceTree = SOURCE_ROOT; };
                DC7F46EC08A183FC0027DB24 /* English */ = {isa = PBXFileReference; lastKnownFileType = wrapper.nib; name = English; path = Resources/English.lproj/Extended.nib; sourceTree = "<group>"; };
                                089C167CFE841241C02AAC07 /* Resources */,
                                089C1671FE841209C02AAC07 /* Frameworks and Libraries */,
                                19C28FB8FE9D52D311CA2CBB /* Products */,
-                               CC402F4A0E00ABBB006A4BA4 /* Info.plist */,
                        );
                        name = vlc;
                        sourceTree = "<group>";
                                DC7F46F108A187F60027DB24 /* extended.m */,
                                DCE7BD0708A5724D007B10AE /* bookmarks.h */,
                                DCE7BD0608A5724D007B10AE /* bookmarks.m */,
-                               CCF3C6500923B9D100401862 /* sfilters.h */,
-                               CCF3C6510923B9D100401862 /* sfilters.m */,
                                CC26BF3109A7A08C00E94D62 /* update.h */,
                                CC26BF3209A7A08C00E94D62 /* update.m */,
                                CC6D8D9C0A878DED006F2BBE /* AppleRemote.h */,
                                DCFCCDB7085CE18F001E36AF /* Wizard.nib */,
                                DC7F46EB08A183FC0027DB24 /* Extended.nib */,
                                DCE7BD0308A56C8B007B10AE /* Bookmarks.nib */,
-                               CCF3C64A0923B99D00401862 /* SFilters.nib */,
                                CC26BF2A09A7A05000E94D62 /* Update.nib */,
                                CC1B4B4B09A8CF9E0078AD2E /* Interaction.nib */,
                                CC1AC1BA0A7BDA41002478C3 /* InteractionErrorPanel.nib */,
                                CC402EF10E00ABBB006A4BA4 /* Extended.nib in Resources */,
                                CC402EF20E00ABBB006A4BA4 /* Bookmarks.nib in Resources */,
                                CC402EF30E00ABBB006A4BA4 /* about_bg.png in Resources */,
-                               CC402EF40E00ABBB006A4BA4 /* SFilters.nib in Resources */,
                                CC402EF50E00ABBB006A4BA4 /* skip_forward_active_embedded.png in Resources */,
                                CC402EF60E00ABBB006A4BA4 /* play_embedded.png in Resources */,
                                CC402EF70E00ABBB006A4BA4 /* pause_embedded.png in Resources */,
                        name = MediaInfo.nib;
                        sourceTree = "<group>";
                };
-               CCF3C64A0923B99D00401862 /* SFilters.nib */ = {
-                       isa = PBXVariantGroup;
-                       children = (
-                               CCF3C64B0923B99D00401862 /* English */,
-                       );
-                       name = SFilters.nib;
-                       sourceTree = "<group>";
-               };
                DC7F46EB08A183FC0027DB24 /* Extended.nib */ = {
                        isa = PBXVariantGroup;
                        children = (
                                GCC_ENABLE_FIX_AND_CONTINUE = NO;
                                GCC_SYMBOLS_PRIVATE_EXTERN = NO;
                                HEADER_SEARCH_PATHS = "";
-                               INFOPLIST_FILE = "Info.plist";
+                               INFOPLIST_FILE = Info.plist;
                                INSTALL_PATH = "$(HOME)/Library/Bundles";
                                JAVAC_SOURCE_FILE_ENCODING = "ISO-8859-1";
                                LIBRARY_SEARCH_PATHS = /Volumes/Genitus/vlc/modules/gui/macosx;
                                FRAMEWORK_SEARCH_PATHS = "";
                                GCC_SYMBOLS_PRIVATE_EXTERN = NO;
                                HEADER_SEARCH_PATHS = "";
-                               INFOPLIST_FILE = "Info.plist";
+                               INFOPLIST_FILE = Info.plist;
                                INSTALL_PATH = "$(HOME)/Library/Bundles";
                                JAVAC_SOURCE_FILE_ENCODING = "ISO-8859-1";
                                LIBRARY_SEARCH_PATHS = /Volumes/Genitus/vlc/modules/gui/macosx;
index 9b1aec15b955f2bc836065cea1cb65c2c424b833..d3e68e94c1a59795430c09e877c42557c4f6d437 100644 (file)
@@ -47,8 +47,6 @@ SOURCES_macosx = \
        extended.m \
        bookmarks.h \
        bookmarks.m \
-       sfilters.h \
-       sfilters.m \
        embeddedwindow.h \
        embeddedwindow.m \
        fspanel.m \
index bc17c797fab95a1b7ab5b4c81cd76c0215ade154..ac26f9d99b149648e7512eb7bacb2699c49aacf8 100644 (file)
@@ -109,7 +109,6 @@ struct intf_sys_t
     id o_bookmarks;             /* VLCBookmarks   */
     id o_embedded_list;         /* VLCEmbeddedList*/
     id o_interaction_list;      /* VLCInteractionList*/
-    id o_sfilters;              /* VLCsFilters    */
     id o_info;                  /* VLCInformation */
 #ifdef UPDATE_CHECK
     id o_update;                /* VLCUpdate      */
@@ -121,7 +120,6 @@ struct intf_sys_t
     BOOL nib_wizard_loaded;     /* wizard nibfile */
     BOOL nib_extended_loaded;   /* extended nibfile */
     BOOL nib_bookmarks_loaded;  /* bookmarks nibfile */
-    BOOL nib_sfilters_loaded;   /* sfilters nibfile */
     BOOL nib_prefs_loaded;      /* preferences nibfile */
     BOOL nib_update_loaded;     /* update nibfile */
     BOOL nib_info_loaded;       /* information panel nibfile */
@@ -366,7 +364,6 @@ struct intf_sys_t
 - (IBAction)showWizard:(id)sender;
 - (IBAction)showExtended:(id)sender;
 - (IBAction)showBookmarks:(id)sender;
-- (IBAction)showSFilters:(id)sender;
 
 - (IBAction)viewAbout:(id)sender;
 - (IBAction)showLicense:(id)sender;
index c0c86f4c3fa3075edf1892afc2d17d3056612460..792cb2a3ee7322b67f7d3962eafb85154cea69ab 100644 (file)
@@ -48,7 +48,6 @@
 #import "wizard.h"
 #import "extended.h"
 #import "bookmarks.h"
-#import "sfilters.h"
 #import "interaction.h"
 #import "embeddedwindow.h"
 #import "update.h"
@@ -351,7 +350,6 @@ static VLCMain *_o_sharedMainInstance = nil;
     o_embedded_list = [[VLCEmbeddedList alloc] init];
     o_interaction_list = [[VLCInteractionList alloc] init];
     o_info = [[VLCInfo alloc] init];
-    o_sfilters = nil;
 #ifdef UPDATE_CHECK
     o_update = [[VLCUpdate alloc] init];
 #endif
@@ -1886,22 +1884,6 @@ end:
     [o_extended showPanel];
 }
 
-- (IBAction)showSFilters:(id)sender
-{
-    if( o_sfilters == nil )
-    {
-        o_sfilters = [[VLCsFilters alloc] init];
-    }
-    if( !nib_sfilters_loaded )
-    {
-        nib_sfilters_loaded = [NSBundle loadNibNamed:@"SFilters" owner:self];
-        [o_sfilters initStrings];
-        [o_sfilters showAsPanel];
-    } else {
-        [o_sfilters showAsPanel];
-    }
-}
-
 - (IBAction)showBookmarks:(id)sender
 {
     /* we need the wizard-nib for the bookmarks's extract functionality */
diff --git a/modules/gui/macosx/sfilters.h b/modules/gui/macosx/sfilters.h
deleted file mode 100644 (file)
index 054590c..0000000
+++ /dev/null
@@ -1,94 +0,0 @@
-/*****************************************************************************
- * sfilter.h: MacOS X Subpicture filters dialogue
- *****************************************************************************
- * Copyright (C) 2005-2008 the VideoLAN team
- * $Id$
- *
- * Authors: Felix Paul Kühne <fkuehne -at- videolan -dot- org>
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
- *****************************************************************************/
-
-#import <Cocoa/Cocoa.h>
-#import "intf.h"
-#import <vlc_common.h>
-
-@interface VLCsFilters : NSObject
-{
-    /* window stuff */
-    IBOutlet id o_sfilter_tabView;
-    IBOutlet id o_sfilter_win;
-    IBOutlet id o_sfilter_saveSettings_ckb;
-
-    /* logo section */
-    IBOutlet id o_logo_enabled_ckb;
-    IBOutlet id o_logo_image_btn;
-    IBOutlet id o_logo_image_fld;
-    IBOutlet id o_logo_image_lbl;
-    IBOutlet id o_logo_opaque_lbl;
-    IBOutlet id o_logo_opaque_sld;
-    IBOutlet id o_logo_pos_lbl;
-    IBOutlet id o_logo_pos_radio;
-
-    /* marquee section */
-    IBOutlet id o_marq_enabled_ckb;
-    IBOutlet id o_marq_color_lbl;
-    IBOutlet id o_marq_color_pop;
-    IBOutlet id o_marq_marq_fld;
-    IBOutlet id o_marq_marq_lbl;
-    IBOutlet id o_marq_opaque_lbl;
-    IBOutlet id o_marq_opaque_sld;
-    IBOutlet id o_marq_pos_lbl;
-    IBOutlet id o_marq_pos_radio;
-    IBOutlet id o_marq_size_inPx_lbl;
-    IBOutlet id o_marq_size_lbl;
-    IBOutlet id o_marq_size_pop;
-    IBOutlet id o_marq_tmOut_fld;
-    IBOutlet id o_marq_tmOut_lbl;
-    IBOutlet id o_marq_tmOut_ms_lbl;
-
-    /* time section */
-    IBOutlet id o_time_enabled_ckb;
-    IBOutlet id o_time_color_lbl;
-    IBOutlet id o_time_color_pop;
-    IBOutlet id o_time_opaque_lbl;
-    IBOutlet id o_time_opaque_sld;
-    IBOutlet id o_time_pos_lbl;
-    IBOutlet id o_time_pos_radio;
-    IBOutlet id o_time_size_inPx_lbl;
-    IBOutlet id o_time_size_lbl;
-    IBOutlet id o_time_size_pop;
-    IBOutlet id o_time_stamp_fld;
-    IBOutlet id o_time_stamp_lbl;
-
-    BOOL o_config_changed;
-    BOOL o_save_settings;
-    NSArray * o_colors;
-}
-
-
-+ (VLCsFilters *)sharedInstance;
-- (IBAction)logo_selectFile:(id)sender;
-- (IBAction)propertyChanged:(id)sender;
-- (IBAction)enableFilter:(id)sender;
-
-- (void)showAsPanel;
-- (void)initStrings;
-- (void)changeFiltersString: (char *)psz_name onOrOff: (bool )b_add;
-- (void)enableTime;
-- (void)enableLogo;
-- (void)enableMarq;
-
-@end
diff --git a/modules/gui/macosx/sfilters.m b/modules/gui/macosx/sfilters.m
deleted file mode 100644 (file)
index b20967a..0000000
+++ /dev/null
@@ -1,598 +0,0 @@
-/*****************************************************************************
- * sfilter.m: MacOS X Subpicture filters dialogue
- *****************************************************************************
- * Copyright (C) 2005-2008 the VideoLAN team
- * $Id$
- *
- * Authors: Felix Paul Kühne <fkuehne -at -videolan -dot- org>
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
- *****************************************************************************/
-
-
-/*****************************************************************************
- * Note:
- * the code used to bind with VLC's core is partially based upon the
- * RC-interface, written by Antoine Cellerier and Mark F. Moriarty
- * (members of the VideoLAN team)
- *****************************************************************************/
-
-#import "sfilters.h"
-#import <vlc_vout.h>
-
-/* TODO:
-    - check for memory leaks
-    - save the preferences, if requested
-*/
-
-@implementation VLCsFilters
-
-static VLCsFilters *_o_sharedInstance = nil;
-
-+ (VLCsFilters *)sharedInstance
-{
-    return _o_sharedInstance ? _o_sharedInstance : [[self alloc] init];
-}
-
-- (id)init
-{
-    if (_o_sharedInstance) {
-        [self dealloc];
-    } else {
-        _o_sharedInstance = [super init];
-    }
-
-    return _o_sharedInstance;
-}
-
-- (void)dealloc
-{
-    [o_colors release];
-
-    [super dealloc];
-}
-
-- (void)initStrings
-{
-    [o_sfilter_win setTitle: _NS("Subpicture Filters")];
-    [[o_sfilter_tabView tabViewItemAtIndex: 0] setLabel: _NS("Logo")];
-    [[o_sfilter_tabView tabViewItemAtIndex: 1] setLabel: _NS("Time")];
-    [[o_sfilter_tabView tabViewItemAtIndex: 2] setLabel: _NS("Marquee")];
-    [o_sfilter_saveSettings_ckb setTitle: _NS("Save settings")];
-    [o_logo_image_btn setTitle: _NS("Browse...")];
-    [o_logo_enabled_ckb setTitle: _NS("Enabled")];
-    [o_logo_image_lbl setStringValue: _NS("Image:")];
-    [o_logo_pos_lbl setStringValue: _NS("Position:")];
-    [o_logo_opaque_lbl setStringValue: _NS("Opaqueness")];
-    [o_time_enabled_ckb setTitle: _NS("Enabled")];
-    [o_time_stamp_lbl setStringValue: _NS("Timestamp:")];
-    [o_time_size_lbl setStringValue: _NS("Size:")];
-    [o_time_color_lbl setStringValue: _NS("Color:")];
-    [o_time_opaque_lbl setStringValue: _NS("Opaqueness:")];
-    [o_time_pos_lbl setStringValue: _NS("Position:")];
-    [o_time_size_inPx_lbl setStringValue: _NS("(in pixels)")];
-    [o_marq_enabled_ckb setTitle: _NS("Enabled")];
-    [o_marq_color_lbl setStringValue: _NS("Color:")];
-    [o_marq_marq_lbl setStringValue: _NS("Marquee:")];
-    [o_marq_opaque_lbl setStringValue: _NS("Opaqueness")];
-    [o_marq_tmOut_lbl setStringValue: _NS("Timeout:")];
-    [o_marq_tmOut_ms_lbl setStringValue: _NS("ms")];
-    [o_marq_pos_lbl setStringValue: _NS("Position:")];
-    [o_marq_size_lbl setStringValue: _NS("Size:")];
-    [o_time_color_lbl setStringValue: _NS("(in pixels)")];
-}
-
-- (void)awakeFromNib
-{
-    /* colors as implemented at the beginning of marq.c and time.c
-     * feel free to add more colors, but remember to add them to these files
-     * as well to keep a certain level of consistency across the interfaces */
-    NSArray * o_default;
-    NSArray * o_black;
-    NSArray * o_gray;
-    NSArray * o_silver;
-    NSArray * o_white;
-    NSArray * o_maroon;
-    NSArray * o_red;
-    NSArray * o_fuchsia;
-    NSArray * o_yellow;
-    NSArray * o_olive;
-    NSArray * o_green;
-    NSArray * o_teal;
-    NSArray * o_lime;
-    NSArray * o_purple;
-    NSArray * o_navy;
-    NSArray * o_blue;
-    NSArray * o_aqua;
-    o_default = [NSArray arrayWithObjects: _NS("Default"), @"-1", nil];
-    o_black = [NSArray arrayWithObjects: _NS("Black"), @"0x000000", nil];
-    o_gray = [NSArray arrayWithObjects: _NS("Gray"), @"0x808080", nil];
-    o_silver = [NSArray arrayWithObjects: _NS("Silver"), @"0xC0C0C0", nil];
-    o_white = [NSArray arrayWithObjects: _NS("White"), @"0xFFFFFF", nil];
-    o_maroon = [NSArray arrayWithObjects: _NS("Maroon"), @"0x800000", nil];
-    o_red = [NSArray arrayWithObjects: _NS("Red"), @"0xFF0000", nil];
-    o_fuchsia = [NSArray arrayWithObjects: _NS("Fuchsia"), @"0xFF00FF", nil];
-    o_yellow = [NSArray arrayWithObjects: _NS("Yellow"), @"0xFFFF00", nil];
-    o_olive = [NSArray arrayWithObjects: _NS("Olive"), @"0x808000", nil];
-    o_green = [NSArray arrayWithObjects: _NS("Green"), @"0x008000", nil];
-    o_teal = [NSArray arrayWithObjects: _NS("Teal"), @"0x008080", nil];
-    o_lime = [NSArray arrayWithObjects: _NS("Lime"), @"0x00FF00", nil];
-    o_purple = [NSArray arrayWithObjects: _NS("Purple"), @"0x800080", nil];
-    o_navy = [NSArray arrayWithObjects: _NS("Navy"), @"0x000080", nil];
-    o_blue = [NSArray arrayWithObjects: _NS("Blue"), @"0x0000FF", nil];
-    o_aqua = [NSArray arrayWithObjects: _NS("Aqua"), @"0x00FFFF", nil];
-    o_colors = [[NSArray alloc] initWithObjects: o_default, o_black, o_gray,
-        o_silver, o_white, o_maroon, o_red, o_fuchsia, o_yellow, o_olive,
-        o_green, o_teal, o_lime, o_purple, o_navy, o_blue, o_aqua, nil];
-
-    unsigned int x = 0;
-    [o_marq_color_pop removeAllItems];
-    [o_time_color_pop removeAllItems];
-    /* we are adding tags to the items, so we can easily identify them even if
-     * the menu was sorted */
-    while (x != [o_colors count])
-    {
-        [o_marq_color_pop addItemWithTitle: [[o_colors objectAtIndex:x]
-            objectAtIndex:0]];
-        [[o_marq_color_pop lastItem] setTag: x];
-        [o_time_color_pop addItemWithTitle: [[o_colors objectAtIndex:x]
-            objectAtIndex:0]];
-        [[o_time_color_pop lastItem] setTag: x];
-        x = (x + 1);
-    }
-
-    [o_marq_color_pop selectItemAtIndex:0];
-    [o_time_color_pop selectItemAtIndex:0];
-
-    NSArray * o_sizes;
-    o_sizes = [[NSArray alloc] initWithObjects: @"6", @"8", @"10", @"11", @"12",\
-        @"13", @"14", @"16", @"18", @"24", @"36", @"48", @"64", @"72", @"96",
-        @"144", @"288", nil];
-    [o_marq_size_pop removeAllItems];
-    [o_marq_size_pop addItemsWithTitles: o_sizes];
-    [o_time_size_pop removeAllItems];
-    [o_time_size_pop addItemsWithTitles: o_sizes];
-    [o_sizes release];
-}
-
-- (void)showAsPanel
-{
-    char * psz_temp;
-
-    /* called from intf.m */
-    [o_sfilter_win displayIfNeeded];
-    [o_sfilter_win makeKeyAndOrderFront:nil];
-
-    intf_thread_t * p_intf = VLCIntf;
-
-    /* retrieve the marquee settings */
-    int x = 0;
-    int tempInt = config_GetInt( p_intf, "marq-color" );
-    while( strtol([[[o_colors objectAtIndex:x] objectAtIndex:1] UTF8String],
-        NULL, 0) != tempInt )
-    {
-        x = (x + 1);
-        if( x >= [o_marq_color_pop numberOfItems] )
-        {
-            x = 0;
-            return;
-        }
-    }
-    [o_marq_color_pop selectItemAtIndex: x];
-    if( psz_temp = config_GetPsz( p_intf, "time-format" ) )
-        [o_marq_marq_fld setStringValue: [NSString stringWithUTF8String: psz_temp]];
-    else
-        [o_marq_marq_fld setStringValue: _NS("Not Available")];
-    [o_marq_opaque_sld setIntValue: config_GetInt( p_intf, "marq-opacity")];
-    [o_marq_pos_radio selectCellWithTag: config_GetInt( p_intf, "marq-position" )];
-    /* FIXME: the following line doesn't work with "-1", which is the default
-     * value */
-    [o_marq_size_pop selectItemWithTitle:
-        [[NSNumber numberWithInt: config_GetInt( p_intf, "marq-size" )]
-            stringValue]];
-    [o_marq_size_pop selectItemAtIndex: x];
-    [o_marq_tmOut_fld setStringValue: [[NSNumber numberWithInt:
-        config_GetInt( p_intf, "marq-timeout" )] stringValue]];
-    /* retrieve the time settings */
-    x = 0;
-    tempInt = config_GetInt( p_intf, "time-color" );
-    while( strtol([[[o_colors objectAtIndex:x] objectAtIndex:1] UTF8String], NULL, 0) != tempInt )
-    {
-        x = (x + 1);
-        if( x >= [o_time_color_pop numberOfItems] )
-        {
-            x = 0;
-            return;
-        }
-    }
-    [o_time_color_pop selectItemAtIndex: x];
-    if( psz_temp = config_GetPsz( p_intf, "time-format" ) )
-        [o_time_stamp_fld setStringValue: [NSString stringWithUTF8String: psz_temp]];
-    else
-        [o_time_stamp_fld setStringValue: _NS("Not Available")];
-
-    [o_time_opaque_sld setIntValue: config_GetInt( p_intf, "time-opacity")];
-    /* FIXME: the following line doesn't work with "-1", which is the default
-     * value */
-    [o_time_size_pop selectItemWithTitle:
-        [[NSNumber numberWithInt: config_GetInt( p_intf, "time-size" )]
-            stringValue]];
-    [o_time_pos_radio selectCellWithTag: config_GetInt( p_intf, "time-position" )];
-
-    /* retrieve the logo settings */
-    [o_logo_opaque_sld setIntValue: config_GetInt( p_intf, "logo-transparency")];
-    /* in case that no path has been saved yet */
-    if( psz_temp = config_GetPsz( p_intf, "logo-file" ) )
-        [o_logo_image_fld setStringValue: [NSString stringWithUTF8String: psz_temp]];
-    else
-        [o_logo_image_fld setStringValue: @""];
-    [o_logo_pos_radio selectCellWithTag: config_GetInt( p_intf, "logo-position" )];
-    /* enable the requested filters */
-    char * psz_subfilters;
-    psz_subfilters = config_GetPsz( p_intf, "sub-filter" );
-    if( psz_subfilters )
-    {
-        if( strstr( psz_subfilters, "marq") )
-            [o_marq_enabled_ckb setState: YES];
-        else
-            [o_marq_enabled_ckb setState: NO];
-        if( strstr( psz_subfilters, "logo") )
-            [o_logo_enabled_ckb setState: YES];
-        else
-            [o_logo_enabled_ckb setState: NO];
-        if( strstr( psz_subfilters, "time") )
-            [o_time_enabled_ckb setState: YES];
-        else
-            [o_time_enabled_ckb setState: NO];
-    }
-    [self enableMarq];
-    [self enableLogo];
-    [self enableTime];
-}
-
-- (IBAction)logo_selectFile:(id)sender
-{
-    NSOpenPanel * openPanel = [NSOpenPanel openPanel];
-    SEL sel = @selector(logo_getFile:returnCode:contextInfo:);
-    [openPanel beginSheetForDirectory:nil file:nil types: [NSArray
-        arrayWithObjects: @"png", @"PNG", @"'PNGf'", nil] modalForWindow:
-        o_sfilter_win modalDelegate:self didEndSelector:sel contextInfo:nil];
-}
-
-- (void)logo_getFile: (NSOpenPanel *)sheet returnCode:
-    (int)returnCode contextInfo: (void *)contextInfo
-{
-    if (returnCode == NSOKButton)
-    {
-        [o_logo_image_fld setStringValue: [sheet filename]];
-        /* Make sure we notice that */
-        [self propertyChanged: o_logo_image_fld];
-    }
-}
-
-- (IBAction)propertyChanged:(id)sender
-{
-    intf_thread_t * p_intf = VLCIntf;
-    input_thread_t * p_input = (input_thread_t *)vlc_object_find( p_intf,
-        VLC_OBJECT_INPUT, FIND_ANYWHERE );
-
-    vlc_value_t val;
-
-    /* general properties */
-    if( sender == o_sfilter_saveSettings_ckb)
-    {
-        o_save_settings = [o_sfilter_saveSettings_ckb state];
-    }
-
-    /* marquee */
-    else if( sender == o_marq_marq_fld )
-    {
-        if( [[o_marq_marq_fld stringValue] length] == 0 )
-        {
-            val.psz_string = (char *)"";
-        }
-        else
-        {
-            val.psz_string = (char *)[[o_marq_marq_fld stringValue] UTF8String];
-        }
-
-        if( p_input )
-            var_Set( p_input->p_libvlc, "marq-marquee", val );
-
-        config_PutPsz( p_intf, "marq-marquee", val.psz_string );
-    }
-
-    else if( sender == o_marq_pos_radio )
-    {
-        val.i_int = [[o_marq_pos_radio selectedCell] tag];
-
-        if( p_input )
-            var_Set( p_input->p_libvlc, "marq-position", val );
-
-        config_PutInt( p_intf, "marq-position", val.i_int );
-    }
-
-    else if( sender == o_marq_color_pop )
-    {
-        val.i_int = strtol( [[[o_colors objectAtIndex: [o_marq_color_pop
-            indexOfSelectedItem]] objectAtIndex: 1] UTF8String], NULL, 0 );
-
-        if( p_input )
-            var_Set( p_input->p_libvlc, "marq-color", val );
-
-        config_PutInt( p_intf, "marq-color", val.i_int );
-    }
-
-    else if( sender == o_marq_opaque_sld )
-    {
-        val.i_int = [o_marq_opaque_sld intValue];
-
-        if( p_input )
-            var_Set( p_input->p_libvlc, "marq-opacity", val );
-
-        config_PutInt( p_intf, "marq-opacity", val.i_int );
-    }
-
-    else if( sender == o_marq_size_pop )
-    {
-        val.i_int = [[o_marq_size_pop titleOfSelectedItem] intValue];
-
-        if( p_input )
-            var_Set( p_input->p_libvlc, "marq-size", val );
-
-        config_PutInt( p_intf, "marq-size", val.i_int );
-    }
-
-    else if( sender == o_marq_tmOut_fld && [[sender stringValue] length] > 0 )
-    {
-        val.i_int = [o_marq_tmOut_fld intValue];
-
-        if( p_input )
-            var_Set( p_input->p_libvlc, "marq-timeout", val );
-
-        config_PutInt( p_intf, "marq-timeout", val.i_int );
-    }
-    /* time */
-    else if( sender == o_time_stamp_fld )
-    {
-        if( [[o_time_stamp_fld stringValue] length] == 0 )
-        {
-            val.psz_string = (char *)"";
-        }
-        else
-        {
-            val.psz_string = (char *)[[o_time_stamp_fld stringValue] UTF8String];
-        }
-
-        if( p_input )
-            var_Set( p_input->p_libvlc, "time-format", val );
-
-        config_PutPsz( p_intf, "time-format", val.psz_string );
-    }
-
-    else if( sender == o_time_pos_radio )
-    {
-        val.i_int = [[o_time_pos_radio selectedCell] tag];
-
-        if( p_input )
-            var_Set( p_input->p_libvlc, "time-position", val );
-
-        config_PutInt( p_intf, "time-position", val.i_int );
-    }
-
-    else if( sender == o_time_color_pop )
-    {
-        val.i_int = strtol( [[[o_colors objectAtIndex: [o_time_color_pop
-            indexOfSelectedItem]] objectAtIndex: 1] UTF8String], NULL, 0 );
-
-        if( p_input )
-            var_Set( p_input->p_libvlc, "time-color", val );
-
-        config_PutInt( p_intf, "time-color", val.i_int );
-    }
-
-    else if( sender == o_time_opaque_sld )
-    {
-        val.i_int = [o_time_opaque_sld intValue];
-
-        if( p_input )
-            var_Set( p_input->p_libvlc, "time-opacity", val );
-
-        config_PutInt( p_intf, "time-opacity", val.i_int );
-    }
-
-    else if( sender == o_time_size_pop )
-    {
-        val.i_int = [[o_time_size_pop titleOfSelectedItem] intValue];
-
-        if( p_input )
-            var_Set( p_input->p_libvlc, "time-size", val );
-
-        config_PutInt( p_intf, "time-size", val.i_int );
-    }
-
-    /* logo */
-    else if( sender == o_logo_opaque_sld )
-    {
-        val.i_int = [o_logo_opaque_sld intValue];
-
-        if( p_input )
-            var_Set( p_input->p_libvlc, "logo-transparency", val );
-
-        config_PutInt( p_intf, "logo-transparency", val.i_int );
-    }
-
-    else if( sender == o_logo_pos_radio )
-    {
-        val.i_int = [[o_logo_pos_radio selectedCell] tag];
-
-        if( p_input )
-            var_Set( p_input->p_libvlc, "logo-position", val );
-
-        config_PutInt( p_intf, "logo-position", val.i_int );
-    }
-    else if ( sender == o_logo_image_fld )
-    {
-        val.psz_string = (char *)[[o_logo_image_fld stringValue] UTF8String];
-
-        if( p_input )
-            var_Set( p_input->p_libvlc, "logo-file", val );
-
-        config_PutPsz( p_intf, "logo-file", val.psz_string );
-    }
-    else
-    {
-        /* just in case */
-        msg_Err( p_intf, "couldn't find any action for sender" );
-    }
-
-    /* clean up */
-    if ( p_input )
-    {
-        o_config_changed = YES;
-        vlc_object_release( p_input );
-    }
-}
-
-- (IBAction)enableFilter:(id)sender
-{
-    if( sender == o_marq_enabled_ckb )
-    {
-        [self changeFiltersString:"marq" onOrOff: [o_marq_enabled_ckb state]];
-
-        [self enableMarq];
-    }
-    if( sender == o_logo_enabled_ckb )
-    {
-        [self changeFiltersString:"logo" onOrOff: [o_logo_enabled_ckb state]];
-
-        [self enableLogo];
-    }
-    if( sender == o_time_enabled_ckb )
-    {
-        [self changeFiltersString:"time" onOrOff: [o_time_enabled_ckb state]];
-
-        [self enableTime];
-    }
-}
-
-- (void)enableMarq
-{
-    [o_marq_color_pop setEnabled: [o_marq_enabled_ckb state]];
-    [o_marq_marq_fld setEnabled: [o_marq_enabled_ckb state]];
-    [o_marq_opaque_sld setEnabled: [o_marq_enabled_ckb state]];
-    [o_marq_size_pop setEnabled: [o_marq_enabled_ckb state]];
-    [o_marq_tmOut_fld setEnabled: [o_marq_enabled_ckb state]];
-    [o_marq_pos_radio setEnabled: [o_marq_enabled_ckb state]];
-}
-
-- (void)enableTime
-{
-    [o_time_color_pop setEnabled: [o_time_enabled_ckb state]];
-    [o_time_stamp_fld setEnabled: [o_time_enabled_ckb state]];
-    [o_time_opaque_sld setEnabled: [o_time_enabled_ckb state]];
-    [o_time_size_pop setEnabled: [o_time_enabled_ckb state]];
-    [o_time_pos_radio setEnabled: [o_time_enabled_ckb state]];
-}
-
-- (void)enableLogo
-{
-    [o_logo_image_btn setEnabled: [o_logo_enabled_ckb state]];
-    [o_logo_image_fld setEnabled: [o_logo_enabled_ckb state]];
-    [o_logo_opaque_sld setEnabled: [o_logo_enabled_ckb state]];
-    [o_logo_pos_radio setEnabled: [o_logo_enabled_ckb state]];
-}
-
-- (void)changeFiltersString:(char *)psz_name onOrOff:(bool )b_add
-{
-    /* copied from ../wxwidgets/extrapanel.cpp
-     * renamed to conform with Cocoa's rules
-     * and slightly modified to suit our needs */
-
-    intf_thread_t * p_intf = VLCIntf;
-    char *psz_parser, *psz_string;
-    psz_string = config_GetPsz( p_intf, "sub-filter" );
-    if( !psz_string ) psz_string = strdup("");
-
-    psz_parser = strstr( psz_string, psz_name );
-
-    if( b_add )
-    {
-        if( !psz_parser )
-        {
-            psz_parser = psz_string;
-            asprintf( &psz_string, (*psz_string) ? "%s:%s" : "%s%s",
-                            psz_string, psz_name );
-            free( psz_parser );
-        }
-        else
-        {
-            return;
-        }
-    }
-    else
-    {
-        if( psz_parser )
-        {
-            memmove( psz_parser, psz_parser + strlen(psz_name) +
-                            (*(psz_parser + strlen(psz_name)) == ':' ? 1 : 0 ),
-                            strlen(psz_parser + strlen(psz_name)) + 1 );
-
-            /* Remove trailing : : */
-            if( *(psz_string+strlen(psz_string ) -1 ) == ':' )
-            {
-                *(psz_string+strlen(psz_string ) -1 ) = '\0';
-            }
-         }
-         else
-         {
-             free( psz_string );
-             return;
-         }
-    }
-    config_PutPsz( p_intf, "sub-filter", psz_string );
-    /* Try to set on the fly */
-    /* FIXME: enable this once we support on-the-fly addition of this kind of
-     * filters... */
-    vout_thread_t *p_vout;
-    p_vout = (vout_thread_t *)vlc_object_find( p_intf, VLC_OBJECT_VOUT,
-                                              FIND_ANYWHERE );
-    if( p_vout )
-    {
-        var_SetString( p_vout, "sub-filter", psz_string );
-        vlc_object_release( p_vout );
-    }
-
-    free( psz_string );
-
-    o_config_changed = YES;
-}
-@end