dany/clapper
1
0
Fork 0
mirror of https://github.com/Rafostar/clapper.git synced 2025-09-01 08:51:59 +02:00
Code Issues Packages Projects Releases Wiki Activity

API: make it autoplay on the same context invoke

Browse Source
This commit is contained in:
Rafał Dzięgiel
2021-04-26 14:47:42 +02:00
parent c6e8824e3b
commit a8aca7b3c0
2 changed files with 23 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

40
lib/gst/clapper/gstclapper.c vendored
View File

@@ -550,10 +550,9 @@ gst_clapper_set_uri_internal (gpointer user_data)
gst_clapper_stop_internal (self, FALSE); gst_clapper_stop_internal (self, FALSE);
g_mutex_lock (&self->lock); g_mutex_lock (&self->lock);
GST_DEBUG_OBJECT (self, "Changing URI to '%s'", GST_STR_NULL (self->uri)); GST_DEBUG_OBJECT (self, "Changing URI to '%s'", GST_STR_NULL (self->uri));
g_object_set (self->playbin, "uri", self->uri, NULL); g_object_set (self->playbin, "uri", self->uri, NULL);
g_object_set (self->playbin, "suburi", NULL, NULL);
if (g_signal_handler_find (self, G_SIGNAL_MATCH_ID, if (g_signal_handler_find (self, G_SIGNAL_MATCH_ID,
signals[SIGNAL_URI_LOADED], 0, NULL, NULL, NULL) != 0) { signals[SIGNAL_URI_LOADED], 0, NULL, NULL, NULL) != 0) {
@@ -566,10 +565,10 @@ gst_clapper_set_uri_internal (gpointer user_data)
(GDestroyNotify) uri_loaded_signal_data_free); (GDestroyNotify) uri_loaded_signal_data_free);
} }
g_object_set (self->playbin, "suburi", NULL, NULL);
g_mutex_unlock (&self->lock); g_mutex_unlock (&self->lock);
gst_clapper_play_internal (self);
return G_SOURCE_REMOVE; return G_SOURCE_REMOVE;
} }
@@ -3086,6 +3085,11 @@ gst_clapper_play (GstClapper * self)
{ {
g_return_if_fail (GST_IS_CLAPPER (self)); g_return_if_fail (GST_IS_CLAPPER (self));
if (self->app_state == GST_CLAPPER_STATE_STOPPED) {
GST_DEBUG_OBJECT (self, "Player stopped, play request ignored");
return;
}
g_mutex_lock (&self->lock); g_mutex_lock (&self->lock);
self->inhibit_sigs = FALSE; self->inhibit_sigs = FALSE;
g_mutex_unlock (&self->lock); g_mutex_unlock (&self->lock);
@@ -3157,15 +3161,22 @@ gst_clapper_pause (GstClapper * self)
{ {
g_return_if_fail (GST_IS_CLAPPER (self)); g_return_if_fail (GST_IS_CLAPPER (self));
/* Do not try to pause on DVD navigation */ if (self->app_state == GST_CLAPPER_STATE_STOPPED) {
if (G_LIKELY (self->cached_duration > 1000000000)) { GST_DEBUG_OBJECT (self, "Player stopped, pause request ignored");
g_mutex_lock (&self->lock); return;
self->inhibit_sigs = FALSE;
g_mutex_unlock (&self->lock);
g_main_context_invoke_full (self->context, G_PRIORITY_DEFAULT,
gst_clapper_pause_internal, self, NULL);
} }
if (G_UNLIKELY (self->cached_duration <= GST_SECOND)) {
GST_DEBUG_OBJECT (self, "Cannot pause on this stream");
return;
}
g_mutex_lock (&self->lock);
self->inhibit_sigs = FALSE;
g_mutex_unlock (&self->lock);
g_main_context_invoke_full (self->context, G_PRIORITY_DEFAULT,
gst_clapper_pause_internal, self, NULL);
} }
/** /**
@@ -3180,11 +3191,6 @@ gst_clapper_toggle_play (GstClapper * self)
{ {
g_return_if_fail (GST_IS_CLAPPER (self)); g_return_if_fail (GST_IS_CLAPPER (self));
if (self->app_state == GST_CLAPPER_STATE_STOPPED) {
GST_DEBUG_OBJECT (self, "Player stopped, toggle_play ignored");
return;
}
if (self->app_state == GST_CLAPPER_STATE_PLAYING) if (self->app_state == GST_CLAPPER_STATE_PLAYING)
gst_clapper_pause (self); gst_clapper_pause (self);
else else

1
src/player.js
View File

@@ -588,7 +588,6 @@ class ClapperPlayer extends GstClapper.Clapper
} }
} }
} }
this.play();
} }
_onPlayerWarning(player, error) _onPlayerWarning(player, error)