* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
*****************************************************************************/
-#include <mediacontrol_internal.h>
+#include <vlc/vlc.h>
#include <vlc/mediacontrol.h>
#include <vlc/libvlc.h>
-#include <vlc/intf.h>
-#include <vlc/vout.h>
-#include <vlc/aout.h>
-#include <vlc_demux.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 "mediacontrol_internal.h"
#include <stdlib.h> /* malloc(), free() */
#include <string.h>
libvlc_exception_t ex;
libvlc_exception_init( &ex );
- exception=mediacontrol_exception_init( exception );
+ mediacontrol_exception_init( exception );
retval = ( mediacontrol_Instance* )malloc( sizeof( mediacontrol_Instance ) );
- if( !retval )
+ if( !retval )
RAISE_NULL( mediacontrol_InternalException, "Out of memory" );
retval->p_instance = libvlc_new( argc, argv, &ex );
- retval->p_playlist = retval->p_instance->p_libvlc_int->p_playlist;
HANDLE_LIBVLC_EXCEPTION_NULL( &ex );
- return retval;
-};
+ retval->p_playlist = retval->p_instance->p_libvlc_int->p_playlist;
+ return retval;
+}
void
mediacontrol_exit( mediacontrol_Instance *self )
libvlc_exception_t ex;
libvlc_exception_init( &ex );
- libvlc_destroy( self->p_instance, &ex );
+ libvlc_release( self->p_instance, &ex );
}
libvlc_instance_t*
mediacontrol_Instance *
mediacontrol_new_from_instance( libvlc_instance_t* p_instance,
- mediacontrol_Exception *exception )
+ mediacontrol_Exception *exception )
{
mediacontrol_Instance* retval;
retval = ( mediacontrol_Instance* )malloc( sizeof( mediacontrol_Instance ) );
if( ! retval )
- {
+ {
RAISE_NULL( mediacontrol_InternalException, "Out of memory" );
}
retval->p_instance = p_instance;
retval->p_playlist = retval->p_instance->p_libvlc_int->p_playlist;
- return retval;
+ return retval;
}
/**************************************************************************
mediacontrol_Position* retval = NULL;
libvlc_exception_t ex;
vlc_int64_t pos;
- libvlc_input_t * p_input;
+ libvlc_media_instance_t * p_mi;
- exception = mediacontrol_exception_init( exception );
+ mediacontrol_exception_init( exception );
libvlc_exception_init( &ex );
retval = ( mediacontrol_Position* )malloc( sizeof( mediacontrol_Position ) );
retval->origin = an_origin;
retval->key = a_key;
- p_input = libvlc_playlist_get_input( self->p_instance, &ex);
+ p_mi = libvlc_playlist_get_media_instance( self->p_instance, &ex);
HANDLE_LIBVLC_EXCEPTION_NULL( &ex );
if( an_origin != mediacontrol_AbsolutePosition )
{
- libvlc_input_free( p_input );
+ libvlc_media_instance_release( p_mi );
/* Relative or ModuloPosition make no sense */
RAISE_NULL( mediacontrol_PositionOriginNotSupported,
"Only absolute position is valid." );
}
/* We are asked for an AbsolutePosition. */
- pos = libvlc_input_get_time( p_input, &ex );
+ pos = libvlc_media_instance_get_time( p_mi, &ex );
if( a_key == mediacontrol_MediaTime )
{
}
else
{
- if( ! self->p_playlist->p_input )
+ if( ! self->p_playlist->p_input )
{
- libvlc_input_free( p_input );
+ libvlc_media_instance_release( p_mi );
RAISE_NULL( mediacontrol_InternalException,
"No input" );
}
- retval->value = mediacontrol_unit_convert( self->p_playlist->p_input,
+ retval->value = private_mediacontrol_unit_convert( self->p_playlist->p_input,
mediacontrol_MediaTime,
a_key,
pos );
}
- libvlc_input_free( p_input );
+ libvlc_media_instance_release( p_mi );
return retval;
}
const mediacontrol_Position * a_position,
mediacontrol_Exception *exception )
{
- libvlc_input_t * p_input;
+ libvlc_media_instance_t * p_mi;
libvlc_exception_t ex;
vlc_int64_t i_pos;
libvlc_exception_init( &ex );
mediacontrol_exception_init( exception );
- p_input = libvlc_playlist_get_input( self->p_instance, &ex);
+ p_mi = libvlc_playlist_get_media_instance( self->p_instance, &ex);
HANDLE_LIBVLC_EXCEPTION_VOID( &ex );
- i_pos = mediacontrol_position2microsecond( self->p_playlist->p_input, a_position );
- libvlc_input_set_time( p_input, i_pos / 1000, &ex );
- libvlc_input_free( p_input );
+ i_pos = private_mediacontrol_position2microsecond( self->p_playlist->p_input, a_position );
+ libvlc_media_instance_set_time( p_mi, i_pos / 1000, &ex );
+ libvlc_media_instance_release( p_mi );
HANDLE_LIBVLC_EXCEPTION_VOID( &ex );
}
* 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.
{
playlist_t * p_playlist = self->p_playlist;
- exception = mediacontrol_exception_init( exception );
+ mediacontrol_exception_init( exception );
if( ! p_playlist )
{
RAISE( mediacontrol_PlaylistException, "No available playlist" );
}
vlc_mutex_lock( &p_playlist->object_lock );
- if( p_playlist->i_size )
+ if( p_playlist->items.i_size )
{
int i_from;
char *psz_from = NULL;
psz_from = ( char * )malloc( 20 * sizeof( char ) );
if( psz_from && p_playlist->status.p_item )
{
- i_from = mediacontrol_position2microsecond( p_playlist->p_input, a_position ) / 1000000;
+ i_from = private_mediacontrol_position2microsecond( p_playlist->p_input, a_position ) / 1000000;
/* Set start time */
snprintf( psz_from, 20, "start-time=%i", i_from );
input_thread_t *p_input = self->p_playlist->p_input;
/* FIXME: use the a_position parameter */
- exception=mediacontrol_exception_init( exception );
+ mediacontrol_exception_init( exception );
if( p_input != NULL )
{
var_SetInteger( p_input, "state", PAUSE_S );
input_thread_t *p_input = self->p_playlist->p_input;
/* FIXME: use the a_position parameter */
- exception=mediacontrol_exception_init( exception );
+ mediacontrol_exception_init( exception );
if( p_input != NULL )
{
var_SetInteger( p_input, "state", PAUSE_S );
mediacontrol_Exception *exception )
{
/* FIXME: use the a_position parameter */
- exception=mediacontrol_exception_init( exception );
+ mediacontrol_exception_init( exception );
if( !self->p_playlist )
{
RAISE( mediacontrol_PlaylistException, "No playlist" );
mediacontrol_PlaylistSeq *retval = NULL;
int i_index;
playlist_t * p_playlist = self->p_playlist;
+ playlist_item_t *p_root;
int i_playlist_size;
- exception=mediacontrol_exception_init( exception );
+ mediacontrol_exception_init( exception );
if( !p_playlist )
{
RAISE( mediacontrol_PlaylistException, "No playlist" );
}
vlc_mutex_lock( &p_playlist->object_lock );
- i_playlist_size = p_playlist->i_size;
- retval = mediacontrol_PlaylistSeq__alloc( i_playlist_size );
+ p_root = p_playlist->p_root_onelevel->pp_children[0];
+ i_playlist_size = p_root->i_children;
+ retval = private_mediacontrol_PlaylistSeq__alloc( i_playlist_size );
for( i_index = 0 ; i_index < i_playlist_size ; i_index++ )
{
- retval->data[i_index] = strdup( p_playlist->pp_items[i_index]->p_input->psz_uri );
+ retval->data[i_index] = strdup( p_root->pp_children[i_index]->p_input->psz_name );
}
vlc_mutex_unlock( &p_playlist->object_lock );
break;
}
- retval->url = strdup( p_input->input.p_item->psz_uri );
+ retval->url = input_item_GetURI( input_GetItem( p_input ) );
/* TIME and LENGTH are in microseconds. We want them in ms */
var_Get( p_input, "time", &val);
var_Get( p_input, "length", &val);
retval->length = val.i_time / 1000;
- retval->position = mediacontrol_unit_convert( p_input,
+ retval->position = private_mediacontrol_unit_convert( p_input,
mediacontrol_MediaTime, a_key,
retval->position );
- retval->length = mediacontrol_unit_convert( p_input,
+ retval->length = private_mediacontrol_unit_convert( p_input,
mediacontrol_MediaTime, a_key,
retval->length );
}