return p_input_thread;
}
+/*
+ * Set the internal state of the media_player. (media player Internal)
+ *
+ * Function will lock the media_player.
+ */
+static void set_state( libvlc_media_player_t *p_mi, libvlc_state_t state )
+{
+ lock(p_mi);
+ p_mi->state = state;
+ libvlc_media_t *media = p_mi->p_md;
+ if (media)
+ libvlc_media_retain(media);
+ unlock(p_mi);
+
+
+ if (media) {
+ // Also set the state of the corresponding media
+ // This is strictly for convenience.
+ libvlc_media_set_state(media, state);
+
+ libvlc_media_release(media);
+ }
+}
+
static int
input_seekable_changed( vlc_object_t * p_this, char const * psz_cmd,
vlc_value_t oldval, vlc_value_t newval,
libvlc_media_player_t * p_mi = p_userdata;
libvlc_event_t event;
- libvlc_media_set_state( p_mi->p_md, libvlc_NothingSpecial );
event.type = libvlc_MediaPlayerSeekableChanged;
event.u.media_player_seekable_changed.new_seekable = newval.b_bool;
libvlc_media_player_t * p_mi = p_userdata;
libvlc_event_t event;
- libvlc_media_set_state( p_mi->p_md, libvlc_NothingSpecial );
event.type = libvlc_MediaPlayerPausableChanged;
event.u.media_player_pausable_changed.new_pausable = newval.b_bool;
default:
return VLC_SUCCESS;
}
-
- libvlc_media_set_state( p_mi->p_md, libvlc_state );
+
+ set_state( p_mi, libvlc_state );
libvlc_event_send( p_mi->p_event_manager, &event );
}
else if( newval.i_int == INPUT_EVENT_ABORT )
libvlc_state_t libvlc_state = libvlc_Stopped;
event.type = libvlc_MediaPlayerStopped;
- libvlc_media_set_state( p_mi->p_md, libvlc_state );
+ set_state( p_mi, libvlc_state );
libvlc_event_send( p_mi->p_event_manager, &event );
}
else if( newval.i_int == INPUT_EVENT_POSITION )
mp->drawable.hwnd = NULL;
mp->drawable.nsobject = NULL;
mp->keyboard_events = mp->mouse_events = 1;
+ mp->state = libvlc_NothingSpecial;
mp->p_libvlc_instance = instance;
mp->p_input_thread = NULL;
mp->p_input_resource = NULL;
var_DelCallback( p_mi->p_libvlc_instance->p_libvlc_int,
"snapshot-file", snapshot_was_taken, p_mi );
- /* Release the input thread */
- release_input_thread( p_mi, true );
+ /* If the input thread hasn't been already deleted it means
+ * that the owners didn't stop the thread before releasing it. */
+ assert(!p_mi->p_input_thread);
+
+ /* Fallback for those who don't use NDEBUG */
+ if (p_mi->p_input_thread)
+ release_input_thread(p_mi, true);
if( p_mi->p_input_resource )
{
{
VLC_UNUSED(p_e);
- if( !p_mi )
- return;
-
lock(p_mi);
/* FIXME I am not sure if it is a user request or on die(eof/error)
p_mi->p_input_thread &&
!p_mi->p_input_thread->b_eof &&
!p_mi->p_input_thread->b_error );
+ unlock(p_mi);
+
+ set_state( p_mi, libvlc_NothingSpecial );
- if( p_mi->p_md )
- libvlc_media_set_state( p_mi->p_md, libvlc_NothingSpecial );
+ lock(p_mi);
libvlc_media_release( p_mi->p_md );
{
libvlc_state_t state = libvlc_media_player_get_state( p_mi, p_e );
- if( state == libvlc_Playing ||
- state == libvlc_Paused ||
- state == libvlc_Buffering )
+ lock(p_mi);
+ release_input_thread( p_mi, true ); /* This will stop the input thread */
+ unlock(p_mi);
+
+ /* Force to go to stopped state, in case we were in Ended, or Error
+ * state. */
+ if( state != libvlc_Stopped )
{
- /* Send a stop notification event only if we are in playing,
- * buffering or paused states */
- libvlc_media_set_state( p_mi->p_md, libvlc_Stopped );
+ set_state( p_mi, libvlc_Stopped );
/* Construct and send the event */
libvlc_event_t event;
event.type = libvlc_MediaPlayerStopped;
libvlc_event_send( p_mi->p_event_manager, &event );
}
-
- lock(p_mi);
- release_input_thread( p_mi, true ); /* This will stop the input thread */
- unlock(p_mi);
}
/**************************************************************************
int libvlc_media_player_will_play( libvlc_media_player_t *p_mi,
libvlc_exception_t *p_e)
{
+ bool b_will_play;
input_thread_t *p_input_thread =
libvlc_get_input_thread ( p_mi, p_e);
if ( !p_input_thread )
return false;
- if ( !p_input_thread->b_die && !p_input_thread->b_dead )
- {
- vlc_object_release( p_input_thread );
- return true;
- }
+ b_will_play = !p_input_thread->b_die && !p_input_thread->b_dead;
vlc_object_release( p_input_thread );
- return false;
+
+ return b_will_play;
}
void libvlc_media_player_set_rate(
return;
}
- var_SetInteger( p_input_thread, "rate", 1000.0f/rate );
+ var_SetFloat( p_input_thread, "rate", rate );
vlc_object_release( p_input_thread );
}
libvlc_exception_t *p_e )
{
input_thread_t *p_input_thread;
- int i_rate;
+ float f_rate;
bool b_can_rewind;
p_input_thread = libvlc_get_input_thread ( p_mi, p_e );
if( !p_input_thread )
return 0.0; /* rate < 0 indicates rewind */
- i_rate = var_GetInteger( p_input_thread, "rate" );
+ f_rate = var_GetFloat( p_input_thread, "rate" );
b_can_rewind = var_GetBool( p_input_thread, "can-rewind" );
- if( i_rate < 0 && !b_can_rewind )
+ /* FIXME: why are negative values forbidden ?? (rewinding) */
+ if( f_rate < 0 && !b_can_rewind )
{
vlc_object_release( p_input_thread );
return 0.0;
}
vlc_object_release( p_input_thread );
- return (float)1000.0f/i_rate;
+ return f_rate;
}
-libvlc_state_t libvlc_media_player_get_state(
- libvlc_media_player_t *p_mi,
- libvlc_exception_t *p_e )
+libvlc_state_t libvlc_media_player_get_state( libvlc_media_player_t *p_mi, libvlc_exception_t *p_e )
{
- input_thread_t *p_input_thread;
- libvlc_state_t state = libvlc_Ended;
-
- p_input_thread = libvlc_get_input_thread ( p_mi, p_e );
- if( !p_input_thread )
- {
- /* We do return the right value, no need to throw an exception */
- clear_if_needed(p_e);
- return state;
- }
-
- state = libvlc_media_get_state( p_mi->p_md );
- if( state == libvlc_Playing )
- {
- float caching;
- caching = var_GetFloat( p_input_thread, "cache" );
- if( caching > 0.0 && caching < 1.0 )
- state = libvlc_Buffering;
- }
- vlc_object_release( p_input_thread );
+ VLC_UNUSED(p_e);
+ lock(p_mi);
+ libvlc_state_t state = p_mi->state;
+ unlock(p_mi);
return state;
}
projects / vlc / blobdiff