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

Misc memory issues

Browse Source
This commit is contained in:
rocky
2005-04-11 01:37:38 +00:00
parent ea6f2ba77c
commit 4428ffa788
6 changed files with 11 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
example/audio.c
View File

@@ -1,5 +1,5 @@
/* /*
$Id: audio.c,v 1.5 2005/03/19 16:17:13 rocky Exp $ $Id: audio.c,v 1.6 2005/04/11 01:37:38 rocky Exp $
Copyright (C) 2005 Rocky Bernstein <rocky@panix.com> Copyright (C) 2005 Rocky Bernstein <rocky@panix.com>
@@ -64,7 +64,7 @@
static bool play_track(track_t t1, track_t t2); static bool play_track(track_t t1, track_t t2);
CdIo_t *p_cdio; /* libcdio handle */ CdIo_t *p_cdio = NULL; /* libcdio handle */
driver_id_t driver_id = DRIVER_DEVICE; driver_id_t driver_id = DRIVER_DEVICE;
/* cdrom data */ /* cdrom data */
@@ -135,7 +135,7 @@ cd_eject(void)
b_ok = DRIVER_OP_SUCCESS == cdio_eject_media(&p_cdio); b_ok = DRIVER_OP_SUCCESS == cdio_eject_media(&p_cdio);
if (!b_ok) if (!b_ok)
xperror("eject"); xperror("eject");
b_cd = 0; b_cd = false;
p_cdio = NULL; p_cdio = NULL;
} }
return b_ok; return b_ok;
@@ -300,6 +300,7 @@ usage(char *prog)
} }
typedef enum { typedef enum {
NO_OP=0,
PLAY_CD=1, PLAY_CD=1,
PLAY_TRACK=2, PLAY_TRACK=2,
STOP_PLAYING=3, STOP_PLAYING=3,
@@ -316,7 +317,7 @@ main(int argc, char *argv[])
char *h; char *h;
int i_rc = 0; int i_rc = 0;
int i_volume_level; int i_volume_level;
cd_operation_t todo; /* operation to do in non-interactive mode */ cd_operation_t todo = NO_OP; /* operation to do in non-interactive mode */
psz_program = strrchr(argv[0],'/'); psz_program = strrchr(argv[0],'/');
psz_program = psz_program ? psz_program+1 : argv[0]; psz_program = psz_program ? psz_program+1 : argv[0];
@@ -432,6 +433,8 @@ main(int argc, char *argv[])
} }
if (b_cd) if (b_cd)
switch (todo) { switch (todo) {
case NO_OP:
break;
case STOP_PLAYING: case STOP_PLAYING:
i_rc = cd_stop(p_cdio) ? 0 : 1; i_rc = cd_stop(p_cdio) ? 0 : 1;
break; break;

7
example/drives.c
View File

@@ -1,5 +1,5 @@
/* /*
$Id: drives.c,v 1.1 2004/10/10 00:21:08 rocky Exp $ $Id: drives.c,v 1.2 2005/04/11 01:37:38 rocky Exp $
Copyright (C) 2003, 2004 Rocky Bernstein <rocky@panix.com> Copyright (C) 2003, 2004 Rocky Bernstein <rocky@panix.com>
@@ -63,7 +63,6 @@ main(int argc, const char *argv[])
} }
cdio_free_device_list(ppsz_cd_drives); cdio_free_device_list(ppsz_cd_drives);
free(ppsz_cd_drives);
ppsz_cd_drives = NULL; ppsz_cd_drives = NULL;
printf("-----\n"); printf("-----\n");
@@ -78,7 +77,6 @@ main(int argc, const char *argv[])
} }
cdio_free_device_list(ppsz_cd_drives); cdio_free_device_list(ppsz_cd_drives);
free(ppsz_cd_drives);
printf("-----\n"); printf("-----\n");
printf("CD-DA drives...\n"); printf("CD-DA drives...\n");
@@ -92,7 +90,6 @@ main(int argc, const char *argv[])
} }
} }
cdio_free_device_list(ppsz_cd_drives); cdio_free_device_list(ppsz_cd_drives);
free(ppsz_cd_drives);
printf("-----\n"); printf("-----\n");
ppsz_cd_drives = NULL; ppsz_cd_drives = NULL;
@@ -108,8 +105,6 @@ main(int argc, const char *argv[])
} }
cdio_free_device_list(ppsz_cd_drives); cdio_free_device_list(ppsz_cd_drives);
free(ppsz_cd_drives);
return 0; return 0;
} }

1
example/paranoia.c
View File

@@ -52,7 +52,6 @@ main(int argc, const char *argv[])
/* Don't need a list of CD's with CD-DA's any more. */ /* Don't need a list of CD's with CD-DA's any more. */
cdio_free_device_list(ppsz_cd_drives); cdio_free_device_list(ppsz_cd_drives);
free(ppsz_cd_drives);
/* We'll set for verbose paranoia messages. */ /* We'll set for verbose paranoia messages. */
cdda_verbose_set(d, CDDA_MESSAGE_PRINTIT, CDDA_MESSAGE_PRINTIT); cdda_verbose_set(d, CDDA_MESSAGE_PRINTIT, CDDA_MESSAGE_PRINTIT);

1
example/paranoia2.c
View File

@@ -57,7 +57,6 @@ main(int argc, const char *argv[])
/* Don't need a list of CD's with CD-DA's any more. */ /* Don't need a list of CD's with CD-DA's any more. */
cdio_free_device_list(ppsz_cd_drives); cdio_free_device_list(ppsz_cd_drives);
free(ppsz_cd_drives);
/* We'll set for verbose paranoia messages. */ /* We'll set for verbose paranoia messages. */
cdio_cddap_verbose_set(d, CDDA_MESSAGE_PRINTIT, CDDA_MESSAGE_PRINTIT); cdio_cddap_verbose_set(d, CDDA_MESSAGE_PRINTIT, CDDA_MESSAGE_PRINTIT);

3
src/cd-drive.c
View File

@@ -1,5 +1,5 @@
/* /*
$Id: cd-drive.c,v 1.18 2005/03/18 12:56:00 rocky Exp $ $Id: cd-drive.c,v 1.19 2005/04/11 01:37:38 rocky Exp $
Copyright (C) 2004, 2005 Rocky Bernstein <rocky@panix.com> Copyright (C) 2004, 2005 Rocky Bernstein <rocky@panix.com>
@@ -247,7 +247,6 @@ main(int argc, const char *argv[])
} }
cdio_free_device_list(ppsz_cdrives); cdio_free_device_list(ppsz_cdrives);
free(ppsz_cdrives);
ppsz_cdrives = NULL; ppsz_cdrives = NULL;
} else { } else {
/* Print CD-drive info for given source */ /* Print CD-drive info for given source */

4
src/cdda-player.c
View File

@@ -1,5 +1,5 @@
/* /*
$Id: cdda-player.c,v 1.31 2005/04/10 14:52:52 rocky Exp $ $Id: cdda-player.c,v 1.32 2005/04/11 01:37:39 rocky Exp $
Copyright (C) 2005 Rocky Bernstein <rocky@panix.com> Copyright (C) 2005 Rocky Bernstein <rocky@panix.com>
@@ -328,7 +328,7 @@ cd_eject(void)
b_ok = DRIVER_OP_SUCCESS == cdio_eject_media(&p_cdio); b_ok = DRIVER_OP_SUCCESS == cdio_eject_media(&p_cdio);
if (!b_ok) if (!b_ok)
xperror("eject"); xperror("eject");
b_cd = 0; b_cd = false;
cdio_destroy (p_cdio); cdio_destroy (p_cdio);
p_cdio = NULL; p_cdio = NULL;
} }