Tim-Philipp Müller
fb6d09055a
Merge remote-tracking branch 'origin/master' into 0.11
...
Conflicts:
ext/alsa/gstalsadeviceprobe.c
ext/alsa/gstalsamixer.c
ext/pango/gsttextoverlay.c
ext/pango/gsttextoverlay.h
gst-libs/gst/audio/gstaudiobasesink.c
gst-libs/gst/audio/gstaudioringbuffer.c
gst-libs/gst/audio/gstaudiosrc.c
gst-libs/gst/video/Makefile.am
gst-libs/gst/video/video.c
gst/encoding/gststreamcombiner.c
gst/encoding/gststreamsplitter.c
gst/playback/gstplaybasebin.c
gst/playback/gststreamsynchronizer.c
gst/playback/gstsubtitleoverlay.c
gst/playback/gsturidecodebin.c
sys/xvimage/xvimagesink.c
tests/examples/Makefile.am
win32/common/libgstvideo.def
Video overlay composition disabled for now, needs
porting to buffer meta.
2011-12-08 01:19:03 +00:00
Tim-Philipp Müller
ff6cc8af82
tools, tests: g_thread_init() is deprecated in glib master
...
It's not needed any longer.
2011-12-04 17:16:36 +00:00
Wim Taymans
552e825b4f
fix includes for moved interfaces
2011-11-30 07:23:47 +01:00
Wim Taymans
871b306fce
video: move some interfaces
...
Move some interfaces to the video library
2011-11-29 19:10:01 +01:00
Tim-Philipp Müller
d5f44ec6ea
tests: fix libs order in some makefiles
...
Local libs should come first.
2011-08-08 14:16:39 +01:00
Tim-Philipp Müller
789e325678
tests: update for GstXOverlay => GstVideoOverlay
2011-08-08 14:12:15 +01:00
Tim-Philipp Müller
8cd8339893
tests: don't use deprecated gtk_widget_hide_all()
...
gtk_widget_hide_all() has been deprecated in gtk+ 2.x and
removed in 2.9x master. Just use gtk_widget_hide() instead.
2010-10-21 13:38:01 +01:00
David Schleef
6dc02137fb
xoverlay: Add guintptr versions of functions
...
And deprecate the gulong versions. This is to support platforms
where sizeof(unsigned long) < sizeof(void *). Fixes #627565 .
API: Add gst_x_overlay_set_window_handle()
API: Deprecate: gst_x_overlay_set_xwindow_id()
API: Add gst_x_overlay_got_window_handle()
API: Deprecate: gst_x_overlay_got_xwindow_id()
API: Add GstXOverlay::set_window_handle()
API: Deprecate: GstXOverlay::set_xwindow_id()
2010-09-15 00:10:23 -07:00
Tim-Philipp Müller
2c21340c79
examples: get the right Qt moc binary to use via pkg-config
...
Should make us do the right thing in cases where both Qt3 and Qt4
are installed.
Fixes #620211 .
2010-06-01 13:07:53 +01:00
Tim-Philipp Müller
58a92964c6
build: Makefile.am fixes
...
Mostly just add missing $(GST_BASE_CFLAGS), but also fix up order
of flags (see docs/random/moving-plugins).
2010-03-19 01:00:36 +00:00
Tim-Philipp Müller
4def141e86
tests: make Gtk+ test programs compile with -DGSEAL_ENABLE
...
Fixes #612552 , at least for now.
2010-03-14 22:48:00 +00:00
Sebastian Dröge
d5a4ca9962
build: Make some more rules silent if requested
2010-03-09 21:01:38 +00:00
Tim-Philipp Müller
c43dec83af
examples: make sure to dist qtgv-xoverlay.h header file
...
This time for real.
Fixes #610832 .
2010-03-08 17:07:57 +00:00
Götz Waschk
6de021c56e
examples: Dist header file for the Qt graphics view example
...
Fixes bug #610832 .
2010-02-23 16:59:27 +01:00
Stefan Kost
1b41c2696d
examples: also add sink detection and set title to qt examples
...
Also set a title in the qt examples like it is now done in the gtk example.
Fix the newly added find_video_sink in the gtk example and add similar function
to the qt examples.
2010-02-22 14:02:24 +02:00
Stefan Kost
236b707cd2
gitignore: ignore files in new example directroy
2010-02-22 13:04:43 +02:00
Tim-Philipp Müller
094a05b06a
Ignore new overlay examples
2010-02-19 00:18:00 +00:00
Tim-Philipp Müller
590bc917a2
examples: don't hard-code xvimagesink for Gtk+ GstXOverlay example
...
Try to find a working videosink, don't hardcode xvimagesink. Also
add some borders to window and give it a title so that it's clear
that this is really a Gtk+ window and not a window created by the
videosink.
2010-02-18 23:47:35 +00:00
Stefan Kost
54094cd9ce
examples: add video overlay examples for gtk, qt and qt graphics view
...
Add simple videotestsrc ! xvimagesink examples using gtk and qt. This patch also
adds all boilerplate to configure for using c++. The qt based examples are
optional like their gtk counterparts.
2010-02-17 09:48:10 +02:00
