eeva/jamulus
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

merge fixes

Browse source
This commit is contained in:
Volker Fischer 2020-06-01 09:55:31 +02:00
parent 9cdf178e86
commit 50ccb63163
3 changed files with 12 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
ChangeLog
View file

@ -3,8 +3,11 @@
3.5.6git 3.5.6git
- enable/disable recording from command line, coded by pljones (#228)
- added check in acknowledge message, coded by atsampson (#302) - added check in acknowledge message, coded by atsampson (#302)
- bug fix: on MacOS declare an activity to ensure the process doesn't get throttled - bug fix: on MacOS declare an activity to ensure the process doesn't get throttled

8
src/server.cpp
View file

@ -400,11 +400,11 @@ CServer::CServer ( const int iNewMaxNumChan,
QString().number( static_cast<int> ( iPortNumber ) ) ); QString().number( static_cast<int> ( iPortNumber ) ) );
} }
// Enable jam recording (if requested) - kicks off the thread // enable jam recording (if requested) - kicks off the thread
if ( !strRecordingDirName.isEmpty() ) if ( !strRecordingDirName.isEmpty() )
{ {
bRecorderInitialised = JamRecorder.Init ( this, iServerFrameSizeSamples ); bRecorderInitialised = JamRecorder.Init ( this, iServerFrameSizeSamples );
bEnableRecording = bRecorderInitialised; bEnableRecording = bRecorderInitialised;
} }
// enable all channels (for the server all channel must be enabled the // enable all channels (for the server all channel must be enabled the
@ -717,8 +717,10 @@ void CServer::RequestNewRecording()
void CServer::SetEnableRecording ( bool bNewEnableRecording ) void CServer::SetEnableRecording ( bool bNewEnableRecording )
{ {
if ( bRecorderInitialised ) { if ( bRecorderInitialised )
{
bEnableRecording = bNewEnableRecording; bEnableRecording = bNewEnableRecording;
if ( !bEnableRecording ) if ( !bEnableRecording )
{ {
emit StopRecorder(); emit StopRecorder();

8
src/serverdlg.cpp
View file

@ -699,9 +699,9 @@ void CServerDlg::UpdateRecorderStatus ( QString sessionDir )
} }
Qt::CheckState csIsEnabled; Qt::CheckState csIsEnabled;
QString currentSessionDir = edtCurrentSessionDir->text(); QString currentSessionDir = edtCurrentSessionDir->text();
bool bIsRecording = false; bool bIsRecording = false;
QString strRecorderStatus; QString strRecorderStatus;
if ( pServer->GetRecordingEnabled() ) if ( pServer->GetRecordingEnabled() )
{ {
@ -719,7 +719,7 @@ void CServerDlg::UpdateRecorderStatus ( QString sessionDir )
} }
else else
{ {
csIsEnabled = Qt::CheckState::Unchecked; csIsEnabled = Qt::CheckState::Unchecked;
strRecorderStatus = tr ( "Not enabled" ); strRecorderStatus = tr ( "Not enabled" );
} }