Autres/Rivendellaudio
1
0
Fork 0
mirror of https://github.com/ElvishArtisan/rivendell.git synced 2025-10-10 16:43:35 +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
rdrepld/Makefile.am
View File

@@ -1,6 +1,6 @@
## Makefile.am
##
## (C) Copyright 2010-2020 Fred Gleason <fredg@paravelsystems.com>
## (C) Copyright 2010-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
@@ -18,7 +18,7 @@
##
## Use automake to process this into a Makefile.in
AM_CPPFLAGS = -Wall -I$(top_srcdir)/lib @QT4_CFLAGS@ -DQT3_SUPPORT @MUSICBRAINZ_CFLAGS@ -I/usr/include/Qt3Support
AM_CPPFLAGS = -Wall -I$(top_srcdir)/lib @QT4_CFLAGS@ @MUSICBRAINZ_CFLAGS@
LIBS = -L$(top_srcdir)/lib
MOC = @QT_MOC@
@@ -32,7 +32,7 @@ dist_rdrepld_SOURCES = rdrepld.cpp rdrepld.h \
replfactory.cpp replfactory.h\
citadelxds.cpp citadelxds.h
nodist_rdrepld_SOURCES = moc_rdrepld.cpp
rdrepld_LDADD = @LIB_RDLIBS@ @LIBVORBIS@ @QT4_LIBS@ @MUSICBRAINZ_LIBS@ -lQt3Support
rdrepld_LDADD = @LIB_RDLIBS@ @LIBVORBIS@ @QT4_LIBS@ @MUSICBRAINZ_LIBS@
CLEANFILES = *~ moc_*
DISTCLEANFILES = moc_*

58
rdrepld/citadelxds.cpp
View File

@@ -24,8 +24,6 @@
#include <syslog.h>
#include <errno.h>
#include <QUrl>
#include <rdapplication.h>
#include <rdaudioconvert.h>
#include <rdcart.h>
@@ -120,7 +118,7 @@ bool CitadelXds::LoadIsciXreference(const QString &filename)
bool ok=false;
unsigned linenum=3;
if((f=fopen(filename,"r"))==NULL) {
if((f=fopen(filename.toUtf8(),"r"))==NULL) {
rda->syslog(LOG_WARNING,
"unable to load ISCI cross reference file \"%s\" [%s]",
(const char *)rda->system()->isciXreferencePath().toUtf8(),
@@ -148,7 +146,7 @@ bool CitadelXds::LoadIsciXreference(const QString &filename)
fields=fields.split(',',line,"\"");
if(fields.size()==9) {
for(int i=0;i<fields.size();i++) {
fields[i]=fields[i].replace("\"","").stripWhiteSpace();
fields[i]=fields[i].replace("\"","").trimmed();
}
cartnum=fields[3].right(fields[3].length()-1).toUInt(&ok);
if(ok&&(cartnum<=RD_MAX_CART_NUMBER)) {
@@ -219,26 +217,26 @@ bool CitadelXds::ValidateFilename(const QString &filename)
// List of illegal characters taken from 'Illegal Characters4.doc'
// from Citadel
//
ret=ret&&(filename.find(" ")<0);
ret=ret&&(filename.find("\"")<0);
ret=ret&&(filename.find("%")<0);
ret=ret&&(filename.find("*")<0);
ret=ret&&(filename.find("+")<0);
ret=ret&&(filename.find("/")<0);
ret=ret&&(filename.find(":")<0);
ret=ret&&(filename.find(";")<0);
ret=ret&&(filename.find("<")<0);
ret=ret&&(filename.find("=")<0);
ret=ret&&(filename.find(">")<0);
ret=ret&&(filename.find("?")<0);
ret=ret&&(filename.find("@")<0);
ret=ret&&(filename.find("[")<0);
ret=ret&&(filename.find("\\")<0);
ret=ret&&(filename.find("]")<0);
ret=ret&&(filename.find("^")<0);
ret=ret&&(filename.find("{")<0);
ret=ret&&(filename.find("|")<0);
ret=ret&&(filename.find("}")<0);
ret=ret&&(filename.indexOf(" ")<0);
ret=ret&&(filename.indexOf("\"")<0);
ret=ret&&(filename.indexOf("%")<0);
ret=ret&&(filename.indexOf("*")<0);
ret=ret&&(filename.indexOf("+")<0);
ret=ret&&(filename.indexOf("/")<0);
ret=ret&&(filename.indexOf(":")<0);
ret=ret&&(filename.indexOf(";")<0);
ret=ret&&(filename.indexOf("<")<0);
ret=ret&&(filename.indexOf("=")<0);
ret=ret&&(filename.indexOf(">")<0);
ret=ret&&(filename.indexOf("?")<0);
ret=ret&&(filename.indexOf("@")<0);
ret=ret&&(filename.indexOf("[")<0);
ret=ret&&(filename.indexOf("\\")<0);
ret=ret&&(filename.indexOf("]")<0);
ret=ret&&(filename.indexOf("^")<0);
ret=ret&&(filename.indexOf("{")<0);
ret=ret&&(filename.indexOf("|")<0);
ret=ret&&(filename.indexOf("}")<0);
return ret;
}
@@ -378,16 +376,16 @@ bool CitadelXds::PostCut(const QString &cutname,const QString &filename)
default:
rda->syslog(LOG_WARNING,"CitadelXds: audio upload failed: %s",
(const char *)RDUpload::errorText(upload_err).toUtf8());
unlink(tempfile);
unlink(tempfile.toUtf8());
delete upload;
return false;
}
unlink(tempfile);
unlink(tempfile.toUtf8());
delete upload;
rda->syslog(LOG_INFO,"CitadelXds: uploaded cut %s to %s/%s",
(const char *)cutname.toUtf8(),
(const char *)config()->url().toUtf8(),
(const char *)filename.toUtf8());
cutname.toUtf8().constData(),
config()->url().toUtf8().constData(),
filename.toUtf8().constData());
return true;
}
@@ -419,7 +417,7 @@ void CitadelXds::PurgeCuts()
}
QUrl url(path+q->value(1).toString());
conv=new RDDelete(rda->config());
conv->setTargetUrl(url);
conv->setTargetUrl(url.toString());
//
// FIXME: Finish implementing ssh(1) key support!
//

11
rdrepld/rdrepld.cpp
View File

@@ -23,7 +23,7 @@
#include <sys/types.h>
#include <sys/wait.h>
#include <qapplication.h>
#include <QApplication>
#include <dbversion.h>
#include <rdapplication.h>
@@ -72,7 +72,7 @@ MainObject::MainObject(QObject *parent)
//
rda=static_cast<RDApplication *>(new RDCoreApplication("rdrepld","rdrepld",RDREPLD_USAGE,this));
if(!rda->open(&err_msg,&err_type,false)) {
fprintf(stderr,"rdrepld: %s\n",(const char *)err_msg);
fprintf(stderr,"rdrepld: %s\n",err_msg.toUtf8().constData());
exit(1);
}
@@ -86,7 +86,7 @@ MainObject::MainObject(QObject *parent)
}
if(!rda->cmdSwitch()->processed(i)) {
fprintf(stderr,"rdrepld: unknown command option \"%s\"\n",
(const char *)rda->cmdSwitch()->key(i));
rda->cmdSwitch()->key(i).toUtf8().constData());
exit(2);
}
}
@@ -116,8 +116,9 @@ MainObject::MainObject(QObject *parent)
// Start the Main Loop
//
repl_loop_timer=new QTimer(this);
repl_loop_timer->setSingleShot(true);
connect(repl_loop_timer,SIGNAL(timeout()),this,SLOT(mainLoop()));
repl_loop_timer->start(RD_RDREPL_SCAN_INTERVAL,true);
repl_loop_timer->start(RD_RDREPL_SCAN_INTERVAL);
rda->syslog(LOG_INFO,"started");
}
@@ -128,7 +129,7 @@ void MainObject::mainLoop()
LoadReplicators();
ProcessCarts();
FreeReplicators();
repl_loop_timer->start(RD_RDREPL_SCAN_INTERVAL,true);
repl_loop_timer->start(RD_RDREPL_SCAN_INTERVAL);
}