From 436b928915f56a8bc56fc7065800fad7e474e158 Mon Sep 17 00:00:00 2001 From: Guenter Bartsch Date: Thu, 21 Jun 2001 17:34:23 +0000 Subject: solaris and stability patches provided by Juergen Keil CVS patchset: 211 CVS date: 2001/06/21 17:34:23 --- src/input/input_dvd.c | 17 +++++++++++++++-- 1 file changed, 15 insertions(+), 2 deletions(-) (limited to 'src/input/input_dvd.c') diff --git a/src/input/input_dvd.c b/src/input/input_dvd.c index b9ccda9cd..3c49e5948 100644 --- a/src/input/input_dvd.c +++ b/src/input/input_dvd.c @@ -17,7 +17,7 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA * - * $Id: input_dvd.c,v 1.9 2001/06/02 21:44:01 guenter Exp $ + * $Id: input_dvd.c,v 1.10 2001/06/21 17:34:23 guenter Exp $ */ #ifdef HAVE_CONFIG_H @@ -27,7 +27,8 @@ #include #include #include -#if defined(__NetBSD__) || defined(__OpenBSD__) || defined(__FreeBSD__) +#if defined(__NetBSD__) || defined(__OpenBSD__) || defined(__FreeBSD__) \ + || defined(__sun) # include #elif defined(__linux__) #include /* Check for DEVFS */ @@ -49,6 +50,10 @@ static uint32_t xine_debug; +#if defined(__sun) +#define RDVD "/vol/dev/aliases/cdrom0" +#define DVD RDVD +#else #ifdef CONFIG_DEVFS_FS #define DVD "/dev/cdroms/dvd" #define RDVD "/dev/cdroms/rdvd" @@ -56,6 +61,7 @@ static uint32_t xine_debug; #define DVD "/dev/dvd" #define RDVD "/dev/rdvd" #endif +#endif typedef struct { @@ -375,6 +381,13 @@ static int dvd_plugin_eject_media (input_plugin_t *this_gen) { } } +#elif defined(__sun) + + status = 0; + if ((ret = ioctl(fd, CDROMEJECT)) != 0) { + xprintf(VERBOSE|INPUT, "CDROMEJECT failed: %s\n", strerror(errno)); + } + #endif close(fd); -- cgit v1.2.3