mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2025-01-11 18:05:37 +00:00
Code Issues 1 Projects Releases Wiki Activity

tests/examples/seek/: Remove libgstvideo usage. Use gtk_get_option_group instead of gtk_init().

Browse source 
Original commit message from CVS:
* tests/examples/seek/Makefile.am:
* tests/examples/seek/seek.c:
Remove libgstvideo usage. Use gtk_get_option_group instead of
gtk_init().
This commit is contained in:
Stefan Kost 2008-06-25 13:15:50 +00:00
parent 21ade62c0b
commit 0d4409ce49
3 changed files with 9 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
ChangeLog
View file

@ -1,3 +1,10 @@
2008-06-25 Stefan Kost <ensonic@users.sf.net>
* tests/examples/seek/Makefile.am:
* tests/examples/seek/seek.c:
Remove libgstvideo usage. Use gtk_get_option_group instead of
gtk_init().
2008-06-24 Stefan Kost <ensonic@users.sf.net> 2008-06-24 Stefan Kost <ensonic@users.sf.net>
* tests/check/Makefile.am: * tests/check/Makefile.am:

3
tests/examples/seek/Makefile.am
View file

@ -7,6 +7,5 @@ examples = $(GTK_EXAMPLES)
noinst_PROGRAMS = $(examples) noinst_PROGRAMS = $(examples)
LDADD = $(GST_LIBS) $(GTK_LIBS) \ LDADD = $(GST_LIBS) $(GTK_LIBS) \
$(top_builddir)/gst-libs/gst/interfaces/libgstinterfaces-@GST_MAJORMINOR@.la \ $(top_builddir)/gst-libs/gst/interfaces/libgstinterfaces-@GST_MAJORMINOR@.la
$(top_builddir)/gst-libs/gst/video/libgstvideo-@GST_MAJORMINOR@.la
AM_CFLAGS = $(GST_CFLAGS) $(GTK_CFLAGS) -I$(top_builddir)/gst-libs AM_CFLAGS = $(GST_CFLAGS) $(GTK_CFLAGS) -I$(top_builddir)/gst-libs

4
tests/examples/seek/seek.c
View file

@ -29,7 +29,6 @@
#include <X11/Xlib.h> #include <X11/Xlib.h>
#include <gdk/gdkx.h> #include <gdk/gdkx.h>
#include <gst/interfaces/xoverlay.h> #include <gst/interfaces/xoverlay.h>
#include <gst/video/gstvideosink.h>
GST_DEBUG_CATEGORY_STATIC (seek_debug); GST_DEBUG_CATEGORY_STATIC (seek_debug);
#define GST_CAT_DEFAULT (seek_debug) #define GST_CAT_DEFAULT (seek_debug)
@ -2253,6 +2252,7 @@ main (int argc, char **argv)
ctx = g_option_context_new ("- test seeking in gsteamer"); ctx = g_option_context_new ("- test seeking in gsteamer");
g_option_context_add_main_entries (ctx, options, NULL); g_option_context_add_main_entries (ctx, options, NULL);
g_option_context_add_group (ctx, gst_init_get_option_group ()); g_option_context_add_group (ctx, gst_init_get_option_group ());
g_option_context_add_group (ctx, gtk_get_option_group (TRUE));
if (!g_option_context_parse (ctx, &argc, &argv, &err)) { if (!g_option_context_parse (ctx, &argc, &argv, &err)) {
g_print ("Error initializing: %s\n", err->message); g_print ("Error initializing: %s\n", err->message);
@ -2261,8 +2261,6 @@ main (int argc, char **argv)
GST_DEBUG_CATEGORY_INIT (seek_debug, "seek", 0, "seek example"); GST_DEBUG_CATEGORY_INIT (seek_debug, "seek", 0, "seek example");
gtk_init (&argc, &argv);
if (argc != 3) { if (argc != 3) {
print_usage (argc, argv); print_usage (argc, argv);
exit (-1); exit (-1);