Autres/Rivendellaudio
1
0
Fork 0
mirror of https://github.com/ElvishArtisan/rivendell.git synced 2025-07-09 17:07:44 +02:00
Code Issues Projects Releases Wiki Activity

Fixed conflict in 'ChangeLog'

Browse Source 
Signed-off-by: Fred Gleason <fredg@paravelsystems.com>
This commit is contained in:
Fred Gleason 2021-11-24 08:38:23 -05:00
commit 519a09fcee
2 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
ChangeLog
View File

@ -22571,5 +22571,8 @@
2021-10-28 Fred Gleason <fredg@paravelsystems.com> 2021-10-28 Fred Gleason <fredg@paravelsystems.com>
* Moved the 'Daylight Saving Time Considerations' section in the * Moved the 'Daylight Saving Time Considerations' section in the
Operations Guide to after the 'The RDCatch Main Window' section. Operations Guide to after the 'The RDCatch Main Window' section.
2021-11-23 Fred Gleason <fredg@paravelsystems.com>
* Fixed a regression in caed(8) that made it impossible to stop
audio recordings manually.
2021-11-24 Fred Gleason <fredg@paravelsystems.com> 2021-11-24 Fred Gleason <fredg@paravelsystems.com>
* Added a '--check-strings' switch to rddbmgr(8). * Added a '--check-strings' switch to rddbmgr(8).

5
cae/cae.cpp
View File

@ -634,7 +634,10 @@ void MainObject::stopRecordingData(int id,unsigned card,unsigned stream)
cae_server->sendCommand(id,QString::asprintf("SR %u %u -!",card,stream)); cae_server->sendCommand(id,QString::asprintf("SR %u %u -!",card,stream));
return; return;
} }
if(!dvr->stopRecord(card,stream)) { if(dvr->stopRecord(card,stream)) {
cae_server->sendCommand(id,QString::asprintf("SR %u %u +!",card,stream));
}
else {
cae_server->sendCommand(id,QString::asprintf("SR %u %u -!",card,stream)); cae_server->sendCommand(id,QString::asprintf("SR %u %u -!",card,stream));
return; return;
} }