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
92e11edb
Commit
92e11edb
authored
Aug 08, 2016
by
David
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
macosx: rename coredialogs.x to VLCCoreDialogProvider.x
parent
c53156c5
Changes
6
Hide whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
13 additions
and
14 deletions
+13
-14
extras/package/macosx/vlc.xcodeproj/project.pbxproj
extras/package/macosx/vlc.xcodeproj/project.pbxproj
+8
-8
modules/gui/macosx/ExtensionsDialogProvider.h
modules/gui/macosx/ExtensionsDialogProvider.h
+0
-1
modules/gui/macosx/Makefile.am
modules/gui/macosx/Makefile.am
+1
-1
modules/gui/macosx/VLCCoreDialogProvider.h
modules/gui/macosx/VLCCoreDialogProvider.h
+1
-1
modules/gui/macosx/VLCCoreDialogProvider.m
modules/gui/macosx/VLCCoreDialogProvider.m
+2
-2
modules/gui/macosx/intf.m
modules/gui/macosx/intf.m
+1
-1
No files found.
extras/package/macosx/vlc.xcodeproj/project.pbxproj
View file @
92e11edb
...
...
@@ -381,8 +381,8 @@
1CCB5F611A62A724004C3E90
/* ControlsBar.m in Sources */
=
{
isa
=
PBXBuildFile
;
fileRef
=
E0382C01160BA09E0031D7FF
/* ControlsBar.m */
;
};
1CCB5F621A62A724004C3E90
/* ConvertAndSave.h in Sources */
=
{
isa
=
PBXBuildFile
;
fileRef
=
CC0663341566C34C003A411C
/* ConvertAndSave.h */
;
};
1CCB5F631A62A724004C3E90
/* ConvertAndSave.m in Sources */
=
{
isa
=
PBXBuildFile
;
fileRef
=
CC0663351566C34C003A411C
/* ConvertAndSave.m */
;
};
1CCB5F641A62A724004C3E90
/*
c
ore
d
ialog
s
.h in Sources */
=
{
isa
=
PBXBuildFile
;
fileRef
=
CC4A33220F8CB017000FC4A7
/*
c
ore
d
ialog
s
.h */
;
};
1CCB5F651A62A724004C3E90
/*
c
ore
d
ialog
s
.m in Sources */
=
{
isa
=
PBXBuildFile
;
fileRef
=
CC4A33210F8CB017000FC4A7
/*
c
ore
d
ialog
s
.m */
;
};
1CCB5F641A62A724004C3E90
/*
VLCC
ore
D
ialog
Provider
.h in Sources */
=
{
isa
=
PBXBuildFile
;
fileRef
=
CC4A33220F8CB017000FC4A7
/*
VLCC
ore
D
ialog
Provider
.h */
;
};
1CCB5F651A62A724004C3E90
/*
VLCC
ore
D
ialog
Provider
.m in Sources */
=
{
isa
=
PBXBuildFile
;
fileRef
=
CC4A33210F8CB017000FC4A7
/*
VLCC
ore
D
ialog
Provider
.m */
;
};
1CCB5F661A62A724004C3E90
/* CoreInteraction.h in Sources */
=
{
isa
=
PBXBuildFile
;
fileRef
=
CC448A6013B68A0B009F72E0
/* CoreInteraction.h */
;
};
1CCB5F671A62A724004C3E90
/* CoreInteraction.m in Sources */
=
{
isa
=
PBXBuildFile
;
fileRef
=
CC448A6113B68A0B009F72E0
/* CoreInteraction.m */
;
};
1CCB5F681A62A724004C3E90
/* DebugMessageVisualizer.h in Sources */
=
{
isa
=
PBXBuildFile
;
fileRef
=
7D8BB0B318302AC000FAE9B7
/* DebugMessageVisualizer.h */
;
};
...
...
@@ -1575,8 +1575,8 @@
CC448A6313B68A0B009F72E0
/* MainWindow.m */
=
{
isa
=
PBXFileReference
;
lastKnownFileType
=
sourcecode.c.objc
;
name
=
MainWindow.m
;
path
=
../../../modules/gui/macosx/MainWindow.m
;
sourceTree
=
SOURCE_ROOT
;
};
CC461F6C160078340022423C
/* SharedDialogs.h */
=
{
isa
=
PBXFileReference
;
fileEncoding
=
4
;
lastKnownFileType
=
sourcecode.c.h
;
lineEnding
=
0
;
name
=
SharedDialogs.h
;
path
=
../../../modules/gui/macosx/SharedDialogs.h
;
sourceTree
=
SOURCE_ROOT
;
xcLanguageSpecificationIdentifier
=
xcode.lang.objcpp
;
};
CC461F6D160078340022423C
/* SharedDialogs.m */
=
{
isa
=
PBXFileReference
;
fileEncoding
=
4
;
lastKnownFileType
=
sourcecode.c.objc
;
name
=
SharedDialogs.m
;
path
=
../../../modules/gui/macosx/SharedDialogs.m
;
sourceTree
=
SOURCE_ROOT
;
};
CC4A33210F8CB017000FC4A7
/*
c
ore
d
ialog
s
.m */
=
{
isa
=
PBXFileReference
;
fileEncoding
=
4
;
lastKnownFileType
=
sourcecode.c.objc
;
name
=
c
ore
d
ialog
s
.m
;
path
=
../../../modules/gui/macosx/
c
ore
d
ialog
s
.m
;
sourceTree
=
SOURCE_ROOT
;
};
CC4A33220F8CB017000FC4A7
/*
c
ore
d
ialog
s
.h */
=
{
isa
=
PBXFileReference
;
fileEncoding
=
4
;
lastKnownFileType
=
sourcecode.c.h
;
name
=
c
ore
d
ialog
s
.h
;
path
=
../../../modules/gui/macosx/
c
ore
d
ialog
s
.h
;
sourceTree
=
SOURCE_ROOT
;
};
CC4A33210F8CB017000FC4A7
/*
VLCC
ore
D
ialog
Provider
.m */
=
{
isa
=
PBXFileReference
;
fileEncoding
=
4
;
lastKnownFileType
=
sourcecode.c.objc
;
name
=
VLCC
ore
D
ialog
Provider
.m
;
path
=
../../../modules/gui/macosx/
VLCC
ore
D
ialog
Provider
.m
;
sourceTree
=
SOURCE_ROOT
;
};
CC4A33220F8CB017000FC4A7
/*
VLCC
ore
D
ialog
Provider
.h */
=
{
isa
=
PBXFileReference
;
fileEncoding
=
4
;
lastKnownFileType
=
sourcecode.c.h
;
name
=
VLCC
ore
D
ialog
Provider
.h
;
path
=
../../../modules/gui/macosx/
VLCC
ore
D
ialog
Provider
.h
;
sourceTree
=
SOURCE_ROOT
;
};
CC4D67F71348F601003FCC5B
/* specific.c */
=
{
isa
=
PBXFileReference
;
lastKnownFileType
=
sourcecode.c.c
;
name
=
specific.c
;
path
=
../../../src/darwin/specific.c
;
sourceTree
=
"<group>"
;
};
CC4EFC2C13E96BD00091D19A
/* dropzone.png */
=
{
isa
=
PBXFileReference
;
lastKnownFileType
=
image.png
;
name
=
dropzone.png
;
path
=
Resources/mainwindow/dropzone.png
;
sourceTree
=
"<group>"
;
};
CC5560231365CDC700D54038
/* AudioEffects.h */
=
{
isa
=
PBXFileReference
;
lastKnownFileType
=
sourcecode.c.h
;
name
=
AudioEffects.h
;
path
=
../../../modules/gui/macosx/AudioEffects.h
;
sourceTree
=
SOURCE_ROOT
;
};
...
...
@@ -1883,8 +1883,8 @@
E0382C01160BA09E0031D7FF
/* ControlsBar.m */
,
CC0663341566C34C003A411C
/* ConvertAndSave.h */
,
CC0663351566C34C003A411C
/* ConvertAndSave.m */
,
CC4A33220F8CB017000FC4A7
/*
c
ore
d
ialog
s
.h */
,
CC4A33210F8CB017000FC4A7
/*
c
ore
d
ialog
s
.m */
,
CC4A33220F8CB017000FC4A7
/*
VLCC
ore
D
ialog
Provider
.h */
,
CC4A33210F8CB017000FC4A7
/*
VLCC
ore
D
ialog
Provider
.m */
,
CC448A6013B68A0B009F72E0
/* CoreInteraction.h */
,
CC448A6113B68A0B009F72E0
/* CoreInteraction.m */
,
7D8BB0B318302AC000FAE9B7
/* DebugMessageVisualizer.h */
,
...
...
@@ -3965,8 +3965,8 @@
1CCB5F611A62A724004C3E90
/* ControlsBar.m in Sources */
,
1CCB5F621A62A724004C3E90
/* ConvertAndSave.h in Sources */
,
1CCB5F631A62A724004C3E90
/* ConvertAndSave.m in Sources */
,
1CCB5F641A62A724004C3E90
/*
c
ore
d
ialog
s
.h in Sources */
,
1CCB5F651A62A724004C3E90
/*
c
ore
d
ialog
s
.m in Sources */
,
1CCB5F641A62A724004C3E90
/*
VLCC
ore
D
ialog
Provider
.h in Sources */
,
1CCB5F651A62A724004C3E90
/*
VLCC
ore
D
ialog
Provider
.m in Sources */
,
1CCB5F661A62A724004C3E90
/* CoreInteraction.h in Sources */
,
6BBBB8AA1D108A17001BD9BA
/* VLCRendererDialog.m in Sources */
,
1CCB5F671A62A724004C3E90
/* CoreInteraction.m in Sources */
,
...
...
modules/gui/macosx/ExtensionsDialogProvider.h
View file @
92e11edb
...
...
@@ -23,7 +23,6 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
*****************************************************************************/
#import "coredialogs.h"
#import "intf.h"
#import "VLCUIWidgets.h"
...
...
modules/gui/macosx/Makefile.am
View file @
92e11edb
...
...
@@ -32,7 +32,6 @@ libmacosx_plugin_la_SOURCES = \
CompatibilityFixes.h
\
ControlsBar.m ControlsBar.h
\
ConvertAndSave.h ConvertAndSave.m
\
coredialogs.h coredialogs.m
\
CoreInteraction.h CoreInteraction.m
\
DebugMessageVisualizer.h DebugMessageVisualizer.m
\
ExtensionsDialogProvider.h ExtensionsDialogProvider.m
\
...
...
@@ -78,6 +77,7 @@ libmacosx_plugin_la_SOURCES = \
VLCStatusBarIcon.h VLCStatusBarIcon.m
\
VLCVoutWindowController.h VLCVoutWindowController.m
\
Windows.h Windows.m
\
VLCCoreDialogProvider.h VLCCoreDialogProvider.m
\
VLCHUDSliderCell.h VLCHUDSliderCell.m
\
VLCHUDButtonCell.h VLCHUDButtonCell.m
\
VLCHUDCheckboxCell.h VLCHUDCheckboxCell.m
\
...
...
modules/gui/macosx/
c
ore
d
ialog
s
.h
→
modules/gui/macosx/
VLCC
ore
D
ialog
Provider
.h
View file @
92e11edb
/*****************************************************************************
*
c
ore
d
ialog
s
.h: Mac OS X Core Dialogs
*
VLCC
ore
D
ialog
Provider
.h: Mac OS X Core Dialogs
*****************************************************************************
* Copyright (C) 2005-2016 VLC authors and VideoLAN
* $Id$
...
...
modules/gui/macosx/
c
ore
d
ialog
s
.m
→
modules/gui/macosx/
VLCC
ore
D
ialog
Provider
.m
View file @
92e11edb
/*****************************************************************************
*
c
ore
d
ialog
s
.m: Mac OS X Core Dialogs
*
VLCC
ore
D
ialog
Provider
.m: Mac OS X Core Dialogs
*****************************************************************************
* Copyright (C) 2005-2016 VLC authors and VideoLAN
* $Id$
...
...
@@ -23,7 +23,7 @@
*****************************************************************************/
#import "intf.h"
#import "
c
ore
d
ialog
s
.h"
#import "
VLCC
ore
D
ialog
Provider
.h"
#import "misc.h"
/* for the icon in our custom error panel */
...
...
modules/gui/macosx/intf.m
View file @
92e11edb
...
...
@@ -52,7 +52,7 @@
#import "VLCPlaylistInfo.h"
#import "open.h"
#import "bookmarks.h"
#import "
c
ore
d
ialog
s
.h"
#import "
VLCC
ore
D
ialog
Provider
.h"
#import "simple_prefs.h"
#import "CoreInteraction.h"
#import "TrackSynchronization.h"
...
...
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