diff --git a/lib/driver/bsdi.c b/lib/driver/bsdi.c index 9cfb6059..70134496 100644 --- a/lib/driver/bsdi.c +++ b/lib/driver/bsdi.c @@ -1,5 +1,5 @@ /* - $Id: bsdi.c,v 1.11 2005/03/22 09:15:57 rocky Exp $ + $Id: bsdi.c,v 1.12 2005/03/23 11:26:49 rocky Exp $ Copyright (C) 2001 Herbert Valerio Riedel Copyright (C) 2002, 2003, 2004, 2005 Rocky Bernstein @@ -27,7 +27,7 @@ # include "config.h" #endif -static const char _rcsid[] = "$Id: bsdi.c,v 1.11 2005/03/22 09:15:57 rocky Exp $"; +static const char _rcsid[] = "$Id: bsdi.c,v 1.12 2005/03/23 11:26:49 rocky Exp $"; #include #include @@ -878,7 +878,7 @@ get_track_msf_bsdi(void *user_data, track_t i_track, msf_t *msf) */ driver_return_code_t -close_tray_bsdi (char *psz_device) +close_tray_bsdi (const char *psz_device) { #ifdef HAVE_BSDI_CDROM int fd = open(psz_device, O_RDONLY | O_NONBLOCK, 0); diff --git a/lib/driver/cdio_private.h b/lib/driver/cdio_private.h index 6a2f6858..5d984be1 100644 --- a/lib/driver/cdio_private.h +++ b/lib/driver/cdio_private.h @@ -1,5 +1,5 @@ /* - $Id: cdio_private.h,v 1.28 2005/03/18 19:30:31 rocky Exp $ + $Id: cdio_private.h,v 1.29 2005/03/23 11:26:49 rocky Exp $ Copyright (C) 2003, 2004, 2005 Rocky Bernstein @@ -120,13 +120,6 @@ extern "C" { */ driver_return_code_t (*audio_stop) ( void *p_env ); - /*! - Close media tray in CD drive if there is a routine to do so. - - @param p_env the CD object to be acted upon. - */ - driver_return_code_t (*close_tray) ( void *p_env ); - /*! Eject media in CD drive. If successful, as a side effect we also free p_env. @@ -473,7 +466,7 @@ extern "C" { void cdio_add_device_list(char **device_list[], const char *psz_drive, unsigned int *i_drives); - driver_return_code_t close_tray_bsdi (char *psz_drive); + driver_return_code_t close_tray_bsdi (const char *psz_drive); driver_return_code_t close_tray_freebsd (const char *psz_drive); driver_return_code_t close_tray_linux (const char *psz_drive); driver_return_code_t close_tray_osx (const char *psz_drive);