@ -28,22 +28,22 @@
@@ -28,22 +28,22 @@
# include "device/deviceapi.h"
# include "filesink output.h"
# include "filesink worker.h"
MESSAGE_CLASS_DEFINITION ( FileSink Output : : MsgConfigureFileSink , Message )
MESSAGE_CLASS_DEFINITION ( FileSink Output : : MsgStartStop , Message )
MESSAGE_CLASS_DEFINITION ( FileSink Output : : MsgConfigureFileSink Name , Message )
MESSAGE_CLASS_DEFINITION ( FileSink Output : : MsgConfigureFileSink Work , Message )
MESSAGE_CLASS_DEFINITION ( FileSink Output : : MsgConfigureFileSink StreamTiming , Message )
MESSAGE_CLASS_DEFINITION ( FileSink Output : : MsgReportFileSink Generation , Message )
MESSAGE_CLASS_DEFINITION ( FileSink Output : : MsgReportFileSink StreamTiming , Message )
FileSink Output : : FileSink Output ( DeviceAPI * deviceAPI ) :
# include "fileoutput.h"
# include "fileoutput worker.h"
MESSAGE_CLASS_DEFINITION ( FileOutput : : MsgConfigureFileOutput , Message )
MESSAGE_CLASS_DEFINITION ( FileOutput : : MsgStartStop , Message )
MESSAGE_CLASS_DEFINITION ( FileOutput : : MsgConfigureFileOutput Name , Message )
MESSAGE_CLASS_DEFINITION ( FileOutput : : MsgConfigureFileOutput Work , Message )
MESSAGE_CLASS_DEFINITION ( FileOutput : : MsgConfigureFileOutput StreamTiming , Message )
MESSAGE_CLASS_DEFINITION ( FileOutput : : MsgReportFileOutput Generation , Message )
MESSAGE_CLASS_DEFINITION ( FileOutput : : MsgReportFileOutput StreamTiming , Message )
FileOutput : : FileOutput ( DeviceAPI * deviceAPI ) :
m_deviceAPI ( deviceAPI ) ,
m_settings ( ) ,
m_fileSink Worker ( nullptr ) ,
m_deviceDescription ( " FileSink " ) ,
m_fileOutput Worker ( nullptr ) ,
m_deviceDescription ( " FileOutput " ) ,
m_fileName ( " ./test.sdriq " ) ,
m_startingTimeStamp ( 0 ) ,
m_masterTimer ( deviceAPI - > getMasterTimer ( ) )
@ -51,17 +51,17 @@ FileSinkOutput::FileSinkOutput(DeviceAPI *deviceAPI) :
@@ -51,17 +51,17 @@ FileSinkOutput::FileSinkOutput(DeviceAPI *deviceAPI) :
m_deviceAPI - > setNbSinkStreams ( 1 ) ;
}
FileSink Output : : ~ FileSink Output ( )
FileOutput : : ~ FileOutput ( )
{
stop ( ) ;
}
void FileSink Output : : destroy ( )
void FileOutput : : destroy ( )
{
delete this ;
}
void FileSink Output : : openFileStream ( )
void FileOutput : : openFileStream ( )
{
if ( m_ofstream . is_open ( ) ) {
m_ofstream . close ( ) ;
@ -79,51 +79,51 @@ void FileSinkOutput::openFileStream()
@@ -79,51 +79,51 @@ void FileSinkOutput::openFileStream()
FileRecord : : writeHeader ( m_ofstream , header ) ;
qDebug ( ) < < " FileSink Output::openFileStream: " < < m_fileName . toStdString ( ) . c_str ( ) ;
qDebug ( ) < < " FileOutput::openFileStream: " < < m_fileName . toStdString ( ) . c_str ( ) ;
}
void FileSink Output : : init ( )
void FileOutput : : init ( )
{
applySettings ( m_settings , true ) ;
}
bool FileSink Output : : start ( )
bool FileOutput : : start ( )
{
QMutexLocker mutexLocker ( & m_mutex ) ;
qDebug ( ) < < " FileSink Output::start " ;
qDebug ( ) < < " FileOutput::start " ;
openFileStream ( ) ;
m_fileSinkWorker = new FileSink Worker ( & m_ofstream , & m_sampleSourceFifo ) ;
m_fileSink Worker - > moveToThread ( & m_fileSink WorkerThread ) ;
m_fileSink Worker - > setSamplerate ( m_settings . m_sampleRate ) ;
m_fileSink Worker - > setLog2Interpolation ( m_settings . m_log2Interp ) ;
m_fileSink Worker - > connectTimer ( m_masterTimer ) ;
m_fileOutputWorker = new FileOutput Worker ( & m_ofstream , & m_sampleSourceFifo ) ;
m_fileOutput Worker - > moveToThread ( & m_fileOutput WorkerThread ) ;
m_fileOutput Worker - > setSamplerate ( m_settings . m_sampleRate ) ;
m_fileOutput Worker - > setLog2Interpolation ( m_settings . m_log2Interp ) ;
m_fileOutput Worker - > connectTimer ( m_masterTimer ) ;
startWorker ( ) ;
mutexLocker . unlock ( ) ;
//applySettings(m_generalSettings, m_settings, true);
qDebug ( " FileSink Output::start: started " ) ;
qDebug ( " FileOutput::start: started " ) ;
if ( getMessageQueueToGUI ( ) )
{
MsgReportFileSink Generation * report = MsgReportFileSink Generation : : create ( true ) ; // acquisition on
MsgReportFileOutput Generation * report = MsgReportFileOutput Generation : : create ( true ) ; // acquisition on
getMessageQueueToGUI ( ) - > push ( report ) ;
}
return true ;
}
void FileSink Output : : stop ( )
void FileOutput : : stop ( )
{
qDebug ( ) < < " FileSourceInput::stop " ;
QMutexLocker mutexLocker ( & m_mutex ) ;
if ( m_fileSink Worker )
if ( m_fileOutput Worker )
{
stopWorker ( ) ;
delete m_fileSink Worker ;
m_fileSink Worker = nullptr ;
delete m_fileOutput Worker ;
m_fileOutput Worker = nullptr ;
}
if ( m_ofstream . is_open ( ) ) {
@ -132,30 +132,30 @@ void FileSinkOutput::stop()
@@ -132,30 +132,30 @@ void FileSinkOutput::stop()
if ( getMessageQueueToGUI ( ) )
{
MsgReportFileSink Generation * report = MsgReportFileSink Generation : : create ( false ) ; // acquisition off
MsgReportFileOutput Generation * report = MsgReportFileOutput Generation : : create ( false ) ; // acquisition off
getMessageQueueToGUI ( ) - > push ( report ) ;
}
}
void FileSink Output : : startWorker ( )
void FileOutput : : startWorker ( )
{
m_fileSink Worker - > startWork ( ) ;
m_fileSink WorkerThread . start ( ) ;
m_fileOutput Worker - > startWork ( ) ;
m_fileOutput WorkerThread . start ( ) ;
}
void FileSink Output : : stopWorker ( )
void FileOutput : : stopWorker ( )
{
m_fileSink Worker - > stopWork ( ) ;
m_fileSink WorkerThread . quit ( ) ;
m_fileSink WorkerThread . wait ( ) ;
m_fileOutput Worker - > stopWork ( ) ;
m_fileOutput WorkerThread . quit ( ) ;
m_fileOutput WorkerThread . wait ( ) ;
}
QByteArray FileSink Output : : serialize ( ) const
QByteArray FileOutput : : serialize ( ) const
{
return m_settings . serialize ( ) ;
}
bool FileSink Output : : deserialize ( const QByteArray & data )
bool FileOutput : : deserialize ( const QByteArray & data )
{
bool success = true ;
@ -165,58 +165,58 @@ bool FileSinkOutput::deserialize(const QByteArray& data)
@@ -165,58 +165,58 @@ bool FileSinkOutput::deserialize(const QByteArray& data)
success = false ;
}
MsgConfigureFileSink * message = MsgConfigureFileSink : : create ( m_settings , true ) ;
MsgConfigureFileOutput * message = MsgConfigureFileOutput : : create ( m_settings , true ) ;
m_inputMessageQueue . push ( message ) ;
if ( m_guiMessageQueue )
{
MsgConfigureFileSink * messageToGUI = MsgConfigureFileSink : : create ( m_settings , true ) ;
MsgConfigureFileOutput * messageToGUI = MsgConfigureFileOutput : : create ( m_settings , true ) ;
m_guiMessageQueue - > push ( messageToGUI ) ;
}
return success ;
}
const QString & FileSink Output : : getDeviceDescription ( ) const
const QString & FileOutput : : getDeviceDescription ( ) const
{
return m_deviceDescription ;
}
int FileSink Output : : getSampleRate ( ) const
int FileOutput : : getSampleRate ( ) const
{
return m_settings . m_sampleRate ;
}
quint64 FileSink Output : : getCenterFrequency ( ) const
quint64 FileOutput : : getCenterFrequency ( ) const
{
return m_settings . m_centerFrequency ;
}
void FileSink Output : : setCenterFrequency ( qint64 centerFrequency )
void FileOutput : : setCenterFrequency ( qint64 centerFrequency )
{
FileSink Settings settings = m_settings ;
FileOutput Settings settings = m_settings ;
settings . m_centerFrequency = centerFrequency ;
MsgConfigureFileSink * message = MsgConfigureFileSink : : create ( settings , false ) ;
MsgConfigureFileOutput * message = MsgConfigureFileOutput : : create ( settings , false ) ;
m_inputMessageQueue . push ( message ) ;
if ( m_guiMessageQueue )
{
MsgConfigureFileSink * messageToGUI = MsgConfigureFileSink : : create ( settings , false ) ;
MsgConfigureFileOutput * messageToGUI = MsgConfigureFileOutput : : create ( settings , false ) ;
m_guiMessageQueue - > push ( messageToGUI ) ;
}
}
std : : time_t FileSink Output : : getStartingTimeStamp ( ) const
std : : time_t FileOutput : : getStartingTimeStamp ( ) const
{
return m_startingTimeStamp ;
}
bool FileSink Output : : handleMessage ( const Message & message )
bool FileOutput : : handleMessage ( const Message & message )
{
if ( MsgConfigureFileSink Name : : match ( message ) )
if ( MsgConfigureFileOutput Name : : match ( message ) )
{
MsgConfigureFileSink Name & conf = ( MsgConfigureFileSink Name & ) message ;
MsgConfigureFileOutput Name & conf = ( MsgConfigureFileOutput Name & ) message ;
m_fileName = conf . getFileName ( ) ;
openFileStream ( ) ;
return true ;
@ -224,7 +224,7 @@ bool FileSinkOutput::handleMessage(const Message& message)
@@ -224,7 +224,7 @@ bool FileSinkOutput::handleMessage(const Message& message)
else if ( MsgStartStop : : match ( message ) )
{
MsgStartStop & cmd = ( MsgStartStop & ) message ;
qDebug ( ) < < " FileSink Output::handleMessage: MsgStartStop: " < < ( cmd . getStartStop ( ) ? " start " : " stop " ) ;
qDebug ( ) < < " FileOutput::handleMessage: MsgStartStop: " < < ( cmd . getStartStop ( ) ? " start " : " stop " ) ;
if ( cmd . getStartStop ( ) )
{
@ -240,19 +240,19 @@ bool FileSinkOutput::handleMessage(const Message& message)
@@ -240,19 +240,19 @@ bool FileSinkOutput::handleMessage(const Message& message)
return true ;
}
else if ( MsgConfigureFileSink : : match ( message ) )
else if ( MsgConfigureFileOutput : : match ( message ) )
{
qDebug ( ) < < " FileSinkOutput::handleMessage: MsgConfigureFileSink " ;
MsgConfigureFileSink & conf = ( MsgConfigureFileSink & ) message ;
qDebug ( ) < < " FileOutput::handleMessage: MsgConfigureFileOutput " ;
MsgConfigureFileOutput & conf = ( MsgConfigureFileOutput & ) message ;
applySettings ( conf . getSettings ( ) , conf . getForce ( ) ) ;
return true ;
}
else if ( MsgConfigureFileSink Work : : match ( message ) )
else if ( MsgConfigureFileOutput Work : : match ( message ) )
{
MsgConfigureFileSink Work & conf = ( MsgConfigureFileSink Work & ) message ;
MsgConfigureFileOutput Work & conf = ( MsgConfigureFileOutput Work & ) message ;
bool working = conf . isWorking ( ) ;
if ( m_fileSink Worker ! = 0 )
if ( m_fileOutput Worker ! = 0 )
{
if ( working ) {
startWorker ( ) ;
@ -263,13 +263,13 @@ bool FileSinkOutput::handleMessage(const Message& message)
@@ -263,13 +263,13 @@ bool FileSinkOutput::handleMessage(const Message& message)
return true ;
}
else if ( MsgConfigureFileSink StreamTiming : : match ( message ) )
else if ( MsgConfigureFileOutput StreamTiming : : match ( message ) )
{
MsgReportFileSink StreamTiming * report ;
MsgReportFileOutput StreamTiming * report ;
if ( m_fileSink Worker ! = 0 & & getMessageQueueToGUI ( ) )
if ( m_fileOutput Worker ! = 0 & & getMessageQueueToGUI ( ) )
{
report = MsgReportFileSink StreamTiming : : create ( m_fileSink Worker - > getSamplesCount ( ) ) ;
report = MsgReportFileOutput StreamTiming : : create ( m_fileOutput Worker - > getSamplesCount ( ) ) ;
getMessageQueueToGUI ( ) - > push ( report ) ;
}
@ -281,7 +281,7 @@ bool FileSinkOutput::handleMessage(const Message& message)
@@ -281,7 +281,7 @@ bool FileSinkOutput::handleMessage(const Message& message)
}
}
void FileSink Output : : applySettings ( const FileSink Settings & settings , bool force )
void FileOutput : : applySettings ( const FileOutput Settings & settings , bool force )
{
QMutexLocker mutexLocker ( & m_mutex ) ;
bool forwardChange = false ;
@ -296,9 +296,9 @@ void FileSinkOutput::applySettings(const FileSinkSettings& settings, bool force)
@@ -296,9 +296,9 @@ void FileSinkOutput::applySettings(const FileSinkSettings& settings, bool force)
{
m_settings . m_sampleRate = settings . m_sampleRate ;
if ( m_fileSink Worker ! = 0 )
if ( m_fileOutput Worker ! = 0 )
{
m_fileSink Worker - > setSamplerate ( m_settings . m_sampleRate ) ;
m_fileOutput Worker - > setSamplerate ( m_settings . m_sampleRate ) ;
}
forwardChange = true ;
@ -308,9 +308,9 @@ void FileSinkOutput::applySettings(const FileSinkSettings& settings, bool force)
@@ -308,9 +308,9 @@ void FileSinkOutput::applySettings(const FileSinkSettings& settings, bool force)
{
m_settings . m_log2Interp = settings . m_log2Interp ;
if ( m_fileSink Worker ! = 0 )
if ( m_fileOutput Worker ! = 0 )
{
m_fileSink Worker - > setLog2Interpolation ( m_settings . m_log2Interp ) ;
m_fileOutput Worker - > setLog2Interpolation ( m_settings . m_log2Interp ) ;
}
forwardChange = true ;
@ -318,7 +318,7 @@ void FileSinkOutput::applySettings(const FileSinkSettings& settings, bool force)
@@ -318,7 +318,7 @@ void FileSinkOutput::applySettings(const FileSinkSettings& settings, bool force)
if ( forwardChange )
{
qDebug ( " FileSink Output::applySettings: forward: m_centerFrequency: %llu m_sampleRate: %llu m_log2Interp: %d " ,
qDebug ( " FileOutput::applySettings: forward: m_centerFrequency: %llu m_sampleRate: %llu m_log2Interp: %d " ,
m_settings . m_centerFrequency ,
m_settings . m_sampleRate ,
m_settings . m_log2Interp ) ;
@ -328,7 +328,7 @@ void FileSinkOutput::applySettings(const FileSinkSettings& settings, bool force)
@@ -328,7 +328,7 @@ void FileSinkOutput::applySettings(const FileSinkSettings& settings, bool force)
}
int FileSink Output : : webapiRunGet (
int FileOutput : : webapiRunGet (
SWGSDRangel : : SWGDeviceState & response ,
QString & errorMessage )
{
@ -337,7 +337,7 @@ int FileSinkOutput::webapiRunGet(
@@ -337,7 +337,7 @@ int FileSinkOutput::webapiRunGet(
return 200 ;
}
int FileSink Output : : webapiRun (
int FileOutput : : webapiRun (
bool run ,
SWGSDRangel : : SWGDeviceState & response ,
QString & errorMessage )