[vlc-commits] macosx: Rename to VLCInputManager
David Fuhrmann
git at videolan.org
Mon Aug 8 18:47:38 CEST 2016
vlc | branch: master | David Fuhrmann <dfuhrmann at videolan.org> | Mon Aug 8 17:55:19 2016 +0200| [80b2257114fdbf661f4c5a27ee88c1b02748144f] | committer: David Fuhrmann
macosx: Rename to VLCInputManager
> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=80b2257114fdbf661f4c5a27ee88c1b02748144f
---
extras/package/macosx/vlc.xcodeproj/project.pbxproj | 8 ++++----
modules/gui/macosx/CoreInteraction.m | 2 +-
modules/gui/macosx/Makefile.am | 2 +-
modules/gui/macosx/{InputManager.h => VLCInputManager.h} | 2 +-
modules/gui/macosx/{InputManager.m => VLCInputManager.m} | 4 ++--
modules/gui/macosx/intf.m | 2 +-
6 files changed, 10 insertions(+), 10 deletions(-)
diff --git a/extras/package/macosx/vlc.xcodeproj/project.pbxproj b/extras/package/macosx/vlc.xcodeproj/project.pbxproj
index f53f1b7..fba1faf 100644
--- a/extras/package/macosx/vlc.xcodeproj/project.pbxproj
+++ b/extras/package/macosx/vlc.xcodeproj/project.pbxproj
@@ -1315,8 +1315,8 @@
7DE88F291831396A00CD9DA2 /* English */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = English; path = Resources/English.lproj/PlaylistAccessoryView.xib; sourceTree = "<group>"; };
7DF0435E1972E26A0022B534 /* AddonListDataSource.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = AddonListDataSource.h; path = ../../../modules/gui/macosx/AddonListDataSource.h; sourceTree = SOURCE_ROOT; };
7DF0435F1972E26A0022B534 /* AddonListDataSource.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; name = AddonListDataSource.m; path = ../../../modules/gui/macosx/AddonListDataSource.m; sourceTree = SOURCE_ROOT; };
- 7DF812ED1B555A340052293C /* InputManager.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = InputManager.h; path = ../../../modules/gui/macosx/InputManager.h; sourceTree = "<group>"; };
- 7DF812EE1B555A340052293C /* InputManager.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; name = InputManager.m; path = ../../../modules/gui/macosx/InputManager.m; sourceTree = "<group>"; };
+ 7DF812ED1B555A340052293C /* VLCInputManager.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = VLCInputManager.h; path = ../../../modules/gui/macosx/VLCInputManager.h; sourceTree = "<group>"; };
+ 7DF812EE1B555A340052293C /* VLCInputManager.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; name = VLCInputManager.m; path = ../../../modules/gui/macosx/VLCInputManager.m; sourceTree = "<group>"; };
7DF812EF1B555C8E0052293C /* KeyboardBacklight.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = KeyboardBacklight.h; path = ../../../modules/gui/macosx/KeyboardBacklight.h; sourceTree = "<group>"; };
7DF812F01B555C8E0052293C /* KeyboardBacklight.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; name = KeyboardBacklight.m; path = ../../../modules/gui/macosx/KeyboardBacklight.m; sourceTree = "<group>"; };
7DF812F11B5599E40052293C /* PLItem.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = PLItem.h; path = ../../../modules/gui/macosx/PLItem.h; sourceTree = "<group>"; };
@@ -1898,8 +1898,8 @@
2AEF857609A5FEC900130822 /* fspanel.h */,
2AEF857709A5FEC900130822 /* fspanel.m */,
7D871D391B5E684D000B56C0 /* helpers.h */,
- 7DF812ED1B555A340052293C /* InputManager.h */,
- 7DF812EE1B555A340052293C /* InputManager.m */,
+ 7DF812ED1B555A340052293C /* VLCInputManager.h */,
+ 7DF812EE1B555A340052293C /* VLCInputManager.m */,
7D871D371B5E6844000B56C0 /* intf-prefs.h */,
7D871D381B5E6844000B56C0 /* intf-prefs.m */,
8ED6C27C03E2EB1C0059A3A7 /* intf.h */,
diff --git a/modules/gui/macosx/CoreInteraction.m b/modules/gui/macosx/CoreInteraction.m
index b17138c..78e8946 100644
--- a/modules/gui/macosx/CoreInteraction.m
+++ b/modules/gui/macosx/CoreInteraction.m
@@ -39,7 +39,7 @@
#include <vlc_plugin.h>
#import "SPMediaKeyTap.h"
#import "AppleRemote.h"
-#import "InputManager.h"
+#import "VLCInputManager.h"
static int BossCallback(vlc_object_t *p_this, const char *psz_var,
vlc_value_t oldval, vlc_value_t new_val, void *param)
diff --git a/modules/gui/macosx/Makefile.am b/modules/gui/macosx/Makefile.am
index 9ca84b4..a7eaaaa 100644
--- a/modules/gui/macosx/Makefile.am
+++ b/modules/gui/macosx/Makefile.am
@@ -38,7 +38,6 @@ libmacosx_plugin_la_SOURCES = \
HelpWindowController.h HelpWindowController.m \
intf-prefs.h intf-prefs.m \
intf.h intf.m \
- InputManager.h InputManager.m \
iTunes.h \
KeyboardBacklight.h KeyboardBacklight.m \
macosx.m \
@@ -79,6 +78,7 @@ libmacosx_plugin_la_SOURCES = \
VLCHUDCheckboxCell.h VLCHUDCheckboxCell.m \
VLCHUDRadiobuttonCell.h VLCHUDRadiobuttonCell.m \
VLCHUDTextFieldCell.h VLCHUDTextFieldCell.m \
+ VLCInputManager.h VLCInputManager.m \
VLCMainWindow.h VLCMainWindow.m \
VLCRendererDiscovery.h VLCRendererDiscovery.m \
VLCRendererItem.h VLCRendererItem.m \
diff --git a/modules/gui/macosx/InputManager.h b/modules/gui/macosx/VLCInputManager.h
similarity index 96%
rename from modules/gui/macosx/InputManager.h
rename to modules/gui/macosx/VLCInputManager.h
index 516240b..791463c 100644
--- a/modules/gui/macosx/InputManager.h
+++ b/modules/gui/macosx/VLCInputManager.h
@@ -1,5 +1,5 @@
/*****************************************************************************
- * InputManager.h: MacOS X interface module
+ * VLCInputManager.h: MacOS X interface module
*****************************************************************************
* Copyright (C) 2015 VLC authors and VideoLAN
* $Id$
diff --git a/modules/gui/macosx/InputManager.m b/modules/gui/macosx/VLCInputManager.m
similarity index 99%
rename from modules/gui/macosx/InputManager.m
rename to modules/gui/macosx/VLCInputManager.m
index fed2268..b6c7220 100644
--- a/modules/gui/macosx/InputManager.m
+++ b/modules/gui/macosx/VLCInputManager.m
@@ -1,5 +1,5 @@
/*****************************************************************************
- * InputManager.m: MacOS X interface module
+ * VLCInputManager.m: MacOS X interface module
*****************************************************************************
* Copyright (C) 2015 VLC authors and VideoLAN
* $Id$
@@ -19,7 +19,7 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
*****************************************************************************/
-#import "InputManager.h"
+#import "VLCInputManager.h"
#import "CoreInteraction.h"
#import "CompatibilityFixes.h"
diff --git a/modules/gui/macosx/intf.m b/modules/gui/macosx/intf.m
index 02b38c7..ea86317 100644
--- a/modules/gui/macosx/intf.m
+++ b/modules/gui/macosx/intf.m
@@ -43,7 +43,7 @@
#include <vlc_variables.h>
#import "CompatibilityFixes.h"
-#import "InputManager.h"
+#import "VLCInputManager.h"
#import "MainMenu.h"
#import "VideoView.h"
#import "prefs.h"
More information about the vlc-commits
mailing list