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

@@ -1,6 +1,6 @@
/*******************************************************************************
* SDR Trunk
* Copyright (C) 2014 Dennis Sheirer
* Copyright (C) 2014-2016 Dennis Sheirer
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
@@ -22,7 +22,8 @@ import javax.swing.JCheckBox;
import record.config.RecordConfiguration;
import controller.channel.AbstractChannelEditor;
import controller.channel.ChannelNode;
import controller.channel.Channel;
import controller.channel.ConfigurationValidationException;
public class RecordComponentEditor extends AbstractChannelEditor
{
@@ -32,9 +33,9 @@ public class RecordComponentEditor extends AbstractChannelEditor
private JCheckBox mBasebandRecorder = new JCheckBox( "Baseband I/Q" );
private JCheckBox mTrafficBasebandRecorder = new JCheckBox( "Traffic Channel Baseband I/Q" );
public RecordComponentEditor( ChannelNode channelNode )
public RecordComponentEditor( Channel channel )
{
super( channelNode );
super( channel );
add( mAudioRecorder, "span" );
add( mBasebandRecorder, "span" );
@@ -46,8 +47,7 @@ public class RecordComponentEditor extends AbstractChannelEditor
@Override
public void save()
{
RecordConfiguration config =
getChannelNode().getChannel().getRecordConfiguration();
RecordConfiguration config = getChannel().getRecordConfiguration();
config.clearRecorders();
@@ -76,8 +76,7 @@ public class RecordComponentEditor extends AbstractChannelEditor
@Override
public void run()
{
RecordConfiguration config =
getChannelNode().getChannel().getRecordConfiguration();
RecordConfiguration config = getChannel().getRecordConfiguration();
mAudioRecorder.setSelected( config.getRecorders()
.contains( RecorderType.AUDIO ) );
@@ -90,4 +89,18 @@ public class RecordComponentEditor extends AbstractChannelEditor
}
});
}
@Override
public void setConfiguration( Channel channel )
{
// TODO Auto-generated method stub
}
@Override
public void validateConfiguration() throws ConfigurationValidationException
{
// TODO Auto-generated method stub
}
}

View File

@@ -18,9 +18,11 @@
package record;
import record.config.RecordConfiguration;
import controller.Editor;
import controller.channel.Channel;
import controller.channel.ChannelConfigurationEditor;
import controller.channel.ConfigurationValidationException;
public class RecordEditor extends Editor
public class RecordEditor extends ChannelConfigurationEditor
{
private static final long serialVersionUID = 1L;
@@ -42,7 +44,16 @@ public class RecordEditor extends Editor
}
@Override
public void reset()
{
}
public void setConfiguration( Channel channel )
{
// TODO Auto-generated method stub
}
@Override
public void validateConfiguration() throws ConfigurationValidationException
{
// TODO Auto-generated method stub
}
}

View File

@@ -1,6 +1,6 @@
/*******************************************************************************
* SDR Trunk
* Copyright (C) 2014,2015 Dennis Sheirer
* Copyright (C) 2014-2016 Dennis Sheirer
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
@@ -20,7 +20,6 @@ package record;
import java.io.File;
import java.util.HashMap;
import java.util.Map;
import java.util.concurrent.TimeUnit;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -33,7 +32,6 @@ import audio.AudioPacket;
import audio.metadata.Metadata;
import audio.metadata.MetadataType;
import controller.ThreadPoolManager;
import controller.ThreadPoolManager.ThreadType;
public class RecorderManager implements Listener<AudioPacket>
{
@@ -170,8 +168,7 @@ public class RecorderManager implements Listener<AudioPacket>
/**
* Constructs a baseband recorder for use in a processing chain.
*/
public static ComplexBufferWaveRecorder getBasebandRecorder(
ThreadPoolManager threadPoolManager, String channelName )
public ComplexBufferWaveRecorder getBasebandRecorder( String channelName )
{
StringBuilder sb = new StringBuilder();
sb.append( SystemProperties.getInstance()
@@ -180,7 +177,7 @@ public class RecorderManager implements Listener<AudioPacket>
sb.append( channelName );
sb.append( "_baseband" );
return new ComplexBufferWaveRecorder( threadPoolManager,
return new ComplexBufferWaveRecorder( mThreadPoolManager,
AUDIO_SAMPLE_RATE, sb.toString() );
}
}

View File

@@ -34,7 +34,7 @@ import org.slf4j.LoggerFactory;
import sample.ConversionUtils;
import sample.Listener;
import sample.real.IRealBufferListener;
import sample.real.IFilteredRealBufferListener;
import sample.real.RealBuffer;
import util.TimeStamp;
import controller.ThreadPoolManager;
@@ -44,7 +44,7 @@ import controller.ThreadPoolManager.ThreadType;
* WAVE audio recorder module for recording real sample buffers to a wave file
*/
public class RealBufferWaveRecorder extends Module
implements IRealBufferListener, Listener<RealBuffer>
implements IFilteredRealBufferListener, Listener<RealBuffer>
{
private final static Logger mLog =
LoggerFactory.getLogger( RealBufferWaveRecorder.class );
@@ -151,7 +151,7 @@ public class RealBufferWaveRecorder extends Module
}
@Override
public Listener<RealBuffer> getRealBufferListener()
public Listener<RealBuffer> getFilteredRealBufferListener()
{
return this;
}