Merge pull request #89 from DSheirer/#65_audio_recorder_exception_on_startup

#65 resolves issue where on audio recorder startup an IO exception is…
This commit is contained in:
Denny Sheirer
2017-01-07 10:59:57 -05:00
committed by GitHub

View File

@@ -1,6 +1,6 @@
/*******************************************************************************
* SDR Trunk
* Copyright (C) 2014-2016 Dennis Sheirer
* Copyright (C) 2014-2017 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
@@ -17,21 +17,20 @@
******************************************************************************/
package record;
import java.io.File;
import java.util.HashMap;
import java.util.Map;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import properties.SystemProperties;
import record.wave.ComplexBufferWaveRecorder;
import record.wave.RealBufferWaveRecorder;
import sample.Listener;
import audio.AudioPacket;
import audio.metadata.Metadata;
import audio.metadata.MetadataType;
import controller.ThreadPoolManager;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import properties.SystemProperties;
import record.wave.ComplexBufferWaveRecorder;
import record.wave.RealBufferWaveRecorder;
import sample.Listener;
import java.io.File;
import java.util.HashMap;
import java.util.Map;
public class RecorderManager implements Listener<AudioPacket>
{
@@ -45,6 +44,9 @@ public class RecorderManager implements Listener<AudioPacket>
private boolean mCanStartNewRecorders = true;
/**
* Manages starting and stopping all system recorders and distributes channel audio to each of the recorders.
*/
public RecorderManager(ThreadPoolManager threadPoolManager)
{
mThreadPoolManager = threadPoolManager;
@@ -83,10 +85,11 @@ public class RecorderManager implements Listener<AudioPacket>
{
String filePrefix = getFilePrefix(audioPacket);
RealBufferWaveRecorder recorder = null;
try
{
RealBufferWaveRecorder recorder =
new RealBufferWaveRecorder( AUDIO_SAMPLE_RATE, filePrefix );
recorder = new RealBufferWaveRecorder(AUDIO_SAMPLE_RATE, filePrefix);
recorder.start(mThreadPoolManager.getScheduledExecutorService());
@@ -97,8 +100,13 @@ public class RecorderManager implements Listener<AudioPacket>
{
mCanStartNewRecorders = false;
mLog.error( "Error attempting to start new audio wave recorder."
+ " All (future) audio recording is disabled", ioe );
mLog.error("Error attempting to start new audio wave recorder. All (future) audio recording " +
"is disabled", ioe);
if(recorder != null)
{
recorder.stop();
}
}
}
}
@@ -112,52 +120,41 @@ public class RecorderManager implements Listener<AudioPacket>
{
StringBuilder sb = new StringBuilder();
sb.append( SystemProperties.getInstance()
.getApplicationFolder( "recordings" ) );
sb.append(SystemProperties.getInstance().getApplicationFolder("recordings"));
sb.append(File.separator);
Metadata systemMetadata = packet.getAudioMetadata()
.getMetadata( MetadataType.SYSTEM );
Metadata systemMetadata = packet.getAudioMetadata().getMetadata(MetadataType.SYSTEM);
sb.append( systemMetadata != null ?
systemMetadata.getValue() : "UNKNOWN_SYSTEM" );
sb.append(systemMetadata != null ? systemMetadata.getValue() : "UNKNOWN_SYSTEM");
Metadata toMetadata = packet.getAudioMetadata()
.getMetadata( MetadataType.TO );
Metadata toMetadata = packet.getAudioMetadata().getMetadata(MetadataType.TO);
if(toMetadata != null)
{
sb.append( "_TO_" );
sb.append( toMetadata.getValue() );
sb.append("_TO_").append(toMetadata.getValue());
Metadata fromMetadata = packet.getAudioMetadata()
.getMetadata( MetadataType.FROM );
Metadata fromMetadata = packet.getAudioMetadata().getMetadata(MetadataType.FROM);
if(fromMetadata != null)
{
sb.append( "_FROM_" );
sb.append( fromMetadata.getValue() );
sb.append("_FROM_").append(fromMetadata.getValue());
}
}
else
{
Metadata siteMetadata = packet.getAudioMetadata()
.getMetadata( MetadataType.SITE_ID );
Metadata siteMetadata = packet.getAudioMetadata().getMetadata(MetadataType.SITE_ID);
if(siteMetadata != null)
{
sb.append( "_" );
sb.append( siteMetadata.getValue() );
sb.append("_").append(siteMetadata.getValue());
}
Metadata channelMetadata = packet.getAudioMetadata()
.getMetadata( MetadataType.CHANNEL_NAME );
Metadata channelMetadata = packet.getAudioMetadata().getMetadata(MetadataType.CHANNEL_NAME);
if(channelMetadata != null)
{
sb.append( "_" );
sb.append( channelMetadata.getValue() );
sb.append("_").append(channelMetadata.getValue());
}
}
@@ -170,11 +167,8 @@ public class RecorderManager implements Listener<AudioPacket>
public ComplexBufferWaveRecorder getBasebandRecorder(String channelName)
{
StringBuilder sb = new StringBuilder();
sb.append( SystemProperties.getInstance()
.getApplicationFolder( "recordings" ) );
sb.append( File.separator );
sb.append( channelName );
sb.append( "_baseband" );
sb.append(SystemProperties.getInstance().getApplicationFolder("recordings"));
sb.append(File.separator).append(channelName).append("_baseband");
return new ComplexBufferWaveRecorder(AUDIO_SAMPLE_RATE, sb.toString());
}