Changeset e0003bec24b8241621d4bb6ce0fe5160835d84d0

Timestamp:

02/14/06 22:41:23 (2 years ago)

Author:

Clément Stenac <zorglub@videolan.org>

git-committer:

Clément Stenac <zorglub@videolan.org> 1139953283 +0000

git-parent:

[f0f9014510bebfe8ea372ce5e6dc01f62ea2df4e]

git-author:

Clément Stenac <zorglub@videolan.org> 1139953283 +0000

Message:

* Beginning of VLM API
* Some test work
* Export vlm_MediaSearch

Files:

• Makefile.am (modified) (1 diff)
• bindings/STATUS (deleted)
• include/libvlc_internal.h (modified) (1 diff)
• include/vlc/libvlc.h (modified) (6 diffs)
• include/vlc_symbols.h (modified) (4 diffs)
• include/vlc_vlm.h (modified) (1 diff)
• src/control/core.c (modified) (3 diffs)
• src/misc/vlm.c (modified) (2 diffs)
• test/native/libvlc.c (modified) (4 diffs)
• test/pyunit.h (modified) (1 diff)

Makefile.am

@@ -476 +476 @@
-    src/control/core.c \
-    src/control/playlist.c \
+    src/control/vlm.c \
-    src/control/input.c \
-    src/control/video.c \

include/libvlc_internal.h

@@ -36 +36 @@
-    vlc_t *p_vlc;
-    playlist_t *p_playlist;
+    vlm_t      *p_vlm;
-    int    i_vlc_id;
-};

include/vlc/libvlc.h

@@ -74 +74 @@
- * \param psz_message the exception message
- */
-message
+format, ...
-
-/**
@@ -147 +147 @@
-
-/**
+ * Pause a running playlist, resume if it was stopped
+ * \param p_instance the instance to pause
+ * \param p_exception an initialized exception
+ */
+void libvlc_playlist_pause( libvlc_instance_t *, libvlc_exception_t * );
+
+/**
+ * Checks if the playlist is running
+ * \param p_instance the instance
+ * \param p_exception an initialized exception
+ * \return 0 if the playlist is stopped or paused, 1 if it is running
+ */
+int libvlc_playlist_isplaying( libvlc_instance_t *, libvlc_exception_t * );
+
+/**
+ * Get the number of items in the playlist
+ * \param p_instance the instance
+ * \param p_exception an initialized exception
+ * \return the number of items
+ */
+int libvlc_playlist_items_count( libvlc_instance_t *, libvlc_exception_t * );
+
+
+
+
+
+/**
- * Stop playing
- * \param p_instance the instance to stop
@@ -154 +181 @@
-
-/**
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
- * \param p_instance the instance
- * \param p_exception an initialized exception
@@ -200 +241 @@
-
-
-
-typedef struct libvlc_input_t libvlc_input_t;
-
-
+
+
+
+
+
-libvlc_input_t *libvlc_playlist_get_input( libvlc_instance_t *,
-                                           libvlc_exception_t * );
@@ -231 +275 @@
-
-
+/** @} */
+
+/** defgroup libvlc_video Video
+ * \ingroup libvlc
+ * LibVLC Video handling
+ * @{
+ */
+
+/**
+ * Toggle fullscreen status on video output
+ * \param p_input the input
+ * \param p_exception an initialized exception
+ */
-void libvlc_toggle_fullscreen( libvlc_input_t *, libvlc_exception_t * );
-
+/**
+ * Enable or disable fullscreen on a video output
+ * \param p_input the input
+ * \param b_fullscreen boolean for fullscreen status
+ * \param p_exception an initialized exception
+ */
+void libvlc_set_fullscreen( libvlc_input_t *, int, libvlc_exception_t * );
+
+/**
+ * Get current fullscreen status
+ * \param p_input the input
+ * \param p_exception an initialized exception
+ * \return the fullscreen status (boolean)
+ */
+int libvlc_get_fullscreen( libvlc_input_t *, libvlc_exception_t * );
+
+/** @}
+ * defgroup libvlc_vlm VLM
+ * \ingroup libvlc
+ * LibVLC VLM handling
+ * @{
+ */
+
+
+/**
+ * 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_exception an initialized exception
+ */
+void libvlc_vlm_add_broadcast( libvlc_instance_t *, char *, char *, char* ,
+                               int, char **, int, int, libvlc_exception_t * );
+
+/**
+ * Delete a media (vod or broadcast)
+ * \param p_instance the instance
+ * \param psz_name the media to delete
+ * \param p_exception an initialized exception
+ */
+void libvlc_vlm_del_media( libvlc_instance_t *, 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_exception an initialized exception
+ */
+void libvlc_vlm_set_enabled( libvlc_instance_t *, char *, int,
+                             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_exception an initialized exception
+ */
+void libvlc_vlm_change_media( libvlc_instance_t *, char *, char *, char* ,
+                              int, char **, int, int, libvlc_exception_t * );
+
-
-/** @} */
-
-
-
-# ifdef __cplusplus
@@ -242 +370 @@
-# endif
-
-vlc_control
+libvlc

include/vlc_symbols.h

@@ -363 +363 @@
-char * mstrtime (char *psz_buffer, mtime_t date);
-void aout_FormatPrepare (audio_sample_format_t * p_format);
+vlm_media_t* vlm_MediaSearch (vlm_t *, const char *);
-void spu_DisplaySubpicture (spu_t *, subpicture_t *);
-int intf_RunThread (intf_thread_t *);
@@ -940 +941 @@
-    char * (*FromLocaleDup_inner) (const char *);
-    int (*utf8_mkdir_inner) (const char *filename);
+    vlm_media_t* (*vlm_MediaSearch_inner) (vlm_t *, const char *);
-};
-#  if defined (__PLUGIN__)
@@ -1394 +1396 @@
-#  define FromLocaleDup (p_symbols)->FromLocaleDup_inner
-#  define utf8_mkdir (p_symbols)->utf8_mkdir_inner
+#  define vlm_MediaSearch (p_symbols)->vlm_MediaSearch_inner
-#  elif defined (HAVE_DYNAMIC_PLUGINS) && !defined (__BUILTIN__)
-/******************************************************************
@@ -1851 +1854 @@
-    ((p_symbols)->FromLocaleDup_inner) = FromLocaleDup; \
-    ((p_symbols)->utf8_mkdir_inner) = utf8_mkdir; \
+    ((p_symbols)->vlm_MediaSearch_inner) = vlm_MediaSearch; \
-    (p_symbols)->net_ConvertIPv4_deprecated = NULL; \
-    (p_symbols)->__stats_CounterGet_deprecated = NULL; \

include/vlc_vlm.h

@@ -140 +140 @@
-VLC_EXPORT( int, vlm_MediaSetup, ( vlm_t *, vlm_media_t *, const char *, const char * ) );
-VLC_EXPORT( int, vlm_MediaControl, ( vlm_t *, vlm_media_t *, const char *, const char *, const char * ) );
+VLC_EXPORT( vlm_media_t* , vlm_MediaSearch,( vlm_t *, const char *) );
-VLC_EXPORT( vlm_schedule_t *, vlm_ScheduleNew, ( vlm_t *, const char * ) );
-VLC_EXPORT( void, vlm_ScheduleDelete, ( vlm_t *, vlm_schedule_t *, const char * ) );

src/control/core.c

@@ -21 +21 @@
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
- *****************************************************************************/
-
+
-#include <libvlc_internal.h>
-#include <vlc/libvlc.h>
@@ -59 +59 @@
-
-inline void libvlc_exception_raise( libvlc_exception_t *p_exception,
-message
+format, ...
-{
+    va_list args;
+    char *psz_message;
+    va_start( args, psz_message );
+    vasprintf( &psz_message, psz_format, args );
+    va_end( args );
+
-    if( p_exception == NULL ) return;
-    p_exception->b_raised = 1;
@@ -98 +104 @@
-    p_new->p_playlist = (playlist_t *)vlc_object_find( p_new->p_vlc,
-                                VLC_OBJECT_PLAYLIST, FIND_CHILD );
+    p_new->p_vlm = NULL;
-
-    if( !p_new->p_playlist )

src/misc/vlm.c

@@ -55 +55 @@
-static vlm_message_t *vlm_Help( vlm_t *, char * );
-
-static vlm_media_t *vlm_MediaSearch ( vlm_t *, const char * );
-static vlm_media_instance_t *vlm_MediaInstanceSearch( vlm_t *, vlm_media_t *, const char * );
-
@@ -819 +818 @@
-}
-
-static 
+
-{
-    int i;

test/native/libvlc.c

@@ -56 +56 @@
-
-    p_instance = libvlc_new( 2, argv, &exception );
-
+NO
-
-    /* Initial status */
@@ -66 +66 @@
-
-    i_playing  = libvlc_playlist_isplaying( p_instance, &exception  );
-
+NO
-    ASSERT( i_playing == 0, "Playlist shouldn't be running" );
-    i_items = libvlc_playlist_items_count( p_instance, &exception );
-
+NO
-    ASSERT( i_items == 0, "Playlist should be empty" );
-
@@ -75 +75 @@
-    libvlc_exception_clear( &exception );
-    i_id = libvlc_playlist_add( p_instance, "test" , NULL , &exception );
-
+NO
-    ASSERT( i_id > 0 , "Returned identifier is <= 0" );
-    i_items = libvlc_playlist_items_count( p_instance, &exception );
-
+NO
-    ASSERT( i_items == 1, "Playlist should have 1 item" );
-    i_playing  = libvlc_playlist_isplaying( p_instance, &exception  );
-
+NO
-    ASSERT( i_playing == 0, "Playlist shouldn't be running" );
-
@@ -90 +90 @@
-}
-
+static PyObject *vlm_test( PyObject *self, PyObject *args )
+{
+    libvlc_instance_t *p_instance;
+    char *argv[] = { "vlc", "--quiet" };
+    libvlc_exception_t exception;
+    libvlc_exception_init( &exception );
+   
+    libvlc_vlm_set_enabled( p_instance, "test", 1, &exception );
+    ASSERT_EXCEPTION;
+    libvlc_exception_clear( &exception );
+
+    Py_INCREF( Py_None );
+    return Py_None;
+}
+
-static PyMethodDef native_libvlc_test_methods[] = {
-   DEF_METHOD( create_destroy, "Create and destroy" )
-   DEF_METHOD( exception_test, "Test Exception handling" )
-   DEF_METHOD( playlist_test, "Test Playlist interaction" )
+   DEF_METHOD( vlm_test, "Test VLM" )
-   { NULL, NULL, 0, NULL }
-};

test/pyunit.h

@@ -7 +7 @@
-}
-
-
+NO
-         if( libvlc_exception_get_message( &exception ) )  PyErr_SetString( PyExc_AssertionError, libvlc_exception_get_message( &exception ) ); \
-         else PyErr_SetString( PyExc_AssertionError, "Exception raised" ); return NULL; }
-
+#define ASSERT_EXCEPTION if( !libvlc_exception_raised( &exception ) ) { \
+         if( libvlc_exception_get_message( &exception ) )  PyErr_SetString( PyExc_AssertionError, libvlc_exception_get_message( &exception ) ); \
+         else PyErr_SetString( PyExc_AssertionError, "Exception not raised" ); return NULL; }
+
+
+
-#define DEF_METHOD( method, desc ) { #method, method, METH_VARARGS, desc},