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

2021-02-23 Fred Gleason <fredg@paravelsystems.com>

Browse Source 
* Removed the Qt3Support library from the build system.

Signed-off-by: Fred Gleason <fredg@paravelsystems.com>
This commit is contained in:
Fred Gleason
2021-02-23 18:07:21 -05:00
parent b2f8532e25
commit 89a0d72439
508 changed files with 5763 additions and 6078 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
rdpadengined/Makefile.am
View File

@@ -2,7 +2,7 @@
##
## Rivendell PyPAD Script Host
##
## (C) Copyright 2018-2020 Fred Gleason <fredg@paravelsystems.com>
## (C) Copyright 2018-2021 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
@@ -20,7 +20,7 @@
##
## Use automake to process this into a Makefile.in
AM_CPPFLAGS = -Wall -DPREFIX=\"$(prefix)\" -I$(top_srcdir)/lib @QT4_CFLAGS@ @MUSICBRAINZ_CFLAGS@ -I/usr/include/Qt3Support
AM_CPPFLAGS = -Wall -DPREFIX=\"$(prefix)\" -I$(top_srcdir)/lib @QT4_CFLAGS@ @MUSICBRAINZ_CFLAGS@
LIBS = -L$(top_srcdir)/lib -L$(top_srcdir)/rdhpi
MOC = @QT_MOC@
@@ -35,7 +35,7 @@ dist_rdpadengined_SOURCES = rdpadengined.cpp rdpadengined.h
nodist_rdpadengined_SOURCES = moc_rdpadengined.cpp
rdpadengined_LDADD = @LIB_RDLIBS@ @LIBVORBIS@ @QT4_LIBS@ @MUSICBRAINZ_LIBS@ -lQt3Support
rdpadengined_LDADD = @LIB_RDLIBS@ @LIBVORBIS@ @QT4_LIBS@ @MUSICBRAINZ_LIBS@
CLEANFILES = *~\
*.idb\

9
rdpadengined/rdpadengined.cpp
View File

@@ -23,8 +23,7 @@
#include <stdio.h>
#include <syslog.h>
#include <qcoreapplication.h>
#include <qstringlist.h>
#include <QCoreApplication>
#include <rdapplication.h>
#include <rdconf.h>
@@ -57,7 +56,7 @@ MainObject::MainObject(QObject *parent)
//
rda=static_cast<RDApplication *>(new RDCoreApplication("rdpadengined","rdpadengined",RDPADENGINED_USAGE,this));
if(!rda->open(&err_msg,&err_type,false)) {
fprintf(stderr,"rdpadengined: %s\n",(const char *)err_msg);
fprintf(stderr,"rdpadengined: %s\n",err_msg.toUtf8().constData());
exit(1);
}
@@ -272,8 +271,8 @@ void MainObject::StartScript(unsigned id)
args.push_back(QString().sprintf("%u",RD_PAD_CLIENT_TCP_PORT));
args.push_back(QString().sprintf("$%u",id));
pad_instances.value(id)->start(RD_PYPAD_PYTHON_PATH,args);
rda->syslog(LOG_INFO,"starting: "+proc->program()+" "+
proc->arguments().join(" ").toUtf8());
rda->syslog(LOG_INFO,"%s",(QString("starting: ")+proc->program()+" "+
proc->arguments().join(" ")).toUtf8().constData());
}
delete q;
}