Autres/Rivendellaudio
1
0
Fork 0
mirror of https://github.com/ElvishArtisan/rivendell.git synced 2025-11-29 08:40:12 +01: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
rdvairplayd/Makefile.am
View File

@@ -1,6 +1,6 @@
## Makefile.am
##
## (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
@@ -17,7 +17,7 @@
##
## Use automake to process this into a Makefile.in
AM_CPPFLAGS = -Wall -DPREFIX=\"$(prefix)\" -I$(top_srcdir)/lib @QT4_CFLAGS@ @MUSICBRAINZ_CFLAGS@ -DQT3_SUPPORT -I/usr/include/Qt3Support
AM_CPPFLAGS = -Wall -DPREFIX=\"$(prefix)\" -I$(top_srcdir)/lib @QT4_CFLAGS@ @MUSICBRAINZ_CFLAGS@
LIBS = -L$(top_srcdir)/lib
MOC = @QT_MOC@
@@ -32,7 +32,7 @@ dist_rdvairplayd_SOURCES = local_macros.cpp\
nodist_rdvairplayd_SOURCES = moc_rdvairplayd.cpp
rdvairplayd_LDADD = @LIB_RDLIBS@ @LIBVORBIS@ @QT4_LIBS@ @MUSICBRAINZ_LIBS@ -lQt3Support
rdvairplayd_LDADD = @LIB_RDLIBS@ @LIBVORBIS@ @QT4_LIBS@ @MUSICBRAINZ_LIBS@
CLEANFILES = *~\
*.idb\

6
rdvairplayd/local_macros.cpp
View File

@@ -545,8 +545,8 @@ void MainObject::rmlReceivedData(RDMacro *rml)
}
return;
}
if((rml->arg(0).lower()!="now")&&
(rml->arg(0).lower()!="next")) {
if((rml->arg(0).toLower()!="now")&&
(rml->arg(0).toLower()!="next")) {
if(rml->echoRequested()) {
rml->acknowledge(false);
rda->ripc()->sendRml(rml);
@@ -567,7 +567,7 @@ void MainObject::rmlReceivedData(RDMacro *rml)
}
return;
}
if(rml->arg(0).lower()=="now") {
if(rml->arg(0).toLower()=="now") {
air_logs[index]->setNowCart(rml->arg(2).toUInt());
rda->syslog(LOG_INFO,"set default \"now\" cart to %06u on log machine %d",
rml->arg(2).toUInt(),rml->arg(1).toInt());

6
rdvairplayd/rdvairplayd.cpp
View File

@@ -25,7 +25,7 @@
#include <syslog.h>
#include <unistd.h>
#include <qapplication.h>
#include <QCoreApplication>
#include <rdapplication.h>
#include <rdconf.h>
@@ -66,7 +66,7 @@ MainObject::MainObject(QObject *parent)
//
rda=static_cast<RDApplication *>(new RDCoreApplication("rdvairplayd","rdvairplayd",RDVAIRPLAYD_USAGE,this));
if(!rda->open(&err_msg,&err_type,false)) {
fprintf(stderr,"rdvairplayd: %s\n",(const char *)err_msg);
fprintf(stderr,"rdvairplayd: %s\n",err_msg.toUtf8().constData());
exit(1);
}
air_previous_exit_code=rda->airplayConf()->virtualExitCode();
@@ -78,7 +78,7 @@ MainObject::MainObject(QObject *parent)
for(unsigned i=0;i<rda->cmdSwitch()->keys();i++) {
if(!rda->cmdSwitch()->processed(i)) {
fprintf(stderr,"rdvairplayd: unknown command option \"%s\"\n",
(const char *)rda->cmdSwitch()->key(i));
rda->cmdSwitch()->key(i).toUtf8().constData());
exit(2);
}
}