From 9040ae06a945dce82a12b5536b9c8c49a2fb0433 Mon Sep 17 00:00:00 2001
From: rocky <rocky>
Date: Fri, 21 Mar 2008 10:19:38 +0000
Subject: [PATCH] cdio_private.h: Remove type mismatch warning on
 get_track_pregap_lba                 when compiling image drivers.

nrg.c: initialize previously uninitialzied field. Bug found by Robert
       William Fuller.

cvs2cl_usermap: add esdead and karl

NEWS: try to track what's been happening.
---
 NEWS                      | 13 +++++++++++--
 cvs2cl_usermap            |  2 ++
 lib/driver/cdio_private.h |  4 ++--
 lib/driver/image/nrg.c    |  5 +++--
 4 files changed, 18 insertions(+), 6 deletions(-)

diff --git a/NEWS b/NEWS
index 53eee65e..e9def642 100644
--- a/NEWS
+++ b/NEWS
@@ -1,7 +1,16 @@
-$Id: NEWS,v 1.118 2008/03/18 00:37:20 karl Exp $
+$Id: NEWS,v 1.119 2008/03/21 10:19:38 rocky Exp $
+
+version 0.81cvs
 
 - license of manual now GFDL 1.2 or later, with no invariant sections.
 
+- Nero image handling more complete. 
+    CD-Text processing.
+    DAO in read_audio_sectors
+
+- Allow reading pregap of a track via get_track_pregap_lsn(). Add
+  Section on "CD-DA pregap" in libcdio manual
+
 version 0.80
 2008-03-15
 
@@ -403,4 +412,4 @@ version 0.1
 
   Routines split off from VCDImager.
 
-$Id: NEWS,v 1.118 2008/03/18 00:37:20 karl Exp $
+$Id: NEWS,v 1.119 2008/03/21 10:19:38 rocky Exp $
diff --git a/cvs2cl_usermap b/cvs2cl_usermap
index c75b735d..1afc0ae1 100644
--- a/cvs2cl_usermap
+++ b/cvs2cl_usermap
@@ -1,5 +1,7 @@
+edsdead:Robert William Fuller
 flameeyes:Diego 'Flameeyes' Pettenò
 hvr:Herbert Valerio Riedel
+karl:Karl Berry
 nboullis:Nicolas Boullis
 rocky:Rocky Bernstein
 thesin:Justin F. Hallett
diff --git a/lib/driver/cdio_private.h b/lib/driver/cdio_private.h
index 85386073..00a7fcf5 100644
--- a/lib/driver/cdio_private.h
+++ b/lib/driver/cdio_private.h
@@ -1,5 +1,5 @@
 /*
-    $Id: cdio_private.h,v 1.33 2008/03/20 01:40:29 edsdead Exp $
+    $Id: cdio_private.h,v 1.34 2008/03/21 10:19:38 rocky Exp $
 
     Copyright (C) 2003, 2004, 2005 Rocky Bernstein <rocky@panix.com>
 
@@ -275,7 +275,7 @@ extern "C" {
       Note: string is malloc'd so caller has to free() the returned
       string when done with it.
     */
-    char * (*get_track_isrc) ( const CdIo_t *p_cdio, track_t i_track );
+    char * (*get_track_isrc) ( const void *p_env, track_t i_track );
     
     /*!  
       Get format of track. 
diff --git a/lib/driver/image/nrg.c b/lib/driver/image/nrg.c
index 80ff307b..486cb2e4 100644
--- a/lib/driver/image/nrg.c
+++ b/lib/driver/image/nrg.c
@@ -1,5 +1,5 @@
 /*
-    $Id: nrg.c,v 1.29 2008/03/21 08:06:36 edsdead Exp $
+    $Id: nrg.c,v 1.30 2008/03/21 10:19:38 rocky Exp $
 
     Copyright (C) 2003, 2004, 2005, 2006 Rocky Bernstein <rocky@panix.com>
     Copyright (C) 2001, 2003 Herbert Valerio Riedel <hvr@gnu.org>
@@ -46,7 +46,7 @@
 #include "_cdio_stdio.h"
 #include "nrg.h"
 
-static const char _rcsid[] = "$Id: nrg.c,v 1.29 2008/03/21 08:06:36 edsdead Exp $";
+static const char _rcsid[] = "$Id: nrg.c,v 1.30 2008/03/21 10:19:38 rocky Exp $";
 
 nero_id_t    nero_id;
 nero_dtype_t nero_dtype;
@@ -832,6 +832,7 @@ _lseek_nrg (void *p_user_data, off_t offset, int whence)
 
   unsigned int i;
 
+  p_env->pos.lba = 0;
   for (i=0; i<p_env->gen.i_tracks; i++) {
     track_info_t  *this_track=&(p_env->tocent[i]);
     p_env->pos.index = i;