From e79de51b443d61e3cfcaee973532632435948792 Mon Sep 17 00:00:00 2001 From: rocky Date: Sat, 7 Aug 2004 10:50:03 +0000 Subject: [PATCH] cdio->p_cdio --- example/sample1.c | 19 ++++++++++--------- example/sample2.c | 14 +++++++------- example/sample3.c | 24 ++++++++++++------------ example/sample4.c | 26 +++++++++++++------------- 4 files changed, 42 insertions(+), 41 deletions(-) diff --git a/example/sample1.c b/example/sample1.c index 4aebf24c..a51bac6b 100644 --- a/example/sample1.c +++ b/example/sample1.c @@ -1,7 +1,7 @@ /* - $Id: sample1.c,v 1.5 2003/10/03 08:36:39 rocky Exp $ + $Id: sample1.c,v 1.6 2004/08/07 10:50:03 rocky Exp $ - Copyright (C) 2003 Rocky Bernstein + Copyright (C) 2003, 2004 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,31 +29,32 @@ int main(int argc, const char *argv[]) { - CdIo *cdio = cdio_open (NULL, DRIVER_UNKNOWN); + CdIo *p_cdio = cdio_open (NULL, DRIVER_UNKNOWN); track_t first_track_num; track_t num_tracks; int j, i=first_track_num; - if (NULL == cdio) { + if (NULL == p_cdio) { printf("Couldn't find a driver.. leaving.\n"); return 1; } - num_tracks = cdio_get_num_tracks(cdio); - first_track_num = i = cdio_get_first_track_num(cdio); + num_tracks = cdio_get_num_tracks(p_cdio); + first_track_num = i = cdio_get_first_track_num(p_cdio); printf("CD-ROM Track List (%i - %i)\n", first_track_num, num_tracks); printf(" #: LSN\n"); for (j = 0; j < num_tracks; i++, j++) { - lsn_t lsn = cdio_get_track_lsn(cdio, i); + 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); } printf("%3X: %06lu leadout\n", CDIO_CDROM_LEADOUT_TRACK, - (long unsigned int) cdio_get_track_lsn(cdio, CDIO_CDROM_LEADOUT_TRACK)); - cdio_destroy(cdio); + (long unsigned int) cdio_get_track_lsn(p_cdio, + CDIO_CDROM_LEADOUT_TRACK)); + cdio_destroy(p_cdio); return 0; } diff --git a/example/sample2.c b/example/sample2.c index b2466900..2dcd4548 100644 --- a/example/sample2.c +++ b/example/sample2.c @@ -1,5 +1,5 @@ /* - $Id: sample2.c,v 1.11 2004/07/18 03:35:07 rocky Exp $ + $Id: sample2.c,v 1.12 2004/08/07 10:50:03 rocky Exp $ Copyright (C) 2003, 2004 Rocky Bernstein @@ -99,25 +99,25 @@ print_drive_capabilities(cdio_drive_read_cap_t i_read_cap, int main(int argc, const char *argv[]) { - CdIo *cdio = cdio_open (NULL, DRIVER_UNKNOWN); + CdIo *p_cdio = cdio_open (NULL, DRIVER_UNKNOWN); driver_id_t driver_id; - if (NULL != cdio) { - char *default_device = cdio_get_default_device(cdio); + if (NULL != p_cdio) { + char *default_device = cdio_get_default_device(p_cdio); cdio_drive_read_cap_t i_read_cap; cdio_drive_write_cap_t i_write_cap; cdio_drive_misc_cap_t i_misc_cap; - printf("The driver selected is %s\n", cdio_get_driver_name(cdio)); + printf("The driver selected is %s\n", cdio_get_driver_name(p_cdio)); if (default_device) printf("The default device for this driver is %s\n", default_device); - cdio_get_drive_cap(cdio, &i_read_cap, &i_write_cap, &i_misc_cap); + cdio_get_drive_cap(p_cdio, &i_read_cap, &i_write_cap, &i_misc_cap); print_drive_capabilities(i_read_cap, i_write_cap, i_misc_cap); free(default_device); - cdio_destroy(cdio); + cdio_destroy(p_cdio); printf("\n"); } else { diff --git a/example/sample3.c b/example/sample3.c index f4bb540e..0508080b 100644 --- a/example/sample3.c +++ b/example/sample3.c @@ -1,5 +1,5 @@ /* - $Id: sample3.c,v 1.7 2004/03/20 13:16:19 rocky Exp $ + $Id: sample3.c,v 1.8 2004/08/07 10:50:03 rocky Exp $ Copyright (C) 2003 Rocky Bernstein @@ -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 *cdio) + track_t num_tracks, track_t first_track_num, CdIo *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 *cdio = cdio_open (NULL, DRIVER_UNKNOWN); + CdIo *p_cdio = cdio_open (NULL, DRIVER_UNKNOWN); cdio_fs_anal_t fs=0; track_t num_tracks; @@ -128,17 +128,17 @@ main(int argc, const char *argv[]) unsigned int num_audio = 0; /* # of audio tracks */ unsigned int i; - if (NULL == cdio) { + if (NULL == p_cdio) { printf("Problem in trying to find a driver.\n\n"); return 1; } - first_track_num = cdio_get_first_track_num(cdio); - num_tracks = cdio_get_num_tracks(cdio); + first_track_num = cdio_get_first_track_num(p_cdio); + num_tracks = cdio_get_num_tracks(p_cdio); /* Count the number of data and audio tracks. */ for (i = first_track_num; i <= num_tracks; i++) { - if (TRACK_FORMAT_AUDIO == cdio_get_track_format(cdio, i)) { + if (TRACK_FORMAT_AUDIO == cdio_get_track_format(p_cdio, i)) { num_audio++; if (-1 == first_audio) first_audio = i; } else { @@ -159,9 +159,9 @@ main(int argc, const char *argv[]) for (j = 2, i = first_data; i <= num_tracks; i++) { lsn_t lsn; - track_format_t track_format = cdio_get_track_format(cdio, i); + track_format_t track_format = cdio_get_track_format(p_cdio, i); - lsn = cdio_get_track_lsn(cdio, i); + lsn = cdio_get_track_lsn(p_cdio, i); switch ( track_format ) { case TRACK_FORMAT_AUDIO: @@ -184,10 +184,10 @@ main(int argc, const char *argv[]) if (start_track < data_start + cdio_iso_analysis.isofs_size) continue; - fs = cdio_guess_cd_type(cdio, start_track, i, &cdio_iso_analysis); + fs = cdio_guess_cd_type(p_cdio, start_track, i, &cdio_iso_analysis); print_analysis(cdio_iso_analysis, fs, first_data, num_audio, - num_tracks, first_track_num, cdio); + num_tracks, first_track_num, p_cdio); if ( !(CDIO_FSTYPE(fs) == CDIO_FS_ISO_9660 || CDIO_FSTYPE(fs) == CDIO_FS_ISO_HFS || @@ -196,6 +196,6 @@ main(int argc, const char *argv[]) break; } } - cdio_destroy(cdio); + cdio_destroy(p_cdio); return 0; } diff --git a/example/sample4.c b/example/sample4.c index dab140fb..dd11937b 100644 --- a/example/sample4.c +++ b/example/sample4.c @@ -1,5 +1,5 @@ /* - $Id: sample4.c,v 1.5 2004/03/20 13:18:31 rocky Exp $ + $Id: sample4.c,v 1.6 2004/08/07 10:50:03 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 *cdio) + track_t num_tracks, track_t first_track_num, CdIo *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 *cdio; + CdIo *p_cdio; cdio_fs_anal_t fs=0; track_t num_tracks; @@ -147,19 +147,19 @@ main(int argc, const char *argv[]) cdio_log_set_handler (log_handler); - cdio = cdio_open (cd_image_name, DRIVER_UNKNOWN); + p_cdio = cdio_open (cd_image_name, DRIVER_UNKNOWN); - if (NULL == cdio) { + if (NULL == p_cdio) { printf("Problem in trying to find a driver.\n\n"); return 1; } - first_track_num = cdio_get_first_track_num(cdio); - num_tracks = cdio_get_num_tracks(cdio); + first_track_num = cdio_get_first_track_num(p_cdio); + num_tracks = cdio_get_num_tracks(p_cdio); /* Count the number of data and audio tracks. */ for (i = first_track_num; i <= num_tracks; i++) { - if (TRACK_FORMAT_AUDIO == cdio_get_track_format(cdio, i)) { + if (TRACK_FORMAT_AUDIO == cdio_get_track_format(p_cdio, i)) { num_audio++; if (-1 == first_audio) first_audio = i; } else { @@ -180,9 +180,9 @@ main(int argc, const char *argv[]) for (j = 2, i = first_data; i <= num_tracks; i++) { lsn_t lsn; - track_format_t track_format = cdio_get_track_format(cdio, i); + track_format_t track_format = cdio_get_track_format(p_cdio, i); - lsn = cdio_get_track_lsn(cdio, i); + lsn = cdio_get_track_lsn(p_cdio, i); switch ( track_format ) { case TRACK_FORMAT_AUDIO: @@ -205,10 +205,10 @@ main(int argc, const char *argv[]) if (start_track < data_start + cdio_iso_analysis.isofs_size) continue; - fs = cdio_guess_cd_type(cdio, start_track, i, &cdio_iso_analysis); + fs = cdio_guess_cd_type(p_cdio, start_track, i, &cdio_iso_analysis); print_analysis(cdio_iso_analysis, fs, first_data, num_audio, - num_tracks, first_track_num, cdio); + num_tracks, first_track_num, p_cdio); if ( !(CDIO_FSTYPE(fs) == CDIO_FS_ISO_9660 || CDIO_FSTYPE(fs) == CDIO_FS_ISO_HFS || @@ -217,6 +217,6 @@ main(int argc, const char *argv[]) break; } } - cdio_destroy(cdio); + cdio_destroy(p_cdio); return 0; }