summaryrefslogtreecommitdiffstats
path: root/win32/vlc/.svn
diff options
context:
space:
mode:
Diffstat (limited to 'win32/vlc/.svn')
-rw-r--r--win32/vlc/.svn/all-wcprops95
-rw-r--r--win32/vlc/.svn/entries538
-rw-r--r--win32/vlc/.svn/text-base/deprecated.h.svn-base352
-rw-r--r--win32/vlc/.svn/text-base/libvlc.h.svn-base417
-rw-r--r--win32/vlc/.svn/text-base/libvlc_events.h.svn-base219
-rw-r--r--win32/vlc/.svn/text-base/libvlc_media.h.svn-base307
-rw-r--r--win32/vlc/.svn/text-base/libvlc_media_discoverer.h.svn-base102
-rw-r--r--win32/vlc/.svn/text-base/libvlc_media_library.h.svn-base103
-rw-r--r--win32/vlc/.svn/text-base/libvlc_media_list.h.svn-base254
-rw-r--r--win32/vlc/.svn/text-base/libvlc_media_list_player.h.svn-base175
-rw-r--r--win32/vlc/.svn/text-base/libvlc_media_list_view.h.svn-base160
-rw-r--r--win32/vlc/.svn/text-base/libvlc_media_player.h.svn-base971
-rw-r--r--win32/vlc/.svn/text-base/libvlc_structures.h.svn-base139
-rw-r--r--win32/vlc/.svn/text-base/libvlc_vlm.h.svn-base342
-rw-r--r--win32/vlc/.svn/text-base/mediacontrol.h.svn-base342
-rw-r--r--win32/vlc/.svn/text-base/mediacontrol_structures.h.svn-base144
-rw-r--r--win32/vlc/.svn/text-base/vlc.h.svn-base57
17 files changed, 4717 insertions, 0 deletions
diff --git a/win32/vlc/.svn/all-wcprops b/win32/vlc/.svn/all-wcprops
new file mode 100644
index 0000000..0dcdd35
--- /dev/null
+++ b/win32/vlc/.svn/all-wcprops
@@ -0,0 +1,95 @@
+K 25
+svn:wc:ra_dav:version-url
+V 66
+/anyclip/!svn/ver/2282/branches/iterations/AnyClip4D/1.1/win32/vlc
+END
+libvlc_vlm.h
+K 25
+svn:wc:ra_dav:version-url
+V 79
+/anyclip/!svn/ver/2282/branches/iterations/AnyClip4D/1.1/win32/vlc/libvlc_vlm.h
+END
+libvlc_media_library.h
+K 25
+svn:wc:ra_dav:version-url
+V 89
+/anyclip/!svn/ver/2282/branches/iterations/AnyClip4D/1.1/win32/vlc/libvlc_media_library.h
+END
+libvlc_media_list_view.h
+K 25
+svn:wc:ra_dav:version-url
+V 91
+/anyclip/!svn/ver/2282/branches/iterations/AnyClip4D/1.1/win32/vlc/libvlc_media_list_view.h
+END
+libvlc_media_discoverer.h
+K 25
+svn:wc:ra_dav:version-url
+V 92
+/anyclip/!svn/ver/2282/branches/iterations/AnyClip4D/1.1/win32/vlc/libvlc_media_discoverer.h
+END
+libvlc_events.h
+K 25
+svn:wc:ra_dav:version-url
+V 82
+/anyclip/!svn/ver/2282/branches/iterations/AnyClip4D/1.1/win32/vlc/libvlc_events.h
+END
+deprecated.h
+K 25
+svn:wc:ra_dav:version-url
+V 79
+/anyclip/!svn/ver/2282/branches/iterations/AnyClip4D/1.1/win32/vlc/deprecated.h
+END
+libvlc_media_list.h
+K 25
+svn:wc:ra_dav:version-url
+V 86
+/anyclip/!svn/ver/2282/branches/iterations/AnyClip4D/1.1/win32/vlc/libvlc_media_list.h
+END
+libvlc_media.h
+K 25
+svn:wc:ra_dav:version-url
+V 81
+/anyclip/!svn/ver/2282/branches/iterations/AnyClip4D/1.1/win32/vlc/libvlc_media.h
+END
+libvlc.h
+K 25
+svn:wc:ra_dav:version-url
+V 75
+/anyclip/!svn/ver/2282/branches/iterations/AnyClip4D/1.1/win32/vlc/libvlc.h
+END
+libvlc_structures.h
+K 25
+svn:wc:ra_dav:version-url
+V 86
+/anyclip/!svn/ver/2282/branches/iterations/AnyClip4D/1.1/win32/vlc/libvlc_structures.h
+END
+mediacontrol.h
+K 25
+svn:wc:ra_dav:version-url
+V 81
+/anyclip/!svn/ver/2282/branches/iterations/AnyClip4D/1.1/win32/vlc/mediacontrol.h
+END
+libvlc_media_list_player.h
+K 25
+svn:wc:ra_dav:version-url
+V 93
+/anyclip/!svn/ver/2282/branches/iterations/AnyClip4D/1.1/win32/vlc/libvlc_media_list_player.h
+END
+mediacontrol_structures.h
+K 25
+svn:wc:ra_dav:version-url
+V 92
+/anyclip/!svn/ver/2282/branches/iterations/AnyClip4D/1.1/win32/vlc/mediacontrol_structures.h
+END
+vlc.h
+K 25
+svn:wc:ra_dav:version-url
+V 72
+/anyclip/!svn/ver/2282/branches/iterations/AnyClip4D/1.1/win32/vlc/vlc.h
+END
+libvlc_media_player.h
+K 25
+svn:wc:ra_dav:version-url
+V 88
+/anyclip/!svn/ver/2282/branches/iterations/AnyClip4D/1.1/win32/vlc/libvlc_media_player.h
+END
diff --git a/win32/vlc/.svn/entries b/win32/vlc/.svn/entries
new file mode 100644
index 0000000..25ecd2d
--- /dev/null
+++ b/win32/vlc/.svn/entries
@@ -0,0 +1,538 @@
+10
+
+dir
+2301
+https://anyclip.svn.beanstalkapp.com/anyclip/branches/iterations/AnyClip4D/1.1/win32/vlc
+https://anyclip.svn.beanstalkapp.com/anyclip
+
+
+
+2009-11-30T08:19:44.492039Z
+2282
+zx2c4
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+4cc9b9cd-7cf8-4f8c-937d-e7c95023a307
+
+libvlc_vlm.h
+file
+
+
+
+
+2009-11-30T05:15:26.955455Z
+806c3b33b45cd8fa7a5105043b0eac45
+2009-11-30T08:19:44.492039Z
+2282
+zx2c4
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+12436
+
+libvlc_media_library.h
+file
+
+
+
+
+2009-11-30T05:15:26.955455Z
+e3a9049880cfd005fff9b2a5c925b036
+2009-11-30T08:19:44.492039Z
+2282
+zx2c4
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+3448
+
+libvlc_media_list_view.h
+file
+
+
+
+
+2009-11-30T05:15:26.955455Z
+5fa4d022ed685db1096cbdda97a653fa
+2009-11-30T08:19:44.492039Z
+2282
+zx2c4
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+5934
+
+libvlc_events.h
+file
+
+
+
+
+2009-11-30T05:15:26.955455Z
+849c61682897c6e1ec839f6d4210ba3a
+2009-11-30T08:19:44.492039Z
+2282
+zx2c4
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+5665
+
+libvlc_media_discoverer.h
+file
+
+
+
+
+2009-11-30T05:15:26.955455Z
+38ed195c18461d166abddd0d8cd91689
+2009-11-30T08:19:44.492039Z
+2282
+zx2c4
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+3506
+
+deprecated.h
+file
+
+
+
+
+2009-11-30T05:15:26.954457Z
+b23d957a2c5dbc58620c5bf8e695bfb2
+2009-11-30T08:19:44.492039Z
+2282
+zx2c4
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+12865
+
+libvlc_media_list.h
+file
+
+
+
+
+2009-11-30T05:15:26.955455Z
+f8b5389babe3445f55d0b6066eb8a61b
+2009-11-30T08:19:44.492039Z
+2282
+zx2c4
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+8557
+
+libvlc_media.h
+file
+
+
+
+
+2009-11-30T05:15:26.955455Z
+4b6cac135a59b64df849b658a34da786
+2009-11-30T08:19:44.492039Z
+2282
+zx2c4
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+10326
+
+libvlc.h
+file
+
+
+
+
+2009-11-30T05:15:26.954457Z
+6313331c9d7d238e6447749bfd83dc2f
+2009-11-30T08:19:44.492039Z
+2282
+zx2c4
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+12852
+
+libvlc_structures.h
+file
+
+
+
+
+2009-11-30T05:15:26.955455Z
+66ccbab5a8367bc5889996533ca3d6fb
+2009-11-30T08:19:44.492039Z
+2282
+zx2c4
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+3910
+
+mediacontrol.h
+file
+
+
+
+
+2009-11-30T05:15:26.956455Z
+5a0b19313aed5cc626b70d805da94563
+2009-11-30T08:19:44.492039Z
+2282
+zx2c4
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+11607
+
+libvlc_media_list_player.h
+file
+
+
+
+
+2009-11-30T05:15:26.955455Z
+69f7f5458756c7659336c10c29a610c7
+2009-11-30T08:19:44.492039Z
+2282
+zx2c4
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+5721
+
+mediacontrol_structures.h
+file
+
+
+
+
+2009-11-30T05:15:26.956455Z
+fd83f7c786a56479a464ba16baa4d51c
+2009-11-30T08:19:44.492039Z
+2282
+zx2c4
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+3927
+
+vlc.h
+file
+
+
+
+
+2009-11-30T05:15:26.956455Z
+b9b36f87b87aa3c68680777bee0326d4
+2009-11-30T08:19:44.492039Z
+2282
+zx2c4
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+1957
+
+libvlc_media_player.h
+file
+
+
+
+
+2009-11-30T05:15:26.955455Z
+8be05b75b619ee13c30353f92c006869
+2009-11-30T08:19:44.492039Z
+2282
+zx2c4
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+30752
+
diff --git a/win32/vlc/.svn/text-base/deprecated.h.svn-base b/win32/vlc/.svn/text-base/deprecated.h.svn-base
new file mode 100644
index 0000000..85122f0
--- /dev/null
+++ b/win32/vlc/.svn/text-base/deprecated.h.svn-base
@@ -0,0 +1,352 @@
+/*****************************************************************************
+ * deprecated.h: libvlc deprecated API
+ *****************************************************************************
+ * Copyright (C) 1998-2008 the VideoLAN team
+ * $Id: 2cb82e11034c42b79115efd043f41fdfd06aa1eb $
+ *
+ * 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
+ * (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.
+ *
+ * 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.
+ *****************************************************************************/
+
+#ifndef LIBVLC_DEPRECATED_H
+#define LIBVLC_DEPRECATED_H 1
+
+/**
+ * \file
+ * This file defines libvlc depreceated 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 * );
+
+/**
+ * Set the default video output's parent.
+ *
+ * This setting will be used as default for any video output.
+ *
+ * \param p_instance libvlc instance
+ * \param drawable the new parent window
+ * (see libvlc_media_player_set_drawable() for details)
+ * \param p_e an initialized exception pointer
+ * @deprecated Use libvlc_media_player_set_drawable
+ */
+VLC_DEPRECATED_API void libvlc_video_set_parent( libvlc_instance_t *, libvlc_drawable_t, libvlc_exception_t * );
+
+/**
+ * Set the default video output parent.
+ *
+ * This setting will be used as default for all video outputs.
+ *
+ * \param p_instance libvlc instance
+ * \param drawable the new parent window (Drawable on X11, CGrafPort on MacOSX, HWND on Win32)
+ * \param p_e an initialized exception pointer
+ * @deprecated Use libvlc_media_player_get_drawable
+ */
+VLC_DEPRECATED_API libvlc_drawable_t libvlc_video_get_parent( libvlc_instance_t *, libvlc_exception_t * );
+
+/**
+ * Does nothing. Do not use this function.
+ */
+VLC_DEPRECATED_API int libvlc_video_reparent( libvlc_media_player_t *, libvlc_drawable_t, libvlc_exception_t * );
+
+/**
+ * Resize the current video output window.
+ * This might crash. Please use libvlc_video_set_scale() instead.
+ *
+ * \param p_mi media player instance
+ * \param width new width for video output window
+ * \param height new height for video output window
+ * \param p_e an initialized exception pointer
+ * \return the success status (boolean)
+ */
+VLC_DEPRECATED_API void libvlc_video_resize( libvlc_media_player_t *, int, int, libvlc_exception_t *);
+
+/**
+ * Tell windowless video output to redraw rectangular area (MacOS X only).
+ * This might crash. Do not use this function.
+ *
+ * \param p_mi media player instance
+ * \param area coordinates within video drawable
+ * \param p_e an initialized exception pointer
+ */
+VLC_DEPRECATED_API void libvlc_video_redraw_rectangle( libvlc_media_player_t *, const libvlc_rectangle_t *, libvlc_exception_t * );
+
+/**
+ * Set the default video output size.
+ * This setting will be used as default for all video outputs.
+ *
+ * \param p_instance libvlc instance
+ * \param width new width for video drawable
+ * \param height new height for video drawable
+ * \param p_e an initialized exception pointer
+ */
+VLC_DEPRECATED_API void libvlc_video_set_size( libvlc_instance_t *, int, int, libvlc_exception_t * );
+
+/**
+ * Set the default video output viewport for a windowless video output
+ * (MacOS X only). This might crash. Do not use this function.
+ *
+ * This setting will be used as default for all video outputs.
+ *
+ * \param p_instance libvlc instance
+ * \param p_mi media player instance
+ * \param view coordinates within video drawable
+ * \param clip coordinates within video drawable
+ * \param p_e an initialized exception pointer
+ */
+VLC_DEPRECATED_API void libvlc_video_set_viewport( libvlc_instance_t *, libvlc_media_player_t *, const libvlc_rectangle_t *, const libvlc_rectangle_t *, libvlc_exception_t * );
+
+/*
+ * This function shall not be used at all. It may lead to crash and race condition.
+ */
+VLC_DEPRECATED_API int libvlc_video_destroy( libvlc_media_player_t *, libvlc_exception_t *);
+
+/*****************************************************************************
+ * Playlist (Deprecated)
+ *****************************************************************************/
+/** \defgroup libvlc_playlist libvlc_playlist (Deprecated)
+ * \ingroup libvlc
+ * LibVLC Playlist handling (Deprecated)
+ * @deprecated Use media_list
+ * @{
+ */
+
+/**
+ * Set the playlist's loop attribute. If set, the playlist runs continuously
+ * and wraps around when it reaches the end.
+ *
+ * \param p_instance the playlist instance
+ * \param loop the loop attribute. 1 sets looping, 0 disables it
+ * \param p_e an initialized exception pointer
+ */
+VLC_DEPRECATED_API void libvlc_playlist_loop( libvlc_instance_t* , int,
+ libvlc_exception_t * );
+
+/**
+ * Start playing.
+ *
+ * Additionnal playlist item options can be specified for addition to the
+ * item before it is played.
+ *
+ * \param p_instance the playlist instance
+ * \param i_id the item to play. If this is a negative number, the next
+ * item will be selected. Otherwise, the item with the given ID will be
+ * 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 * );
+
+/**
+ * Toggle the playlist's pause status.
+ *
+ * If the playlist was running, it is paused. If it was paused, it is resumed.
+ *
+ * \param p_instance the playlist instance to pause
+ * \param p_e an initialized exception pointer
+ */
+VLC_DEPRECATED_API void libvlc_playlist_pause( libvlc_instance_t *,
+ libvlc_exception_t * );
+
+/**
+ * Checks whether the playlist is running
+ *
+ * \param p_instance the playlist instance
+ * \param p_e an initialized exception pointer
+ * \return 0 if the playlist is stopped or paused, 1 if it is running
+ */
+VLC_DEPRECATED_API int libvlc_playlist_isplaying( libvlc_instance_t *,
+ libvlc_exception_t * );
+
+/**
+ * Get the number of items in the playlist
+ *
+ * Expects the playlist instance to be locked already.
+ *
+ * \param p_instance the playlist instance
+ * \param p_e an initialized exception pointer
+ * \return the number of items
+ */
+VLC_DEPRECATED_API int libvlc_playlist_items_count( libvlc_instance_t *,
+ libvlc_exception_t * );
+
+VLC_DEPRECATED_API int libvlc_playlist_get_current_index( libvlc_instance_t *,
+ libvlc_exception_t *);
+/**
+ * Lock the playlist.
+ *
+ * \param p_instance the playlist instance
+ */
+VLC_DEPRECATED_API void libvlc_playlist_lock( libvlc_instance_t * );
+
+/**
+ * Unlock the playlist.
+ *
+ * \param p_instance the playlist instance
+ */
+VLC_DEPRECATED_API void libvlc_playlist_unlock( libvlc_instance_t * );
+
+/**
+ * Stop playing.
+ *
+ * \param p_instance the playlist instance to stop
+ * \param p_e an initialized exception pointer
+ */
+VLC_DEPRECATED_API void libvlc_playlist_stop( libvlc_instance_t *,
+ libvlc_exception_t * );
+
+/**
+ * Go to the next playlist item. If the playlist was stopped, playback
+ * is started.
+ *
+ * \param p_instance the playlist instance
+ * \param p_e an initialized exception pointer
+ */
+VLC_DEPRECATED_API void libvlc_playlist_next( libvlc_instance_t *,
+ libvlc_exception_t * );
+
+/**
+ * Go to the previous playlist item. If the playlist was stopped, playback
+ * is started.
+ *
+ * \param p_instance the playlist instance
+ * \param p_e an initialized exception pointer
+ */
+VLC_DEPRECATED_API void libvlc_playlist_prev( libvlc_instance_t *,
+ libvlc_exception_t * );
+
+/**
+ * Empty a playlist. All items in the playlist are removed.
+ *
+ * \param p_instance the playlist instance
+ * \param p_e an initialized exception pointer
+ */
+VLC_DEPRECATED_API void libvlc_playlist_clear( libvlc_instance_t *,
+ libvlc_exception_t * );
+
+/**
+ * Append an item to the playlist. The item is added at the end. If more
+ * advanced options are required, \see libvlc_playlist_add_extended instead.
+ *
+ * \param p_instance the playlist instance
+ * \param psz_uri the URI to open, using VLC format
+ * \param psz_name a name that you might want to give or NULL
+ * \param p_e an initialized exception pointer
+ * \return the identifier of the new item
+ */
+VLC_DEPRECATED_API int libvlc_playlist_add( libvlc_instance_t *, const char *,
+ const char *, libvlc_exception_t * );
+
+/**
+ * Append an item to the playlist. The item is added at the end, with
+ * additional input options.
+ *
+ * \param p_instance the playlist instance
+ * \param psz_uri the URI to open, using VLC format
+ * \param psz_name a name that you might want to give or NULL
+ * \param i_options the number of options to add
+ * \param ppsz_options strings representing the options to add
+ * \param p_e an initialized exception pointer
+ * \return the identifier of the new item
+ */
+VLC_DEPRECATED_API int libvlc_playlist_add_extended( libvlc_instance_t *, const char *,
+ const char *, int, const char **,
+ libvlc_exception_t * );
+
+/**
+ * Append an item to the playlist. The item is added at the end, with
+ * additional input options from an untrusted source.
+ *
+ * \param p_instance the playlist instance
+ * \param psz_uri the URI to open, using VLC format
+ * \param psz_name a name that you might want to give or NULL
+ * \param i_options the number of options to add
+ * \param ppsz_options strings representing the options to add
+ * \param p_e an initialized exception pointer
+ * \return the identifier of the new item
+ */
+VLC_DEPRECATED_API int libvlc_playlist_add_extended_untrusted( libvlc_instance_t *, const char *,
+ const char *, int, const char **,
+ libvlc_exception_t * );
+
+/**
+ * Delete the playlist item with the given ID.
+ *
+ * \param p_instance the playlist instance
+ * \param i_id the id to remove
+ * \param p_e an initialized exception pointer
+ * \return 0 in case of success, a non-zero value otherwise
+ */
+VLC_DEPRECATED_API int libvlc_playlist_delete_item( libvlc_instance_t *, int,
+ libvlc_exception_t * );
+
+/** Get the input that is currently being played by the playlist.
+ *
+ * \param p_instance the playlist instance to use
+ * \param p_e an initialized exception pointern
+ * \return a media instance object
+ */
+VLC_DEPRECATED_API libvlc_media_player_t * libvlc_playlist_get_media_player(
+ libvlc_instance_t *, libvlc_exception_t * );
+
+/** @}*/
+
+# ifdef __cplusplus
+}
+# endif
+
+#endif /* _LIBVLC_DEPRECATED_H */
diff --git a/win32/vlc/.svn/text-base/libvlc.h.svn-base b/win32/vlc/.svn/text-base/libvlc.h.svn-base
new file mode 100644
index 0000000..986f7af
--- /dev/null
+++ b/win32/vlc/.svn/text-base/libvlc.h.svn-base
@@ -0,0 +1,417 @@
+/*****************************************************************************
+ * libvlc.h: libvlc external API
+ *****************************************************************************
+ * Copyright (C) 1998-2009 the VideoLAN team
+ * $Id: 6a56774bb95eade041fcfc85962de338462add39 $
+ *
+ * Authors: Clément Stenac <zorglub@videolan.org>
+ * Jean-Paul Saman <jpsaman@videolan.org>
+ * Pierre d'Herbemont <pdherbemont@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
+ * (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.
+ *
+ * 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.
+ *****************************************************************************/
+
+/**
+ * \file
+ * This file defines libvlc external API
+ */
+
+/**
+ * \defgroup libvlc libvlc
+ * This is libvlc, the base library of the VLC program.
+ *
+ * @{
+ */
+
+#ifndef VLC_LIBVLC_H
+#define VLC_LIBVLC_H 1
+
+#if defined (WIN32) && defined (DLL_EXPORT)
+# define VLC_PUBLIC_API __declspec(dllexport)
+#else
+# define VLC_PUBLIC_API
+#endif
+
+#ifdef __LIBVLC__
+/* Avoid unuseful warnings from libvlc with our deprecated APIs */
+# define VLC_DEPRECATED_API VLC_PUBLIC_API
+#elif defined(__GNUC__) && \
+ (__GNUC__ > 3 || __GNUC__ == 3 && __GNUC_MINOR__ > 0)
+# define VLC_DEPRECATED_API VLC_PUBLIC_API __attribute__((deprecated))
+#else
+# define VLC_DEPRECATED_API VLC_PUBLIC_API
+#endif
+
+# ifdef __cplusplus
+extern "C" {
+# endif
+
+#include <vlc/libvlc_structures.h>
+
+/*****************************************************************************
+ * Exception handling
+ *****************************************************************************/
+/** \defgroup libvlc_exception libvlc_exception
+ * \ingroup libvlc_core
+ * LibVLC Exceptions handling
+ * @{
+ */
+
+/**
+ * Initialize an exception structure. This can be called several times to
+ * reuse an exception structure.
+ *
+ * \param p_exception the exception to initialize
+ */
+VLC_PUBLIC_API void libvlc_exception_init( libvlc_exception_t *p_exception );
+
+/**
+ * Has an exception been raised?
+ *
+ * \param p_exception the exception to query
+ * \return 0 if the exception was raised, 1 otherwise
+ */
+VLC_PUBLIC_API int
+libvlc_exception_raised( const libvlc_exception_t *p_exception );
+
+/**
+ * Raise an exception using a user-provided message.
+ *
+ * \param p_exception the exception to raise
+ * \param psz_format the exception message format string
+ * \param ... the format string arguments
+ */
+VLC_PUBLIC_API void
+libvlc_exception_raise( libvlc_exception_t *p_exception,
+ const char *psz_format, ... );
+
+/**
+ * Clear an exception object so it can be reused.
+ * The exception object must have be initialized.
+ *
+ * \param p_exception the exception to clear
+ */
+VLC_PUBLIC_API void libvlc_exception_clear( libvlc_exception_t * );
+
+/**
+ * Get an exception's message.
+ *
+ * \param p_exception the exception to query
+ * \return the exception message or NULL if not applicable (exception not
+ * raised, for example)
+ */
+VLC_PUBLIC_API const char *
+libvlc_exception_get_message( const libvlc_exception_t *p_exception );
+
+/**@} */
+
+/*****************************************************************************
+ * Core handling
+ *****************************************************************************/
+
+/** \defgroup libvlc_core libvlc_core
+ * \ingroup libvlc
+ * LibVLC Core
+ * @{
+ */
+
+/**
+ * Create and initialize a libvlc instance.
+ *
+ * \param argc the number of arguments
+ * \param argv command-line-type arguments. argv[0] must be the path of the
+ * calling program.
+ * \param p_e an initialized exception pointer
+ * \return the libvlc instance
+ */
+VLC_PUBLIC_API libvlc_instance_t *
+libvlc_new( int , const char *const *, libvlc_exception_t *);
+
+/**
+ * Return a libvlc instance identifier for legacy APIs. Use of this
+ * function is discouraged, you should convert your program to use the
+ * new API.
+ *
+ * \param p_instance the instance
+ * \return the instance identifier
+ */
+VLC_PUBLIC_API int libvlc_get_vlc_id( libvlc_instance_t *p_instance );
+
+/**
+ * Decrement the reference count of a libvlc instance, and destroy it
+ * if it reaches zero.
+ *
+ * \param p_instance the instance to destroy
+ */
+VLC_PUBLIC_API void libvlc_release( libvlc_instance_t * );
+
+/**
+ * Increments the reference count of a libvlc instance.
+ * The initial reference count is 1 after libvlc_new() returns.
+ *
+ * \param p_instance the instance to reference
+ */
+VLC_PUBLIC_API void libvlc_retain( libvlc_instance_t * );
+
+/**
+ * Try to start a user interface for the libvlc instance.
+ *
+ * \param p_instance the instance
+ * \param name interface name, or NULL for default
+ * \param p_exception an initialized exception pointer
+ */
+VLC_PUBLIC_API
+void libvlc_add_intf( libvlc_instance_t *p_instance, const char *name,
+ libvlc_exception_t *p_exception );
+
+/**
+ * Waits until an interface causes the instance to exit.
+ * You should start at least one interface first, using libvlc_add_intf().
+ *
+ * \param p_instance the instance
+ */
+VLC_PUBLIC_API
+void libvlc_wait( libvlc_instance_t *p_instance );
+
+/**
+ * Retrieve libvlc version.
+ *
+ * Example: "0.9.0-git Grishenko"
+ *
+ * \return a string containing the libvlc version
+ */
+VLC_PUBLIC_API const char * libvlc_get_version(void);
+
+/**
+ * Retrieve libvlc compiler version.
+ *
+ * Example: "gcc version 4.2.3 (Ubuntu 4.2.3-2ubuntu6)"
+ *
+ * \return a string containing the libvlc compiler version
+ */
+VLC_PUBLIC_API const char * libvlc_get_compiler(void);
+
+/**
+ * Retrieve libvlc changeset.
+ *
+ * Example: "aa9bce0bc4"
+ *
+ * \return a string containing the libvlc changeset
+ */
+VLC_PUBLIC_API const char * libvlc_get_changeset(void);
+
+struct vlc_object_t;
+
+/**
+ * Return the libvlc internal object, the main object that all other depend on.
+ * Any of of this function should be considered an ugly hack and avoided at all
+ * cost. E.g. you need to expose some functionality that is not provided by the
+ * libvlc API directly with libvlccore.
+ * Remember to release the object with vlc_object_release( obj* )
+ *
+ * \param p_instance the libvlc instance
+ */
+VLC_PUBLIC_API struct vlc_object_t *libvlc_get_vlc_instance(libvlc_instance_t *);
+
+/**
+ * Frees an heap allocation (char *) returned by a LibVLC API.
+ * If you know you're using the same underlying C run-time as the LibVLC
+ * implementation, then you can call ANSI C free() directly instead.
+ */
+VLC_PUBLIC_API void libvlc_free( void *ptr );
+
+/** @}*/
+
+/*****************************************************************************
+ * Event handling
+ *****************************************************************************/
+
+/** \defgroup libvlc_event libvlc_event
+ * \ingroup libvlc_core
+ * LibVLC Events
+ * @{
+ */
+
+/**
+ * Event manager that belongs to a libvlc object, and from whom events can
+ * be received.
+ */
+
+typedef struct libvlc_event_manager_t libvlc_event_manager_t;
+typedef struct libvlc_event_t libvlc_event_t;
+typedef uint32_t libvlc_event_type_t;
+
+/**
+ * Callback function notification
+ * \param p_event the event triggering the callback
+ */
+
+typedef void ( *libvlc_callback_t )( const libvlc_event_t *, void * );
+
+/**
+ * Register for an event notification.
+ *
+ * \param p_event_manager the event manager to which you want to attach to.
+ * Generally it is obtained by vlc_my_object_event_manager() where
+ * my_object is the object you want to listen to.
+ * \param i_event_type the desired event to which we want to listen
+ * \param f_callback the function to call when i_event_type occurs
+ * \param user_data user provided data to carry with the event
+ * \param p_e an initialized exception pointer
+ */
+VLC_PUBLIC_API void libvlc_event_attach( libvlc_event_manager_t *p_event_manager,
+ libvlc_event_type_t i_event_type,
+ libvlc_callback_t f_callback,
+ void *user_data,
+ libvlc_exception_t *p_e );
+
+/**
+ * Unregister an event notification.
+ *
+ * \param p_event_manager the event manager
+ * \param i_event_type the desired event to which we want to unregister
+ * \param f_callback the function to call when i_event_type occurs
+ * \param p_user_data user provided data to carry with the event
+ * \param p_e an initialized exception pointer
+ */
+VLC_PUBLIC_API void libvlc_event_detach( libvlc_event_manager_t *p_event_manager,
+ libvlc_event_type_t i_event_type,
+ libvlc_callback_t f_callback,
+ void *p_user_data,
+ libvlc_exception_t *p_e );
+
+/**
+ * Get an event's type name.
+ *
+ * \param i_event_type the desired event
+ */
+VLC_PUBLIC_API const char * libvlc_event_type_name( libvlc_event_type_t event_type );
+
+/** @} */
+
+/*****************************************************************************
+ * Message log handling
+ *****************************************************************************/
+
+/** \defgroup libvlc_log libvlc_log
+ * \ingroup libvlc_core
+ * LibVLC Message Logging
+ * @{
+ */
+
+/**
+ * Return the VLC messaging verbosity level.
+ *
+ * \param p_instance libvlc instance
+ * \param p_e an initialized exception pointer
+ * \return verbosity level for messages
+ */
+VLC_PUBLIC_API unsigned libvlc_get_log_verbosity( const libvlc_instance_t *p_instance,
+ libvlc_exception_t *p_e );
+
+/**
+ * Set the VLC messaging verbosity level.
+ *
+ * \param p_instance libvlc log instance
+ * \param level log level
+ * \param p_e an initialized exception pointer
+ */
+VLC_PUBLIC_API void libvlc_set_log_verbosity( libvlc_instance_t *p_instance, unsigned level,
+ libvlc_exception_t *p_e );
+
+/**
+ * Open a VLC message log instance.
+ *
+ * \param p_instance libvlc instance
+ * \param p_e an initialized exception pointer
+ * \return log message instance
+ */
+VLC_PUBLIC_API libvlc_log_t *libvlc_log_open( libvlc_instance_t *, libvlc_exception_t *);
+
+/**
+ * Close a VLC message log instance.
+ *
+ * \param p_log libvlc log instance
+ * \param p_e an initialized exception pointer
+ */
+VLC_PUBLIC_API void libvlc_log_close( libvlc_log_t *, libvlc_exception_t *);
+
+/**
+ * Returns the number of messages in a log instance.
+ *
+ * \param p_log libvlc log instance
+ * \param p_e an initialized exception pointer
+ * \return number of log messages
+ */
+VLC_PUBLIC_API unsigned libvlc_log_count( const libvlc_log_t *, libvlc_exception_t *);
+
+/**
+ * Clear a log instance.
+ *
+ * All messages in the log are removed. The log should be cleared on a
+ * regular basis to avoid clogging.
+ *
+ * \param p_log libvlc log instance
+ * \param p_e an initialized exception pointer
+ */
+VLC_PUBLIC_API void libvlc_log_clear( libvlc_log_t *, libvlc_exception_t *);
+
+/**
+ * Allocate and returns a new iterator to messages in log.
+ *
+ * \param p_log libvlc log instance
+ * \param p_e an initialized exception pointer
+ * \return log iterator object
+ */
+VLC_PUBLIC_API libvlc_log_iterator_t *libvlc_log_get_iterator( const libvlc_log_t *, libvlc_exception_t *);
+
+/**
+ * Release a previoulsy allocated iterator.
+ *
+ * \param p_iter libvlc log iterator
+ * \param p_e an initialized exception pointer
+ */
+VLC_PUBLIC_API void libvlc_log_iterator_free( libvlc_log_iterator_t *p_iter, libvlc_exception_t *p_e );
+
+/**
+ * Return whether log iterator has more messages.
+ *
+ * \param p_iter libvlc log iterator
+ * \param p_e an initialized exception pointer
+ * \return true if iterator has more message objects, else false
+ */
+VLC_PUBLIC_API int libvlc_log_iterator_has_next( const libvlc_log_iterator_t *p_iter, libvlc_exception_t *p_e );
+
+/**
+ * Return the next log message.
+ *
+ * The message contents must not be freed
+ *
+ * \param p_iter libvlc log iterator
+ * \param p_buffer log buffer
+ * \param p_e an initialized exception pointer
+ * \return log message object
+ */
+VLC_PUBLIC_API libvlc_log_message_t *libvlc_log_iterator_next( libvlc_log_iterator_t *p_iter,
+ libvlc_log_message_t *p_buffer,
+ libvlc_exception_t *p_e );
+
+/** @} */
+
+# ifdef __cplusplus
+}
+# endif
+
+#endif /* <vlc/libvlc.h> */
diff --git a/win32/vlc/.svn/text-base/libvlc_events.h.svn-base b/win32/vlc/.svn/text-base/libvlc_events.h.svn-base
new file mode 100644
index 0000000..d4ae67b
--- /dev/null
+++ b/win32/vlc/.svn/text-base/libvlc_events.h.svn-base
@@ -0,0 +1,219 @@
+/*****************************************************************************
+ * libvlc_events.h: libvlc_events external API structure
+ *****************************************************************************
+ * Copyright (C) 1998-2008 the VideoLAN team
+ * $Id $
+ *
+ * Authors: Filippo Carone <littlejohn@videolan.org>
+ * Pierre d'Herbemont <pdherbemont@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
+ * (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.
+ *
+ * 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.
+ *****************************************************************************/
+
+#ifndef LIBVLC_EVENTS_H
+#define LIBVLC_EVENTS_H 1
+
+/**
+ * \file
+ * This file defines libvlc_event external API
+ */
+
+# ifdef __cplusplus
+extern "C" {
+# endif
+
+/*****************************************************************************
+ * Events handling
+ *****************************************************************************/
+
+/** \defgroup libvlc_event libvlc_event
+ * \ingroup libvlc_core
+ * LibVLC Available Events
+ * @{
+ */
+
+#ifdef __cplusplus
+enum libvlc_event_type_e {
+#else
+enum libvlc_event_type_t {
+#endif
+ /* Append new event types at the end.
+ * Do not remove, insert or re-order any entry. */
+ libvlc_MediaMetaChanged,
+ libvlc_MediaSubItemAdded,
+ libvlc_MediaDurationChanged,
+ libvlc_MediaPreparsedChanged,
+ libvlc_MediaFreed,
+ libvlc_MediaStateChanged,
+
+ libvlc_MediaPlayerNothingSpecial,
+ libvlc_MediaPlayerOpening,
+ libvlc_MediaPlayerBuffering,
+ libvlc_MediaPlayerPlaying,
+ libvlc_MediaPlayerPaused,
+ libvlc_MediaPlayerStopped,
+ libvlc_MediaPlayerForward,
+ libvlc_MediaPlayerBackward,
+ libvlc_MediaPlayerEndReached,
+ libvlc_MediaPlayerEncounteredError,
+ libvlc_MediaPlayerTimeChanged,
+ libvlc_MediaPlayerPositionChanged,
+ libvlc_MediaPlayerSeekableChanged,
+ libvlc_MediaPlayerPausableChanged,
+
+ libvlc_MediaListItemAdded,
+ libvlc_MediaListWillAddItem,
+ libvlc_MediaListItemDeleted,
+ libvlc_MediaListWillDeleteItem,
+
+ libvlc_MediaListViewItemAdded,
+ libvlc_MediaListViewWillAddItem,
+ libvlc_MediaListViewItemDeleted,
+ libvlc_MediaListViewWillDeleteItem,
+
+ libvlc_MediaListPlayerPlayed,
+ libvlc_MediaListPlayerNextItemSet,
+ libvlc_MediaListPlayerStopped,
+
+ libvlc_MediaDiscovererStarted,
+ libvlc_MediaDiscovererEnded,
+
+ libvlc_MediaPlayerTitleChanged,
+ libvlc_MediaPlayerSnapshotTaken,
+ /* New event types HERE */
+};
+
+/**
+ * An Event
+ * \param type the even type
+ * \param p_obj the sender object
+ * \param u Event dependent content
+ */
+
+struct libvlc_event_t
+{
+ libvlc_event_type_t type;
+ void * p_obj;
+ union event_type_specific
+ {
+ /* media descriptor */
+ struct
+ {
+ libvlc_meta_t meta_type;
+ } media_meta_changed;
+ struct
+ {
+ libvlc_media_t * new_child;
+ } media_subitem_added;
+ struct
+ {
+ int64_t new_duration;
+ } media_duration_changed;
+ struct
+ {
+ int new_status;
+ } media_preparsed_changed;
+ struct
+ {
+ libvlc_media_t * md;
+ } media_freed;
+ struct
+ {
+ libvlc_state_t new_state;
+ } media_state_changed;
+
+ /* media instance */
+ struct
+ {
+ float new_position;
+ } media_player_position_changed;
+ struct
+ {
+ libvlc_time_t new_time;
+ } media_player_time_changed;
+ struct
+ {
+ int new_title;
+ } media_player_title_changed;
+ struct
+ {
+ uint64_t new_seekable; /* FIXME: that's a boolean! */
+ } media_player_seekable_changed;
+ struct
+ {
+ uint64_t new_pausable; /* FIXME: that's a BOOL!!! */
+ } media_player_pausable_changed;
+
+ /* media list */
+ struct
+ {
+ libvlc_media_t * item;
+ int index;
+ } media_list_item_added;
+ struct
+ {
+ libvlc_media_t * item;
+ int index;
+ } media_list_will_add_item;
+ struct
+ {
+ libvlc_media_t * item;
+ int index;
+ } media_list_item_deleted;
+ struct
+ {
+ libvlc_media_t * item;
+ int index;
+ } media_list_will_delete_item;
+
+ /* media list view */
+ struct
+ {
+ libvlc_media_t * item;
+ int index;
+ } media_list_view_item_added;
+ struct
+ {
+ libvlc_media_t * item;
+ int index;
+ } media_list_view_will_add_item;
+ struct
+ {
+ libvlc_media_t * item;
+ int index;
+ } media_list_view_item_deleted;
+ struct
+ {
+ libvlc_media_t * item;
+ int index;
+ } media_list_view_will_delete_item;
+
+ /* snapshot taken */
+ struct
+ {
+ char* psz_filename ;
+ } media_player_snapshot_taken ;
+
+ } u;
+};
+
+
+/**@} */
+
+# ifdef __cplusplus
+}
+# endif
+
+#endif /* _LIBVLC_EVENTS_H */
diff --git a/win32/vlc/.svn/text-base/libvlc_media.h.svn-base b/win32/vlc/.svn/text-base/libvlc_media.h.svn-base
new file mode 100644
index 0000000..553b32c
--- /dev/null
+++ b/win32/vlc/.svn/text-base/libvlc_media.h.svn-base
@@ -0,0 +1,307 @@
+/*****************************************************************************
+ * libvlc.h: libvlc external API
+ *****************************************************************************
+ * Copyright (C) 1998-2009 the VideoLAN team
+ * $Id: e9156223f97c813be0a28879517e0fad856f5e97 $
+ *
+ * Authors: Clément Stenac <zorglub@videolan.org>
+ * Jean-Paul Saman <jpsaman@videolan.org>
+ * Pierre d'Herbemont <pdherbemont@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
+ * (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.
+ *
+ * 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.
+ *****************************************************************************/
+
+/**
+ * \file
+ * This file defines libvlc_media external API
+ */
+
+#ifndef VLC_LIBVLC_MEDIA_H
+#define VLC_LIBVLC_MEDIA_H 1
+
+/*****************************************************************************
+ * media
+ *****************************************************************************/
+/** \defgroup libvlc_media libvlc_media
+ * \ingroup libvlc
+ * LibVLC Media
+ * @{
+ */
+
+typedef struct libvlc_media_t libvlc_media_t;
+
+/* Meta Handling */
+/** defgroup libvlc_meta libvlc_meta
+ * \ingroup libvlc_media
+ * LibVLC Media Meta
+ * @{
+ */
+
+typedef enum libvlc_meta_t {
+ libvlc_meta_Title,
+ libvlc_meta_Artist,
+ libvlc_meta_Genre,
+ libvlc_meta_Copyright,
+ libvlc_meta_Album,
+ libvlc_meta_TrackNumber,
+ libvlc_meta_Description,
+ libvlc_meta_Rating,
+ libvlc_meta_Date,
+ libvlc_meta_Setting,
+ libvlc_meta_URL,
+ libvlc_meta_Language,
+ libvlc_meta_NowPlaying,
+ libvlc_meta_Publisher,
+ libvlc_meta_EncodedBy,
+ libvlc_meta_ArtworkURL,
+ libvlc_meta_TrackID,
+ /* Add new meta types HERE */
+} libvlc_meta_t;
+
+/** @}*/
+
+/**
+ * Note the order of libvlc_state_t enum must match exactly the order of
+ * @see mediacontrol_PlayerStatus, @see input_state_e enums,
+ * and VideoLAN.LibVLC.State (at bindings/cil/src/media.cs).
+ *
+ * Expected states by web plugins are:
+ * IDLE/CLOSE=0, OPENING=1, BUFFERING=2, PLAYING=3, PAUSED=4,
+ * STOPPING=5, ENDED=6, ERROR=7
+ */
+typedef enum libvlc_state_t
+{
+ libvlc_NothingSpecial=0,
+ libvlc_Opening,
+ libvlc_Buffering,
+ libvlc_Playing,
+ libvlc_Paused,
+ libvlc_Stopped,
+ libvlc_Ended,
+ libvlc_Error
+} libvlc_state_t;
+
+/**
+ * Create a media with the given MRL.
+ *
+ * \param p_instance the instance
+ * \param psz_mrl the MRL to read
+ * \param p_e an initialized exception pointer
+ * \return the newly created media
+ */
+VLC_PUBLIC_API libvlc_media_t * libvlc_media_new(
+ libvlc_instance_t *p_instance,
+ const char * psz_mrl,
+ libvlc_exception_t *p_e );
+
+/**
+ * Create a media as an empty node with the passed name.
+ *
+ * \param p_instance the instance
+ * \param psz_name the name of the node
+ * \param p_e an initialized exception pointer
+ * \return the new empty media
+ */
+VLC_PUBLIC_API libvlc_media_t * libvlc_media_new_as_node(
+ libvlc_instance_t *p_instance,
+ const char * psz_name,
+ libvlc_exception_t *p_e );
+
+/**
+ * Add an option to the media.
+ *
+ * This option will be used to determine how the media_player will
+ * read the media. This allows to use VLC's advanced
+ * reading/streaming options on a per-media basis.
+ *
+ * The options are detailed in vlc --long-help, for instance "--sout-all"
+ *
+ * \param p_instance the instance
+ * \param ppsz_options the options (as a string)
+ * \param p_e an initialized exception pointer
+ */
+VLC_PUBLIC_API void libvlc_media_add_option(
+ libvlc_media_t * p_md,
+ const char * ppsz_options,
+ libvlc_exception_t * p_e );
+/**
+ * Add an option to the media from an untrusted source.
+ *
+ * This option will be used to determine how the media_player will
+ * read the media. This allows to use VLC's advanced
+ * reading/streaming options on a per-media basis.
+ *
+ * The options are detailed in vlc --long-help, for instance "--sout-all"
+ *
+ * \param p_instance the instance
+ * \param ppsz_options the options (as a string)
+ * \param p_e an initialized exception pointer
+ */
+VLC_PUBLIC_API void libvlc_media_add_option_untrusted(
+ libvlc_media_t * p_md,
+ const char * ppsz_options,
+ libvlc_exception_t * p_e );
+
+
+/**
+ * Retain a reference to a media descriptor object (libvlc_media_t). Use
+ * libvlc_media_release() to decrement the reference count of a
+ * media descriptor object.
+ *
+ * \param p_meta_desc a media descriptor object.
+ */
+VLC_PUBLIC_API void libvlc_media_retain(
+ libvlc_media_t *p_meta_desc );
+
+/**
+ * Decrement the reference count of a media descriptor object. If the
+ * reference count is 0, then libvlc_media_release() will release the
+ * media descriptor object. It will send out an libvlc_MediaFreed event
+ * to all listeners. If the media descriptor object has been released it
+ * should not be used again.
+ *
+ * \param p_meta_desc a media descriptor object.
+ */
+VLC_PUBLIC_API void libvlc_media_release(
+ libvlc_media_t *p_meta_desc );
+
+
+/**
+ * Get the media resource locator (mrl) from a media descriptor object
+ *
+ * \param p_md a media descriptor object
+ * \param p_e an initialized exception object
+ * \return string with mrl of media descriptor object
+ */
+VLC_PUBLIC_API char * libvlc_media_get_mrl( libvlc_media_t * p_md,
+ libvlc_exception_t * p_e );
+
+/**
+ * Duplicate a media descriptor object.
+ *
+ * \param p_meta_desc a media descriptor object.
+ */
+VLC_PUBLIC_API libvlc_media_t * libvlc_media_duplicate( libvlc_media_t * );
+
+/**
+ * Read the meta of the media.
+ *
+ * \param p_meta_desc the media to read
+ * \param e_meta the meta to read
+ * \param p_e an initialized exception pointer
+ * \return the media's meta
+ */
+VLC_PUBLIC_API char * libvlc_media_get_meta(
+ libvlc_media_t *p_meta_desc,
+ libvlc_meta_t e_meta,
+ libvlc_exception_t *p_e );
+/**
+ * Get current state of media descriptor object. Possible media states
+ * are defined in libvlc_structures.c ( libvlc_NothingSpecial=0,
+ * libvlc_Opening, libvlc_Buffering, libvlc_Playing, libvlc_Paused,
+ * libvlc_Stopped, libvlc_Ended,
+ * libvlc_Error).
+ *
+ * @see libvlc_state_t
+ * \param p_meta_desc a media descriptor object
+ * \param p_e an initialized exception object
+ * \return state of media descriptor object
+ */
+VLC_PUBLIC_API libvlc_state_t libvlc_media_get_state(
+ libvlc_media_t *p_meta_desc,
+ libvlc_exception_t *p_e );
+
+
+/**
+ * Get subitems of media descriptor object. This will increment
+ * the reference count of supplied media descriptor object. Use
+ * libvlc_media_list_release() to decrement the reference counting.
+ *
+ * \param p_md media descriptor object
+ * \param p_e initalized exception object
+ * \return list of media descriptor subitems or NULL
+ */
+
+/* This method uses libvlc_media_list_t, however, media_list usage is optionnal
+ * and this is here for convenience */
+#define VLC_FORWARD_DECLARE_OBJECT(a) struct a
+
+VLC_PUBLIC_API VLC_FORWARD_DECLARE_OBJECT(libvlc_media_list_t *)
+libvlc_media_subitems( libvlc_media_t *p_md,
+ libvlc_exception_t *p_e );
+
+/**
+ * Get event manager from media descriptor object.
+ * NOTE: this function doesn't increment reference counting.
+ *
+ * \param p_md a media descriptor object
+ * \param p_e an initialized exception object
+ * \return event manager object
+ */
+VLC_PUBLIC_API libvlc_event_manager_t *
+ libvlc_media_event_manager( libvlc_media_t * p_md,
+ libvlc_exception_t * p_e );
+
+/**
+ * Get duration of media descriptor object item.
+ *
+ * \param p_md media descriptor object
+ * \param p_e an initialized exception object
+ * \return duration of media item
+ */
+VLC_PUBLIC_API libvlc_time_t
+ libvlc_media_get_duration( libvlc_media_t * p_md,
+ libvlc_exception_t * p_e );
+
+/**
+ * Get preparsed status for media descriptor object.
+ *
+ * \param p_md media descriptor object
+ * \param p_e an initialized exception object
+ * \return true if media object has been preparsed otherwise it returns false
+ */
+VLC_PUBLIC_API int
+ libvlc_media_is_preparsed( libvlc_media_t * p_md,
+ libvlc_exception_t * p_e );
+
+/**
+ * Sets media descriptor's user_data. user_data is specialized data
+ * accessed by the host application, VLC.framework uses it as a pointer to
+ * an native object that references a libvlc_media_t pointer
+ *
+ * \param p_md media descriptor object
+ * \param p_new_user_data pointer to user data
+ * \param p_e an initialized exception object
+ */
+VLC_PUBLIC_API void
+ libvlc_media_set_user_data( libvlc_media_t * p_md,
+ void * p_new_user_data,
+ libvlc_exception_t * p_e);
+
+/**
+ * Get media descriptor's user_data. user_data is specialized data
+ * accessed by the host application, VLC.framework uses it as a pointer to
+ * an native object that references a libvlc_media_t pointer
+ *
+ * \param p_md media descriptor object
+ * \param p_e an initialized exception object
+ */
+VLC_PUBLIC_API void *
+ libvlc_media_get_user_data( libvlc_media_t * p_md,
+ libvlc_exception_t * p_e);
+
+/** @}*/
+
+#endif /* VLC_LIBVLC_MEDIA_H */
diff --git a/win32/vlc/.svn/text-base/libvlc_media_discoverer.h.svn-base b/win32/vlc/.svn/text-base/libvlc_media_discoverer.h.svn-base
new file mode 100644
index 0000000..669aafc
--- /dev/null
+++ b/win32/vlc/.svn/text-base/libvlc_media_discoverer.h.svn-base
@@ -0,0 +1,102 @@
+/*****************************************************************************
+ * libvlc.h: libvlc external API
+ *****************************************************************************
+ * Copyright (C) 1998-2009 the VideoLAN team
+ * $Id: dabf51a3bb1f2075e0a799a53a588fc58b6405fb $
+ *
+ * Authors: Clément Stenac <zorglub@videolan.org>
+ * Jean-Paul Saman <jpsaman@videolan.org>
+ * Pierre d'Herbemont <pdherbemont@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
+ * (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.
+ *
+ * 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.
+ *****************************************************************************/
+
+/**
+ * \file
+ * This file defines libvlc_media_discoverer external API
+ */
+
+#ifndef VLC_LIBVLC_MEDIA_DISCOVERER_H
+#define VLC_LIBVLC_MEDIA_DISCOVERER_H 1
+
+/*****************************************************************************
+ * Services/Media Discovery
+ *****************************************************************************/
+/** \defgroup libvlc_media_discoverer libvlc_media_discoverer
+ * \ingroup libvlc
+ * LibVLC Media Discoverer
+ * @{
+ */
+
+typedef struct libvlc_media_discoverer_t libvlc_media_discoverer_t;
+
+/**
+ * Discover media service by name.
+ *
+ * \param p_inst libvlc instance
+ * \param psz_name service name
+ * \param p_e an initialized exception object
+ * \return media discover object
+ */
+VLC_PUBLIC_API libvlc_media_discoverer_t *
+libvlc_media_discoverer_new_from_name( libvlc_instance_t * p_inst,
+ const char * psz_name,
+ libvlc_exception_t * p_e );
+
+/**
+ * Release media discover object. If the reference count reaches 0, then
+ * the object will be released.
+ *
+ * \param p_mdis media service discover object
+ */
+VLC_PUBLIC_API void libvlc_media_discoverer_release( libvlc_media_discoverer_t * p_mdis );
+
+/**
+ * Get media service discover object its localized name.
+ *
+ * \param media discover object
+ * \return localized name
+ */
+VLC_PUBLIC_API char * libvlc_media_discoverer_localized_name( libvlc_media_discoverer_t * p_mdis );
+
+/**
+ * Get media service discover media list.
+ *
+ * \param p_mdis media service discover object
+ * \return list of media items
+ */
+VLC_PUBLIC_API libvlc_media_list_t * libvlc_media_discoverer_media_list( libvlc_media_discoverer_t * p_mdis );
+
+/**
+ * Get event manager from media service discover object.
+ *
+ * \param p_mdis media service discover object
+ * \return event manager object.
+ */
+VLC_PUBLIC_API libvlc_event_manager_t *
+ libvlc_media_discoverer_event_manager( libvlc_media_discoverer_t * p_mdis );
+
+/**
+ * Query if media service discover object is running.
+ *
+ * \param p_mdis media service discover object
+ * \return true if running, false if not
+ */
+VLC_PUBLIC_API int
+ libvlc_media_discoverer_is_running( libvlc_media_discoverer_t * p_mdis );
+
+/**@} */
+
+#endif /* <vlc/libvlc.h> */
diff --git a/win32/vlc/.svn/text-base/libvlc_media_library.h.svn-base b/win32/vlc/.svn/text-base/libvlc_media_library.h.svn-base
new file mode 100644
index 0000000..b59e203
--- /dev/null
+++ b/win32/vlc/.svn/text-base/libvlc_media_library.h.svn-base
@@ -0,0 +1,103 @@
+/*****************************************************************************
+ * libvlc.h: libvlc external API
+ *****************************************************************************
+ * Copyright (C) 1998-2009 the VideoLAN team
+ * $Id: d2192bc788e8bce7b33a2f1f05826b5e95d21676 $
+ *
+ * Authors: Clément Stenac <zorglub@videolan.org>
+ * Jean-Paul Saman <jpsaman@videolan.org>
+ * Pierre d'Herbemont <pdherbemont@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
+ * (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.
+ *
+ * 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.
+ *****************************************************************************/
+
+/**
+ * \file
+ * This file defines libvlc_media_library external API
+ */
+
+#ifndef VLC_LIBVLC_MEDIA_LIBRARY_H
+#define VLC_LIBVLC_MEDIA_LIBRARY_H 1
+
+/*****************************************************************************
+ * Media Library
+ *****************************************************************************/
+/** \defgroup libvlc_media_library libvlc_media_library
+ * \ingroup libvlc
+ * LibVLC Media Library
+ * @{
+ */
+
+typedef struct libvlc_media_library_t libvlc_media_library_t;
+
+VLC_PUBLIC_API libvlc_media_library_t *
+ libvlc_media_library_new( libvlc_instance_t * p_inst,
+ libvlc_exception_t * p_e );
+
+/**
+ * Release media library object. This functions decrements the
+ * reference count of the media library object. If it reaches 0,
+ * then the object will be released.
+ *
+ * \param p_mlib media library object
+ */
+VLC_PUBLIC_API void
+ libvlc_media_library_release( libvlc_media_library_t * p_mlib );
+
+/**
+ * Retain a reference to a media library object. This function will
+ * increment the reference counting for this object. Use
+ * libvlc_media_library_release() to decrement the reference count.
+ *
+ * \param p_mlib media library object
+ */
+VLC_PUBLIC_API void
+ libvlc_media_library_retain( libvlc_media_library_t * p_mlib );
+
+/**
+ * Load media library.
+ *
+ * \param p_mlib media library object
+ * \param p_e an initialized exception object.
+ */
+VLC_PUBLIC_API void
+ libvlc_media_library_load( libvlc_media_library_t * p_mlib,
+ libvlc_exception_t * p_e );
+
+/**
+ * Save media library.
+ *
+ * \param p_mlib media library object
+ * \param p_e an initialized exception object.
+ */
+VLC_PUBLIC_API void
+ libvlc_media_library_save( libvlc_media_library_t * p_mlib,
+ libvlc_exception_t * p_e );
+
+/**
+ * Get media library subitems.
+ *
+ * \param p_mlib media library object
+ * \param p_e an initialized exception object.
+ * \return media list subitems
+ */
+VLC_PUBLIC_API libvlc_media_list_t *
+ libvlc_media_library_media_list( libvlc_media_library_t * p_mlib,
+ libvlc_exception_t * p_e );
+
+
+/** @} */
+
+#endif /* VLC_LIBVLC_MEDIA_LIBRARY_H */
diff --git a/win32/vlc/.svn/text-base/libvlc_media_list.h.svn-base b/win32/vlc/.svn/text-base/libvlc_media_list.h.svn-base
new file mode 100644
index 0000000..3de1359
--- /dev/null
+++ b/win32/vlc/.svn/text-base/libvlc_media_list.h.svn-base
@@ -0,0 +1,254 @@
+/*****************************************************************************
+ * libvlc_media_list.h: libvlc_media_list API
+ *****************************************************************************
+ * Copyright (C) 1998-2008 the VideoLAN team
+ * $Id: b9cc188e1e627e9cee7fd0fe708487b7220254a7 $
+ *
+ * Authors: Pierre d'Herbemont
+ *
+ * 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
+ * (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.
+ *
+ * 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.
+ *****************************************************************************/
+
+#ifndef LIBVLC_MEDIA_LIST_H
+#define LIBVLC_MEDIA_LIST_H 1
+
+/**
+ * \file
+ * This file defines libvlc_media_list API
+ */
+
+# ifdef __cplusplus
+extern "C" {
+# endif
+
+/*****************************************************************************
+ * Media List
+ *****************************************************************************/
+/** \defgroup libvlc_media_list libvlc_media_list
+ * \ingroup libvlc
+ * LibVLC Media List, a media list holds multiple media descriptors
+ * @{
+ */
+
+typedef struct libvlc_media_list_t libvlc_media_list_t;
+typedef struct libvlc_media_list_view_t libvlc_media_list_view_t;
+
+/**
+ * Create an empty media list.
+ *
+ * \param p_libvlc libvlc instance
+ * \param p_e an initialized exception pointer
+ * \return empty media list
+ */
+VLC_PUBLIC_API libvlc_media_list_t *
+ libvlc_media_list_new( libvlc_instance_t *, libvlc_exception_t * );
+
+/**
+ * Release media list created with libvlc_media_list_new().
+ *
+ * \param p_ml a media list created with libvlc_media_list_new()
+ */
+VLC_PUBLIC_API void
+ libvlc_media_list_release( libvlc_media_list_t * );
+
+/**
+ * Retain reference to a media list
+ *
+ * \param p_ml a media list created with libvlc_media_list_new()
+ */
+VLC_PUBLIC_API void
+ libvlc_media_list_retain( libvlc_media_list_t * );
+
+VLC_DEPRECATED_API void
+ libvlc_media_list_add_file_content( libvlc_media_list_t * p_mlist,
+ const char * psz_uri,
+ libvlc_exception_t * p_e );
+
+/**
+ * Associate media instance with this media list instance.
+ * If another media instance was present it will be released.
+ * The libvlc_media_list_lock should NOT be held upon entering this function.
+ *
+ * \param p_ml a media list instance
+ * \param p_mi media instance to add
+ * \param p_e initialized exception object
+ */
+VLC_PUBLIC_API void
+ libvlc_media_list_set_media( libvlc_media_list_t *,
+ libvlc_media_t *,
+ libvlc_exception_t *);
+
+/**
+ * Get media instance from this media list instance. This action will increase
+ * the refcount on the media instance.
+ * The libvlc_media_list_lock should NOT be held upon entering this function.
+ *
+ * \param p_ml a media list instance
+ * \param p_e initialized exception object
+ * \return media instance
+ */
+VLC_PUBLIC_API libvlc_media_t *
+ libvlc_media_list_media( libvlc_media_list_t *,
+ libvlc_exception_t *);
+
+/**
+ * Add media instance to media list
+ * The libvlc_media_list_lock should be held upon entering this function.
+ *
+ * \param p_ml a media list instance
+ * \param p_mi a media instance
+ * \param p_e initialized exception object
+ */
+VLC_PUBLIC_API void
+ libvlc_media_list_add_media( libvlc_media_list_t *,
+ libvlc_media_t *,
+ libvlc_exception_t * );
+
+/**
+ * Insert media instance in media list on a position
+ * The libvlc_media_list_lock should be held upon entering this function.
+ *
+ * \param p_ml a media list instance
+ * \param p_mi a media instance
+ * \param i_pos position in array where to insert
+ * \param p_e initialized exception object
+ */
+VLC_PUBLIC_API void
+ libvlc_media_list_insert_media( libvlc_media_list_t *,
+ libvlc_media_t *,
+ int,
+ libvlc_exception_t * );
+/**
+ * Remove media instance from media list on a position
+ * The libvlc_media_list_lock should be held upon entering this function.
+ *
+ * \param p_ml a media list instance
+ * \param i_pos position in array where to insert
+ * \param p_e initialized exception object
+ */
+VLC_PUBLIC_API void
+ libvlc_media_list_remove_index( libvlc_media_list_t *, int,
+ libvlc_exception_t * );
+
+/**
+ * Get count on media list items
+ * The libvlc_media_list_lock should be held upon entering this function.
+ *
+ * \param p_ml a media list instance
+ * \param p_e initialized exception object
+ * \return number of items in media list
+ */
+VLC_PUBLIC_API int
+ libvlc_media_list_count( libvlc_media_list_t * p_mlist,
+ libvlc_exception_t * p_e );
+
+/**
+ * List media instance in media list at a position
+ * The libvlc_media_list_lock should be held upon entering this function.
+ *
+ * \param p_ml a media list instance
+ * \param i_pos position in array where to insert
+ * \param p_e initialized exception object
+ * \return media instance at position i_pos and libvlc_media_retain() has been called to increase the refcount on this object.
+ */
+VLC_PUBLIC_API libvlc_media_t *
+ libvlc_media_list_item_at_index( libvlc_media_list_t *, int,
+ libvlc_exception_t * );
+/**
+ * Find index position of List media instance in media list.
+ * Warning: the function will return the first matched position.
+ * The libvlc_media_list_lock should be held upon entering this function.
+ *
+ * \param p_ml a media list instance
+ * \param p_mi media list instance
+ * \param p_e initialized exception object
+ * \return position of media instance
+ */
+VLC_PUBLIC_API int
+ libvlc_media_list_index_of_item( libvlc_media_list_t *,
+ libvlc_media_t *,
+ libvlc_exception_t * );
+
+/**
+ * This indicates if this media list is read-only from a user point of view
+ *
+ * \param p_ml media list instance
+ * \return 0 on readonly, 1 on readwrite
+ */
+VLC_PUBLIC_API int
+ libvlc_media_list_is_readonly( libvlc_media_list_t * p_mlist );
+
+/**
+ * Get lock on media list items
+ *
+ * \param p_ml a media list instance
+ */
+VLC_PUBLIC_API void
+ libvlc_media_list_lock( libvlc_media_list_t * );
+
+/**
+ * Release lock on media list items
+ * The libvlc_media_list_lock should be held upon entering this function.
+ *
+ * \param p_ml a media list instance
+ */
+VLC_PUBLIC_API void
+ libvlc_media_list_unlock( libvlc_media_list_t * );
+
+/**
+ * Get a flat media list view of media list items
+ *
+ * \param p_ml a media list instance
+ * \param p_ex an excpetion instance
+ * \return flat media list view instance
+ */
+VLC_PUBLIC_API libvlc_media_list_view_t *
+ libvlc_media_list_flat_view( libvlc_media_list_t *,
+ libvlc_exception_t * );
+
+/**
+ * Get a hierarchical media list view of media list items
+ *
+ * \param p_ml a media list instance
+ * \param p_ex an excpetion instance
+ * \return hierarchical media list view instance
+ */
+VLC_PUBLIC_API libvlc_media_list_view_t *
+ libvlc_media_list_hierarchical_view( libvlc_media_list_t *,
+ libvlc_exception_t * );
+
+VLC_PUBLIC_API libvlc_media_list_view_t *
+ libvlc_media_list_hierarchical_node_view( libvlc_media_list_t * p_ml,
+ libvlc_exception_t * p_ex);
+
+/**
+ * Get libvlc_event_manager from this media list instance.
+ * The p_event_manager is immutable, so you don't have to hold the lock
+ *
+ * \param p_ml a media list instance
+ * \param p_ex an excpetion instance
+ * \return libvlc_event_manager
+ */
+VLC_PUBLIC_API libvlc_event_manager_t *
+ libvlc_media_list_event_manager( libvlc_media_list_t *,
+ libvlc_exception_t * );
+
+/** @} media_list */
+
+# ifdef __cplusplus
+}
+# endif
+
+#endif /* _LIBVLC_MEDIA_LIST_H */
diff --git a/win32/vlc/.svn/text-base/libvlc_media_list_player.h.svn-base b/win32/vlc/.svn/text-base/libvlc_media_list_player.h.svn-base
new file mode 100644
index 0000000..b0e3080
--- /dev/null
+++ b/win32/vlc/.svn/text-base/libvlc_media_list_player.h.svn-base
@@ -0,0 +1,175 @@
+/*****************************************************************************
+ * libvlc_media_list.h: libvlc_media_list API
+ *****************************************************************************
+ * Copyright (C) 1998-2008 the VideoLAN team
+ * $Id: d2f21515cd2cce6f46075c396cf16bef35a66374 $
+ *
+ * Authors: Pierre d'Herbemont
+ *
+ * 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
+ * (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.
+ *
+ * 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.
+ *****************************************************************************/
+
+#ifndef LIBVLC_MEDIA_LIST_PLAYER_H
+#define LIBVLC_MEDIA_LIST_PLAYER_H 1
+
+/**
+ * \file
+ * This file defines libvlc_media_list_player API
+ */
+
+# ifdef __cplusplus
+extern "C" {
+# endif
+
+/*****************************************************************************
+ * Media List Player
+ *****************************************************************************/
+/** \defgroup libvlc_media_list_player libvlc_media_list_player
+ * \ingroup libvlc
+ * LibVLC Media List Player, play a media_list. You can see that as a media
+ * instance subclass
+ * @{
+ */
+
+typedef struct libvlc_media_list_player_t libvlc_media_list_player_t;
+
+/**
+ * Create new media_list_player.
+ *
+ * \param p_instance libvlc instance
+ * \param p_e initialized exception instance
+ * \return media list player instance
+ */
+VLC_PUBLIC_API libvlc_media_list_player_t *
+ libvlc_media_list_player_new( libvlc_instance_t * p_instance,
+ libvlc_exception_t * p_e );
+
+/**
+ * Release media_list_player.
+ *
+ * \param p_mlp media list player instance
+ */
+VLC_PUBLIC_API void
+ libvlc_media_list_player_release( libvlc_media_list_player_t * p_mlp );
+
+/**
+ * Replace media player in media_list_player with this instance.
+ *
+ * \param p_mlp media list player instance
+ * \param p_mi media player instance
+ * \param p_e initialized exception instance
+ */
+VLC_PUBLIC_API void
+ libvlc_media_list_player_set_media_player(
+ libvlc_media_list_player_t * p_mlp,
+ libvlc_media_player_t * p_mi,
+ libvlc_exception_t * p_e );
+
+VLC_PUBLIC_API void
+ libvlc_media_list_player_set_media_list(
+ libvlc_media_list_player_t * p_mlp,
+ libvlc_media_list_t * p_mlist,
+ libvlc_exception_t * p_e );
+
+/**
+ * Play media list
+ *
+ * \param p_mlp media list player instance
+ * \param p_e initialized exception instance
+ */
+VLC_PUBLIC_API void
+ libvlc_media_list_player_play( libvlc_media_list_player_t * p_mlp,
+ libvlc_exception_t * p_e );
+
+/**
+ * Pause media list
+ *
+ * \param p_mlp media list player instance
+ * \param p_e initialized exception instance
+ */
+VLC_PUBLIC_API void
+ libvlc_media_list_player_pause( libvlc_media_list_player_t * p_mlp,
+ libvlc_exception_t * p_e );
+
+/**
+ * Is media list playing?
+ *
+ * \param p_mlp media list player instance
+ * \param p_e initialized exception instance
+ * \return true for playing and false for not playing
+ */
+VLC_PUBLIC_API int
+ libvlc_media_list_player_is_playing( libvlc_media_list_player_t * p_mlp,
+ libvlc_exception_t * p_e );
+
+/**
+ * Get current libvlc_state of media list player
+ *
+ * \param p_mlp media list player instance
+ * \param p_e initialized exception instance
+ * \return libvlc_state_t for media list player
+ */
+VLC_PUBLIC_API libvlc_state_t
+ libvlc_media_list_player_get_state( libvlc_media_list_player_t * p_mlp,
+ libvlc_exception_t * p_e );
+
+/**
+ * Play media list item at position index
+ *
+ * \param p_mlp media list player instance
+ * \param i_index index in media list to play
+ * \param p_e initialized exception instance
+ */
+VLC_PUBLIC_API void
+ libvlc_media_list_player_play_item_at_index(
+ libvlc_media_list_player_t * p_mlp,
+ int i_index,
+ libvlc_exception_t * p_e );
+
+VLC_PUBLIC_API void
+ libvlc_media_list_player_play_item(
+ libvlc_media_list_player_t * p_mlp,
+ libvlc_media_t * p_md,
+ libvlc_exception_t * p_e );
+
+/**
+ * Stop playing media list
+ *
+ * \param p_mlp media list player instance
+ * \param p_e initialized exception instance
+ */
+VLC_PUBLIC_API void
+ libvlc_media_list_player_stop( libvlc_media_list_player_t * p_mlp,
+ libvlc_exception_t * p_e );
+
+/**
+ * Play next item from media list
+ *
+ * \param p_mlp media list player instance
+ * \param p_e initialized exception instance
+ */
+VLC_PUBLIC_API void
+ libvlc_media_list_player_next( libvlc_media_list_player_t * p_mlp,
+ libvlc_exception_t * p_e );
+
+/* NOTE: shouldn't there also be a libvlc_media_list_player_prev() */
+
+/** @} media_list_player */
+
+# ifdef __cplusplus
+}
+# endif
+
+#endif /* LIBVLC_MEDIA_LIST_PLAYER_H */
diff --git a/win32/vlc/.svn/text-base/libvlc_media_list_view.h.svn-base b/win32/vlc/.svn/text-base/libvlc_media_list_view.h.svn-base
new file mode 100644
index 0000000..50b1bb7
--- /dev/null
+++ b/win32/vlc/.svn/text-base/libvlc_media_list_view.h.svn-base
@@ -0,0 +1,160 @@
+/*****************************************************************************
+ * libvlc_media_list.h: libvlc_media_list API
+ *****************************************************************************
+ * Copyright (C) 1998-2008 the VideoLAN team
+ * $Id: 6834f4d309d167718b12f607362cefc0edd32238 $
+ *
+ * Authors: Pierre d'Herbemont
+ *
+ * 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
+ * (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.
+ *
+ * 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.
+ *****************************************************************************/
+
+#ifndef LIBVLC_MEDIA_LIST_VIEW_H
+#define LIBVLC_MEDIA_LIST_VIEW_H 1
+
+/**
+ * \file
+ * This file defines libvlc_media_list API
+ */
+
+# ifdef __cplusplus
+extern "C" {
+# endif
+
+/*****************************************************************************
+ * Media List View
+ *****************************************************************************/
+/** \defgroup libvlc_media_list_view libvlc_media_list_view
+ * \ingroup libvlc
+ * LibVLC Media List View, represent a media_list using a different layout
+ * @{ */
+
+/**
+ * Retain reference to a media list view
+ *
+ * \param p_mlv a media list view created with libvlc_media_list_view_new()
+ */
+VLC_PUBLIC_API void
+ libvlc_media_list_view_retain( libvlc_media_list_view_t * p_mlv );
+
+/**
+ * Release reference to a media list view. If the refcount reaches 0, then
+ * the object will be released.
+ *
+ * \param p_mlv a media list view created with libvlc_media_list_view_new()
+ */
+VLC_PUBLIC_API void
+ libvlc_media_list_view_release( libvlc_media_list_view_t * p_mlv );
+
+/**
+ * Get libvlc_event_manager from this media list view instance.
+ * The p_event_manager is immutable, so you don't have to hold the lock
+ *
+ * \param p_mlv a media list view instance
+ * \return libvlc_event_manager
+ */
+VLC_PUBLIC_API libvlc_event_manager_t *
+ libvlc_media_list_view_event_manager( libvlc_media_list_view_t * p_mlv );
+
+/**
+ * Get count on media list view items
+ *
+ * \param p_mlv a media list view instance
+ * \param p_e initialized exception object
+ * \return number of items in media list view
+ */
+VLC_PUBLIC_API int
+ libvlc_media_list_view_count( libvlc_media_list_view_t * p_mlv,
+ libvlc_exception_t * p_e );
+
+/**
+ * List media instance in media list view at an index position
+ *
+ * \param p_mlv a media list view instance
+ * \param i_index index position in array where to insert
+ * \param p_e initialized exception object
+ * \return media instance at position i_pos and libvlc_media_retain() has been called to increase the refcount on this object.
+ */
+VLC_PUBLIC_API libvlc_media_t *
+ libvlc_media_list_view_item_at_index( libvlc_media_list_view_t * p_mlv,
+ int i_index,
+ libvlc_exception_t * p_e );
+
+VLC_PUBLIC_API libvlc_media_list_view_t *
+ libvlc_media_list_view_children_at_index( libvlc_media_list_view_t * p_mlv,
+ int index,
+ libvlc_exception_t * p_e );
+
+VLC_PUBLIC_API libvlc_media_list_view_t *
+ libvlc_media_list_view_children_for_item( libvlc_media_list_view_t * p_mlv,
+ libvlc_media_t * p_md,
+ libvlc_exception_t * p_e );
+
+/**
+ * Get index position of media instance in media list view.
+ * The function will return the first occurence.
+ *
+ * \param p_mlv a media list view instance
+ * \param p_md media instance
+ * \param p_e initialized exception object
+ * \return index position in array of p_md
+ */
+VLC_PUBLIC_API int
+ libvlc_media_list_view_index_of_item( libvlc_media_list_view_t * p_mlv,
+ libvlc_media_t * p_md,
+ libvlc_exception_t * p_e );
+
+/**
+ * Insert media instance in media list view at index position
+ *
+ * \param p_mlv a media list view instance
+ * \param p_md media instance
+ * \param index position in array where to insert
+ * \param p_e initialized exception object
+ */
+VLC_PUBLIC_API void
+ libvlc_media_list_view_insert_at_index( libvlc_media_list_view_t * p_mlv,
+ libvlc_media_t * p_md,
+ int index,
+ libvlc_exception_t * p_e );
+
+/**
+ * Remove media instance in media list view from index position
+ *
+ * \param p_mlv a media list view instance
+ * \param index position in array of media instance to remove
+ * \param p_e initialized exception object
+ */
+VLC_PUBLIC_API void
+ libvlc_media_list_view_remove_at_index( libvlc_media_list_view_t * p_mlv,
+ int index,
+ libvlc_exception_t * p_e );
+
+VLC_PUBLIC_API void
+ libvlc_media_list_view_add_item( libvlc_media_list_view_t * p_mlv,
+ libvlc_media_t * p_md,
+ libvlc_exception_t * p_e );
+
+VLC_PUBLIC_API libvlc_media_list_t *
+ libvlc_media_list_view_parent_media_list( libvlc_media_list_view_t * p_mlv,
+ libvlc_exception_t * p_e );
+
+/** @} media_list_view */
+
+# ifdef __cplusplus
+}
+# endif
+
+#endif /* LIBVLC_MEDIA_LIST_VIEW_H */
diff --git a/win32/vlc/.svn/text-base/libvlc_media_player.h.svn-base b/win32/vlc/.svn/text-base/libvlc_media_player.h.svn-base
new file mode 100644
index 0000000..0d88b44
--- /dev/null
+++ b/win32/vlc/.svn/text-base/libvlc_media_player.h.svn-base
@@ -0,0 +1,971 @@
+/*****************************************************************************
+ * libvlc_media_player.h: libvlc_media_player external API
+ *****************************************************************************
+ * Copyright (C) 1998-2009 the VideoLAN team
+ * $Id: 30b2ddbbe373969b564789172ee8ae49ae0ba8a8 $
+ *
+ * Authors: Clément Stenac <zorglub@videolan.org>
+ * Jean-Paul Saman <jpsaman@videolan.org>
+ * Pierre d'Herbemont <pdherbemont@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
+ * (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.
+ *
+ * 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.
+ *****************************************************************************/
+
+/**
+ * \file
+ * This file defines libvlc_media_player external API
+ */
+
+#ifndef VLC_LIBVLC_MEDIA_PLAYER_H
+#define VLC_LIBVLC_MEDIA_PLAYER_H 1
+
+/*****************************************************************************
+ * Media Player
+ *****************************************************************************/
+/** \defgroup libvlc_media_player libvlc_media_player
+ * \ingroup libvlc
+ * LibVLC Media Player, object that let you play a media
+ * in a custom drawable
+ * @{
+ */
+
+typedef struct libvlc_media_player_t libvlc_media_player_t;
+
+/**
+ * Description for video, audio tracks and subtitles. It contains
+ * id, name (description string) and pointer to next record.
+ */
+typedef struct libvlc_track_description_t
+{
+ int i_id;
+ char *psz_name;
+ struct libvlc_track_description_t *p_next;
+
+} libvlc_track_description_t;
+
+/**
+ * Description for audio output. It contains
+ * name, description and pointer to next record.
+ */
+typedef struct libvlc_audio_output_t
+{
+ char *psz_name;
+ char *psz_description;
+ struct libvlc_audio_output_t *p_next;
+
+} libvlc_audio_output_t;
+
+/**
+ * Rectangle type for video geometry
+ */
+typedef struct libvlc_rectangle_t
+{
+ int top, left;
+ int bottom, right;
+} libvlc_rectangle_t;
+
+
+/**
+ * Create an empty Media Player object
+ *
+ * \param p_libvlc_instance the libvlc instance in which the Media Player
+ * should be created.
+ * \param p_e an initialized exception pointer
+ */
+VLC_PUBLIC_API libvlc_media_player_t * libvlc_media_player_new( libvlc_instance_t *, libvlc_exception_t * );
+
+/**
+ * Create a Media Player object from a Media
+ *
+ * \param p_md the media. Afterwards the p_md can be safely
+ * destroyed.
+ * \param p_e an initialized exception pointer
+ */
+VLC_PUBLIC_API libvlc_media_player_t * libvlc_media_player_new_from_media( libvlc_media_t *, libvlc_exception_t * );
+
+/**
+ * Release a media_player after use
+ * Decrement the reference count of a media player object. If the
+ * reference count is 0, then libvlc_media_player_release() will
+ * release the media player object. If the media player object
+ * has been released, then it should not be used again.
+ *
+ * \param p_mi the Media Player to free
+ */
+VLC_PUBLIC_API void libvlc_media_player_release( libvlc_media_player_t * );
+
+/**
+ * Retain a reference to a media player object. Use
+ * libvlc_media_player_release() to decrement reference count.
+ *
+ * \param p_mi media player object
+ */
+VLC_PUBLIC_API void libvlc_media_player_retain( libvlc_media_player_t * );
+
+/**
+ * Set the media that will be used by the media_player. If any,
+ * previous md will be released.
+ *
+ * \param p_mi the Media Player
+ * \param p_md the Media. Afterwards the p_md can be safely
+ * destroyed.
+ * \param p_e an initialized exception pointer
+ */
+VLC_PUBLIC_API void libvlc_media_player_set_media( libvlc_media_player_t *, libvlc_media_t *, libvlc_exception_t * );
+
+/**
+ * Get the media used by the media_player.
+ *
+ * \param p_mi the Media Player
+ * \param p_e an initialized exception pointer
+ * \return the media associated with p_mi, or NULL if no
+ * media is associated
+ */
+VLC_PUBLIC_API libvlc_media_t * libvlc_media_player_get_media( libvlc_media_player_t *, libvlc_exception_t * );
+
+/**
+ * Get the Event Manager from which the media player send event.
+ *
+ * \param p_mi the Media Player
+ * \param p_e an initialized exception pointer
+ * \return the event manager associated with p_mi
+ */
+VLC_PUBLIC_API libvlc_event_manager_t * libvlc_media_player_event_manager ( libvlc_media_player_t *, libvlc_exception_t * );
+
+/**
+ * is_playing
+ *
+ * \param p_mi the Media Player
+ * \param p_e an initialized exception pointer
+ * \return 1 if the media player is playing, 0 otherwise
+ */
+VLC_PUBLIC_API int libvlc_media_player_is_playing ( libvlc_media_player_t *, libvlc_exception_t * );
+
+/**
+ * Play
+ *
+ * \param p_mi the Media Player
+ * \param p_e an initialized exception pointer
+ */
+VLC_PUBLIC_API void libvlc_media_player_play ( libvlc_media_player_t *, libvlc_exception_t * );
+
+/**
+ * Pause
+ *
+ * \param p_mi the Media Player
+ * \param p_e an initialized exception pointer
+ */
+VLC_PUBLIC_API void libvlc_media_player_pause ( libvlc_media_player_t *, libvlc_exception_t * );
+
+/**
+ * Stop
+ *
+ * \param p_mi the Media Player
+ * \param p_e an initialized exception pointer
+ */
+VLC_PUBLIC_API void libvlc_media_player_stop ( libvlc_media_player_t *, libvlc_exception_t * );
+
+/**
+ * Set the agl handler where the media player should render its video output.
+ *
+ * \param p_mi the Media Player
+ * \param drawable the agl handler
+ * \param p_e an initialized exception pointer
+ */
+VLC_PUBLIC_API void libvlc_media_player_set_nsobject ( libvlc_media_player_t *p_mi, void * drawable, libvlc_exception_t *p_e );
+
+/**
+ * Get the agl handler previously set with libvlc_media_player_set_agl().
+ *
+ * \return the agl handler or 0 if none where set
+ */
+VLC_PUBLIC_API void * libvlc_media_player_get_nsobject ( libvlc_media_player_t *p_mi );
+
+/**
+ * Set the agl handler where the media player should render its video output.
+ *
+ * \param p_mi the Media Player
+ * \param drawable the agl handler
+ * \param p_e an initialized exception pointer
+ */
+VLC_PUBLIC_API void libvlc_media_player_set_agl ( libvlc_media_player_t *p_mi, uint32_t drawable, libvlc_exception_t *p_e );
+
+/**
+ * Get the agl handler previously set with libvlc_media_player_set_agl().
+ *
+ * \param p_mi the Media Player
+ * \return the agl handler or 0 if none where set
+ */
+VLC_PUBLIC_API uint32_t libvlc_media_player_get_agl ( libvlc_media_player_t *p_mi );
+
+/**
+ * Set an X Window System drawable where the media player should render its
+ * video output. If LibVLC was built without X11 output support, then this has
+ * no effects.
+ *
+ * The specified identifier must correspond to an existing Input/Output class
+ * X11 window. Pixmaps are <b>not</b> supported. The caller shall ensure that
+ * the X11 server is the same as the one the VLC instance has been configured
+ * with.
+ * If XVideo is <b>not</b> used, it is assumed that the drawable has the
+ * following properties in common with the default X11 screen: depth, scan line
+ * pad, black pixel. This is a bug.
+ *
+ * \param p_mi the Media Player
+ * \param drawable the ID of the X window
+ * \param p_e an initialized exception pointer
+ */
+VLC_PUBLIC_API void libvlc_media_player_set_xwindow ( libvlc_media_player_t *p_mi, uint32_t drawable, libvlc_exception_t *p_e );
+
+/**
+ * Get the X Window System window identifier previously set with
+ * libvlc_media_player_set_xwindow(). Note that this will return the identifier
+ * even if VLC is not currently using it (for instance if it is playing an
+ * audio-only input).
+ *
+ * \return an X window ID, or 0 if none where set.
+ */
+VLC_PUBLIC_API uint32_t libvlc_media_player_get_xwindow ( libvlc_media_player_t *p_mi );
+
+/**
+ * Set a Win32/Win64 API window handle (HWND) where the media player should
+ * render its video output. If LibVLC was built without Win32/Win64 API output
+ * support, then this has no effects.
+ *
+ * \param p_mi the Media Player
+ * \param drawable windows handle of the drawable
+ * \param p_e an initialized exception pointer
+ */
+VLC_PUBLIC_API void libvlc_media_player_set_hwnd ( libvlc_media_player_t *p_mi, void *drawable, libvlc_exception_t *p_e );
+
+/**
+ * Get the Windows API window handle (HWND) previously set with
+ * libvlc_media_player_set_hwnd(). The handle will be returned even if LibVLC
+ * is not currently outputting any video to it.
+ *
+ * \return a window handle or NULL if there are none.
+ */
+VLC_PUBLIC_API void *libvlc_media_player_get_hwnd ( libvlc_media_player_t *p_mi );
+
+
+
+/** \bug This might go away ... to be replaced by a broader system */
+
+/**
+ * Get the current movie length (in ms).
+ *
+ * \param p_mi the Media Player
+ * \param p_e an initialized exception pointer
+ * \return the movie length (in ms).
+ */
+VLC_PUBLIC_API libvlc_time_t libvlc_media_player_get_length( libvlc_media_player_t *, libvlc_exception_t *);
+
+/**
+ * Get the current movie time (in ms).
+ *
+ * \param p_mi the Media Player
+ * \param p_e an initialized exception pointer
+ * \return the movie time (in ms).
+ */
+VLC_PUBLIC_API libvlc_time_t libvlc_media_player_get_time( libvlc_media_player_t *, libvlc_exception_t *);
+
+/**
+ * Set the movie time (in ms).
+ *
+ * \param p_mi the Media Player
+ * \param the movie time (in ms).
+ * \param p_e an initialized exception pointer
+ */
+VLC_PUBLIC_API void libvlc_media_player_set_time( libvlc_media_player_t *, libvlc_time_t, libvlc_exception_t *);
+
+/**
+ * Get movie position.
+ *
+ * \param p_mi the Media Player
+ * \param p_e an initialized exception pointer
+ * \return movie position
+ */
+VLC_PUBLIC_API float libvlc_media_player_get_position( libvlc_media_player_t *, libvlc_exception_t *);
+
+/**
+ * Set movie position.
+ *
+ * \param p_mi the Media Player
+ * \param f_pos the position
+ * \param p_e an initialized exception pointer
+ */
+VLC_PUBLIC_API void libvlc_media_player_set_position( libvlc_media_player_t *, float, libvlc_exception_t *);
+
+/**
+ * Set movie chapter
+ *
+ * \param p_mi the Media Player
+ * \param i_chapter chapter number to play
+ * \param p_e an initialized exception pointer
+ */
+VLC_PUBLIC_API void libvlc_media_player_set_chapter( libvlc_media_player_t *, int, libvlc_exception_t *);
+
+/**
+ * Get movie chapter
+ *
+ * \param p_mi the Media Player
+ * \param p_e an initialized exception pointer
+ * \return chapter number currently playing
+ */
+VLC_PUBLIC_API int libvlc_media_player_get_chapter( libvlc_media_player_t *, libvlc_exception_t * );
+
+/**
+ * Get movie chapter count
+ *
+ * \param p_mi the Media Player
+ * \param p_e an initialized exception pointer
+ * \return number of chapters in movie
+ */
+VLC_PUBLIC_API int libvlc_media_player_get_chapter_count( libvlc_media_player_t *, libvlc_exception_t *);
+
+/**
+ * Will the player play
+ *
+ * \param p_mi the Media Player
+ * \param p_e an initialized exception pointer
+ * \return boolean
+ */
+VLC_PUBLIC_API int libvlc_media_player_will_play ( libvlc_media_player_t *, libvlc_exception_t *);
+
+/**
+ * Get title chapter count
+ *
+ * \param p_mi the Media Player
+ * \param i_title title
+ * \param p_e an initialized exception pointer
+ * \return number of chapters in title
+ */
+VLC_PUBLIC_API int libvlc_media_player_get_chapter_count_for_title(
+ libvlc_media_player_t *, int, libvlc_exception_t *);
+
+/**
+ * Set movie title
+ *
+ * \param p_mi the Media Player
+ * \param i_title title number to play
+ * \param p_e an initialized exception pointer
+ */
+VLC_PUBLIC_API void libvlc_media_player_set_title( libvlc_media_player_t *, int, libvlc_exception_t *);
+
+/**
+ * Get movie title
+ *
+ * \param p_mi the Media Player
+ * \param p_e an initialized exception pointer
+ * \return title number currently playing
+ */
+VLC_PUBLIC_API int libvlc_media_player_get_title( libvlc_media_player_t *, libvlc_exception_t *);
+
+/**
+ * Get movie title count
+ *
+ * \param p_mi the Media Player
+ * \param p_e an initialized exception pointer
+ * \return title number count
+ */
+VLC_PUBLIC_API int libvlc_media_player_get_title_count( libvlc_media_player_t *, libvlc_exception_t *);
+
+/**
+ * Set previous chapter
+ *
+ * \param p_mi the Media Player
+ * \param p_e an initialized exception pointer
+ */
+VLC_PUBLIC_API void libvlc_media_player_previous_chapter( libvlc_media_player_t *, libvlc_exception_t *);
+
+/**
+ * Set next chapter
+ *
+ * \param p_mi the Media Player
+ * \param p_e an initialized exception pointer
+ */
+VLC_PUBLIC_API void libvlc_media_player_next_chapter( libvlc_media_player_t *, libvlc_exception_t *);
+
+/**
+ * Get movie play rate
+ *
+ * \param p_mi the Media Player
+ * \param p_e an initialized exception pointer
+ * \return movie play rate
+ */
+VLC_PUBLIC_API float libvlc_media_player_get_rate( libvlc_media_player_t *, libvlc_exception_t *);
+
+/**
+ * Set movie play rate
+ *
+ * \param p_mi the Media Player
+ * \param movie play rate to set
+ * \param p_e an initialized exception pointer
+ */
+VLC_PUBLIC_API void libvlc_media_player_set_rate( libvlc_media_player_t *, float, libvlc_exception_t *);
+
+/**
+ * Get current movie state
+ *
+ * \param p_mi the Media Player
+ * \param p_e an initialized exception pointer
+ * \return current movie state as libvlc_state_t
+ */
+VLC_PUBLIC_API libvlc_state_t libvlc_media_player_get_state( libvlc_media_player_t *, libvlc_exception_t *);
+
+/**
+ * Get movie fps rate
+ *
+ * \param p_mi the Media Player
+ * \param p_e an initialized exception pointer
+ * \return frames per second (fps) for this playing movie
+ */
+VLC_PUBLIC_API float libvlc_media_player_get_fps( libvlc_media_player_t *, libvlc_exception_t *);
+
+/** end bug */
+
+/**
+ * Does this media player have a video output?
+ *
+ * \param p_md the media player
+ * \param p_e an initialized exception pointer
+ */
+VLC_PUBLIC_API int libvlc_media_player_has_vout( libvlc_media_player_t *, libvlc_exception_t *);
+
+/**
+ * Is this media player seekable?
+ *
+ * \param p_input the input
+ * \param p_e an initialized exception pointer
+ */
+VLC_PUBLIC_API int libvlc_media_player_is_seekable( libvlc_media_player_t *p_mi, libvlc_exception_t *p_e );
+
+/**
+ * Can this media player be paused?
+ *
+ * \param p_input the input
+ * \param p_e an initialized exception pointer
+ */
+VLC_PUBLIC_API int libvlc_media_player_can_pause( libvlc_media_player_t *p_mi, libvlc_exception_t *p_e );
+
+/**
+ * Release (free) libvlc_track_description_t
+ *
+ * \param p_track_description the structure to release
+ */
+VLC_PUBLIC_API void libvlc_track_description_release( libvlc_track_description_t *p_track_description );
+
+/** \defgroup libvlc_video libvlc_video
+ * \ingroup libvlc_media_player
+ * LibVLC Video handling
+ * @{
+ */
+
+/**
+ * Toggle fullscreen status on video output.
+ *
+ * \param p_mediaplayer the media player
+ * \param p_e an initialized exception pointer
+ */
+VLC_PUBLIC_API void libvlc_toggle_fullscreen( libvlc_media_player_t *, libvlc_exception_t * );
+
+/**
+ * Enable or disable fullscreen on a video output.
+ *
+ * \param p_mediaplayer the media player
+ * \param b_fullscreen boolean for fullscreen status
+ * \param p_e an initialized exception pointer
+ */
+VLC_PUBLIC_API void libvlc_set_fullscreen( libvlc_media_player_t *, int, libvlc_exception_t * );
+
+/**
+ * Get current fullscreen status.
+ *
+ * \param p_mediaplayer the media player
+ * \param p_e an initialized exception pointer
+ * \return the fullscreen status (boolean)
+ */
+VLC_PUBLIC_API int libvlc_get_fullscreen( libvlc_media_player_t *, libvlc_exception_t * );
+
+/**
+ * Get current video height.
+ *
+ * \param p_mediaplayer the media player
+ * \param p_e an initialized exception pointer
+ * \return the video height
+ */
+VLC_PUBLIC_API int libvlc_video_get_height( libvlc_media_player_t *, libvlc_exception_t * );
+
+/**
+ * Get current video width.
+ *
+ * \param p_mediaplayer the media player
+ * \param p_e an initialized exception pointer
+ * \return the video width
+ */
+VLC_PUBLIC_API int libvlc_video_get_width( libvlc_media_player_t *, libvlc_exception_t * );
+
+/**
+ * Get the current video scaling factor.
+ * See also libvlc_video_set_scale().
+ *
+ * \param p_mediaplayer the media player
+ * \param p_e an initialized exception pointer
+ * \return the currently configured zoom factor, or 0. if the video is set
+ * to fit to the output window/drawable automatically.
+ */
+VLC_PUBLIC_API float libvlc_video_get_scale( libvlc_media_player_t *,
+ libvlc_exception_t *p_e );
+
+/**
+ * Set the video scaling factor. That is the ratio of the number of pixels on
+ * screen to the number of pixels in the original decoded video in each
+ * dimension. Zero is a special value; it will adjust the video to the output
+ * window/drawable (in windowed mode) or the entire screen.
+ *
+ * Note that not all video outputs support scaling.
+ *
+ * \param p_mediaplayer the media player
+ * \param i_factor the scaling factor, or zero
+ * \param p_e an initialized exception pointer
+ */
+VLC_PUBLIC_API void libvlc_video_set_scale( libvlc_media_player_t *, float,
+ libvlc_exception_t *p_e );
+
+/**
+ * Get current video aspect ratio.
+ *
+ * \param p_mediaplayer the media player
+ * \param p_e an initialized exception pointer
+ * \return the video aspect ratio
+ */
+VLC_PUBLIC_API char *libvlc_video_get_aspect_ratio( libvlc_media_player_t *, libvlc_exception_t * );
+
+/**
+ * Set new video aspect ratio.
+ *
+ * \param p_mediaplayer the media player
+ * \param psz_aspect new video aspect-ratio
+ * \param p_e an initialized exception pointer
+ */
+VLC_PUBLIC_API void libvlc_video_set_aspect_ratio( libvlc_media_player_t *, char *, libvlc_exception_t * );
+
+/**
+ * Get current video subtitle.
+ *
+ * \param p_mediaplayer the media player
+ * \param p_e an initialized exception pointer
+ * \return the video subtitle selected
+ */
+VLC_PUBLIC_API int libvlc_video_get_spu( libvlc_media_player_t *, libvlc_exception_t * );
+
+/**
+ * Get the number of available video subtitles.
+ *
+ * \param p_mediaplayer the media player
+ * \param p_e an initialized exception pointer
+ * \return the number of available video subtitles
+ */
+VLC_PUBLIC_API int libvlc_video_get_spu_count( libvlc_media_player_t *, libvlc_exception_t * );
+
+/**
+ * Get the description of available video subtitles.
+ *
+ * \param p_mediaplayer the media player
+ * \param p_e an initialized exception pointer
+ * \return list containing description of available video subtitles
+ */
+VLC_PUBLIC_API libvlc_track_description_t *
+ libvlc_video_get_spu_description( libvlc_media_player_t *, libvlc_exception_t * );
+
+/**
+ * Set new video subtitle.
+ *
+ * \param p_mediaplayer the media player
+ * \param i_spu new video subtitle to select
+ * \param p_e an initialized exception pointer
+ */
+VLC_PUBLIC_API void libvlc_video_set_spu( libvlc_media_player_t *, int , libvlc_exception_t * );
+
+/**
+ * Set new video subtitle file.
+ *
+ * \param p_mediaplayer the media player
+ * \param psz_subtitle new video subtitle file
+ * \param p_e an initialized exception pointer
+ * \return the success status (boolean)
+ */
+VLC_PUBLIC_API int libvlc_video_set_subtitle_file( libvlc_media_player_t *, char *, libvlc_exception_t * );
+
+/**
+ * Get the description of available titles.
+ *
+ * \param p_mediaplayer the media player
+ * \param p_e an initialized exception pointer
+ * \return list containing description of available titles
+ */
+VLC_PUBLIC_API libvlc_track_description_t *
+ libvlc_video_get_title_description( libvlc_media_player_t *, libvlc_exception_t * );
+
+/**
+ * Get the description of available chapters for specific title.
+ *
+ * \param p_mediaplayer the media player
+ * \param i_title selected title
+ * \param p_e an initialized exception pointer
+ * \return list containing description of available chapter for title i_title
+ */
+VLC_PUBLIC_API libvlc_track_description_t *
+ libvlc_video_get_chapter_description( libvlc_media_player_t *, int, libvlc_exception_t * );
+
+/**
+ * Get current crop filter geometry.
+ *
+ * \param p_mediaplayer the media player
+ * \param p_e an initialized exception pointer
+ * \return the crop filter geometry
+ */
+VLC_PUBLIC_API char *libvlc_video_get_crop_geometry( libvlc_media_player_t *, libvlc_exception_t * );
+
+/**
+ * Set new crop filter geometry.
+ *
+ * \param p_mediaplayer the media player
+ * \param psz_geometry new crop filter geometry
+ * \param p_e an initialized exception pointer
+ */
+VLC_PUBLIC_API void libvlc_video_set_crop_geometry( libvlc_media_player_t *, char *, libvlc_exception_t * );
+
+/**
+ * Toggle teletext transparent status on video output.
+ *
+ * \param p_mediaplayer the media player
+ * \param p_e an initialized exception pointer
+ */
+VLC_PUBLIC_API void libvlc_toggle_teletext( libvlc_media_player_t *, libvlc_exception_t * );
+
+/**
+ * Get current teletext page requested.
+ *
+ * \param p_mediaplayer the media player
+ * \param p_e an initialized exception pointer
+ * \return the current teletext page requested.
+ */
+VLC_PUBLIC_API int libvlc_video_get_teletext( libvlc_media_player_t *, libvlc_exception_t * );
+
+/**
+ * Set new teletext page to retrieve.
+ *
+ * \param p_mediaplayer the media player
+ * \param i_page teletex page number requested
+ * \param p_e an initialized exception pointer
+ */
+VLC_PUBLIC_API void libvlc_video_set_teletext( libvlc_media_player_t *, int, libvlc_exception_t * );
+
+/**
+ * Get number of available video tracks.
+ *
+ * \param p_mi media player
+ * \param p_e an initialized exception
+ * \return the number of available video tracks (int)
+ */
+VLC_PUBLIC_API int libvlc_video_get_track_count( libvlc_media_player_t *, libvlc_exception_t * );
+
+/**
+ * Get the description of available video tracks.
+ *
+ * \param p_mi media player
+ * \param p_e an initialized exception
+ * \return list with description of available video tracks
+ */
+VLC_PUBLIC_API libvlc_track_description_t *
+ libvlc_video_get_track_description( libvlc_media_player_t *, libvlc_exception_t * );
+
+/**
+ * Get current video track.
+ *
+ * \param p_mi media player
+ * \param p_e an initialized exception pointer
+ * \return the video track (int)
+ */
+VLC_PUBLIC_API int libvlc_video_get_track( libvlc_media_player_t *, libvlc_exception_t * );
+
+/**
+ * Set video track.
+ *
+ * \param p_mi media player
+ * \param i_track the track (int)
+ * \param p_e an initialized exception pointer
+ */
+VLC_PUBLIC_API void libvlc_video_set_track( libvlc_media_player_t *, int, libvlc_exception_t * );
+
+/**
+ * Take a snapshot of the current video window.
+ *
+ * If i_width AND i_height is 0, original size is used.
+ * If i_width XOR i_height is 0, original aspect-ratio is preserved.
+ *
+ * \param p_mi media player instance
+ * \param psz_filepath the path where to save the screenshot to
+ * \param i_width the snapshot's width
+ * \param i_height the snapshot's height
+ * \param p_e an initialized exception pointer
+ */
+VLC_PUBLIC_API void libvlc_video_take_snapshot( libvlc_media_player_t *, const char *,unsigned int, unsigned int, libvlc_exception_t * );
+
+/** @} video */
+
+/** \defgroup libvlc_audio libvlc_audio
+ * \ingroup libvlc_media_player
+ * LibVLC Audio handling
+ * @{
+ */
+
+/**
+ * Audio device types
+ */
+typedef enum libvlc_audio_output_device_types_t {
+ libvlc_AudioOutputDevice_Error = -1,
+ libvlc_AudioOutputDevice_Mono = 1,
+ libvlc_AudioOutputDevice_Stereo = 2,
+ libvlc_AudioOutputDevice_2F2R = 4,
+ libvlc_AudioOutputDevice_3F2R = 5,
+ libvlc_AudioOutputDevice_5_1 = 6,
+ libvlc_AudioOutputDevice_6_1 = 7,
+ libvlc_AudioOutputDevice_7_1 = 8,
+ libvlc_AudioOutputDevice_SPDIF = 10
+} libvlc_audio_output_device_types_t;
+
+/**
+ * Audio channels
+ */
+typedef enum libvlc_audio_output_channel_t {
+ libvlc_AudioChannel_Error = -1,
+ libvlc_AudioChannel_Stereo = 1,
+ libvlc_AudioChannel_RStereo = 2,
+ libvlc_AudioChannel_Left = 3,
+ libvlc_AudioChannel_Right = 4,
+ libvlc_AudioChannel_Dolbys = 5
+} libvlc_audio_output_channel_t;
+
+
+/**
+ * Get the list of available audio outputs
+ *
+ * \param p_instance libvlc instance
+ * \param p_e an initialized exception pointer
+ * \return list of available audio outputs, at the end free it with
+* \see libvlc_audio_output_list_release \see libvlc_audio_output_t
+ */
+VLC_PUBLIC_API libvlc_audio_output_t *
+ libvlc_audio_output_list_get( libvlc_instance_t *,
+ libvlc_exception_t * );
+
+/**
+ * Free the list of available audio outputs
+ *
+ * \param p_list list with audio outputs for release
+ */
+VLC_PUBLIC_API void libvlc_audio_output_list_release( libvlc_audio_output_t * );
+
+/**
+ * Set the audio output.
+ * Change will be applied after stop and play.
+ *
+ * \param p_instance libvlc instance
+ * \param psz_name name of audio output,
+ * use psz_name of \see libvlc_audio_output_t
+ * \return true if function succeded
+ */
+VLC_PUBLIC_API int libvlc_audio_output_set( libvlc_instance_t *,
+ const char * );
+
+/**
+ * Get count of devices for audio output, these devices are hardware oriented
+ * like analor or digital output of sound card
+ *
+ * \param p_instance libvlc instance
+ * \param psz_audio_output - name of audio output, \see libvlc_audio_output_t
+ * \return number of devices
+ */
+VLC_PUBLIC_API int libvlc_audio_output_device_count( libvlc_instance_t *,
+ const char * );
+
+/**
+ * Get long name of device, if not available short name given
+ *
+ * \param p_instance libvlc instance
+ * \param psz_audio_output - name of audio output, \see libvlc_audio_output_t
+ * \param i_device device index
+ * \return long name of device
+ */
+VLC_PUBLIC_API char * libvlc_audio_output_device_longname( libvlc_instance_t *,
+ const char *,
+ int );
+
+/**
+ * Get id name of device
+ *
+ * \param p_instance libvlc instance
+ * \param psz_audio_output - name of audio output, \see libvlc_audio_output_t
+ * \param i_device device index
+ * \return id name of device, use for setting device, need to be free after use
+ */
+VLC_PUBLIC_API char * libvlc_audio_output_device_id( libvlc_instance_t *,
+ const char *,
+ int );
+
+/**
+ * Set device for using
+ *
+ * \param p_instance libvlc instance
+ * \param psz_audio_output - name of audio output, \see libvlc_audio_output_t
+ * \param psz_device_id device
+ */
+VLC_PUBLIC_API void libvlc_audio_output_device_set( libvlc_instance_t *,
+ const char *,
+ const char * );
+
+/**
+ * Get current audio device type. Device type describes something like
+ * character of output sound - stereo sound, 2.1, 5.1 etc
+ *
+ * \param p_instance vlc instance
+ * \param p_e an initialized exception pointer
+ * \return the audio devices type \see libvlc_audio_output_device_types_t
+ */
+VLC_PUBLIC_API int libvlc_audio_output_get_device_type(
+ libvlc_instance_t *, libvlc_exception_t * );
+
+/**
+ * Set current audio device type.
+ *
+ * \param p_instance vlc instance
+ * \param device_type the audio device type,
+ according to \see libvlc_audio_output_device_types_t
+ * \param p_e an initialized exception pointer
+ */
+VLC_PUBLIC_API void libvlc_audio_output_set_device_type( libvlc_instance_t *,
+ int,
+ libvlc_exception_t * );
+
+
+/**
+ * Toggle mute status.
+ *
+ * \param p_instance libvlc instance
+ * \param p_e an initialized exception pointer
+ */
+VLC_PUBLIC_API void libvlc_audio_toggle_mute( libvlc_instance_t *, libvlc_exception_t * );
+
+/**
+ * Get current mute status.
+ *
+ * \param p_instance libvlc instance
+ * \param p_e an initialized exception pointer
+ * \return the mute status (boolean)
+ */
+VLC_PUBLIC_API int libvlc_audio_get_mute( libvlc_instance_t *, libvlc_exception_t * );
+
+/**
+ * Set mute status.
+ *
+ * \param p_instance libvlc instance
+ * \param status If status is true then mute, otherwise unmute
+ * \param p_e an initialized exception pointer
+ */
+VLC_PUBLIC_API void libvlc_audio_set_mute( libvlc_instance_t *, int , libvlc_exception_t * );
+
+/**
+ * Get current audio level.
+ *
+ * \param p_instance libvlc instance
+ * \param p_e an initialized exception pointer
+ * \return the audio level (int)
+ */
+VLC_PUBLIC_API int libvlc_audio_get_volume( libvlc_instance_t *, libvlc_exception_t * );
+
+/**
+ * Set current audio level.
+ *
+ * \param p_instance libvlc instance
+ * \param i_volume the volume (int)
+ * \param p_e an initialized exception pointer
+ */
+VLC_PUBLIC_API void libvlc_audio_set_volume( libvlc_instance_t *, int, libvlc_exception_t *);
+
+/**
+ * Get number of available audio tracks.
+ *
+ * \param p_mi media player
+ * \param p_e an initialized exception
+ * \return the number of available audio tracks (int)
+ */
+VLC_PUBLIC_API int libvlc_audio_get_track_count( libvlc_media_player_t *, libvlc_exception_t * );
+
+/**
+ * Get the description of available audio tracks.
+ *
+ * \param p_mi media player
+ * \param p_e an initialized exception
+ * \return list with description of available audio tracks
+ */
+VLC_PUBLIC_API libvlc_track_description_t *
+ libvlc_audio_get_track_description( libvlc_media_player_t *, libvlc_exception_t * );
+
+/**
+ * Get current audio track.
+ *
+ * \param p_mi media player
+ * \param p_e an initialized exception pointer
+ * \return the audio track (int)
+ */
+VLC_PUBLIC_API int libvlc_audio_get_track( libvlc_media_player_t *, libvlc_exception_t * );
+
+/**
+ * Set current audio track.
+ *
+ * \param p_mi media player
+ * \param i_track the track (int)
+ * \param p_e an initialized exception pointer
+ */
+VLC_PUBLIC_API void libvlc_audio_set_track( libvlc_media_player_t *, int, libvlc_exception_t * );
+
+/**
+ * Get current audio channel.
+ *
+ * \param p_instance vlc instance
+ * \param p_e an initialized exception pointer
+ * \return the audio channel \see libvlc_audio_output_channel_t
+ */
+VLC_PUBLIC_API int
+ libvlc_audio_get_channel( libvlc_instance_t *, libvlc_exception_t * );
+
+/**
+ * Set current audio channel.
+ *
+ * \param p_instance vlc instance
+ * \param channel the audio channel, \see libvlc_audio_output_channel_t
+ * \param p_e an initialized exception pointer
+ */
+VLC_PUBLIC_API void libvlc_audio_set_channel( libvlc_instance_t *,
+ int,
+ libvlc_exception_t * );
+
+/** @} audio */
+
+/** @} media_player */
+
+#endif /* VLC_LIBVLC_MEDIA_PLAYER_H */
diff --git a/win32/vlc/.svn/text-base/libvlc_structures.h.svn-base b/win32/vlc/.svn/text-base/libvlc_structures.h.svn-base
new file mode 100644
index 0000000..1f830d7
--- /dev/null
+++ b/win32/vlc/.svn/text-base/libvlc_structures.h.svn-base
@@ -0,0 +1,139 @@
+/*****************************************************************************
+ * libvlc.h: libvlc_* new external API structures
+ *****************************************************************************
+ * Copyright (C) 1998-2008 the VideoLAN team
+ * $Id $
+ *
+ * Authors: Filippo Carone <littlejohn@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
+ * (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.
+ *
+ * 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.
+ *****************************************************************************/
+
+#ifndef LIBVLC_STRUCTURES_H
+#define LIBVLC_STRUCTURES_H 1
+
+/**
+ * \file
+ * This file defines libvlc_* new external API structures
+ */
+
+#include <stdint.h>
+
+# ifdef __cplusplus
+extern "C" {
+# endif
+
+/** This structure is opaque. It represents a libvlc instance */
+typedef struct libvlc_instance_t libvlc_instance_t;
+
+/*****************************************************************************
+ * Exceptions
+ *****************************************************************************/
+
+/** \defgroup libvlc_exception libvlc_exception
+ * \ingroup libvlc_core
+ * LibVLC Exceptions handling
+ * @{
+ */
+
+typedef struct libvlc_exception_t
+{
+ int b_raised;
+ int i_code;
+ char *psz_message;
+} libvlc_exception_t;
+
+/**@} */
+
+/*****************************************************************************
+ * Time
+ *****************************************************************************/
+/** \defgroup libvlc_time libvlc_time
+ * \ingroup libvlc_core
+ * LibVLC Time support in libvlc
+ * @{
+ */
+
+typedef int64_t libvlc_time_t;
+
+/**@} */
+
+/*****************************************************************************
+ * Media Descriptor
+ *****************************************************************************/
+/** \defgroup libvlc_media libvlc_media
+ * \ingroup libvlc
+ * LibVLC Media Descriptor handling
+ * @{
+ */
+
+
+/**@} */
+
+
+/*****************************************************************************
+ * Playlist
+ *****************************************************************************/
+/** \defgroup libvlc_playlist libvlc_playlist (Deprecated)
+ * \ingroup libvlc
+ * LibVLC Playlist handling (Deprecated)
+ * @deprecated Use media_list
+ * @{
+ */
+
+typedef struct libvlc_playlist_item_t
+{
+ int i_id;
+ char * psz_uri;
+ char * psz_name;
+
+} libvlc_playlist_item_t;
+
+/**@} */
+
+
+/*****************************************************************************
+ * Message log handling
+ *****************************************************************************/
+
+/** \defgroup libvlc_log libvlc_log
+ * \ingroup libvlc_core
+ * LibVLC Message Logging
+ * @{
+ */
+
+/** This structure is opaque. It represents a libvlc log instance */
+typedef struct libvlc_log_t libvlc_log_t;
+
+/** This structure is opaque. It represents a libvlc log iterator */
+typedef struct libvlc_log_iterator_t libvlc_log_iterator_t;
+
+typedef struct libvlc_log_message_t
+{
+ unsigned sizeof_msg; /* sizeof() of message structure, must be filled in by user */
+ int i_severity; /* 0=INFO, 1=ERR, 2=WARN, 3=DBG */
+ const char *psz_type; /* module type */
+ const char *psz_name; /* module name */
+ const char *psz_header; /* optional header */
+ const char *psz_message; /* message */
+} libvlc_log_message_t;
+
+/**@} */
+
+# ifdef __cplusplus
+}
+# endif
+
+#endif
diff --git a/win32/vlc/.svn/text-base/libvlc_vlm.h.svn-base b/win32/vlc/.svn/text-base/libvlc_vlm.h.svn-base
new file mode 100644
index 0000000..c3305ba
--- /dev/null
+++ b/win32/vlc/.svn/text-base/libvlc_vlm.h.svn-base
@@ -0,0 +1,342 @@
+/*****************************************************************************
+ * libvlc_vlm.h: libvlc_* new external API
+ *****************************************************************************
+ * Copyright (C) 1998-2008 the VideoLAN team
+ * $Id$
+ *
+ * Authors: Clément Stenac <zorglub@videolan.org>
+ * Jean-Paul Saman <jpsaman _at_ m2x _dot_ nl>
+ *
+ * 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
+ * (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.
+ *
+ * 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.
+ *****************************************************************************/
+
+#ifndef LIBVLC_VLM_H
+#define LIBVLC_VLM_H 1
+
+/**
+ * \file
+ * This file defines libvlc_vlm_* external API
+ */
+
+# ifdef __cplusplus
+extern "C" {
+# endif
+
+/*****************************************************************************
+ * VLM
+ *****************************************************************************/
+/** \defgroup libvlc_vlm libvlc_vlm
+ * \ingroup libvlc
+ * LibVLC VLM
+ * @{
+ */
+
+
+/**
+ * Release the vlm instance related to the given libvlc_instance_t
+ *
+ * \param p_instance the instance
+ * \param p_e an initialized exception pointer
+ */
+VLC_PUBLIC_API void libvlc_vlm_release( libvlc_instance_t *, libvlc_exception_t * );
+
+/**
+ * Add a broadcast, with one input.
+ *
+ * \param p_instance the instance
+ * \param psz_name the name of the new broadcast
+ * \param psz_input the input MRL
+ * \param psz_output the output MRL (the parameter to the "sout" variable)
+ * \param i_options number of additional options
+ * \param ppsz_options additional options
+ * \param b_enabled boolean for enabling the new broadcast
+ * \param b_loop Should this broadcast be played in loop ?
+ * \param p_e an initialized exception pointer
+ */
+VLC_PUBLIC_API void libvlc_vlm_add_broadcast( libvlc_instance_t *,
+ const char *, const char *,
+ const char * , int,
+ const char * const*,
+ int, int,
+ libvlc_exception_t * );
+
+/**
+ * Add a vod, with one input.
+ *
+ * \param p_instance the instance
+ * \param psz_name the name of the new vod media
+ * \param psz_input the input MRL
+ * \param i_options number of additional options
+ * \param ppsz_options additional options
+ * \param b_enabled boolean for enabling the new vod
+ * \param psz_mux the muxer of the vod media
+ * \param p_e an initialized exception pointer
+ */
+VLC_PUBLIC_API void libvlc_vlm_add_vod( libvlc_instance_t *,
+ const char *, const char *,
+ int, const char * const*,
+ int, const char *,
+ libvlc_exception_t * );
+
+/**
+ * Delete a media (VOD or broadcast).
+ *
+ * \param p_instance the instance
+ * \param psz_name the media to delete
+ * \param p_e an initialized exception pointer
+ */
+VLC_PUBLIC_API void libvlc_vlm_del_media( libvlc_instance_t *,
+ const char *,
+ libvlc_exception_t * );
+
+/**
+ * Enable or disable a media (VOD or broadcast).
+ *
+ * \param p_instance the instance
+ * \param psz_name the media to work on
+ * \param b_enabled the new status
+ * \param p_e an initialized exception pointer
+ */
+VLC_PUBLIC_API void libvlc_vlm_set_enabled( libvlc_instance_t *, const char *,
+ int, libvlc_exception_t * );
+
+/**
+ * Set the output for a media.
+ *
+ * \param p_instance the instance
+ * \param psz_name the media to work on
+ * \param psz_output the output MRL (the parameter to the "sout" variable)
+ * \param p_e an initialized exception pointer
+ */
+VLC_PUBLIC_API void libvlc_vlm_set_output( libvlc_instance_t *, const char *,
+ const char *,
+ libvlc_exception_t * );
+
+/**
+ * Set a media's input MRL. This will delete all existing inputs and
+ * add the specified one.
+ *
+ * \param p_instance the instance
+ * \param psz_name the media to work on
+ * \param psz_input the input MRL
+ * \param p_e an initialized exception pointer
+ */
+VLC_PUBLIC_API void libvlc_vlm_set_input( libvlc_instance_t *, const char *,
+ const char *,
+ libvlc_exception_t * );
+
+/**
+ * Add a media's input MRL. This will add the specified one.
+ *
+ * \param p_instance the instance
+ * \param psz_name the media to work on
+ * \param psz_input the input MRL
+ * \param p_e an initialized exception pointer
+ */
+VLC_PUBLIC_API void libvlc_vlm_add_input( libvlc_instance_t *, const char *,
+ const char *,
+ libvlc_exception_t * );
+/**
+ * Set a media's loop status.
+ *
+ * \param p_instance the instance
+ * \param psz_name the media to work on
+ * \param b_loop the new status
+ * \param p_e an initialized exception pointer
+ */
+VLC_PUBLIC_API void libvlc_vlm_set_loop( libvlc_instance_t *, const char *,
+ int, libvlc_exception_t * );
+
+/**
+ * Set a media's vod muxer.
+ *
+ * \param p_instance the instance
+ * \param psz_name the media to work on
+ * \param psz_mux the new muxer
+ * \param p_e an initialized exception pointer
+ */
+VLC_PUBLIC_API void libvlc_vlm_set_mux( libvlc_instance_t *, const char *,
+ const char *, libvlc_exception_t * );
+
+/**
+ * Edit the parameters of a media. This will delete all existing inputs and
+ * add the specified one.
+ *
+ * \param p_instance the instance
+ * \param psz_name the name of the new broadcast
+ * \param psz_input the input MRL
+ * \param psz_output the output MRL (the parameter to the "sout" variable)
+ * \param i_options number of additional options
+ * \param ppsz_options additional options
+ * \param b_enabled boolean for enabling the new broadcast
+ * \param b_loop Should this broadcast be played in loop ?
+ * \param p_e an initialized exception pointer
+ */
+VLC_PUBLIC_API void libvlc_vlm_change_media( libvlc_instance_t *,
+ const char *, const char *,
+ const char* , int,
+ const char * const *, int, int,
+ libvlc_exception_t * );
+
+/**
+ * Play the named broadcast.
+ *
+ * \param p_instance the instance
+ * \param psz_name the name of the broadcast
+ * \param p_e an initialized exception pointer
+ */
+VLC_PUBLIC_API void libvlc_vlm_play_media ( libvlc_instance_t *, const char *,
+ libvlc_exception_t * );
+
+/**
+ * Stop the named broadcast.
+ *
+ * \param p_instance the instance
+ * \param psz_name the name of the broadcast
+ * \param p_e an initialized exception pointer
+ */
+VLC_PUBLIC_API void libvlc_vlm_stop_media ( libvlc_instance_t *, const char *,
+ libvlc_exception_t * );
+
+/**
+ * Pause the named broadcast.
+ *
+ * \param p_instance the instance
+ * \param psz_name the name of the broadcast
+ * \param p_e an initialized exception pointer
+ */
+VLC_PUBLIC_API void libvlc_vlm_pause_media( libvlc_instance_t *, const char *,
+ libvlc_exception_t * );
+
+/**
+ * Seek in the named broadcast.
+ *
+ * \param p_instance the instance
+ * \param psz_name the name of the broadcast
+ * \param f_percentage the percentage to seek to
+ * \param p_e an initialized exception pointer
+ */
+VLC_PUBLIC_API void libvlc_vlm_seek_media( libvlc_instance_t *, const char *,
+ float, libvlc_exception_t * );
+
+/**
+ * Return information about the named broadcast.
+ * \bug will always return NULL
+ * \param p_instance the instance
+ * \param psz_name the name of the broadcast
+ * \param p_e an initialized exception pointer
+ * \return string with information about named media
+ */
+VLC_PUBLIC_API char* libvlc_vlm_show_media( libvlc_instance_t *, const char *,
+ libvlc_exception_t * );
+
+/**
+ * Get vlm_media instance position by name or instance id
+ *
+ * \param p_instance a libvlc instance
+ * \param psz_name name of vlm media instance
+ * \param i_instance instance id
+ * \param p_e an initialized exception pointer
+ * \return position as float
+ */
+VLC_PUBLIC_API float libvlc_vlm_get_media_instance_position( libvlc_instance_t *,
+ const char *, int,
+ libvlc_exception_t * );
+
+/**
+ * Get vlm_media instance time by name or instance id
+ *
+ * \param p_instance a libvlc instance
+ * \param psz_name name of vlm media instance
+ * \param i_instance instance id
+ * \param p_e an initialized exception pointer
+ * \return time as integer
+ */
+VLC_PUBLIC_API int libvlc_vlm_get_media_instance_time( libvlc_instance_t *,
+ const char *, int,
+ libvlc_exception_t * );
+
+/**
+ * Get vlm_media instance length by name or instance id
+ *
+ * \param p_instance a libvlc instance
+ * \param psz_name name of vlm media instance
+ * \param i_instance instance id
+ * \param p_e an initialized exception pointer
+ * \return length of media item
+ */
+VLC_PUBLIC_API int libvlc_vlm_get_media_instance_length( libvlc_instance_t *,
+ const char *, int ,
+ libvlc_exception_t * );
+
+/**
+ * Get vlm_media instance playback rate by name or instance id
+ *
+ * \param p_instance a libvlc instance
+ * \param psz_name name of vlm media instance
+ * \param i_instance instance id
+ * \param p_e an initialized exception pointer
+ * \return playback rate
+ */
+VLC_PUBLIC_API int libvlc_vlm_get_media_instance_rate( libvlc_instance_t *,
+ const char *, int,
+ libvlc_exception_t * );
+
+/**
+ * Get vlm_media instance title number by name or instance id
+ * \bug will always return 0
+ * \param p_instance a libvlc instance
+ * \param psz_name name of vlm media instance
+ * \param i_instance instance id
+ * \param p_e an initialized exception pointer
+ * \return title as number
+ */
+VLC_PUBLIC_API int libvlc_vlm_get_media_instance_title( libvlc_instance_t *,
+ const char *, int,
+ libvlc_exception_t * );
+
+/**
+ * Get vlm_media instance chapter number by name or instance id
+ * \bug will always return 0
+ * \param p_instance a libvlc instance
+ * \param psz_name name of vlm media instance
+ * \param i_instance instance id
+ * \param p_e an initialized exception pointer
+ * \return chapter as number
+ */
+VLC_PUBLIC_API int libvlc_vlm_get_media_instance_chapter( libvlc_instance_t *,
+ const char *, int,
+ libvlc_exception_t * );
+
+/**
+ * Is libvlc instance seekable ?
+ * \bug will always return 0
+ * \param p_instance a libvlc instance
+ * \param psz_name name of vlm media instance
+ * \param i_instance instance id
+ * \param p_e an initialized exception pointer
+ * \return 1 if seekable, 0 if not
+ */
+VLC_PUBLIC_API int libvlc_vlm_get_media_instance_seekable( libvlc_instance_t *,
+ const char *, int,
+ libvlc_exception_t * );
+
+/** @} */
+
+# ifdef __cplusplus
+}
+# endif
+
+#endif /* <vlc/libvlc_vlm.h> */
diff --git a/win32/vlc/.svn/text-base/mediacontrol.h.svn-base b/win32/vlc/.svn/text-base/mediacontrol.h.svn-base
new file mode 100644
index 0000000..7f04455
--- /dev/null
+++ b/win32/vlc/.svn/text-base/mediacontrol.h.svn-base
@@ -0,0 +1,342 @@
+/*****************************************************************************
+ * mediacontrol.h: global header for mediacontrol
+ *****************************************************************************
+ * Copyright (C) 2005-2008 the VideoLAN team
+ * $Id$
+ *
+ * Authors: Olivier Aubert <olivier.aubert@liris.univ-lyon1.fr>
+ *
+ * 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
+ * (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.
+ *
+ * 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.
+ *****************************************************************************/
+
+/**
+ * \file
+ * This file defines libvlc mediacontrol_* external API
+ */
+
+/**
+ * \defgroup mediacontrol MediaControl
+ * This is the MediaControl API, * intended to provide a generic API to movie players.
+ *
+ * @{
+ */
+
+
+#ifndef VLC_CONTROL_H
+#define VLC_CONTROL_H 1
+
+# ifdef __cplusplus
+extern "C" {
+# endif
+
+#if defined( WIN32 )
+#include <windows.h>
+typedef HWND WINDOWHANDLE;
+#else
+typedef int WINDOWHANDLE;
+#endif
+
+#include <vlc/libvlc.h>
+#include <vlc/mediacontrol_structures.h>
+
+/**
+ * mediacontrol_Instance is an opaque structure, defined in
+ * mediacontrol_internal.h. API users do not have to mess with it.
+ */
+typedef struct mediacontrol_Instance mediacontrol_Instance;
+
+/**************************************************************************
+ * Helper functions
+ ***************************************************************************/
+
+/**
+ * Free a RGBPicture structure.
+ * \param pic: the RGBPicture structure
+ */
+VLC_PUBLIC_API void mediacontrol_RGBPicture__free( mediacontrol_RGBPicture *pic );
+
+VLC_PUBLIC_API void mediacontrol_PlaylistSeq__free( mediacontrol_PlaylistSeq *ps );
+
+/**
+ * Free a StreamInformation structure.
+ * \param pic: the StreamInformation structure
+ */
+VLC_PUBLIC_API void
+mediacontrol_StreamInformation__free( mediacontrol_StreamInformation* p_si );
+
+/**
+ * Instanciate and initialize an exception structure.
+ * \return the exception
+ */
+VLC_PUBLIC_API mediacontrol_Exception *
+ mediacontrol_exception_create( void );
+
+/**
+ * Initialize an existing exception structure.
+ * \param p_exception the exception to initialize.
+ */
+VLC_PUBLIC_API void
+ mediacontrol_exception_init( mediacontrol_Exception *exception );
+
+/**
+ * Clean up an existing exception structure after use.
+ * \param p_exception the exception to clean up.
+ */
+VLC_PUBLIC_API void
+mediacontrol_exception_cleanup( mediacontrol_Exception *exception );
+
+/**
+ * Free an exception structure created with mediacontrol_exception_create().
+ * \return the exception
+ */
+VLC_PUBLIC_API void mediacontrol_exception_free(mediacontrol_Exception *exception);
+
+/*****************************************************************************
+ * Core functions
+ *****************************************************************************/
+
+/**
+ * Create a MediaControl instance with parameters
+ * \param argc the number of arguments
+ * \param argv parameters
+ * \param exception an initialized exception pointer
+ * \return a mediacontrol_Instance
+ */
+VLC_PUBLIC_API mediacontrol_Instance *
+mediacontrol_new( int argc, char **argv, mediacontrol_Exception *exception );
+
+/**
+ * Create a MediaControl instance from an existing libvlc instance
+ * \param p_instance the libvlc instance
+ * \param exception an initialized exception pointer
+ * \return a mediacontrol_Instance
+ */
+VLC_PUBLIC_API mediacontrol_Instance *
+mediacontrol_new_from_instance( libvlc_instance_t* p_instance,
+ mediacontrol_Exception *exception );
+
+/**
+ * Get the associated libvlc instance
+ * \param self: the mediacontrol instance
+ * \return a libvlc instance
+ */
+VLC_PUBLIC_API libvlc_instance_t*
+mediacontrol_get_libvlc_instance( mediacontrol_Instance* self );
+
+/**
+ * Get the associated libvlc_media_player
+ * \param self: the mediacontrol instance
+ * \return a libvlc_media_player_t instance
+ */
+VLC_PUBLIC_API libvlc_media_player_t*
+mediacontrol_get_media_player( mediacontrol_Instance* self );
+
+/**
+ * Get the current position
+ * \param self the mediacontrol instance
+ * \param an_origin the position origin
+ * \param a_key the position unit
+ * \param exception an initialized exception pointer
+ * \return a mediacontrol_Position
+ */
+VLC_PUBLIC_API mediacontrol_Position * mediacontrol_get_media_position(
+ mediacontrol_Instance *self,
+ const mediacontrol_PositionOrigin an_origin,
+ const mediacontrol_PositionKey a_key,
+ mediacontrol_Exception *exception );
+
+/**
+ * Set the position
+ * \param self the mediacontrol instance
+ * \param a_position a mediacontrol_Position
+ * \param exception an initialized exception pointer
+ */
+VLC_PUBLIC_API void mediacontrol_set_media_position( mediacontrol_Instance *self,
+ const mediacontrol_Position *a_position,
+ mediacontrol_Exception *exception );
+
+/**
+ * Play the movie at a given position
+ * \param self the mediacontrol instance
+ * \param a_position a mediacontrol_Position
+ * \param exception an initialized exception pointer
+ */
+VLC_PUBLIC_API void mediacontrol_start( mediacontrol_Instance *self,
+ const mediacontrol_Position *a_position,
+ mediacontrol_Exception *exception );
+
+/**
+ * Pause the movie at a given position
+ * \param self the mediacontrol instance
+ * \param exception an initialized exception pointer
+ */
+VLC_PUBLIC_API void mediacontrol_pause( mediacontrol_Instance *self,
+ mediacontrol_Exception *exception );
+
+/**
+ * Resume the movie at a given position
+ * \param self the mediacontrol instance
+ * \param exception an initialized exception pointer
+ */
+VLC_PUBLIC_API void mediacontrol_resume( mediacontrol_Instance *self,
+ mediacontrol_Exception *exception );
+
+/**
+ * Stop the movie at a given position
+ * \param self the mediacontrol instance
+ * \param exception an initialized exception pointer
+ */
+VLC_PUBLIC_API void mediacontrol_stop( mediacontrol_Instance *self,
+ mediacontrol_Exception *exception );
+
+/**
+ * Exit the player
+ * \param self the mediacontrol instance
+ */
+VLC_PUBLIC_API void mediacontrol_exit( mediacontrol_Instance *self );
+
+/**
+ * Set the MRL to be played.
+ * \param self the mediacontrol instance
+ * \param psz_file the MRL
+ * \param exception an initialized exception pointer
+ */
+VLC_PUBLIC_API void mediacontrol_set_mrl( mediacontrol_Instance *self,
+ const char* psz_file,
+ mediacontrol_Exception *exception );
+
+/**
+ * Get the MRL to be played.
+ * \param self the mediacontrol instance
+ * \param exception an initialized exception pointer
+ */
+VLC_PUBLIC_API char * mediacontrol_get_mrl( mediacontrol_Instance *self,
+ mediacontrol_Exception *exception );
+
+/*****************************************************************************
+ * A/V functions
+ *****************************************************************************/
+/**
+ * Get a snapshot
+ * \param self the mediacontrol instance
+ * \param a_position the desired position (ignored for now)
+ * \param exception an initialized exception pointer
+ * \return a RGBpicture
+ */
+VLC_PUBLIC_API mediacontrol_RGBPicture *
+ mediacontrol_snapshot( mediacontrol_Instance *self,
+ const mediacontrol_Position *a_position,
+ mediacontrol_Exception *exception );
+
+/**
+ * Displays the message string, between "begin" and "end" positions.
+ * \param self the mediacontrol instance
+ * \param message the message to display
+ * \param begin the begin position
+ * \param end the end position
+ * \param exception an initialized exception pointer
+ */
+VLC_PUBLIC_API void mediacontrol_display_text( mediacontrol_Instance *self,
+ const char *message,
+ const mediacontrol_Position *begin,
+ const mediacontrol_Position *end,
+ mediacontrol_Exception *exception );
+
+/**
+ * Get information about a stream
+ * \param self the mediacontrol instance
+ * \param a_key the time unit
+ * \param exception an initialized exception pointer
+ * \return a mediacontrol_StreamInformation
+ */
+VLC_PUBLIC_API mediacontrol_StreamInformation *
+ mediacontrol_get_stream_information( mediacontrol_Instance *self,
+ mediacontrol_PositionKey a_key,
+ mediacontrol_Exception *exception );
+
+/**
+ * Get the current audio level, normalized in [0..100]
+ * \param self the mediacontrol instance
+ * \param exception an initialized exception pointer
+ * \return the volume
+ */
+VLC_PUBLIC_API unsigned short
+ mediacontrol_sound_get_volume( mediacontrol_Instance *self,
+ mediacontrol_Exception *exception );
+/**
+ * Set the audio level
+ * \param self the mediacontrol instance
+ * \param volume the volume (normalized in [0..100])
+ * \param exception an initialized exception pointer
+ */
+VLC_PUBLIC_API void mediacontrol_sound_set_volume( mediacontrol_Instance *self,
+ const unsigned short volume,
+ mediacontrol_Exception *exception );
+
+/**
+ * Set the video output window
+ * \param self the mediacontrol instance
+ * \param visual_id the Xid or HWND, depending on the platform
+ * \param exception an initialized exception pointer
+ */
+VLC_PUBLIC_API int mediacontrol_set_visual( mediacontrol_Instance *self,
+ WINDOWHANDLE visual_id,
+ mediacontrol_Exception *exception );
+
+/**
+ * Get the current playing rate, in percent
+ * \param self the mediacontrol instance
+ * \param exception an initialized exception pointer
+ * \return the rate
+ */
+VLC_PUBLIC_API int mediacontrol_get_rate( mediacontrol_Instance *self,
+ mediacontrol_Exception *exception );
+
+/**
+ * Set the playing rate, in percent
+ * \param self the mediacontrol instance
+ * \param rate the desired rate
+ * \param exception an initialized exception pointer
+ */
+VLC_PUBLIC_API void mediacontrol_set_rate( mediacontrol_Instance *self,
+ const int rate,
+ mediacontrol_Exception *exception );
+
+/**
+ * Get current fullscreen status
+ * \param self the mediacontrol instance
+ * \param exception an initialized exception pointer
+ * \return the fullscreen status
+ */
+VLC_PUBLIC_API int mediacontrol_get_fullscreen( mediacontrol_Instance *self,
+ mediacontrol_Exception *exception );
+
+/**
+ * Set fullscreen status
+ * \param self the mediacontrol instance
+ * \param b_fullscreen the desired status
+ * \param exception an initialized exception pointer
+ */
+VLC_PUBLIC_API void mediacontrol_set_fullscreen( mediacontrol_Instance *self,
+ const int b_fullscreen,
+ mediacontrol_Exception *exception );
+
+# ifdef __cplusplus
+}
+# endif
+
+#endif
+
+/** @} */
diff --git a/win32/vlc/.svn/text-base/mediacontrol_structures.h.svn-base b/win32/vlc/.svn/text-base/mediacontrol_structures.h.svn-base
new file mode 100644
index 0000000..6a37482
--- /dev/null
+++ b/win32/vlc/.svn/text-base/mediacontrol_structures.h.svn-base
@@ -0,0 +1,144 @@
+/*****************************************************************************
+ * mediacontrol_structures.h: global header for mediacontrol
+ *****************************************************************************
+ * Copyright (C) 2005-2008 the VideoLAN team
+ * $Id$
+ *
+ * Authors: Olivier Aubert <olivier.aubert@liris.univ-lyon1.fr>
+ *
+ * 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
+ * (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.
+ *
+ * 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.
+ *****************************************************************************/
+
+/**
+ * \file
+ * This file defines libvlc mediacontrol_* data structures
+ */
+
+/**
+ * \defgroup mediacontrol_structures MediaControl Structures
+ * Data structures used in the MediaControl API.
+ *
+ * @{
+ */
+
+#ifndef VLC_CONTROL_STRUCTURES_H
+#define VLC_CONTROL_STRUCTURES_H 1
+
+# ifdef __cplusplus
+extern "C" {
+# endif
+
+#include <stdint.h>
+
+/**
+ * A position may have different origins:
+ * - absolute counts from the movie start
+ * - relative counts from the current position
+ * - modulo counts from the current position and wraps at the end of the movie
+ */
+typedef enum {
+ mediacontrol_AbsolutePosition,
+ mediacontrol_RelativePosition,
+ mediacontrol_ModuloPosition
+} mediacontrol_PositionOrigin;
+
+/**
+ * Units available in mediacontrol Positions
+ * - ByteCount number of bytes
+ * - SampleCount number of frames
+ * - MediaTime time in milliseconds
+ */
+typedef enum {
+ mediacontrol_ByteCount,
+ mediacontrol_SampleCount,
+ mediacontrol_MediaTime
+} mediacontrol_PositionKey;
+
+/**
+ * Possible player status
+ * Note the order of these enums must match exactly the order of
+ * libvlc_state_t and input_state_e enums.
+ */
+typedef enum {
+ mediacontrol_UndefinedStatus=0, mediacontrol_InitStatus,
+ mediacontrol_BufferingStatus, mediacontrol_PlayingStatus,
+ mediacontrol_PauseStatus, mediacontrol_StopStatus,
+ mediacontrol_EndStatus, mediacontrol_ErrorStatus,
+} mediacontrol_PlayerStatus;
+
+/**
+ * MediaControl Position
+ */
+typedef struct {
+ mediacontrol_PositionOrigin origin;
+ mediacontrol_PositionKey key;
+ int64_t value;
+} mediacontrol_Position;
+
+/**
+ * RGBPicture structure
+ * This generic structure holds a picture in an encoding specified by type.
+ */
+typedef struct {
+ int width;
+ int height;
+ uint32_t type;
+ int64_t date;
+ int size;
+ char *data;
+} mediacontrol_RGBPicture;
+
+/**
+ * Playlist sequence
+ * A simple list of strings.
+ */
+typedef struct {
+ int size;
+ char **data;
+} mediacontrol_PlaylistSeq;
+
+typedef struct {
+ int code;
+ char *message;
+} mediacontrol_Exception;
+
+/**
+ * Exception codes
+ */
+#define mediacontrol_PositionKeyNotSupported 1
+#define mediacontrol_PositionOriginNotSupported 2
+#define mediacontrol_InvalidPosition 3
+#define mediacontrol_PlaylistException 4
+#define mediacontrol_InternalException 5
+
+/**
+ * Stream information
+ * This structure allows to quickly get various informations about the stream.
+ */
+typedef struct {
+ mediacontrol_PlayerStatus streamstatus;
+ char *url; /* The URL of the current media stream */
+ int64_t position; /* actual location in the stream (in ms) */
+ int64_t length; /* total length of the stream (in ms) */
+} mediacontrol_StreamInformation;
+
+
+# ifdef __cplusplus
+}
+# endif
+
+#endif
+
+/** @} */
diff --git a/win32/vlc/.svn/text-base/vlc.h.svn-base b/win32/vlc/.svn/text-base/vlc.h.svn-base
new file mode 100644
index 0000000..2836504
--- /dev/null
+++ b/win32/vlc/.svn/text-base/vlc.h.svn-base
@@ -0,0 +1,57 @@
+/*****************************************************************************
+ * vlc.h: global header for libvlc
+ *****************************************************************************
+ * Copyright (C) 1998-2008 the VideoLAN team
+ * $Id: 0f34b57f3f53f2bfdaad3fdc544752c902d37461 $
+ *
+ * Authors: Vincent Seguin <seguin@via.ecp.fr>
+ * Samuel Hocevar <sam@zoy.org>
+ * Gildas Bazin <gbazin@netcourrier.com>
+ * Derk-Jan Hartman <hartman at videolan dot org>
+ * Pierre d'Herbemont <pdherbemont@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
+ * (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.
+ *
+ * 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.
+ *****************************************************************************/
+
+#ifndef VLC_VLC_H
+#define VLC_VLC_H 1
+
+/**
+ * \file
+ * This file defines libvlc new external API
+ */
+
+# ifdef __cplusplus
+extern "C" {
+# endif
+
+#include <vlc/libvlc_structures.h>
+#include <vlc/libvlc.h>
+#include <vlc/libvlc_media.h>
+#include <vlc/libvlc_media_player.h>
+#include <vlc/libvlc_media_list.h>
+#include <vlc/libvlc_media_list_view.h>
+#include <vlc/libvlc_media_list_player.h>
+#include <vlc/libvlc_media_library.h>
+#include <vlc/libvlc_media_discoverer.h>
+#include <vlc/libvlc_events.h>
+#include <vlc/libvlc_vlm.h>
+#include <vlc/deprecated.h>
+
+# ifdef __cplusplus
+}
+# endif
+
+#endif /* _VLC_VLC_H */