]> git.sesse.net Git - vlc/blobdiff - src/control/vlm.c
Removes trailing spaces. Removes tabs.
[vlc] / src / control / vlm.c
index a770e5d731c7b2edc1c37baf4c0074dd10ec82ec..c21dd000bdda404d2cd1aa4b6be1f4da657597a2 100644 (file)
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
  *****************************************************************************/
 
-#include <libvlc_internal.h>
 #include <vlc/libvlc.h>
-
-#include <vlc/vlc.h>
 #include <vlc_es.h>
 #include <vlc_input.h>
 #include <vlc_vlm.h>
 
-void InitVLM( libvlc_instance_t *p_instance )
+#include "libvlc_internal.h"
+
+#if 0
+/* local function to be used in libvlc_vlm_show_media only */
+static char* recurse_answer( char* psz_prefix, vlm_message_t *p_answer ) {
+    char* psz_childprefix;
+    char* psz_response="";
+    char* response_tmp;
+    int i;
+    vlm_message_t *aw_child, **paw_child;
+
+    asprintf( &psz_childprefix, "%s%s.", psz_prefix, p_answer->psz_name );
+
+    if ( p_answer->i_child )
+    {
+        paw_child = p_answer->child;
+        aw_child = *( paw_child );
+        for( i = 0; i < p_answer->i_child; i++ )
+        {
+            asprintf( &response_tmp, "%s%s%s:%s\n",
+                      psz_response, psz_prefix, aw_child->psz_name,
+                      aw_child->psz_value );
+            free( psz_response );
+            psz_response = response_tmp;
+            if ( aw_child->i_child )
+            {
+                asprintf(&response_tmp, "%s%s", psz_response,
+                         recurse_answer(psz_childprefix, aw_child));
+                free( psz_response );
+                psz_response = response_tmp;
+            }
+            paw_child++;
+            aw_child = *( paw_child );
+        }
+    }
+    free( psz_childprefix );
+    return psz_response;
+}
+
+char* libvlc_vlm_show_media( libvlc_instance_t *p_instance, char *psz_name,
+                             libvlc_exception_t *p_exception )
 {
+    char *psz_message;
+    vlm_message_t *answer;
+    char *psz_response;
+
+    CHECK_VLM;
 #ifdef ENABLE_VLM
-    if( p_instance->p_vlm ) return;
-    p_instance->p_vlm = vlm_New( p_instance->p_vlc );
-#else
-    p_instance->p_vlm = NULL;
+    asprintf( &psz_message, "show %s", psz_name );
+    asprintf( &psz_response, "", psz_name );
+    vlm_ExecuteCommand( p_instance->p_vlm, psz_message, &answer );
+    if( answer->psz_value )
+    {
+        libvlc_exception_raise( p_exception, "Unable to call show %s: %s",
+                                psz_name, answer->psz_value );
+    }
+    else
+    {
+        if ( answer->child )
+        {
+            psz_response = recurse_answer( "", answer );
+        }
+    }
+    free( psz_message );
+    return(psz_response );
 #endif
+    return NULL;
 }
+#endif
 
-#define CHECK_VLM { if( !p_instance->p_vlm ) InitVLM( p_instance ); \
-                    if( !p_instance->p_vlm ) {\
-                  libvlc_exception_raise( p_exception, \
-                  "Unable to create VLM. It might be disabled." ); return; } }
+static int libvlc_vlm_init( libvlc_instance_t *p_instance,
+                            libvlc_exception_t *p_exception )
+{
+#ifdef ENABLE_VLM
+    if( !p_instance->p_vlm )
+        p_instance->p_vlm = vlm_New( p_instance->p_libvlc_int );
+#endif
 
-#define GET_MEDIA { p_media = vlm_MediaSearch( p_instance->p_vlm, psz_name );\
-                   if( !p_media ) \
-                   { \
-                        libvlc_exception_raise( p_exception, \
-                                                "Media %s does not exist", \
-                                                psz_name ); return; } }
+    if( !p_instance->p_vlm )
+    {
+        libvlc_exception_raise( p_exception,
+                                "Unable to create VLM. It might be disabled." );
+        return VLC_EGENERIC;
+    }
+    return VLC_SUCCESS;
+}
+#define VLM_RET(p,ret) do {                                     \
+    if( libvlc_vlm_init( p_instance, p_exception ) ) return ret;\
+    (p) = p_instance->p_vlm;                                    \
+  } while(0)
+#define VLM(p) VLM_RET(p,)
 
 void libvlc_vlm_add_broadcast( libvlc_instance_t *p_instance, char *psz_name,
                                char *psz_input, char *psz_output,
@@ -57,133 +124,112 @@ void libvlc_vlm_add_broadcast( libvlc_instance_t *p_instance, char *psz_name,
                                int b_enabled, int b_loop,
                                libvlc_exception_t *p_exception )
 {
-    vlm_media_t *p_media;
-    CHECK_VLM;
+    vlm_t *p_vlm;
+    vlm_media_t m;
+    int n;
+
+    VLM(p_vlm);
+
+    vlm_media_Init( &m );
+    m.psz_name = strdup( psz_name );
+    m.b_enabled = b_enabled;
+    m.b_vod = VLC_FALSE;
+    m.broadcast.b_loop = b_loop;
+    if( psz_input )
+        TAB_APPEND( m.i_input, m.ppsz_input, strdup(psz_input) );
+    if( psz_output )
+        m.psz_output = strdup( psz_output );
+    for( n = 0; n < i_options; n++ )
+        TAB_APPEND( m.i_option, m.ppsz_option, strdup(ppsz_options[n]) );
 
-    p_media = vlm_MediaNew( p_instance->p_vlm, psz_name, BROADCAST_TYPE );
-    if( !p_media )
+    if( vlm_Control( p_vlm, VLM_ADD_MEDIA, &m, NULL ) )
     {
-        libvlc_exception_raise( p_exception, "Media %s creation failed",
-                                psz_name );
-        return;
+        vlm_media_Clean( &m );
+        libvlc_exception_raise( p_exception, "Media %s creation failed", psz_name );
     }
-    libvlc_vlm_change_media( p_instance, psz_name, psz_input, psz_output,
-                             i_options, ppsz_options, b_enabled, b_loop,
-                             p_exception );
-
+    vlm_media_Clean( &m );
 }
 
 void libvlc_vlm_del_media( libvlc_instance_t *p_instance, char *psz_name,
                            libvlc_exception_t *p_exception )
 {
-    char *psz_message;
-    vlm_message_t *answer;
-    CHECK_VLM;
-#ifdef ENABLE_VLM
-    asprintf( &psz_message, "del %s", psz_name );
-    vlm_ExecuteCommand( p_instance->p_vlm, psz_message, &answer );
-    if( answer->psz_value )
+    vlm_t *p_vlm;
+    int64_t id;
+
+    VLM(p_vlm);
+
+    if( vlm_Control( p_vlm, VLM_GET_MEDIA_ID, psz_name, &id ) ||
+        vlm_Control( p_vlm, VLM_DEL_MEDIA, id ) )
     {
-        libvlc_exception_raise( p_exception, "Unable to delete %s",
-                                psz_name );
+        libvlc_exception_raise( p_exception, "Unable to delete %s", psz_name );
     }
-    free( psz_message);
-#endif
 }
 
+#define VLM_CHANGE(psz_error, code ) do {   \
+    vlm_media_t *p_media;   \
+    vlm_t *p_vlm;           \
+    int64_t id;             \
+    VLM(p_vlm);             \
+    if( vlm_Control( p_vlm, VLM_GET_MEDIA_ID, psz_name, &id ) ||    \
+        vlm_Control( p_vlm, VLM_GET_MEDIA, id, &p_media ) ) {       \
+        libvlc_exception_raise( p_exception, psz_error, psz_name ); \
+        return;             \
+    }                       \
+    if( !p_media ) goto error;                                      \
+                            \
+    code;                   \
+                            \
+    if( vlm_Control( p_vlm, VLM_CHANGE_MEDIA, p_media ) ) {         \
+        vlm_media_Delete( p_media );                                \
+        goto error;         \
+    }                       \
+    vlm_media_Delete( p_media );                                    \
+    return;                 \
+  error:                    \
+    libvlc_exception_raise( p_exception, psz_error, psz_name );\
+  } while(0)
+
 void libvlc_vlm_set_enabled( libvlc_instance_t *p_instance, char *psz_name,
                              int b_enabled, libvlc_exception_t *p_exception )
 {
-    vlm_media_t *p_media;
-    CHECK_VLM;
-#ifdef ENABLE_VLM
-    GET_MEDIA;
-    if( b_enabled != 0 ) b_enabled = 1;
-    p_media->b_enabled = b_enabled;
-#endif
+#define VLM_CHANGE_CODE { p_media->b_enabled = b_enabled; }
+    VLM_CHANGE( "Unable to delete %s", VLM_CHANGE_CODE );
+#undef VLM_CHANGE_CODE
 }
 
 void libvlc_vlm_set_loop( libvlc_instance_t *p_instance, char *psz_name,
                           int b_loop, libvlc_exception_t *p_exception )
 {
-    vlm_media_t *p_media;
-    CHECK_VLM;
-#ifdef ENABLE_VLM
-    GET_MEDIA;
-    if( b_loop != 0 ) b_loop = 1;
-    p_media->b_loop = b_loop;
-#endif
+#define VLM_CHANGE_CODE { p_media->broadcast.b_loop = b_loop; }
+    VLM_CHANGE( "Unable to change %s loop property", VLM_CHANGE_CODE );
+#undef VLM_CHANGE_CODE
 }
 
 void libvlc_vlm_set_output( libvlc_instance_t *p_instance, char *psz_name,
                             char *psz_output,  libvlc_exception_t *p_exception )
 {
-    vlm_media_t *p_media;
-    int i_ret;
-    CHECK_VLM;
-#ifdef ENABLE_VLM
-    GET_MEDIA;
-
-    vlc_mutex_lock( &p_instance->p_vlm->lock );
-    i_ret = vlm_MediaSetup( p_instance->p_vlm, p_media, "output", psz_output );
-    if( i_ret )
-    {
-        libvlc_exception_raise( p_exception, "Unable to set output" );
-        vlc_mutex_unlock( &p_instance->p_vlm->lock );
-        return;
-    }
-    vlc_mutex_unlock( &p_instance->p_vlm->lock );
-#endif
+#define VLM_CHANGE_CODE { if( p_media->psz_output ) free( p_media->psz_output ); \
+                          p_media->psz_output = strdup( psz_output ); }
+    VLM_CHANGE( "Unable to change %s output property", VLM_CHANGE_CODE );
+#undef VLM_CHANGE_CODE
 }
 
 void libvlc_vlm_set_input( libvlc_instance_t *p_instance, char *psz_name,
                            char *psz_input,  libvlc_exception_t *p_exception )
 {
-    vlm_media_t *p_media;
-    int i_ret;
-    CHECK_VLM;
-#ifdef ENABLE_VLM
-    vlc_mutex_lock( &p_instance->p_vlm->lock );
-    GET_MEDIA;
-
-    i_ret = vlm_MediaSetup( p_instance->p_vlm, p_media, "inputdel", "all" );
-    if( i_ret )
-    {
-        libvlc_exception_raise( p_exception, "Unable to change input" );
-        vlc_mutex_unlock( &p_instance->p_vlm->lock );
-        return;
-    }
-    i_ret = vlm_MediaSetup( p_instance->p_vlm, p_media, "input", psz_input );
-    if( i_ret )
-    {
-        libvlc_exception_raise( p_exception, "Unable to change input" );
-        vlc_mutex_unlock( &p_instance->p_vlm->lock );
-        return;
-    }
-    vlc_mutex_unlock( &p_instance->p_vlm->lock );
-#endif
+#define VLM_CHANGE_CODE { while( p_media->i_input > 0 ) \
+                            free( p_media->ppsz_input[--p_media->i_input] );\
+                          TAB_APPEND( p_media->i_input, p_media->ppsz_input, strdup(psz_input) ); }
+    VLM_CHANGE( "Unable to change %s input property", VLM_CHANGE_CODE );
+#undef VLM_CHANGE_CODE
 }
 
 void libvlc_vlm_add_input( libvlc_instance_t *p_instance, char *psz_name,
                            char *psz_input,  libvlc_exception_t *p_exception )
 {
-    vlm_media_t *p_media;
-    int i_ret;
-    CHECK_VLM;
-#ifdef ENABLE_VLM
-    vlc_mutex_lock( &p_instance->p_vlm->lock );
-    GET_MEDIA;
-
-    i_ret = vlm_MediaSetup( p_instance->p_vlm, p_media, "input", psz_input );
-    if( i_ret )
-    {
-        libvlc_exception_raise( p_exception, "Unable to change input" );
-        vlc_mutex_unlock( &p_instance->p_vlm->lock );
-        return;
-    }
-
-    vlc_mutex_unlock( &p_instance->p_vlm->lock );
-#endif
+#define VLM_CHANGE_CODE { TAB_APPEND( p_media->i_input, p_media->ppsz_input, strdup(psz_input) ); }
+    VLM_CHANGE( "Unable to change %s input property", VLM_CHANGE_CODE );
+#undef VLM_CHANGE_CODE
 }
 
 
@@ -192,104 +238,151 @@ void libvlc_vlm_change_media( libvlc_instance_t *p_instance, char *psz_name,
                               char **ppsz_options, int b_enabled, int b_loop,
                               libvlc_exception_t *p_exception )
 {
-    vlm_media_t *p_media;
-    int i_ret;
-    CHECK_VLM;
-#ifdef ENABLE_VLM
-    vlc_mutex_lock( &p_instance->p_vlm->lock );
-    GET_MEDIA;
-    if( b_enabled != 0 ) b_enabled = 1;
-    if( b_loop != 0 ) b_loop = 1;
+#define VLM_CHANGE_CODE { int n;        \
+    p_media->b_enabled = b_enabled;     \
+    p_media->broadcast.b_loop = b_loop; \
+    while( p_media->i_input > 0 )       \
+        free( p_media->ppsz_input[--p_media->i_input] );    \
+    if( psz_input )                     \
+        TAB_APPEND( p_media->i_input, p_media->ppsz_input, strdup(psz_input) ); \
+    if( p_media->psz_output )           \
+        free( p_media->psz_output );    \
+    p_media->psz_output = psz_output ? strdup( psz_output ) : NULL; \
+    while( p_media->i_option > 0 )     \
+        free( p_media->ppsz_option[--p_media->i_option] );        \
+    for( n = 0; n < i_options; n++ )    \
+        TAB_APPEND( p_media->i_option, p_media->ppsz_option, strdup(ppsz_options[n]) );   \
+  }
+    VLM_CHANGE( "Unable to change %s properties", VLM_CHANGE_CODE );
+#undef VLM_CHANGE_CODE
+}
 
-    i_ret = vlm_MediaSetup( p_instance->p_vlm, p_media, "output", psz_output );
-    if( i_ret )
-    {
-        libvlc_exception_raise( p_exception, "Unable to set output" );
-        vlc_mutex_unlock( &p_instance->p_vlm->lock );
-        return;
-    }
-    p_media->b_enabled = b_enabled;
-    p_media->b_loop = b_loop;
+void libvlc_vlm_play_media( libvlc_instance_t *p_instance, char *psz_name,
+                            libvlc_exception_t *p_exception )
+{
+    vlm_t *p_vlm;
+    int64_t id;
 
-    i_ret = vlm_MediaSetup( p_instance->p_vlm, p_media, "output", psz_output );
-    if( i_ret )
-    {
-        libvlc_exception_raise( p_exception, "Unable to set output" );
-        vlc_mutex_unlock( &p_instance->p_vlm->lock );
-        return;
-    }
-    i_ret = vlm_MediaSetup( p_instance->p_vlm, p_media, "inputdel", "all" );
-    if( i_ret )
+    VLM(p_vlm);
+
+    if( vlm_Control( p_vlm, VLM_GET_MEDIA_ID, psz_name, &id ) ||
+        vlm_Control( p_vlm, VLM_START_MEDIA_BROADCAST_INSTANCE, id, NULL, 0 ) )
     {
-        libvlc_exception_raise( p_exception, "Unable to change input" );
-        vlc_mutex_unlock( &p_instance->p_vlm->lock );
-        return;
+        libvlc_exception_raise( p_exception, "Unable to play %s", psz_name );
     }
-    i_ret = vlm_MediaSetup( p_instance->p_vlm, p_media, "input", psz_input );
-    if( i_ret )
+}
+
+void libvlc_vlm_stop_media( libvlc_instance_t *p_instance, char *psz_name,
+                            libvlc_exception_t *p_exception )
+{
+    vlm_t *p_vlm;
+    int64_t id;
+
+    VLM(p_vlm);
+
+    if( vlm_Control( p_vlm, VLM_GET_MEDIA_ID, psz_name, &id ) ||
+        vlm_Control( p_vlm, VLM_STOP_MEDIA_INSTANCE, id, NULL ) )
     {
-        libvlc_exception_raise( p_exception, "Unable to change input" );
-        vlc_mutex_unlock( &p_instance->p_vlm->lock );
-        return;
+        libvlc_exception_raise( p_exception, "Unable to stop %s", psz_name );
     }
-
-    vlc_mutex_unlock( &p_instance->p_vlm->lock );
-#endif
 }
 
-void libvlc_vlm_play_media( libvlc_instance_t *p_instance, char *psz_name,
+void libvlc_vlm_pause_media( libvlc_instance_t *p_instance, char *psz_name,
                             libvlc_exception_t *p_exception )
-    
 {
-    char *psz_message;
-    vlm_message_t *answer;
-    CHECK_VLM;
-#ifdef ENABLE_VLM
-    asprintf( &psz_message, "control %s play", psz_name );
-    vlm_ExecuteCommand( p_instance->p_vlm, psz_message, &answer );
-    if( answer->psz_value )
+    vlm_t *p_vlm;
+    int64_t id;
+
+    VLM(p_vlm);
+
+    if( vlm_Control( p_vlm, VLM_GET_MEDIA_ID, psz_name, &id ) ||
+        vlm_Control( p_vlm, VLM_PAUSE_MEDIA_INSTANCE, id, NULL ) )
     {
-        libvlc_exception_raise( p_exception, "Unable to play %s",
-                                psz_name );
+        libvlc_exception_raise( p_exception, "Unable to pause %s", psz_name );
     }
-    free( psz_message);
-#endif
 }
 
-void libvlc_vlm_stop_media( libvlc_instance_t *p_instance, char *psz_name,
-                            libvlc_exception_t *p_exception )
-    
+void libvlc_vlm_seek_media( libvlc_instance_t *p_instance, char *psz_name,
+                            float f_percentage, libvlc_exception_t *p_exception )
 {
-    char *psz_message;
-    vlm_message_t *answer;
-    CHECK_VLM;
-#ifdef ENABLE_VLM
-    asprintf( &psz_message, "control %s stop", psz_name );
-    vlm_ExecuteCommand( p_instance->p_vlm, psz_message, &answer );
-    if( answer->psz_value )
+    vlm_t *p_vlm;
+    int64_t id;
+
+    VLM(p_vlm);
+
+    if( vlm_Control( p_vlm, VLM_GET_MEDIA_ID, psz_name, &id ) ||
+        vlm_Control( p_vlm, VLM_SET_MEDIA_INSTANCE_POSITION, id, NULL, f_percentage ) )
     {
-        libvlc_exception_raise( p_exception, "Unable to stop %s",
-                                psz_name );
+        libvlc_exception_raise( p_exception, "Unable to seek %s to %f", psz_name, f_percentage );
     }
-    free( psz_message);
-#endif
 }
 
-void libvlc_vlm_pause_media( libvlc_instance_t *p_instance, char *psz_name,
-                            libvlc_exception_t *p_exception )
-    
+static vlm_media_instance_t *libvlc_vlm_get_media_instance( libvlc_instance_t *p_instance,
+                                                            char *psz_name, int i_minstance_idx,
+                                                            libvlc_exception_t *p_exception )
 {
-    char *psz_message;
-    vlm_message_t *answer;
-    CHECK_VLM;
-#ifdef ENABLE_VLM
-    asprintf( &psz_message, "control %s pause", psz_name );
-    vlm_ExecuteCommand( p_instance->p_vlm, psz_message, &answer );
-    if( answer->psz_value )
+    vlm_t *p_vlm;
+    vlm_media_instance_t **pp_minstance;
+    vlm_media_instance_t *p_minstance;
+    int i_minstance;
+    int64_t id;
+
+    VLM_RET(p_vlm, NULL);
+
+    if( vlm_Control( p_vlm, VLM_GET_MEDIA_ID, psz_name, &id ) ||
+        vlm_Control( p_vlm, VLM_GET_MEDIA_INSTANCES, id, &pp_minstance, &i_minstance ) )
     {
-        libvlc_exception_raise( p_exception, "Unable to pause %s",
-                                psz_name );
+        libvlc_exception_raise( p_exception, "Unable to get %s instances", psz_name );
+        return NULL;
     }
-    free( psz_message);
-#endif
+    p_minstance = NULL;
+    if( i_minstance_idx >= 0 && i_minstance_idx < i_minstance )
+    {
+        p_minstance = pp_minstance[i_minstance_idx];
+        TAB_REMOVE( i_minstance, pp_minstance, p_minstance );
+    }
+    while( i_minstance > 0 )
+        vlm_media_instance_Delete( pp_minstance[--i_minstance] );
+    TAB_CLEAN( i_minstance, pp_minstance );
+    return p_minstance;
 }
+
+#define LIBVLC_VLM_GET_MEDIA_ATTRIBUTE( attr, returnType, getType, ret, code )\
+returnType libvlc_vlm_get_media_## attr( libvlc_instance_t *p_instance, \
+                        char *psz_name, int i_instance, libvlc_exception_t *p_exception ) \
+{ \
+    vlm_media_instance_t *p_mi = libvlc_vlm_get_media_instance( p_instance, psz_name, i_instance, \
+                                                                p_exception );  \
+    if( p_mi ) {                            \
+        returnType ret_value;               \
+        code;                               \
+        vlm_media_instance_Delete( p_mi );  \
+        return ret_value;                   \
+    }                                       \
+    libvlc_exception_raise( p_exception, "Unable to get %s "#attr "attribute" ); \
+    return ret; \
+}
+
+LIBVLC_VLM_GET_MEDIA_ATTRIBUTE( position, float, Float, -1, ret_value = p_mi->d_position; );
+LIBVLC_VLM_GET_MEDIA_ATTRIBUTE( time,     int, Integer, -1, ret_value = p_mi->i_time );
+LIBVLC_VLM_GET_MEDIA_ATTRIBUTE( length,   int, Integer, -1, ret_value = p_mi->i_length );
+LIBVLC_VLM_GET_MEDIA_ATTRIBUTE( rate,     int, Integer, -1, ret_value = p_mi->i_rate );
+/* FIXME extend vlm_media_instance_t to be able to implement them */
+LIBVLC_VLM_GET_MEDIA_ATTRIBUTE( title,    int, Integer,  0, ret_value = 0 );
+LIBVLC_VLM_GET_MEDIA_ATTRIBUTE( chapter,  int, Integer,  0, ret_value = 0 );
+LIBVLC_VLM_GET_MEDIA_ATTRIBUTE( seekable, int, Bool,     0, ret_value = VLC_FALSE );
+
+#undef LIBVLC_VLM_GET_MEDIA_ATTRIBUTE
+
+char* libvlc_vlm_show_media( libvlc_instance_t *p_instance, char *psz_name,
+                             libvlc_exception_t *p_exception )
+{
+    /* FIXME is it needed ? */
+    libvlc_exception_raise( p_exception, "Unable to call show %s", psz_name );
+    return NULL;
+}
+