/*****************************************************************************
- * core.c: Core functions : init, playlist, stream management
+ * core.c: Core libvlc new API functions : initialization, exceptions handling
*****************************************************************************
* Copyright (C) 2005 the VideoLAN team
- * $Id: vlc.c 10786 2005-04-23 23:19:17Z zorglub $
+ * $Id$
*
- * Authors: Olivier Aubert <olivier.aubert@liris.univ-lyon1.fr>
+ * Authors: Clément Stenac <zorglub@videolan.org>
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
*
* 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 <stdarg.h>
+#include "libvlc_internal.h"
+#include <vlc/libvlc.h>
-#include <vlc/control.h>
+#include <vlc_interface.h>
-#include <vlc/intf.h>
-#include <vlc/vout.h>
-#include <vlc/aout.h>
-#include <vlc_demux.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
-#include <sys/types.h>
-
-#define RAISE( c, m ) exception->code = c; \
- exception->message = strdup(m);
-
-
-mediacontrol_Instance* mediacontrol_new_from_object( vlc_object_t* p_object,
- mediacontrol_Exception *exception )
+/*************************************************************************
+ * Exceptions handling
+ *************************************************************************/
+void libvlc_exception_init( libvlc_exception_t *p_exception )
{
- mediacontrol_Instance* retval;
- vlc_object_t *p_vlc;
-
- 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;
-
- /* 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 );
-
- if( ! retval->p_playlist || ! retval->p_intf )
- {
- RAISE( mediacontrol_InternalException, "No available interface" );
- return NULL;
- }
- return retval;
-};
-
+ p_exception->b_raised = 0;
+ p_exception->psz_message = NULL;
+}
-/**************************************************************************
- * Playback management
- **************************************************************************/
-mediacontrol_Position*
-mediacontrol_get_media_position( mediacontrol_Instance *self,
- const mediacontrol_PositionOrigin an_origin,
- const mediacontrol_PositionKey a_key,
- mediacontrol_Exception *exception )
+void libvlc_exception_clear( libvlc_exception_t *p_exception )
{
- mediacontrol_Position* retval;
- vlc_value_t val;
- input_thread_t * p_input = self->p_playlist->p_input;
-
- 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 );
- */
- retval->value = 0;
- return retval;
- }
-
- if( an_origin == mediacontrol_RelativePosition
- || an_origin == mediacontrol_ModuloPosition )
- {
- /* Relative or ModuloPosition make no sense */
- retval->value = 0;
- return retval;
- }
-
- /* 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 );
- return retval;
+ if( p_exception->psz_message )
+ free( p_exception->psz_message );
+ p_exception->psz_message = NULL;
+ p_exception->b_raised = 0;
}
-/* Sets the media position */
-void
-mediacontrol_set_media_position( mediacontrol_Instance *self,
- const mediacontrol_Position * a_position,
- mediacontrol_Exception *exception )
+int libvlc_exception_raised( libvlc_exception_t *p_exception )
{
- vlc_value_t val;
- input_thread_t * p_input = self->p_playlist->p_input;
-
- 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;
- }
-
- val.i_time = mediacontrol_position2microsecond( p_input, a_position );
- var_Set( p_input, "time", val );
- return;
+ return (NULL != p_exception) && p_exception->b_raised;
}
-/* Starts playing a stream */
-void
-mediacontrol_start( mediacontrol_Instance *self,
- const mediacontrol_Position * a_position,
- mediacontrol_Exception *exception )
+char *libvlc_exception_get_message( libvlc_exception_t *p_exception )
{
- playlist_t * p_playlist = self->p_playlist;
-
- exception = mediacontrol_exception_init( exception );
- if( ! p_playlist )
- {
- RAISE( mediacontrol_PlaylistException, "No available playlist" );
- return;
- }
-
- vlc_mutex_lock( &p_playlist->object_lock );
- if( p_playlist->i_size )
- {
- vlc_value_t val;
-
- vlc_mutex_unlock( &p_playlist->object_lock );
-
- /* Set start time */
- val.i_int = mediacontrol_position2microsecond( p_playlist->p_input, a_position ) / 1000000;
- var_Set( p_playlist, "start-time", val );
-
- playlist_Play( p_playlist );
- }
- else
+ if( p_exception->b_raised == 1 && p_exception->psz_message )
{
- RAISE( mediacontrol_PlaylistException, "Empty playlist." );
- vlc_mutex_unlock( &p_playlist->object_lock );
- return;
+ return p_exception->psz_message;
}
-
- return;
+ return NULL;
}
-void
-mediacontrol_pause( mediacontrol_Instance *self,
- const mediacontrol_Position * a_position,
- mediacontrol_Exception *exception )
+void libvlc_exception_raise( libvlc_exception_t *p_exception,
+ const char *psz_format, ... )
{
- input_thread_t *p_input = self->p_playlist->p_input;;
+ va_list args;
- /* 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" );
- }
+ /* does caller care about exceptions ? */
+ if( p_exception == NULL ) return;
- return;
-}
+ /* remove previous exception if it wasn't cleared */
+ if( p_exception->b_raised && p_exception->psz_message )
+ free(p_exception->psz_message);
-void
-mediacontrol_resume( mediacontrol_Instance *self,
- const mediacontrol_Position * a_position,
- mediacontrol_Exception *exception )
-{
- input_thread_t *p_input = self->p_playlist->p_input;
+ va_start( args, psz_format );
+ if( vasprintf( &p_exception->psz_message, psz_format, args ) == -1)
+ p_exception->psz_message = NULL;
+ va_end( args );
- /* 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" );
- }
+ p_exception->b_raised = 1;
}
-void
-mediacontrol_stop( mediacontrol_Instance *self,
- const mediacontrol_Position * a_position,
- mediacontrol_Exception *exception )
+libvlc_instance_t * libvlc_new( int argc, char **argv,
+ libvlc_exception_t *p_e )
{
- /* FIXME: use the a_position parameter */
- exception=mediacontrol_exception_init( exception );
- if( !self->p_playlist )
- {
- RAISE( mediacontrol_PlaylistException, "No playlist" );
- return;
- }
+ libvlc_instance_t *p_new;
- playlist_Stop( self->p_playlist );
-}
+ libvlc_int_t *p_libvlc_int = libvlc_InternalCreate();
+ if( !p_libvlc_int ) RAISENULL( "VLC initialization failed" );
-/**************************************************************************
- * Playlist management
- **************************************************************************/
+ p_new = (libvlc_instance_t *)malloc( sizeof( libvlc_instance_t ) );
+ if( !p_new ) RAISENULL( "Out of memory" );
-void
-mediacontrol_playlist_add_item( 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;
- }
+ /** \todo Look for interface settings. If we don't have any, add -I dummy */
+ /* Because we probably don't want a GUI by default */
- playlist_Add( self->p_playlist, psz_file, psz_file , PLAYLIST_REPLACE, 0 );
-}
-
-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;
- }
+ if( libvlc_InternalInit( p_libvlc_int, argc, argv ) )
+ RAISENULL( "VLC initialization failed" );
- playlist_Clear( self->p_playlist );
+ p_new->p_libvlc_int = p_libvlc_int;
+ p_new->p_vlm = NULL;
+ p_new->b_playlist_locked = 0;
+ p_new->p_callback_list = NULL;
+ vlc_mutex_init(p_libvlc_int, &p_new->instance_lock);
+ vlc_mutex_init(p_libvlc_int, &p_new->event_callback_lock);
+
+ libvlc_event_init(p_new, p_e);
- return;
+ return p_new;
}
-mediacontrol_PlaylistSeq *
-mediacontrol_playlist_get_list( mediacontrol_Instance *self,
- mediacontrol_Exception *exception )
+void libvlc_destroy( libvlc_instance_t *p_instance, libvlc_exception_t *p_e )
{
- mediacontrol_PlaylistSeq *retval;
- int i_index;
- playlist_t * p_playlist = self->p_playlist;
- int i_playlist_size;
-
- exception=mediacontrol_exception_init( exception );
- if( !p_playlist )
- {
- RAISE( mediacontrol_PlaylistException, "No playlist" );
- return NULL;
- }
-
- 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++ )
- {
- retval->data[i_index] = strdup( p_playlist->pp_items[i_index]->input.psz_uri );
- }
- vlc_mutex_unlock( &p_playlist->object_lock );
-
- return retval;
+ libvlc_event_fini( p_instance, p_e );
+ vlc_mutex_destroy( &p_instance->instance_lock );
+ vlc_mutex_destroy( &p_instance->event_callback_lock);
+ libvlc_InternalCleanup( p_instance->p_libvlc_int );
+ libvlc_InternalDestroy( p_instance->p_libvlc_int, VLC_FALSE );
+ free( p_instance );
}
-/***************************************************************************
- * Status feedback
- ***************************************************************************/
-
-mediacontrol_StreamInformation *
-mediacontrol_get_stream_information( mediacontrol_Instance *self,
- mediacontrol_PositionKey a_key,
- mediacontrol_Exception *exception )
+int libvlc_get_vlc_id( libvlc_instance_t *p_instance )
{
- mediacontrol_StreamInformation *retval;
- input_thread_t *p_input = self->p_playlist->p_input;
- vlc_value_t val;
-
- retval = ( mediacontrol_StreamInformation* )malloc( sizeof( mediacontrol_StreamInformation ) );
- if( ! retval )
- {
- RAISE( mediacontrol_InternalException, "Out of memory" );
- return NULL;
- }
-
- if( ! p_input )
- {
- /* No p_input defined */
- retval->streamstatus = mediacontrol_UndefinedStatus;
- retval->url = strdup( "None" );
- retval->position = 0;
- retval->length = 0;
- }
- else
- {
- switch( var_GetInteger( p_input, "state" ) )
- {
- case PLAYING_S :
- retval->streamstatus = mediacontrol_PlayingStatus;
- break;
- case PAUSE_S :
- retval->streamstatus = mediacontrol_PauseStatus;
- break;
- case INIT_S :
- retval->streamstatus = mediacontrol_InitStatus;
- break;
- case END_S :
- retval->streamstatus = mediacontrol_EndStatus;
- 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->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 );
- }
- return retval;
+ return p_instance->p_libvlc_int->i_object_id;
}
projects / vlc / blobdiff