diff --git a/example/cdtext.c b/example/cdtext.c index 55f2b85f..d5f08dfd 100644 --- a/example/cdtext.c +++ b/example/cdtext.c @@ -1,7 +1,7 @@ /* - $Id: cdtext.c,v 1.1 2004/10/10 00:21:08 rocky Exp $ + $Id: cdtext.c,v 1.2 2005/01/04 04:40:22 rocky Exp $ - Copyright (C) 2004 Rocky Bernstein + Copyright (C) 2004, 2005 Rocky Bernstein This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -29,7 +29,7 @@ static void -print_cdtext_track_info(CdIo *p_cdio, track_t i_track, const char *psz_msg) { +print_cdtext_track_info(CdIo_t *p_cdio, track_t i_track, const char *psz_msg) { const cdtext_t *cdtext = cdio_get_cdtext(p_cdio, 0); if (NULL != cdtext) { cdtext_field_t i; @@ -46,7 +46,7 @@ print_cdtext_track_info(CdIo *p_cdio, track_t i_track, const char *psz_msg) { } static void -print_disc_info(CdIo *p_cdio, track_t i_tracks, track_t i_first_track) { +print_disc_info(CdIo_t *p_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(p_cdio); @@ -65,7 +65,7 @@ main(int argc, const char *argv[]) { track_t i_first_track; track_t i_tracks; - CdIo *p_cdio = cdio_open ("../test/cdda.cue", DRIVER_BINCUE); + CdIo_t *p_cdio = cdio_open ("../test/cdda.cue", DRIVER_BINCUE); if (NULL == p_cdio) { diff --git a/example/iso2.c b/example/iso2.c index 37886011..6e113208 100644 --- a/example/iso2.c +++ b/example/iso2.c @@ -1,7 +1,7 @@ /* - $Id: iso2.c,v 1.4 2004/11/22 01:03:53 rocky Exp $ + $Id: iso2.c,v 1.5 2005/01/04 04:40:22 rocky Exp $ - Copyright (C) 2003, 2004 Rocky Bernstein + Copyright (C) 2003, 2004, 2005 Rocky Bernstein This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -74,7 +74,7 @@ main(int argc, const char *argv[]) FILE *p_outfd; int i; - CdIo *p_cdio = cdio_open (ISO9660_IMAGE, DRIVER_BINCUE); + CdIo_t *p_cdio = cdio_open (ISO9660_IMAGE, DRIVER_BINCUE); if (NULL == p_cdio) { fprintf(stderr, "Sorry, couldn't open BIN/CUE image %s\n", ISO9660_IMAGE); diff --git a/example/sample2.c b/example/sample2.c index 2dcd4548..aa492ac9 100644 --- a/example/sample2.c +++ b/example/sample2.c @@ -1,7 +1,7 @@ /* - $Id: sample2.c,v 1.12 2004/08/07 10:50:03 rocky Exp $ + $Id: sample2.c,v 1.13 2005/01/04 04:40:22 rocky Exp $ - Copyright (C) 2003, 2004 Rocky Bernstein + Copyright (C) 2003, 2004, 2005 Rocky Bernstein This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -99,7 +99,7 @@ print_drive_capabilities(cdio_drive_read_cap_t i_read_cap, int main(int argc, const char *argv[]) { - CdIo *p_cdio = cdio_open (NULL, DRIVER_UNKNOWN); + CdIo_t *p_cdio = cdio_open (NULL, DRIVER_UNKNOWN); driver_id_t driver_id; if (NULL != p_cdio) { diff --git a/example/sample3.c b/example/sample3.c index 0508080b..503226d3 100644 --- a/example/sample3.c +++ b/example/sample3.c @@ -1,7 +1,7 @@ /* - $Id: sample3.c,v 1.8 2004/08/07 10:50:03 rocky Exp $ + $Id: sample3.c,v 1.9 2005/01/04 04:40:22 rocky Exp $ - Copyright (C) 2003 Rocky Bernstein + Copyright (C) 2003, 2005 Rocky Bernstein This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -34,7 +34,7 @@ static void print_analysis(cdio_iso_analysis_t cdio_iso_analysis, cdio_fs_anal_t fs, int first_data, unsigned int num_audio, - track_t num_tracks, track_t first_track_num, CdIo *p_cdio) + track_t num_tracks, track_t first_track_num, CdIo_t *p_cdio) { switch(CDIO_FSTYPE(fs)) { case CDIO_FS_AUDIO: @@ -114,7 +114,7 @@ print_analysis(cdio_iso_analysis_t cdio_iso_analysis, int main(int argc, const char *argv[]) { - CdIo *p_cdio = cdio_open (NULL, DRIVER_UNKNOWN); + CdIo_t *p_cdio = cdio_open (NULL, DRIVER_UNKNOWN); cdio_fs_anal_t fs=0; track_t num_tracks; diff --git a/example/sample4.c b/example/sample4.c index dd11937b..aea8a474 100644 --- a/example/sample4.c +++ b/example/sample4.c @@ -1,5 +1,5 @@ /* - $Id: sample4.c,v 1.6 2004/08/07 10:50:03 rocky Exp $ + $Id: sample4.c,v 1.7 2005/01/04 04:40:22 rocky Exp $ Copyright (C) 2003, 2004 Rocky Bernstein @@ -47,7 +47,7 @@ log_handler (cdio_log_level_t level, const char message[]) static void print_analysis(cdio_iso_analysis_t cdio_iso_analysis, cdio_fs_anal_t fs, int first_data, unsigned int num_audio, - track_t num_tracks, track_t first_track_num, CdIo *p_cdio) + track_t num_tracks, track_t first_track_num, CdIo_t *p_cdio) { switch(CDIO_FSTYPE(fs)) { case CDIO_FS_AUDIO: @@ -127,7 +127,7 @@ print_analysis(cdio_iso_analysis_t cdio_iso_analysis, int main(int argc, const char *argv[]) { - CdIo *p_cdio; + CdIo_t *p_cdio; cdio_fs_anal_t fs=0; track_t num_tracks; diff --git a/example/tracks.c b/example/tracks.c index c11fc306..2fd977b5 100644 --- a/example/tracks.c +++ b/example/tracks.c @@ -1,7 +1,7 @@ /* - $Id: tracks.c,v 1.1 2004/10/10 00:21:08 rocky Exp $ + $Id: tracks.c,v 1.2 2005/01/04 04:40:22 rocky Exp $ - Copyright (C) 2003, 2004 Rocky Bernstein + Copyright (C) 2003, 2004, 2005 Rocky Bernstein This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -29,10 +29,10 @@ int main(int argc, const char *argv[]) { - CdIo *p_cdio = cdio_open (NULL, DRIVER_UNKNOWN); - track_t first_track_num; - track_t num_tracks; - int j, i=first_track_num; + CdIo_t *p_cdio = cdio_open (NULL, DRIVER_UNKNOWN); + track_t i_first_track; + track_t i_tracks; + int j, i=i_first_track; if (NULL == p_cdio) { @@ -40,14 +40,14 @@ main(int argc, const char *argv[]) return 1; } - num_tracks = cdio_get_num_tracks(p_cdio); - first_track_num = i = cdio_get_first_track_num(p_cdio); + i_tracks = cdio_get_num_tracks(p_cdio); + i_first_track = i = cdio_get_first_track_num(p_cdio); - printf("CD-ROM Track List (%i - %i)\n", first_track_num, num_tracks); + printf("CD-ROM Track List (%i - %i)\n", i_first_track, i_tracks); printf(" #: LSN\n"); - for (j = 0; j < num_tracks; i++, j++) { + for (j = 0; j < i_tracks; i++, j++) { lsn_t lsn = cdio_get_track_lsn(p_cdio, i); if (CDIO_INVALID_LSN != lsn) printf("%3d: %06lu\n", (int) i, (long unsigned int) lsn);