Autres/Rivendellaudio
1
0
Fork 0
mirror of https://github.com/ElvishArtisan/rivendell.git synced 2025-06-05 06:32:34 +02:00
Code Issues Projects Releases Wiki Activity

Refactored 'RDCddbLookup' class to use 'QTcpSocket' class instead of 'Q3Socket'.

Browse Source
This commit is contained in:
Patrick Linstruth 2019-08-28 22:05:24 -07:00
parent 9585ddf36b
commit 388ab8b4c4
3 changed files with 18 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
ChangeLog
View File

@ -19040,3 +19040,6 @@
2019-08-29 Patrick Linstruth <patrick@deltecent.com> 2019-08-29 Patrick Linstruth <patrick@deltecent.com>
* Modified caed(8) to skip JACK startup, rather than crash, if * Modified caed(8) to skip JACK startup, rather than crash, if
no command line is specified in rdadmin(1). no command line is specified in rdadmin(1).
2019-08-29 Patrick Linstruth <patrick@deltecent.com>
* Refactored 'RDCddbLookup' class to use 'QTcpSocket' class
instead of 'Q3Socket'.

18
lib/rdcddblookup.cpp
View File

@ -49,9 +49,9 @@ RDCddbLookup::RDCddbLookup(FILE *profile_msgs,QObject *parent)
// //
// Socket // 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(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 &username,const QString &appname,
const QString &appver) const QString &appver)
{ {
if(lookup_record->tracks()==0) {
return;
}
lookup_username=username; lookup_username=username;
lookup_appname=appname; lookup_appname=appname;
lookup_appver=appver; lookup_appver=appver;
@ -249,18 +253,20 @@ void RDCddbLookup::readyReadData()
} }
void RDCddbLookup::errorData(int err) void RDCddbLookup::errorData(QAbstractSocket::SocketError err)
{ {
switch(err) { switch(err) {
case Q3Socket::ErrConnectionRefused: case QTcpSocket::ErrConnectionRefused:
printf("CDDB: Connection Refused!\n"); printf("CDDB: Connection Refused!\n");
break; break;
case Q3Socket::ErrHostNotFound: case QTcpSocket::ErrHostNotFound:
printf("CDDB: Host Not Found!\n"); printf("CDDB: Host Not Found!\n");
break; break;
case Q3Socket::ErrSocketRead: case QTcpSocket::ErrSocketRead:
printf("CDDB: Socket Read Error!\n"); printf("CDDB: Socket Read Error!\n");
break; break;
default:
break;
} }
lookup_state=0; lookup_state=0;
emit done(RDCddbLookup::NetworkError); emit done(RDCddbLookup::NetworkError);

6
lib/rdcddblookup.h
View File

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