Commit 2a70bf34 authored by Rémi Denis-Courmont's avatar Rémi Denis-Courmont
Browse files

Move intf_EJect() out of core

parent a5aed8a3
......@@ -102,9 +102,6 @@ struct intf_dialog_args_t
VLC_API int intf_Create( vlc_object_t *, const char * );
#define intf_Create(a,b) intf_Create(VLC_OBJECT(a),b)
VLC_API int intf_Eject( vlc_object_t *, const char * );
#define intf_Eject(a,b) intf_Eject(VLC_OBJECT(a),b)
VLC_API void libvlc_Quit( libvlc_int_t * );
/*@}*/
......
......@@ -16,3 +16,4 @@ endif
SOURCES_ncurses = ncurses.c
SOURCES_fbosd = fbosd.c
EXTRA_DIST += eject.c
/*****************************************************************************
* intf_eject.c: CD/DVD-ROM ejection handling functions
* eject.c: CD/DVD-ROM ejection handling functions
*****************************************************************************
* Copyright (C) 2001-2004 the VideoLAN team
* $Id$
* Copyright (C) 2001-2011 the VideoLAN team
*
* Authors: Julien Blache <jb@technologeek.org> for the Linux part
* with code taken from the Linux "eject" command
......@@ -29,13 +28,12 @@
* This file contain functions to eject CD and DVD drives
*/
#ifdef HAVE_CONFIG_H
/*#ifdef HAVE_CONFIG_H
# include "config.h"
#endif
#endif*/
#include <vlc_common.h>
#include <vlc_fs.h>
#include <vlc_interface.h>
#if defined( WIN32 ) && !defined( UNDER_CE )
# include <mmsystem.h>
......@@ -115,13 +113,12 @@ static int EjectSCSI( int i_fd )
#undef intf_Eject
/**
* \brief Ejects the CD /DVD
* \ingroup vlc_interface
* Ejects the optical disc in a device
* \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
* \return VLC_SUCCESS or VLC_EGENERIC
*/
int intf_Eject( vlc_object_t *p_this, const char *psz_device )
static int intf_Eject( vlc_object_t *p_this, const char *psz_device )
{
VLC_UNUSED(p_this);
......@@ -179,3 +176,5 @@ int intf_Eject( vlc_object_t *p_this, const char *psz_device )
return VLC_EGENERIC;
#endif
}
#define intf_Eject(o, p) intf_Eject(VLC_OBJECT(o), p)
......@@ -85,6 +85,8 @@ vlc_module_begin ()
add_directory("browse-dir", NULL, BROWSE_TEXT, BROWSE_LONGTEXT, false)
vlc_module_end ()
#include "eject.c"
/*****************************************************************************
* intf_sys_t: description and status of ncurses interface
*****************************************************************************/
......
......@@ -57,6 +57,8 @@
I_DIR_OR_FOLDER( N_("Select a device or a VIDEO_TS directory"), \
N_("Select a device or a VIDEO_TS folder") )
#include "../../eject.c"
/* Populate a combobox with the devices matching a pattern.
Combobox will automatically do autocompletion on the edit zone */
#define POPULATE_WITH_DEVS(ppsz_devlist, targetCombo) \
......
......@@ -105,7 +105,6 @@ src/input/vlm.c
src/input/vlm_internal.h
src/input/vlmshell.c
src/interface/interface.c
src/interface/intf_eject.c
src/libvlc.c
src/libvlc.h
src/libvlc-module.c
......
......@@ -304,7 +304,6 @@ SOURCES_libvlc_common = \
version.c \
interface/dialog.c \
interface/interface.c \
interface/intf_eject.c \
playlist/playlist_internal.h \
playlist/art.c \
playlist/art.h \
......
......@@ -230,7 +230,6 @@ input_Stop
input_vaControl
input_Close
intf_Create
intf_Eject
IsUTF8
libvlc_InternalAddIntf
libvlc_InternalCleanup
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment