*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111, USA.
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
*****************************************************************************/
-#include <mediacontrol_internal.h>
+#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_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 <sys/types.h>
#endif
-#define RAISE( c, m ) exception->code = c; \
- exception->message = strdup(m);
-
-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;
+ char** ppsz_argv = NULL;
+ int i_index;
- 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" );
+
+ /* Prepend a dummy argv[0] so that users of the API do not have to
+ do it themselves, and can simply provide the args list. */
+ ppsz_argv = malloc( ( argc + 2 ) * sizeof( char * ) ) ;
+ if( ! ppsz_argv )
+ RAISE_NULL( mediacontrol_InternalException, "Out of memory" );
+
+ ppsz_argv[0] = strdup("vlc");
+ for ( i_index = 0; i_index < argc; i_index++ )
+ ppsz_argv[i_index + 1] = argv[i_index];
+ ppsz_argv[argc + 1] = NULL;
+
+ retval->p_instance = libvlc_new( argc + 1, ppsz_argv, &ex );
+ retval->p_playlist = retval->p_instance->p_libvlc_int->p_playlist;
+ HANDLE_LIBVLC_EXCEPTION_NULL( &ex );
+ return retval;
+};
- /* 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 );
+void
+mediacontrol_exit( mediacontrol_Instance *self )
+{
+ libvlc_exception_t ex;
+ libvlc_exception_init( &ex );
- if( ! retval->p_playlist || ! retval->p_intf )
- {
- RAISE( mediacontrol_InternalException, "No available interface" );
- return NULL;
- }
- return retval;
-};
+ libvlc_destroy( self->p_instance, &ex );
+}
+libvlc_instance_t*
+mediacontrol_get_libvlc_instance( mediacontrol_Instance *self )
+{
+ return self->p_instance;
+}
+
+mediacontrol_Instance *
+mediacontrol_new_from_instance( libvlc_instance_t* p_instance,
+ 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;
+}
/**************************************************************************
* Playback management
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;
+ libvlc_exception_t ex;
+ vlc_int64_t pos;
+ libvlc_input_t * p_input;
- 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;
- if( ! p_input )
- {
- RAISE( mediacontrol_InternalException, "No input thread." );
- return NULL;
- }
+ p_input = libvlc_playlist_get_input( self->p_instance, &ex);
+ HANDLE_LIBVLC_EXCEPTION_NULL( &ex );
if( an_origin != mediacontrol_AbsolutePosition )
{
+ libvlc_input_free( p_input );
/* 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_input_get_time( p_input, &ex );
+
+ if( a_key == mediacontrol_MediaTime )
+ {
+ retval->value = pos;
+ }
+ else
+ {
+ if( ! self->p_playlist->p_input )
+ {
+ libvlc_input_free( p_input );
+ RAISE_NULL( mediacontrol_InternalException,
+ "No input" );
+ }
+ retval->value = mediacontrol_unit_convert( self->p_playlist->p_input,
+ mediacontrol_MediaTime,
+ a_key,
+ pos );
+ }
+ libvlc_input_free( p_input );
return retval;
}
const mediacontrol_Position * a_position,
mediacontrol_Exception *exception )
{
- vlc_value_t val;
- input_thread_t * p_input = self->p_playlist->p_input;
+ libvlc_input_t * p_input;
+ libvlc_exception_t ex;
+ vlc_int64_t i_pos;
- exception=mediacontrol_exception_init( exception );
- if( ! p_input )
- {
- RAISE( mediacontrol_InternalException, "No input thread." );
- return;
- }
+ libvlc_exception_init( &ex );
+ mediacontrol_exception_init( exception );
- if( !var_GetBool( p_input, "seekable" ) )
- {
- RAISE( mediacontrol_InvalidPosition, "Stream not seekable" );
- return;
- }
+ p_input = libvlc_playlist_get_input( self->p_instance, &ex);
+ HANDLE_LIBVLC_EXCEPTION_VOID( &ex );
- val.i_time = mediacontrol_position2microsecond( p_input, a_position );
- var_Set( p_input, "time", val );
- return;
+ 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 );
+ HANDLE_LIBVLC_EXCEPTION_VOID( &ex );
}
/* Starts playing a stream */
{
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_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;
- }
+ char *psz_from = NULL;
- /* 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 );
+ 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;
- vlc_mutex_unlock( &p_playlist->object_lock );
+ /* Set start time */
+ snprintf( psz_from, 20, "start-time=%i", i_from );
+ input_ItemAddOption( p_playlist->status.p_item->p_input, psz_from );
+ free( psz_from );
+ }
+ vlc_mutex_unlock( &p_playlist->object_lock );
playlist_Play( p_playlist );
}
else
RAISE( mediacontrol_PlaylistException, "Empty playlist." );
vlc_mutex_unlock( &p_playlist->object_lock );
}
-
- return;
}
void
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 );
{
RAISE( mediacontrol_InternalException, "No input" );
}
-
- return;
}
void
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" );
- return;
}
-
- playlist_Stop( self->p_playlist );
+ else
+ playlist_Stop( self->p_playlist );
}
/**************************************************************************
const char * psz_file,
mediacontrol_Exception *exception )
{
- exception=mediacontrol_exception_init( exception );
- if( !self->p_playlist )
- {
- RAISE( mediacontrol_InternalException, "No playlist" );
- return;
- }
+ libvlc_exception_t ex;
+
+ mediacontrol_exception_init( exception );
+ libvlc_exception_init( &ex );
- playlist_Add( self->p_playlist, psz_file, psz_file , PLAYLIST_INSERT,
- PLAYLIST_END );
+ libvlc_playlist_add( self->p_instance, psz_file, psz_file, &ex );
+ HANDLE_LIBVLC_EXCEPTION_VOID( &ex );
}
void
mediacontrol_playlist_next_item( mediacontrol_Instance *self,
- mediacontrol_Exception *exception )
+ mediacontrol_Exception *exception )
{
- exception=mediacontrol_exception_init( exception );
- if ( !self->p_playlist )
- {
- RAISE( mediacontrol_InternalException, "No playlist" );
- return;
- }
+ libvlc_exception_t ex;
- playlist_Next( self->p_playlist );
+ mediacontrol_exception_init( exception );
+ libvlc_exception_init( &ex );
- return;
+ libvlc_playlist_next( self->p_instance, &ex );
+ HANDLE_LIBVLC_EXCEPTION_VOID( &ex );
}
void
mediacontrol_playlist_clear( mediacontrol_Instance *self,
mediacontrol_Exception *exception )
{
- exception=mediacontrol_exception_init( exception );
- if( !self->p_playlist )
- {
- RAISE( mediacontrol_PlaylistException, "No playlist" );
- return;
- }
+ libvlc_exception_t ex;
- playlist_Clear( self->p_playlist );
+ mediacontrol_exception_init( exception );
+ libvlc_exception_init( &ex );
- return;
+ libvlc_playlist_clear( self->p_instance, &ex );
+ HANDLE_LIBVLC_EXCEPTION_VOID( &ex );
}
mediacontrol_PlaylistSeq *
mediacontrol_playlist_get_list( mediacontrol_Instance *self,
mediacontrol_Exception *exception )
{
- mediacontrol_PlaylistSeq *retval;
+ mediacontrol_PlaylistSeq *retval = NULL;
int i_index;
playlist_t * p_playlist = self->p_playlist;
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;
+ i_playlist_size = p_playlist->current.i_size;
retval = 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]->input.psz_uri );
+ retval->data[i_index] = strdup( ARRAY_VAL(p_playlist->current, i_index)->p_input->psz_uri );
}
vlc_mutex_unlock( &p_playlist->object_lock );
mediacontrol_PositionKey a_key,
mediacontrol_Exception *exception )
{
- mediacontrol_StreamInformation *retval;
+ mediacontrol_StreamInformation *retval = NULL;
input_thread_t *p_input = self->p_playlist->p_input;
vlc_value_t val;
- retval = ( mediacontrol_StreamInformation* )malloc( sizeof( mediacontrol_StreamInformation ) );
+ retval = ( mediacontrol_StreamInformation* )
+ malloc( sizeof( mediacontrol_StreamInformation ) );
if( ! retval )
{
RAISE( mediacontrol_InternalException, "Out of memory" );
break;
}
- retval->url = strdup( p_input->input.p_item->psz_uri );
+ retval->url = strdup( input_GetItem(p_input)->psz_uri );
/* TIME and LENGTH are in microseconds. We want them in ms */
var_Get( p_input, "time", &val);
retval->length = val.i_time / 1000;
retval->position = mediacontrol_unit_convert( p_input,
- mediacontrol_MediaTime, a_key,
- retval->position );
+ mediacontrol_MediaTime, a_key,
+ retval->position );
retval->length = mediacontrol_unit_convert( p_input,
- mediacontrol_MediaTime, a_key,
- retval->length );
+ mediacontrol_MediaTime, a_key,
+ retval->length );
}
return retval;
}
projects / vlc / blobdiff