projects
/
sonitus.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Make controller’s value’s type variable.
[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
..
fdcbbd6
100644
(file)
--- a/
src/main/java/net/pterodactylus/sonitus/data/sink/AudioSink.java
+++ b/
src/main/java/net/pterodactylus/sonitus/data/sink/AudioSink.java
@@
-67,10
+67,10
@@
public class AudioSink implements Sink {
volumeFader = new Fader() {
@Override
volumeFader = new Fader() {
@Override
- protected void valueSet(
int
value) {
+ protected void valueSet(
Double
value) {
if (sourceDataLine != null) {
FloatControl volumeControl = (FloatControl) sourceDataLine.getControl(VOLUME);
if (sourceDataLine != null) {
FloatControl volumeControl = (FloatControl) sourceDataLine.getControl(VOLUME);
- volumeControl.setValue(
value * volumeControl.getMaximum() / (float) maximum(
));
+ volumeControl.setValue(
(float) (value * volumeControl.getMaximum()
));
}
}
};
}
}
};
@@
-79,10
+79,10
@@
public class AudioSink implements Sink {
private float previousValue;
@Override
private float previousValue;
@Override
- protected void valueSet(
int
value) {
+ protected void valueSet(
Boolean
value) {
if (sourceDataLine != null) {
FloatControl volumeControl = (FloatControl) sourceDataLine.getControl(VOLUME);
if (sourceDataLine != null) {
FloatControl volumeControl = (FloatControl) sourceDataLine.getControl(VOLUME);
- if (value
== 1
) {
+ if (value) {
previousValue = volumeControl.getValue();
volumeControl.setValue(0);
} else {
previousValue = volumeControl.getValue();
volumeControl.setValue(0);
} else {
@@
-98,8
+98,8
@@
public class AudioSink implements Sink {
//
@Override
//
@Override
- public List<Controller> controllers() {
- return Arrays.<Controller>asList(volumeFader, muteSwitch);
+ public List<Controller
<?>
> controllers() {
+ return Arrays.<Controller
<?>
>asList(volumeFader, muteSwitch);
}
//
}
//