Autres/Rivendellaudio
1
0
Fork 0
mirror of https://github.com/ElvishArtisan/rivendell.git synced 2025-06-01 00:22:38 +02:00
Code Issues Projects Releases Wiki Activity

2021-12-28 Fred Gleason <fredg@paravelsystems.com>

Browse Source 
* Fixed a regression in caed(8) that broke audio capture under
	ALSA and JACK.

Signed-off-by: Fred Gleason <fredg@paravelsystems.com>
This commit is contained in:
Fred Gleason 2021-12-28 09:00:45 -05:00
parent 8ae2c2bacb
commit 884f327050
5 changed files with 8 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
ChangeLog
View File

@ -22845,3 +22845,6 @@
* Added an 'AR_PYTHON_MODULE()' autoconf macro. * Added an 'AR_PYTHON_MODULE()' autoconf macro.
* Added a test for the PyPI module build chain to 'configure.ac'. * Added a test for the PyPI module build chain to 'configure.ac'.
* Bumped the minimum Python version dependency from 3.4 to 3.6. * Bumped the minimum Python version dependency from 3.4 to 3.6.
2021-12-28 Fred Gleason <fredg@paravelsystems.com>
* Fixed a regression in caed(8) that broke audio capture under
ALSA and JACK.

8
cae/cae.cpp
View File

@ -634,15 +634,11 @@ 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)) { // No positive echo required here!
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;
} }
rda->syslog(LOG_INFO, rda->syslog(LOG_INFO,"StopRecord - Card: %d Stream: %d",card,stream);
"StopRecord - Card: %d Stream: %d",card,stream);
} }

2
cae/cae_server.cpp
View File

@ -217,7 +217,7 @@ void CaeServer::connectionClosedData(int id)
bool CaeServer::ProcessCommand(int id,const QString &cmd) bool CaeServer::ProcessCommand(int id,const QString &cmd)
{ {
printf("CaeServer::ProcessCommand(%d,'%s')\n",id,cmd.toUtf8().constData()); // rda->syslog(LOG_NOTICE,"processing command: \"%s\"",cmd.toUtf8().constData());
CaeServerConnection *conn=cae_connections.value(id); CaeServerConnection *conn=cae_connections.value(id);
bool ok=false; bool ok=false;
QString cmdstr=cmd; QString cmdstr=cmd;

2
cae/driver_alsa.cpp
View File

@ -1052,6 +1052,7 @@ bool DriverAlsa::stopRecord(int card,int port)
return false; return false;
} }
alsa_recording[card][port]=false; alsa_recording[card][port]=false;
stateRecordUpdate(card,port,2);
return true; return true;
#else #else
return false; return false;
@ -1386,7 +1387,6 @@ void DriverAlsa::recordTimerData(int cardport)
int stream=cardport-card*RD_MAX_PORTS; int stream=cardport-card*RD_MAX_PORTS;
stopRecord(card,stream); stopRecord(card,stream);
stateRecordUpdate(card,stream,2);
#endif // ALSA #endif // ALSA
} }

5
cae/driver_jack.cpp
View File

@ -31,9 +31,6 @@
#include "driver_jack.h" #include "driver_jack.h"
#ifdef JACK
#endif // JACK
#ifdef JACK #ifdef JACK
// //
// Callback Variables // Callback Variables
@ -1050,6 +1047,7 @@ bool DriverJack::stopRecord(int card,int port)
return false; return false;
} }
jack_recording[port]=false; jack_recording[port]=false;
stateRecordUpdate(card,port,2);
return true; return true;
#else #else
return false; return false;
@ -1393,7 +1391,6 @@ void DriverJack::recordTimerData(int stream)
{ {
#ifdef JACK #ifdef JACK
stopRecord(jack_card,stream); stopRecord(jack_card,stream);
// stateRecordUpdate(jack_card,stream,2);
#endif // JACK #endif // JACK
} }