From 6b702c60bbb946736e6ed9da6176e99f2be4462f Mon Sep 17 00:00:00 2001 From: Wim Taymans Date: Mon, 19 Dec 2011 09:49:07 +0100 Subject: [PATCH] use playbin instead of playbin2 --- tests/examples/seek/jsseek.c | 16 ++++++++-------- tests/examples/seek/seek.c | 12 ++++++------ tests/examples/seek/stepping.c | 2 +- tests/examples/seek/stepping2.c | 2 +- 4 files changed, 16 insertions(+), 16 deletions(-) diff --git a/tests/examples/seek/jsseek.c b/tests/examples/seek/jsseek.c index d13a533..bc91596 100644 --- a/tests/examples/seek/jsseek.c +++ b/tests/examples/seek/jsseek.c @@ -948,9 +948,9 @@ make_playerbin_pipeline (const gchar * location) static GstElement * make_playerbin2_pipeline (const gchar * location) { - GstElement *pipeline = construct_playerbin ("playbin2", location); + GstElement *pipeline = construct_playerbin ("playbin", location); - /* FIXME: this is not triggered, playbin2 is not forwarding it from the sink */ + /* FIXME: this is not triggered, playbin is not forwarding it from the sink */ g_signal_connect (pipeline, "notify::volume", G_CALLBACK (volume_notify_cb), NULL); return pipeline; @@ -1800,7 +1800,7 @@ update_streams (GstPipeline * pipeline) /* remove previous info */ clear_streams (GST_ELEMENT_CAST (pipeline)); - /* here we get and update the different streams detected by playbin2 */ + /* here we get and update the different streams detected by playbin */ g_object_get (pipeline, "n-video", &n_video, NULL); g_object_get (pipeline, "n-audio", &n_audio, NULL); g_object_get (pipeline, "n-text", &n_text, NULL); @@ -1961,7 +1961,7 @@ vis_combo_cb (GtkComboBox * combo, GstPipeline * pipeline) if (!element) return; - /* set vis plugin for playbin2 */ + /* set vis plugin for playbin */ g_object_set (pipeline, "vis-plugin", element, NULL); } } @@ -2855,7 +2855,7 @@ main (int argc, char **argv) pipeline); if (pipeline_type == 16) { - /* the playbin2 panel controls for the video/audio/subtitle tracks */ + /* the playbin panel controls for the video/audio/subtitle tracks */ panel = gtk_hbox_new (FALSE, 0); video_combo = gtk_combo_box_text_new (); audio_combo = gtk_combo_box_text_new (); @@ -2872,7 +2872,7 @@ main (int argc, char **argv) G_CALLBACK (audio_combo_cb), pipeline); g_signal_connect (G_OBJECT (text_combo), "changed", G_CALLBACK (text_combo_cb), pipeline); - /* playbin2 panel for flag checkboxes and volume/mute */ + /* playbin panel for flag checkboxes and volume/mute */ boxes = gtk_hbox_new (FALSE, 0); vis_checkbox = gtk_check_button_new_with_label ("Vis"); video_checkbox = gtk_check_button_new_with_label ("Video"); @@ -2916,7 +2916,7 @@ main (int argc, char **argv) G_CALLBACK (buffer_toggle_cb), pipeline); g_signal_connect (G_OBJECT (volume_spinbutton), "value_changed", G_CALLBACK (volume_spinbutton_changed_cb), pipeline); - /* playbin2 panel for snapshot */ + /* playbin panel for snapshot */ boxes2 = gtk_hbox_new (FALSE, 0); shot_button = gtk_button_new_from_stock (GTK_STOCK_SAVE); gtk_widget_set_tooltip_text (shot_button, @@ -2961,7 +2961,7 @@ main (int argc, char **argv) gtk_table_attach_defaults (GTK_TABLE (flagtable), rate_spinbutton, 4, 5, 1, 2); if (panel && boxes && boxes2) { - expander = gtk_expander_new ("playbin2 options"); + expander = gtk_expander_new ("playbin options"); pb2vbox = gtk_vbox_new (FALSE, 0); gtk_box_pack_start (GTK_BOX (pb2vbox), panel, FALSE, FALSE, 2); gtk_box_pack_start (GTK_BOX (pb2vbox), boxes, FALSE, FALSE, 2); diff --git a/tests/examples/seek/seek.c b/tests/examples/seek/seek.c index 6c439e7..7f205c9 100644 --- a/tests/examples/seek/seek.c +++ b/tests/examples/seek/seek.c @@ -945,7 +945,7 @@ update_streams (GstPipeline * pipeline) /* remove previous info */ clear_streams (GST_ELEMENT_CAST (pipeline)); - /* here we get and update the different streams detected by playbin2 */ + /* here we get and update the different streams detected by playbin */ g_object_get (pipeline, "n-video", &n_video, NULL); g_object_get (pipeline, "n-audio", &n_audio, NULL); g_object_get (pipeline, "n-text", &n_text, NULL); @@ -1106,7 +1106,7 @@ vis_combo_cb (GtkComboBox * combo, GstPipeline * pipeline) if (!element) return; - /* set vis plugin for playbin2 */ + /* set vis plugin for playbin */ g_object_set (pipeline, "vis-plugin", element, NULL); } } @@ -1986,7 +1986,7 @@ main (int argc, char **argv) pipeline); if (pipeline_type == 0) { - /* the playbin2 panel controls for the video/audio/subtitle tracks */ + /* the playbin panel controls for the video/audio/subtitle tracks */ panel = gtk_hbox_new (FALSE, 0); video_combo = gtk_combo_box_text_new (); audio_combo = gtk_combo_box_text_new (); @@ -2003,7 +2003,7 @@ main (int argc, char **argv) G_CALLBACK (audio_combo_cb), pipeline); g_signal_connect (G_OBJECT (text_combo), "changed", G_CALLBACK (text_combo_cb), pipeline); - /* playbin2 panel for flag checkboxes and volume/mute */ + /* playbin panel for flag checkboxes and volume/mute */ boxes = gtk_hbox_new (FALSE, 0); vis_checkbox = gtk_check_button_new_with_label ("Vis"); video_checkbox = gtk_check_button_new_with_label ("Video"); @@ -2047,7 +2047,7 @@ main (int argc, char **argv) G_CALLBACK (buffer_toggle_cb), pipeline); g_signal_connect (G_OBJECT (volume_spinbutton), "value_changed", G_CALLBACK (volume_spinbutton_changed_cb), pipeline); - /* playbin2 panel for snapshot */ + /* playbin panel for snapshot */ boxes2 = gtk_hbox_new (FALSE, 0); shot_button = gtk_button_new_from_stock (GTK_STOCK_SAVE); gtk_widget_set_tooltip_text (shot_button, @@ -2092,7 +2092,7 @@ main (int argc, char **argv) gtk_table_attach_defaults (GTK_TABLE (flagtable), rate_spinbutton, 4, 5, 1, 2); if (panel && boxes && boxes2) { - expander = gtk_expander_new ("playbin2 options"); + expander = gtk_expander_new ("playbin options"); pb2vbox = gtk_vbox_new (FALSE, 0); gtk_box_pack_start (GTK_BOX (pb2vbox), panel, FALSE, FALSE, 2); gtk_box_pack_start (GTK_BOX (pb2vbox), boxes, FALSE, FALSE, 2); diff --git a/tests/examples/seek/stepping.c b/tests/examples/seek/stepping.c index 6f6997f..d970db4 100644 --- a/tests/examples/seek/stepping.c +++ b/tests/examples/seek/stepping.c @@ -97,7 +97,7 @@ main (int argc, char *argv[]) } /* create a new bin to hold the elements */ - bin = gst_element_factory_make ("playbin2", "bin"); + bin = gst_element_factory_make ("playbin", "bin"); g_assert (bin); g_object_set (bin, "uri", argv[1], NULL); diff --git a/tests/examples/seek/stepping2.c b/tests/examples/seek/stepping2.c index 8cea180..39cf336 100644 --- a/tests/examples/seek/stepping2.c +++ b/tests/examples/seek/stepping2.c @@ -106,7 +106,7 @@ main (int argc, char *argv[]) } /* create a new bin to hold the elements */ - bin = gst_element_factory_make ("playbin2", "bin"); + bin = gst_element_factory_make ("playbin", "bin"); g_assert (bin); g_object_set (bin, "uri", argv[1], NULL); -- 2.7.4