Skip to content
This repository has been archived by the owner on Apr 16, 2018. It is now read-only.

Commit

Permalink
player: Remove gst_player_new() and make gst_player_new_full() the no…
Browse files Browse the repository at this point in the history
…rmal 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.
  • Loading branch information
sdroege committed Jan 4, 2016
1 parent 32c91cf commit 14b945d
Show file tree
Hide file tree
Showing 9 changed files with 11 additions and 24 deletions.
2 changes: 1 addition & 1 deletion android/jni/player.c
Expand Up @@ -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);

Expand Down
1 change: 0 additions & 1 deletion docs/lib/gst-player-sections.txt
Expand Up @@ -3,7 +3,6 @@
GstPlayer

gst_player_new
gst_player_new_full

gst_player_play
gst_player_pause
Expand Down
2 changes: 1 addition & 1 deletion gst-play/gst-play.c
Expand Up @@ -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",
Expand Down
2 changes: 1 addition & 1 deletion gtk/gtk-play.c
Expand Up @@ -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",
Expand Down
2 changes: 1 addition & 1 deletion ios/GstPlay/VideoViewController.m
Expand Up @@ -63,7 +63,7 @@ - (void)viewDidLoad
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);
Expand Down
13 changes: 1 addition & 12 deletions lib/gst/player/gstplayer.c
Expand Up @@ -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
*
Expand All @@ -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;
Expand Down
3 changes: 1 addition & 2 deletions lib/gst/player/gstplayer.h
Expand Up @@ -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);
Expand Down
2 changes: 1 addition & 1 deletion qt/qgstplayer.cpp
Expand Up @@ -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_,
Expand Down
8 changes: 4 additions & 4 deletions tests/player.c
Expand Up @@ -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);
}
Expand All @@ -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);

Expand All @@ -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);

Expand Down Expand Up @@ -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);

Expand Down

0 comments on commit 14b945d

Please sign in to comment.