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

Get device name if none supplied in cdio_cddap_indentify. Check for

Browse Source 
more error conditions and update doc to reflect that the error return
is NULL.
This commit is contained in:
rocky
2005-08-27 14:28:30 +00:00
parent 4d25281770
commit d97137d6ed
1 changed files with 16 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
lib/cdda_interface/scan_devices.c
View File

@@ -1,5 +1,5 @@
/* /*
$Id: scan_devices.c,v 1.28 2005/04/30 07:15:51 rocky Exp $ $Id: scan_devices.c,v 1.29 2005/08/27 14:28:30 rocky Exp $
Copyright (C) 2004, 2005 Rocky Bernstein <rocky@panix.com> Copyright (C) 2004, 2005 Rocky Bernstein <rocky@panix.com>
Copyright (C) 1998 Monty xiphmont@mit.edu Copyright (C) 1998 Monty xiphmont@mit.edu
@@ -150,7 +150,8 @@ test_resolve_symlink(const char *file, int messagedest, char **ppsz_messages)
} }
#endif #endif
/** Returns a paranoia CD-ROM drive object with a CD-DA in it. /** Returns a paranoia CD-ROM drive object with a CD-DA in it or NULL
if there was an error.
@see cdio_cddap_identify_cdio @see cdio_cddap_identify_cdio
*/ */
cdrom_drive_t * cdrom_drive_t *
@@ -181,15 +182,21 @@ char **ppsz_messages)
#endif #endif
p_cdio = cdio_open(psz_dev, DRIVER_UNKNOWN); p_cdio = cdio_open(psz_dev, DRIVER_UNKNOWN);
return cdda_identify_device_cdio(p_cdio, psz_dev, messagedest, if (p_cdio) {
ppsz_messages); if (!psz_dev) {
psz_dev = cdio_get_arg(p_cdio, "source");
}
return cdda_identify_device_cdio(p_cdio, psz_dev, messagedest,
ppsz_messages);
}
return NULL;
} }
/** Returns a paranoia CD-ROM drive object with a CD-DA in it. In /** Returns a paranoia CD-ROM drive object with a CD-DA in it or NULL
contrast to cdio_cddap_identify, we start out with an initialized if there was an error. In contrast to cdio_cddap_identify, we
p_cdio object. For example you may have used that for other start out with an initialized p_cdio object. For example you may
purposes such as to get CDDB/CD-Text information. @see have used that for other purposes such as to get CDDB/CD-Text
cdio_cddap_identify information. @see cdio_cddap_identify
*/ */
cdrom_drive_t * cdrom_drive_t *
cdio_cddap_identify_cdio(CdIo_t *p_cdio, int messagedest, char **ppsz_messages) cdio_cddap_identify_cdio(CdIo_t *p_cdio, int messagedest, char **ppsz_messages)