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

get_default_device with NULL will get device *without* trying to open

Browse Source 
cd. Add read_audio call.
This commit is contained in:
rocky
2003-04-10 04:13:41 +00:00
parent 4a67211833
commit aa9d1b517f
9 changed files with 292 additions and 87 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
lib/_cdio_freebsd.c
View File

@@ -1,5 +1,5 @@
/*
$Id: _cdio_freebsd.c,v 1.5 2003/03/30 00:40:29 rocky Exp $
$Id: _cdio_freebsd.c,v 1.6 2003/04/10 04:13:41 rocky Exp $
Copyright (C) 2003 Rocky Bernstein <rocky@panix.com>
@@ -26,18 +26,22 @@
# include "config.h"
#endif
static const char _rcsid[] = "$Id: _cdio_freebsd.c,v 1.5 2003/03/30 00:40:29 rocky Exp $";
static const char _rcsid[] = "$Id: _cdio_freebsd.c,v 1.6 2003/04/10 04:13:41 rocky Exp $";
#include "cdio_assert.h"
#include "cdio_private.h"
#include "sector.h"
#include "util.h"
/* Is this the right default? */
#define DEFAULT_CDIO_DEVICE "/dev/acd0c"
#include <string.h>
#ifdef HAVE_FREEBSD_CDROM
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
#include <errno.h>
#include <unistd.h>
#include <fcntl.h>
@@ -51,9 +55,6 @@ static const char _rcsid[] = "$Id: _cdio_freebsd.c,v 1.5 2003/03/30 00:40:29 roc
#include <sys/types.h>
#include <sys/ioctl.h>
/* Is this the right default? */
#define DEFAULT_CDIO_DEVICE "/dev/acd0c"
#define TOTAL_TRACKS (_obj->tochdr.ending_track \
- obj->tochdr.starting_track + 1)
#define FIRST_TRACK_NUM (_obj->tochdr.starting_track)
@@ -365,15 +366,6 @@ _cdio_get_arg (void *user_data, const char key[])
return NULL;
}
/*!
Return a string containing the default VCD device if none is specified.
*/
static char *
_cdio_get_default_device()
{
return strdup(DEFAULT_CDIO_DEVICE);
}
/*!
Return the number of of the first track.
CDIO_INVALID_TRACK is returned on error.
@@ -487,6 +479,15 @@ _cdio_get_track_msf(void *user_data, track_t track_num, msf_t *msf)
#endif /* HAVE_FREEBSD_CDROM */
/*!
Return a string containing the default VCD device if none is specified.
*/
char *
cdio_get_default_device_freebsd()
{
return strdup(DEFAULT_CDIO_DEVICE);
}
/*!
Initialization routine. This is the only thing that doesn't
get called via a function pointer. In fact *we* are the
@@ -553,3 +554,4 @@ cdio_have_freebsd (void)
#endif /* HAVE_FREEBSD_CDROM */
}