[gtk/cherry-pick-7db87a88] Merge branch 'fix-gst-media-file' into 'master'




commit 06a0265efa7aab59aaa96c86cc2b0b1406e2bb0f
Author: Benjamin Otte <otte benjamin googlemail com>
Date:   Wed May 19 16:22:35 2021 +0000

    Merge branch 'fix-gst-media-file' into 'master'
    
    gtkgstmediafile: Remove media-info-updated callback
    
    Closes #3913
    
    See merge request GNOME/gtk!3565
    
    (cherry picked from commit 7db87a8889d9151df61dafd7d188a89fe08f655f)
    
    12a9a0fa gtkgstmediafile: Remove media-info-updated callback

 modules/media/gtkgstmediafile.c | 10 ----------
 1 file changed, 10 deletions(-)
---
diff --git a/modules/media/gtkgstmediafile.c b/modules/media/gtkgstmediafile.c
index b5b1d772b0..d64fe660b5 100644
--- a/modules/media/gtkgstmediafile.c
+++ b/modules/media/gtkgstmediafile.c
@@ -170,14 +170,6 @@ gtk_gst_media_file_position_updated_cb (GstPlayer       *player,
   gtk_media_stream_update (GTK_MEDIA_STREAM (self), FROM_GST_TIME (time));
 }
 
-static void
-gtk_gst_media_file_media_info_updated_cb (GstPlayer          *player,
-                                          GstPlayerMediaInfo *media_info,
-                                          GtkGstMediaFile    *self)
-{
-  gtk_gst_media_file_ensure_prepared (self);
-}
-
 static void
 gtk_gst_media_file_seek_done_cb (GstPlayer       *player,
                                  GstClockTime     time,
@@ -225,7 +217,6 @@ gtk_gst_media_file_destroy_player (GtkGstMediaFile *self)
   if (self->player == NULL)
     return;
 
-  g_signal_handlers_disconnect_by_func (self->player, gtk_gst_media_file_media_info_updated_cb, self);
   g_signal_handlers_disconnect_by_func (self->player, gtk_gst_media_file_position_updated_cb, self);
   g_signal_handlers_disconnect_by_func (self->player, gtk_gst_media_file_end_of_stream_cb, self);
   g_signal_handlers_disconnect_by_func (self->player, gtk_gst_media_file_seek_done_cb, self);
@@ -244,7 +235,6 @@ gtk_gst_media_file_create_player (GtkGstMediaFile *file)
 
   self->player = gst_player_new (GST_PLAYER_VIDEO_RENDERER (g_object_ref (self->paintable)),
                                  gst_player_g_main_context_signal_dispatcher_new (NULL));
-  g_signal_connect (self->player, "media-info-updated", G_CALLBACK 
(gtk_gst_media_file_media_info_updated_cb), self);
   g_signal_connect (self->player, "position-updated", G_CALLBACK (gtk_gst_media_file_position_updated_cb), 
self);
   g_signal_connect (self->player, "end-of-stream", G_CALLBACK (gtk_gst_media_file_end_of_stream_cb), self);
   g_signal_connect (self->player, "seek-done", G_CALLBACK (gtk_gst_media_file_seek_done_cb), self);


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]