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

2019-06-21 Fred Gleason <fredg@paravelsystems.com>

Browse Source 
* Added 'RDApplication::syslog()' methods.
This commit is contained in:
Fred Gleason
2019-06-24 16:40:18 -04:00
parent 52dc14a3b3
commit f50447eb8b
71 changed files with 1064 additions and 887 deletions
Download Patch File Download Diff File Expand all files Collapse all files

72
cae/cae_jack.cpp
View File

@@ -19,13 +19,13 @@
//
#include <math.h>
#include <syslog.h>
#include <samplerate.h>
#include <qsignalmapper.h>
#include <rd.h>
#include <rdapplication.h>
#include <rddatedecode.h>
#include <rddb.h>
#include <rdescape_string.h>
@@ -447,13 +447,14 @@ void MainObject::jackClientStartData()
jack_clients.push_back(new QProcess(this));
jack_clients.back()->start(program,args);
if(jack_clients.back()->waitForStarted()) {
syslog(LOG_INFO,"started JACK Client \"%s\"",
RDApplication::syslog(rd_config,LOG_INFO,"started JACK Client \"%s\"",
(const char *)q->value(0).toString().toUtf8());
}
else {
syslog(LOG_WARNING,"failed to start JACK Client \"%s\" [%s]",
(const char *)q->value(0).toString().toUtf8(),
(const char *)q->value(1).toString().toUtf8());
RDApplication::syslog(rd_config,LOG_WARNING,
"failed to start JACK Client \"%s\" [%s]",
(const char *)q->value(0).toString().toUtf8(),
(const char *)q->value(1).toString().toUtf8());
}
sleep(1);
}
@@ -480,7 +481,7 @@ void MainObject::jackInit(RDStation *station)
}
}
if(jack_card==RD_MAX_CARDS) {
syslog(LOG_INFO,"no more RD cards available");
RDApplication::syslog(rd_config,LOG_INFO,"no more RD cards available");
return;
}
QString name=QString().sprintf("rivendell_%d",jack_card);
@@ -496,10 +497,11 @@ void MainObject::jackInit(RDStation *station)
QProcess *proc=new QProcess(this);
proc->start(program,args);
if(proc->waitForStarted()) {
syslog(LOG_INFO,"JACK server started");
RDApplication::syslog(rd_config,LOG_INFO,"JACK server started");
}
else {
syslog(LOG_WARNING,"failed to start JACK server");
RDApplication::syslog(rd_config,LOG_WARNING,
"failed to start JACK server");
}
sleep(1);
}
@@ -518,61 +520,70 @@ void MainObject::jackInit(RDStation *station)
if(jack_client==NULL) {
if((jackstat&JackInvalidOption)!=0) {
fprintf (stderr, "invalid or unsupported JACK option\n");
syslog(LOG_WARNING,"invalid or unsupported JACK option");
RDApplication::syslog(rd_config,LOG_WARNING,
"invalid or unsupported JACK option");
}
if((jackstat&JackServerError)!=0) {
fprintf (stderr, "communication error with the JACK server\n");
syslog(LOG_WARNING,"communication error with the JACK server");
RDApplication::syslog(rd_config,LOG_WARNING,
"communication error with the JACK server");
}
if((jackstat&JackNoSuchClient)!=0) {
fprintf (stderr, "requested JACK client does not exist\n");
syslog(LOG_WARNING,"requested JACK client does not exist");
RDApplication::syslog(rd_config,LOG_WARNING,
"requested JACK client does not exist");
}
if((jackstat&JackLoadFailure)!=0) {
fprintf (stderr, "unable to load internal JACK client\n");
syslog(LOG_WARNING,"unable to load internal JACK client");
RDApplication::syslog(rd_config,LOG_WARNING,
"unable to load internal JACK client");
}
if((jackstat&JackInitFailure)!=0) {
fprintf (stderr, "unable to initialize JACK client\n");
syslog(LOG_WARNING,"unable to initialize JACK client");
RDApplication::syslog(rd_config,LOG_WARNING,
"unable to initialize JACK client");
}
if((jackstat&JackShmFailure)!=0) {
fprintf (stderr, "unable to access JACK shared memory\n");
syslog(LOG_WARNING,"unable to access JACK shared memory");
RDApplication::syslog(rd_config,LOG_WARNING,
"unable to access JACK shared memory");
}
if((jackstat&JackVersionError)!=0) {
fprintf (stderr, "JACK protocol version mismatch\n");
syslog(LOG_WARNING,"JACK protocol version mismatch");
RDApplication::syslog(rd_config,LOG_WARNING,
"JACK protocol version mismatch");
}
if((jackstat&JackServerStarted)!=0) {
fprintf (stderr, "JACK server started\n");
syslog(LOG_WARNING,"JACK server started");
RDApplication::syslog(rd_config,LOG_WARNING,"JACK server started");
}
if((jackstat&JackServerFailed)!=0) {
fprintf (stderr, "unable to communication with JACK server\n");
syslog(LOG_WARNING,"unable to communicate with JACK server");
RDApplication::syslog(rd_config,LOG_WARNING,
"unable to communicate with JACK server");
}
if((jackstat&JackNameNotUnique)!=0) {
fprintf (stderr, "JACK client name not unique\n");
syslog(LOG_WARNING,"JACK client name not unique");
RDApplication::syslog(rd_config,LOG_WARNING,
"JACK client name not unique");
}
if((jackstat&JackFailure)!=0) {
fprintf (stderr, "JACK general failure\n");
syslog(LOG_WARNING,"JACK general failure");
RDApplication::syslog(rd_config,LOG_WARNING,"JACK general failure");
}
jack_card=-1;
fprintf (stderr, "no connection to JACK server\n");
syslog(LOG_WARNING,"no connection to JACK server");
RDApplication::syslog(rd_config,LOG_WARNING,"no connection to JACK server");
return;
}
jack_connected=true;
@@ -584,7 +595,7 @@ void MainObject::jackInit(RDStation *station)
#else
jack_on_shutdown(jack_client,JackShutdown,0);
#endif // HAVE_JACK_INFO_SHUTDOWN
syslog(LOG_INFO,"connected to JACK server");
RDApplication::syslog(rd_config,LOG_INFO,"connected to JACK server");
//
// Start JACK Clients
@@ -701,7 +712,7 @@ void MainObject::jackInit(RDStation *station)
jack_sample_rate=jack_get_sample_rate(jack_client);
if(jack_sample_rate!=system_sample_rate) {
fprintf (stderr,"JACK sample rate mismatch!\n");
syslog(LOG_WARNING,"JACK sample rate mismatch!");
RDApplication::syslog(rd_config,LOG_WARNING,"JACK sample rate mismatch!");
}
jack_activated=true;
cae_driver[jack_card]=RDStation::Jack;
@@ -730,13 +741,15 @@ bool MainObject::jackLoadPlayback(int card,QString wavename,int *stream)
{
#ifdef JACK
if((*stream=GetJackOutputStream())<0) {
syslog(LOG_WARNING,"jackLoadPlayback(%s) GetJackOutputStream():%d <0",
RDApplication::syslog(rd_config,LOG_DEBUG,
"jackLoadPlayback(%s) GetJackOutputStream():%d <0",
(const char *)wavename.toUtf8(),*stream);
return false;
}
jack_play_wave[*stream]=new RDWaveFile(wavename);
if(!jack_play_wave[*stream]->openWave()) {
syslog(LOG_WARNING,"jackLoadPlayback(%s) openWave() failed to open file",
RDApplication::syslog(rd_config,LOG_DEBUG,
"jackLoadPlayback(%s) openWave() failed to open file",
(const char *)wavename.toUtf8());
delete jack_play_wave[*stream];
jack_play_wave[*stream]=NULL;
@@ -754,7 +767,8 @@ bool MainObject::jackLoadPlayback(int card,QString wavename,int *stream)
break;
default:
syslog(LOG_WARNING,"jackLoadPlayback(%s) getFormatTag()%d || getBistsPerSample()%d failed",
RDApplication::syslog(rd_config,LOG_DEBUG,
"jackLoadPlayback(%s) getFormatTag()%d || getBistsPerSample()%d failed",
(const char *) wavename.toUtf8(),
jack_play_wave[*stream]->getFormatTag(),
jack_play_wave[*stream]->getBitsPerSample());
@@ -948,7 +962,7 @@ bool MainObject::jackLoadRecord(int card,int stream,int coding,int chans,
break;
default:
syslog(LOG_WARNING,
RDApplication::syslog(rd_config,LOG_WARNING,
"requested unsupported channel count %d, card: %d, stream: %d",
chans,card,stream);
delete jack_record_wave[stream];
@@ -976,7 +990,7 @@ bool MainObject::jackLoadRecord(int card,int stream,int coding,int chans,
break;
default:
syslog(LOG_WARNING,
RDApplication::syslog(rd_config,LOG_WARNING,
"requested invalid audio encoding %d, card: %d, stream: %d",
coding,card,stream);
delete jack_record_wave[stream];
@@ -1474,7 +1488,7 @@ void MainObject::WriteJackBuffer(int stream,jack_default_audio_sample_t *buffer,
jack_record_wave[stream]->writeWave(mpeg,s);
}
else {
syslog(LOG_WARNING,
RDApplication::syslog(rd_config,LOG_WARNING,
"TwoLAME encode error, card: %d, stream: %d",jack_card,stream);
}
}
@@ -1678,7 +1692,7 @@ void MainObject::JackSessionSetup()
QString dest=profile->stringValue("JackSession",dest_tag,"",&dest_ok);
while(src_ok&&dest_ok) {
if(jack_connect(jack_client,(const char *)src,(const char *)dest)!=0) {
syslog(LOG_WARNING,"unable to connect %s to %s",
RDApplication::syslog(rd_config,LOG_WARNING,"unable to connect %s to %s",
(const char *)src.toUtf8(),(const char *)dest.toUtf8());
}
count++;