#include <vlc/libvlc.h>
#include <vlc_demux.h>
#include <vlc_input.h>
-#include "input/input_internal.h"
#include "libvlc_internal.h"
+#include "libvlc.h"
/*
* Release the associated input thread
static void release_input_thread( libvlc_media_instance_t *p_mi )
{
input_thread_t *p_input_thread;
- vlc_bool_t should_destroy;
if( !p_mi || p_mi->i_input_id == -1 )
return;
/* release for previous vlc_object_get */
vlc_object_release( p_input_thread );
- should_destroy = p_input_thread->p_internals->i_refcount == 1;
-
/* release for initial p_input_thread yield (see _new()) */
vlc_object_release( p_input_thread );
/* No one is tracking this input_thread appart us. Destroy it */
- if( should_destroy )
+ if( p_mi->b_own_its_input_thread )
{
/* We owned this one */
input_StopThread( p_input_thread );
{
/* XXX: hack the playlist doesn't retain the input thread,
* so we did it for the playlist (see _new_from_input_thread),
- * revert that here. */
+ * revert that here. This will be deleted with the playlist API */
vlc_object_release( p_input_thread );
}
}
* operation the refcount is 0, the object is destroyed.
* - Accessor _retain increase the refcount by 1 (XXX: to implement) */
p_mi->i_refcount = 1;
+ p_mi->b_own_its_input_thread = VLC_TRUE;
/* object_lock strategy:
* - No lock held in constructor
* - Lock when accessing all variable this lock is held
libvlc_event_manager_register_event_type( p_mi->p_event_manager,
libvlc_MediaInstanceReachedEnd, p_e );
+ libvlc_event_manager_register_event_type( p_mi->p_event_manager,
+ libvlc_MediaInstancePaused, p_e );
+ libvlc_event_manager_register_event_type( p_mi->p_event_manager,
+ libvlc_MediaInstancePlayed, p_e );
+ libvlc_event_manager_register_event_type( p_mi->p_event_manager,
+ libvlc_MediaInstancePositionChanged, p_e );
return p_mi;
}
p_mi->p_md = libvlc_media_descriptor_new_from_input_item(
p_libvlc_instance,
- p_input->p->input.p_item, p_e );
+ input_GetItem( p_input ), p_e );
if( !p_mi->p_md )
{
}
p_mi->i_input_id = p_input->i_object_id;
-
+ p_mi->b_own_its_input_thread = VLC_FALSE;
+
/* will be released in media_instance_release() */
vlc_object_yield( p_input );
vlc_mutex_unlock( &p_mi->object_lock );
vlc_mutex_destroy( &p_mi->object_lock );
- libvlc_event_manager_release( p_mi->p_event_manager );
-
release_input_thread( p_mi );
+ libvlc_event_manager_release( p_mi->p_event_manager );
+
libvlc_media_descriptor_release( p_mi->p_md );
free( p_mi );
p_mi->i_refcount++;
}
+
/**************************************************************************
* Set the Media descriptor associated with the instance
**************************************************************************/
if( (p_input_thread = libvlc_get_input_thread( p_mi, p_e )) )
{
/* A thread alread exists, send it a play message */
- vlc_value_t val;
- val.i_int = PLAYING_S;
-
- input_Control( p_input_thread, INPUT_CONTROL_SET_STATE, PLAYING_S );
+ input_Control( p_input_thread, INPUT_SET_STATE, PLAYING_S );
vlc_object_release( p_input_thread );
return;
}
void libvlc_media_instance_pause( libvlc_media_instance_t *p_mi,
libvlc_exception_t *p_e )
{
- input_thread_t * p_input_thread;
- vlc_value_t val;
- val.i_int = PAUSE_S;
-
- p_input_thread = libvlc_get_input_thread( p_mi, p_e );
+ input_thread_t * p_input_thread = libvlc_get_input_thread( p_mi, p_e );
if( !p_input_thread )
return;
- input_Control( p_input_thread, INPUT_CONTROL_SET_STATE, val );
+ input_Control( p_input_thread, INPUT_SET_STATE, PAUSE_S );
vlc_object_release( p_input_thread );
}
libvlc_media_instance_t *p_mi,
libvlc_exception_t *p_e)
{
+ input_thread_t *p_input_thread = libvlc_get_input_thread ( p_mi, p_e );
double f_fps = 0.0;
- input_thread_t *p_input_thread;
-
- p_input_thread = libvlc_get_input_thread ( p_mi, p_e );
- if( !p_input_thread )
- return 0.0;
- if( (NULL == p_input_thread->p->input.p_demux)
- || demux2_Control( p_input_thread->p->input.p_demux, DEMUX_GET_FPS, &f_fps )
- || f_fps < 0.1 )
- {
- vlc_object_release( p_input_thread );
- return 0.0;
- }
- else
+ if( p_input_thread )
{
+ if( input_Control( p_input_thread, INPUT_GET_VIDEO_FPS, &f_fps ) )
+ f_fps = 0.0;
vlc_object_release( p_input_thread );
- return( f_fps );
}
+ return f_fps;
}
vlc_bool_t libvlc_media_instance_will_play(