GitHub/sdrtrunk
1
0
Fork 0
mirror of https://github.com/DSheirer/sdrtrunk.git synced 2026-11-13 00:57:31 -05:00
Code Issues Packages Projects Releases 2 Wiki Activity

Changed to slf4j logging framework

Browse Source 
Enhanced error handling/logging in RTL2832 eeprom device descriptor read method for troubleshooting issue present in some R820T tuners.
This commit is contained in:
dennis.sheirer
2014-09-20 10:04:04 +00:00
parent f2f658c43a
commit e441ebf0c9
78 changed files with 791 additions and 834 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
src/record/wave/BooleanWaveRecorder.java
View File

@@ -23,7 +23,9 @@ import java.util.concurrent.LinkedBlockingQueue;
import javax.sound.sampled.AudioFormat;
import log.Log;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import record.Recorder;
import record.RecorderType;
import sample.Listener;
@@ -35,6 +37,9 @@ import buffer.FloatSampleBufferAssembler;
*/
public class BooleanWaveRecorder extends Recorder implements Listener<Boolean>
{
private final static Logger mLog =
LoggerFactory.getLogger( BooleanWaveRecorder.class );
private AudioFormat mAudioFormat;
private boolean mRunning = false;
private boolean mPaused = false;
@@ -117,7 +122,8 @@ public class BooleanWaveRecorder extends Recorder implements Listener<Boolean>
if( !success )
{
Log.error( "Wave recorder buffer overflow - throwing away " + buffer.capacity() + " samples" );
mLog.error( "Wave recorder buffer overflow - throwing away " +
buffer.capacity() + " samples" );
}
}
}
@@ -137,7 +143,8 @@ public class BooleanWaveRecorder extends Recorder implements Listener<Boolean>
if( !mToWriteBufferQueue.offer( mCurrentBuffer.get() ) )
{
//We had an overflow ... log it
Log.error( "ShortWaveRecorder: buffer overflow - throwing away 1 second of sample data" );
mLog.error( "ShortWaveRecorder: buffer overflow - throwing "
+ "away 1 second of sample data" );
}
mCurrentBuffer.reset();
@@ -159,12 +166,13 @@ public class BooleanWaveRecorder extends Recorder implements Listener<Boolean>
}
catch ( IOException ioe )
{
Log.error( "IOException while trying to write to the wave writer - " + ioe.getLocalizedMessage() );
mLog.error( "IOException while trying to write to the "
+ "wave writer", ioe );
}
catch ( InterruptedException e )
{
Log.error( "Oops ... error while processing the buffer queue for " +
" the wave recorder - " + e.getLocalizedMessage() );
mLog.error( "Oops ... error while processing the buffer "
+ "queue for the wave recorder", e );
}
}
}

20
src/record/wave/ComplexWaveRecorder.java
View File

@@ -23,7 +23,9 @@ import java.util.concurrent.LinkedBlockingQueue;
import javax.sound.sampled.AudioFormat;
import log.Log;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import record.Recorder;
import record.RecorderType;
import sample.Listener;
@@ -37,6 +39,9 @@ import buffer.ComplexSampleBufferAssembler;
*/
public class ComplexWaveRecorder extends Recorder implements Listener<ComplexSample>
{
private final static Logger mLog =
LoggerFactory.getLogger( ComplexWaveRecorder.class );
private AudioFormat mAudioFormat;
private boolean mRunning = false;
private boolean mPaused = false;
@@ -119,7 +124,7 @@ public class ComplexWaveRecorder extends Recorder implements Listener<ComplexSam
if( !success )
{
Log.error( "Wave recorder buffer overflow - throwing away " +
mLog.error( "Wave recorder buffer overflow - throwing away " +
buffer.capacity() + " samples" );
}
}
@@ -136,7 +141,7 @@ public class ComplexWaveRecorder extends Recorder implements Listener<ComplexSam
if( !mToWriteBufferQueue.offer( mCurrentBuffer.get() ) )
{
//We had an overflow ... log it
Log.error( "ComplexWaveRecorder: buffer overflow - throwing "
mLog.error( "ComplexWaveRecorder: buffer overflow - throwing "
+ "away 1 second of sample data" );
}
@@ -159,14 +164,13 @@ public class ComplexWaveRecorder extends Recorder implements Listener<ComplexSam
}
catch ( IOException ioe )
{
Log.error( "IOException while trying to write to the wave "
+ "writer - " + ioe.getLocalizedMessage() );
mLog.error( "IOException while trying to write to the wave "
+ "writer", ioe );
}
catch ( InterruptedException e )
{
Log.error( "Oops ... error while processing the buffer "
+ "queue for the wave recorder - " +
e.getLocalizedMessage() );
mLog.error( "Oops ... error while processing the buffer "
+ "queue for the wave recorder", e );
}
}
}

20
src/record/wave/FloatWaveRecorder.java
View File

@@ -23,7 +23,9 @@ import java.util.concurrent.LinkedBlockingQueue;
import javax.sound.sampled.AudioFormat;
import log.Log;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import record.Recorder;
import record.RecorderType;
import sample.Listener;
@@ -35,6 +37,9 @@ import buffer.FloatSampleBufferAssembler;
*/
public class FloatWaveRecorder extends Recorder implements Listener<Float>
{
private final static Logger mLog =
LoggerFactory.getLogger( FloatWaveRecorder.class );
private AudioFormat mAudioFormat;
private boolean mRunning = false;
private boolean mPaused = false;
@@ -117,7 +122,7 @@ public class FloatWaveRecorder extends Recorder implements Listener<Float>
if( !success )
{
Log.error( "Wave recorder buffer overflow - throwing away " +
mLog.error( "Wave recorder buffer overflow - throwing away " +
buffer.capacity() + " samples" );
}
}
@@ -134,7 +139,7 @@ public class FloatWaveRecorder extends Recorder implements Listener<Float>
if( !mToWriteBufferQueue.offer( mCurrentBuffer.get() ) )
{
//We had an overflow ... log it
Log.error( "FloatWaveRecorder: buffer overflow - throwing "
mLog.error( "FloatWaveRecorder: buffer overflow - throwing "
+ "away 1 second of sample data" );
}
@@ -157,14 +162,13 @@ public class FloatWaveRecorder extends Recorder implements Listener<Float>
}
catch ( IOException ioe )
{
Log.error( "IOException while trying to write to the wave "
+ "writer - " + ioe.getLocalizedMessage() );
mLog.error( "IOException while trying to write to the wave "
+ "writer", ioe );
}
catch ( InterruptedException e )
{
Log.error( "Oops ... error while processing the buffer "
+ "queue for the wave recorder - " +
e.getLocalizedMessage() );
mLog.error( "Oops ... error while processing the buffer "
+ "queue for the wave recorder", e );
}
}
}

19
src/record/wave/WaveRecorder.java
View File

@@ -17,13 +17,17 @@
******************************************************************************/
package record.wave;
import gui.SDRTrunk;
import java.io.IOException;
import java.nio.ByteBuffer;
import java.util.concurrent.LinkedBlockingQueue;
import javax.sound.sampled.AudioFormat;
import log.Log;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import record.Recorder;
import record.RecorderType;
import util.waveaudio.WaveWriter;
@@ -33,6 +37,9 @@ import util.waveaudio.WaveWriter;
*/
public class WaveRecorder extends Recorder
{
private final static Logger mLog =
LoggerFactory.getLogger( WaveRecorder.class );
private AudioFormat mAudioFormat;
private boolean mRunning = false;
private boolean mPaused = false;
@@ -101,7 +108,8 @@ public class WaveRecorder extends Recorder
if( !success )
{
Log.error( "Wave recorder buffer overflow - throwing away " + buffer.capacity() + " samples" );
mLog.error( "Wave recorder buffer overflow - throwing away " +
buffer.capacity() + " samples" );
}
}
}
@@ -121,12 +129,13 @@ public class WaveRecorder extends Recorder
}
catch ( IOException ioe )
{
Log.error( "IOException while trying to write to the wave writer - " + ioe.getLocalizedMessage() );
mLog.error( "IOException while trying to write to the "
+ "wave writer", ioe );
}
catch ( InterruptedException e )
{
Log.error( "Oops ... error while processing the buffer queue for " +
" the wave recorder - " + e.getLocalizedMessage() );
mLog.error( "Oops ... error while processing the buffer"
+ " queue for the wave recorder", e );
}
}
}