claunia/libcdio-osx
Archived
1
0
Fork 0
Code Issues 2 Pull Requests Actions Packages Projects Releases Wiki Activity

Add discmode to string array. Simplifies some code a bit.

Browse Source
This commit is contained in:
rocky
2004-07-28 22:03:35 +00:00
parent 9ad07fbd2a
commit e606f025a0
4 changed files with 21 additions and 90 deletions
Download Patch File Download Diff File Expand all files Collapse all files

45
example/sample8.c
View File

@@ -1,5 +1,5 @@
/*
$Id: sample8.c,v 1.9 2004/07/25 20:59:29 rocky Exp $
$Id: sample8.c,v 1.10 2004/07/28 22:03:35 rocky Exp $
Copyright (C) 2003 Rocky Bernstein <rocky@panix.com>
@@ -50,48 +50,7 @@ print_disc_info(CdIo *cdio, track_t i_tracks, track_t i_first_track) {
track_t i_last_track = i_first_track+i_tracks;
discmode_t cd_discmode = cdio_get_discmode(cdio);
switch (cd_discmode) {
case CDIO_DISC_MODE_CD_DA:
printf("CD-DA\n");
break;
case CDIO_DISC_MODE_CD_DATA:
printf("CD-ROM form 1");
break;
case CDIO_DISC_MODE_CD_XA:
printf("CD-ROM XA form2");
break;
case CDIO_DISC_MODE_CD_MIXED:
printf("CD-ROM mixed mode");
break;
case CDIO_DISC_MODE_DVD_ROM:
printf("DVD-ROM");
break;
case CDIO_DISC_MODE_DVD_RAM:
printf("DVD-RAM");
break;
case CDIO_DISC_MODE_DVD_R:
printf("DVD-R");
break;
case CDIO_DISC_MODE_DVD_RW:
printf("DVD-RW");
break;
case CDIO_DISC_MODE_DVD_PR:
printf("DVD+R");
break;
case CDIO_DISC_MODE_DVD_PRW:
printf("DVD+RW");
break;
case CDIO_DISC_MODE_DVD_OTHER:
printf("Unknown/unclassified DVD");
break;
case CDIO_DISC_MODE_NO_INFO:
printf("No information");
break;
case CDIO_DISC_MODE_ERROR:
printf("Error in getting information");
break;
}
printf("\n");
printf("%s\n", discmode2str[cd_discmode]);
print_cdtext_track_info(cdio, 0, "\nCD-TEXT for Disc:");
for ( ; i_first_track < i_last_track; i_first_track++ ) {

4
include/cdio/cdio.h
View File

@@ -1,5 +1,5 @@
/* -*- c -*-
$Id: cdio.h,v 1.59 2004/07/21 10:19:20 rocky Exp $
$Id: cdio.h,v 1.60 2004/07/28 22:03:35 rocky Exp $
Copyright (C) 2001 Herbert Valerio Riedel <hvr@gnu.org>
Copyright (C) 2003, 2004 Rocky Bernstein <rocky@panix.com>
@@ -112,6 +112,8 @@ extern "C" {
TRACK_FORMAT_ERROR /**< Dunno what is, or some other error. */
} track_format_t;
extern const char *discmode2str[];
/*! Printable tags for track_format_t enumeration. */
extern const char *track_format2str[6];

15
lib/cdio.c
View File

@@ -1,5 +1,5 @@
/*
$Id: cdio.c,v 1.66 2004/07/26 02:54:37 rocky Exp $
$Id: cdio.c,v 1.67 2004/07/28 22:03:35 rocky Exp $
Copyright (C) 2003, 2004 Rocky Bernstein <rocky@panix.com>
Copyright (C) 2001 Herbert Valerio Riedel <hvr@gnu.org>
@@ -39,7 +39,7 @@
#include <cdio/logging.h>
#include "cdio_private.h"
static const char _rcsid[] = "$Id: cdio.c,v 1.66 2004/07/26 02:54:37 rocky Exp $";
static const char _rcsid[] = "$Id: cdio.c,v 1.67 2004/07/28 22:03:35 rocky Exp $";
const char *track_format2str[6] =
@@ -47,6 +47,17 @@ const char *track_format2str[6] =
"audio", "CD-i", "XA", "data", "PSX", "error"
};
/* Must match discmode enumeration */
const char *discmode2str[] = {
"CD-DA",
"CD-DATA Form 1", "CD DATA Form 2", "CD-ROM Mixed",
"DVD-ROM", "DVD-RAM", "DVD-R", "DVD-RW", "DVD+RW",
"Unknown/unclassified DVD",
"No information",
"Error in getting information"
};
/* The below array gives of the drivers that are currently available for
on a particular host. */

47
src/cd-info.c
View File

@@ -1,5 +1,5 @@
/*
$Id: cd-info.c,v 1.78 2004/07/25 18:37:09 rocky Exp $
$Id: cd-info.c,v 1.79 2004/07/28 22:03:35 rocky Exp $
Copyright (C) 2003, 2004 Rocky Bernstein <rocky@panix.com>
Copyright (C) 1996, 1997, 1998 Gerd Knorr <kraxel@bytesex.org>
@@ -1007,49 +1007,8 @@ main(int argc, const char *argv[])
if ( 0 == opts.no_disc_mode ) {
printf("Disc mode is listed as: ");
switch( (discmode = cdio_get_discmode(cdio)) ) {
case CDIO_DISC_MODE_CD_DA:
printf("CD-DA\n");
break;
case CDIO_DISC_MODE_CD_DATA:
printf("CD-ROM form 1");
break;
case CDIO_DISC_MODE_CD_XA:
printf("CD-ROM XA form2");
break;
case CDIO_DISC_MODE_CD_MIXED:
printf("CD-ROM mixed mode");
break;
case CDIO_DISC_MODE_DVD_ROM:
printf("DVD-ROM");
break;
case CDIO_DISC_MODE_DVD_RAM:
printf("DVD-RAM");
break;
case CDIO_DISC_MODE_DVD_R:
printf("DVD-R");
break;
case CDIO_DISC_MODE_DVD_RW:
printf("DVD-RW");
break;
case CDIO_DISC_MODE_DVD_PR:
printf("DVD+R");
break;
case CDIO_DISC_MODE_DVD_PRW:
printf("DVD+RW");
break;
case CDIO_DISC_MODE_DVD_OTHER:
printf("Unknown/unclassified DVD");
break;
case CDIO_DISC_MODE_NO_INFO:
printf("No information");
break;
case CDIO_DISC_MODE_ERROR:
printf("Error in getting information");
break;
}
printf("\n");
printf("Disc mode is listed as: %s\n",
discmode2str[cdio_get_discmode(cdio)]);
}
i_first_track = cdio_get_first_track_num(cdio);