[gtk/wip/ricotz/mediafile] mediafile: Use correct return-type for factory methods
- From: Rico Tzschichholz <ricotz src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gtk/wip/ricotz/mediafile] mediafile: Use correct return-type for factory methods
- Date: Mon, 23 Sep 2019 12:14:20 +0000 (UTC)
commit 70b2c750432f6cea07011857c5b2b5cc6a90db0c
Author: Rico Tzschichholz <ricotz ubuntu com>
Date: Mon Sep 23 14:09:50 2019 +0200
mediafile: Use correct return-type for factory methods
gtk/gtkmediafile.c | 14 +++++++-------
gtk/gtkmediafile.h | 10 +++++-----
2 files changed, 12 insertions(+), 12 deletions(-)
---
diff --git a/gtk/gtkmediafile.c b/gtk/gtkmediafile.c
index bc050eedfb..18307942eb 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,7 +268,7 @@ gtk_media_file_new (void)
*
* Returns: a new #GtkMediaFile playing @filename
**/
-GtkMediaStream *
+GtkMediaFile *
gtk_media_file_new_for_filename (const char *filename)
{
GtkMediaStream *result;
@@ -296,7 +296,7 @@ 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;
@@ -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);
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]