Add name to controllers.

[sonitus.git] / src / main / java / net / pterodactylus / sonitus / data / sink / AudioSink.java

diff --git a/src/main/java/net/pterodactylus/sonitus/data/sink/AudioSink.java b/src/main/java/net/pterodactylus/sonitus/data/sink/AudioSink.java
index 720b919..611dcd9 100644 (file)
--- a/src/main/java/net/pterodactylus/sonitus/data/sink/AudioSink.java
+++ b/src/main/java/net/pterodactylus/sonitus/data/sink/AudioSink.java
@@ -64,25 +64,25 @@ public class AudioSink implements Sink {
        /** Creates a new audio sink. */
        public AudioSink() {
                super();
-               volumeFader = new Fader() {
+               volumeFader = new Fader("Volume") {
 
                        @Override
-                       protected void valueSet(int value) {
+                       protected void valueSet(Double value) {
                                if (sourceDataLine != null) {
                                        FloatControl volumeControl = (FloatControl) sourceDataLine.getControl(VOLUME);
-                                       volumeControl.setValue(value * volumeControl.getMaximum() / (float) maximum());
+                                       volumeControl.setValue((float) (value * volumeControl.getMaximum()));
                                }
                        }
                };
-               muteSwitch = new Switch() {
+               muteSwitch = new Switch("Mute") {
 
                        private float previousValue;
 
                        @Override
-                       protected void valueSet(int value) {
+                       protected void valueSet(Boolean value) {
                                if (sourceDataLine != null) {
                                        FloatControl volumeControl = (FloatControl) sourceDataLine.getControl(VOLUME);
-                                       if (value == 1) {
+                                       if (value) {
                                                previousValue = volumeControl.getValue();
                                                volumeControl.setValue(0);
                                        } else {
@@ -98,8 +98,8 @@ public class AudioSink implements Sink {
        //
 
        @Override
-       public List<Controller> controllers() {
-               return Arrays.<Controller>asList(volumeFader, muteSwitch);
+       public List<Controller<?>> controllers() {
+               return Arrays.<Controller<?>>asList(volumeFader, muteSwitch);
        }
 
        //