Autres/Rivendellaudio
1
0
Fork 0
mirror of https://github.com/ElvishArtisan/rivendell.git synced 2026-01-11 15:16:07 +01:00
Code Issues Projects Releases Wiki Activity

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

Browse Source 
* Updated build system to use Qt5 instead of Qt4.

Signed-off-by: Fred Gleason <fredg@paravelsystems.com>
This commit is contained in:
Fred Gleason
2021-02-24 16:12:22 -05:00
parent 5131b1d5fe
commit 57abeada3c
130 changed files with 481 additions and 441 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
rdcatchd/Makefile.am
View File

@@ -20,7 +20,7 @@
##
## Use automake to process this into a Makefile.in
AM_CPPFLAGS = -Wall -I$(top_srcdir)/lib @QT4_CFLAGS@ @MUSICBRAINZ_CFLAGS@
AM_CPPFLAGS = -Wall -I$(top_srcdir)/lib -Wno-strict-aliasing -std=c++11 -fPIC @QT5_CFLAGS@ @MUSICBRAINZ_CFLAGS@
LIBS = -L$(top_srcdir)/lib
MOC = @QT_MOC@
@@ -39,7 +39,7 @@ dist_rdcatchd_SOURCES = batch.cpp\
nodist_rdcatchd_SOURCES = moc_event_player.cpp\
moc_rdcatchd.cpp
rdcatchd_LDADD = @LIB_RDLIBS@ @LIBVORBIS@ @QT4_LIBS@ @MUSICBRAINZ_LIBS@
rdcatchd_LDADD = @LIB_RDLIBS@ @LIBVORBIS@ @QT5_LIBS@ @MUSICBRAINZ_LIBS@
CLEANFILES = *~\
moc_*

24
rdcatchd/rdcatchd.cpp
View File

@@ -359,7 +359,7 @@ MainObject::MainObject(QObject *parent)
connect(catch_engine,SIGNAL(timeout(int)),this,SLOT(engineData(int)));
LoadEngine();
if(qApp->argc()!=1) {
if(qApp->arguments().size()!=1) {
debug=true;
}
@@ -1603,19 +1603,14 @@ void MainObject::ParseCommand(int ch)
QString line=QString::fromUtf8(data);
for(int i=0;i<line.length();i++) {
QChar c=line.at(i);
switch(c.toAscii()) {
case '!':
bool modified=false;
if(c==QChar('!')) {
DispatchCommand(conn);
conn->accum="";
break;
case '\r':
case '\n':
break;
default:
modified=true;
}
if((!modified)&&(c!=QChar('\r'))&&(c!=QChar('\n'))) {
conn->accum+=c;
break;
}
}
}
@@ -2511,11 +2506,12 @@ QString MainObject::GetFileExtension(QString filename)
}
/* This is an overloaded virtual function to tell a session manager not to restart this daemon. */
/*
void QApplication::saveState(QSessionManager &sm) {
sm.setRestartHint(QSessionManager::RestartNever);
return;
};
*/
bool MainObject::SendErrorMessage(CatchEvent *event,const QString &err_desc,
QString rml)
@@ -2679,9 +2675,9 @@ void MainObject::SendNotification(RDNotification::Type type,
QString MainObject::GetTempRecordingName(int id) const
{
return QString().sprintf("%s/rdcatchd-record-%d.%s",
RDConfiguration()->audioRoot().toAscii().constData(),
RDConfiguration()->audioRoot().toUtf8().constData(),
id,
RDConfiguration()->audioExtension().toAscii().
RDConfiguration()->audioExtension().toUtf8().
constData());
}