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/instrument/InstrumentableProcessingChain.java

@@ -9,11 +9,13 @@ import java.util.List;
 import module.Module;
 import module.ProcessingChain;
 import source.Source;
+import controller.channel.Channel.ChannelType;
 
 public class InstrumentableProcessingChain extends ProcessingChain implements Instrumentable
 {
 	public InstrumentableProcessingChain()
 	{
+		super( ChannelType.STANDARD );
 	}
 
 	public void setSource( Source source ) throws IllegalStateException

src/instrument/gui/DecoderSelectionFrame.java

@@ -13,8 +13,6 @@ import module.decode.config.DecodeConfiguration;
 import net.miginfocom.swing.MigLayout;
 import playlist.PlaylistManager;
 import source.IControllableFileSource;
-import controller.ResourceManager;
-import controller.ThreadPoolManager;
 import controller.channel.ChannelModel;
 
 public class DecoderSelectionFrame extends JInternalFrame
@@ -22,7 +20,7 @@ public class DecoderSelectionFrame extends JInternalFrame
 	private static final long serialVersionUID = 1L;
 
 	private DecodeComponentEditor mDecodeEditor = new DecodeComponentEditor( null );
-	private ResourceManager mResourceManager;
+	private PlaylistManager mPlaylistManager;
 	
 	private IControllableFileSource mSource;
 	private JDesktopPane mDesktop;
@@ -31,9 +29,7 @@ public class DecoderSelectionFrame extends JInternalFrame
 								  IControllableFileSource source )
 	{
 		ChannelModel channelModel = new ChannelModel();
-		
-		mResourceManager = new ResourceManager( new PlaylistManager( channelModel ), 
-				new ThreadPoolManager(), channelModel );
+		mPlaylistManager = new PlaylistManager( channelModel );
 
 		mDesktop = desktop;
 		mSource = source;
@@ -78,12 +74,7 @@ public class DecoderSelectionFrame extends JInternalFrame
 					if( config != null )
 					{
 						DecoderViewFrame decoderFrame = new DecoderViewFrame( 
-								mResourceManager, 
-								config,
-								null,
-								null,
-								null,
-								mSource );
+								mPlaylistManager, null, mSource );
 
 						decoderFrame.setVisible( true );
 						

src/instrument/gui/DecoderViewFrame.java

@@ -57,22 +57,20 @@ import javax.swing.JSeparator;
 import message.Message;
 import module.Module;
 import module.decode.DecoderFactory;
-import module.decode.config.AuxDecodeConfiguration;
 import module.decode.config.DecodeConfiguration;
 import net.miginfocom.swing.MigLayout;
 
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import record.config.RecordConfiguration;
+import playlist.PlaylistManager;
 import sample.Listener;
 import source.IControllableFileSource;
 import source.Source;
-import alias.AliasList;
-import controller.ResourceManager;
-import controller.channel.Channel.ChannelType;
-import controller.site.Site;
-import controller.system.System;
+import controller.ThreadPoolManager;
+import controller.channel.Channel;
+import controller.channel.ChannelModel;
+import controller.channel.ChannelProcessingManager;
 
 public class DecoderViewFrame extends JInternalFrame 
 							  implements Listener<Message>
@@ -88,29 +86,23 @@ public class DecoderViewFrame extends JInternalFrame
 	private HashMap<Tap,TapViewPanel> mPanelMap = 
 				new HashMap<Tap,TapViewPanel>();
 	
-	public DecoderViewFrame( ResourceManager resourceManager,
-							 DecodeConfiguration decodeConfig,
-							 RecordConfiguration recordConfig,
-							 AuxDecodeConfiguration auxConfig,
-							 AliasList aliasList,
+	public DecoderViewFrame( PlaylistManager playlistManager,
+							 Channel channel,
 							 IControllableFileSource source )
 	{
 		mSource = source;
 
-		mDecodeConfig = decodeConfig;
+		mDecodeConfig = channel.getDecodeConfiguration();
 		
 		mProcessingChain = new InstrumentableProcessingChain();
+
+		ChannelModel channelModel = new ChannelModel();
+		ChannelProcessingManager channelProcessingManager = 
+			new ChannelProcessingManager( channelModel, null, 
+				playlistManager, null, null, new ThreadPoolManager() );
 		
-		List<Module> modules = DecoderFactory
-			.getModules( ChannelType.STANDARD, 
-					     resourceManager, 
-					     decodeConfig, 
-					     recordConfig, 
-					     auxConfig, 
-					     aliasList, 
-					     "Instrumented", 
-					     "Instrumented",
-					     "Channel Name" );
+		List<Module> modules = DecoderFactory.getModules( channelModel, 
+				channelProcessingManager, playlistManager, channel );
 
 		mProcessingChain.addModules( modules );