diff --git a/extras/package/macosx/vlc.xcodeproj/project.pbxproj b/extras/package/macosx/vlc.xcodeproj/project.pbxproj
index 22c1fc393ade66f6982b5c44ac10be63a2bdbe61..194b788b265c23ee5683f9a2f025952e6b95fe8e 100644
--- a/extras/package/macosx/vlc.xcodeproj/project.pbxproj
+++ b/extras/package/macosx/vlc.xcodeproj/project.pbxproj
@@ -31,6 +31,8 @@
1C67C8A91D58EC1B0079E1C1 /* VLCPLItem.m in Sources */ = {isa = PBXBuildFile; fileRef = 7DF812F21B5599E40052293C /* VLCPLItem.m */; };
1C67C8AA1D58EC1E0079E1C1 /* VLCPLModel.h in Sources */ = {isa = PBXBuildFile; fileRef = 7DF812F31B5599E40052293C /* VLCPLModel.h */; };
1C67C8AB1D58EC290079E1C1 /* VLCPLModel.m in Sources */ = {isa = PBXBuildFile; fileRef = 7DF812F41B5599E40052293C /* VLCPLModel.m */; };
+ 1C7CB9181D787C4A00388902 /* VLCKeyboardBacklightControl.h in Sources */ = {isa = PBXBuildFile; fileRef = 7DF812EF1B555C8E0052293C /* VLCKeyboardBacklightControl.h */; };
+ 1C7CB9191D787C4A00388902 /* VLCKeyboardBacklightControl.m in Sources */ = {isa = PBXBuildFile; fileRef = 7DF812F01B555C8E0052293C /* VLCKeyboardBacklightControl.m */; };
1C88BA5419DC7B2200645190 /* yosemite-window-close-graphite.png in Resources */ = {isa = PBXBuildFile; fileRef = 1C88BA2419DC7B2200645190 /* yosemite-window-close-graphite.png */; };
1C88BA5519DC7B2200645190 /* yosemite-window-close-graphite@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = 1C88BA2519DC7B2200645190 /* yosemite-window-close-graphite@2x.png */; };
1C88BA5619DC7B2200645190 /* yosemite-window-close-on-graphite.png in Resources */ = {isa = PBXBuildFile; fileRef = 1C88BA2619DC7B2200645190 /* yosemite-window-close-on-graphite.png */; };
@@ -1326,8 +1328,8 @@
7DF0435F1972E26A0022B534 /* VLCAddonListItem.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; name = VLCAddonListItem.m; path = ../../../modules/gui/macosx/VLCAddonListItem.m; sourceTree = SOURCE_ROOT; };
7DF812ED1B555A340052293C /* VLCInputManager.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = VLCInputManager.h; path = ../../../modules/gui/macosx/VLCInputManager.h; sourceTree = "<group>"; };
7DF812EE1B555A340052293C /* VLCInputManager.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; name = VLCInputManager.m; path = ../../../modules/gui/macosx/VLCInputManager.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>"; };
+ 7DF812EF1B555C8E0052293C /* VLCKeyboardBacklightControl.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = VLCKeyboardBacklightControl.h; path = ../../../modules/gui/macosx/VLCKeyboardBacklightControl.h; sourceTree = "<group>"; };
+ 7DF812F01B555C8E0052293C /* VLCKeyboardBacklightControl.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; name = VLCKeyboardBacklightControl.m; path = ../../../modules/gui/macosx/VLCKeyboardBacklightControl.m; sourceTree = "<group>"; };
7DF812F11B5599E40052293C /* VLCPLItem.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = VLCPLItem.h; path = ../../../modules/gui/macosx/VLCPLItem.h; sourceTree = "<group>"; };
7DF812F21B5599E40052293C /* VLCPLItem.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; name = VLCPLItem.m; path = ../../../modules/gui/macosx/VLCPLItem.m; sourceTree = "<group>"; };
7DF812F31B5599E40052293C /* VLCPLModel.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = VLCPLModel.h; path = ../../../modules/gui/macosx/VLCPLModel.h; sourceTree = "<group>"; };
@@ -1917,8 +1919,8 @@
8ED6C27D03E2EB1C0059A3A7 /* VLCMain.m */,
7D5678EB1D5BA1DC002698F3 /* VLCApplication.h */,
7D5678EC1D5BA1DC002698F3 /* VLCApplication.m */,
- 7DF812EF1B555C8E0052293C /* KeyboardBacklight.h */,
- 7DF812F01B555C8E0052293C /* KeyboardBacklight.m */,
+ 7DF812EF1B555C8E0052293C /* VLCKeyboardBacklightControl.h */,
+ 7DF812F01B555C8E0052293C /* VLCKeyboardBacklightControl.m */,
8ED6C27E03E2EB1C0059A3A7 /* macosx.m */,
CC448A5A13B61D49009F72E0 /* VLCMainMenu.h */,
CC448A5B13B61D49009F72E0 /* VLCMainMenu.m */,
@@ -3966,6 +3968,8 @@
1CCB5F541A62A724004C3E90 /* VLCAddonListItem.m in Sources */,
1CCB5F551A62A724004C3E90 /* VLCAddonsWindowController.h in Sources */,
1CCB5F561A62A724004C3E90 /* VLCAddonsWindowController.m in Sources */,
+ 1C7CB9181D787C4A00388902 /* VLCKeyboardBacklightControl.h in Sources */,
+ 1C7CB9191D787C4A00388902 /* VLCKeyboardBacklightControl.m in Sources */,
1CCB5F571A62A724004C3E90 /* applescript.h in Sources */,
1CCB5F581A62A724004C3E90 /* applescript.m in Sources */,
1CCB5F591A62A724004C3E90 /* VLCAudioEffectsWindowController.h in Sources */,
diff --git a/modules/gui/macosx/Makefile.am b/modules/gui/macosx/Makefile.am
index d40fa9c763c0553d008951be3e56a0124bf86340..29bced30440eacb7683513d45a3d7c458e194235 100644
--- a/modules/gui/macosx/Makefile.am
+++ b/modules/gui/macosx/Makefile.am
@@ -40,7 +40,7 @@ libmacosx_plugin_la_SOURCES = \
VLCMain.h VLCMain.m \
VLCApplication.h VLCApplication.m \
iTunes.h \
- KeyboardBacklight.h KeyboardBacklight.m \
+ VLCKeyboardBacklightControl.h VLCKeyboardBacklightControl.m \
macosx.m \
VLCMainMenu.h VLCMainMenu.m \
MainWindowTitle.h MainWindowTitle.m \
diff --git a/modules/gui/macosx/KeyboardBacklight.h b/modules/gui/macosx/VLCKeyboardBacklightControl.h
similarity index 93%
rename from modules/gui/macosx/KeyboardBacklight.h
rename to modules/gui/macosx/VLCKeyboardBacklightControl.h
index 9727d674d6981056ae9bc587b2d2fb18f77bdee7..ecbb308f6c43e23e300e1ffb16d8c72aa3ae4e34 100644
--- a/modules/gui/macosx/KeyboardBacklight.h
+++ b/modules/gui/macosx/VLCKeyboardBacklightControl.h
@@ -1,5 +1,5 @@
/*****************************************************************************
- * KeyboardBacklight.h: MacBook keyboard backlight control for VLC
+ * VLCKeyboardBlacklightControl.h: MacBook keyboard backlight control for VLC
*****************************************************************************
* Copyright (C) 2015 VLC authors and VideoLAN
*
@@ -23,7 +23,7 @@
#import <Foundation/Foundation.h>
-@interface KeyboardBacklight : NSObject
+@interface VLCKeyboardBacklightControl : NSObject
/*!
* Initialize an instance of KeyboardBacklight.
diff --git a/modules/gui/macosx/KeyboardBacklight.m b/modules/gui/macosx/VLCKeyboardBacklightControl.m
similarity index 96%
rename from modules/gui/macosx/KeyboardBacklight.m
rename to modules/gui/macosx/VLCKeyboardBacklightControl.m
index fc201be5a4d1dec3dae48ca7ba90ae08b43bac4a..55cf2b0b7ffef205ab1067d717a48d686eeda488 100644
--- a/modules/gui/macosx/KeyboardBacklight.m
+++ b/modules/gui/macosx/VLCKeyboardBacklightControl.m
@@ -1,5 +1,5 @@
/*****************************************************************************
- * KeyboardBacklight.m: MacBook keyboard backlight control for VLC
+ * VLCKeyboardBlacklightControl.m: MacBook keyboard backlight control for VLC
*****************************************************************************
* Copyright (C) 2015 VLC authors and VideoLAN
*
@@ -21,7 +21,7 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
*****************************************************************************/
-#import "KeyboardBacklight.h"
+#import "VLCKeyboardBacklightControl.h"
#import <IOKit/IOKitLib.h>
enum {
@@ -31,7 +31,7 @@ enum {
kSetLEDFadeID = 3 // setLEDFade(int, int, int, int *)
};
-@implementation KeyboardBacklight {
+@implementation VLCKeyboardBacklightControl {
io_connect_t dataPort;
}
diff --git a/modules/gui/macosx/VLCVoutWindowController.h b/modules/gui/macosx/VLCVoutWindowController.h
index 183dda3ef3b69bce6f85ea38f453f4bad1414c2b..d7b7f9abac7d7c5bd2c82d9c21f9f57d22d47fd3 100644
--- a/modules/gui/macosx/VLCVoutWindowController.h
+++ b/modules/gui/macosx/VLCVoutWindowController.h
@@ -25,7 +25,7 @@
#import <Cocoa/Cocoa.h>
#import <vlc_vout_window.h>
-#import "KeyboardBacklight.h"
+#import "VLCKeyboardBacklightControl.h"
@class VLCControlsBarCommon;
@class VLCVideoWindowCommon;
diff --git a/modules/gui/macosx/VLCVoutWindowController.m b/modules/gui/macosx/VLCVoutWindowController.m
index a960ccf1a59087e8d68ec13b16c39a9b4131d2e3..8d7138da411f02d3366edc27caf6bd13aaa5aeda 100644
--- a/modules/gui/macosx/VLCVoutWindowController.m
+++ b/modules/gui/macosx/VLCVoutWindowController.m
@@ -197,7 +197,7 @@ void WindowClose(vout_window_t *p_wnd)
@interface VLCVoutWindowController ()
{
NSMutableDictionary *o_vout_dict;
- KeyboardBacklight *o_keyboard_backlight;
+ VLCKeyboardBacklightControl *o_keyboard_backlight;
NSPoint top_left_point;
@@ -217,7 +217,7 @@ void WindowClose(vout_window_t *p_wnd)
if (self) {
atomic_store(&b_intf_starting, true);
o_vout_dict = [[NSMutableDictionary alloc] init];
- o_keyboard_backlight = [[KeyboardBacklight alloc] init];
+ o_keyboard_backlight = [[VLCKeyboardBacklightControl alloc] init];
i_currentWindowLevel = NSNormalWindowLevel;
_currentStatusWindowLevel = NSFloatingWindowLevel;
}