Changeset 661a6c1357158cb970fd2b92fc5d126d65e021ac

Timestamp:

02/03/06 20:53:47 (2 years ago)

Author:

Clément Stenac <zorglub@videolan.org>

git-committer:

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

git-parent:

[6df78501b98cd69f9577c984347fbb3c8f265ec9]

git-author:

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

Message:

Play and add (Refs:#457)

Files:

• include/vlc/libvlc.h (modified) (3 diffs)
• src/control/core.c (modified) (2 diffs)
• src/control/playlist.c (modified) (3 diffs)
• test/NativeLibvlcTest.py (modified) (1 diff)
• test/native_libvlc/native_libvlc_test.c (modified) (2 diffs)
• test/pyunit.h (modified) (1 diff)

include/vlc/libvlc.h

@@ -68 +68 @@
- */
-int libvlc_exception_raised( libvlc_exception_t *p_exception );
+
+/**
+ * Raise an exception
+ * \param p_exception the exception to raise
+ * \param psz_message the exception message
+ */
-void libvlc_exception_raise( libvlc_exception_t *p_exception, char *psz_message );
+
+/**
+ * Clear an exception object so it can be reused.
+ * The exception object must be initialized
+ * \param p_exception the exception to clear
+ */
+void libvlc_exception_clear( libvlc_exception_t * );
-
-/**
@@ -124 +137 @@
- * that will be added to the item before playing it.
- * \param p_instance the instance
+ * \param i_id the item to play. If this is a negative number, the next
+ * item will be selected. Else, 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_exception an initialized exception
- */
-
+int, 
-                           libvlc_exception_t * );
-
@@ -159 +174 @@
-void libvlc_playlist_prev( libvlc_instance_t *, libvlc_exception_t * );
-
+/**
+ * Add an item at the end of the playlist
+ * If you need more advanced options, \see libvlc_playlist_add_extended
+ * \param p_instance the instance
+ * \param psz_uri the URI to open, using VLC format
+ * \param psz_name a name that you might want to give or NULL
+ * \return the identifier of the new item
+ */
+int libvlc_playlist_add( libvlc_instance_t *, const char *, const char *,
+                         libvlc_exception_t * );
+
+/**
+ * Add an item at the end of the playlist, with additional input options
+ * \param p_instance the 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
+ * \return the identifier of the new item
+ */
+int libvlc_playlist_add_extended( libvlc_instance_t *, const char *,
+                                  const char *, int, const char **,
+                                  libvlc_exception_t * );
-
-

src/control/core.c

@@ -36 +36 @@
-}
-
+void libvlc_exception_clear( libvlc_exception_t *p_exception )
+{
+    if( p_exception->psz_message )
+        free( p_exception->psz_message );
+    p_exception->b_raised = 0;
+}
+
-inline int libvlc_exception_raised( libvlc_exception_t *p_exception )
-{
@@ -58 +65 @@
-        p_exception->psz_message = strdup( psz_message );
-}
-
-
-libvlc_instance_t * libvlc_new( int argc, char **argv,

src/control/playlist.c

@@ -27 +27 @@
-#include <vlc/intf.h>
-
-
+ int i_id,
-                           int i_options, char **ppsz_options,
-                           libvlc_exception_t *p_exception )
@@ -38 +38 @@
-        return;
-    }
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-}
-
@@ -55 +90 @@
-    playlist_Clear( p_instance->p_playlist );
-}
+
+int libvlc_playlist_add( libvlc_instance_t *p_instance, const char *psz_uri,
+                         const char *psz_name, libvlc_exception_t *p_exception )
+{
+    return libvlc_playlist_add_extended( p_instance, psz_uri, psz_name,
+                                         0, NULL, p_exception );
+}
+
+int libvlc_playlist_add_extended( libvlc_instance_t *p_instance,
+                                  const char *psz_uri, const char *psz_name,
+                                  int i_options, const char **ppsz_options,
+                                  libvlc_exception_t *p_exception )
+{
+    return playlist_AddExt( p_instance->p_playlist, psz_uri, psz_name,
+                            PLAYLIST_INSERT, PLAYLIST_END, -1, ppsz_options,
+                            i_options );
+}
+
-
-

test/NativeLibvlcTest.py

@@ -11 +11 @@
-        """Checks creation/destroy of libvlc"""
-        native_libvlc_test.create_destroy()
+    def testPlaylist( self ):
+        """Checks basic playlist interaction"""
+        native_libvlc_test.playlist_test()

test/native_libvlc/native_libvlc_test.c

@@ -24 +24 @@
-static PyObject *create_destroy( PyObject *self, PyObject *args )
-{
- 
- char *argv[] = {
+
+char *argv[] = { "vlc", "--quiet" 
-
- 
- 
+
+
-
- p_instance = libvlc_new( 0
+p_instance = libvlc_new( 2
-
- 
+
-
- 
+
-             "Exception raised while creating instance" );
-
- 
+
-     
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-}
-
@@ -46 +73 @@
-   DEF_METHOD( create_destroy, "Create and destroy" )
-   DEF_METHOD( exception_test, "Test Exception handling" )
+   DEF_METHOD( playlist_test, "Test Playlist interaction" )
-   { NULL, NULL, 0, NULL }
-};

test/pyunit.h

@@ -7 +7 @@
-}
-
+#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 raised" ); return NULL; }
+
-#define DEF_METHOD( method, desc ) { #method, method, METH_VARARGS, desc},