From: Derk-Jan Hartman Date: Fri, 9 Jan 2004 22:11:04 +0000 (+0000) Subject: * extras/MacOSX/Resources/English.lproj/MainMenu.nib X-Git-Tag: 0.7.1~550 X-Git-Url: https://git.sesse.net/?a=commitdiff_plain;h=5caa41762b984f27a1f1af0bcea9bdcfd812a25b;p=vlc * extras/MacOSX/Resources/English.lproj/MainMenu.nib - Added the duration column - Added a 'surpress error dialog' option to the dialog * ALL: copyright year and author changes --- diff --git a/extras/MacOSX/Resources/English.lproj/MainMenu.nib/classes.nib b/extras/MacOSX/Resources/English.lproj/MainMenu.nib/classes.nib index a0015c851a..12357b904a 100644 --- a/extras/MacOSX/Resources/English.lproj/MainMenu.nib/classes.nib +++ b/extras/MacOSX/Resources/English.lproj/MainMenu.nib/classes.nib @@ -90,6 +90,7 @@ "o_err_btn_dismiss" = id; "o_err_btn_msgs" = id; "o_err_bug_lbl" = id; + "o_err_ckbk_surpress" = id; "o_err_lbl" = id; "o_err_msg" = id; "o_error" = id; @@ -349,6 +350,7 @@ "o_status_field" = id; "o_table_view" = id; "o_tc_author" = id; + "o_tc_duration" = id; "o_tc_name" = id; "o_window" = id; }; diff --git a/extras/MacOSX/Resources/English.lproj/MainMenu.nib/info.nib b/extras/MacOSX/Resources/English.lproj/MainMenu.nib/info.nib index 91539c663a..2e0734c49d 100644 --- a/extras/MacOSX/Resources/English.lproj/MainMenu.nib/info.nib +++ b/extras/MacOSX/Resources/English.lproj/MainMenu.nib/info.nib @@ -3,11 +3,11 @@ IBDocumentLocation - 313 340 505 541 0 0 1280 1002 + 323 227 505 541 0 0 1280 1002 IBEditorPositions 1617 - 541 480 104 149 0 0 1024 746 + 692 686 104 149 0 0 1280 1002 29 165 929 419 44 0 0 1280 1002 915 @@ -19,11 +19,12 @@ IBOpenObjects + 1647 1617 + 984 21 - 1647 IBSystem Version - 7C107 + 7D24 diff --git a/extras/MacOSX/Resources/English.lproj/MainMenu.nib/objects.nib b/extras/MacOSX/Resources/English.lproj/MainMenu.nib/objects.nib index b28211bdb9..b7b18378aa 100644 Binary files a/extras/MacOSX/Resources/English.lproj/MainMenu.nib/objects.nib and b/extras/MacOSX/Resources/English.lproj/MainMenu.nib/objects.nib differ diff --git a/extras/MacOSX/vlc.pbproj/project.pbxproj b/extras/MacOSX/vlc.pbproj/project.pbxproj index 155b4449bb..938c9468cf 100644 --- a/extras/MacOSX/vlc.pbproj/project.pbxproj +++ b/extras/MacOSX/vlc.pbproj/project.pbxproj @@ -6,7 +6,7 @@ objectVersion = 39; objects = { 014CEA410018CDE011CA2923 = { - expectedFileType = "wrapper.plug-in"; + explicitFileType = wrapper.cfbundle; fallbackIsa = PBXFileReference; isa = PBXBundleReference; path = VLC.bundle; @@ -87,9 +87,9 @@ sourceTree = ""; }; 089C1672FE841209C02AAC07 = { - expectedFileType = wrapper.framework; fallbackIsa = PBXFileReference; isa = PBXFrameworkReference; + lastKnownFileType = wrapper.framework; name = Foundation.framework; path = /System/Library/Frameworks/Foundation.framework; refType = 0; @@ -704,9 +704,9 @@ sourceTree = ""; }; 089C167FFE841241C02AAC07 = { - expectedFileType = wrapper.framework; fallbackIsa = PBXFileReference; isa = PBXFrameworkReference; + lastKnownFileType = wrapper.framework; name = AppKit.framework; path = /System/Library/Frameworks/AppKit.framework; refType = 0; @@ -764,9 +764,9 @@ sourceTree = ""; }; 1058C7ADFEA557BF11CA2CBB = { - expectedFileType = wrapper.framework; fallbackIsa = PBXFileReference; isa = PBXFrameworkReference; + lastKnownFileType = wrapper.framework; name = Cocoa.framework; path = /System/Library/Frameworks/Cocoa.framework; refType = 0; @@ -856,176 +856,176 @@ sourceTree = ""; }; 8E445F8704728A700059A3A7 = { - expectedFileType = image.icns; isa = PBXFileReference; + lastKnownFileType = image.icns; name = a52.icns; path = Resources/a52.icns; refType = 2; sourceTree = SOURCE_ROOT; }; 8E445F8804728A700059A3A7 = { - expectedFileType = image.icns; isa = PBXFileReference; + lastKnownFileType = image.icns; name = aac.icns; path = Resources/aac.icns; refType = 2; sourceTree = SOURCE_ROOT; }; 8E445F8904728A700059A3A7 = { - expectedFileType = image.icns; isa = PBXFileReference; + lastKnownFileType = image.icns; name = asf.icns; path = Resources/asf.icns; refType = 2; sourceTree = SOURCE_ROOT; }; 8E445F8A04728A700059A3A7 = { - expectedFileType = image.icns; isa = PBXFileReference; + lastKnownFileType = image.icns; name = asx.icns; path = Resources/asx.icns; refType = 2; sourceTree = SOURCE_ROOT; }; 8E445F8B04728A700059A3A7 = { - expectedFileType = image.icns; isa = PBXFileReference; + lastKnownFileType = image.icns; name = avi.icns; path = Resources/avi.icns; refType = 2; sourceTree = SOURCE_ROOT; }; 8E445F8C04728A700059A3A7 = { - expectedFileType = image.icns; isa = PBXFileReference; + lastKnownFileType = image.icns; name = bin.icns; path = Resources/bin.icns; refType = 2; sourceTree = SOURCE_ROOT; }; 8E445F8D04728A700059A3A7 = { - expectedFileType = image.icns; isa = PBXFileReference; + lastKnownFileType = image.icns; name = cue.icns; path = Resources/cue.icns; refType = 2; sourceTree = SOURCE_ROOT; }; 8E445F8E04728A700059A3A7 = { - expectedFileType = image.icns; isa = PBXFileReference; + lastKnownFileType = image.icns; name = dat.icns; path = Resources/dat.icns; refType = 2; sourceTree = SOURCE_ROOT; }; 8E445F8F04728A700059A3A7 = { - expectedFileType = image.icns; isa = PBXFileReference; + lastKnownFileType = image.icns; name = dv.icns; path = Resources/dv.icns; refType = 2; sourceTree = SOURCE_ROOT; }; 8E445F9004728A700059A3A7 = { - expectedFileType = image.icns; isa = PBXFileReference; + lastKnownFileType = image.icns; name = m3u.icns; path = Resources/m3u.icns; refType = 2; sourceTree = SOURCE_ROOT; }; 8E445F9104728A700059A3A7 = { - expectedFileType = image.icns; isa = PBXFileReference; + lastKnownFileType = image.icns; name = mov.icns; path = Resources/mov.icns; refType = 2; sourceTree = SOURCE_ROOT; }; 8E445F9204728A700059A3A7 = { - expectedFileType = image.icns; isa = PBXFileReference; + lastKnownFileType = image.icns; name = mp3.icns; path = Resources/mp3.icns; refType = 2; sourceTree = SOURCE_ROOT; }; 8E445F9304728A700059A3A7 = { - expectedFileType = image.icns; isa = PBXFileReference; + lastKnownFileType = image.icns; name = mp4.icns; path = Resources/mp4.icns; refType = 2; sourceTree = SOURCE_ROOT; }; 8E445F9404728A700059A3A7 = { - expectedFileType = image.icns; isa = PBXFileReference; + lastKnownFileType = image.icns; name = mpg.icns; path = Resources/mpg.icns; refType = 2; sourceTree = SOURCE_ROOT; }; 8E445F9504728A700059A3A7 = { - expectedFileType = image.icns; isa = PBXFileReference; + lastKnownFileType = image.icns; name = ogg.icns; path = Resources/ogg.icns; refType = 2; sourceTree = SOURCE_ROOT; }; 8E445F9604728A700059A3A7 = { - expectedFileType = image.icns; isa = PBXFileReference; + lastKnownFileType = image.icns; name = ogm.icns; path = Resources/ogm.icns; refType = 2; sourceTree = SOURCE_ROOT; }; 8E445F9704728A700059A3A7 = { - expectedFileType = image.icns; isa = PBXFileReference; + lastKnownFileType = image.icns; name = pls.icns; path = Resources/pls.icns; refType = 2; sourceTree = SOURCE_ROOT; }; 8E445F9804728A700059A3A7 = { - expectedFileType = image.icns; isa = PBXFileReference; + lastKnownFileType = image.icns; name = srt.icns; path = Resources/srt.icns; refType = 2; sourceTree = SOURCE_ROOT; }; 8E445F9904728A700059A3A7 = { - expectedFileType = image.icns; isa = PBXFileReference; + lastKnownFileType = image.icns; name = sub.icns; path = Resources/sub.icns; refType = 2; sourceTree = SOURCE_ROOT; }; 8E445F9A04728A700059A3A7 = { - expectedFileType = image.icns; isa = PBXFileReference; + lastKnownFileType = image.icns; name = vob.icns; path = Resources/vob.icns; refType = 2; sourceTree = SOURCE_ROOT; }; 8E445F9B04728A700059A3A7 = { - expectedFileType = image.icns; isa = PBXFileReference; + lastKnownFileType = image.icns; name = wma.icns; path = Resources/wma.icns; refType = 2; sourceTree = SOURCE_ROOT; }; 8E445F9C04728A700059A3A7 = { - expectedFileType = image.icns; isa = PBXFileReference; + lastKnownFileType = image.icns; name = wmv.icns; path = Resources/wmv.icns; refType = 2; @@ -1164,253 +1164,253 @@ }; }; 8E55FB7F0459B0FD00FB3317 = { - expectedFileType = sourcecode.c.h; fileEncoding = 30; isa = PBXFileReference; + lastKnownFileType = sourcecode.c.h; name = output.h; path = ../../modules/gui/macosx/output.h; refType = 2; sourceTree = SOURCE_ROOT; }; 8E55FB800459B0FD00FB3317 = { - expectedFileType = sourcecode.c.objc; fileEncoding = 30; isa = PBXFileReference; + lastKnownFileType = sourcecode.c.objc; name = output.m; path = ../../modules/gui/macosx/output.m; refType = 2; sourceTree = SOURCE_ROOT; }; 8E6BC6F6041643860059A3A7 = { - expectedFileType = sourcecode.c.h; fileEncoding = 4; isa = PBXFileReference; + lastKnownFileType = sourcecode.c.h; name = applescript.h; path = ../../modules/gui/macosx/applescript.h; refType = 2; sourceTree = SOURCE_ROOT; }; 8E6BC6F7041643860059A3A7 = { - expectedFileType = sourcecode.c.objc; fileEncoding = 4; isa = PBXFileReference; + lastKnownFileType = sourcecode.c.objc; name = applescript.m; path = ../../modules/gui/macosx/applescript.m; refType = 2; sourceTree = SOURCE_ROOT; }; 8E6BC6FA041684EC0059A3A7 = { - expectedFileType = sourcecode.c.h; fileEncoding = 4; isa = PBXFileReference; + lastKnownFileType = sourcecode.c.h; name = controls.h; path = ../../modules/gui/macosx/controls.h; refType = 2; sourceTree = SOURCE_ROOT; }; 8E93909A0565D6D300C7661C = { - expectedFileType = image.png; isa = PBXFileReference; + lastKnownFileType = image.png; name = display_slider.png; path = Resources/display_slider.png; refType = 2; sourceTree = SOURCE_ROOT; }; 8E93909B0565D6D300C7661C = { - expectedFileType = image.png; isa = PBXFileReference; + lastKnownFileType = image.png; name = display_track.png; path = Resources/display_track.png; refType = 2; sourceTree = SOURCE_ROOT; }; 8E93909C0565D6D300C7661C = { - expectedFileType = image.png; isa = PBXFileReference; + lastKnownFileType = image.png; name = display.png; path = Resources/display.png; refType = 2; sourceTree = SOURCE_ROOT; }; 8E93909D0565D6D300C7661C = { - expectedFileType = image.png; isa = PBXFileReference; + lastKnownFileType = image.png; name = fullscreen_active.png; path = Resources/fullscreen_active.png; refType = 2; sourceTree = SOURCE_ROOT; }; 8E93909E0565D6D300C7661C = { - expectedFileType = image.png; isa = PBXFileReference; + lastKnownFileType = image.png; name = fullscreen_blue.png; path = Resources/fullscreen_blue.png; refType = 2; sourceTree = SOURCE_ROOT; }; 8E93909F0565D6D300C7661C = { - expectedFileType = image.png; isa = PBXFileReference; + lastKnownFileType = image.png; name = next_active.png; path = Resources/next_active.png; refType = 2; sourceTree = SOURCE_ROOT; }; 8E9390A00565D6D300C7661C = { - expectedFileType = image.png; isa = PBXFileReference; + lastKnownFileType = image.png; name = next_blue.png; path = Resources/next_blue.png; refType = 2; sourceTree = SOURCE_ROOT; }; 8E9390A10565D6D300C7661C = { - expectedFileType = image.png; isa = PBXFileReference; + lastKnownFileType = image.png; name = pause_blue.png; path = Resources/pause_blue.png; refType = 2; sourceTree = SOURCE_ROOT; }; 8E9390A20565D6D300C7661C = { - expectedFileType = image.png; isa = PBXFileReference; + lastKnownFileType = image.png; name = pause.png; path = Resources/pause.png; refType = 2; sourceTree = SOURCE_ROOT; }; 8E9390A30565D6D300C7661C = { - expectedFileType = image.png; isa = PBXFileReference; + lastKnownFileType = image.png; name = play_blue.png; path = Resources/play_blue.png; refType = 2; sourceTree = SOURCE_ROOT; }; 8E9390A40565D6D300C7661C = { - expectedFileType = image.png; isa = PBXFileReference; + lastKnownFileType = image.png; name = play.png; path = Resources/play.png; refType = 2; sourceTree = SOURCE_ROOT; }; 8E9390A50565D6D300C7661C = { - expectedFileType = image.png; isa = PBXFileReference; + lastKnownFileType = image.png; name = playlistdrawer_active.png; path = Resources/playlistdrawer_active.png; refType = 2; sourceTree = SOURCE_ROOT; }; 8E9390A60565D6D300C7661C = { - expectedFileType = image.png; isa = PBXFileReference; + lastKnownFileType = image.png; name = playlistdrawer_blue.png; path = Resources/playlistdrawer_blue.png; refType = 2; sourceTree = SOURCE_ROOT; }; 8E9390A70565D6D300C7661C = { - expectedFileType = image.png; isa = PBXFileReference; + lastKnownFileType = image.png; name = previous_active.png; path = Resources/previous_active.png; refType = 2; sourceTree = SOURCE_ROOT; }; 8E9390A80565D6D300C7661C = { - expectedFileType = image.png; isa = PBXFileReference; + lastKnownFileType = image.png; name = previous_blue.png; path = Resources/previous_blue.png; refType = 2; sourceTree = SOURCE_ROOT; }; 8E9390A90565D6D300C7661C = { - expectedFileType = image.png; isa = PBXFileReference; + lastKnownFileType = image.png; name = skip_forward_active.png; path = Resources/skip_forward_active.png; refType = 2; sourceTree = SOURCE_ROOT; }; 8E9390AA0565D6D300C7661C = { - expectedFileType = image.png; isa = PBXFileReference; + lastKnownFileType = image.png; name = skip_forward_blue.png; path = Resources/skip_forward_blue.png; refType = 2; sourceTree = SOURCE_ROOT; }; 8E9390AB0565D6D300C7661C = { - expectedFileType = image.png; isa = PBXFileReference; + lastKnownFileType = image.png; name = skip_previous_active.png; path = Resources/skip_previous_active.png; refType = 2; sourceTree = SOURCE_ROOT; }; 8E9390AC0565D6D300C7661C = { - expectedFileType = image.png; isa = PBXFileReference; + lastKnownFileType = image.png; name = skip_previous_blue.png; path = Resources/skip_previous_blue.png; refType = 2; sourceTree = SOURCE_ROOT; }; 8E9390AD0565D6D300C7661C = { - expectedFileType = image.png; isa = PBXFileReference; + lastKnownFileType = image.png; name = stop_blue.png; path = Resources/stop_blue.png; refType = 2; sourceTree = SOURCE_ROOT; }; 8E9390AE0565D6D300C7661C = { - expectedFileType = image.png; isa = PBXFileReference; + lastKnownFileType = image.png; name = stop.png; path = Resources/stop.png; refType = 2; sourceTree = SOURCE_ROOT; }; 8E9390AF0565D6D300C7661C = { - expectedFileType = image.png; isa = PBXFileReference; + lastKnownFileType = image.png; name = volume_high.png; path = Resources/volume_high.png; refType = 2; sourceTree = SOURCE_ROOT; }; 8E9390B00565D6D300C7661C = { - expectedFileType = image.png; isa = PBXFileReference; + lastKnownFileType = image.png; name = volume_low.png; path = Resources/volume_low.png; refType = 2; sourceTree = SOURCE_ROOT; }; 8E9390B10565D6D300C7661C = { - expectedFileType = image.png; isa = PBXFileReference; + lastKnownFileType = image.png; name = volumeslider_blue.png; path = Resources/volumeslider_blue.png; refType = 2; sourceTree = SOURCE_ROOT; }; 8E9390B20565D6D300C7661C = { - expectedFileType = image.png; isa = PBXFileReference; + lastKnownFileType = image.png; name = volumeslider_normal.png; path = Resources/volumeslider_normal.png; refType = 2; sourceTree = SOURCE_ROOT; }; 8E9390B30565D6D300C7661C = { - expectedFileType = image.png; isa = PBXFileReference; + lastKnownFileType = image.png; name = volumetrack.png; path = Resources/volumetrack.png; refType = 2; @@ -1573,9 +1573,9 @@ }; }; 8E9CC7B1046EFD700059A3A7 = { - expectedFileType = text; fileEncoding = 12; isa = PBXFileReference; + lastKnownFileType = text; name = THANKS; path = ../../THANKS; refType = 2; @@ -1588,8 +1588,8 @@ }; }; 8EBF3FA303F13FFB0059A3A7 = { - expectedFileType = text; isa = PBXFileReference; + lastKnownFileType = text; name = vlc.scriptSuite; path = Resources/vlc.scriptSuite; refType = 2; @@ -1602,8 +1602,8 @@ }; }; 8EBF3FA503F140960059A3A7 = { - expectedFileType = text; isa = PBXFileReference; + lastKnownFileType = text; name = vlc.scriptTerminology; path = Resources/English.lproj/vlc.scriptTerminology; refType = 2; @@ -1659,153 +1659,153 @@ sourceTree = ""; }; 8ED6C27A03E2EB1C0059A3A7 = { - expectedFileType = sourcecode.c.c; fileEncoding = 30; isa = PBXFileReference; + lastKnownFileType = sourcecode.c.c; name = coreaudio.c; path = ../../modules/audio_output/coreaudio.c; refType = 2; sourceTree = SOURCE_ROOT; }; 8ED6C27B03E2EB1C0059A3A7 = { - expectedFileType = sourcecode.c.objc; fileEncoding = 30; isa = PBXFileReference; + lastKnownFileType = sourcecode.c.objc; name = controls.m; path = ../../modules/gui/macosx/controls.m; refType = 2; sourceTree = SOURCE_ROOT; }; 8ED6C27C03E2EB1C0059A3A7 = { - expectedFileType = sourcecode.c.h; fileEncoding = 30; isa = PBXFileReference; + lastKnownFileType = sourcecode.c.h; name = intf.h; path = ../../modules/gui/macosx/intf.h; refType = 2; sourceTree = SOURCE_ROOT; }; 8ED6C27D03E2EB1C0059A3A7 = { - expectedFileType = sourcecode.c.objc; fileEncoding = 30; isa = PBXFileReference; + lastKnownFileType = sourcecode.c.objc; name = intf.m; path = ../../modules/gui/macosx/intf.m; refType = 2; sourceTree = SOURCE_ROOT; }; 8ED6C27E03E2EB1C0059A3A7 = { - expectedFileType = sourcecode.c.objc; fileEncoding = 30; isa = PBXFileReference; + lastKnownFileType = sourcecode.c.objc; name = macosx.m; path = ../../modules/gui/macosx/macosx.m; refType = 2; sourceTree = SOURCE_ROOT; }; 8ED6C27F03E2EB1C0059A3A7 = { - expectedFileType = sourcecode.c.h; fileEncoding = 30; isa = PBXFileReference; + lastKnownFileType = sourcecode.c.h; name = misc.h; path = ../../modules/gui/macosx/misc.h; refType = 2; sourceTree = SOURCE_ROOT; }; 8ED6C28003E2EB1C0059A3A7 = { - expectedFileType = sourcecode.c.objc; fileEncoding = 30; isa = PBXFileReference; + lastKnownFileType = sourcecode.c.objc; name = misc.m; path = ../../modules/gui/macosx/misc.m; refType = 2; sourceTree = SOURCE_ROOT; }; 8ED6C28103E2EB1C0059A3A7 = { - expectedFileType = sourcecode.c.h; fileEncoding = 30; isa = PBXFileReference; + lastKnownFileType = sourcecode.c.h; name = open.h; path = ../../modules/gui/macosx/open.h; refType = 2; sourceTree = SOURCE_ROOT; }; 8ED6C28203E2EB1C0059A3A7 = { - expectedFileType = sourcecode.c.objc; fileEncoding = 30; isa = PBXFileReference; + lastKnownFileType = sourcecode.c.objc; name = open.m; path = ../../modules/gui/macosx/open.m; refType = 2; sourceTree = SOURCE_ROOT; }; 8ED6C28303E2EB1C0059A3A7 = { - expectedFileType = sourcecode.c.h; fileEncoding = 30; isa = PBXFileReference; + lastKnownFileType = sourcecode.c.h; name = playlist.h; path = ../../modules/gui/macosx/playlist.h; refType = 2; sourceTree = SOURCE_ROOT; }; 8ED6C28403E2EB1C0059A3A7 = { - expectedFileType = sourcecode.c.objc; fileEncoding = 30; isa = PBXFileReference; + lastKnownFileType = sourcecode.c.objc; name = playlist.m; path = ../../modules/gui/macosx/playlist.m; refType = 2; sourceTree = SOURCE_ROOT; }; 8ED6C28503E2EB1C0059A3A7 = { - expectedFileType = sourcecode.c.h; fileEncoding = 30; isa = PBXFileReference; + lastKnownFileType = sourcecode.c.h; name = prefs.h; path = ../../modules/gui/macosx/prefs.h; refType = 2; sourceTree = SOURCE_ROOT; }; 8ED6C28603E2EB1C0059A3A7 = { - expectedFileType = sourcecode.c.objc; fileEncoding = 30; isa = PBXFileReference; + lastKnownFileType = sourcecode.c.objc; name = prefs.m; path = ../../modules/gui/macosx/prefs.m; refType = 2; sourceTree = SOURCE_ROOT; }; 8ED6C28703E2EB1C0059A3A7 = { - expectedFileType = sourcecode.c.h; fileEncoding = 30; isa = PBXFileReference; + lastKnownFileType = sourcecode.c.h; name = vout.h; path = ../../modules/gui/macosx/vout.h; refType = 2; sourceTree = SOURCE_ROOT; }; 8ED6C28803E2EB1C0059A3A7 = { - expectedFileType = sourcecode.c.objc; fileEncoding = 30; isa = PBXFileReference; + lastKnownFileType = sourcecode.c.objc; name = vout.m; path = ../../modules/gui/macosx/vout.m; refType = 2; sourceTree = SOURCE_ROOT; }; 8ED6C29D03E2F32E0059A3A7 = { - expectedFileType = text; fileEncoding = 12; isa = PBXFileReference; + lastKnownFileType = text; name = AUTHORS; path = ../../AUTHORS; refType = 2; sourceTree = SOURCE_ROOT; }; 8ED6C29E03E2F32E0059A3A7 = { - expectedFileType = text; fileEncoding = 12; isa = PBXFileReference; + lastKnownFileType = text; name = COPYING; path = ../../COPYING; refType = 2; @@ -1824,8 +1824,8 @@ }; }; 8EDAC3430440F72D0059A3A7 = { - expectedFileType = text.rtf; isa = PBXFileReference; + lastKnownFileType = text.rtf; name = README.MacOSX.rtf; path = ../../README.MacOSX.rtf; refType = 2; @@ -1838,26 +1838,26 @@ }; }; 8EE1AF9F044465080059A3A7 = { - expectedFileType = sourcecode.c.h; fileEncoding = 30; isa = PBXFileReference; + lastKnownFileType = sourcecode.c.h; name = about.h; path = ../../modules/gui/macosx/about.h; refType = 2; sourceTree = SOURCE_ROOT; }; 8EE1AFA0044465080059A3A7 = { - expectedFileType = sourcecode.c.objc; fileEncoding = 30; isa = PBXFileReference; + lastKnownFileType = sourcecode.c.objc; name = about.m; path = ../../modules/gui/macosx/about.m; refType = 2; sourceTree = SOURCE_ROOT; }; 8EE1AFA30444660F0059A3A7 = { - expectedFileType = image.png; isa = PBXFileReference; + lastKnownFileType = image.png; name = about_bg.png; path = Resources/about_bg.png; refType = 2; @@ -1870,18 +1870,18 @@ }; }; 8EF1600B03FC62560059A3A7 = { - expectedFileType = sourcecode.c.h; fileEncoding = 4; isa = PBXFileReference; + lastKnownFileType = sourcecode.c.h; name = info.h; path = ../../modules/gui/macosx/info.h; refType = 2; sourceTree = SOURCE_ROOT; }; 8EF1600C03FC62560059A3A7 = { - expectedFileType = sourcecode.c.objc; fileEncoding = 4; isa = PBXFileReference; + lastKnownFileType = sourcecode.c.objc; name = info.m; path = ../../modules/gui/macosx/info.m; refType = 2; @@ -1898,9 +1898,9 @@ //A03 //A04 A0E6B59804407FBD0080DD97 = { - expectedFileType = text; fileEncoding = 12; isa = PBXFileReference; + lastKnownFileType = text; name = README; path = Resources/README; refType = 4; @@ -1933,9 +1933,9 @@ sourceTree = ""; }; F69B0CA702E24F6401A80112 = { - expectedFileType = text.plist.strings; fileEncoding = 5; isa = PBXFileReference; + lastKnownFileType = text.plist.strings; name = English; path = Resources/English.lproj/InfoPlist.strings; refType = 4; @@ -1948,48 +1948,48 @@ }; }; F6E4F90A02D2648B01A80112 = { - expectedFileType = image.icns; isa = PBXFileReference; + lastKnownFileType = image.icns; name = divx.icns; path = Resources/divx.icns; refType = 4; sourceTree = ""; }; F6E4F90B02D2648B01A80112 = { - expectedFileType = image.icns; isa = PBXFileReference; + lastKnownFileType = image.icns; name = generic.icns; path = Resources/generic.icns; refType = 4; sourceTree = ""; }; F6E4F90C02D2648B01A80112 = { - expectedFileType = image.icns; isa = PBXFileReference; + lastKnownFileType = image.icns; name = mpeg.icns; path = Resources/mpeg.icns; refType = 4; sourceTree = ""; }; F6E4F90D02D2648B01A80112 = { - expectedFileType = image.icns; isa = PBXFileReference; + lastKnownFileType = image.icns; name = mpeg1.icns; path = Resources/mpeg1.icns; refType = 4; sourceTree = ""; }; F6E4F90E02D2648B01A80112 = { - expectedFileType = image.icns; isa = PBXFileReference; + lastKnownFileType = image.icns; name = mpeg2.icns; path = Resources/mpeg2.icns; refType = 4; sourceTree = ""; }; F6E4F90F02D2648B01A80112 = { - expectedFileType = image.icns; isa = PBXFileReference; + lastKnownFileType = image.icns; name = mpeg4.icns; path = Resources/mpeg4.icns; refType = 4; @@ -2042,8 +2042,8 @@ //F73 //F74 F74F13DF02C2A53401EE194C = { - expectedFileType = image.icns; isa = PBXFileReference; + lastKnownFileType = image.icns; name = vlc.icns; path = Resources/vlc.icns; refType = 4; @@ -2066,8 +2066,8 @@ sourceTree = ""; }; F74F13EB02C2A79C01EE194C = { - expectedFileType = wrapper.nib; isa = PBXFileReference; + lastKnownFileType = wrapper.nib; name = English; path = Resources/English.lproj/MainMenu.nib; refType = 4; diff --git a/include/variables.h b/include/variables.h index 8e658ea701..6411d660af 100644 --- a/include/variables.h +++ b/include/variables.h @@ -1,10 +1,11 @@ /***************************************************************************** * variables.h: variables handling ***************************************************************************** - * Copyright (C) 2002 VideoLAN - * $Id: variables.h,v 1.20 2004/01/09 20:36:21 hartman Exp $ + * Copyright (C) 2002-2004 VideoLAN + * $Id: variables.h,v 1.21 2004/01/09 22:11:04 hartman Exp $ * * Authors: Samuel Hocevar + * Gildas Bazin * * 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 diff --git a/modules/gui/macosx/info.m b/modules/gui/macosx/info.m index 74aa9744dd..5ce07bbf82 100644 --- a/modules/gui/macosx/info.m +++ b/modules/gui/macosx/info.m @@ -2,9 +2,9 @@ * info.m: MacOS X info panel ***************************************************************************** * Copyright (C) 2003 VideoLAN - * $Id: info.m,v 1.8 2003/10/19 13:39:12 hartman Exp $ + * $Id: info.m,v 1.9 2004/01/09 22:11:04 hartman Exp $ * - * Authors: Derk-Jan Hartman + * Authors: Derk-Jan Hartman * * 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 diff --git a/modules/gui/macosx/intf.h b/modules/gui/macosx/intf.h index e8f7ce4764..fbd57b05d3 100644 --- a/modules/gui/macosx/intf.h +++ b/modules/gui/macosx/intf.h @@ -1,12 +1,12 @@ /***************************************************************************** * intf.h: MacOS X interface plugin ***************************************************************************** - * Copyright (C) 2002-2003 VideoLAN - * $Id: intf.h,v 1.54 2004/01/04 21:44:44 kuehne Exp $ + * Copyright (C) 2002-2004 VideoLAN + * $Id: intf.h,v 1.55 2004/01/09 22:11:04 hartman Exp $ * * Authors: Jon Lech Johansen * Christophe Massiot - * Derk-Jan Hartman + * Derk-Jan Hartman * * 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 @@ -130,6 +130,7 @@ struct intf_sys_t IBOutlet id o_err_bug_lbl; IBOutlet id o_err_btn_msgs; /* Open Messages */ IBOutlet id o_err_btn_dismiss; + IBOutlet id o_err_ckbk_surpress; IBOutlet id o_info_window; /* Info panel */ diff --git a/modules/gui/macosx/intf.m b/modules/gui/macosx/intf.m index 1eb137c19e..d91d5bbf09 100644 --- a/modules/gui/macosx/intf.m +++ b/modules/gui/macosx/intf.m @@ -1,8 +1,8 @@ /***************************************************************************** * intf.m: MacOS X interface plugin ***************************************************************************** - * Copyright (C) 2002-2003 VideoLAN - * $Id: intf.m,v 1.112 2004/01/05 18:43:17 bigben Exp $ + * Copyright (C) 2002-2004 VideoLAN + * $Id: intf.m,v 1.113 2004/01/09 22:11:04 hartman Exp $ * * Authors: Jon Lech Johansen * Christophe Massiot @@ -556,6 +556,7 @@ unsigned int VLCModifiersToCocoa( unsigned int i_key ) [o_err_bug_lbl setStringValue: _NS("If you believe that it is a bug, please follow the instructions at:")]; [o_err_btn_msgs setTitle: _NS("Open Messages Window")]; [o_err_btn_dismiss setTitle: _NS("Dismiss")]; + [o_err_ckbk_surpress setTitle: _NS("Surpress further errors")]; [o_info_window setTitle: _NS("Info")]; } @@ -940,6 +941,7 @@ unsigned int VLCModifiersToCocoa( unsigned int i_key ) { int i_start, i_stop; intf_thread_t * p_intf = [NSApp getIntf]; + vlc_value_t quiet; vlc_mutex_lock( p_intf->p_sys->p_sub->p_lock ); i_stop = *p_intf->p_sys->p_sub->pi_stop; @@ -994,7 +996,9 @@ unsigned int VLCModifiersToCocoa( unsigned int i_key ) [o_msg_lock unlock]; - if( i_type == 1 ) + var_Get( p_intf->p_vlc, "verbose", &quiet ); + + if( i_type == 1 && quiet.i_int > -1 ) { NSString *o_my_msg = [NSString stringWithFormat: @"%s: %s\n", p_intf->p_sys->p_sub->p_msg[i_start].psz_module, @@ -1212,6 +1216,14 @@ unsigned int VLCModifiersToCocoa( unsigned int i_key ) - (IBAction)closeError:(id)sender { + vlc_value_t val; + intf_thread_t * p_intf = [NSApp getIntf]; + + if( [o_err_ckbk_surpress state] == NSOnState ) + { + val.i_int = -1; + var_Set( p_intf->p_vlc, "verbose", val ); + } [o_err_msg setString: @""]; [o_error performClose: self]; } diff --git a/modules/gui/macosx/playlist.h b/modules/gui/macosx/playlist.h index 5df0787b1b..0eaff37709 100644 --- a/modules/gui/macosx/playlist.h +++ b/modules/gui/macosx/playlist.h @@ -1,11 +1,11 @@ /***************************************************************************** * playlist.h: MacOS X interface plugin ***************************************************************************** - * Copyright (C) 2002-2003 VideoLAN - * $Id: playlist.h,v 1.16 2003/12/11 19:34:46 hartman Exp $ + * Copyright (C) 2002-2004 VideoLAN + * $Id: playlist.h,v 1.17 2004/01/09 22:11:04 hartman Exp $ * * Authors: Jon Lech Johansen - * Derk-Jan Hartman + * Derk-Jan Hartman * * 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 @@ -45,6 +45,7 @@ IBOutlet id o_status_field; IBOutlet id o_tc_name; IBOutlet id o_tc_author; + IBOutlet id o_tc_duration; IBOutlet id o_ctx_menu; IBOutlet id o_mi_save_playlist; diff --git a/modules/gui/macosx/playlist.m b/modules/gui/macosx/playlist.m index d85f581dc0..21cd0d943f 100644 --- a/modules/gui/macosx/playlist.m +++ b/modules/gui/macosx/playlist.m @@ -1,11 +1,11 @@ /***************************************************************************** * playlist.m: MacOS X interface plugin ***************************************************************************** - * Copyright (C) 2002-2003 VideoLAN - * $Id: playlist.m,v 1.50 2004/01/05 13:07:03 zorglub Exp $ + * Copyright (C) 2002-2004 VideoLAN + * $Id: playlist.m,v 1.51 2004/01/09 22:11:04 hartman Exp $ * * Authors: Jon Lech Johansen - * Derk-Jan Hartman + * Derk-Jan Hartman * * 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 @@ -145,6 +145,7 @@ [o_mi_selectall setTitle: _NS("Select All")]; [[o_tc_name headerCell] setStringValue:_NS("Name")]; [[o_tc_author headerCell] setStringValue:_NS("Author")]; + [[o_tc_duration headerCell] setStringValue:_NS("Duration")]; [o_random_ckb setTitle: _NS("Shuffle")]; [o_loop_ckb setTitle: _NS("Repeat Playlist")]; [o_repeat_ckb setTitle: _NS("Repeat Item")]; @@ -342,25 +343,24 @@ { /* One item */ NSDictionary *o_one_item; - int j; - int i_total_options = 0; + int j, i_new_position = -1; int i_mode = PLAYLIST_INSERT; BOOL b_rem = FALSE, b_dir = FALSE; - NSString *o_url, *o_name; + NSString *o_uri, *o_name; NSArray *o_options; - char **ppsz_options = NULL; + NSURL *o_true_file; /* Get the item */ o_one_item = [o_array objectAtIndex: i_item]; - o_url = (NSString *)[o_one_item objectForKey: @"ITEM_URL"]; + o_uri = (NSString *)[o_one_item objectForKey: @"ITEM_URL"]; o_name = (NSString *)[o_one_item objectForKey: @"ITEM_NAME"]; o_options = (NSArray *)[o_one_item objectForKey: @"ITEM_OPTIONS"]; /* If no name, then make a guess */ - if( !o_name) o_name = [[NSFileManager defaultManager] displayNameAtPath: o_url]; + if( !o_name) o_name = [[NSFileManager defaultManager] displayNameAtPath: o_uri]; - if( [[NSFileManager defaultManager] fileExistsAtPath:o_url isDirectory:&b_dir] && b_dir && - [[NSWorkspace sharedWorkspace] getFileSystemInfoForPath: o_url isRemovable: &b_rem + if( [[NSFileManager defaultManager] fileExistsAtPath:o_uri isDirectory:&b_dir] && b_dir && + [[NSWorkspace sharedWorkspace] getFileSystemInfoForPath: o_uri isRemovable: &b_rem isWritable:NULL isUnmountable:NULL description:NULL type:NULL] && b_rem ) { /* All of this is to make sure CD's play when you D&D them on VLC */ @@ -368,50 +368,38 @@ struct statfs *buf; char *psz_dev, *temp; buf = (struct statfs *) malloc (sizeof(struct statfs)); - statfs( [o_url fileSystemRepresentation], buf ); + statfs( [o_uri fileSystemRepresentation], buf ); psz_dev = strdup(buf->f_mntfromname); free( buf ); temp = strrchr( psz_dev , 's' ); psz_dev[temp - psz_dev] = '\0'; - o_url = [NSString stringWithCString: psz_dev ]; + o_uri = [NSString stringWithCString: psz_dev ]; } if (i_item == 0 && !b_enqueue) i_mode |= PLAYLIST_GO; - - if( o_options && [o_options count] > 0 ) + + /* Add the item */ + i_new_position = playlist_Add( p_playlist, [o_uri fileSystemRepresentation], + [o_name UTF8String], i_mode, + i_position == -1 ? PLAYLIST_END : i_position + i_item); + + /* Add the options, when there are any */ + if( o_options ) { - /* Count the input options */ - i_total_options = [o_options count]; - - /* Allocate ppsz_options */ - for( j = 0; j < i_total_options; j++ ) + for( j = 0; j < [o_options count]; j++ ) { - if( !ppsz_options ) - ppsz_options = (char **)malloc( sizeof(char *) * i_total_options ); - - ppsz_options[j] = strdup([[o_options objectAtIndex:j] UTF8String]); + playlist_AddOption( p_playlist, i_new_position, + strdup( [[o_options objectAtIndex:j] UTF8String] ) ); } } - playlist_Add( p_playlist, [o_url fileSystemRepresentation], - [o_name UTF8String], i_mode, - i_position == -1 ? PLAYLIST_END : i_position + i_item); -/*-1, - (ppsz_options != NULL ) ? (const char **)ppsz_options : 0, i_total_options, - i_mode, i_position == -1 ? PLAYLIST_END : i_position + i_item);*/ - - /* clean up */ - for( j = 0; j < i_total_options; j++ ) - free( ppsz_options[j] ); - if( ppsz_options ) free( ppsz_options ); - /* Recent documents menu */ - NSURL *o_true_url = [NSURL fileURLWithPath: o_url]; - if( o_true_url != nil ) + o_true_file = [NSURL fileURLWithPath: o_uri]; + if( o_true_file != nil ) { [[NSDocumentController sharedDocumentController] - noteNewRecentDocumentURL: o_true_url]; + noteNewRecentDocumentURL: o_true_file]; } } @@ -505,7 +493,7 @@ { vlc_mutex_lock( &p_playlist->object_lock ); o_value = [[NSString stringWithUTF8String: - p_playlist->pp_items[i_row]->psz_name] lastPathComponent]; + p_playlist->pp_items[i_row]->psz_name] lastPathComponent]; vlc_mutex_unlock( &p_playlist->object_lock ); } else if( [[o_tc identifier] isEqualToString:@"2"] ) @@ -515,6 +503,20 @@ playlist_GetInfo(p_playlist, i_row ,_("General"),_("Author") )]; vlc_mutex_unlock( &p_playlist->object_lock ); } + else if( [[o_tc identifier] isEqualToString:@"3"] ) + { + char psz_duration[MSTRTIME_MAX_SIZE]; + mtime_t dur = p_playlist->pp_items[i_row]->i_duration; + if( dur != -1 ) + { + secstotimestr( psz_duration, dur/1000000 ); + o_value = [NSString stringWithUTF8String: psz_duration]; + } + else + { + o_value = @"-:--:--"; + } + } vlc_object_release( p_playlist ); diff --git a/vlc.ebuild b/vlc.ebuild index ad5cd86517..c46b774d88 100644 --- a/vlc.ebuild +++ b/vlc.ebuild @@ -1,10 +1,10 @@ ############################################################################### # vlc.ebuild: A Gentoo ebuild for vlc ############################################################################### -# Copyright (C) 2003 VideoLAN -# $Id: vlc.ebuild,v 1.24 2004/01/08 22:37:59 hartman Exp $ +# Copyright (C) 2003-2004 VideoLAN +# $Id: vlc.ebuild,v 1.25 2004/01/09 22:11:04 hartman Exp $ # -# Authors: Derk-Jan Hartman +# Authors: Derk-Jan Hartman # # 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