From 9c94266adbc77f926e832036f98afcf1251b4fcf Mon Sep 17 00:00:00 2001
From: denny <dennissheirer2002@yahoo.com>
Date: Thu, 4 Feb 2016 20:49:11 -0500
Subject: [PATCH] Resolves issue with Audio Channel display showing a call in
 progress with TO/FROM identifiers displayed, but no audio playing.  This
 occurred when the decoder sent a few audio buffers which caused the display
 to update from the metadata, however the decoder stopped sending buffers and
 the audio start threshold is never met.  Clear display is invoked upon audio
 stop, so the panel was never started or stopped or cleared until the next
 call came in.

Changed to store the incoming metadata and only display it once the
audio playback starts and reset the display once the audio stops.
---
 src/audio/AudioChannelPanel.java | 118 +++++++++++++++++++------------
 1 file changed, 72 insertions(+), 46 deletions(-)

diff --git a/src/audio/AudioChannelPanel.java b/src/audio/AudioChannelPanel.java
index 207cc403..d23c2024 100644
--- a/src/audio/AudioChannelPanel.java
+++ b/src/audio/AudioChannelPanel.java
@@ -48,8 +48,11 @@ public class AudioChannelPanel extends JPanel
 	private JLabel mFromLabel = new JLabel( "FROM:" );
 	private JLabel mFrom = new JLabel( "" );
 	private JLabel mFromAlias = new JLabel( "" );
+
+	private enum AudioStatus { STARTED,STOPPED };
+	private AudioStatus mAudioStatus = AudioStatus.STOPPED;
 	
-	private boolean mConfigured = false;
+	private AudioMetadata mAudioMetadata;
 	
 	public AudioChannelPanel( SettingsManager settingsManager, AudioOutput audioOutput )
 	{
@@ -134,15 +137,19 @@ public class AudioChannelPanel extends JPanel
 	{
 		switch( audioEvent.getType() )
 		{
-			case AUDIO_STOPPED:
-				EventQueue.invokeLater( new Runnable()
+			case AUDIO_STARTED:
+				synchronized( mAudioStatus )
 				{
-					@Override
-					public void run()
-					{
-						resetLabels();
-					}
-				} );
+					mAudioStatus = AudioStatus.STARTED;
+					updateLabels();
+				}
+				break;
+			case AUDIO_STOPPED:
+				synchronized( mAudioStatus )
+				{
+					mAudioStatus = AudioStatus.STOPPED;
+					resetLabels();
+				}
 				break;
 			case AUDIO_MUTED:
 			case AUDIO_UNMUTED:
@@ -166,13 +173,55 @@ public class AudioChannelPanel extends JPanel
 	 */
 	private void resetLabels()
 	{
-		mFrom.setText( "" );
-		updateAlias( mFromAlias, null );
-		
-		mTo.setText( "" );
-		updateAlias( mToAlias, null );
-		
-		mConfigured = false;
+		EventQueue.invokeLater( new Runnable() 
+		{
+			@Override
+			public void run()
+			{
+				mFrom.setText( "" );
+				updateAlias( mFromAlias, null );
+				
+				mTo.setText( "" );
+				updateAlias( mToAlias, null );
+			}
+		} );
+	}
+	
+	private void updateLabels()
+	{
+		if( mAudioMetadata != null )
+		{
+			final Metadata from = mAudioMetadata.getMetadata( MetadataType.FROM );
+
+			final Metadata to = mAudioMetadata.getMetadata( MetadataType.TO );
+			
+			EventQueue.invokeLater( new Runnable() 
+			{
+				@Override
+				public void run()
+				{
+					if( from != null )
+					{
+						mFrom.setText( from.getValue() );
+						updateAlias( mFromAlias, from.getAlias() );
+					}
+					else
+					{
+						mFrom.setText( "-----" );
+					}
+					
+					if( to != null )
+					{
+						mTo.setText( to.getValue() );
+						updateAlias( mToAlias, to.getAlias() );
+					}
+					else
+					{
+						mTo.setText( "-----" );
+					}
+				}
+			} );
+		}
 	}
 
 	/**
@@ -214,40 +263,17 @@ public class AudioChannelPanel extends JPanel
 		@Override
 		public void receive( AudioMetadata audioMetadata )
 		{
-			if( !mConfigured || audioMetadata.isUpdated() )
+			mAudioMetadata = audioMetadata;
+			
+			if( audioMetadata.isUpdated() )
 			{
-				final Metadata from = audioMetadata.getMetadata( MetadataType.FROM );
-
-				final Metadata to = audioMetadata.getMetadata( MetadataType.TO );
-				
-				EventQueue.invokeLater( new Runnable() 
+				synchronized( mAudioStatus )
 				{
-					@Override
-					public void run()
+					if( mAudioStatus == AudioStatus.STARTED )
 					{
-						if( from != null )
-						{
-							mFrom.setText( from.getValue() );
-							updateAlias( mFromAlias, from.getAlias() );
-						}
-						else
-						{
-							mFrom.setText( "-----" );
-						}
-						
-						if( to != null )
-						{
-							mTo.setText( to.getValue() );
-							updateAlias( mToAlias, to.getAlias() );
-						}
-						else
-						{
-							mTo.setText( "-----" );
-						}
+						updateLabels();
 					}
-				} );
-				
-				mConfigured = true;
+				}
 			}
 		}
 	}