Commit aa373d36 authored by David Fuhrmann's avatar David Fuhrmann

macosx: Rename to VLCExtensionsManager

parent e1df0389
......@@ -392,8 +392,8 @@
1CCB5F691A62A724004C3E90 /* VLCDebugMessageWindowController.m in Sources */ = {isa = PBXBuildFile; fileRef = 7D8BB0B418302AC000FAE9B7 /* VLCDebugMessageWindowController.m */; };
1CCB5F6A1A62A724004C3E90 /* VLCExtensionsDialogProvider.h in Sources */ = {isa = PBXBuildFile; fileRef = 5CCED71014C0D4A90057F8D1 /* VLCExtensionsDialogProvider.h */; };
1CCB5F6B1A62A724004C3E90 /* VLCExtensionsDialogProvider.m in Sources */ = {isa = PBXBuildFile; fileRef = 5CCED71114C0D4A90057F8D1 /* VLCExtensionsDialogProvider.m */; };
1CCB5F6C1A62A724004C3E90 /* ExtensionsManager.h in Sources */ = {isa = PBXBuildFile; fileRef = 5CCED71214C0D4A90057F8D1 /* ExtensionsManager.h */; };
1CCB5F6D1A62A724004C3E90 /* ExtensionsManager.m in Sources */ = {isa = PBXBuildFile; fileRef = 5CCED71314C0D4A90057F8D1 /* ExtensionsManager.m */; };
1CCB5F6C1A62A724004C3E90 /* VLCExtensionsManager.h in Sources */ = {isa = PBXBuildFile; fileRef = 5CCED71214C0D4A90057F8D1 /* VLCExtensionsManager.h */; };
1CCB5F6D1A62A724004C3E90 /* VLCExtensionsManager.m in Sources */ = {isa = PBXBuildFile; fileRef = 5CCED71314C0D4A90057F8D1 /* VLCExtensionsManager.m */; };
1CCB5F6E1A62A724004C3E90 /* VLCEyeTvController.h in Sources */ = {isa = PBXBuildFile; fileRef = CC6EDD4F0B9CA2140096068A /* VLCEyeTvController.h */; };
1CCB5F6F1A62A724004C3E90 /* VLCEyeTvController.m in Sources */ = {isa = PBXBuildFile; fileRef = CC6EDD500B9CA2140096068A /* VLCEyeTvController.m */; };
1CCB5F701A62A724004C3E90 /* VLCFSPanel.h in Sources */ = {isa = PBXBuildFile; fileRef = 2AEF857609A5FEC900130822 /* VLCFSPanel.h */; };
......@@ -1261,8 +1261,8 @@
2AEF857709A5FEC900130822 /* VLCFSPanel.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = VLCFSPanel.m; path = ../../../modules/gui/macosx/VLCFSPanel.m; sourceTree = SOURCE_ROOT; };
5CCED71014C0D4A90057F8D1 /* VLCExtensionsDialogProvider.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = VLCExtensionsDialogProvider.h; path = ../../../modules/gui/macosx/VLCExtensionsDialogProvider.h; sourceTree = SOURCE_ROOT; };
5CCED71114C0D4A90057F8D1 /* VLCExtensionsDialogProvider.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = VLCExtensionsDialogProvider.m; path = ../../../modules/gui/macosx/VLCExtensionsDialogProvider.m; sourceTree = SOURCE_ROOT; };
5CCED71214C0D4A90057F8D1 /* ExtensionsManager.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = ExtensionsManager.h; path = ../../../modules/gui/macosx/ExtensionsManager.h; sourceTree = SOURCE_ROOT; };
5CCED71314C0D4A90057F8D1 /* ExtensionsManager.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = ExtensionsManager.m; path = ../../../modules/gui/macosx/ExtensionsManager.m; sourceTree = SOURCE_ROOT; };
5CCED71214C0D4A90057F8D1 /* VLCExtensionsManager.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = VLCExtensionsManager.h; path = ../../../modules/gui/macosx/VLCExtensionsManager.h; sourceTree = SOURCE_ROOT; };
5CCED71314C0D4A90057F8D1 /* VLCExtensionsManager.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = VLCExtensionsManager.m; path = ../../../modules/gui/macosx/VLCExtensionsManager.m; sourceTree = SOURCE_ROOT; };
5CCED71414C0D4A90057F8D1 /* VLCUIWidgets.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = VLCUIWidgets.h; path = ../../../modules/gui/macosx/VLCUIWidgets.h; sourceTree = SOURCE_ROOT; };
5CCED71514C0D4A90057F8D1 /* VLCUIWidgets.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = VLCUIWidgets.m; path = ../../../modules/gui/macosx/VLCUIWidgets.m; sourceTree = SOURCE_ROOT; };
633121CA1B51122700E636DA /* VLCResumeDialogController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = VLCResumeDialogController.h; path = ../../../modules/gui/macosx/VLCResumeDialogController.h; sourceTree = "<group>"; };
......@@ -1902,8 +1902,8 @@
7D8BB0B418302AC000FAE9B7 /* VLCDebugMessageWindowController.m */,
5CCED71014C0D4A90057F8D1 /* VLCExtensionsDialogProvider.h */,
5CCED71114C0D4A90057F8D1 /* VLCExtensionsDialogProvider.m */,
5CCED71214C0D4A90057F8D1 /* ExtensionsManager.h */,
5CCED71314C0D4A90057F8D1 /* ExtensionsManager.m */,
5CCED71214C0D4A90057F8D1 /* VLCExtensionsManager.h */,
5CCED71314C0D4A90057F8D1 /* VLCExtensionsManager.m */,
CC6EDD4F0B9CA2140096068A /* VLCEyeTvController.h */,
CC6EDD500B9CA2140096068A /* VLCEyeTvController.m */,
2AEF857609A5FEC900130822 /* VLCFSPanel.h */,
......@@ -3993,8 +3993,8 @@
1CCB5F6A1A62A724004C3E90 /* VLCExtensionsDialogProvider.h in Sources */,
7DBB06641CC2314D004C74D2 /* caopengllayer.m in Sources */,
1CCB5F6B1A62A724004C3E90 /* VLCExtensionsDialogProvider.m in Sources */,
1CCB5F6C1A62A724004C3E90 /* ExtensionsManager.h in Sources */,
1CCB5F6D1A62A724004C3E90 /* ExtensionsManager.m in Sources */,
1CCB5F6C1A62A724004C3E90 /* VLCExtensionsManager.h in Sources */,
1CCB5F6D1A62A724004C3E90 /* VLCExtensionsManager.m in Sources */,
6BBBB8B41D112BAC001BD9BA /* VLCRendererItem.m in Sources */,
1CCB5F6E1A62A724004C3E90 /* VLCEyeTvController.h in Sources */,
1CCB5F6F1A62A724004C3E90 /* VLCEyeTvController.m in Sources */,
......
......@@ -33,7 +33,7 @@ libmacosx_plugin_la_SOURCES = \
VLCConvertAndSaveWindowController.h VLCConvertAndSaveWindowController.m \
VLCCoreInteraction.h VLCCoreInteraction.m \
VLCExtensionsDialogProvider.h VLCExtensionsDialogProvider.m \
ExtensionsManager.h ExtensionsManager.m \
VLCExtensionsManager.h VLCExtensionsManager.m \
VLCFSPanel.h VLCFSPanel.m \
VLCHelpWindowController.h VLCHelpWindowController.m \
VLCMain+OldPrefs.h VLCMain+OldPrefs.m \
......
......@@ -27,7 +27,7 @@
#import "VLCExtensionsDialogProvider.h"
#import "VLCMain.h"
#import "ExtensionsManager.h"
#import "VLCExtensionsManager.h"
#import "misc.h"
#import "VLCUIWidgets.h"
......
/*****************************************************************************
* extensions_manager.h: Extensions manager for Cocoa
* VLCExtensionsManager.h: Extensions manager for Cocoa
****************************************************************************
* Copyright (C) 2012 VideoLAN and authors
* $Id$
......@@ -38,7 +38,7 @@
- (void)extensionsUpdated;
@end
@interface ExtensionsManager : NSObject
@interface VLCExtensionsManager : NSObject
- (void)buildMenu:(NSMenu *)extMenu;
......
/*****************************************************************************
* extensions_manager.cpp: Extensions manager for Cocoa
* VLCExtensionsManager.m: Extensions manager for Cocoa
****************************************************************************
* Copyright (C) 2009-2012 VideoLAN and authors
* $Id$
......@@ -22,7 +22,7 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
*****************************************************************************/
#import "ExtensionsManager.h"
#import "VLCExtensionsManager.h"
#import "VLCExtensionsDialogProvider.h"
......@@ -33,7 +33,7 @@
#define MENU_GET_ACTION(a) ((uint16_t)(((uint32_t)a) >> 16))
#define MENU_GET_EXTENSION(a) ((uint16_t)(((uint32_t)a) & 0xFFFF))
@interface ExtensionsManager()
@interface VLCExtensionsManager()
{
extensions_manager_t *p_extensions_manager;
VLCExtensionsDialogProvider *_extensionDialogProvider;
......@@ -46,7 +46,7 @@
}
@end
@implementation ExtensionsManager
@implementation VLCExtensionsManager
- (id)init
{
......
......@@ -23,7 +23,7 @@
#import "VLCCoreInteraction.h"
#import "CompatibilityFixes.h"
#import "ExtensionsManager.h"
#import "VLCExtensionsManager.h"
#import "VLCMain.h"
#import "VLCMainMenu.h"
#import "VLCMainWindow.h"
......
......@@ -73,7 +73,7 @@ static NSString * VLCMediaKeySupportSettingChangedNotification = @"VLCMediaKeySu
@class VLCAudioEffectsWindowController;
@class VLCVideoEffectsWindowController;
@class VLCConvertAndSaveWindowController;
@class ExtensionsManager;
@class VLCExtensionsManager;
@class VLCInfo;
@class VLCStatusBarIcon;
......@@ -96,7 +96,7 @@ static NSString * VLCMediaKeySupportSettingChangedNotification = @"VLCMediaKeySu
- (VLCCoreDialogProvider *)coreDialogProvider;
- (VLCResumeDialogController *)resumeDialog;
- (VLCInputManager *)inputManager;
- (ExtensionsManager *)extensionsManager;
- (VLCExtensionsManager *)extensionsManager;
- (VLCStatusBarIcon *)statusBarIcon;
- (VLCDebugMessageWindowController *)debugMsgPanel;
......
......@@ -56,7 +56,7 @@
#import "simple_prefs.h"
#import "VLCCoreInteraction.h"
#import "VLCTrackSynchronizationWindowController.h"
#import "ExtensionsManager.h"
#import "VLCExtensionsManager.h"
#import "BWQuincyManager.h"
#import "VLCResumeDialogController.h"
#import "VLCDebugMessageWindowController.h"
......@@ -177,7 +177,7 @@ static int ShowController(vlc_object_t *p_this, const char *psz_variable,
VLCAudioEffectsWindowController *_audioEffectsPanel;
VLCVideoEffectsWindowController *_videoEffectsPanel;
VLCConvertAndSaveWindowController *_convertAndSaveWindow;
ExtensionsManager *_extensionsManager;
VLCExtensionsManager *_extensionsManager;
VLCInfo *_currentMediaInfoPanel;
bool b_intf_terminating; /* Makes sure applicationWillTerminate will be called only once */
......@@ -222,7 +222,7 @@ static VLCMain *sharedInstance = nil;
// first initalize extensions dialog provider, then core dialog
// provider which will register both at the core
_extensionsManager = [[ExtensionsManager alloc] init];
_extensionsManager = [[VLCExtensionsManager alloc] init];
_coredialogs = [[VLCCoreDialogProvider alloc] init];
_mainmenu = [[VLCMainMenu alloc] init];
......@@ -524,7 +524,7 @@ static VLCMain *sharedInstance = nil;
return _input_manager;
}
- (ExtensionsManager *)extensionsManager
- (VLCExtensionsManager *)extensionsManager
{
return _extensionsManager;
}
......
......@@ -42,7 +42,7 @@
#import "VLCCoreInteraction.h"
#import "VLCMainWindow.h"
#import "VLCMainWindowControlsBar.h"
#import "ExtensionsManager.h"
#import "VLCExtensionsManager.h"
#import "VLCConvertAndSaveWindowController.h"
#import "VLCDebugMessageWindowController.h"
#import "VLCAddonsWindowController.h"
......@@ -216,7 +216,7 @@
/* setup extensions menu */
/* Let the ExtensionsManager itself build the menu */
ExtensionsManager *extMgr = [[VLCMain sharedInstance] extensionsManager];
VLCExtensionsManager *extMgr = [[VLCMain sharedInstance] extensionsManager];
[extMgr buildMenu:_extensionsMenu];
[_extensions setEnabled: ([_extensionsMenu numberOfItems] > 0)];
......
......@@ -557,8 +557,8 @@ modules/gui/macosx/VLCCoreInteraction.h
modules/gui/macosx/VLCCoreInteraction.m
modules/gui/macosx/VLCExtensionsDialogProvider.h
modules/gui/macosx/VLCExtensionsDialogProvider.m
modules/gui/macosx/ExtensionsManager.h
modules/gui/macosx/ExtensionsManager.m
modules/gui/macosx/VLCExtensionsManager.h
modules/gui/macosx/VLCExtensionsManager.m
modules/gui/macosx/VLCEyeTvController.h
modules/gui/macosx/VLCEyeTvController.m
modules/gui/macosx/VLCFSPanel.h
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment