From: Derk-Jan Hartman Date: Mon, 3 Nov 2003 15:27:28 +0000 (+0000) Subject: * modules/gui/macosx/*: Commit of the Visualizations menu item. X-Git-Tag: 0.7.0~637 X-Git-Url: https://git.sesse.net/?a=commitdiff_plain;h=03d18c98e8576eab70efae9100279861bd657650;p=vlc * 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. --- 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 15cd1eb5b1..47e7156d37 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 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 ); }