From 1ba084bd1711447d59061f41f570b6836d538f24 Mon Sep 17 00:00:00 2001
From: rocky <rocky>
Date: Sat, 9 Jul 2005 15:22:44 +0000
Subject: [PATCH] Changes for libcddb 1.1.0 API change. Thanks to Chris Clayton
 for the patch.

---
 src/cdda-player.c | 27 +++++++++------------------
 src/cddb.c        | 11 ++++++-----
 2 files changed, 15 insertions(+), 23 deletions(-)

diff --git a/src/cdda-player.c b/src/cdda-player.c
index 3263a4ba..97307cb0 100644
--- a/src/cdda-player.c
+++ b/src/cdda-player.c
@@ -1,5 +1,5 @@
 /*
-    $Id: cdda-player.c,v 1.34 2005/04/22 01:54:13 rocky Exp $
+    $Id: cdda-player.c,v 1.35 2005/07/09 15:22:44 rocky Exp $
 
     Copyright (C) 2005 Rocky Bernstein <rocky@panix.com>
 
@@ -381,12 +381,6 @@ read_subchannel(CdIo_t *p_cdio)
   return b_ok;
 }
 
-#define add_cddb_disc_info(format_str, field)  \
-  if (p_cddb_disc->field && !strlen(field))  { \
-    snprintf(field, sizeof(field), format_str, p_cddb_disc->field); \
-    b_cdtext_ ## field = false;                                     \
-  }
-
 static void 
 get_cddb_disc_info(CdIo_t *p_cdio) 
 {
@@ -394,10 +388,12 @@ get_cddb_disc_info(CdIo_t *p_cdio)
   b_db = init_cddb(p_cdio, &p_conn, &p_cddb_disc, xperror, i_first_track, 
 		   i_tracks, &i_cddb_matches);
   if (b_db) {
-    add_cddb_disc_info("%s",  artist);
-    add_cddb_disc_info("%s",  title);
-    add_cddb_disc_info("%s",  genre);
-    add_cddb_disc_info("%4d", year);
+    int i_year;
+    i_year = atoi(year);
+    cddb_disc_set_artist(p_cddb_disc, artist);
+    cddb_disc_set_title(p_cddb_disc, title);
+    cddb_disc_set_genre(p_cddb_disc, genre);
+    cddb_disc_set_year(p_cddb_disc, i_year);
   }
 #endif
   return;
@@ -687,11 +683,6 @@ display_status(bool b_status_only)
 
 }
 
-#define add_cddb_track_info(format_str, field) \
-  if (t->field) \
-    snprintf(cd_info[i_track].field, sizeof(cd_info[i_track].field)-1, \
-	     format_str, t->field);
-
 static void
 get_cddb_track_info(track_t i_track)
 {
@@ -699,8 +690,8 @@ get_cddb_track_info(track_t i_track)
   cddb_track_t *t = cddb_disc_get_track(p_cddb_disc, 
 					i_track - i_first_track);
   if (t) {
-    add_cddb_track_info("%s", title);
-    add_cddb_track_info("%s", artist);
+    cddb_track_set_title(t, title);
+    cddb_track_set_artist(t, artist);
   }
   
 #else
diff --git a/src/cddb.c b/src/cddb.c
index 638f1ccd..bb54ff32 100644
--- a/src/cddb.c
+++ b/src/cddb.c
@@ -1,5 +1,5 @@
 /*
-  $Id: cddb.c,v 1.3 2005/03/12 06:02:36 rocky Exp $
+  $Id: cddb.c,v 1.4 2005/07/09 15:22:44 rocky Exp $
 
   Copyright (C) 2005 Rocky Bernstein <rocky@panix.com>
   
@@ -117,13 +117,14 @@ init_cddb(CdIo_t *p_cdio, cddb_conn_t **pp_conn, cddb_disc_t **pp_cddb_disc,
   }
   for(i = 0; i < i_tracks; i++) {
     cddb_track_t *t = cddb_track_new(); 
-    t->frame_offset = cdio_get_track_lba(p_cdio, i+i_first_track);
+    cddb_track_set_frame_offset(t, 
+				cdio_get_track_lba(p_cdio, i+i_first_track));
     cddb_disc_add_track(*pp_cddb_disc, t);
   }
   
-  (*pp_cddb_disc)->length = 
-    cdio_get_track_lba(p_cdio, CDIO_CDROM_LEADOUT_TRACK) 
-    / CDIO_CD_FRAMES_PER_SEC;
+  cddb_disc_set_length(*pp_cddb_disc, 
+		       cdio_get_track_lba(p_cdio, CDIO_CDROM_LEADOUT_TRACK) 
+		       / CDIO_CD_FRAMES_PER_SEC);
   
   if (!cddb_disc_calc_discid(*pp_cddb_disc)) {
     errmsg("libcddb calc discid failed.");