summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSebastian Dröge <sebastian@centricular.com>2016-01-04 09:59:40 +0200
committerSebastian Dröge <sebastian@centricular.com>2016-01-04 09:59:40 +0200
commit14b945de5a98fe3d3ab306651ad3ecb494a1743d (patch)
tree60a17f06296a493acb3fd223786166da5fa07299
parent32c91cf0a1571f6495cc04cd1e058c1fb9213ed6 (diff)
player: Remove gst_player_new() and make gst_player_new_full() the normal constructor
In very few cases the simple version was actually needed and having the parameters hidden by a _full() version caused application that actually needed it to not use it.
-rw-r--r--android/jni/player.c2
-rw-r--r--docs/lib/gst-player-sections.txt1
-rw-r--r--gst-play/gst-play.c2
-rw-r--r--gtk/gtk-play.c2
-rw-r--r--ios/GstPlay/VideoViewController.m2
-rw-r--r--lib/gst/player/gstplayer.c13
-rw-r--r--lib/gst/player/gstplayer.h3
-rw-r--r--qt/qgstplayer.cpp2
-rw-r--r--tests/player.c8
9 files changed, 11 insertions, 24 deletions
diff --git a/android/jni/player.c b/android/jni/player.c
index 133d970..ee53708 100644
--- a/android/jni/player.c
+++ b/android/jni/player.c
@@ -199,7 +199,7 @@ native_new (JNIEnv * env, jobject thiz)
Player *player = g_new0 (Player, 1);
player->renderer = gst_player_video_overlay_video_renderer_new (NULL);
- player->player = gst_player_new_full (player->renderer, NULL);
+ player->player = gst_player_new (player->renderer, NULL);
SET_CUSTOM_DATA (env, thiz, native_player_field_id, player);
player->java_player = (*env)->NewGlobalRef (env, thiz);
diff --git a/docs/lib/gst-player-sections.txt b/docs/lib/gst-player-sections.txt
index 5bada67..247c34b 100644
--- a/docs/lib/gst-player-sections.txt
+++ b/docs/lib/gst-player-sections.txt
@@ -3,7 +3,6 @@
GstPlayer
gst_player_new
-gst_player_new_full
gst_player_play
gst_player_pause
diff --git a/gst-play/gst-play.c b/gst-play/gst-play.c
index 95b9d4f..46f6d62 100644
--- a/gst-play/gst-play.c
+++ b/gst-play/gst-play.c
@@ -357,7 +357,7 @@ play_new (gchar ** uris, gdouble initial_volume)
play->cur_idx = -1;
play->player =
- gst_player_new_full (NULL, gst_player_g_main_context_signal_dispatcher_new
+ gst_player_new (NULL, gst_player_g_main_context_signal_dispatcher_new
(NULL));
g_signal_connect (play->player, "position-updated",
diff --git a/gtk/gtk-play.c b/gtk/gtk-play.c
index 0e6ac76..51d0bf0 100644
--- a/gtk/gtk-play.c
+++ b/gtk/gtk-play.c
@@ -1732,7 +1732,7 @@ gtk_play_constructor (GType type, guint n_construct_params,
create_ui (self);
self->player =
- gst_player_new_full (self->renderer,
+ gst_player_new (self->renderer,
gst_player_g_main_context_signal_dispatcher_new (NULL));
g_signal_connect (self->player, "position-updated",
diff --git a/ios/GstPlay/VideoViewController.m b/ios/GstPlay/VideoViewController.m
index eda419c..19c3799 100644
--- a/ios/GstPlay/VideoViewController.m
+++ b/ios/GstPlay/VideoViewController.m
@@ -63,7 +63,7 @@
media_width = 320;
media_height = 240;
- player = gst_player_new_full (gst_player_video_overlay_video_renderer_new ((__bridge gpointer)(video_view)), NULL);
+ player = gst_player_new (gst_player_video_overlay_video_renderer_new ((__bridge gpointer)(video_view)), NULL);
g_object_set (player, "uri", [uri UTF8String], NULL);
gst_debug_set_threshold_for_name("gst-player", GST_LEVEL_TRACE);
diff --git a/lib/gst/player/gstplayer.c b/lib/gst/player/gstplayer.c
index 94892b7..78f36d5 100644
--- a/lib/gst/player/gstplayer.c
+++ b/lib/gst/player/gstplayer.c
@@ -2491,17 +2491,6 @@ gst_player_init_once (G_GNUC_UNUSED gpointer user_data)
/**
* gst_player_new:
- *
- * Returns: a new #GstPlayer instance
- */
-GstPlayer *
-gst_player_new (void)
-{
- return gst_player_new_full (NULL, NULL);
-}
-
-/**
- * gst_player_new_full:
* @video_renderer: (transfer full) (allow-none): GstPlayerVideoRenderer to use
* @signal_dispatcher: (transfer full) (allow-none): GstPlayerSignalDispatcher to use
*
@@ -2516,7 +2505,7 @@ gst_player_new (void)
* Returns: a new #GstPlayer instance
*/
GstPlayer *
-gst_player_new_full (GstPlayerVideoRenderer * video_renderer,
+gst_player_new (GstPlayerVideoRenderer * video_renderer,
GstPlayerSignalDispatcher * signal_dispatcher)
{
static GOnce once = G_ONCE_INIT;
diff --git a/lib/gst/player/gstplayer.h b/lib/gst/player/gstplayer.h
index 29287bd..3391b0f 100644
--- a/lib/gst/player/gstplayer.h
+++ b/lib/gst/player/gstplayer.h
@@ -97,8 +97,7 @@ const gchar *gst_player_color_balance_type_get_name (GstPlayerColorBalanceType
GType gst_player_get_type (void);
-GstPlayer * gst_player_new (void);
-GstPlayer * gst_player_new_full (GstPlayerVideoRenderer * video_renderer, GstPlayerSignalDispatcher * signal_dispatcher);
+GstPlayer * gst_player_new (GstPlayerVideoRenderer * video_renderer, GstPlayerSignalDispatcher * signal_dispatcher);
void gst_player_play (GstPlayer * player);
void gst_player_pause (GstPlayer * player);
diff --git a/qt/qgstplayer.cpp b/qt/qgstplayer.cpp
index b15347f..77112ef 100644
--- a/qt/qgstplayer.cpp
+++ b/qt/qgstplayer.cpp
@@ -397,7 +397,7 @@ Player::Player(QObject *parent, VideoRenderer *renderer)
, autoPlay_(false)
{
- player_ = gst_player_new_full(renderer ? renderer->renderer() : 0,
+ player_ = gst_player_new(renderer ? renderer->renderer() : 0,
gst_player_qt_signal_dispatcher_new(this));
g_object_connect(player_,
diff --git a/tests/player.c b/tests/player.c
index 06325e7..dbb5b62 100644
--- a/tests/player.c
+++ b/tests/player.c
@@ -76,7 +76,7 @@ START_TEST (test_create_and_free)
{
GstPlayer *player;
- player = gst_player_new ();
+ player = gst_player_new (NULL, NULL);
fail_unless (player != NULL);
g_object_unref (player);
}
@@ -88,7 +88,7 @@ START_TEST (test_set_and_get_uri)
GstPlayer *player;
gchar *uri;
- player = gst_player_new ();
+ player = gst_player_new (NULL, NULL);
fail_unless (player != NULL);
@@ -108,7 +108,7 @@ START_TEST (test_set_and_get_position_update_interval)
GstPlayer *player;
guint interval = 0;
- player = gst_player_new ();
+ player = gst_player_new (NULL, NULL);
fail_unless (player != NULL);
@@ -362,7 +362,7 @@ test_player_new (TestPlayerState * state)
GstElement *playbin, *fakesink;
player =
- gst_player_new_full (NULL,
+ gst_player_new (NULL,
gst_player_g_main_context_signal_dispatcher_new (NULL));
fail_unless (player != NULL);