mirror of
https://github.com/DSheirer/sdrtrunk.git
synced 2026-11-19 20:17:25 -05:00
Closes #41. Resolves issue with Mono/Stereo audio output when gain
and/or mute controls are not available for a particular mixer.
This commit is contained in:
@@ -10,6 +10,7 @@ import java.util.concurrent.TimeUnit;
|
|||||||
import java.util.concurrent.atomic.AtomicBoolean;
|
import java.util.concurrent.atomic.AtomicBoolean;
|
||||||
|
|
||||||
import javax.sound.sampled.BooleanControl;
|
import javax.sound.sampled.BooleanControl;
|
||||||
|
import javax.sound.sampled.Control;
|
||||||
import javax.sound.sampled.FloatControl;
|
import javax.sound.sampled.FloatControl;
|
||||||
import javax.sound.sampled.LineUnavailableException;
|
import javax.sound.sampled.LineUnavailableException;
|
||||||
import javax.sound.sampled.Mixer;
|
import javax.sound.sampled.Mixer;
|
||||||
@@ -23,6 +24,7 @@ import audio.AudioEvent;
|
|||||||
import audio.AudioFormats;
|
import audio.AudioFormats;
|
||||||
import audio.AudioPacket;
|
import audio.AudioPacket;
|
||||||
import audio.AudioPacket.Type;
|
import audio.AudioPacket.Type;
|
||||||
|
import audio.output.StereoAudioOutput.QueueProcessor;
|
||||||
import controller.NamingThreadFactory;
|
import controller.NamingThreadFactory;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
@@ -75,12 +77,6 @@ public class MonoAudioOutput extends AudioOutput
|
|||||||
|
|
||||||
mCanProcessAudio = true;
|
mCanProcessAudio = true;
|
||||||
|
|
||||||
mGainControl = (FloatControl)mOutput.getControl(
|
|
||||||
FloatControl.Type.MASTER_GAIN );
|
|
||||||
|
|
||||||
mMuteControl = (BooleanControl)mOutput.getControl(
|
|
||||||
BooleanControl.Type.MUTE );
|
|
||||||
|
|
||||||
mExecutorService = Executors.newSingleThreadScheduledExecutor(
|
mExecutorService = Executors.newSingleThreadScheduledExecutor(
|
||||||
new NamingThreadFactory( "audio (mono) output" ) );
|
new NamingThreadFactory( "audio (mono) output" ) );
|
||||||
|
|
||||||
@@ -94,6 +90,38 @@ public class MonoAudioOutput extends AudioOutput
|
|||||||
mLog.error( "Couldn't obtain source data line for 48kHz PCM mono "
|
mLog.error( "Couldn't obtain source data line for 48kHz PCM mono "
|
||||||
+ "audio output" );
|
+ "audio output" );
|
||||||
}
|
}
|
||||||
|
|
||||||
|
if( mOutput != null )
|
||||||
|
{
|
||||||
|
try
|
||||||
|
{
|
||||||
|
Control gain = mOutput.getControl( FloatControl.Type.MASTER_GAIN );
|
||||||
|
mGainControl = (FloatControl)gain;
|
||||||
|
}
|
||||||
|
catch( IllegalArgumentException iae )
|
||||||
|
{
|
||||||
|
mLog.warn( "Couldn't obtain MASTER GAIN control for mono line [" +
|
||||||
|
mixer.getMixerInfo().getName() + "]" );
|
||||||
|
}
|
||||||
|
|
||||||
|
try
|
||||||
|
{
|
||||||
|
Control mute = mOutput.getControl( BooleanControl.Type.MUTE );
|
||||||
|
mMuteControl = (BooleanControl)mute;
|
||||||
|
}
|
||||||
|
catch( IllegalArgumentException iae )
|
||||||
|
{
|
||||||
|
mLog.warn( "Couldn't obtain MUTE control for mono line [" +
|
||||||
|
mixer.getMixerInfo().getName() + "]" );
|
||||||
|
}
|
||||||
|
|
||||||
|
mExecutorService = Executors.newSingleThreadScheduledExecutor(
|
||||||
|
new NamingThreadFactory( "audio (mono) output" ) );
|
||||||
|
|
||||||
|
/* Run the queue processor task every 40 milliseconds */
|
||||||
|
mExecutorService.scheduleAtFixedRate( new QueueProcessor(),
|
||||||
|
0, 40, TimeUnit.MILLISECONDS );
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
|
|||||||
@@ -10,6 +10,7 @@ import java.util.concurrent.TimeUnit;
|
|||||||
import java.util.concurrent.atomic.AtomicBoolean;
|
import java.util.concurrent.atomic.AtomicBoolean;
|
||||||
|
|
||||||
import javax.sound.sampled.BooleanControl;
|
import javax.sound.sampled.BooleanControl;
|
||||||
|
import javax.sound.sampled.Control;
|
||||||
import javax.sound.sampled.FloatControl;
|
import javax.sound.sampled.FloatControl;
|
||||||
import javax.sound.sampled.LineUnavailableException;
|
import javax.sound.sampled.LineUnavailableException;
|
||||||
import javax.sound.sampled.Mixer;
|
import javax.sound.sampled.Mixer;
|
||||||
@@ -78,21 +79,7 @@ public class StereoAudioOutput extends AudioOutput
|
|||||||
if( mOutput != null )
|
if( mOutput != null )
|
||||||
{
|
{
|
||||||
mOutput.open( AudioFormats.PCM_SIGNED_48KHZ_16BITS_STEREO, BUFFER_SIZE );
|
mOutput.open( AudioFormats.PCM_SIGNED_48KHZ_16BITS_STEREO, BUFFER_SIZE );
|
||||||
|
|
||||||
mCanProcessAudio = true;
|
mCanProcessAudio = true;
|
||||||
|
|
||||||
mGainControl = (FloatControl)mOutput.getControl(
|
|
||||||
FloatControl.Type.MASTER_GAIN );
|
|
||||||
|
|
||||||
mMuteControl = (BooleanControl)mOutput.getControl(
|
|
||||||
BooleanControl.Type.MUTE );
|
|
||||||
|
|
||||||
mExecutorService = Executors.newSingleThreadScheduledExecutor(
|
|
||||||
new NamingThreadFactory( "audio (stereo) output" ) );
|
|
||||||
|
|
||||||
/* Run the queue processor task every 40 milliseconds */
|
|
||||||
mExecutorService.scheduleAtFixedRate( new QueueProcessor(),
|
|
||||||
0, 40, TimeUnit.MILLISECONDS );
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
catch ( LineUnavailableException e )
|
catch ( LineUnavailableException e )
|
||||||
@@ -101,6 +88,38 @@ public class StereoAudioOutput extends AudioOutput
|
|||||||
+ "audio output - mixer [" + mixer.getMixerInfo().getName() +
|
+ "audio output - mixer [" + mixer.getMixerInfo().getName() +
|
||||||
"] channel [" + mMixerChannel.name() + "]" );
|
"] channel [" + mMixerChannel.name() + "]" );
|
||||||
}
|
}
|
||||||
|
|
||||||
|
if( mOutput != null )
|
||||||
|
{
|
||||||
|
try
|
||||||
|
{
|
||||||
|
Control gain = mOutput.getControl( FloatControl.Type.MASTER_GAIN );
|
||||||
|
mGainControl = (FloatControl)gain;
|
||||||
|
}
|
||||||
|
catch( IllegalArgumentException iae )
|
||||||
|
{
|
||||||
|
mLog.warn( "Couldn't obtain MASTER GAIN control for stereo line [" +
|
||||||
|
mixer.getMixerInfo().getName() + " | " + channel.name() + "]" );
|
||||||
|
}
|
||||||
|
|
||||||
|
try
|
||||||
|
{
|
||||||
|
Control mute = mOutput.getControl( BooleanControl.Type.MUTE );
|
||||||
|
mMuteControl = (BooleanControl)mute;
|
||||||
|
}
|
||||||
|
catch( IllegalArgumentException iae )
|
||||||
|
{
|
||||||
|
mLog.warn( "Couldn't obtain MUTE control for stereo line [" +
|
||||||
|
mixer.getMixerInfo().getName() + " | " + channel.name() + "]" );
|
||||||
|
}
|
||||||
|
|
||||||
|
mExecutorService = Executors.newSingleThreadScheduledExecutor(
|
||||||
|
new NamingThreadFactory( "audio (stereo) output" ) );
|
||||||
|
|
||||||
|
/* Run the queue processor task every 40 milliseconds */
|
||||||
|
mExecutorService.scheduleAtFixedRate( new QueueProcessor(),
|
||||||
|
0, 40, TimeUnit.MILLISECONDS );
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
|
|||||||
Reference in New Issue
Block a user