Autres/Rivendellaudio
1
0
Fork 0
mirror of https://github.com/ElvishArtisan/rivendell.git synced 2025-07-30 15:39:31 +02:00
Code Issues Projects Releases Wiki Activity

Merge branch 'deltecent-cddb'

Browse Source
This commit is contained in:
Fred Gleason 2019-08-31 12:01:43 -04:00
commit 165f947b79
3 changed files with 20 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
ChangeLog
View File

@ -19039,9 +19039,12 @@
dialog.
2019-08-28 Patrick Linstruth <patrick@deltecent.com>
* Added 'pypad_httpget.py' script.
2019-08-29 Patrick Linstruth <patrick@deltecent.com>
2019-08-28 Patrick Linstruth <patrick@deltecent.com>
* Modified caed(8) to skip JACK startup, rather than crash, if
no command line is specified in rdadmin(1).
2019-08-28 Fred Gleason <fredg@paravelsystems.com>
* Added the '%l' wildcard (unpadded month 1-12) to the filepath
wildcards.
2019-08-29 Patrick Linstruth <patrick@deltecent.com>
* Refactored 'RDCddbLookup' class to use 'QTcpSocket' class
instead of 'Q3Socket'.

20
lib/rdcddblookup.cpp
View File

@ -49,9 +49,9 @@ RDCddbLookup::RDCddbLookup(FILE *profile_msgs,QObject *parent)
//
// Socket
//
lookup_socket=new Q3Socket(this,"lookup_socket");
lookup_socket=new QTcpSocket(this);
connect(lookup_socket,SIGNAL(readyRead()),this,SLOT(readyReadData()));
connect(lookup_socket,SIGNAL(error(int)),this,SLOT(errorData(int)));
connect(lookup_socket,SIGNAL(error(QAbstractSocket::SocketError)),this,SLOT(errorData(QAbstractSocket::SocketError)));
}
@ -72,6 +72,10 @@ void RDCddbLookup::lookupRecord(const QString &cdda_dir,const QString &cdda_dev,
const QString &username,const QString &appname,
const QString &appver)
{
if(lookup_record->tracks()==0) {
return;
}
lookup_username=username;
lookup_appname=appname;
lookup_appver=appver;
@ -175,7 +179,7 @@ void RDCddbLookup::readyReadData()
case 200: // Exact Match
f0=line.split(" ");
if(f0.size()>=4) {
lookup_record->setDiscId(f0[2].toInt(&ok,16));
lookup_record->setDiscId(f0[2].toUInt(&ok,16));
if(!ok) {
FinishCddbLookup(RDCddbLookup::ProtocolError);
}
@ -249,18 +253,20 @@ void RDCddbLookup::readyReadData()
}
void RDCddbLookup::errorData(int err)
void RDCddbLookup::errorData(QAbstractSocket::SocketError err)
{
switch(err) {
case Q3Socket::ErrConnectionRefused:
case QTcpSocket::ErrConnectionRefused:
printf("CDDB: Connection Refused!\n");
break;
case Q3Socket::ErrHostNotFound:
case QTcpSocket::ErrHostNotFound:
printf("CDDB: Host Not Found!\n");
break;
case Q3Socket::ErrSocketRead:
case QTcpSocket::ErrSocketRead:
printf("CDDB: Socket Read Error!\n");
break;
default:
break;
}
lookup_state=0;
emit done(RDCddbLookup::NetworkError);

6
lib/rdcddblookup.h
View File

@ -25,7 +25,7 @@
#include <stdio.h>
#include <qobject.h>
#include <q3socket.h>
#include <qtcpsocket.h>
#include <rdcddbrecord.h>
//
@ -62,7 +62,7 @@ class RDCddbLookup : public QObject
private slots:
void readyReadData();
void errorData(int);
void errorData(QAbstractSocket::SocketError);
signals:
void done(RDCddbLookup::Result);
@ -77,7 +77,7 @@ class RDCddbLookup : public QObject
void SendToServer(const QString &msg);
void Profile(const QString &msg);
RDCddbRecord *lookup_record;
Q3Socket *lookup_socket;
QTcpSocket *lookup_socket;
int lookup_state;
QString lookup_username;
QString lookup_appname;