[vlc-commits] macosx: Use VLCVolumeSlider

[Marvin Scholz]

vlc | branch: master | Marvin Scholz <epirat07 at gmail.com> | Mon Jul 31 18:09:56 2017 +0200| [b3839ecb54dcafa6e6e0ea4787015d78f28cc8b7] | committer: Marvin Scholz

macosx: Use VLCVolumeSlider

> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=b3839ecb54dcafa6e6e0ea4787015d78f28cc8b7
---

 modules/gui/macosx/UI/MainWindow.xib          | 8 ++++----
 modules/gui/macosx/VLCDefaultValueSlider.h    | 2 --
 modules/gui/macosx/VLCDefaultValueSlider.m    | 5 -----
 modules/gui/macosx/VLCMainWindowControlsBar.h | 4 ++--
 4 files changed, 6 insertions(+), 13 deletions(-)

diff --git a/modules/gui/macosx/UI/MainWindow.xib b/modules/gui/macosx/UI/MainWindow.xib
index 5bc6939176..d30d2f544f 100644
--- a/modules/gui/macosx/UI/MainWindow.xib
+++ b/modules/gui/macosx/UI/MainWindow.xib
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="10117" systemVersion="16F73" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES">
+<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="12121" systemVersion="16G24b" 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="10117"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="12121"/>
         <capability name="box content view" minToolsVersion="7.0"/>
+        <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
     </dependencies>
     <objects>
         <customObject id="-2" userLabel="File's Owner" customClass="NSWindowController">
@@ -611,7 +611,7 @@
                                             <action selector="volumeAction:" target="5339" id="5361"/>
                                         </connections>
                                     </button>
-                                    <slider verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="3649" customClass="VLCDefaultValueSlider">
+                                    <slider verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="3649" customClass="VLCVolumeSlider">
                                         <rect key="frame" x="578" y="11" width="48" height="13"/>
                                         <constraints>
                                             <constraint firstAttribute="width" constant="48" id="XRa-UG-wuM"/>
diff --git a/modules/gui/macosx/VLCDefaultValueSlider.h b/modules/gui/macosx/VLCDefaultValueSlider.h
index 6b946157d0..ebb22f0f64 100644
--- a/modules/gui/macosx/VLCDefaultValueSlider.h
+++ b/modules/gui/macosx/VLCDefaultValueSlider.h
@@ -53,6 +53,4 @@
  */
 - (double)defaultValue;
 
-- (void)setUsesBrightArtwork:(BOOL)brightArtwork;
-
 @end
diff --git a/modules/gui/macosx/VLCDefaultValueSlider.m b/modules/gui/macosx/VLCDefaultValueSlider.m
index 1aec1d3187..16e689a467 100644
--- a/modules/gui/macosx/VLCDefaultValueSlider.m
+++ b/modules/gui/macosx/VLCDefaultValueSlider.m
@@ -78,9 +78,4 @@
     return [(VLCDefaultValueSliderCell *)self.cell defaultValue];
 }
 
-- (void)setUsesBrightArtwork:(BOOL)brightArtwork
-{
-    // TODO!
-}
-
 @end
diff --git a/modules/gui/macosx/VLCMainWindowControlsBar.h b/modules/gui/macosx/VLCMainWindowControlsBar.h
index 7a16c16732..279a469741 100644
--- a/modules/gui/macosx/VLCMainWindowControlsBar.h
+++ b/modules/gui/macosx/VLCMainWindowControlsBar.h
@@ -25,7 +25,7 @@
 #import <Cocoa/Cocoa.h>
 #import "misc.h"
 #import "VLCControlsBarCommon.h"
-#import "VLCDefaultValueSlider.h"
+#import "VLCVolumeSlider.h"
 
 /*****************************************************************************
  * VLCMainWindowControlsBar
@@ -49,7 +49,7 @@
 @property (readwrite, strong) IBOutlet NSButton *shuffleButton;
 @property (readwrite, strong) IBOutlet NSLayoutConstraint *shuffleButtonWidthConstraint;
 
- at property (readwrite, strong) IBOutlet VLCDefaultValueSlider *volumeSlider;
+ at property (readwrite, strong) IBOutlet VLCVolumeSlider *volumeSlider;
 @property (readwrite, strong) IBOutlet NSButton *volumeDownButton;
 @property (readwrite, strong) IBOutlet NSButton *volumeUpButton;