Autres/Rivendellaudio
1
0
Fork 0
mirror of https://github.com/ElvishArtisan/rivendell.git synced 2025-05-31 16:12:33 +02:00
Code Issues Projects Releases Wiki Activity

2019-05-29 Fred Gleason <fredg@paravelsystems.com>

Browse Source 
* Removed 'Q3Process' dependency from caed(8).
This commit is contained in:
Fred Gleason 2019-05-29 18:25:38 -04:00
parent dd7ac31388
commit 64906f8ab3
3 changed files with 20 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ChangeLog
View File

@ -18701,3 +18701,5 @@
client connections.
2019-05-29 Fred Gleason <fredg@paravelsystems.com>
* Removed 'Q3SocketDevice' dependency from caed(8).
2019-05-29 Fred Gleason <fredg@paravelsystems.com>
* Removed 'Q3Process' dependency from caed(8).

5
cae/cae.h
View File

@ -31,7 +31,8 @@
#include <qstring.h>
#include <qsignalmapper.h>
#include <qtimer.h>
#include <q3process.h>
//#include <q3process.h>
#include <qprocess.h>
#include <qudpsocket.h>
#include <rdwavefile.h>
@ -287,7 +288,7 @@ class MainObject : public QObject
bool jack_activated;
#ifdef JACK
int jack_card;
std::vector<Q3Process *> jack_clients;
QList<QProcess *> jack_clients;
RDWaveFile *jack_record_wave[RD_MAX_STREAMS];
RDWaveFile *jack_play_wave[RD_MAX_STREAMS];
short *jack_wave_buffer;

23
cae/cae_jack.cpp
View File

@ -2,7 +2,7 @@
//
// The JACK Driver for the Core Audio Engine component of Rivendell
//
// (C) Copyright 2002-2015 Fred Gleason <fredg@paravelsystems.com>
// (C) Copyright 2002-2019 Fred Gleason <fredg@paravelsystems.com>
//
// This program is free software; you can redistribute it and/or modify
// it under the terms of the GNU General Public License version 2 as
@ -440,9 +440,12 @@ void MainObject::jackClientStartData()
QString cmd=RDDateDecode(q->value(1).toString(),QDate::currentDate(),
cae_station,rd_config,
rd_config->provisioningServiceName(rd_config->stationName()));
QStringList fields=cmd.split(" ");
jack_clients.push_back(new Q3Process(fields,this));
if(jack_clients.back()->start()) {
QStringList args=cmd.split(" ",QString::SkipEmptyParts);
QString program=args.at(0);
args.removeFirst();
jack_clients.push_back(new QProcess(this));
jack_clients.back()->start(program,args);
if(jack_clients.back()->waitForStarted()) {
rd_config->log("caed",RDConfig::LogDebug,"started JACK Client \""+
q->value(0).toString()+"\"");
}
@ -486,9 +489,13 @@ void MainObject::jackInit(RDStation *station)
// Start Jack Server
//
if(station->startJack()) {
QStringList fields=station->jackCommandLine().split(" ");
Q3Process *proc=new Q3Process(fields,this);
if(proc->start()) {
QStringList args=
station->jackCommandLine().split(" ",QString::SkipEmptyParts);
QString program=args.at(0);
args.removeFirst();
QProcess *proc=new QProcess(this);
proc->start(program,args);
if(proc->waitForStarted()) {
rd_config->log("caed",RDConfig::LogDebug,"JACK server started");
}
else {
@ -707,7 +714,7 @@ void MainObject::jackInit(RDStation *station)
void MainObject::jackFree()
{
#ifdef JACK
for(unsigned i=0;i<jack_clients.size();i++) {
for(int i=0;i<jack_clients.size();i++) {
jack_clients[i]->kill();
delete jack_clients[i];
}