From a80b4378583456ccc76ae3f885c09aa247929284 Mon Sep 17 00:00:00 2001 From: Peter L Jones Date: Fri, 10 Apr 2020 17:51:37 +0100 Subject: [PATCH] Pass frame size to recorder --- src/recorder/jamrecorder.cpp | 5 ++++- src/recorder/jamrecorder.h | 4 +++- src/server.cpp | 2 +- 3 files changed, 8 insertions(+), 3 deletions(-) diff --git a/src/recorder/jamrecorder.cpp b/src/recorder/jamrecorder.cpp index 0d5d20d5..c1a4f0d1 100755 --- a/src/recorder/jamrecorder.cpp +++ b/src/recorder/jamrecorder.cpp @@ -295,7 +295,8 @@ QMap> CJamSession::TracksFromSessionDir(const QString * @brief CJamRecorder::Init Create recording directory, if necessary, and connect signal handlers * @param server Server object emiting signals */ -void CJamRecorder::Init(const CServer* server) +void CJamRecorder::Init( const CServer* server, + const int _iServerFrameSizeSamples ) { QFileInfo fi(recordBaseDir.absolutePath()); fi.setCaching(false); @@ -325,6 +326,8 @@ void CJamRecorder::Init(const CServer* server) QObject::connect((const QObject *)server, SIGNAL ( AudioFrame(const int, const QString, const CHostAddress, const int, const CVector) ), this, SLOT( OnFrame(const int, const QString, const CHostAddress, const int, const CVector) ), Qt::ConnectionType::QueuedConnection); + + iServerFrameSizeSamples = _iServerFrameSizeSamples; } /** diff --git a/src/recorder/jamrecorder.h b/src/recorder/jamrecorder.h index 3dd24e15..6adac471 100755 --- a/src/recorder/jamrecorder.h +++ b/src/recorder/jamrecorder.h @@ -139,7 +139,8 @@ class CJamRecorder : public QThread public: CJamRecorder(const QString recordingDirName) : recordBaseDir (recordingDirName), isRecording (false) {} - void Init(const CServer* server); + + void Init( const CServer* server, const int _iServerFrameSizeSamples ); static void SessionDirToReaper(QString& strSessionDirName); @@ -170,6 +171,7 @@ private: bool isRecording; CJamSession* currentSession; + int iServerFrameSizeSamples; }; } diff --git a/src/server.cpp b/src/server.cpp index 93ea88ce..16acb80a 100755 --- a/src/server.cpp +++ b/src/server.cpp @@ -397,7 +397,7 @@ CServer::CServer ( const int iNewMaxNumChan, // Enable jam recording (if requested) if ( bEnableRecording ) { - JamRecorder.Init ( this ); + JamRecorder.Init ( this, iServerFrameSizeSamples ); JamRecorder.start(); }