[vlc-commits] macosx: rename eyetv to VLCEyeTvController

[David Fuhrmann]

vlc | branch: master | David Fuhrmann <dfuhrmann at videolan.org> | Mon Aug  8 15:57:49 2016 +0200| [fa1f5d024eb662cb0df3b5dbbe913a2f51b1cc9d] | committer: David Fuhrmann

macosx: rename eyetv to VLCEyeTvController

> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=fa1f5d024eb662cb0df3b5dbbe913a2f51b1cc9d
---

 extras/package/macosx/vlc.xcodeproj/project.pbxproj  | 16 ++++++++--------
 modules/gui/macosx/Makefile.am                       |  2 +-
 modules/gui/macosx/{eyetv.h => VLCEyeTvController.h} |  2 +-
 modules/gui/macosx/{eyetv.m => VLCEyeTvController.m} |  5 +++--
 modules/gui/macosx/open.m                            |  2 +-
 5 files changed, 14 insertions(+), 13 deletions(-)

diff --git a/extras/package/macosx/vlc.xcodeproj/project.pbxproj b/extras/package/macosx/vlc.xcodeproj/project.pbxproj
index 2db936c..3adc407 100644
--- a/extras/package/macosx/vlc.xcodeproj/project.pbxproj
+++ b/extras/package/macosx/vlc.xcodeproj/project.pbxproj
@@ -391,8 +391,8 @@
 		1CCB5F6B1A62A724004C3E90 /* ExtensionsDialogProvider.m in Sources */ = {isa = PBXBuildFile; fileRef = 5CCED71114C0D4A90057F8D1 /* ExtensionsDialogProvider.m */; };
 		1CCB5F6C1A62A724004C3E90 /* ExtensionsManager.h in Sources */ = {isa = PBXBuildFile; fileRef = 5CCED71214C0D4A90057F8D1 /* ExtensionsManager.h */; };
 		1CCB5F6D1A62A724004C3E90 /* ExtensionsManager.m in Sources */ = {isa = PBXBuildFile; fileRef = 5CCED71314C0D4A90057F8D1 /* ExtensionsManager.m */; };
-		1CCB5F6E1A62A724004C3E90 /* eyetv.h in Sources */ = {isa = PBXBuildFile; fileRef = CC6EDD4F0B9CA2140096068A /* eyetv.h */; };
-		1CCB5F6F1A62A724004C3E90 /* eyetv.m in Sources */ = {isa = PBXBuildFile; fileRef = CC6EDD500B9CA2140096068A /* eyetv.m */; };
+		1CCB5F6E1A62A724004C3E90 /* VLCEyeTvController.h in Sources */ = {isa = PBXBuildFile; fileRef = CC6EDD4F0B9CA2140096068A /* VLCEyeTvController.h */; };
+		1CCB5F6F1A62A724004C3E90 /* VLCEyeTvController.m in Sources */ = {isa = PBXBuildFile; fileRef = CC6EDD500B9CA2140096068A /* VLCEyeTvController.m */; };
 		1CCB5F701A62A724004C3E90 /* fspanel.h in Sources */ = {isa = PBXBuildFile; fileRef = 2AEF857609A5FEC900130822 /* fspanel.h */; };
 		1CCB5F711A62A724004C3E90 /* fspanel.m in Sources */ = {isa = PBXBuildFile; fileRef = 2AEF857709A5FEC900130822 /* fspanel.m */; };
 		1CCB5F721A62A724004C3E90 /* intf.h in Sources */ = {isa = PBXBuildFile; fileRef = 8ED6C27C03E2EB1C0059A3A7 /* intf.h */; };
@@ -1591,8 +1591,8 @@
 		CC6C01BB0DDF3F0700C7D754 /* opengl.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = opengl.c; path = ../../../modules/video_output/opengl.c; sourceTree = SOURCE_ROOT; };
 		CC6D8D9C0A878DED006F2BBE /* AppleRemote.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = AppleRemote.h; path = ../../../modules/gui/macosx/AppleRemote.h; sourceTree = SOURCE_ROOT; };
 		CC6D8D9D0A878DED006F2BBE /* AppleRemote.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = AppleRemote.m; path = ../../../modules/gui/macosx/AppleRemote.m; sourceTree = SOURCE_ROOT; };
-		CC6EDD4F0B9CA2140096068A /* eyetv.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = eyetv.h; path = ../../../modules/gui/macosx/eyetv.h; sourceTree = SOURCE_ROOT; };
-		CC6EDD500B9CA2140096068A /* eyetv.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = eyetv.m; path = ../../../modules/gui/macosx/eyetv.m; sourceTree = SOURCE_ROOT; };
+		CC6EDD4F0B9CA2140096068A /* VLCEyeTvController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = VLCEyeTvController.h; path = ../../../modules/gui/macosx/VLCEyeTvController.h; sourceTree = SOURCE_ROOT; };
+		CC6EDD500B9CA2140096068A /* VLCEyeTvController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = VLCEyeTvController.m; path = ../../../modules/gui/macosx/VLCEyeTvController.m; sourceTree = SOURCE_ROOT; };
 		CC707EC3137464CD0003010A /* TrackSynchronization.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = TrackSynchronization.h; path = ../../../modules/gui/macosx/TrackSynchronization.h; sourceTree = SOURCE_ROOT; };
 		CC707EC4137464CD0003010A /* TrackSynchronization.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = TrackSynchronization.m; path = ../../../modules/gui/macosx/TrackSynchronization.m; sourceTree = SOURCE_ROOT; };
 		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; };
@@ -1893,8 +1893,8 @@
 				5CCED71114C0D4A90057F8D1 /* ExtensionsDialogProvider.m */,
 				5CCED71214C0D4A90057F8D1 /* ExtensionsManager.h */,
 				5CCED71314C0D4A90057F8D1 /* ExtensionsManager.m */,
-				CC6EDD4F0B9CA2140096068A /* eyetv.h */,
-				CC6EDD500B9CA2140096068A /* eyetv.m */,
+				CC6EDD4F0B9CA2140096068A /* VLCEyeTvController.h */,
+				CC6EDD500B9CA2140096068A /* VLCEyeTvController.m */,
 				2AEF857609A5FEC900130822 /* fspanel.h */,
 				2AEF857709A5FEC900130822 /* fspanel.m */,
 				7D871D391B5E684D000B56C0 /* helpers.h */,
@@ -3979,8 +3979,8 @@
 				1CCB5F6C1A62A724004C3E90 /* ExtensionsManager.h in Sources */,
 				1CCB5F6D1A62A724004C3E90 /* ExtensionsManager.m in Sources */,
 				6BBBB8B41D112BAC001BD9BA /* VLCRendererItem.m in Sources */,
-				1CCB5F6E1A62A724004C3E90 /* eyetv.h in Sources */,
-				1CCB5F6F1A62A724004C3E90 /* eyetv.m in Sources */,
+				1CCB5F6E1A62A724004C3E90 /* VLCEyeTvController.h in Sources */,
+				1CCB5F6F1A62A724004C3E90 /* VLCEyeTvController.m in Sources */,
 				1CCB5F701A62A724004C3E90 /* fspanel.h in Sources */,
 				1CCB5F711A62A724004C3E90 /* fspanel.m in Sources */,
 				1CCB5F721A62A724004C3E90 /* intf.h in Sources */,
diff --git a/modules/gui/macosx/Makefile.am b/modules/gui/macosx/Makefile.am
index 0cd8123..eb0a2ad 100644
--- a/modules/gui/macosx/Makefile.am
+++ b/modules/gui/macosx/Makefile.am
@@ -36,7 +36,6 @@ libmacosx_plugin_la_SOURCES = \
 	DebugMessageVisualizer.h DebugMessageVisualizer.m \
 	ExtensionsDialogProvider.h ExtensionsDialogProvider.m \
 	ExtensionsManager.h ExtensionsManager.m \
-	eyetv.h eyetv.m \
 	fspanel.h fspanel.m \
 	HelpWindowController.h HelpWindowController.m \
 	intf-prefs.h intf-prefs.m \
@@ -78,6 +77,7 @@ libmacosx_plugin_la_SOURCES = \
 	VLCVoutWindowController.h VLCVoutWindowController.m \
 	Windows.h Windows.m \
 	VLCCoreDialogProvider.h VLCCoreDialogProvider.m \
+	VLCEyeTvController.h VLCEyeTvController.m \
 	VLCHUDSliderCell.h VLCHUDSliderCell.m \
 	VLCHUDButtonCell.h VLCHUDButtonCell.m \
 	VLCHUDCheckboxCell.h VLCHUDCheckboxCell.m \
diff --git a/modules/gui/macosx/eyetv.h b/modules/gui/macosx/VLCEyeTvController.h
similarity index 94%
rename from modules/gui/macosx/eyetv.h
rename to modules/gui/macosx/VLCEyeTvController.h
index 041f827..976b346 100644
--- a/modules/gui/macosx/eyetv.h
+++ b/modules/gui/macosx/VLCEyeTvController.h
@@ -1,5 +1,5 @@
 /*****************************************************************************
-* eyetv.h: small class to control the notification parts of the EyeTV plugin
+* VLCEyeTVController.h: small class to control the notification parts of the EyeTV plugin
 *****************************************************************************
 * Copyright (C) 2006-2007 VLC authors and VideoLAN
 * $Id$
diff --git a/modules/gui/macosx/eyetv.m b/modules/gui/macosx/VLCEyeTvController.m
similarity index 98%
rename from modules/gui/macosx/eyetv.m
rename to modules/gui/macosx/VLCEyeTvController.m
index 4455335..5d83cf7 100644
--- a/modules/gui/macosx/eyetv.m
+++ b/modules/gui/macosx/VLCEyeTvController.m
@@ -1,5 +1,5 @@
 /*****************************************************************************
-* eyetv.m: small class to control the notification parts of the EyeTV plugin
+* VLCEyeTVController.m: small class to control the notification parts of the EyeTV plugin
 *****************************************************************************
 * Copyright (C) 2006-2011 VLC authors and VideoLAN
 * $Id$
@@ -22,7 +22,8 @@
 * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
 *****************************************************************************/
 
-#import "eyetv.h"
+#import "VLCEyeTvController.h"
+
 /* for apple event interaction [carbon] */
 //#import <Foundation/NSAppleScript>
 /* for various VLC core related calls */
diff --git a/modules/gui/macosx/open.m b/modules/gui/macosx/open.m
index ea07894..b23061f 100644
--- a/modules/gui/macosx/open.m
+++ b/modules/gui/macosx/open.m
@@ -40,7 +40,7 @@
 #import "VLCPlaylist.h"
 #import "open.h"
 #import "output.h"
-#import "eyetv.h"
+#import "VLCEyeTvController.h"
 #import "misc.h"
 
 #import <vlc_url.h>