Backport 13132

[vlc] / modules / access / cdda / cdda.h

diff --git a/modules/access/cdda/cdda.h b/modules/access/cdda/cdda.h
index e35006830135d0f9bd46253618e3eb8541c3fefe..64258b6fccfd6568fc01b38270f9fb96607f268a 100644 (file)
--- a/modules/access/cdda/cdda.h
+++ b/modules/access/cdda/cdda.h
@@ -1,7 +1,7 @@
 /*****************************************************************************
  * cdda.h : CD-DA input module header for vlc using libcdio.
  *****************************************************************************
- * Copyright (C) 2003 VideoLAN
+ * Copyright (C) 2003 the VideoLAN team
  * $Id$
  *
  * Author: Rocky Bernstein <rocky@panix.com>
@@ -66,6 +66,7 @@
 
 #if LIBCDIO_VERSION_NUM >= 72
 #include <cdio/cdda.h>
+#include <cdio/paranoia.h>
 #else
 #define CdIo_t CdIo
 #endif    
@@ -82,30 +83,33 @@ typedef enum {
  *****************************************************************************/
 typedef struct cdda_data_s
 {
-  CdIo_t         *p_cdio;                   /* libcdio CD device */
-  track_t        i_tracks;                 /* # of tracks */
-  track_t        i_first_track;            /* # of first track */
-  track_t        i_titles;                 /* # of titles in playlist */
+  CdIo_t         *p_cdio;             /* libcdio CD device */
+  track_t        i_tracks;            /* # of tracks */
+  track_t        i_first_track;       /* # of first track */
+  track_t        i_titles;            /* # of titles in playlist */
   
   /* Current position */
-  track_t        i_track;                  /* Current track */
-  lsn_t          i_lsn;                    /* Current Logical Sector Number */
+  track_t        i_track;             /* Current track */
+  lsn_t          i_lsn;               /* Current Logical Sector Number */
   
-  int            i_blocks_per_read;        /* # blocks to get in a read */
-  int            i_debug;                  /* Debugging mask */
+  lsn_t          first_frame;         /* LSN of first frame of this track   */
+  lsn_t          last_frame;          /* LSN of last frame of this track    */
+  lsn_t          last_disc_frame;     /* LSN of last frame on CD            */
+  int            i_blocks_per_read;   /* # blocks to get in a read */
+  int            i_debug;             /* Debugging mask */
 
   /* Information about CD */
   vlc_meta_t    *p_meta;
-  char *         psz_mcn;                  /* Media Catalog Number */
-  char *         psz_source;               /* CD drive or CD image filename */
+  char *         psz_mcn;             /* Media Catalog Number */
+  char *         psz_source;          /* CD drive or CD image filename */
   input_title_t *p_title[CDIO_CD_MAX_TRACKS]; /* This *is* 0 origin, not
                                                 track number origin */
 
 #if LIBCDIO_VERSION_NUM >= 72
   /* Paranoia support */
-  paranoia_mode_t e_paranoia;              /* Use cd paranoia for reads? */
-  cdrom_drive_t *paranoia_cd;              /* Place to store drive
-                                             handle given by paranoia. */
+  paranoia_mode_t e_paranoia;         /* Use cd paranoia for reads? */
+  cdrom_drive_t *paranoia_cd;         /* Place to store drive
+                                        handle given by paranoia. */
   cdrom_paranoia_t *paranoia;
 
 #endif