mirror of
https://github.com/ElvishArtisan/rivendell.git
synced 2026-01-12 07:35:55 +01:00
2018-08-07 Fred Gleason <fredg@paravelsystems.com>
* Removed the 'pam_rd' plug-in. * Removed rdchunk(1). * Upgraded Qt3 to Qt4.
This commit is contained in:
@@ -24,7 +24,7 @@
|
||||
#include <qtimer.h>
|
||||
#include <qregexp.h>
|
||||
#include <qdatetime.h>
|
||||
#include <qprocess.h>
|
||||
#include <q3process.h>
|
||||
#include <qstringlist.h>
|
||||
|
||||
#include <rdcddblookup.h>
|
||||
@@ -49,7 +49,7 @@ RDCddbLookup::RDCddbLookup(FILE *profile_msgs,QObject *parent)
|
||||
//
|
||||
// Socket
|
||||
//
|
||||
lookup_socket=new QSocket(this,"lookup_socket");
|
||||
lookup_socket=new Q3Socket(this,"lookup_socket");
|
||||
connect(lookup_socket,SIGNAL(readyRead()),this,SLOT(readyReadData()));
|
||||
connect(lookup_socket,SIGNAL(error(int)),this,SLOT(errorData(int)));
|
||||
}
|
||||
@@ -252,13 +252,13 @@ void RDCddbLookup::readyReadData()
|
||||
void RDCddbLookup::errorData(int err)
|
||||
{
|
||||
switch(err) {
|
||||
case QSocket::ErrConnectionRefused:
|
||||
case Q3Socket::ErrConnectionRefused:
|
||||
printf("CDDB: Connection Refused!\n");
|
||||
break;
|
||||
case QSocket::ErrHostNotFound:
|
||||
case Q3Socket::ErrHostNotFound:
|
||||
printf("CDDB: Host Not Found!\n");
|
||||
break;
|
||||
case QSocket::ErrSocketRead:
|
||||
case Q3Socket::ErrSocketRead:
|
||||
printf("CDDB: Socket Read Error!\n");
|
||||
break;
|
||||
}
|
||||
@@ -282,7 +282,7 @@ QString RDCddbLookup::DecodeString(QString &str)
|
||||
QString outstr;
|
||||
QChar ch;
|
||||
|
||||
for(unsigned i=0;i<str.length();i++) {
|
||||
for(int i=0;i<str.length();i++) {
|
||||
if((ch=str.at(i))=='\\') {
|
||||
outstr+=QString("\n");
|
||||
i++;
|
||||
@@ -298,7 +298,7 @@ QString RDCddbLookup::DecodeString(QString &str)
|
||||
void RDCddbLookup::ParsePair(QString *line,QString *tag,QString *value,
|
||||
int *index)
|
||||
{
|
||||
for(unsigned i=0;i<line->length();i++) {
|
||||
for(int i=0;i<line->length();i++) {
|
||||
if(line->at(i)=='=') {
|
||||
*tag=line->left(i);
|
||||
*value=line->right(line->length()-i-1);
|
||||
@@ -314,7 +314,7 @@ int RDCddbLookup::GetIndex(QString *tag)
|
||||
{
|
||||
int index;
|
||||
|
||||
for(unsigned i=0;i<tag->length();i++) {
|
||||
for(int i=0;i<tag->length();i++) {
|
||||
if(tag->at(i).isDigit()) {
|
||||
index=tag->right(tag->length()-i).toInt();
|
||||
*tag=tag->left(i);
|
||||
@@ -336,7 +336,7 @@ bool RDCddbLookup::ReadCdText(const QString &cdda_dir,const QString &cdda_dev)
|
||||
// Write the Track Title Data to a Temp File
|
||||
//
|
||||
QByteArray output;
|
||||
QProcess *proc=new QProcess(this);
|
||||
Q3Process *proc=new Q3Process(this);
|
||||
proc->addArgument("cdda2wav");
|
||||
proc->addArgument("-D");
|
||||
proc->addArgument(cdda_dev);
|
||||
|
||||
Reference in New Issue
Block a user