[patch] patch for libcdio-1.x

libcdio-1.patch (text/plain), 2.50 KB, created by Helmut Jarausch on 2017-11-25 10:41:54 UTC

--- src/cdaudio/cdaudio-ng.cc.ORIG	2017-08-20 03:20:10.000000000 +0200
+++ src/cdaudio/cdaudio-ng.cc	2017-11-25 11:23:13.943029614 +0100
@@ -33,11 +33,7 @@
 #include <cdio/sector.h>
 #include <cdio/cd_types.h>
 
-#if LIBCDIO_VERSION_NUM >= 90
 #include <cdio/paranoia/cdda.h>
-#else
-#include <cdio/cdda.h>
-#endif
 
 #include <cddb/cddb.h>
 
@@ -540,27 +536,16 @@
     if (aud_get_bool ("CDDA", "use_cdtext"))
     {
         AUDDBG ("getting cd-text information for disc\n");
-#if LIBCDIO_VERSION_NUM >= 90
         pcdtext = cdio_get_cdtext (pcdrom_drive->p_cdio);
         if (pcdtext == nullptr)
-#else
-        pcdtext = cdio_get_cdtext (pcdrom_drive->p_cdio, 0);
-        if (pcdtext == nullptr || pcdtext->field[CDTEXT_TITLE] == nullptr)
-#endif
         {
             AUDDBG ("no cd-text available for disc\n");
         }
         else
         {
-#if LIBCDIO_VERSION_NUM >= 90
             trackinfo[0].performer = String (cdtext_get_const (pcdtext, CDTEXT_FIELD_PERFORMER, 0));
             trackinfo[0].name = String (cdtext_get_const (pcdtext, CDTEXT_FIELD_TITLE, 0));
             trackinfo[0].genre = String (cdtext_get_const (pcdtext, CDTEXT_FIELD_GENRE, 0));
-#else
-            trackinfo[0].performer = String (pcdtext->field[CDTEXT_PERFORMER]);
-            trackinfo[0].name = String (pcdtext->field[CDTEXT_TITLE]);
-            trackinfo[0].genre = String (pcdtext->field[CDTEXT_GENRE]);
-#endif
         }
     }
 
@@ -568,7 +553,6 @@
     bool cdtext_was_available = false;
     for (int trackno = firsttrackno; trackno <= lasttrackno; trackno++)
     {
-#if LIBCDIO_VERSION_NUM < 90
         if (aud_get_bool ("CDDA", "use_cdtext"))
         {
             AUDDBG ("getting cd-text information for track %d\n", trackno);
@@ -579,19 +563,12 @@
                 pcdtext = nullptr;
             }
         }
-#endif
 
         if (pcdtext != nullptr)
         {
-#if LIBCDIO_VERSION_NUM >= 90
             trackinfo[trackno].performer = String (cdtext_get_const (pcdtext, CDTEXT_FIELD_PERFORMER, trackno));
             trackinfo[trackno].name = String (cdtext_get_const (pcdtext, CDTEXT_FIELD_TITLE, trackno));
             trackinfo[trackno].genre = String (cdtext_get_const (pcdtext, CDTEXT_FIELD_GENRE, trackno));
-#else
-            trackinfo[trackno].performer = String (pcdtext->field[CDTEXT_PERFORMER]);
-            trackinfo[trackno].name = String (pcdtext->field[CDTEXT_TITLE]);
-            trackinfo[trackno].genre = String (pcdtext->field[CDTEXT_GENRE]);
-#endif
             cdtext_was_available = true;
         }
     }