mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2024-09-22 20:10:13 +00:00
Code Issues 1 Projects Releases Wiki Activity

playback/player: gtk: Use gtkglsink if available

Browse source
This commit is contained in:
Sebastian Dröge 2015-06-11 15:11:23 +02:00
parent 2a2c10ac25
commit 78142bf4ea
2 changed files with 23 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
playback/player/gtk/Makefile.am
View file

@ -3,8 +3,8 @@ bin_PROGRAMS = gtk-play
gtk_play_SOURCES = gtk-play.c
LDADD = $(top_builddir)/lib/gst/player/.libs/libgstplayer-@GST_PLAYER_API_VERSION@.la \
$(GSTREAMER_LIBS) $(GTK_LIBS) $(GLIB_LIBS) $(LIBM)
$(GSTREAMER_LIBS) $(GTK_LIBS) $(GTK_X11_LIBS) $(GLIB_LIBS) $(LIBM)
AM_CFLAGS = -I$(top_srcdir)/lib -I$(top_builddir)/lib $(GSTREAMER_CFLAGS) $(GTK_CFLAGS) $(GLIB_CFLAGS)
AM_CFLAGS = -I$(top_srcdir)/lib -I$(top_builddir)/lib $(GSTREAMER_CFLAGS) $(GTK_CFLAGS) $(GTK_X11_CFLAGS) $(GLIB_CFLAGS)
noinst_HEADERS =

26
playback/player/gtk/gtk-play.c
View file

@ -1203,15 +1203,28 @@ create_ui (GtkPlay * play)
{
GtkWidget *image;
GtkWidget *controls, *main_hbox, *main_vbox;
GstElement *playbin, *video_sink, *gl_sink;
play->window = gtk_window_new (GTK_WINDOW_TOPLEVEL);
g_signal_connect (G_OBJECT (play->window), "delete-event",
G_CALLBACK (delete_event_cb), play);
set_title (play, APP_NAME);
play->video_area = gtk_drawing_area_new ();
g_signal_connect (play->video_area, "realize",
G_CALLBACK (video_area_realize_cb), play);
gl_sink = gst_element_factory_make ("gtkglsink", NULL);
if (gl_sink) {
g_object_get (gl_sink, "widget", &play->video_area, NULL);
video_sink = gst_element_factory_make ("glsinkbin", NULL);
g_object_set (video_sink, "sink", gl_sink, NULL);
playbin = gst_player_get_pipeline (play->player);
g_object_set (playbin, "video-sink", video_sink, NULL);
gst_object_unref (playbin);
} else {
play->video_area = gtk_drawing_area_new ();
g_signal_connect (play->video_area, "realize",
G_CALLBACK (video_area_realize_cb), play);
}
g_signal_connect (play->video_area, "button-press-event",
G_CALLBACK (mouse_button_pressed_cb), play);
g_signal_connect (play->video_area, "motion-notify-event",
@ -1536,8 +1549,7 @@ player_volume_changed_cb (GstPlayer * player, GtkPlay * play)
{
gdouble new_val, cur_val;
cur_val = gtk_scale_button_get_value
(GTK_SCALE_BUTTON (play->volume_button));
cur_val = gtk_scale_button_get_value (GTK_SCALE_BUTTON (play->volume_button));
new_val = gst_player_get_volume (play->player);
if (fabs (cur_val - new_val) > 0.001) {
@ -1570,6 +1582,10 @@ main (gint argc, gchar ** argv)
guint list_length = 0;
GError *err = NULL;
#if defined (GDK_WINDOWING_X11)
XInitThreads ();
#endif
memset (&play, 0, sizeof (play));
g_set_prgname (APP_NAME);