LGPL

[vlc] / include / vlc / deprecated.h

diff --git a/include/vlc/deprecated.h b/include/vlc/deprecated.h
index 93053490ec6c97ca53f7f33fb25a711b68ac0b16..dc2142ba77c393a458d5e202df5b5f9ef254266e 100644 (file)
--- a/include/vlc/deprecated.h
+++ b/include/vlc/deprecated.h
@@ -1,25 +1,25 @@
 /*****************************************************************************
  * deprecated.h:  libvlc deprecated API
  *****************************************************************************
- * Copyright (C) 1998-2008 the VideoLAN team
+ * Copyright (C) 1998-2008 VLC authors and VideoLAN
  * $Id$
  *
  * Authors: Clément Stenac <zorglub@videolan.org>
  *          Jean-Paul Saman <jpsaman@videolan.org>
  *
- * 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
- * the Free Software Foundation; either version 2 of the License, or
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation; either version 2.1 of the License, or
  * (at your option) any later version.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Lesser General Public License for more details.
  *
- * 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., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
  *****************************************************************************/
 
 #ifndef LIBVLC_DEPRECATED_H
@@ -27,62 +27,24 @@
 
 /**
  * \file
- * This file defines libvlc depreceated API
+ * This file defines libvlc deprecated API
  */
 
-/**
- * This is the legacy representation of a platform-specific drawable. Because
- * it cannot accomodate a pointer on most 64-bits platforms, it should not be
- * used anymore.
- */
-typedef int libvlc_drawable_t;
-
 # ifdef __cplusplus
 extern "C" {
 # endif
 
-/**
- * Set the drawable where the media player should render its video output.
- *
- * On Windows 32-bits, a window handle (HWND) is expected.
- * On Windows 64-bits, this function will always fail.
- *
- * On OSX 32-bits, a CGrafPort is expected.
- * On OSX 64-bits, this function will always fail.
- *
- * On other platforms, an existing X11 window ID is expected. See
- * libvlc_media_player_set_xid() for details.
- *
- * \param p_mi the Media Player
- * \param drawable the libvlc_drawable_t where the media player
- *        should render its video
- * \param p_e an initialized exception pointer
- */
-VLC_DEPRECATED_API void libvlc_media_player_set_drawable ( libvlc_media_player_t *, libvlc_drawable_t, libvlc_exception_t * );
-
-/**
- * Get the drawable where the media player should render its video output
- *
- * \param p_mi the Media Player
- * \param p_e an initialized exception pointer
- * \return the libvlc_drawable_t where the media player
- *         should render its video
- */
-VLC_DEPRECATED_API libvlc_drawable_t
-                    libvlc_media_player_get_drawable ( libvlc_media_player_t *, libvlc_exception_t * );
-
 /*****************************************************************************
  * Playlist (Deprecated)
  *****************************************************************************/
-/** \defgroup libvlc_playlist libvlc_playlist (Deprecated)
+/** \defgroup libvlc_playlist LibVLC playlist (legacy)
  * \ingroup libvlc
- * LibVLC Playlist handling (Deprecated)
- * @deprecated Use media_list
+ * @deprecated Use @ref libvlc_media_list instead.
  * @{
  */
 
 /**
- * Start playing.
+ * Start playing (if there is any item in the playlist).
  *
  * Additionnal playlist item options can be specified for addition to the
  * item before it is played.
@@ -93,10 +55,10 @@ VLC_DEPRECATED_API libvlc_drawable_t
  *        played
  * \param i_options the number of options to add to the item
  * \param ppsz_options the options to add to the item
- * \param p_e an initialized exception pointer
  */
-VLC_DEPRECATED_API void libvlc_playlist_play( libvlc_instance_t*, int, int,
-                                          char **, libvlc_exception_t * );
+LIBVLC_DEPRECATED void libvlc_playlist_play( libvlc_instance_t *p_instance,
+                                              int i_id, int i_options,
+                                              char **ppsz_options );
 
 /** @}*/