X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=src%2Fmain%2Fjava%2Fnet%2Fpterodactylus%2Fsonitus%2Fdata%2Fsink%2FAudioSink.java;h=f7ab938d569e73ec52247ab15d4bede54900dc2a;hb=09f8bd2297dc864e24baa67c65be97104e00c320;hp=5d1ebbcb2cfb29c125e88b93381d723bada69761;hpb=d6152103cbdee66c1b047d6411c8e9cbf180b79b;p=sonitus.git 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 5d1ebbc..f7ab938 100644 --- a/src/main/java/net/pterodactylus/sonitus/data/sink/AudioSink.java +++ b/src/main/java/net/pterodactylus/sonitus/data/sink/AudioSink.java @@ -17,23 +17,32 @@ package net.pterodactylus.sonitus.data.sink; -import static com.google.common.base.Preconditions.*; +import static javax.sound.sampled.FloatControl.Type.VOLUME; +import java.io.IOException; +import java.io.OutputStream; +import java.util.Arrays; +import java.util.List; import java.util.logging.Logger; import javax.sound.sampled.AudioFormat; import javax.sound.sampled.AudioSystem; +import javax.sound.sampled.FloatControl; import javax.sound.sampled.LineUnavailableException; import javax.sound.sampled.SourceDataLine; -import net.pterodactylus.sonitus.data.ConnectException; -import net.pterodactylus.sonitus.data.Connection; -import net.pterodactylus.sonitus.data.Format; +import net.pterodactylus.sonitus.data.Controller; +import net.pterodactylus.sonitus.data.Metadata; import net.pterodactylus.sonitus.data.Sink; import net.pterodactylus.sonitus.data.Source; +import net.pterodactylus.sonitus.data.controller.Fader; +import net.pterodactylus.sonitus.data.controller.Switch; +import net.pterodactylus.sonitus.io.IntegralWriteOutputStream; + +import com.google.common.base.Preconditions; /** - * {@link Sink} implementation that uses the JDK’s {@link javax.sound.sampled.AudioSystem} to play all {@link - * net.pterodactylus.sonitus.data.Source}s. + * {@link Sink} implementation that uses the JDK’s {@link AudioSystem} to play + * all {@link Source}s. * * @author David ‘Bombe’ Roden */ @@ -42,33 +51,116 @@ public class AudioSink implements Sink { /** The logger. */ private static final Logger logger = Logger.getLogger(AudioSink.class.getName()); + /** The volume fader. */ + private final Fader volumeFader; + + /** The “mute” switch. */ + private final Switch muteSwitch; + + /** The current metadata. */ + private Metadata metadata; + + /** The audio output. */ + private SourceDataLine sourceDataLine; + + /** A buffered output stream to ensure correct writing to the source data line. */ + private OutputStream sourceDataLineOutputStream = new IntegralWriteOutputStream(new OutputStream() { + + @Override + public void write(int b) throws IOException { + } + + @Override + public void write(byte[] b) throws IOException { + write(b, 0, b.length); + } + + @Override + public void write(byte[] b, int off, int len) throws IOException { + if (sourceDataLine != null) { + sourceDataLine.write(b, off, len); + } + } + }, 1024); + + /** Creates a new audio sink. */ + public AudioSink() { + volumeFader = new Fader("Volume") { + + @Override + protected void valueSet(Double value) { + if (sourceDataLine != null) { + FloatControl volumeControl = (FloatControl) sourceDataLine.getControl(VOLUME); + volumeControl.setValue((float) (value * volumeControl.getMaximum())); + } + } + }; + muteSwitch = new Switch("Mute") { + + private float previousValue; + + @Override + protected void valueSet(Boolean value) { + if (sourceDataLine != null) { + FloatControl volumeControl = (FloatControl) sourceDataLine.getControl(VOLUME); + if (value) { + previousValue = volumeControl.getValue(); + volumeControl.setValue(0); + } else { + volumeControl.setValue(previousValue); + } + } + } + }; + } + + // + // CONTROLLED METHODS + // + @Override - public void connect(Source source) throws ConnectException { - checkNotNull(source, "source must not be null"); - checkState(source.format().encoding().equalsIgnoreCase("PCM"), "source must be PCM-encoded"); + public String name() { + return "Audio Output"; + } + + @Override + public List> controllers() { + return Arrays.>asList(volumeFader, muteSwitch); + } + + // + // SINK METHODS + // - final Format sourceFormat = source.format(); - AudioFormat audioFormat = new AudioFormat(sourceFormat.frequency(), 16, sourceFormat.channels(), true, false); + @Override + public void open(Metadata metadata) throws IOException { + Preconditions.checkArgument(metadata.encoding().equalsIgnoreCase("PCM"), "source must be PCM-encoded"); + AudioFormat audioFormat = new AudioFormat(metadata.frequency(), 16, metadata.channels(), true, false); try { - final SourceDataLine sourceDataLine = AudioSystem.getSourceDataLine(audioFormat); + sourceDataLine = AudioSystem.getSourceDataLine(audioFormat); sourceDataLine.open(audioFormat); sourceDataLine.start(); - new Thread(new Connection(source) { - @Override - protected int bufferSize() { - return sourceFormat.channels() * sourceFormat.frequency() * 2; - } - - @Override - protected void feed(byte[] buffer) { - sourceDataLine.write(buffer, 0, buffer.length); - logger.finest(String.format("AudioSink: Wrote %d Bytes.", buffer.length)); - } - }).start(); - } - catch (LineUnavailableException lue1) { - throw new ConnectException(lue1); + } catch (LineUnavailableException e) { + /* TODO */ + throw new IOException(e); } } + @Override + public void close() { + sourceDataLine.stop(); + sourceDataLine.close(); + } + + @Override + public void metadataUpdated(Metadata metadata) { + logger.info(String.format("Now playing %s.", metadata)); + } + + @Override + public void process(byte[] buffer) throws IOException { + sourceDataLineOutputStream.write(buffer); + logger.finest(String.format("AudioSink: Wrote %d Bytes.", buffer.length)); + } + }