X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=src%2Fcontrol%2Fmediacontrol_core.c;h=7ab5e8f557439f08fa137c64272d45a35b81ec82;hb=595e377e334bff112c55d2799467173adff71001;hp=2382f756ebd94f95044d3a1693d31f11be288559;hpb=2cb472dba008f7d877ffe6bae9c5575253365282;p=vlc

diff --git a/src/control/mediacontrol_core.c b/src/control/mediacontrol_core.c
index 2382f756eb..7ab5e8f557 100644
--- a/src/control/mediacontrol_core.c
+++ b/src/control/mediacontrol_core.c
@@ -21,81 +21,88 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
  *****************************************************************************/
 
-#include <mediacontrol_internal.h>
+#ifdef HAVE_CONFIG_H
+# include "config.h"
+#endif
+
+#include "mediacontrol_internal.h"
 #include <vlc/mediacontrol.h>
 
-#include <vlc/intf.h>
-#include <vlc/vout.h>
-#include <vlc/aout.h>
-#include <vlc_demux.h>
+#include <vlc/libvlc.h>
+#include <vlc_common.h>
+#include <vlc_interface.h>
+#include <vlc_playlist.h>
 
+#include <vlc_vout.h>
+#include <vlc_aout.h>
+#include <vlc_input.h>
 #include <vlc_osd.h>
 
-#define HAS_SNAPSHOT 1
-
-#ifdef HAS_SNAPSHOT
-#include <snapshot.h>
-#endif
-
 #include <stdlib.h>                                      /* malloc(), free() */
 #include <string.h>
 
-#include <errno.h>                                                 /* ENOMEM */
 #include <stdio.h>
-#include <ctype.h>
 
 #ifdef HAVE_UNISTD_H
 #    include <unistd.h>
 #endif
-#ifdef HAVE_SYS_TIME_H
-#    include <sys/time.h>
-#endif
-#ifdef HAVE_SYS_TYPES_H
-#    include <sys/types.h>
-#endif
-
-#define RAISE( c, m )  exception->code = c; \
-                       exception->message = strdup(m);
+#include <sys/types.h>
 
-vlc_t * vlc_current_object( int );
-
-mediacontrol_Instance* mediacontrol_new_from_object( int vlc_object_id,
-                                                     mediacontrol_Exception *exception )
+mediacontrol_Instance* mediacontrol_new( int argc, char** argv, mediacontrol_Exception *exception )
 {
     mediacontrol_Instance* retval;
-    vlc_object_t *p_vlc;
-    vlc_object_t *p_object;
+    libvlc_exception_t ex;
 
-    p_object = ( vlc_object_t* )vlc_current_object( vlc_object_id );
-    if( ! p_object )
-    {
-        RAISE( mediacontrol_InternalException, "Unable to find vlc object" );
-        return NULL;
-    }
+    libvlc_exception_init( &ex );
+    mediacontrol_exception_init( exception );
 
-    p_vlc = vlc_object_find( p_object, VLC_OBJECT_ROOT, FIND_PARENT );
-    if( ! p_vlc )
-    {
-        RAISE( mediacontrol_InternalException, "Unable to initialize VLC" );
-        return NULL;
-    }
     retval = ( mediacontrol_Instance* )malloc( sizeof( mediacontrol_Instance ) );
-    retval->p_vlc = p_vlc;
-    retval->vlc_object_id = p_vlc->i_object_id;
+    if( !retval )
+        RAISE_NULL( mediacontrol_InternalException, "Out of memory" );
+
+    retval->p_instance = libvlc_new( argc, (const char**)argv, &ex );
+    HANDLE_LIBVLC_EXCEPTION_NULL( &ex );
+    retval->p_media_player = libvlc_media_player_new( retval->p_instance );
+    if( !retval->p_media_player )
+        RAISE_NULL( mediacontrol_InternalException, "Out of memory" );
+    return retval;
+}
+
+void
+mediacontrol_exit( mediacontrol_Instance *self )
+{
+    libvlc_release( self->p_instance );
+}
+
+libvlc_instance_t*
+mediacontrol_get_libvlc_instance( mediacontrol_Instance *self )
+{
+    return self->p_instance;
+}
 
-    /* We can keep references on these, which should not change. Is it true ? */
-    retval->p_playlist = vlc_object_find( p_vlc,
-                                        VLC_OBJECT_PLAYLIST, FIND_ANYWHERE );
-    retval->p_intf = vlc_object_find( p_vlc, VLC_OBJECT_INTF, FIND_ANYWHERE );
+libvlc_media_player_t*
+mediacontrol_get_media_player( mediacontrol_Instance *self )
+{
+    return self->p_media_player;
+}
+
+mediacontrol_Instance *
+mediacontrol_new_from_instance( libvlc_instance_t* p_instance,
+                mediacontrol_Exception *exception )
+{
+    mediacontrol_Instance* retval;
 
-    if( ! retval->p_playlist || ! retval->p_intf )
+    retval = ( mediacontrol_Instance* )malloc( sizeof( mediacontrol_Instance ) );
+    if( ! retval )
     {
-        RAISE( mediacontrol_InternalException, "No available interface" );
-        return NULL;
+        RAISE_NULL( mediacontrol_InternalException, "Out of memory" );
     }
+    retval->p_instance = p_instance;
+    retval->p_media_player = libvlc_media_player_new( retval->p_instance );
+    if( ! retval->p_media_player )
+         RAISE_NULL( mediacontrol_InternalException, "Out of memory" );
     return retval;
-};
-
+}
 
 /**************************************************************************
  * Playback management
@@ -106,38 +113,37 @@ mediacontrol_get_media_position( mediacontrol_Instance *self,
                                  const mediacontrol_PositionKey a_key,
                                  mediacontrol_Exception *exception )
 {
-    mediacontrol_Position* retval;
-    vlc_value_t val;
-    input_thread_t * p_input = self->p_playlist->p_input;
+    mediacontrol_Position* retval = NULL;
+    int64_t pos;
 
-    exception = mediacontrol_exception_init( exception );
+    mediacontrol_exception_init( exception );
 
     retval = ( mediacontrol_Position* )malloc( sizeof( mediacontrol_Position ) );
     retval->origin = an_origin;
     retval->key = a_key;
 
-    if( ! p_input )
-    {
-        RAISE( mediacontrol_InternalException, "No input thread." );
-        return NULL;
-    }
-
     if(  an_origin != mediacontrol_AbsolutePosition )
     {
+        free( retval );
         /* Relative or ModuloPosition make no sense */
-        RAISE( mediacontrol_PositionOriginNotSupported, "Only absolute position is valid." );
-        return NULL;
+        RAISE_NULL( mediacontrol_PositionOriginNotSupported,
+                    "Only absolute position is valid." );
     }
 
     /* We are asked for an AbsolutePosition. */
-    val.i_time = 0;
-    var_Get( p_input, "time", &val );
-    /* FIXME: check val.i_time > 0 */
-
-    retval->value = mediacontrol_unit_convert( p_input,
-                                               mediacontrol_MediaTime,
-                                               a_key,
-                                               val.i_time / 1000 );
+    pos = libvlc_media_player_get_time( self->p_media_player );
+
+    if( a_key == mediacontrol_MediaTime )
+    {
+        retval->value = pos;
+    }
+    else
+    {
+        retval->value = private_mediacontrol_unit_convert( self->p_media_player,
+                                                           mediacontrol_MediaTime,
+                                                           a_key,
+                                                           pos );
+    }
     return retval;
 }
 
@@ -147,25 +153,12 @@ mediacontrol_set_media_position( mediacontrol_Instance *self,
                                  const mediacontrol_Position * a_position,
                                  mediacontrol_Exception *exception )
 {
-    vlc_value_t val;
-    input_thread_t * p_input = self->p_playlist->p_input;
+    int64_t i_pos;
 
-    exception=mediacontrol_exception_init( exception );
-    if( ! p_input )
-    {
-        RAISE( mediacontrol_InternalException, "No input thread." );
-        return;
-    }
-
-    if( !var_GetBool( p_input, "seekable" ) )
-    {
-        RAISE( mediacontrol_InvalidPosition, "Stream not seekable" );
-        return;
-    }
+    mediacontrol_exception_init( exception );
 
-    val.i_time = mediacontrol_position2microsecond( p_input, a_position );
-    var_Set( p_input, "time", val );
-    return;
+    i_pos = private_mediacontrol_position2microsecond( self->p_media_player, a_position );
+    libvlc_media_player_set_time( self->p_media_player, i_pos / 1000 );
 }
 
 /* Starts playing a stream */
@@ -173,7 +166,7 @@ mediacontrol_set_media_position( mediacontrol_Instance *self,
  * Known issues: since moving in the playlist using playlist_Next
  * or playlist_Prev implies starting to play items, the a_position
  * argument will be only honored for the 1st item in the list.
- * 
+ *
  * XXX:FIXME split moving in the playlist and playing items two
  * different actions or make playlist_<Next|Prev> accept a time
  * value to start to play from.
@@ -183,185 +176,119 @@ mediacontrol_start( mediacontrol_Instance *self,
                     const mediacontrol_Position * a_position,
                     mediacontrol_Exception *exception )
 {
-    playlist_t * p_playlist = self->p_playlist;
+    libvlc_media_t * p_media;
+    char * psz_name;
+    libvlc_exception_t ex;
+
+    mediacontrol_exception_init( exception );
+    libvlc_exception_init( &ex );
 
-    exception = mediacontrol_exception_init( exception );
-    if( ! p_playlist )
+    p_media = libvlc_media_player_get_media( self->p_media_player );
+
+    if ( ! p_media )
     {
-        RAISE( mediacontrol_PlaylistException, "No available playlist" );
-        return;
+        /* No media was defined. */
+        RAISE( mediacontrol_PlaylistException, "No defined media." );
     }
-
-    vlc_mutex_lock( &p_playlist->object_lock );
-    if( p_playlist->i_size )
+    else
     {
-        int i_index;
-        int i_from;
-	char * psz_from = ( char * )malloc( 20 * sizeof( char ) );
-
-        i_from = mediacontrol_position2microsecond( p_playlist->p_input, a_position ) / 1000000;
-	
-        i_index = p_playlist->i_index;
-        if( i_index < 0 )
-        { 
-            /* We know that there is at least 1 element, since i_size != 0 */
-            i_index = 0;
-        }
+        /* A media was defined. Get its mrl to reuse it, but reset the options
+           (because start-time may have been set on the previous invocation */
+        psz_name = libvlc_media_get_mrl( p_media );
+        HANDLE_LIBVLC_EXCEPTION_VOID( &ex );
 
-        /* Set start time */
-	snprintf( psz_from, 20, "start-time=%i", i_from );
-	playlist_ItemAddOption( p_playlist->pp_items[i_index], psz_from );
-	free( psz_from );
+        /* Create a new media */
+        p_media = libvlc_media_new( self->p_instance, psz_name, &ex );
+        HANDLE_LIBVLC_EXCEPTION_VOID( &ex );
 
-        vlc_mutex_unlock( &p_playlist->object_lock );
+        if( a_position->value )
+        {
+            char * psz_from;
+            libvlc_time_t i_from;
+
+            /* A start position was specified. Add it to media options */
+            psz_from = ( char * )malloc( 20 * sizeof( char ) );
+            i_from = private_mediacontrol_position2microsecond( self->p_media_player, a_position ) / 1000000;
+            snprintf( psz_from, 20, "start-time=%"PRId64, i_from );
+            libvlc_media_add_option( p_media, psz_from );
+            HANDLE_LIBVLC_EXCEPTION_VOID( &ex );
+        }
 
-        playlist_Play( p_playlist );
-    }
-    else
-    {
-        RAISE( mediacontrol_PlaylistException, "Empty playlist." );
-        vlc_mutex_unlock( &p_playlist->object_lock );
-    }
+        libvlc_media_player_set_media( self->p_media_player, p_media );
 
-    return;
+        libvlc_media_player_play( self->p_media_player );
+    }
 }
 
 void
 mediacontrol_pause( mediacontrol_Instance *self,
-                    const mediacontrol_Position * a_position,
                     mediacontrol_Exception *exception )
 {
-    input_thread_t *p_input = self->p_playlist->p_input;
-
-    /* FIXME: use the a_position parameter */
-    exception=mediacontrol_exception_init( exception );
-    if( p_input != NULL )
-    {
-        var_SetInteger( p_input, "state", PAUSE_S );
-    }
-    else
-    {
-        RAISE( mediacontrol_InternalException, "No input" );
-    }
-
-    return;
+    mediacontrol_exception_init( exception );
+    libvlc_media_player_pause( self->p_media_player );
 }
 
 void
 mediacontrol_resume( mediacontrol_Instance *self,
-                     const mediacontrol_Position * a_position,
                      mediacontrol_Exception *exception )
 {
-    input_thread_t *p_input = self->p_playlist->p_input;
-
-    /* FIXME: use the a_position parameter */
-    exception=mediacontrol_exception_init( exception );
-    if( p_input != NULL )
-    {
-        var_SetInteger( p_input, "state", PAUSE_S );
-    }
-    else
-    {
-        RAISE( mediacontrol_InternalException, "No input" );
-    }
+    mediacontrol_exception_init( exception );
+    libvlc_media_player_pause( self->p_media_player );
 }
 
 void
 mediacontrol_stop( mediacontrol_Instance *self,
-                   const mediacontrol_Position * a_position,
                    mediacontrol_Exception *exception )
 {
-    /* FIXME: use the a_position parameter */
-    exception=mediacontrol_exception_init( exception );
-    if( !self->p_playlist )
-    {
-        RAISE( mediacontrol_PlaylistException, "No playlist" );
-        return;
-    }
-
-    playlist_Stop( self->p_playlist );
+    mediacontrol_exception_init( exception );
+    libvlc_media_player_stop( self->p_media_player );
 }
 
 /**************************************************************************
- * Playlist management
+ * File management
  **************************************************************************/
 
 void
-mediacontrol_playlist_add_item( mediacontrol_Instance *self,
-                                const char * psz_file,
-                                mediacontrol_Exception *exception )
+mediacontrol_set_mrl( mediacontrol_Instance *self,
+                      const char * psz_file,
+                      mediacontrol_Exception *exception )
 {
-    exception=mediacontrol_exception_init( exception );
-    if( !self->p_playlist )
-    {
-        RAISE( mediacontrol_InternalException, "No playlist" );
-        return;
-    }
+    libvlc_media_t * p_media;
+    libvlc_exception_t ex;
 
-    playlist_Add( self->p_playlist, psz_file, psz_file , PLAYLIST_INSERT,
-                  PLAYLIST_END );
-}
-
-void
-mediacontrol_playlist_next_item( mediacontrol_Instance *self,
-				 mediacontrol_Exception *exception )
-{
-    exception=mediacontrol_exception_init( exception );
-    if ( !self->p_playlist )
-    {
-        RAISE( mediacontrol_InternalException, "No playlist" );
-        return;
-    }
+    mediacontrol_exception_init( exception );
+    libvlc_exception_init( &ex );
 
-    playlist_Next( self->p_playlist );
+    p_media = libvlc_media_new( self->p_instance, psz_file, &ex );
+    HANDLE_LIBVLC_EXCEPTION_VOID( &ex );
 
-    return;
+    libvlc_media_player_set_media( self->p_media_player, p_media );
 }
 
-void
-mediacontrol_playlist_clear( mediacontrol_Instance *self,
-                             mediacontrol_Exception *exception )
+char *
+mediacontrol_get_mrl( mediacontrol_Instance *self,
+                      mediacontrol_Exception *exception )
 {
-    exception=mediacontrol_exception_init( exception );
-    if( !self->p_playlist )
-    {
-        RAISE( mediacontrol_PlaylistException, "No playlist" );
-        return;
-    }
-
-    playlist_Clear( self->p_playlist );
+    libvlc_media_t * p_media;
+    libvlc_exception_t ex;
 
-    return;
-}
+    mediacontrol_exception_init( exception );
+    libvlc_exception_init( &ex );
 
-mediacontrol_PlaylistSeq *
-mediacontrol_playlist_get_list( mediacontrol_Instance *self,
-                                mediacontrol_Exception *exception )
-{
-    mediacontrol_PlaylistSeq *retval;
-    int i_index;
-    playlist_t * p_playlist = self->p_playlist;
-    int i_playlist_size;
+    p_media = libvlc_media_player_get_media( self->p_media_player );
 
-    exception=mediacontrol_exception_init( exception );
-    if( !p_playlist )
+    if ( ! p_media )
     {
-        RAISE( mediacontrol_PlaylistException, "No playlist" );
-        return NULL;
+        return strdup( "" );
     }
-
-    vlc_mutex_lock( &p_playlist->object_lock );
-    i_playlist_size = p_playlist->i_size;
-
-    retval = mediacontrol_PlaylistSeq__alloc( i_playlist_size );
-
-    for( i_index = 0 ; i_index < i_playlist_size ; i_index++ )
+    else
     {
-        retval->data[i_index] = strdup( p_playlist->pp_items[i_index]->input.psz_uri );
-    }
-    vlc_mutex_unlock( &p_playlist->object_lock );
+        char * psz_mrl;
 
-    return retval;
+        psz_mrl = libvlc_media_get_mrl( p_media );
+        HANDLE_LIBVLC_EXCEPTION_NULL( &ex );
+        return psz_mrl;
+    }
 }
 
 /***************************************************************************
@@ -373,61 +300,70 @@ mediacontrol_get_stream_information( mediacontrol_Instance *self,
                                      mediacontrol_PositionKey a_key,
                                      mediacontrol_Exception *exception )
 {
-    mediacontrol_StreamInformation *retval;
-    input_thread_t *p_input = self->p_playlist->p_input;
-    vlc_value_t val;
+    (void)a_key;
+    mediacontrol_StreamInformation *retval = NULL;
+    libvlc_media_t * p_media;
+    libvlc_exception_t ex;
+
+    libvlc_exception_init( &ex );
 
-    retval = ( mediacontrol_StreamInformation* )malloc( sizeof( mediacontrol_StreamInformation ) );
+    retval = ( mediacontrol_StreamInformation* )
+                            malloc( sizeof( mediacontrol_StreamInformation ) );
     if( ! retval )
     {
         RAISE( mediacontrol_InternalException, "Out of memory" );
         return NULL;
     }
 
-    if( ! p_input )
+    p_media = libvlc_media_player_get_media( self->p_media_player );
+    if( ! p_media )
     {
-        /* No p_input defined */
+        /* No p_media defined */
         retval->streamstatus = mediacontrol_UndefinedStatus;
-        retval->url          = strdup( "None" );
+        retval->url          = strdup( "" );
         retval->position     = 0;
         retval->length       = 0;
     }
     else
     {
-        switch( var_GetInteger( p_input, "state" ) )
+        libvlc_state_t state;
+
+        state = libvlc_media_player_get_state( self->p_media_player );
+        switch( state )
         {
-        case PLAYING_S     :
+        case libvlc_NothingSpecial:
+            retval->streamstatus = mediacontrol_UndefinedStatus;
+            break;
+        case libvlc_Opening :
+            retval->streamstatus = mediacontrol_InitStatus;
+            break;
+        case libvlc_Buffering:
+            retval->streamstatus = mediacontrol_BufferingStatus;
+            break;
+        case libvlc_Playing:
             retval->streamstatus = mediacontrol_PlayingStatus;
             break;
-        case PAUSE_S       :
+        case libvlc_Paused:
             retval->streamstatus = mediacontrol_PauseStatus;
             break;
-        case INIT_S        :
-            retval->streamstatus = mediacontrol_InitStatus;
+        case libvlc_Stopped:
+            retval->streamstatus = mediacontrol_StopStatus;
             break;
-        case END_S         :
+        case libvlc_Ended:
             retval->streamstatus = mediacontrol_EndStatus;
             break;
+        case libvlc_Error:
+            retval->streamstatus = mediacontrol_ErrorStatus;
+            break;
         default :
             retval->streamstatus = mediacontrol_UndefinedStatus;
             break;
         }
 
-        retval->url = strdup( p_input->input.p_item->psz_uri );
-
-        /* TIME and LENGTH are in microseconds. We want them in ms */
-        var_Get( p_input, "time", &val);
-        retval->position = val.i_time / 1000;
-
-        var_Get( p_input, "length", &val);
-        retval->length = val.i_time / 1000;
+        retval->url = libvlc_media_get_mrl( p_media );
 
-        retval->position = mediacontrol_unit_convert( p_input,
-                                                      mediacontrol_MediaTime, a_key,
-                                                      retval->position );
-        retval->length   = mediacontrol_unit_convert( p_input,
-                                                      mediacontrol_MediaTime, a_key,
-                                                      retval->length );
+        retval->position = libvlc_media_player_get_time( self->p_media_player );
+        retval->length = libvlc_media_player_get_length( self->p_media_player );
     }
     return retval;
 }