Reworked the Media Information panel
authorFelix Paul Kühne <fkuehne@videolan.org>
Thu, 27 Mar 2008 11:25:33 +0000 (12:25 +0100)
committerFelix Paul Kühne <fkuehne@videolan.org>
Thu, 27 Mar 2008 11:25:33 +0000 (12:25 +0100)
Nicer, easier to use, less memory consuming, faster and prepared for meta data editing.

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/MediaInfo.nib/classes.nib [new file with mode: 0644]
extras/package/macosx/Resources/English.lproj/MediaInfo.nib/info.nib [new file with mode: 0644]
extras/package/macosx/Resources/English.lproj/MediaInfo.nib/keyedobjects.nib [new file with mode: 0644]
extras/package/macosx/Resources/noart.png [new file with mode: 0644]
extras/package/macosx/vlc.xcodeproj/project.pbxproj
modules/gui/macosx/intf.h
modules/gui/macosx/intf.m
modules/gui/macosx/playlistinfo.h
modules/gui/macosx/playlistinfo.m

index d6e93fe..1a777b1 100644 (file)
-{
-    IBClasses = (
-        {CLASS = FirstResponder; LANGUAGE = ObjC; SUPERCLASS = NSObject; }, 
-        {CLASS = ITSlider; LANGUAGE = ObjC; SUPERCLASS = NSSlider; }, 
-        {CLASS = MPSlider; LANGUAGE = ObjC; SUPERCLASS = NSSlider; }, 
-        {CLASS = VLBrushedMetalImageView; LANGUAGE = ObjC; SUPERCLASS = NSImageView; }, 
-        {CLASS = VLCApplication; LANGUAGE = ObjC; SUPERCLASS = NSApplication; }, 
-        {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; 
-                slower = id; 
-                stop = id; 
-                toggleVar = 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; 
-            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 = {faster = id; next = id; play = id; prev = id; slower = id; }; 
-            CLASS = VLCFSPanelView; 
-            LANGUAGE = ObjC; 
-            SUPERCLASS = NSView; 
-        }, 
-        {CLASS = VLCFSTimeSlider; LANGUAGE = ObjC; SUPERCLASS = NSSlider; }, 
-        {
-            ACTIONS = {
-                createOutlineGroup = id; 
-                deleteOutlineGroup = id; 
-                infoCancel = id; 
-                infoOk = id; 
-                toggleInfoPanel = id; 
-                togglePlaylistInfoPanel = id; 
-            }; 
-            CLASS = VLCInfo; 
-            LANGUAGE = ObjC; 
-            OUTLETS = {
-                "o_audio_box" = id; 
-                "o_audio_decoded_lbl" = id; 
-                "o_audio_decoded_txt" = id; 
-                "o_author_lbl" = id; 
-                "o_author_txt" = id; 
-                "o_btn_cancel" = id; 
-                "o_btn_ok" = id; 
-                "o_collection_lbl" = id; 
-                "o_collection_txt" = id; 
-                "o_copyright_lbl" = id; 
-                "o_copyright_txt" = id; 
-                "o_date_lbl" = id; 
-                "o_date_txt" = id; 
-                "o_demux_bitrate_lbl" = id; 
-                "o_demux_bitrate_txt" = id; 
-                "o_demux_bytes_lbl" = id; 
-                "o_demux_bytes_txt" = id; 
-                "o_description_lbl" = id; 
-                "o_description_txt" = id; 
-                "o_displayed_lbl" = id; 
-                "o_displayed_txt" = id; 
-                "o_fps_lbl" = id; 
-                "o_fps_txt" = id; 
-                "o_genre_lbl" = id; 
-                "o_genre_txt" = id; 
-                "o_info_window" = id; 
-                "o_input_bitrate_lbl" = id; 
-                "o_input_bitrate_txt" = id; 
-                "o_input_box" = id; 
-                "o_language_lbl" = id; 
-                "o_language_txt" = id; 
-                "o_lost_abuffers_lbl" = id; 
-                "o_lost_abuffers_txt" = id; 
-                "o_lost_frames_lbl" = id; 
-                "o_lost_frames_txt" = id; 
-                "o_nowPlaying_lbl" = id; 
-                "o_nowPlaying_txt" = id; 
-                "o_outline_view" = id; 
-                "o_played_abuffers_lbl" = id; 
-                "o_played_abuffers_txt" = id; 
-                "o_publisher_lbl" = id; 
-                "o_publisher_txt" = id; 
-                "o_rating_lbl" = id; 
-                "o_rating_txt" = id; 
-                "o_read_bytes_lbl" = id; 
-                "o_read_bytes_txt" = id; 
-                "o_sent_bitrate_lbl" = id; 
-                "o_sent_bitrate_txt" = id; 
-                "o_sent_bytes_lbl" = id; 
-                "o_sent_bytes_txt" = id; 
-                "o_sent_packets_lbl" = id; 
-                "o_sent_packets_txt" = id; 
-                "o_seqNum_lbl" = id; 
-                "o_seqNum_txt" = id; 
-                "o_sout_box" = id; 
-                "o_tab_view" = id; 
-                "o_title_lbl" = id; 
-                "o_title_txt" = id; 
-                "o_uri_lbl" = id; 
-                "o_uri_txt" = id; 
-                "o_video_box" = id; 
-                "o_video_decoded_lbl" = id; 
-                "o_video_decoded_txt" = id; 
-            }; 
-            SUPERCLASS = NSObject; 
-        }, 
-        {
-            ACTIONS = {
-                checkForUpdate = id; 
-                clearRecentItems = 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; 
-                showLicense = id; 
-                showMessagesPanel = id; 
-                showSFilters = id; 
-                showWizard = id; 
-                timesliderUpdate = id; 
-                togglePlaylist = id; 
-                viewAbout = id; 
-                viewErrorsAndWarnings = id; 
-                viewHelp = id; 
-                viewPreferences = id; 
-            }; 
-            CLASS = VLCMain; 
-            LANGUAGE = ObjC; 
-            OUTLETS = {
-                "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_window" = id; 
-                "o_info" = 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_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_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_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_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_playlist" = id; 
-                "o_playlist_view" = id; 
-                "o_scrollfield" = id; 
-                "o_timefield" = id; 
-                "o_timeslider" = 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; 
-            }; 
-            SUPERCLASS = NSObject; 
-        }, 
-        {
-            ACTIONS = {
-                addNode = id; 
-                deleteItem = id; 
-                playItem = id; 
-                preparseItem = id; 
-                recursiveExpandNode = id; 
-                savePlaylist = id; 
-                searchItem = id; 
-                selectAll = id; 
-                sortNodeByAuthor = id; 
-                sortNodeByName = id; 
-            }; 
-            CLASS = VLCPlaylist; 
-            LANGUAGE = ObjC; 
-            OUTLETS = {
-                "o_btn_addNode" = 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_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; 
-            }; 
-            SUPERCLASS = NSObject; 
-        }, 
-        {CLASS = VLCPlaylistView; LANGUAGE = ObjC; SUPERCLASS = NSOutlineView; }, 
-        {CLASS = VLCTimeField; LANGUAGE = ObjC; SUPERCLASS = NSTextField; }, 
-        {CLASS = VLCVoutView; LANGUAGE = ObjC; SUPERCLASS = NSView; }
-    ); 
-    IBVersion = 1; 
-}
\ No newline at end of file
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+       <key>IBClasses</key>
+       <array>
+               <dict>
+                       <key>CLASS</key>
+                       <string>VLCTimeField</string>
+                       <key>LANGUAGE</key>
+                       <string>ObjC</string>
+                       <key>SUPERCLASS</key>
+                       <string>NSTextField</string>
+               </dict>
+               <dict>
+                       <key>CLASS</key>
+                       <string>VLCControllerView</string>
+                       <key>LANGUAGE</key>
+                       <string>ObjC</string>
+                       <key>SUPERCLASS</key>
+                       <string>NSView</string>
+               </dict>
+               <dict>
+                       <key>CLASS</key>
+                       <string>VLCEmbeddedWindow</string>
+                       <key>LANGUAGE</key>
+                       <string>ObjC</string>
+                       <key>OUTLETS</key>
+                       <dict>
+                               <key>o_btn_backward</key>
+                               <string>id</string>
+                               <key>o_btn_forward</key>
+                               <string>id</string>
+                               <key>o_btn_fullscreen</key>
+                               <string>id</string>
+                               <key>o_btn_play</key>
+                               <string>id</string>
+                               <key>o_slider</key>
+                               <string>id</string>
+                               <key>o_time</key>
+                               <string>id</string>
+                               <key>o_view</key>
+                               <string>id</string>
+                       </dict>
+                       <key>SUPERCLASS</key>
+                       <string>NSWindow</string>
+               </dict>
+               <dict>
+                       <key>ACTIONS</key>
+                       <dict>
+                               <key>checkForUpdate</key>
+                               <string>id</string>
+                               <key>clearRecentItems</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_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>VLCPlaylistCommon</string>
+                       <key>LANGUAGE</key>
+                       <string>ObjC</string>
+                       <key>OUTLETS</key>
+                       <dict>
+                               <key>o_outline_view</key>
+                               <string>id</string>
+                               <key>o_tc_author</key>
+                               <string>id</string>
+                               <key>o_tc_duration</key>
+                               <string>id</string>
+                               <key>o_tc_name</key>
+                               <string>id</string>
+                       </dict>
+                       <key>SUPERCLASS</key>
+                       <string>NSObject</string>
+               </dict>
+               <dict>
+                       <key>CLASS</key>
+                       <string>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>
+       </array>
+       <key>IBVersion</key>
+       <string>1</string>
+</dict>
+</plist>
index e810075..8f297d1 100644 (file)
@@ -1,39 +1,24 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
 <plist version="1.0">
 <dict>
-       <key>IBDocumentLocation</key>
-       <string>328 138 478 430 0 0 1280 778 </string>
-       <key>IBEditorPositions</key>
-       <dict>
-               <key>1617</key>
-               <string>788 586 109 149 0 0 1440 878 </string>
-               <key>2197</key>
-               <string>342 466 596 143 0 0 1280 778 </string>
-               <key>2709</key>
-               <string>305 626 508 82 0 0 1024 746 </string>
-               <key>2730</key>
-               <string>348 431 130 249 0 0 1280 778 </string>
-               <key>29</key>
-               <string>109 706 438 44 0 0 1280 778 </string>
-               <key>915</key>
-               <string>777 479 187 249 0 0 1440 878 </string>
-       </dict>
        <key>IBFramework Version</key>
-       <string>446.1</string>
-       <key>IBLockedObjects</key>
-       <array/>
+       <string>644</string>
+       <key>IBLastKnownRelativeProjectPath</key>
+       <string>../../vlc.xcodeproj</string>
+       <key>IBOldestOS</key>
+       <integer>5</integer>
        <key>IBOpenObjects</key>
        <array>
-               <integer>2769</integer>
-               <integer>21</integer>
                <integer>2730</integer>
-               <integer>2416</integer>
-               <integer>1789</integer>
-               <integer>29</integer>
-               <integer>2197</integer>
+               <integer>21</integer>
+               <integer>24</integer>
+               <integer>2769</integer>
+               <integer>1779</integer>
        </array>
        <key>IBSystem Version</key>
-       <string>8S2167</string>
+       <string>9C31</string>
+       <key>targetFramework</key>
+       <string>IBCocoaFramework</string>
 </dict>
 </plist>
index 50173d9..3fd0056 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/MediaInfo.nib/classes.nib b/extras/package/macosx/Resources/English.lproj/MediaInfo.nib/classes.nib
new file mode 100644 (file)
index 0000000..d3e9a37
--- /dev/null
@@ -0,0 +1,171 @@
+<?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>NSApplication</string>
+                       <key>LANGUAGE</key>
+                       <string>ObjC</string>
+                       <key>SUPERCLASS</key>
+                       <string>NSResponder</string>
+               </dict>
+               <dict>
+                       <key>CLASS</key>
+                       <string>NSObject</string>
+                       <key>LANGUAGE</key>
+                       <string>ObjC</string>
+               </dict>
+               <dict>
+                       <key>ACTIONS</key>
+                       <dict>
+                               <key>createOutlineGroup</key>
+                               <string>id</string>
+                               <key>deleteOutlineGroup</key>
+                               <string>id</string>
+                               <key>saveMetaData</key>
+                               <string>id</string>
+                               <key>toggleInfoPanel</key>
+                               <string>id</string>
+                               <key>togglePlaylistInfoPanel</key>
+                               <string>id</string>
+                       </dict>
+                       <key>CLASS</key>
+                       <string>VLCInfo</string>
+                       <key>LANGUAGE</key>
+                       <string>ObjC</string>
+                       <key>OUTLETS</key>
+                       <dict>
+                               <key>o_audio_box</key>
+                               <string>id</string>
+                               <key>o_audio_decoded_lbl</key>
+                               <string>id</string>
+                               <key>o_audio_decoded_txt</key>
+                               <string>id</string>
+                               <key>o_author_lbl</key>
+                               <string>id</string>
+                               <key>o_author_txt</key>
+                               <string>id</string>
+                               <key>o_collection_lbl</key>
+                               <string>id</string>
+                               <key>o_collection_txt</key>
+                               <string>id</string>
+                               <key>o_copyright_lbl</key>
+                               <string>id</string>
+                               <key>o_copyright_txt</key>
+                               <string>id</string>
+                               <key>o_date_lbl</key>
+                               <string>id</string>
+                               <key>o_date_txt</key>
+                               <string>id</string>
+                               <key>o_demux_bitrate_lbl</key>
+                               <string>id</string>
+                               <key>o_demux_bitrate_txt</key>
+                               <string>id</string>
+                               <key>o_demux_bytes_lbl</key>
+                               <string>id</string>
+                               <key>o_demux_bytes_txt</key>
+                               <string>id</string>
+                               <key>o_description_lbl</key>
+                               <string>id</string>
+                               <key>o_description_txt</key>
+                               <string>id</string>
+                               <key>o_displayed_lbl</key>
+                               <string>id</string>
+                               <key>o_displayed_txt</key>
+                               <string>id</string>
+                               <key>o_fps_lbl</key>
+                               <string>id</string>
+                               <key>o_fps_txt</key>
+                               <string>id</string>
+                               <key>o_genre_lbl</key>
+                               <string>id</string>
+                               <key>o_genre_txt</key>
+                               <string>id</string>
+                               <key>o_image_well</key>
+                               <string>id</string>
+                               <key>o_info_window</key>
+                               <string>id</string>
+                               <key>o_input_bitrate_lbl</key>
+                               <string>id</string>
+                               <key>o_input_bitrate_txt</key>
+                               <string>id</string>
+                               <key>o_input_box</key>
+                               <string>id</string>
+                               <key>o_language_lbl</key>
+                               <string>id</string>
+                               <key>o_language_txt</key>
+                               <string>id</string>
+                               <key>o_lost_abuffers_lbl</key>
+                               <string>id</string>
+                               <key>o_lost_abuffers_txt</key>
+                               <string>id</string>
+                               <key>o_lost_frames_lbl</key>
+                               <string>id</string>
+                               <key>o_lost_frames_txt</key>
+                               <string>id</string>
+                               <key>o_nowPlaying_lbl</key>
+                               <string>id</string>
+                               <key>o_nowPlaying_txt</key>
+                               <string>id</string>
+                               <key>o_outline_view</key>
+                               <string>id</string>
+                               <key>o_played_abuffers_lbl</key>
+                               <string>id</string>
+                               <key>o_played_abuffers_txt</key>
+                               <string>id</string>
+                               <key>o_publisher_lbl</key>
+                               <string>id</string>
+                               <key>o_publisher_txt</key>
+                               <string>id</string>
+                               <key>o_read_bytes_lbl</key>
+                               <string>id</string>
+                               <key>o_read_bytes_txt</key>
+                               <string>id</string>
+                               <key>o_saveMetaData_btn</key>
+                               <string>id</string>
+                               <key>o_sent_bitrate_lbl</key>
+                               <string>id</string>
+                               <key>o_sent_bitrate_txt</key>
+                               <string>id</string>
+                               <key>o_sent_bytes_lbl</key>
+                               <string>id</string>
+                               <key>o_sent_bytes_txt</key>
+                               <string>id</string>
+                               <key>o_sent_packets_lbl</key>
+                               <string>id</string>
+                               <key>o_sent_packets_txt</key>
+                               <string>id</string>
+                               <key>o_seqNum_lbl</key>
+                               <string>id</string>
+                               <key>o_seqNum_txt</key>
+                               <string>id</string>
+                               <key>o_sout_box</key>
+                               <string>id</string>
+                               <key>o_tab_view</key>
+                               <string>id</string>
+                               <key>o_title_lbl</key>
+                               <string>id</string>
+                               <key>o_title_txt</key>
+                               <string>id</string>
+                               <key>o_uri_lbl</key>
+                               <string>id</string>
+                               <key>o_uri_txt</key>
+                               <string>id</string>
+                               <key>o_video_box</key>
+                               <string>id</string>
+                               <key>o_video_decoded_lbl</key>
+                               <string>id</string>
+                               <key>o_video_decoded_txt</key>
+                               <string>id</string>
+                       </dict>
+                       <key>SUPERCLASS</key>
+                       <string>NSObject</string>
+               </dict>
+       </array>
+       <key>IBVersion</key>
+       <string>1</string>
+</dict>
+</plist>
diff --git a/extras/package/macosx/Resources/English.lproj/MediaInfo.nib/info.nib b/extras/package/macosx/Resources/English.lproj/MediaInfo.nib/info.nib
new file mode 100644 (file)
index 0000000..2c9d7aa
--- /dev/null
@@ -0,0 +1,20 @@
+<?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>IBFramework Version</key>
+       <string>644</string>
+       <key>IBLastKnownRelativeProjectPath</key>
+       <string>../../vlc.xcodeproj</string>
+       <key>IBOldestOS</key>
+       <integer>5</integer>
+       <key>IBOpenObjects</key>
+       <array>
+               <integer>8</integer>
+       </array>
+       <key>IBSystem Version</key>
+       <string>9C31</string>
+       <key>targetFramework</key>
+       <string>IBCocoaFramework</string>
+</dict>
+</plist>
diff --git a/extras/package/macosx/Resources/English.lproj/MediaInfo.nib/keyedobjects.nib b/extras/package/macosx/Resources/English.lproj/MediaInfo.nib/keyedobjects.nib
new file mode 100644 (file)
index 0000000..e4242fa
Binary files /dev/null and b/extras/package/macosx/Resources/English.lproj/MediaInfo.nib/keyedobjects.nib differ
diff --git a/extras/package/macosx/Resources/noart.png b/extras/package/macosx/Resources/noart.png
new file mode 100644 (file)
index 0000000..89eb543
Binary files /dev/null and b/extras/package/macosx/Resources/noart.png differ
index b758760..b083517 100644 (file)
@@ -77,6 +77,7 @@
                CC1941250B9C1F8400635F6B /* QTKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = CC1941240B9C1F8400635F6B /* QTKit.framework */; };
                CC1AC1BC0A7BDA41002478C3 /* InteractionErrorPanel.nib in Resources */ = {isa = PBXBuildFile; fileRef = CC1AC1BA0A7BDA41002478C3 /* InteractionErrorPanel.nib */; };
                CC1B4B4D09A8CF9E0078AD2E /* Interaction.nib in Resources */ = {isa = PBXBuildFile; fileRef = CC1B4B4B09A8CF9E0078AD2E /* Interaction.nib */; };
+               CC1C41D10D9BAD7F002728FA /* noart.png in Resources */ = {isa = PBXBuildFile; fileRef = CC1C41D00D9BAD7F002728FA /* noart.png */; };
                CC26BF2C09A7A05000E94D62 /* Update.nib in Resources */ = {isa = PBXBuildFile; fileRef = CC26BF2A09A7A05000E94D62 /* Update.nib */; };
                CC33C2220D2572DE008C4683 /* pause_embedded_graphite.png in Resources */ = {isa = PBXBuildFile; fileRef = CC33C2200D2572DE008C4683 /* pause_embedded_graphite.png */; };
                CC33C2230D2572DE008C4683 /* play_embedded_graphite.png in Resources */ = {isa = PBXBuildFile; fileRef = CC33C2210D2572DE008C4683 /* play_embedded_graphite.png */; };
                CC4ED9B80ABE07C800CA4CC5 /* shuffle_embedded_blue.png in Resources */ = {isa = PBXBuildFile; fileRef = CC4ED9B10ABE07C800CA4CC5 /* shuffle_embedded_blue.png */; };
                CC4ED9B90ABE07C800CA4CC5 /* shuffle_embedded.png in Resources */ = {isa = PBXBuildFile; fileRef = CC4ED9B20ABE07C800CA4CC5 /* shuffle_embedded.png */; };
                CC962E2D0CC7992800A56695 /* WebKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = CC962E2C0CC7992800A56695 /* WebKit.framework */; };
+               CCC896BA0D9AA9E9005AE59C /* MediaInfo.nib in Resources */ = {isa = PBXBuildFile; fileRef = CCC896B80D9AA9E8005AE59C /* MediaInfo.nib */; };
                CCCB86DB0ACFDFB300CF1E10 /* fs_time_slider.png in Resources */ = {isa = PBXBuildFile; fileRef = CCCB86C00ACFDFB300CF1E10 /* fs_time_slider.png */; };
                CCCB86DC0ACFDFB400CF1E10 /* fs_skip_next_highlight.png in Resources */ = {isa = PBXBuildFile; fileRef = CCCB86C10ACFDFB300CF1E10 /* fs_skip_next_highlight.png */; };
                CCCB86DD0ACFDFB400CF1E10 /* fs_skip_next.png in Resources */ = {isa = PBXBuildFile; fileRef = CCCB86C20ACFDFB300CF1E10 /* fs_skip_next.png */; };
                        productName = vlc;
                        productReference = 014CEA410018CDE011CA2923 /* VLC.bundle */;
                        productSettingsXML = "<?xml version=\"1.0\" encoding=\"UTF-8\"?>
-<!DOCTYPE plist PUBLIC \"-//Apple Computer//DTD PLIST 1.0//EN\" \"http://www.apple.com/DTDs/PropertyList-1.0.dtd\">
+<!DOCTYPE plist PUBLIC \"-//Apple//DTD PLIST 1.0//EN\" \"http://www.apple.com/DTDs/PropertyList-1.0.dtd\">
 <plist version=\"1.0\">
 <dict>
        <key>CFBundleDevelopmentRegion</key>
                8E445F9A04728A700059A3A7 /* vob.icns */ = {isa = PBXFileReference; lastKnownFileType = image.icns; name = vob.icns; path = Resources/vob.icns; sourceTree = SOURCE_ROOT; };
                8E445F9B04728A700059A3A7 /* wma.icns */ = {isa = PBXFileReference; lastKnownFileType = image.icns; name = wma.icns; path = Resources/wma.icns; sourceTree = SOURCE_ROOT; };
                8E445F9C04728A700059A3A7 /* wmv.icns */ = {isa = PBXFileReference; lastKnownFileType = image.icns; name = wmv.icns; path = Resources/wmv.icns; sourceTree = SOURCE_ROOT; };
-               8E49720006417F6800370C9F /* playlistinfo.h */ = {isa = PBXFileReference; fileEncoding = 5; lastKnownFileType = sourcecode.c.h; name = playlistinfo.h; path = ../../../modules/gui/macosx/playlistinfo.h; sourceTree = SOURCE_ROOT; };
+               8E49720006417F6800370C9F /* playlistinfo.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = playlistinfo.h; path = ../../../modules/gui/macosx/playlistinfo.h; sourceTree = SOURCE_ROOT; };
                8E49720106417F6800370C9F /* playlistinfo.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = playlistinfo.m; path = ../../../modules/gui/macosx/playlistinfo.m; sourceTree = SOURCE_ROOT; };
                8E55FB7F0459B0FD00FB3317 /* output.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = output.h; path = ../../../modules/gui/macosx/output.h; sourceTree = SOURCE_ROOT; };
                8E55FB800459B0FD00FB3317 /* output.m */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.objc; name = output.m; path = ../../../modules/gui/macosx/output.m; sourceTree = SOURCE_ROOT; };
                8EBF3FA303F13FFB0059A3A7 /* vlc.scriptSuite */ = {isa = PBXFileReference; lastKnownFileType = text; name = vlc.scriptSuite; path = Resources/vlc.scriptSuite; sourceTree = SOURCE_ROOT; };
                8EBF3FA503F140960059A3A7 /* vlc.scriptTerminology */ = {isa = PBXFileReference; lastKnownFileType = text.xml; name = vlc.scriptTerminology; path = Resources/vlc.scriptTerminology; sourceTree = SOURCE_ROOT; };
                8ED6C27B03E2EB1C0059A3A7 /* controls.m */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.objc; name = controls.m; path = ../../../modules/gui/macosx/controls.m; sourceTree = SOURCE_ROOT; };
-               8ED6C27C03E2EB1C0059A3A7 /* intf.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = intf.h; path = ../../../modules/gui/macosx/intf.h; sourceTree = SOURCE_ROOT; };
-               8ED6C27D03E2EB1C0059A3A7 /* intf.m */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.objc; name = intf.m; path = ../../../modules/gui/macosx/intf.m; sourceTree = SOURCE_ROOT; };
+               8ED6C27C03E2EB1C0059A3A7 /* intf.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = intf.h; path = ../../../modules/gui/macosx/intf.h; sourceTree = SOURCE_ROOT; };
+               8ED6C27D03E2EB1C0059A3A7 /* intf.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = intf.m; path = ../../../modules/gui/macosx/intf.m; sourceTree = SOURCE_ROOT; };
                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; };
                CC1B4B4C09A8CF9E0078AD2E /* English */ = {isa = PBXFileReference; lastKnownFileType = wrapper.nib; name = English; path = Resources/English.lproj/Interaction.nib; sourceTree = "<group>"; };
                CC1B4C1409A8EC690078AD2E /* interaction.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = interaction.h; path = ../../../modules/gui/macosx/interaction.h; sourceTree = "<group>"; };
                CC1B4C1509A8EC690078AD2E /* interaction.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = interaction.m; path = ../../../modules/gui/macosx/interaction.m; sourceTree = "<group>"; };
+               CC1C41D00D9BAD7F002728FA /* noart.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = noart.png; path = Resources/noart.png; sourceTree = "<group>"; };
                CC26BF2B09A7A05000E94D62 /* English */ = {isa = PBXFileReference; lastKnownFileType = wrapper.nib; name = English; path = Resources/English.lproj/Update.nib; sourceTree = "<group>"; };
                CC26BF3109A7A08C00E94D62 /* update.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = update.h; path = ../../../modules/gui/macosx/update.h; sourceTree = SOURCE_ROOT; };
                CC26BF3209A7A08C00E94D62 /* update.m */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.objc; name = update.m; path = ../../../modules/gui/macosx/update.m; sourceTree = SOURCE_ROOT; };
                CCB24D5E0D54BBAE004D780C /* simple_prefs.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = simple_prefs.h; path = ../../../modules/gui/macosx/simple_prefs.h; sourceTree = SOURCE_ROOT; };
                CCC593780AB4A9FB0004FF52 /* embeddedwindow.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = embeddedwindow.h; path = ../../../modules/gui/macosx/embeddedwindow.h; sourceTree = SOURCE_ROOT; };
                CCC593790AB4A9FB0004FF52 /* embeddedwindow.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = embeddedwindow.m; path = ../../../modules/gui/macosx/embeddedwindow.m; sourceTree = SOURCE_ROOT; };
+               CCC895830D9A8A82005AE59C /* eyetv.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = eyetv.m; path = ../../../modules/access/eyetv.m; sourceTree = SOURCE_ROOT; };
+               CCC896B90D9AA9E8005AE59C /* English */ = {isa = PBXFileReference; lastKnownFileType = wrapper.nib; name = English; path = Resources/English.lproj/MediaInfo.nib; sourceTree = "<group>"; };
                CCCB86C00ACFDFB300CF1E10 /* fs_time_slider.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = fs_time_slider.png; path = Resources/fs_time_slider.png; sourceTree = "<group>"; };
                CCCB86C10ACFDFB300CF1E10 /* fs_skip_next_highlight.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = fs_skip_next_highlight.png; path = Resources/fs_skip_next_highlight.png; sourceTree = "<group>"; };
                CCCB86C20ACFDFB300CF1E10 /* fs_skip_next.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = fs_skip_next.png; path = Resources/fs_skip_next.png; sourceTree = "<group>"; };
                089C166AFE841209C02AAC07 /* vlc */ = {
                        isa = PBXGroup;
                        children = (
+                               CCC8957F0D9A8A61005AE59C /* OSX-specific access */,
                                08FB77AFFE84173DC02AAC07 /* Classes */,
                                089C167CFE841241C02AAC07 /* Resources */,
                                089C1671FE841209C02AAC07 /* Frameworks and Libraries */,
                                8ECA7E520563CD9500DFC000 /* Controller */,
                                F69B0CA602E24F6401A80112 /* InfoPlist.strings */,
                                8EBF3FA303F13FFB0059A3A7 /* vlc.scriptSuite */,
+                               CC1C41D00D9BAD7F002728FA /* noart.png */,
                                CC0B71E00D54F0DD00448E00 /* simple prefs (taken from qt4) */,
                                8EBF3FA503F140960059A3A7 /* vlc.scriptTerminology */,
                                8EDAC3430440F72D0059A3A7 /* README.MacOSX.rtf */,
                        name = "main window";
                        sourceTree = "<group>";
                };
+               CCC8957F0D9A8A61005AE59C /* OSX-specific access */ = {
+                       isa = PBXGroup;
+                       children = (
+                               CCC895830D9A8A82005AE59C /* eyetv.m */,
+                       );
+                       name = "OSX-specific access";
+                       sourceTree = "<group>";
+               };
                CCCB86BF0ACFDE4A00CF1E10 /* Native FSPanel icons */ = {
                        isa = PBXGroup;
                        children = (
                DCF358BC077F1236007DB450 /* nibs */ = {
                        isa = PBXGroup;
                        children = (
+                               CCC896B80D9AA9E8005AE59C /* MediaInfo.nib */,
                                DCA00AA7075F948800E6BF46 /* About.nib */,
                                F74F13EA02C2A79C01EE194C /* MainMenu.nib */,
                                DCF358B9077F10BA007DB450 /* Preferences.nib */,
                089C1669FE841209C02AAC07 /* Project object */ = {
                        isa = PBXProject;
                        buildConfigurationList = C2F2A6EA09588F1B00018C74 /* Build configuration list for PBXProject "vlc" */;
+                       compatibilityVersion = "Xcode 2.4";
                        hasScannedForEncodings = 1;
                        mainGroup = 089C166AFE841209C02AAC07 /* vlc */;
                        projectDirPath = "";
                                CC0B72400D54F2B100448E00 /* spref_cone_Interface_64.png in Resources */,
                                CC0B72410D54F2B100448E00 /* spref_cone_Subtitles_64.png in Resources */,
                                CC0B72420D54F2B100448E00 /* spref_cone_Video_64.png in Resources */,
+                               CCC896BA0D9AA9E9005AE59C /* MediaInfo.nib in Resources */,
+                               CC1C41D10D9BAD7F002728FA /* noart.png in Resources */,
                        );
                        runOnlyForDeploymentPostprocessing = 0;
                };
                        name = Update.nib;
                        sourceTree = "<group>";
                };
+               CCC896B80D9AA9E8005AE59C /* MediaInfo.nib */ = {
+                       isa = PBXVariantGroup;
+                       children = (
+                               CCC896B90D9AA9E8005AE59C /* English */,
+                       );
+                       name = MediaInfo.nib;
+                       sourceTree = "<group>";
+               };
                CCF3C64A0923B99D00401862 /* SFilters.nib */ = {
                        isa = PBXVariantGroup;
                        children = (
index 21dd711..02b8716 100644 (file)
@@ -1,13 +1,13 @@
 /*****************************************************************************
  * intf.h: MacOS X interface module
  *****************************************************************************
- * Copyright (C) 2002-2007 the VideoLAN team
+ * Copyright (C) 2002-2008 the VideoLAN team
  * $Id$
  *
  * Authors: Jon Lech Johansen <jon-vl@nanocrew.net>
  *          Christophe Massiot <massiot@via.ecp.fr>
  *          Derk-Jan Hartman <hartman at videolan dot org>
- *          Felix Kühne <fkuehne at videolan dot org>
+ *          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
@@ -106,6 +106,7 @@ struct intf_sys_t
     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      */
 #endif
@@ -119,6 +120,7 @@ struct intf_sys_t
     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 */
 
     IBOutlet id o_window;       /* main window    */
     IBOutlet id o_playlist_view;/* playlist view  */
@@ -148,7 +150,6 @@ struct intf_sys_t
 
     IBOutlet id o_controls;     /* VLCControls    */
     IBOutlet id o_playlist;     /* VLCPlaylist    */
-    IBOutlet id o_info;         /* VLCInfo        */
 
     IBOutlet id o_messages;     /* messages tv    */
     IBOutlet id o_msgs_panel;   /* messages panel */
@@ -156,8 +157,6 @@ struct intf_sys_t
     NSLock * o_msg_lock;        /* messages lock  */
     IBOutlet id o_msgs_btn_crashlog;    /* messages open crashlog */
 
-    IBOutlet id o_info_window;  /* Info panel     */
-
     /* main menu */
 
     IBOutlet id o_mi_about;
@@ -370,6 +369,7 @@ struct intf_sys_t
 - (IBAction)openCrashLog:(id)sender;
 - (IBAction)viewErrorsAndWarnings:(id)sender;
 - (IBAction)showMessagesPanel:(id)sender;
+- (IBAction)showInformationPanel:(id)sender;
 
 - (IBAction)togglePlaylist:(id)sender;
 - (void)updateTogglePlaylistState;
index 00d3cdc..e82aa20 100644 (file)
@@ -1,7 +1,7 @@
 /*****************************************************************************
  * intf.m: MacOS X interface module
  *****************************************************************************
- * Copyright (C) 2002-2007 the VideoLAN team
+ * Copyright (C) 2002-2008 the VideoLAN team
  * $Id$
  *
  * Authors: Jon Lech Johansen <jon-vl@nanocrew.net>
@@ -41,6 +41,7 @@
 #import "vout.h"
 #import "prefs.h"
 #import "playlist.h"
+#import "playlistinfo.h"
 #import "controls.h"
 #import "about.h"
 #import "open.h"
@@ -427,6 +428,7 @@ static VLCMain *_o_sharedMainInstance = nil;
     o_bookmarks = [[VLCBookmarks alloc] init];
     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];
@@ -781,8 +783,6 @@ static VLCMain *_o_sharedMainInstance = nil;
     [o_vmi_mute setTitle: _NS("Mute")];
     [o_vmi_fullscreen setTitle: _NS("Fullscreen")];
     [o_vmi_snapshot setTitle: _NS("Snapshot")];
-
-    [o_info_window setTitle: _NS("Media Information")];
 }
 
 - (void)applicationWillFinishLaunching:(NSNotification *)o_notification
@@ -1812,6 +1812,9 @@ static VLCMain *_o_sharedMainInstance = nil;
     if( nib_bookmarks_loaded && o_bookmarks )
         [o_bookmarks release];
 
+    if( nib_info_loaded && o_info )
+        [o_info release];
+    
     if( nib_wizard_loaded && o_wizard )
         [o_wizard release];
  
@@ -2096,7 +2099,7 @@ static VLCMain *_o_sharedMainInstance = nil;
     }
     else
     {
-        NSBeginInformationalAlertSheet(_NS("No CrashLog found"), @"Continue", nil, nil, o_msgs_panel, self, NULL, NULL, nil, _NS("Couldn't find any trace of a previous crash.") );
+        NSBeginInformationalAlertSheet(_NS("No CrashLog found"), _NS("Continue"), nil, nil, o_msgs_panel, self, NULL, NULL, nil, _NS("Couldn't find any trace of a previous crash.") );
 
     }
 }
@@ -2111,6 +2114,14 @@ static VLCMain *_o_sharedMainInstance = nil;
     [o_msgs_panel makeKeyAndOrderFront: sender];
 }
 
+- (IBAction)showInformationPanel:(id)sender
+{
+    if(! nib_info_loaded )
+        nib_info_loaded = [NSBundle loadNibNamed:@"MediaInfo" owner: self];
+    
+    [o_info initPanel];
+}
+
 - (void)windowDidBecomeKey:(NSNotification *)o_notification
 {
     if( [o_notification object] == o_msgs_panel )
index 9e300e8..39b8d25 100644 (file)
@@ -1,11 +1,11 @@
 /*****************************************************************************
  * playlistinfo.h: MacOS X interface module
  *****************************************************************************
- * Copyright (C) 2002-2006 the VideoLAN team
+ * Copyright (C) 2002-2008 the VideoLAN team
  * $Id$
  *
  * Authors: Benjamin Pracht <bigben at videolan dot org>
- *          Felix Kühne <fkuehne at videolan dot org>
+ *          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
     IBOutlet id o_uri_txt;
     IBOutlet id o_title_txt;
     IBOutlet id o_author_txt;
-    IBOutlet id o_btn_ok;
-    IBOutlet id o_btn_cancel;
-    IBOutlet id o_btn_delete_group;
-    IBOutlet id o_btn_add_group;
     IBOutlet id o_outline_view;
 
     IBOutlet id o_tab_view;
     IBOutlet id o_nowPlaying_txt;
     IBOutlet id o_publisher_lbl;
     IBOutlet id o_publisher_txt;
-    IBOutlet id o_rating_lbl;
-    IBOutlet id o_rating_txt;
     IBOutlet id o_seqNum_lbl;
     IBOutlet id o_seqNum_txt;
+    IBOutlet id o_image_well;
+    IBOutlet id o_saveMetaData_btn;
 
     IBOutlet id o_audio_box;
     IBOutlet id o_audio_decoded_lbl;
     NSTimer * o_statUpdateTimer;
 }
 
-- (IBAction)togglePlaylistInfoPanel:(id)sender;
-- (IBAction)toggleInfoPanel:(id)sender;
-- (void)initPanel:(id)sender;
+- (void)initPanel;
+- (IBAction)saveMetaData:(id)sender;
 - (void)updatePanel;
-- (IBAction)infoCancel:(id)sender;
-- (IBAction)infoOk:(id)sender;
 - (playlist_item_t *)getItem;
 - (BOOL)isItemInPlaylist:(playlist_item_t *)p_item;
 
 - (void)setMeta: (char *)meta forLabel: (id)theItem;
 - (void)updateStatistics: (NSTimer*)theTimer;
+
++ (VLCInfo *)sharedInstance;
 @end
 
 @interface VLCInfoTreeItem : NSObject
index f9b0408..5f0cb1f 100644 (file)
@@ -1,11 +1,11 @@
 /*****************************************************************************
  r playlistinfo.m: MacOS X interface module
  *****************************************************************************
- * Copyright (C) 2002-2007 the VideoLAN team
+ * Copyright (C) 2002-2008 the VideoLAN team
  * $Id$
  *
  * Authors: Benjamin Pracht <bigben at videolan dot org>
- *          Felix Kühne <fkuehne at videolan dot org>
+ *          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
 
 @implementation VLCInfo
 
-- (id)init
+static VLCInfo *_o_sharedInstance = nil;
+
++ (VLCInfo *)sharedInstance
 {
-    self = [super init];
+    return _o_sharedInstance ? _o_sharedInstance : [[self alloc] init];
+}
 
-    if( self != nil )
-    {
-        p_item = NULL;
-        o_statUpdateTimer = nil;
+- (id)init
+{
+    if( _o_sharedInstance ) {
+        [self dealloc];
+    } else {
+        _o_sharedInstance = [super init];
+        
+        if( _o_sharedInstance != nil )
+        {
+            p_item = NULL;
+            o_statUpdateTimer = nil;
+        }
     }
-    return( self );
+
+    return _o_sharedInstance;
 }
 
 - (void)awakeFromNib
 {
     [o_info_window setExcludedFromWindowsMenu: TRUE];
 
-    [o_info_window setTitle: _NS("Information")];
-    [o_uri_lbl setStringValue: _NS("URI")];
+    [o_info_window setTitle: _NS("Media Information")];
+    [o_uri_lbl setStringValue: _NS("Location")];
     [o_title_lbl setStringValue: _NS("Title")];
-    [o_author_lbl setStringValue: _NS("Author")];
-    [o_btn_ok setTitle: _NS("OK")];
-    [o_btn_cancel setTitle: _NS("Cancel")];
+    [o_author_lbl setStringValue: _NS("Artist")];
+    [o_saveMetaData_btn setStringValue: _NS("Save Metadata" )];
+
     [[o_tab_view tabViewItemAtIndex: 0] setLabel: _NS("General")];
-    [[o_tab_view tabViewItemAtIndex: 1] setLabel: _NS("Advanced Information")];
+    [[o_tab_view tabViewItemAtIndex: 1] setLabel: _NS("Codec Details")];
     [[o_tab_view tabViewItemAtIndex: 2] setLabel: _NS("Statistics")];
     [o_tab_view selectTabViewItemAtIndex: 0];
 
@@ -70,7 +81,6 @@
     [o_collection_lbl setStringValue: _NS(VLC_META_COLLECTION)];
     [o_seqNum_lbl setStringValue: _NS(VLC_META_SEQ_NUM)];
     [o_description_lbl setStringValue: _NS(VLC_META_DESCRIPTION)];
-    [o_rating_lbl setStringValue: _NS(VLC_META_RATING)];
     [o_date_lbl setStringValue: _NS(VLC_META_DATE)];
     [o_language_lbl setStringValue: _NS(VLC_META_LANGUAGE)];
     [o_nowPlaying_lbl setStringValue: _NS(VLC_META_NOW_PLAYING)];
 
     [super dealloc];
 }
-- (IBAction)togglePlaylistInfoPanel:(id)sender
-{
-    if( [o_info_window isVisible] )
-    {
-        [self windowShouldClose: nil];
-        [o_info_window orderOut: sender];
-    }
-    else
-    {
-        p_item = [[[VLCMain sharedInstance] getPlaylist] selectedPlaylistItem];
-        [self initPanel:sender];
-    }
-}
-
-- (IBAction)toggleInfoPanel:(id)sender
-{
-    if( [o_info_window isVisible] )
-    {
-        [self windowShouldClose: nil];
-        [o_info_window orderOut: sender];
-    }
-    else
-    {
-        intf_thread_t * p_intf = VLCIntf;
-        playlist_t * p_playlist = pl_Yield( p_intf );
-
-        p_item = p_playlist->status.p_item;
-        vlc_object_release( p_playlist );
-        [self initPanel:sender];
-    }
-}
 
-- (void)initPanel:(id)sender
+- (void)initPanel
 {
     BOOL b_stats = config_GetInt(VLCIntf, "stats");
     if( b_stats )
     }
 
     [self updatePanel];
-    [o_info_window makeKeyAndOrderFront: sender];
+    [o_info_window makeKeyAndOrderFront: self];
 }
 
 - (void)updatePanel
     SET( seqNum, TrackNum );
     SET( genre, Genre );
     SET( copyright, Copyright );
-    SET( rating, Rating );
     SET( publisher, Publisher );
     SET( nowPlaying, NowPlaying );
     SET( language, Language );
     SET( date, Date );
 
 #undef SET
+    
+    char *psz_meta;
+    NSImage *o_image;
+    /* FIXME!! 
+    psz_meta = input_item_GetArtURL( p_item );
+    if( psz_meta && !strncmp( psz_meta, "file://", 7 ) )
+        o_image = [[NSImage alloc] initWithContentsOfURL: [NSURL URLWithString: [NSString stringWithUTF8String: psz_meta]]];
+    else */
+        o_image = [[NSImage imageNamed: @"noart.png"] retain];
+    [o_image_well setImage: o_image];
+    [o_image release];
+    //free( psz_meta );
 
     /* reload the advanced table */
     [[VLCInfoTreeItem rootItem] refresh];
 {
     if( psz_meta != NULL && *psz_meta)
         [theItem setStringValue: [NSString stringWithUTF8String:psz_meta]];
-    else
-        [theItem setStringValue: @"-"];
 }
 
 - (void)updateStatistics:(NSTimer*)theTimer
 {
     if( [self isItemInPlaylist: p_item] )
     {
-        /* we can only do that if there's a valid input around */
-
         vlc_mutex_lock( &p_item->p_input->p_stats->lock );
 
         /* input */
             @"%6.0f kb/s", (float)(p_item->p_input->p_stats->f_demux_bitrate)*8000]];
 
         /* Video */
-        [o_video_decoded_txt setStringValue: [NSString stringWithFormat: @"%5i",
-            p_item->p_input->p_stats->i_decoded_video]];
-        [o_displayed_txt setStringValue: [NSString stringWithFormat: @"%5i",
-            p_item->p_input->p_stats->i_displayed_pictures]];
-        [o_lost_frames_txt setStringValue: [NSString stringWithFormat: @"%5i",
-            p_item->p_input->p_stats->i_lost_pictures]];
+        [o_video_decoded_txt setIntValue: p_item->p_input->p_stats->i_decoded_video];
+        [o_displayed_txt setIntValue: p_item->p_input->p_stats->i_displayed_pictures];
+        [o_lost_frames_txt setIntValue: p_item->p_input->p_stats->i_lost_pictures];
+        float f_fps = 0;
+        /* FIXME! input_Control( p_item->p_input, INPUT_GET_VIDEO_FPS, &f_fps ); */
+        [o_fps_txt setFloatValue: f_fps];
 
         /* Sout */
-        [o_sent_packets_txt setStringValue: [NSString stringWithFormat: @"%5i",
-            p_item->p_input->p_stats->i_sent_packets]];
+        [o_sent_packets_txt setIntValue: p_item->p_input->p_stats->i_sent_packets];
         [o_sent_bytes_txt setStringValue: [NSString stringWithFormat: @"%8.0f kB",
             (float)(p_item->p_input->p_stats->i_sent_bytes)/1000]];
         [o_sent_bitrate_txt setStringValue: [NSString stringWithFormat:
             @"%6.0f kb/s", (float)(p_item->p_input->p_stats->f_send_bitrate*8)*1000]];
 
         /* Audio */
-        [o_audio_decoded_txt setStringValue: [NSString stringWithFormat: @"%5i",
-            p_item->p_input->p_stats->i_decoded_audio]];
-        [o_played_abuffers_txt setStringValue: [NSString stringWithFormat: @"%5i",
-            p_item->p_input->p_stats->i_played_abuffers]];
-        [o_lost_abuffers_txt setStringValue: [NSString stringWithFormat: @"%5i",
-            p_item->p_input->p_stats->i_lost_abuffers]];
+        [o_audio_decoded_txt setIntValue: p_item->p_input->p_stats->i_decoded_audio];
+        [o_played_abuffers_txt setIntValue: p_item->p_input->p_stats->i_played_abuffers];
+        [o_lost_abuffers_txt setIntValue: p_item->p_input->p_stats->i_lost_abuffers];
 
         vlc_mutex_unlock( &p_item->p_input->p_stats->lock );
     }
 }
 
-- (IBAction)infoCancel:(id)sender
-{
-    [self windowShouldClose: nil];
-    [o_info_window orderOut: self];
-}
-
-
-- (IBAction)infoOk:(id)sender
+- (IBAction)saveMetaData:(id)sender
 {
+    /* TODO: implement this feature
     intf_thread_t * p_intf = VLCIntf;
     playlist_t * p_playlist = pl_Yield( p_intf );
     vlc_value_t val;
         val.b_bool = VLC_TRUE;
         var_Set( p_playlist, "intf-change", val );
     }
-    vlc_object_release( p_playlist );
-    [self windowShouldClose: nil];
-    [o_info_window orderOut: self];
+    vlc_object_release( p_playlist );*/
 }
 
 - (playlist_item_t *)getItem