/*****************************************************************************
* intf_eject.c: CD/DVD-ROM ejection handling functions
*****************************************************************************
- * Copyright (C) 2001-2004 VideoLAN
- * $Id: intf_eject.c,v 1.23 2004/01/06 12:02:06 zorglub Exp $
+ * Copyright (C) 2001-2004 the VideoLAN team
+ * $Id$
*
* Authors: Julien Blache <jb@technologeek.org> for the Linux part
* with code taken from the Linux "eject" command
*
* 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.
*****************************************************************************/
/**
* This file contain functions to eject CD and DVD drives
*/
-#include <vlc/vlc.h>
+#ifdef HAVE_CONFIG_H
+# include "config.h"
+#endif
-#include <stdio.h>
-#include <stdlib.h>
+#include <vlc_common.h>
#ifdef HAVE_UNISTD_H
# include <unistd.h>
#endif
-#include <string.h>
-
#ifdef HAVE_FCNTL_H
# include <fcntl.h>
#endif
# include <dvd.h>
#endif
-#if defined(SYS_LINUX) && defined(HAVE_LINUX_VERSION_H)
+#if defined(__linux__) && defined(HAVE_LINUX_VERSION_H)
# include <linux/version.h>
/* handy macro found in 2.1 kernels, but not in older ones */
# ifndef KERNEL_VERSION
# endif
# include <sys/types.h>
-# include <sys/stat.h>
# include <sys/ioctl.h>
# include <sys/ioctl.h>
# include <mmsystem.h>
#endif
+#include <vlc_interface.h>
+
/*****************************************************************************
* 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
- *****************************************************************************/
+#undef intf_Eject
/**
* \brief Ejects the CD /DVD
* \ingroup vlc_interface
* \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 intf_Eject( vlc_object_t *p_this, const char *psz_device )
{
+ VLC_UNUSED(p_this);
int i_ret = VLC_SUCCESS;
-#ifdef SYS_DARWIN
+#ifdef __APPLE__
FILE *p_eject;
char *psz_disk;
char sz_cmd[32];
i_flags = MCI_OPEN_TYPE | MCI_OPEN_TYPE_ID |
MCI_OPEN_ELEMENT | MCI_OPEN_SHAREABLE;
- if( !mciSendCommand( 0, MCI_OPEN, i_flags, (unsigned long)&op ) )
+ if( !mciSendCommand( 0, MCI_OPEN, i_flags, (uintptr_t)&op ) )
{
st.dwItem = MCI_STATUS_READY;
/* Eject disc */
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 );
i_ret = ioctl( i_fd, CDROMEJECT, 0 );
#else
- msg_Warn( p_this, "CD-Rom ejection unsupported on this platform" );
+ msg_Warn( p_this, "CD-ROM ejection unsupported on this platform" );
i_ret = -1;
#endif
/* 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
*****************************************************************************/