From 7283004d7a50087ccffbc265ffc41c1a84cb0283 Mon Sep 17 00:00:00 2001 From: denny Date: Sat, 3 Oct 2015 17:59:18 -0400 Subject: [PATCH] Fixed issue with audio manager when swapping mixers and there is a call in progress. --- src/audio/AudioManager.java | 1 + src/controller/channel/Channel.java | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/src/audio/AudioManager.java b/src/audio/AudioManager.java index 4a26cecc..8783e00e 100644 --- a/src/audio/AudioManager.java +++ b/src/audio/AudioManager.java @@ -326,6 +326,7 @@ public class AudioManager implements Listener, IAudioController endAllAudioAssignments(); + mChannelAssignments.clear(); mAvailableAudioOutputs.clear(); mChannelNames.clear(); mAudioOutputMap.clear(); diff --git a/src/controller/channel/Channel.java b/src/controller/channel/Channel.java index 9d50da47..5a2e77f3 100644 --- a/src/controller/channel/Channel.java +++ b/src/controller/channel/Channel.java @@ -714,7 +714,7 @@ public class Channel extends Configuration } catch( SourceException se ) { - mLog.error( "Error obtaining source for channel" ); + mLog.info( "Couldn't obtain source for channel [" + mName + "]" ); } } }