[gtk/wip/ricotz/mediafile] mediafile: Use correct return-type for factory methods

[Rico Tzschichholz <ricotz src gnome org>]

commit eeb8dbbcb6f221d75e264fca47cca384adb86aaf
Author: Rico Tzschichholz <ricotz ubuntu com>
Date:   Mon Sep 23 14:09:50 2019 +0200

    mediafile: Use correct return-type for factory methods

 demos/gtk-demo/fishbowl.c       |  2 +-
 demos/gtk-demo/sliding_puzzle.c |  2 +-
 gtk/gtkmediafile.c              | 18 +++++++++---------
 gtk/gtkmediafile.h              | 10 +++++-----
 gtk/gtkvideo.c                  | 10 +++++-----
 5 files changed, 21 insertions(+), 21 deletions(-)
---
diff --git a/demos/gtk-demo/fishbowl.c b/demos/gtk-demo/fishbowl.c
index 45f63710b0..38c2d88c36 100644
--- a/demos/gtk-demo/fishbowl.c
+++ b/demos/gtk-demo/fishbowl.c
@@ -133,7 +133,7 @@ create_label (void)
 static GtkWidget *
 create_video (void)
 {
-  GtkMediaStream *stream = gtk_media_file_new_for_resource ("/images/gtk-logo.webm");
+  GtkMediaStream *stream = GTK_MEDIA_STREAM (gtk_media_file_new_for_resource ("/images/gtk-logo.webm"));
   GtkWidget *w = gtk_picture_new_for_paintable (GDK_PAINTABLE (stream));
 
   gtk_widget_set_size_request (w, 64, 64);
diff --git a/demos/gtk-demo/sliding_puzzle.c b/demos/gtk-demo/sliding_puzzle.c
index 9486004605..6a8a86198d 100644
--- a/demos/gtk-demo/sliding_puzzle.c
+++ b/demos/gtk-demo/sliding_puzzle.c
@@ -427,7 +427,7 @@ do_sliding_puzzle (GtkWidget *do_widget)
       gtk_style_context_add_class (gtk_widget_get_style_context (choices), GTK_STYLE_CLASS_VIEW);
       add_choice (choices, puzzle);
       add_choice (choices, gtk_nuclear_animation_new ());
-      media = gtk_media_file_new_for_resource ("/images/gtk-logo.webm");
+      media = GTK_MEDIA_STREAM (gtk_media_file_new_for_resource ("/images/gtk-logo.webm"));
       gtk_media_stream_set_loop (media, TRUE);
       gtk_media_stream_set_muted (media, TRUE);
       gtk_media_stream_play (media);
diff --git a/gtk/gtkmediafile.c b/gtk/gtkmediafile.c
index bc050eedfb..9d89add750 100644
--- a/gtk/gtkmediafile.c
+++ b/gtk/gtkmediafile.c
@@ -253,7 +253,7 @@ gtk_media_file_get_impl_type (void)
  *
  * Returns: a new #GtkMediaFile
  **/
-GtkMediaStream *
+GtkMediaFile *
 gtk_media_file_new (void)
 {
   return g_object_new (gtk_media_file_get_impl_type (), NULL);
@@ -268,10 +268,10 @@ gtk_media_file_new (void)
  *
  * Returns: a new #GtkMediaFile playing @filename
  **/
-GtkMediaStream *
+GtkMediaFile *
 gtk_media_file_new_for_filename (const char *filename)
 {
-  GtkMediaStream *result;
+  GtkMediaFile *result;
   GFile *file;
 
   if (filename)
@@ -296,10 +296,10 @@ gtk_media_file_new_for_filename (const char *filename)
  *
  * Returns: a new #GtkMediaFile playing @resource_path
  **/
-GtkMediaStream *
+GtkMediaFile *
 gtk_media_file_new_for_resource (const char *resource_path)
 {
-  GtkMediaStream *result;
+  GtkMediaFile *result;
   GFile *file;
 
   if (resource_path)
@@ -329,13 +329,13 @@ gtk_media_file_new_for_resource (const char *resource_path)
 
 /**
  * gtk_media_file_new_for_file:
- * @file: (allow-none): The file to play
+ * @file: The file to play
  *
  * Creates a new media file to play @file. 
  *
  * Returns: a new #GtkMediaFile playing @file
  **/
-GtkMediaStream *
+GtkMediaFile *
 gtk_media_file_new_for_file (GFile *file)
 {
   g_return_val_if_fail (file == NULL || G_IS_FILE (file), NULL);
@@ -347,7 +347,7 @@ gtk_media_file_new_for_file (GFile *file)
 
 /**
  * gtk_media_file_new_for_input_stream:
- * @stream: (allow-none): The stream to play
+ * @stream: The stream to play
  *
  * Creates a new media file to play @stream. If you want the
  * resulting media to be seekable, the stream should implement
@@ -355,7 +355,7 @@ gtk_media_file_new_for_file (GFile *file)
  *
  * Returns: a new #GtkMediaFile
  **/
-GtkMediaStream *
+GtkMediaFile *
 gtk_media_file_new_for_input_stream (GInputStream *stream)
 {
   g_return_val_if_fail (stream == NULL || G_IS_INPUT_STREAM (stream), NULL);
diff --git a/gtk/gtkmediafile.h b/gtk/gtkmediafile.h
index daa17d9aa8..3f25f1fd04 100644
--- a/gtk/gtkmediafile.h
+++ b/gtk/gtkmediafile.h
@@ -50,15 +50,15 @@ struct _GtkMediaFileClass
 };
 
 GDK_AVAILABLE_IN_ALL
-GtkMediaStream *        gtk_media_file_new                      (void);
+GtkMediaFile *          gtk_media_file_new                      (void);
 GDK_AVAILABLE_IN_ALL
-GtkMediaStream *        gtk_media_file_new_for_filename         (const char     *filename);
+GtkMediaFile *          gtk_media_file_new_for_filename         (const char     *filename);
 GDK_AVAILABLE_IN_ALL
-GtkMediaStream *        gtk_media_file_new_for_resource         (const char     *resource_path);
+GtkMediaFile *          gtk_media_file_new_for_resource         (const char     *resource_path);
 GDK_AVAILABLE_IN_ALL
-GtkMediaStream *        gtk_media_file_new_for_file             (GFile          *file);
+GtkMediaFile *          gtk_media_file_new_for_file             (GFile          *file);
 GDK_AVAILABLE_IN_ALL
-GtkMediaStream *        gtk_media_file_new_for_input_stream     (GInputStream   *stream);
+GtkMediaFile *          gtk_media_file_new_for_input_stream     (GInputStream   *stream);
 
 GDK_AVAILABLE_IN_ALL
 void                    gtk_media_file_clear                    (GtkMediaFile   *self);
diff --git a/gtk/gtkvideo.c b/gtk/gtkvideo.c
index 3813d4e80c..fcc78b52dd 100644
--- a/gtk/gtkvideo.c
+++ b/gtk/gtkvideo.c
@@ -666,15 +666,15 @@ gtk_video_set_file (GtkVideo *self,
 
   if (file)
     {
-      GtkMediaStream *stream;
+      GtkMediaFile *media_file;
 
-      stream = gtk_media_file_new ();
+      media_file = gtk_media_file_new ();
 
-      gtk_video_set_media_stream (self, stream);
+      gtk_video_set_media_stream (self, GTK_MEDIA_STREAM (media_file));
       if (gtk_widget_get_realized (GTK_WIDGET (self)))
-        gtk_media_file_set_file (GTK_MEDIA_FILE (stream), file);
+        gtk_media_file_set_file (media_file, file);
 
-      g_object_unref (stream);
+      g_object_unref (media_file);
     }
   else
     {