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
This commit is contained in:
denny
2016-01-10 18:02:04 -05:00
parent c405ddad96
commit 4be63d4b95
197 changed files with 4181 additions and 4439 deletions

View File

@@ -24,11 +24,13 @@ import javax.swing.DefaultComboBoxModel;
import javax.swing.JComboBox;
import javax.swing.JLabel;
import controller.channel.Channel;
import controller.channel.ConfigurationValidationException;
import source.SourceEditor;
import source.SourceManager;
import source.config.SourceConfigMixer;
import source.config.SourceConfiguration;
import source.mixer.MixerManager.InputMixerConfiguration;
import controller.ResourceManager;
public class MixerEditor extends SourceEditor
{
@@ -38,10 +40,10 @@ public class MixerEditor extends SourceEditor
protected Mixer.Info mSelectedMixer = null;
public MixerEditor( ResourceManager resourceManager,
public MixerEditor( SourceManager sourceManager,
SourceConfiguration config )
{
super( resourceManager, config );
super( sourceManager, config );
initGUI();
}
@@ -105,7 +107,8 @@ public class MixerEditor extends SourceEditor
@Override
public void run()
{
InputMixerConfiguration[] mixers = MixerManager.getInstance().getInputMixers();
InputMixerConfiguration[] mixers = mSourceManager
.getMixerManager().getInputMixers();
mComboMixers.setModel(
new DefaultComboBoxModel<InputMixerConfiguration>( mixers ) );
@@ -155,4 +158,18 @@ public class MixerEditor extends SourceEditor
}
});
}
@Override
public void setConfiguration( Channel channel )
{
// TODO Auto-generated method stub
}
@Override
public void validateConfiguration() throws ConfigurationValidationException
{
// TODO Auto-generated method stub
}
}