diff --git a/extras/package/macosx/vlc.xcodeproj/project.pbxproj b/extras/package/macosx/vlc.xcodeproj/project.pbxproj
index fa0ed112a28c61ce5bfbdccc79faff2e82a090cf..ce207b2f44f37a86c65496b09240a99041a5b40e 100644
--- a/extras/package/macosx/vlc.xcodeproj/project.pbxproj
+++ b/extras/package/macosx/vlc.xcodeproj/project.pbxproj
@@ -460,7 +460,7 @@
1CE5ED2519DD6AB700FCEFD3 /* lion-window-fullscreen.png in Resources */ = {isa = PBXBuildFile; fileRef = 1CE5ED1F19DD6AB700FCEFD3 /* lion-window-fullscreen.png */; };
1CE5ED2619DD6AB700FCEFD3 /* lion-window-fullscreen@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = 1CE5ED2019DD6AB700FCEFD3 /* lion-window-fullscreen@2x.png */; };
633121D01B5112C300E636DA /* ResumeDialog.xib in Resources */ = {isa = PBXBuildFile; fileRef = 633121CE1B5112C300E636DA /* ResumeDialog.xib */; };
- 6B13E2A81BC67678001AD24A /* VLCScrollingClipView.m in Sources */ = {isa = PBXBuildFile; fileRef = 6B13E2A71BC67678001AD24A /* VLCScrollingClipView.m */; settings = {ASSET_TAGS = (); }; };
+ 6B13E2A81BC67678001AD24A /* VLCScrollingClipView.m in Sources */ = {isa = PBXBuildFile; fileRef = 6B13E2A71BC67678001AD24A /* VLCScrollingClipView.m */; };
7D3F6525188051F2005776C4 /* BWQuincyMain.xib in Resources */ = {isa = PBXBuildFile; fileRef = 7D3F6523188051F2005776C4 /* BWQuincyMain.xib */; };
7D8BB0B71830311300FAE9B7 /* DebugMessageVisualizer.xib in Resources */ = {isa = PBXBuildFile; fileRef = 7D8BB0B51830311300FAE9B7 /* DebugMessageVisualizer.xib */; };
7D8BB0BA1830367200FAE9B7 /* PlaylistMenu.xib in Resources */ = {isa = PBXBuildFile; fileRef = 7D8BB0B81830367200FAE9B7 /* PlaylistMenu.xib */; };
@@ -1430,8 +1430,8 @@
CC0586B714ACF7C000659A99 /* sidebar-pictures.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = "sidebar-pictures.png"; path = "Resources/sidebar-icons/sidebar-pictures.png"; sourceTree = "<group>"; };
CC0586B814ACF7C000659A99 /* sidebar-playlist.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = "sidebar-playlist.png"; path = "Resources/sidebar-icons/sidebar-playlist.png"; sourceTree = "<group>"; };
CC0586B914ACF7C000659A99 /* sidebar-podcast.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = "sidebar-podcast.png"; path = "Resources/sidebar-icons/sidebar-podcast.png"; sourceTree = "<group>"; };
- CC0663341566C34C003A411C /* ConvertAndSave.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; lineEnding = 0; name = ConvertAndSave.h; path = ../../../modules/gui/macosx/ConvertAndSave.h; sourceTree = SOURCE_ROOT; xcLanguageSpecificationIdentifier = xcode.lang.objcpp; };
- CC0663351566C34C003A411C /* ConvertAndSave.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; lineEnding = 0; name = ConvertAndSave.m; path = ../../../modules/gui/macosx/ConvertAndSave.m; sourceTree = SOURCE_ROOT; xcLanguageSpecificationIdentifier = xcode.lang.objc; };
+ CC0663341566C34C003A411C /* ConvertAndSave.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; lineEnding = 0; name = ConvertAndSave.h; path = ../../../modules/gui/macosx/ConvertAndSave.h; sourceTree = SOURCE_ROOT; };
+ CC0663351566C34C003A411C /* ConvertAndSave.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; lineEnding = 0; name = ConvertAndSave.m; path = ../../../modules/gui/macosx/ConvertAndSave.m; sourceTree = SOURCE_ROOT; };
CC0663381566CD5A003A411C /* English */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = English; path = Resources/English.lproj/ConvertAndSave.xib; sourceTree = "<group>"; };
CC0CD0DF13DE0EAE00B0D90D /* PXSourceList.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = PXSourceList.h; path = ../../../modules/gui/macosx/PXSourceList.h; sourceTree = SOURCE_ROOT; };
CC0CD0E013DE0EAE00B0D90D /* PXSourceList.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; name = PXSourceList.m; path = ../../../modules/gui/macosx/PXSourceList.m; sourceTree = SOURCE_ROOT; };
@@ -1552,7 +1552,6 @@
CC772DAC10E621C100675C9B /* VLCProgressPanel.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = VLCProgressPanel.h; path = ../../../modules/gui/macosx_dialog_provider/VLCProgressPanel.h; sourceTree = SOURCE_ROOT; };
CC772DAD10E621C100675C9B /* VLCProgressPanel.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = VLCProgressPanel.m; path = ../../../modules/gui/macosx_dialog_provider/VLCProgressPanel.m; sourceTree = SOURCE_ROOT; };
CC79F66614014FC30015D89E /* opengl.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = opengl.h; path = ../../../modules/video_output/opengl.h; sourceTree = "<group>"; };
- CC79F66714014FDC0015D89E /* quartztext.c */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.c; name = quartztext.c; path = ../../../modules/text_renderer/quartztext.c; sourceTree = "<group>"; };
CC8062631021F8790021EB9A /* dsa_pub.pem */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = dsa_pub.pem; path = Resources/dsa_pub.pem; sourceTree = "<group>"; };
CC84FB2C130083BB00816D38 /* BGHUDAppKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = BGHUDAppKit.framework; path = ../../../contrib/BGHUDAppKit.framework; sourceTree = "<absolute>"; };
CC91903C159B4BB800E634A7 /* volume-high_dark@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = "volume-high_dark@2x.png"; path = "Resources/mainwindow_dark/volume-high_dark@2x.png"; sourceTree = "<group>"; };
@@ -1627,7 +1626,6 @@
CC973BB415F0E14400D5F650 /* forward-3btns@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = "forward-3btns@2x.png"; path = "Resources/mainwindow/forward-3btns@2x.png"; sourceTree = "<group>"; };
CC9B43AE13B29C79000205AE /* bottom-background.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = "bottom-background.png"; path = "Resources/mainwindow/bottom-background.png"; sourceTree = "<group>"; };
CC9B43B013B29FCF000205AE /* bottom-background_dark.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = "bottom-background_dark.png"; path = "Resources/mainwindow_dark/bottom-background_dark.png"; sourceTree = "<group>"; };
- CC9E3E7913D1CFCF00429A71 /* qtcapture.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; name = qtcapture.m; path = ../../../modules/access/qtcapture.m; sourceTree = "<group>"; };
CC9E5D6A15975E2600D14E83 /* sidebar-local@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = "sidebar-local@2x.png"; path = "Resources/sidebar-icons/sidebar-local@2x.png"; sourceTree = "<group>"; };
CC9E5D6B15975E2600D14E83 /* sidebar-movie@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = "sidebar-movie@2x.png"; path = "Resources/sidebar-icons/sidebar-movie@2x.png"; sourceTree = "<group>"; };
CC9E5D6C15975E2600D14E83 /* sidebar-music@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = "sidebar-music@2x.png"; path = "Resources/sidebar-icons/sidebar-music@2x.png"; sourceTree = "<group>"; };
@@ -1821,11 +1819,8 @@
08FB77AFFE84173DC02AAC07 /* Classes */ = {
isa = PBXGroup;
children = (
- 7D871D391B5E684D000B56C0 /* helpers.h */,
8EE1AF9F044465080059A3A7 /* about.h */,
8EE1AFA0044465080059A3A7 /* about.m */,
- 6B13E2A61BC67678001AD24A /* VLCScrollingClipView.h */,
- 6B13E2A71BC67678001AD24A /* VLCScrollingClipView.m */,
7DF0435E1972E26A0022B534 /* AddonListDataSource.h */,
7DF0435F1972E26A0022B534 /* AddonListDataSource.m */,
7DB65D5218ABD6380053B874 /* AddonsWindowController.h */,
@@ -1855,12 +1850,13 @@
CC6EDD500B9CA2140096068A /* eyetv.m */,
2AEF857609A5FEC900130822 /* fspanel.h */,
2AEF857709A5FEC900130822 /* fspanel.m */,
- 8ED6C27C03E2EB1C0059A3A7 /* intf.h */,
- 8ED6C27D03E2EB1C0059A3A7 /* intf.m */,
- 7D871D371B5E6844000B56C0 /* intf-prefs.h */,
- 7D871D381B5E6844000B56C0 /* intf-prefs.m */,
+ 7D871D391B5E684D000B56C0 /* helpers.h */,
7DF812ED1B555A340052293C /* InputManager.h */,
7DF812EE1B555A340052293C /* InputManager.m */,
+ 7D871D371B5E6844000B56C0 /* intf-prefs.h */,
+ 7D871D381B5E6844000B56C0 /* intf-prefs.m */,
+ 8ED6C27C03E2EB1C0059A3A7 /* intf.h */,
+ 8ED6C27D03E2EB1C0059A3A7 /* intf.m */,
7DF812EF1B555C8E0052293C /* KeyboardBacklight.h */,
7DF812F01B555C8E0052293C /* KeyboardBacklight.m */,
8ED6C27E03E2EB1C0059A3A7 /* macosx.m */,
@@ -1868,24 +1864,22 @@
CC448A5B13B61D49009F72E0 /* MainMenu.m */,
CC448A6213B68A0B009F72E0 /* MainWindow.h */,
CC448A6313B68A0B009F72E0 /* MainWindow.m */,
+ CC017A0B14A4C8AF00C09A4F /* MainWindowTitle.h */,
+ CC017A0C14A4C8AF00C09A4F /* MainWindowTitle.m */,
+ 8ED6C27F03E2EB1C0059A3A7 /* misc.h */,
+ 8ED6C28003E2EB1C0059A3A7 /* misc.m */,
8ED6C28103E2EB1C0059A3A7 /* open.h */,
8ED6C28203E2EB1C0059A3A7 /* open.m */,
8E55FB7F0459B0FD00FB3317 /* output.h */,
8E55FB800459B0FD00FB3317 /* output.m */,
- 8ED6C28303E2EB1C0059A3A7 /* VLCPlaylist.h */,
- 8ED6C28403E2EB1C0059A3A7 /* VLCPlaylist.m */,
- 7DA481221B5FC13700917FD7 /* VLCPlaylistView.h */,
- 7DA481231B5FC13700917FD7 /* VLCPlaylistView.m */,
- 8E49720006417F6800370C9F /* VLCPlaylistInfo.h */,
- 8E49720106417F6800370C9F /* VLCPlaylistInfo.m */,
7DF812F11B5599E40052293C /* PLItem.h */,
7DF812F21B5599E40052293C /* PLItem.m */,
7DF812F31B5599E40052293C /* PLModel.h */,
7DF812F41B5599E40052293C /* PLModel.m */,
- 8ED6C28503E2EB1C0059A3A7 /* prefs.h */,
- 8ED6C28603E2EB1C0059A3A7 /* prefs.m */,
8E9CA1A306D7DEE800B7186C /* prefs_widgets.h */,
8E9CA1A406D7DEE800B7186C /* prefs_widgets.m */,
+ 8ED6C28503E2EB1C0059A3A7 /* prefs.h */,
+ 8ED6C28603E2EB1C0059A3A7 /* prefs.m */,
633121CA1B51122700E636DA /* ResumeDialogController.h */,
633121CB1B51122700E636DA /* ResumeDialogController.m */,
CC461F6C160078340022423C /* SharedDialogs.h */,
@@ -1900,13 +1894,22 @@
CCCE366E13817E4500694F2A /* VideoEffects.m */,
CCCCDCA01413E1C000FE3DE1 /* VideoView.h */,
CCCCDCA11413E1C000FE3DE1 /* VideoView.m */,
+ 8ED6C28303E2EB1C0059A3A7 /* VLCPlaylist.h */,
+ 8ED6C28403E2EB1C0059A3A7 /* VLCPlaylist.m */,
+ 8E49720006417F6800370C9F /* VLCPlaylistInfo.h */,
+ 8E49720106417F6800370C9F /* VLCPlaylistInfo.m */,
+ 7DA481221B5FC13700917FD7 /* VLCPlaylistView.h */,
+ 7DA481231B5FC13700917FD7 /* VLCPlaylistView.m */,
+ 6B13E2A61BC67678001AD24A /* VLCScrollingClipView.h */,
+ 6B13E2A71BC67678001AD24A /* VLCScrollingClipView.m */,
1CD366791B7A242E0054E39F /* VLCTimeSelectionPanelController.h */,
1CD3667A1B7A242E0054E39F /* VLCTimeSelectionPanelController.m */,
5CCED71414C0D4A90057F8D1 /* VLCUIWidgets.h */,
5CCED71514C0D4A90057F8D1 /* VLCUIWidgets.m */,
E0C2583E161B593D00185AAD /* VLCVoutWindowController.h */,
E0C2583F161B593D00185AAD /* VLCVoutWindowController.m */,
- CC017A0E14A4C8B600C09A4F /* custom UI code */,
+ E06CF7F416020F6200C698B7 /* Windows.h */,
+ E06CF7F516020F6200C698B7 /* Windows.m */,
CC0CD0E513DE0FC600B0D90D /* Imported Code */,
);
name = Classes;
@@ -2369,19 +2372,6 @@
name = fileicons;
sourceTree = "<group>";
};
- CC017A0E14A4C8B600C09A4F /* custom UI code */ = {
- isa = PBXGroup;
- children = (
- E06CF7F416020F6200C698B7 /* Windows.h */,
- E06CF7F516020F6200C698B7 /* Windows.m */,
- 8ED6C27F03E2EB1C0059A3A7 /* misc.h */,
- 8ED6C28003E2EB1C0059A3A7 /* misc.m */,
- CC017A0B14A4C8AF00C09A4F /* MainWindowTitle.h */,
- CC017A0C14A4C8AF00C09A4F /* MainWindowTitle.m */,
- );
- name = "custom UI code";
- sourceTree = "<group>";
- };
CC0430EE13B2461A00D7D52E /* ui graphics */ = {
isa = PBXGroup;
children = (
@@ -2758,7 +2748,6 @@
CCC8957F0D9A8A61005AE59C /* OSX-specific source files */ = {
isa = PBXGroup;
children = (
- CC79F66714014FDC0015D89E /* quartztext.c */,
CCDDF1AE172FF4CE007729A1 /* vout */,
CCDDF1AF172FF4D6007729A1 /* core */,
CC6C01BA0DDF3EEC00C7D754 /* auhal.c */,
@@ -2867,7 +2856,6 @@
children = (
CCC895830D9A8A82005AE59C /* eyetv.m */,
DCC8017816FCA036007FE736 /* avcapture.m */,
- CC9E3E7913D1CFCF00429A71 /* qtcapture.m */,
DC1A176914E2778A001477C6 /* qtsound.m */,
);
name = access;