mirror of
https://github.com/DSheirer/sdrtrunk.git
synced 2026-11-16 10:37:26 -05:00
Resolved issue with audio cycling between channels every 2 seconds when
audio mixer has stereo channel output.
This commit is contained in:
@@ -29,6 +29,7 @@ public class AudioEvent
|
|||||||
AUDIO_UNSQUELCHED,
|
AUDIO_UNSQUELCHED,
|
||||||
AUDIO_STARTED,
|
AUDIO_STARTED,
|
||||||
AUDIO_STOPPED,
|
AUDIO_STOPPED,
|
||||||
|
AUDIO_CONTINUATION,
|
||||||
AUDIO_CONFIGURATION_CHANGE_STARTED,
|
AUDIO_CONFIGURATION_CHANGE_STARTED,
|
||||||
AUDIO_CONFIGURATION_CHANGE_COMPLETE;
|
AUDIO_CONFIGURATION_CHANGE_COMPLETE;
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -319,6 +319,7 @@ public class AudioManager implements Listener<AudioPacket>, IAudioController
|
|||||||
{
|
{
|
||||||
case AUDIO_STARTED:
|
case AUDIO_STARTED:
|
||||||
case AUDIO_STOPPED:
|
case AUDIO_STOPPED:
|
||||||
|
case AUDIO_CONTINUATION:
|
||||||
mAudioStoppedTime = System.currentTimeMillis();
|
mAudioStoppedTime = System.currentTimeMillis();
|
||||||
break;
|
break;
|
||||||
default:
|
default:
|
||||||
|
|||||||
@@ -51,6 +51,7 @@ public class MonoAudioOutput extends AudioOutput
|
|||||||
|
|
||||||
private AudioEvent mAudioStartEvent;
|
private AudioEvent mAudioStartEvent;
|
||||||
private AudioEvent mAudioStopEvent;
|
private AudioEvent mAudioStopEvent;
|
||||||
|
private AudioEvent mAudioContinuationEvent;
|
||||||
|
|
||||||
public MonoAudioOutput( Mixer mixer )
|
public MonoAudioOutput( Mixer mixer )
|
||||||
{
|
{
|
||||||
@@ -60,6 +61,8 @@ public class MonoAudioOutput extends AudioOutput
|
|||||||
getChannelName() );
|
getChannelName() );
|
||||||
mAudioStopEvent = new AudioEvent( AudioEvent.Type.AUDIO_STOPPED,
|
mAudioStopEvent = new AudioEvent( AudioEvent.Type.AUDIO_STOPPED,
|
||||||
getChannelName() );
|
getChannelName() );
|
||||||
|
mAudioContinuationEvent = new AudioEvent( AudioEvent.Type.AUDIO_CONTINUATION,
|
||||||
|
getChannelName() );
|
||||||
|
|
||||||
try
|
try
|
||||||
{
|
{
|
||||||
@@ -130,6 +133,8 @@ public class MonoAudioOutput extends AudioOutput
|
|||||||
|
|
||||||
if( packets.size() > 0 )
|
if( packets.size() > 0 )
|
||||||
{
|
{
|
||||||
|
broadcast( mAudioContinuationEvent );
|
||||||
|
|
||||||
for( AudioPacket packet: packets )
|
for( AudioPacket packet: packets )
|
||||||
{
|
{
|
||||||
if( mCanProcessAudio )
|
if( mCanProcessAudio )
|
||||||
|
|||||||
@@ -51,6 +51,7 @@ public class StereoAudioOutput extends AudioOutput
|
|||||||
|
|
||||||
private AudioEvent mAudioStartEvent;
|
private AudioEvent mAudioStartEvent;
|
||||||
private AudioEvent mAudioStopEvent;
|
private AudioEvent mAudioStopEvent;
|
||||||
|
private AudioEvent mAudioContinuationEvent;
|
||||||
|
|
||||||
private MixerChannel mMixerChannel;
|
private MixerChannel mMixerChannel;
|
||||||
|
|
||||||
@@ -66,6 +67,8 @@ public class StereoAudioOutput extends AudioOutput
|
|||||||
getChannelName() );
|
getChannelName() );
|
||||||
mAudioStopEvent = new AudioEvent( AudioEvent.Type.AUDIO_STOPPED,
|
mAudioStopEvent = new AudioEvent( AudioEvent.Type.AUDIO_STOPPED,
|
||||||
getChannelName() );
|
getChannelName() );
|
||||||
|
mAudioContinuationEvent = new AudioEvent( AudioEvent.Type.AUDIO_CONTINUATION,
|
||||||
|
getChannelName() );
|
||||||
|
|
||||||
try
|
try
|
||||||
{
|
{
|
||||||
@@ -166,6 +169,8 @@ public class StereoAudioOutput extends AudioOutput
|
|||||||
|
|
||||||
if( packets.size() > 0 )
|
if( packets.size() > 0 )
|
||||||
{
|
{
|
||||||
|
broadcast( mAudioContinuationEvent );
|
||||||
|
|
||||||
for( AudioPacket packet: packets )
|
for( AudioPacket packet: packets )
|
||||||
{
|
{
|
||||||
if( mCanProcessAudio )
|
if( mCanProcessAudio )
|
||||||
|
|||||||
Reference in New Issue
Block a user