mirror of
https://github.com/DSheirer/sdrtrunk.git
synced 2026-11-19 20:17:25 -05:00
Resolved issue with delayed event log writing ... added forced flushing
after each event write.
This commit is contained in:
@@ -98,13 +98,12 @@ public class AudioModule extends Module implements IAudioPacketProvider,
|
|||||||
@Override
|
@Override
|
||||||
public void stop()
|
public void stop()
|
||||||
{
|
{
|
||||||
// /* Issue an end audio packet in case a recorder is still rolling */
|
/* Issue an end audio packet in case a recorder is still rolling */
|
||||||
// if( mAudioPacketListener != null )
|
if( mAudioPacketListener != null )
|
||||||
// {
|
{
|
||||||
// mLog.debug( "Sending end audio packet - stop() invoked" );
|
mAudioPacketListener.receive( new AudioPacket( AudioPacket.Type.END,
|
||||||
// mAudioPacketListener.receive( new AudioPacket( AudioPacket.Type.END,
|
mAudioMetadata.copyOf() ) );
|
||||||
// mAudioMetadata.copyOf() ) );
|
}
|
||||||
// }
|
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
@@ -201,8 +200,6 @@ public class AudioModule extends Module implements IAudioPacketProvider,
|
|||||||
@Override
|
@Override
|
||||||
public void receive( SquelchState state )
|
public void receive( SquelchState state )
|
||||||
{
|
{
|
||||||
mLog.debug( "Squelch State:" + state );
|
|
||||||
|
|
||||||
if( state == SquelchState.SQUELCH && mAudioPacketListener != null )
|
if( state == SquelchState.SQUELCH && mAudioPacketListener != null )
|
||||||
{
|
{
|
||||||
mAudioPacketListener.receive( new AudioPacket( AudioPacket.Type.END,
|
mAudioPacketListener.receive( new AudioPacket( AudioPacket.Type.END,
|
||||||
|
|||||||
@@ -7,7 +7,6 @@ import java.awt.event.ActionListener;
|
|||||||
import javax.swing.JButton;
|
import javax.swing.JButton;
|
||||||
import javax.swing.JDesktopPane;
|
import javax.swing.JDesktopPane;
|
||||||
import javax.swing.JInternalFrame;
|
import javax.swing.JInternalFrame;
|
||||||
import javax.swing.JPanel;
|
|
||||||
|
|
||||||
import module.decode.DecodeComponentEditor;
|
import module.decode.DecodeComponentEditor;
|
||||||
import module.decode.config.DecodeConfiguration;
|
import module.decode.config.DecodeConfiguration;
|
||||||
|
|||||||
@@ -230,13 +230,9 @@ public class ChannelState extends Module implements ICallEventProvider,
|
|||||||
( mChannelType == ChannelType.STANDARD ? FADE_TIMEOUT_DELAY :
|
( mChannelType == ChannelType.STANDARD ? FADE_TIMEOUT_DELAY :
|
||||||
mTrafficChannelTimeout );
|
mTrafficChannelTimeout );
|
||||||
|
|
||||||
mLog.debug( "Updating Fade Timeout - previous [" + mFadeTimeout + "] new [" + timeout + "] current [" + current + "] delay [" + ( mChannelType == ChannelType.STANDARD ? FADE_TIMEOUT_DELAY :
|
|
||||||
mTrafficChannelTimeout ) + "]" );
|
|
||||||
|
|
||||||
if( timeout > mFadeTimeout )
|
if( timeout > mFadeTimeout )
|
||||||
{
|
{
|
||||||
mFadeTimeout = timeout;
|
mFadeTimeout = timeout;
|
||||||
mLog.debug( "Timeout updated to: " + mFadeTimeout );
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -307,7 +303,6 @@ public class ChannelState extends Module implements ICallEventProvider,
|
|||||||
case CONTROL:
|
case CONTROL:
|
||||||
case DATA:
|
case DATA:
|
||||||
case ENCRYPTED:
|
case ENCRYPTED:
|
||||||
mLog.debug( "Squelching for [" + state + "]" );
|
|
||||||
broadcast( SquelchState.SQUELCH );
|
broadcast( SquelchState.SQUELCH );
|
||||||
updateFadeTimeout();
|
updateFadeTimeout();
|
||||||
startMonitor();
|
startMonitor();
|
||||||
@@ -318,19 +313,16 @@ public class ChannelState extends Module implements ICallEventProvider,
|
|||||||
startMonitor();
|
startMonitor();
|
||||||
break;
|
break;
|
||||||
case FADE:
|
case FADE:
|
||||||
mLog.debug( "Squelching for [" + state + "]" );
|
|
||||||
broadcast( SquelchState.SQUELCH );
|
broadcast( SquelchState.SQUELCH );
|
||||||
updateResetTimeout();
|
updateResetTimeout();
|
||||||
startMonitor();
|
startMonitor();
|
||||||
break;
|
break;
|
||||||
case END:
|
case END:
|
||||||
mLog.debug( "Squelching for [" + state + "]" );
|
|
||||||
broadcast( SquelchState.SQUELCH );
|
broadcast( SquelchState.SQUELCH );
|
||||||
broadcast( new DecoderStateEvent( this, Event.RESET, State.IDLE ) );
|
broadcast( new DecoderStateEvent( this, Event.RESET, State.IDLE ) );
|
||||||
broadcast( new MetadataReset() );
|
broadcast( new MetadataReset() );
|
||||||
break;
|
break;
|
||||||
case IDLE:
|
case IDLE:
|
||||||
mLog.debug( "Squelching for [" + state + "]" );
|
|
||||||
broadcast( SquelchState.SQUELCH );
|
broadcast( SquelchState.SQUELCH );
|
||||||
stopMonitor();
|
stopMonitor();
|
||||||
|
|
||||||
@@ -381,7 +373,6 @@ public class ChannelState extends Module implements ICallEventProvider,
|
|||||||
{
|
{
|
||||||
if( mFadeTimeout <= System.currentTimeMillis() )
|
if( mFadeTimeout <= System.currentTimeMillis() )
|
||||||
{
|
{
|
||||||
mLog.debug( "Fading for timeout [" + mFadeTimeout + "] current [" + System.currentTimeMillis() + "]" );
|
|
||||||
setState( State.FADE );
|
setState( State.FADE );
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -130,6 +130,7 @@ public abstract class EventLogger extends Module
|
|||||||
try
|
try
|
||||||
{
|
{
|
||||||
mLogFile.write( eventLogEntry + "\n" );
|
mLogFile.write( eventLogEntry + "\n" );
|
||||||
|
mLogFile.flush();
|
||||||
}
|
}
|
||||||
catch ( IOException e )
|
catch ( IOException e )
|
||||||
{
|
{
|
||||||
|
|||||||
Reference in New Issue
Block a user