Browse Source

macosx: rename VLCMain source file and split out VLCApplication class

pull/48/head
Felix Paul Kühne 10 years ago
parent
commit
e0dfd83141
  1. 22
      extras/package/macosx/vlc.xcodeproj/project.pbxproj
  2. 2
      modules/gui/macosx/AppleRemote.m
  3. 2
      modules/gui/macosx/BWQuincyUI.m
  4. 2
      modules/gui/macosx/ControlsBar.m
  5. 2
      modules/gui/macosx/ExtensionsDialogProvider.h
  6. 2
      modules/gui/macosx/ExtensionsDialogProvider.m
  7. 2
      modules/gui/macosx/ExtensionsManager.h
  8. 2
      modules/gui/macosx/MainWindowTitle.m
  9. 3
      modules/gui/macosx/Makefile.am
  10. 2
      modules/gui/macosx/VLCAboutWindowController.m
  11. 2
      modules/gui/macosx/VLCAddonListItem.m
  12. 2
      modules/gui/macosx/VLCAddonsWindowController.m
  13. 35
      modules/gui/macosx/VLCApplication.h
  14. 49
      modules/gui/macosx/VLCApplication.m
  15. 2
      modules/gui/macosx/VLCAudioEffectsWindowController.m
  16. 2
      modules/gui/macosx/VLCBookmarksWindowController.h
  17. 2
      modules/gui/macosx/VLCConvertAndSaveWindowController.m
  18. 2
      modules/gui/macosx/VLCCoreDialogProvider.m
  19. 2
      modules/gui/macosx/VLCCoreInteraction.m
  20. 2
      modules/gui/macosx/VLCDebugMessageWindowController.m
  21. 2
      modules/gui/macosx/VLCEyeTvController.m
  22. 2
      modules/gui/macosx/VLCFSPanel.m
  23. 2
      modules/gui/macosx/VLCHelpWindowController.m
  24. 2
      modules/gui/macosx/VLCInputManager.m
  25. 2
      modules/gui/macosx/VLCMain+OldPrefs.h
  26. 13
      modules/gui/macosx/VLCMain.h
  27. 23
      modules/gui/macosx/VLCMain.m
  28. 2
      modules/gui/macosx/VLCMainMenu.m
  29. 2
      modules/gui/macosx/VLCMainWindow.m
  30. 2
      modules/gui/macosx/VLCOpenWindowController.m
  31. 2
      modules/gui/macosx/VLCOutput.m
  32. 2
      modules/gui/macosx/VLCPLModel.m
  33. 2
      modules/gui/macosx/VLCPlaylist.m
  34. 2
      modules/gui/macosx/VLCPlaylistInfo.m
  35. 2
      modules/gui/macosx/VLCPlaylistView.m
  36. 2
      modules/gui/macosx/VLCRendererDialog.m
  37. 2
      modules/gui/macosx/VLCRendererDiscovery.m
  38. 2
      modules/gui/macosx/VLCResumeDialogController.m
  39. 4
      modules/gui/macosx/VLCStatusBarIcon.m
  40. 2
      modules/gui/macosx/VLCStringUtility.m
  41. 2
      modules/gui/macosx/VLCTrackSynchronizationWindowController.m
  42. 2
      modules/gui/macosx/VLCVideoEffectsWindowController.m
  43. 2
      modules/gui/macosx/VLCVoutView.m
  44. 2
      modules/gui/macosx/VLCVoutWindowController.m
  45. 2
      modules/gui/macosx/Windows.m
  46. 2
      modules/gui/macosx/applescript.m
  47. 2
      modules/gui/macosx/helpers.h
  48. 2
      modules/gui/macosx/misc.m
  49. 2
      modules/gui/macosx/prefs.m
  50. 2
      modules/gui/macosx/prefs_widgets.m
  51. 2
      modules/gui/macosx/simple_prefs.h
  52. 2
      modules/gui/macosx/simple_prefs.m
  53. 2
      modules/gui/minimal_macosx/VLCMinimalVoutWindow.m
  54. 2
      modules/gui/minimal_macosx/intf.m
  55. 6
      po/POTFILES.in

22
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 = "<group>"; };
7D5678EC1D5BA1DC002698F3 /* VLCApplication.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = VLCApplication.m; path = ../../../modules/gui/macosx/VLCApplication.m; sourceTree = "<group>"; };
7D871D371B5E6844000B56C0 /* VLCMain+OldPrefs.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = "VLCMain+OldPrefs.h"; path = "../../../modules/gui/macosx/VLCMain+OldPrefs.h"; sourceTree = "<group>"; };
7D871D381B5E6844000B56C0 /* VLCMain+OldPrefs.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; name = "VLCMain+OldPrefs.m"; path = "../../../modules/gui/macosx/VLCMain+OldPrefs.m"; sourceTree = "<group>"; };
7D871D391B5E684D000B56C0 /* helpers.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = helpers.h; path = ../../../modules/gui/macosx/helpers.h; sourceTree = "<group>"; };
@ -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 */,

2
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";

2
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 <sys/sysctl.h>

2
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"

2
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 <vlc_common.h>

2
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"

2
modules/gui/macosx/ExtensionsManager.h

@ -26,7 +26,7 @@
#endif
#import "ExtensionsDialogProvider.h"
#import "intf.h"
#import "VLCMain.h"
#import <vlc_extensions.h>

2
modules/gui/macosx/MainWindowTitle.m

@ -22,7 +22,7 @@
*****************************************************************************/
#import <vlc_common.h>
#import "intf.h"
#import "VLCMain.h"
#import "MainWindowTitle.h"
#import "VLCCoreInteraction.h"
#import "CompatibilityFixes.h"

3
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 \

2
modules/gui/macosx/VLCAboutWindowController.m

@ -28,7 +28,7 @@
#import "VLCAboutWindowController.h"
#import "intf.h"
#import "VLCMain.h"
#import <vlc_intf_strings.h>
#import <vlc_about.h>
#import "CompatibilityFixes.h"

2
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"

2
modules/gui/macosx/VLCAddonsWindowController.m

@ -24,7 +24,7 @@
#import <vlc_addons.h>
#import "VLCAddonsWindowController.h"
#import "intf.h"
#import "VLCMain.h"
#import "VLCMainWindow.h"
#import "VLCAddonListItem.h"

35
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 <hartman at videolan dot org>
* Felix Paul Kühne <fkuehne at videolan dot org>
* David Fuhrmann <david dot fuhrmann at googlemail dot com>
* Pierre d'Herbemont <pdherbemont # videolan org>
*
* 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 <Cocoa/Cocoa.h>
/*****************************************************************************
* VLCApplication interface
*****************************************************************************/
@interface VLCApplication : NSApplication
@end

49
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 <hartman at videolan.org>
* Felix Paul Kühne <fkuehne at videolan dot org>
* Pierre d'Herbemont <pdherbemont # videolan org>
* David Fuhrmann <david dot fuhrmann at googlemail dot com>
*
* 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

2
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"

2
modules/gui/macosx/VLCBookmarksWindowController.h

@ -22,7 +22,7 @@
*****************************************************************************/
#import <Cocoa/Cocoa.h>
#import "intf.h"
#import "VLCMain.h"
#import <vlc_common.h>
@interface VLCBookmarksWindowController : NSWindowController

2
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"

2
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"

2
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 <math.h>

2
modules/gui/macosx/VLCDebugMessageWindowController.m

@ -24,7 +24,7 @@
*****************************************************************************/
#import "VLCDebugMessageWindowController.h"
#import "intf.h"
#import "VLCMain.h"
#import <vlc_common.h>
static void MsgCallback(void *data, int type, const vlc_log_t *item, const char *format, va_list ap);

2
modules/gui/macosx/VLCEyeTvController.m

@ -27,7 +27,7 @@
/* for apple event interaction [carbon] */
//#import <Foundation/NSAppleScript>
/* for various VLC core related calls */
#import "intf.h"
#import "VLCMain.h"
@implementation VLCEyeTVController

2
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"

2
modules/gui/macosx/VLCHelpWindowController.m

@ -24,7 +24,7 @@
#import "VLCHelpWindowController.h"
#import "intf.h"
#import "VLCMain.h"
#import <vlc_intf_strings.h>
#import <vlc_about.h>
#import "CompatibilityFixes.h"

2
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"

2
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)

13
modules/gui/macosx/intf.h → 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 <hartman at videolan dot org>
@ -118,13 +118,4 @@ static NSString * VLCInputChangedNotification = @"VLCInputChangedNotification";
@end
/*****************************************************************************
* VLCApplication interface
*****************************************************************************/
@interface VLCApplication : NSApplication
@end
#import "helpers.h"

23
modules/gui/macosx/intf.m → 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 <stdlib.h> /* malloc(), free() */
#include <string.h>
@ -65,6 +65,7 @@
#import "VLCVideoEffectsWindowController.h"
#import "VLCAudioEffectsWindowController.h"
#import "VLCMain+OldPrefs.h"
#import "VLCApplication.h"
#ifdef HAVE_SPARKLE
#import <Sparkle/Sparkle.h> /* 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

2
modules/gui/macosx/VLCMainMenu.m

@ -22,7 +22,7 @@
*****************************************************************************/
#import "VLCMainMenu.h"
#import "intf.h"
#import "VLCMain.h"
#import <vlc_common.h>
#import <vlc_playlist.h>

2
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"

2
modules/gui/macosx/VLCOpenWindowController.m

@ -36,7 +36,7 @@
#import <AVFoundation/AVFoundation.h>
#import <CoreMedia/CoreMedia.h>
#import "intf.h"
#import "VLCMain.h"
#import "VLCPlaylist.h"
#import "VLCOpenWindowController.h"
#import "VLCOutput.h"

2
modules/gui/macosx/VLCOutput.m

@ -27,7 +27,7 @@
#import "VLCOutput.h"
#import "intf.h"
#import "VLCMain.h"
@interface VLCOutput()
{

2
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"

2
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"

2
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 <vlc_url.h>

2
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"

2
modules/gui/macosx/VLCRendererDialog.m

@ -24,7 +24,7 @@
#import "VLCRendererDialog.h"
#import "VLCRendererItem.h"
#import "intf.h"
#import "VLCMain.h"
#include <vlc_renderer_discovery.h>

2
modules/gui/macosx/VLCRendererDiscovery.m

@ -23,7 +23,7 @@
#import "VLCRendererDiscovery.h"
#import "intf.h"
#import "VLCMain.h"
#include <vlc_common.h>
#include <vlc_renderer_discovery.h>

2
modules/gui/macosx/VLCResumeDialogController.m

@ -24,7 +24,7 @@
#import "VLCResumeDialogController.h"
#import "intf.h"
#import "VLCMain.h"
#import "VLCStringUtility.h"
@interface VLCResumeDialogController()

4
modules/gui/macosx/VLCStatusBarIcon.m

@ -24,7 +24,7 @@
#import "VLCStatusBarIcon.h"
#import "VLCMainMenu.h"
#import "intf.h"
#import "VLCMain.h"
#import <vlc_common.h>
#import <vlc_playlist.h>
@ -33,6 +33,8 @@
#import "VLCCoreInteraction.h"
#import "VLCStringUtility.h"
#import "VLCApplication.h"
@interface VLCStatusBarIcon ()
{
NSMenuItem *_vlcStatusBarMenuItem;

2
modules/gui/macosx/VLCStringUtility.m

@ -26,7 +26,7 @@
#import "VLCStringUtility.h"
#import "intf.h"
#import "VLCMain.h"
#import "CompatibilityFixes.h"
#import <IOKit/storage/IOMedia.h>

2
modules/gui/macosx/VLCTrackSynchronizationWindowController.m

@ -23,7 +23,7 @@
*****************************************************************************/
#import "CompatibilityFixes.h"
#import "intf.h"
#import "VLCMain.h"
#import <vlc_common.h>
#import "VLCTrackSynchronizationWindowController.h"
#import "VLCCoreInteraction.h"

2
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"

2
modules/gui/macosx/VLCVoutView.m

@ -32,7 +32,7 @@
#import <stdlib.h> /* free() */
#import "CompatibilityFixes.h"
#import "intf.h"
#import "VLCMain.h"
#import "VLCVoutView.h"
#import "VLCCoreInteraction.h"
#import "VLCMainMenu.h"

2
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"

2
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"

2
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"

2
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)

2
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"

2
modules/gui/macosx/prefs.m

@ -54,7 +54,7 @@
#include <vlc_config_cat.h>
#import "CompatibilityFixes.h"
#import "intf.h"
#import "VLCMain.h"
#import "prefs.h"
#import "simple_prefs.h"
#import "prefs_widgets.h"

2
modules/gui/macosx/prefs_widgets.m

@ -37,7 +37,7 @@
#include <vlc_plugin.h>
#include <vlc_keys.h>
#include "intf.h"
#include "VLCMain.h"
#include "prefs_widgets.h"
#define CONFIG_ITEM_STRING_LIST (CONFIG_ITEM_STRING + 10)

2
modules/gui/macosx/simple_prefs.h

@ -22,7 +22,7 @@
*****************************************************************************/
#import <Cocoa/Cocoa.h>
#import "intf.h"
#import "VLCMain.h"
#import <vlc_common.h>
@interface VLCSimplePrefs : NSWindowController

2
modules/gui/macosx/simple_prefs.m

@ -34,7 +34,7 @@
#import <vlc_plugin.h>
#import <vlc_config_cat.h>
#import "misc.h"
#import "intf.h"
#import "VLCMain.h"
#import "VLCMain+OldPrefs.h"
#import "AppleRemote.h"
#import "VLCCoreInteraction.h"

2
modules/gui/minimal_macosx/VLCMinimalVoutWindow.m

@ -25,7 +25,7 @@
/*****************************************************************************
* Preamble
*****************************************************************************/
#import "intf.h"
#import "VLCMain.h"
#import "VLCMinimalVoutWindow.h"
#import "misc.h"

2
modules/gui/minimal_macosx/intf.m

@ -37,7 +37,7 @@
#include <vlc_playlist.h>
#include <vlc_vout_window.h>
#import "intf.h"
#import "VLCMain.h"
#import "VLCMinimalVoutWindow.h"
/*****************************************************************************

6
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

Loading…
Cancel
Save