Skip to content

GitLab

V
vlc
Commit b3e1b006 authored by David Fuhrmann's avatar David Fuhrmann
Browse files
Options

macosx: rename to VLCVideoEffectsWindowController

parent 39a5afd2
Hide whitespace changes
Inline Side-by-side
Showing with 27 additions and 27 deletions
extras/package/macosx/Resources/English.lproj/VideoEffects.xib
View file @ b3e1b006
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="9532" systemVersion="15D21" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES">
<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="10117" systemVersion="15G31" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES">
<dependencies>
<deployment version="1070" identifier="macosx"/>
<development version="7000" identifier="xcode"/>
<plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="9532"/>
<plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="10117"/>
<capability name="box content view" minToolsVersion="7.0"/>
</dependencies>
<objects>
<customObject id="-2" userLabel="File's Owner" customClass="VLCVideoEffects">
<customObject id="-2" userLabel="File's Owner" customClass="VLCVideoEffectsWindowController">
<connections>
<outlet property="addLogoCheckbox" destination="643" id="zmd-dD-hIw"/>
<outlet property="addLogoLogoLabel" destination="652" id="sif-vx-H7Z"/>
......
extras/package/macosx/vlc.xcodeproj/project.pbxproj
View file @ b3e1b006
......@@ -422,8 +422,8 @@
1CCB5F8A1A62A724004C3E90 /* StringUtility.m in Sources */ = {isa = PBXBuildFile; fileRef = CC269A4715E7947F00F2FDC9 /* StringUtility.m */; };
1CCB5F8B1A62A724004C3E90 /* TrackSynchronization.h in Sources */ = {isa = PBXBuildFile; fileRef = CC707EC3137464CD0003010A /* TrackSynchronization.h */; };
1CCB5F8C1A62A724004C3E90 /* TrackSynchronization.m in Sources */ = {isa = PBXBuildFile; fileRef = CC707EC4137464CD0003010A /* TrackSynchronization.m */; };
1CCB5F8D1A62A724004C3E90 /* VideoEffects.h in Sources */ = {isa = PBXBuildFile; fileRef = CCCE366D13817E4500694F2A /* VideoEffects.h */; };
1CCB5F8E1A62A724004C3E90 /* VideoEffects.m in Sources */ = {isa = PBXBuildFile; fileRef = CCCE366E13817E4500694F2A /* VideoEffects.m */; };
1CCB5F8D1A62A724004C3E90 /* VLCVideoEffectsWindowController.h in Sources */ = {isa = PBXBuildFile; fileRef = CCCE366D13817E4500694F2A /* VLCVideoEffectsWindowController.h */; };
1CCB5F8E1A62A724004C3E90 /* VLCVideoEffectsWindowController.m in Sources */ = {isa = PBXBuildFile; fileRef = CCCE366E13817E4500694F2A /* VLCVideoEffectsWindowController.m */; };
1CCB5F8F1A62A724004C3E90 /* VideoView.h in Sources */ = {isa = PBXBuildFile; fileRef = CCCCDCA01413E1C000FE3DE1 /* VideoView.h */; };
1CCB5F901A62A724004C3E90 /* VideoView.m in Sources */ = {isa = PBXBuildFile; fileRef = CCCCDCA11413E1C000FE3DE1 /* VideoView.m */; };
1CCB5F911A62A724004C3E90 /* VLCUIWidgets.h in Sources */ = {isa = PBXBuildFile; fileRef = 5CCED71414C0D4A90057F8D1 /* VLCUIWidgets.h */; };
......@@ -1752,8 +1752,8 @@
CCCCDCA11413E1C000FE3DE1 /* VideoView.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; name = VideoView.m; path = ../../../modules/gui/macosx/VideoView.m; sourceTree = SOURCE_ROOT; };
CCCDDEEF13E870BB00A35661 /* SideBarItem.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = SideBarItem.h; path = ../../../modules/gui/macosx/SideBarItem.h; sourceTree = SOURCE_ROOT; };
CCCDDEF013E870BB00A35661 /* SideBarItem.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; name = SideBarItem.m; path = ../../../modules/gui/macosx/SideBarItem.m; sourceTree = SOURCE_ROOT; };
CCCE366D13817E4500694F2A /* VideoEffects.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = VideoEffects.h; path = ../../../modules/gui/macosx/VideoEffects.h; sourceTree = SOURCE_ROOT; };
CCCE366E13817E4500694F2A /* VideoEffects.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; lineEnding = 0; name = VideoEffects.m; path = ../../../modules/gui/macosx/VideoEffects.m; sourceTree = SOURCE_ROOT; xcLanguageSpecificationIdentifier = xcode.lang.objc; };
CCCE366D13817E4500694F2A /* VLCVideoEffectsWindowController.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = VLCVideoEffectsWindowController.h; path = ../../../modules/gui/macosx/VLCVideoEffectsWindowController.h; sourceTree = SOURCE_ROOT; };
CCCE366E13817E4500694F2A /* VLCVideoEffectsWindowController.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; lineEnding = 0; name = VLCVideoEffectsWindowController.m; path = ../../../modules/gui/macosx/VLCVideoEffectsWindowController.m; sourceTree = SOURCE_ROOT; xcLanguageSpecificationIdentifier = xcode.lang.objc; };
CCD590F010E5B73200D39094 /* dialogProvider.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = dialogProvider.h; path = ../../../modules/gui/macosx_dialog_provider/dialogProvider.h; sourceTree = SOURCE_ROOT; };
CCD590F110E5B73200D39094 /* dialogProvider.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = dialogProvider.m; path = ../../../modules/gui/macosx_dialog_provider/dialogProvider.m; sourceTree = SOURCE_ROOT; };
CCD590F210E5B76300D39094 /* VLCLoginPanel.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = VLCLoginPanel.h; path = ../../../modules/gui/macosx_dialog_provider/VLCLoginPanel.h; sourceTree = SOURCE_ROOT; };
......@@ -1937,8 +1937,8 @@
CC269A4715E7947F00F2FDC9 /* StringUtility.m */,
CC707EC3137464CD0003010A /* TrackSynchronization.h */,
CC707EC4137464CD0003010A /* TrackSynchronization.m */,
CCCE366D13817E4500694F2A /* VideoEffects.h */,
CCCE366E13817E4500694F2A /* VideoEffects.m */,
CCCE366D13817E4500694F2A /* VLCVideoEffectsWindowController.h */,
CCCE366E13817E4500694F2A /* VLCVideoEffectsWindowController.m */,
CCCCDCA01413E1C000FE3DE1 /* VideoView.h */,
CCCCDCA11413E1C000FE3DE1 /* VideoView.m */,
8ED6C28303E2EB1C0059A3A7 /* VLCPlaylist.h */,
......@@ -4016,8 +4016,8 @@
1CCB5F8B1A62A724004C3E90 /* TrackSynchronization.h in Sources */,
1CCB5F8C1A62A724004C3E90 /* TrackSynchronization.m in Sources */,
6BBBB8B71D114628001BD9BA /* VLCRendererDiscovery.m in Sources */,
1CCB5F8D1A62A724004C3E90 /* VideoEffects.h in Sources */,
1CCB5F8E1A62A724004C3E90 /* VideoEffects.m in Sources */,
1CCB5F8D1A62A724004C3E90 /* VLCVideoEffectsWindowController.h in Sources */,
1CCB5F8E1A62A724004C3E90 /* VLCVideoEffectsWindowController.m in Sources */,
1CCB5F8F1A62A724004C3E90 /* VideoView.h in Sources */,
1CCB5F901A62A724004C3E90 /* VideoView.m in Sources */,
1CCB5F911A62A724004C3E90 /* VLCUIWidgets.h in Sources */,
......
modules/gui/macosx/MainMenu.m
View file @ b3e1b006
......@@ -33,7 +33,7 @@
#import "VLCAudioEffectsWindowController.h"
#import "TrackSynchronization.h"
#import "HelpWindowController.h"
#import "VideoEffects.h"
#import "VLCVideoEffectsWindowController.h"
#import "VLCBookmarksWindowController.h"
#import "simple_prefs.h"
#import "VLCPlaylist.h"
......
modules/gui/macosx/Makefile.am
View file @ b3e1b006
......@@ -66,7 +66,6 @@ libmacosx_plugin_la_SOURCES = \
Spotify.h \
StringUtility.h StringUtility.m \
TrackSynchronization.h TrackSynchronization.m \
VideoEffects.h VideoEffects.m \
VideoView.h VideoView.m \
VLCTimeSelectionPanelController.h VLCTimeSelectionPanelController.m \
VLCUIWidgets.h VLCUIWidgets.m \
......@@ -85,4 +84,5 @@ libmacosx_plugin_la_SOURCES = \
VLCHUDTextFieldCell.h VLCHUDTextFieldCell.m \
VLCRendererDiscovery.h VLCRendererDiscovery.m \
VLCRendererItem.h VLCRendererItem.m \
VLCRendererDialog.h VLCRendererDialog.m
VLCRendererDialog.h VLCRendererDialog.m \
VLCVideoEffectsWindowController.h VLCVideoEffectsWindowController.m
modules/gui/macosx/VideoEffects.h → modules/gui/macosx/VLCVideoEffectsWindowController.h
View file @ b3e1b006
/*****************************************************************************
* VideoEffects.h: MacOS X interface module
* VLCVideoEffectsWindowController.h: MacOS X interface module
*****************************************************************************
* Copyright (C) 2011-2015 Felix Paul Kühne
* $Id$
......@@ -26,7 +26,7 @@
@class VLCPopupPanelController;
@class VLCTextfieldPanelController;
@interface VLCVideoEffects : NSWindowController
@interface VLCVideoEffectsWindowController : NSWindowController
/* generic */
@property (readwrite, weak) IBOutlet NSTabView *tabView;
......
modules/gui/macosx/VideoEffects.m → modules/gui/macosx/VLCVideoEffectsWindowController.m
View file @ b3e1b006
/*****************************************************************************
* VideoEffects.m: MacOS X interface module
* VLCVideoEffectsWindowController.m: MacOS X interface module
*****************************************************************************
* Copyright (C) 2011-2015 Felix Paul Kühne
* $Id$
......@@ -23,11 +23,11 @@
#import "CompatibilityFixes.h"
#import "intf.h"
#import "VideoEffects.h"
#import "VLCVideoEffectsWindowController.h"
#import "SharedDialogs.h"
#import "CoreInteraction.h"
@interface VLCVideoEffects()
@interface VLCVideoEffectsWindowController()
{
NSInteger i_old_profile_index;
}
......@@ -36,7 +36,7 @@
#pragma mark -
#pragma mark Initialization
@implementation VLCVideoEffects
@implementation VLCVideoEffectsWindowController
+ (void)initialize
{
......
modules/gui/macosx/VLCVoutWindowController.m
View file @ b3e1b006
......@@ -30,7 +30,7 @@
#import "MainWindow.h"
#import "VideoView.h"
#import "VideoEffects.h"
#import "VLCVideoEffectsWindowController.h"
#import "VLCAudioEffectsWindowController.h"
#import "VLCPlaylistInfo.h"
#import "VLCBookmarksWindowController.h"
......
modules/gui/macosx/intf.h
View file @ b3e1b006
......@@ -69,7 +69,7 @@ static NSString * VLCInputChangedNotification = @"VLCInputChangedNotification";
@class VLCDebugMessageVisualizer;
@class VLCTrackSynchronization;
@class VLCAudioEffectsWindowController;
@class VLCVideoEffects;
@class VLCVideoEffectsWindowController;
@class VLCConvertAndSave;
@class ExtensionsManager;
@class VLCInfo;
......@@ -101,7 +101,7 @@ static NSString * VLCInputChangedNotification = @"VLCInputChangedNotification";
- (VLCTrackSynchronization *)trackSyncPanel;
- (VLCAudioEffectsWindowController *)audioEffectsPanel;
- (VLCVideoEffects *)videoEffectsPanel;
- (VLCVideoEffectsWindowController *)videoEffectsPanel;
- (VLCInfo *)currentMediaInfoPanel;
......
modules/gui/macosx/intf.m
View file @ b3e1b006
......@@ -62,7 +62,7 @@
#import "DebugMessageVisualizer.h"
#import "ConvertAndSave.h"
#import "VideoEffects.h"
#import "VLCVideoEffectsWindowController.h"
#import "VLCAudioEffectsWindowController.h"
#import "intf-prefs.h"
......@@ -178,7 +178,7 @@ static int ShowController(vlc_object_t *p_this, const char *psz_variable,
VLCStatusBarIcon *_statusBarIcon;
VLCTrackSynchronization *_trackSyncPanel;
VLCAudioEffectsWindowController *_audioEffectsPanel;
VLCVideoEffects *_videoEffectsPanel;
VLCVideoEffectsWindowController *_videoEffectsPanel;
VLCConvertAndSave *_convertAndSaveWindow;
ExtensionsManager *_extensionsManager;
VLCInfo *_currentMediaInfoPanel;
......@@ -560,10 +560,10 @@ static VLCMain *sharedInstance = nil;
return _audioEffectsPanel;
}
- (VLCVideoEffects *)videoEffectsPanel
- (VLCVideoEffectsWindowController *)videoEffectsPanel
{
if (!_videoEffectsPanel)
_videoEffectsPanel = [[VLCVideoEffects alloc] init];
_videoEffectsPanel = [[VLCVideoEffectsWindowController alloc] init];
return _videoEffectsPanel;
}
......
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