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

solaris: add audio stop

Browse Source 
gnu_linux.c: correct comment.
This commit is contained in:
rocky
2005-03-06 22:53:50 +00:00
parent 007456fd3a
commit c082cedeba
2 changed files with 19 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
lib/driver/gnu_linux.c
View File

@@ -1,5 +1,5 @@
/* /*
$Id: gnu_linux.c,v 1.5 2005/03/06 11:21:52 rocky Exp $ $Id: gnu_linux.c,v 1.6 2005/03/06 22:53:50 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: gnu_linux.c,v 1.5 2005/03/06 11:21:52 rocky Exp $"; static const char _rcsid[] = "$Id: gnu_linux.c,v 1.6 2005/03/06 22:53:50 rocky Exp $";
#include <string.h> #include <string.h>
@@ -314,7 +314,7 @@ audio_stop_linux (void *p_user_data)
} }
/*! /*!
Stop playing an audio CD. Close tray on CD-ROM.
@param p_user_data the CD object to be acted upon. @param p_user_data the CD object to be acted upon.

18
lib/driver/solaris.c
View File

@@ -1,5 +1,5 @@
/* /*
$Id: solaris.c,v 1.4 2005/03/06 11:21:52 rocky Exp $ $Id: solaris.c,v 1.5 2005/03/06 22:53:50 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>
@@ -38,7 +38,7 @@
#ifdef HAVE_SOLARIS_CDROM #ifdef HAVE_SOLARIS_CDROM
static const char _rcsid[] = "$Id: solaris.c,v 1.4 2005/03/06 11:21:52 rocky Exp $"; static const char _rcsid[] = "$Id: solaris.c,v 1.5 2005/03/06 22:53:50 rocky Exp $";
#ifdef HAVE_GLOB_H #ifdef HAVE_GLOB_H
#include <glob.h> #include <glob.h>
@@ -212,6 +212,19 @@ audio_set_volume_solaris (void *p_user_data,
return ioctl(p_env->gen.fd, CDROMVOLCTRL, p_volume); return ioctl(p_env->gen.fd, CDROMVOLCTRL, p_volume);
} }
/*!
Stop playing an audio CD.
@param p_user_data the CD object to be acted upon.
*/
static driver_return_code_t
audio_stop_solaris (void *p_user_data)
{
const _img_private_t *p_env = p_user_data;
return ioctl(p_env->gen.fd, CDROMSTOP);
}
/*! /*!
Initialize CD device. Initialize CD device.
*/ */
@@ -1004,6 +1017,7 @@ cdio_open_am_solaris (const char *psz_orig_source, const char *access_mode)
_funcs.audio_read_subchannel = audio_read_subchannel_solaris; _funcs.audio_read_subchannel = audio_read_subchannel_solaris;
_funcs.audio_resume = audio_resume_solaris; _funcs.audio_resume = audio_resume_solaris;
_funcs.audio_set_volume = audio_set_volume_solaris; _funcs.audio_set_volume = audio_set_volume_solaris;
_funcs.audio_stop = audio_stop_solaris,
_funcs.eject_media = eject_media_solaris; _funcs.eject_media = eject_media_solaris;
_funcs.free = cdio_generic_free; _funcs.free = cdio_generic_free;
_funcs.get_arg = get_arg_solaris; _funcs.get_arg = get_arg_solaris;