Merge remote-tracking branch 'upstream/master'

Conflicts:
	ChangeLog

ChangeLog

@@ -19039,9 +19039,15 @@
 	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'.
+2019-08-29 Patrick Linstruth <patrick@deltecent.com>
+	* Modified rdlibrary(1) Rip Disk dialog to use Artist and Album
+	text fields when modifying cart labels.

lib/rdcddblookup.cpp

@@ -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);

lib/rdcddblookup.h

@@ -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;

rdlibrary/disk_ripper.cpp

@@ -443,6 +443,11 @@ void DiskRipper::ripDiskButtonData()
     rip_isrc_read=true;
   }
 
+  //
+  // Set Artist and Album
+  //
+  SetArtistAlbum();
+
   //
   // Rip
   //
@@ -503,7 +508,9 @@ void DiskRipper::ripDiskButtonData()
     item->setText(5,"");
     item=(RDListViewItem *)item->nextSibling();
   }
-  rip_cdrom->eject();
+
+//  rip_cdrom->eject();
+
   if(rip_aborting) {
     QMessageBox::information(this,tr("Rip Complete"),tr("Rip aborted!"));
   }
@@ -737,7 +744,10 @@ void DiskRipper::setSingleButtonData()
 
 void DiskRipper::modifyCartLabelData()
 {
+  SetArtistAlbum();
+
   RDListViewItem *item=(RDListViewItem *)rip_track_list->firstChild();
+
   while(item!=NULL) {
     if(item->isSelected()) {
       int track=item->text(0).toInt()-1;
@@ -777,6 +787,8 @@ void DiskRipper::mediaChangedData()
 {
   RDListViewItem *l;
 
+  QApplication::setOverrideCursor(QCursor(Qt::WaitCursor));
+
   rip_isrc_read=false;
   rip_cutnames.clear();
   rip_end_track.clear();
@@ -813,6 +825,8 @@ void DiskRipper::mediaChangedData()
     lookupRecord(rip_cdda_dir.path(),rda->libraryConf()->ripperDevice(),
 		 rda->libraryConf()->cddbServer(),8880,
 		 RIPPER_CDDB_USER,PACKAGE_NAME,VERSION);
+
+  QApplication::restoreOverrideCursor();
 }
 
 
@@ -1149,6 +1163,23 @@ QString DiskRipper::BuildTrackName(int start_track,int end_track) const
 }
 
 
+void DiskRipper::SetArtistAlbum()
+{
+  RDListViewItem *item=(RDListViewItem *)rip_track_list->firstChild();
+
+  while(item!=NULL) {
+    int track=item->text(0).toInt()-1;
+    if(rip_wave_datas[track]->artist().isEmpty()) {
+      rip_wave_datas[track]->setArtist(rip_artist_edit->text());
+    }
+    if(rip_wave_datas[track]->album().isEmpty()) {
+      rip_wave_datas[track]->setAlbum(rip_album_edit->text());
+    }
+    item=(RDListViewItem *)item->nextSibling();
+  }
+}
+
+
 void DiskRipper::SendNotification(RDNotification::Action action,
 				  unsigned cartnum)
 {

rdlibrary/disk_ripper.h

@@ -88,6 +88,7 @@ class DiskRipper : public QDialog
   void RipTrack(int track,int end_track,QString cutname,QString title);
   void UpdateRipButton();
   QString BuildTrackName(int start_track,int end_track) const;
+  void SetArtistAlbum();
   void SendNotification(RDNotification::Action action,unsigned cartnum);
   RDCdPlayer *rip_cdrom;
   RDCddbRecord rip_cddb_record;