mirror of
https://github.com/DSheirer/sdrtrunk.git
synced 2026-11-11 08:07:24 -05:00
Initial commit of redesigned internal processing and audio management.
Note: Several of the decoders are currently non-functioning in this commit. If you want the latest functioning codebase, please checkout the commit prior to this one. All decoders will eventually be updated with this new architecture. Currently broken: - Logging and recording - Aux decoders (Fleetsync/MDC/LoJack/Tait) - LTR/Passport decoders Changes in this commit: - Module architecture for decoders and components with central provisioning by the DecoderFactory - Transition from Complex sample stream processing to float buffer processing for improved memory management - Redesigned filter structures - to support buffers and streams - Resolved several memory leak issues - Universal sharing of the thread pool manager - Added centralized audio management with call/user prioritization and new gui with mute/volume controls - Embedded audio metadata for eventual streaming support - Redesigned ProcessingChain to support independent re-use - Added new TrafficChannelManager to handle traffic channel allocations - Traffic Channel pool size and Call timeout available in P25 and MPT1327 configs - Redesigned channel and decoder gui components
This commit is contained in:
@@ -17,8 +17,6 @@
|
||||
******************************************************************************/
|
||||
package source.recording;
|
||||
|
||||
import gui.SDRTrunk;
|
||||
|
||||
import java.util.ArrayList;
|
||||
import java.util.Collections;
|
||||
import java.util.List;
|
||||
@@ -30,10 +28,10 @@ import settings.SettingsManager;
|
||||
import source.Source;
|
||||
import source.SourceException;
|
||||
import source.config.SourceConfigRecording;
|
||||
import source.config.SourceConfiguration;
|
||||
import source.tuner.TunerChannel;
|
||||
import source.tuner.TunerChannelSource;
|
||||
import controller.ResourceManager;
|
||||
import controller.channel.ProcessingChain;
|
||||
|
||||
public class RecordingSourceManager
|
||||
{
|
||||
@@ -55,21 +53,21 @@ public class RecordingSourceManager
|
||||
* Iterates current recordings to get a tuner channel source for the frequency
|
||||
* specified in the channel config's source config object
|
||||
*/
|
||||
public Source getSource( ProcessingChain processingChain )
|
||||
public Source getSource( SourceConfiguration config, int bandwidth )
|
||||
throws SourceException
|
||||
{
|
||||
TunerChannelSource retVal = null;
|
||||
|
||||
if( processingChain.getChannel().getSourceConfiguration()
|
||||
instanceof SourceConfigRecording )
|
||||
if( config instanceof SourceConfigRecording )
|
||||
{
|
||||
TunerChannel tunerChannel =
|
||||
processingChain.getChannel().getTunerChannel();
|
||||
SourceConfigRecording configRecording = (SourceConfigRecording)config;
|
||||
|
||||
TunerChannel tunerChannel = configRecording.getTunerChannel();
|
||||
|
||||
tunerChannel.setBandwidth( bandwidth );
|
||||
|
||||
SourceConfigRecording config = (SourceConfigRecording)processingChain
|
||||
.getChannel().getSourceConfiguration();
|
||||
|
||||
Recording recording = getRecordingFromAlias( config.getRecordingAlias() );
|
||||
Recording recording = getRecordingFromAlias(
|
||||
configRecording.getRecordingAlias() );
|
||||
|
||||
if( recording != null )
|
||||
{
|
||||
@@ -80,7 +78,7 @@ public class RecordingSourceManager
|
||||
else
|
||||
{
|
||||
throw new SourceException( "Recording with alias name [" +
|
||||
config.getRecordingAlias() + "] is not currently available" );
|
||||
configRecording.getRecordingAlias() + "] is not currently available" );
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user