X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;ds=sidebyside;f=src%2Finterface%2Fintf_eject.c;h=4031d99d75e5116501973499be4e00426257ceb4;hb=cc82ee52dfa8c7958e2226b8b2ebf163daea4933;hp=d286ea6880c3c52ba2ae8370c7451db38d574038;hpb=ae0f3b94006fb086a7f403f3db678701db4d2217;p=vlc diff --git a/src/interface/intf_eject.c b/src/interface/intf_eject.c index d286ea6880..4031d99d75 100644 --- a/src/interface/intf_eject.c +++ b/src/interface/intf_eject.c @@ -1,12 +1,13 @@ /***************************************************************************** * intf_eject.c: CD/DVD-ROM ejection handling functions ***************************************************************************** - * Copyright (C) 2001, 2002 VideoLAN - * $Id: intf_eject.c,v 1.11 2002/05/06 23:18:26 jlj Exp $ + * Copyright (C) 2001-2004 the VideoLAN team + * $Id$ * - * Author: Julien Blache for the Linux part - * with code taken from the Linux "eject" command - * Jon Lech Johansen for Darwin + * Authors: Julien Blache for the Linux part + * with code taken from the Linux "eject" command + * Jon Lech Johansen for Darwin + * Gildas Bazin for Win32 * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -20,20 +21,24 @@ * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111, USA. + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA. *****************************************************************************/ -#include +/** + * \file + * This file contain functions to eject CD and DVD drives + */ -#include -#include +#ifdef HAVE_CONFIG_H +# include "config.h" +#endif + +#include #ifdef HAVE_UNISTD_H # include #endif -#include - #ifdef HAVE_FCNTL_H # include #endif @@ -42,7 +47,7 @@ # include #endif -#if defined(SYS_LINUX) && defined(HAVE_LINUX_VERSION_H) +#if defined(__linux__) && defined(HAVE_LINUX_VERSION_H) # include /* handy macro found in 2.1 kernels, but not in older ones */ # ifndef KERNEL_VERSION @@ -50,7 +55,6 @@ # endif # include -# include # include # include @@ -66,25 +70,33 @@ # include #endif +#if defined( WIN32 ) && !defined( UNDER_CE ) +# include +#endif + +#include + /***************************************************************************** * Local prototypes *****************************************************************************/ -#if defined(SYS_LINUX) && defined(HAVE_LINUX_VERSION_H) +#if defined(__linux__) && defined(HAVE_LINUX_VERSION_H) static int EjectSCSI ( int i_fd ); #endif -/***************************************************************************** - * intf_Eject: eject the CDRom - ***************************************************************************** - * returns 0 on success - * returns 1 on failure - * returns -1 if not implemented - *****************************************************************************/ -int intf_Eject( const char *psz_device ) +#undef intf_Eject +/** + * \brief Ejects the CD /DVD + * \ingroup vlc_interface + * \param p_this the calling vlc_object_t + * \param psz_device the CD/DVD to eject + * \return 0 on success, 1 on failure, -1 if not implemented + */ +int intf_Eject( vlc_object_t *p_this, const char *psz_device ) { - int i_ret; + VLC_UNUSED(p_this); + int i_ret = VLC_SUCCESS; -#ifdef SYS_DARWIN +#ifdef __APPLE__ FILE *p_eject; char *psz_disk; char sz_cmd[32]; @@ -93,7 +105,7 @@ int intf_Eject( const char *psz_device ) * The only way to cleanly unmount the disc under MacOS X * is to use the 'disktool' command line utility. It uses * the non-public Disk Arbitration API, which can not be - * used by Cocoa or Carbon applications. + * used by Cocoa or Carbon applications. */ if( ( psz_disk = (char *)strstr( psz_device, "disk" ) ) != NULL && @@ -111,7 +123,7 @@ int intf_Eject( const char *psz_device ) if( i_ret == 0 && ferror( p_eject ) != 0 ) { pclose( p_eject ); - return 1; + return VLC_EGENERIC; } pclose( p_eject ); @@ -120,28 +132,60 @@ int intf_Eject( const char *psz_device ) if( strstr( psz_result, "Disk Ejected" ) != NULL ) { - return 0; + return VLC_SUCCESS; } } } - return 1; + return VLC_EGENERIC; + +#elif defined(UNDER_CE) + msg_Warn( p_this, "CD-Rom ejection unsupported on this platform" ); + return i_ret; + +#elif defined(WIN32) + MCI_OPEN_PARMS op; + MCI_STATUS_PARMS st; + DWORD i_flags; + char psz_drive[4]; -#else /* SYS_DARWIN */ + memset( &op, 0, sizeof(MCI_OPEN_PARMS) ); + op.lpstrDeviceType = (LPCSTR)MCI_DEVTYPE_CD_AUDIO; + + strcpy( psz_drive, "X:" ); + psz_drive[0] = psz_device[0]; + op.lpstrElementName = psz_drive; + + /* Set the flags for the device type */ + i_flags = MCI_OPEN_TYPE | MCI_OPEN_TYPE_ID | + MCI_OPEN_ELEMENT | MCI_OPEN_SHAREABLE; + + if( !mciSendCommand( 0, MCI_OPEN, i_flags, (uintptr_t)&op ) ) + { + st.dwItem = MCI_STATUS_READY; + /* Eject disc */ + i_ret = mciSendCommand( op.wDeviceID, MCI_SET, MCI_SET_DOOR_OPEN, 0 ); + /* Release access to the device */ + mciSendCommand( op.wDeviceID, MCI_CLOSE, MCI_WAIT, 0 ); + } + else i_ret = VLC_EGENERIC; + + return i_ret; +#else /* WIN32 */ int i_fd; /* This code could be extended to support CD/DVD-ROM chargers */ i_fd = open( psz_device, O_RDONLY | O_NONBLOCK ); - + if( i_fd == -1 ) { - intf_ErrMsg( "intf error: couldn't open device %s", psz_device ); - return 1; + msg_Err( p_this, "could not open device %s", psz_device ); + return VLC_EGENERIC; } -#if defined(SYS_LINUX) && defined(HAVE_LINUX_VERSION_H) +#if defined(__linux__) && defined(HAVE_LINUX_VERSION_H) /* Try a simple ATAPI eject */ i_ret = ioctl( i_fd, CDROMEJECT, 0 ); @@ -152,14 +196,14 @@ int intf_Eject( const char *psz_device ) if( i_ret != 0 ) { - intf_ErrMsg( "intf error: couldn't eject %s", psz_device ); + msg_Err( p_this, "could not eject %s", psz_device ); } #elif defined (HAVE_DVD_H) i_ret = ioctl( i_fd, CDROMEJECT, 0 ); #else - intf_ErrMsg( "intf error: CD-Rom ejection unsupported on this platform" ); + msg_Warn( p_this, "CD-ROM ejection unsupported on this platform" ); i_ret = -1; #endif @@ -171,10 +215,17 @@ int intf_Eject( const char *psz_device ) /* The following functions are local */ -#if defined(SYS_LINUX) && defined(HAVE_LINUX_VERSION_H) +#if defined(__linux__) && defined(HAVE_LINUX_VERSION_H) /***************************************************************************** * Eject using SCSI commands. Return 0 if successful *****************************************************************************/ +/** + * \brief Ejects the CD /DVD using SCSI commands + * \ingroup vlc_interface + * This function is local + * \param i_fd a device nummber + * \return 0 on success, VLC_EGENERIC on failure + */ static int EjectSCSI( int i_fd ) { int i_status; @@ -197,7 +248,7 @@ static int EjectSCSI( int i_fd ) i_status = ioctl( i_fd, SCSI_IOCTL_SEND_COMMAND, (void *)&scsi_cmd ); if( i_status != 0 ) { - return 1; + return VLC_EGENERIC; } scsi_cmd.inlen = 0; @@ -211,9 +262,9 @@ static int EjectSCSI( int i_fd ) i_status = ioctl( i_fd, SCSI_IOCTL_SEND_COMMAND, (void *)&scsi_cmd ); if( i_status != 0 ) { - return 1; + return VLC_EGENERIC; } - + scsi_cmd.inlen = 0; scsi_cmd.outlen = 0; scsi_cmd.cmd[0] = START_STOP; @@ -225,12 +276,12 @@ static int EjectSCSI( int i_fd ) i_status = ioctl( i_fd, SCSI_IOCTL_SEND_COMMAND, (void *)&scsi_cmd ); if( i_status != 0 ) { - return 1; + return VLC_EGENERIC; } - + /* Force kernel to reread partition table when new disc inserted */ i_status = ioctl( i_fd, BLKRRPART ); - + return i_status; } #endif