Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
What's new
7
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in / Register
Toggle navigation
Open sidebar
GSoC
GSoC2018
macOS
vlc
Commits
8eba6a82
Commit
8eba6a82
authored
Aug 08, 2016
by
David
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
macosx: rename to VLCTrackSynchronizationWindowController
parent
c6fdee69
Changes
10
Hide whitespace changes
Inline
Side-by-side
Showing
10 changed files
with
28 additions
and
29 deletions
+28
-29
extras/package/macosx/Resources/English.lproj/SyncTracks.xib
extras/package/macosx/Resources/English.lproj/SyncTracks.xib
+5
-6
extras/package/macosx/vlc.xcodeproj/project.pbxproj
extras/package/macosx/vlc.xcodeproj/project.pbxproj
+8
-8
modules/gui/macosx/InputManager.m
modules/gui/macosx/InputManager.m
+1
-1
modules/gui/macosx/MainMenu.m
modules/gui/macosx/MainMenu.m
+1
-1
modules/gui/macosx/Makefile.am
modules/gui/macosx/Makefile.am
+1
-1
modules/gui/macosx/VLCTrackSynchronizationWindowController.h
modules/gui/macosx/VLCTrackSynchronizationWindowController.h
+2
-2
modules/gui/macosx/VLCTrackSynchronizationWindowController.m
modules/gui/macosx/VLCTrackSynchronizationWindowController.m
+3
-3
modules/gui/macosx/VLCVoutWindowController.m
modules/gui/macosx/VLCVoutWindowController.m
+1
-1
modules/gui/macosx/intf.h
modules/gui/macosx/intf.h
+2
-2
modules/gui/macosx/intf.m
modules/gui/macosx/intf.m
+4
-4
No files found.
extras/package/macosx/Resources/English.lproj/SyncTracks.xib
View file @
8eba6a82
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<document
type=
"com.apple.InterfaceBuilder3.Cocoa.XIB"
version=
"3.0"
toolsVersion=
"
9532
"
systemVersion=
"15
D2
1"
targetRuntime=
"MacOSX.Cocoa"
propertyAccessControl=
"none"
useAutolayout=
"YES"
>
<document
type=
"com.apple.InterfaceBuilder3.Cocoa.XIB"
version=
"3.0"
toolsVersion=
"
10117
"
systemVersion=
"15
G3
1"
targetRuntime=
"MacOSX.Cocoa"
propertyAccessControl=
"none"
useAutolayout=
"YES"
>
<dependencies>
<dependencies>
<deployment
identifier=
"macosx"
/>
<development
version=
"7000"
identifier=
"xcode"
/>
<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"
/>
<capability
name=
"box content view"
minToolsVersion=
"7.0"
/>
</dependencies>
</dependencies>
<objects>
<objects>
<customObject
id=
"-2"
userLabel=
"File's Owner"
customClass=
"VLCTrackSynchronization"
>
<customObject
id=
"-2"
userLabel=
"File's Owner"
customClass=
"VLCTrackSynchronization
WindowController
"
>
<connections>
<connections>
<outlet
property=
"avLabel"
destination=
"39"
id=
"134"
/>
<outlet
property=
"avLabel"
destination=
"39"
id=
"134"
/>
<outlet
property=
"avStepper"
destination=
"10"
id=
"115"
/>
<outlet
property=
"avStepper"
destination=
"10"
id=
"115"
/>
...
@@ -284,7 +283,7 @@
...
@@ -284,7 +283,7 @@
</textField>
</textField>
<button
verticalHuggingPriority=
"750"
translatesAutoresizingMaskIntoConstraints=
"NO"
id=
"41"
>
<button
verticalHuggingPriority=
"750"
translatesAutoresizingMaskIntoConstraints=
"NO"
id=
"41"
>
<rect
key=
"frame"
x=
"16"
y=
"12"
width=
"39"
height=
"17"
/>
<rect
key=
"frame"
x=
"16"
y=
"12"
width=
"39"
height=
"17"
/>
<buttonCell
key=
"cell"
type=
"roundRect"
title=
"Reset"
bezelStyle=
"roundedRect"
image=
"
92D21617-8D17-4241-AC95-8B9E3346C39B
"
imagePosition=
"overlaps"
alignment=
"center"
controlSize=
"mini"
borderStyle=
"border"
inset=
"2"
id=
"42"
customClass=
"BGHUDButtonCell"
>
<buttonCell
key=
"cell"
type=
"roundRect"
title=
"Reset"
bezelStyle=
"roundedRect"
image=
"
FF2862BF-B9A1-44D3-96B5-AA87003226E8
"
imagePosition=
"overlaps"
alignment=
"center"
controlSize=
"mini"
borderStyle=
"border"
inset=
"2"
id=
"42"
customClass=
"BGHUDButtonCell"
>
<behavior
key=
"behavior"
pushIn=
"YES"
lightByBackground=
"YES"
lightByGray=
"YES"
/>
<behavior
key=
"behavior"
pushIn=
"YES"
lightByBackground=
"YES"
lightByGray=
"YES"
/>
<font
key=
"font"
metaFont=
"miniSystem"
/>
<font
key=
"font"
metaFont=
"miniSystem"
/>
<userDefinedRuntimeAttributes>
<userDefinedRuntimeAttributes>
...
@@ -312,7 +311,7 @@
...
@@ -312,7 +311,7 @@
</window>
</window>
</objects>
</objects>
<resources>
<resources>
<image
name=
"
92D21617-8D17-4241-AC95-8B9E3346C39B
"
width=
"1"
height=
"1"
>
<image
name=
"
FF2862BF-B9A1-44D3-96B5-AA87003226E8
"
width=
"1"
height=
"1"
>
<mutableData
key=
"keyedArchiveRepresentation"
>
<mutableData
key=
"keyedArchiveRepresentation"
>
YnBsaXN0MDDUAQIDBAUGPT5YJHZlcnNpb25YJG9iamVjdHNZJGFyY2hpdmVyVCR0b3ASAAGGoK4HCBMU
YnBsaXN0MDDUAQIDBAUGPT5YJHZlcnNpb25YJG9iamVjdHNZJGFyY2hpdmVyVCR0b3ASAAGGoK4HCBMU
GR4fIyQrLjE3OlUkbnVsbNUJCgsMDQ4PEBESVk5TU2l6ZVYkY2xhc3NcTlNJbWFnZUZsYWdzVk5TUmVw
GR4fIyQrLjE3OlUkbnVsbNUJCgsMDQ4PEBESVk5TU2l6ZVYkY2xhc3NcTlNJbWFnZUZsYWdzVk5TUmVw
...
...
extras/package/macosx/vlc.xcodeproj/project.pbxproj
View file @
8eba6a82
...
@@ -420,8 +420,8 @@
...
@@ -420,8 +420,8 @@
1CCB5F881A62A724004C3E90
/* simple_prefs.m in Sources */
=
{
isa
=
PBXBuildFile
;
fileRef
=
CCB24D5D0D54BBAE004D780C
/* simple_prefs.m */
;
};
1CCB5F881A62A724004C3E90
/* simple_prefs.m in Sources */
=
{
isa
=
PBXBuildFile
;
fileRef
=
CCB24D5D0D54BBAE004D780C
/* simple_prefs.m */
;
};
1CCB5F891A62A724004C3E90
/* StringUtility.h in Sources */
=
{
isa
=
PBXBuildFile
;
fileRef
=
CC269A4615E7947F00F2FDC9
/* StringUtility.h */
;
};
1CCB5F891A62A724004C3E90
/* StringUtility.h in Sources */
=
{
isa
=
PBXBuildFile
;
fileRef
=
CC269A4615E7947F00F2FDC9
/* StringUtility.h */
;
};
1CCB5F8A1A62A724004C3E90
/* StringUtility.m in Sources */
=
{
isa
=
PBXBuildFile
;
fileRef
=
CC269A4715E7947F00F2FDC9
/* StringUtility.m */
;
};
1CCB5F8A1A62A724004C3E90
/* StringUtility.m in Sources */
=
{
isa
=
PBXBuildFile
;
fileRef
=
CC269A4715E7947F00F2FDC9
/* StringUtility.m */
;
};
1CCB5F8B1A62A724004C3E90
/* TrackSynchronization.h in Sources */
=
{
isa
=
PBXBuildFile
;
fileRef
=
CC707EC3137464CD0003010A
/* TrackSynchronization.h */
;
};
1CCB5F8B1A62A724004C3E90
/*
VLC
TrackSynchronization
WindowController
.h in Sources */
=
{
isa
=
PBXBuildFile
;
fileRef
=
CC707EC3137464CD0003010A
/*
VLC
TrackSynchronization
WindowController
.h */
;
};
1CCB5F8C1A62A724004C3E90
/* TrackSynchronization.m in Sources */
=
{
isa
=
PBXBuildFile
;
fileRef
=
CC707EC4137464CD0003010A
/* TrackSynchronization.m */
;
};
1CCB5F8C1A62A724004C3E90
/*
VLC
TrackSynchronization
WindowController
.m in Sources */
=
{
isa
=
PBXBuildFile
;
fileRef
=
CC707EC4137464CD0003010A
/*
VLC
TrackSynchronization
WindowController
.m */
;
};
1CCB5F8D1A62A724004C3E90
/* VLCVideoEffectsWindowController.h in Sources */
=
{
isa
=
PBXBuildFile
;
fileRef
=
CCCE366D13817E4500694F2A
/* VLCVideoEffectsWindowController.h */
;
};
1CCB5F8D1A62A724004C3E90
/* VLCVideoEffectsWindowController.h in Sources */
=
{
isa
=
PBXBuildFile
;
fileRef
=
CCCE366D13817E4500694F2A
/* VLCVideoEffectsWindowController.h */
;
};
1CCB5F8E1A62A724004C3E90
/* VLCVideoEffectsWindowController.m in Sources */
=
{
isa
=
PBXBuildFile
;
fileRef
=
CCCE366E13817E4500694F2A
/* VLCVideoEffectsWindowController.m */
;
};
1CCB5F8E1A62A724004C3E90
/* VLCVideoEffectsWindowController.m in Sources */
=
{
isa
=
PBXBuildFile
;
fileRef
=
CCCE366E13817E4500694F2A
/* VLCVideoEffectsWindowController.m */
;
};
1CCB5F8F1A62A724004C3E90
/* VideoView.h in Sources */
=
{
isa
=
PBXBuildFile
;
fileRef
=
CCCCDCA01413E1C000FE3DE1
/* VideoView.h */
;
};
1CCB5F8F1A62A724004C3E90
/* VideoView.h in Sources */
=
{
isa
=
PBXBuildFile
;
fileRef
=
CCCCDCA01413E1C000FE3DE1
/* VideoView.h */
;
};
...
@@ -1593,8 +1593,8 @@
...
@@ -1593,8 +1593,8 @@
CC6D8D9D0A878DED006F2BBE
/* AppleRemote.m */
=
{
isa
=
PBXFileReference
;
fileEncoding
=
4
;
lastKnownFileType
=
sourcecode.c.objc
;
name
=
AppleRemote.m
;
path
=
../../../modules/gui/macosx/AppleRemote.m
;
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
/* VLCEyeTvController.h */
=
{
isa
=
PBXFileReference
;
fileEncoding
=
4
;
lastKnownFileType
=
sourcecode.c.h
;
name
=
VLCEyeTvController.h
;
path
=
../../../modules/gui/macosx/VLCEyeTvController.h
;
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
;
};
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
;
};
CC707EC3137464CD0003010A
/*
VLC
TrackSynchronization
WindowController
.h */
=
{
isa
=
PBXFileReference
;
fileEncoding
=
4
;
lastKnownFileType
=
sourcecode.c.h
;
name
=
VLC
TrackSynchronization
WindowController
.h
;
path
=
../../../modules/gui/macosx/
VLC
TrackSynchronization
WindowController
.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
;
};
CC707EC4137464CD0003010A
/*
VLC
TrackSynchronization
WindowController
.m */
=
{
isa
=
PBXFileReference
;
fileEncoding
=
4
;
lastKnownFileType
=
sourcecode.c.objc
;
name
=
VLC
TrackSynchronization
WindowController
.m
;
path
=
../../../modules/gui/macosx/
VLC
TrackSynchronization
WindowController
.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
;
};
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
;
};
CC772DAD10E621C100675C9B
/* VLCProgressPanel.m */
=
{
isa
=
PBXFileReference
;
fileEncoding
=
4
;
lastKnownFileType
=
sourcecode.c.objc
;
name
=
VLCProgressPanel.m
;
path
=
../../../modules/gui/macosx_dialog_provider/VLCProgressPanel.m
;
sourceTree
=
SOURCE_ROOT
;
};
CC772DAD10E621C100675C9B
/* VLCProgressPanel.m */
=
{
isa
=
PBXFileReference
;
fileEncoding
=
4
;
lastKnownFileType
=
sourcecode.c.objc
;
name
=
VLCProgressPanel.m
;
path
=
../../../modules/gui/macosx_dialog_provider/VLCProgressPanel.m
;
sourceTree
=
SOURCE_ROOT
;
};
CC79F66614014FC30015D89E
/* opengl.h */
=
{
isa
=
PBXFileReference
;
lastKnownFileType
=
sourcecode.c.h
;
name
=
opengl.h
;
path
=
../../../modules/video_output/opengl.h
;
sourceTree
=
"<group>"
;
};
CC79F66614014FC30015D89E
/* opengl.h */
=
{
isa
=
PBXFileReference
;
lastKnownFileType
=
sourcecode.c.h
;
name
=
opengl.h
;
path
=
../../../modules/video_output/opengl.h
;
sourceTree
=
"<group>"
;
};
...
@@ -1935,8 +1935,8 @@
...
@@ -1935,8 +1935,8 @@
CCB24D5D0D54BBAE004D780C
/* simple_prefs.m */
,
CCB24D5D0D54BBAE004D780C
/* simple_prefs.m */
,
CC269A4615E7947F00F2FDC9
/* StringUtility.h */
,
CC269A4615E7947F00F2FDC9
/* StringUtility.h */
,
CC269A4715E7947F00F2FDC9
/* StringUtility.m */
,
CC269A4715E7947F00F2FDC9
/* StringUtility.m */
,
CC707EC3137464CD0003010A
/* TrackSynchronization.h */
,
CC707EC3137464CD0003010A
/*
VLC
TrackSynchronization
WindowController
.h */
,
CC707EC4137464CD0003010A
/* TrackSynchronization.m */
,
CC707EC4137464CD0003010A
/*
VLC
TrackSynchronization
WindowController
.m */
,
CCCE366D13817E4500694F2A
/* VLCVideoEffectsWindowController.h */
,
CCCE366D13817E4500694F2A
/* VLCVideoEffectsWindowController.h */
,
CCCE366E13817E4500694F2A
/* VLCVideoEffectsWindowController.m */
,
CCCE366E13817E4500694F2A
/* VLCVideoEffectsWindowController.m */
,
CCCCDCA01413E1C000FE3DE1
/* VideoView.h */
,
CCCCDCA01413E1C000FE3DE1
/* VideoView.h */
,
...
@@ -4013,8 +4013,8 @@
...
@@ -4013,8 +4013,8 @@
1CCB5F881A62A724004C3E90
/* simple_prefs.m in Sources */
,
1CCB5F881A62A724004C3E90
/* simple_prefs.m in Sources */
,
1CCB5F891A62A724004C3E90
/* StringUtility.h in Sources */
,
1CCB5F891A62A724004C3E90
/* StringUtility.h in Sources */
,
1CCB5F8A1A62A724004C3E90
/* StringUtility.m in Sources */
,
1CCB5F8A1A62A724004C3E90
/* StringUtility.m in Sources */
,
1CCB5F8B1A62A724004C3E90
/* TrackSynchronization.h in Sources */
,
1CCB5F8B1A62A724004C3E90
/*
VLC
TrackSynchronization
WindowController
.h in Sources */
,
1CCB5F8C1A62A724004C3E90
/* TrackSynchronization.m in Sources */
,
1CCB5F8C1A62A724004C3E90
/*
VLC
TrackSynchronization
WindowController
.m in Sources */
,
6BBBB8B71D114628001BD9BA
/* VLCRendererDiscovery.m in Sources */
,
6BBBB8B71D114628001BD9BA
/* VLCRendererDiscovery.m in Sources */
,
1CCB5F8D1A62A724004C3E90
/* VLCVideoEffectsWindowController.h in Sources */
,
1CCB5F8D1A62A724004C3E90
/* VLCVideoEffectsWindowController.h in Sources */
,
1CCB5F8E1A62A724004C3E90
/* VLCVideoEffectsWindowController.m in Sources */
,
1CCB5F8E1A62A724004C3E90
/* VLCVideoEffectsWindowController.m in Sources */
,
...
...
modules/gui/macosx/InputManager.m
View file @
8eba6a82
...
@@ -30,7 +30,7 @@
...
@@ -30,7 +30,7 @@
#import "VLCPlaylist.h"
#import "VLCPlaylist.h"
#import "VLCPlaylistInfo.h"
#import "VLCPlaylistInfo.h"
#import "VLCResumeDialogController.h"
#import "VLCResumeDialogController.h"
#import "TrackSynchronization.h"
#import "
VLC
TrackSynchronization
WindowController
.h"
#import "VideoView.h"
#import "VideoView.h"
#import "iTunes.h"
#import "iTunes.h"
...
...
modules/gui/macosx/MainMenu.m
View file @
8eba6a82
...
@@ -31,7 +31,7 @@
...
@@ -31,7 +31,7 @@
#import "AboutWindowController.h"
#import "AboutWindowController.h"
#import "open.h"
#import "open.h"
#import "VLCAudioEffectsWindowController.h"
#import "VLCAudioEffectsWindowController.h"
#import "TrackSynchronization.h"
#import "
VLC
TrackSynchronization
WindowController
.h"
#import "HelpWindowController.h"
#import "HelpWindowController.h"
#import "VLCVideoEffectsWindowController.h"
#import "VLCVideoEffectsWindowController.h"
#import "VLCBookmarksWindowController.h"
#import "VLCBookmarksWindowController.h"
...
...
modules/gui/macosx/Makefile.am
View file @
8eba6a82
...
@@ -64,7 +64,6 @@ libmacosx_plugin_la_SOURCES = \
...
@@ -64,7 +64,6 @@ libmacosx_plugin_la_SOURCES = \
SPMediaKeyTap.h SPMediaKeyTap.m
\
SPMediaKeyTap.h SPMediaKeyTap.m
\
Spotify.h
\
Spotify.h
\
StringUtility.h StringUtility.m
\
StringUtility.h StringUtility.m
\
TrackSynchronization.h TrackSynchronization.m
\
VideoView.h VideoView.m
\
VideoView.h VideoView.m
\
VLCTimeSelectionPanelController.h VLCTimeSelectionPanelController.m
\
VLCTimeSelectionPanelController.h VLCTimeSelectionPanelController.m
\
VLCUIWidgets.h VLCUIWidgets.m
\
VLCUIWidgets.h VLCUIWidgets.m
\
...
@@ -85,4 +84,5 @@ libmacosx_plugin_la_SOURCES = \
...
@@ -85,4 +84,5 @@ libmacosx_plugin_la_SOURCES = \
VLCRendererItem.h VLCRendererItem.m
\
VLCRendererItem.h VLCRendererItem.m
\
VLCRendererDialog.h VLCRendererDialog.m
\
VLCRendererDialog.h VLCRendererDialog.m
\
VLCResumeDialogController.h VLCResumeDialogController.m
\
VLCResumeDialogController.h VLCResumeDialogController.m
\
VLCTrackSynchronizationWindowController.h VLCTrackSynchronizationWindowController.m
\
VLCVideoEffectsWindowController.h VLCVideoEffectsWindowController.m
VLCVideoEffectsWindowController.h VLCVideoEffectsWindowController.m
modules/gui/macosx/TrackSynchronization.h
→
modules/gui/macosx/
VLC
TrackSynchronization
WindowController
.h
View file @
8eba6a82
/*****************************************************************************
/*****************************************************************************
* TrackSynchronization.h: MacOS X interface module
*
VLC
TrackSynchronization
WindowController
.h: MacOS X interface module
*****************************************************************************
*****************************************************************************
* Copyright (C) 2011-2012 VLC authors and VideoLAN
* Copyright (C) 2011-2012 VLC authors and VideoLAN
* Copyright (C) 2011-2015 Felix Paul Kühne
* Copyright (C) 2011-2015 Felix Paul Kühne
...
@@ -24,7 +24,7 @@
...
@@ -24,7 +24,7 @@
#import <Cocoa/Cocoa.h>
#import <Cocoa/Cocoa.h>
@interface
VLCTrackSynchronization
:
NSWindowController
@interface
VLCTrackSynchronization
WindowController
:
NSWindowController
/* generic */
/* generic */
@property
(
readwrite
,
weak
)
IBOutlet
NSButton
*
resetButton
;
@property
(
readwrite
,
weak
)
IBOutlet
NSButton
*
resetButton
;
...
...
modules/gui/macosx/TrackSynchronization.m
→
modules/gui/macosx/
VLC
TrackSynchronization
WindowController
.m
View file @
8eba6a82
/*****************************************************************************
/*****************************************************************************
* TrackSynchronization.m: MacOS X interface module
*
VLC
TrackSynchronization
WindowController
.m: MacOS X interface module
*****************************************************************************
*****************************************************************************
* Copyright (C) 2011-2014 VLC authors and VideoLAN
* Copyright (C) 2011-2014 VLC authors and VideoLAN
* Copyright (C) 2011-2015 Felix Paul Kühne
* Copyright (C) 2011-2015 Felix Paul Kühne
...
@@ -25,7 +25,7 @@
...
@@ -25,7 +25,7 @@
#import "CompatibilityFixes.h"
#import "CompatibilityFixes.h"
#import "intf.h"
#import "intf.h"
#import <vlc_common.h>
#import <vlc_common.h>
#import "TrackSynchronization.h"
#import "
VLC
TrackSynchronization
WindowController
.h"
#import "CoreInteraction.h"
#import "CoreInteraction.h"
#define SUBSDELAY_CFG_MODE "subsdelay-mode"
#define SUBSDELAY_CFG_MODE "subsdelay-mode"
...
@@ -34,7 +34,7 @@
...
@@ -34,7 +34,7 @@
#define SUBSDELAY_MODE_RELATIVE_SOURCE_DELAY 1
#define SUBSDELAY_MODE_RELATIVE_SOURCE_DELAY 1
#define SUBSDELAY_MODE_RELATIVE_SOURCE_CONTENT 2
#define SUBSDELAY_MODE_RELATIVE_SOURCE_CONTENT 2
@implementation
VLCTrackSynchronization
@implementation
VLCTrackSynchronization
WindowController
-
(
id
)
init
-
(
id
)
init
{
{
...
...
modules/gui/macosx/VLCVoutWindowController.m
View file @
8eba6a82
...
@@ -34,7 +34,7 @@
...
@@ -34,7 +34,7 @@
#import "VLCAudioEffectsWindowController.h"
#import "VLCAudioEffectsWindowController.h"
#import "VLCPlaylistInfo.h"
#import "VLCPlaylistInfo.h"
#import "VLCBookmarksWindowController.h"
#import "VLCBookmarksWindowController.h"
#import "TrackSynchronization.h"
#import "
VLC
TrackSynchronization
WindowController
.h"
#import "VLCResumeDialogController.h"
#import "VLCResumeDialogController.h"
#import "VLCPlaylist.h"
#import "VLCPlaylist.h"
...
...
modules/gui/macosx/intf.h
View file @
8eba6a82
...
@@ -67,7 +67,7 @@ static NSString * VLCInputChangedNotification = @"VLCInputChangedNotification";
...
@@ -67,7 +67,7 @@ static NSString * VLCInputChangedNotification = @"VLCInputChangedNotification";
@class
VLCBookmarksWindowController
;
@class
VLCBookmarksWindowController
;
@class
VLCOpen
;
@class
VLCOpen
;
@class
VLCDebugMessageVisualizer
;
@class
VLCDebugMessageVisualizer
;
@class
VLCTrackSynchronization
;
@class
VLCTrackSynchronization
WindowController
;
@class
VLCAudioEffectsWindowController
;
@class
VLCAudioEffectsWindowController
;
@class
VLCVideoEffectsWindowController
;
@class
VLCVideoEffectsWindowController
;
@class
VLCConvertAndSave
;
@class
VLCConvertAndSave
;
...
@@ -99,7 +99,7 @@ static NSString * VLCInputChangedNotification = @"VLCInputChangedNotification";
...
@@ -99,7 +99,7 @@ static NSString * VLCInputChangedNotification = @"VLCInputChangedNotification";
-
(
VLCDebugMessageVisualizer
*
)
debugMsgPanel
;
-
(
VLCDebugMessageVisualizer
*
)
debugMsgPanel
;
-
(
VLCTrackSynchronization
*
)
trackSyncPanel
;
-
(
VLCTrackSynchronization
WindowController
*
)
trackSyncPanel
;
-
(
VLCAudioEffectsWindowController
*
)
audioEffectsPanel
;
-
(
VLCAudioEffectsWindowController
*
)
audioEffectsPanel
;
-
(
VLCVideoEffectsWindowController
*
)
videoEffectsPanel
;
-
(
VLCVideoEffectsWindowController
*
)
videoEffectsPanel
;
...
...
modules/gui/macosx/intf.m
View file @
8eba6a82
...
@@ -55,7 +55,7 @@
...
@@ -55,7 +55,7 @@
#import "VLCCoreDialogProvider.h"
#import "VLCCoreDialogProvider.h"
#import "simple_prefs.h"
#import "simple_prefs.h"
#import "CoreInteraction.h"
#import "CoreInteraction.h"
#import "TrackSynchronization.h"
#import "
VLC
TrackSynchronization
WindowController
.h"
#import "ExtensionsManager.h"
#import "ExtensionsManager.h"
#import "BWQuincyManager.h"
#import "BWQuincyManager.h"
#import "VLCResumeDialogController.h"
#import "VLCResumeDialogController.h"
...
@@ -176,7 +176,7 @@ static int ShowController(vlc_object_t *p_this, const char *psz_variable,
...
@@ -176,7 +176,7 @@ static int ShowController(vlc_object_t *p_this, const char *psz_variable,
VLCPlaylist
*
_playlist
;
VLCPlaylist
*
_playlist
;
VLCDebugMessageVisualizer
*
_messagePanelController
;
VLCDebugMessageVisualizer
*
_messagePanelController
;
VLCStatusBarIcon
*
_statusBarIcon
;
VLCStatusBarIcon
*
_statusBarIcon
;
VLCTrackSynchronization
*
_trackSyncPanel
;
VLCTrackSynchronization
WindowController
*
_trackSyncPanel
;
VLCAudioEffectsWindowController
*
_audioEffectsPanel
;
VLCAudioEffectsWindowController
*
_audioEffectsPanel
;
VLCVideoEffectsWindowController
*
_videoEffectsPanel
;
VLCVideoEffectsWindowController
*
_videoEffectsPanel
;
VLCConvertAndSave
*
_convertAndSaveWindow
;
VLCConvertAndSave
*
_convertAndSaveWindow
;
...
@@ -544,10 +544,10 @@ static VLCMain *sharedInstance = nil;
...
@@ -544,10 +544,10 @@ static VLCMain *sharedInstance = nil;
return
_messagePanelController
;
return
_messagePanelController
;
}
}
-
(
VLCTrackSynchronization
*
)
trackSyncPanel
-
(
VLCTrackSynchronization
WindowController
*
)
trackSyncPanel
{
{
if
(
!
_trackSyncPanel
)
if
(
!
_trackSyncPanel
)
_trackSyncPanel
=
[[
VLCTrackSynchronization
alloc
]
init
];
_trackSyncPanel
=
[[
VLCTrackSynchronization
WindowController
alloc
]
init
];
return
_trackSyncPanel
;
return
_trackSyncPanel
;
}
}
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment