diff options
| author | Matthias Clasen <mclasen@redhat.com> | 2021-07-03 09:05:33 -0400 |
|---|---|---|
| committer | Matthias Clasen <mclasen@redhat.com> | 2021-07-03 09:05:33 -0400 |
| commit | 3227aa2c45fa24f195f81fcc8cd56c1059c1869c (patch) | |
| tree | 0198ba0b7aa546f6647220458d29d8e23213bcbb /modules | |
| parent | c88dc98b7c2cc3c64569055770108a4bbc997a04 (diff) | |
| download | gtk+-3227aa2c45fa24f195f81fcc8cd56c1059c1869c.tar.gz | |
mediastream: Rename apis one more time
Before we end up with names that we are unhappy with,
rename things one more time, and update all callers.
Diffstat (limited to 'modules')
| -rw-r--r-- | modules/media/gtkffmediafile.c | 18 | ||||
| -rw-r--r-- | modules/media/gtkgstmediafile.c | 22 |
2 files changed, 20 insertions, 20 deletions
diff --git a/modules/media/gtkffmediafile.c b/modules/media/gtkffmediafile.c index 4964b58886..ff5225e845 100644 --- a/modules/media/gtkffmediafile.c +++ b/modules/media/gtkffmediafile.c @@ -553,13 +553,13 @@ gtk_ff_media_file_open (GtkMediaFile *file) return; } - gtk_media_stream_set_prepared (GTK_MEDIA_STREAM (video), - FALSE, - video->codec_ctx != NULL, - TRUE, - video->format_ctx->duration != AV_NOPTS_VALUE - ? av_rescale (video->format_ctx->duration, G_USEC_PER_SEC, AV_TIME_BASE) - : 0); + gtk_media_stream_stream_prepared (GTK_MEDIA_STREAM (video), + FALSE, + video->codec_ctx != NULL, + TRUE, + video->format_ctx->duration != AV_NOPTS_VALUE + ? av_rescale (video->format_ctx->duration, G_USEC_PER_SEC, AV_TIME_BASE) + : 0); gdk_paintable_invalidate_size (GDK_PAINTABLE (video)); @@ -632,7 +632,7 @@ gtk_ff_media_file_next_frame_cb (gpointer data) if (!gtk_media_stream_get_loop (GTK_MEDIA_STREAM (video)) || !gtk_ff_media_file_restart (video)) { - gtk_media_stream_set_ended (GTK_MEDIA_STREAM (video)); + gtk_media_stream_stream_ended (GTK_MEDIA_STREAM (video)); return G_SOURCE_REMOVE; } @@ -733,7 +733,7 @@ gtk_ff_media_file_seek (GtkMediaStream *stream, { gtk_ff_media_file_pause (stream); if (!gtk_ff_media_file_play (stream)) - gtk_media_stream_set_ended (stream); + gtk_media_stream_stream_ended (stream); } } diff --git a/modules/media/gtkgstmediafile.c b/modules/media/gtkgstmediafile.c index d1ebab1506..6f09d1dbc8 100644 --- a/modules/media/gtkgstmediafile.c +++ b/modules/media/gtkgstmediafile.c @@ -137,11 +137,11 @@ gtk_gst_media_file_ensure_prepared (GtkGstMediaFile *self) media_info = gst_player_get_media_info (self->player); if (media_info) { - gtk_media_stream_set_prepared (GTK_MEDIA_STREAM (self), - gst_player_media_info_get_audio_streams (media_info) != NULL, - gst_player_media_info_get_video_streams (media_info) != NULL, - gst_player_media_info_is_seekable (media_info), - FROM_GST_TIME (gst_player_media_info_get_duration (media_info))); + gtk_media_stream_stream_prepared (GTK_MEDIA_STREAM (self), + gst_player_media_info_get_audio_streams (media_info) != NULL, + gst_player_media_info_get_video_streams (media_info) != NULL, + gst_player_media_info_is_seekable (media_info), + FROM_GST_TIME (gst_player_media_info_get_duration (media_info))); g_object_unref (media_info); } @@ -152,11 +152,11 @@ gtk_gst_media_file_ensure_prepared (GtkGstMediaFile *self) * * Only for seeking we can't do a thing, because with 0 duration we can't seek anywhere. */ - gtk_media_stream_set_prepared (GTK_MEDIA_STREAM (self), - TRUE, - TRUE, - FALSE, - 0); + gtk_media_stream_stream_prepared (GTK_MEDIA_STREAM (self), + TRUE, + TRUE, + FALSE, + 0); } } @@ -208,7 +208,7 @@ gtk_gst_media_file_end_of_stream_cb (GstPlayer *player, return; } - gtk_media_stream_set_ended (GTK_MEDIA_STREAM (self)); + gtk_media_stream_stream_ended (GTK_MEDIA_STREAM (self)); } static void |