From 993ab36a2967dab83f4902672b19eb54cb600f19 Mon Sep 17 00:00:00 2001
From: f4exb <f4exb06@gmail.com>
Date: Wed, 10 Oct 2018 14:05:21 +0200
Subject: [PATCH] FileRecord improvement: update FileSink plugin and
 writeHeader private method in FileRecord accordingly

---
 plugins/samplesink/filesink/filesinkoutput.cpp | 11 +++++++----
 plugins/samplesink/filesink/filesinkplugin.cpp |  2 +-
 sdrbase/dsp/filerecord.cpp                     | 13 +++++++++----
 sdrbase/dsp/filerecord.h                       |  1 +
 4 files changed, 18 insertions(+), 9 deletions(-)

diff --git a/plugins/samplesink/filesink/filesinkoutput.cpp b/plugins/samplesink/filesink/filesinkoutput.cpp
index b9ea22fb9..d73747c1a 100644
--- a/plugins/samplesink/filesink/filesinkoutput.cpp
+++ b/plugins/samplesink/filesink/filesinkoutput.cpp
@@ -68,12 +68,15 @@ void FileSinkOutput::openFileStream()
 
 	m_ofstream.open(m_fileName.toStdString().c_str(), std::ios::binary);
 
+    FileRecord::Header header;
 	int actualSampleRate = m_settings.m_sampleRate * (1<<m_settings.m_log2Interp);
-	m_ofstream.write((const char *) &actualSampleRate, sizeof(int));
-    //m_ofstream.write((const char *) &m_settings.m_sampleRate, sizeof(int));
-	m_ofstream.write((const char *) &m_settings.m_centerFrequency, sizeof(quint64));
+    header.sampleRate = actualSampleRate;
+    header.centerFrequency = m_settings.m_centerFrequency;
     m_startingTimeStamp = time(0);
-    m_ofstream.write((const char *) &m_startingTimeStamp, sizeof(std::time_t));
+    header.startTimeStamp = m_startingTimeStamp;
+    header.sampleSize = SDR_RX_SAMP_SZ;
+
+    FileRecord::writeHeader(m_ofstream, header);
 
 	qDebug() << "FileSinkOutput::openFileStream: " << m_fileName.toStdString().c_str();
 }
diff --git a/plugins/samplesink/filesink/filesinkplugin.cpp b/plugins/samplesink/filesink/filesinkplugin.cpp
index 468ad020a..66248021e 100644
--- a/plugins/samplesink/filesink/filesinkplugin.cpp
+++ b/plugins/samplesink/filesink/filesinkplugin.cpp
@@ -29,7 +29,7 @@
 
 const PluginDescriptor FileSinkPlugin::m_pluginDescriptor = {
 	QString("File sink output"),
-	QString("3.14.5"),
+	QString("4.2.1"),
 	QString("(c) Edouard Griffiths, F4EXB"),
 	QString("https://github.com/f4exb/sdrangel"),
 	true,
diff --git a/sdrbase/dsp/filerecord.cpp b/sdrbase/dsp/filerecord.cpp
index 55ae8cfc0..5a483e7d9 100644
--- a/sdrbase/dsp/filerecord.cpp
+++ b/sdrbase/dsp/filerecord.cpp
@@ -155,11 +155,8 @@ void FileRecord::writeHeader()
     header.startTimeStamp = ts;
     header.sampleSize = SDR_RX_SAMP_SZ;
     header.filler = 0;
-    boost::crc_32_type crc32;
-    crc32.process_bytes(&header, 28);
-    header.crc32 = crc32.checksum();
 
-    m_sampleFile.write((const char *) &header, sizeof(Header));
+    writeHeader(m_sampleFile, header);
 }
 
 bool FileRecord::readHeader(std::ifstream& sampleFile, Header& header)
@@ -169,3 +166,11 @@ bool FileRecord::readHeader(std::ifstream& sampleFile, Header& header)
     crc32.process_bytes(&header, 28);
     return header.crc32 == crc32.checksum();
 }
+
+void FileRecord::writeHeader(std::ofstream& sampleFile, Header& header)
+{
+    boost::crc_32_type crc32;
+    crc32.process_bytes(&header, 28);
+    header.crc32 = crc32.checksum();
+    sampleFile.write((const char *) &header, sizeof(Header));
+}
\ No newline at end of file
diff --git a/sdrbase/dsp/filerecord.h b/sdrbase/dsp/filerecord.h
index 07248cea6..e5377ee13 100644
--- a/sdrbase/dsp/filerecord.h
+++ b/sdrbase/dsp/filerecord.h
@@ -58,6 +58,7 @@ public:
     void startRecording();
     void stopRecording();
     static bool readHeader(std::ifstream& samplefile, Header& header); //!< returns true if CRC checksum is correct else false
+    static void writeHeader(std::ofstream& samplefile, Header& header);
 
 private:
 	QString m_fileName;