GitHub/sdrtrunk
1
0
Fork 0
mirror of https://github.com/DSheirer/sdrtrunk.git synced 2026-11-12 08:37:25 -05:00
Code Issues Packages Projects Releases 2 Wiki Activity

Resolved issue with audio cycling between channels every 2 seconds when

Browse Source 
audio mixer has stereo channel output.
This commit is contained in:
denny
2015-12-13 09:45:52 -05:00
parent 2bcffa0f44
commit 47f36590fb
4 changed files with 12 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
src/audio/AudioEvent.java
View File

@@ -29,6 +29,7 @@ public class AudioEvent
AUDIO_UNSQUELCHED,
AUDIO_STARTED,
AUDIO_STOPPED,
AUDIO_CONTINUATION,
AUDIO_CONFIGURATION_CHANGE_STARTED,
AUDIO_CONFIGURATION_CHANGE_COMPLETE;
}

1
src/audio/AudioManager.java
View File

@@ -319,6 +319,7 @@ public class AudioManager implements Listener<AudioPacket>, IAudioController
{
case AUDIO_STARTED:
case AUDIO_STOPPED:
case AUDIO_CONTINUATION:
mAudioStoppedTime = System.currentTimeMillis();
break;
default:

5
src/audio/output/MonoAudioOutput.java
View File

@@ -51,6 +51,7 @@ public class MonoAudioOutput extends AudioOutput
private AudioEvent mAudioStartEvent;
private AudioEvent mAudioStopEvent;
private AudioEvent mAudioContinuationEvent;
public MonoAudioOutput( Mixer mixer )
{
@@ -60,6 +61,8 @@ public class MonoAudioOutput extends AudioOutput
getChannelName() );
mAudioStopEvent = new AudioEvent( AudioEvent.Type.AUDIO_STOPPED,
getChannelName() );
mAudioContinuationEvent = new AudioEvent( AudioEvent.Type.AUDIO_CONTINUATION,
getChannelName() );
try
{
@@ -130,6 +133,8 @@ public class MonoAudioOutput extends AudioOutput
if( packets.size() > 0 )
{
broadcast( mAudioContinuationEvent );
for( AudioPacket packet: packets )
{
if( mCanProcessAudio )

5
src/audio/output/StereoAudioOutput.java
View File

@@ -51,6 +51,7 @@ public class StereoAudioOutput extends AudioOutput
private AudioEvent mAudioStartEvent;
private AudioEvent mAudioStopEvent;
private AudioEvent mAudioContinuationEvent;
private MixerChannel mMixerChannel;
@@ -66,6 +67,8 @@ public class StereoAudioOutput extends AudioOutput
getChannelName() );
mAudioStopEvent = new AudioEvent( AudioEvent.Type.AUDIO_STOPPED,
getChannelName() );
mAudioContinuationEvent = new AudioEvent( AudioEvent.Type.AUDIO_CONTINUATION,
getChannelName() );
try
{
@@ -166,6 +169,8 @@ public class StereoAudioOutput extends AudioOutput
if( packets.size() > 0 )
{
broadcast( mAudioContinuationEvent );
for( AudioPacket packet: packets )
{
if( mCanProcessAudio )