From: Benjamin Pracht Date: Tue, 27 Dec 2005 00:06:33 +0000 (+0000) Subject: * Add an controls to the vout (using the embedded vout framework) X-Git-Tag: 0.9.0-test0~12821 X-Git-Url: https://git.sesse.net/?a=commitdiff_plain;h=2f78783f5a6c12321088f02423a590f1af58f8ef;p=vlc * Add an controls to the vout (using the embedded vout framework) - There is some redundancy in the controls now... - This is just a proposal. If you don't like it, say so... - Hope I didn't forget any file (yell if you habe troubles) * Add an option to disable the embedded window --- diff --git a/extras/MacOSX/Resources/.DS_Store b/extras/MacOSX/Resources/.DS_Store new file mode 100644 index 0000000000..98f2375709 Binary files /dev/null and b/extras/MacOSX/Resources/.DS_Store differ diff --git a/extras/MacOSX/Resources/English.lproj/MainMenu.nib/classes.nib b/extras/MacOSX/Resources/English.lproj/MainMenu.nib/classes.nib index 609b50c1cc..5e0e4ca8f7 100644 --- a/extras/MacOSX/Resources/English.lproj/MainMenu.nib/classes.nib +++ b/extras/MacOSX/Resources/English.lproj/MainMenu.nib/classes.nib @@ -31,10 +31,29 @@ }; CLASS = VLCControls; LANGUAGE = ObjC; - OUTLETS = {"o_btn_fullscreen" = id; "o_main" = id; "o_volumeslider" = id; }; + OUTLETS = {"o_main" = 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_window" = id; + }; + SUPERCLASS = NSObject; + }, { ACTIONS = { bandSliderUpdated = id; @@ -122,7 +141,6 @@ LANGUAGE = ObjC; OUTLETS = { "o_btn_ff" = id; - "o_btn_fullscreen" = id; "o_btn_next" = id; "o_btn_play" = id; "o_btn_playlist" = id; @@ -135,6 +153,7 @@ "o_dmi_play" = id; "o_dmi_previous" = id; "o_dmi_stop" = id; + "o_embedded_window" = id; "o_err_btn_dismiss" = id; "o_err_btn_msgs" = id; "o_err_bug_lbl" = id; @@ -292,4 +311,4 @@ {CLASS = VLCVoutView; LANGUAGE = ObjC; SUPERCLASS = NSView; } ); IBVersion = 1; -} +} \ No newline at end of file diff --git a/extras/MacOSX/Resources/English.lproj/MainMenu.nib/info.nib b/extras/MacOSX/Resources/English.lproj/MainMenu.nib/info.nib index ba302359d0..4a01efcdae 100644 --- a/extras/MacOSX/Resources/English.lproj/MainMenu.nib/info.nib +++ b/extras/MacOSX/Resources/English.lproj/MainMenu.nib/info.nib @@ -3,7 +3,7 @@ IBDocumentLocation - 394 559 496 270 0 0 1280 1002 + 134 289 496 270 0 0 1024 746 IBEditorPositions 1617 @@ -11,18 +11,17 @@ 2197 422 532 596 143 0 0 1440 878 29 - 503 790 438 44 0 0 1440 878 + 294 89 438 44 0 0 1024 746 915 678 573 187 249 0 0 1280 1002 IBFramework Version - 437.0 + 439.0 IBLockedObjects IBOpenObjects 29 - 2029 21 IBSystem Version diff --git a/extras/MacOSX/Resources/English.lproj/MainMenu.nib/keyedobjects.nib b/extras/MacOSX/Resources/English.lproj/MainMenu.nib/keyedobjects.nib index f24ab61df4..a848081ced 100644 Binary files a/extras/MacOSX/Resources/English.lproj/MainMenu.nib/keyedobjects.nib and b/extras/MacOSX/Resources/English.lproj/MainMenu.nib/keyedobjects.nib differ diff --git a/extras/MacOSX/Resources/embedded_vout.png b/extras/MacOSX/Resources/embedded_vout.png new file mode 100644 index 0000000000..d853cef47c Binary files /dev/null and b/extras/MacOSX/Resources/embedded_vout.png differ diff --git a/extras/MacOSX/Resources/pause_embedded.png b/extras/MacOSX/Resources/pause_embedded.png new file mode 100644 index 0000000000..78b66bb9fb Binary files /dev/null and b/extras/MacOSX/Resources/pause_embedded.png differ diff --git a/extras/MacOSX/Resources/pause_embedded_blue.png b/extras/MacOSX/Resources/pause_embedded_blue.png new file mode 100644 index 0000000000..183141a349 Binary files /dev/null and b/extras/MacOSX/Resources/pause_embedded_blue.png differ diff --git a/extras/MacOSX/Resources/play_embedded.png b/extras/MacOSX/Resources/play_embedded.png new file mode 100644 index 0000000000..2d6e5d5748 Binary files /dev/null and b/extras/MacOSX/Resources/play_embedded.png differ diff --git a/extras/MacOSX/Resources/play_embedded_blue.png b/extras/MacOSX/Resources/play_embedded_blue.png new file mode 100644 index 0000000000..5645e5297c Binary files /dev/null and b/extras/MacOSX/Resources/play_embedded_blue.png differ diff --git a/extras/MacOSX/Resources/skip_forward_active_embedded.png b/extras/MacOSX/Resources/skip_forward_active_embedded.png new file mode 100644 index 0000000000..32df1c4058 Binary files /dev/null and b/extras/MacOSX/Resources/skip_forward_active_embedded.png differ diff --git a/extras/MacOSX/Resources/skip_forward_embedded_blue.png b/extras/MacOSX/Resources/skip_forward_embedded_blue.png new file mode 100644 index 0000000000..bd7dfb5ba9 Binary files /dev/null and b/extras/MacOSX/Resources/skip_forward_embedded_blue.png differ diff --git a/extras/MacOSX/Resources/skip_previous_active_embedded.png b/extras/MacOSX/Resources/skip_previous_active_embedded.png new file mode 100644 index 0000000000..f0d0ea903f Binary files /dev/null and b/extras/MacOSX/Resources/skip_previous_active_embedded.png differ diff --git a/extras/MacOSX/Resources/skip_previous_embedded_blue.png b/extras/MacOSX/Resources/skip_previous_embedded_blue.png new file mode 100644 index 0000000000..afddcdde19 Binary files /dev/null and b/extras/MacOSX/Resources/skip_previous_embedded_blue.png differ diff --git a/extras/MacOSX/vlc.pbproj/project.pbxproj b/extras/MacOSX/vlc.pbproj/project.pbxproj index 7039265966..d65c394812 100644 --- a/extras/MacOSX/vlc.pbproj/project.pbxproj +++ b/extras/MacOSX/vlc.pbproj/project.pbxproj @@ -3,16 +3,98 @@ archiveVersion = 1; classes = { }; - objectVersion = 39; + objectVersion = 42; objects = { - 014CEA410018CDE011CA2923 = { - explicitFileType = wrapper.cfbundle; - isa = PBXFileReference; - path = VLC.bundle; - refType = 3; - sourceTree = BUILT_PRODUCTS_DIR; - }; - 014CEA420018CDE011CA2923 = { + +/* Begin PBXBuildFile section */ + 1058C7AFFEA557BF11CA2CBB /* Cocoa.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 1058C7ADFEA557BF11CA2CBB /* Cocoa.framework */; }; + 2A16E08006C5074F00C87B09 /* equalizerdrawer_active.png in Resources */ = {isa = PBXBuildFile; fileRef = 2A16E07E06C5074F00C87B09 /* equalizerdrawer_active.png */; }; + 2A16E08106C5074F00C87B09 /* equalizerdrawer_blue.png in Resources */ = {isa = PBXBuildFile; fileRef = 2A16E07F06C5074F00C87B09 /* equalizerdrawer_blue.png */; }; + 8E445F9D04728A700059A3A7 /* a52.icns in Resources */ = {isa = PBXBuildFile; fileRef = 8E445F8704728A700059A3A7 /* a52.icns */; }; + 8E445F9E04728A700059A3A7 /* aac.icns in Resources */ = {isa = PBXBuildFile; fileRef = 8E445F8804728A700059A3A7 /* aac.icns */; }; + 8E445F9F04728A700059A3A7 /* asf.icns in Resources */ = {isa = PBXBuildFile; fileRef = 8E445F8904728A700059A3A7 /* asf.icns */; }; + 8E445FA004728A700059A3A7 /* asx.icns in Resources */ = {isa = PBXBuildFile; fileRef = 8E445F8A04728A700059A3A7 /* asx.icns */; }; + 8E445FA104728A700059A3A7 /* avi.icns in Resources */ = {isa = PBXBuildFile; fileRef = 8E445F8B04728A700059A3A7 /* avi.icns */; }; + 8E445FA204728A700059A3A7 /* bin.icns in Resources */ = {isa = PBXBuildFile; fileRef = 8E445F8C04728A700059A3A7 /* bin.icns */; }; + 8E445FA304728A700059A3A7 /* cue.icns in Resources */ = {isa = PBXBuildFile; fileRef = 8E445F8D04728A700059A3A7 /* cue.icns */; }; + 8E445FA404728A700059A3A7 /* dat.icns in Resources */ = {isa = PBXBuildFile; fileRef = 8E445F8E04728A700059A3A7 /* dat.icns */; }; + 8E445FA504728A700059A3A7 /* dv.icns in Resources */ = {isa = PBXBuildFile; fileRef = 8E445F8F04728A700059A3A7 /* dv.icns */; }; + 8E445FA604728A700059A3A7 /* m3u.icns in Resources */ = {isa = PBXBuildFile; fileRef = 8E445F9004728A700059A3A7 /* m3u.icns */; }; + 8E445FA704728A700059A3A7 /* mov.icns in Resources */ = {isa = PBXBuildFile; fileRef = 8E445F9104728A700059A3A7 /* mov.icns */; }; + 8E445FA804728A700059A3A7 /* mp3.icns in Resources */ = {isa = PBXBuildFile; fileRef = 8E445F9204728A700059A3A7 /* mp3.icns */; }; + 8E445FA904728A700059A3A7 /* mp4.icns in Resources */ = {isa = PBXBuildFile; fileRef = 8E445F9304728A700059A3A7 /* mp4.icns */; }; + 8E445FAA04728A700059A3A7 /* mpg.icns in Resources */ = {isa = PBXBuildFile; fileRef = 8E445F9404728A700059A3A7 /* mpg.icns */; }; + 8E445FAB04728A700059A3A7 /* ogg.icns in Resources */ = {isa = PBXBuildFile; fileRef = 8E445F9504728A700059A3A7 /* ogg.icns */; }; + 8E445FAC04728A700059A3A7 /* ogm.icns in Resources */ = {isa = PBXBuildFile; fileRef = 8E445F9604728A700059A3A7 /* ogm.icns */; }; + 8E445FAD04728A700059A3A7 /* pls.icns in Resources */ = {isa = PBXBuildFile; fileRef = 8E445F9704728A700059A3A7 /* pls.icns */; }; + 8E445FAE04728A700059A3A7 /* srt.icns in Resources */ = {isa = PBXBuildFile; fileRef = 8E445F9804728A700059A3A7 /* srt.icns */; }; + 8E445FAF04728A700059A3A7 /* sub.icns in Resources */ = {isa = PBXBuildFile; fileRef = 8E445F9904728A700059A3A7 /* sub.icns */; }; + 8E445FB004728A700059A3A7 /* vob.icns in Resources */ = {isa = PBXBuildFile; fileRef = 8E445F9A04728A700059A3A7 /* vob.icns */; }; + 8E445FB104728A700059A3A7 /* wma.icns in Resources */ = {isa = PBXBuildFile; fileRef = 8E445F9B04728A700059A3A7 /* wma.icns */; }; + 8E445FB204728A700059A3A7 /* wmv.icns in Resources */ = {isa = PBXBuildFile; fileRef = 8E445F9C04728A700059A3A7 /* wmv.icns */; }; + 8E9390B40565D6D300C7661C /* display_slider.png in Resources */ = {isa = PBXBuildFile; fileRef = 8E93909A0565D6D300C7661C /* display_slider.png */; }; + 8E9390B50565D6D300C7661C /* display_track.png in Resources */ = {isa = PBXBuildFile; fileRef = 8E93909B0565D6D300C7661C /* display_track.png */; }; + 8E9390B60565D6D300C7661C /* display.png in Resources */ = {isa = PBXBuildFile; fileRef = 8E93909C0565D6D300C7661C /* display.png */; }; + 8E9390B70565D6D300C7661C /* fullscreen_active.png in Resources */ = {isa = PBXBuildFile; fileRef = 8E93909D0565D6D300C7661C /* fullscreen_active.png */; }; + 8E9390B80565D6D300C7661C /* fullscreen_blue.png in Resources */ = {isa = PBXBuildFile; fileRef = 8E93909E0565D6D300C7661C /* fullscreen_blue.png */; }; + 8E9390B90565D6D300C7661C /* next_active.png in Resources */ = {isa = PBXBuildFile; fileRef = 8E93909F0565D6D300C7661C /* next_active.png */; }; + 8E9390BA0565D6D300C7661C /* next_blue.png in Resources */ = {isa = PBXBuildFile; fileRef = 8E9390A00565D6D300C7661C /* next_blue.png */; }; + 8E9390BB0565D6D300C7661C /* pause_blue.png in Resources */ = {isa = PBXBuildFile; fileRef = 8E9390A10565D6D300C7661C /* pause_blue.png */; }; + 8E9390BC0565D6D300C7661C /* pause.png in Resources */ = {isa = PBXBuildFile; fileRef = 8E9390A20565D6D300C7661C /* pause.png */; }; + 8E9390BD0565D6D300C7661C /* play_blue.png in Resources */ = {isa = PBXBuildFile; fileRef = 8E9390A30565D6D300C7661C /* play_blue.png */; }; + 8E9390BE0565D6D300C7661C /* play.png in Resources */ = {isa = PBXBuildFile; fileRef = 8E9390A40565D6D300C7661C /* play.png */; }; + 8E9390BF0565D6D300C7661C /* playlistdrawer_active.png in Resources */ = {isa = PBXBuildFile; fileRef = 8E9390A50565D6D300C7661C /* playlistdrawer_active.png */; }; + 8E9390C00565D6D300C7661C /* playlistdrawer_blue.png in Resources */ = {isa = PBXBuildFile; fileRef = 8E9390A60565D6D300C7661C /* playlistdrawer_blue.png */; }; + 8E9390C10565D6D300C7661C /* previous_active.png in Resources */ = {isa = PBXBuildFile; fileRef = 8E9390A70565D6D300C7661C /* previous_active.png */; }; + 8E9390C20565D6D300C7661C /* previous_blue.png in Resources */ = {isa = PBXBuildFile; fileRef = 8E9390A80565D6D300C7661C /* previous_blue.png */; }; + 8E9390C30565D6D300C7661C /* skip_forward_active.png in Resources */ = {isa = PBXBuildFile; fileRef = 8E9390A90565D6D300C7661C /* skip_forward_active.png */; }; + 8E9390C40565D6D300C7661C /* skip_forward_blue.png in Resources */ = {isa = PBXBuildFile; fileRef = 8E9390AA0565D6D300C7661C /* skip_forward_blue.png */; }; + 8E9390C50565D6D300C7661C /* skip_previous_active.png in Resources */ = {isa = PBXBuildFile; fileRef = 8E9390AB0565D6D300C7661C /* skip_previous_active.png */; }; + 8E9390C60565D6D300C7661C /* skip_previous_blue.png in Resources */ = {isa = PBXBuildFile; fileRef = 8E9390AC0565D6D300C7661C /* skip_previous_blue.png */; }; + 8E9390C70565D6D300C7661C /* stop_blue.png in Resources */ = {isa = PBXBuildFile; fileRef = 8E9390AD0565D6D300C7661C /* stop_blue.png */; }; + 8E9390C80565D6D300C7661C /* stop.png in Resources */ = {isa = PBXBuildFile; fileRef = 8E9390AE0565D6D300C7661C /* stop.png */; }; + 8E9390C90565D6D300C7661C /* volume_high.png in Resources */ = {isa = PBXBuildFile; fileRef = 8E9390AF0565D6D300C7661C /* volume_high.png */; }; + 8E9390CA0565D6D300C7661C /* volume_low.png in Resources */ = {isa = PBXBuildFile; fileRef = 8E9390B00565D6D300C7661C /* volume_low.png */; }; + 8E9390CB0565D6D300C7661C /* volumeslider_blue.png in Resources */ = {isa = PBXBuildFile; fileRef = 8E9390B10565D6D300C7661C /* volumeslider_blue.png */; }; + 8E9390CC0565D6D300C7661C /* volumeslider_normal.png in Resources */ = {isa = PBXBuildFile; fileRef = 8E9390B20565D6D300C7661C /* volumeslider_normal.png */; }; + 8E9390CD0565D6D300C7661C /* volumetrack.png in Resources */ = {isa = PBXBuildFile; fileRef = 8E9390B30565D6D300C7661C /* volumetrack.png */; }; + 8E9CC7B2046EFD700059A3A7 /* THANKS in Resources */ = {isa = PBXBuildFile; fileRef = 8E9CC7B1046EFD700059A3A7 /* THANKS */; }; + 8EBF3FA403F13FFB0059A3A7 /* vlc.scriptSuite in Resources */ = {isa = PBXBuildFile; fileRef = 8EBF3FA303F13FFB0059A3A7 /* vlc.scriptSuite */; }; + 8ED6C29F03E2F32E0059A3A7 /* AUTHORS in Resources */ = {isa = PBXBuildFile; fileRef = 8ED6C29D03E2F32E0059A3A7 /* AUTHORS */; }; + 8ED6C2A003E2F32E0059A3A7 /* COPYING in Resources */ = {isa = PBXBuildFile; fileRef = 8ED6C29E03E2F32E0059A3A7 /* COPYING */; }; + 8EDAC3440440F72D0059A3A7 /* README.MacOSX.rtf in Resources */ = {isa = PBXBuildFile; fileRef = 8EDAC3430440F72D0059A3A7 /* README.MacOSX.rtf */; }; + A0E6B59904407FBD0080DD97 /* README in Resources */ = {isa = PBXBuildFile; fileRef = A0E6B59804407FBD0080DD97 /* README */; }; + C2F2A6FB0958A6E600018C74 /* skip_forward_active_embedded.png in Resources */ = {isa = PBXBuildFile; fileRef = C2F2A6FA0958A6E600018C74 /* skip_forward_active_embedded.png */; }; + C2F2A6FD0958A94500018C74 /* play_embedded.png in Resources */ = {isa = PBXBuildFile; fileRef = C2F2A6FC0958A94500018C74 /* play_embedded.png */; }; + C2F2A6FF0958AA9300018C74 /* pause_embedded.png in Resources */ = {isa = PBXBuildFile; fileRef = C2F2A6FE0958AA9300018C74 /* pause_embedded.png */; }; + C2F2A7010958AC9000018C74 /* skip_previous_active_embedded.png in Resources */ = {isa = PBXBuildFile; fileRef = C2F2A7000958AC9000018C74 /* skip_previous_active_embedded.png */; }; + C2F2A706095AE51600018C74 /* pause_embedded_blue.png in Resources */ = {isa = PBXBuildFile; fileRef = C2F2A702095AE51600018C74 /* pause_embedded_blue.png */; }; + C2F2A707095AE51700018C74 /* play_embedded_blue.png in Resources */ = {isa = PBXBuildFile; fileRef = C2F2A703095AE51600018C74 /* play_embedded_blue.png */; }; + C2F2A708095AE51700018C74 /* skip_forward_embedded_blue.png in Resources */ = {isa = PBXBuildFile; fileRef = C2F2A704095AE51600018C74 /* skip_forward_embedded_blue.png */; }; + C2F2A709095AE51700018C74 /* skip_previous_embedded_blue.png in Resources */ = {isa = PBXBuildFile; fileRef = C2F2A705095AE51600018C74 /* skip_previous_embedded_blue.png */; }; + CCF3C64C0923B99D00401862 /* SFilters.nib in Resources */ = {isa = PBXBuildFile; fileRef = CCF3C64A0923B99D00401862 /* SFilters.nib */; }; + DC7F46ED08A183FC0027DB24 /* Extended.nib in Resources */ = {isa = PBXBuildFile; fileRef = DC7F46EB08A183FC0027DB24 /* Extended.nib */; }; + DCA00AA9075F948800E6BF46 /* About.nib in Resources */ = {isa = PBXBuildFile; fileRef = DCA00AA7075F948800E6BF46 /* About.nib */; }; + DCA693C30789DF8700139EC6 /* Open.nib in Resources */ = {isa = PBXBuildFile; fileRef = DCA693C10789DF8700139EC6 /* Open.nib */; }; + DCC9AE9507F77DE600394C42 /* vlc.scriptTerminology in Resources */ = {isa = PBXBuildFile; fileRef = 8EBF3FA503F140960059A3A7 /* vlc.scriptTerminology */; }; + DCDA5E6508F94518009D93A8 /* about_bg.png in Resources */ = {isa = PBXBuildFile; fileRef = DCDA5E6408F94518009D93A8 /* about_bg.png */; }; + DCE7BD0508A56C8B007B10AE /* Bookmarks.nib in Resources */ = {isa = PBXBuildFile; fileRef = DCE7BD0308A56C8B007B10AE /* Bookmarks.nib */; }; + DCF358BB077F10BA007DB450 /* Preferences.nib in Resources */ = {isa = PBXBuildFile; fileRef = DCF358B9077F10BA007DB450 /* Preferences.nib */; }; + DCFCCDB9085CE18F001E36AF /* Wizard.nib in Resources */ = {isa = PBXBuildFile; fileRef = DCFCCDB7085CE18F001E36AF /* Wizard.nib */; }; + F69B0CA802E24F6401A80112 /* InfoPlist.strings in Resources */ = {isa = PBXBuildFile; fileRef = F69B0CA602E24F6401A80112 /* InfoPlist.strings */; }; + F6E4F91002D2648B01A80112 /* divx.icns in Resources */ = {isa = PBXBuildFile; fileRef = F6E4F90A02D2648B01A80112 /* divx.icns */; }; + F6E4F91102D2648B01A80112 /* generic.icns in Resources */ = {isa = PBXBuildFile; fileRef = F6E4F90B02D2648B01A80112 /* generic.icns */; }; + F6E4F91202D2648B01A80112 /* mpeg.icns in Resources */ = {isa = PBXBuildFile; fileRef = F6E4F90C02D2648B01A80112 /* mpeg.icns */; }; + F6E4F91302D2648B01A80112 /* mpeg1.icns in Resources */ = {isa = PBXBuildFile; fileRef = F6E4F90D02D2648B01A80112 /* mpeg1.icns */; }; + F6E4F91402D2648B01A80112 /* mpeg2.icns in Resources */ = {isa = PBXBuildFile; fileRef = F6E4F90E02D2648B01A80112 /* mpeg2.icns */; }; + F6E4F91502D2648B01A80112 /* mpeg4.icns in Resources */ = {isa = PBXBuildFile; fileRef = F6E4F90F02D2648B01A80112 /* mpeg4.icns */; }; + F74F13E002C2A53401EE194C /* vlc.icns in Resources */ = {isa = PBXBuildFile; fileRef = F74F13DF02C2A53401EE194C /* vlc.icns */; }; + F74F13EC02C2A79C01EE194C /* MainMenu.nib in Resources */ = {isa = PBXBuildFile; fileRef = F74F13EA02C2A79C01EE194C /* MainMenu.nib */; }; +/* End PBXBuildFile section */ + +/* Begin PBXBuildStyle section */ + 014CEA420018CDE011CA2923 /* Development */ = { + isa = PBXBuildStyle; buildSettings = { COPY_PHASE_STRIP = NO; GCC_DYNAMIC_NO_PIC = NO; @@ -22,78 +104,27 @@ OPTIMIZATION_CFLAGS = "-O0"; ZERO_LINK = YES; }; - isa = PBXBuildStyle; name = Development; }; - 014CEA430018CDE011CA2923 = { + 014CEA430018CDE011CA2923 /* Deployment */ = { + isa = PBXBuildStyle; buildSettings = { COPY_PHASE_STRIP = YES; GCC_ENABLE_FIX_AND_CONTINUE = NO; ZERO_LINK = NO; }; - isa = PBXBuildStyle; name = Deployment; }; -//010 -//011 -//012 -//013 -//014 -//080 -//081 -//082 -//083 -//084 - 089C1669FE841209C02AAC07 = { - buildSettings = { - }; - buildStyles = ( - 014CEA420018CDE011CA2923, - 014CEA430018CDE011CA2923, - ); - hasScannedForEncodings = 1; - isa = PBXProject; - mainGroup = 089C166AFE841209C02AAC07; - projectDirPath = ""; - targets = ( - 089C1673FE841209C02AAC07, - ); - }; - 089C166AFE841209C02AAC07 = { - children = ( - 08FB77AFFE84173DC02AAC07, - 089C167CFE841241C02AAC07, - 089C1671FE841209C02AAC07, - 19C28FB8FE9D52D311CA2CBB, - ); - isa = PBXGroup; - name = vlc; - refType = 4; - sourceTree = ""; - }; - 089C1671FE841209C02AAC07 = { - children = ( - 1058C7ACFEA557BF11CA2CBB, - 1058C7AEFEA557BF11CA2CBB, - ); - isa = PBXGroup; - name = "Frameworks and Libraries"; - refType = 4; - sourceTree = ""; - }; - 089C1672FE841209C02AAC07 = { - isa = PBXFileReference; - lastKnownFileType = wrapper.framework; - name = Foundation.framework; - path = /System/Library/Frameworks/Foundation.framework; - refType = 0; - sourceTree = ""; - }; - 089C1673FE841209C02AAC07 = { +/* End PBXBuildStyle section */ + +/* Begin PBXBundleTarget section */ + 089C1673FE841209C02AAC07 /* vlc */ = { + isa = PBXBundleTarget; + buildConfigurationList = C2F2A6E609588F1B00018C74 /* Build configuration list for PBXBundleTarget "vlc" */; buildPhases = ( - 089C1675FE841209C02AAC07, - 089C1677FE841209C02AAC07, - 089C1679FE841209C02AAC07, + 089C1675FE841209C02AAC07 /* Resources */, + 089C1677FE841209C02AAC07 /* Frameworks */, + 089C1679FE841209C02AAC07 /* Rez */, ); buildSettings = { FRAMEWORK_SEARCH_PATHS = ""; @@ -106,16 +137,19 @@ OTHER_REZFLAGS = ""; PRODUCT_NAME = VLC; SECTORDER_FLAGS = ""; - WARNING_CFLAGS = "-Wmost -Wno-four-char-constants -Wno-unknown-pragmas"; + WARNING_CFLAGS = ( + "-Wmost", + "-Wno-four-char-constants", + "-Wno-unknown-pragmas", + ); WRAPPER_EXTENSION = bundle; }; dependencies = ( ); - isa = PBXBundleTarget; name = vlc; productInstallPath = "$(HOME)/Library/Bundles"; productName = vlc; - productReference = 014CEA410018CDE011CA2923; + productReference = 014CEA410018CDE011CA2923 /* VLC.bundle */; productSettingsXML = " @@ -761,1877 +795,667 @@ "; }; - 089C1675FE841209C02AAC07 = { +/* End PBXBundleTarget section */ + +/* Begin PBXFileReference section */ + 014CEA410018CDE011CA2923 /* VLC.bundle */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; path = VLC.bundle; sourceTree = BUILT_PRODUCTS_DIR; }; + 089C1672FE841209C02AAC07 /* Foundation.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Foundation.framework; path = /System/Library/Frameworks/Foundation.framework; sourceTree = ""; }; + 089C167FFE841241C02AAC07 /* AppKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = AppKit.framework; path = /System/Library/Frameworks/AppKit.framework; sourceTree = ""; }; + 1058C7ADFEA557BF11CA2CBB /* Cocoa.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Cocoa.framework; path = /System/Library/Frameworks/Cocoa.framework; sourceTree = ""; }; + 2A16E03F06C4F08700C87B09 /* equalizer.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = equalizer.h; path = ../../modules/gui/macosx/equalizer.h; sourceTree = SOURCE_ROOT; }; + 2A16E04006C4F08700C87B09 /* equalizer.m */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.objc; name = equalizer.m; path = ../../modules/gui/macosx/equalizer.m; sourceTree = SOURCE_ROOT; }; + 2A16E07E06C5074F00C87B09 /* equalizerdrawer_active.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = equalizerdrawer_active.png; path = Resources/equalizerdrawer_active.png; sourceTree = ""; }; + 2A16E07F06C5074F00C87B09 /* equalizerdrawer_blue.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = equalizerdrawer_blue.png; path = Resources/equalizerdrawer_blue.png; sourceTree = ""; }; + 8E445F8704728A700059A3A7 /* a52.icns */ = {isa = PBXFileReference; lastKnownFileType = image.icns; name = a52.icns; path = Resources/a52.icns; sourceTree = SOURCE_ROOT; }; + 8E445F8804728A700059A3A7 /* aac.icns */ = {isa = PBXFileReference; lastKnownFileType = image.icns; name = aac.icns; path = Resources/aac.icns; sourceTree = SOURCE_ROOT; }; + 8E445F8904728A700059A3A7 /* asf.icns */ = {isa = PBXFileReference; lastKnownFileType = image.icns; name = asf.icns; path = Resources/asf.icns; sourceTree = SOURCE_ROOT; }; + 8E445F8A04728A700059A3A7 /* asx.icns */ = {isa = PBXFileReference; lastKnownFileType = image.icns; name = asx.icns; path = Resources/asx.icns; sourceTree = SOURCE_ROOT; }; + 8E445F8B04728A700059A3A7 /* avi.icns */ = {isa = PBXFileReference; lastKnownFileType = image.icns; name = avi.icns; path = Resources/avi.icns; sourceTree = SOURCE_ROOT; }; + 8E445F8C04728A700059A3A7 /* bin.icns */ = {isa = PBXFileReference; lastKnownFileType = image.icns; name = bin.icns; path = Resources/bin.icns; sourceTree = SOURCE_ROOT; }; + 8E445F8D04728A700059A3A7 /* cue.icns */ = {isa = PBXFileReference; lastKnownFileType = image.icns; name = cue.icns; path = Resources/cue.icns; sourceTree = SOURCE_ROOT; }; + 8E445F8E04728A700059A3A7 /* dat.icns */ = {isa = PBXFileReference; lastKnownFileType = image.icns; name = dat.icns; path = Resources/dat.icns; sourceTree = SOURCE_ROOT; }; + 8E445F8F04728A700059A3A7 /* dv.icns */ = {isa = PBXFileReference; lastKnownFileType = image.icns; name = dv.icns; path = Resources/dv.icns; sourceTree = SOURCE_ROOT; }; + 8E445F9004728A700059A3A7 /* m3u.icns */ = {isa = PBXFileReference; lastKnownFileType = image.icns; name = m3u.icns; path = Resources/m3u.icns; sourceTree = SOURCE_ROOT; }; + 8E445F9104728A700059A3A7 /* mov.icns */ = {isa = PBXFileReference; lastKnownFileType = image.icns; name = mov.icns; path = Resources/mov.icns; sourceTree = SOURCE_ROOT; }; + 8E445F9204728A700059A3A7 /* mp3.icns */ = {isa = PBXFileReference; lastKnownFileType = image.icns; name = mp3.icns; path = Resources/mp3.icns; sourceTree = SOURCE_ROOT; }; + 8E445F9304728A700059A3A7 /* mp4.icns */ = {isa = PBXFileReference; lastKnownFileType = image.icns; name = mp4.icns; path = Resources/mp4.icns; sourceTree = SOURCE_ROOT; }; + 8E445F9404728A700059A3A7 /* mpg.icns */ = {isa = PBXFileReference; lastKnownFileType = image.icns; name = mpg.icns; path = Resources/mpg.icns; sourceTree = SOURCE_ROOT; }; + 8E445F9504728A700059A3A7 /* ogg.icns */ = {isa = PBXFileReference; lastKnownFileType = image.icns; name = ogg.icns; path = Resources/ogg.icns; sourceTree = SOURCE_ROOT; }; + 8E445F9604728A700059A3A7 /* ogm.icns */ = {isa = PBXFileReference; lastKnownFileType = image.icns; name = ogm.icns; path = Resources/ogm.icns; sourceTree = SOURCE_ROOT; }; + 8E445F9704728A700059A3A7 /* pls.icns */ = {isa = PBXFileReference; lastKnownFileType = image.icns; name = pls.icns; path = Resources/pls.icns; sourceTree = SOURCE_ROOT; }; + 8E445F9804728A700059A3A7 /* srt.icns */ = {isa = PBXFileReference; lastKnownFileType = image.icns; name = srt.icns; path = Resources/srt.icns; sourceTree = SOURCE_ROOT; }; + 8E445F9904728A700059A3A7 /* sub.icns */ = {isa = PBXFileReference; lastKnownFileType = image.icns; name = sub.icns; path = Resources/sub.icns; sourceTree = SOURCE_ROOT; }; + 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; }; + 8E49720106417F6800370C9F /* playlistinfo.m */ = {isa = PBXFileReference; fileEncoding = 5; 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; }; + 8E6BC6F6041643860059A3A7 /* applescript.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = applescript.h; path = ../../modules/gui/macosx/applescript.h; sourceTree = SOURCE_ROOT; }; + 8E6BC6F7041643860059A3A7 /* applescript.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = applescript.m; path = ../../modules/gui/macosx/applescript.m; sourceTree = SOURCE_ROOT; }; + 8E6BC6FA041684EC0059A3A7 /* controls.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = controls.h; path = ../../modules/gui/macosx/controls.h; sourceTree = SOURCE_ROOT; }; + 8E93909A0565D6D300C7661C /* display_slider.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = display_slider.png; path = Resources/display_slider.png; sourceTree = SOURCE_ROOT; }; + 8E93909B0565D6D300C7661C /* display_track.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = display_track.png; path = Resources/display_track.png; sourceTree = SOURCE_ROOT; }; + 8E93909C0565D6D300C7661C /* display.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = display.png; path = Resources/display.png; sourceTree = SOURCE_ROOT; }; + 8E93909D0565D6D300C7661C /* fullscreen_active.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = fullscreen_active.png; path = Resources/fullscreen_active.png; sourceTree = SOURCE_ROOT; }; + 8E93909E0565D6D300C7661C /* fullscreen_blue.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = fullscreen_blue.png; path = Resources/fullscreen_blue.png; sourceTree = SOURCE_ROOT; }; + 8E93909F0565D6D300C7661C /* next_active.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = next_active.png; path = Resources/next_active.png; sourceTree = SOURCE_ROOT; }; + 8E9390A00565D6D300C7661C /* next_blue.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = next_blue.png; path = Resources/next_blue.png; sourceTree = SOURCE_ROOT; }; + 8E9390A10565D6D300C7661C /* pause_blue.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = pause_blue.png; path = Resources/pause_blue.png; sourceTree = SOURCE_ROOT; }; + 8E9390A20565D6D300C7661C /* pause.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = pause.png; path = Resources/pause.png; sourceTree = SOURCE_ROOT; }; + 8E9390A30565D6D300C7661C /* play_blue.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = play_blue.png; path = Resources/play_blue.png; sourceTree = SOURCE_ROOT; }; + 8E9390A40565D6D300C7661C /* play.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = play.png; path = Resources/play.png; sourceTree = SOURCE_ROOT; }; + 8E9390A50565D6D300C7661C /* playlistdrawer_active.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = playlistdrawer_active.png; path = Resources/playlistdrawer_active.png; sourceTree = SOURCE_ROOT; }; + 8E9390A60565D6D300C7661C /* playlistdrawer_blue.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = playlistdrawer_blue.png; path = Resources/playlistdrawer_blue.png; sourceTree = SOURCE_ROOT; }; + 8E9390A70565D6D300C7661C /* previous_active.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = previous_active.png; path = Resources/previous_active.png; sourceTree = SOURCE_ROOT; }; + 8E9390A80565D6D300C7661C /* previous_blue.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = previous_blue.png; path = Resources/previous_blue.png; sourceTree = SOURCE_ROOT; }; + 8E9390A90565D6D300C7661C /* skip_forward_active.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = skip_forward_active.png; path = Resources/skip_forward_active.png; sourceTree = SOURCE_ROOT; }; + 8E9390AA0565D6D300C7661C /* skip_forward_blue.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = skip_forward_blue.png; path = Resources/skip_forward_blue.png; sourceTree = SOURCE_ROOT; }; + 8E9390AB0565D6D300C7661C /* skip_previous_active.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = skip_previous_active.png; path = Resources/skip_previous_active.png; sourceTree = SOURCE_ROOT; }; + 8E9390AC0565D6D300C7661C /* skip_previous_blue.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = skip_previous_blue.png; path = Resources/skip_previous_blue.png; sourceTree = SOURCE_ROOT; }; + 8E9390AD0565D6D300C7661C /* stop_blue.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = stop_blue.png; path = Resources/stop_blue.png; sourceTree = SOURCE_ROOT; }; + 8E9390AE0565D6D300C7661C /* stop.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = stop.png; path = Resources/stop.png; sourceTree = SOURCE_ROOT; }; + 8E9390AF0565D6D300C7661C /* volume_high.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = volume_high.png; path = Resources/volume_high.png; sourceTree = SOURCE_ROOT; }; + 8E9390B00565D6D300C7661C /* volume_low.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = volume_low.png; path = Resources/volume_low.png; sourceTree = SOURCE_ROOT; }; + 8E9390B10565D6D300C7661C /* volumeslider_blue.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = volumeslider_blue.png; path = Resources/volumeslider_blue.png; sourceTree = SOURCE_ROOT; }; + 8E9390B20565D6D300C7661C /* volumeslider_normal.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = volumeslider_normal.png; path = Resources/volumeslider_normal.png; sourceTree = SOURCE_ROOT; }; + 8E9390B30565D6D300C7661C /* volumetrack.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = volumetrack.png; path = Resources/volumetrack.png; sourceTree = SOURCE_ROOT; }; + 8E9CA1A306D7DEE800B7186C /* prefs_widgets.h */ = {isa = PBXFileReference; fileEncoding = 5; lastKnownFileType = sourcecode.c.h; name = prefs_widgets.h; path = ../../modules/gui/macosx/prefs_widgets.h; sourceTree = SOURCE_ROOT; }; + 8E9CA1A406D7DEE800B7186C /* prefs_widgets.m */ = {isa = PBXFileReference; fileEncoding = 5; lastKnownFileType = sourcecode.c.objc; name = prefs_widgets.m; path = ../../modules/gui/macosx/prefs_widgets.m; sourceTree = SOURCE_ROOT; }; + 8E9CA1A506D7DEE800B7186C /* voutgl.m */ = {isa = PBXFileReference; fileEncoding = 5; lastKnownFileType = sourcecode.c.objc; name = voutgl.m; path = ../../modules/gui/macosx/voutgl.m; sourceTree = SOURCE_ROOT; }; + 8E9CA1A606D7DEE800B7186C /* voutqt.m */ = {isa = PBXFileReference; fileEncoding = 5; lastKnownFileType = sourcecode.c.objc; name = voutqt.m; path = ../../modules/gui/macosx/voutqt.m; sourceTree = SOURCE_ROOT; }; + 8E9CC7B1046EFD700059A3A7 /* THANKS */ = {isa = PBXFileReference; fileEncoding = 12; lastKnownFileType = text; name = THANKS; path = ../../THANKS; 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; }; + 8ED6C27A03E2EB1C0059A3A7 /* coreaudio.c */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.c; name = coreaudio.c; path = ../../modules/audio_output/coreaudio.c; 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; }; + 8ED6C27E03E2EB1C0059A3A7 /* macosx.m */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.objc; name = macosx.m; path = ../../modules/gui/macosx/macosx.m; sourceTree = SOURCE_ROOT; }; + 8ED6C27F03E2EB1C0059A3A7 /* misc.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = misc.h; path = ../../modules/gui/macosx/misc.h; sourceTree = SOURCE_ROOT; }; + 8ED6C28003E2EB1C0059A3A7 /* misc.m */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.objc; name = misc.m; path = ../../modules/gui/macosx/misc.m; sourceTree = SOURCE_ROOT; }; + 8ED6C28103E2EB1C0059A3A7 /* open.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = open.h; path = ../../modules/gui/macosx/open.h; sourceTree = SOURCE_ROOT; }; + 8ED6C28203E2EB1C0059A3A7 /* open.m */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.objc; name = open.m; path = ../../modules/gui/macosx/open.m; sourceTree = SOURCE_ROOT; }; + 8ED6C28303E2EB1C0059A3A7 /* playlist.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = playlist.h; path = ../../modules/gui/macosx/playlist.h; sourceTree = SOURCE_ROOT; }; + 8ED6C28403E2EB1C0059A3A7 /* playlist.m */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.objc; name = playlist.m; path = ../../modules/gui/macosx/playlist.m; sourceTree = SOURCE_ROOT; }; + 8ED6C28503E2EB1C0059A3A7 /* prefs.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = prefs.h; path = ../../modules/gui/macosx/prefs.h; sourceTree = SOURCE_ROOT; }; + 8ED6C28603E2EB1C0059A3A7 /* prefs.m */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.objc; name = prefs.m; path = ../../modules/gui/macosx/prefs.m; sourceTree = SOURCE_ROOT; }; + 8ED6C28703E2EB1C0059A3A7 /* vout.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = vout.h; path = ../../modules/gui/macosx/vout.h; sourceTree = SOURCE_ROOT; }; + 8ED6C28803E2EB1C0059A3A7 /* vout.m */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.objc; name = vout.m; path = ../../modules/gui/macosx/vout.m; sourceTree = SOURCE_ROOT; }; + 8ED6C29D03E2F32E0059A3A7 /* AUTHORS */ = {isa = PBXFileReference; fileEncoding = 12; lastKnownFileType = text; name = AUTHORS; path = ../../AUTHORS; sourceTree = SOURCE_ROOT; }; + 8ED6C29E03E2F32E0059A3A7 /* COPYING */ = {isa = PBXFileReference; fileEncoding = 12; lastKnownFileType = text; name = COPYING; path = ../../COPYING; sourceTree = SOURCE_ROOT; }; + 8EDAC3430440F72D0059A3A7 /* README.MacOSX.rtf */ = {isa = PBXFileReference; lastKnownFileType = text.rtf; name = README.MacOSX.rtf; path = ../../README.MacOSX.rtf; sourceTree = SOURCE_ROOT; }; + 8EE1AF9F044465080059A3A7 /* about.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = about.h; path = ../../modules/gui/macosx/about.h; sourceTree = SOURCE_ROOT; }; + 8EE1AFA0044465080059A3A7 /* about.m */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.objc; name = about.m; path = ../../modules/gui/macosx/about.m; sourceTree = SOURCE_ROOT; }; + A0E6B59804407FBD0080DD97 /* README */ = {isa = PBXFileReference; fileEncoding = 12; lastKnownFileType = text; name = README; path = Resources/README; sourceTree = ""; }; + C2F2A6FA0958A6E600018C74 /* skip_forward_active_embedded.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = skip_forward_active_embedded.png; path = Resources/skip_forward_active_embedded.png; sourceTree = ""; }; + C2F2A6FC0958A94500018C74 /* play_embedded.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = play_embedded.png; path = Resources/play_embedded.png; sourceTree = ""; }; + C2F2A6FE0958AA9300018C74 /* pause_embedded.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = pause_embedded.png; path = Resources/pause_embedded.png; sourceTree = ""; }; + C2F2A7000958AC9000018C74 /* skip_previous_active_embedded.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = skip_previous_active_embedded.png; path = Resources/skip_previous_active_embedded.png; sourceTree = ""; }; + C2F2A702095AE51600018C74 /* pause_embedded_blue.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = pause_embedded_blue.png; path = Resources/pause_embedded_blue.png; sourceTree = ""; }; + C2F2A703095AE51600018C74 /* play_embedded_blue.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = play_embedded_blue.png; path = Resources/play_embedded_blue.png; sourceTree = ""; }; + C2F2A704095AE51600018C74 /* skip_forward_embedded_blue.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = skip_forward_embedded_blue.png; path = Resources/skip_forward_embedded_blue.png; sourceTree = ""; }; + C2F2A705095AE51600018C74 /* skip_previous_embedded_blue.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = skip_previous_embedded_blue.png; path = Resources/skip_previous_embedded_blue.png; sourceTree = ""; }; + CCF3C64B0923B99D00401862 /* English */ = {isa = PBXFileReference; lastKnownFileType = wrapper.nib; name = English; path = Resources/English.lproj/SFilters.nib; sourceTree = ""; }; + CCF3C6500923B9D100401862 /* sfilters.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = sfilters.h; path = ../../modules/gui/macosx/sfilters.h; sourceTree = SOURCE_ROOT; }; + CCF3C6510923B9D100401862 /* sfilters.m */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.objc; name = sfilters.m; path = ../../modules/gui/macosx/sfilters.m; sourceTree = SOURCE_ROOT; }; + DC769AB7085DF0DB001A838D /* wizard.m */ = {isa = PBXFileReference; fileEncoding = 5; indentWidth = 4; lastKnownFileType = sourcecode.c.objc; name = wizard.m; path = ../../modules/gui/macosx/wizard.m; sourceTree = SOURCE_ROOT; tabWidth = 4; usesTabs = 0; }; + DC769AB8085DF0DB001A838D /* wizard.h */ = {isa = PBXFileReference; fileEncoding = 5; lastKnownFileType = sourcecode.c.h; name = wizard.h; path = ../../modules/gui/macosx/wizard.h; sourceTree = SOURCE_ROOT; }; + DC7F46EC08A183FC0027DB24 /* English */ = {isa = PBXFileReference; lastKnownFileType = wrapper.nib; name = English; path = Resources/English.lproj/Extended.nib; sourceTree = ""; }; + DC7F46F008A187F60027DB24 /* extended.h */ = {isa = PBXFileReference; explicitFileType = sourcecode.c.objc; fileEncoding = 5; name = extended.h; path = ../../modules/gui/macosx/extended.h; sourceTree = SOURCE_ROOT; usesTabs = 0; }; + DC7F46F108A187F60027DB24 /* extended.m */ = {isa = PBXFileReference; explicitFileType = sourcecode.c.objc; fileEncoding = 5; includeInIndex = 0; name = extended.m; path = ../../modules/gui/macosx/extended.m; sourceTree = SOURCE_ROOT; }; + DCA00AA8075F948800E6BF46 /* English */ = {isa = PBXFileReference; lastKnownFileType = wrapper.nib; name = English; path = Resources/English.lproj/About.nib; sourceTree = ""; }; + DCA693C20789DF8700139EC6 /* English */ = {isa = PBXFileReference; lastKnownFileType = wrapper.nib; name = English; path = Resources/English.lproj/Open.nib; sourceTree = ""; }; + DCDA5E6408F94518009D93A8 /* about_bg.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = about_bg.png; path = Resources/about_bg.png; sourceTree = ""; }; + DCE7BD0408A56C8B007B10AE /* English */ = {isa = PBXFileReference; lastKnownFileType = wrapper.nib; name = English; path = Resources/English.lproj/Bookmarks.nib; sourceTree = ""; }; + DCE7BD0608A5724D007B10AE /* bookmarks.m */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.objc; name = bookmarks.m; path = ../../modules/gui/macosx/bookmarks.m; sourceTree = SOURCE_ROOT; }; + DCE7BD0708A5724D007B10AE /* bookmarks.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = bookmarks.h; path = ../../modules/gui/macosx/bookmarks.h; sourceTree = SOURCE_ROOT; }; + DCF358BA077F10BA007DB450 /* English */ = {isa = PBXFileReference; lastKnownFileType = wrapper.nib; name = English; path = Resources/English.lproj/Preferences.nib; sourceTree = ""; }; + DCFCCDB8085CE18F001E36AF /* English */ = {isa = PBXFileReference; lastKnownFileType = wrapper.nib; name = English; path = Resources/English.lproj/Wizard.nib; sourceTree = ""; }; + F69B0CA702E24F6401A80112 /* English */ = {isa = PBXFileReference; fileEncoding = 5; lastKnownFileType = text.plist.strings; name = English; path = Resources/English.lproj/InfoPlist.strings; sourceTree = ""; }; + F6E4F90A02D2648B01A80112 /* divx.icns */ = {isa = PBXFileReference; lastKnownFileType = image.icns; name = divx.icns; path = Resources/divx.icns; sourceTree = ""; }; + F6E4F90B02D2648B01A80112 /* generic.icns */ = {isa = PBXFileReference; lastKnownFileType = image.icns; name = generic.icns; path = Resources/generic.icns; sourceTree = ""; }; + F6E4F90C02D2648B01A80112 /* mpeg.icns */ = {isa = PBXFileReference; lastKnownFileType = image.icns; name = mpeg.icns; path = Resources/mpeg.icns; sourceTree = ""; }; + F6E4F90D02D2648B01A80112 /* mpeg1.icns */ = {isa = PBXFileReference; lastKnownFileType = image.icns; name = mpeg1.icns; path = Resources/mpeg1.icns; sourceTree = ""; }; + F6E4F90E02D2648B01A80112 /* mpeg2.icns */ = {isa = PBXFileReference; lastKnownFileType = image.icns; name = mpeg2.icns; path = Resources/mpeg2.icns; sourceTree = ""; }; + F6E4F90F02D2648B01A80112 /* mpeg4.icns */ = {isa = PBXFileReference; lastKnownFileType = image.icns; name = mpeg4.icns; path = Resources/mpeg4.icns; sourceTree = ""; }; + F74F13DF02C2A53401EE194C /* vlc.icns */ = {isa = PBXFileReference; lastKnownFileType = image.icns; name = vlc.icns; path = Resources/vlc.icns; sourceTree = ""; }; + F74F13EB02C2A79C01EE194C /* English */ = {isa = PBXFileReference; lastKnownFileType = wrapper.nib; name = English; path = Resources/English.lproj/MainMenu.nib; sourceTree = ""; }; +/* End PBXFileReference section */ + +/* Begin PBXFrameworksBuildPhase section */ + 089C1677FE841209C02AAC07 /* Frameworks */ = { + isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( - F74F13E002C2A53401EE194C, - F74F13EC02C2A79C01EE194C, - F6E4F91002D2648B01A80112, - F6E4F91102D2648B01A80112, - F6E4F91202D2648B01A80112, - F6E4F91302D2648B01A80112, - F6E4F91402D2648B01A80112, - F6E4F91502D2648B01A80112, - F69B0CA802E24F6401A80112, - 8ED6C29F03E2F32E0059A3A7, - 8ED6C2A003E2F32E0059A3A7, - 8EBF3FA403F13FFB0059A3A7, - DCC9AE9507F77DE600394C42, - A0E6B59904407FBD0080DD97, - 8EDAC3440440F72D0059A3A7, - 8E9CC7B2046EFD700059A3A7, - 8E445F9D04728A700059A3A7, - 8E445F9E04728A700059A3A7, - 8E445F9F04728A700059A3A7, - 8E445FA004728A700059A3A7, - 8E445FA104728A700059A3A7, - 8E445FA204728A700059A3A7, - 8E445FA304728A700059A3A7, - 8E445FA404728A700059A3A7, - 8E445FA504728A700059A3A7, - 8E445FA604728A700059A3A7, - 8E445FA704728A700059A3A7, - 8E445FA804728A700059A3A7, - 8E445FA904728A700059A3A7, - 8E445FAA04728A700059A3A7, - 8E445FAB04728A700059A3A7, - 8E445FAC04728A700059A3A7, - 8E445FAD04728A700059A3A7, - 8E445FAE04728A700059A3A7, - 8E445FAF04728A700059A3A7, - 8E445FB004728A700059A3A7, - 8E445FB104728A700059A3A7, - 8E445FB204728A700059A3A7, - 8E9390B40565D6D300C7661C, - 8E9390B50565D6D300C7661C, - 8E9390B60565D6D300C7661C, - 8E9390B70565D6D300C7661C, - 8E9390B80565D6D300C7661C, - 8E9390B90565D6D300C7661C, - 8E9390BA0565D6D300C7661C, - 8E9390BB0565D6D300C7661C, - 8E9390BC0565D6D300C7661C, - 8E9390BD0565D6D300C7661C, - 8E9390BE0565D6D300C7661C, - 8E9390BF0565D6D300C7661C, - 8E9390C00565D6D300C7661C, - 8E9390C10565D6D300C7661C, - 8E9390C20565D6D300C7661C, - 8E9390C30565D6D300C7661C, - 8E9390C40565D6D300C7661C, - 8E9390C50565D6D300C7661C, - 8E9390C60565D6D300C7661C, - 8E9390C70565D6D300C7661C, - 8E9390C80565D6D300C7661C, - 8E9390C90565D6D300C7661C, - 8E9390CA0565D6D300C7661C, - 8E9390CB0565D6D300C7661C, - 8E9390CC0565D6D300C7661C, - 8E9390CD0565D6D300C7661C, - 2A16E08006C5074F00C87B09, - 2A16E08106C5074F00C87B09, - DCA00AA9075F948800E6BF46, - DCF358BB077F10BA007DB450, - DCA693C30789DF8700139EC6, - DCFCCDB9085CE18F001E36AF, - DC7F46ED08A183FC0027DB24, - DCE7BD0508A56C8B007B10AE, - DCDA5E6508F94518009D93A8, - CCF3C64C0923B99D00401862, + 1058C7AFFEA557BF11CA2CBB /* Cocoa.framework in Frameworks */, ); - isa = PBXResourcesBuildPhase; runOnlyForDeploymentPostprocessing = 0; }; - 089C1677FE841209C02AAC07 = { - buildActionMask = 2147483647; - files = ( - 1058C7AFFEA557BF11CA2CBB, +/* End PBXFrameworksBuildPhase section */ + +/* Begin PBXGroup section */ + 089C166AFE841209C02AAC07 /* vlc */ = { + isa = PBXGroup; + children = ( + 08FB77AFFE84173DC02AAC07 /* Classes */, + 089C167CFE841241C02AAC07 /* Resources */, + 089C1671FE841209C02AAC07 /* Frameworks and Libraries */, + 19C28FB8FE9D52D311CA2CBB /* Products */, ); - isa = PBXFrameworksBuildPhase; - runOnlyForDeploymentPostprocessing = 0; + name = vlc; + sourceTree = ""; }; - 089C1679FE841209C02AAC07 = { - buildActionMask = 2147483647; - files = ( + 089C1671FE841209C02AAC07 /* Frameworks and Libraries */ = { + isa = PBXGroup; + children = ( + 1058C7ACFEA557BF11CA2CBB /* Linked Frameworks */, + 1058C7AEFEA557BF11CA2CBB /* Other Frameworks */, ); - isa = PBXRezBuildPhase; - runOnlyForDeploymentPostprocessing = 0; + name = "Frameworks and Libraries"; + sourceTree = ""; }; - 089C167CFE841241C02AAC07 = { + 089C167CFE841241C02AAC07 /* Resources */ = { + isa = PBXGroup; children = ( - DCF358BC077F1236007DB450, - DCDA5E6408F94518009D93A8, - 8E445F86047289E50059A3A7, - 8ECA7E520563CD9500DFC000, - F69B0CA602E24F6401A80112, - 8ED6C29D03E2F32E0059A3A7, - 8E9CC7B1046EFD700059A3A7, - 8ED6C29E03E2F32E0059A3A7, - A0E6B59804407FBD0080DD97, - 8EBF3FA303F13FFB0059A3A7, - 8EBF3FA503F140960059A3A7, - 8EDAC3430440F72D0059A3A7, + DCF358BC077F1236007DB450 /* nibs */, + DCDA5E6408F94518009D93A8 /* about_bg.png */, + 8E445F86047289E50059A3A7 /* fileicons */, + 8ECA7E520563CD9500DFC000 /* Controller */, + F69B0CA602E24F6401A80112 /* InfoPlist.strings */, + 8ED6C29D03E2F32E0059A3A7 /* AUTHORS */, + 8E9CC7B1046EFD700059A3A7 /* THANKS */, + 8ED6C29E03E2F32E0059A3A7 /* COPYING */, + A0E6B59804407FBD0080DD97 /* README */, + 8EBF3FA303F13FFB0059A3A7 /* vlc.scriptSuite */, + 8EBF3FA503F140960059A3A7 /* vlc.scriptTerminology */, + 8EDAC3430440F72D0059A3A7 /* README.MacOSX.rtf */, ); - isa = PBXGroup; name = Resources; - path = ""; - refType = 4; sourceTree = ""; }; - 089C167FFE841241C02AAC07 = { - isa = PBXFileReference; - lastKnownFileType = wrapper.framework; - name = AppKit.framework; - path = /System/Library/Frameworks/AppKit.framework; - refType = 0; - sourceTree = ""; - }; - 08FB77AFFE84173DC02AAC07 = { + 08FB77AFFE84173DC02AAC07 /* Classes */ = { + isa = PBXGroup; children = ( - 8ED6C27E03E2EB1C0059A3A7, - 8ED6C27C03E2EB1C0059A3A7, - 8ED6C27D03E2EB1C0059A3A7, - 8E6BC6FA041684EC0059A3A7, - 8ED6C27B03E2EB1C0059A3A7, - 8E6BC6F6041643860059A3A7, - 8E6BC6F7041643860059A3A7, - 8ED6C27F03E2EB1C0059A3A7, - 8ED6C28003E2EB1C0059A3A7, - 8EE1AF9F044465080059A3A7, - 8EE1AFA0044465080059A3A7, - 8ED6C28103E2EB1C0059A3A7, - 8ED6C28203E2EB1C0059A3A7, - 8ED6C28303E2EB1C0059A3A7, - 8ED6C28403E2EB1C0059A3A7, - 8ED6C28503E2EB1C0059A3A7, - 8ED6C28603E2EB1C0059A3A7, - 8E9CA1A306D7DEE800B7186C, - 8E9CA1A406D7DEE800B7186C, - 8E49720006417F6800370C9F, - 8E49720106417F6800370C9F, - 8E55FB7F0459B0FD00FB3317, - 8E55FB800459B0FD00FB3317, - 2A16E03F06C4F08700C87B09, - 2A16E04006C4F08700C87B09, - 8ED6C27A03E2EB1C0059A3A7, - 8ED6C28703E2EB1C0059A3A7, - 8ED6C28803E2EB1C0059A3A7, - 8E9CA1A506D7DEE800B7186C, - 8E9CA1A606D7DEE800B7186C, - DC769AB8085DF0DB001A838D, - DC769AB7085DF0DB001A838D, - DC7F46F008A187F60027DB24, - DC7F46F108A187F60027DB24, - DCE7BD0708A5724D007B10AE, - DCE7BD0608A5724D007B10AE, - CCF3C6500923B9D100401862, - CCF3C6510923B9D100401862, + 8ED6C27E03E2EB1C0059A3A7 /* macosx.m */, + 8ED6C27C03E2EB1C0059A3A7 /* intf.h */, + 8ED6C27D03E2EB1C0059A3A7 /* intf.m */, + 8E6BC6FA041684EC0059A3A7 /* controls.h */, + 8ED6C27B03E2EB1C0059A3A7 /* controls.m */, + 8E6BC6F6041643860059A3A7 /* applescript.h */, + 8E6BC6F7041643860059A3A7 /* applescript.m */, + 8ED6C27F03E2EB1C0059A3A7 /* misc.h */, + 8ED6C28003E2EB1C0059A3A7 /* misc.m */, + 8EE1AF9F044465080059A3A7 /* about.h */, + 8EE1AFA0044465080059A3A7 /* about.m */, + 8ED6C28103E2EB1C0059A3A7 /* open.h */, + 8ED6C28203E2EB1C0059A3A7 /* open.m */, + 8ED6C28303E2EB1C0059A3A7 /* playlist.h */, + 8ED6C28403E2EB1C0059A3A7 /* playlist.m */, + 8ED6C28503E2EB1C0059A3A7 /* prefs.h */, + 8ED6C28603E2EB1C0059A3A7 /* prefs.m */, + 8E9CA1A306D7DEE800B7186C /* prefs_widgets.h */, + 8E9CA1A406D7DEE800B7186C /* prefs_widgets.m */, + 8E49720006417F6800370C9F /* playlistinfo.h */, + 8E49720106417F6800370C9F /* playlistinfo.m */, + 8E55FB7F0459B0FD00FB3317 /* output.h */, + 8E55FB800459B0FD00FB3317 /* output.m */, + 2A16E03F06C4F08700C87B09 /* equalizer.h */, + 2A16E04006C4F08700C87B09 /* equalizer.m */, + 8ED6C27A03E2EB1C0059A3A7 /* coreaudio.c */, + 8ED6C28703E2EB1C0059A3A7 /* vout.h */, + 8ED6C28803E2EB1C0059A3A7 /* vout.m */, + 8E9CA1A506D7DEE800B7186C /* voutgl.m */, + 8E9CA1A606D7DEE800B7186C /* voutqt.m */, + DC769AB8085DF0DB001A838D /* wizard.h */, + DC769AB7085DF0DB001A838D /* wizard.m */, + DC7F46F008A187F60027DB24 /* extended.h */, + DC7F46F108A187F60027DB24 /* extended.m */, + DCE7BD0708A5724D007B10AE /* bookmarks.h */, + DCE7BD0608A5724D007B10AE /* bookmarks.m */, + CCF3C6500923B9D100401862 /* sfilters.h */, + CCF3C6510923B9D100401862 /* sfilters.m */, ); - isa = PBXGroup; name = Classes; - refType = 4; sourceTree = ""; }; -//080 -//081 -//082 -//083 -//084 -//100 -//101 -//102 -//103 -//104 - 1058C7ACFEA557BF11CA2CBB = { + 1058C7ACFEA557BF11CA2CBB /* Linked Frameworks */ = { + isa = PBXGroup; children = ( - 1058C7ADFEA557BF11CA2CBB, + 1058C7ADFEA557BF11CA2CBB /* Cocoa.framework */, ); - isa = PBXGroup; name = "Linked Frameworks"; - refType = 4; sourceTree = ""; }; - 1058C7ADFEA557BF11CA2CBB = { - isa = PBXFileReference; - lastKnownFileType = wrapper.framework; - name = Cocoa.framework; - path = /System/Library/Frameworks/Cocoa.framework; - refType = 0; - sourceTree = ""; - }; - 1058C7AEFEA557BF11CA2CBB = { + 1058C7AEFEA557BF11CA2CBB /* Other Frameworks */ = { + isa = PBXGroup; children = ( - 089C1672FE841209C02AAC07, - 089C167FFE841241C02AAC07, + 089C1672FE841209C02AAC07 /* Foundation.framework */, + 089C167FFE841241C02AAC07 /* AppKit.framework */, ); - isa = PBXGroup; name = "Other Frameworks"; - refType = 4; sourceTree = ""; }; - 1058C7AFFEA557BF11CA2CBB = { - fileRef = 1058C7ADFEA557BF11CA2CBB; - isa = PBXBuildFile; - settings = { - }; - }; -//100 -//101 -//102 -//103 -//104 -//190 -//191 -//192 -//193 -//194 - 19C28FB8FE9D52D311CA2CBB = { + 19C28FB8FE9D52D311CA2CBB /* Products */ = { + isa = PBXGroup; children = ( - 014CEA410018CDE011CA2923, + 014CEA410018CDE011CA2923 /* VLC.bundle */, ); - isa = PBXGroup; name = Products; - refType = 4; sourceTree = ""; }; -//190 -//191 -//192 -//193 -//194 -//2A0 -//2A1 -//2A2 -//2A3 -//2A4 - 2A16E03F06C4F08700C87B09 = { - fileEncoding = 30; - isa = PBXFileReference; - lastKnownFileType = sourcecode.c.h; - name = equalizer.h; - path = ../../modules/gui/macosx/equalizer.h; - refType = 2; - sourceTree = SOURCE_ROOT; - }; - 2A16E04006C4F08700C87B09 = { - fileEncoding = 30; - isa = PBXFileReference; - lastKnownFileType = sourcecode.c.objc; - name = equalizer.m; - path = ../../modules/gui/macosx/equalizer.m; - refType = 2; - sourceTree = SOURCE_ROOT; - }; - 2A16E07E06C5074F00C87B09 = { - isa = PBXFileReference; - lastKnownFileType = image.png; - name = equalizerdrawer_active.png; - path = Resources/equalizerdrawer_active.png; - refType = 4; - sourceTree = ""; - }; - 2A16E07F06C5074F00C87B09 = { - isa = PBXFileReference; - lastKnownFileType = image.png; - name = equalizerdrawer_blue.png; - path = Resources/equalizerdrawer_blue.png; - refType = 4; - sourceTree = ""; - }; - 2A16E08006C5074F00C87B09 = { - fileRef = 2A16E07E06C5074F00C87B09; - isa = PBXBuildFile; - settings = { - }; - }; - 2A16E08106C5074F00C87B09 = { - fileRef = 2A16E07F06C5074F00C87B09; - isa = PBXBuildFile; - settings = { - }; - }; -//2A0 -//2A1 -//2A2 -//2A3 -//2A4 -//8E0 -//8E1 -//8E2 -//8E3 -//8E4 - 8E445F86047289E50059A3A7 = { + 8E445F86047289E50059A3A7 /* fileicons */ = { + isa = PBXGroup; children = ( - F74F13DF02C2A53401EE194C, - F6E4F90A02D2648B01A80112, - F6E4F90B02D2648B01A80112, - F6E4F90C02D2648B01A80112, - F6E4F90D02D2648B01A80112, - F6E4F90E02D2648B01A80112, - F6E4F90F02D2648B01A80112, - 8E445F8704728A700059A3A7, - 8E445F8804728A700059A3A7, - 8E445F8904728A700059A3A7, - 8E445F8A04728A700059A3A7, - 8E445F8B04728A700059A3A7, - 8E445F8C04728A700059A3A7, - 8E445F8D04728A700059A3A7, - 8E445F8E04728A700059A3A7, - 8E445F8F04728A700059A3A7, - 8E445F9004728A700059A3A7, - 8E445F9104728A700059A3A7, - 8E445F9204728A700059A3A7, - 8E445F9304728A700059A3A7, - 8E445F9404728A700059A3A7, - 8E445F9504728A700059A3A7, - 8E445F9604728A700059A3A7, - 8E445F9704728A700059A3A7, - 8E445F9804728A700059A3A7, - 8E445F9904728A700059A3A7, - 8E445F9A04728A700059A3A7, - 8E445F9B04728A700059A3A7, - 8E445F9C04728A700059A3A7, + F74F13DF02C2A53401EE194C /* vlc.icns */, + F6E4F90A02D2648B01A80112 /* divx.icns */, + F6E4F90B02D2648B01A80112 /* generic.icns */, + F6E4F90C02D2648B01A80112 /* mpeg.icns */, + F6E4F90D02D2648B01A80112 /* mpeg1.icns */, + F6E4F90E02D2648B01A80112 /* mpeg2.icns */, + F6E4F90F02D2648B01A80112 /* mpeg4.icns */, + 8E445F8704728A700059A3A7 /* a52.icns */, + 8E445F8804728A700059A3A7 /* aac.icns */, + 8E445F8904728A700059A3A7 /* asf.icns */, + 8E445F8A04728A700059A3A7 /* asx.icns */, + 8E445F8B04728A700059A3A7 /* avi.icns */, + 8E445F8C04728A700059A3A7 /* bin.icns */, + 8E445F8D04728A700059A3A7 /* cue.icns */, + C2F2A6FA0958A6E600018C74 /* skip_forward_active_embedded.png */, + 8E445F8E04728A700059A3A7 /* dat.icns */, + 8E445F8F04728A700059A3A7 /* dv.icns */, + 8E445F9004728A700059A3A7 /* m3u.icns */, + 8E445F9104728A700059A3A7 /* mov.icns */, + 8E445F9204728A700059A3A7 /* mp3.icns */, + 8E445F9304728A700059A3A7 /* mp4.icns */, + 8E445F9404728A700059A3A7 /* mpg.icns */, + 8E445F9504728A700059A3A7 /* ogg.icns */, + 8E445F9604728A700059A3A7 /* ogm.icns */, + 8E445F9704728A700059A3A7 /* pls.icns */, + 8E445F9804728A700059A3A7 /* srt.icns */, + 8E445F9904728A700059A3A7 /* sub.icns */, + 8E445F9A04728A700059A3A7 /* vob.icns */, + 8E445F9B04728A700059A3A7 /* wma.icns */, + 8E445F9C04728A700059A3A7 /* wmv.icns */, ); - isa = PBXGroup; name = fileicons; - path = ""; - refType = 4; sourceTree = ""; }; - 8E445F8704728A700059A3A7 = { - isa = PBXFileReference; - lastKnownFileType = image.icns; - name = a52.icns; - path = Resources/a52.icns; - refType = 2; - sourceTree = SOURCE_ROOT; - }; - 8E445F8804728A700059A3A7 = { - isa = PBXFileReference; - lastKnownFileType = image.icns; - name = aac.icns; - path = Resources/aac.icns; - refType = 2; - sourceTree = SOURCE_ROOT; - }; - 8E445F8904728A700059A3A7 = { - isa = PBXFileReference; - lastKnownFileType = image.icns; - name = asf.icns; - path = Resources/asf.icns; - refType = 2; - sourceTree = SOURCE_ROOT; - }; - 8E445F8A04728A700059A3A7 = { - isa = PBXFileReference; - lastKnownFileType = image.icns; - name = asx.icns; - path = Resources/asx.icns; - refType = 2; - sourceTree = SOURCE_ROOT; - }; - 8E445F8B04728A700059A3A7 = { - isa = PBXFileReference; - lastKnownFileType = image.icns; - name = avi.icns; - path = Resources/avi.icns; - refType = 2; - sourceTree = SOURCE_ROOT; - }; - 8E445F8C04728A700059A3A7 = { - isa = PBXFileReference; - lastKnownFileType = image.icns; - name = bin.icns; - path = Resources/bin.icns; - refType = 2; - sourceTree = SOURCE_ROOT; - }; - 8E445F8D04728A700059A3A7 = { - isa = PBXFileReference; - lastKnownFileType = image.icns; - name = cue.icns; - path = Resources/cue.icns; - refType = 2; - sourceTree = SOURCE_ROOT; - }; - 8E445F8E04728A700059A3A7 = { - isa = PBXFileReference; - lastKnownFileType = image.icns; - name = dat.icns; - path = Resources/dat.icns; - refType = 2; - sourceTree = SOURCE_ROOT; - }; - 8E445F8F04728A700059A3A7 = { - isa = PBXFileReference; - lastKnownFileType = image.icns; - name = dv.icns; - path = Resources/dv.icns; - refType = 2; - sourceTree = SOURCE_ROOT; - }; - 8E445F9004728A700059A3A7 = { - isa = PBXFileReference; - lastKnownFileType = image.icns; - name = m3u.icns; - path = Resources/m3u.icns; - refType = 2; - sourceTree = SOURCE_ROOT; - }; - 8E445F9104728A700059A3A7 = { - isa = PBXFileReference; - lastKnownFileType = image.icns; - name = mov.icns; - path = Resources/mov.icns; - refType = 2; - sourceTree = SOURCE_ROOT; - }; - 8E445F9204728A700059A3A7 = { - isa = PBXFileReference; - lastKnownFileType = image.icns; - name = mp3.icns; - path = Resources/mp3.icns; - refType = 2; - sourceTree = SOURCE_ROOT; - }; - 8E445F9304728A700059A3A7 = { - isa = PBXFileReference; - lastKnownFileType = image.icns; - name = mp4.icns; - path = Resources/mp4.icns; - refType = 2; - sourceTree = SOURCE_ROOT; - }; - 8E445F9404728A700059A3A7 = { - isa = PBXFileReference; - lastKnownFileType = image.icns; - name = mpg.icns; - path = Resources/mpg.icns; - refType = 2; - sourceTree = SOURCE_ROOT; - }; - 8E445F9504728A700059A3A7 = { - isa = PBXFileReference; - lastKnownFileType = image.icns; - name = ogg.icns; - path = Resources/ogg.icns; - refType = 2; - sourceTree = SOURCE_ROOT; - }; - 8E445F9604728A700059A3A7 = { - isa = PBXFileReference; - lastKnownFileType = image.icns; - name = ogm.icns; - path = Resources/ogm.icns; - refType = 2; - sourceTree = SOURCE_ROOT; - }; - 8E445F9704728A700059A3A7 = { - isa = PBXFileReference; - lastKnownFileType = image.icns; - name = pls.icns; - path = Resources/pls.icns; - refType = 2; - sourceTree = SOURCE_ROOT; - }; - 8E445F9804728A700059A3A7 = { - isa = PBXFileReference; - lastKnownFileType = image.icns; - name = srt.icns; - path = Resources/srt.icns; - refType = 2; - sourceTree = SOURCE_ROOT; - }; - 8E445F9904728A700059A3A7 = { - isa = PBXFileReference; - lastKnownFileType = image.icns; - name = sub.icns; - path = Resources/sub.icns; - refType = 2; - sourceTree = SOURCE_ROOT; - }; - 8E445F9A04728A700059A3A7 = { - isa = PBXFileReference; - lastKnownFileType = image.icns; - name = vob.icns; - path = Resources/vob.icns; - refType = 2; - sourceTree = SOURCE_ROOT; - }; - 8E445F9B04728A700059A3A7 = { - isa = PBXFileReference; - lastKnownFileType = image.icns; - name = wma.icns; - path = Resources/wma.icns; - refType = 2; - sourceTree = SOURCE_ROOT; - }; - 8E445F9C04728A700059A3A7 = { - isa = PBXFileReference; - lastKnownFileType = image.icns; - name = wmv.icns; - path = Resources/wmv.icns; - refType = 2; - sourceTree = SOURCE_ROOT; - }; - 8E445F9D04728A700059A3A7 = { - fileRef = 8E445F8704728A700059A3A7; - isa = PBXBuildFile; - settings = { - }; - }; - 8E445F9E04728A700059A3A7 = { - fileRef = 8E445F8804728A700059A3A7; - isa = PBXBuildFile; - settings = { - }; - }; - 8E445F9F04728A700059A3A7 = { - fileRef = 8E445F8904728A700059A3A7; - isa = PBXBuildFile; - settings = { - }; - }; - 8E445FA004728A700059A3A7 = { - fileRef = 8E445F8A04728A700059A3A7; - isa = PBXBuildFile; - settings = { - }; - }; - 8E445FA104728A700059A3A7 = { - fileRef = 8E445F8B04728A700059A3A7; - isa = PBXBuildFile; - settings = { - }; - }; - 8E445FA204728A700059A3A7 = { - fileRef = 8E445F8C04728A700059A3A7; - isa = PBXBuildFile; - settings = { - }; - }; - 8E445FA304728A700059A3A7 = { - fileRef = 8E445F8D04728A700059A3A7; - isa = PBXBuildFile; - settings = { - }; - }; - 8E445FA404728A700059A3A7 = { - fileRef = 8E445F8E04728A700059A3A7; - isa = PBXBuildFile; - settings = { - }; - }; - 8E445FA504728A700059A3A7 = { - fileRef = 8E445F8F04728A700059A3A7; - isa = PBXBuildFile; - settings = { - }; - }; - 8E445FA604728A700059A3A7 = { - fileRef = 8E445F9004728A700059A3A7; - isa = PBXBuildFile; - settings = { - }; - }; - 8E445FA704728A700059A3A7 = { - fileRef = 8E445F9104728A700059A3A7; - isa = PBXBuildFile; - settings = { - }; - }; - 8E445FA804728A700059A3A7 = { - fileRef = 8E445F9204728A700059A3A7; - isa = PBXBuildFile; - settings = { - }; - }; - 8E445FA904728A700059A3A7 = { - fileRef = 8E445F9304728A700059A3A7; - isa = PBXBuildFile; - settings = { - }; - }; - 8E445FAA04728A700059A3A7 = { - fileRef = 8E445F9404728A700059A3A7; - isa = PBXBuildFile; - settings = { - }; - }; - 8E445FAB04728A700059A3A7 = { - fileRef = 8E445F9504728A700059A3A7; - isa = PBXBuildFile; - settings = { - }; - }; - 8E445FAC04728A700059A3A7 = { - fileRef = 8E445F9604728A700059A3A7; - isa = PBXBuildFile; - settings = { - }; - }; - 8E445FAD04728A700059A3A7 = { - fileRef = 8E445F9704728A700059A3A7; - isa = PBXBuildFile; - settings = { - }; - }; - 8E445FAE04728A700059A3A7 = { - fileRef = 8E445F9804728A700059A3A7; - isa = PBXBuildFile; - settings = { - }; - }; - 8E445FAF04728A700059A3A7 = { - fileRef = 8E445F9904728A700059A3A7; - isa = PBXBuildFile; - settings = { - }; - }; - 8E445FB004728A700059A3A7 = { - fileRef = 8E445F9A04728A700059A3A7; - isa = PBXBuildFile; - settings = { - }; - }; - 8E445FB104728A700059A3A7 = { - fileRef = 8E445F9B04728A700059A3A7; - isa = PBXBuildFile; - settings = { - }; - }; - 8E445FB204728A700059A3A7 = { - fileRef = 8E445F9C04728A700059A3A7; - isa = PBXBuildFile; - settings = { - }; - }; - 8E49720006417F6800370C9F = { - fileEncoding = 5; - isa = PBXFileReference; - lastKnownFileType = sourcecode.c.h; - name = playlistinfo.h; - path = ../../modules/gui/macosx/playlistinfo.h; - refType = 2; - sourceTree = SOURCE_ROOT; - }; - 8E49720106417F6800370C9F = { - fileEncoding = 5; - isa = PBXFileReference; - lastKnownFileType = sourcecode.c.objc; - name = playlistinfo.m; - path = ../../modules/gui/macosx/playlistinfo.m; - refType = 2; - sourceTree = SOURCE_ROOT; - }; - 8E55FB7F0459B0FD00FB3317 = { - fileEncoding = 30; - isa = PBXFileReference; - lastKnownFileType = sourcecode.c.h; - name = output.h; - path = ../../modules/gui/macosx/output.h; - refType = 2; - sourceTree = SOURCE_ROOT; - }; - 8E55FB800459B0FD00FB3317 = { - fileEncoding = 30; - isa = PBXFileReference; - lastKnownFileType = sourcecode.c.objc; - name = output.m; - path = ../../modules/gui/macosx/output.m; - refType = 2; - sourceTree = SOURCE_ROOT; - }; - 8E6BC6F6041643860059A3A7 = { - fileEncoding = 4; - isa = PBXFileReference; - lastKnownFileType = sourcecode.c.h; - name = applescript.h; - path = ../../modules/gui/macosx/applescript.h; - refType = 2; - sourceTree = SOURCE_ROOT; - }; - 8E6BC6F7041643860059A3A7 = { - fileEncoding = 4; - isa = PBXFileReference; - lastKnownFileType = sourcecode.c.objc; - name = applescript.m; - path = ../../modules/gui/macosx/applescript.m; - refType = 2; - sourceTree = SOURCE_ROOT; - }; - 8E6BC6FA041684EC0059A3A7 = { - fileEncoding = 4; - isa = PBXFileReference; - lastKnownFileType = sourcecode.c.h; - name = controls.h; - path = ../../modules/gui/macosx/controls.h; - refType = 2; - sourceTree = SOURCE_ROOT; - }; - 8E93909A0565D6D300C7661C = { - isa = PBXFileReference; - lastKnownFileType = image.png; - name = display_slider.png; - path = Resources/display_slider.png; - refType = 2; - sourceTree = SOURCE_ROOT; - }; - 8E93909B0565D6D300C7661C = { - isa = PBXFileReference; - lastKnownFileType = image.png; - name = display_track.png; - path = Resources/display_track.png; - refType = 2; - sourceTree = SOURCE_ROOT; - }; - 8E93909C0565D6D300C7661C = { - isa = PBXFileReference; - lastKnownFileType = image.png; - name = display.png; - path = Resources/display.png; - refType = 2; - sourceTree = SOURCE_ROOT; - }; - 8E93909D0565D6D300C7661C = { - isa = PBXFileReference; - lastKnownFileType = image.png; - name = fullscreen_active.png; - path = Resources/fullscreen_active.png; - refType = 2; - sourceTree = SOURCE_ROOT; - }; - 8E93909E0565D6D300C7661C = { - isa = PBXFileReference; - lastKnownFileType = image.png; - name = fullscreen_blue.png; - path = Resources/fullscreen_blue.png; - refType = 2; - sourceTree = SOURCE_ROOT; - }; - 8E93909F0565D6D300C7661C = { - isa = PBXFileReference; - lastKnownFileType = image.png; - name = next_active.png; - path = Resources/next_active.png; - refType = 2; - sourceTree = SOURCE_ROOT; - }; - 8E9390A00565D6D300C7661C = { - isa = PBXFileReference; - lastKnownFileType = image.png; - name = next_blue.png; - path = Resources/next_blue.png; - refType = 2; - sourceTree = SOURCE_ROOT; - }; - 8E9390A10565D6D300C7661C = { - isa = PBXFileReference; - lastKnownFileType = image.png; - name = pause_blue.png; - path = Resources/pause_blue.png; - refType = 2; - sourceTree = SOURCE_ROOT; - }; - 8E9390A20565D6D300C7661C = { - isa = PBXFileReference; - lastKnownFileType = image.png; - name = pause.png; - path = Resources/pause.png; - refType = 2; - sourceTree = SOURCE_ROOT; - }; - 8E9390A30565D6D300C7661C = { - isa = PBXFileReference; - lastKnownFileType = image.png; - name = play_blue.png; - path = Resources/play_blue.png; - refType = 2; - sourceTree = SOURCE_ROOT; - }; - 8E9390A40565D6D300C7661C = { - isa = PBXFileReference; - lastKnownFileType = image.png; - name = play.png; - path = Resources/play.png; - refType = 2; - sourceTree = SOURCE_ROOT; - }; - 8E9390A50565D6D300C7661C = { - isa = PBXFileReference; - lastKnownFileType = image.png; - name = playlistdrawer_active.png; - path = Resources/playlistdrawer_active.png; - refType = 2; - sourceTree = SOURCE_ROOT; - }; - 8E9390A60565D6D300C7661C = { - isa = PBXFileReference; - lastKnownFileType = image.png; - name = playlistdrawer_blue.png; - path = Resources/playlistdrawer_blue.png; - refType = 2; - sourceTree = SOURCE_ROOT; - }; - 8E9390A70565D6D300C7661C = { - isa = PBXFileReference; - lastKnownFileType = image.png; - name = previous_active.png; - path = Resources/previous_active.png; - refType = 2; - sourceTree = SOURCE_ROOT; - }; - 8E9390A80565D6D300C7661C = { - isa = PBXFileReference; - lastKnownFileType = image.png; - name = previous_blue.png; - path = Resources/previous_blue.png; - refType = 2; - sourceTree = SOURCE_ROOT; - }; - 8E9390A90565D6D300C7661C = { - isa = PBXFileReference; - lastKnownFileType = image.png; - name = skip_forward_active.png; - path = Resources/skip_forward_active.png; - refType = 2; - sourceTree = SOURCE_ROOT; - }; - 8E9390AA0565D6D300C7661C = { - isa = PBXFileReference; - lastKnownFileType = image.png; - name = skip_forward_blue.png; - path = Resources/skip_forward_blue.png; - refType = 2; - sourceTree = SOURCE_ROOT; - }; - 8E9390AB0565D6D300C7661C = { - isa = PBXFileReference; - lastKnownFileType = image.png; - name = skip_previous_active.png; - path = Resources/skip_previous_active.png; - refType = 2; - sourceTree = SOURCE_ROOT; - }; - 8E9390AC0565D6D300C7661C = { - isa = PBXFileReference; - lastKnownFileType = image.png; - name = skip_previous_blue.png; - path = Resources/skip_previous_blue.png; - refType = 2; - sourceTree = SOURCE_ROOT; - }; - 8E9390AD0565D6D300C7661C = { - isa = PBXFileReference; - lastKnownFileType = image.png; - name = stop_blue.png; - path = Resources/stop_blue.png; - refType = 2; - sourceTree = SOURCE_ROOT; - }; - 8E9390AE0565D6D300C7661C = { - isa = PBXFileReference; - lastKnownFileType = image.png; - name = stop.png; - path = Resources/stop.png; - refType = 2; - sourceTree = SOURCE_ROOT; - }; - 8E9390AF0565D6D300C7661C = { - isa = PBXFileReference; - lastKnownFileType = image.png; - name = volume_high.png; - path = Resources/volume_high.png; - refType = 2; - sourceTree = SOURCE_ROOT; - }; - 8E9390B00565D6D300C7661C = { - isa = PBXFileReference; - lastKnownFileType = image.png; - name = volume_low.png; - path = Resources/volume_low.png; - refType = 2; - sourceTree = SOURCE_ROOT; - }; - 8E9390B10565D6D300C7661C = { - isa = PBXFileReference; - lastKnownFileType = image.png; - name = volumeslider_blue.png; - path = Resources/volumeslider_blue.png; - refType = 2; - sourceTree = SOURCE_ROOT; - }; - 8E9390B20565D6D300C7661C = { - isa = PBXFileReference; - lastKnownFileType = image.png; - name = volumeslider_normal.png; - path = Resources/volumeslider_normal.png; - refType = 2; - sourceTree = SOURCE_ROOT; - }; - 8E9390B30565D6D300C7661C = { - isa = PBXFileReference; - lastKnownFileType = image.png; - name = volumetrack.png; - path = Resources/volumetrack.png; - refType = 2; - sourceTree = SOURCE_ROOT; - }; - 8E9390B40565D6D300C7661C = { - fileRef = 8E93909A0565D6D300C7661C; - isa = PBXBuildFile; - settings = { - }; - }; - 8E9390B50565D6D300C7661C = { - fileRef = 8E93909B0565D6D300C7661C; - isa = PBXBuildFile; - settings = { - }; - }; - 8E9390B60565D6D300C7661C = { - fileRef = 8E93909C0565D6D300C7661C; - isa = PBXBuildFile; - settings = { - }; - }; - 8E9390B70565D6D300C7661C = { - fileRef = 8E93909D0565D6D300C7661C; - isa = PBXBuildFile; - settings = { - }; - }; - 8E9390B80565D6D300C7661C = { - fileRef = 8E93909E0565D6D300C7661C; - isa = PBXBuildFile; - settings = { - }; - }; - 8E9390B90565D6D300C7661C = { - fileRef = 8E93909F0565D6D300C7661C; - isa = PBXBuildFile; - settings = { - }; - }; - 8E9390BA0565D6D300C7661C = { - fileRef = 8E9390A00565D6D300C7661C; - isa = PBXBuildFile; - settings = { - }; - }; - 8E9390BB0565D6D300C7661C = { - fileRef = 8E9390A10565D6D300C7661C; - isa = PBXBuildFile; - settings = { - }; - }; - 8E9390BC0565D6D300C7661C = { - fileRef = 8E9390A20565D6D300C7661C; - isa = PBXBuildFile; - settings = { - }; - }; - 8E9390BD0565D6D300C7661C = { - fileRef = 8E9390A30565D6D300C7661C; - isa = PBXBuildFile; - settings = { - }; - }; - 8E9390BE0565D6D300C7661C = { - fileRef = 8E9390A40565D6D300C7661C; - isa = PBXBuildFile; - settings = { - }; - }; - 8E9390BF0565D6D300C7661C = { - fileRef = 8E9390A50565D6D300C7661C; - isa = PBXBuildFile; - settings = { - }; - }; - 8E9390C00565D6D300C7661C = { - fileRef = 8E9390A60565D6D300C7661C; - isa = PBXBuildFile; - settings = { - }; - }; - 8E9390C10565D6D300C7661C = { - fileRef = 8E9390A70565D6D300C7661C; - isa = PBXBuildFile; - settings = { - }; - }; - 8E9390C20565D6D300C7661C = { - fileRef = 8E9390A80565D6D300C7661C; - isa = PBXBuildFile; - settings = { - }; - }; - 8E9390C30565D6D300C7661C = { - fileRef = 8E9390A90565D6D300C7661C; - isa = PBXBuildFile; - settings = { - }; - }; - 8E9390C40565D6D300C7661C = { - fileRef = 8E9390AA0565D6D300C7661C; - isa = PBXBuildFile; - settings = { - }; - }; - 8E9390C50565D6D300C7661C = { - fileRef = 8E9390AB0565D6D300C7661C; - isa = PBXBuildFile; - settings = { - }; - }; - 8E9390C60565D6D300C7661C = { - fileRef = 8E9390AC0565D6D300C7661C; - isa = PBXBuildFile; - settings = { - }; - }; - 8E9390C70565D6D300C7661C = { - fileRef = 8E9390AD0565D6D300C7661C; - isa = PBXBuildFile; - settings = { - }; - }; - 8E9390C80565D6D300C7661C = { - fileRef = 8E9390AE0565D6D300C7661C; - isa = PBXBuildFile; - settings = { - }; - }; - 8E9390C90565D6D300C7661C = { - fileRef = 8E9390AF0565D6D300C7661C; - isa = PBXBuildFile; - settings = { - }; - }; - 8E9390CA0565D6D300C7661C = { - fileRef = 8E9390B00565D6D300C7661C; - isa = PBXBuildFile; - settings = { - }; - }; - 8E9390CB0565D6D300C7661C = { - fileRef = 8E9390B10565D6D300C7661C; - isa = PBXBuildFile; - settings = { - }; - }; - 8E9390CC0565D6D300C7661C = { - fileRef = 8E9390B20565D6D300C7661C; - isa = PBXBuildFile; - settings = { - }; - }; - 8E9390CD0565D6D300C7661C = { - fileRef = 8E9390B30565D6D300C7661C; - isa = PBXBuildFile; - settings = { - }; - }; - 8E9CA1A306D7DEE800B7186C = { - fileEncoding = 5; - isa = PBXFileReference; - lastKnownFileType = sourcecode.c.h; - name = prefs_widgets.h; - path = ../../modules/gui/macosx/prefs_widgets.h; - refType = 2; - sourceTree = SOURCE_ROOT; - }; - 8E9CA1A406D7DEE800B7186C = { - fileEncoding = 5; - isa = PBXFileReference; - lastKnownFileType = sourcecode.c.objc; - name = prefs_widgets.m; - path = ../../modules/gui/macosx/prefs_widgets.m; - refType = 2; - sourceTree = SOURCE_ROOT; - }; - 8E9CA1A506D7DEE800B7186C = { - fileEncoding = 5; - isa = PBXFileReference; - lastKnownFileType = sourcecode.c.objc; - name = voutgl.m; - path = ../../modules/gui/macosx/voutgl.m; - refType = 2; - sourceTree = SOURCE_ROOT; - }; - 8E9CA1A606D7DEE800B7186C = { - fileEncoding = 5; - isa = PBXFileReference; - lastKnownFileType = sourcecode.c.objc; - name = voutqt.m; - path = ../../modules/gui/macosx/voutqt.m; - refType = 2; - sourceTree = SOURCE_ROOT; - }; - 8E9CC7B1046EFD700059A3A7 = { - fileEncoding = 12; - isa = PBXFileReference; - lastKnownFileType = text; - name = THANKS; - path = ../../THANKS; - refType = 2; - sourceTree = SOURCE_ROOT; - }; - 8E9CC7B2046EFD700059A3A7 = { - fileRef = 8E9CC7B1046EFD700059A3A7; - isa = PBXBuildFile; - settings = { - }; - }; - 8EBF3FA303F13FFB0059A3A7 = { - isa = PBXFileReference; - lastKnownFileType = text; - name = vlc.scriptSuite; - path = Resources/vlc.scriptSuite; - refType = 2; - sourceTree = SOURCE_ROOT; - }; - 8EBF3FA403F13FFB0059A3A7 = { - fileRef = 8EBF3FA303F13FFB0059A3A7; - isa = PBXBuildFile; - settings = { - }; - }; - 8EBF3FA503F140960059A3A7 = { - isa = PBXFileReference; - lastKnownFileType = text.xml; - name = vlc.scriptTerminology; - path = Resources/vlc.scriptTerminology; - refType = 2; - sourceTree = SOURCE_ROOT; - }; - 8ECA7E520563CD9500DFC000 = { + 8ECA7E520563CD9500DFC000 /* Controller */ = { + isa = PBXGroup; children = ( - 2A16E07E06C5074F00C87B09, - 2A16E07F06C5074F00C87B09, - 8E93909A0565D6D300C7661C, - 8E93909B0565D6D300C7661C, - 8E93909C0565D6D300C7661C, - 8E93909D0565D6D300C7661C, - 8E93909E0565D6D300C7661C, - 8E93909F0565D6D300C7661C, - 8E9390A00565D6D300C7661C, - 8E9390A10565D6D300C7661C, - 8E9390A20565D6D300C7661C, - 8E9390A30565D6D300C7661C, - 8E9390A40565D6D300C7661C, - 8E9390A50565D6D300C7661C, - 8E9390A60565D6D300C7661C, - 8E9390A70565D6D300C7661C, - 8E9390A80565D6D300C7661C, - 8E9390A90565D6D300C7661C, - 8E9390AA0565D6D300C7661C, - 8E9390AB0565D6D300C7661C, - 8E9390AC0565D6D300C7661C, - 8E9390AD0565D6D300C7661C, - 8E9390AE0565D6D300C7661C, - 8E9390AF0565D6D300C7661C, - 8E9390B00565D6D300C7661C, - 8E9390B10565D6D300C7661C, - 8E9390B20565D6D300C7661C, - 8E9390B30565D6D300C7661C, + 2A16E07E06C5074F00C87B09 /* equalizerdrawer_active.png */, + 2A16E07F06C5074F00C87B09 /* equalizerdrawer_blue.png */, + 8E93909A0565D6D300C7661C /* display_slider.png */, + 8E93909B0565D6D300C7661C /* display_track.png */, + 8E93909C0565D6D300C7661C /* display.png */, + 8E93909D0565D6D300C7661C /* fullscreen_active.png */, + 8E93909E0565D6D300C7661C /* fullscreen_blue.png */, + 8E93909F0565D6D300C7661C /* next_active.png */, + 8E9390A00565D6D300C7661C /* next_blue.png */, + 8E9390A10565D6D300C7661C /* pause_blue.png */, + 8E9390A20565D6D300C7661C /* pause.png */, + 8E9390A30565D6D300C7661C /* play_blue.png */, + 8E9390A40565D6D300C7661C /* play.png */, + 8E9390A50565D6D300C7661C /* playlistdrawer_active.png */, + 8E9390A60565D6D300C7661C /* playlistdrawer_blue.png */, + 8E9390A70565D6D300C7661C /* previous_active.png */, + 8E9390A80565D6D300C7661C /* previous_blue.png */, + 8E9390A90565D6D300C7661C /* skip_forward_active.png */, + 8E9390AA0565D6D300C7661C /* skip_forward_blue.png */, + 8E9390AB0565D6D300C7661C /* skip_previous_active.png */, + C2F2A7000958AC9000018C74 /* skip_previous_active_embedded.png */, + C2F2A6FE0958AA9300018C74 /* pause_embedded.png */, + C2F2A6FC0958A94500018C74 /* play_embedded.png */, + C2F2A702095AE51600018C74 /* pause_embedded_blue.png */, + C2F2A703095AE51600018C74 /* play_embedded_blue.png */, + C2F2A704095AE51600018C74 /* skip_forward_embedded_blue.png */, + C2F2A705095AE51600018C74 /* skip_previous_embedded_blue.png */, + 8E9390AC0565D6D300C7661C /* skip_previous_blue.png */, + 8E9390AD0565D6D300C7661C /* stop_blue.png */, + 8E9390AE0565D6D300C7661C /* stop.png */, + 8E9390AF0565D6D300C7661C /* volume_high.png */, + 8E9390B00565D6D300C7661C /* volume_low.png */, + 8E9390B10565D6D300C7661C /* volumeslider_blue.png */, + 8E9390B20565D6D300C7661C /* volumeslider_normal.png */, + 8E9390B30565D6D300C7661C /* volumetrack.png */, ); - isa = PBXGroup; name = Controller; - refType = 4; sourceTree = ""; }; - 8ED6C27A03E2EB1C0059A3A7 = { - fileEncoding = 30; - isa = PBXFileReference; - lastKnownFileType = sourcecode.c.c; - name = coreaudio.c; - path = ../../modules/audio_output/coreaudio.c; - refType = 2; - sourceTree = SOURCE_ROOT; - }; - 8ED6C27B03E2EB1C0059A3A7 = { - fileEncoding = 30; - isa = PBXFileReference; - lastKnownFileType = sourcecode.c.objc; - name = controls.m; - path = ../../modules/gui/macosx/controls.m; - refType = 2; - sourceTree = SOURCE_ROOT; - }; - 8ED6C27C03E2EB1C0059A3A7 = { - fileEncoding = 30; - isa = PBXFileReference; - lastKnownFileType = sourcecode.c.h; - name = intf.h; - path = ../../modules/gui/macosx/intf.h; - refType = 2; - sourceTree = SOURCE_ROOT; - }; - 8ED6C27D03E2EB1C0059A3A7 = { - fileEncoding = 30; - isa = PBXFileReference; - lastKnownFileType = sourcecode.c.objc; - name = intf.m; - path = ../../modules/gui/macosx/intf.m; - refType = 2; - sourceTree = SOURCE_ROOT; - }; - 8ED6C27E03E2EB1C0059A3A7 = { - fileEncoding = 30; - isa = PBXFileReference; - lastKnownFileType = sourcecode.c.objc; - name = macosx.m; - path = ../../modules/gui/macosx/macosx.m; - refType = 2; - sourceTree = SOURCE_ROOT; - }; - 8ED6C27F03E2EB1C0059A3A7 = { - fileEncoding = 30; - isa = PBXFileReference; - lastKnownFileType = sourcecode.c.h; - name = misc.h; - path = ../../modules/gui/macosx/misc.h; - refType = 2; - sourceTree = SOURCE_ROOT; - }; - 8ED6C28003E2EB1C0059A3A7 = { - fileEncoding = 30; - isa = PBXFileReference; - lastKnownFileType = sourcecode.c.objc; - name = misc.m; - path = ../../modules/gui/macosx/misc.m; - refType = 2; - sourceTree = SOURCE_ROOT; - }; - 8ED6C28103E2EB1C0059A3A7 = { - fileEncoding = 30; - isa = PBXFileReference; - lastKnownFileType = sourcecode.c.h; - name = open.h; - path = ../../modules/gui/macosx/open.h; - refType = 2; - sourceTree = SOURCE_ROOT; - }; - 8ED6C28203E2EB1C0059A3A7 = { - fileEncoding = 30; - isa = PBXFileReference; - lastKnownFileType = sourcecode.c.objc; - name = open.m; - path = ../../modules/gui/macosx/open.m; - refType = 2; - sourceTree = SOURCE_ROOT; - }; - 8ED6C28303E2EB1C0059A3A7 = { - fileEncoding = 30; - isa = PBXFileReference; - lastKnownFileType = sourcecode.c.h; - name = playlist.h; - path = ../../modules/gui/macosx/playlist.h; - refType = 2; - sourceTree = SOURCE_ROOT; - }; - 8ED6C28403E2EB1C0059A3A7 = { - fileEncoding = 30; - isa = PBXFileReference; - lastKnownFileType = sourcecode.c.objc; - name = playlist.m; - path = ../../modules/gui/macosx/playlist.m; - refType = 2; - sourceTree = SOURCE_ROOT; - }; - 8ED6C28503E2EB1C0059A3A7 = { - fileEncoding = 30; - isa = PBXFileReference; - lastKnownFileType = sourcecode.c.h; - name = prefs.h; - path = ../../modules/gui/macosx/prefs.h; - refType = 2; - sourceTree = SOURCE_ROOT; - }; - 8ED6C28603E2EB1C0059A3A7 = { - fileEncoding = 30; - isa = PBXFileReference; - lastKnownFileType = sourcecode.c.objc; - name = prefs.m; - path = ../../modules/gui/macosx/prefs.m; - refType = 2; - sourceTree = SOURCE_ROOT; - }; - 8ED6C28703E2EB1C0059A3A7 = { - fileEncoding = 30; - isa = PBXFileReference; - lastKnownFileType = sourcecode.c.h; - name = vout.h; - path = ../../modules/gui/macosx/vout.h; - refType = 2; - sourceTree = SOURCE_ROOT; - }; - 8ED6C28803E2EB1C0059A3A7 = { - fileEncoding = 30; - isa = PBXFileReference; - lastKnownFileType = sourcecode.c.objc; - name = vout.m; - path = ../../modules/gui/macosx/vout.m; - refType = 2; - sourceTree = SOURCE_ROOT; - }; - 8ED6C29D03E2F32E0059A3A7 = { - fileEncoding = 12; - isa = PBXFileReference; - lastKnownFileType = text; - name = AUTHORS; - path = ../../AUTHORS; - refType = 2; - sourceTree = SOURCE_ROOT; - }; - 8ED6C29E03E2F32E0059A3A7 = { - fileEncoding = 12; - isa = PBXFileReference; - lastKnownFileType = text; - name = COPYING; - path = ../../COPYING; - refType = 2; - sourceTree = SOURCE_ROOT; - }; - 8ED6C29F03E2F32E0059A3A7 = { - fileRef = 8ED6C29D03E2F32E0059A3A7; - isa = PBXBuildFile; - settings = { - }; - }; - 8ED6C2A003E2F32E0059A3A7 = { - fileRef = 8ED6C29E03E2F32E0059A3A7; - isa = PBXBuildFile; - settings = { - }; - }; - 8EDAC3430440F72D0059A3A7 = { - isa = PBXFileReference; - lastKnownFileType = text.rtf; - name = README.MacOSX.rtf; - path = ../../README.MacOSX.rtf; - refType = 2; - sourceTree = SOURCE_ROOT; + DCF358BC077F1236007DB450 /* nibs */ = { + isa = PBXGroup; + children = ( + DCA00AA7075F948800E6BF46 /* About.nib */, + F74F13EA02C2A79C01EE194C /* MainMenu.nib */, + DCF358B9077F10BA007DB450 /* Preferences.nib */, + DCA693C10789DF8700139EC6 /* Open.nib */, + DCFCCDB7085CE18F001E36AF /* Wizard.nib */, + DC7F46EB08A183FC0027DB24 /* Extended.nib */, + DCE7BD0308A56C8B007B10AE /* Bookmarks.nib */, + CCF3C64A0923B99D00401862 /* SFilters.nib */, + ); + name = nibs; + sourceTree = ""; }; - 8EDAC3440440F72D0059A3A7 = { - fileRef = 8EDAC3430440F72D0059A3A7; - isa = PBXBuildFile; - settings = { +/* End PBXGroup section */ + +/* Begin PBXProject section */ + 089C1669FE841209C02AAC07 /* Project object */ = { + isa = PBXProject; + buildConfigurationList = C2F2A6EA09588F1B00018C74 /* Build configuration list for PBXProject "vlc" */; + buildSettings = { }; + buildStyles = ( + 014CEA420018CDE011CA2923 /* Development */, + 014CEA430018CDE011CA2923 /* Deployment */, + ); + hasScannedForEncodings = 1; + mainGroup = 089C166AFE841209C02AAC07 /* vlc */; + projectDirPath = ""; + targets = ( + 089C1673FE841209C02AAC07 /* vlc */, + ); }; - 8EE1AF9F044465080059A3A7 = { - fileEncoding = 30; - isa = PBXFileReference; - lastKnownFileType = sourcecode.c.h; - name = about.h; - path = ../../modules/gui/macosx/about.h; - refType = 2; - sourceTree = SOURCE_ROOT; - }; - 8EE1AFA0044465080059A3A7 = { - fileEncoding = 30; - isa = PBXFileReference; - lastKnownFileType = sourcecode.c.objc; - name = about.m; - path = ../../modules/gui/macosx/about.m; - refType = 2; - sourceTree = SOURCE_ROOT; - }; -//8E0 -//8E1 -//8E2 -//8E3 -//8E4 -//A00 -//A01 -//A02 -//A03 -//A04 - A0E6B59804407FBD0080DD97 = { - fileEncoding = 12; - isa = PBXFileReference; - lastKnownFileType = text; - name = README; - path = Resources/README; - refType = 4; - sourceTree = ""; +/* End PBXProject section */ + +/* Begin PBXResourcesBuildPhase section */ + 089C1675FE841209C02AAC07 /* Resources */ = { + isa = PBXResourcesBuildPhase; + buildActionMask = 2147483647; + files = ( + F74F13E002C2A53401EE194C /* vlc.icns in Resources */, + F74F13EC02C2A79C01EE194C /* MainMenu.nib in Resources */, + F6E4F91002D2648B01A80112 /* divx.icns in Resources */, + F6E4F91102D2648B01A80112 /* generic.icns in Resources */, + F6E4F91202D2648B01A80112 /* mpeg.icns in Resources */, + F6E4F91302D2648B01A80112 /* mpeg1.icns in Resources */, + F6E4F91402D2648B01A80112 /* mpeg2.icns in Resources */, + F6E4F91502D2648B01A80112 /* mpeg4.icns in Resources */, + F69B0CA802E24F6401A80112 /* InfoPlist.strings in Resources */, + 8ED6C29F03E2F32E0059A3A7 /* AUTHORS in Resources */, + 8ED6C2A003E2F32E0059A3A7 /* COPYING in Resources */, + 8EBF3FA403F13FFB0059A3A7 /* vlc.scriptSuite in Resources */, + DCC9AE9507F77DE600394C42 /* vlc.scriptTerminology in Resources */, + A0E6B59904407FBD0080DD97 /* README in Resources */, + 8EDAC3440440F72D0059A3A7 /* README.MacOSX.rtf in Resources */, + 8E9CC7B2046EFD700059A3A7 /* THANKS in Resources */, + 8E445F9D04728A700059A3A7 /* a52.icns in Resources */, + 8E445F9E04728A700059A3A7 /* aac.icns in Resources */, + 8E445F9F04728A700059A3A7 /* asf.icns in Resources */, + 8E445FA004728A700059A3A7 /* asx.icns in Resources */, + 8E445FA104728A700059A3A7 /* avi.icns in Resources */, + 8E445FA204728A700059A3A7 /* bin.icns in Resources */, + 8E445FA304728A700059A3A7 /* cue.icns in Resources */, + 8E445FA404728A700059A3A7 /* dat.icns in Resources */, + 8E445FA504728A700059A3A7 /* dv.icns in Resources */, + 8E445FA604728A700059A3A7 /* m3u.icns in Resources */, + 8E445FA704728A700059A3A7 /* mov.icns in Resources */, + 8E445FA804728A700059A3A7 /* mp3.icns in Resources */, + 8E445FA904728A700059A3A7 /* mp4.icns in Resources */, + 8E445FAA04728A700059A3A7 /* mpg.icns in Resources */, + 8E445FAB04728A700059A3A7 /* ogg.icns in Resources */, + 8E445FAC04728A700059A3A7 /* ogm.icns in Resources */, + 8E445FAD04728A700059A3A7 /* pls.icns in Resources */, + 8E445FAE04728A700059A3A7 /* srt.icns in Resources */, + 8E445FAF04728A700059A3A7 /* sub.icns in Resources */, + 8E445FB004728A700059A3A7 /* vob.icns in Resources */, + 8E445FB104728A700059A3A7 /* wma.icns in Resources */, + 8E445FB204728A700059A3A7 /* wmv.icns in Resources */, + 8E9390B40565D6D300C7661C /* display_slider.png in Resources */, + 8E9390B50565D6D300C7661C /* display_track.png in Resources */, + 8E9390B60565D6D300C7661C /* display.png in Resources */, + 8E9390B70565D6D300C7661C /* fullscreen_active.png in Resources */, + 8E9390B80565D6D300C7661C /* fullscreen_blue.png in Resources */, + 8E9390B90565D6D300C7661C /* next_active.png in Resources */, + 8E9390BA0565D6D300C7661C /* next_blue.png in Resources */, + 8E9390BB0565D6D300C7661C /* pause_blue.png in Resources */, + 8E9390BC0565D6D300C7661C /* pause.png in Resources */, + 8E9390BD0565D6D300C7661C /* play_blue.png in Resources */, + 8E9390BE0565D6D300C7661C /* play.png in Resources */, + 8E9390BF0565D6D300C7661C /* playlistdrawer_active.png in Resources */, + 8E9390C00565D6D300C7661C /* playlistdrawer_blue.png in Resources */, + 8E9390C10565D6D300C7661C /* previous_active.png in Resources */, + 8E9390C20565D6D300C7661C /* previous_blue.png in Resources */, + 8E9390C30565D6D300C7661C /* skip_forward_active.png in Resources */, + 8E9390C40565D6D300C7661C /* skip_forward_blue.png in Resources */, + 8E9390C50565D6D300C7661C /* skip_previous_active.png in Resources */, + 8E9390C60565D6D300C7661C /* skip_previous_blue.png in Resources */, + 8E9390C70565D6D300C7661C /* stop_blue.png in Resources */, + 8E9390C80565D6D300C7661C /* stop.png in Resources */, + 8E9390C90565D6D300C7661C /* volume_high.png in Resources */, + 8E9390CA0565D6D300C7661C /* volume_low.png in Resources */, + 8E9390CB0565D6D300C7661C /* volumeslider_blue.png in Resources */, + 8E9390CC0565D6D300C7661C /* volumeslider_normal.png in Resources */, + 8E9390CD0565D6D300C7661C /* volumetrack.png in Resources */, + 2A16E08006C5074F00C87B09 /* equalizerdrawer_active.png in Resources */, + 2A16E08106C5074F00C87B09 /* equalizerdrawer_blue.png in Resources */, + DCA00AA9075F948800E6BF46 /* About.nib in Resources */, + DCF358BB077F10BA007DB450 /* Preferences.nib in Resources */, + DCA693C30789DF8700139EC6 /* Open.nib in Resources */, + DCFCCDB9085CE18F001E36AF /* Wizard.nib in Resources */, + DC7F46ED08A183FC0027DB24 /* Extended.nib in Resources */, + DCE7BD0508A56C8B007B10AE /* Bookmarks.nib in Resources */, + DCDA5E6508F94518009D93A8 /* about_bg.png in Resources */, + CCF3C64C0923B99D00401862 /* SFilters.nib in Resources */, + C2F2A6FB0958A6E600018C74 /* skip_forward_active_embedded.png in Resources */, + C2F2A6FD0958A94500018C74 /* play_embedded.png in Resources */, + C2F2A6FF0958AA9300018C74 /* pause_embedded.png in Resources */, + C2F2A7010958AC9000018C74 /* skip_previous_active_embedded.png in Resources */, + C2F2A706095AE51600018C74 /* pause_embedded_blue.png in Resources */, + C2F2A707095AE51700018C74 /* play_embedded_blue.png in Resources */, + C2F2A708095AE51700018C74 /* skip_forward_embedded_blue.png in Resources */, + C2F2A709095AE51700018C74 /* skip_previous_embedded_blue.png in Resources */, + ); + runOnlyForDeploymentPostprocessing = 0; }; - A0E6B59904407FBD0080DD97 = { - fileRef = A0E6B59804407FBD0080DD97; - isa = PBXBuildFile; - settings = { - }; +/* End PBXResourcesBuildPhase section */ + +/* Begin PBXRezBuildPhase section */ + 089C1679FE841209C02AAC07 /* Rez */ = { + isa = PBXRezBuildPhase; + buildActionMask = 2147483647; + files = ( + ); + runOnlyForDeploymentPostprocessing = 0; }; -//A00 -//A01 -//A02 -//A03 -//A04 -//CC0 -//CC1 -//CC2 -//CC3 -//CC4 - CCF3C64A0923B99D00401862 = { +/* End PBXRezBuildPhase section */ + +/* Begin PBXVariantGroup section */ + CCF3C64A0923B99D00401862 /* SFilters.nib */ = { + isa = PBXVariantGroup; children = ( - CCF3C64B0923B99D00401862, + CCF3C64B0923B99D00401862 /* English */, ); - isa = PBXVariantGroup; name = SFilters.nib; - path = ""; - refType = 4; - sourceTree = ""; - }; - CCF3C64B0923B99D00401862 = { - isa = PBXFileReference; - lastKnownFileType = wrapper.nib; - name = English; - path = Resources/English.lproj/SFilters.nib; - refType = 4; sourceTree = ""; }; - CCF3C64C0923B99D00401862 = { - fileRef = CCF3C64A0923B99D00401862; - isa = PBXBuildFile; - settings = { - }; - }; - CCF3C6500923B9D100401862 = { - fileEncoding = 30; - isa = PBXFileReference; - lastKnownFileType = sourcecode.c.h; - name = sfilters.h; - path = ../../modules/gui/macosx/sfilters.h; - refType = 2; - sourceTree = SOURCE_ROOT; - }; - CCF3C6510923B9D100401862 = { - fileEncoding = 30; - isa = PBXFileReference; - lastKnownFileType = sourcecode.c.objc; - name = sfilters.m; - path = ../../modules/gui/macosx/sfilters.m; - refType = 2; - sourceTree = SOURCE_ROOT; - }; -//CC0 -//CC1 -//CC2 -//CC3 -//CC4 -//DC0 -//DC1 -//DC2 -//DC3 -//DC4 - DC769AB7085DF0DB001A838D = { - fileEncoding = 5; - indentWidth = 4; - isa = PBXFileReference; - lastKnownFileType = sourcecode.c.objc; - name = wizard.m; - path = ../../modules/gui/macosx/wizard.m; - refType = 2; - sourceTree = SOURCE_ROOT; - tabWidth = 4; - usesTabs = 0; - }; - DC769AB8085DF0DB001A838D = { - fileEncoding = 5; - isa = PBXFileReference; - lastKnownFileType = sourcecode.c.h; - name = wizard.h; - path = ../../modules/gui/macosx/wizard.h; - refType = 2; - sourceTree = SOURCE_ROOT; - }; - DC7F46EB08A183FC0027DB24 = { + DC7F46EB08A183FC0027DB24 /* Extended.nib */ = { + isa = PBXVariantGroup; children = ( - DC7F46EC08A183FC0027DB24, + DC7F46EC08A183FC0027DB24 /* English */, ); - isa = PBXVariantGroup; name = Extended.nib; - path = ""; - refType = 4; - sourceTree = ""; - }; - DC7F46EC08A183FC0027DB24 = { - isa = PBXFileReference; - lastKnownFileType = wrapper.nib; - name = English; - path = Resources/English.lproj/Extended.nib; - refType = 4; sourceTree = ""; }; - DC7F46ED08A183FC0027DB24 = { - fileRef = DC7F46EB08A183FC0027DB24; - isa = PBXBuildFile; - settings = { - }; - }; - DC7F46F008A187F60027DB24 = { - explicitFileType = sourcecode.c.objc; - fileEncoding = 5; - isa = PBXFileReference; - name = extended.h; - path = ../../modules/gui/macosx/extended.h; - refType = 2; - sourceTree = SOURCE_ROOT; - usesTabs = 0; - }; - DC7F46F108A187F60027DB24 = { - explicitFileType = sourcecode.c.objc; - fileEncoding = 5; - includeInIndex = 0; - isa = PBXFileReference; - name = extended.m; - path = ../../modules/gui/macosx/extended.m; - refType = 2; - sourceTree = SOURCE_ROOT; - }; - DCA00AA7075F948800E6BF46 = { + DCA00AA7075F948800E6BF46 /* About.nib */ = { + isa = PBXVariantGroup; children = ( - DCA00AA8075F948800E6BF46, + DCA00AA8075F948800E6BF46 /* English */, ); - isa = PBXVariantGroup; name = About.nib; - path = ""; - refType = 4; - sourceTree = ""; - }; - DCA00AA8075F948800E6BF46 = { - isa = PBXFileReference; - lastKnownFileType = wrapper.nib; - name = English; - path = Resources/English.lproj/About.nib; - refType = 4; sourceTree = ""; }; - DCA00AA9075F948800E6BF46 = { - fileRef = DCA00AA7075F948800E6BF46; - isa = PBXBuildFile; - settings = { - }; - }; - DCA693C10789DF8700139EC6 = { + DCA693C10789DF8700139EC6 /* Open.nib */ = { + isa = PBXVariantGroup; children = ( - DCA693C20789DF8700139EC6, + DCA693C20789DF8700139EC6 /* English */, ); - isa = PBXVariantGroup; name = Open.nib; - path = ""; - refType = 4; - sourceTree = ""; - }; - DCA693C20789DF8700139EC6 = { - isa = PBXFileReference; - lastKnownFileType = wrapper.nib; - name = English; - path = Resources/English.lproj/Open.nib; - refType = 4; sourceTree = ""; }; - DCA693C30789DF8700139EC6 = { - fileRef = DCA693C10789DF8700139EC6; - isa = PBXBuildFile; - settings = { - }; - }; - DCC9AE9507F77DE600394C42 = { - fileRef = 8EBF3FA503F140960059A3A7; - isa = PBXBuildFile; - settings = { - }; - }; - DCDA5E6408F94518009D93A8 = { - isa = PBXFileReference; - lastKnownFileType = image.png; - name = about_bg.png; - path = Resources/about_bg.png; - refType = 4; - sourceTree = ""; - }; - DCDA5E6508F94518009D93A8 = { - fileRef = DCDA5E6408F94518009D93A8; - isa = PBXBuildFile; - settings = { - }; - }; - DCE7BD0308A56C8B007B10AE = { + DCE7BD0308A56C8B007B10AE /* Bookmarks.nib */ = { + isa = PBXVariantGroup; children = ( - DCE7BD0408A56C8B007B10AE, + DCE7BD0408A56C8B007B10AE /* English */, ); - isa = PBXVariantGroup; name = Bookmarks.nib; - path = ""; - refType = 4; sourceTree = ""; }; - DCE7BD0408A56C8B007B10AE = { - isa = PBXFileReference; - lastKnownFileType = wrapper.nib; - name = English; - path = Resources/English.lproj/Bookmarks.nib; - refType = 4; - sourceTree = ""; - }; - DCE7BD0508A56C8B007B10AE = { - fileRef = DCE7BD0308A56C8B007B10AE; - isa = PBXBuildFile; - settings = { - }; - }; - DCE7BD0608A5724D007B10AE = { - fileEncoding = 30; - isa = PBXFileReference; - lastKnownFileType = sourcecode.c.objc; - name = bookmarks.m; - path = ../../modules/gui/macosx/bookmarks.m; - refType = 2; - sourceTree = SOURCE_ROOT; - }; - DCE7BD0708A5724D007B10AE = { - fileEncoding = 30; - isa = PBXFileReference; - lastKnownFileType = sourcecode.c.h; - name = bookmarks.h; - path = ../../modules/gui/macosx/bookmarks.h; - refType = 2; - sourceTree = SOURCE_ROOT; - }; - DCF358B9077F10BA007DB450 = { - children = ( - DCF358BA077F10BA007DB450, - ); + DCF358B9077F10BA007DB450 /* Preferences.nib */ = { isa = PBXVariantGroup; - name = Preferences.nib; - path = ""; - refType = 4; - sourceTree = ""; - }; - DCF358BA077F10BA007DB450 = { - isa = PBXFileReference; - lastKnownFileType = wrapper.nib; - name = English; - path = Resources/English.lproj/Preferences.nib; - refType = 4; - sourceTree = ""; - }; - DCF358BB077F10BA007DB450 = { - fileRef = DCF358B9077F10BA007DB450; - isa = PBXBuildFile; - settings = { - }; - }; - DCF358BC077F1236007DB450 = { children = ( - DCA00AA7075F948800E6BF46, - F74F13EA02C2A79C01EE194C, - DCF358B9077F10BA007DB450, - DCA693C10789DF8700139EC6, - DCFCCDB7085CE18F001E36AF, - DC7F46EB08A183FC0027DB24, - DCE7BD0308A56C8B007B10AE, - CCF3C64A0923B99D00401862, + DCF358BA077F10BA007DB450 /* English */, ); - isa = PBXGroup; - name = nibs; - refType = 4; + name = Preferences.nib; sourceTree = ""; }; - DCFCCDB7085CE18F001E36AF = { + DCFCCDB7085CE18F001E36AF /* Wizard.nib */ = { + isa = PBXVariantGroup; children = ( - DCFCCDB8085CE18F001E36AF, + DCFCCDB8085CE18F001E36AF /* English */, ); - isa = PBXVariantGroup; name = Wizard.nib; - path = ""; - refType = 4; sourceTree = ""; }; - DCFCCDB8085CE18F001E36AF = { - isa = PBXFileReference; - lastKnownFileType = wrapper.nib; - name = English; - path = Resources/English.lproj/Wizard.nib; - refType = 4; - sourceTree = ""; - }; - DCFCCDB9085CE18F001E36AF = { - fileRef = DCFCCDB7085CE18F001E36AF; - isa = PBXBuildFile; - settings = { - }; - }; -//DC0 -//DC1 -//DC2 -//DC3 -//DC4 -//F60 -//F61 -//F62 -//F63 -//F64 - F69B0CA602E24F6401A80112 = { + F69B0CA602E24F6401A80112 /* InfoPlist.strings */ = { + isa = PBXVariantGroup; children = ( - F69B0CA702E24F6401A80112, + F69B0CA702E24F6401A80112 /* English */, ); - isa = PBXVariantGroup; name = InfoPlist.strings; - path = ""; - refType = 4; - sourceTree = ""; - }; - F69B0CA702E24F6401A80112 = { - fileEncoding = 5; - isa = PBXFileReference; - lastKnownFileType = text.plist.strings; - name = English; - path = Resources/English.lproj/InfoPlist.strings; - refType = 4; - sourceTree = ""; - }; - F69B0CA802E24F6401A80112 = { - fileRef = F69B0CA602E24F6401A80112; - isa = PBXBuildFile; - settings = { - }; - }; - F6E4F90A02D2648B01A80112 = { - isa = PBXFileReference; - lastKnownFileType = image.icns; - name = divx.icns; - path = Resources/divx.icns; - refType = 4; - sourceTree = ""; - }; - F6E4F90B02D2648B01A80112 = { - isa = PBXFileReference; - lastKnownFileType = image.icns; - name = generic.icns; - path = Resources/generic.icns; - refType = 4; - sourceTree = ""; - }; - F6E4F90C02D2648B01A80112 = { - isa = PBXFileReference; - lastKnownFileType = image.icns; - name = mpeg.icns; - path = Resources/mpeg.icns; - refType = 4; - sourceTree = ""; - }; - F6E4F90D02D2648B01A80112 = { - isa = PBXFileReference; - lastKnownFileType = image.icns; - name = mpeg1.icns; - path = Resources/mpeg1.icns; - refType = 4; - sourceTree = ""; - }; - F6E4F90E02D2648B01A80112 = { - isa = PBXFileReference; - lastKnownFileType = image.icns; - name = mpeg2.icns; - path = Resources/mpeg2.icns; - refType = 4; sourceTree = ""; }; - F6E4F90F02D2648B01A80112 = { - isa = PBXFileReference; - lastKnownFileType = image.icns; - name = mpeg4.icns; - path = Resources/mpeg4.icns; - refType = 4; + F74F13EA02C2A79C01EE194C /* MainMenu.nib */ = { + isa = PBXVariantGroup; + children = ( + F74F13EB02C2A79C01EE194C /* English */, + ); + name = MainMenu.nib; sourceTree = ""; }; - F6E4F91002D2648B01A80112 = { - fileRef = F6E4F90A02D2648B01A80112; - isa = PBXBuildFile; - settings = { - }; - }; - F6E4F91102D2648B01A80112 = { - fileRef = F6E4F90B02D2648B01A80112; - isa = PBXBuildFile; - settings = { +/* End PBXVariantGroup section */ + +/* Begin XCBuildConfiguration section */ + C2F2A6E709588F1B00018C74 /* Development */ = { + isa = XCBuildConfiguration; + buildSettings = { + COPY_PHASE_STRIP = NO; + FRAMEWORK_SEARCH_PATHS = ""; + GCC_DYNAMIC_NO_PIC = NO; + GCC_ENABLE_FIX_AND_CONTINUE = YES; + GCC_GENERATE_DEBUGGING_SYMBOLS = YES; + GCC_OPTIMIZATION_LEVEL = 0; + HEADER_SEARCH_PATHS = ""; + INSTALL_PATH = "$(HOME)/Library/Bundles"; + JAVAC_SOURCE_FILE_ENCODING = "ISO-8859-1"; + LIBRARY_SEARCH_PATHS = /Volumes/Genitus/vlc/modules/gui/macosx; + OPTIMIZATION_CFLAGS = "-O0"; + OTHER_CFLAGS = ""; + OTHER_LDFLAGS = ""; + OTHER_REZFLAGS = ""; + PRODUCT_NAME = VLC; + SECTORDER_FLAGS = ""; + WARNING_CFLAGS = ( + "-Wmost", + "-Wno-four-char-constants", + "-Wno-unknown-pragmas", + ); + WRAPPER_EXTENSION = bundle; + ZERO_LINK = YES; }; + name = Development; }; - F6E4F91202D2648B01A80112 = { - fileRef = F6E4F90C02D2648B01A80112; - isa = PBXBuildFile; - settings = { + C2F2A6E809588F1B00018C74 /* Deployment */ = { + isa = XCBuildConfiguration; + buildSettings = { + COPY_PHASE_STRIP = YES; + FRAMEWORK_SEARCH_PATHS = ""; + GCC_ENABLE_FIX_AND_CONTINUE = NO; + HEADER_SEARCH_PATHS = ""; + INSTALL_PATH = "$(HOME)/Library/Bundles"; + JAVAC_SOURCE_FILE_ENCODING = "ISO-8859-1"; + LIBRARY_SEARCH_PATHS = /Volumes/Genitus/vlc/modules/gui/macosx; + OTHER_CFLAGS = ""; + OTHER_LDFLAGS = ""; + OTHER_REZFLAGS = ""; + PRODUCT_NAME = VLC; + SECTORDER_FLAGS = ""; + WARNING_CFLAGS = ( + "-Wmost", + "-Wno-four-char-constants", + "-Wno-unknown-pragmas", + ); + WRAPPER_EXTENSION = bundle; + ZERO_LINK = NO; }; + name = Deployment; }; - F6E4F91302D2648B01A80112 = { - fileRef = F6E4F90D02D2648B01A80112; - isa = PBXBuildFile; - settings = { + C2F2A6E909588F1B00018C74 /* Default */ = { + isa = XCBuildConfiguration; + buildSettings = { + FRAMEWORK_SEARCH_PATHS = ""; + HEADER_SEARCH_PATHS = ""; + INSTALL_PATH = "$(HOME)/Library/Bundles"; + JAVAC_SOURCE_FILE_ENCODING = "ISO-8859-1"; + LIBRARY_SEARCH_PATHS = /Volumes/Genitus/vlc/modules/gui/macosx; + OTHER_CFLAGS = ""; + OTHER_LDFLAGS = ""; + OTHER_REZFLAGS = ""; + PRODUCT_NAME = VLC; + SECTORDER_FLAGS = ""; + WARNING_CFLAGS = ( + "-Wmost", + "-Wno-four-char-constants", + "-Wno-unknown-pragmas", + ); + WRAPPER_EXTENSION = bundle; }; + name = Default; }; - F6E4F91402D2648B01A80112 = { - fileRef = F6E4F90E02D2648B01A80112; - isa = PBXBuildFile; - settings = { + C2F2A6EB09588F1B00018C74 /* Development */ = { + isa = XCBuildConfiguration; + buildSettings = { }; + name = Development; }; - F6E4F91502D2648B01A80112 = { - fileRef = F6E4F90F02D2648B01A80112; - isa = PBXBuildFile; - settings = { + C2F2A6EC09588F1B00018C74 /* Deployment */ = { + isa = XCBuildConfiguration; + buildSettings = { }; + name = Deployment; }; -//F60 -//F61 -//F62 -//F63 -//F64 -//F70 -//F71 -//F72 -//F73 -//F74 - F74F13DF02C2A53401EE194C = { - isa = PBXFileReference; - lastKnownFileType = image.icns; - name = vlc.icns; - path = Resources/vlc.icns; - refType = 4; - sourceTree = ""; - }; - F74F13E002C2A53401EE194C = { - fileRef = F74F13DF02C2A53401EE194C; - isa = PBXBuildFile; - settings = { + C2F2A6ED09588F1B00018C74 /* Default */ = { + isa = XCBuildConfiguration; + buildSettings = { }; - }; - F74F13EA02C2A79C01EE194C = { - children = ( - F74F13EB02C2A79C01EE194C, + name = Default; + }; +/* End XCBuildConfiguration section */ + +/* Begin XCConfigurationList section */ + C2F2A6E609588F1B00018C74 /* Build configuration list for PBXBundleTarget "vlc" */ = { + isa = XCConfigurationList; + buildConfigurations = ( + C2F2A6E709588F1B00018C74 /* Development */, + C2F2A6E809588F1B00018C74 /* Deployment */, + C2F2A6E909588F1B00018C74 /* Default */, ); - isa = PBXVariantGroup; - name = MainMenu.nib; - path = ""; - refType = 4; - sourceTree = ""; - }; - F74F13EB02C2A79C01EE194C = { - isa = PBXFileReference; - lastKnownFileType = wrapper.nib; - name = English; - path = Resources/English.lproj/MainMenu.nib; - refType = 4; - sourceTree = ""; - }; - F74F13EC02C2A79C01EE194C = { - fileRef = F74F13EA02C2A79C01EE194C; - isa = PBXBuildFile; - settings = { - }; + defaultConfigurationIsVisible = 0; + defaultConfigurationName = Default; + }; + C2F2A6EA09588F1B00018C74 /* Build configuration list for PBXProject "vlc" */ = { + isa = XCConfigurationList; + buildConfigurations = ( + C2F2A6EB09588F1B00018C74 /* Development */, + C2F2A6EC09588F1B00018C74 /* Deployment */, + C2F2A6ED09588F1B00018C74 /* Default */, + ); + defaultConfigurationIsVisible = 0; + defaultConfigurationName = Default; }; +/* End XCConfigurationList section */ }; - rootObject = 089C1669FE841209C02AAC07; + rootObject = 089C1669FE841209C02AAC07 /* Project object */; } diff --git a/modules/gui/macosx/Modules.am b/modules/gui/macosx/Modules.am index 209973e738..1baedb79b0 100644 --- a/modules/gui/macosx/Modules.am +++ b/modules/gui/macosx/Modules.am @@ -38,5 +38,7 @@ SOURCES_macosx = \ bookmarks.m \ sfilters.h \ sfilters.m \ + embeddedwindow.h \ + embeddedwindow.m \ $(NULL) diff --git a/modules/gui/macosx/embeddedwindow.h b/modules/gui/macosx/embeddedwindow.h new file mode 100644 index 0000000000..5240343b3b --- /dev/null +++ b/modules/gui/macosx/embeddedwindow.h @@ -0,0 +1,51 @@ +/***************************************************************************** + * embeddedwindow.h: MacOS X interface module + ***************************************************************************** + * Copyright (C) 2002-2004 the VideoLAN team + * $Id: playlistinfo.h 11664 2005-07-09 06:17:09Z courmisch $ + * + * Authors: Benjamin Pracht + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111, USA. + *****************************************************************************/ + +/***************************************************************************** + * VLCEmbeddedWindow interface + *****************************************************************************/ + + +@interface VLCEmbeddedWindow : NSObject +{ + IBOutlet id o_btn_backward; + IBOutlet id o_btn_forward; + IBOutlet id o_btn_fullscreen; + IBOutlet id o_btn_play; + IBOutlet id o_slider; + IBOutlet id o_time; + IBOutlet id o_window; + + NSImage * o_img_play; + NSImage * o_img_play_pressed; + NSImage * o_img_pause; + NSImage * o_img_pause_pressed; +} + +- (void)setTime:(NSString *)o_arg_ime position:(float)f_position; +- (void)playStatusUpdated:(int)i_status; +- (void)setSeekable:(BOOL)b_seekable; +- (void)setFullscreen:(BOOL)b_fullscreen; + +@end + diff --git a/modules/gui/macosx/embeddedwindow.m b/modules/gui/macosx/embeddedwindow.m new file mode 100644 index 0000000000..661d0f9f58 --- /dev/null +++ b/modules/gui/macosx/embeddedwindow.m @@ -0,0 +1,102 @@ +/***************************************************************************** + * embeddedwindow.m: MacOS X interface module + ***************************************************************************** + * Copyright (C) 2002-2005 the VideoLAN team + * $Id: playlistinfo.m 12560 2005-09-15 14:21:38Z hartman $ + * + * Authors: Benjamin Pracht + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111, USA. + *****************************************************************************/ + +/***************************************************************************** + * Preamble + *****************************************************************************/ + +#include "intf.h" +#include "vout.h" +#include "embeddedwindow.h" + +/***************************************************************************** + * VLCEmbeddedWindow Implementation + *****************************************************************************/ + +@implementation VLCEmbeddedWindow + +- (void)awakeFromNib +{ + [o_window setDelegate: self]; + + [o_btn_backward setToolTip: _NS("Rewind")]; + [o_btn_forward setToolTip: _NS("Fast Forward")]; + [o_btn_fullscreen setToolTip: _NS("Fullscreen")]; + [o_btn_play setToolTip: _NS("Play")]; + [o_slider setToolTip: _NS("Position")]; + + o_img_play = [NSImage imageNamed: @"play_embedded"]; + o_img_play_pressed = [NSImage imageNamed: @"play_embedded_blue"]; + o_img_pause = [NSImage imageNamed: @"pause_embedded"]; + o_img_pause_pressed = [NSImage imageNamed: @"pause_embedded_blue"]; +} + +- (void)setTime:(NSString *)o_arg_time position:(float)f_position +{ + [o_time setStringValue: o_arg_time]; + [o_slider setFloatValue: f_position]; +} + +- (void)playStatusUpdated:(int)i_status +{ + if( i_status == PLAYING_S ) + { + [o_btn_play setImage: o_img_pause]; + [o_btn_play setAlternateImage: o_img_pause_pressed]; + [o_btn_play setToolTip: _NS("Pause")]; + } + else + { + [o_btn_play setImage: o_img_play]; + [o_btn_play setAlternateImage: o_img_play_pressed]; + [o_btn_play setToolTip: _NS("Play")]; + } +} + +- (void)setSeekable:(BOOL)b_seekable +{ + [o_btn_forward setEnabled: b_seekable]; + [o_btn_backward setEnabled: b_seekable]; + [o_slider setEnabled: b_seekable]; +} + +- (void)setFullscreen:(BOOL)b_fullscreen +{ + [o_btn_fullscreen setState: b_fullscreen]; +} + +- (BOOL)windowShouldClose:(id)sender +{ + playlist_t * p_playlist = vlc_object_find( VLCIntf, VLC_OBJECT_PLAYLIST, + FIND_ANYWHERE ); + if( p_playlist == NULL ) + { + return NO; + } + + playlist_Stop( p_playlist ); + vlc_object_release( p_playlist ); + return YES; +} + +@end diff --git a/modules/gui/macosx/extended.m b/modules/gui/macosx/extended.m index e560715a1f..0933536469 100644 --- a/modules/gui/macosx/extended.m +++ b/modules/gui/macosx/extended.m @@ -356,24 +356,20 @@ static VLCExtended *_o_sharedInstance = nil; FIND_ANYWHERE ); vout_thread_t *p_vout = vlc_object_find( VLCIntf, VLC_OBJECT_VOUT, FIND_ANYWHERE ); vout_thread_t *p_real_vout; - + val.f_float = [o_sld_opaque floatValue] / 100; + if( p_vout != NULL ) { - if( p_vout->i_object_type == VLC_OBJECT_OPENGL ) - { - p_real_vout = (vout_thread_t *) p_vout->p_parent; - } - else - { - p_real_vout = p_vout; - } + p_real_vout = [VLCVoutView getRealVout: p_vout]; var_Set( p_real_vout, "macosx-opaqueness", val ); - + while ((o_window = [o_enumerator nextObject])) { - if( [[o_window className] isEqualToString: @"VLCWindow"] ) + if( [[o_window className] isEqualToString: @"VLCWindow"] || + [[[VLCMain sharedInstance] getEmbeddedList] + windowContainsEmbedded: o_window]) { [o_window setAlphaValue: val.f_float]; } diff --git a/modules/gui/macosx/intf.h b/modules/gui/macosx/intf.h index 9909611388..3a4d8cbcf9 100644 --- a/modules/gui/macosx/intf.h +++ b/modules/gui/macosx/intf.h @@ -112,6 +112,7 @@ struct intf_sys_t IBOutlet id o_scrollfield; /* info field */ IBOutlet id o_timefield; /* time field */ IBOutlet id o_timeslider; /* time slider */ + IBOutlet id o_embedded_window; /* Embedded Vout Window */ float f_slider; /* slider value */ float f_slider_old; /* old slider val */ IBOutlet id o_volumeslider; /* volume slider */ diff --git a/modules/gui/macosx/intf.m b/modules/gui/macosx/intf.m index 2c751c2d94..1be23df804 100644 --- a/modules/gui/macosx/intf.m +++ b/modules/gui/macosx/intf.m @@ -43,6 +43,7 @@ #include "bookmarks.h" #include "sfilters.h" #include "interaction.h" +#include "embeddedwindow.h" /*#include "update.h"*/ /***************************************************************************** @@ -449,7 +450,8 @@ static VLCMain *_o_sharedMainInstance = nil; var_AddCallback( p_playlist, "fullscreen", FullscreenChanged, self); - [o_btn_fullscreen setState: ( var_Get( p_playlist, "fullscreen", &val )>=0 && val.b_bool )]; + [o_embedded_window setFullscreen: var_GetBool( p_playlist, + "fullscreen" )]; vlc_object_release( p_playlist ); } @@ -964,6 +966,8 @@ static VLCMain *_o_sharedMainInstance = nil; [o_timeslider setEnabled: b_seekable]; [o_timefield setStringValue: @"0:00:00"]; + [o_embedded_window setSeekable: b_seekable]; + p_intf->p_sys->b_intf_update = VLC_FALSE; } @@ -983,7 +987,7 @@ static VLCMain *_o_sharedMainInstance = nil; playlist_t * p_playlist = vlc_object_find( p_intf, VLC_OBJECT_PLAYLIST, FIND_ANYWHERE ); var_Get( p_playlist, "fullscreen", &val ); - [o_btn_fullscreen setState: val.b_bool]; + [o_embedded_window setFullscreen: val.b_bool]; vlc_object_release( p_playlist ); p_intf->p_sys->b_fullscreen_update = VLC_FALSE; @@ -1020,9 +1024,11 @@ static VLCMain *_o_sharedMainInstance = nil; while( ( o_vout_wnd = [o_enum nextObject] ) ) { - if( [[o_vout_wnd className] isEqualToString: @"VLCWindow"] ) + if( [[o_vout_wnd className] isEqualToString: @"VLCWindow"] + || [[[VLCMain sharedInstance] getEmbeddedList] + windowContainsEmbedded: o_vout_wnd]) { - [o_vout_wnd updateTitle]; + [[o_vout_wnd getVoutView] updateTitle]; } } vlc_object_release( (vlc_object_t *)p_vout ); @@ -1053,8 +1059,9 @@ static VLCMain *_o_sharedMainInstance = nil; (int) (i_seconds / 60 % 60), (int) (i_seconds % 60)]; [o_timefield setStringValue: o_time]; + [o_embedded_window setTime: o_time position: f_updated]; } - + if( p_intf->p_sys->b_volume_update ) { NSString *o_text; @@ -1075,6 +1082,7 @@ static VLCMain *_o_sharedMainInstance = nil; { p_intf->p_sys->i_play_status = val.i_int; [self playStatusUpdated: p_intf->p_sys->i_play_status]; + [o_embedded_window playStatusUpdated: p_intf->p_sys->i_play_status]; } } else @@ -1082,6 +1090,7 @@ static VLCMain *_o_sharedMainInstance = nil; p_intf->p_sys->i_play_status = END_S; p_intf->p_sys->b_intf_update = VLC_TRUE; [self playStatusUpdated: p_intf->p_sys->i_play_status]; + [o_embedded_window playStatusUpdated: p_intf->p_sys->i_play_status]; [self setSubmenusEnabled: FALSE]; } @@ -1368,6 +1377,7 @@ static VLCMain *_o_sharedMainInstance = nil; (int) (i_seconds / 60 % 60), (int) (i_seconds % 60)]; [o_timefield setStringValue: o_time]; + [o_embedded_window setTime: o_time position: f_updated]; } #undef p_input } diff --git a/modules/gui/macosx/macosx.m b/modules/gui/macosx/macosx.m index 17781bcc7f..59a45e0d65 100644 --- a/modules/gui/macosx/macosx.m +++ b/modules/gui/macosx/macosx.m @@ -47,6 +47,10 @@ void E_(CloseVideoGL) ( vlc_object_t * ); /***************************************************************************** * Module descriptor *****************************************************************************/ +#define EMBEDDED_TEXT N_("Use embedded video output") +#define EMBEDDED_LONGTEXT N_("Disable this if you want the video output to " \ + "be opened in a separate window instead of in the control window.") + #define VDEV_TEXT N_("Video device") #define VDEV_LONGTEXT N_("Choose a number corresponding to " \ "a screen in you video device selection menu and this screen " \ @@ -77,6 +81,8 @@ vlc_module_begin(); set_callbacks( E_(OpenIntf), E_(CloseIntf) ); set_category( CAT_INTERFACE ); set_subcategory( SUBCAT_INTERFACE_GENERAL ); + add_bool( "macosx-embedded", 1, NULL, EMBEDDED_TEXT, EMBEDDED_LONGTEXT, + VLC_FALSE ); add_submodule(); set_description( _("Quartz video") ); set_capability( "video output", 100 ); diff --git a/modules/gui/macosx/vout.h b/modules/gui/macosx/vout.h index 373da7fba3..9c5e6e0a1f 100644 --- a/modules/gui/macosx/vout.h +++ b/modules/gui/macosx/vout.h @@ -56,6 +56,7 @@ - (BOOL)setVout: (vout_thread_t *) p_arg_vout subView: (NSView *) view frame: (NSRect *) s_arg_frame; - (void)closeVout; +- (void)updateTitle; - (void)manage; - (void)scaleWindowWithFactor: (float)factor; - (void)setOnTop:(BOOL)b_on_top; @@ -98,6 +99,16 @@ @end +/***************************************************************************** + * VLCDetachedEmbeddedView interface + *****************************************************************************/ + +@interface VLCDetachedEmbeddedVoutView : VLCEmbeddedVoutView +{ +} + +@end + /***************************************************************************** * VLCWindow interface *****************************************************************************/ @@ -119,7 +130,6 @@ - (void)closeWindow; - (id)closeReal: (id) sender; - (id)getVoutView; -- (void)updateTitle; - (BOOL)windowShouldClose:(id)sender; diff --git a/modules/gui/macosx/vout.m b/modules/gui/macosx/vout.m index 7ac1c79069..9ab009f9a1 100644 --- a/modules/gui/macosx/vout.m +++ b/modules/gui/macosx/vout.m @@ -248,6 +248,51 @@ int DeviceCallback( vlc_object_t *p_this, const char *psz_variable, p_real_vout = NULL; } +- (void)updateTitle +{ + NSMutableString * o_title = nil, * o_mrl = nil; + input_thread_t * p_input; + + if( p_vout == NULL ) + { + return; + } + + p_input = vlc_object_find( p_vout, VLC_OBJECT_INPUT, FIND_PARENT ); + + if( p_input == NULL ) + { + return; + } + + if( p_input->input.p_item->psz_name != NULL ) + o_title = [NSMutableString stringWithUTF8String: + p_input->input.p_item->psz_name]; + if( p_input->input.p_item->psz_uri != NULL ) + o_mrl = [NSMutableString stringWithUTF8String: + p_input->input.p_item->psz_uri]; + if( o_title == nil ) + o_title = o_mrl; + + if( o_mrl != nil ) + { + if( p_input->input.p_access && !strcmp( p_input->input.p_access->p_module->psz_shortname, "File" ) ) + { + NSRange prefix_range = [o_mrl rangeOfString: @"file:"]; + if( prefix_range.location != NSNotFound ) + [o_mrl deleteCharactersInRange: prefix_range]; + [o_window setRepresentedFilename: o_mrl]; + } + [o_window setTitle: o_title]; + } + else + { + [o_window setTitle: [NSString stringWithCString: VOUT_TITLE]]; + } + vlc_object_release( p_input ); +} + + - (void)setOnTop:(BOOL)b_on_top { if( b_on_top ) @@ -650,6 +695,7 @@ int DeviceCallback( vlc_object_t *p_this, const char *psz_variable, var_Create( p_vout, "macosx-stretch", VLC_VAR_BOOL | VLC_VAR_DOINHERIT ); var_Create( p_vout, "macosx-opaqueness", VLC_VAR_FLOAT | VLC_VAR_DOINHERIT ); var_Create( p_vout, "macosx-background", VLC_VAR_BOOL | VLC_VAR_DOINHERIT ); + var_Create( p_vout, "macosx-embedded", VLC_VAR_BOOL | VLC_VAR_DOINHERIT ); /* We only wait for NSApp to initialise if we're not embedded (as in the @@ -676,7 +722,8 @@ int DeviceCallback( vlc_object_t *p_this, const char *psz_variable, else { if ( VLCIntf && !(p_vout->b_fullscreen) && - !(var_GetBool( p_real_vout, "macosx-background" )) ) + !(var_GetBool( p_real_vout, "macosx-background" )) && + var_GetBool( p_vout, "macosx-embedded") ) { o_return = [[[VLCMain sharedInstance] getEmbeddedList] getEmbeddedVout]; @@ -716,6 +763,7 @@ int DeviceCallback( vlc_object_t *p_this, const char *psz_variable, i_time_mouse_last_moved = mdate(); o_window = [[VLCWindow alloc] initWithVout: p_arg_vout view: self frame: s_arg_frame]; + [self updateTitle]; [view setFrame: [self frame]]; [o_window setAcceptsMouseMovedEvents: TRUE]; return b_return; @@ -823,6 +871,30 @@ int DeviceCallback( vlc_object_t *p_this, const char *psz_variable, @end +@implementation VLCDetachedEmbeddedVoutView + +- (BOOL)setVout: (vout_thread_t *) p_arg_vout subView: (NSView *) view + frame: (NSRect *) s_arg_frame +{ + BOOL b_return = [super setVout: p_arg_vout subView: view frame: s_arg_frame]; + + if( b_return ) + { + [o_window setAlphaValue: var_GetFloat( p_vout, "macosx-opaqueness" )]; + [self updateTitle]; + [self scaleWindowWithFactor: 1.0]; + [o_window makeKeyAndOrderFront: self]; + } + return b_return; +} + +- (void)closeVout +{ + [o_window orderOut: self]; + [super closeVout]; +} + +@end /***************************************************************************** * VLCWindow implementation @@ -847,7 +919,7 @@ int DeviceCallback( vlc_object_t *p_this, const char *psz_variable, return self; } -- (id) initReal: (id) sender +- (id)initReal: (id) sender { NSAutoreleasePool *o_pool = [[NSAutoreleasePool alloc] init]; NSArray *o_screens = [NSScreen screens]; @@ -943,7 +1015,6 @@ int DeviceCallback( vlc_object_t *p_this, const char *psz_variable, } } - [self updateTitle]; [self makeKeyAndOrderFront: nil]; [self setReleasedWhenClosed: YES]; @@ -1001,50 +1072,6 @@ int DeviceCallback( vlc_object_t *p_this, const char *psz_variable, /* This is actually the same as VLCControls::stop. */ -- (void)updateTitle /*not modified yey ! */ -{ - NSMutableString * o_title = NULL, * o_mrl = NULL; - input_thread_t * p_input; - - if( p_vout == NULL ) - { - return; - } - - p_input = vlc_object_find( p_vout, VLC_OBJECT_INPUT, FIND_PARENT ); - - if( p_input == NULL ) - { - return; - } - - if( p_input->input.p_item->psz_name != NULL ) - o_title = [NSMutableString stringWithUTF8String: - p_input->input.p_item->psz_name]; - if( p_input->input.p_item->psz_uri != NULL ) - o_mrl = [NSMutableString stringWithUTF8String: - p_input->input.p_item->psz_uri]; - if( o_title == nil ) - o_title = o_mrl; - - if( o_mrl != nil ) - { - if( p_input->input.p_access && !strcmp( p_input->input.p_access->p_module->psz_shortname, "File" ) ) - { - NSRange prefix_range = [o_mrl rangeOfString: @"file:"]; - if( prefix_range.location != NSNotFound ) - [o_mrl deleteCharactersInRange: prefix_range]; - [self setRepresentedFilename: o_mrl]; - } - [self setTitle: o_title]; - } - else - { - [self setTitle: [NSString stringWithCString: VOUT_TITLE]]; - } - vlc_object_release( p_input ); -} - - (BOOL)windowShouldClose:(id)sender { playlist_t * p_playlist = vlc_object_find( p_vout, VLC_OBJECT_PLAYLIST,