Work in progress.

-Started work on new channel editor channel viewer/controller
-Removed a number of unused buffer package classes
-Moved automatic frequency control to be a module and removed special
handling
-Added IUnfilteredRealBufferListener & Provider interfaces
-Completely removed the ResourceManager class

src/module/decode/state/ChannelCollectionPanel.java

@@ -16,6 +16,8 @@ import org.slf4j.LoggerFactory;
 import playlist.PlaylistManager;
 import settings.SettingsManager;
 import controller.channel.Channel;
+import controller.channel.ChannelModel;
+import controller.channel.ChannelProcessingManager;
 
 /**
  * Channel Collection assembles a primary channel panel and any related decoder
@@ -28,15 +30,21 @@ public class ChannelCollectionPanel extends JPanel
 	
 	private final static Logger mLog = LoggerFactory.getLogger( ChannelCollectionPanel.class );
 
+	private ChannelModel mChannelModel;
+	private ChannelProcessingManager mChannelProcessingManager;
 	private PlaylistManager mPlaylistManager;
 	private SettingsManager mSettingsManager;
 	
 	private List<ChannelStatePanel> mChannelPanels = new ArrayList<ChannelStatePanel>();
 	
-	public ChannelCollectionPanel( PlaylistManager playlistManager,
+	public ChannelCollectionPanel( ChannelModel channelModel,
+								   ChannelProcessingManager channelProcessingManager,
+								   PlaylistManager playlistManager,
 								   SettingsManager settingsManager, 
 								   Channel channel )
 	{
+		mChannelModel = channelModel;
+		mChannelProcessingManager = channelProcessingManager;
 		mPlaylistManager = playlistManager;
 		mSettingsManager = settingsManager;
 		
@@ -49,8 +57,8 @@ public class ChannelCollectionPanel extends JPanel
     	
     	setOpaque( false );
 
-    	ChannelStatePanel csp = new ChannelStatePanel( mPlaylistManager, 
-    			mSettingsManager, channel );
+    	ChannelStatePanel csp = new ChannelStatePanel( mChannelModel, 
+			mChannelProcessingManager, mPlaylistManager, mSettingsManager, channel );
     	
     	mChannelPanels.add( csp );
     	

src/module/decode/state/ChannelList.java

@@ -43,6 +43,8 @@ import settings.SettingsManager;
 import controller.channel.Channel;
 import controller.channel.ChannelEvent;
 import controller.channel.ChannelEventListener;
+import controller.channel.ChannelModel;
+import controller.channel.ChannelProcessingManager;
 
 /**
  * Gui wrapper for the list of currently processing primary channels 
@@ -56,12 +58,18 @@ public class ChannelList extends JPanel implements ChannelEventListener
     private HashMap<Channel,ChannelCollectionPanel> mDisplayedPanels = 
     			new HashMap<Channel,ChannelCollectionPanel>();
 
+    private ChannelModel mChannelModel;
+    private ChannelProcessingManager mChannelProcessingManager;
     private PlaylistManager mPlaylistManager;
     private SettingsManager mSettingsManager;
     
-    public ChannelList( PlaylistManager playlistManager, 
+    public ChannelList( ChannelModel channelModel,
+    					ChannelProcessingManager channelProcessingManager,
+    					PlaylistManager playlistManager, 
     					SettingsManager settingsManager )
     {
+    	mChannelModel = channelModel;
+    	mChannelProcessingManager = channelProcessingManager;
     	mPlaylistManager = playlistManager;
     	mSettingsManager = settingsManager;
 
@@ -96,8 +104,8 @@ public class ChannelList extends JPanel implements ChannelEventListener
     {
     	if( !mDisplayedPanels.containsKey( channel ) )
     	{
-    		ChannelCollectionPanel panel = new ChannelCollectionPanel( 
-    				mPlaylistManager, mSettingsManager, channel );
+    		ChannelCollectionPanel panel = new ChannelCollectionPanel( mChannelModel,
+				mChannelProcessingManager, mPlaylistManager, mSettingsManager, channel );
     		
 			add( panel, "wrap" );
 			

src/module/decode/state/ChannelStatePanel.java

@@ -14,6 +14,7 @@ import javax.swing.JLabel;
 import javax.swing.JMenu;
 import javax.swing.JPanel;
 
+import module.ProcessingChain;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -31,6 +32,11 @@ import settings.Setting;
 import settings.SettingChangeListener;
 import settings.SettingsManager;
 
+import controller.channel.Channel;
+import controller.channel.ChannelModel;
+import controller.channel.ChannelProcessingManager;
+import controller.channel.ChannelUtils;
+
 public class ChannelStatePanel extends JPanel 
 				implements Listener<ChangedAttribute>, SettingChangeListener
 {
@@ -38,10 +44,6 @@ public class ChannelStatePanel extends JPanel
 
 	private final static Logger mLog = LoggerFactory.getLogger( ChannelStatePanel.class );
 
-	private static final boolean ENABLED = true;
-	private static final boolean DISABLED = false;
-	private static final boolean BROADCAST_CHANGE = true;
-
     private Font mFontDetails = new Font( Font.MONOSPACED, Font.PLAIN, 12 );
     private Font mFontDecoder = new Font( Font.MONOSPACED, Font.PLAIN, 12 );
 
@@ -75,7 +77,10 @@ public class ChannelStatePanel extends JPanel
 	protected SettingsManager mSettingsManager;
 
 	private Channel mChannel;
+	private ChannelState mChannelState;
 	private List<DecoderPanel> mDecoderPanels = new ArrayList<>();
+	private ChannelModel mChannelModel;
+	private ChannelProcessingManager mChannelProcessingManager;
 	
 	/**
 	 * Gui component to a channel state.  Provides System, Site and channel
@@ -83,21 +88,31 @@ public class ChannelStatePanel extends JPanel
 	 * 
 	 * Updates color background according to current channel state.
 	 */
-	public ChannelStatePanel( PlaylistManager playlistManager, 
+	public ChannelStatePanel( ChannelModel channelModel,
+							  ChannelProcessingManager channelProcessingManager,
+							  PlaylistManager playlistManager, 
 							  SettingsManager settingsManager, 
 							  Channel channel )
 	{
+		mChannelModel = channelModel;
+		mChannelProcessingManager = channelProcessingManager;
 		mPlaylistManager = playlistManager;
 		
 		mSettingsManager = settingsManager;
 		mSettingsManager.addListener( this );
 		
 		mChannel = channel;
-		mChannel.getChannelState().setChangedAttributeListener( this );
+		
+		ProcessingChain processingChain = 
+				channelProcessingManager.getProcessingChain( mChannel );
+
+		mChannelState = processingChain.getChannelState();
+		
+		mChannelState.setChangedAttributeListener( this );
 		
 		init();
 
-		for( DecoderState decoderState: getChannel().getProcessingChain().getDecoderStates() )
+		for( DecoderState decoderState: processingChain.getDecoderStates() )
     	{
 			DecoderPanel panel = DecoderFactory.getDecoderPanel( mSettingsManager, decoderState );
 			mDecoderPanels.add( panel );
@@ -126,8 +141,7 @@ public class ChannelStatePanel extends JPanel
 		mChannelLabel.setForeground( mColorLabelDetails );
 		add( mChannelLabel, "wrap" );
 		
-		mStateLabel = new JLabel( mChannel.getChannelState().getState()
-				.getDisplayValue() );
+		mStateLabel = new JLabel( mChannelState.getState().getDisplayValue() );
 		mStateLabel.setFont( mFontDecoder );
 		mStateLabel.setForeground( mColorLabelDecoder );
 		add( mStateLabel );
@@ -161,8 +175,6 @@ public class ChannelStatePanel extends JPanel
 		mOptionsLabel.setFont( mFontDetails );
 		mOptionsLabel.setForeground( mColorLabelAuxDecoder );
 		add( mOptionsLabel, "wrap" );
-
-//		add( new JSeparator( JSeparator.HORIZONTAL ), "span,growx" );
 	}
 	
 	public Channel getChannel()
@@ -177,7 +189,8 @@ public class ChannelStatePanel extends JPanel
 		mSettingsManager.removeListener( this );
 		mSettingsManager = null;
 		
-		mChannel.getChannelState().removeChangedAttributeListener();
+		mChannelState.removeChangedAttributeListener();
+		mChannelState = null;
 		mChannel = null;
 		
 		for( DecoderPanel panel: mDecoderPanels )
@@ -192,8 +205,6 @@ public class ChannelStatePanel extends JPanel
 	@Override
 	public void receive( final ChangedAttribute changedAttribute )
 	{
-		final ChannelState state = mChannel.getChannelState();
-		
 		EventQueue.invokeLater( new Runnable()
 		{
 			@Override
@@ -202,9 +213,9 @@ public class ChannelStatePanel extends JPanel
 				switch( changedAttribute )
 				{
 					case CHANNEL_STATE:
-						if( state.getState() != null )
+						if( mChannelState.getState() != null )
 						{
-				    		mStateLabel.setText( state.getState().getDisplayValue() );
+				    		mStateLabel.setText( mChannelState.getState().getDisplayValue() );
 						}
 						break;
 					case SOURCE:
@@ -214,7 +225,7 @@ public class ChannelStatePanel extends JPanel
 					case CHANNEL_NAME:
 					case SITE_NAME:
 					case SYSTEM_NAME:
-				    	mChannelLabel.setText( mChannel.getChannelDisplayName() );
+				    	mChannelLabel.setText( mChannel.toString() );
 						break;
 					default:
 						break;
@@ -419,7 +430,7 @@ public class ChannelStatePanel extends JPanel
 
 	public JMenu getContextMenu()
 	{
-		return ChannelUtils.getContextMenu( mPlaylistManager, mChannel, 
-				ChannelStatePanel.this );
+		return ChannelUtils.getContextMenu( mChannelModel, mChannelProcessingManager, 
+				mPlaylistManager, mChannel, ChannelStatePanel.this );
 	}
 }

src/module/decode/state/TrafficChannelManager.java

@@ -6,6 +6,7 @@ import java.util.Map;
 import java.util.concurrent.ConcurrentHashMap;
 
 import module.Module;
+import module.ProcessingChain;
 import module.decode.config.DecodeConfiguration;
 import module.decode.event.CallEvent;
 import module.decode.event.CallEvent.CallEventType;
@@ -21,11 +22,12 @@ import source.tuner.TunerChannel;
 import source.tuner.TunerChannel.Type;
 import alias.Alias;
 import alias.priority.Priority;
-import controller.ResourceManager;
 import controller.channel.Channel;
 import controller.channel.Channel.ChannelType;
-import controller.site.Site;
-import controller.system.System;
+import controller.channel.ChannelEvent;
+import controller.channel.ChannelEvent.Event;
+import controller.channel.ChannelModel;
+import controller.channel.ChannelProcessingManager;
 
 public class TrafficChannelManager extends Module 
 			implements ICallEventProvider, IDecoderStateEventListener
@@ -40,15 +42,14 @@ public class TrafficChannelManager extends Module
 	private DecoderStateEventListener mEventListener = new DecoderStateEventListener();
 	private Listener<CallEvent> mCallEventListener;
 
+	private ChannelModel mChannelModel;
+	private ChannelProcessingManager mChannelProcessingManager;
 	private DecodeConfiguration mDecodeConfiguration;
 	private RecordConfiguration mRecordConfiguration;
-	private ResourceManager mResourceManager;
 	private String mSystem;
 	private String mSite;
 	private String mAliasListName;
-	private long mTrafficChannelTimeout;
 	private CallEvent mPreviousDoNotMonitorCallEvent;
-	private boolean mShuttingDown = false;
 
 	/**
 	 * Monitors call events and allocates traffic decoder channels in response
@@ -68,7 +69,8 @@ public class TrafficChannelManager extends Module
 	 * @param trafficChannelPoolSize - maximum number of allocated traffic channels
 	 * in the pool
 	 */
-	public TrafficChannelManager( ResourceManager resourceManager,
+	public TrafficChannelManager( ChannelModel channelModel,
+								  ChannelProcessingManager channelProcessingManager,
 								  DecodeConfiguration decodeConfiguration,
 								  RecordConfiguration recordConfiguration,
 								  String system,
@@ -77,13 +79,14 @@ public class TrafficChannelManager extends Module
 								  long trafficChannelTimeout,
 								  int trafficChannelPoolSize ) 
 	{
-		mResourceManager = resourceManager;
+		mChannelModel = channelModel;
+		mChannelProcessingManager = channelProcessingManager;
 		mDecodeConfiguration = decodeConfiguration;
 		mRecordConfiguration = recordConfiguration;
 		mSystem = system;
 		mSite = site;
 		mAliasListName = aliasListName;
-		mTrafficChannelTimeout = trafficChannelTimeout;
+//		mTrafficChannelTimeout = trafficChannelTimeout;
 		mTrafficChannelPoolMaximumSize = trafficChannelPoolSize;
 	}
 	
@@ -91,7 +94,6 @@ public class TrafficChannelManager extends Module
 	public void dispose()
 	{
 		mCallEventListener = null;
-		mResourceManager = null;
 		mDecodeConfiguration = null;
 		mPreviousDoNotMonitorCallEvent = null;
 	}
@@ -115,7 +117,7 @@ public class TrafficChannelManager extends Module
 		{
 			for( Channel configuredChannel: mTrafficChannelPool )
 			{
-				if( !configuredChannel.isProcessing() )
+				if( !configuredChannel.getEnabled() )
 				{
 					channel = configuredChannel;
 					break;
@@ -130,12 +132,10 @@ public class TrafficChannelManager extends Module
 				
 				channel.setRecordConfiguration( mRecordConfiguration );
 				
-				channel.setResourceManager( mResourceManager );
-				
-				channel.setTrafficChannelTimeout( mTrafficChannelTimeout );
-				
 				channel.setAliasListName( mAliasListName );
 				
+				mChannelModel.addChannel( channel );
+				
 				mTrafficChannelPool.add( channel );
 			}
 
@@ -143,26 +143,15 @@ public class TrafficChannelManager extends Module
 			if( channel != null )
 			{
 				channel.setSourceConfiguration( new SourceConfigTuner( tunerChannel ) );
-				
 				channel.setSystem( mSystem );
 				channel.setSite( mSite );
 				channel.setName( channelNumber );
 
-				channel.setEnabled( true );
+				mChannelModel.broadcast( new ChannelEvent( channel, 
+						Event.NOTIFICATION_CONFIGURATION_CHANGE ) );
 
-				/* Check the channel obtained a source and is currently processing */
-				if( channel.isProcessing() )
-				{
-					mTrafficChannelsInUse.put( channelNumber, channel );
-				}
-				else
-				{
-					channel.setEnabled( false );
-					
-					channel.setSystem( mSystem );
-					channel.setSite( mSite );
-					channel.setName( "Traffic" );
-				}
+				mChannelModel.broadcast( new ChannelEvent( channel,	
+						Event.REQUEST_ENABLE ) );
 			}
 		}
 
@@ -210,26 +199,29 @@ public class TrafficChannelManager extends Module
 
 				if( channel != null )
 				{
-					if( channel.isProcessing() )
+					if( channel.getEnabled() )
 					{
-						callEvent.setDetails( "TRAFFIC CHANNEL ALLOCATED" );
-						
-						ChannelState state = channel.getChannelState();
-						
-						/* Register as a listener to be notified when the call
-						 * is completed */
-						state.configureAsTrafficChannel( 
-							new TrafficChannelStatusListener( this, 
-								callEvent.getChannel() ), event );
-						
-						/* Set state to call so that audio squelch state is correct */
-						state.setState( State.CALL );
+						ProcessingChain chain = mChannelProcessingManager
+								.getProcessingChain( channel );
+							
+						if( chain != null )
+						{
+							ChannelState state = chain.getChannelState();
+								
+							/* Register as a listener to be notified when the call
+							 * is completed */
+							state.configureAsTrafficChannel( 
+								new TrafficChannelStatusListener( this, 
+									callEvent.getChannel() ), event );
+								
+							/* Set state to call so that audio squelch state is correct */
+							state.setState( State.CALL );
+						}
 					}
 					else
 					{
 						callEvent.setCallEventType( CallEventType.CALL_DETECT );
-						callEvent.setDetails( "CHANNEL PROCESSING ERROR" );
-					}
+					}				
 				}
 				else
 				{
@@ -390,15 +382,13 @@ public class TrafficChannelManager extends Module
 	{
 		synchronized( mTrafficChannelsInUse )
 		{
-			if( channelNumber != null && 
-				mTrafficChannelsInUse.containsKey( channelNumber ) )
+			if( channelNumber != null && mTrafficChannelsInUse.containsKey( channelNumber ) )
 			{
 				Channel channel = mTrafficChannelsInUse.get( channelNumber );
-				
+			
+				mChannelModel.broadcast( new ChannelEvent( channel, Event.REQUEST_DISABLE ) );
+			
 				mTrafficChannelsInUse.remove( channelNumber );
-
-				/* Disable the channel and broadcast a notification */
-				channel.setEnabled( false );
 			}
 		}
 	}