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

Remove internal "close_tray" function as this is external only.

Browse Source 
Now that close_tray is done right the prototype can be like the others.
This commit is contained in:
rocky
2005-03-23 11:26:49 +00:00
parent 4ef90d57b4
commit a18b69a318
2 changed files with 5 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
lib/driver/bsdi.c
View File

@@ -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 <hvr@gnu.org> Copyright (C) 2001 Herbert Valerio Riedel <hvr@gnu.org>
Copyright (C) 2002, 2003, 2004, 2005 Rocky Bernstein <rocky@panix.com> Copyright (C) 2002, 2003, 2004, 2005 Rocky Bernstein <rocky@panix.com>
@@ -27,7 +27,7 @@
# include "config.h" # include "config.h"
#endif #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 <cdio/logging.h> #include <cdio/logging.h>
#include <cdio/sector.h> #include <cdio/sector.h>
@@ -878,7 +878,7 @@ get_track_msf_bsdi(void *user_data, track_t i_track, msf_t *msf)
*/ */
driver_return_code_t driver_return_code_t
close_tray_bsdi (char *psz_device) close_tray_bsdi (const char *psz_device)
{ {
#ifdef HAVE_BSDI_CDROM #ifdef HAVE_BSDI_CDROM
int fd = open(psz_device, O_RDONLY | O_NONBLOCK, 0); int fd = open(psz_device, O_RDONLY | O_NONBLOCK, 0);

11
lib/driver/cdio_private.h
View File

@@ -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 <rocky@panix.com> Copyright (C) 2003, 2004, 2005 Rocky Bernstein <rocky@panix.com>
@@ -120,13 +120,6 @@ extern "C" {
*/ */
driver_return_code_t (*audio_stop) ( void *p_env ); 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 Eject media in CD drive. If successful, as a side effect we
also free p_env. also free p_env.
@@ -473,7 +466,7 @@ extern "C" {
void cdio_add_device_list(char **device_list[], const char *psz_drive, void cdio_add_device_list(char **device_list[], const char *psz_drive,
unsigned int *i_drives); 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_freebsd (const char *psz_drive);
driver_return_code_t close_tray_linux (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); driver_return_code_t close_tray_osx (const char *psz_drive);