From 03d18c98e8576eab70efae9100279861bd657650 Mon Sep 17 00:00:00 2001 From: Derk-Jan Hartman Date: Mon, 3 Nov 2003 15:27:28 +0000 Subject: [PATCH] * modules/gui/macosx/*: Commit of the Visualizations menu item. * ALL: bring the project files to XCode. 10.2 users should revert the change in Makefile.am or they won't be able to build VLC on their machine. Editing the project files will probably also not be possible for them. --- Makefile.am | 2 +- .../English.lproj/MainMenu.nib/classes.nib | 2 + .../English.lproj/MainMenu.nib/info.nib | 16 +- .../English.lproj/MainMenu.nib/objects.nib | Bin 51158 -> 49080 bytes extras/MacOSX/vlc.pbproj/project.pbxproj | 183 +++++++++++++++++- modules/gui/macosx/intf.h | 4 +- modules/gui/macosx/intf.m | 7 +- 7 files changed, 204 insertions(+), 10 deletions(-) diff --git a/Makefile.am b/Makefile.am index 566ba4d536..4767de0017 100644 --- a/Makefile.am +++ b/Makefile.am @@ -453,7 +453,7 @@ VLC.app: vlc cp "$(srcdir)/modules/gui/macosx/$$i" \ $(top_builddir)/tmp/modules/gui/macosx; \ done - cd $(top_builddir)/tmp/extras/MacOSX && pbxbuild -target vlc | grep -v '^\([ \t]\|$$\)' + cd $(top_builddir)/tmp/extras/MacOSX && xcodebuild -target vlc | grep -v '^\([ \t]\|$$\)' cp -r $(top_builddir)/tmp/extras/MacOSX/build/vlc.bundle \ $(top_builddir)/VLC.app rm -Rf $(top_builddir)/tmp diff --git a/extras/MacOSX/Resources/English.lproj/MainMenu.nib/classes.nib b/extras/MacOSX/Resources/English.lproj/MainMenu.nib/classes.nib index 6a0f005522..19f3abba5e 100644 --- a/extras/MacOSX/Resources/English.lproj/MainMenu.nib/classes.nib +++ b/extras/MacOSX/Resources/English.lproj/MainMenu.nib/classes.nib @@ -144,6 +144,7 @@ "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; @@ -165,6 +166,7 @@ "o_mu_title" = id; "o_mu_video" = id; "o_mu_videotrack" = id; + "o_mu_visual" = id; "o_mu_window" = id; "o_playlist" = id; "o_prefs" = id; diff --git a/extras/MacOSX/Resources/English.lproj/MainMenu.nib/info.nib b/extras/MacOSX/Resources/English.lproj/MainMenu.nib/info.nib index cd1482041a..c55d1856dd 100644 --- a/extras/MacOSX/Resources/English.lproj/MainMenu.nib/info.nib +++ b/extras/MacOSX/Resources/English.lproj/MainMenu.nib/info.nib @@ -3,25 +3,29 @@ IBDocumentLocation - 32 550 365 441 0 0 1280 1002 + 23 160 772 722 0 0 1280 1002 IBEditorPositions 29 - 431 891 419 44 0 0 1280 1002 + 430 938 419 44 0 0 1280 1002 303 - 60 509 104 114 0 0 1280 1002 + 259 604 104 118 0 0 1280 1002 909 72 297 430 172 0 0 1152 746 915 - 439 657 93 96 0 0 1280 1002 + 439 657 93 99 0 0 1280 1002 IBFramework Version - 291.0 + 349.0 IBLockedObjects 977 + IBOpenObjects + + 29 + IBSystem Version - 6R73 + 7B85 diff --git a/extras/MacOSX/Resources/English.lproj/MainMenu.nib/objects.nib b/extras/MacOSX/Resources/English.lproj/MainMenu.nib/objects.nib index 15cd1eb5b12c5b1b22b2f1ba0e46d245f4f6c2a9..47e7156d37c7359c3c53c5781753a693a2430130 100644 GIT binary patch literal 49080 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

398Cbk_LhmZpa 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 O4htnCbK?p4@BbI_RD$9F diff --git a/extras/MacOSX/vlc.pbproj/project.pbxproj b/extras/MacOSX/vlc.pbproj/project.pbxproj index 659cbff64c..a075a69c26 100644 --- a/extras/MacOSX/vlc.pbproj/project.pbxproj +++ b/extras/MacOSX/vlc.pbproj/project.pbxproj @@ -3,19 +3,27 @@ archiveVersion = 1; classes = { }; - objectVersion = 38; + objectVersion = 39; objects = { 014CEA410018CDE011CA2923 = { + expectedFileType = wrapper.cfbundle; + fallbackIsa = PBXFileReference; isa = PBXBundleReference; path = VLC.bundle; refType = 3; + sourceTree = BUILT_PRODUCTS_DIR; }; 014CEA420018CDE011CA2923 = { buildRules = ( ); buildSettings = { COPY_PHASE_STRIP = NO; + GCC_DYNAMIC_NO_PIC = NO; + GCC_ENABLE_FIX_AND_CONTINUE = YES; + GCC_GENERATE_DEBUGGING_SYMBOLS = YES; + GCC_OPTIMIZATION_LEVEL = 0; OPTIMIZATION_CFLAGS = "-O0"; + ZERO_LINK = YES; }; isa = PBXBuildStyle; name = Development; @@ -25,6 +33,8 @@ ); buildSettings = { COPY_PHASE_STRIP = YES; + GCC_ENABLE_FIX_AND_CONTINUE = NO; + ZERO_LINK = NO; }; isa = PBXBuildStyle; name = Deployment; @@ -40,6 +50,8 @@ //083 //084 089C1669FE841209C02AAC07 = { + buildSettings = { + }; buildStyles = ( 014CEA420018CDE011CA2923, 014CEA430018CDE011CA2923, @@ -62,6 +74,7 @@ isa = PBXGroup; name = vlc; refType = 4; + sourceTree = ""; }; 089C1671FE841209C02AAC07 = { children = ( @@ -71,12 +84,16 @@ isa = PBXGroup; name = "Frameworks and Libraries"; refType = 4; + sourceTree = ""; }; 089C1672FE841209C02AAC07 = { + expectedFileType = wrapper.framework; + fallbackIsa = PBXFileReference; isa = PBXFrameworkReference; name = Foundation.framework; path = /System/Library/Frameworks/Foundation.framework; refType = 0; + sourceTree = ""; }; 089C1673FE841209C02AAC07 = { buildPhases = ( @@ -88,6 +105,7 @@ FRAMEWORK_SEARCH_PATHS = ""; HEADER_SEARCH_PATHS = ""; INSTALL_PATH = "$(HOME)/Library/Bundles"; + JAVAC_SOURCE_FILE_ENCODING = "ISO-8859-1"; LIBRARY_SEARCH_PATHS = ""; OTHER_CFLAGS = ""; OTHER_LDFLAGS = ""; @@ -678,12 +696,16 @@ name = Resources; path = ""; refType = 4; + sourceTree = ""; }; 089C167FFE841241C02AAC07 = { + expectedFileType = wrapper.framework; + fallbackIsa = PBXFileReference; isa = PBXFrameworkReference; name = AppKit.framework; path = /System/Library/Frameworks/AppKit.framework; refType = 0; + sourceTree = ""; }; 08FB77AFFE84173DC02AAC07 = { children = ( @@ -715,6 +737,7 @@ isa = PBXGroup; name = Classes; refType = 4; + sourceTree = ""; }; //080 //081 @@ -733,12 +756,16 @@ isa = PBXGroup; name = "Linked Frameworks"; refType = 4; + sourceTree = ""; }; 1058C7ADFEA557BF11CA2CBB = { + expectedFileType = wrapper.framework; + fallbackIsa = PBXFileReference; isa = PBXFrameworkReference; name = Cocoa.framework; path = /System/Library/Frameworks/Cocoa.framework; refType = 0; + sourceTree = ""; }; 1058C7AEFEA557BF11CA2CBB = { children = ( @@ -748,6 +775,7 @@ isa = PBXGroup; name = "Other Frameworks"; refType = 4; + sourceTree = ""; }; 1058C7AFFEA557BF11CA2CBB = { fileRef = 1058C7ADFEA557BF11CA2CBB; @@ -772,6 +800,7 @@ isa = PBXGroup; name = Products; refType = 4; + sourceTree = ""; }; //190 //191 @@ -819,138 +848,183 @@ name = fileicons; path = ""; refType = 4; + sourceTree = ""; }; 8E445F8704728A700059A3A7 = { + expectedFileType = image.icns; isa = PBXFileReference; name = a52.icns; path = Resources/a52.icns; refType = 2; + sourceTree = SOURCE_ROOT; }; 8E445F8804728A700059A3A7 = { + expectedFileType = image.icns; isa = PBXFileReference; name = aac.icns; path = Resources/aac.icns; refType = 2; + sourceTree = SOURCE_ROOT; }; 8E445F8904728A700059A3A7 = { + expectedFileType = image.icns; isa = PBXFileReference; name = asf.icns; path = Resources/asf.icns; refType = 2; + sourceTree = SOURCE_ROOT; }; 8E445F8A04728A700059A3A7 = { + expectedFileType = image.icns; isa = PBXFileReference; name = asx.icns; path = Resources/asx.icns; refType = 2; + sourceTree = SOURCE_ROOT; }; 8E445F8B04728A700059A3A7 = { + expectedFileType = image.icns; isa = PBXFileReference; name = avi.icns; path = Resources/avi.icns; refType = 2; + sourceTree = SOURCE_ROOT; }; 8E445F8C04728A700059A3A7 = { + expectedFileType = image.icns; isa = PBXFileReference; name = bin.icns; path = Resources/bin.icns; refType = 2; + sourceTree = SOURCE_ROOT; }; 8E445F8D04728A700059A3A7 = { + expectedFileType = image.icns; isa = PBXFileReference; name = cue.icns; path = Resources/cue.icns; refType = 2; + sourceTree = SOURCE_ROOT; }; 8E445F8E04728A700059A3A7 = { + expectedFileType = image.icns; isa = PBXFileReference; name = dat.icns; path = Resources/dat.icns; refType = 2; + sourceTree = SOURCE_ROOT; }; 8E445F8F04728A700059A3A7 = { + expectedFileType = image.icns; isa = PBXFileReference; name = dv.icns; path = Resources/dv.icns; refType = 2; + sourceTree = SOURCE_ROOT; }; 8E445F9004728A700059A3A7 = { + expectedFileType = image.icns; isa = PBXFileReference; name = m3u.icns; path = Resources/m3u.icns; refType = 2; + sourceTree = SOURCE_ROOT; }; 8E445F9104728A700059A3A7 = { + expectedFileType = image.icns; isa = PBXFileReference; name = mov.icns; path = Resources/mov.icns; refType = 2; + sourceTree = SOURCE_ROOT; }; 8E445F9204728A700059A3A7 = { + expectedFileType = image.icns; isa = PBXFileReference; name = mp3.icns; path = Resources/mp3.icns; refType = 2; + sourceTree = SOURCE_ROOT; }; 8E445F9304728A700059A3A7 = { + expectedFileType = image.icns; isa = PBXFileReference; name = mp4.icns; path = Resources/mp4.icns; refType = 2; + sourceTree = SOURCE_ROOT; }; 8E445F9404728A700059A3A7 = { + expectedFileType = image.icns; isa = PBXFileReference; name = mpg.icns; path = Resources/mpg.icns; refType = 2; + sourceTree = SOURCE_ROOT; }; 8E445F9504728A700059A3A7 = { + expectedFileType = image.icns; isa = PBXFileReference; name = ogg.icns; path = Resources/ogg.icns; refType = 2; + sourceTree = SOURCE_ROOT; }; 8E445F9604728A700059A3A7 = { + expectedFileType = image.icns; isa = PBXFileReference; name = ogm.icns; path = Resources/ogm.icns; refType = 2; + sourceTree = SOURCE_ROOT; }; 8E445F9704728A700059A3A7 = { + expectedFileType = image.icns; isa = PBXFileReference; name = pls.icns; path = Resources/pls.icns; refType = 2; + sourceTree = SOURCE_ROOT; }; 8E445F9804728A700059A3A7 = { + expectedFileType = image.icns; isa = PBXFileReference; name = srt.icns; path = Resources/srt.icns; refType = 2; + sourceTree = SOURCE_ROOT; }; 8E445F9904728A700059A3A7 = { + expectedFileType = image.icns; isa = PBXFileReference; name = sub.icns; path = Resources/sub.icns; refType = 2; + sourceTree = SOURCE_ROOT; }; 8E445F9A04728A700059A3A7 = { + expectedFileType = image.icns; isa = PBXFileReference; name = vob.icns; path = Resources/vob.icns; refType = 2; + sourceTree = SOURCE_ROOT; }; 8E445F9B04728A700059A3A7 = { + expectedFileType = image.icns; isa = PBXFileReference; name = wma.icns; path = Resources/wma.icns; refType = 2; + sourceTree = SOURCE_ROOT; }; 8E445F9C04728A700059A3A7 = { + expectedFileType = image.icns; isa = PBXFileReference; name = wmv.icns; path = Resources/wmv.icns; refType = 2; + sourceTree = SOURCE_ROOT; }; 8E445F9D04728A700059A3A7 = { fileRef = 8E445F8704728A700059A3A7; @@ -1085,45 +1159,57 @@ }; }; 8E55FB7F0459B0FD00FB3317 = { + expectedFileType = sourcecode.c.h; fileEncoding = 30; isa = PBXFileReference; name = output.h; path = ../../modules/gui/macosx/output.h; refType = 2; + sourceTree = SOURCE_ROOT; }; 8E55FB800459B0FD00FB3317 = { + expectedFileType = sourcecode.c.objc; fileEncoding = 30; isa = PBXFileReference; name = output.m; path = ../../modules/gui/macosx/output.m; refType = 2; + sourceTree = SOURCE_ROOT; }; 8E6BC6F6041643860059A3A7 = { + expectedFileType = sourcecode.c.h; fileEncoding = 4; isa = PBXFileReference; name = applescript.h; path = ../../modules/gui/macosx/applescript.h; refType = 2; + sourceTree = SOURCE_ROOT; }; 8E6BC6F7041643860059A3A7 = { + expectedFileType = sourcecode.c.objc; fileEncoding = 4; isa = PBXFileReference; name = applescript.m; path = ../../modules/gui/macosx/applescript.m; refType = 2; + sourceTree = SOURCE_ROOT; }; 8E6BC6FA041684EC0059A3A7 = { + expectedFileType = sourcecode.c.h; fileEncoding = 4; isa = PBXFileReference; name = controls.h; path = ../../modules/gui/macosx/controls.h; refType = 2; + sourceTree = SOURCE_ROOT; }; 8E88833C03DD6E870059A3A7 = { + expectedFileType = image.png; isa = PBXFileReference; name = slow.png; path = Resources/slow.png; refType = 4; + sourceTree = ""; }; 8E88833D03DD6E870059A3A7 = { fileRef = 8E88833C03DD6E870059A3A7; @@ -1132,11 +1218,13 @@ }; }; 8E9CC7B1046EFD700059A3A7 = { + expectedFileType = text; fileEncoding = 12; isa = PBXFileReference; name = THANKS; path = ../../THANKS; refType = 2; + sourceTree = SOURCE_ROOT; }; 8E9CC7B2046EFD700059A3A7 = { fileRef = 8E9CC7B1046EFD700059A3A7; @@ -1145,10 +1233,12 @@ }; }; 8EBF3FA303F13FFB0059A3A7 = { + expectedFileType = text; isa = PBXFileReference; name = vlc.scriptSuite; path = Resources/vlc.scriptSuite; refType = 2; + sourceTree = SOURCE_ROOT; }; 8EBF3FA403F13FFB0059A3A7 = { fileRef = 8EBF3FA303F13FFB0059A3A7; @@ -1157,10 +1247,12 @@ }; }; 8EBF3FA503F140960059A3A7 = { + expectedFileType = text; isa = PBXFileReference; name = vlc.scriptTerminology; path = Resources/English.lproj/vlc.scriptTerminology; refType = 2; + sourceTree = SOURCE_ROOT; }; 8EBF3FA703F140A80059A3A7 = { children = ( @@ -1169,6 +1261,7 @@ isa = PBXVariantGroup; name = vlc.scriptTerminology; refType = 4; + sourceTree = ""; }; 8EBF3FA803F140A80059A3A7 = { fileRef = 8EBF3FA703F140A80059A3A7; @@ -1177,123 +1270,157 @@ }; }; 8ED6C27A03E2EB1C0059A3A7 = { + expectedFileType = sourcecode.c.c; fileEncoding = 30; isa = PBXFileReference; name = coreaudio.c; path = ../../modules/audio_output/coreaudio.c; refType = 2; + sourceTree = SOURCE_ROOT; }; 8ED6C27B03E2EB1C0059A3A7 = { + expectedFileType = sourcecode.c.objc; fileEncoding = 30; isa = PBXFileReference; name = controls.m; path = ../../modules/gui/macosx/controls.m; refType = 2; + sourceTree = SOURCE_ROOT; }; 8ED6C27C03E2EB1C0059A3A7 = { + expectedFileType = sourcecode.c.h; fileEncoding = 30; isa = PBXFileReference; name = intf.h; path = ../../modules/gui/macosx/intf.h; refType = 2; + sourceTree = SOURCE_ROOT; }; 8ED6C27D03E2EB1C0059A3A7 = { + expectedFileType = sourcecode.c.objc; fileEncoding = 30; isa = PBXFileReference; name = intf.m; path = ../../modules/gui/macosx/intf.m; refType = 2; + sourceTree = SOURCE_ROOT; }; 8ED6C27E03E2EB1C0059A3A7 = { + expectedFileType = sourcecode.c.objc; fileEncoding = 30; isa = PBXFileReference; name = macosx.m; path = ../../modules/gui/macosx/macosx.m; refType = 2; + sourceTree = SOURCE_ROOT; }; 8ED6C27F03E2EB1C0059A3A7 = { + expectedFileType = sourcecode.c.h; fileEncoding = 30; isa = PBXFileReference; name = misc.h; path = ../../modules/gui/macosx/misc.h; refType = 2; + sourceTree = SOURCE_ROOT; }; 8ED6C28003E2EB1C0059A3A7 = { + expectedFileType = sourcecode.c.objc; fileEncoding = 30; isa = PBXFileReference; name = misc.m; path = ../../modules/gui/macosx/misc.m; refType = 2; + sourceTree = SOURCE_ROOT; }; 8ED6C28103E2EB1C0059A3A7 = { + expectedFileType = sourcecode.c.h; fileEncoding = 30; isa = PBXFileReference; name = open.h; path = ../../modules/gui/macosx/open.h; refType = 2; + sourceTree = SOURCE_ROOT; }; 8ED6C28203E2EB1C0059A3A7 = { + expectedFileType = sourcecode.c.objc; fileEncoding = 30; isa = PBXFileReference; name = open.m; path = ../../modules/gui/macosx/open.m; refType = 2; + sourceTree = SOURCE_ROOT; }; 8ED6C28303E2EB1C0059A3A7 = { + expectedFileType = sourcecode.c.h; fileEncoding = 30; isa = PBXFileReference; name = playlist.h; path = ../../modules/gui/macosx/playlist.h; refType = 2; + sourceTree = SOURCE_ROOT; }; 8ED6C28403E2EB1C0059A3A7 = { + expectedFileType = sourcecode.c.objc; fileEncoding = 30; isa = PBXFileReference; name = playlist.m; path = ../../modules/gui/macosx/playlist.m; refType = 2; + sourceTree = SOURCE_ROOT; }; 8ED6C28503E2EB1C0059A3A7 = { + expectedFileType = sourcecode.c.h; fileEncoding = 30; isa = PBXFileReference; name = prefs.h; path = ../../modules/gui/macosx/prefs.h; refType = 2; + sourceTree = SOURCE_ROOT; }; 8ED6C28603E2EB1C0059A3A7 = { + expectedFileType = sourcecode.c.objc; fileEncoding = 30; isa = PBXFileReference; name = prefs.m; path = ../../modules/gui/macosx/prefs.m; refType = 2; + sourceTree = SOURCE_ROOT; }; 8ED6C28703E2EB1C0059A3A7 = { + expectedFileType = sourcecode.c.h; fileEncoding = 30; isa = PBXFileReference; name = vout.h; path = ../../modules/gui/macosx/vout.h; refType = 2; + sourceTree = SOURCE_ROOT; }; 8ED6C28803E2EB1C0059A3A7 = { + expectedFileType = sourcecode.c.objc; fileEncoding = 30; isa = PBXFileReference; name = vout.m; path = ../../modules/gui/macosx/vout.m; refType = 2; + sourceTree = SOURCE_ROOT; }; 8ED6C29D03E2F32E0059A3A7 = { + expectedFileType = text; fileEncoding = 12; isa = PBXFileReference; name = AUTHORS; path = ../../AUTHORS; refType = 2; + sourceTree = SOURCE_ROOT; }; 8ED6C29E03E2F32E0059A3A7 = { + expectedFileType = text; fileEncoding = 12; isa = PBXFileReference; name = COPYING; path = ../../COPYING; refType = 2; + sourceTree = SOURCE_ROOT; }; 8ED6C29F03E2F32E0059A3A7 = { fileRef = 8ED6C29D03E2F32E0059A3A7; @@ -1308,10 +1435,12 @@ }; }; 8EDAC3430440F72D0059A3A7 = { + expectedFileType = text.rtf; isa = PBXFileReference; name = README.MacOSX.rtf; path = ../../README.MacOSX.rtf; refType = 2; + sourceTree = SOURCE_ROOT; }; 8EDAC3440440F72D0059A3A7 = { fileRef = 8EDAC3430440F72D0059A3A7; @@ -1320,24 +1449,30 @@ }; }; 8EE1AF9F044465080059A3A7 = { + expectedFileType = sourcecode.c.h; fileEncoding = 30; isa = PBXFileReference; name = about.h; path = ../../modules/gui/macosx/about.h; refType = 2; + sourceTree = SOURCE_ROOT; }; 8EE1AFA0044465080059A3A7 = { + expectedFileType = sourcecode.c.objc; fileEncoding = 30; isa = PBXFileReference; name = about.m; path = ../../modules/gui/macosx/about.m; refType = 2; + sourceTree = SOURCE_ROOT; }; 8EE1AFA30444660F0059A3A7 = { + expectedFileType = image.png; isa = PBXFileReference; name = about_bg.png; path = Resources/about_bg.png; refType = 2; + sourceTree = SOURCE_ROOT; }; 8EE1AFA40444660F0059A3A7 = { fileRef = 8EE1AFA30444660F0059A3A7; @@ -1346,18 +1481,22 @@ }; }; 8EF1600B03FC62560059A3A7 = { + expectedFileType = sourcecode.c.h; fileEncoding = 4; isa = PBXFileReference; name = info.h; path = ../../modules/gui/macosx/info.h; refType = 2; + sourceTree = SOURCE_ROOT; }; 8EF1600C03FC62560059A3A7 = { + expectedFileType = sourcecode.c.objc; fileEncoding = 4; isa = PBXFileReference; name = info.m; path = ../../modules/gui/macosx/info.m; refType = 2; + sourceTree = SOURCE_ROOT; }; //8E0 //8E1 @@ -1370,64 +1509,84 @@ //A03 //A04 A064F9E003CB9EE000B21232 = { + expectedFileType = image.png; isa = PBXFileReference; name = prefs.png; path = Resources/prefs.png; refType = 4; + sourceTree = ""; }; A064F9E103CB9EE000B21232 = { + expectedFileType = image.png; isa = PBXFileReference; name = end.png; path = Resources/end.png; refType = 4; + sourceTree = ""; }; A064F9E203CB9EE000B21232 = { + expectedFileType = image.png; isa = PBXFileReference; name = pause.png; path = Resources/pause.png; refType = 4; + sourceTree = ""; }; A064F9E303CB9EE000B21232 = { + expectedFileType = image.png; isa = PBXFileReference; name = list.png; path = Resources/list.png; refType = 4; + sourceTree = ""; }; A064F9E403CB9EE000B21232 = { + expectedFileType = image.png; isa = PBXFileReference; name = forw.png; path = Resources/forw.png; refType = 4; + sourceTree = ""; }; A064F9E503CB9EE000B21232 = { + expectedFileType = image.png; isa = PBXFileReference; name = vlc_hg.png; path = Resources/vlc_hg.png; refType = 4; + sourceTree = ""; }; A064F9E603CB9EE000B21232 = { + expectedFileType = image.png; isa = PBXFileReference; name = stop.png; path = Resources/stop.png; refType = 4; + sourceTree = ""; }; A064F9E703CB9EE000B21232 = { + expectedFileType = image.png; isa = PBXFileReference; name = begin.png; path = Resources/begin.png; refType = 4; + sourceTree = ""; }; A064F9E803CB9EE000B21232 = { + expectedFileType = image.png; isa = PBXFileReference; name = back.png; path = Resources/back.png; refType = 4; + sourceTree = ""; }; A064F9E903CB9EE000B21232 = { + expectedFileType = image.png; isa = PBXFileReference; name = play.png; path = Resources/play.png; refType = 4; + sourceTree = ""; }; A064F9EA03CB9EE000B21232 = { fileRef = A064F9E003CB9EE000B21232; @@ -1490,11 +1649,13 @@ }; }; A0E6B59804407FBD0080DD97 = { + expectedFileType = text; fileEncoding = 12; isa = PBXFileReference; name = README; path = Resources/README; refType = 4; + sourceTree = ""; }; A0E6B59904407FBD0080DD97 = { fileRef = A0E6B59804407FBD0080DD97; @@ -1520,13 +1681,16 @@ name = InfoPlist.strings; path = ""; refType = 4; + sourceTree = ""; }; F69B0CA702E24F6401A80112 = { + expectedFileType = text.plist.strings; fileEncoding = 5; isa = PBXFileReference; name = English; path = Resources/English.lproj/InfoPlist.strings; refType = 4; + sourceTree = ""; }; F69B0CA802E24F6401A80112 = { fileRef = F69B0CA602E24F6401A80112; @@ -1535,40 +1699,52 @@ }; }; F6E4F90A02D2648B01A80112 = { + expectedFileType = image.icns; isa = PBXFileReference; name = divx.icns; path = Resources/divx.icns; refType = 4; + sourceTree = ""; }; F6E4F90B02D2648B01A80112 = { + expectedFileType = image.icns; isa = PBXFileReference; name = generic.icns; path = Resources/generic.icns; refType = 4; + sourceTree = ""; }; F6E4F90C02D2648B01A80112 = { + expectedFileType = image.icns; isa = PBXFileReference; name = mpeg.icns; path = Resources/mpeg.icns; refType = 4; + sourceTree = ""; }; F6E4F90D02D2648B01A80112 = { + expectedFileType = image.icns; isa = PBXFileReference; name = mpeg1.icns; path = Resources/mpeg1.icns; refType = 4; + sourceTree = ""; }; F6E4F90E02D2648B01A80112 = { + expectedFileType = image.icns; isa = PBXFileReference; name = mpeg2.icns; path = Resources/mpeg2.icns; refType = 4; + sourceTree = ""; }; F6E4F90F02D2648B01A80112 = { + expectedFileType = image.icns; isa = PBXFileReference; name = mpeg4.icns; path = Resources/mpeg4.icns; refType = 4; + sourceTree = ""; }; F6E4F91002D2648B01A80112 = { fileRef = F6E4F90A02D2648B01A80112; @@ -1617,10 +1793,12 @@ //F73 //F74 F74F13DF02C2A53401EE194C = { + expectedFileType = image.icns; isa = PBXFileReference; name = vlc.icns; path = Resources/vlc.icns; refType = 4; + sourceTree = ""; }; F74F13E002C2A53401EE194C = { fileRef = F74F13DF02C2A53401EE194C; @@ -1636,12 +1814,15 @@ name = MainMenu.nib; path = ""; refType = 4; + sourceTree = ""; }; F74F13EB02C2A79C01EE194C = { + expectedFileType = wrapper.nib; isa = PBXFileReference; name = English; path = Resources/English.lproj/MainMenu.nib; refType = 4; + sourceTree = ""; }; F74F13EC02C2A79C01EE194C = { fileRef = F74F13EA02C2A79C01EE194C; diff --git a/modules/gui/macosx/intf.h b/modules/gui/macosx/intf.h index 40e4499804..4204f1df4b 100644 --- a/modules/gui/macosx/intf.h +++ b/modules/gui/macosx/intf.h @@ -2,7 +2,7 @@ * intf.h: MacOS X interface plugin ***************************************************************************** * Copyright (C) 2002-2003 VideoLAN - * $Id: intf.h,v 1.46 2003/10/29 02:13:04 hartman Exp $ + * $Id: intf.h,v 1.47 2003/11/03 15:27:28 hartman Exp $ * * Authors: Jon Lech Johansen * Christophe Massiot @@ -183,6 +183,8 @@ struct intf_sys_t IBOutlet id o_mu_channels; IBOutlet id o_mi_device; IBOutlet id o_mu_device; + IBOutlet id o_mi_visual; + IBOutlet id o_mu_visual; IBOutlet id o_mu_video; IBOutlet id o_mi_half_window; diff --git a/modules/gui/macosx/intf.m b/modules/gui/macosx/intf.m index 71cf04413a..1d5ba9aced 100644 --- a/modules/gui/macosx/intf.m +++ b/modules/gui/macosx/intf.m @@ -2,7 +2,7 @@ * intf.m: MacOS X interface plugin ***************************************************************************** * Copyright (C) 2002-2003 VideoLAN - * $Id: intf.m,v 1.97 2003/10/29 02:13:04 hartman Exp $ + * $Id: intf.m,v 1.98 2003/11/03 15:27:28 hartman Exp $ * * Authors: Jon Lech Johansen * Christophe Massiot @@ -419,6 +419,8 @@ int CocoaConvertKey( unichar i_key ) [o_mu_channels setTitle: _NS("Audio channels")]; [o_mi_device setTitle: _NS("Audio device")]; [o_mu_device setTitle: _NS("Audio device")]; + [o_mi_visual setTitle: _NS("Visualizations")]; + [o_mu_visual setTitle: _NS("Visualizations")]; [o_mu_video setTitle: _NS("Video")]; [o_mi_half_window setTitle: _NS("Half Size")]; @@ -779,6 +781,9 @@ int CocoaConvertKey( unichar i_key ) [o_controls setupVarMenuItem: o_mi_device target: (vlc_object_t *)p_aout var: "audio-device" selector: @selector(toggleVar:)]; + + [o_controls setupVarMenuItem: o_mi_visual target: (vlc_object_t *)p_aout + var: "visual" selector: @selector(toggleVar:)]; vlc_object_release( (vlc_object_t *)p_aout ); } -- 2.39.2