From e0dfd83141c5eef01374e82ddeb4bf70ba1daf7e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Felix=20Paul=20K=C3=BChne?= Date: Wed, 10 Aug 2016 20:00:09 +0200 Subject: [PATCH] macosx: rename VLCMain source file and split out VLCApplication class --- .../macosx/vlc.xcodeproj/project.pbxproj | 22 ++++++--- modules/gui/macosx/AppleRemote.m | 2 +- modules/gui/macosx/BWQuincyUI.m | 2 +- modules/gui/macosx/ControlsBar.m | 2 +- modules/gui/macosx/ExtensionsDialogProvider.h | 2 +- modules/gui/macosx/ExtensionsDialogProvider.m | 2 +- modules/gui/macosx/ExtensionsManager.h | 2 +- modules/gui/macosx/MainWindowTitle.m | 2 +- modules/gui/macosx/Makefile.am | 3 +- modules/gui/macosx/VLCAboutWindowController.m | 2 +- modules/gui/macosx/VLCAddonListItem.m | 2 +- .../gui/macosx/VLCAddonsWindowController.m | 2 +- modules/gui/macosx/VLCApplication.h | 35 +++++++++++++ modules/gui/macosx/VLCApplication.m | 49 +++++++++++++++++++ .../macosx/VLCAudioEffectsWindowController.m | 2 +- .../gui/macosx/VLCBookmarksWindowController.h | 2 +- .../VLCConvertAndSaveWindowController.m | 2 +- modules/gui/macosx/VLCCoreDialogProvider.m | 2 +- modules/gui/macosx/VLCCoreInteraction.m | 2 +- .../macosx/VLCDebugMessageWindowController.m | 2 +- modules/gui/macosx/VLCEyeTvController.m | 2 +- modules/gui/macosx/VLCFSPanel.m | 2 +- modules/gui/macosx/VLCHelpWindowController.m | 2 +- modules/gui/macosx/VLCInputManager.m | 2 +- modules/gui/macosx/VLCMain+OldPrefs.h | 2 +- modules/gui/macosx/{intf.h => VLCMain.h} | 13 +---- modules/gui/macosx/{intf.m => VLCMain.m} | 23 ++------- modules/gui/macosx/VLCMainMenu.m | 2 +- modules/gui/macosx/VLCMainWindow.m | 2 +- modules/gui/macosx/VLCOpenWindowController.m | 2 +- modules/gui/macosx/VLCOutput.m | 2 +- modules/gui/macosx/VLCPLModel.m | 2 +- modules/gui/macosx/VLCPlaylist.m | 2 +- modules/gui/macosx/VLCPlaylistInfo.m | 2 +- modules/gui/macosx/VLCPlaylistView.m | 2 +- modules/gui/macosx/VLCRendererDialog.m | 2 +- modules/gui/macosx/VLCRendererDiscovery.m | 2 +- .../gui/macosx/VLCResumeDialogController.m | 2 +- modules/gui/macosx/VLCStatusBarIcon.m | 4 +- modules/gui/macosx/VLCStringUtility.m | 2 +- .../VLCTrackSynchronizationWindowController.m | 2 +- .../macosx/VLCVideoEffectsWindowController.m | 2 +- modules/gui/macosx/VLCVoutView.m | 2 +- modules/gui/macosx/VLCVoutWindowController.m | 2 +- modules/gui/macosx/Windows.m | 2 +- modules/gui/macosx/applescript.m | 2 +- modules/gui/macosx/helpers.h | 2 +- modules/gui/macosx/misc.m | 2 +- modules/gui/macosx/prefs.m | 2 +- modules/gui/macosx/prefs_widgets.m | 2 +- modules/gui/macosx/simple_prefs.h | 2 +- modules/gui/macosx/simple_prefs.m | 2 +- .../gui/minimal_macosx/VLCMinimalVoutWindow.m | 2 +- modules/gui/minimal_macosx/intf.m | 2 +- po/POTFILES.in | 6 ++- 55 files changed, 159 insertions(+), 90 deletions(-) create mode 100644 modules/gui/macosx/VLCApplication.h create mode 100644 modules/gui/macosx/VLCApplication.m rename modules/gui/macosx/{intf.h => VLCMain.h} (92%) rename modules/gui/macosx/{intf.m => VLCMain.m} (96%) diff --git a/extras/package/macosx/vlc.xcodeproj/project.pbxproj b/extras/package/macosx/vlc.xcodeproj/project.pbxproj index 3847421b6b..137d473a2f 100644 --- a/extras/package/macosx/vlc.xcodeproj/project.pbxproj +++ b/extras/package/macosx/vlc.xcodeproj/project.pbxproj @@ -398,8 +398,8 @@ 1CCB5F6F1A62A724004C3E90 /* VLCEyeTvController.m in Sources */ = {isa = PBXBuildFile; fileRef = CC6EDD500B9CA2140096068A /* VLCEyeTvController.m */; }; 1CCB5F701A62A724004C3E90 /* VLCFSPanel.h in Sources */ = {isa = PBXBuildFile; fileRef = 2AEF857609A5FEC900130822 /* VLCFSPanel.h */; }; 1CCB5F711A62A724004C3E90 /* VLCFSPanel.m in Sources */ = {isa = PBXBuildFile; fileRef = 2AEF857709A5FEC900130822 /* VLCFSPanel.m */; }; - 1CCB5F721A62A724004C3E90 /* intf.h in Sources */ = {isa = PBXBuildFile; fileRef = 8ED6C27C03E2EB1C0059A3A7 /* intf.h */; }; - 1CCB5F731A62A724004C3E90 /* intf.m in Sources */ = {isa = PBXBuildFile; fileRef = 8ED6C27D03E2EB1C0059A3A7 /* intf.m */; }; + 1CCB5F721A62A724004C3E90 /* VLCMain.h in Sources */ = {isa = PBXBuildFile; fileRef = 8ED6C27C03E2EB1C0059A3A7 /* VLCMain.h */; }; + 1CCB5F731A62A724004C3E90 /* VLCMain.m in Sources */ = {isa = PBXBuildFile; fileRef = 8ED6C27D03E2EB1C0059A3A7 /* VLCMain.m */; }; 1CCB5F741A62A724004C3E90 /* macosx.m in Sources */ = {isa = PBXBuildFile; fileRef = 8ED6C27E03E2EB1C0059A3A7 /* macosx.m */; }; 1CCB5F751A62A724004C3E90 /* VLCMainMenu.h in Sources */ = {isa = PBXBuildFile; fileRef = CC448A5A13B61D49009F72E0 /* VLCMainMenu.h */; }; 1CCB5F761A62A724004C3E90 /* VLCMainMenu.m in Sources */ = {isa = PBXBuildFile; fileRef = CC448A5B13B61D49009F72E0 /* VLCMainMenu.m */; }; @@ -480,6 +480,7 @@ 6BBBB8B71D114628001BD9BA /* VLCRendererDiscovery.m in Sources */ = {isa = PBXBuildFile; fileRef = 6BBBB8B61D114628001BD9BA /* VLCRendererDiscovery.m */; }; 6BBBB8B81D12AF72001BD9BA /* VLCRendererDialog.xib in Resources */ = {isa = PBXBuildFile; fileRef = 6BBBB8AC1D108A87001BD9BA /* VLCRendererDialog.xib */; }; 7D3F6525188051F2005776C4 /* BWQuincyMain.xib in Resources */ = {isa = PBXBuildFile; fileRef = 7D3F6523188051F2005776C4 /* BWQuincyMain.xib */; }; + 7D5678ED1D5BA1DC002698F3 /* VLCApplication.m in Sources */ = {isa = PBXBuildFile; fileRef = 7D5678EC1D5BA1DC002698F3 /* VLCApplication.m */; }; 7D8BB0B71830311300FAE9B7 /* DebugMessageVisualizer.xib in Resources */ = {isa = PBXBuildFile; fileRef = 7D8BB0B51830311300FAE9B7 /* DebugMessageVisualizer.xib */; }; 7D8BB0BA1830367200FAE9B7 /* PlaylistMenu.xib in Resources */ = {isa = PBXBuildFile; fileRef = 7D8BB0B81830367200FAE9B7 /* PlaylistMenu.xib */; }; 7D8BB0C01830393300FAE9B7 /* MainWindow.xib in Resources */ = {isa = PBXBuildFile; fileRef = 7D8BB0BE1830393300FAE9B7 /* MainWindow.xib */; }; @@ -1296,6 +1297,8 @@ 7D3F652718805297005776C4 /* BWQuincyManager.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; name = BWQuincyManager.m; path = ../../../modules/gui/macosx/BWQuincyManager.m; sourceTree = SOURCE_ROOT; }; 7D3F652818805297005776C4 /* BWQuincyUI.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = BWQuincyUI.h; path = ../../../modules/gui/macosx/BWQuincyUI.h; sourceTree = SOURCE_ROOT; }; 7D3F652918805297005776C4 /* BWQuincyUI.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; name = BWQuincyUI.m; path = ../../../modules/gui/macosx/BWQuincyUI.m; sourceTree = SOURCE_ROOT; }; + 7D5678EB1D5BA1DC002698F3 /* VLCApplication.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = VLCApplication.h; path = ../../../modules/gui/macosx/VLCApplication.h; sourceTree = ""; }; + 7D5678EC1D5BA1DC002698F3 /* VLCApplication.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = VLCApplication.m; path = ../../../modules/gui/macosx/VLCApplication.m; sourceTree = ""; }; 7D871D371B5E6844000B56C0 /* VLCMain+OldPrefs.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = "VLCMain+OldPrefs.h"; path = "../../../modules/gui/macosx/VLCMain+OldPrefs.h"; sourceTree = ""; }; 7D871D381B5E6844000B56C0 /* VLCMain+OldPrefs.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; name = "VLCMain+OldPrefs.m"; path = "../../../modules/gui/macosx/VLCMain+OldPrefs.m"; sourceTree = ""; }; 7D871D391B5E684D000B56C0 /* helpers.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = helpers.h; path = ../../../modules/gui/macosx/helpers.h; sourceTree = ""; }; @@ -1338,8 +1341,8 @@ 8E9CA1A406D7DEE800B7186C /* prefs_widgets.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = prefs_widgets.m; path = ../../../modules/gui/macosx/prefs_widgets.m; 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; }; - 8ED6C27C03E2EB1C0059A3A7 /* intf.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = intf.h; path = ../../../modules/gui/macosx/intf.h; sourceTree = SOURCE_ROOT; }; - 8ED6C27D03E2EB1C0059A3A7 /* intf.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = intf.m; path = ../../../modules/gui/macosx/intf.m; sourceTree = SOURCE_ROOT; }; + 8ED6C27C03E2EB1C0059A3A7 /* VLCMain.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = VLCMain.h; path = ../../../modules/gui/macosx/VLCMain.h; sourceTree = SOURCE_ROOT; }; + 8ED6C27D03E2EB1C0059A3A7 /* VLCMain.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = VLCMain.m; path = ../../../modules/gui/macosx/VLCMain.m; sourceTree = SOURCE_ROOT; }; 8ED6C27E03E2EB1C0059A3A7 /* macosx.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = macosx.m; path = ../../../modules/gui/macosx/macosx.m; sourceTree = SOURCE_ROOT; }; 8ED6C27F03E2EB1C0059A3A7 /* misc.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = misc.h; path = ../../../modules/gui/macosx/misc.h; sourceTree = SOURCE_ROOT; }; 8ED6C28003E2EB1C0059A3A7 /* misc.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = misc.m; path = ../../../modules/gui/macosx/misc.m; sourceTree = SOURCE_ROOT; }; @@ -1905,8 +1908,10 @@ 7DF812EE1B555A340052293C /* VLCInputManager.m */, 7D871D371B5E6844000B56C0 /* VLCMain+OldPrefs.h */, 7D871D381B5E6844000B56C0 /* VLCMain+OldPrefs.m */, - 8ED6C27C03E2EB1C0059A3A7 /* intf.h */, - 8ED6C27D03E2EB1C0059A3A7 /* intf.m */, + 8ED6C27C03E2EB1C0059A3A7 /* VLCMain.h */, + 8ED6C27D03E2EB1C0059A3A7 /* VLCMain.m */, + 7D5678EB1D5BA1DC002698F3 /* VLCApplication.h */, + 7D5678EC1D5BA1DC002698F3 /* VLCApplication.m */, 7DF812EF1B555C8E0052293C /* KeyboardBacklight.h */, 7DF812F01B555C8E0052293C /* KeyboardBacklight.m */, 8ED6C27E03E2EB1C0059A3A7 /* macosx.m */, @@ -3988,11 +3993,12 @@ 1CCB5F6E1A62A724004C3E90 /* VLCEyeTvController.h in Sources */, 1CCB5F6F1A62A724004C3E90 /* VLCEyeTvController.m in Sources */, 1CCB5F701A62A724004C3E90 /* VLCFSPanel.h in Sources */, + 7D5678ED1D5BA1DC002698F3 /* VLCApplication.m in Sources */, 1CCB5F711A62A724004C3E90 /* VLCFSPanel.m in Sources */, - 1CCB5F721A62A724004C3E90 /* intf.h in Sources */, + 1CCB5F721A62A724004C3E90 /* VLCMain.h in Sources */, 6B13E2A81BC67678001AD24A /* VLCScrollingClipView.m in Sources */, 1CD3667B1B7A242E0054E39F /* VLCTimeSelectionPanelController.m in Sources */, - 1CCB5F731A62A724004C3E90 /* intf.m in Sources */, + 1CCB5F731A62A724004C3E90 /* VLCMain.m in Sources */, 1CCB5F741A62A724004C3E90 /* macosx.m in Sources */, 1CCB5F751A62A724004C3E90 /* VLCMainMenu.h in Sources */, 1CCB5F761A62A724004C3E90 /* VLCMainMenu.m in Sources */, diff --git a/modules/gui/macosx/AppleRemote.m b/modules/gui/macosx/AppleRemote.m index 595af50f02..3850dff95d 100644 --- a/modules/gui/macosx/AppleRemote.m +++ b/modules/gui/macosx/AppleRemote.m @@ -54,7 +54,7 @@ #import "AppleRemote.h" /* this was added by the VideoLAN team to ensure Leopard-compatibility and is VLC-only */ -#import "intf.h" +#import "VLCMain.h" #import "CompatibilityFixes.h" const char* AppleRemoteDeviceName = "AppleIRController"; diff --git a/modules/gui/macosx/BWQuincyUI.m b/modules/gui/macosx/BWQuincyUI.m index b7f2987e02..07abd16ad9 100644 --- a/modules/gui/macosx/BWQuincyUI.m +++ b/modules/gui/macosx/BWQuincyUI.m @@ -27,7 +27,7 @@ * OTHER DEALINGS IN THE SOFTWARE. */ -#import "intf.h" +#import "VLCMain.h" #import "BWQuincyUI.h" #import "BWQuincyManager.h" #import diff --git a/modules/gui/macosx/ControlsBar.m b/modules/gui/macosx/ControlsBar.m index 9a42620f4d..b029ea1185 100644 --- a/modules/gui/macosx/ControlsBar.m +++ b/modules/gui/macosx/ControlsBar.m @@ -23,7 +23,7 @@ *****************************************************************************/ #import "ControlsBar.h" -#import "intf.h" +#import "VLCMain.h" #import "VLCCoreInteraction.h" #import "VLCMainMenu.h" #import "VLCFSPanel.h" diff --git a/modules/gui/macosx/ExtensionsDialogProvider.h b/modules/gui/macosx/ExtensionsDialogProvider.h index ac72faf413..bc30739c55 100644 --- a/modules/gui/macosx/ExtensionsDialogProvider.h +++ b/modules/gui/macosx/ExtensionsDialogProvider.h @@ -23,7 +23,7 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA. *****************************************************************************/ -#import "intf.h" +#import "VLCMain.h" #import "VLCUIWidgets.h" #import diff --git a/modules/gui/macosx/ExtensionsDialogProvider.m b/modules/gui/macosx/ExtensionsDialogProvider.m index 13a20f49e1..61a7671516 100644 --- a/modules/gui/macosx/ExtensionsDialogProvider.m +++ b/modules/gui/macosx/ExtensionsDialogProvider.m @@ -26,7 +26,7 @@ #import "ExtensionsDialogProvider.h" -#import "intf.h" +#import "VLCMain.h" #import "ExtensionsManager.h" #import "misc.h" #import "VLCUIWidgets.h" diff --git a/modules/gui/macosx/ExtensionsManager.h b/modules/gui/macosx/ExtensionsManager.h index f284e59444..c9ba0ec6b8 100644 --- a/modules/gui/macosx/ExtensionsManager.h +++ b/modules/gui/macosx/ExtensionsManager.h @@ -26,7 +26,7 @@ #endif #import "ExtensionsDialogProvider.h" -#import "intf.h" +#import "VLCMain.h" #import diff --git a/modules/gui/macosx/MainWindowTitle.m b/modules/gui/macosx/MainWindowTitle.m index 74ab4f31ef..ddca569ac8 100644 --- a/modules/gui/macosx/MainWindowTitle.m +++ b/modules/gui/macosx/MainWindowTitle.m @@ -22,7 +22,7 @@ *****************************************************************************/ #import -#import "intf.h" +#import "VLCMain.h" #import "MainWindowTitle.h" #import "VLCCoreInteraction.h" #import "CompatibilityFixes.h" diff --git a/modules/gui/macosx/Makefile.am b/modules/gui/macosx/Makefile.am index fd402f4ef5..f796f87755 100644 --- a/modules/gui/macosx/Makefile.am +++ b/modules/gui/macosx/Makefile.am @@ -36,7 +36,8 @@ libmacosx_plugin_la_SOURCES = \ VLCFSPanel.h VLCFSPanel.m \ VLCHelpWindowController.h VLCHelpWindowController.m \ VLCMain+OldPrefs.h VLCMain+OldPrefs.m \ - intf.h intf.m \ + VLCMain.h VLCMain.m \ + VLCApplication.h VLCApplication.m \ iTunes.h \ KeyboardBacklight.h KeyboardBacklight.m \ macosx.m \ diff --git a/modules/gui/macosx/VLCAboutWindowController.m b/modules/gui/macosx/VLCAboutWindowController.m index 48440453c8..838858c081 100644 --- a/modules/gui/macosx/VLCAboutWindowController.m +++ b/modules/gui/macosx/VLCAboutWindowController.m @@ -28,7 +28,7 @@ #import "VLCAboutWindowController.h" -#import "intf.h" +#import "VLCMain.h" #import #import #import "CompatibilityFixes.h" diff --git a/modules/gui/macosx/VLCAddonListItem.m b/modules/gui/macosx/VLCAddonListItem.m index 6cc1811371..d23150c4ac 100644 --- a/modules/gui/macosx/VLCAddonListItem.m +++ b/modules/gui/macosx/VLCAddonListItem.m @@ -20,7 +20,7 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA. *****************************************************************************/ -#import "intf.h" +#import "VLCMain.h" #import "VLCAddonListItem.h" #import "VLCStringUtility.h" diff --git a/modules/gui/macosx/VLCAddonsWindowController.m b/modules/gui/macosx/VLCAddonsWindowController.m index 9625bf3108..a82e521ebf 100644 --- a/modules/gui/macosx/VLCAddonsWindowController.m +++ b/modules/gui/macosx/VLCAddonsWindowController.m @@ -24,7 +24,7 @@ #import #import "VLCAddonsWindowController.h" -#import "intf.h" +#import "VLCMain.h" #import "VLCMainWindow.h" #import "VLCAddonListItem.h" diff --git a/modules/gui/macosx/VLCApplication.h b/modules/gui/macosx/VLCApplication.h new file mode 100644 index 0000000000..704ed7e87b --- /dev/null +++ b/modules/gui/macosx/VLCApplication.h @@ -0,0 +1,35 @@ +/***************************************************************************** + * VLCApplication.h: MacOS X interface module + ***************************************************************************** + * Copyright (C) 2002-2016 VLC authors and VideoLAN + * $Id$ + * + * Authors: Derk-Jan Hartman + * Felix Paul Kühne + * David Fuhrmann + * Pierre d'Herbemont + * + * 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., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA. + *****************************************************************************/ + +#import + +/***************************************************************************** + * VLCApplication interface + *****************************************************************************/ + +@interface VLCApplication : NSApplication + +@end diff --git a/modules/gui/macosx/VLCApplication.m b/modules/gui/macosx/VLCApplication.m new file mode 100644 index 0000000000..f89e4a4513 --- /dev/null +++ b/modules/gui/macosx/VLCApplication.m @@ -0,0 +1,49 @@ +/***************************************************************************** + * VLCApplication.m: MacOS X interface module + ***************************************************************************** + * Copyright (C) 2002-2016 VLC authors and VideoLAN + * $Id$ + * + * Authors: Derk-Jan Hartman + * Felix Paul Kühne + * Pierre d'Herbemont + * David Fuhrmann + * + * 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., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA. + *****************************************************************************/ + +/***************************************************************************** + * Preamble + *****************************************************************************/ + +#import "VLCApplication.h" + +/***************************************************************************** + * VLCApplication implementation + *****************************************************************************/ + +@implementation VLCApplication +// when user selects the quit menu from dock it sends a terminate: +// but we need to send a stop: to properly exits libvlc. +// However, we are not able to change the action-method sent by this standard menu item. +// thus we override terminate: to send a stop: +// see [af97f24d528acab89969d6541d83f17ce1ecd580] that introduced the removal of setjmp() and longjmp() +- (void)terminate:(id)sender +{ + [self activateIgnoringOtherApps:YES]; + [self stop:sender]; +} + +@end diff --git a/modules/gui/macosx/VLCAudioEffectsWindowController.m b/modules/gui/macosx/VLCAudioEffectsWindowController.m index 56cac04359..9e9bbc04cb 100644 --- a/modules/gui/macosx/VLCAudioEffectsWindowController.m +++ b/modules/gui/macosx/VLCAudioEffectsWindowController.m @@ -26,7 +26,7 @@ # import "config.h" #endif -#import "intf.h" +#import "VLCMain.h" #import "VLCAudioEffectsWindowController.h" #import "../../audio_filter/equalizer_presets.h" #import "CompatibilityFixes.h" diff --git a/modules/gui/macosx/VLCBookmarksWindowController.h b/modules/gui/macosx/VLCBookmarksWindowController.h index c0152a9690..365cd7b6cc 100644 --- a/modules/gui/macosx/VLCBookmarksWindowController.h +++ b/modules/gui/macosx/VLCBookmarksWindowController.h @@ -22,7 +22,7 @@ *****************************************************************************/ #import -#import "intf.h" +#import "VLCMain.h" #import @interface VLCBookmarksWindowController : NSWindowController diff --git a/modules/gui/macosx/VLCConvertAndSaveWindowController.m b/modules/gui/macosx/VLCConvertAndSaveWindowController.m index ffd0be5ae7..94782bb8ba 100644 --- a/modules/gui/macosx/VLCConvertAndSaveWindowController.m +++ b/modules/gui/macosx/VLCConvertAndSaveWindowController.m @@ -23,7 +23,7 @@ #import "VLCConvertAndSaveWindowController.h" -#import "intf.h" +#import "VLCMain.h" #import "VLCPlaylist.h" #import "misc.h" #import "SharedDialogs.h" diff --git a/modules/gui/macosx/VLCCoreDialogProvider.m b/modules/gui/macosx/VLCCoreDialogProvider.m index 0e59290e3d..86f85321b7 100644 --- a/modules/gui/macosx/VLCCoreDialogProvider.m +++ b/modules/gui/macosx/VLCCoreDialogProvider.m @@ -22,7 +22,7 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA. *****************************************************************************/ -#import "intf.h" +#import "VLCMain.h" #import "VLCCoreDialogProvider.h" #import "misc.h" diff --git a/modules/gui/macosx/VLCCoreInteraction.m b/modules/gui/macosx/VLCCoreInteraction.m index 3bdfe3c591..5dfecbe6a1 100644 --- a/modules/gui/macosx/VLCCoreInteraction.m +++ b/modules/gui/macosx/VLCCoreInteraction.m @@ -22,7 +22,7 @@ *****************************************************************************/ #import "VLCCoreInteraction.h" -#import "intf.h" +#import "VLCMain.h" #import "VLCOpenWindowController.h" #import "VLCPlaylist.h" #import diff --git a/modules/gui/macosx/VLCDebugMessageWindowController.m b/modules/gui/macosx/VLCDebugMessageWindowController.m index c870c5c85d..d5b48c632d 100644 --- a/modules/gui/macosx/VLCDebugMessageWindowController.m +++ b/modules/gui/macosx/VLCDebugMessageWindowController.m @@ -24,7 +24,7 @@ *****************************************************************************/ #import "VLCDebugMessageWindowController.h" -#import "intf.h" +#import "VLCMain.h" #import static void MsgCallback(void *data, int type, const vlc_log_t *item, const char *format, va_list ap); diff --git a/modules/gui/macosx/VLCEyeTvController.m b/modules/gui/macosx/VLCEyeTvController.m index 5d83cf7804..22a433b8f3 100644 --- a/modules/gui/macosx/VLCEyeTvController.m +++ b/modules/gui/macosx/VLCEyeTvController.m @@ -27,7 +27,7 @@ /* for apple event interaction [carbon] */ //#import /* for various VLC core related calls */ -#import "intf.h" +#import "VLCMain.h" @implementation VLCEyeTVController diff --git a/modules/gui/macosx/VLCFSPanel.m b/modules/gui/macosx/VLCFSPanel.m index c9a92555cf..f2bfc922cc 100644 --- a/modules/gui/macosx/VLCFSPanel.m +++ b/modules/gui/macosx/VLCFSPanel.m @@ -26,7 +26,7 @@ /***************************************************************************** * Preamble *****************************************************************************/ -#import "intf.h" +#import "VLCMain.h" #import "VLCCoreInteraction.h" #import "VLCMainWindow.h" #import "misc.h" diff --git a/modules/gui/macosx/VLCHelpWindowController.m b/modules/gui/macosx/VLCHelpWindowController.m index bbe8e47547..bf78140f22 100644 --- a/modules/gui/macosx/VLCHelpWindowController.m +++ b/modules/gui/macosx/VLCHelpWindowController.m @@ -24,7 +24,7 @@ #import "VLCHelpWindowController.h" -#import "intf.h" +#import "VLCMain.h" #import #import #import "CompatibilityFixes.h" diff --git a/modules/gui/macosx/VLCInputManager.m b/modules/gui/macosx/VLCInputManager.m index a9e9fa3e87..7b05c2f075 100644 --- a/modules/gui/macosx/VLCInputManager.m +++ b/modules/gui/macosx/VLCInputManager.m @@ -24,7 +24,7 @@ #import "VLCCoreInteraction.h" #import "CompatibilityFixes.h" #import "ExtensionsManager.h" -#import "intf.h" +#import "VLCMain.h" #import "VLCMainMenu.h" #import "VLCMainWindow.h" #import "VLCPlaylist.h" diff --git a/modules/gui/macosx/VLCMain+OldPrefs.h b/modules/gui/macosx/VLCMain+OldPrefs.h index e222048970..ed135ca011 100644 --- a/modules/gui/macosx/VLCMain+OldPrefs.h +++ b/modules/gui/macosx/VLCMain+OldPrefs.h @@ -21,7 +21,7 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA. *****************************************************************************/ -#import "intf.h" +#import "VLCMain.h" @interface VLCMain (OldPrefs) diff --git a/modules/gui/macosx/intf.h b/modules/gui/macosx/VLCMain.h similarity index 92% rename from modules/gui/macosx/intf.h rename to modules/gui/macosx/VLCMain.h index 6469d5dfdc..cf49fbe2e3 100644 --- a/modules/gui/macosx/intf.h +++ b/modules/gui/macosx/VLCMain.h @@ -1,7 +1,7 @@ /***************************************************************************** - * intf.h: MacOS X interface module + * VLCMain.h: MacOS X interface module ***************************************************************************** - * Copyright (C) 2002-2015 VLC authors and VideoLAN + * Copyright (C) 2002-2016 VLC authors and VideoLAN * $Id$ * * Authors: Derk-Jan Hartman @@ -118,13 +118,4 @@ static NSString * VLCInputChangedNotification = @"VLCInputChangedNotification"; @end - -/***************************************************************************** - * VLCApplication interface - *****************************************************************************/ - -@interface VLCApplication : NSApplication - -@end - #import "helpers.h" diff --git a/modules/gui/macosx/intf.m b/modules/gui/macosx/VLCMain.m similarity index 96% rename from modules/gui/macosx/intf.m rename to modules/gui/macosx/VLCMain.m index 92b6856337..d6affd411d 100644 --- a/modules/gui/macosx/intf.m +++ b/modules/gui/macosx/VLCMain.m @@ -1,5 +1,5 @@ /***************************************************************************** - * intf.m: MacOS X interface module + * VLCMain.m: MacOS X interface module ***************************************************************************** * Copyright (C) 2002-2015 VLC authors and VideoLAN * $Id$ @@ -31,7 +31,7 @@ # include "config.h" #endif -#import "intf.h" +#import "VLCMain.h" #include /* malloc(), free() */ #include @@ -65,6 +65,7 @@ #import "VLCVideoEffectsWindowController.h" #import "VLCAudioEffectsWindowController.h" #import "VLCMain+OldPrefs.h" +#import "VLCApplication.h" #ifdef HAVE_SPARKLE #import /* we're the update delegate */ @@ -640,21 +641,3 @@ static VLCMain *sharedInstance = nil; } @end - -/***************************************************************************** - * VLCApplication interface - *****************************************************************************/ - -@implementation VLCApplication -// when user selects the quit menu from dock it sends a terminate: -// but we need to send a stop: to properly exits libvlc. -// However, we are not able to change the action-method sent by this standard menu item. -// thus we override terminate: to send a stop: -// see [af97f24d528acab89969d6541d83f17ce1ecd580] that introduced the removal of setjmp() and longjmp() -- (void)terminate:(id)sender -{ - [self activateIgnoringOtherApps:YES]; - [self stop:sender]; -} - -@end diff --git a/modules/gui/macosx/VLCMainMenu.m b/modules/gui/macosx/VLCMainMenu.m index 171efefa8b..7581e4311d 100644 --- a/modules/gui/macosx/VLCMainMenu.m +++ b/modules/gui/macosx/VLCMainMenu.m @@ -22,7 +22,7 @@ *****************************************************************************/ #import "VLCMainMenu.h" -#import "intf.h" +#import "VLCMain.h" #import #import diff --git a/modules/gui/macosx/VLCMainWindow.m b/modules/gui/macosx/VLCMainWindow.m index ea42cd4829..893eac1edb 100644 --- a/modules/gui/macosx/VLCMainWindow.m +++ b/modules/gui/macosx/VLCMainWindow.m @@ -27,7 +27,7 @@ #import "VLCMainWindow.h" -#import "intf.h" +#import "VLCMain.h" #import "CompatibilityFixes.h" #import "VLCCoreInteraction.h" #import "VLCAudioEffectsWindowController.h" diff --git a/modules/gui/macosx/VLCOpenWindowController.m b/modules/gui/macosx/VLCOpenWindowController.m index fc52fb0a71..df39c8077d 100644 --- a/modules/gui/macosx/VLCOpenWindowController.m +++ b/modules/gui/macosx/VLCOpenWindowController.m @@ -36,7 +36,7 @@ #import #import -#import "intf.h" +#import "VLCMain.h" #import "VLCPlaylist.h" #import "VLCOpenWindowController.h" #import "VLCOutput.h" diff --git a/modules/gui/macosx/VLCOutput.m b/modules/gui/macosx/VLCOutput.m index d19c23c5ce..68bb3ce9a4 100644 --- a/modules/gui/macosx/VLCOutput.m +++ b/modules/gui/macosx/VLCOutput.m @@ -27,7 +27,7 @@ #import "VLCOutput.h" -#import "intf.h" +#import "VLCMain.h" @interface VLCOutput() { diff --git a/modules/gui/macosx/VLCPLModel.m b/modules/gui/macosx/VLCPLModel.m index ef4b4b4396..d87d4c90ec 100644 --- a/modules/gui/macosx/VLCPLModel.m +++ b/modules/gui/macosx/VLCPLModel.m @@ -25,7 +25,7 @@ #import "VLCPlaylist.h" #import "VLCStringUtility.h" -#import "intf.h" +#import "VLCMain.h" #import "ControlsBar.h" #import "VLCMainMenu.h" #import "VLCPlaylistInfo.h" diff --git a/modules/gui/macosx/VLCPlaylist.m b/modules/gui/macosx/VLCPlaylist.m index c5cb73081d..db04e5d2e2 100644 --- a/modules/gui/macosx/VLCPlaylist.m +++ b/modules/gui/macosx/VLCPlaylist.m @@ -41,7 +41,7 @@ #import "CompatibilityFixes.h" -#import "intf.h" +#import "VLCMain.h" #import "VLCPlaylist.h" #import "VLCMainMenu.h" #import "VLCPlaylistInfo.h" diff --git a/modules/gui/macosx/VLCPlaylistInfo.m b/modules/gui/macosx/VLCPlaylistInfo.m index 6eec5e5401..27459214bd 100644 --- a/modules/gui/macosx/VLCPlaylistInfo.m +++ b/modules/gui/macosx/VLCPlaylistInfo.m @@ -23,7 +23,7 @@ ******************************************************************************/ #import "CompatibilityFixes.h" -#import "intf.h" +#import "VLCMain.h" #import "VLCPlaylistInfo.h" #import "VLCPlaylist.h" #import diff --git a/modules/gui/macosx/VLCPlaylistView.m b/modules/gui/macosx/VLCPlaylistView.m index 013ae0842a..2a54d9c1e0 100644 --- a/modules/gui/macosx/VLCPlaylistView.m +++ b/modules/gui/macosx/VLCPlaylistView.m @@ -23,7 +23,7 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA. *****************************************************************************/ -#import "intf.h" +#import "VLCMain.h" #import "VLCPlaylistView.h" #import "VLCPlaylist.h" diff --git a/modules/gui/macosx/VLCRendererDialog.m b/modules/gui/macosx/VLCRendererDialog.m index f2f2d165bc..afc8f4038d 100644 --- a/modules/gui/macosx/VLCRendererDialog.m +++ b/modules/gui/macosx/VLCRendererDialog.m @@ -24,7 +24,7 @@ #import "VLCRendererDialog.h" #import "VLCRendererItem.h" -#import "intf.h" +#import "VLCMain.h" #include diff --git a/modules/gui/macosx/VLCRendererDiscovery.m b/modules/gui/macosx/VLCRendererDiscovery.m index 96050e8dd2..f54077c82e 100644 --- a/modules/gui/macosx/VLCRendererDiscovery.m +++ b/modules/gui/macosx/VLCRendererDiscovery.m @@ -23,7 +23,7 @@ #import "VLCRendererDiscovery.h" -#import "intf.h" +#import "VLCMain.h" #include #include diff --git a/modules/gui/macosx/VLCResumeDialogController.m b/modules/gui/macosx/VLCResumeDialogController.m index d19a322edd..8d03f32f14 100644 --- a/modules/gui/macosx/VLCResumeDialogController.m +++ b/modules/gui/macosx/VLCResumeDialogController.m @@ -24,7 +24,7 @@ #import "VLCResumeDialogController.h" -#import "intf.h" +#import "VLCMain.h" #import "VLCStringUtility.h" @interface VLCResumeDialogController() diff --git a/modules/gui/macosx/VLCStatusBarIcon.m b/modules/gui/macosx/VLCStatusBarIcon.m index 0b04afa02c..94689b941a 100644 --- a/modules/gui/macosx/VLCStatusBarIcon.m +++ b/modules/gui/macosx/VLCStatusBarIcon.m @@ -24,7 +24,7 @@ #import "VLCStatusBarIcon.h" #import "VLCMainMenu.h" -#import "intf.h" +#import "VLCMain.h" #import #import @@ -33,6 +33,8 @@ #import "VLCCoreInteraction.h" #import "VLCStringUtility.h" +#import "VLCApplication.h" + @interface VLCStatusBarIcon () { NSMenuItem *_vlcStatusBarMenuItem; diff --git a/modules/gui/macosx/VLCStringUtility.m b/modules/gui/macosx/VLCStringUtility.m index b26923e3f2..561b2e60a2 100644 --- a/modules/gui/macosx/VLCStringUtility.m +++ b/modules/gui/macosx/VLCStringUtility.m @@ -26,7 +26,7 @@ #import "VLCStringUtility.h" -#import "intf.h" +#import "VLCMain.h" #import "CompatibilityFixes.h" #import diff --git a/modules/gui/macosx/VLCTrackSynchronizationWindowController.m b/modules/gui/macosx/VLCTrackSynchronizationWindowController.m index 2731303f71..2293019405 100644 --- a/modules/gui/macosx/VLCTrackSynchronizationWindowController.m +++ b/modules/gui/macosx/VLCTrackSynchronizationWindowController.m @@ -23,7 +23,7 @@ *****************************************************************************/ #import "CompatibilityFixes.h" -#import "intf.h" +#import "VLCMain.h" #import #import "VLCTrackSynchronizationWindowController.h" #import "VLCCoreInteraction.h" diff --git a/modules/gui/macosx/VLCVideoEffectsWindowController.m b/modules/gui/macosx/VLCVideoEffectsWindowController.m index 6944fb1c0c..e84faa5475 100644 --- a/modules/gui/macosx/VLCVideoEffectsWindowController.m +++ b/modules/gui/macosx/VLCVideoEffectsWindowController.m @@ -22,7 +22,7 @@ *****************************************************************************/ #import "CompatibilityFixes.h" -#import "intf.h" +#import "VLCMain.h" #import "VLCVideoEffectsWindowController.h" #import "SharedDialogs.h" #import "VLCCoreInteraction.h" diff --git a/modules/gui/macosx/VLCVoutView.m b/modules/gui/macosx/VLCVoutView.m index f9aa48d2f7..2965502858 100644 --- a/modules/gui/macosx/VLCVoutView.m +++ b/modules/gui/macosx/VLCVoutView.m @@ -32,7 +32,7 @@ #import /* free() */ #import "CompatibilityFixes.h" -#import "intf.h" +#import "VLCMain.h" #import "VLCVoutView.h" #import "VLCCoreInteraction.h" #import "VLCMainMenu.h" diff --git a/modules/gui/macosx/VLCVoutWindowController.m b/modules/gui/macosx/VLCVoutWindowController.m index f3d1064c75..a960ccf1a5 100644 --- a/modules/gui/macosx/VLCVoutWindowController.m +++ b/modules/gui/macosx/VLCVoutWindowController.m @@ -26,7 +26,7 @@ #import "CompatibilityFixes.h" #import "VLCVoutWindowController.h" -#import "intf.h" +#import "VLCMain.h" #import "VLCMainWindow.h" #import "VLCVoutView.h" diff --git a/modules/gui/macosx/Windows.m b/modules/gui/macosx/Windows.m index 146ff65e4c..00dc9284a0 100644 --- a/modules/gui/macosx/Windows.m +++ b/modules/gui/macosx/Windows.m @@ -23,7 +23,7 @@ *****************************************************************************/ #import "Windows.h" -#import "intf.h" +#import "VLCMain.h" #import "VLCCoreInteraction.h" #import "ControlsBar.h" #import "VLCVoutView.h" diff --git a/modules/gui/macosx/applescript.m b/modules/gui/macosx/applescript.m index 2651ce15a8..a16a1701f6 100644 --- a/modules/gui/macosx/applescript.m +++ b/modules/gui/macosx/applescript.m @@ -25,7 +25,7 @@ /***************************************************************************** * Preamble *****************************************************************************/ -#import "intf.h" +#import "VLCMain.h" #import "applescript.h" #import "VLCCoreInteraction.h" #import "VLCPlaylist.h" diff --git a/modules/gui/macosx/helpers.h b/modules/gui/macosx/helpers.h index 97c43347a5..fefd0e6c19 100644 --- a/modules/gui/macosx/helpers.h +++ b/modules/gui/macosx/helpers.h @@ -23,7 +23,7 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA. *****************************************************************************/ -#import "intf.h" +#import "VLCMain.h" #import "VLCVoutView.h" static inline input_thread_t *getInput(void) diff --git a/modules/gui/macosx/misc.m b/modules/gui/macosx/misc.m index dd784eb7d5..5a9366d292 100644 --- a/modules/gui/macosx/misc.m +++ b/modules/gui/macosx/misc.m @@ -24,7 +24,7 @@ #import "CompatibilityFixes.h" #import "misc.h" -#import "intf.h" /* VLCApplication */ +#import "VLCMain.h" /* VLCApplication */ #import "VLCMainWindow.h" #import "VLCMainMenu.h" #import "ControlsBar.h" diff --git a/modules/gui/macosx/prefs.m b/modules/gui/macosx/prefs.m index b8dd43e630..e92c77be3f 100644 --- a/modules/gui/macosx/prefs.m +++ b/modules/gui/macosx/prefs.m @@ -54,7 +54,7 @@ #include #import "CompatibilityFixes.h" -#import "intf.h" +#import "VLCMain.h" #import "prefs.h" #import "simple_prefs.h" #import "prefs_widgets.h" diff --git a/modules/gui/macosx/prefs_widgets.m b/modules/gui/macosx/prefs_widgets.m index 7dc66a9059..1b745eb1d6 100644 --- a/modules/gui/macosx/prefs_widgets.m +++ b/modules/gui/macosx/prefs_widgets.m @@ -37,7 +37,7 @@ #include #include -#include "intf.h" +#include "VLCMain.h" #include "prefs_widgets.h" #define CONFIG_ITEM_STRING_LIST (CONFIG_ITEM_STRING + 10) diff --git a/modules/gui/macosx/simple_prefs.h b/modules/gui/macosx/simple_prefs.h index 7225b1ab41..ddeeb7bc92 100644 --- a/modules/gui/macosx/simple_prefs.h +++ b/modules/gui/macosx/simple_prefs.h @@ -22,7 +22,7 @@ *****************************************************************************/ #import -#import "intf.h" +#import "VLCMain.h" #import @interface VLCSimplePrefs : NSWindowController diff --git a/modules/gui/macosx/simple_prefs.m b/modules/gui/macosx/simple_prefs.m index 205c2b4ba6..ba8627d1fe 100644 --- a/modules/gui/macosx/simple_prefs.m +++ b/modules/gui/macosx/simple_prefs.m @@ -34,7 +34,7 @@ #import #import #import "misc.h" -#import "intf.h" +#import "VLCMain.h" #import "VLCMain+OldPrefs.h" #import "AppleRemote.h" #import "VLCCoreInteraction.h" diff --git a/modules/gui/minimal_macosx/VLCMinimalVoutWindow.m b/modules/gui/minimal_macosx/VLCMinimalVoutWindow.m index 143291e5d1..4998e6b03c 100644 --- a/modules/gui/minimal_macosx/VLCMinimalVoutWindow.m +++ b/modules/gui/minimal_macosx/VLCMinimalVoutWindow.m @@ -25,7 +25,7 @@ /***************************************************************************** * Preamble *****************************************************************************/ -#import "intf.h" +#import "VLCMain.h" #import "VLCMinimalVoutWindow.h" #import "misc.h" diff --git a/modules/gui/minimal_macosx/intf.m b/modules/gui/minimal_macosx/intf.m index 26c16bd05d..78fb7510e3 100644 --- a/modules/gui/minimal_macosx/intf.m +++ b/modules/gui/minimal_macosx/intf.m @@ -37,7 +37,7 @@ #include #include -#import "intf.h" +#import "VLCMain.h" #import "VLCMinimalVoutWindow.h" /***************************************************************************** diff --git a/po/POTFILES.in b/po/POTFILES.in index a64b9b8075..d97cc7d34f 100644 --- a/po/POTFILES.in +++ b/po/POTFILES.in @@ -538,6 +538,8 @@ modules/gui/macosx/AppleRemote.h modules/gui/macosx/AppleRemote.m modules/gui/macosx/applescript.h modules/gui/macosx/applescript.m +modules/gui/macosx/VLCApplication.h +modules/gui/macosx/VLCApplication.m modules/gui/macosx/VLCAudioEffectsWindowController.h modules/gui/macosx/VLCAudioEffectsWindowController.m modules/gui/macosx/VLCBookmarksWindowController.h @@ -561,9 +563,9 @@ modules/gui/macosx/VLCEyeTvController.m modules/gui/macosx/VLCFSPanel.h modules/gui/macosx/VLCFSPanel.m modules/gui/macosx/helpers.h -modules/gui/macosx/intf.h -modules/gui/macosx/intf.m modules/gui/macosx/macosx.m +modules/gui/macosx/VLCMain.h +modules/gui/macosx/VLCMain.m modules/gui/macosx/VLCMain+OldPrefs.h modules/gui/macosx/VLCMain+OldPrefs.m modules/gui/macosx/VLCMainMenu.h