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
80b22571
Commit
80b22571
authored
Aug 08, 2016
by
David
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
macosx: Rename to VLCInputManager
parent
b1c445b6
Changes
6
Hide whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
10 additions
and
10 deletions
+10
-10
extras/package/macosx/vlc.xcodeproj/project.pbxproj
extras/package/macosx/vlc.xcodeproj/project.pbxproj
+4
-4
modules/gui/macosx/CoreInteraction.m
modules/gui/macosx/CoreInteraction.m
+1
-1
modules/gui/macosx/Makefile.am
modules/gui/macosx/Makefile.am
+1
-1
modules/gui/macosx/VLCInputManager.h
modules/gui/macosx/VLCInputManager.h
+1
-1
modules/gui/macosx/VLCInputManager.m
modules/gui/macosx/VLCInputManager.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 @
80b22571
...
...
@@ -1315,8 +1315,8 @@
7DE88F291831396A00CD9DA2
/* English */
=
{
isa
=
PBXFileReference
;
lastKnownFileType
=
file.xib
;
name
=
English
;
path
=
Resources/English.lproj/PlaylistAccessoryView.xib
;
sourceTree
=
"<group>"
;
};
7DF0435E1972E26A0022B534
/* AddonListDataSource.h */
=
{
isa
=
PBXFileReference
;
lastKnownFileType
=
sourcecode.c.h
;
name
=
AddonListDataSource.h
;
path
=
../../../modules/gui/macosx/AddonListDataSource.h
;
sourceTree
=
SOURCE_ROOT
;
};
7DF0435F1972E26A0022B534
/* AddonListDataSource.m */
=
{
isa
=
PBXFileReference
;
lastKnownFileType
=
sourcecode.c.objc
;
name
=
AddonListDataSource.m
;
path
=
../../../modules/gui/macosx/AddonListDataSource.m
;
sourceTree
=
SOURCE_ROOT
;
};
7DF812ED1B555A340052293C
/* InputManager.h */
=
{
isa
=
PBXFileReference
;
lastKnownFileType
=
sourcecode.c.h
;
name
=
InputManager.h
;
path
=
../../../modules/gui/macosx/InputManager.h
;
sourceTree
=
"<group>"
;
};
7DF812EE1B555A340052293C
/* InputManager.m */
=
{
isa
=
PBXFileReference
;
lastKnownFileType
=
sourcecode.c.objc
;
name
=
InputManager.m
;
path
=
../../../modules/gui/macosx/InputManager.m
;
sourceTree
=
"<group>"
;
};
7DF812ED1B555A340052293C
/*
VLC
InputManager.h */
=
{
isa
=
PBXFileReference
;
lastKnownFileType
=
sourcecode.c.h
;
name
=
VLC
InputManager.h
;
path
=
../../../modules/gui/macosx/
VLC
InputManager.h
;
sourceTree
=
"<group>"
;
};
7DF812EE1B555A340052293C
/*
VLC
InputManager.m */
=
{
isa
=
PBXFileReference
;
lastKnownFileType
=
sourcecode.c.objc
;
name
=
VLC
InputManager.m
;
path
=
../../../modules/gui/macosx/
VLC
InputManager.m
;
sourceTree
=
"<group>"
;
};
7DF812EF1B555C8E0052293C
/* KeyboardBacklight.h */
=
{
isa
=
PBXFileReference
;
lastKnownFileType
=
sourcecode.c.h
;
name
=
KeyboardBacklight.h
;
path
=
../../../modules/gui/macosx/KeyboardBacklight.h
;
sourceTree
=
"<group>"
;
};
7DF812F01B555C8E0052293C
/* KeyboardBacklight.m */
=
{
isa
=
PBXFileReference
;
lastKnownFileType
=
sourcecode.c.objc
;
name
=
KeyboardBacklight.m
;
path
=
../../../modules/gui/macosx/KeyboardBacklight.m
;
sourceTree
=
"<group>"
;
};
7DF812F11B5599E40052293C
/* PLItem.h */
=
{
isa
=
PBXFileReference
;
lastKnownFileType
=
sourcecode.c.h
;
name
=
PLItem.h
;
path
=
../../../modules/gui/macosx/PLItem.h
;
sourceTree
=
"<group>"
;
};
...
...
@@ -1898,8 +1898,8 @@
2AEF857609A5FEC900130822
/* fspanel.h */
,
2AEF857709A5FEC900130822
/* fspanel.m */
,
7D871D391B5E684D000B56C0
/* helpers.h */
,
7DF812ED1B555A340052293C
/* InputManager.h */
,
7DF812EE1B555A340052293C
/* InputManager.m */
,
7DF812ED1B555A340052293C
/*
VLC
InputManager.h */
,
7DF812EE1B555A340052293C
/*
VLC
InputManager.m */
,
7D871D371B5E6844000B56C0
/* intf-prefs.h */
,
7D871D381B5E6844000B56C0
/* intf-prefs.m */
,
8ED6C27C03E2EB1C0059A3A7
/* intf.h */
,
...
...
modules/gui/macosx/CoreInteraction.m
View file @
80b22571
...
...
@@ -39,7 +39,7 @@
#include <vlc_plugin.h>
#import "SPMediaKeyTap.h"
#import "AppleRemote.h"
#import "InputManager.h"
#import "
VLC
InputManager.h"
static
int
BossCallback
(
vlc_object_t
*
p_this
,
const
char
*
psz_var
,
vlc_value_t
oldval
,
vlc_value_t
new_val
,
void
*
param
)
...
...
modules/gui/macosx/Makefile.am
View file @
80b22571
...
...
@@ -38,7 +38,6 @@ libmacosx_plugin_la_SOURCES = \
HelpWindowController.h HelpWindowController.m
\
intf-prefs.h intf-prefs.m
\
intf.h intf.m
\
InputManager.h InputManager.m
\
iTunes.h
\
KeyboardBacklight.h KeyboardBacklight.m
\
macosx.m
\
...
...
@@ -79,6 +78,7 @@ libmacosx_plugin_la_SOURCES = \
VLCHUDCheckboxCell.h VLCHUDCheckboxCell.m
\
VLCHUDRadiobuttonCell.h VLCHUDRadiobuttonCell.m
\
VLCHUDTextFieldCell.h VLCHUDTextFieldCell.m
\
VLCInputManager.h VLCInputManager.m
\
VLCMainWindow.h VLCMainWindow.m
\
VLCRendererDiscovery.h VLCRendererDiscovery.m
\
VLCRendererItem.h VLCRendererItem.m
\
...
...
modules/gui/macosx/InputManager.h
→
modules/gui/macosx/
VLC
InputManager.h
View file @
80b22571
/*****************************************************************************
* InputManager.h: MacOS X interface module
*
VLC
InputManager.h: MacOS X interface module
*****************************************************************************
* Copyright (C) 2015 VLC authors and VideoLAN
* $Id$
...
...
modules/gui/macosx/InputManager.m
→
modules/gui/macosx/
VLC
InputManager.m
View file @
80b22571
/*****************************************************************************
* InputManager.m: MacOS X interface module
*
VLC
InputManager.m: MacOS X interface module
*****************************************************************************
* Copyright (C) 2015 VLC authors and VideoLAN
* $Id$
...
...
@@ -19,7 +19,7 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
*****************************************************************************/
#import "InputManager.h"
#import "
VLC
InputManager.h"
#import "CoreInteraction.h"
#import "CompatibilityFixes.h"
...
...
modules/gui/macosx/intf.m
View file @
80b22571
...
...
@@ -43,7 +43,7 @@
#include <vlc_variables.h>
#import "CompatibilityFixes.h"
#import "InputManager.h"
#import "
VLC
InputManager.h"
#import "MainMenu.h"
#import "VideoView.h"
#import "prefs.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