openLine() moved to outlet:open()

Author: HelgeStenstrom

src/main/java/com/goxr3plus/streamplayer/stream/Outlet.java

@@ -1,18 +1,21 @@
 package com.goxr3plus.streamplayer.stream;
 
-import javax.sound.sampled.BooleanControl;
-import javax.sound.sampled.Control;
-import javax.sound.sampled.FloatControl;
-import javax.sound.sampled.SourceDataLine;
+import javax.sound.sampled.*;
+import java.util.logging.Logger;
 
 public class Outlet {
 
+    private final Logger logger;
     private FloatControl balanceControl;
     private FloatControl gainControl;
     private BooleanControl muteControl;
     private FloatControl panControl;
     private SourceDataLine sourceDataLine;
 
+    public Outlet(Logger logger) {
+        this.logger = logger;
+    }
+
 
     public FloatControl getBalanceControl() {
         return balanceControl;
@@ -114,4 +117,39 @@ void start() {
         getSourceDataLine().start();
     }
 
+    void open(AudioFormat audioFormat, int currentLineBufferSize) throws LineUnavailableException {
+        logger.info("Entered OpenLine()!:\n");
+
+        if (getSourceDataLine() != null) {
+            getSourceDataLine().open(audioFormat, currentLineBufferSize);
+
+            // opened?
+            if (getSourceDataLine().isOpen()) {
+
+                // Master_Gain Control?
+                if (getSourceDataLine().isControlSupported(FloatControl.Type.MASTER_GAIN))
+                    setGainControl((FloatControl) getSourceDataLine().getControl(FloatControl.Type.MASTER_GAIN));
+                else setGainControl(null);
+
+                // PanControl?
+                if (getSourceDataLine().isControlSupported(FloatControl.Type.PAN))
+                    setPanControl((FloatControl) getSourceDataLine().getControl(FloatControl.Type.PAN));
+                else setPanControl(null);
+
+                // Mute?
+                BooleanControl muteControl1 = getSourceDataLine().isControlSupported(BooleanControl.Type.MUTE)
+                        ? (BooleanControl) getSourceDataLine().getControl(BooleanControl.Type.MUTE)
+                        : null;
+                setMuteControl(muteControl1);
+
+                // Speakers Balance?
+                FloatControl balanceControl = getSourceDataLine().isControlSupported(FloatControl.Type.BALANCE)
+                        ? (FloatControl) getSourceDataLine().getControl(FloatControl.Type.BALANCE)
+                        : null;
+                setBalanceControl(balanceControl);
+            }
+        }
+        logger.info("Exited OpenLine()!:\n");
+    }
+
 }

src/main/java/com/goxr3plus/streamplayer/stream/StreamPlayer.java

@@ -171,7 +171,7 @@ public StreamPlayer(Logger logger, ExecutorService streamPlayerExecutorService,
 		this.streamPlayerExecutorService = streamPlayerExecutorService;
 		this.eventsExecutorService = eventsExecutorService;
 		listeners = new ArrayList<>();
-		outlet = new Outlet();
+		outlet = new Outlet(logger);
 		reset();
 	}
 
@@ -505,41 +505,7 @@ private void createLine() throws LineUnavailableException, StreamPlayerException
 	 * @param currentLineBufferSize
 	 */
 	private void openLine(AudioFormat audioFormat, int currentLineBufferSize) throws LineUnavailableException {
-
-		logger.info("Entered OpenLine()!:\n");
-
-		if (outlet.getSourceDataLine() != null) {
-			outlet.getSourceDataLine().open(audioFormat, currentLineBufferSize);
-
-			// opened?
-			if (outlet.getSourceDataLine().isOpen()) {
-
-				// Master_Gain Control?
-				if (outlet.getSourceDataLine().isControlSupported(FloatControl.Type.MASTER_GAIN))
-					outlet.setGainControl((FloatControl) outlet.getSourceDataLine().getControl(FloatControl.Type.MASTER_GAIN));
-				else outlet.setGainControl(null);
-
-				// PanControl?
-				if (outlet.getSourceDataLine().isControlSupported(FloatControl.Type.PAN))
-					outlet.setPanControl((FloatControl) outlet.getSourceDataLine().getControl(FloatControl.Type.PAN));
-				else outlet.setPanControl(null);
-
-				// Mute?
-				BooleanControl muteControl1 = outlet.getSourceDataLine().isControlSupported(BooleanControl.Type.MUTE)
-					? (BooleanControl) outlet.getSourceDataLine().getControl(BooleanControl.Type.MUTE)
-					: null;
-				outlet.setMuteControl(muteControl1);
-
-				// Speakers Balance?
-				FloatControl balanceControl = outlet.getSourceDataLine().isControlSupported(FloatControl.Type.BALANCE)
-					? (FloatControl) outlet.getSourceDataLine().getControl(FloatControl.Type.BALANCE)
-					: null;
-				outlet.setBalanceControl(balanceControl);
-			}
-
-		}
-
-		logger.info("Exited OpenLine()!:\n");
+		outlet.open(audioFormat, currentLineBufferSize);
 	}
 
 	/**