Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 5 additions & 2 deletions src/recorder/cwavestream.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -120,10 +120,13 @@ void CWaveStream::waveStreamHeaders()
*this << scHdrRiff << cFmtSubChunk << scDataSubChunkHdr;
}

CWaveStream::~CWaveStream()
void CWaveStream::finalise()
{
static const uint32_t hdrRiffChunkSize = sizeof(uint32_t) + sizeof(uint32_t) + sizeof(uint32_t);
static const uint32_t fmtSubChunkSize = sizeof(uint32_t) + sizeof(uint32_t) + sizeof(uint16_t) + sizeof(uint16_t) + sizeof(uint32_t) + sizeof(uint32_t) + sizeof(uint16_t) + sizeof(uint16_t);

static const uint32_t hdrRiffChunkSizeOffset = sizeof(uint32_t);
static const uint32_t dataSubChunkHdrChunkSizeOffset = sizeof(HdrRiff) + sizeof(FmtSubChunk) + sizeof (uint32_t) + sizeof (uint32_t);
static const uint32_t dataSubChunkHdrChunkSizeOffset = hdrRiffChunkSize + fmtSubChunkSize + sizeof (uint32_t);

const int64_t currentPos = this->device()->pos();
const uint32_t fileLength = static_cast<uint32_t>(currentPos - initialPos);
Expand Down
3 changes: 2 additions & 1 deletion src/recorder/cwavestream.h
Original file line number Diff line number Diff line change
Expand Up @@ -73,7 +73,8 @@ class CWaveStream : public QDataStream
explicit CWaveStream(QIODevice *iod, const uint16_t numChannels);
CWaveStream(QByteArray *iod, QIODevice::OpenMode flags, const uint16_t numChannels);
CWaveStream(const QByteArray &ba, const uint16_t numChannels);
~CWaveStream();

void finalise();

private:
void waveStreamHeaders();
Expand Down
2 changes: 1 addition & 1 deletion src/recorder/jamrecorder.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -87,7 +87,7 @@ void CJamClient::Frame(const QString _name, const CVector<int16_t>& pcm)
*/
void CJamClient::Disconnect()
{
delete out;
static_cast<CWaveStream*>(out)->finalise();
out = nullptr;

wavFile->close();
Expand Down