Merge commit 'db4dfff9e11c516ae35d87e568f511002ddae9d7'

Author: Sibras

.circleci/config.yml

@@ -27,8 +27,7 @@ jobs:
     # To see the list of pre-built images that CircleCI provides for most common languages see
     # https://circleci.com/docs/2.0/circleci-images/
     docker:
-    - image: circleci/build-image:ubuntu-14.04-XXL-upstart-1189-5614f37
-      command: /sbin/init
+    - image: circleci/buildpack-deps:disco
     steps:
     # Machine Setup
     #   If you break your build into multiple jobs with workflows, you will probably want to do the parts of this that are relevant in each
@@ -51,14 +50,14 @@ jobs:
     - restore_cache:
         keys:
         # This branch if available
-        - v1-dep-{{ .Branch }}-
+        - v2-dependencies-{{ .Branch }}-
         # Default branch if not
-        - v1-dep-master-
+        - v2-dependencies-master-
         # Any branch if there are none on the default branch - this should be unnecessary if you have your default branch configured correctly
-        - v1-dep-
+        - v2-dependencies-
     # Save dependency cache
     - save_cache:
-        key: v1-dep-{{ .Branch }}-{{ epoch }}
+        key: v2-dependencies-{{ .Branch }}-{{ epoch }}
         paths:
         # This is a broad list of cache paths to include many possible development environments
         # You can probably delete some of these entries

include/cdio/paranoia/Makefile.am

@@ -4,7 +4,7 @@
 #
 
 cdio_paranoia_includedir=$(includedir)/cdio/paranoia
-dist_cdio_paranoia_include_HEADERS = cdda.h paranoia.h 
+dist_cdio_paranoia_include_HEADERS = cdda.h paranoia.h toc.h
 
 EXTRA_DIST = version.h.in
 BUILT_SOURCES = version.h

include/cdio/paranoia/toc.h

@@ -0,0 +1,62 @@
+/*
+  Copyright (C) 2019
+    Rocky Bernstein <[email protected]>
+*/
+
+/** \file toc.h
+ *
+ *  \brief Information from a CDROM TOC relevant to CD-DA disks
+ ******************************************************************/
+
+#ifndef CDIO__PARANOIA__TOC_H_
+#define CDIO__PARANOIA__TOC_H_
+
+#include <cdio/cdio.h>
+
+#ifdef __cplusplus
+extern "C" {
+#endif /* __cplusplus */
+
+  /** cdrom_paranoia is an opaque structure which is used in all of the
+      library operations.
+  */
+  typedef struct cdrom_paranoia_s cdrom_paranoia_t;
+  typedef struct cdrom_drive_s   cdrom_drive_t;
+
+  /*! Return the track containing the given LSN. If the LSN is before
+    the first track (in the pregap), 0 is returned. If there was an
+    error or the LSN after the LEADOUT (beyond the end of the CD), then
+    CDIO_INVALID_TRACK is returned.
+  */
+  extern int     cdio_cddap_sector_gettrack(cdrom_drive_t *d, lsn_t lsn);
+
+  /*! Return the number of channels in track: 2 or 4; -2 if not
+    implemented or -1 for error.
+    Not meaningful if track is not an audio track.
+  */
+  extern int     cdio_cddap_track_channels(cdrom_drive_t *d, track_t i_track);
+
+  /*! Return 1 is track is an audio track, 0 otherwise. */
+  extern int     cdio_cddap_track_audiop(cdrom_drive_t *d, track_t i_track);
+
+  /*! Return 1 is track has copy permit set, 0 otherwise. */
+  extern int     cdio_cddap_track_copyp(cdrom_drive_t *d, track_t i_track);
+
+  /*! Return 1 is audio track has linear preemphasis set, 0 otherwise.
+    Only makes sense for audio tracks.
+  */
+  extern int     cdio_cddap_track_preemp(cdrom_drive_t *d, track_t i_track);
+
+  /*! Get first lsn of the first audio track. -1 is returned on error. */
+  extern lsn_t   cdio_cddap_disc_firstsector(cdrom_drive_t *d);
+
+  /*! Get last lsn of the last audio track. The last lsn is generally one
+    less than the start of the next track after the audio track. -1 is
+    returned on error. */
+  extern lsn_t   cdio_cddap_disc_lastsector(cdrom_drive_t *d);
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /*CDIO__PARANOIA__TOC_H_*/

lib/cdda_interface/toc.c

@@ -1,5 +1,5 @@
 /*
-  Copyright (C) 2005, 2008, 2013 Rocky Bernstein <[email protected]>
+  Copyright (C) 2005, 2008, 2013, 2019 Rocky Bernstein <[email protected]>
   Copyright (C) 1998-2008 Monty [email protected]
   derived from code (C) 1994-1996 Heiko Eissfeldt
 
@@ -27,6 +27,7 @@
 
 #include "low_interface.h"
 #include "utils.h"
+#include <cdio/paranoia/toc.h>
 
 /*! Return the lsn for the start of track i_track or CDIO_LEADOUT_TRACK */
 lsn_t
@@ -165,7 +166,7 @@ cdda_tracks(cdrom_drive_t *d)
     CDIO_INVALID_TRACK is returned.
  */
 int
-cdda_sector_gettrack(cdrom_drive_t *d, lsn_t lsn)
+cdio_cddap_sector_gettrack(cdrom_drive_t *d, lsn_t lsn)
 {
   if (!d->opened) {
     cderror(d,"400: Device not open\n");
@@ -182,23 +183,23 @@ cdda_sector_gettrack(cdrom_drive_t *d, lsn_t lsn)
   implemented or -1 for error.
   Not meaningful if track is not an audio track.
 */
-int
-cdda_track_channels(cdrom_drive_t *d, track_t i_track)
+extern int
+cdio_cddap_track_channels(cdrom_drive_t *d, track_t i_track)
 {
   return(cdio_get_track_channels(d->p_cdio, i_track));
 }
 
 /*! Return 1 is track is an audio track, 0 otherwise. */
-int
-cdda_track_audiop(cdrom_drive_t *d, track_t i_track)
+extern int
+cdio_cddap_track_audiop(cdrom_drive_t *d, track_t i_track)
 {
   track_format_t track_format = cdio_get_track_format(d->p_cdio, i_track);
   return TRACK_FORMAT_AUDIO == track_format ? 1 : 0;
 }
 
 /*! Return 1 is track is an audio track, 0 otherwise. */
-int
-cdda_track_copyp(cdrom_drive_t *d, track_t i_track)
+extern int
+cdio_cddap_track_copyp(cdrom_drive_t *d, track_t i_track)
 {
   track_flag_t track_flag = cdio_get_track_copy_permit(d->p_cdio, i_track);
   return CDIO_TRACK_FLAG_TRUE == track_flag ? 1 : 0;
@@ -207,8 +208,8 @@ cdda_track_copyp(cdrom_drive_t *d, track_t i_track)
 /*! Return 1 is audio track has linear preemphasis set, 0 otherwise.
     Only makes sense for audio tracks.
  */
-int
-cdda_track_preemp(cdrom_drive_t *d, track_t i_track)
+extern int
+cdio_cddap_track_preemp(cdrom_drive_t *d, track_t i_track)
 {
   track_flag_t track_flag = cdio_get_track_preemphasis(d->p_cdio, i_track);
   return CDIO_TRACK_FLAG_TRUE == track_flag ? 1 : 0;

src/cd-paranoia.c

@@ -1487,7 +1487,10 @@ main(int argc,char *argv[])
 			"                                           \r%s%s\n",
 			mes?mes:"",err?err:"");
 
-	      if(err)free(err);if(mes)free(mes);
+	      if (err)
+		free(err);
+	      if (mes)
+		free(mes);
 	      if(readbuf==NULL){
 		skipped_flag=1;
 		report("\nparanoia_read: Unrecoverable error reading through "