[vlc-commits] macosx: rename to VLCOutput
David Fuhrmann
git at videolan.org
Mon Aug 8 18:47:40 CEST 2016
vlc | branch: master | David Fuhrmann <dfuhrmann at videolan.org> | Mon Aug 8 18:33:29 2016 +0200| [829d2a02cd2a27ffd35b2feb5047d98589641e8d] | committer: David Fuhrmann
macosx: rename to VLCOutput
> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=829d2a02cd2a27ffd35b2feb5047d98589641e8d
---
extras/package/macosx/vlc.xcodeproj/project.pbxproj | 16 ++++++++--------
modules/gui/macosx/Makefile.am | 2 +-
modules/gui/macosx/VLCOpenWindowController.h | 2 ++
modules/gui/macosx/VLCOpenWindowController.m | 2 +-
modules/gui/macosx/{output.h => VLCOutput.h} | 4 +++-
modules/gui/macosx/{output.m => VLCOutput.m} | 7 ++++---
6 files changed, 19 insertions(+), 14 deletions(-)
diff --git a/extras/package/macosx/vlc.xcodeproj/project.pbxproj b/extras/package/macosx/vlc.xcodeproj/project.pbxproj
index 648bf96..965a814 100644
--- a/extras/package/macosx/vlc.xcodeproj/project.pbxproj
+++ b/extras/package/macosx/vlc.xcodeproj/project.pbxproj
@@ -404,8 +404,8 @@
1CCB5F781A62A724004C3E90 /* VLCMainWindow.m in Sources */ = {isa = PBXBuildFile; fileRef = CC448A6313B68A0B009F72E0 /* VLCMainWindow.m */; };
1CCB5F791A62A724004C3E90 /* VLCOpenWindowController.h in Sources */ = {isa = PBXBuildFile; fileRef = 8ED6C28103E2EB1C0059A3A7 /* VLCOpenWindowController.h */; };
1CCB5F7A1A62A724004C3E90 /* VLCOpenWindowController.m in Sources */ = {isa = PBXBuildFile; fileRef = 8ED6C28203E2EB1C0059A3A7 /* VLCOpenWindowController.m */; };
- 1CCB5F7B1A62A724004C3E90 /* output.h in Sources */ = {isa = PBXBuildFile; fileRef = 8E55FB7F0459B0FD00FB3317 /* output.h */; };
- 1CCB5F7C1A62A724004C3E90 /* output.m in Sources */ = {isa = PBXBuildFile; fileRef = 8E55FB800459B0FD00FB3317 /* output.m */; };
+ 1CCB5F7B1A62A724004C3E90 /* VLCOutput.h in Sources */ = {isa = PBXBuildFile; fileRef = 8E55FB7F0459B0FD00FB3317 /* VLCOutput.h */; };
+ 1CCB5F7C1A62A724004C3E90 /* VLCOutput.m in Sources */ = {isa = PBXBuildFile; fileRef = 8E55FB800459B0FD00FB3317 /* VLCOutput.m */; };
1CCB5F7D1A62A724004C3E90 /* VLCPlaylist.h in Sources */ = {isa = PBXBuildFile; fileRef = 8ED6C28303E2EB1C0059A3A7 /* VLCPlaylist.h */; };
1CCB5F7E1A62A724004C3E90 /* VLCPlaylist.m in Sources */ = {isa = PBXBuildFile; fileRef = 8ED6C28403E2EB1C0059A3A7 /* VLCPlaylist.m */; };
1CCB5F7F1A62A724004C3E90 /* VLCPlaylistInfo.h in Sources */ = {isa = PBXBuildFile; fileRef = 8E49720006417F6800370C9F /* VLCPlaylistInfo.h */; };
@@ -1327,8 +1327,8 @@
7DFFA16B16124F38001AF89F /* effects-one-button-pressed-dark at 2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = "effects-one-button-pressed-dark at 2x.png"; path = "Resources/mainwindow_dark/effects-one-button-pressed-dark at 2x.png"; sourceTree = "<group>"; };
8E49720006417F6800370C9F /* VLCPlaylistInfo.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = VLCPlaylistInfo.h; path = ../../../modules/gui/macosx/VLCPlaylistInfo.h; sourceTree = SOURCE_ROOT; };
8E49720106417F6800370C9F /* VLCPlaylistInfo.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = VLCPlaylistInfo.m; path = ../../../modules/gui/macosx/VLCPlaylistInfo.m; sourceTree = SOURCE_ROOT; };
- 8E55FB7F0459B0FD00FB3317 /* output.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = output.h; path = ../../../modules/gui/macosx/output.h; sourceTree = SOURCE_ROOT; };
- 8E55FB800459B0FD00FB3317 /* output.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = output.m; path = ../../../modules/gui/macosx/output.m; sourceTree = SOURCE_ROOT; };
+ 8E55FB7F0459B0FD00FB3317 /* VLCOutput.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = VLCOutput.h; path = ../../../modules/gui/macosx/VLCOutput.h; sourceTree = SOURCE_ROOT; };
+ 8E55FB800459B0FD00FB3317 /* VLCOutput.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = VLCOutput.m; path = ../../../modules/gui/macosx/VLCOutput.m; sourceTree = SOURCE_ROOT; };
8E6BC6F6041643860059A3A7 /* applescript.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = applescript.h; path = ../../../modules/gui/macosx/applescript.h; sourceTree = SOURCE_ROOT; };
8E6BC6F7041643860059A3A7 /* applescript.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = applescript.m; path = ../../../modules/gui/macosx/applescript.m; sourceTree = SOURCE_ROOT; };
8E9CA1A306D7DEE800B7186C /* prefs_widgets.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = prefs_widgets.h; path = ../../../modules/gui/macosx/prefs_widgets.h; sourceTree = SOURCE_ROOT; };
@@ -1917,8 +1917,8 @@
8ED6C28003E2EB1C0059A3A7 /* misc.m */,
8ED6C28103E2EB1C0059A3A7 /* VLCOpenWindowController.h */,
8ED6C28203E2EB1C0059A3A7 /* VLCOpenWindowController.m */,
- 8E55FB7F0459B0FD00FB3317 /* output.h */,
- 8E55FB800459B0FD00FB3317 /* output.m */,
+ 8E55FB7F0459B0FD00FB3317 /* VLCOutput.h */,
+ 8E55FB800459B0FD00FB3317 /* VLCOutput.m */,
7DF812F11B5599E40052293C /* PLItem.h */,
7DF812F21B5599E40052293C /* PLItem.m */,
7DF812F31B5599E40052293C /* PLModel.h */,
@@ -3995,9 +3995,9 @@
6B846FE61CF5D88C00112E54 /* VLCHUDRadiobuttonCell.m in Sources */,
1CCB5F791A62A724004C3E90 /* VLCOpenWindowController.h in Sources */,
1CCB5F7A1A62A724004C3E90 /* VLCOpenWindowController.m in Sources */,
- 1CCB5F7B1A62A724004C3E90 /* output.h in Sources */,
+ 1CCB5F7B1A62A724004C3E90 /* VLCOutput.h in Sources */,
1CC25CA81B2C585D0003F994 /* darwinvlc.m in Sources */,
- 1CCB5F7C1A62A724004C3E90 /* output.m in Sources */,
+ 1CCB5F7C1A62A724004C3E90 /* VLCOutput.m in Sources */,
1CCB5F7D1A62A724004C3E90 /* VLCPlaylist.h in Sources */,
1CCB5F7E1A62A724004C3E90 /* VLCPlaylist.m in Sources */,
1CCB5F7F1A62A724004C3E90 /* VLCPlaylistInfo.h in Sources */,
diff --git a/modules/gui/macosx/Makefile.am b/modules/gui/macosx/Makefile.am
index aa0517e..c1870cf5 100644
--- a/modules/gui/macosx/Makefile.am
+++ b/modules/gui/macosx/Makefile.am
@@ -44,7 +44,7 @@ libmacosx_plugin_la_SOURCES = \
MainWindowTitle.h MainWindowTitle.m \
misc.h misc.m \
VLCOpenWindowController.h VLCOpenWindowController.m \
- output.h output.m \
+ VLCOutput.h VLCOutput.m \
VLCPlaylistView.h VLCPlaylistView.m \
VLCPlaylist.h VLCPlaylist.m \
VLCPlaylistInfo.h VLCPlaylistInfo.m \
diff --git a/modules/gui/macosx/VLCOpenWindowController.h b/modules/gui/macosx/VLCOpenWindowController.h
index 47c28e2..4c24375 100644
--- a/modules/gui/macosx/VLCOpenWindowController.h
+++ b/modules/gui/macosx/VLCOpenWindowController.h
@@ -24,6 +24,8 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
*****************************************************************************/
+#import <Cocoa/Cocoa.h>
+
@interface VLCOpenWindowController : NSWindowController
@property (readwrite, weak) IBOutlet NSTextField *mrlTextField;
diff --git a/modules/gui/macosx/VLCOpenWindowController.m b/modules/gui/macosx/VLCOpenWindowController.m
index ca46f83..fc52fb0 100644
--- a/modules/gui/macosx/VLCOpenWindowController.m
+++ b/modules/gui/macosx/VLCOpenWindowController.m
@@ -39,7 +39,7 @@
#import "intf.h"
#import "VLCPlaylist.h"
#import "VLCOpenWindowController.h"
-#import "output.h"
+#import "VLCOutput.h"
#import "VLCEyeTvController.h"
#import "misc.h"
diff --git a/modules/gui/macosx/output.h b/modules/gui/macosx/VLCOutput.h
similarity index 98%
rename from modules/gui/macosx/output.h
rename to modules/gui/macosx/VLCOutput.h
index fe200ad..cbee1a5 100644
--- a/modules/gui/macosx/output.h
+++ b/modules/gui/macosx/VLCOutput.h
@@ -1,5 +1,5 @@
/*****************************************************************************
- * output.h: MacOS X Output Dialog
+ * VLCOutput.h: MacOS X Output Dialog
*****************************************************************************
* Copyright (C) 2002-2015 VLC authors and VideoLAN
* $Id$
@@ -24,6 +24,8 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
*****************************************************************************/
+#import <Cocoa/Cocoa.h>
+
@interface VLCOutput : NSObject
@property (readwrite, weak) IBOutlet NSPanel *outputSheet;
diff --git a/modules/gui/macosx/output.m b/modules/gui/macosx/VLCOutput.m
similarity index 99%
rename from modules/gui/macosx/output.m
rename to modules/gui/macosx/VLCOutput.m
index 31e6dbb..d19c23c 100644
--- a/modules/gui/macosx/output.m
+++ b/modules/gui/macosx/VLCOutput.m
@@ -1,5 +1,5 @@
/*****************************************************************************
- * output.m: MacOS X Output Dialog
+ * VLCOutput.m: MacOS X Output Dialog
*****************************************************************************
* Copyright (C) 2002-2015 VLC authors and VideoLAN
* $Id$
@@ -25,8 +25,9 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
*****************************************************************************/
-#include "intf.h"
-#include "output.h"
+#import "VLCOutput.h"
+
+#import "intf.h"
@interface VLCOutput()
{
More information about the vlc-commits
mailing list