diff --git a/ChangeLog b/ChangeLog
index de9b64312e078b2aa7ec7956cde3ad747913b58c..25ebea8b792afbd9e8684133af2b92e3a358cdb9 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,9 +1,734 @@
+=== release 0.11.91 ===
+
+2012-05-13 Sebastian Dröge <sebastian.droege@collabora.co.uk>
+
+ * configure.ac:
+ releasing 0.11.91, "I smell the blood of an Englishman"
+
+2012-05-13 15:56:05 +0200 Sebastian Dröge <sebastian.droege@collabora.co.uk>
+
+ * common:
+ Automatic update of common submodule
+ From dc70203 to 3429ba6
+
+2012-05-09 15:14:55 +0100 Tim-Philipp Müller <tim.muller@collabora.co.uk>
+
+ * gst/debugutils/rndbuffersize.c:
+ rndbuffersize: only send flush-stop if it was a flushing seek
+
+2012-05-09 12:54:11 +0200 Peter Seiderer <ps.report@gmx.net>
+
+ * sys/v4l2/v4l2_calls.c:
+ v4l2src: fix v4l2_std_id logging
+ input.std is of type v4l2_std_id which is defined as 64-bit unsigned integer.
+ Casting to uint means the higher bits, wich are used for the private video
+ standards of the TI video capture/display driver for example, are lost.
+
+2012-05-09 12:24:37 +0100 Tim-Philipp Müller <tim.muller@collabora.co.uk>
+
+ * gst/debugutils/rndbuffersize.c:
+ rndbuffersize: must send flush-stop after acquiring the stream lock
+ Otherwise the streaming thread might just keep on going and we
+ might never get the stream lock.
+
+2012-05-09 11:15:21 +0100 Tim-Philipp Müller <tim.muller@collabora.co.uk>
+
+ * gst/debugutils/rndbuffersize.c:
+ rndbuffersize: port seeking code to 0.11
+
+2012-05-08 19:07:04 +0100 Tim-Philipp Müller <tim.muller@collabora.co.uk>
+
+ * gst/debugutils/rndbuffersize.c:
+ rndbuffersize: add support for seeks
+ Useful for e.g. filesrc ! rndbuffersize ! queue2 ! ...
+
+2012-05-08 18:45:34 +0100 Tim-Philipp Müller <tim.muller@collabora.co.uk>
+
+ * gst/debugutils/rndbuffersize.c:
+ rndbuffersize: send SEGMENT event before pushing buffers
+ Conflicts:
+ gst/debugutils/rndbuffersize.c
+
+2012-05-09 11:15:57 +0200 Wim Taymans <wim.taymans@collabora.co.uk>
+
+ * gst/interleave/interleave.c:
+ interleave: fix compilation again
+
+2012-01-13 10:49:43 +0100 Pascal Buhler <pabuhler@cisco.com>
+
+ * gst/rtpmanager/rtpsession.c:
+ rtpsession: creation should be signaled before validation
+ https://bugzilla.gnome.org/show_bug.cgi?id=667850
+
+2012-05-04 15:20:47 -0300 Thiago Santos <thiago.sousa.santos@collabora.com>
+
+ * ext/jpeg/gstjpegenc.c:
+ jpegenc: do not proxy our filter caps downstream on caps queries
+ Downstream likely won't accept video/x-raw and the caps query
+ will return EMPTY caps. Instead, create a copy of the caps that
+ has all structure names replaced by 'image/jpeg'
+ Simple pipeline that shows the problem:
+ gst-launch-1.0 videotestsrc num-buffers=1 ! "video/x-raw, \
+ width=(int)640, height=(int)480" ! videoscale ! jpegenc ! \
+ "image/jpeg, width=(int)800, height=(int)600" ! filesink \
+ location=/tmp/image.jpg
+
+2012-05-02 21:17:43 +0200 Alban Browaeys <prahal@yahoo.com>
+
+ * gst/isomp4/qtdemux.c:
+ isomp4: set layout=interleaved on raw audio caps
+ This fixes a not-negotiated error at least on mov files with
+ twos audio with two channels and video dvcp. As playbin and gst-launch
+ sample coming from the qtdemux.c file uses audioconvert and the latter
+ require format interleaved.
+ https://bugzilla.gnome.org/show_bug.cgi?id=675326
+
+2012-05-02 21:49:56 +0400 РуÑлан Ижбулатов <lrn1986@gmail.com>
+
+ * sys/waveform/Makefile.am:
+ waveform: No more gstinterfaces
+ Fixes #675319
+
+2012-05-02 20:14:24 +0400 РуÑлан Ижбулатов <lrn1986@gmail.com>
+
+ * sys/directsound/Makefile.am:
+ directsound: No more gstinterfaces
+ Fixes #675319
+
+2012-05-01 18:58:03 +0100 Tim-Philipp Müller <tim.muller@collabora.co.uk>
+
+ * gst/videomixer/videomixer2.c:
+ * gst/videomixer/videomixer2.h:
+ videomixer: change sink pad template name from sink_%d to sink_%u
+
+2012-04-30 11:00:19 +0200 Wim Taymans <wim.taymans@collabora.co.uk>
+
+ * gst/interleave/interleave.c:
+ interleave: handle EOS on all pads
+ When all pads go to EOS immediately, we are not negotiated and our collected
+ function is called (without any available data). Handle this case gracefully.
+ Conflicts:
+ gst/interleave/interleave.c
+
+2012-04-30 10:59:31 +0200 Wim Taymans <wim.taymans@collabora.co.uk>
+
+ * gst/interleave/interleave.c:
+ interleave: improve debugging
+
+2012-05-01 13:31:51 +0200 Sebastian Dröge <sebastian.droege@collabora.co.uk>
+
+ * sys/v4l2/gstv4l2src.c:
+ v4l2src: Update for basesrc API changes
+
+2012-04-30 23:57:28 +0100 Tim-Philipp Müller <tim.muller@collabora.co.uk>
+
+ * gst/alpha/gstalpha.c:
+ alpha: don't set up stuff before the input and output formats are known
+ Fixes crash on startup.
+
+2012-04-30 14:09:23 +0200 Peter Seiderer <ps.report@gmx.net>
+
+ * gst/multifile/gstmultifilesink.c:
+ multifilesink: don't write stream header twice for first file
+
+2012-04-30 13:32:41 +0200 Peter Seiderer <ps.report@gmx.net>
+
+ * gst/multifile/gstmultifilesink.c:
+ multifilesink: fix buffer list size calculation in render_list
+ Fix uninitialized 'size' variable in call to gst_buffer_list_foreach().
+
+2012-04-30 21:58:00 +0100 Luis de Bethencourt <luis@debethencourt.com>
+
+ * gst/multifile/gstmultifilesrc.c:
+ multifile: unnecessary size check
+
+2012-04-30 21:30:56 +0100 Luis de Bethencourt <luis@debethencourt.com>
+
+ * gst/avi/gstavidemux.c:
+ avi: fix build errors
+ fix redundant declarations
+ and also style/indent issues
+
+2012-04-26 12:47:27 +0100 Vincent Penquerc'h <vincent.penquerch@collabora.co.uk>
+
+ * gst/matroska/matroska-demux.c:
+ * gst/matroska/matroska-parse.c:
+ * gst/matroska/matroska-read-common.c:
+ * gst/matroska/matroska-read-common.h:
+ matroska: implement forward snapping keyframe seeking
+ Requires an index.
+
+2012-04-26 12:46:11 +0100 Vincent Penquerc'h <vincent.penquerch@collabora.co.uk>
+
+ * gst/avi/gstavidemux.c:
+ avi: implement forward snapping keyframe seeking
+ In pull mode with an index.
+
+2012-04-28 23:14:24 +0100 Tim-Philipp Müller <tim.muller@collabora.co.uk>
+
+ * tests/check/elements/matroskamux.c:
+ tests: fix matroskamux unit test after media type changes
+
+2012-04-28 19:57:51 +0100 Tim-Philipp Müller <tim.muller@collabora.co.uk>
+
+ * gst/matroska/matroska-demux.c:
+ * gst/matroska/matroska-mux.c:
+ * gst/matroska/matroska-parse.c:
+ * gst/matroska/webm-mux.c:
+ matroska: update for media type changes
+
+2012-04-24 16:08:47 +0200 idc-dragon <idc-dragon at gmx.de>
+
+ * gst/rtp/gstrtpceltdepay.c:
+ celtdepay: calculate size correctly
+ The summation was done wrong, causing the de-payloader to exit its loop too
+ early, before all frames are processed.
+ Fixes https://bugzilla.gnome.org/show_bug.cgi?id=674472
+
+2012-04-24 15:57:19 +0200 Wim Taymans <wim.taymans@collabora.co.uk>
+
+ * ext/pulse/pulsesink.c:
+ pulsesink: improve debug
+
+2012-04-24 15:34:57 +0200 Wim Taymans <wim.taymans@collabora.co.uk>
+
+ * ext/pulse/pulsesink.c:
+ pulsesink: start unmuted when requested
+ When we explicitely set the mute property to FALSE, connect to pulseaudio with
+ the PA_STREAM_START_UNMUTED flag set, otherwise pulseaudio will use its
+ previously used value (which might start the stream muted).
+ Fixes https://bugzilla.gnome.org/show_bug.cgi?id=672401
+
+2012-04-25 09:41:46 +0200 Wim Taymans <wim.taymans@collabora.co.uk>
+
+ * sys/v4l2/gstv4l2src.c:
+ v4l2: improve timestamp code
+ Sample the pipeline clock and device clock closer to eachother to reduce jitter.
+ Don't subtract the frame duration from the timestamp when we can use the device
+ timestamps.
+ Assume a delay of 1 frame in read-write mode.
+
+2012-04-24 12:37:33 +0200 Wim Taymans <wim.taymans@collabora.co.uk>
+
+ * sys/v4l2/gstv4l2bufferpool.c:
+ * sys/v4l2/gstv4l2src.c:
+ v4l2: use driver timestamps
+ Use the drive timestamps for timestamping outgoing buffers.
+
+2012-04-23 18:01:31 +0200 Wim Taymans <wim.taymans@collabora.co.uk>
+
+ * sys/v4l2/gstv4l2bufferpool.c:
+ * sys/v4l2/gstv4l2bufferpool.h:
+ * sys/v4l2/gstv4l2src.c:
+ v4l2: Improve buffer management
+ Query the amount of available buffers when doing set_config(). This allows us to
+ configure the parent bufferpool with the number of buffers to preallocate.
+ Keep track of the provided allocator and use it when we need to allocate a
+ buffer in RW mode.
+ When we are can not allocate the requested max_buffers amount of buffers, make
+ sure we keep 2 buffers around in the pool and copy them into an output buffer.
+ This makes sure that we always have a buffer to capture into. We also need to
+ detect those copied buffers and unref them when they return to the pool.
+
+2012-04-23 16:51:28 +0200 Wim Taymans <wim.taymans@collabora.co.uk>
+
+ * sys/v4l2/gstv4l2bufferpool.c:
+ v4l2: free the queued buffers
+ Only free the queued buffers that we keep track of in our buffer array. for rw
+ io-mode, we do allocate buffers but we don't keep track of them in the buffer
+ array.
+
+2012-04-23 16:10:17 +0200 Wim Taymans <wim.taymans@collabora.co.uk>
+
+ * sys/v4l2/gstv4l2bufferpool.c:
+ v4l2: mark memory as no-share
+ We don't support sharing our mmapped memory so mark it as NO_SHARE.
+
+2012-04-23 16:09:55 +0200 Wim Taymans <wim.taymans@collabora.co.uk>
+
+ * sys/v4l2/v4l2src_calls.c:
+ v4l2: remove old unused file
+
+2012-04-23 13:32:48 +0200 Wim Taymans <wim.taymans@collabora.co.uk>
+
+ * sys/v4l2/v4l2src_calls.c:
+ v4l2: remove unused function
+
+2012-04-11 12:42:17 +0100 Bastien Nocera <hadess@hadess.net>
+
+ * ext/soup/gstsouphttpsrc.c:
+ soup: Handle icy and icyx URI schemes
+ As handled by QuickTime (for icy), and Orban/Coding Technologies
+ AAC/aacPlus Player (for icyx). See also:
+ https://bugzilla.gnome.org/show_bug.cgi?id=394207
+ https://bugzilla.gnome.org/show_bug.cgi?id=403285
+ https://bugzilla.gnome.org/show_bug.cgi?id=673899
+
+2012-04-23 10:03:19 +0300 Mart Raudsepp <mart.raudsepp@collabora.com>
+
+ * sys/v4l2/gstv4l2src.c:
+ docs: Add Since tag for new GstV4l2Src::prepare-format signal
+
+2012-04-23 10:07:12 +0200 Chris Pankow <kain2396@gmail.com>
+
+ * gst/audiofx/audiofxbasefirfilter.c:
+ audiofxbasefirfilter: Fix time-domain convolution for multichannel input
+ Fixes bug #674025.
+
+2012-04-21 11:08:51 +0200 Mark Nauwelaerts <mark.nauwelaerts@collabora.co.uk>
+
+ * po/POTFILES.in:
+ po: remove some more non-existent files from the list
+
+2012-04-21 10:05:45 +0400 РуÑлан Ижбулатов <lrn1986@gmail.com>
+
+ * po/POTFILES.in:
+ po: Remove non-existent potfiles from the list
+ Fixes #674518
+
+2012-04-20 18:13:15 +0200 Mark Nauwelaerts <mark.nauwelaerts@collabora.co.uk>
+
+ * tests/icles/test-oss4.c:
+ tests: oss4: limit test scope
+
+2012-04-20 18:13:01 +0200 Mark Nauwelaerts <mark.nauwelaerts@collabora.co.uk>
+
+ * configure.ac:
+ * docs/plugins/Makefile.am:
+ * docs/plugins/gst-plugins-good-plugins-docs.sgml:
+ * docs/plugins/gst-plugins-good-plugins-sections.txt:
+ * sys/oss4/Makefile.am:
+ * sys/oss4/oss4-audio.c:
+ * sys/oss4/oss4-audio.h:
+ * sys/oss4/oss4-mixer-enum.c:
+ * sys/oss4/oss4-mixer-enum.h:
+ * sys/oss4/oss4-mixer-slider.c:
+ * sys/oss4/oss4-mixer-slider.h:
+ * sys/oss4/oss4-mixer-switch.c:
+ * sys/oss4/oss4-mixer-switch.h:
+ * sys/oss4/oss4-mixer.c:
+ * sys/oss4/oss4-mixer.h:
+ * sys/oss4/oss4-property-probe.c:
+ * sys/oss4/oss4-property-probe.h:
+ * sys/oss4/oss4-sink.c:
+ * sys/oss4/oss4-sink.h:
+ * sys/oss4/oss4-source.c:
+ * sys/oss4/oss4-source.h:
+ oss4: port to 0.11
+
+2012-04-20 18:12:54 +0200 Mark Nauwelaerts <mark.nauwelaerts@collabora.co.uk>
+
+ * configure.ac:
+ * docs/plugins/Makefile.am:
+ * docs/plugins/gst-plugins-good-plugins-docs.sgml:
+ * docs/plugins/gst-plugins-good-plugins-sections.txt:
+ * sys/oss/Makefile.am:
+ * sys/oss/gstossaudio.c:
+ * sys/oss/gstosshelper.c:
+ * sys/oss/gstosshelper.h:
+ * sys/oss/gstossmixer.c:
+ * sys/oss/gstossmixer.h:
+ * sys/oss/gstossmixerelement.c:
+ * sys/oss/gstossmixerelement.h:
+ * sys/oss/gstossmixertrack.c:
+ * sys/oss/gstossmixertrack.h:
+ * sys/oss/gstosssink.c:
+ * sys/oss/gstosssrc.c:
+ * sys/oss/gstosssrc.h:
+ oss: port to 0.11
+
+2012-04-20 16:49:56 +0200 Wim Taymans <wim.taymans@collabora.co.uk>
+
+ * gst/multipart/multipartdemux.c:
+ multipartdemux: first activate pad then set caps
+
+2012-04-20 13:35:15 +0200 Wim Taymans <wim.taymans@collabora.co.uk>
+
+ * gst/matroska/matroska-mux.c:
+ matroskamux: set caps on srcpad
+ Fixes https://bugzilla.gnome.org/show_bug.cgi?id=674219
+
+2012-04-19 14:16:01 +0200 Wim Taymans <wim.taymans@collabora.co.uk>
+
+ * sys/v4l2/gstv4l2bufferpool.c:
+ v4l2: update for video api change
+
+2012-04-19 12:38:58 +0200 Wim Taymans <wim.taymans@collabora.co.uk>
+
+ * sys/v4l2/gstv4l2object.c:
+ v4l2: fix compilation on older v4l2
+ Fix compilation on systems where the H264 format is not defined.
+
+2012-04-19 12:20:59 +0200 Sebastian Dröge <sebastian.droege@collabora.co.uk>
+
+ * ext/dv/gstdvdec.c:
+ * ext/raw1394/Makefile.am:
+ * gst/rtp/gstrtpvrawpay.c:
+ * gst/y4m/gsty4mencode.c:
+ * sys/v4l2/gstv4l2bufferpool.c:
+ * sys/v4l2/gstv4l2object.c:
+ video: Update for libgstvideo API changes
+
+2012-04-19 08:27:01 +0000 Youness Alaoui <youness.alaoui@collabora.co.uk>
+
+ * sys/v4l2/gstv4l2object.c:
+ * sys/v4l2/v4l2src_calls.c:
+ v4l2src: Allow mpeg-ts cameras to negociate format
+ This removes an ugly hack until the reason for the hack can be documented
+
+2012-04-19 09:50:25 +0200 Sebastian Dröge <sebastian.droege@collabora.co.uk>
+
+ * sys/v4l2/gstv4l2object.c:
+ v4l2src: Fix merge
+
+2012-04-19 09:40:53 +0200 Sebastian Dröge <sebastian.droege@collabora.co.uk>
+
+ * sys/v4l2/gstv4l2src.c:
+ * sys/v4l2/v4l2src_calls.c:
+ v4l2src: Rename pre-set-format signal to prepare-format
+
+2012-04-16 22:08:21 +0000 Youness Alaoui <youness.alaoui@collabora.co.uk>
+
+ * sys/v4l2/gstv4l2object.c:
+ v4l2src: Add H264 encoded stream support to the caps
+ This is not enough to properly support H264 cameras, but it will
+ allow an H264 stream to be generated by v4l2src using the default
+ settings of the camera. If used with the pre-set-format signal, the
+ H264 encoder can be fully configured.
+ Conflicts:
+ sys/v4l2/gstv4l2object.c
+
+2012-04-16 22:06:21 +0000 Youness Alaoui <youness.alaoui@collabora.co.uk>
+
+ * sys/v4l2/.gitignore:
+ * sys/v4l2/gstv4l2-marshal.list:
+ * sys/v4l2/gstv4l2src.c:
+ * sys/v4l2/v4l2src_calls.c:
+ v4l2src: Adding a pre-set-format signal
+ In order to support UVC H264 encoding cameras, an H264 Probe&Commit
+ must happen before the normal v4l2 set-format. This new signal is
+ meant to allow an external application or bin to do it.
+ It also serves to expose the file descriptor used by v4l2src in case
+ some custom ioctls need to be called.
+ Conflicts:
+ sys/v4l2/Makefile.am
+ sys/v4l2/gstv4l2src.c
+ sys/v4l2/v4l2src_calls.c
+
+2012-04-18 17:09:45 +0200 Mark Nauwelaerts <mark.nauwelaerts@collabora.co.uk>
+
+ * configure.ac:
+ * ext/raw1394/gst1394probe.c:
+ * ext/raw1394/gst1394probe.h:
+ * ext/raw1394/gstdv1394src.c:
+ * ext/raw1394/gsthdv1394src.c:
+ dv1394: port to 0.11
+
+2012-04-17 15:14:27 +0200 Mark Nauwelaerts <mark.nauwelaerts@collabora.co.uk>
+
+ * ext/cairo/gsttextoverlay.c:
+ * ext/cairo/gsttextoverlay.h:
+ * gst/avi/gstavimux.c:
+ * gst/avi/gstavimux.h:
+ * gst/flv/gstflvmux.c:
+ * gst/flv/gstflvmux.h:
+ * gst/interleave/interleave.c:
+ * gst/interleave/interleave.h:
+ * gst/isomp4/gstqtmux.c:
+ * gst/isomp4/gstqtmux.h:
+ * gst/matroska/matroska-mux.c:
+ * gst/matroska/matroska-mux.h:
+ * gst/multipart/multipartmux.c:
+ * gst/multipart/multipartmux.h:
+ * gst/smpte/gstsmpte.c:
+ * gst/smpte/gstsmpte.h:
+ * gst/videomixer/videomixer2.c:
+ * gst/videomixer/videomixer2.h:
+ * gst/videomixer/videomixer2pad.h:
+ collectpads2: rename to collectpads
+
+2012-04-16 16:37:49 +0200 Mark Nauwelaerts <mark.nauwelaerts@collabora.co.uk>
+
+ * gst/avi/gstavimux.c:
+ * gst/flv/gstflvmux.c:
+ * gst/interleave/interleave.c:
+ * gst/isomp4/gstqtmux.c:
+ * gst/matroska/matroska-mux.c:
+ * gst/smpte/gstsmpte.c:
+ * gst/videomixer/videomixer2.c:
+ misc: chain up to collectpads event handler
+
+2012-04-16 09:09:11 +0200 Sebastian Dröge <sebastian.droege@collabora.co.uk>
+
+ * common:
+ Automatic update of common submodule
+ From 6db25be to dc70203
+
+2012-04-15 22:49:47 +0100 Tim-Philipp Müller <tim.muller@collabora.co.uk>
+
+ * ext/shout2/gstshout2.c:
+ shout2: update for ogg media type changes
+
+2012-04-13 16:54:53 +0200 Mark Nauwelaerts <mark.nauwelaerts@collabora.co.uk>
+
+ * gst/smpte/gstsmpte.c:
+ * gst/smpte/gstsmpte.h:
+ smpte: use some more boilerplate
+
+2012-04-13 16:54:50 +0200 Mark Nauwelaerts <mark.nauwelaerts@collabora.co.uk>
+
+ * gst/flx/gstflxdec.c:
+ flxdec: improve segment handling
+ ... to send a proper TIME segment downstream.
+
+2012-04-13 16:54:46 +0200 Mark Nauwelaerts <mark.nauwelaerts@collabora.co.uk>
+
+ * configure.ac:
+ * gst/flx/gstflxdec.c:
+ * gst/flx/gstflxdec.h:
+ flxdec: port to 0.11
+
+2012-04-13 16:54:42 +0200 Mark Nauwelaerts <mark.nauwelaerts@collabora.co.uk>
+
+ * gst/videobox/gstvideobox.c:
+ * gst/videobox/gstvideobox.h:
+ videobox: adjust to deprecated GMutex setup
+
+2012-04-13 16:54:38 +0200 Mark Nauwelaerts <mark.nauwelaerts@collabora.co.uk>
+
+ * configure.ac:
+ * gst/videobox/gstvideobox.c:
+ * gst/videobox/gstvideobox.h:
+ videobox: port to 0.11
+
+2012-04-13 16:54:31 +0200 Mark Nauwelaerts <mark.nauwelaerts@collabora.co.uk>
+
+ * gst/alpha/gstalpha.c:
+ * gst/alpha/gstalphacolor.c:
+ * gst/smpte/gstsmptealpha.c:
+ alpha, smpte: adjust to removed color-matrix caps field
+
+2012-04-13 16:27:34 +0200 VÃctor Manuel Jáquez Leal <vjaquez@igalia.com>
+
+ * sys/v4l2/Makefile.am:
+ v4l2: ensure autogenerated files are created
+ The tuner marshal and enumtypes are autogenerated, and they need
+ to be created before the compilation of gstv4l2tuner.c
+ This patch adds the automake instruction for ensuring the
+ autogeneration of those files previous the compilation.
+
+2012-04-13 13:41:44 +0200 Sebastian Dröge <sebastian.droege@collabora.co.uk>
+
+ * autogen.sh:
+ * configure.ac:
+ configure: Modernize autotools setup a bit
+ Also we now only create tar.bz2 and tar.xz tarballs.
+
+2012-04-13 13:37:10 +0200 Sebastian Dröge <sebastian.droege@collabora.co.uk>
+
+ * common:
+ Automatic update of common submodule
+ From 464fe15 to 6db25be
+
+2012-04-13 13:04:12 +0200 Sebastian Dröge <sebastian.droege@collabora.co.uk>
+
+ * docs/plugins/Makefile.am:
+ * ext/pulse/Makefile.am:
+ * ext/pulse/plugin.c:
+ * ext/pulse/pulsemixer.c:
+ * ext/pulse/pulsemixer.h:
+ * ext/pulse/pulsemixerctrl.c:
+ * ext/pulse/pulsemixerctrl.h:
+ * ext/pulse/pulsemixertrack.c:
+ * ext/pulse/pulsemixertrack.h:
+ * ext/pulse/pulsesink.c:
+ * ext/pulse/pulsesrc.c:
+ * ext/pulse/pulsesrc.h:
+ * gst/rtsp/Makefile.am:
+ * sys/v4l2/Makefile.am:
+ * sys/v4l2/gstv4l2tuner.h:
+ * sys/v4l2/gstv4l2videooverlay.c:
+ * sys/v4l2/gstv4l2videooverlay.h:
+ * sys/v4l2/tuner-marshal.list:
+ * sys/v4l2/tuner.c:
+ * sys/v4l2/tuner.h:
+ * sys/v4l2/tunerchannel.c:
+ * sys/v4l2/tunerchannel.h:
+ * sys/v4l2/tunernorm.c:
+ * sys/v4l2/tunernorm.h:
+ * tests/check/Makefile.am:
+ * tests/examples/pulse/Makefile.am:
+ * tests/icles/Makefile.am:
+ * tests/icles/v4l2src-test.c:
+ Update everything for the removal of the interface library and mixer/tuner interfaces
+
+2012-04-12 15:50:16 +0200 Edward Hervey <edward.hervey@collabora.co.uk>
+
+ * gst/rtp/gstrtpmparobustdepay.c:
+ rtp: Use unchecked variant of GstByteWriter where applicable
+ The size was checked before
+
+2012-04-12 15:49:44 +0200 Edward Hervey <edward.hervey@collabora.co.uk>
+
+ * gst/matroska/ebml-read.c:
+ * gst/matroska/ebml-write.c:
+ * gst/matroska/matroska-demux.c:
+ matroska: Check return value of GstByteReader/Writer
+
+2012-04-12 15:48:57 +0200 Edward Hervey <edward.hervey@collabora.co.uk>
+
+ * gst/isomp4/atoms.c:
+ * gst/isomp4/qtdemux.c:
+ * gst/isomp4/qtdemux_dump.c:
+ isomp4: Check return value of GstByteWriter
+ And use unchecked variant of GstByteReader where applicable
+
+2012-04-12 15:48:00 +0200 Edward Hervey <edward.hervey@collabora.co.uk>
+
+ * gst/flv/gstflvdemux.c:
+ flvdemux: Use unchecked variant of GstByteReader
+ We know there's at least 7 bytes (checked above)
+
+2012-04-12 15:47:49 +0200 Edward Hervey <edward.hervey@collabora.co.uk>
+
+ * gst/avi/gstavimux.c:
+ avi: Check return value of GstByteWriter
+
+2012-04-12 15:47:24 +0200 Edward Hervey <edward.hervey@collabora.co.uk>
+
+ * gst/audioparsers/gstaacparse.c:
+ * gst/audioparsers/gstflacparse.c:
+ * gst/audioparsers/gstwavpackparse.c:
+ audioparsers: Check return value of GstBitReader/GstByteReader
+
+2012-04-12 11:57:59 +0100 uraeus <uraeus@gnome.org>
+
+ * gst-plugins-good.spec.in:
+ Add interleave plugin to spec file
+
+2012-04-12 11:19:01 +0200 Sebastian Dröge <sebastian.droege@collabora.co.uk>
+
+ * configure.ac:
+ Back to development
+
=== release 0.11.90 ===
-2012-04-12 Sebastian Dröge <sebastian.droege@collabora.co.uk>
+2012-04-12 10:27:31 +0200 Sebastian Dröge <sebastian.droege@collabora.co.uk>
+ * ChangeLog:
+ * NEWS:
+ * RELEASE:
* configure.ac:
- releasing 0.11.90, "From grief and moan to a gold throne"
+ * docs/plugins/gst-plugins-good-plugins.hierarchy:
+ * docs/plugins/gst-plugins-good-plugins.interfaces:
+ * docs/plugins/gst-plugins-good-plugins.prerequisites:
+ * docs/plugins/inspect/plugin-aasink.xml:
+ * docs/plugins/inspect/plugin-alaw.xml:
+ * docs/plugins/inspect/plugin-alpha.xml:
+ * docs/plugins/inspect/plugin-alphacolor.xml:
+ * docs/plugins/inspect/plugin-annodex.xml:
+ * docs/plugins/inspect/plugin-apetag.xml:
+ * docs/plugins/inspect/plugin-audiofx.xml:
+ * docs/plugins/inspect/plugin-audioparsers.xml:
+ * docs/plugins/inspect/plugin-auparse.xml:
+ * docs/plugins/inspect/plugin-autodetect.xml:
+ * docs/plugins/inspect/plugin-avi.xml:
+ * docs/plugins/inspect/plugin-cacasink.xml:
+ * docs/plugins/inspect/plugin-cutter.xml:
+ * docs/plugins/inspect/plugin-debug.xml:
+ * docs/plugins/inspect/plugin-dv.xml:
+ * docs/plugins/inspect/plugin-effectv.xml:
+ * docs/plugins/inspect/plugin-equalizer.xml:
+ * docs/plugins/inspect/plugin-flac.xml:
+ * docs/plugins/inspect/plugin-flv.xml:
+ * docs/plugins/inspect/plugin-goom.xml:
+ * docs/plugins/inspect/plugin-goom2k1.xml:
+ * docs/plugins/inspect/plugin-icydemux.xml:
+ * docs/plugins/inspect/plugin-id3demux.xml:
+ * docs/plugins/inspect/plugin-imagefreeze.xml:
+ * docs/plugins/inspect/plugin-interleave.xml:
+ * docs/plugins/inspect/plugin-isomp4.xml:
+ * docs/plugins/inspect/plugin-jack.xml:
+ * docs/plugins/inspect/plugin-jpeg.xml:
+ * docs/plugins/inspect/plugin-level.xml:
+ * docs/plugins/inspect/plugin-matroska.xml:
+ * docs/plugins/inspect/plugin-mulaw.xml:
+ * docs/plugins/inspect/plugin-multifile.xml:
+ * docs/plugins/inspect/plugin-multipart.xml:
+ * docs/plugins/inspect/plugin-navigationtest.xml:
+ * docs/plugins/inspect/plugin-png.xml:
+ * docs/plugins/inspect/plugin-pulseaudio.xml:
+ * docs/plugins/inspect/plugin-replaygain.xml:
+ * docs/plugins/inspect/plugin-rtp.xml:
+ * docs/plugins/inspect/plugin-rtpmanager.xml:
+ * docs/plugins/inspect/plugin-rtsp.xml:
+ * docs/plugins/inspect/plugin-shapewipe.xml:
+ * docs/plugins/inspect/plugin-shout2send.xml:
+ * docs/plugins/inspect/plugin-smpte.xml:
+ * docs/plugins/inspect/plugin-soup.xml:
+ * docs/plugins/inspect/plugin-spectrum.xml:
+ * docs/plugins/inspect/plugin-speex.xml:
+ * docs/plugins/inspect/plugin-taglib.xml:
+ * docs/plugins/inspect/plugin-udp.xml:
+ * docs/plugins/inspect/plugin-video4linux2.xml:
+ * docs/plugins/inspect/plugin-videocrop.xml:
+ * docs/plugins/inspect/plugin-videofilter.xml:
+ * docs/plugins/inspect/plugin-videomixer.xml:
+ * docs/plugins/inspect/plugin-wavenc.xml:
+ * docs/plugins/inspect/plugin-wavpack.xml:
+ * docs/plugins/inspect/plugin-wavparse.xml:
+ * docs/plugins/inspect/plugin-ximagesrc.xml:
+ * docs/plugins/inspect/plugin-y4menc.xml:
+ * gst-plugins-good.doap:
+ * gst/deinterlace/tvtime-dist.c:
+ * gst/videobox/gstvideoboxorc-dist.c:
+ * gst/videomixer/blendorc-dist.c:
+ * win32/common/config.h:
+ Release 0.11.90
+
+2012-04-12 10:26:52 +0200 Sebastian Dröge <sebastian.droege@collabora.co.uk>
+
+ * po/af.po:
+ * po/az.po:
+ * po/bg.po:
+ * po/ca.po:
+ * po/cs.po:
+ * po/da.po:
+ * po/de.po:
+ * po/el.po:
+ * po/en_GB.po:
+ * po/eo.po:
+ * po/es.po:
+ * po/eu.po:
+ * po/fi.po:
+ * po/fr.po:
+ * po/gl.po:
+ * po/hu.po:
+ * po/id.po:
+ * po/it.po:
+ * po/ja.po:
+ * po/lt.po:
+ * po/lv.po:
+ * po/mt.po:
+ * po/nb.po:
+ * po/nl.po:
+ * po/or.po:
+ * po/pl.po:
+ * po/pt_BR.po:
+ * po/ro.po:
+ * po/ru.po:
+ * po/sk.po:
+ * po/sl.po:
+ * po/sq.po:
+ * po/sr.po:
+ * po/sv.po:
+ * po/tr.po:
+ * po/uk.po:
+ * po/vi.po:
+ * po/zh_CN.po:
+ * po/zh_HK.po:
+ * po/zh_TW.po:
+ Update .po files
2012-04-11 00:19:30 +0400 РуÑлан Ижбулатов <lrn1986@gmail.com>
diff --git a/Makefile.in b/Makefile.in
index 0a191e875a1f1175a8d9c2520c2a3bc0c355e988..83a36adc9ddc5b24675c9c806d4408266a65390a 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.11.4 from Makefile.am.
+# Makefile.in generated by automake 1.11.5 from Makefile.am.
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -78,6 +78,7 @@ am__aclocal_m4_deps = $(top_srcdir)/common/m4/as-ac-expand.m4 \
$(top_srcdir)/common/m4/as-auto-alt.m4 \
$(top_srcdir)/common/m4/as-compiler-flag.m4 \
$(top_srcdir)/common/m4/as-gcc-inline-assembly.m4 \
+ $(top_srcdir)/common/m4/as-libtool.m4 \
$(top_srcdir)/common/m4/as-objc.m4 \
$(top_srcdir)/common/m4/as-python.m4 \
$(top_srcdir)/common/m4/as-scrub-include.m4 \
@@ -179,8 +180,8 @@ am__relativize = \
dir1=`echo "$$dir1" | sed -e "$$sed_rest"`; \
done; \
reldir="$$dir2"
-DIST_ARCHIVES = $(distdir).tar.gz $(distdir).tar.bz2
GZIP_ENV = --best
+DIST_ARCHIVES = $(distdir).tar.xz
distuninstallcheck_listfiles = find . -type f -print
am__distuninstallcheck_listfiles = $(distuninstallcheck_listfiles) \
| sed 's|^\./|$(prefix)/|' | grep -v '$(infodir)/dir$$'
@@ -265,6 +266,7 @@ GMSGFMT_015 = @GMSGFMT_015@
GREP = @GREP@
GSTPB_PLUGINS_DIR = @GSTPB_PLUGINS_DIR@
GSTPB_PREFIX = @GSTPB_PREFIX@
+GST_AGE = @GST_AGE@
GST_ALL_LDFLAGS = @GST_ALL_LDFLAGS@
GST_API_VERSION = @GST_API_VERSION@
GST_BASE_CFLAGS = @GST_BASE_CFLAGS@
@@ -274,9 +276,11 @@ GST_CHECK_CFLAGS = @GST_CHECK_CFLAGS@
GST_CHECK_LIBS = @GST_CHECK_LIBS@
GST_CONTROLLER_CFLAGS = @GST_CONTROLLER_CFLAGS@
GST_CONTROLLER_LIBS = @GST_CONTROLLER_LIBS@
+GST_CURRENT = @GST_CURRENT@
GST_CXXFLAGS = @GST_CXXFLAGS@
GST_LEVEL_DEFAULT = @GST_LEVEL_DEFAULT@
GST_LIBS = @GST_LIBS@
+GST_LIBVERSION = @GST_LIBVERSION@
GST_LICENSE = @GST_LICENSE@
GST_LT_LDFLAGS = @GST_LT_LDFLAGS@
GST_NET_CFLAGS = @GST_NET_CFLAGS@
@@ -294,6 +298,7 @@ GST_PLUGINS_NONPORTED = @GST_PLUGINS_NONPORTED@
GST_PLUGINS_SELECTED = @GST_PLUGINS_SELECTED@
GST_PLUGIN_LDFLAGS = @GST_PLUGIN_LDFLAGS@
GST_PREFIX = @GST_PREFIX@
+GST_REVISION = @GST_REVISION@
GST_TOOLS_DIR = @GST_TOOLS_DIR@
GTKDOC_CHECK = @GTKDOC_CHECK@
GTK_CFLAGS = @GTK_CFLAGS@
@@ -531,9 +536,6 @@ noinst_HEADERS = \
gst-libs/gst/glib-compat-private.h
-# make bz2 as well
-AUTOMAKE_OPTIONS = dist-bzip2
-
# cruft: plugins that have been merged or moved or renamed
CRUFT_FILES = \
$(top_builddir)/common/shave \
@@ -819,6 +821,7 @@ distdir: $(DISTFILES)
dist-gzip: distdir
tardir=$(distdir) && $(am__tar) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).tar.gz
$(am__remove_distdir)
+
dist-bzip2: distdir
tardir=$(distdir) && $(am__tar) | BZIP2=$${BZIP2--9} bzip2 -c >$(distdir).tar.bz2
$(am__remove_distdir)
@@ -830,7 +833,6 @@ dist-lzip: distdir
dist-lzma: distdir
tardir=$(distdir) && $(am__tar) | lzma -9 -c >$(distdir).tar.lzma
$(am__remove_distdir)
-
dist-xz: distdir
tardir=$(distdir) && $(am__tar) | XZ_OPT=$${XZ_OPT--e} xz -c >$(distdir).tar.xz
$(am__remove_distdir)
@@ -849,8 +851,7 @@ dist-zip: distdir
$(am__remove_distdir)
dist dist-all: distdir
- tardir=$(distdir) && $(am__tar) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).tar.gz
- tardir=$(distdir) && $(am__tar) | BZIP2=$${BZIP2--9} bzip2 -c >$(distdir).tar.bz2
+ tardir=$(distdir) && $(am__tar) | XZ_OPT=$${XZ_OPT--e} xz -c >$(distdir).tar.xz
$(am__remove_distdir)
# This target untars the dist file and tries a VPATH configuration. Then
@@ -1126,8 +1127,7 @@ check-nonportable-print-format:
dist-hook: check-exports win32-check-crlf
release: dist
- $(MAKE) $(PACKAGE)-$(VERSION).tar.gz.md5
- $(MAKE) $(PACKAGE)-$(VERSION).tar.bz2.md5
+ $(MAKE) $(PACKAGE)-$(VERSION).tar.xz.md5
# generate md5 sum files
%.md5: %
diff --git a/NEWS b/NEWS
index 58abf337a30d9ed2ba638ba3b92005034ff25507..9162c3cf0d2089bea7e132a639b4e3cf3e2e4115 100644
--- a/NEWS
+++ b/NEWS
@@ -1,4 +1,9 @@
-This is GStreamer Good Plug-ins 0.11.90 "From grief and moan to a gold throne"
+This is GStreamer Good Plug-ins 0.11.91 "I smell the blood of an Englishman"
+
+New features in 0.11.91:
+
+ * Ported flx, dv1394, oss and oss4 plugins
+ * Lots of bugfixes and other improvements
New features in 0.11.90:
diff --git a/RELEASE b/RELEASE
index eb334f74dd784632dcabb728b6db187f5e215ef9..ae072f015d1a61e61e2ce233a93bb908a0b323a4 100644
--- a/RELEASE
+++ b/RELEASE
@@ -1,5 +1,5 @@
-Release notes for GStreamer Good Plug-ins 0.11.90 "From grief and moan to a gold throne"
+Release notes for GStreamer Good Plug-ins 0.11.91 "I smell the blood of an Englishman"
@@ -52,8 +52,8 @@ contains a set of less supported plug-ins that haven't passed the
Features of this release
- * Lots of bugfixes, cleanup and other improvements
- * The interleave/deinterleave plugin was ported to 0.11
+ * Ported flx, dv1394, oss and oss4 plugins
+ * Lots of bugfixes and other improvements
There were no bugs fixed in this release
@@ -84,15 +84,23 @@ Applications
Contributors to this release
- * Alexander Saprykin
+ * Alban Browaeys
+ * Bastien Nocera
+ * Chris Pankow
+ * Edward Hervey
+ * Luis de Bethencourt
* Mark Nauwelaerts
- * Nicolas Dufresne
- * Olivier Crête
- * Raimo Järvi
+ * Mart Raudsepp
+ * Pascal Buhler
+ * Peter Seiderer
* Sebastian Dröge
- * Stefan Sauer
+ * Thiago Santos
* Tim-Philipp Müller
+ * Vincent Penquerc'h
+ * VÃctor Manuel Jáquez Leal
* Wim Taymans
+ * Youness Alaoui
+ * idc-dragon
* uraeus
* РуÑлан Ижбулатов
Â
\ No newline at end of file
diff --git a/aclocal.m4 b/aclocal.m4
index 1041b537e5590fdc9c189a079b91c88aa7fa53cb..e4dafa2a2232bd0f5c25f5970a4efaf5840505f1 100644
--- a/aclocal.m4
+++ b/aclocal.m4
@@ -1,4 +1,4 @@
-# generated automatically by aclocal 1.11.4 -*- Autoconf -*-
+# generated automatically by aclocal 1.11.5 -*- Autoconf -*-
# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
# 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software Foundation,
@@ -14,8 +14,8 @@
m4_ifndef([AC_AUTOCONF_VERSION],
[m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl
-m4_if(m4_defn([AC_AUTOCONF_VERSION]), [2.68],,
-[m4_warning([this file was generated for autoconf 2.68.
+m4_if(m4_defn([AC_AUTOCONF_VERSION]), [2.69],,
+[m4_warning([this file was generated for autoconf 2.69.
You have another version of autoconf. It may work, but is not guaranteed to.
If you have problems, you may need to regenerate the build system entirely.
To do so, use the procedure documented by the package, typically `autoreconf'.])])
@@ -38,7 +38,7 @@ AC_DEFUN([AM_AUTOMAKE_VERSION],
[am__api_version='1.11'
dnl Some users find AM_AUTOMAKE_VERSION and mistake it for a way to
dnl require some minimum version. Point them to the right macro.
-m4_if([$1], [1.11.4], [],
+m4_if([$1], [1.11.5], [],
[AC_FATAL([Do not call $0, use AM_INIT_AUTOMAKE([$1]).])])dnl
])
@@ -54,7 +54,7 @@ m4_define([_AM_AUTOCONF_VERSION], [])
# Call AM_AUTOMAKE_VERSION and AM_AUTOMAKE_VERSION so they can be traced.
# This function is AC_REQUIREd by AM_INIT_AUTOMAKE.
AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION],
-[AM_AUTOMAKE_VERSION([1.11.4])dnl
+[AM_AUTOMAKE_VERSION([1.11.5])dnl
m4_ifndef([AC_AUTOCONF_VERSION],
[m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl
_AM_AUTOCONF_VERSION(m4_defn([AC_AUTOCONF_VERSION]))])
@@ -867,6 +867,25 @@ AC_DEFUN([_AM_SET_OPTIONS],
AC_DEFUN([_AM_IF_OPTION],
[m4_ifset(_AM_MANGLE_OPTION([$1]), [$2], [$3])])
+# Copyright (C) 2001, 2003, 2005, 2011 Free Software Foundation, Inc.
+#
+# This file is free software; the Free Software Foundation
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
+
+# serial 1
+
+# AM_RUN_LOG(COMMAND)
+# -------------------
+# Run COMMAND, save the exit status in ac_status, and log it.
+# (This has been adapted from Autoconf's _AC_RUN_LOG macro.)
+AC_DEFUN([AM_RUN_LOG],
+[{ echo "$as_me:$LINENO: $1" >&AS_MESSAGE_LOG_FD
+ ($1) >&AS_MESSAGE_LOG_FD 2>&AS_MESSAGE_LOG_FD
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&AS_MESSAGE_LOG_FD
+ (exit $ac_status); }])
+
# Check to make sure that the build environment is sane. -*- Autoconf -*-
# Copyright (C) 1996, 1997, 2000, 2001, 2003, 2005, 2008
@@ -1139,6 +1158,7 @@ m4_include([common/m4/as-ac-expand.m4])
m4_include([common/m4/as-auto-alt.m4])
m4_include([common/m4/as-compiler-flag.m4])
m4_include([common/m4/as-gcc-inline-assembly.m4])
+m4_include([common/m4/as-libtool.m4])
m4_include([common/m4/as-objc.m4])
m4_include([common/m4/as-python.m4])
m4_include([common/m4/as-scrub-include.m4])
diff --git a/autogen.sh b/autogen.sh
index 645b2aeb38a398252acb5d8f52281c1eef7664d8..768d12308c02fc2c715aa5cc2dfed7a31d54b198 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -39,14 +39,14 @@ autogen_options $@
printf "+ check for build tools"
if test ! -z "$NOCHECK"; then echo " skipped"; else echo; fi
-version_check "autoconf" "$AUTOCONF autoconf autoconf270 autoconf269 autoconf268 autoconf267 autoconf266 autoconf265 autoconf264 autoconf263 autoconf262 autoconf261 autoconf260" \
- "ftp://ftp.gnu.org/pub/gnu/autoconf/" 2 60 || DIE=1
-version_check "automake" "$AUTOMAKE automake automake-1.11 automake-1.10" \
- "ftp://ftp.gnu.org/pub/gnu/automake/" 1 10 || DIE=1
+version_check "autoconf" "$AUTOCONF autoconf autoconf270 autoconf269 autoconf268 autoconf267 autoconf266 autoconf265 autoconf264 autoconf263 autoconf262" \
+ "ftp://ftp.gnu.org/pub/gnu/autoconf/" 2 62 || DIE=1
+version_check "automake" "$AUTOMAKE automake automake-1.11" \
+ "ftp://ftp.gnu.org/pub/gnu/automake/" 1 11 || DIE=1
version_check "autopoint" "autopoint" \
"ftp://ftp.gnu.org/pub/gnu/gettext/" 0 17 || DIE=1
version_check "libtoolize" "$LIBTOOLIZE libtoolize glibtoolize" \
- "ftp://ftp.gnu.org/pub/gnu/libtool/" 1 5 0 || DIE=1
+ "ftp://ftp.gnu.org/pub/gnu/libtool/" 2 2 6 || DIE=1
version_check "pkg-config" "" \
"http://www.freedesktop.org/software/pkgconfig" 0 8 0 || DIE=1
diff --git a/common/Makefile.in b/common/Makefile.in
index 77a6ebae2c84d7a8de6f493af699b4609c007130..2c26f503255b193f49d81b663fc706bab216aba2 100644
--- a/common/Makefile.in
+++ b/common/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.11.4 from Makefile.am.
+# Makefile.in generated by automake 1.11.5 from Makefile.am.
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -57,6 +57,7 @@ am__aclocal_m4_deps = $(top_srcdir)/common/m4/as-ac-expand.m4 \
$(top_srcdir)/common/m4/as-auto-alt.m4 \
$(top_srcdir)/common/m4/as-compiler-flag.m4 \
$(top_srcdir)/common/m4/as-gcc-inline-assembly.m4 \
+ $(top_srcdir)/common/m4/as-libtool.m4 \
$(top_srcdir)/common/m4/as-objc.m4 \
$(top_srcdir)/common/m4/as-python.m4 \
$(top_srcdir)/common/m4/as-scrub-include.m4 \
@@ -228,6 +229,7 @@ GMSGFMT_015 = @GMSGFMT_015@
GREP = @GREP@
GSTPB_PLUGINS_DIR = @GSTPB_PLUGINS_DIR@
GSTPB_PREFIX = @GSTPB_PREFIX@
+GST_AGE = @GST_AGE@
GST_ALL_LDFLAGS = @GST_ALL_LDFLAGS@
GST_API_VERSION = @GST_API_VERSION@
GST_BASE_CFLAGS = @GST_BASE_CFLAGS@
@@ -237,9 +239,11 @@ GST_CHECK_CFLAGS = @GST_CHECK_CFLAGS@
GST_CHECK_LIBS = @GST_CHECK_LIBS@
GST_CONTROLLER_CFLAGS = @GST_CONTROLLER_CFLAGS@
GST_CONTROLLER_LIBS = @GST_CONTROLLER_LIBS@
+GST_CURRENT = @GST_CURRENT@
GST_CXXFLAGS = @GST_CXXFLAGS@
GST_LEVEL_DEFAULT = @GST_LEVEL_DEFAULT@
GST_LIBS = @GST_LIBS@
+GST_LIBVERSION = @GST_LIBVERSION@
GST_LICENSE = @GST_LICENSE@
GST_LT_LDFLAGS = @GST_LT_LDFLAGS@
GST_NET_CFLAGS = @GST_NET_CFLAGS@
@@ -257,6 +261,7 @@ GST_PLUGINS_NONPORTED = @GST_PLUGINS_NONPORTED@
GST_PLUGINS_SELECTED = @GST_PLUGINS_SELECTED@
GST_PLUGIN_LDFLAGS = @GST_PLUGIN_LDFLAGS@
GST_PREFIX = @GST_PREFIX@
+GST_REVISION = @GST_REVISION@
GST_TOOLS_DIR = @GST_TOOLS_DIR@
GTKDOC_CHECK = @GTKDOC_CHECK@
GTK_CFLAGS = @GTK_CFLAGS@
diff --git a/common/gst-autogen.sh b/common/gst-autogen.sh
index f05e0213c177031b79b5707041e87fbac9723d8a..e54dbcfa2f5c1cb86c02806205747f5dd6d57956 100644
--- a/common/gst-autogen.sh
+++ b/common/gst-autogen.sh
@@ -216,38 +216,6 @@ autoheader_check ()
}
-autoconf_2_52d_check ()
-{
- # autoconf 2.52d has a weird issue involving a yes:no error
- # so don't allow it's use
- test -z "$NOCHECK" && {
- ac_version=`$autoconf --version|head -n 1|sed 's/^[a-zA-Z\.\ ()]*//;s/ .*$//'`
- if test "$ac_version" = "2.52d"; then
- echo "autoconf 2.52d has an issue with our current build."
- echo "We don't know who's to blame however. So until we do, get a"
- echo "regular version. RPM's of a working version are on the gstreamer site."
- exit 1
- fi
- }
- return 0
-}
-libtool_2_2_gettext_check ()
-{
- # libtool 2.2 needs autopoint 0.17 or higher
- version_compare LIBTOOLIZE 2 2 0
- if test $? -eq 0
- then
- version_compare AUTOPOINT 0 17 0
- if test $? -ne 0
- then
- echo "libtool 2.2 requires autopoint 0.17 or higher"
- return 1
- fi
- fi
- return 0
-}
-
-
die_check ()
{
# call with $DIE
diff --git a/common/m4/Makefile.in b/common/m4/Makefile.in
index c9ec658eeabdc081aadd95affe27b46bfd00bdb6..13685598dd1d62c781b820515625c3dafe7666e5 100644
--- a/common/m4/Makefile.in
+++ b/common/m4/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.11.4 from Makefile.am.
+# Makefile.in generated by automake 1.11.5 from Makefile.am.
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -57,6 +57,7 @@ am__aclocal_m4_deps = $(top_srcdir)/common/m4/as-ac-expand.m4 \
$(top_srcdir)/common/m4/as-auto-alt.m4 \
$(top_srcdir)/common/m4/as-compiler-flag.m4 \
$(top_srcdir)/common/m4/as-gcc-inline-assembly.m4 \
+ $(top_srcdir)/common/m4/as-libtool.m4 \
$(top_srcdir)/common/m4/as-objc.m4 \
$(top_srcdir)/common/m4/as-python.m4 \
$(top_srcdir)/common/m4/as-scrub-include.m4 \
@@ -188,6 +189,7 @@ GMSGFMT_015 = @GMSGFMT_015@
GREP = @GREP@
GSTPB_PLUGINS_DIR = @GSTPB_PLUGINS_DIR@
GSTPB_PREFIX = @GSTPB_PREFIX@
+GST_AGE = @GST_AGE@
GST_ALL_LDFLAGS = @GST_ALL_LDFLAGS@
GST_API_VERSION = @GST_API_VERSION@
GST_BASE_CFLAGS = @GST_BASE_CFLAGS@
@@ -197,9 +199,11 @@ GST_CHECK_CFLAGS = @GST_CHECK_CFLAGS@
GST_CHECK_LIBS = @GST_CHECK_LIBS@
GST_CONTROLLER_CFLAGS = @GST_CONTROLLER_CFLAGS@
GST_CONTROLLER_LIBS = @GST_CONTROLLER_LIBS@
+GST_CURRENT = @GST_CURRENT@
GST_CXXFLAGS = @GST_CXXFLAGS@
GST_LEVEL_DEFAULT = @GST_LEVEL_DEFAULT@
GST_LIBS = @GST_LIBS@
+GST_LIBVERSION = @GST_LIBVERSION@
GST_LICENSE = @GST_LICENSE@
GST_LT_LDFLAGS = @GST_LT_LDFLAGS@
GST_NET_CFLAGS = @GST_NET_CFLAGS@
@@ -217,6 +221,7 @@ GST_PLUGINS_NONPORTED = @GST_PLUGINS_NONPORTED@
GST_PLUGINS_SELECTED = @GST_PLUGINS_SELECTED@
GST_PLUGIN_LDFLAGS = @GST_PLUGIN_LDFLAGS@
GST_PREFIX = @GST_PREFIX@
+GST_REVISION = @GST_REVISION@
GST_TOOLS_DIR = @GST_TOOLS_DIR@
GTKDOC_CHECK = @GTKDOC_CHECK@
GTK_CFLAGS = @GTK_CFLAGS@
diff --git a/common/m4/as-libtool.m4 b/common/m4/as-libtool.m4
index 25de9d13b832d0838f31d871f3385ca6c02f7dfe..3b16095ac72685ebc3ca123706980e6ac3f3c164 100644
--- a/common/m4/as-libtool.m4
+++ b/common/m4/as-libtool.m4
@@ -41,5 +41,6 @@ AC_DEFUN([AS_LIBTOOL],
fi
AC_SUBST([$1]_LT_LDFLAGS)
- AC_LIBTOOL_DLOPEN
+ LT_PREREQ([2.2.6])
+ LT_INIT([dlopen win32-dll disable-static])
])
diff --git a/common/release.mak b/common/release.mak
index 4a9b7d56defbeb51f8bd52d101097d80580fdf4c..7fbf4ca1a7ee2735edd579f0599d6744fda9e788 100644
--- a/common/release.mak
+++ b/common/release.mak
@@ -1,12 +1,8 @@
# include this snippet to add a common release: target by using
# include $(top_srcdir)/common/release.mak
-# make bz2 as well
-AUTOMAKE_OPTIONS = dist-bzip2
-
release: dist
- $(MAKE) $(PACKAGE)-$(VERSION).tar.gz.md5
- $(MAKE) $(PACKAGE)-$(VERSION).tar.bz2.md5
+ $(MAKE) $(PACKAGE)-$(VERSION).tar.xz.md5
# generate md5 sum files
%.md5: %
diff --git a/configure b/configure
index 73f89edd632390b2ec4e350acaa91927d792a61e..aa6e2b2b4d7d007c6f50f769bfc87d7f0eaf6f78 100755
--- a/configure
+++ b/configure
@@ -1,13 +1,11 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.68 for GStreamer Good Plug-ins 0.11.90.
+# Generated by GNU Autoconf 2.69 for GStreamer Good Plug-ins 0.11.91.
#
# Report bugs to <http://bugzilla.gnome.org/enter_bug.cgi?product=GStreamer>.
#
#
-# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
-# 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 Free Software
-# Foundation, Inc.
+# Copyright (C) 1992-1996, 1998-2012 Free Software Foundation, Inc.
#
#
# This configure script is free software; the Free Software Foundation
@@ -136,6 +134,31 @@ export LANGUAGE
# CDPATH.
(unset CDPATH) >/dev/null 2>&1 && unset CDPATH
+# Use a proper internal environment variable to ensure we don't fall
+ # into an infinite loop, continuously re-executing ourselves.
+ if test x"${_as_can_reexec}" != xno && test "x$CONFIG_SHELL" != x; then
+ _as_can_reexec=no; export _as_can_reexec;
+ # We cannot yet assume a decent shell, so we have to provide a
+# neutralization value for shells without unset; and this also
+# works around shells that cannot unset nonexistent variables.
+# Preserve -v and -x to the replacement shell.
+BASH_ENV=/dev/null
+ENV=/dev/null
+(unset BASH_ENV) >/dev/null 2>&1 && unset BASH_ENV ENV
+case $- in # ((((
+ *v*x* | *x*v* ) as_opts=-vx ;;
+ *v* ) as_opts=-v ;;
+ *x* ) as_opts=-x ;;
+ * ) as_opts= ;;
+esac
+exec $CONFIG_SHELL $as_opts "$as_myself" ${1+"$@"}
+# Admittedly, this is quite paranoid, since all the known shells bail
+# out after a failed `exec'.
+$as_echo "$0: could not re-execute with $CONFIG_SHELL" >&2
+as_fn_exit 255
+ fi
+ # We don't want this to propagate to other subprocesses.
+ { _as_can_reexec=; unset _as_can_reexec;}
if test "x$CONFIG_SHELL" = x; then
as_bourne_compatible="if test -n \"\${ZSH_VERSION+set}\" && (emulate sh) >/dev/null 2>&1; then :
emulate sh
@@ -169,7 +192,8 @@ if ( set x; as_fn_ret_success y && test x = \"\$1\" ); then :
else
exitcode=1; echo positional parameters were not saved.
fi
-test x\$exitcode = x0 || exit 1"
+test x\$exitcode = x0 || exit 1
+test -x / || exit 1"
as_suggested=" as_lineno_1=";as_suggested=$as_suggested$LINENO;as_suggested=$as_suggested" as_lineno_1a=\$LINENO
as_lineno_2=";as_suggested=$as_suggested$LINENO;as_suggested=$as_suggested" as_lineno_2a=\$LINENO
eval 'test \"x\$as_lineno_1'\$as_run'\" != \"x\$as_lineno_2'\$as_run'\" &&
@@ -222,21 +246,25 @@ IFS=$as_save_IFS
if test "x$CONFIG_SHELL" != x; then :
- # We cannot yet assume a decent shell, so we have to provide a
- # neutralization value for shells without unset; and this also
- # works around shells that cannot unset nonexistent variables.
- # Preserve -v and -x to the replacement shell.
- BASH_ENV=/dev/null
- ENV=/dev/null
- (unset BASH_ENV) >/dev/null 2>&1 && unset BASH_ENV ENV
- export CONFIG_SHELL
- case $- in # ((((
- *v*x* | *x*v* ) as_opts=-vx ;;
- *v* ) as_opts=-v ;;
- *x* ) as_opts=-x ;;
- * ) as_opts= ;;
- esac
- exec "$CONFIG_SHELL" $as_opts "$as_myself" ${1+"$@"}
+ export CONFIG_SHELL
+ # We cannot yet assume a decent shell, so we have to provide a
+# neutralization value for shells without unset; and this also
+# works around shells that cannot unset nonexistent variables.
+# Preserve -v and -x to the replacement shell.
+BASH_ENV=/dev/null
+ENV=/dev/null
+(unset BASH_ENV) >/dev/null 2>&1 && unset BASH_ENV ENV
+case $- in # ((((
+ *v*x* | *x*v* ) as_opts=-vx ;;
+ *v* ) as_opts=-v ;;
+ *x* ) as_opts=-x ;;
+ * ) as_opts= ;;
+esac
+exec $CONFIG_SHELL $as_opts "$as_myself" ${1+"$@"}
+# Admittedly, this is quite paranoid, since all the known shells bail
+# out after a failed `exec'.
+$as_echo "$0: could not re-execute with $CONFIG_SHELL" >&2
+exit 255
fi
if test x$as_have_required = xno; then :
@@ -340,6 +368,14 @@ $as_echo X"$as_dir" |
} # as_fn_mkdir_p
+
+# as_fn_executable_p FILE
+# -----------------------
+# Test if FILE is an executable regular file.
+as_fn_executable_p ()
+{
+ test -f "$1" && test -x "$1"
+} # as_fn_executable_p
# as_fn_append VAR VALUE
# ----------------------
# Append the text in VALUE to the end of the definition contained in VAR. Take
@@ -461,6 +497,10 @@ as_cr_alnum=$as_cr_Letters$as_cr_digits
chmod +x "$as_me.lineno" ||
{ $as_echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2; as_fn_exit 1; }
+ # If we had to re-execute with $CONFIG_SHELL, we're ensured to have
+ # already done that, so ensure we don't try to do so again and fall
+ # in an infinite loop. This has already happened in practice.
+ _as_can_reexec=no; export _as_can_reexec
# Don't try to exec as it changes $[0], causing all sort of problems
# (the dirname of $[0] is not the place where we might find the
# original and so on. Autoconf is especially sensitive to this).
@@ -495,16 +535,16 @@ if (echo >conf$$.file) 2>/dev/null; then
# ... but there are two gotchas:
# 1) On MSYS, both `ln -s file dir' and `ln file dir' fail.
# 2) DJGPP < 2.04 has no symlinks; `ln -s' creates a wrapper executable.
- # In both cases, we have to default to `cp -p'.
+ # In both cases, we have to default to `cp -pR'.
ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe ||
- as_ln_s='cp -p'
+ as_ln_s='cp -pR'
elif ln conf$$.file conf$$ 2>/dev/null; then
as_ln_s=ln
else
- as_ln_s='cp -p'
+ as_ln_s='cp -pR'
fi
else
- as_ln_s='cp -p'
+ as_ln_s='cp -pR'
fi
rm -f conf$$ conf$$.exe conf$$.dir/conf$$.file conf$$.file
rmdir conf$$.dir 2>/dev/null
@@ -516,28 +556,8 @@ else
as_mkdir_p=false
fi
-if test -x / >/dev/null 2>&1; then
- as_test_x='test -x'
-else
- if ls -dL / >/dev/null 2>&1; then
- as_ls_L_option=L
- else
- as_ls_L_option=
- fi
- as_test_x='
- eval sh -c '\''
- if test -d "$1"; then
- test -d "$1/.";
- else
- case $1 in #(
- -*)set "./$1";;
- esac;
- case `ls -ld'$as_ls_L_option' "$1" 2>/dev/null` in #((
- ???[sx]*):;;*)false;;esac;fi
- '\'' sh
- '
-fi
-as_executable_p=$as_test_x
+as_test_x='test -x'
+as_executable_p=as_fn_executable_p
# Sed expression to map a string onto a valid CPP name.
as_tr_cpp="eval sed 'y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g'"
@@ -571,8 +591,8 @@ MAKEFLAGS=
# Identity of this package.
PACKAGE_NAME='GStreamer Good Plug-ins'
PACKAGE_TARNAME='gst-plugins-good'
-PACKAGE_VERSION='0.11.90'
-PACKAGE_STRING='GStreamer Good Plug-ins 0.11.90'
+PACKAGE_VERSION='0.11.91'
+PACKAGE_STRING='GStreamer Good Plug-ins 0.11.91'
PACKAGE_BUGREPORT='http://bugzilla.gnome.org/enter_bug.cgi?product=GStreamer'
PACKAGE_URL=''
@@ -622,7 +642,6 @@ LIBOBJS
GST_PLUGIN_LDFLAGS
GST_ALL_LDFLAGS
GST_CXXFLAGS
-GST_LT_LDFLAGS
GST_OPTION_CXXFLAGS
GST_OPTION_CFLAGS
DEPRECATED_CFLAGS
@@ -1061,6 +1080,11 @@ LIBTOOL
OBJDUMP
DLLTOOL
AS
+GST_LT_LDFLAGS
+GST_LIBVERSION
+GST_AGE
+GST_REVISION
+GST_CURRENT
GST_API_VERSION
AM_BACKSLASH
AM_DEFAULT_VERBOSITY
@@ -1148,8 +1172,8 @@ ac_user_opts='
enable_option_checking
enable_maintainer_mode
enable_silent_rules
-enable_shared
enable_static
+enable_shared
with_pic
enable_fast_install
enable_dependency_tracking
@@ -1810,8 +1834,6 @@ target=$target_alias
if test "x$host_alias" != x; then
if test "x$build_alias" = x; then
cross_compiling=maybe
- $as_echo "$as_me: WARNING: if you wanted to set the --build type, don't use --host.
- If a cross compiler is detected then cross compile mode will be used" >&2
elif test "x$build_alias" != "x$host_alias"; then
cross_compiling=yes
fi
@@ -1897,7 +1919,7 @@ if test "$ac_init_help" = "long"; then
# Omit some internal or obsolete options to make the list less imposing.
# This message is too long to be a string in the A/UX 3.1 sh.
cat <<_ACEOF
-\`configure' configures GStreamer Good Plug-ins 0.11.90 to adapt to many kinds of systems.
+\`configure' configures GStreamer Good Plug-ins 0.11.91 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@@ -1972,7 +1994,7 @@ fi
if test -n "$ac_init_help"; then
case $ac_init_help in
- short | recursive ) echo "Configuration of GStreamer Good Plug-ins 0.11.90:";;
+ short | recursive ) echo "Configuration of GStreamer Good Plug-ins 0.11.91:";;
esac
cat <<\_ACEOF
@@ -1980,12 +2002,12 @@ Optional Features:
--disable-option-checking ignore unrecognized --enable/--with options
--disable-FEATURE do not include FEATURE (same as --enable-FEATURE=no)
--enable-FEATURE[=ARG] include FEATURE [ARG=yes]
- --enable-maintainer-mode enable make rules and dependencies not useful
+ --disable-maintainer-mode disable make rules and dependencies not useful
(and sometimes confusing) to the casual installer
--enable-silent-rules less verbose build output (undo: `make V=1')
--disable-silent-rules verbose build output (undo: `make V=0')
+ --enable-static[=PKGS] build static libraries [default=no]
--enable-shared[=PKGS] build shared libraries [default=yes]
- --enable-static[=PKGS] build static libraries [default=yes]
--enable-fast-install[=PKGS]
optimize for fast installation [default=yes]
--disable-dependency-tracking speeds up one-time build
@@ -2326,10 +2348,10 @@ fi
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
-GStreamer Good Plug-ins configure 0.11.90
-generated by GNU Autoconf 2.68
+GStreamer Good Plug-ins configure 0.11.91
+generated by GNU Autoconf 2.69
-Copyright (C) 2010 Free Software Foundation, Inc.
+Copyright (C) 2012 Free Software Foundation, Inc.
This configure script is free software; the Free Software Foundation
gives unlimited permission to copy, distribute and modify it.
_ACEOF
@@ -2405,7 +2427,7 @@ $as_echo "$ac_try_echo"; } >&5
test ! -s conftest.err
} && test -s conftest$ac_exeext && {
test "$cross_compiling" = yes ||
- $as_test_x conftest$ac_exeext
+ test -x conftest$ac_exeext
}; then :
ac_retval=0
else
@@ -2749,7 +2771,7 @@ $as_echo "$ac_try_echo"; } >&5
test ! -s conftest.err
} && test -s conftest$ac_exeext && {
test "$cross_compiling" = yes ||
- $as_test_x conftest$ac_exeext
+ test -x conftest$ac_exeext
}; then :
ac_retval=0
else
@@ -2839,7 +2861,8 @@ int
main ()
{
static int test_array [1 - 2 * !(($2) >= 0)];
-test_array [0] = 0
+test_array [0] = 0;
+return test_array [0];
;
return 0;
@@ -2855,7 +2878,8 @@ int
main ()
{
static int test_array [1 - 2 * !(($2) <= $ac_mid)];
-test_array [0] = 0
+test_array [0] = 0;
+return test_array [0];
;
return 0;
@@ -2881,7 +2905,8 @@ int
main ()
{
static int test_array [1 - 2 * !(($2) < 0)];
-test_array [0] = 0
+test_array [0] = 0;
+return test_array [0];
;
return 0;
@@ -2897,7 +2922,8 @@ int
main ()
{
static int test_array [1 - 2 * !(($2) >= $ac_mid)];
-test_array [0] = 0
+test_array [0] = 0;
+return test_array [0];
;
return 0;
@@ -2931,7 +2957,8 @@ int
main ()
{
static int test_array [1 - 2 * !(($2) <= $ac_mid)];
-test_array [0] = 0
+test_array [0] = 0;
+return test_array [0];
;
return 0;
@@ -3094,8 +3121,8 @@ cat >config.log <<_ACEOF
This file contains any messages produced by compilers while
running configure, to aid debugging if configure makes a mistake.
-It was created by GStreamer Good Plug-ins $as_me 0.11.90, which was
-generated by GNU Autoconf 2.68. Invocation command line was
+It was created by GStreamer Good Plug-ins $as_me 0.11.91, which was
+generated by GNU Autoconf 2.69. Invocation command line was
$ $0 $@
@@ -3519,7 +3546,7 @@ case $as_dir/ in #((
# by default.
for ac_prog in ginstall scoinst install; do
for ac_exec_ext in '' $ac_executable_extensions; do
- if { test -f "$as_dir/$ac_prog$ac_exec_ext" && $as_test_x "$as_dir/$ac_prog$ac_exec_ext"; }; then
+ if as_fn_executable_p "$as_dir/$ac_prog$ac_exec_ext"; then
if test $ac_prog = install &&
grep dspmsg "$as_dir/$ac_prog$ac_exec_ext" >/dev/null 2>&1; then
# AIX install. It has an incompatible calling convention.
@@ -3688,7 +3715,7 @@ do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
ac_cv_prog_STRIP="${ac_tool_prefix}strip"
$as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
@@ -3728,7 +3755,7 @@ do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
ac_cv_prog_ac_ct_STRIP="strip"
$as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
@@ -3779,7 +3806,7 @@ do
test -z "$as_dir" && as_dir=.
for ac_prog in mkdir gmkdir; do
for ac_exec_ext in '' $ac_executable_extensions; do
- { test -f "$as_dir/$ac_prog$ac_exec_ext" && $as_test_x "$as_dir/$ac_prog$ac_exec_ext"; } || continue
+ as_fn_executable_p "$as_dir/$ac_prog$ac_exec_ext" || continue
case `"$as_dir/$ac_prog$ac_exec_ext" --version 2>&1` in #(
'mkdir (GNU coreutils) '* | \
'mkdir (coreutils) '* | \
@@ -3832,7 +3859,7 @@ do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
ac_cv_prog_AWK="$ac_prog"
$as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
@@ -3918,7 +3945,7 @@ fi
# Define the identity of the package.
PACKAGE='gst-plugins-good'
- VERSION='0.11.90'
+ VERSION='0.11.91'
cat >>confdefs.h <<_ACEOF
@@ -3952,7 +3979,88 @@ MAKEINFO=${MAKEINFO-"${am_missing_run}makeinfo"}
# in the wild :-( We should find a proper way to deprecate it ...
AMTAR='$${TAR-tar}'
-am__tar='$${TAR-tar} chof - "$$tardir"' am__untar='$${TAR-tar} xf -'
+
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to create a ustar tar archive" >&5
+$as_echo_n "checking how to create a ustar tar archive... " >&6; }
+# Loop over all known methods to create a tar archive until one works.
+_am_tools='gnutar plaintar pax cpio none'
+_am_tools=${am_cv_prog_tar_ustar-$_am_tools}
+# Do not fold the above two line into one, because Tru64 sh and
+# Solaris sh will not grok spaces in the rhs of `-'.
+for _am_tool in $_am_tools
+do
+ case $_am_tool in
+ gnutar)
+ for _am_tar in tar gnutar gtar;
+ do
+ { echo "$as_me:$LINENO: $_am_tar --version" >&5
+ ($_am_tar --version) >&5 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } && break
+ done
+ am__tar="$_am_tar --format=ustar -chf - "'"$$tardir"'
+ am__tar_="$_am_tar --format=ustar -chf - "'"$tardir"'
+ am__untar="$_am_tar -xf -"
+ ;;
+ plaintar)
+ # Must skip GNU tar: if it does not support --format= it doesn't create
+ # ustar tarball either.
+ (tar --version) >/dev/null 2>&1 && continue
+ am__tar='tar chf - "$$tardir"'
+ am__tar_='tar chf - "$tardir"'
+ am__untar='tar xf -'
+ ;;
+ pax)
+ am__tar='pax -L -x ustar -w "$$tardir"'
+ am__tar_='pax -L -x ustar -w "$tardir"'
+ am__untar='pax -r'
+ ;;
+ cpio)
+ am__tar='find "$$tardir" -print | cpio -o -H ustar -L'
+ am__tar_='find "$tardir" -print | cpio -o -H ustar -L'
+ am__untar='cpio -i -H ustar -d'
+ ;;
+ none)
+ am__tar=false
+ am__tar_=false
+ am__untar=false
+ ;;
+ esac
+
+ # If the value was cached, stop now. We just wanted to have am__tar
+ # and am__untar set.
+ test -n "${am_cv_prog_tar_ustar}" && break
+
+ # tar/untar a dummy directory, and stop if the command works
+ rm -rf conftest.dir
+ mkdir conftest.dir
+ echo GrepMe > conftest.dir/file
+ { echo "$as_me:$LINENO: tardir=conftest.dir && eval $am__tar_ >conftest.tar" >&5
+ (tardir=conftest.dir && eval $am__tar_ >conftest.tar) >&5 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }
+ rm -rf conftest.dir
+ if test -s conftest.tar; then
+ { echo "$as_me:$LINENO: $am__untar <conftest.tar" >&5
+ ($am__untar <conftest.tar) >&5 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }
+ grep GrepMe conftest.dir/file >/dev/null 2>&1 && break
+ fi
+done
+rm -rf conftest.dir
+
+if ${am_cv_prog_tar_ustar+:} false; then :
+ $as_echo_n "(cached) " >&6
+else
+ am_cv_prog_tar_ustar=$_am_tool
+fi
+
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_prog_tar_ustar" >&5
+$as_echo "$am_cv_prog_tar_ustar" >&6; }
@@ -3960,9 +4068,9 @@ am__tar='$${TAR-tar} chof - "$$tardir"' am__untar='$${TAR-tar} xf -'
- PACKAGE_VERSION_MAJOR=$(echo 0.11.90 | cut -d'.' -f1)
- PACKAGE_VERSION_MINOR=$(echo 0.11.90 | cut -d'.' -f2)
- PACKAGE_VERSION_MICRO=$(echo 0.11.90 | cut -d'.' -f3)
+ PACKAGE_VERSION_MAJOR=$(echo 0.11.91 | cut -d'.' -f1)
+ PACKAGE_VERSION_MINOR=$(echo 0.11.91 | cut -d'.' -f2)
+ PACKAGE_VERSION_MICRO=$(echo 0.11.91 | cut -d'.' -f3)
@@ -3973,7 +4081,7 @@ am__tar='$${TAR-tar} chof - "$$tardir"' am__untar='$${TAR-tar} xf -'
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking nano version" >&5
$as_echo_n "checking nano version... " >&6; }
- NANO=$(echo 0.11.90 | cut -d'.' -f4)
+ NANO=$(echo 0.11.91 | cut -d'.' -f4)
if test x"$NANO" = x || test "x$NANO" = "x0" ; then
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: 0 (release)" >&5
@@ -4008,7 +4116,7 @@ $as_echo_n "checking whether to enable maintainer-specific portions of Makefiles
if test "${enable_maintainer_mode+set}" = set; then :
enableval=$enable_maintainer_mode; USE_MAINTAINER_MODE=$enableval
else
- USE_MAINTAINER_MODE=no
+ USE_MAINTAINER_MODE=yes
fi
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $USE_MAINTAINER_MODE" >&5
@@ -4152,311 +4260,6 @@ _ACEOF
;;
esac
-
-
-enable_win32_dll=yes
-
-case $host in
-*-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-cegcc*)
- if test -n "$ac_tool_prefix"; then
- # Extract the first word of "${ac_tool_prefix}as", so it can be a program name with args.
-set dummy ${ac_tool_prefix}as; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_prog_AS+:} false; then :
- $as_echo_n "(cached) " >&6
-else
- if test -n "$AS"; then
- ac_cv_prog_AS="$AS" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
- IFS=$as_save_IFS
- test -z "$as_dir" && as_dir=.
- for ac_exec_ext in '' $ac_executable_extensions; do
- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
- ac_cv_prog_AS="${ac_tool_prefix}as"
- $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
- break 2
- fi
-done
- done
-IFS=$as_save_IFS
-
-fi
-fi
-AS=$ac_cv_prog_AS
-if test -n "$AS"; then
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $AS" >&5
-$as_echo "$AS" >&6; }
-else
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-
-fi
-if test -z "$ac_cv_prog_AS"; then
- ac_ct_AS=$AS
- # Extract the first word of "as", so it can be a program name with args.
-set dummy as; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_prog_ac_ct_AS+:} false; then :
- $as_echo_n "(cached) " >&6
-else
- if test -n "$ac_ct_AS"; then
- ac_cv_prog_ac_ct_AS="$ac_ct_AS" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
- IFS=$as_save_IFS
- test -z "$as_dir" && as_dir=.
- for ac_exec_ext in '' $ac_executable_extensions; do
- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
- ac_cv_prog_ac_ct_AS="as"
- $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
- break 2
- fi
-done
- done
-IFS=$as_save_IFS
-
-fi
-fi
-ac_ct_AS=$ac_cv_prog_ac_ct_AS
-if test -n "$ac_ct_AS"; then
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_AS" >&5
-$as_echo "$ac_ct_AS" >&6; }
-else
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
- if test "x$ac_ct_AS" = x; then
- AS="false"
- else
- case $cross_compiling:$ac_tool_warned in
-yes:)
-{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
-$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
-ac_tool_warned=yes ;;
-esac
- AS=$ac_ct_AS
- fi
-else
- AS="$ac_cv_prog_AS"
-fi
-
- if test -n "$ac_tool_prefix"; then
- # Extract the first word of "${ac_tool_prefix}dlltool", so it can be a program name with args.
-set dummy ${ac_tool_prefix}dlltool; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_prog_DLLTOOL+:} false; then :
- $as_echo_n "(cached) " >&6
-else
- if test -n "$DLLTOOL"; then
- ac_cv_prog_DLLTOOL="$DLLTOOL" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
- IFS=$as_save_IFS
- test -z "$as_dir" && as_dir=.
- for ac_exec_ext in '' $ac_executable_extensions; do
- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
- ac_cv_prog_DLLTOOL="${ac_tool_prefix}dlltool"
- $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
- break 2
- fi
-done
- done
-IFS=$as_save_IFS
-
-fi
-fi
-DLLTOOL=$ac_cv_prog_DLLTOOL
-if test -n "$DLLTOOL"; then
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $DLLTOOL" >&5
-$as_echo "$DLLTOOL" >&6; }
-else
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-
-fi
-if test -z "$ac_cv_prog_DLLTOOL"; then
- ac_ct_DLLTOOL=$DLLTOOL
- # Extract the first word of "dlltool", so it can be a program name with args.
-set dummy dlltool; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_prog_ac_ct_DLLTOOL+:} false; then :
- $as_echo_n "(cached) " >&6
-else
- if test -n "$ac_ct_DLLTOOL"; then
- ac_cv_prog_ac_ct_DLLTOOL="$ac_ct_DLLTOOL" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
- IFS=$as_save_IFS
- test -z "$as_dir" && as_dir=.
- for ac_exec_ext in '' $ac_executable_extensions; do
- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
- ac_cv_prog_ac_ct_DLLTOOL="dlltool"
- $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
- break 2
- fi
-done
- done
-IFS=$as_save_IFS
-
-fi
-fi
-ac_ct_DLLTOOL=$ac_cv_prog_ac_ct_DLLTOOL
-if test -n "$ac_ct_DLLTOOL"; then
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_DLLTOOL" >&5
-$as_echo "$ac_ct_DLLTOOL" >&6; }
-else
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
- if test "x$ac_ct_DLLTOOL" = x; then
- DLLTOOL="false"
- else
- case $cross_compiling:$ac_tool_warned in
-yes:)
-{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
-$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
-ac_tool_warned=yes ;;
-esac
- DLLTOOL=$ac_ct_DLLTOOL
- fi
-else
- DLLTOOL="$ac_cv_prog_DLLTOOL"
-fi
-
- if test -n "$ac_tool_prefix"; then
- # Extract the first word of "${ac_tool_prefix}objdump", so it can be a program name with args.
-set dummy ${ac_tool_prefix}objdump; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_prog_OBJDUMP+:} false; then :
- $as_echo_n "(cached) " >&6
-else
- if test -n "$OBJDUMP"; then
- ac_cv_prog_OBJDUMP="$OBJDUMP" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
- IFS=$as_save_IFS
- test -z "$as_dir" && as_dir=.
- for ac_exec_ext in '' $ac_executable_extensions; do
- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
- ac_cv_prog_OBJDUMP="${ac_tool_prefix}objdump"
- $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
- break 2
- fi
-done
- done
-IFS=$as_save_IFS
-
-fi
-fi
-OBJDUMP=$ac_cv_prog_OBJDUMP
-if test -n "$OBJDUMP"; then
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $OBJDUMP" >&5
-$as_echo "$OBJDUMP" >&6; }
-else
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-
-fi
-if test -z "$ac_cv_prog_OBJDUMP"; then
- ac_ct_OBJDUMP=$OBJDUMP
- # Extract the first word of "objdump", so it can be a program name with args.
-set dummy objdump; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_prog_ac_ct_OBJDUMP+:} false; then :
- $as_echo_n "(cached) " >&6
-else
- if test -n "$ac_ct_OBJDUMP"; then
- ac_cv_prog_ac_ct_OBJDUMP="$ac_ct_OBJDUMP" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
- IFS=$as_save_IFS
- test -z "$as_dir" && as_dir=.
- for ac_exec_ext in '' $ac_executable_extensions; do
- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
- ac_cv_prog_ac_ct_OBJDUMP="objdump"
- $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
- break 2
- fi
-done
- done
-IFS=$as_save_IFS
-
-fi
-fi
-ac_ct_OBJDUMP=$ac_cv_prog_ac_ct_OBJDUMP
-if test -n "$ac_ct_OBJDUMP"; then
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_OBJDUMP" >&5
-$as_echo "$ac_ct_OBJDUMP" >&6; }
-else
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
- if test "x$ac_ct_OBJDUMP" = x; then
- OBJDUMP="false"
- else
- case $cross_compiling:$ac_tool_warned in
-yes:)
-{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
-$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
-ac_tool_warned=yes ;;
-esac
- OBJDUMP=$ac_ct_OBJDUMP
- fi
-else
- OBJDUMP="$ac_cv_prog_OBJDUMP"
-fi
-
- ;;
-esac
-
-test -z "$AS" && AS=as
-
-
-
-
-
-test -z "$DLLTOOL" && DLLTOOL=dlltool
-
-
-
-
-
-test -z "$OBJDUMP" && OBJDUMP=objdump
-
-
-
-
-
-
-
case `pwd` in
*\ * | *\ *)
{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Libtool does not cope well with whitespace in \`pwd\`" >&5
@@ -4636,7 +4439,7 @@ do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
ac_cv_prog_CC="${ac_tool_prefix}gcc"
$as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
@@ -4676,7 +4479,7 @@ do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
ac_cv_prog_ac_ct_CC="gcc"
$as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
@@ -4729,7 +4532,7 @@ do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
ac_cv_prog_CC="${ac_tool_prefix}cc"
$as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
@@ -4770,7 +4573,7 @@ do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
if test "$as_dir/$ac_word$ac_exec_ext" = "/usr/ucb/cc"; then
ac_prog_rejected=yes
continue
@@ -4828,7 +4631,7 @@ do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
ac_cv_prog_CC="$ac_tool_prefix$ac_prog"
$as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
@@ -4872,7 +4675,7 @@ do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
ac_cv_prog_ac_ct_CC="$ac_prog"
$as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
@@ -5318,8 +5121,7 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
#include <stdarg.h>
#include <stdio.h>
-#include <sys/types.h>
-#include <sys/stat.h>
+struct stat;
/* Most of the following tests are stolen from RCS 5.7's src/conf.sh. */
struct buf { int x; };
FILE * (*rcsopen) (struct buf *, struct stat *, int);
@@ -5554,7 +5356,7 @@ do
for ac_prog in sed gsed; do
for ac_exec_ext in '' $ac_executable_extensions; do
ac_path_SED="$as_dir/$ac_prog$ac_exec_ext"
- { test -f "$ac_path_SED" && $as_test_x "$ac_path_SED"; } || continue
+ as_fn_executable_p "$ac_path_SED" || continue
# Check for GNU ac_path_SED and select it if it is found.
# Check for GNU $ac_path_SED
case `"$ac_path_SED" --version 2>&1` in
@@ -5630,7 +5432,7 @@ do
for ac_prog in grep ggrep; do
for ac_exec_ext in '' $ac_executable_extensions; do
ac_path_GREP="$as_dir/$ac_prog$ac_exec_ext"
- { test -f "$ac_path_GREP" && $as_test_x "$ac_path_GREP"; } || continue
+ as_fn_executable_p "$ac_path_GREP" || continue
# Check for GNU ac_path_GREP and select it if it is found.
# Check for GNU $ac_path_GREP
case `"$ac_path_GREP" --version 2>&1` in
@@ -5696,7 +5498,7 @@ do
for ac_prog in egrep; do
for ac_exec_ext in '' $ac_executable_extensions; do
ac_path_EGREP="$as_dir/$ac_prog$ac_exec_ext"
- { test -f "$ac_path_EGREP" && $as_test_x "$ac_path_EGREP"; } || continue
+ as_fn_executable_p "$ac_path_EGREP" || continue
# Check for GNU ac_path_EGREP and select it if it is found.
# Check for GNU $ac_path_EGREP
case `"$ac_path_EGREP" --version 2>&1` in
@@ -5763,7 +5565,7 @@ do
for ac_prog in fgrep; do
for ac_exec_ext in '' $ac_executable_extensions; do
ac_path_FGREP="$as_dir/$ac_prog$ac_exec_ext"
- { test -f "$ac_path_FGREP" && $as_test_x "$ac_path_FGREP"; } || continue
+ as_fn_executable_p "$ac_path_FGREP" || continue
# Check for GNU ac_path_FGREP and select it if it is found.
# Check for GNU $ac_path_FGREP
case `"$ac_path_FGREP" --version 2>&1` in
@@ -6019,7 +5821,7 @@ do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
ac_cv_prog_DUMPBIN="$ac_tool_prefix$ac_prog"
$as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
@@ -6063,7 +5865,7 @@ do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
ac_cv_prog_ac_ct_DUMPBIN="$ac_prog"
$as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
@@ -6487,7 +6289,7 @@ do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
ac_cv_prog_OBJDUMP="${ac_tool_prefix}objdump"
$as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
@@ -6527,7 +6329,7 @@ do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
ac_cv_prog_ac_ct_OBJDUMP="objdump"
$as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
@@ -6830,7 +6632,7 @@ do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
ac_cv_prog_DLLTOOL="${ac_tool_prefix}dlltool"
$as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
@@ -6870,7 +6672,7 @@ do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
ac_cv_prog_ac_ct_DLLTOOL="dlltool"
$as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
@@ -6971,7 +6773,7 @@ do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
ac_cv_prog_AR="$ac_tool_prefix$ac_prog"
$as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
@@ -7015,7 +6817,7 @@ do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
ac_cv_prog_ac_ct_AR="$ac_prog"
$as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
@@ -7140,7 +6942,7 @@ do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
ac_cv_prog_STRIP="${ac_tool_prefix}strip"
$as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
@@ -7180,7 +6982,7 @@ do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
ac_cv_prog_ac_ct_STRIP="strip"
$as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
@@ -7239,7 +7041,7 @@ do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
ac_cv_prog_RANLIB="${ac_tool_prefix}ranlib"
$as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
@@ -7279,7 +7081,7 @@ do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
ac_cv_prog_ac_ct_RANLIB="ranlib"
$as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
@@ -7928,7 +7730,7 @@ do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
ac_cv_prog_MANIFEST_TOOL="${ac_tool_prefix}mt"
$as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
@@ -7968,7 +7770,7 @@ do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
ac_cv_prog_ac_ct_MANIFEST_TOOL="mt"
$as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
@@ -8048,7 +7850,7 @@ do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
ac_cv_prog_DSYMUTIL="${ac_tool_prefix}dsymutil"
$as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
@@ -8088,7 +7890,7 @@ do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
ac_cv_prog_ac_ct_DSYMUTIL="dsymutil"
$as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
@@ -8140,7 +7942,7 @@ do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
ac_cv_prog_NMEDIT="${ac_tool_prefix}nmedit"
$as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
@@ -8180,7 +7982,7 @@ do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
ac_cv_prog_ac_ct_NMEDIT="nmedit"
$as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
@@ -8232,7 +8034,7 @@ do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
ac_cv_prog_LIPO="${ac_tool_prefix}lipo"
$as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
@@ -8272,7 +8074,7 @@ do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
ac_cv_prog_ac_ct_LIPO="lipo"
$as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
@@ -8324,7 +8126,7 @@ do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
ac_cv_prog_OTOOL="${ac_tool_prefix}otool"
$as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
@@ -8364,7 +8166,7 @@ do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
ac_cv_prog_ac_ct_OTOOL="otool"
$as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
@@ -8416,7 +8218,7 @@ do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
ac_cv_prog_OTOOL64="${ac_tool_prefix}otool64"
$as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
@@ -8456,7 +8258,7 @@ do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
ac_cv_prog_ac_ct_OTOOL64="otool64"
$as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
@@ -8936,38 +8738,350 @@ fi
done
+ GST_CURRENT=0
+ GST_REVISION=0
+ GST_AGE=0
+ GST_LIBVERSION=0:0:0
+
+
+
+
+
+ GST_LT_LDFLAGS="$GST_LT_LDFLAGS -version-info $GST_LIBVERSION"
+ if test ! -z ""
+ then
+ GST_LT_LDFLAGS="$GST_LT_LDFLAGS -release "
+ fi
+
+
+
+
# Set options
+enable_dlopen=yes
+enable_win32_dll=yes
+case $host in
+*-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-cegcc*)
+ if test -n "$ac_tool_prefix"; then
+ # Extract the first word of "${ac_tool_prefix}as", so it can be a program name with args.
+set dummy ${ac_tool_prefix}as; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if ${ac_cv_prog_AS+:} false; then :
+ $as_echo_n "(cached) " >&6
+else
+ if test -n "$AS"; then
+ ac_cv_prog_AS="$AS" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+ IFS=$as_save_IFS
+ test -z "$as_dir" && as_dir=.
+ for ac_exec_ext in '' $ac_executable_extensions; do
+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+ ac_cv_prog_AS="${ac_tool_prefix}as"
+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+ break 2
+ fi
+done
+ done
+IFS=$as_save_IFS
+fi
+fi
+AS=$ac_cv_prog_AS
+if test -n "$AS"; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $AS" >&5
+$as_echo "$AS" >&6; }
+else
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
- enable_dlopen=no
+fi
+if test -z "$ac_cv_prog_AS"; then
+ ac_ct_AS=$AS
+ # Extract the first word of "as", so it can be a program name with args.
+set dummy as; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if ${ac_cv_prog_ac_ct_AS+:} false; then :
+ $as_echo_n "(cached) " >&6
+else
+ if test -n "$ac_ct_AS"; then
+ ac_cv_prog_ac_ct_AS="$ac_ct_AS" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+ IFS=$as_save_IFS
+ test -z "$as_dir" && as_dir=.
+ for ac_exec_ext in '' $ac_executable_extensions; do
+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+ ac_cv_prog_ac_ct_AS="as"
+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+ break 2
+ fi
+done
+ done
+IFS=$as_save_IFS
+fi
+fi
+ac_ct_AS=$ac_cv_prog_ac_ct_AS
+if test -n "$ac_ct_AS"; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_AS" >&5
+$as_echo "$ac_ct_AS" >&6; }
+else
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
- # Check whether --enable-shared was given.
-if test "${enable_shared+set}" = set; then :
- enableval=$enable_shared; p=${PACKAGE-default}
+ if test "x$ac_ct_AS" = x; then
+ AS="false"
+ else
+ case $cross_compiling:$ac_tool_warned in
+yes:)
+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
+$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
+ac_tool_warned=yes ;;
+esac
+ AS=$ac_ct_AS
+ fi
+else
+ AS="$ac_cv_prog_AS"
+fi
+
+ if test -n "$ac_tool_prefix"; then
+ # Extract the first word of "${ac_tool_prefix}dlltool", so it can be a program name with args.
+set dummy ${ac_tool_prefix}dlltool; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if ${ac_cv_prog_DLLTOOL+:} false; then :
+ $as_echo_n "(cached) " >&6
+else
+ if test -n "$DLLTOOL"; then
+ ac_cv_prog_DLLTOOL="$DLLTOOL" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+ IFS=$as_save_IFS
+ test -z "$as_dir" && as_dir=.
+ for ac_exec_ext in '' $ac_executable_extensions; do
+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+ ac_cv_prog_DLLTOOL="${ac_tool_prefix}dlltool"
+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+ break 2
+ fi
+done
+ done
+IFS=$as_save_IFS
+
+fi
+fi
+DLLTOOL=$ac_cv_prog_DLLTOOL
+if test -n "$DLLTOOL"; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $DLLTOOL" >&5
+$as_echo "$DLLTOOL" >&6; }
+else
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+
+fi
+if test -z "$ac_cv_prog_DLLTOOL"; then
+ ac_ct_DLLTOOL=$DLLTOOL
+ # Extract the first word of "dlltool", so it can be a program name with args.
+set dummy dlltool; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if ${ac_cv_prog_ac_ct_DLLTOOL+:} false; then :
+ $as_echo_n "(cached) " >&6
+else
+ if test -n "$ac_ct_DLLTOOL"; then
+ ac_cv_prog_ac_ct_DLLTOOL="$ac_ct_DLLTOOL" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+ IFS=$as_save_IFS
+ test -z "$as_dir" && as_dir=.
+ for ac_exec_ext in '' $ac_executable_extensions; do
+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+ ac_cv_prog_ac_ct_DLLTOOL="dlltool"
+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+ break 2
+ fi
+done
+ done
+IFS=$as_save_IFS
+
+fi
+fi
+ac_ct_DLLTOOL=$ac_cv_prog_ac_ct_DLLTOOL
+if test -n "$ac_ct_DLLTOOL"; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_DLLTOOL" >&5
+$as_echo "$ac_ct_DLLTOOL" >&6; }
+else
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+ if test "x$ac_ct_DLLTOOL" = x; then
+ DLLTOOL="false"
+ else
+ case $cross_compiling:$ac_tool_warned in
+yes:)
+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
+$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
+ac_tool_warned=yes ;;
+esac
+ DLLTOOL=$ac_ct_DLLTOOL
+ fi
+else
+ DLLTOOL="$ac_cv_prog_DLLTOOL"
+fi
+
+ if test -n "$ac_tool_prefix"; then
+ # Extract the first word of "${ac_tool_prefix}objdump", so it can be a program name with args.
+set dummy ${ac_tool_prefix}objdump; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if ${ac_cv_prog_OBJDUMP+:} false; then :
+ $as_echo_n "(cached) " >&6
+else
+ if test -n "$OBJDUMP"; then
+ ac_cv_prog_OBJDUMP="$OBJDUMP" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+ IFS=$as_save_IFS
+ test -z "$as_dir" && as_dir=.
+ for ac_exec_ext in '' $ac_executable_extensions; do
+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+ ac_cv_prog_OBJDUMP="${ac_tool_prefix}objdump"
+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+ break 2
+ fi
+done
+ done
+IFS=$as_save_IFS
+
+fi
+fi
+OBJDUMP=$ac_cv_prog_OBJDUMP
+if test -n "$OBJDUMP"; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $OBJDUMP" >&5
+$as_echo "$OBJDUMP" >&6; }
+else
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+
+fi
+if test -z "$ac_cv_prog_OBJDUMP"; then
+ ac_ct_OBJDUMP=$OBJDUMP
+ # Extract the first word of "objdump", so it can be a program name with args.
+set dummy objdump; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if ${ac_cv_prog_ac_ct_OBJDUMP+:} false; then :
+ $as_echo_n "(cached) " >&6
+else
+ if test -n "$ac_ct_OBJDUMP"; then
+ ac_cv_prog_ac_ct_OBJDUMP="$ac_ct_OBJDUMP" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+ IFS=$as_save_IFS
+ test -z "$as_dir" && as_dir=.
+ for ac_exec_ext in '' $ac_executable_extensions; do
+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+ ac_cv_prog_ac_ct_OBJDUMP="objdump"
+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+ break 2
+ fi
+done
+ done
+IFS=$as_save_IFS
+
+fi
+fi
+ac_ct_OBJDUMP=$ac_cv_prog_ac_ct_OBJDUMP
+if test -n "$ac_ct_OBJDUMP"; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_OBJDUMP" >&5
+$as_echo "$ac_ct_OBJDUMP" >&6; }
+else
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+ if test "x$ac_ct_OBJDUMP" = x; then
+ OBJDUMP="false"
+ else
+ case $cross_compiling:$ac_tool_warned in
+yes:)
+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
+$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
+ac_tool_warned=yes ;;
+esac
+ OBJDUMP=$ac_ct_OBJDUMP
+ fi
+else
+ OBJDUMP="$ac_cv_prog_OBJDUMP"
+fi
+
+ ;;
+esac
+
+test -z "$AS" && AS=as
+
+
+
+
+
+test -z "$DLLTOOL" && DLLTOOL=dlltool
+
+
+
+
+
+test -z "$OBJDUMP" && OBJDUMP=objdump
+
+
+
+
+# Check whether --enable-static was given.
+if test "${enable_static+set}" = set; then :
+ enableval=$enable_static; p=${PACKAGE-default}
case $enableval in
- yes) enable_shared=yes ;;
- no) enable_shared=no ;;
+ yes) enable_static=yes ;;
+ no) enable_static=no ;;
*)
- enable_shared=no
+ enable_static=no
# Look at the argument we got. We use all the common list separators.
lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR,"
for pkg in $enableval; do
IFS="$lt_save_ifs"
if test "X$pkg" = "X$p"; then
- enable_shared=yes
+ enable_static=yes
fi
done
IFS="$lt_save_ifs"
;;
esac
else
- enable_shared=yes
+ enable_static=no
fi
@@ -8978,27 +9092,30 @@ fi
- # Check whether --enable-static was given.
-if test "${enable_static+set}" = set; then :
- enableval=$enable_static; p=${PACKAGE-default}
+
+
+
+ # Check whether --enable-shared was given.
+if test "${enable_shared+set}" = set; then :
+ enableval=$enable_shared; p=${PACKAGE-default}
case $enableval in
- yes) enable_static=yes ;;
- no) enable_static=no ;;
+ yes) enable_shared=yes ;;
+ no) enable_shared=no ;;
*)
- enable_static=no
+ enable_shared=no
# Look at the argument we got. We use all the common list separators.
lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR,"
for pkg in $enableval; do
IFS="$lt_save_ifs"
if test "X$pkg" = "X$p"; then
- enable_static=yes
+ enable_shared=yes
fi
done
IFS="$lt_save_ifs"
;;
esac
else
- enable_static=yes
+ enable_shared=yes
fi
@@ -9010,6 +9127,7 @@ fi
+
# Check whether --with-pic was given.
if test "${with_pic+set}" = set; then :
withval=$with_pic; lt_p=${PACKAGE-default}
@@ -12958,6 +13076,7 @@ CC="$lt_save_CC"
+
GST_REQ=0.11.90
GSTPB_REQ=0.11.90
@@ -13132,7 +13251,7 @@ do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
ac_cv_path_GMSGFMT="$as_dir/$ac_word$ac_exec_ext"
$as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
@@ -15041,7 +15160,7 @@ do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
ac_cv_path_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext"
$as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
@@ -15084,7 +15203,7 @@ do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
ac_cv_path_ac_pt_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext"
$as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
@@ -16395,7 +16514,7 @@ do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
ac_cv_prog_CC="${ac_tool_prefix}gcc"
$as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
@@ -16435,7 +16554,7 @@ do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
ac_cv_prog_ac_ct_CC="gcc"
$as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
@@ -16488,7 +16607,7 @@ do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
ac_cv_prog_CC="${ac_tool_prefix}cc"
$as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
@@ -16529,7 +16648,7 @@ do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
if test "$as_dir/$ac_word$ac_exec_ext" = "/usr/ucb/cc"; then
ac_prog_rejected=yes
continue
@@ -16587,7 +16706,7 @@ do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
ac_cv_prog_CC="$ac_tool_prefix$ac_prog"
$as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
@@ -16631,7 +16750,7 @@ do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
ac_cv_prog_ac_ct_CC="$ac_prog"
$as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
@@ -16827,8 +16946,7 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
#include <stdarg.h>
#include <stdio.h>
-#include <sys/types.h>
-#include <sys/stat.h>
+struct stat;
/* Most of the following tests are stolen from RCS 5.7's src/conf.sh. */
struct buf { int x; };
FILE * (*rcsopen) (struct buf *, struct stat *, int);
@@ -17191,7 +17309,7 @@ main ()
return 0;
}
_ACEOF
-for ac_arg in '' -std=gnu99 -std=c99 -c99 -AC99 -xc99=all -qlanglvl=extc99
+for ac_arg in '' -std=gnu99 -std=c99 -c99 -AC99 -D_STDC_C99= -qlanglvl=extc99
do
CC="$ac_save_CC $ac_arg"
if ac_fn_c_try_compile "$LINENO"; then :
@@ -17231,8 +17349,7 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
#include <stdarg.h>
#include <stdio.h>
-#include <sys/types.h>
-#include <sys/stat.h>
+struct stat;
/* Most of the following tests are stolen from RCS 5.7's src/conf.sh. */
struct buf { int x; };
FILE * (*rcsopen) (struct buf *, struct stat *, int);
@@ -17363,7 +17480,7 @@ do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
ac_cv_prog_CXX="$ac_tool_prefix$ac_prog"
$as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
@@ -17407,7 +17524,7 @@ do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
ac_cv_prog_ac_ct_CXX="$ac_prog"
$as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
@@ -20950,7 +21067,7 @@ do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
ac_cv_prog_HAVE_CXX="yes"
$as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
@@ -21127,7 +21244,7 @@ do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
ac_cv_prog_OBJC="$ac_tool_prefix$ac_prog"
$as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
@@ -21171,7 +21288,7 @@ do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
ac_cv_prog_ac_ct_OBJC="$ac_prog"
$as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
@@ -21827,7 +21944,7 @@ do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
ac_cv_path_VALGRIND_PATH="$as_dir/$ac_word$ac_exec_ext"
$as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
@@ -21913,7 +22030,7 @@ do
for ac_prog in sed gsed; do
for ac_exec_ext in '' $ac_executable_extensions; do
ac_path_SED="$as_dir/$ac_prog$ac_exec_ext"
- { test -f "$ac_path_SED" && $as_test_x "$ac_path_SED"; } || continue
+ as_fn_executable_p "$ac_path_SED" || continue
# Check for GNU ac_path_SED and select it if it is found.
# Check for GNU $ac_path_SED
case `"$ac_path_SED" --version 2>&1` in
@@ -21988,7 +22105,7 @@ do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
ac_cv_path_GTKDOC_CHECK="$as_dir/$ac_word$ac_exec_ext"
$as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
@@ -22070,7 +22187,7 @@ do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
ac_cv_path_PYTHON="$as_dir/$ac_word$ac_exec_ext"
$as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
@@ -26196,10 +26313,8 @@ _ACEOF
-GST_PLUGINS_NONPORTED="deinterlace flx \
- videobox \
- cairo cairo_gobject dv1394 gdk_pixbuf \
- oss oss4 \
+GST_PLUGINS_NONPORTED="deinterlace \
+ cairo cairo_gobject gdk_pixbuf \
osx_video osx_audio "
@@ -30729,7 +30844,7 @@ do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
ac_cv_path_AALIB_CONFIG="$as_dir/$ac_word$ac_exec_ext"
$as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
@@ -36906,16 +37021,16 @@ if (echo >conf$$.file) 2>/dev/null; then
# ... but there are two gotchas:
# 1) On MSYS, both `ln -s file dir' and `ln file dir' fail.
# 2) DJGPP < 2.04 has no symlinks; `ln -s' creates a wrapper executable.
- # In both cases, we have to default to `cp -p'.
+ # In both cases, we have to default to `cp -pR'.
ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe ||
- as_ln_s='cp -p'
+ as_ln_s='cp -pR'
elif ln conf$$.file conf$$ 2>/dev/null; then
as_ln_s=ln
else
- as_ln_s='cp -p'
+ as_ln_s='cp -pR'
fi
else
- as_ln_s='cp -p'
+ as_ln_s='cp -pR'
fi
rm -f conf$$ conf$$.exe conf$$.dir/conf$$.file conf$$.file
rmdir conf$$.dir 2>/dev/null
@@ -36975,28 +37090,16 @@ else
as_mkdir_p=false
fi
-if test -x / >/dev/null 2>&1; then
- as_test_x='test -x'
-else
- if ls -dL / >/dev/null 2>&1; then
- as_ls_L_option=L
- else
- as_ls_L_option=
- fi
- as_test_x='
- eval sh -c '\''
- if test -d "$1"; then
- test -d "$1/.";
- else
- case $1 in #(
- -*)set "./$1";;
- esac;
- case `ls -ld'$as_ls_L_option' "$1" 2>/dev/null` in #((
- ???[sx]*):;;*)false;;esac;fi
- '\'' sh
- '
-fi
-as_executable_p=$as_test_x
+
+# as_fn_executable_p FILE
+# -----------------------
+# Test if FILE is an executable regular file.
+as_fn_executable_p ()
+{
+ test -f "$1" && test -x "$1"
+} # as_fn_executable_p
+as_test_x='test -x'
+as_executable_p=as_fn_executable_p
# Sed expression to map a string onto a valid CPP name.
as_tr_cpp="eval sed 'y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g'"
@@ -37017,8 +37120,8 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
# report actual input values of CONFIG_FILES etc. instead of their
# values after options handling.
ac_log="
-This file was extended by GStreamer Good Plug-ins $as_me 0.11.90, which was
-generated by GNU Autoconf 2.68. Invocation command line was
+This file was extended by GStreamer Good Plug-ins $as_me 0.11.91, which was
+generated by GNU Autoconf 2.69. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
CONFIG_HEADERS = $CONFIG_HEADERS
@@ -37083,11 +37186,11 @@ _ACEOF
cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
ac_cs_version="\\
-GStreamer Good Plug-ins config.status 0.11.90
-configured by $0, generated by GNU Autoconf 2.68,
+GStreamer Good Plug-ins config.status 0.11.91
+configured by $0, generated by GNU Autoconf 2.69,
with options \\"\$ac_cs_config\\"
-Copyright (C) 2010 Free Software Foundation, Inc.
+Copyright (C) 2012 Free Software Foundation, Inc.
This config.status script is free software; the Free Software Foundation
gives unlimited permission to copy, distribute and modify it."
@@ -37178,7 +37281,7 @@ fi
_ACEOF
cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
if \$ac_cs_recheck; then
- set X '$SHELL' '$0' $ac_configure_args \$ac_configure_extra_args --no-create --no-recursion
+ set X $SHELL '$0' $ac_configure_args \$ac_configure_extra_args --no-create --no-recursion
shift
\$as_echo "running CONFIG_SHELL=$SHELL \$*" >&6
CONFIG_SHELL='$SHELL'
@@ -37212,13 +37315,13 @@ AMDEP_TRUE="$AMDEP_TRUE" ac_aux_dir="$ac_aux_dir"
sed_quote_subst='$sed_quote_subst'
double_quote_subst='$double_quote_subst'
delay_variable_subst='$delay_variable_subst'
+macro_version='`$ECHO "$macro_version" | $SED "$delay_single_quote_subst"`'
+macro_revision='`$ECHO "$macro_revision" | $SED "$delay_single_quote_subst"`'
AS='`$ECHO "$AS" | $SED "$delay_single_quote_subst"`'
DLLTOOL='`$ECHO "$DLLTOOL" | $SED "$delay_single_quote_subst"`'
OBJDUMP='`$ECHO "$OBJDUMP" | $SED "$delay_single_quote_subst"`'
-macro_version='`$ECHO "$macro_version" | $SED "$delay_single_quote_subst"`'
-macro_revision='`$ECHO "$macro_revision" | $SED "$delay_single_quote_subst"`'
-enable_shared='`$ECHO "$enable_shared" | $SED "$delay_single_quote_subst"`'
enable_static='`$ECHO "$enable_static" | $SED "$delay_single_quote_subst"`'
+enable_shared='`$ECHO "$enable_shared" | $SED "$delay_single_quote_subst"`'
pic_mode='`$ECHO "$pic_mode" | $SED "$delay_single_quote_subst"`'
enable_fast_install='`$ECHO "$enable_fast_install" | $SED "$delay_single_quote_subst"`'
SHELL='`$ECHO "$SHELL" | $SED "$delay_single_quote_subst"`'
@@ -38460,6 +38563,10 @@ available_tags="CXX "
# ### BEGIN LIBTOOL CONFIG
+# Which release of libtool.m4 was used?
+macro_version=$macro_version
+macro_revision=$macro_revision
+
# Assembler program.
AS=$lt_AS
@@ -38469,16 +38576,12 @@ DLLTOOL=$lt_DLLTOOL
# Object dumper program.
OBJDUMP=$lt_OBJDUMP
-# Which release of libtool.m4 was used?
-macro_version=$macro_version
-macro_revision=$macro_revision
+# Whether or not to build static libraries.
+build_old_libs=$enable_static
# Whether or not to build shared libraries.
build_libtool_libs=$enable_shared
-# Whether or not to build static libraries.
-build_old_libs=$enable_static
-
# What type of objects to build.
pic_mode=$pic_mode
diff --git a/configure.ac b/configure.ac
index 73c344a12e6bfd654c63b082f6f9fa7bb7750c48..a9cbe23a6a32a279cfcbd60a3e4cf1bef811008a 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,18 +1,18 @@
-AC_PREREQ(2.60)
+AC_PREREQ(2.62)
dnl please read gstreamer/docs/random/autotools before changing this file
dnl initialize autoconf
dnl releases only do -Wall, git and prerelease does -Werror too
dnl use a three digit version number for releases, and four for git/pre
-AC_INIT(GStreamer Good Plug-ins, 0.11.90,
+AC_INIT(GStreamer Good Plug-ins, 0.11.91,
http://bugzilla.gnome.org/enter_bug.cgi?product=GStreamer,
gst-plugins-good)
AG_GST_INIT
dnl initialize automake
-AM_INIT_AUTOMAKE([-Wno-portability 1.10])
+AM_INIT_AUTOMAKE([-Wno-portability 1.11 no-dist-gzip dist-xz tar-ustar])
dnl define PACKAGE_VERSION_* variables
AS_VERSION
@@ -27,7 +27,7 @@ dnl define the output header for config
AM_CONFIG_HEADER([config.h])
dnl AM_MAINTAINER_MODE only provides the option to configure to enable it
-AM_MAINTAINER_MODE
+AM_MAINTAINER_MODE([enable])
dnl sets host_* variables
AC_CANONICAL_HOST
@@ -45,14 +45,7 @@ AC_DEFINE_UNQUOTED(GST_API_VERSION, "$GST_API_VERSION",
[GStreamer API Version])
AG_GST_LIBTOOL_PREPARE
-
-dnl FIXME: this macro doesn't actually work;
-dnl the generated libtool script has no support for the listed tags.
-dnl So this needs to be fixed first if we want to use this
-dnl AS_LIBTOOL_TAGS
-
-AC_LIBTOOL_WIN32_DLL
-AM_PROG_LIBTOOL
+AS_LIBTOOL(GST, 0, 0, 0)
dnl *** required versions of GStreamer stuff ***
GST_REQ=0.11.90
@@ -141,7 +134,7 @@ AG_GST_PLUGIN_DOCS([1.3],[2.1])
dnl *** checks for libraries ***
dnl check for libm, for sin()
-AC_CHECK_LIBM
+LT_LIB_M
AC_SUBST(LIBM)
dnl *** checks for header files ***
@@ -315,10 +308,8 @@ dnl *** plug-ins to include ***
dnl Non ported plugins (non-dependant, then dependant)
dnl Make sure you have a space before and after all plugins
-GST_PLUGINS_NONPORTED="deinterlace flx \
- videobox \
- cairo cairo_gobject dv1394 gdk_pixbuf \
- oss oss4 \
+GST_PLUGINS_NONPORTED="deinterlace \
+ cairo cairo_gobject gdk_pixbuf \
osx_video osx_audio "
AC_SUBST(GST_PLUGINS_NONPORTED)
diff --git a/docs/Makefile.in b/docs/Makefile.in
index 51f8a2eb3fe38516d067f0047e9fe39fd1aa486a..36f583a6eabafa5912d4de26bc2607031dd54121 100644
--- a/docs/Makefile.in
+++ b/docs/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.11.4 from Makefile.am.
+# Makefile.in generated by automake 1.11.5 from Makefile.am.
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -58,6 +58,7 @@ am__aclocal_m4_deps = $(top_srcdir)/common/m4/as-ac-expand.m4 \
$(top_srcdir)/common/m4/as-auto-alt.m4 \
$(top_srcdir)/common/m4/as-compiler-flag.m4 \
$(top_srcdir)/common/m4/as-gcc-inline-assembly.m4 \
+ $(top_srcdir)/common/m4/as-libtool.m4 \
$(top_srcdir)/common/m4/as-objc.m4 \
$(top_srcdir)/common/m4/as-python.m4 \
$(top_srcdir)/common/m4/as-scrub-include.m4 \
@@ -228,6 +229,7 @@ GMSGFMT_015 = @GMSGFMT_015@
GREP = @GREP@
GSTPB_PLUGINS_DIR = @GSTPB_PLUGINS_DIR@
GSTPB_PREFIX = @GSTPB_PREFIX@
+GST_AGE = @GST_AGE@
GST_ALL_LDFLAGS = @GST_ALL_LDFLAGS@
GST_API_VERSION = @GST_API_VERSION@
GST_BASE_CFLAGS = @GST_BASE_CFLAGS@
@@ -237,9 +239,11 @@ GST_CHECK_CFLAGS = @GST_CHECK_CFLAGS@
GST_CHECK_LIBS = @GST_CHECK_LIBS@
GST_CONTROLLER_CFLAGS = @GST_CONTROLLER_CFLAGS@
GST_CONTROLLER_LIBS = @GST_CONTROLLER_LIBS@
+GST_CURRENT = @GST_CURRENT@
GST_CXXFLAGS = @GST_CXXFLAGS@
GST_LEVEL_DEFAULT = @GST_LEVEL_DEFAULT@
GST_LIBS = @GST_LIBS@
+GST_LIBVERSION = @GST_LIBVERSION@
GST_LICENSE = @GST_LICENSE@
GST_LT_LDFLAGS = @GST_LT_LDFLAGS@
GST_NET_CFLAGS = @GST_NET_CFLAGS@
@@ -257,6 +261,7 @@ GST_PLUGINS_NONPORTED = @GST_PLUGINS_NONPORTED@
GST_PLUGINS_SELECTED = @GST_PLUGINS_SELECTED@
GST_PLUGIN_LDFLAGS = @GST_PLUGIN_LDFLAGS@
GST_PREFIX = @GST_PREFIX@
+GST_REVISION = @GST_REVISION@
GST_TOOLS_DIR = @GST_TOOLS_DIR@
GTKDOC_CHECK = @GTKDOC_CHECK@
GTK_CFLAGS = @GTK_CFLAGS@
diff --git a/docs/plugins/Makefile.am b/docs/plugins/Makefile.am
index 61240de6ad21386ce98461d0dd5d1dbc4bb7e4cf..5c73726beb39c31531e456d7932d0f03249cf630 100644
--- a/docs/plugins/Makefile.am
+++ b/docs/plugins/Makefile.am
@@ -79,7 +79,6 @@ EXTRA_HFILES = \
$(top_srcdir)/ext/taglib/gstid3v2mux.h \
$(top_srcdir)/ext/pulse/pulsesink.h \
$(top_srcdir)/ext/pulse/pulsesrc.h \
- $(top_srcdir)/ext/pulse/pulsemixer.h \
$(top_srcdir)/ext/speex/gstspeexenc.h \
$(top_srcdir)/ext/speex/gstspeexdec.h \
$(top_srcdir)/ext/wavpack/gstwavpackdec.h \
@@ -192,10 +191,8 @@ EXTRA_HFILES = \
$(top_srcdir)/gst/wavparse/gstwavparse.h \
$(top_srcdir)/gst/y4m/gsty4mencode.h \
$(top_srcdir)/sys/directsound/gstdirectsoundsink.h \
- $(top_srcdir)/sys/oss4/oss4-mixer.h \
$(top_srcdir)/sys/oss4/oss4-sink.h \
$(top_srcdir)/sys/oss4/oss4-source.h \
- $(top_srcdir)/sys/oss/gstossmixerelement.h \
$(top_srcdir)/sys/oss/gstosssink.h \
$(top_srcdir)/sys/oss/gstosssrc.h \
$(top_srcdir)/sys/osxaudio/gstosxaudiosrc.h \
diff --git a/docs/plugins/Makefile.in b/docs/plugins/Makefile.in
index 558a690dc983fbc9ae6e23d28b5c4074fd12985c..dbc8a583cebb0120f82747362ec4a4078caa8877 100644
--- a/docs/plugins/Makefile.in
+++ b/docs/plugins/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.11.4 from Makefile.am.
+# Makefile.in generated by automake 1.11.5 from Makefile.am.
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -76,6 +76,7 @@ am__aclocal_m4_deps = $(top_srcdir)/common/m4/as-ac-expand.m4 \
$(top_srcdir)/common/m4/as-auto-alt.m4 \
$(top_srcdir)/common/m4/as-compiler-flag.m4 \
$(top_srcdir)/common/m4/as-gcc-inline-assembly.m4 \
+ $(top_srcdir)/common/m4/as-libtool.m4 \
$(top_srcdir)/common/m4/as-objc.m4 \
$(top_srcdir)/common/m4/as-python.m4 \
$(top_srcdir)/common/m4/as-scrub-include.m4 \
@@ -207,6 +208,7 @@ GMSGFMT_015 = @GMSGFMT_015@
GREP = @GREP@
GSTPB_PLUGINS_DIR = @GSTPB_PLUGINS_DIR@
GSTPB_PREFIX = @GSTPB_PREFIX@
+GST_AGE = @GST_AGE@
GST_ALL_LDFLAGS = @GST_ALL_LDFLAGS@
GST_API_VERSION = @GST_API_VERSION@
GST_BASE_CFLAGS = @GST_BASE_CFLAGS@
@@ -216,9 +218,11 @@ GST_CHECK_CFLAGS = @GST_CHECK_CFLAGS@
GST_CHECK_LIBS = @GST_CHECK_LIBS@
GST_CONTROLLER_CFLAGS = @GST_CONTROLLER_CFLAGS@
GST_CONTROLLER_LIBS = @GST_CONTROLLER_LIBS@
+GST_CURRENT = @GST_CURRENT@
GST_CXXFLAGS = @GST_CXXFLAGS@
GST_LEVEL_DEFAULT = @GST_LEVEL_DEFAULT@
GST_LIBS = @GST_LIBS@
+GST_LIBVERSION = @GST_LIBVERSION@
GST_LICENSE = @GST_LICENSE@
GST_LT_LDFLAGS = @GST_LT_LDFLAGS@
GST_NET_CFLAGS = @GST_NET_CFLAGS@
@@ -236,6 +240,7 @@ GST_PLUGINS_NONPORTED = @GST_PLUGINS_NONPORTED@
GST_PLUGINS_SELECTED = @GST_PLUGINS_SELECTED@
GST_PLUGIN_LDFLAGS = @GST_PLUGIN_LDFLAGS@
GST_PREFIX = @GST_PREFIX@
+GST_REVISION = @GST_REVISION@
GST_TOOLS_DIR = @GST_TOOLS_DIR@
GTKDOC_CHECK = @GTKDOC_CHECK@
GTK_CFLAGS = @GTK_CFLAGS@
@@ -519,7 +524,6 @@ EXTRA_HFILES = \
$(top_srcdir)/ext/taglib/gstid3v2mux.h \
$(top_srcdir)/ext/pulse/pulsesink.h \
$(top_srcdir)/ext/pulse/pulsesrc.h \
- $(top_srcdir)/ext/pulse/pulsemixer.h \
$(top_srcdir)/ext/speex/gstspeexenc.h \
$(top_srcdir)/ext/speex/gstspeexdec.h \
$(top_srcdir)/ext/wavpack/gstwavpackdec.h \
@@ -632,10 +636,8 @@ EXTRA_HFILES = \
$(top_srcdir)/gst/wavparse/gstwavparse.h \
$(top_srcdir)/gst/y4m/gsty4mencode.h \
$(top_srcdir)/sys/directsound/gstdirectsoundsink.h \
- $(top_srcdir)/sys/oss4/oss4-mixer.h \
$(top_srcdir)/sys/oss4/oss4-sink.h \
$(top_srcdir)/sys/oss4/oss4-source.h \
- $(top_srcdir)/sys/oss/gstossmixerelement.h \
$(top_srcdir)/sys/oss/gstosssink.h \
$(top_srcdir)/sys/oss/gstosssrc.h \
$(top_srcdir)/sys/osxaudio/gstosxaudiosrc.h \
diff --git a/docs/plugins/gst-plugins-good-plugins-docs.sgml b/docs/plugins/gst-plugins-good-plugins-docs.sgml
index a539978b235594080365101e58fa111e2223b66c..cbedd706524f37342b58820f2cc88b00e45677c6 100644
--- a/docs/plugins/gst-plugins-good-plugins-docs.sgml
+++ b/docs/plugins/gst-plugins-good-plugins-docs.sgml
@@ -111,10 +111,8 @@
<xi:include href="xml/element-multipartmux.xml" />
<xi:include href="xml/element-multiudpsink.xml" />
<xi:include href="xml/element-optv.xml" />
- <xi:include href="xml/element-oss4mixer.xml" />
<xi:include href="xml/element-oss4sink.xml" />
<xi:include href="xml/element-oss4src.xml" />
- <xi:include href="xml/element-ossmixer.xml" />
<xi:include href="xml/element-osssink.xml" />
<xi:include href="xml/element-osssrc.xml" />
<xi:include href="xml/element-osxaudiosink.xml" />
diff --git a/docs/plugins/gst-plugins-good-plugins-sections.txt b/docs/plugins/gst-plugins-good-plugins-sections.txt
index bd6f3a787f8d54f6f450ee57693c43792ec09dbf..d37038c95fd7c53e8160acc11393811e235fdc86 100644
--- a/docs/plugins/gst-plugins-good-plugins-sections.txt
+++ b/docs/plugins/gst-plugins-good-plugins-sections.txt
@@ -1396,30 +1396,6 @@ GST_IS_MULTIUDPSINK_CLASS
gst_multiudpsink_get_type
</SECTION>
-<SECTION>
-<FILE>element-oss4mixer</FILE>
-<TITLE>oss4mixer</TITLE>
-GstOss4Mixer
-<SUBSECTION Standard>
-GstOss4MixerClass
-GST_OSS4_MIXER
-GST_OSS4_MIXER_CLASS
-GST_IS_OSS4_MIXER
-GST_IS_OSS4_MIXER_CLASS
-GST_TYPE_OSS4_MIXER
-gst_oss4_mixer_get_type
-GST_OSS4_MIXER_CAST
-GST_OSS4_MIXER_IS_OPEN
-MIXEXT_ENUM_IS_AVAILABLE
-MIXEXT_HAS_DESCRIPTION
-MIXEXT_IS_ROOT
-MIXEXT_IS_SLIDER
-gst_oss4_mixer_get_control_val
-gst_oss4_mixer_set_control_val
-gst_oss4_source_input_get_type
-GstOss4MixerControl
-</SECTION>
-
<SECTION>
<FILE>element-oss4sink</FILE>
<TITLE>oss4sink</TITLE>
@@ -1457,20 +1433,6 @@ GstOss4SourceInput
GstOss4SourceInputClass
</SECTION>
-<SECTION>
-<FILE>element-ossmixer</FILE>
-<TITLE>ossmixer</TITLE>
-GstOssMixerElement
-<SUBSECTION Standard>
-GstOssMixerElementClass
-GST_OSS_MIXER_ELEMENT
-GST_OSS_MIXER_ELEMENT_CLASS
-GST_IS_OSS_MIXER_ELEMENT
-GST_IS_OSS_MIXER_ELEMENT_CLASS
-GST_TYPE_OSS_MIXER_ELEMENT
-gst_oss_mixer_element_get_type
-</SECTION>
-
<SECTION>
<FILE>element-osssink</FILE>
<TITLE>osssink</TITLE>
diff --git a/docs/plugins/html/ch01.html b/docs/plugins/html/ch01.html
index 898c3442b956d09856da0149706a866039303c57..d8589b2df2055fdcf3d62a1bc9cb98d64b285c29 100644
--- a/docs/plugins/html/ch01.html
+++ b/docs/plugins/html/ch01.html
@@ -21,7 +21,7 @@
</tr></table>
<div class="chapter">
<div class="titlepage"><div><div><h2 class="title">
-<a name="idp43936"></a>gst-plugins-good Elements</h2></div></div></div>
+<a name="idp178848"></a>gst-plugins-good Elements</h2></div></div></div>
<div class="toc"><dl>
<dt>
<span class="refentrytitle"><a href="gst-plugins-good-plugins-3gppmux.html">3gppmux</a></span><span class="refpurpose"> — Muxer for 3GPP (.3gp) files</span>
@@ -303,18 +303,12 @@
<span class="refentrytitle"><a href="gst-plugins-good-plugins-optv.html">optv</a></span><span class="refpurpose"> — Optical art meets real-time video effect</span>
</dt>
<dt>
-<span class="refentrytitle"><a href="gst-plugins-good-plugins-oss4mixer.html">oss4mixer</a></span><span class="refpurpose"> — Control sound input and output levels with OSS4</span>
-</dt>
-<dt>
<span class="refentrytitle"><a href="gst-plugins-good-plugins-oss4sink.html">oss4sink</a></span><span class="refpurpose"> — Output to a sound card via OSS version 4</span>
</dt>
<dt>
<span class="refentrytitle"><a href="gst-plugins-good-plugins-oss4src.html">oss4src</a></span><span class="refpurpose"> — Capture from a sound card via OSS version 4</span>
</dt>
<dt>
-<span class="refentrytitle"><a href="gst-plugins-good-plugins-ossmixer.html">ossmixer</a></span><span class="refpurpose"> — Control sound input and output levels with OSS</span>
-</dt>
-<dt>
<span class="refentrytitle"><a href="gst-plugins-good-plugins-osssink.html">osssink</a></span><span class="refpurpose"> — Output to a sound card via OSS</span>
</dt>
<dt>
diff --git a/docs/plugins/html/ch02.html b/docs/plugins/html/ch02.html
index 4aa3930bdecc26aa71b2e1e1ca27379ba2b510ba..958a2367b84c98bcd34dbbde95a4ae9e336eb2d7 100644
--- a/docs/plugins/html/ch02.html
+++ b/docs/plugins/html/ch02.html
@@ -21,7 +21,7 @@
</tr></table>
<div class="chapter">
<div class="titlepage"><div><div><h2 class="title">
-<a name="idp4988160"></a>gst-plugins-good Plugins</h2></div></div></div>
+<a name="idp4986944"></a>gst-plugins-good Plugins</h2></div></div></div>
<div class="toc"><dl>
<dt>
<span class="refentrytitle"><a href="gst-plugins-good-plugins-plugin-1394.html">1394</a></span><span class="refpurpose"> — <a name="plugin-1394"></a>Source for video data via IEEE1394 interface</span>
diff --git a/docs/plugins/html/ch03.html b/docs/plugins/html/ch03.html
index 0c85e1c9268249ee8ee4828a60b18ea68c70f59f..bce2a80bafcabc1b7741fa533872d5745d200cda 100644
--- a/docs/plugins/html/ch03.html
+++ b/docs/plugins/html/ch03.html
@@ -21,7 +21,7 @@
</tr></table>
<div class="chapter">
<div class="titlepage"><div><div><h2 class="title">
-<a name="idp5023648"></a>gst-plugins-good Base Classes</h2></div></div></div>
+<a name="idp5022432"></a>gst-plugins-good Base Classes</h2></div></div></div>
<div class="toc"><dl>
<dt>
<span class="refentrytitle"><a href="GstIirEqualizer.html">GstIirEqualizer</a></span><span class="refpurpose"></span>
diff --git a/docs/plugins/html/gst-plugins-good-plugins-3gppmux.html b/docs/plugins/html/gst-plugins-good-plugins-3gppmux.html
index aef77aef46f389669eca23589d25040ef210e58b..1d35bf781520a61bcb20ba2516d5711061e91bad 100644
--- a/docs/plugins/html/gst-plugins-good-plugins-3gppmux.html
+++ b/docs/plugins/html/gst-plugins-good-plugins-3gppmux.html
@@ -96,7 +96,7 @@ presentation-timestamp.
<p>
</p>
<div class="refsect2">
-<a name="idp7133232"></a><h3>Example pipelines</h3>
+<a name="idp9398192"></a><h3>Example pipelines</h3>
<div class="informalexample">
<table class="listing_frame" border="0" cellpadding="0" cellspacing="0">
<tbody>
@@ -119,7 +119,7 @@ Documentation last reviewed on 2011-04-21
<div class="refsynopsisdiv">
<h2>Synopsis</h2>
<div class="refsect2">
-<a name="idp7789616"></a><h3>Element Information</h3>
+<a name="idp9135536"></a><h3>Element Information</h3>
<div class="variablelist"><table border="0">
<col align="left" valign="top">
<tbody>
@@ -142,7 +142,7 @@ Documentation last reviewed on 2011-04-21
</div>
<hr>
<div class="refsect2">
-<a name="idp7718416"></a><h3>Element Pads</h3>
+<a name="idp7843984"></a><h3>Element Pads</h3>
<div class="variablelist"><table border="0">
<col align="left" valign="top">
<tbody>
diff --git a/docs/plugins/html/gst-plugins-good-plugins-aacparse.html b/docs/plugins/html/gst-plugins-good-plugins-aacparse.html
index c20ccf41a19c17e92589bce9f2c910b9cf63f0d2..16469e5a0e9a517f89244a4aacbae614f2809d6d 100644
--- a/docs/plugins/html/gst-plugins-good-plugins-aacparse.html
+++ b/docs/plugins/html/gst-plugins-good-plugins-aacparse.html
@@ -66,7 +66,7 @@ can also estimate playback position and clip duration.
<p>
</p>
<div class="refsect2">
-<a name="idp9795264"></a><h3>Example launch line</h3>
+<a name="idp6492544"></a><h3>Example launch line</h3>
<div class="informalexample">
<table class="listing_frame" border="0" cellpadding="0" cellspacing="0">
<tbody>
@@ -84,7 +84,7 @@ can also estimate playback position and clip duration.
<div class="refsynopsisdiv">
<h2>Synopsis</h2>
<div class="refsect2">
-<a name="idp8507408"></a><h3>Element Information</h3>
+<a name="idp4505456"></a><h3>Element Information</h3>
<div class="variablelist"><table border="0">
<col align="left" valign="top">
<tbody>
@@ -107,7 +107,7 @@ can also estimate playback position and clip duration.
</div>
<hr>
<div class="refsect2">
-<a name="idp6572032"></a><h3>Element Pads</h3>
+<a name="idp7993424"></a><h3>Element Pads</h3>
<div class="variablelist"><table border="0">
<col align="left" valign="top">
<tbody>
diff --git a/docs/plugins/html/gst-plugins-good-plugins-aasink.html b/docs/plugins/html/gst-plugins-good-plugins-aasink.html
index 4a093f42cbde4f30e5c18710ea03ec7b8784db1b..f8c76eff40b7c68f7b33d678b5faadfeccebe490 100644
--- a/docs/plugins/html/gst-plugins-good-plugins-aasink.html
+++ b/docs/plugins/html/gst-plugins-good-plugins-aasink.html
@@ -86,7 +86,7 @@
<div class="refsynopsisdiv">
<h2>Synopsis</h2>
<div class="refsect2">
-<a name="idp5850448"></a><h3>Element Information</h3>
+<a name="idp5374656"></a><h3>Element Information</h3>
<div class="variablelist"><table border="0">
<col align="left" valign="top">
<tbody>
@@ -109,7 +109,7 @@
</div>
<hr>
<div class="refsect2">
-<a name="idp9485456"></a><h3>Element Pads</h3>
+<a name="idp8617504"></a><h3>Element Pads</h3>
<div class="variablelist"><table border="0">
<col align="left" valign="top">
<tbody>
diff --git a/docs/plugins/html/gst-plugins-good-plugins-ac3parse.html b/docs/plugins/html/gst-plugins-good-plugins-ac3parse.html
index 4794342336f5907d7685a77f74b4f6899ce2f435..03254546cc808333398054df4ccfa5eef3358100 100644
--- a/docs/plugins/html/gst-plugins-good-plugins-ac3parse.html
+++ b/docs/plugins/html/gst-plugins-good-plugins-ac3parse.html
@@ -61,7 +61,7 @@ This is an AC3 parser.
<p>
</p>
<div class="refsect2">
-<a name="idm13232"></a><h3>Example launch line</h3>
+<a name="idp5885568"></a><h3>Example launch line</h3>
<div class="informalexample">
<table class="listing_frame" border="0" cellpadding="0" cellspacing="0">
<tbody>
@@ -79,7 +79,7 @@ This is an AC3 parser.
<div class="refsynopsisdiv">
<h2>Synopsis</h2>
<div class="refsect2">
-<a name="idp7914112"></a><h3>Element Information</h3>
+<a name="idp5794640"></a><h3>Element Information</h3>
<div class="variablelist"><table border="0">
<col align="left" valign="top">
<tbody>
@@ -102,7 +102,7 @@ This is an AC3 parser.
</div>
<hr>
<div class="refsect2">
-<a name="idp9665088"></a><h3>Element Pads</h3>
+<a name="idp8081552"></a><h3>Element Pads</h3>
<div class="variablelist"><table border="0">
<col align="left" valign="top">
<tbody>
diff --git a/docs/plugins/html/gst-plugins-good-plugins-agingtv.html b/docs/plugins/html/gst-plugins-good-plugins-agingtv.html
index 2c8cfad74b066e0b58d04a3c083bef1c24be0e7d..9707d4f7e9a00b414d787b70dc2e81a4ce17545d 100644
--- a/docs/plugins/html/gst-plugins-good-plugins-agingtv.html
+++ b/docs/plugins/html/gst-plugins-good-plugins-agingtv.html
@@ -74,7 +74,7 @@ scratches and dust.
<p>
</p>
<div class="refsect2">
-<a name="idp5862032"></a><h3>Example launch line</h3>
+<a name="idp9792304"></a><h3>Example launch line</h3>
<div class="informalexample">
<table class="listing_frame" border="0" cellpadding="0" cellspacing="0">
<tbody>
@@ -92,7 +92,7 @@ scratches and dust.
<div class="refsynopsisdiv">
<h2>Synopsis</h2>
<div class="refsect2">
-<a name="idp5687920"></a><h3>Element Information</h3>
+<a name="idp8947712"></a><h3>Element Information</h3>
<div class="variablelist"><table border="0">
<col align="left" valign="top">
<tbody>
@@ -115,7 +115,7 @@ scratches and dust.
</div>
<hr>
<div class="refsect2">
-<a name="idp5050400"></a><h3>Element Pads</h3>
+<a name="idp7299200"></a><h3>Element Pads</h3>
<div class="variablelist"><table border="0">
<col align="left" valign="top">
<tbody>
diff --git a/docs/plugins/html/gst-plugins-good-plugins-alawdec.html b/docs/plugins/html/gst-plugins-good-plugins-alawdec.html
index 3c4f86a5f57701af164492c2cb5fa1ee0e97693c..2cac5f24317c2d69cdc02e04a965f935318d8fec 100644
--- a/docs/plugins/html/gst-plugins-good-plugins-alawdec.html
+++ b/docs/plugins/html/gst-plugins-good-plugins-alawdec.html
@@ -60,7 +60,7 @@ This element decodes alaw audio. Alaw coding is also known as G.711.
<div class="refsynopsisdiv">
<h2>Synopsis</h2>
<div class="refsect2">
-<a name="idp9236320"></a><h3>Element Information</h3>
+<a name="idp9033600"></a><h3>Element Information</h3>
<div class="variablelist"><table border="0">
<col align="left" valign="top">
<tbody>
@@ -83,7 +83,7 @@ This element decodes alaw audio. Alaw coding is also known as G.711.
</div>
<hr>
<div class="refsect2">
-<a name="idp5640176"></a><h3>Element Pads</h3>
+<a name="idp5484128"></a><h3>Element Pads</h3>
<div class="variablelist"><table border="0">
<col align="left" valign="top">
<tbody>
diff --git a/docs/plugins/html/gst-plugins-good-plugins-alawenc.html b/docs/plugins/html/gst-plugins-good-plugins-alawenc.html
index 9acacc34c4bd99842d64415118fe4fd87db26586..c3e702e05fa5c07f2e9ae1043f3b56771d954828 100644
--- a/docs/plugins/html/gst-plugins-good-plugins-alawenc.html
+++ b/docs/plugins/html/gst-plugins-good-plugins-alawenc.html
@@ -49,7 +49,7 @@ This element encode alaw audio. Alaw coding is also known as G.711.
<div class="refsynopsisdiv">
<h2>Synopsis</h2>
<div class="refsect2">
-<a name="idp7856992"></a><h3>Element Information</h3>
+<a name="idp7489152"></a><h3>Element Information</h3>
<div class="variablelist"><table border="0">
<col align="left" valign="top">
<tbody>
@@ -72,7 +72,7 @@ This element encode alaw audio. Alaw coding is also known as G.711.
</div>
<hr>
<div class="refsect2">
-<a name="idp9804848"></a><h3>Element Pads</h3>
+<a name="idp9499328"></a><h3>Element Pads</h3>
<div class="variablelist"><table border="0">
<col align="left" valign="top">
<tbody>
diff --git a/docs/plugins/html/gst-plugins-good-plugins-alpha.html b/docs/plugins/html/gst-plugins-good-plugins-alpha.html
index d4567fa4218419931c0aabe75ffb11737f87f01f..2c4198bb0334964f6b375c59db6bdbc3acc97eee 100644
--- a/docs/plugins/html/gst-plugins-good-plugins-alpha.html
+++ b/docs/plugins/html/gst-plugins-good-plugins-alpha.html
@@ -105,7 +105,7 @@ a snow video stream.
<div class="refsynopsisdiv">
<h2>Synopsis</h2>
<div class="refsect2">
-<a name="idp9400512"></a><h3>Element Information</h3>
+<a name="idp7693376"></a><h3>Element Information</h3>
<div class="variablelist"><table border="0">
<col align="left" valign="top">
<tbody>
@@ -130,7 +130,7 @@ Jan Schmidt <thaytan@noraisin.net></td>
</div>
<hr>
<div class="refsect2">
-<a name="idp9319120"></a><h3>Element Pads</h3>
+<a name="idp5828128"></a><h3>Element Pads</h3>
<div class="variablelist"><table border="0">
<col align="left" valign="top">
<tbody>
diff --git a/docs/plugins/html/gst-plugins-good-plugins-alphacolor.html b/docs/plugins/html/gst-plugins-good-plugins-alphacolor.html
index 4bd00f8a57771b72a4628282cfad570e6bbcbfc5..0591a7b309a74b529b9ffddcefb0d7be8563c966 100644
--- a/docs/plugins/html/gst-plugins-good-plugins-alphacolor.html
+++ b/docs/plugins/html/gst-plugins-good-plugins-alphacolor.html
@@ -82,7 +82,7 @@ Sample pipeline:
<div class="refsynopsisdiv">
<h2>Synopsis</h2>
<div class="refsect2">
-<a name="idp6869408"></a><h3>Element Information</h3>
+<a name="idp5656096"></a><h3>Element Information</h3>
<div class="variablelist"><table border="0">
<col align="left" valign="top">
<tbody>
@@ -105,7 +105,7 @@ Sample pipeline:
</div>
<hr>
<div class="refsect2">
-<a name="idp8128464"></a><h3>Element Pads</h3>
+<a name="idp6968704"></a><h3>Element Pads</h3>
<div class="variablelist"><table border="0">
<col align="left" valign="top">
<tbody>
diff --git a/docs/plugins/html/gst-plugins-good-plugins-amrparse.html b/docs/plugins/html/gst-plugins-good-plugins-amrparse.html
index 42ba3da276e16698f55801944bb1c900e415f16d..ff4497c117a99c8e2700417b56e372ab1d511619 100644
--- a/docs/plugins/html/gst-plugins-good-plugins-amrparse.html
+++ b/docs/plugins/html/gst-plugins-good-plugins-amrparse.html
@@ -62,7 +62,7 @@ formats.
<p>
</p>
<div class="refsect2">
-<a name="idp5739040"></a><h3>Example launch line</h3>
+<a name="idp7306176"></a><h3>Example launch line</h3>
<div class="informalexample">
<table class="listing_frame" border="0" cellpadding="0" cellspacing="0">
<tbody>
@@ -80,7 +80,7 @@ formats.
<div class="refsynopsisdiv">
<h2>Synopsis</h2>
<div class="refsect2">
-<a name="idp7986816"></a><h3>Element Information</h3>
+<a name="idp9919136"></a><h3>Element Information</h3>
<div class="variablelist"><table border="0">
<col align="left" valign="top">
<tbody>
@@ -103,7 +103,7 @@ formats.
</div>
<hr>
<div class="refsect2">
-<a name="idp9125312"></a><h3>Element Pads</h3>
+<a name="idp5826544"></a><h3>Element Pads</h3>
<div class="variablelist"><table border="0">
<col align="left" valign="top">
<tbody>
diff --git a/docs/plugins/html/gst-plugins-good-plugins-apedemux.html b/docs/plugins/html/gst-plugins-good-plugins-apedemux.html
index 648eea0dab1b42efb964c395bce39376069bd97b..fb9a35811dead0153e4a03a80d2815ec1f8d8346 100644
--- a/docs/plugins/html/gst-plugins-good-plugins-apedemux.html
+++ b/docs/plugins/html/gst-plugins-good-plugins-apedemux.html
@@ -72,7 +72,7 @@ information.
<p>
</p>
<div class="refsect2">
-<a name="idp7463872"></a><h3>Example launch line</h3>
+<a name="idp8171328"></a><h3>Example launch line</h3>
<div class="informalexample">
<table class="listing_frame" border="0" cellpadding="0" cellspacing="0">
<tbody>
@@ -92,7 +92,7 @@ the appropriate mime type set on buffers produced from apedemux.
<div class="refsynopsisdiv">
<h2>Synopsis</h2>
<div class="refsect2">
-<a name="idp8111344"></a><h3>Element Information</h3>
+<a name="idp9800000"></a><h3>Element Information</h3>
<div class="variablelist"><table border="0">
<col align="left" valign="top">
<tbody>
@@ -115,7 +115,7 @@ the appropriate mime type set on buffers produced from apedemux.
</div>
<hr>
<div class="refsect2">
-<a name="idp6695680"></a><h3>Element Pads</h3>
+<a name="idp9114816"></a><h3>Element Pads</h3>
<div class="variablelist"><table border="0">
<col align="left" valign="top">
<tbody>
diff --git a/docs/plugins/html/gst-plugins-good-plugins-apev2mux.html b/docs/plugins/html/gst-plugins-good-plugins-apev2mux.html
index 49a591489f875ec9234d9bedc98ee002fba3a036..dd33d3cafb90336dff639a9ffa1ee4a5123de2e7 100644
--- a/docs/plugins/html/gst-plugins-good-plugins-apev2mux.html
+++ b/docs/plugins/html/gst-plugins-good-plugins-apev2mux.html
@@ -66,7 +66,7 @@ GstApev2Mux implements
<div class="refsynopsisdiv">
<h2>Synopsis</h2>
<div class="refsect2">
-<a name="idp9243808"></a><h3>Element Information</h3>
+<a name="idp7630320"></a><h3>Element Information</h3>
<div class="variablelist"><table border="0">
<col align="left" valign="top">
<tbody>
@@ -89,7 +89,7 @@ GstApev2Mux implements
</div>
<hr>
<div class="refsect2">
-<a name="idp5754960"></a><h3>Element Pads</h3>
+<a name="idp5530256"></a><h3>Element Pads</h3>
<div class="variablelist"><table border="0">
<col align="left" valign="top">
<tbody>
diff --git a/docs/plugins/html/gst-plugins-good-plugins-aspectratiocrop.html b/docs/plugins/html/gst-plugins-good-plugins-aspectratiocrop.html
index aabb67a5cb3021a5bd33013889fa9792ae745793..5dc75bcfad31e1d4290d83c3e50328efdb0d1240 100644
--- a/docs/plugins/html/gst-plugins-good-plugins-aspectratiocrop.html
+++ b/docs/plugins/html/gst-plugins-good-plugins-aspectratiocrop.html
@@ -81,7 +81,7 @@ in pass-through mode.
<p>
</p>
<div class="refsect2">
-<a name="idp6818544"></a><h3>Example launch line</h3>
+<a name="idp8244624"></a><h3>Example launch line</h3>
<div class="informalexample">
<table class="listing_frame" border="0" cellpadding="0" cellspacing="0">
<tbody>
@@ -99,7 +99,7 @@ in pass-through mode.
<div class="refsynopsisdiv">
<h2>Synopsis</h2>
<div class="refsect2">
-<a name="idp5913808"></a><h3>Element Information</h3>
+<a name="idp9218592"></a><h3>Element Information</h3>
<div class="variablelist"><table border="0">
<col align="left" valign="top">
<tbody>
@@ -122,7 +122,7 @@ in pass-through mode.
</div>
<hr>
<div class="refsect2">
-<a name="idp8351552"></a><h3>Element Pads</h3>
+<a name="idp6577024"></a><h3>Element Pads</h3>
<div class="variablelist"><table border="0">
<col align="left" valign="top">
<tbody>
diff --git a/docs/plugins/html/gst-plugins-good-plugins-audioamplify.html b/docs/plugins/html/gst-plugins-good-plugins-audioamplify.html
index 93fcc00784761ee467f97d0ebb933cb02b457d16..b9389891003f0b36171ec1543370c266367f6b2a 100644
--- a/docs/plugins/html/gst-plugins-good-plugins-audioamplify.html
+++ b/docs/plugins/html/gst-plugins-good-plugins-audioamplify.html
@@ -72,7 +72,7 @@ The difference between the clipping modes is best evaluated by testing.
<p>
</p>
<div class="refsect2">
-<a name="idp7217808"></a><h3>Example launch line</h3>
+<a name="idp7361040"></a><h3>Example launch line</h3>
<div class="informalexample">
<table class="listing_frame" border="0" cellpadding="0" cellspacing="0">
<tbody>
@@ -94,7 +94,7 @@ gst<span class="gtkdoc opt">-</span>launch audiotestsrc wave<span class="gtkdoc
<div class="refsynopsisdiv">
<h2>Synopsis</h2>
<div class="refsect2">
-<a name="idp5075680"></a><h3>Element Information</h3>
+<a name="idp10685616"></a><h3>Element Information</h3>
<div class="variablelist"><table border="0">
<col align="left" valign="top">
<tbody>
@@ -117,7 +117,7 @@ gst<span class="gtkdoc opt">-</span>launch audiotestsrc wave<span class="gtkdoc
</div>
<hr>
<div class="refsect2">
-<a name="idp8673968"></a><h3>Element Pads</h3>
+<a name="idp9453504"></a><h3>Element Pads</h3>
<div class="variablelist"><table border="0">
<col align="left" valign="top">
<tbody>
diff --git a/docs/plugins/html/gst-plugins-good-plugins-audiochebband.html b/docs/plugins/html/gst-plugins-good-plugins-audiochebband.html
index c87fb624358a910af02f4fe7e47cb0e964d5b6e5..d6404a2fc62d7926db9ff95f70341b40bbf46f52 100644
--- a/docs/plugins/html/gst-plugins-good-plugins-audiochebband.html
+++ b/docs/plugins/html/gst-plugins-good-plugins-audiochebband.html
@@ -103,7 +103,7 @@ a cutoff frequency at a quarter of the sampling rate.
<p>
</p>
<div class="refsect2">
-<a name="idp5105376"></a><h3>Example launch line</h3>
+<a name="idp5931136"></a><h3>Example launch line</h3>
<div class="informalexample">
<table class="listing_frame" border="0" cellpadding="0" cellspacing="0">
<tbody>
@@ -125,7 +125,7 @@ gst<span class="gtkdoc opt">-</span>launch audiotestsrc wave<span class="gtkdoc
<div class="refsynopsisdiv">
<h2>Synopsis</h2>
<div class="refsect2">
-<a name="idp8916048"></a><h3>Element Information</h3>
+<a name="idp6868224"></a><h3>Element Information</h3>
<div class="variablelist"><table border="0">
<col align="left" valign="top">
<tbody>
@@ -148,7 +148,7 @@ gst<span class="gtkdoc opt">-</span>launch audiotestsrc wave<span class="gtkdoc
</div>
<hr>
<div class="refsect2">
-<a name="idp9181488"></a><h3>Element Pads</h3>
+<a name="idp10155648"></a><h3>Element Pads</h3>
<div class="variablelist"><table border="0">
<col align="left" valign="top">
<tbody>
diff --git a/docs/plugins/html/gst-plugins-good-plugins-audiocheblimit.html b/docs/plugins/html/gst-plugins-good-plugins-audiocheblimit.html
index 73a9a747a53f0b75f39691d7e25c41b2f2e6548e..9c467111a83b885f1d359526b0c5f17d1fba6e6d 100644
--- a/docs/plugins/html/gst-plugins-good-plugins-audiocheblimit.html
+++ b/docs/plugins/html/gst-plugins-good-plugins-audiocheblimit.html
@@ -100,7 +100,7 @@ a cutoff frequency at a quarter of the sampling rate.
<p>
</p>
<div class="refsect2">
-<a name="idp5304368"></a><h3>Example launch line</h3>
+<a name="idp9289040"></a><h3>Example launch line</h3>
<div class="informalexample">
<table class="listing_frame" border="0" cellpadding="0" cellspacing="0">
<tbody>
@@ -122,7 +122,7 @@ gst<span class="gtkdoc opt">-</span>launch audiotestsrc wave<span class="gtkdoc
<div class="refsynopsisdiv">
<h2>Synopsis</h2>
<div class="refsect2">
-<a name="idp8974784"></a><h3>Element Information</h3>
+<a name="idp9722064"></a><h3>Element Information</h3>
<div class="variablelist"><table border="0">
<col align="left" valign="top">
<tbody>
@@ -145,7 +145,7 @@ gst<span class="gtkdoc opt">-</span>launch audiotestsrc wave<span class="gtkdoc
</div>
<hr>
<div class="refsect2">
-<a name="idp7116480"></a><h3>Element Pads</h3>
+<a name="idp6156160"></a><h3>Element Pads</h3>
<div class="variablelist"><table border="0">
<col align="left" valign="top">
<tbody>
diff --git a/docs/plugins/html/gst-plugins-good-plugins-audiodynamic.html b/docs/plugins/html/gst-plugins-good-plugins-audiodynamic.html
index 4629750254438f9dda9da6cf7c39bf732134e279..17e79eae7e123cf18619fc0df4859acc5c9aeb1c 100644
--- a/docs/plugins/html/gst-plugins-good-plugins-audiodynamic.html
+++ b/docs/plugins/html/gst-plugins-good-plugins-audiodynamic.html
@@ -76,7 +76,7 @@ soft-knee mode is selected the ratio is applied smoothly.
<p>
</p>
<div class="refsect2">
-<a name="idp9260592"></a><h3>Example launch line</h3>
+<a name="idm7184"></a><h3>Example launch line</h3>
<div class="informalexample">
<table class="listing_frame" border="0" cellpadding="0" cellspacing="0">
<tbody>
@@ -98,7 +98,7 @@ gst<span class="gtkdoc opt">-</span>launch audiotestsrc wave<span class="gtkdoc
<div class="refsynopsisdiv">
<h2>Synopsis</h2>
<div class="refsect2">
-<a name="idp8968144"></a><h3>Element Information</h3>
+<a name="idp7281264"></a><h3>Element Information</h3>
<div class="variablelist"><table border="0">
<col align="left" valign="top">
<tbody>
@@ -121,7 +121,7 @@ gst<span class="gtkdoc opt">-</span>launch audiotestsrc wave<span class="gtkdoc
</div>
<hr>
<div class="refsect2">
-<a name="idp8418848"></a><h3>Element Pads</h3>
+<a name="idp7251216"></a><h3>Element Pads</h3>
<div class="variablelist"><table border="0">
<col align="left" valign="top">
<tbody>
diff --git a/docs/plugins/html/gst-plugins-good-plugins-audioecho.html b/docs/plugins/html/gst-plugins-good-plugins-audioecho.html
index 1d4dafe5153d98b46130dedec9c897dfc705eb40..f9caee346b4543b121549c0afedc085959e153ba 100644
--- a/docs/plugins/html/gst-plugins-good-plugins-audioecho.html
+++ b/docs/plugins/html/gst-plugins-good-plugins-audioecho.html
@@ -84,7 +84,7 @@ state and will be set to the current delay by default.
<p>
</p>
<div class="refsect2">
-<a name="idp5473392"></a><h3>Example launch line</h3>
+<a name="idp8240144"></a><h3>Example launch line</h3>
<div class="informalexample">
<table class="listing_frame" border="0" cellpadding="0" cellspacing="0">
<tbody>
@@ -104,7 +104,7 @@ gst<span class="gtkdoc opt">-</span>launch filesrc location<span class="gtkdoc o
<div class="refsynopsisdiv">
<h2>Synopsis</h2>
<div class="refsect2">
-<a name="idp5266112"></a><h3>Element Information</h3>
+<a name="idp7131664"></a><h3>Element Information</h3>
<div class="variablelist"><table border="0">
<col align="left" valign="top">
<tbody>
@@ -127,7 +127,7 @@ gst<span class="gtkdoc opt">-</span>launch filesrc location<span class="gtkdoc o
</div>
<hr>
<div class="refsect2">
-<a name="idp10502512"></a><h3>Element Pads</h3>
+<a name="idp5696480"></a><h3>Element Pads</h3>
<div class="variablelist"><table border="0">
<col align="left" valign="top">
<tbody>
diff --git a/docs/plugins/html/gst-plugins-good-plugins-audiofirfilter.html b/docs/plugins/html/gst-plugins-good-plugins-audiofirfilter.html
index 485914a8b46ccedd8b320439881f9a9f52d758de..6d7973e4d811958faf97bf7af9ab06e9597cbdc8 100644
--- a/docs/plugins/html/gst-plugins-good-plugins-audiofirfilter.html
+++ b/docs/plugins/html/gst-plugins-good-plugins-audiofirfilter.html
@@ -95,7 +95,7 @@ FIR filters as they're depending on the sampling rate.
<p>
</p>
<div class="refsect2">
-<a name="idp10021936"></a><h3>Example application</h3>
+<a name="idp5737296"></a><h3>Example application</h3>
<div class="informalexample">
<table class="listing_frame" border="0" cellpadding="0" cellspacing="0">
<tbody>
@@ -441,7 +441,7 @@ gint
<div class="refsynopsisdiv">
<h2>Synopsis</h2>
<div class="refsect2">
-<a name="idp5279776"></a><h3>Element Information</h3>
+<a name="idp8854768"></a><h3>Element Information</h3>
<div class="variablelist"><table border="0">
<col align="left" valign="top">
<tbody>
@@ -464,7 +464,7 @@ gint
</div>
<hr>
<div class="refsect2">
-<a name="idp9212336"></a><h3>Element Pads</h3>
+<a name="idp6572736"></a><h3>Element Pads</h3>
<div class="variablelist"><table border="0">
<col align="left" valign="top">
<tbody>
diff --git a/docs/plugins/html/gst-plugins-good-plugins-audioiirfilter.html b/docs/plugins/html/gst-plugins-good-plugins-audioiirfilter.html
index 848e276791512d783a229dda39f4df4fd3302f62..78b37f2d3f3bf6586a4c80f1c3012a8ad320417e 100644
--- a/docs/plugins/html/gst-plugins-good-plugins-audioiirfilter.html
+++ b/docs/plugins/html/gst-plugins-good-plugins-audioiirfilter.html
@@ -91,7 +91,7 @@ IIR filters as they're depending on the sampling rate.
<p>
</p>
<div class="refsect2">
-<a name="idp6557344"></a><h3>Example application</h3>
+<a name="idp5979696"></a><h3>Example application</h3>
<div class="informalexample">
<table class="listing_frame" border="0" cellpadding="0" cellspacing="0">
<tbody>
@@ -389,7 +389,7 @@ gint
<div class="refsynopsisdiv">
<h2>Synopsis</h2>
<div class="refsect2">
-<a name="idp9439360"></a><h3>Element Information</h3>
+<a name="idp8061232"></a><h3>Element Information</h3>
<div class="variablelist"><table border="0">
<col align="left" valign="top">
<tbody>
@@ -412,7 +412,7 @@ gint
</div>
<hr>
<div class="refsect2">
-<a name="idp8298496"></a><h3>Element Pads</h3>
+<a name="idp7643008"></a><h3>Element Pads</h3>
<div class="variablelist"><table border="0">
<col align="left" valign="top">
<tbody>
diff --git a/docs/plugins/html/gst-plugins-good-plugins-audioinvert.html b/docs/plugins/html/gst-plugins-good-plugins-audioinvert.html
index 7677911e21fa5ce63a7835a7b3edfca5ea8d6179..234eca749f888d5f72c457da29cabd9ed4602097 100644
--- a/docs/plugins/html/gst-plugins-good-plugins-audioinvert.html
+++ b/docs/plugins/html/gst-plugins-good-plugins-audioinvert.html
@@ -72,7 +72,7 @@ Creating a stereo sample from a mono source, with one channel inverted produces
<p>
</p>
<div class="refsect2">
-<a name="idp8807968"></a><h3>Example launch line</h3>
+<a name="idp8744464"></a><h3>Example launch line</h3>
<div class="informalexample">
<table class="listing_frame" border="0" cellpadding="0" cellspacing="0">
<tbody>
@@ -94,7 +94,7 @@ gst<span class="gtkdoc opt">-</span>launch audiotestsrc wave<span class="gtkdoc
<div class="refsynopsisdiv">
<h2>Synopsis</h2>
<div class="refsect2">
-<a name="idp6082656"></a><h3>Element Information</h3>
+<a name="idp10117632"></a><h3>Element Information</h3>
<div class="variablelist"><table border="0">
<col align="left" valign="top">
<tbody>
@@ -117,7 +117,7 @@ gst<span class="gtkdoc opt">-</span>launch audiotestsrc wave<span class="gtkdoc
</div>
<hr>
<div class="refsect2">
-<a name="idp8996992"></a><h3>Element Pads</h3>
+<a name="idp7165968"></a><h3>Element Pads</h3>
<div class="variablelist"><table border="0">
<col align="left" valign="top">
<tbody>
diff --git a/docs/plugins/html/gst-plugins-good-plugins-audiokaraoke.html b/docs/plugins/html/gst-plugins-good-plugins-audiokaraoke.html
index 54552fb4d98df5bcdbb509977473d53dfaa3f5cd..7cd077fbf2257695881f6a17cb3757a27e1f5b1c 100644
--- a/docs/plugins/html/gst-plugins-good-plugins-audiokaraoke.html
+++ b/docs/plugins/html/gst-plugins-good-plugins-audiokaraoke.html
@@ -74,7 +74,7 @@ This plugin is useful for karaoke applications.
<p>
</p>
<div class="refsect2">
-<a name="idp7015696"></a><h3>Example launch line</h3>
+<a name="idp9808992"></a><h3>Example launch line</h3>
<div class="informalexample">
<table class="listing_frame" border="0" cellpadding="0" cellspacing="0">
<tbody>
@@ -92,7 +92,7 @@ This plugin is useful for karaoke applications.
<div class="refsynopsisdiv">
<h2>Synopsis</h2>
<div class="refsect2">
-<a name="idp8183184"></a><h3>Element Information</h3>
+<a name="idp7990032"></a><h3>Element Information</h3>
<div class="variablelist"><table border="0">
<col align="left" valign="top">
<tbody>
@@ -115,7 +115,7 @@ This plugin is useful for karaoke applications.
</div>
<hr>
<div class="refsect2">
-<a name="idp5638784"></a><h3>Element Pads</h3>
+<a name="idm5296"></a><h3>Element Pads</h3>
<div class="variablelist"><table border="0">
<col align="left" valign="top">
<tbody>
diff --git a/docs/plugins/html/gst-plugins-good-plugins-audiopanorama.html b/docs/plugins/html/gst-plugins-good-plugins-audiopanorama.html
index 4c1cf874e580289167e1939108d91a2d6a7273e4..04a0b9a818d0283219d6917f88de10660035cc9f 100644
--- a/docs/plugins/html/gst-plugins-good-plugins-audiopanorama.html
+++ b/docs/plugins/html/gst-plugins-good-plugins-audiopanorama.html
@@ -71,7 +71,7 @@ which keeps the same perceived loudness, and a simple panning method that just c
<p>
</p>
<div class="refsect2">
-<a name="idp6094896"></a><h3>Example launch line</h3>
+<a name="idp6898352"></a><h3>Example launch line</h3>
<div class="informalexample">
<table class="listing_frame" border="0" cellpadding="0" cellspacing="0">
<tbody>
@@ -95,7 +95,7 @@ gst<span class="gtkdoc opt">-</span>launch audiotestsrc wave<span class="gtkdoc
<div class="refsynopsisdiv">
<h2>Synopsis</h2>
<div class="refsect2">
-<a name="idp6594448"></a><h3>Element Information</h3>
+<a name="idp9239664"></a><h3>Element Information</h3>
<div class="variablelist"><table border="0">
<col align="left" valign="top">
<tbody>
@@ -118,7 +118,7 @@ gst<span class="gtkdoc opt">-</span>launch audiotestsrc wave<span class="gtkdoc
</div>
<hr>
<div class="refsect2">
-<a name="idp5068096"></a><h3>Element Pads</h3>
+<a name="idp10045600"></a><h3>Element Pads</h3>
<div class="variablelist"><table border="0">
<col align="left" valign="top">
<tbody>
diff --git a/docs/plugins/html/gst-plugins-good-plugins-audiowsincband.html b/docs/plugins/html/gst-plugins-good-plugins-audiowsincband.html
index 6c680e8d0775234bc5268e4fcfed1c3b4bb64aee..5bbd916abc46c5200a14b3b8683c9b1daee873e9 100644
--- a/docs/plugins/html/gst-plugins-good-plugins-audiowsincband.html
+++ b/docs/plugins/html/gst-plugins-good-plugins-audiowsincband.html
@@ -83,7 +83,7 @@ disadvantage is the much slower execution time with larger kernels.
<p>
</p>
<div class="refsect2">
-<a name="idp9591024"></a><h3>Example launch line</h3>
+<a name="idp7767040"></a><h3>Example launch line</h3>
<div class="informalexample">
<table class="listing_frame" border="0" cellpadding="0" cellspacing="0">
<tbody>
@@ -105,7 +105,7 @@ gst<span class="gtkdoc opt">-</span>launch audiotestsrc wave<span class="gtkdoc
<div class="refsynopsisdiv">
<h2>Synopsis</h2>
<div class="refsect2">
-<a name="idp5876224"></a><h3>Element Information</h3>
+<a name="idp10068864"></a><h3>Element Information</h3>
<div class="variablelist"><table border="0">
<col align="left" valign="top">
<tbody>
@@ -128,7 +128,7 @@ gst<span class="gtkdoc opt">-</span>launch audiotestsrc wave<span class="gtkdoc
</div>
<hr>
<div class="refsect2">
-<a name="idp5132304"></a><h3>Element Pads</h3>
+<a name="idp6333312"></a><h3>Element Pads</h3>
<div class="variablelist"><table border="0">
<col align="left" valign="top">
<tbody>
diff --git a/docs/plugins/html/gst-plugins-good-plugins-audiowsinclimit.html b/docs/plugins/html/gst-plugins-good-plugins-audiowsinclimit.html
index 6cad114ce8d3160b999270aedf67cc6fe9d672b1..b2b5840efbec8ded7159b49d5c5f33cc5c8cca20 100644
--- a/docs/plugins/html/gst-plugins-good-plugins-audiowsinclimit.html
+++ b/docs/plugins/html/gst-plugins-good-plugins-audiowsinclimit.html
@@ -83,7 +83,7 @@ disadvantage is the much slower execution time with larger kernels.
<p>
</p>
<div class="refsect2">
-<a name="idp8949296"></a><h3>Example launch line</h3>
+<a name="idp7146640"></a><h3>Example launch line</h3>
<div class="informalexample">
<table class="listing_frame" border="0" cellpadding="0" cellspacing="0">
<tbody>
@@ -105,7 +105,7 @@ gst<span class="gtkdoc opt">-</span>launch audiotestsrc wave<span class="gtkdoc
<div class="refsynopsisdiv">
<h2>Synopsis</h2>
<div class="refsect2">
-<a name="idp7665744"></a><h3>Element Information</h3>
+<a name="idp6506432"></a><h3>Element Information</h3>
<div class="variablelist"><table border="0">
<col align="left" valign="top">
<tbody>
@@ -128,7 +128,7 @@ gst<span class="gtkdoc opt">-</span>launch audiotestsrc wave<span class="gtkdoc
</div>
<hr>
<div class="refsect2">
-<a name="idp10267440"></a><h3>Element Pads</h3>
+<a name="idp5621488"></a><h3>Element Pads</h3>
<div class="variablelist"><table border="0">
<col align="left" valign="top">
<tbody>
diff --git a/docs/plugins/html/gst-plugins-good-plugins-auparse.html b/docs/plugins/html/gst-plugins-good-plugins-auparse.html
index 6e0310ee804c0113ebe82a5df92b166ab714865f..3abda14e594f233406e95d6f3f11d56444614f56 100644
--- a/docs/plugins/html/gst-plugins-good-plugins-auparse.html
+++ b/docs/plugins/html/gst-plugins-good-plugins-auparse.html
@@ -60,7 +60,7 @@ Parses .au files mostly originating from sun os based computers.
<div class="refsynopsisdiv">
<h2>Synopsis</h2>
<div class="refsect2">
-<a name="idp11536224"></a><h3>Element Information</h3>
+<a name="idp7290656"></a><h3>Element Information</h3>
<div class="variablelist"><table border="0">
<col align="left" valign="top">
<tbody>
@@ -83,7 +83,7 @@ Parses .au files mostly originating from sun os based computers.
</div>
<hr>
<div class="refsect2">
-<a name="idp5866736"></a><h3>Element Pads</h3>
+<a name="idp6911408"></a><h3>Element Pads</h3>
<div class="variablelist"><table border="0">
<col align="left" valign="top">
<tbody>
diff --git a/docs/plugins/html/gst-plugins-good-plugins-autoaudiosink.html b/docs/plugins/html/gst-plugins-good-plugins-autoaudiosink.html
index b8df9f1b64d21f732ff29156b82fe694e3b77de9..95cfaf91df2add5d34aed7099a976b688d012bee 100644
--- a/docs/plugins/html/gst-plugins-good-plugins-autoaudiosink.html
+++ b/docs/plugins/html/gst-plugins-good-plugins-autoaudiosink.html
@@ -80,7 +80,7 @@ of their element information, and also have a non-zero autoplugging rank.
<p>
</p>
<div class="refsect2">
-<a name="idp8908384"></a><h3>Example launch line</h3>
+<a name="idp7451552"></a><h3>Example launch line</h3>
<div class="informalexample">
<table class="listing_frame" border="0" cellpadding="0" cellspacing="0">
<tbody>
@@ -98,7 +98,7 @@ of their element information, and also have a non-zero autoplugging rank.
<div class="refsynopsisdiv">
<h2>Synopsis</h2>
<div class="refsect2">
-<a name="idp7627968"></a><h3>Element Information</h3>
+<a name="idp10052208"></a><h3>Element Information</h3>
<div class="variablelist"><table border="0">
<col align="left" valign="top">
<tbody>
@@ -121,7 +121,7 @@ of their element information, and also have a non-zero autoplugging rank.
</div>
<hr>
<div class="refsect2">
-<a name="idp11906320"></a><h3>Element Pads</h3>
+<a name="idp7658096"></a><h3>Element Pads</h3>
<div class="variablelist"><table border="0">
<col align="left" valign="top">
<tbody>
diff --git a/docs/plugins/html/gst-plugins-good-plugins-autoaudiosrc.html b/docs/plugins/html/gst-plugins-good-plugins-autoaudiosrc.html
index 5b0ac11575bd48469f5132807ad68cba4901b42d..8ff11bb81662be3ec2c6ebd387967d01de7af8f7 100644
--- a/docs/plugins/html/gst-plugins-good-plugins-autoaudiosrc.html
+++ b/docs/plugins/html/gst-plugins-good-plugins-autoaudiosrc.html
@@ -80,7 +80,7 @@ of their element information, and also have a non-zero autoplugging rank.
<p>
</p>
<div class="refsect2">
-<a name="idp11617456"></a><h3>Example launch line</h3>
+<a name="idp7388048"></a><h3>Example launch line</h3>
<div class="informalexample">
<table class="listing_frame" border="0" cellpadding="0" cellspacing="0">
<tbody>
@@ -98,7 +98,7 @@ of their element information, and also have a non-zero autoplugging rank.
<div class="refsynopsisdiv">
<h2>Synopsis</h2>
<div class="refsect2">
-<a name="idp11344848"></a><h3>Element Information</h3>
+<a name="idp6433824"></a><h3>Element Information</h3>
<div class="variablelist"><table border="0">
<col align="left" valign="top">
<tbody>
@@ -121,7 +121,7 @@ of their element information, and also have a non-zero autoplugging rank.
</div>
<hr>
<div class="refsect2">
-<a name="idp7745728"></a><h3>Element Pads</h3>
+<a name="idp7519456"></a><h3>Element Pads</h3>
<div class="variablelist"><table border="0">
<col align="left" valign="top">
<tbody>
diff --git a/docs/plugins/html/gst-plugins-good-plugins-autovideosink.html b/docs/plugins/html/gst-plugins-good-plugins-autovideosink.html
index 7ce97307465200397a3ac1a729d8c332e956f841..1e5b2544be0711fab9854af9efeb728a8f010d79 100644
--- a/docs/plugins/html/gst-plugins-good-plugins-autovideosink.html
+++ b/docs/plugins/html/gst-plugins-good-plugins-autovideosink.html
@@ -80,7 +80,7 @@ of their element information, and also have a non-zero autoplugging rank.
<p>
</p>
<div class="refsect2">
-<a name="idp6973552"></a><h3>Example launch line</h3>
+<a name="idp5033936"></a><h3>Example launch line</h3>
<div class="informalexample">
<table class="listing_frame" border="0" cellpadding="0" cellspacing="0">
<tbody>
@@ -98,7 +98,7 @@ of their element information, and also have a non-zero autoplugging rank.
<div class="refsynopsisdiv">
<h2>Synopsis</h2>
<div class="refsect2">
-<a name="idp8454768"></a><h3>Element Information</h3>
+<a name="idp7376240"></a><h3>Element Information</h3>
<div class="variablelist"><table border="0">
<col align="left" valign="top">
<tbody>
@@ -121,7 +121,7 @@ of their element information, and also have a non-zero autoplugging rank.
</div>
<hr>
<div class="refsect2">
-<a name="idp10799680"></a><h3>Element Pads</h3>
+<a name="idp5968880"></a><h3>Element Pads</h3>
<div class="variablelist"><table border="0">
<col align="left" valign="top">
<tbody>
diff --git a/docs/plugins/html/gst-plugins-good-plugins-autovideosrc.html b/docs/plugins/html/gst-plugins-good-plugins-autovideosrc.html
index ab3270eac2d9bbab4fa6ba994b21e81e3250c5ea..1807a1fcc83d229710283b3e1dc2524aa2c1cbf9 100644
--- a/docs/plugins/html/gst-plugins-good-plugins-autovideosrc.html
+++ b/docs/plugins/html/gst-plugins-good-plugins-autovideosrc.html
@@ -80,7 +80,7 @@ of their element information, and also have a non-zero autoplugging rank.
<p>
</p>
<div class="refsect2">
-<a name="idp8819584"></a><h3>Example launch line</h3>
+<a name="idp5941360"></a><h3>Example launch line</h3>
<div class="informalexample">
<table class="listing_frame" border="0" cellpadding="0" cellspacing="0">
<tbody>
@@ -98,7 +98,7 @@ of their element information, and also have a non-zero autoplugging rank.
<div class="refsynopsisdiv">
<h2>Synopsis</h2>
<div class="refsect2">
-<a name="idp5103184"></a><h3>Element Information</h3>
+<a name="idp11212608"></a><h3>Element Information</h3>
<div class="variablelist"><table border="0">
<col align="left" valign="top">
<tbody>
@@ -121,7 +121,7 @@ of their element information, and also have a non-zero autoplugging rank.
</div>
<hr>
<div class="refsect2">
-<a name="idp5505744"></a><h3>Element Pads</h3>
+<a name="idp10080320"></a><h3>Element Pads</h3>
<div class="variablelist"><table border="0">
<col align="left" valign="top">
<tbody>
diff --git a/docs/plugins/html/gst-plugins-good-plugins-avidemux.html b/docs/plugins/html/gst-plugins-good-plugins-avidemux.html
index 2d091b036415d955ba014dfe75cee9b2deb511cd..e222798cf13677912e536d5c8a7bbd003dcc8e6f 100644
--- a/docs/plugins/html/gst-plugins-good-plugins-avidemux.html
+++ b/docs/plugins/html/gst-plugins-good-plugins-avidemux.html
@@ -64,7 +64,7 @@ capabilities of the upstream elements.
<p>
</p>
<div class="refsect2">
-<a name="idp11699392"></a><h3>Example launch line</h3>
+<a name="idp10829264"></a><h3>Example launch line</h3>
<div class="informalexample">
<table class="listing_frame" border="0" cellpadding="0" cellspacing="0">
<tbody>
@@ -88,7 +88,7 @@ Last reviewed on 2006-12-29 (0.10.6)
<div class="refsynopsisdiv">
<h2>Synopsis</h2>
<div class="refsect2">
-<a name="idp11696192"></a><h3>Element Information</h3>
+<a name="idp10826064"></a><h3>Element Information</h3>
<div class="variablelist"><table border="0">
<col align="left" valign="top">
<tbody>
@@ -111,7 +111,7 @@ Last reviewed on 2006-12-29 (0.10.6)
</div>
<hr>
<div class="refsect2">
-<a name="idp11690416"></a><h3>Element Pads</h3>
+<a name="idp10820288"></a><h3>Element Pads</h3>
<div class="variablelist"><table border="0">
<col align="left" valign="top">
<tbody>
diff --git a/docs/plugins/html/gst-plugins-good-plugins-avimux.html b/docs/plugins/html/gst-plugins-good-plugins-avimux.html
index 7fa86c644aa944b20e653c9c27c7d3add84d32e0..b0bd870385224309064b3f7f2168469613133959 100644
--- a/docs/plugins/html/gst-plugins-good-plugins-avimux.html
+++ b/docs/plugins/html/gst-plugins-good-plugins-avimux.html
@@ -76,7 +76,7 @@ Muxes raw or compressed audio and/or video streams into an AVI file.
<p>
</p>
<div class="refsect2">
-<a name="idp7166496"></a><h3>Example launch lines</h3>
+<a name="idp9384352"></a><h3>Example launch lines</h3>
<p>(write everything in one line, without the backslash characters)</p>
<div class="informalexample">
<table class="listing_frame" border="0" cellpadding="0" cellspacing="0">
@@ -130,7 +130,7 @@ only work if you have the necessary encoder elements installed of course.
<div class="refsynopsisdiv">
<h2>Synopsis</h2>
<div class="refsect2">
-<a name="idp10906592"></a><h3>Element Information</h3>
+<a name="idp9136560"></a><h3>Element Information</h3>
<div class="variablelist"><table border="0">
<col align="left" valign="top">
<tbody>
@@ -153,7 +153,7 @@ only work if you have the necessary encoder elements installed of course.
</div>
<hr>
<div class="refsect2">
-<a name="idp11724560"></a><h3>Element Pads</h3>
+<a name="idp6523328"></a><h3>Element Pads</h3>
<div class="variablelist"><table border="0">
<col align="left" valign="top">
<tbody>
diff --git a/docs/plugins/html/gst-plugins-good-plugins-avisubtitle.html b/docs/plugins/html/gst-plugins-good-plugins-avisubtitle.html
index e681494d0fe2bb6766353a665fd52dc5921d161f..569f1e957a42c857f3630e5d2378719f96113f20 100644
--- a/docs/plugins/html/gst-plugins-good-plugins-avisubtitle.html
+++ b/docs/plugins/html/gst-plugins-good-plugins-avisubtitle.html
@@ -57,7 +57,7 @@
<p>
</p>
<div class="refsect2">
-<a name="idp7119296"></a><h3>Example launch line</h3>
+<a name="idp5684848"></a><h3>Example launch line</h3>
<p>
Parses the subtitle stream from an avi file.
</p>
@@ -78,7 +78,7 @@ Last reviewed on 2008-02-01
<div class="refsynopsisdiv">
<h2>Synopsis</h2>
<div class="refsect2">
-<a name="idp5799328"></a><h3>Element Information</h3>
+<a name="idp10139664"></a><h3>Element Information</h3>
<div class="variablelist"><table border="0">
<col align="left" valign="top">
<tbody>
@@ -101,7 +101,7 @@ Last reviewed on 2008-02-01
</div>
<hr>
<div class="refsect2">
-<a name="idp9609760"></a><h3>Element Pads</h3>
+<a name="idp11705264"></a><h3>Element Pads</h3>
<div class="variablelist"><table border="0">
<col align="left" valign="top">
<tbody>
diff --git a/docs/plugins/html/gst-plugins-good-plugins-cacasink.html b/docs/plugins/html/gst-plugins-good-plugins-cacasink.html
index e7915455e5c2502cb0631bfe70a757f5f77338bd..4f967887a22a42d7df9d6fb423299bd40c15cf34 100644
--- a/docs/plugins/html/gst-plugins-good-plugins-cacasink.html
+++ b/docs/plugins/html/gst-plugins-good-plugins-cacasink.html
@@ -69,7 +69,7 @@
<div class="refsynopsisdiv">
<h2>Synopsis</h2>
<div class="refsect2">
-<a name="idp12063120"></a><h3>Element Information</h3>
+<a name="idp7448224"></a><h3>Element Information</h3>
<div class="variablelist"><table border="0">
<col align="left" valign="top">
<tbody>
@@ -92,7 +92,7 @@
</div>
<hr>
<div class="refsect2">
-<a name="idp11576768"></a><h3>Element Pads</h3>
+<a name="idp9739808"></a><h3>Element Pads</h3>
<div class="variablelist"><table border="0">
<col align="left" valign="top">
<tbody>
diff --git a/docs/plugins/html/gst-plugins-good-plugins-cairooverlay.html b/docs/plugins/html/gst-plugins-good-plugins-cairooverlay.html
index 749fc1fc51f68f08e57f4b667e98ce3e3fec3b5f..02943751a1f3ae03ef82dcec987191104d86bcb3 100644
--- a/docs/plugins/html/gst-plugins-good-plugins-cairooverlay.html
+++ b/docs/plugins/html/gst-plugins-good-plugins-cairooverlay.html
@@ -54,7 +54,7 @@
<div class="refsynopsisdiv">
<h2>Synopsis</h2>
<div class="refsect2">
-<a name="idp9694880"></a><h3>Element Information</h3>
+<a name="idp7042880"></a><h3>Element Information</h3>
<div class="variablelist"><table border="0">
<col align="left" valign="top">
<tbody>
@@ -77,7 +77,7 @@
</div>
<hr>
<div class="refsect2">
-<a name="idp3480640"></a><h3>Element Pads</h3>
+<a name="idp9743824"></a><h3>Element Pads</h3>
<div class="variablelist"><table border="0">
<col align="left" valign="top">
<tbody>
diff --git a/docs/plugins/html/gst-plugins-good-plugins-cairorender.html b/docs/plugins/html/gst-plugins-good-plugins-cairorender.html
index 1939e7d861cdd6c163116342b2a18a0fa346faf6..4098939e1a74c75c5823d3af35943cf66384525e 100644
--- a/docs/plugins/html/gst-plugins-good-plugins-cairorender.html
+++ b/docs/plugins/html/gst-plugins-good-plugins-cairorender.html
@@ -45,7 +45,7 @@
<div class="refsynopsisdiv">
<h2>Synopsis</h2>
<div class="refsect2">
-<a name="idp12132864"></a><h3>Element Information</h3>
+<a name="idp9220544"></a><h3>Element Information</h3>
<div class="variablelist"><table border="0">
<col align="left" valign="top">
<tbody>
@@ -68,7 +68,7 @@
</div>
<hr>
<div class="refsect2">
-<a name="idp9227312"></a><h3>Element Pads</h3>
+<a name="idp7482848"></a><h3>Element Pads</h3>
<div class="variablelist"><table border="0">
<col align="left" valign="top">
<tbody>
diff --git a/docs/plugins/html/gst-plugins-good-plugins-cairotextoverlay.html b/docs/plugins/html/gst-plugins-good-plugins-cairotextoverlay.html
index 3ef0927843dc7daf78e41ced719e3a964db1c9fc..682f115d400f66c6ab437dbc5b28d8042748142e 100644
--- a/docs/plugins/html/gst-plugins-good-plugins-cairotextoverlay.html
+++ b/docs/plugins/html/gst-plugins-good-plugins-cairotextoverlay.html
@@ -62,7 +62,7 @@
<div class="refsynopsisdiv">
<h2>Synopsis</h2>
<div class="refsect2">
-<a name="idp7627744"></a><h3>Element Information</h3>
+<a name="idp5318272"></a><h3>Element Information</h3>
<div class="variablelist"><table border="0">
<col align="left" valign="top">
<tbody>
@@ -85,7 +85,7 @@
</div>
<hr>
<div class="refsect2">
-<a name="idp7705424"></a><h3>Element Pads</h3>
+<a name="idp12091712"></a><h3>Element Pads</h3>
<div class="variablelist"><table border="0">
<col align="left" valign="top">
<tbody>
@@ -165,9 +165,9 @@
GstPad *text_sinkpad;
GstPad *srcpad;
- GstCollectPads2 *collect;
- GstCollectData2 *video_collect_data;
- GstCollectData2 *text_collect_data;
+ GstCollectPads *collect;
+ GstCollectData *video_collect_data;
+ GstCollectData *text_collect_data;
GstPadEventFunction collect_event;
gint width;
diff --git a/docs/plugins/html/gst-plugins-good-plugins-cairotimeoverlay.html b/docs/plugins/html/gst-plugins-good-plugins-cairotimeoverlay.html
index 615321cdc3e9283f5ea868856effe6e8c795caf6..32fedd1c35e6cc026ffa7b462a06be4c59a58707 100644
--- a/docs/plugins/html/gst-plugins-good-plugins-cairotimeoverlay.html
+++ b/docs/plugins/html/gst-plugins-good-plugins-cairotimeoverlay.html
@@ -45,7 +45,7 @@
<div class="refsynopsisdiv">
<h2>Synopsis</h2>
<div class="refsect2">
-<a name="idp10029312"></a><h3>Element Information</h3>
+<a name="idp9575648"></a><h3>Element Information</h3>
<div class="variablelist"><table border="0">
<col align="left" valign="top">
<tbody>
@@ -68,7 +68,7 @@
</div>
<hr>
<div class="refsect2">
-<a name="idp6062224"></a><h3>Element Pads</h3>
+<a name="idp11024432"></a><h3>Element Pads</h3>
<div class="variablelist"><table border="0">
<col align="left" valign="top">
<tbody>
diff --git a/docs/plugins/html/gst-plugins-good-plugins-capssetter.html b/docs/plugins/html/gst-plugins-good-plugins-capssetter.html
index b4e20859e445b43b6095d585338bbbe8f29be10b..cd9580c15db6153b01daf3ad2c9952f68061d2ec 100644
--- a/docs/plugins/html/gst-plugins-good-plugins-capssetter.html
+++ b/docs/plugins/html/gst-plugins-good-plugins-capssetter.html
@@ -68,7 +68,7 @@
<p>
</p>
<div class="refsect2">
-<a name="idp6364544"></a><p>
+<a name="idp6126832"></a><p>
Sets or merges caps on a stream's buffers.
That is, a buffer's caps are updated using (fields of)
<a class="link" href="gst-plugins-good-plugins-capssetter.html#GstCapsSetter--caps" title='The "caps" property'>caps</a>. Note that this may
@@ -99,7 +99,7 @@ alike.
<div class="refsynopsisdiv">
<h2>Synopsis</h2>
<div class="refsect2">
-<a name="idp11995488"></a><h3>Element Information</h3>
+<a name="idp5148688"></a><h3>Element Information</h3>
<div class="variablelist"><table border="0">
<col align="left" valign="top">
<tbody>
@@ -122,7 +122,7 @@ alike.
</div>
<hr>
<div class="refsect2">
-<a name="idp6573376"></a><h3>Element Pads</h3>
+<a name="idp7369216"></a><h3>Element Pads</h3>
<div class="variablelist"><table border="0">
<col align="left" valign="top">
<tbody>
diff --git a/docs/plugins/html/gst-plugins-good-plugins-cmmldec.html b/docs/plugins/html/gst-plugins-good-plugins-cmmldec.html
index ad661dd9f003e656896e9bf2813eb737b0a07037..c5748854d4983e90fdc040b9208b454b0a7b483c 100644
--- a/docs/plugins/html/gst-plugins-good-plugins-cmmldec.html
+++ b/docs/plugins/html/gst-plugins-good-plugins-cmmldec.html
@@ -65,7 +65,7 @@
<div class="refsynopsisdiv">
<h2>Synopsis</h2>
<div class="refsect2">
-<a name="idp7826000"></a><h3>Element Information</h3>
+<a name="idp12697024"></a><h3>Element Information</h3>
<div class="variablelist"><table border="0">
<col align="left" valign="top">
<tbody>
@@ -88,7 +88,7 @@
</div>
<hr>
<div class="refsect2">
-<a name="idp10986064"></a><h3>Element Pads</h3>
+<a name="idp7453904"></a><h3>Element Pads</h3>
<div class="variablelist"><table border="0">
<col align="left" valign="top">
<tbody>
diff --git a/docs/plugins/html/gst-plugins-good-plugins-cmmlenc.html b/docs/plugins/html/gst-plugins-good-plugins-cmmlenc.html
index 690fa09105a1d86a2651a15498126134ea05e6bf..efc62dbbaa0ae71581de83d045c92f081d2c4b07 100644
--- a/docs/plugins/html/gst-plugins-good-plugins-cmmlenc.html
+++ b/docs/plugins/html/gst-plugins-good-plugins-cmmlenc.html
@@ -67,7 +67,7 @@
<div class="refsynopsisdiv">
<h2>Synopsis</h2>
<div class="refsect2">
-<a name="idp11538144"></a><h3>Element Information</h3>
+<a name="idp8019104"></a><h3>Element Information</h3>
<div class="variablelist"><table border="0">
<col align="left" valign="top">
<tbody>
@@ -90,7 +90,7 @@
</div>
<hr>
<div class="refsect2">
-<a name="idp6311696"></a><h3>Element Pads</h3>
+<a name="idp6488208"></a><h3>Element Pads</h3>
<div class="variablelist"><table border="0">
<col align="left" valign="top">
<tbody>
diff --git a/docs/plugins/html/gst-plugins-good-plugins-cutter.html b/docs/plugins/html/gst-plugins-good-plugins-cutter.html
index 566cb09de51239575b3125a85a81bf2260c5724f..6927dcb7a79ddd3e8a6e1968880616f675d6de30 100644
--- a/docs/plugins/html/gst-plugins-good-plugins-cutter.html
+++ b/docs/plugins/html/gst-plugins-good-plugins-cutter.html
@@ -89,7 +89,7 @@ The message's structure contains two fields:
<p>
</p>
<div class="refsect2">
-<a name="idp11712656"></a><h3>Example launch line</h3>
+<a name="idp6820592"></a><h3>Example launch line</h3>
<div class="informalexample">
<table class="listing_frame" border="0" cellpadding="0" cellspacing="0">
<tbody>
@@ -107,7 +107,7 @@ The message's structure contains two fields:
<div class="refsynopsisdiv">
<h2>Synopsis</h2>
<div class="refsect2">
-<a name="idp5508864"></a><h3>Element Information</h3>
+<a name="idp11220400"></a><h3>Element Information</h3>
<div class="variablelist"><table border="0">
<col align="left" valign="top">
<tbody>
@@ -130,7 +130,7 @@ The message's structure contains two fields:
</div>
<hr>
<div class="refsect2">
-<a name="idp12766800"></a><h3>Element Pads</h3>
+<a name="idp12243184"></a><h3>Element Pads</h3>
<div class="variablelist"><table border="0">
<col align="left" valign="top">
<tbody>
diff --git a/docs/plugins/html/gst-plugins-good-plugins-dcaparse.html b/docs/plugins/html/gst-plugins-good-plugins-dcaparse.html
index 2010f6fd2f5e6baf8d4ed4603c5d90716ecb8981..fc0370662676cbc88887bd9116297b13d40c2098 100644
--- a/docs/plugins/html/gst-plugins-good-plugins-dcaparse.html
+++ b/docs/plugins/html/gst-plugins-good-plugins-dcaparse.html
@@ -61,7 +61,7 @@ This is a DCA (DTS Coherent Acoustics) parser.
<p>
</p>
<div class="refsect2">
-<a name="idp10982288"></a><h3>Example launch line</h3>
+<a name="idp6247152"></a><h3>Example launch line</h3>
<div class="informalexample">
<table class="listing_frame" border="0" cellpadding="0" cellspacing="0">
<tbody>
@@ -79,7 +79,7 @@ This is a DCA (DTS Coherent Acoustics) parser.
<div class="refsynopsisdiv">
<h2>Synopsis</h2>
<div class="refsect2">
-<a name="idp9627808"></a><h3>Element Information</h3>
+<a name="idp10880000"></a><h3>Element Information</h3>
<div class="variablelist"><table border="0">
<col align="left" valign="top">
<tbody>
@@ -102,7 +102,7 @@ This is a DCA (DTS Coherent Acoustics) parser.
</div>
<hr>
<div class="refsect2">
-<a name="idp11091584"></a><h3>Element Pads</h3>
+<a name="idp12005760"></a><h3>Element Pads</h3>
<div class="variablelist"><table border="0">
<col align="left" valign="top">
<tbody>
diff --git a/docs/plugins/html/gst-plugins-good-plugins-deinterlace.html b/docs/plugins/html/gst-plugins-good-plugins-deinterlace.html
index 0d966c9eed35d629103d1e235bd2ad749f7debb0..dd7ab6cb5abf32a7082c8163dd61816fb1e4eebb 100644
--- a/docs/plugins/html/gst-plugins-good-plugins-deinterlace.html
+++ b/docs/plugins/html/gst-plugins-good-plugins-deinterlace.html
@@ -71,7 +71,7 @@ For this different algorithms can be selected which will be described later.
<p>
</p>
<div class="refsect2">
-<a name="idp11994912"></a><h3>Example launch line</h3>
+<a name="idp12433392"></a><h3>Example launch line</h3>
<div class="informalexample">
<table class="listing_frame" border="0" cellpadding="0" cellspacing="0">
<tbody>
@@ -89,7 +89,7 @@ For this different algorithms can be selected which will be described later.
<div class="refsynopsisdiv">
<h2>Synopsis</h2>
<div class="refsect2">
-<a name="idp10388496"></a><h3>Element Information</h3>
+<a name="idp11957088"></a><h3>Element Information</h3>
<div class="variablelist"><table border="0">
<col align="left" valign="top">
<tbody>
@@ -112,7 +112,7 @@ For this different algorithms can be selected which will be described later.
</div>
<hr>
<div class="refsect2">
-<a name="idp8695888"></a><h3>Element Pads</h3>
+<a name="idp12030128"></a><h3>Element Pads</h3>
<div class="variablelist"><table border="0">
<col align="left" valign="top">
<tbody>
diff --git a/docs/plugins/html/gst-plugins-good-plugins-deinterleave.html b/docs/plugins/html/gst-plugins-good-plugins-deinterleave.html
index e7c9a525aaeb374882383a48029f96da7ede03e9..6d2a4d417202b0b5d839c21aec2a6fc50fd36b59 100644
--- a/docs/plugins/html/gst-plugins-good-plugins-deinterleave.html
+++ b/docs/plugins/html/gst-plugins-good-plugins-deinterleave.html
@@ -78,7 +78,7 @@ before further processing of the audio data.
<p>
</p>
<div class="refsect2">
-<a name="idp12756192"></a><h3>Example launch line</h3>
+<a name="idp10211568"></a><h3>Example launch line</h3>
<div class="informalexample">
<table class="listing_frame" border="0" cellpadding="0" cellspacing="0">
<tbody>
@@ -110,7 +110,7 @@ channels exchanged.
<div class="refsynopsisdiv">
<h2>Synopsis</h2>
<div class="refsect2">
-<a name="idp12176304"></a><h3>Element Information</h3>
+<a name="idp11802256"></a><h3>Element Information</h3>
<div class="variablelist"><table border="0">
<col align="left" valign="top">
<tbody>
@@ -133,7 +133,7 @@ channels exchanged.
</div>
<hr>
<div class="refsect2">
-<a name="idp10755376"></a><h3>Element Pads</h3>
+<a name="idp6094560"></a><h3>Element Pads</h3>
<div class="variablelist"><table border="0">
<col align="left" valign="top">
<tbody>
diff --git a/docs/plugins/html/gst-plugins-good-plugins-dicetv.html b/docs/plugins/html/gst-plugins-good-plugins-dicetv.html
index c893f5317773bedab1786526b8578c93b31d0ae5..fbfbd0e88bdbf46632541fc690db52ba671901f3 100644
--- a/docs/plugins/html/gst-plugins-good-plugins-dicetv.html
+++ b/docs/plugins/html/gst-plugins-good-plugins-dicetv.html
@@ -83,7 +83,7 @@ consistent between each frame.
<p>
</p>
<div class="refsect2">
-<a name="idp5826480"></a><h3>Example launch line</h3>
+<a name="idp6313056"></a><h3>Example launch line</h3>
<div class="informalexample">
<table class="listing_frame" border="0" cellpadding="0" cellspacing="0">
<tbody>
@@ -101,7 +101,7 @@ consistent between each frame.
<div class="refsynopsisdiv">
<h2>Synopsis</h2>
<div class="refsect2">
-<a name="idp10679472"></a><h3>Element Information</h3>
+<a name="idp11138992"></a><h3>Element Information</h3>
<div class="variablelist"><table border="0">
<col align="left" valign="top">
<tbody>
@@ -124,7 +124,7 @@ consistent between each frame.
</div>
<hr>
<div class="refsect2">
-<a name="idp11025600"></a><h3>Element Pads</h3>
+<a name="idp6793888"></a><h3>Element Pads</h3>
<div class="variablelist"><table border="0">
<col align="left" valign="top">
<tbody>
diff --git a/docs/plugins/html/gst-plugins-good-plugins-directsoundsink.html b/docs/plugins/html/gst-plugins-good-plugins-directsoundsink.html
index 595f376a620aa17bf80daaf5e3ba6fe96c17e7b0..07d3dd977ae53b755e3d009c5f5e0cd8117deb8c 100644
--- a/docs/plugins/html/gst-plugins-good-plugins-directsoundsink.html
+++ b/docs/plugins/html/gst-plugins-good-plugins-directsoundsink.html
@@ -45,7 +45,7 @@
<div class="refsynopsisdiv">
<h2>Synopsis</h2>
<div class="refsect2">
-<a name="idp7587152"></a><h3>Element Information</h3>
+<a name="idp11550240"></a><h3>Element Information</h3>
<div class="variablelist"><table border="0">
<col align="left" valign="top">
<tbody>
@@ -68,7 +68,7 @@
</div>
<hr>
<div class="refsect2">
-<a name="idp12665504"></a><h3>Element Pads</h3>
+<a name="idp12563776"></a><h3>Element Pads</h3>
</div>
</div>
<p>
diff --git a/docs/plugins/html/gst-plugins-good-plugins-dv1394src.html b/docs/plugins/html/gst-plugins-good-plugins-dv1394src.html
index d28a6ab3c7dab791d67b01cb565a5f56c5b8da9c..037e68885215649ce7c28e3a710c0835669fa203 100644
--- a/docs/plugins/html/gst-plugins-good-plugins-dv1394src.html
+++ b/docs/plugins/html/gst-plugins-good-plugins-dv1394src.html
@@ -76,7 +76,7 @@ GstDV1394Src implements
<div class="refsynopsisdiv">
<h2>Synopsis</h2>
<div class="refsect2">
-<a name="idp12575152"></a><h3>Element Information</h3>
+<a name="idp12148768"></a><h3>Element Information</h3>
<div class="variablelist"><table border="0">
<col align="left" valign="top">
<tbody>
@@ -99,7 +99,7 @@ GstDV1394Src implements
</div>
<hr>
<div class="refsect2">
-<a name="idp10077376"></a><h3>Element Pads</h3>
+<a name="idp11487712"></a><h3>Element Pads</h3>
<div class="variablelist"><table border="0">
<col align="left" valign="top">
<tbody>
diff --git a/docs/plugins/html/gst-plugins-good-plugins-dvdec.html b/docs/plugins/html/gst-plugins-good-plugins-dvdec.html
index 9732ca0bab599b1691a8d4dd92a3b6d8a3b9912e..8e4bc1825e4721c50ea3f7cef45b18af1130d2b6 100644
--- a/docs/plugins/html/gst-plugins-good-plugins-dvdec.html
+++ b/docs/plugins/html/gst-plugins-good-plugins-dvdec.html
@@ -68,7 +68,7 @@
<div class="refsynopsisdiv">
<h2>Synopsis</h2>
<div class="refsect2">
-<a name="idp5450608"></a><h3>Element Information</h3>
+<a name="idp10268272"></a><h3>Element Information</h3>
<div class="variablelist"><table border="0">
<col align="left" valign="top">
<tbody>
@@ -91,7 +91,7 @@
</div>
<hr>
<div class="refsect2">
-<a name="idp13027280"></a><h3>Element Pads</h3>
+<a name="idp10917088"></a><h3>Element Pads</h3>
<div class="variablelist"><table border="0">
<col align="left" valign="top">
<tbody>
diff --git a/docs/plugins/html/gst-plugins-good-plugins-dvdemux.html b/docs/plugins/html/gst-plugins-good-plugins-dvdemux.html
index 7d809751683dea60ab073d643c4dbe1085b755e3..d314f1b2be846cbdd2767bcf2853912d67eba7a8 100644
--- a/docs/plugins/html/gst-plugins-good-plugins-dvdemux.html
+++ b/docs/plugins/html/gst-plugins-good-plugins-dvdemux.html
@@ -57,7 +57,7 @@
<div class="refsynopsisdiv">
<h2>Synopsis</h2>
<div class="refsect2">
-<a name="idp9232800"></a><h3>Element Information</h3>
+<a name="idp10746464"></a><h3>Element Information</h3>
<div class="variablelist"><table border="0">
<col align="left" valign="top">
<tbody>
@@ -80,7 +80,7 @@
</div>
<hr>
<div class="refsect2">
-<a name="idp6448336"></a><h3>Element Pads</h3>
+<a name="idp8336992"></a><h3>Element Pads</h3>
<div class="variablelist"><table border="0">
<col align="left" valign="top">
<tbody>
diff --git a/docs/plugins/html/gst-plugins-good-plugins-edgetv.html b/docs/plugins/html/gst-plugins-good-plugins-edgetv.html
index b6cfd0af1663d2124d6a0d587aaf8c17034086ad..900db60462ac9f7d5a15b1eb4d655457dc5ded0a 100644
--- a/docs/plugins/html/gst-plugins-good-plugins-edgetv.html
+++ b/docs/plugins/html/gst-plugins-good-plugins-edgetv.html
@@ -63,7 +63,7 @@ computer way.
<p>
</p>
<div class="refsect2">
-<a name="idp8191568"></a><h3>Example launch line</h3>
+<a name="idp7492944"></a><h3>Example launch line</h3>
<div class="informalexample">
<table class="listing_frame" border="0" cellpadding="0" cellspacing="0">
<tbody>
@@ -81,7 +81,7 @@ computer way.
<div class="refsynopsisdiv">
<h2>Synopsis</h2>
<div class="refsect2">
-<a name="idp10518512"></a><h3>Element Information</h3>
+<a name="idp6725056"></a><h3>Element Information</h3>
<div class="variablelist"><table border="0">
<col align="left" valign="top">
<tbody>
@@ -104,7 +104,7 @@ computer way.
</div>
<hr>
<div class="refsect2">
-<a name="idp10488208"></a><h3>Element Pads</h3>
+<a name="idp7995024"></a><h3>Element Pads</h3>
<div class="variablelist"><table border="0">
<col align="left" valign="top">
<tbody>
diff --git a/docs/plugins/html/gst-plugins-good-plugins-equalizer-10bands.html b/docs/plugins/html/gst-plugins-good-plugins-equalizer-10bands.html
index 2d30054d1e5a8be7e8f797228ad0f927c2bdf55b..badc0834fee82512ca8cbfdb31f7973c59ac029b 100644
--- a/docs/plugins/html/gst-plugins-good-plugins-equalizer-10bands.html
+++ b/docs/plugins/html/gst-plugins-good-plugins-equalizer-10bands.html
@@ -89,7 +89,7 @@ frequency bands between 30 Hz and 15 kHz.
<p>
</p>
<div class="refsect2">
-<a name="idp6800144"></a><h3>Example launch line</h3>
+<a name="idp10621088"></a><h3>Example launch line</h3>
<div class="informalexample">
<table class="listing_frame" border="0" cellpadding="0" cellspacing="0">
<tbody>
@@ -107,7 +107,7 @@ frequency bands between 30 Hz and 15 kHz.
<div class="refsynopsisdiv">
<h2>Synopsis</h2>
<div class="refsect2">
-<a name="idp12385936"></a><h3>Element Information</h3>
+<a name="idp10844480"></a><h3>Element Information</h3>
<div class="variablelist"><table border="0">
<col align="left" valign="top">
<tbody>
@@ -130,7 +130,7 @@ frequency bands between 30 Hz and 15 kHz.
</div>
<hr>
<div class="refsect2">
-<a name="idp8495904"></a><h3>Element Pads</h3>
+<a name="idp12502864"></a><h3>Element Pads</h3>
<div class="variablelist"><table border="0">
<col align="left" valign="top">
<tbody>
diff --git a/docs/plugins/html/gst-plugins-good-plugins-equalizer-3bands.html b/docs/plugins/html/gst-plugins-good-plugins-equalizer-3bands.html
index 54cb1ae514f378ec0586b4c47ac84ad02fbfbb47..17328f55f749954ba2d05e12339489bf89fed11b 100644
--- a/docs/plugins/html/gst-plugins-good-plugins-equalizer-3bands.html
+++ b/docs/plugins/html/gst-plugins-good-plugins-equalizer-3bands.html
@@ -82,7 +82,7 @@ medium frequency and high frequency band.
<p>
</p>
<div class="refsect2">
-<a name="idp4491920"></a><h3>Example launch line</h3>
+<a name="idp8414880"></a><h3>Example launch line</h3>
<div class="informalexample">
<table class="listing_frame" border="0" cellpadding="0" cellspacing="0">
<tbody>
@@ -100,7 +100,7 @@ medium frequency and high frequency band.
<div class="refsynopsisdiv">
<h2>Synopsis</h2>
<div class="refsect2">
-<a name="idp9189216"></a><h3>Element Information</h3>
+<a name="idp11754272"></a><h3>Element Information</h3>
<div class="variablelist"><table border="0">
<col align="left" valign="top">
<tbody>
@@ -123,7 +123,7 @@ medium frequency and high frequency band.
</div>
<hr>
<div class="refsect2">
-<a name="idp9553744"></a><h3>Element Pads</h3>
+<a name="idp8398928"></a><h3>Element Pads</h3>
<div class="variablelist"><table border="0">
<col align="left" valign="top">
<tbody>
diff --git a/docs/plugins/html/gst-plugins-good-plugins-equalizer-nbands.html b/docs/plugins/html/gst-plugins-good-plugins-equalizer-nbands.html
index b18fc03353edf66031d419758833b65b37f4dda7..bcb32da0f16c97b9864b4c8537dd33f97ecabfd9 100644
--- a/docs/plugins/html/gst-plugins-good-plugins-equalizer-nbands.html
+++ b/docs/plugins/html/gst-plugins-good-plugins-equalizer-nbands.html
@@ -81,7 +81,7 @@ the center frequency, band width and gain.
<p>
</p>
<div class="refsect2">
-<a name="idp11790448"></a><h3>Example launch line</h3>
+<a name="idp5958288"></a><h3>Example launch line</h3>
<div class="informalexample">
<table class="listing_frame" border="0" cellpadding="0" cellspacing="0">
<tbody>
@@ -98,7 +98,7 @@ the center frequency, band width and gain.
</p>
<hr>
<div class="refsect2">
-<a name="idp8747536"></a><h3>Example code</h3>
+<a name="idp11468416"></a><h3>Example code</h3>
<div class="informalexample">
<table class="listing_frame" border="0" cellpadding="0" cellspacing="0">
<tbody>
@@ -190,7 +190,7 @@ the center frequency, band width and gain.
<div class="refsynopsisdiv">
<h2>Synopsis</h2>
<div class="refsect2">
-<a name="idp13765696"></a><h3>Element Information</h3>
+<a name="idp14072800"></a><h3>Element Information</h3>
<div class="variablelist"><table border="0">
<col align="left" valign="top">
<tbody>
@@ -213,7 +213,7 @@ the center frequency, band width and gain.
</div>
<hr>
<div class="refsect2">
-<a name="idp13644912"></a><h3>Element Pads</h3>
+<a name="idp5990880"></a><h3>Element Pads</h3>
<div class="variablelist"><table border="0">
<col align="left" valign="top">
<tbody>
diff --git a/docs/plugins/html/gst-plugins-good-plugins-flacdec.html b/docs/plugins/html/gst-plugins-good-plugins-flacdec.html
index 6944138b3158e5002ce0b1731cadc669e2ed8682..1afca3ca26d047533f757a7add813b985f7ac80f 100644
--- a/docs/plugins/html/gst-plugins-good-plugins-flacdec.html
+++ b/docs/plugins/html/gst-plugins-good-plugins-flacdec.html
@@ -58,7 +58,7 @@
<div class="refsynopsisdiv">
<h2>Synopsis</h2>
<div class="refsect2">
-<a name="idp5392880"></a><h3>Element Information</h3>
+<a name="idp5717312"></a><h3>Element Information</h3>
<div class="variablelist"><table border="0">
<col align="left" valign="top">
<tbody>
@@ -81,7 +81,7 @@
</div>
<hr>
<div class="refsect2">
-<a name="idp8187264"></a><h3>Element Pads</h3>
+<a name="idp9572240"></a><h3>Element Pads</h3>
<div class="variablelist"><table border="0">
<col align="left" valign="top">
<tbody>
diff --git a/docs/plugins/html/gst-plugins-good-plugins-flacenc.html b/docs/plugins/html/gst-plugins-good-plugins-flacenc.html
index 51c8b742ccb451e9c8bef8e67fdf8beb69b03041..ea814d1b1d1b10d30e1f339b40306b655986ecc2 100644
--- a/docs/plugins/html/gst-plugins-good-plugins-flacenc.html
+++ b/docs/plugins/html/gst-plugins-good-plugins-flacenc.html
@@ -88,7 +88,7 @@ GstFlacEnc implements
<div class="refsynopsisdiv">
<h2>Synopsis</h2>
<div class="refsect2">
-<a name="idp9460448"></a><h3>Element Information</h3>
+<a name="idp12549504"></a><h3>Element Information</h3>
<div class="variablelist"><table border="0">
<col align="left" valign="top">
<tbody>
@@ -111,7 +111,7 @@ GstFlacEnc implements
</div>
<hr>
<div class="refsect2">
-<a name="idp13448912"></a><h3>Element Pads</h3>
+<a name="idp13589536"></a><h3>Element Pads</h3>
<div class="variablelist"><table border="0">
<col align="left" valign="top">
<tbody>
diff --git a/docs/plugins/html/gst-plugins-good-plugins-flacparse.html b/docs/plugins/html/gst-plugins-good-plugins-flacparse.html
index 591ff3c77fc2b5d9f243d571e431972f4cad8b1a..f256f0c3145e7501a81697948e9bad9d5f0103cc 100644
--- a/docs/plugins/html/gst-plugins-good-plugins-flacparse.html
+++ b/docs/plugins/html/gst-plugins-good-plugins-flacparse.html
@@ -80,7 +80,7 @@ format file to an ogg bitstream.
<p>
</p>
<div class="refsect2">
-<a name="idp9256656"></a><h3>Example pipelines</h3>
+<a name="idp5064016"></a><h3>Example pipelines</h3>
<div class="informalexample">
<table class="listing_frame" border="0" cellpadding="0" cellspacing="0">
<tbody>
@@ -102,7 +102,7 @@ buffer has the timestamp, duration, offset, and offset_end set.
<div class="refsynopsisdiv">
<h2>Synopsis</h2>
<div class="refsect2">
-<a name="idp6694880"></a><h3>Element Information</h3>
+<a name="idp9737008"></a><h3>Element Information</h3>
<div class="variablelist"><table border="0">
<col align="left" valign="top">
<tbody>
@@ -125,7 +125,7 @@ buffer has the timestamp, duration, offset, and offset_end set.
</div>
<hr>
<div class="refsect2">
-<a name="idp11214336"></a><h3>Element Pads</h3>
+<a name="idp3341648"></a><h3>Element Pads</h3>
<div class="variablelist"><table border="0">
<col align="left" valign="top">
<tbody>
diff --git a/docs/plugins/html/gst-plugins-good-plugins-flactag.html b/docs/plugins/html/gst-plugins-good-plugins-flactag.html
index b6f3eb30ef25c6a4afb1bc2aac7125ce52da1a05..9d0b1060166dfeb8b1cc8053b23342fbbe520575 100644
--- a/docs/plugins/html/gst-plugins-good-plugins-flactag.html
+++ b/docs/plugins/html/gst-plugins-good-plugins-flactag.html
@@ -65,7 +65,7 @@ GstFlacTag implements
<div class="refsynopsisdiv">
<h2>Synopsis</h2>
<div class="refsect2">
-<a name="idp9633552"></a><h3>Element Information</h3>
+<a name="idp9432064"></a><h3>Element Information</h3>
<div class="variablelist"><table border="0">
<col align="left" valign="top">
<tbody>
@@ -88,7 +88,7 @@ GstFlacTag implements
</div>
<hr>
<div class="refsect2">
-<a name="idp8307824"></a><h3>Element Pads</h3>
+<a name="idp8078464"></a><h3>Element Pads</h3>
<div class="variablelist"><table border="0">
<col align="left" valign="top">
<tbody>
diff --git a/docs/plugins/html/gst-plugins-good-plugins-flvdemux.html b/docs/plugins/html/gst-plugins-good-plugins-flvdemux.html
index b9de89e75b2b20ed67b2a800a8e1bd7ce829f663..200ae769ad0dbcab358037e9054df5bb860edfac 100644
--- a/docs/plugins/html/gst-plugins-good-plugins-flvdemux.html
+++ b/docs/plugins/html/gst-plugins-good-plugins-flvdemux.html
@@ -60,7 +60,7 @@ flvdemux demuxes an FLV file into the different contained streams.
<p>
</p>
<div class="refsect2">
-<a name="idp12614624"></a><h3>Example launch line</h3>
+<a name="idp5941616"></a><h3>Example launch line</h3>
<div class="informalexample">
<table class="listing_frame" border="0" cellpadding="0" cellspacing="0">
<tbody>
@@ -78,7 +78,7 @@ flvdemux demuxes an FLV file into the different contained streams.
<div class="refsynopsisdiv">
<h2>Synopsis</h2>
<div class="refsect2">
-<a name="idp14361792"></a><h3>Element Information</h3>
+<a name="idp14008096"></a><h3>Element Information</h3>
<div class="variablelist"><table border="0">
<col align="left" valign="top">
<tbody>
@@ -101,7 +101,7 @@ flvdemux demuxes an FLV file into the different contained streams.
</div>
<hr>
<div class="refsect2">
-<a name="idp12363360"></a><h3>Element Pads</h3>
+<a name="idp13551456"></a><h3>Element Pads</h3>
<div class="variablelist"><table border="0">
<col align="left" valign="top">
<tbody>
diff --git a/docs/plugins/html/gst-plugins-good-plugins-flvmux.html b/docs/plugins/html/gst-plugins-good-plugins-flvmux.html
index a1e4f2b0ace9ade1722d6cec2df0a9b56a44559f..82fc1fdede30d3bbdb5a31b82773b008a323b87f 100644
--- a/docs/plugins/html/gst-plugins-good-plugins-flvmux.html
+++ b/docs/plugins/html/gst-plugins-good-plugins-flvmux.html
@@ -77,7 +77,7 @@ flvmux muxes different streams into an FLV file.
<p>
</p>
<div class="refsect2">
-<a name="idp8102464"></a><h3>Example launch line</h3>
+<a name="idp13049856"></a><h3>Example launch line</h3>
<div class="informalexample">
<table class="listing_frame" border="0" cellpadding="0" cellspacing="0">
<tbody>
@@ -95,7 +95,7 @@ flvmux muxes different streams into an FLV file.
<div class="refsynopsisdiv">
<h2>Synopsis</h2>
<div class="refsect2">
-<a name="idp5675984"></a><h3>Element Information</h3>
+<a name="idp10897440"></a><h3>Element Information</h3>
<div class="variablelist"><table border="0">
<col align="left" valign="top">
<tbody>
@@ -118,7 +118,7 @@ flvmux muxes different streams into an FLV file.
</div>
<hr>
<div class="refsect2">
-<a name="idp6998704"></a><h3>Element Pads</h3>
+<a name="idp11521824"></a><h3>Element Pads</h3>
<div class="variablelist"><table border="0">
<col align="left" valign="top">
<tbody>
diff --git a/docs/plugins/html/gst-plugins-good-plugins-flxdec.html b/docs/plugins/html/gst-plugins-good-plugins-flxdec.html
index 01d61140d590af73713f9645ee8e4654e1dfd77c..f02773e0d50470f7ad4e8ecc672f549daab6482f 100644
--- a/docs/plugins/html/gst-plugins-good-plugins-flxdec.html
+++ b/docs/plugins/html/gst-plugins-good-plugins-flxdec.html
@@ -48,7 +48,7 @@ This element decodes fli/flc/flx-video into raw video
<div class="refsynopsisdiv">
<h2>Synopsis</h2>
<div class="refsect2">
-<a name="idp12197840"></a><h3>Element Information</h3>
+<a name="idp5757568"></a><h3>Element Information</h3>
<div class="variablelist"><table border="0">
<col align="left" valign="top">
<tbody>
@@ -71,7 +71,7 @@ This element decodes fli/flc/flx-video into raw video
</div>
<hr>
<div class="refsect2">
-<a name="idp5597472"></a><h3>Element Pads</h3>
+<a name="idp8040848"></a><h3>Element Pads</h3>
<div class="variablelist"><table border="0">
<col align="left" valign="top">
<tbody>
@@ -130,7 +130,7 @@ This element decodes fli/flc/flx-video into raw video
gboolean active, new_meta;
- GstBuffer *delta, *frame;
+ guint8 *delta_data, *frame_data;
GstAdapter *adapter;
gulong size;
GstFlxDecState state;
diff --git a/docs/plugins/html/gst-plugins-good-plugins-gamma.html b/docs/plugins/html/gst-plugins-good-plugins-gamma.html
index eabf43c70def076e30aaa123df114e72b4066339..b44daf54a24970c01c9bd18d8cd07efe9706b35b 100644
--- a/docs/plugins/html/gst-plugins-good-plugins-gamma.html
+++ b/docs/plugins/html/gst-plugins-good-plugins-gamma.html
@@ -70,7 +70,7 @@ Performs gamma correction on a video stream.
<p>
</p>
<div class="refsect2">
-<a name="idp10949360"></a><h3>Example launch line</h3>
+<a name="idp10885728"></a><h3>Example launch line</h3>
<div class="informalexample">
<table class="listing_frame" border="0" cellpadding="0" cellspacing="0">
<tbody>
@@ -102,7 +102,7 @@ Last reviewed on 2010-04-18 (0.10.22)
<div class="refsynopsisdiv">
<h2>Synopsis</h2>
<div class="refsect2">
-<a name="idp12807632"></a><h3>Element Information</h3>
+<a name="idp10088416"></a><h3>Element Information</h3>
<div class="variablelist"><table border="0">
<col align="left" valign="top">
<tbody>
@@ -125,7 +125,7 @@ Last reviewed on 2010-04-18 (0.10.22)
</div>
<hr>
<div class="refsect2">
-<a name="idp14192112"></a><h3>Element Pads</h3>
+<a name="idp6598992"></a><h3>Element Pads</h3>
<div class="variablelist"><table border="0">
<col align="left" valign="top">
<tbody>
diff --git a/docs/plugins/html/gst-plugins-good-plugins-gdkpixbufsink.html b/docs/plugins/html/gst-plugins-good-plugins-gdkpixbufsink.html
index 9e0e8145219a600445615cd89589ea30804a93d9..7e4d0d8f8e2b3509638309662d3b81d2cda5fd80 100644
--- a/docs/plugins/html/gst-plugins-good-plugins-gdkpixbufsink.html
+++ b/docs/plugins/html/gst-plugins-good-plugins-gdkpixbufsink.html
@@ -55,7 +55,7 @@
<div class="refsynopsisdiv">
<h2>Synopsis</h2>
<div class="refsect2">
-<a name="idp9792320"></a><h3>Element Information</h3>
+<a name="idp10658096"></a><h3>Element Information</h3>
<div class="variablelist"><table border="0">
<col align="left" valign="top">
<tbody>
@@ -78,7 +78,7 @@
</div>
<hr>
<div class="refsect2">
-<a name="idp8833680"></a><h3>Element Pads</h3>
+<a name="idp13592688"></a><h3>Element Pads</h3>
<div class="variablelist"><table border="0">
<col align="left" valign="top">
<tbody>
diff --git a/docs/plugins/html/gst-plugins-good-plugins-goom.html b/docs/plugins/html/gst-plugins-good-plugins-goom.html
index 58ee2f3bf003d7b7378f76b5a8884c728340ef27..d7263946aa7e576606cb576d9cc55db2bc342cfa 100644
--- a/docs/plugins/html/gst-plugins-good-plugins-goom.html
+++ b/docs/plugins/html/gst-plugins-good-plugins-goom.html
@@ -61,7 +61,7 @@ based on the incoming audio signal.
<p>
</p>
<div class="refsect2">
-<a name="idp5138944"></a><h3>Example launch line</h3>
+<a name="idp6342000"></a><h3>Example launch line</h3>
<div class="informalexample">
<table class="listing_frame" border="0" cellpadding="0" cellspacing="0">
<tbody>
@@ -79,7 +79,7 @@ based on the incoming audio signal.
<div class="refsynopsisdiv">
<h2>Synopsis</h2>
<div class="refsect2">
-<a name="idp5096144"></a><h3>Element Information</h3>
+<a name="idp8318784"></a><h3>Element Information</h3>
<div class="variablelist"><table border="0">
<col align="left" valign="top">
<tbody>
@@ -102,7 +102,7 @@ based on the incoming audio signal.
</div>
<hr>
<div class="refsect2">
-<a name="idp12024128"></a><h3>Element Pads</h3>
+<a name="idp10618592"></a><h3>Element Pads</h3>
<div class="variablelist"><table border="0">
<col align="left" valign="top">
<tbody>
diff --git a/docs/plugins/html/gst-plugins-good-plugins-goom2k1.html b/docs/plugins/html/gst-plugins-good-plugins-goom2k1.html
index 2b62d4d8cb67302a9dda71515cf2e5e56a80d23d..256e428716b717c9d73c960e5319ef053f826a06 100644
--- a/docs/plugins/html/gst-plugins-good-plugins-goom2k1.html
+++ b/docs/plugins/html/gst-plugins-good-plugins-goom2k1.html
@@ -62,7 +62,7 @@ visualisation. Also available is goom2k4, with a different look.
<p>
</p>
<div class="refsect2">
-<a name="idp8850208"></a><h3>Example launch line</h3>
+<a name="idp5035872"></a><h3>Example launch line</h3>
<div class="informalexample">
<table class="listing_frame" border="0" cellpadding="0" cellspacing="0">
<tbody>
@@ -80,7 +80,7 @@ visualisation. Also available is goom2k4, with a different look.
<div class="refsynopsisdiv">
<h2>Synopsis</h2>
<div class="refsect2">
-<a name="idp6255424"></a><h3>Element Information</h3>
+<a name="idp11061456"></a><h3>Element Information</h3>
<div class="variablelist"><table border="0">
<col align="left" valign="top">
<tbody>
@@ -103,7 +103,7 @@ visualisation. Also available is goom2k4, with a different look.
</div>
<hr>
<div class="refsect2">
-<a name="idp10508000"></a><h3>Element Pads</h3>
+<a name="idp9258848"></a><h3>Element Pads</h3>
<div class="variablelist"><table border="0">
<col align="left" valign="top">
<tbody>
diff --git a/docs/plugins/html/gst-plugins-good-plugins-halaudiosink.html b/docs/plugins/html/gst-plugins-good-plugins-halaudiosink.html
index e5b17d1bff3ca44c61785572e15e4753eadbad46..88a5cf895000ff5ed5f9335269d7f2da41b1b356 100644
--- a/docs/plugins/html/gst-plugins-good-plugins-halaudiosink.html
+++ b/docs/plugins/html/gst-plugins-good-plugins-halaudiosink.html
@@ -44,7 +44,7 @@
<div class="refsynopsisdiv">
<h2>Synopsis</h2>
<div class="refsect2">
-<a name="idp4394432"></a><h3>Element Information</h3>
+<a name="idp14428960"></a><h3>Element Information</h3>
<div class="variablelist"><table border="0">
<col align="left" valign="top">
<tbody>
@@ -67,7 +67,7 @@
</div>
<hr>
<div class="refsect2">
-<a name="idp10946784"></a><h3>Element Pads</h3>
+<a name="idp12532944"></a><h3>Element Pads</h3>
<div class="variablelist"><table border="0">
<col align="left" valign="top">
<tbody>
diff --git a/docs/plugins/html/gst-plugins-good-plugins-halaudiosrc.html b/docs/plugins/html/gst-plugins-good-plugins-halaudiosrc.html
index 5b351293c79b8355a1600dcebae963afdbbbd441..0763428f5e99888b3bef942cd6016bb326c6b69c 100644
--- a/docs/plugins/html/gst-plugins-good-plugins-halaudiosrc.html
+++ b/docs/plugins/html/gst-plugins-good-plugins-halaudiosrc.html
@@ -44,7 +44,7 @@
<div class="refsynopsisdiv">
<h2>Synopsis</h2>
<div class="refsect2">
-<a name="idp9250400"></a><h3>Element Information</h3>
+<a name="idp9748224"></a><h3>Element Information</h3>
<div class="variablelist"><table border="0">
<col align="left" valign="top">
<tbody>
@@ -67,7 +67,7 @@
</div>
<hr>
<div class="refsect2">
-<a name="idp4899104"></a><h3>Element Pads</h3>
+<a name="idp7339280"></a><h3>Element Pads</h3>
<div class="variablelist"><table border="0">
<col align="left" valign="top">
<tbody>
diff --git a/docs/plugins/html/gst-plugins-good-plugins-hdv1394src.html b/docs/plugins/html/gst-plugins-good-plugins-hdv1394src.html
index 18006b847e4dbbeda3bce8c7d7cf3f58f66357f7..284b62c8d6344ac847a056ee1ff085d4ee9b6d74 100644
--- a/docs/plugins/html/gst-plugins-good-plugins-hdv1394src.html
+++ b/docs/plugins/html/gst-plugins-good-plugins-hdv1394src.html
@@ -65,7 +65,7 @@ GstHDV1394Src implements
<div class="refsynopsisdiv">
<h2>Synopsis</h2>
<div class="refsect2">
-<a name="idp14765888"></a><h3>Element Information</h3>
+<a name="idp13761712"></a><h3>Element Information</h3>
<div class="variablelist"><table border="0">
<col align="left" valign="top">
<tbody>
@@ -88,7 +88,7 @@ GstHDV1394Src implements
</div>
<hr>
<div class="refsect2">
-<a name="idp13610944"></a><h3>Element Pads</h3>
+<a name="idp8682320"></a><h3>Element Pads</h3>
<div class="variablelist"><table border="0">
<col align="left" valign="top">
<tbody>
diff --git a/docs/plugins/html/gst-plugins-good-plugins-icydemux.html b/docs/plugins/html/gst-plugins-good-plugins-icydemux.html
index 17d18476ffaecbe739407f991987ae989abf89a4..2428985fe0f401465b3528485fafa31de9fd182a 100644
--- a/docs/plugins/html/gst-plugins-good-plugins-icydemux.html
+++ b/docs/plugins/html/gst-plugins-good-plugins-icydemux.html
@@ -64,7 +64,7 @@ on outgoing buffers.
<p>
</p>
<div class="refsect2">
-<a name="idp6903120"></a><h3>Example launch line</h3>
+<a name="idp13006848"></a><h3>Example launch line</h3>
<div class="informalexample">
<table class="listing_frame" border="0" cellpadding="0" cellspacing="0">
<tbody>
@@ -85,7 +85,7 @@ or giosrc instead of souphttpsrc should also work.)
<div class="refsynopsisdiv">
<h2>Synopsis</h2>
<div class="refsect2">
-<a name="idp6415744"></a><h3>Element Information</h3>
+<a name="idp6244576"></a><h3>Element Information</h3>
<div class="variablelist"><table border="0">
<col align="left" valign="top">
<tbody>
@@ -108,7 +108,7 @@ or giosrc instead of souphttpsrc should also work.)
</div>
<hr>
<div class="refsect2">
-<a name="idp6108064"></a><h3>Element Pads</h3>
+<a name="idp6616864"></a><h3>Element Pads</h3>
<div class="variablelist"><table border="0">
<col align="left" valign="top">
<tbody>
diff --git a/docs/plugins/html/gst-plugins-good-plugins-id3demux.html b/docs/plugins/html/gst-plugins-good-plugins-id3demux.html
index 5164debf84e179044bacae303035c1c3165fd90d..f92e1ba13822814f33f5c91f4a5488c022c39cdd 100644
--- a/docs/plugins/html/gst-plugins-good-plugins-id3demux.html
+++ b/docs/plugins/html/gst-plugins-good-plugins-id3demux.html
@@ -83,7 +83,7 @@ relied on libid3tag from the MAD project.
<p>
</p>
<div class="refsect2">
-<a name="idp5298544"></a><h3>Example launch line</h3>
+<a name="idp7559680"></a><h3>Example launch line</h3>
<div class="informalexample">
<table class="listing_frame" border="0" cellpadding="0" cellspacing="0">
<tbody>
@@ -103,7 +103,7 @@ the appropriate mime type set on buffers produced from id3demux.
<div class="refsynopsisdiv">
<h2>Synopsis</h2>
<div class="refsect2">
-<a name="idp8120816"></a><h3>Element Information</h3>
+<a name="idp8137184"></a><h3>Element Information</h3>
<div class="variablelist"><table border="0">
<col align="left" valign="top">
<tbody>
@@ -126,7 +126,7 @@ the appropriate mime type set on buffers produced from id3demux.
</div>
<hr>
<div class="refsect2">
-<a name="idp15313664"></a><h3>Element Pads</h3>
+<a name="idp8566864"></a><h3>Element Pads</h3>
<div class="variablelist"><table border="0">
<col align="left" valign="top">
<tbody>
diff --git a/docs/plugins/html/gst-plugins-good-plugins-id3v2mux.html b/docs/plugins/html/gst-plugins-good-plugins-id3v2mux.html
index 7cbb34db5dc55345418aaba60285b3099732a7f3..e357d25c0bc377778c045e900eb8dbba78f8bd06 100644
--- a/docs/plugins/html/gst-plugins-good-plugins-id3v2mux.html
+++ b/docs/plugins/html/gst-plugins-good-plugins-id3v2mux.html
@@ -66,7 +66,7 @@ GstId3v2Mux implements
<div class="refsynopsisdiv">
<h2>Synopsis</h2>
<div class="refsect2">
-<a name="idp8863408"></a><h3>Element Information</h3>
+<a name="idp8416128"></a><h3>Element Information</h3>
<div class="variablelist"><table border="0">
<col align="left" valign="top">
<tbody>
@@ -89,7 +89,7 @@ GstId3v2Mux implements
</div>
<hr>
<div class="refsect2">
-<a name="idp10480576"></a><h3>Element Pads</h3>
+<a name="idp14839472"></a><h3>Element Pads</h3>
<div class="variablelist"><table border="0">
<col align="left" valign="top">
<tbody>
diff --git a/docs/plugins/html/gst-plugins-good-plugins-imagefreeze.html b/docs/plugins/html/gst-plugins-good-plugins-imagefreeze.html
index e5715d64a4861cab48a236f74432d0b6ef99981e..9ac9d38f79ab3a21f7b94cc3410196e4449f1918 100644
--- a/docs/plugins/html/gst-plugins-good-plugins-imagefreeze.html
+++ b/docs/plugins/html/gst-plugins-good-plugins-imagefreeze.html
@@ -62,7 +62,7 @@ by downstream, allows seeking and answers queries.
<p>
</p>
<div class="refsect2">
-<a name="idp7989952"></a><h3>Example launch line</h3>
+<a name="idp8924032"></a><h3>Example launch line</h3>
<div class="informalexample">
<table class="listing_frame" border="0" cellpadding="0" cellspacing="0">
<tbody>
@@ -80,7 +80,7 @@ by downstream, allows seeking and answers queries.
<div class="refsynopsisdiv">
<h2>Synopsis</h2>
<div class="refsect2">
-<a name="idp10796848"></a><h3>Element Information</h3>
+<a name="idp9672688"></a><h3>Element Information</h3>
<div class="variablelist"><table border="0">
<col align="left" valign="top">
<tbody>
@@ -103,7 +103,7 @@ by downstream, allows seeking and answers queries.
</div>
<hr>
<div class="refsect2">
-<a name="idp12932000"></a><h3>Element Pads</h3>
+<a name="idp5205616"></a><h3>Element Pads</h3>
<div class="variablelist"><table border="0">
<col align="left" valign="top">
<tbody>
diff --git a/docs/plugins/html/gst-plugins-good-plugins-interleave.html b/docs/plugins/html/gst-plugins-good-plugins-interleave.html
index 65be7b089e34ce3e86b77ae3b711c26c598e581c..5208fb8664989db23b3750fce8bb0b774689b0ef 100644
--- a/docs/plugins/html/gst-plugins-good-plugins-interleave.html
+++ b/docs/plugins/html/gst-plugins-good-plugins-interleave.html
@@ -82,7 +82,7 @@ The channel number of every sinkpad in the out can be retrieved from the "channe
<p>
</p>
<div class="refsect2">
-<a name="idp7266960"></a><h3>Example launch line</h3>
+<a name="idp13596320"></a><h3>Example launch line</h3>
<div class="informalexample">
<table class="listing_frame" border="0" cellpadding="0" cellspacing="0">
<tbody>
@@ -113,7 +113,7 @@ channels exchanged.
<div class="refsynopsisdiv">
<h2>Synopsis</h2>
<div class="refsect2">
-<a name="idp9772160"></a><h3>Element Information</h3>
+<a name="idp7032912"></a><h3>Element Information</h3>
<div class="variablelist"><table border="0">
<col align="left" valign="top">
<tbody>
@@ -136,7 +136,7 @@ channels exchanged.
</div>
<hr>
<div class="refsect2">
-<a name="idp8204304"></a><h3>Element Pads</h3>
+<a name="idp12196880"></a><h3>Element Pads</h3>
<div class="variablelist"><table border="0">
<col align="left" valign="top">
<tbody>
diff --git a/docs/plugins/html/gst-plugins-good-plugins-ismlmux.html b/docs/plugins/html/gst-plugins-good-plugins-ismlmux.html
index 9005498812fa0bd732f59d7d6b9eeb0d07cc69d4..a296aea4d8b6a93a838404e99a328e1d06c86532 100644
--- a/docs/plugins/html/gst-plugins-good-plugins-ismlmux.html
+++ b/docs/plugins/html/gst-plugins-good-plugins-ismlmux.html
@@ -96,7 +96,7 @@ presentation-timestamp.
<p>
</p>
<div class="refsect2">
-<a name="idp6554064"></a><h3>Example pipelines</h3>
+<a name="idp9354800"></a><h3>Example pipelines</h3>
<div class="informalexample">
<table class="listing_frame" border="0" cellpadding="0" cellspacing="0">
<tbody>
@@ -119,7 +119,7 @@ Documentation last reviewed on 2011-04-21
<div class="refsynopsisdiv">
<h2>Synopsis</h2>
<div class="refsect2">
-<a name="idp15153392"></a><h3>Element Information</h3>
+<a name="idp9369808"></a><h3>Element Information</h3>
<div class="variablelist"><table border="0">
<col align="left" valign="top">
<tbody>
@@ -142,7 +142,7 @@ Documentation last reviewed on 2011-04-21
</div>
<hr>
<div class="refsect2">
-<a name="idp13395984"></a><h3>Element Pads</h3>
+<a name="idp10051120"></a><h3>Element Pads</h3>
<div class="variablelist"><table border="0">
<col align="left" valign="top">
<tbody>
diff --git a/docs/plugins/html/gst-plugins-good-plugins-jackaudiosink.html b/docs/plugins/html/gst-plugins-good-plugins-jackaudiosink.html
index e6b99c8aecbf16ea444fac2dded828d90b8a0a59..1247560b35c274c26af3cf04467aecb93638a0d1 100644
--- a/docs/plugins/html/gst-plugins-good-plugins-jackaudiosink.html
+++ b/docs/plugins/html/gst-plugins-good-plugins-jackaudiosink.html
@@ -52,7 +52,7 @@
+----<a href="http://gstreamer.freedesktop.org/data/doc/gstreamer/head/gstreamer/html/GstObject.html">GstObject</a>
+----<a href="http://gstreamer.freedesktop.org/data/doc/gstreamer/head/gstreamer/html/GstElement.html">GstElement</a>
+----<a href="http://gstreamer.freedesktop.org/data/doc/gstreamer/head/gstreamer-libs/html/GstBaseSink.html">GstBaseSink</a>
- +----GstAudioBaseSink
+ +----<a href="http://gstreamer.freedesktop.org/data/doc/gstreamer/head/gst-plugins-base-libs/html/gst-plugins-base-libs-gstaudiobasesink.html#GstAudioBaseSink">GstAudioBaseSink</a>
+----GstJackAudioSink
</pre>
</div>
@@ -71,7 +71,7 @@
<div class="refsynopsisdiv">
<h2>Synopsis</h2>
<div class="refsect2">
-<a name="idp11494176"></a><h3>Element Information</h3>
+<a name="idp13848400"></a><h3>Element Information</h3>
<div class="variablelist"><table border="0">
<col align="left" valign="top">
<tbody>
@@ -94,7 +94,7 @@
</div>
<hr>
<div class="refsect2">
-<a name="idp13199184"></a><h3>Element Pads</h3>
+<a name="idp13211280"></a><h3>Element Pads</h3>
<div class="variablelist"><table border="0">
<col align="left" valign="top">
<tbody>
diff --git a/docs/plugins/html/gst-plugins-good-plugins-jackaudiosrc.html b/docs/plugins/html/gst-plugins-good-plugins-jackaudiosrc.html
index cdce9ab0acec4a03a35b4dee287614895a42b9e6..b8f085a403426a1f039cab5766d25299b307e873 100644
--- a/docs/plugins/html/gst-plugins-good-plugins-jackaudiosrc.html
+++ b/docs/plugins/html/gst-plugins-good-plugins-jackaudiosrc.html
@@ -53,7 +53,7 @@
+----<a href="http://gstreamer.freedesktop.org/data/doc/gstreamer/head/gstreamer/html/GstElement.html">GstElement</a>
+----<a href="http://gstreamer.freedesktop.org/data/doc/gstreamer/head/gstreamer-libs/html/GstBaseSrc.html">GstBaseSrc</a>
+----<a href="http://gstreamer.freedesktop.org/data/doc/gstreamer/head/gstreamer-libs/html/GstPushSrc.html">GstPushSrc</a>
- +----GstAudioBaseSrc
+ +----<a href="http://gstreamer.freedesktop.org/data/doc/gstreamer/head/gst-plugins-base-libs/html/gst-plugins-base-libs-gstaudiobasesrc.html#GstAudioBaseSrc">GstAudioBaseSrc</a>
+----GstJackAudioSrc
</pre>
</div>
@@ -72,7 +72,7 @@
<div class="refsynopsisdiv">
<h2>Synopsis</h2>
<div class="refsect2">
-<a name="idp13821568"></a><h3>Element Information</h3>
+<a name="idp14340064"></a><h3>Element Information</h3>
<div class="variablelist"><table border="0">
<col align="left" valign="top">
<tbody>
@@ -95,7 +95,7 @@
</div>
<hr>
<div class="refsect2">
-<a name="idp14604528"></a><h3>Element Pads</h3>
+<a name="idp7321280"></a><h3>Element Pads</h3>
<div class="variablelist"><table border="0">
<col align="left" valign="top">
<tbody>
diff --git a/docs/plugins/html/gst-plugins-good-plugins-jpegdec.html b/docs/plugins/html/gst-plugins-good-plugins-jpegdec.html
index 77c4fe77e40b2ca4619b300bd468d8ba14aae858..2c0e88445c82e13b2a2043dd997bedfd2c5f9099 100644
--- a/docs/plugins/html/gst-plugins-good-plugins-jpegdec.html
+++ b/docs/plugins/html/gst-plugins-good-plugins-jpegdec.html
@@ -66,7 +66,7 @@
<div class="refsynopsisdiv">
<h2>Synopsis</h2>
<div class="refsect2">
-<a name="idp11057744"></a><h3>Element Information</h3>
+<a name="idp6471584"></a><h3>Element Information</h3>
<div class="variablelist"><table border="0">
<col align="left" valign="top">
<tbody>
@@ -89,7 +89,7 @@
</div>
<hr>
<div class="refsect2">
-<a name="idp11927568"></a><h3>Element Pads</h3>
+<a name="idp15465520"></a><h3>Element Pads</h3>
<div class="variablelist"><table border="0">
<col align="left" valign="top">
<tbody>
diff --git a/docs/plugins/html/gst-plugins-good-plugins-jpegenc.html b/docs/plugins/html/gst-plugins-good-plugins-jpegenc.html
index 848af0a3ec3539947c6b960ef5c862b6c00f13e2..a0e39f5de58f3c2fbe95bd2790f2656228c0a023 100644
--- a/docs/plugins/html/gst-plugins-good-plugins-jpegenc.html
+++ b/docs/plugins/html/gst-plugins-good-plugins-jpegenc.html
@@ -74,7 +74,7 @@
<div class="refsynopsisdiv">
<h2>Synopsis</h2>
<div class="refsect2">
-<a name="idp6380416"></a><h3>Element Information</h3>
+<a name="idp10954112"></a><h3>Element Information</h3>
<div class="variablelist"><table border="0">
<col align="left" valign="top">
<tbody>
@@ -97,7 +97,7 @@
</div>
<hr>
<div class="refsect2">
-<a name="idp13799104"></a><h3>Element Pads</h3>
+<a name="idp12254656"></a><h3>Element Pads</h3>
<div class="variablelist"><table border="0">
<col align="left" valign="top">
<tbody>
diff --git a/docs/plugins/html/gst-plugins-good-plugins-level.html b/docs/plugins/html/gst-plugins-good-plugins-level.html
index 78ceaa209c1d3e3510e1ad41f779c88df5c0dbcf..f3db31cc36339fa26636d545359d61e4612bc62f 100644
--- a/docs/plugins/html/gst-plugins-good-plugins-level.html
+++ b/docs/plugins/html/gst-plugins-good-plugins-level.html
@@ -127,7 +127,7 @@ The message's structure contains these fields:
<p>
</p>
<div class="refsect2">
-<a name="idp15712800"></a><h3>Example application</h3>
+<a name="idp15820688"></a><h3>Example application</h3>
<div class="informalexample">
<table class="listing_frame" border="0" cellpadding="0" cellspacing="0">
<tbody>
@@ -401,7 +401,7 @@ The message's structure contains these fields:
<div class="refsynopsisdiv">
<h2>Synopsis</h2>
<div class="refsect2">
-<a name="idp12836656"></a><h3>Element Information</h3>
+<a name="idp14201312"></a><h3>Element Information</h3>
<div class="variablelist"><table border="0">
<col align="left" valign="top">
<tbody>
@@ -424,7 +424,7 @@ The message's structure contains these fields:
</div>
<hr>
<div class="refsect2">
-<a name="idp14086784"></a><h3>Element Pads</h3>
+<a name="idp13629760"></a><h3>Element Pads</h3>
<div class="variablelist"><table border="0">
<col align="left" valign="top">
<tbody>
diff --git a/docs/plugins/html/gst-plugins-good-plugins-matroskademux.html b/docs/plugins/html/gst-plugins-good-plugins-matroskademux.html
index bf291f60bab9cec3f58096a73a00350bf8a81ddf..2ebab7425b920f9b0bbf71728ab3dbff484c0829 100644
--- a/docs/plugins/html/gst-plugins-good-plugins-matroskademux.html
+++ b/docs/plugins/html/gst-plugins-good-plugins-matroskademux.html
@@ -68,7 +68,7 @@ matroskademux demuxes a Matroska file into the different contained streams.
<p>
</p>
<div class="refsect2">
-<a name="idp16107600"></a><h3>Example launch line</h3>
+<a name="idp14757488"></a><h3>Example launch line</h3>
<div class="informalexample">
<table class="listing_frame" border="0" cellpadding="0" cellspacing="0">
<tbody>
@@ -86,7 +86,7 @@ matroskademux demuxes a Matroska file into the different contained streams.
<div class="refsynopsisdiv">
<h2>Synopsis</h2>
<div class="refsect2">
-<a name="idp11863200"></a><h3>Element Information</h3>
+<a name="idp12345616"></a><h3>Element Information</h3>
<div class="variablelist"><table border="0">
<col align="left" valign="top">
<tbody>
@@ -109,7 +109,7 @@ matroskademux demuxes a Matroska file into the different contained streams.
</div>
<hr>
<div class="refsect2">
-<a name="idp10634736"></a><h3>Element Pads</h3>
+<a name="idp14781968"></a><h3>Element Pads</h3>
<div class="variablelist"><table border="0">
<col align="left" valign="top">
<tbody>
diff --git a/docs/plugins/html/gst-plugins-good-plugins-matroskamux.html b/docs/plugins/html/gst-plugins-good-plugins-matroskamux.html
index 04e139de66e8503edc71ce5d2b0df1547a523140..ee53bd3eeacedeb68e33640d0b1610318c64e7e2 100644
--- a/docs/plugins/html/gst-plugins-good-plugins-matroskamux.html
+++ b/docs/plugins/html/gst-plugins-good-plugins-matroskamux.html
@@ -61,7 +61,7 @@
<a name="gst-plugins-good-plugins-matroskamux.implemented-interfaces"></a><h2>Implemented Interfaces</h2>
<p>
GstMatroskaMux implements
- <a href="http://gstreamer.freedesktop.org/data/doc/gstreamer/head/gstreamer/html/GstTagSetter.html">GstTagSetter</a> and GstTocSetter.</p>
+ <a href="http://gstreamer.freedesktop.org/data/doc/gstreamer/head/gstreamer/html/GstTagSetter.html">GstTagSetter</a> and <a href="http://gstreamer.freedesktop.org/data/doc/gstreamer/head/gstreamer/html/gstreamer-GstTocSetter.html#GstTocSetter">GstTocSetter</a>.</p>
</div>
<div class="refsect1">
<a name="gst-plugins-good-plugins-matroskamux.properties"></a><h2>Properties</h2>
@@ -80,7 +80,7 @@ matroskamux muxes different input streams into a Matroska file.
<p>
</p>
<div class="refsect2">
-<a name="idp5256896"></a><h3>Example launch line</h3>
+<a name="idp15449936"></a><h3>Example launch line</h3>
<div class="informalexample">
<table class="listing_frame" border="0" cellpadding="0" cellspacing="0">
<tbody>
@@ -109,7 +109,7 @@ matroskamux muxes different input streams into a Matroska file.
<div class="refsynopsisdiv">
<h2>Synopsis</h2>
<div class="refsect2">
-<a name="idp12868448"></a><h3>Element Information</h3>
+<a name="idp15713440"></a><h3>Element Information</h3>
<div class="variablelist"><table border="0">
<col align="left" valign="top">
<tbody>
@@ -132,7 +132,7 @@ matroskamux muxes different input streams into a Matroska file.
</div>
<hr>
<div class="refsect2">
-<a name="idp9117392"></a><h3>Element Pads</h3>
+<a name="idp14706336"></a><h3>Element Pads</h3>
<div class="variablelist"><table border="0">
<col align="left" valign="top">
<tbody>
diff --git a/docs/plugins/html/gst-plugins-good-plugins-mj2mux.html b/docs/plugins/html/gst-plugins-good-plugins-mj2mux.html
index da15ab6e9afc775d3eec41704f0fce3823f61d06..372a9c9725697f0d4ffbe8800c7f9215d881b86d 100644
--- a/docs/plugins/html/gst-plugins-good-plugins-mj2mux.html
+++ b/docs/plugins/html/gst-plugins-good-plugins-mj2mux.html
@@ -133,7 +133,7 @@ presentation-timestamp.
<p>
</p>
<div class="refsect2">
-<a name="idp15754800"></a><h3>Example pipelines</h3>
+<a name="idp16227872"></a><h3>Example pipelines</h3>
<div class="informalexample">
<table class="listing_frame" border="0" cellpadding="0" cellspacing="0">
<tbody>
@@ -156,7 +156,7 @@ Documentation last reviewed on 2011-04-21
<div class="refsynopsisdiv">
<h2>Synopsis</h2>
<div class="refsect2">
-<a name="idp15758144"></a><h3>Element Information</h3>
+<a name="idp16231216"></a><h3>Element Information</h3>
<div class="variablelist"><table border="0">
<col align="left" valign="top">
<tbody>
@@ -179,7 +179,7 @@ Documentation last reviewed on 2011-04-21
</div>
<hr>
<div class="refsect2">
-<a name="idp11110672"></a><h3>Element Pads</h3>
+<a name="idp16076064"></a><h3>Element Pads</h3>
<div class="variablelist"><table border="0">
<col align="left" valign="top">
<tbody>
diff --git a/docs/plugins/html/gst-plugins-good-plugins-monoscope.html b/docs/plugins/html/gst-plugins-good-plugins-monoscope.html
index 43d09a6c68db2de2052dd819df5b01c9e459bc81..7a78b5b68f407ae0b0ced24dd58d3eeded07dc46 100644
--- a/docs/plugins/html/gst-plugins-good-plugins-monoscope.html
+++ b/docs/plugins/html/gst-plugins-good-plugins-monoscope.html
@@ -49,7 +49,7 @@ curve of the audio signal like on an oscilloscope.
<p>
</p>
<div class="refsect2">
-<a name="idp5369040"></a><h3>Example launch line</h3>
+<a name="idp14456208"></a><h3>Example launch line</h3>
<div class="informalexample">
<table class="listing_frame" border="0" cellpadding="0" cellspacing="0">
<tbody>
@@ -67,7 +67,7 @@ curve of the audio signal like on an oscilloscope.
<div class="refsynopsisdiv">
<h2>Synopsis</h2>
<div class="refsect2">
-<a name="idp6626400"></a><h3>Element Information</h3>
+<a name="idp13497744"></a><h3>Element Information</h3>
<div class="variablelist"><table border="0">
<col align="left" valign="top">
<tbody>
@@ -90,7 +90,7 @@ curve of the audio signal like on an oscilloscope.
</div>
<hr>
<div class="refsect2">
-<a name="idp6720928"></a><h3>Element Pads</h3>
+<a name="idp15224656"></a><h3>Element Pads</h3>
<div class="variablelist"><table border="0">
<col align="left" valign="top">
<tbody>
diff --git a/docs/plugins/html/gst-plugins-good-plugins-mp4mux.html b/docs/plugins/html/gst-plugins-good-plugins-mp4mux.html
index c76d4ea970740a8341b4d89f7c060929ce878092..0c88084c04a5bf6608136fa3920666057fccfcce 100644
--- a/docs/plugins/html/gst-plugins-good-plugins-mp4mux.html
+++ b/docs/plugins/html/gst-plugins-good-plugins-mp4mux.html
@@ -133,7 +133,7 @@ presentation-timestamp.
<p>
</p>
<div class="refsect2">
-<a name="idp11208816"></a><h3>Example pipelines</h3>
+<a name="idp5329152"></a><h3>Example pipelines</h3>
<div class="informalexample">
<table class="listing_frame" border="0" cellpadding="0" cellspacing="0">
<tbody>
@@ -156,7 +156,7 @@ Documentation last reviewed on 2011-04-21
<div class="refsynopsisdiv">
<h2>Synopsis</h2>
<div class="refsect2">
-<a name="idp16138016"></a><h3>Element Information</h3>
+<a name="idp16136848"></a><h3>Element Information</h3>
<div class="variablelist"><table border="0">
<col align="left" valign="top">
<tbody>
@@ -179,7 +179,7 @@ Documentation last reviewed on 2011-04-21
</div>
<hr>
<div class="refsect2">
-<a name="idp15738784"></a><h3>Element Pads</h3>
+<a name="idp13547440"></a><h3>Element Pads</h3>
<div class="variablelist"><table border="0">
<col align="left" valign="top">
<tbody>
diff --git a/docs/plugins/html/gst-plugins-good-plugins-mpegaudioparse.html b/docs/plugins/html/gst-plugins-good-plugins-mpegaudioparse.html
index 8d4f6700a941e26f57aacb8f08b98e976dbd244c..075f279bb2f99fa7ba31de678d39e84cdc753960 100644
--- a/docs/plugins/html/gst-plugins-good-plugins-mpegaudioparse.html
+++ b/docs/plugins/html/gst-plugins-good-plugins-mpegaudioparse.html
@@ -61,7 +61,7 @@ Parses and frames mpeg1 audio streams. Provides seeking.
<p>
</p>
<div class="refsect2">
-<a name="idp10750496"></a><h3>Example launch line</h3>
+<a name="idp11237264"></a><h3>Example launch line</h3>
<div class="informalexample">
<table class="listing_frame" border="0" cellpadding="0" cellspacing="0">
<tbody>
@@ -79,7 +79,7 @@ Parses and frames mpeg1 audio streams. Provides seeking.
<div class="refsynopsisdiv">
<h2>Synopsis</h2>
<div class="refsect2">
-<a name="idp13407296"></a><h3>Element Information</h3>
+<a name="idp6217696"></a><h3>Element Information</h3>
<div class="variablelist"><table border="0">
<col align="left" valign="top">
<tbody>
@@ -102,7 +102,7 @@ Parses and frames mpeg1 audio streams. Provides seeking.
</div>
<hr>
<div class="refsect2">
-<a name="idp13680528"></a><h3>Element Pads</h3>
+<a name="idp14659808"></a><h3>Element Pads</h3>
<div class="variablelist"><table border="0">
<col align="left" valign="top">
<tbody>
diff --git a/docs/plugins/html/gst-plugins-good-plugins-mulawdec.html b/docs/plugins/html/gst-plugins-good-plugins-mulawdec.html
index f807ecff4abcdfeba4c901b5830e7a5ea18c5bf6..be8ba2e6264a3aa5b07b40c0f0d69ab98d7c7fd9 100644
--- a/docs/plugins/html/gst-plugins-good-plugins-mulawdec.html
+++ b/docs/plugins/html/gst-plugins-good-plugins-mulawdec.html
@@ -60,7 +60,7 @@ This element decodes mulaw audio. Mulaw coding is also known as G.711.
<div class="refsynopsisdiv">
<h2>Synopsis</h2>
<div class="refsect2">
-<a name="idp13244144"></a><h3>Element Information</h3>
+<a name="idp15506880"></a><h3>Element Information</h3>
<div class="variablelist"><table border="0">
<col align="left" valign="top">
<tbody>
@@ -83,7 +83,7 @@ This element decodes mulaw audio. Mulaw coding is also known as G.711.
</div>
<hr>
<div class="refsect2">
-<a name="idp12116528"></a><h3>Element Pads</h3>
+<a name="idp11003504"></a><h3>Element Pads</h3>
<div class="variablelist"><table border="0">
<col align="left" valign="top">
<tbody>
diff --git a/docs/plugins/html/gst-plugins-good-plugins-mulawenc.html b/docs/plugins/html/gst-plugins-good-plugins-mulawenc.html
index 74e6d763576b2ab8b15945dc971ceb23649804e7..fbae19736f118b854f737de4eb0ba045e4cbb6f2 100644
--- a/docs/plugins/html/gst-plugins-good-plugins-mulawenc.html
+++ b/docs/plugins/html/gst-plugins-good-plugins-mulawenc.html
@@ -49,7 +49,7 @@ This element encode mulaw audio. Mulaw coding is also known as G.711.
<div class="refsynopsisdiv">
<h2>Synopsis</h2>
<div class="refsect2">
-<a name="idp8936144"></a><h3>Element Information</h3>
+<a name="idp10734560"></a><h3>Element Information</h3>
<div class="variablelist"><table border="0">
<col align="left" valign="top">
<tbody>
@@ -72,7 +72,7 @@ This element encode mulaw audio. Mulaw coding is also known as G.711.
</div>
<hr>
<div class="refsect2">
-<a name="idp8053920"></a><h3>Element Pads</h3>
+<a name="idp12655776"></a><h3>Element Pads</h3>
<div class="variablelist"><table border="0">
<col align="left" valign="top">
<tbody>
diff --git a/docs/plugins/html/gst-plugins-good-plugins-multifilesink.html b/docs/plugins/html/gst-plugins-good-plugins-multifilesink.html
index ec424dc5fa5677b4597a22035b36d974a52d1a72..f70aff423d2d1b812e81b21b4e9454922855130d 100644
--- a/docs/plugins/html/gst-plugins-good-plugins-multifilesink.html
+++ b/docs/plugins/html/gst-plugins-good-plugins-multifilesink.html
@@ -132,7 +132,7 @@ The message's structure contains these fields:
<p>
</p>
<div class="refsect2">
-<a name="idp14473728"></a><h3>Example launch line</h3>
+<a name="idp13200880"></a><h3>Example launch line</h3>
<div class="informalexample">
<table class="listing_frame" border="0" cellpadding="0" cellspacing="0">
<tbody>
@@ -155,7 +155,7 @@ Last reviewed on 2009-09-11 (0.10.17)
<div class="refsynopsisdiv">
<h2>Synopsis</h2>
<div class="refsect2">
-<a name="idp15565040"></a><h3>Element Information</h3>
+<a name="idp16612912"></a><h3>Element Information</h3>
<div class="variablelist"><table border="0">
<col align="left" valign="top">
<tbody>
@@ -178,7 +178,7 @@ Last reviewed on 2009-09-11 (0.10.17)
</div>
<hr>
<div class="refsect2">
-<a name="idp14207776"></a><h3>Element Pads</h3>
+<a name="idp16730464"></a><h3>Element Pads</h3>
<div class="variablelist"><table border="0">
<col align="left" valign="top">
<tbody>
diff --git a/docs/plugins/html/gst-plugins-good-plugins-multifilesrc.html b/docs/plugins/html/gst-plugins-good-plugins-multifilesrc.html
index 41489d850109fcb94de0188377c0818394a26664..b5a9d222408dae27d47d856f6258594e6043d358 100644
--- a/docs/plugins/html/gst-plugins-good-plugins-multifilesrc.html
+++ b/docs/plugins/html/gst-plugins-good-plugins-multifilesrc.html
@@ -81,7 +81,7 @@ File names are created by replacing "%d" with the index using <code class="funct
<p>
</p>
<div class="refsect2">
-<a name="idp13591632"></a><h3>Example launch line</h3>
+<a name="idp16235120"></a><h3>Example launch line</h3>
<div class="informalexample">
<table class="listing_frame" border="0" cellpadding="0" cellspacing="0">
<tbody>
@@ -104,7 +104,7 @@ files named img.0000.png, img.0001.png, etc.
<div class="refsynopsisdiv">
<h2>Synopsis</h2>
<div class="refsect2">
-<a name="idp9376400"></a><h3>Element Information</h3>
+<a name="idp13479456"></a><h3>Element Information</h3>
<div class="variablelist"><table border="0">
<col align="left" valign="top">
<tbody>
@@ -127,7 +127,7 @@ files named img.0000.png, img.0001.png, etc.
</div>
<hr>
<div class="refsect2">
-<a name="idp15502032"></a><h3>Element Pads</h3>
+<a name="idp15940160"></a><h3>Element Pads</h3>
<div class="variablelist"><table border="0">
<col align="left" valign="top">
<tbody>
diff --git a/docs/plugins/html/gst-plugins-good-plugins-multipartdemux.html b/docs/plugins/html/gst-plugins-good-plugins-multipartdemux.html
index f103f1cd6af3afa653d5323ca9e3413b432a625a..127a526a868381330119c3d60c16f0108ec57d6f 100644
--- a/docs/plugins/html/gst-plugins-good-plugins-multipartdemux.html
+++ b/docs/plugins/html/gst-plugins-good-plugins-multipartdemux.html
@@ -83,7 +83,7 @@ otherwise it will be autodetected.
<p>
</p>
<div class="refsect2">
-<a name="idp7148944"></a><h3>Sample pipelines</h3>
+<a name="idp15142160"></a><h3>Sample pipelines</h3>
<div class="informalexample">
<table class="listing_frame" border="0" cellpadding="0" cellspacing="0">
<tbody>
@@ -102,7 +102,7 @@ containing JPEG frames.
<div class="refsynopsisdiv">
<h2>Synopsis</h2>
<div class="refsect2">
-<a name="idp13040640"></a><h3>Element Information</h3>
+<a name="idp14411344"></a><h3>Element Information</h3>
<div class="variablelist"><table border="0">
<col align="left" valign="top">
<tbody>
@@ -125,7 +125,7 @@ containing JPEG frames.
</div>
<hr>
<div class="refsect2">
-<a name="idp14664544"></a><h3>Element Pads</h3>
+<a name="idp7772000"></a><h3>Element Pads</h3>
<div class="variablelist"><table border="0">
<col align="left" valign="top">
<tbody>
diff --git a/docs/plugins/html/gst-plugins-good-plugins-multipartmux.html b/docs/plugins/html/gst-plugins-good-plugins-multipartmux.html
index 72cf91b592a38b7307528a6756a13db3f9d9b3f3..33752539c26485f26f01acb8297928f766b7eeae 100644
--- a/docs/plugins/html/gst-plugins-good-plugins-multipartmux.html
+++ b/docs/plugins/html/gst-plugins-good-plugins-multipartmux.html
@@ -70,7 +70,7 @@ multipart streams are sequential JPEG frames.
<p>
</p>
<div class="refsect2">
-<a name="idp11873552"></a><h3>Sample pipelines</h3>
+<a name="idp14421168"></a><h3>Sample pipelines</h3>
<div class="informalexample">
<table class="listing_frame" border="0" cellpadding="0" cellspacing="0">
<tbody>
@@ -89,7 +89,7 @@ stored to a file.
<div class="refsynopsisdiv">
<h2>Synopsis</h2>
<div class="refsect2">
-<a name="idp10302384"></a><h3>Element Information</h3>
+<a name="idp5602048"></a><h3>Element Information</h3>
<div class="variablelist"><table border="0">
<col align="left" valign="top">
<tbody>
@@ -112,7 +112,7 @@ stored to a file.
</div>
<hr>
<div class="refsect2">
-<a name="idp11784064"></a><h3>Element Pads</h3>
+<a name="idp15429392"></a><h3>Element Pads</h3>
<div class="variablelist"><table border="0">
<col align="left" valign="top">
<tbody>
diff --git a/docs/plugins/html/gst-plugins-good-plugins-multiudpsink.html b/docs/plugins/html/gst-plugins-good-plugins-multiudpsink.html
index e797d0c7b2649538f063d500c8c8197258a51677..e3bbb5aaab1c496320b53c7ba9a2da128b215404 100644
--- a/docs/plugins/html/gst-plugins-good-plugins-multiudpsink.html
+++ b/docs/plugins/html/gst-plugins-good-plugins-multiudpsink.html
@@ -100,7 +100,7 @@ It can be combined with rtp payload encoders to implement RTP streaming.
<div class="refsynopsisdiv">
<h2>Synopsis</h2>
<div class="refsect2">
-<a name="idp14356256"></a><h3>Element Information</h3>
+<a name="idp14505456"></a><h3>Element Information</h3>
<div class="variablelist"><table border="0">
<col align="left" valign="top">
<tbody>
@@ -123,7 +123,7 @@ It can be combined with rtp payload encoders to implement RTP streaming.
</div>
<hr>
<div class="refsect2">
-<a name="idp15865152"></a><h3>Element Pads</h3>
+<a name="idp15816512"></a><h3>Element Pads</h3>
<div class="variablelist"><table border="0">
<col align="left" valign="top">
<tbody>
diff --git a/docs/plugins/html/gst-plugins-good-plugins-optv.html b/docs/plugins/html/gst-plugins-good-plugins-optv.html
index 5e1e3ca335f2395772763aa1aaab738f5d13433e..35774bf5c63dc7d95cc6fe269972cc51963fa4ef 100644
--- a/docs/plugins/html/gst-plugins-good-plugins-optv.html
+++ b/docs/plugins/html/gst-plugins-good-plugins-optv.html
@@ -7,7 +7,7 @@
<link rel="home" href="index.html" title="GStreamer Good Plugins 1.0 Plugins Reference Manual">
<link rel="up" href="ch01.html" title="gst-plugins-good Elements">
<link rel="prev" href="gst-plugins-good-plugins-multiudpsink.html" title="multiudpsink">
-<link rel="next" href="gst-plugins-good-plugins-oss4mixer.html" title="oss4mixer">
+<link rel="next" href="gst-plugins-good-plugins-oss4sink.html" title="oss4sink">
<meta name="generator" content="GTK-Doc V1.18 (XML mode)">
<link rel="stylesheet" href="style.css" type="text/css">
</head>
@@ -18,7 +18,7 @@
<td><a accesskey="u" href="ch01.html"><img src="up.png" width="24" height="24" border="0" alt="Up"></a></td>
<td><a accesskey="h" href="index.html"><img src="home.png" width="24" height="24" border="0" alt="Home"></a></td>
<th width="100%" align="center">GStreamer Good Plugins 1.0 Plugins Reference Manual</th>
-<td><a accesskey="n" href="gst-plugins-good-plugins-oss4mixer.html"><img src="right.png" width="24" height="24" border="0" alt="Next"></a></td>
+<td><a accesskey="n" href="gst-plugins-good-plugins-oss4sink.html"><img src="right.png" width="24" height="24" border="0" alt="Next"></a></td>
</tr>
<tr><td colspan="5" class="shortcuts">
<a href="#gst-plugins-good-plugins-optv.synopsis" class="shortcut">Top</a>
@@ -74,7 +74,7 @@ various optical pattern.
<p>
</p>
<div class="refsect2">
-<a name="idp14867088"></a><h3>Example launch line</h3>
+<a name="idp15002736"></a><h3>Example launch line</h3>
<div class="informalexample">
<table class="listing_frame" border="0" cellpadding="0" cellspacing="0">
<tbody>
@@ -92,7 +92,7 @@ various optical pattern.
<div class="refsynopsisdiv">
<h2>Synopsis</h2>
<div class="refsect2">
-<a name="idp10483840"></a><h3>Element Information</h3>
+<a name="idp13362336"></a><h3>Element Information</h3>
<div class="variablelist"><table border="0">
<col align="left" valign="top">
<tbody>
@@ -115,7 +115,7 @@ various optical pattern.
</div>
<hr>
<div class="refsect2">
-<a name="idp14992928"></a><h3>Element Pads</h3>
+<a name="idp11497760"></a><h3>Element Pads</h3>
<div class="variablelist"><table border="0">
<col align="left" valign="top">
<tbody>
diff --git a/docs/plugins/html/gst-plugins-good-plugins-oss4mixer.html b/docs/plugins/html/gst-plugins-good-plugins-oss4mixer.html
deleted file mode 100644
index 8354e241ed15578810e73f62f5c4ae9bc8d3a69c..0000000000000000000000000000000000000000
--- a/docs/plugins/html/gst-plugins-good-plugins-oss4mixer.html
+++ /dev/null
@@ -1,127 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
-<html>
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-<title>oss4mixer</title>
-<meta name="generator" content="DocBook XSL Stylesheets V1.76.1">
-<link rel="home" href="index.html" title="GStreamer Good Plugins 1.0 Plugins Reference Manual">
-<link rel="up" href="ch01.html" title="gst-plugins-good Elements">
-<link rel="prev" href="gst-plugins-good-plugins-optv.html" title="optv">
-<link rel="next" href="gst-plugins-good-plugins-oss4sink.html" title="oss4sink">
-<meta name="generator" content="GTK-Doc V1.18 (XML mode)">
-<link rel="stylesheet" href="style.css" type="text/css">
-</head>
-<body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
-<table class="navigation" id="top" width="100%" summary="Navigation header" cellpadding="2" cellspacing="2">
-<tr valign="middle">
-<td><a accesskey="p" href="gst-plugins-good-plugins-optv.html"><img src="left.png" width="24" height="24" border="0" alt="Prev"></a></td>
-<td><a accesskey="u" href="ch01.html"><img src="up.png" width="24" height="24" border="0" alt="Up"></a></td>
-<td><a accesskey="h" href="index.html"><img src="home.png" width="24" height="24" border="0" alt="Home"></a></td>
-<th width="100%" align="center">GStreamer Good Plugins 1.0 Plugins Reference Manual</th>
-<td><a accesskey="n" href="gst-plugins-good-plugins-oss4sink.html"><img src="right.png" width="24" height="24" border="0" alt="Next"></a></td>
-</tr>
-<tr><td colspan="5" class="shortcuts">
-<a href="#gst-plugins-good-plugins-oss4mixer.synopsis" class="shortcut">Top</a>
- Â |Â
- <a href="#gst-plugins-good-plugins-oss4mixer.description" class="shortcut">Description</a>
- Â |Â
- <a href="#gst-plugins-good-plugins-oss4mixer.implemented-interfaces" class="shortcut">Implemented Interfaces</a>
- Â |Â
- <a href="#gst-plugins-good-plugins-oss4mixer.properties" class="shortcut">Properties</a>
-</td></tr>
-</table>
-<div class="refentry">
-<a name="gst-plugins-good-plugins-oss4mixer"></a><div class="titlepage"></div>
-<div class="refnamediv"><table width="100%"><tr>
-<td valign="top">
-<h2><span class="refentrytitle"><a name="gst-plugins-good-plugins-oss4mixer.top_of_page"></a>oss4mixer</span></h2>
-<p>oss4mixer — Control sound input and output levels with OSS4</p>
-</td>
-<td valign="top" align="right"></td>
-</tr></table></div>
-<div class="refsynopsisdiv">
-<a name="gst-plugins-good-plugins-oss4mixer.synopsis"></a><h2>Synopsis</h2>
-<pre class="synopsis">struct <a class="link" href="gst-plugins-good-plugins-oss4mixer.html#GstOss4Mixer" title="struct GstOss4Mixer">GstOss4Mixer</a>;
-</pre>
-</div>
-<div class="refsect1">
-<a name="gst-plugins-good-plugins-oss4mixer.implemented-interfaces"></a><h2>Implemented Interfaces</h2>
-<p>
-GstOss4Mixer implements
- <a href="http://gstreamer.freedesktop.org/data/doc/gstreamer/head/gstreamer/html/GstImplementsInterface.html">GstImplementsInterface</a>, <a href="http://gstreamer.freedesktop.org/data/doc/gstreamer/head/gst-plugins-base-libs/html/gst-plugins-base-libs-gstmixer.html#GstMixer">GstMixer</a> and <a href="http://gstreamer.freedesktop.org/data/doc/gstreamer/head/gst-plugins-base-libs/html/gst-plugins-base-libs-gstpropertyprobe.html#GstPropertyProbe">GstPropertyProbe</a>.</p>
-</div>
-<div class="refsect1">
-<a name="gst-plugins-good-plugins-oss4mixer.properties"></a><h2>Properties</h2>
-<pre class="synopsis">
- "<a class="link" href="gst-plugins-good-plugins-oss4mixer.html#GstOss4Mixer--device" title='The "device" property'>device</a>" <a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gchar"><span class="type">gchar</span></a>* : Read / Write
- "<a class="link" href="gst-plugins-good-plugins-oss4mixer.html#GstOss4Mixer--device-name" title='The "device-name" property'>device-name</a>" <a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gchar"><span class="type">gchar</span></a>* : Read
-</pre>
-</div>
-<div class="refsect1">
-<a name="gst-plugins-good-plugins-oss4mixer.description"></a><h2>Description</h2>
-<div class="refsynopsisdiv">
-<h2>Synopsis</h2>
-<div class="refsect2">
-<a name="idp13001632"></a><h3>Element Information</h3>
-<div class="variablelist"><table border="0">
-<col align="left" valign="top">
-<tbody>
-<tr>
-<td><p><span class="term">plugin</span></p></td>
-<td>
- <a class="link" href="gst-plugins-good-plugins-plugin-oss4.html#plugin-oss4">oss4</a>
- </td>
-</tr>
-<tr>
-<td><p><span class="term">author</span></p></td>
-<td>Tim-Philipp Müller <tim centricular net></td>
-</tr>
-<tr>
-<td><p><span class="term">class</span></p></td>
-<td>Generic/Audio</td>
-</tr>
-</tbody>
-</table></div>
-</div>
-<hr>
-<div class="refsect2">
-<a name="idp17410032"></a><h3>Element Pads</h3>
-</div>
-</div>
-<p>
-</p>
-</div>
-<div class="refsect1">
-<a name="gst-plugins-good-plugins-oss4mixer.details"></a><h2>Details</h2>
-<div class="refsect2">
-<a name="GstOss4Mixer"></a><h3>struct GstOss4Mixer</h3>
-<pre class="programlisting">struct GstOss4Mixer {
- GstElement element;
-};
-</pre>
-<p>
-</p>
-</div>
-</div>
-<div class="refsect1">
-<a name="gst-plugins-good-plugins-oss4mixer.property-details"></a><h2>Property Details</h2>
-<div class="refsect2">
-<a name="GstOss4Mixer--device"></a><h3>The <code class="literal">"device"</code> property</h3>
-<pre class="programlisting"> "device" <a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gchar"><span class="type">gchar</span></a>* : Read / Write</pre>
-<p>OSS mixer device (e.g. /dev/oss/hdaudio0/mix0 or /dev/mixerN) (NULL = use first mixer device found).</p>
-<p>Default value: NULL</p>
-</div>
-<hr>
-<div class="refsect2">
-<a name="GstOss4Mixer--device-name"></a><h3>The <code class="literal">"device-name"</code> property</h3>
-<pre class="programlisting"> "device-name" <a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gchar"><span class="type">gchar</span></a>* : Read</pre>
-<p>Human-readable name of the sound device.</p>
-<p>Default value: NULL</p>
-</div>
-</div>
-</div>
-<div class="footer">
-<hr>
- Generated by GTK-Doc V1.18</div>
-</body>
-</html>
\ No newline at end of file
diff --git a/docs/plugins/html/gst-plugins-good-plugins-oss4sink.html b/docs/plugins/html/gst-plugins-good-plugins-oss4sink.html
index a6440f21f4ebb2753d43165e5ed4de18c1aabe6c..f179ba3fb60c537a6136c8cc1899f3d388fed232 100644
--- a/docs/plugins/html/gst-plugins-good-plugins-oss4sink.html
+++ b/docs/plugins/html/gst-plugins-good-plugins-oss4sink.html
@@ -6,7 +6,7 @@
<meta name="generator" content="DocBook XSL Stylesheets V1.76.1">
<link rel="home" href="index.html" title="GStreamer Good Plugins 1.0 Plugins Reference Manual">
<link rel="up" href="ch01.html" title="gst-plugins-good Elements">
-<link rel="prev" href="gst-plugins-good-plugins-oss4mixer.html" title="oss4mixer">
+<link rel="prev" href="gst-plugins-good-plugins-optv.html" title="optv">
<link rel="next" href="gst-plugins-good-plugins-oss4src.html" title="oss4src">
<meta name="generator" content="GTK-Doc V1.18 (XML mode)">
<link rel="stylesheet" href="style.css" type="text/css">
@@ -14,7 +14,7 @@
<body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
<table class="navigation" id="top" width="100%" summary="Navigation header" cellpadding="2" cellspacing="2">
<tr valign="middle">
-<td><a accesskey="p" href="gst-plugins-good-plugins-oss4mixer.html"><img src="left.png" width="24" height="24" border="0" alt="Prev"></a></td>
+<td><a accesskey="p" href="gst-plugins-good-plugins-optv.html"><img src="left.png" width="24" height="24" border="0" alt="Prev"></a></td>
<td><a accesskey="u" href="ch01.html"><img src="up.png" width="24" height="24" border="0" alt="Up"></a></td>
<td><a accesskey="h" href="index.html"><img src="home.png" width="24" height="24" border="0" alt="Home"></a></td>
<th width="100%" align="center">GStreamer Good Plugins 1.0 Plugins Reference Manual</th>
@@ -64,7 +64,7 @@ GstOss4Sink implements
<div class="refsynopsisdiv">
<h2>Synopsis</h2>
<div class="refsect2">
-<a name="idp13682496"></a><h3>Element Information</h3>
+<a name="idp8117088"></a><h3>Element Information</h3>
<div class="variablelist"><table border="0">
<col align="left" valign="top">
<tbody>
@@ -87,7 +87,7 @@ GstOss4Sink implements
</div>
<hr>
<div class="refsect2">
-<a name="idp17088432"></a><h3>Element Pads</h3>
+<a name="idp14692912"></a><h3>Element Pads</h3>
<div class="variablelist"><table border="0">
<col align="left" valign="top">
<tbody>
@@ -153,8 +153,6 @@ GstOss4Sink implements
gint mute_volume;
GstCaps * probed_caps;
-
- GList * property_probe_list;
};
</pre>
<p>
diff --git a/docs/plugins/html/gst-plugins-good-plugins-oss4src.html b/docs/plugins/html/gst-plugins-good-plugins-oss4src.html
index e411c567a9cc256f724140bea505fc69bf12b9df..c78636dcd052f9a5880e3adf7c4fe66a48e9f67c 100644
--- a/docs/plugins/html/gst-plugins-good-plugins-oss4src.html
+++ b/docs/plugins/html/gst-plugins-good-plugins-oss4src.html
@@ -7,7 +7,7 @@
<link rel="home" href="index.html" title="GStreamer Good Plugins 1.0 Plugins Reference Manual">
<link rel="up" href="ch01.html" title="gst-plugins-good Elements">
<link rel="prev" href="gst-plugins-good-plugins-oss4sink.html" title="oss4sink">
-<link rel="next" href="gst-plugins-good-plugins-ossmixer.html" title="ossmixer">
+<link rel="next" href="gst-plugins-good-plugins-osssink.html" title="osssink">
<meta name="generator" content="GTK-Doc V1.18 (XML mode)">
<link rel="stylesheet" href="style.css" type="text/css">
</head>
@@ -18,7 +18,7 @@
<td><a accesskey="u" href="ch01.html"><img src="up.png" width="24" height="24" border="0" alt="Up"></a></td>
<td><a accesskey="h" href="index.html"><img src="home.png" width="24" height="24" border="0" alt="Home"></a></td>
<th width="100%" align="center">GStreamer Good Plugins 1.0 Plugins Reference Manual</th>
-<td><a accesskey="n" href="gst-plugins-good-plugins-ossmixer.html"><img src="right.png" width="24" height="24" border="0" alt="Next"></a></td>
+<td><a accesskey="n" href="gst-plugins-good-plugins-osssink.html"><img src="right.png" width="24" height="24" border="0" alt="Next"></a></td>
</tr>
<tr><td colspan="5" class="shortcuts">
<a href="#gst-plugins-good-plugins-oss4src.synopsis" class="shortcut">Top</a>
@@ -62,7 +62,7 @@ GstOss4Source implements
<div class="refsynopsisdiv">
<h2>Synopsis</h2>
<div class="refsect2">
-<a name="idp8104880"></a><h3>Element Information</h3>
+<a name="idp11797904"></a><h3>Element Information</h3>
<div class="variablelist"><table border="0">
<col align="left" valign="top">
<tbody>
@@ -85,7 +85,7 @@ GstOss4Source implements
</div>
<hr>
<div class="refsect2">
-<a name="idp16561184"></a><h3>Element Pads</h3>
+<a name="idp8055664"></a><h3>Element Pads</h3>
<div class="variablelist"><table border="0">
<col align="left" valign="top">
<tbody>
@@ -150,13 +150,6 @@ GstOss4Source implements
gint bytes_per_sample;
GstCaps * probed_caps;
-
- /* property probe interface */
- GList * property_probe_list;
-
- /* mixer interface */
- GList * tracks;
- gboolean tracks_static; /* FALSE if the list of inputs may change */
};
</pre>
<p>
diff --git a/docs/plugins/html/gst-plugins-good-plugins-ossmixer.html b/docs/plugins/html/gst-plugins-good-plugins-ossmixer.html
deleted file mode 100644
index 39ee18ec2b3f97d01583d74159e10db9c4933153..0000000000000000000000000000000000000000
--- a/docs/plugins/html/gst-plugins-good-plugins-ossmixer.html
+++ /dev/null
@@ -1,130 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
-<html>
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-<title>ossmixer</title>
-<meta name="generator" content="DocBook XSL Stylesheets V1.76.1">
-<link rel="home" href="index.html" title="GStreamer Good Plugins 1.0 Plugins Reference Manual">
-<link rel="up" href="ch01.html" title="gst-plugins-good Elements">
-<link rel="prev" href="gst-plugins-good-plugins-oss4src.html" title="oss4src">
-<link rel="next" href="gst-plugins-good-plugins-osssink.html" title="osssink">
-<meta name="generator" content="GTK-Doc V1.18 (XML mode)">
-<link rel="stylesheet" href="style.css" type="text/css">
-</head>
-<body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
-<table class="navigation" id="top" width="100%" summary="Navigation header" cellpadding="2" cellspacing="2">
-<tr valign="middle">
-<td><a accesskey="p" href="gst-plugins-good-plugins-oss4src.html"><img src="left.png" width="24" height="24" border="0" alt="Prev"></a></td>
-<td><a accesskey="u" href="ch01.html"><img src="up.png" width="24" height="24" border="0" alt="Up"></a></td>
-<td><a accesskey="h" href="index.html"><img src="home.png" width="24" height="24" border="0" alt="Home"></a></td>
-<th width="100%" align="center">GStreamer Good Plugins 1.0 Plugins Reference Manual</th>
-<td><a accesskey="n" href="gst-plugins-good-plugins-osssink.html"><img src="right.png" width="24" height="24" border="0" alt="Next"></a></td>
-</tr>
-<tr><td colspan="5" class="shortcuts">
-<a href="#gst-plugins-good-plugins-ossmixer.synopsis" class="shortcut">Top</a>
- Â |Â
- <a href="#gst-plugins-good-plugins-ossmixer.description" class="shortcut">Description</a>
- Â |Â
- <a href="#gst-plugins-good-plugins-ossmixer.implemented-interfaces" class="shortcut">Implemented Interfaces</a>
- Â |Â
- <a href="#gst-plugins-good-plugins-ossmixer.properties" class="shortcut">Properties</a>
-</td></tr>
-</table>
-<div class="refentry">
-<a name="gst-plugins-good-plugins-ossmixer"></a><div class="titlepage"></div>
-<div class="refnamediv"><table width="100%"><tr>
-<td valign="top">
-<h2><span class="refentrytitle"><a name="gst-plugins-good-plugins-ossmixer.top_of_page"></a>ossmixer</span></h2>
-<p>ossmixer — Control sound input and output levels with OSS</p>
-</td>
-<td valign="top" align="right"></td>
-</tr></table></div>
-<div class="refsynopsisdiv">
-<a name="gst-plugins-good-plugins-ossmixer.synopsis"></a><h2>Synopsis</h2>
-<pre class="synopsis">struct <a class="link" href="gst-plugins-good-plugins-ossmixer.html#GstOssMixerElement" title="struct GstOssMixerElement">GstOssMixerElement</a>;
-</pre>
-</div>
-<div class="refsect1">
-<a name="gst-plugins-good-plugins-ossmixer.implemented-interfaces"></a><h2>Implemented Interfaces</h2>
-<p>
-GstOssMixerElement implements
- <a href="http://gstreamer.freedesktop.org/data/doc/gstreamer/head/gstreamer/html/GstImplementsInterface.html">GstImplementsInterface</a> and <a href="http://gstreamer.freedesktop.org/data/doc/gstreamer/head/gst-plugins-base-libs/html/gst-plugins-base-libs-gstmixer.html#GstMixer">GstMixer</a>.</p>
-</div>
-<div class="refsect1">
-<a name="gst-plugins-good-plugins-ossmixer.properties"></a><h2>Properties</h2>
-<pre class="synopsis">
- "<a class="link" href="gst-plugins-good-plugins-ossmixer.html#GstOssMixerElement--device-name" title='The "device-name" property'>device-name</a>" <a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gchar"><span class="type">gchar</span></a>* : Read
- "<a class="link" href="gst-plugins-good-plugins-ossmixer.html#GstOssMixerElement--device" title='The "device" property'>device</a>" <a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gchar"><span class="type">gchar</span></a>* : Read / Write
-</pre>
-</div>
-<div class="refsect1">
-<a name="gst-plugins-good-plugins-ossmixer.description"></a><h2>Description</h2>
-<div class="refsynopsisdiv">
-<h2>Synopsis</h2>
-<div class="refsect2">
-<a name="idp16705424"></a><h3>Element Information</h3>
-<div class="variablelist"><table border="0">
-<col align="left" valign="top">
-<tbody>
-<tr>
-<td><p><span class="term">plugin</span></p></td>
-<td>
- <a class="link" href="gst-plugins-good-plugins-plugin-ossaudio.html#plugin-ossaudio">ossaudio</a>
- </td>
-</tr>
-<tr>
-<td><p><span class="term">author</span></p></td>
-<td>Andrew Vander Wingo <wingo@pobox.com></td>
-</tr>
-<tr>
-<td><p><span class="term">class</span></p></td>
-<td>Generic/Audio</td>
-</tr>
-</tbody>
-</table></div>
-</div>
-<hr>
-<div class="refsect2">
-<a name="idp14909488"></a><h3>Element Pads</h3>
-</div>
-</div>
-<p>
-</p>
-</div>
-<div class="refsect1">
-<a name="gst-plugins-good-plugins-ossmixer.details"></a><h2>Details</h2>
-<div class="refsect2">
-<a name="GstOssMixerElement"></a><h3>struct GstOssMixerElement</h3>
-<pre class="programlisting">struct GstOssMixerElement {
- GstElement parent;
-
- gchar *device;
- GstOssMixer *mixer;
-};
-</pre>
-<p>
-</p>
-</div>
-</div>
-<div class="refsect1">
-<a name="gst-plugins-good-plugins-ossmixer.property-details"></a><h2>Property Details</h2>
-<div class="refsect2">
-<a name="GstOssMixerElement--device-name"></a><h3>The <code class="literal">"device-name"</code> property</h3>
-<pre class="programlisting"> "device-name" <a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gchar"><span class="type">gchar</span></a>* : Read</pre>
-<p>Human-readable name of the sound device.</p>
-<p>Default value: NULL</p>
-</div>
-<hr>
-<div class="refsect2">
-<a name="GstOssMixerElement--device"></a><h3>The <code class="literal">"device"</code> property</h3>
-<pre class="programlisting"> "device" <a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gchar"><span class="type">gchar</span></a>* : Read / Write</pre>
-<p>OSS mixer device (usually /dev/mixer).</p>
-<p>Default value: "/dev/mixer"</p>
-</div>
-</div>
-</div>
-<div class="footer">
-<hr>
- Generated by GTK-Doc V1.18</div>
-</body>
-</html>
\ No newline at end of file
diff --git a/docs/plugins/html/gst-plugins-good-plugins-osssink.html b/docs/plugins/html/gst-plugins-good-plugins-osssink.html
index 13973aac4564780872abaededf1e9e7e505c5551..e7e97552ea8d9d000c46bce4b70d3e38582409a0 100644
--- a/docs/plugins/html/gst-plugins-good-plugins-osssink.html
+++ b/docs/plugins/html/gst-plugins-good-plugins-osssink.html
@@ -6,7 +6,7 @@
<meta name="generator" content="DocBook XSL Stylesheets V1.76.1">
<link rel="home" href="index.html" title="GStreamer Good Plugins 1.0 Plugins Reference Manual">
<link rel="up" href="ch01.html" title="gst-plugins-good Elements">
-<link rel="prev" href="gst-plugins-good-plugins-ossmixer.html" title="ossmixer">
+<link rel="prev" href="gst-plugins-good-plugins-oss4src.html" title="oss4src">
<link rel="next" href="gst-plugins-good-plugins-osssrc.html" title="osssrc">
<meta name="generator" content="GTK-Doc V1.18 (XML mode)">
<link rel="stylesheet" href="style.css" type="text/css">
@@ -14,7 +14,7 @@
<body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
<table class="navigation" id="top" width="100%" summary="Navigation header" cellpadding="2" cellspacing="2">
<tr valign="middle">
-<td><a accesskey="p" href="gst-plugins-good-plugins-ossmixer.html"><img src="left.png" width="24" height="24" border="0" alt="Prev"></a></td>
+<td><a accesskey="p" href="gst-plugins-good-plugins-oss4src.html"><img src="left.png" width="24" height="24" border="0" alt="Prev"></a></td>
<td><a accesskey="u" href="ch01.html"><img src="up.png" width="24" height="24" border="0" alt="Up"></a></td>
<td><a accesskey="h" href="index.html"><img src="home.png" width="24" height="24" border="0" alt="Home"></a></td>
<th width="100%" align="center">GStreamer Good Plugins 1.0 Plugins Reference Manual</th>
@@ -53,7 +53,7 @@
<div class="refsynopsisdiv">
<h2>Synopsis</h2>
<div class="refsect2">
-<a name="idp16899776"></a><h3>Element Information</h3>
+<a name="idp13056000"></a><h3>Element Information</h3>
<div class="variablelist"><table border="0">
<col align="left" valign="top">
<tbody>
@@ -76,7 +76,7 @@
</div>
<hr>
<div class="refsect2">
-<a name="idp15990432"></a><h3>Element Pads</h3>
+<a name="idp17481680"></a><h3>Element Pads</h3>
<div class="variablelist"><table border="0">
<col align="left" valign="top">
<tbody>
diff --git a/docs/plugins/html/gst-plugins-good-plugins-osssrc.html b/docs/plugins/html/gst-plugins-good-plugins-osssrc.html
index 93400e50f3d1b761c5a54abec4740139e6404e18..cd70ff3daf8affd0625d16aec1ebf49ed5f1e726 100644
--- a/docs/plugins/html/gst-plugins-good-plugins-osssrc.html
+++ b/docs/plugins/html/gst-plugins-good-plugins-osssrc.html
@@ -62,7 +62,7 @@ GstOssSrc implements
<div class="refsynopsisdiv">
<h2>Synopsis</h2>
<div class="refsect2">
-<a name="idp13825120"></a><h3>Element Information</h3>
+<a name="idp12812400"></a><h3>Element Information</h3>
<div class="variablelist"><table border="0">
<col align="left" valign="top">
<tbody>
@@ -85,7 +85,7 @@ GstOssSrc implements
</div>
<hr>
<div class="refsect2">
-<a name="idp16494896"></a><h3>Element Pads</h3>
+<a name="idp17962560"></a><h3>Element Pads</h3>
<div class="variablelist"><table border="0">
<col align="left" valign="top">
<tbody>
@@ -130,8 +130,6 @@ GstOssSrc implements
gchar *device_name;
GstCaps *probed_caps;
-
- GstOssMixer *mixer;
};
</pre>
<p>
diff --git a/docs/plugins/html/gst-plugins-good-plugins-osxaudiosink.html b/docs/plugins/html/gst-plugins-good-plugins-osxaudiosink.html
index 9fb17d9984a055bef62bffc18fa6d190913e5808..0ec4c21967c8716c4f4c81db7553072f9c6611c5 100644
--- a/docs/plugins/html/gst-plugins-good-plugins-osxaudiosink.html
+++ b/docs/plugins/html/gst-plugins-good-plugins-osxaudiosink.html
@@ -53,7 +53,7 @@
<div class="refsynopsisdiv">
<h2>Synopsis</h2>
<div class="refsect2">
-<a name="idp14471904"></a><h3>Element Information</h3>
+<a name="idp14807232"></a><h3>Element Information</h3>
<div class="variablelist"><table border="0">
<col align="left" valign="top">
<tbody>
@@ -76,7 +76,7 @@
</div>
<hr>
<div class="refsect2">
-<a name="idp12538752"></a><h3>Element Pads</h3>
+<a name="idp15043200"></a><h3>Element Pads</h3>
</div>
</div>
<p>
diff --git a/docs/plugins/html/gst-plugins-good-plugins-osxaudiosrc.html b/docs/plugins/html/gst-plugins-good-plugins-osxaudiosrc.html
index 848478a899cd61a3772088655d27718af5d894ee..7f9d317021cfdc08f32df66fdbea289f2412936c 100644
--- a/docs/plugins/html/gst-plugins-good-plugins-osxaudiosrc.html
+++ b/docs/plugins/html/gst-plugins-good-plugins-osxaudiosrc.html
@@ -53,7 +53,7 @@
<div class="refsynopsisdiv">
<h2>Synopsis</h2>
<div class="refsect2">
-<a name="idp14259728"></a><h3>Element Information</h3>
+<a name="idp17002976"></a><h3>Element Information</h3>
<div class="variablelist"><table border="0">
<col align="left" valign="top">
<tbody>
@@ -76,7 +76,7 @@
</div>
<hr>
<div class="refsect2">
-<a name="idp15763312"></a><h3>Element Pads</h3>
+<a name="idp11916176"></a><h3>Element Pads</h3>
</div>
</div>
<p>
diff --git a/docs/plugins/html/gst-plugins-good-plugins-osxvideosink.html b/docs/plugins/html/gst-plugins-good-plugins-osxvideosink.html
index 759042a50a32a5fb6cdf89d181c687cc37748169..9536e1c9d377b10727ab95829faef855413f17b8 100644
--- a/docs/plugins/html/gst-plugins-good-plugins-osxvideosink.html
+++ b/docs/plugins/html/gst-plugins-good-plugins-osxvideosink.html
@@ -54,7 +54,7 @@
<div class="refsynopsisdiv">
<h2>Synopsis</h2>
<div class="refsect2">
-<a name="idp6419984"></a><h3>Element Information</h3>
+<a name="idp14177904"></a><h3>Element Information</h3>
<div class="variablelist"><table border="0">
<col align="left" valign="top">
<tbody>
@@ -77,7 +77,7 @@
</div>
<hr>
<div class="refsect2">
-<a name="idp10726304"></a><h3>Element Pads</h3>
+<a name="idp16961024"></a><h3>Element Pads</h3>
</div>
</div>
<p>
diff --git a/docs/plugins/html/gst-plugins-good-plugins-plugin-1394.html b/docs/plugins/html/gst-plugins-good-plugins-plugin-1394.html
index ec6eb58b4161ed13d9b3f474631cf79032f4c840..574d79bd274d7829d90c953607dd347ddedab61b 100644
--- a/docs/plugins/html/gst-plugins-good-plugins-plugin-1394.html
+++ b/docs/plugins/html/gst-plugins-good-plugins-plugin-1394.html
@@ -29,7 +29,7 @@
<td valign="top" align="right"></td>
</tr></table></div>
<div class="refsect1">
-<a name="idp23831232"></a><h2>Plugin Information</h2>
+<a name="idp15982832"></a><h2>Plugin Information</h2>
<div class="variablelist"><table border="0">
<col align="left" valign="top">
<tbody>
@@ -57,7 +57,7 @@
</table></div>
</div>
<div class="refsect1">
-<a name="idp24047616"></a><h2>Elements</h2>
+<a name="idp22478800"></a><h2>Elements</h2>
<div class="variablelist"><table border="0">
<col align="left" valign="top">
<tbody>
diff --git a/docs/plugins/html/gst-plugins-good-plugins-plugin-aasink.html b/docs/plugins/html/gst-plugins-good-plugins-plugin-aasink.html
index 5c9aa5084fec6bd4ab2a90c59f2dcb1a43dc2b87..9ce901d82a6e922e79502601b99a38ec58d57052 100644
--- a/docs/plugins/html/gst-plugins-good-plugins-plugin-aasink.html
+++ b/docs/plugins/html/gst-plugins-good-plugins-plugin-aasink.html
@@ -29,7 +29,7 @@
<td valign="top" align="right"></td>
</tr></table></div>
<div class="refsect1">
-<a name="idp24075312"></a><h2>Plugin Information</h2>
+<a name="idp6641808"></a><h2>Plugin Information</h2>
<div class="variablelist"><table border="0">
<col align="left" valign="top">
<tbody>
@@ -57,7 +57,7 @@
</table></div>
</div>
<div class="refsect1">
-<a name="idp22534800"></a><h2>Elements</h2>
+<a name="idp21282256"></a><h2>Elements</h2>
<div class="variablelist"><table border="0">
<col align="left" valign="top">
<tbody><tr>
diff --git a/docs/plugins/html/gst-plugins-good-plugins-plugin-alaw.html b/docs/plugins/html/gst-plugins-good-plugins-plugin-alaw.html
index 7d06ba3f325365de3a9a27cbd8c5a63558fd22b8..52bcff273431e014f14c1d3e5ac5e6931b93d4bb 100644
--- a/docs/plugins/html/gst-plugins-good-plugins-plugin-alaw.html
+++ b/docs/plugins/html/gst-plugins-good-plugins-plugin-alaw.html
@@ -29,7 +29,7 @@
<td valign="top" align="right"></td>
</tr></table></div>
<div class="refsect1">
-<a name="idp22257392"></a><h2>Plugin Information</h2>
+<a name="idp23905376"></a><h2>Plugin Information</h2>
<div class="variablelist"><table border="0">
<col align="left" valign="top">
<tbody>
@@ -57,7 +57,7 @@
</table></div>
</div>
<div class="refsect1">
-<a name="idp22065536"></a><h2>Elements</h2>
+<a name="idp21902480"></a><h2>Elements</h2>
<div class="variablelist"><table border="0">
<col align="left" valign="top">
<tbody>
diff --git a/docs/plugins/html/gst-plugins-good-plugins-plugin-alpha.html b/docs/plugins/html/gst-plugins-good-plugins-plugin-alpha.html
index 19db77820020169aea38a2ff5707c0d24f71a573..18bd62e27da89c0ee0c3b6dc4d3c38b7fcb67e09 100644
--- a/docs/plugins/html/gst-plugins-good-plugins-plugin-alpha.html
+++ b/docs/plugins/html/gst-plugins-good-plugins-plugin-alpha.html
@@ -29,7 +29,7 @@
<td valign="top" align="right"></td>
</tr></table></div>
<div class="refsect1">
-<a name="idp23117584"></a><h2>Plugin Information</h2>
+<a name="idp24871472"></a><h2>Plugin Information</h2>
<div class="variablelist"><table border="0">
<col align="left" valign="top">
<tbody>
@@ -57,7 +57,7 @@
</table></div>
</div>
<div class="refsect1">
-<a name="idp24671040"></a><h2>Elements</h2>
+<a name="idp24076464"></a><h2>Elements</h2>
<div class="variablelist"><table border="0">
<col align="left" valign="top">
<tbody><tr>
diff --git a/docs/plugins/html/gst-plugins-good-plugins-plugin-alphacolor.html b/docs/plugins/html/gst-plugins-good-plugins-plugin-alphacolor.html
index e6fe80f7672099adddbd7dd2bc51b7aff610b435..f4bd5f81dc69f55761896b58527d6bfd885f9988 100644
--- a/docs/plugins/html/gst-plugins-good-plugins-plugin-alphacolor.html
+++ b/docs/plugins/html/gst-plugins-good-plugins-plugin-alphacolor.html
@@ -29,7 +29,7 @@
<td valign="top" align="right"></td>
</tr></table></div>
<div class="refsect1">
-<a name="idp23999760"></a><h2>Plugin Information</h2>
+<a name="idp24760352"></a><h2>Plugin Information</h2>
<div class="variablelist"><table border="0">
<col align="left" valign="top">
<tbody>
@@ -57,7 +57,7 @@
</table></div>
</div>
<div class="refsect1">
-<a name="idp21315328"></a><h2>Elements</h2>
+<a name="idp22802736"></a><h2>Elements</h2>
<div class="variablelist"><table border="0">
<col align="left" valign="top">
<tbody><tr>
diff --git a/docs/plugins/html/gst-plugins-good-plugins-plugin-annodex.html b/docs/plugins/html/gst-plugins-good-plugins-plugin-annodex.html
index b85af765a85ec1377de18e98c06d32038832af78..aa589163939d02c731f1a445e12269cceac80aab 100644
--- a/docs/plugins/html/gst-plugins-good-plugins-plugin-annodex.html
+++ b/docs/plugins/html/gst-plugins-good-plugins-plugin-annodex.html
@@ -29,7 +29,7 @@
<td valign="top" align="right"></td>
</tr></table></div>
<div class="refsect1">
-<a name="idp18206640"></a><h2>Plugin Information</h2>
+<a name="idp23676624"></a><h2>Plugin Information</h2>
<div class="variablelist"><table border="0">
<col align="left" valign="top">
<tbody>
@@ -57,7 +57,7 @@
</table></div>
</div>
<div class="refsect1">
-<a name="idp23418880"></a><h2>Elements</h2>
+<a name="idp24541648"></a><h2>Elements</h2>
<div class="variablelist"><table border="0">
<col align="left" valign="top">
<tbody>
diff --git a/docs/plugins/html/gst-plugins-good-plugins-plugin-apetag.html b/docs/plugins/html/gst-plugins-good-plugins-plugin-apetag.html
index c4ced4312612438627a9f48ac65e0d3f1303b1eb..04f8a7d80694fd6fe586b723d480fe6117245b42 100644
--- a/docs/plugins/html/gst-plugins-good-plugins-plugin-apetag.html
+++ b/docs/plugins/html/gst-plugins-good-plugins-plugin-apetag.html
@@ -29,7 +29,7 @@
<td valign="top" align="right"></td>
</tr></table></div>
<div class="refsect1">
-<a name="idp23910144"></a><h2>Plugin Information</h2>
+<a name="idp24559168"></a><h2>Plugin Information</h2>
<div class="variablelist"><table border="0">
<col align="left" valign="top">
<tbody>
@@ -57,7 +57,7 @@
</table></div>
</div>
<div class="refsect1">
-<a name="idp20908704"></a><h2>Elements</h2>
+<a name="idp24139552"></a><h2>Elements</h2>
<div class="variablelist"><table border="0">
<col align="left" valign="top">
<tbody><tr>
diff --git a/docs/plugins/html/gst-plugins-good-plugins-plugin-audiofx.html b/docs/plugins/html/gst-plugins-good-plugins-plugin-audiofx.html
index 0216733555c444b4b1be85c0f7d90f6c36b3803d..9cd2a16ef76e8be27d826bd4b2ab343fe4428856 100644
--- a/docs/plugins/html/gst-plugins-good-plugins-plugin-audiofx.html
+++ b/docs/plugins/html/gst-plugins-good-plugins-plugin-audiofx.html
@@ -29,7 +29,7 @@
<td valign="top" align="right"></td>
</tr></table></div>
<div class="refsect1">
-<a name="idp20066400"></a><h2>Plugin Information</h2>
+<a name="idp23347184"></a><h2>Plugin Information</h2>
<div class="variablelist"><table border="0">
<col align="left" valign="top">
<tbody>
@@ -57,7 +57,7 @@
</table></div>
</div>
<div class="refsect1">
-<a name="idp15328352"></a><h2>Elements</h2>
+<a name="idp23930256"></a><h2>Elements</h2>
<div class="variablelist"><table border="0">
<col align="left" valign="top">
<tbody>
diff --git a/docs/plugins/html/gst-plugins-good-plugins-plugin-auparse.html b/docs/plugins/html/gst-plugins-good-plugins-plugin-auparse.html
index 5bbe5fa2fda0eea42d3e042404d257aaf79171d4..bdb67a8d0c66afaf4c4d5b0cc1b2f99c89c1179a 100644
--- a/docs/plugins/html/gst-plugins-good-plugins-plugin-auparse.html
+++ b/docs/plugins/html/gst-plugins-good-plugins-plugin-auparse.html
@@ -29,7 +29,7 @@
<td valign="top" align="right"></td>
</tr></table></div>
<div class="refsect1">
-<a name="idp21948272"></a><h2>Plugin Information</h2>
+<a name="idp24679872"></a><h2>Plugin Information</h2>
<div class="variablelist"><table border="0">
<col align="left" valign="top">
<tbody>
@@ -57,7 +57,7 @@
</table></div>
</div>
<div class="refsect1">
-<a name="idp24880992"></a><h2>Elements</h2>
+<a name="idp23627760"></a><h2>Elements</h2>
<div class="variablelist"><table border="0">
<col align="left" valign="top">
<tbody><tr>
diff --git a/docs/plugins/html/gst-plugins-good-plugins-plugin-autodetect.html b/docs/plugins/html/gst-plugins-good-plugins-plugin-autodetect.html
index eace2d9616d4afb95dfa62e39eec17c751a18436..9939e9ee645bf012e847bd6fd04db4c2501cdf52 100644
--- a/docs/plugins/html/gst-plugins-good-plugins-plugin-autodetect.html
+++ b/docs/plugins/html/gst-plugins-good-plugins-plugin-autodetect.html
@@ -29,7 +29,7 @@
<td valign="top" align="right"></td>
</tr></table></div>
<div class="refsect1">
-<a name="idp24894992"></a><h2>Plugin Information</h2>
+<a name="idp23998704"></a><h2>Plugin Information</h2>
<div class="variablelist"><table border="0">
<col align="left" valign="top">
<tbody>
@@ -57,7 +57,7 @@
</table></div>
</div>
<div class="refsect1">
-<a name="idp22783136"></a><h2>Elements</h2>
+<a name="idp21562192"></a><h2>Elements</h2>
<div class="variablelist"><table border="0">
<col align="left" valign="top">
<tbody>
diff --git a/docs/plugins/html/gst-plugins-good-plugins-plugin-avi.html b/docs/plugins/html/gst-plugins-good-plugins-plugin-avi.html
index 52510d411f4f0dc7597c3931a067fbd2bc8547ef..8e1728b1fe4488d3c575d2f79fe9cc1533545d23 100644
--- a/docs/plugins/html/gst-plugins-good-plugins-plugin-avi.html
+++ b/docs/plugins/html/gst-plugins-good-plugins-plugin-avi.html
@@ -29,7 +29,7 @@
<td valign="top" align="right"></td>
</tr></table></div>
<div class="refsect1">
-<a name="idp6680656"></a><h2>Plugin Information</h2>
+<a name="idp22997392"></a><h2>Plugin Information</h2>
<div class="variablelist"><table border="0">
<col align="left" valign="top">
<tbody>
@@ -57,7 +57,7 @@
</table></div>
</div>
<div class="refsect1">
-<a name="idp20696224"></a><h2>Elements</h2>
+<a name="idp22082752"></a><h2>Elements</h2>
<div class="variablelist"><table border="0">
<col align="left" valign="top">
<tbody>
diff --git a/docs/plugins/html/gst-plugins-good-plugins-plugin-cacasink.html b/docs/plugins/html/gst-plugins-good-plugins-plugin-cacasink.html
index 4ad4df1356a3e7355d211666855c1250a8afe4e6..41ea856b52da0a6d9a9d12e8dffd59da941fadc3 100644
--- a/docs/plugins/html/gst-plugins-good-plugins-plugin-cacasink.html
+++ b/docs/plugins/html/gst-plugins-good-plugins-plugin-cacasink.html
@@ -29,7 +29,7 @@
<td valign="top" align="right"></td>
</tr></table></div>
<div class="refsect1">
-<a name="idp24857744"></a><h2>Plugin Information</h2>
+<a name="idp24714240"></a><h2>Plugin Information</h2>
<div class="variablelist"><table border="0">
<col align="left" valign="top">
<tbody>
@@ -57,7 +57,7 @@
</table></div>
</div>
<div class="refsect1">
-<a name="idp19101680"></a><h2>Elements</h2>
+<a name="idp21635728"></a><h2>Elements</h2>
<div class="variablelist"><table border="0">
<col align="left" valign="top">
<tbody><tr>
diff --git a/docs/plugins/html/gst-plugins-good-plugins-plugin-cairo.html b/docs/plugins/html/gst-plugins-good-plugins-plugin-cairo.html
index e19b064e2013cfc56cea5b1c5e5b6fa10469c744..c4f0807f37839d707efe0c99f6ff3e2f313f2e44 100644
--- a/docs/plugins/html/gst-plugins-good-plugins-plugin-cairo.html
+++ b/docs/plugins/html/gst-plugins-good-plugins-plugin-cairo.html
@@ -29,7 +29,7 @@
<td valign="top" align="right"></td>
</tr></table></div>
<div class="refsect1">
-<a name="idp24688768"></a><h2>Plugin Information</h2>
+<a name="idp24018416"></a><h2>Plugin Information</h2>
<div class="variablelist"><table border="0">
<col align="left" valign="top">
<tbody>
@@ -57,7 +57,7 @@
</table></div>
</div>
<div class="refsect1">
-<a name="idp24348368"></a><h2>Elements</h2>
+<a name="idp22956496"></a><h2>Elements</h2>
<div class="variablelist"><table border="0">
<col align="left" valign="top">
<tbody>
diff --git a/docs/plugins/html/gst-plugins-good-plugins-plugin-cutter.html b/docs/plugins/html/gst-plugins-good-plugins-plugin-cutter.html
index 16284d66c788da678f61addc3ef00b19b05fd3aa..7e2bde062f4b9e4597fa7e7f240c90be37fa68a0 100644
--- a/docs/plugins/html/gst-plugins-good-plugins-plugin-cutter.html
+++ b/docs/plugins/html/gst-plugins-good-plugins-plugin-cutter.html
@@ -29,7 +29,7 @@
<td valign="top" align="right"></td>
</tr></table></div>
<div class="refsect1">
-<a name="idp24880128"></a><h2>Plugin Information</h2>
+<a name="idp21929344"></a><h2>Plugin Information</h2>
<div class="variablelist"><table border="0">
<col align="left" valign="top">
<tbody>
@@ -57,7 +57,7 @@
</table></div>
</div>
<div class="refsect1">
-<a name="idp19154832"></a><h2>Elements</h2>
+<a name="idp24167056"></a><h2>Elements</h2>
<div class="variablelist"><table border="0">
<col align="left" valign="top">
<tbody><tr>
diff --git a/docs/plugins/html/gst-plugins-good-plugins-plugin-debug.html b/docs/plugins/html/gst-plugins-good-plugins-plugin-debug.html
index 4b2734464ef97ae4795807ababee8353c4ff9055..0e2768c968cc5b9f2668a46e80c5f32ee51359b1 100644
--- a/docs/plugins/html/gst-plugins-good-plugins-plugin-debug.html
+++ b/docs/plugins/html/gst-plugins-good-plugins-plugin-debug.html
@@ -29,7 +29,7 @@
<td valign="top" align="right"></td>
</tr></table></div>
<div class="refsect1">
-<a name="idp24937792"></a><h2>Plugin Information</h2>
+<a name="idp24814976"></a><h2>Plugin Information</h2>
<div class="variablelist"><table border="0">
<col align="left" valign="top">
<tbody>
@@ -57,7 +57,7 @@
</table></div>
</div>
<div class="refsect1">
-<a name="idp23895056"></a><h2>Elements</h2>
+<a name="idp23275216"></a><h2>Elements</h2>
<div class="variablelist"><table border="0">
<col align="left" valign="top">
<tbody>
diff --git a/docs/plugins/html/gst-plugins-good-plugins-plugin-deinterlace.html b/docs/plugins/html/gst-plugins-good-plugins-plugin-deinterlace.html
index c88a6de4398bbeba570001e251cb41ab8301e499..9a923b317c7067f273b3cae8d009c71d1bb2d1b0 100644
--- a/docs/plugins/html/gst-plugins-good-plugins-plugin-deinterlace.html
+++ b/docs/plugins/html/gst-plugins-good-plugins-plugin-deinterlace.html
@@ -29,7 +29,7 @@
<td valign="top" align="right"></td>
</tr></table></div>
<div class="refsect1">
-<a name="idp23686640"></a><h2>Plugin Information</h2>
+<a name="idp24660624"></a><h2>Plugin Information</h2>
<div class="variablelist"><table border="0">
<col align="left" valign="top">
<tbody>
@@ -57,7 +57,7 @@
</table></div>
</div>
<div class="refsect1">
-<a name="idp22974832"></a><h2>Elements</h2>
+<a name="idp22999232"></a><h2>Elements</h2>
<div class="variablelist"><table border="0">
<col align="left" valign="top">
<tbody><tr>
diff --git a/docs/plugins/html/gst-plugins-good-plugins-plugin-directsound.html b/docs/plugins/html/gst-plugins-good-plugins-plugin-directsound.html
index b7f7f0745a9111f2e49f0636626f83da4529d282..52ab402072a6a1f523dca772e82ce0ae213b87ea 100644
--- a/docs/plugins/html/gst-plugins-good-plugins-plugin-directsound.html
+++ b/docs/plugins/html/gst-plugins-good-plugins-plugin-directsound.html
@@ -29,7 +29,7 @@
<td valign="top" align="right"></td>
</tr></table></div>
<div class="refsect1">
-<a name="idp23669952"></a><h2>Plugin Information</h2>
+<a name="idp24610208"></a><h2>Plugin Information</h2>
<div class="variablelist"><table border="0">
<col align="left" valign="top">
<tbody>
@@ -57,7 +57,7 @@
</table></div>
</div>
<div class="refsect1">
-<a name="idp22818496"></a><h2>Elements</h2>
+<a name="idp21298432"></a><h2>Elements</h2>
<div class="variablelist"><table border="0">
<col align="left" valign="top">
<tbody><tr>
diff --git a/docs/plugins/html/gst-plugins-good-plugins-plugin-dv.html b/docs/plugins/html/gst-plugins-good-plugins-plugin-dv.html
index be18c0b6b53443d22450ee527931891fbec96649..bfdaa241dc077d10b9516f01f6d90bd83c938454 100644
--- a/docs/plugins/html/gst-plugins-good-plugins-plugin-dv.html
+++ b/docs/plugins/html/gst-plugins-good-plugins-plugin-dv.html
@@ -29,7 +29,7 @@
<td valign="top" align="right"></td>
</tr></table></div>
<div class="refsect1">
-<a name="idp22382000"></a><h2>Plugin Information</h2>
+<a name="idp19877344"></a><h2>Plugin Information</h2>
<div class="variablelist"><table border="0">
<col align="left" valign="top">
<tbody>
@@ -57,7 +57,7 @@
</table></div>
</div>
<div class="refsect1">
-<a name="idp24997440"></a><h2>Elements</h2>
+<a name="idp22342992"></a><h2>Elements</h2>
<div class="variablelist"><table border="0">
<col align="left" valign="top">
<tbody>
diff --git a/docs/plugins/html/gst-plugins-good-plugins-plugin-effectv.html b/docs/plugins/html/gst-plugins-good-plugins-plugin-effectv.html
index a3ac6a22f9c370d85e7483f49121a09b50c278c1..d62bfd2a33280746e274a0dcdd24ded6a624f88b 100644
--- a/docs/plugins/html/gst-plugins-good-plugins-plugin-effectv.html
+++ b/docs/plugins/html/gst-plugins-good-plugins-plugin-effectv.html
@@ -29,7 +29,7 @@
<td valign="top" align="right"></td>
</tr></table></div>
<div class="refsect1">
-<a name="idp24758544"></a><h2>Plugin Information</h2>
+<a name="idp24237824"></a><h2>Plugin Information</h2>
<div class="variablelist"><table border="0">
<col align="left" valign="top">
<tbody>
@@ -57,7 +57,7 @@
</table></div>
</div>
<div class="refsect1">
-<a name="idp19159120"></a><h2>Elements</h2>
+<a name="idp22109648"></a><h2>Elements</h2>
<div class="variablelist"><table border="0">
<col align="left" valign="top">
<tbody>
diff --git a/docs/plugins/html/gst-plugins-good-plugins-plugin-equalizer.html b/docs/plugins/html/gst-plugins-good-plugins-plugin-equalizer.html
index f3be6ab6d79709ff317c22490c19299dc54e997d..488fc9a83274b2389ceba947bf1304dcd0058802 100644
--- a/docs/plugins/html/gst-plugins-good-plugins-plugin-equalizer.html
+++ b/docs/plugins/html/gst-plugins-good-plugins-plugin-equalizer.html
@@ -29,7 +29,7 @@
<td valign="top" align="right"></td>
</tr></table></div>
<div class="refsect1">
-<a name="idp21974896"></a><h2>Plugin Information</h2>
+<a name="idp23649168"></a><h2>Plugin Information</h2>
<div class="variablelist"><table border="0">
<col align="left" valign="top">
<tbody>
@@ -57,7 +57,7 @@
</table></div>
</div>
<div class="refsect1">
-<a name="idp24781152"></a><h2>Elements</h2>
+<a name="idp22402800"></a><h2>Elements</h2>
<div class="variablelist"><table border="0">
<col align="left" valign="top">
<tbody>
diff --git a/docs/plugins/html/gst-plugins-good-plugins-plugin-flac.html b/docs/plugins/html/gst-plugins-good-plugins-plugin-flac.html
index 4aed3b9e5cc33dfb1c12cbb6489fef6f882644ec..4e83667b78a933fc5029303aebc9b14b4db12d1c 100644
--- a/docs/plugins/html/gst-plugins-good-plugins-plugin-flac.html
+++ b/docs/plugins/html/gst-plugins-good-plugins-plugin-flac.html
@@ -29,7 +29,7 @@
<td valign="top" align="right"></td>
</tr></table></div>
<div class="refsect1">
-<a name="idp24810144"></a><h2>Plugin Information</h2>
+<a name="idp22671840"></a><h2>Plugin Information</h2>
<div class="variablelist"><table border="0">
<col align="left" valign="top">
<tbody>
@@ -57,7 +57,7 @@
</table></div>
</div>
<div class="refsect1">
-<a name="idp20953712"></a><h2>Elements</h2>
+<a name="idp22377168"></a><h2>Elements</h2>
<div class="variablelist"><table border="0">
<col align="left" valign="top">
<tbody>
diff --git a/docs/plugins/html/gst-plugins-good-plugins-plugin-flv.html b/docs/plugins/html/gst-plugins-good-plugins-plugin-flv.html
index 15620ec0c57ac6808f370be09ceda5a61b209765..6dd33ff27319f5717e5e6bbe54a81cf4e229f5a5 100644
--- a/docs/plugins/html/gst-plugins-good-plugins-plugin-flv.html
+++ b/docs/plugins/html/gst-plugins-good-plugins-plugin-flv.html
@@ -29,7 +29,7 @@
<td valign="top" align="right"></td>
</tr></table></div>
<div class="refsect1">
-<a name="idp24734368"></a><h2>Plugin Information</h2>
+<a name="idp20581152"></a><h2>Plugin Information</h2>
<div class="variablelist"><table border="0">
<col align="left" valign="top">
<tbody>
@@ -57,7 +57,7 @@
</table></div>
</div>
<div class="refsect1">
-<a name="idp24429104"></a><h2>Elements</h2>
+<a name="idp24268752"></a><h2>Elements</h2>
<div class="variablelist"><table border="0">
<col align="left" valign="top">
<tbody>
diff --git a/docs/plugins/html/gst-plugins-good-plugins-plugin-flxdec.html b/docs/plugins/html/gst-plugins-good-plugins-plugin-flxdec.html
index 26fc42e6b268387627d2fc8fcc80cdb3185788cc..4011009362898123fee20fe96ead792aadd80446 100644
--- a/docs/plugins/html/gst-plugins-good-plugins-plugin-flxdec.html
+++ b/docs/plugins/html/gst-plugins-good-plugins-plugin-flxdec.html
@@ -29,7 +29,7 @@
<td valign="top" align="right"></td>
</tr></table></div>
<div class="refsect1">
-<a name="idp23643904"></a><h2>Plugin Information</h2>
+<a name="idp25102544"></a><h2>Plugin Information</h2>
<div class="variablelist"><table border="0">
<col align="left" valign="top">
<tbody>
@@ -57,7 +57,7 @@
</table></div>
</div>
<div class="refsect1">
-<a name="idp24948240"></a><h2>Elements</h2>
+<a name="idp24517248"></a><h2>Elements</h2>
<div class="variablelist"><table border="0">
<col align="left" valign="top">
<tbody><tr>
diff --git a/docs/plugins/html/gst-plugins-good-plugins-plugin-gdkpixbuf.html b/docs/plugins/html/gst-plugins-good-plugins-plugin-gdkpixbuf.html
index 91811b55335806945d28ae1ac5f4dd6eb9156bb5..9732797185344f30739e6be9a214fc23a614ea8d 100644
--- a/docs/plugins/html/gst-plugins-good-plugins-plugin-gdkpixbuf.html
+++ b/docs/plugins/html/gst-plugins-good-plugins-plugin-gdkpixbuf.html
@@ -29,7 +29,7 @@
<td valign="top" align="right"></td>
</tr></table></div>
<div class="refsect1">
-<a name="idp19875552"></a><h2>Plugin Information</h2>
+<a name="idp24834912"></a><h2>Plugin Information</h2>
<div class="variablelist"><table border="0">
<col align="left" valign="top">
<tbody>
@@ -57,7 +57,7 @@
</table></div>
</div>
<div class="refsect1">
-<a name="idp25126704"></a><h2>Elements</h2>
+<a name="idp22466752"></a><h2>Elements</h2>
<div class="variablelist"><table border="0">
<col align="left" valign="top">
<tbody>
diff --git a/docs/plugins/html/gst-plugins-good-plugins-plugin-goom.html b/docs/plugins/html/gst-plugins-good-plugins-plugin-goom.html
index 4d2623dee07ef52dc6ec2c7ca7516258c0cbb181..c04f91640740dc7fe8c3d54c5a722a55e3506ccb 100644
--- a/docs/plugins/html/gst-plugins-good-plugins-plugin-goom.html
+++ b/docs/plugins/html/gst-plugins-good-plugins-plugin-goom.html
@@ -29,7 +29,7 @@
<td valign="top" align="right"></td>
</tr></table></div>
<div class="refsect1">
-<a name="idp25255344"></a><h2>Plugin Information</h2>
+<a name="idp16874496"></a><h2>Plugin Information</h2>
<div class="variablelist"><table border="0">
<col align="left" valign="top">
<tbody>
@@ -57,7 +57,7 @@
</table></div>
</div>
<div class="refsect1">
-<a name="idp24271824"></a><h2>Elements</h2>
+<a name="idp23890384"></a><h2>Elements</h2>
<div class="variablelist"><table border="0">
<col align="left" valign="top">
<tbody><tr>
diff --git a/docs/plugins/html/gst-plugins-good-plugins-plugin-goom2k1.html b/docs/plugins/html/gst-plugins-good-plugins-plugin-goom2k1.html
index c978edc255bb0f3cf4bb65c9f8c28c78e7562934..ba441bc020e2f6038044097950efac9760a0dcf5 100644
--- a/docs/plugins/html/gst-plugins-good-plugins-plugin-goom2k1.html
+++ b/docs/plugins/html/gst-plugins-good-plugins-plugin-goom2k1.html
@@ -29,7 +29,7 @@
<td valign="top" align="right"></td>
</tr></table></div>
<div class="refsect1">
-<a name="idp25151664"></a><h2>Plugin Information</h2>
+<a name="idp16890896"></a><h2>Plugin Information</h2>
<div class="variablelist"><table border="0">
<col align="left" valign="top">
<tbody>
@@ -57,7 +57,7 @@
</table></div>
</div>
<div class="refsect1">
-<a name="idp22966960"></a><h2>Elements</h2>
+<a name="idp23640624"></a><h2>Elements</h2>
<div class="variablelist"><table border="0">
<col align="left" valign="top">
<tbody><tr>
diff --git a/docs/plugins/html/gst-plugins-good-plugins-plugin-halelements.html b/docs/plugins/html/gst-plugins-good-plugins-plugin-halelements.html
index 34ad341c5006116996fed1013ee380f8fd302990..91b77fda3fdcd53a343b1e0393aff4f1532353fc 100644
--- a/docs/plugins/html/gst-plugins-good-plugins-plugin-halelements.html
+++ b/docs/plugins/html/gst-plugins-good-plugins-plugin-halelements.html
@@ -29,7 +29,7 @@
<td valign="top" align="right"></td>
</tr></table></div>
<div class="refsect1">
-<a name="idp24127376"></a><h2>Plugin Information</h2>
+<a name="idp24168608"></a><h2>Plugin Information</h2>
<div class="variablelist"><table border="0">
<col align="left" valign="top">
<tbody>
@@ -57,7 +57,7 @@
</table></div>
</div>
<div class="refsect1">
-<a name="idp25181984"></a><h2>Elements</h2>
+<a name="idp16918576"></a><h2>Elements</h2>
<div class="variablelist"><table border="0">
<col align="left" valign="top">
<tbody>
diff --git a/docs/plugins/html/gst-plugins-good-plugins-plugin-icydemux.html b/docs/plugins/html/gst-plugins-good-plugins-plugin-icydemux.html
index ac9586a212ebb4391bd30466cfe9bd45f558db31..72052f48d7528f358fa0745040bcd336ab456a83 100644
--- a/docs/plugins/html/gst-plugins-good-plugins-plugin-icydemux.html
+++ b/docs/plugins/html/gst-plugins-good-plugins-plugin-icydemux.html
@@ -29,7 +29,7 @@
<td valign="top" align="right"></td>
</tr></table></div>
<div class="refsect1">
-<a name="idp25230544"></a><h2>Plugin Information</h2>
+<a name="idp24889856"></a><h2>Plugin Information</h2>
<div class="variablelist"><table border="0">
<col align="left" valign="top">
<tbody>
@@ -57,7 +57,7 @@
</table></div>
</div>
<div class="refsect1">
-<a name="idp23821952"></a><h2>Elements</h2>
+<a name="idp19955728"></a><h2>Elements</h2>
<div class="variablelist"><table border="0">
<col align="left" valign="top">
<tbody><tr>
diff --git a/docs/plugins/html/gst-plugins-good-plugins-plugin-id3demux.html b/docs/plugins/html/gst-plugins-good-plugins-plugin-id3demux.html
index 1014066b47711496319e63e0053974fdbacf3323..1e97c348760aef0efab5df88dbd5d66b2e46f37c 100644
--- a/docs/plugins/html/gst-plugins-good-plugins-plugin-id3demux.html
+++ b/docs/plugins/html/gst-plugins-good-plugins-plugin-id3demux.html
@@ -29,7 +29,7 @@
<td valign="top" align="right"></td>
</tr></table></div>
<div class="refsect1">
-<a name="idp24796720"></a><h2>Plugin Information</h2>
+<a name="idp24905712"></a><h2>Plugin Information</h2>
<div class="variablelist"><table border="0">
<col align="left" valign="top">
<tbody>
@@ -57,7 +57,7 @@
</table></div>
</div>
<div class="refsect1">
-<a name="idp24020880"></a><h2>Elements</h2>
+<a name="idp21880512"></a><h2>Elements</h2>
<div class="variablelist"><table border="0">
<col align="left" valign="top">
<tbody><tr>
diff --git a/docs/plugins/html/gst-plugins-good-plugins-plugin-imagefreeze.html b/docs/plugins/html/gst-plugins-good-plugins-plugin-imagefreeze.html
index 08388eb1611c1ae30e180478086bac4ec86284e0..a8bad57d2c3eb56487d9490874ae8dc084538562 100644
--- a/docs/plugins/html/gst-plugins-good-plugins-plugin-imagefreeze.html
+++ b/docs/plugins/html/gst-plugins-good-plugins-plugin-imagefreeze.html
@@ -29,7 +29,7 @@
<td valign="top" align="right"></td>
</tr></table></div>
<div class="refsect1">
-<a name="idp25036512"></a><h2>Plugin Information</h2>
+<a name="idp24922240"></a><h2>Plugin Information</h2>
<div class="variablelist"><table border="0">
<col align="left" valign="top">
<tbody>
@@ -57,7 +57,7 @@
</table></div>
</div>
<div class="refsect1">
-<a name="idp24401424"></a><h2>Elements</h2>
+<a name="idp24301504"></a><h2>Elements</h2>
<div class="variablelist"><table border="0">
<col align="left" valign="top">
<tbody><tr>
diff --git a/docs/plugins/html/gst-plugins-good-plugins-plugin-interleave.html b/docs/plugins/html/gst-plugins-good-plugins-plugin-interleave.html
index 6dcb582a24574e4516fc75202bd529333f0b46bc..41818c8a84d8110f839cbb77080b92d99150325b 100644
--- a/docs/plugins/html/gst-plugins-good-plugins-plugin-interleave.html
+++ b/docs/plugins/html/gst-plugins-good-plugins-plugin-interleave.html
@@ -29,7 +29,7 @@
<td valign="top" align="right"></td>
</tr></table></div>
<div class="refsect1">
-<a name="idp24019952"></a><h2>Plugin Information</h2>
+<a name="idp21881104"></a><h2>Plugin Information</h2>
<div class="variablelist"><table border="0">
<col align="left" valign="top">
<tbody>
@@ -57,7 +57,7 @@
</table></div>
</div>
<div class="refsect1">
-<a name="idp24655552"></a><h2>Elements</h2>
+<a name="idp22399936"></a><h2>Elements</h2>
<div class="variablelist"><table border="0">
<col align="left" valign="top">
<tbody>
diff --git a/docs/plugins/html/gst-plugins-good-plugins-plugin-isomp4.html b/docs/plugins/html/gst-plugins-good-plugins-plugin-isomp4.html
index ef1bf83ede9e222bb32006319d28a5a3610505ea..d8c1a731a950f76995535195f8c7092eb783a368 100644
--- a/docs/plugins/html/gst-plugins-good-plugins-plugin-isomp4.html
+++ b/docs/plugins/html/gst-plugins-good-plugins-plugin-isomp4.html
@@ -29,7 +29,7 @@
<td valign="top" align="right"></td>
</tr></table></div>
<div class="refsect1">
-<a name="idp25247616"></a><h2>Plugin Information</h2>
+<a name="idp24602448"></a><h2>Plugin Information</h2>
<div class="variablelist"><table border="0">
<col align="left" valign="top">
<tbody>
@@ -57,7 +57,7 @@
</table></div>
</div>
<div class="refsect1">
-<a name="idp23805040"></a><h2>Elements</h2>
+<a name="idp16887920"></a><h2>Elements</h2>
<div class="variablelist"><table border="0">
<col align="left" valign="top">
<tbody>
diff --git a/docs/plugins/html/gst-plugins-good-plugins-plugin-jack.html b/docs/plugins/html/gst-plugins-good-plugins-plugin-jack.html
index 37007ce357a9ff97d0fe14092bdf302c11d7b605..c97687b05bce50517ee0e22d2f7b3e5b7df1d869 100644
--- a/docs/plugins/html/gst-plugins-good-plugins-plugin-jack.html
+++ b/docs/plugins/html/gst-plugins-good-plugins-plugin-jack.html
@@ -29,7 +29,7 @@
<td valign="top" align="right"></td>
</tr></table></div>
<div class="refsect1">
-<a name="idp22723408"></a><h2>Plugin Information</h2>
+<a name="idp23292176"></a><h2>Plugin Information</h2>
<div class="variablelist"><table border="0">
<col align="left" valign="top">
<tbody>
@@ -57,7 +57,7 @@
</table></div>
</div>
<div class="refsect1">
-<a name="idp25074896"></a><h2>Elements</h2>
+<a name="idp23292832"></a><h2>Elements</h2>
<div class="variablelist"><table border="0">
<col align="left" valign="top">
<tbody>
diff --git a/docs/plugins/html/gst-plugins-good-plugins-plugin-jpeg.html b/docs/plugins/html/gst-plugins-good-plugins-plugin-jpeg.html
index b83c9ca72c89833ac3d0f6cb796c771c947d6dc2..bccd59b29e42316e1e9ff895f85486cd066bd057 100644
--- a/docs/plugins/html/gst-plugins-good-plugins-plugin-jpeg.html
+++ b/docs/plugins/html/gst-plugins-good-plugins-plugin-jpeg.html
@@ -29,7 +29,7 @@
<td valign="top" align="right"></td>
</tr></table></div>
<div class="refsect1">
-<a name="idp24836176"></a><h2>Plugin Information</h2>
+<a name="idp22464016"></a><h2>Plugin Information</h2>
<div class="variablelist"><table border="0">
<col align="left" valign="top">
<tbody>
@@ -57,7 +57,7 @@
</table></div>
</div>
<div class="refsect1">
-<a name="idp21567008"></a><h2>Elements</h2>
+<a name="idp25067632"></a><h2>Elements</h2>
<div class="variablelist"><table border="0">
<col align="left" valign="top">
<tbody>
diff --git a/docs/plugins/html/gst-plugins-good-plugins-plugin-level.html b/docs/plugins/html/gst-plugins-good-plugins-plugin-level.html
index 299019a121797b55437cd44c73ac0a242f135418..9d93f797b6709b8d9caaac56c17b7a3a5962d23c 100644
--- a/docs/plugins/html/gst-plugins-good-plugins-plugin-level.html
+++ b/docs/plugins/html/gst-plugins-good-plugins-plugin-level.html
@@ -29,7 +29,7 @@
<td valign="top" align="right"></td>
</tr></table></div>
<div class="refsect1">
-<a name="idp24746272"></a><h2>Plugin Information</h2>
+<a name="idp9647120"></a><h2>Plugin Information</h2>
<div class="variablelist"><table border="0">
<col align="left" valign="top">
<tbody>
@@ -57,7 +57,7 @@
</table></div>
</div>
<div class="refsect1">
-<a name="idp21634832"></a><h2>Elements</h2>
+<a name="idp21230160"></a><h2>Elements</h2>
<div class="variablelist"><table border="0">
<col align="left" valign="top">
<tbody><tr>
diff --git a/docs/plugins/html/gst-plugins-good-plugins-plugin-matroska.html b/docs/plugins/html/gst-plugins-good-plugins-plugin-matroska.html
index 2162a69a129f0e3163a97e66033cd6db0c0f89a9..4fd2bb50cbeb8f3c756d22b20af4fe27d0143d0a 100644
--- a/docs/plugins/html/gst-plugins-good-plugins-plugin-matroska.html
+++ b/docs/plugins/html/gst-plugins-good-plugins-plugin-matroska.html
@@ -29,7 +29,7 @@
<td valign="top" align="right"></td>
</tr></table></div>
<div class="refsect1">
-<a name="idp25208400"></a><h2>Plugin Information</h2>
+<a name="idp25095264"></a><h2>Plugin Information</h2>
<div class="variablelist"><table border="0">
<col align="left" valign="top">
<tbody>
@@ -57,7 +57,7 @@
</table></div>
</div>
<div class="refsect1">
-<a name="idp24785664"></a><h2>Elements</h2>
+<a name="idp23566464"></a><h2>Elements</h2>
<div class="variablelist"><table border="0">
<col align="left" valign="top">
<tbody>
diff --git a/docs/plugins/html/gst-plugins-good-plugins-plugin-monoscope.html b/docs/plugins/html/gst-plugins-good-plugins-plugin-monoscope.html
index 767bb9894aca61cd84de1321804af1c7ad8e192d..6cfebefc13e9d7fca8181320a59cf7e3b6e7594f 100644
--- a/docs/plugins/html/gst-plugins-good-plugins-plugin-monoscope.html
+++ b/docs/plugins/html/gst-plugins-good-plugins-plugin-monoscope.html
@@ -29,7 +29,7 @@
<td valign="top" align="right"></td>
</tr></table></div>
<div class="refsect1">
-<a name="idp13554144"></a><h2>Plugin Information</h2>
+<a name="idp25490784"></a><h2>Plugin Information</h2>
<div class="variablelist"><table border="0">
<col align="left" valign="top">
<tbody>
@@ -57,7 +57,7 @@
</table></div>
</div>
<div class="refsect1">
-<a name="idp24761008"></a><h2>Elements</h2>
+<a name="idp24345456"></a><h2>Elements</h2>
<div class="variablelist"><table border="0">
<col align="left" valign="top">
<tbody><tr>
diff --git a/docs/plugins/html/gst-plugins-good-plugins-plugin-mulaw.html b/docs/plugins/html/gst-plugins-good-plugins-plugin-mulaw.html
index 9b516633559ecf7b760de1717efffd939c79d8ae..aca52facd7e58f513e8e7a3c09fe1ef979ada10c 100644
--- a/docs/plugins/html/gst-plugins-good-plugins-plugin-mulaw.html
+++ b/docs/plugins/html/gst-plugins-good-plugins-plugin-mulaw.html
@@ -29,7 +29,7 @@
<td valign="top" align="right"></td>
</tr></table></div>
<div class="refsect1">
-<a name="idp24760752"></a><h2>Plugin Information</h2>
+<a name="idp21289952"></a><h2>Plugin Information</h2>
<div class="variablelist"><table border="0">
<col align="left" valign="top">
<tbody>
@@ -57,7 +57,7 @@
</table></div>
</div>
<div class="refsect1">
-<a name="idp24867664"></a><h2>Elements</h2>
+<a name="idp16885632"></a><h2>Elements</h2>
<div class="variablelist"><table border="0">
<col align="left" valign="top">
<tbody>
diff --git a/docs/plugins/html/gst-plugins-good-plugins-plugin-multifile.html b/docs/plugins/html/gst-plugins-good-plugins-plugin-multifile.html
index 57c7371c506cb4ab8bdaa6e21e56af7f6deb5806..93997cacc0503de0fdfb05932c2b01ce76f9ba0d 100644
--- a/docs/plugins/html/gst-plugins-good-plugins-plugin-multifile.html
+++ b/docs/plugins/html/gst-plugins-good-plugins-plugin-multifile.html
@@ -29,7 +29,7 @@
<td valign="top" align="right"></td>
</tr></table></div>
<div class="refsect1">
-<a name="idp22375712"></a><h2>Plugin Information</h2>
+<a name="idp24763744"></a><h2>Plugin Information</h2>
<div class="variablelist"><table border="0">
<col align="left" valign="top">
<tbody>
@@ -57,7 +57,7 @@
</table></div>
</div>
<div class="refsect1">
-<a name="idp25522096"></a><h2>Elements</h2>
+<a name="idp25036240"></a><h2>Elements</h2>
<div class="variablelist"><table border="0">
<col align="left" valign="top">
<tbody>
diff --git a/docs/plugins/html/gst-plugins-good-plugins-plugin-multipart.html b/docs/plugins/html/gst-plugins-good-plugins-plugin-multipart.html
index 2339f08de62a373430d52d1023473b0783d3d7f2..7495de68576291a5beb96527664449c7038ae72b 100644
--- a/docs/plugins/html/gst-plugins-good-plugins-plugin-multipart.html
+++ b/docs/plugins/html/gst-plugins-good-plugins-plugin-multipart.html
@@ -29,7 +29,7 @@
<td valign="top" align="right"></td>
</tr></table></div>
<div class="refsect1">
-<a name="idp25386656"></a><h2>Plugin Information</h2>
+<a name="idp21393360"></a><h2>Plugin Information</h2>
<div class="variablelist"><table border="0">
<col align="left" valign="top">
<tbody>
@@ -57,7 +57,7 @@
</table></div>
</div>
<div class="refsect1">
-<a name="idp23778944"></a><h2>Elements</h2>
+<a name="idp24631568"></a><h2>Elements</h2>
<div class="variablelist"><table border="0">
<col align="left" valign="top">
<tbody>
diff --git a/docs/plugins/html/gst-plugins-good-plugins-plugin-navigationtest.html b/docs/plugins/html/gst-plugins-good-plugins-plugin-navigationtest.html
index 1348a1b2e3b5650d6491eec4d1a97073078c8469..3cc9e4e2104c08683969f77dd6ff7d38a47f41bc 100644
--- a/docs/plugins/html/gst-plugins-good-plugins-plugin-navigationtest.html
+++ b/docs/plugins/html/gst-plugins-good-plugins-plugin-navigationtest.html
@@ -29,7 +29,7 @@
<td valign="top" align="right"></td>
</tr></table></div>
<div class="refsect1">
-<a name="idp25496784"></a><h2>Plugin Information</h2>
+<a name="idp10158576"></a><h2>Plugin Information</h2>
<div class="variablelist"><table border="0">
<col align="left" valign="top">
<tbody>
@@ -57,7 +57,7 @@
</table></div>
</div>
<div class="refsect1">
-<a name="idp24214544"></a><h2>Elements</h2>
+<a name="idp24286752"></a><h2>Elements</h2>
<div class="variablelist"><table border="0">
<col align="left" valign="top">
<tbody><tr>
diff --git a/docs/plugins/html/gst-plugins-good-plugins-plugin-oss4.html b/docs/plugins/html/gst-plugins-good-plugins-plugin-oss4.html
index 77e01361c290a609770c8806a1957fb59da2d3a9..ffa0a16c11ba8eb83eef34961f89403bea38b75b 100644
--- a/docs/plugins/html/gst-plugins-good-plugins-plugin-oss4.html
+++ b/docs/plugins/html/gst-plugins-good-plugins-plugin-oss4.html
@@ -29,7 +29,7 @@
<td valign="top" align="right"></td>
</tr></table></div>
<div class="refsect1">
-<a name="idp24802384"></a><h2>Plugin Information</h2>
+<a name="idp23351072"></a><h2>Plugin Information</h2>
<div class="variablelist"><table border="0">
<col align="left" valign="top">
<tbody>
@@ -57,12 +57,12 @@
</table></div>
</div>
<div class="refsect1">
-<a name="idp24832928"></a><h2>Elements</h2>
+<a name="idp25120096"></a><h2>Elements</h2>
<div class="variablelist"><table border="0">
<col align="left" valign="top">
<tbody>
<tr>
-<td><p><span class="term"><a class="link" href="gst-plugins-good-plugins-oss4mixer.html" title="oss4mixer">oss4mixer</a></span></p></td>
+<td><p><span class="term"><a href="http://gstreamer.freedesktop.org/data/doc/gstreamer/head/gst-plugins-good/html/gst-plugins-good-plugins-oss4mixer.html">oss4mixer</a></span></p></td>
<td>Control sound input and output levels with OSS4</td>
</tr>
<tr>
diff --git a/docs/plugins/html/gst-plugins-good-plugins-plugin-ossaudio.html b/docs/plugins/html/gst-plugins-good-plugins-plugin-ossaudio.html
index 0e7bc3167ab31ff74ffdcb75d1a1679f70c7a67b..7947ef915dbcf13d92cc6307a1fd598c8252becb 100644
--- a/docs/plugins/html/gst-plugins-good-plugins-plugin-ossaudio.html
+++ b/docs/plugins/html/gst-plugins-good-plugins-plugin-ossaudio.html
@@ -29,7 +29,7 @@
<td valign="top" align="right"></td>
</tr></table></div>
<div class="refsect1">
-<a name="idp23647264"></a><h2>Plugin Information</h2>
+<a name="idp20767936"></a><h2>Plugin Information</h2>
<div class="variablelist"><table border="0">
<col align="left" valign="top">
<tbody>
@@ -57,12 +57,12 @@
</table></div>
</div>
<div class="refsect1">
-<a name="idp25493408"></a><h2>Elements</h2>
+<a name="idp24943408"></a><h2>Elements</h2>
<div class="variablelist"><table border="0">
<col align="left" valign="top">
<tbody>
<tr>
-<td><p><span class="term"><a class="link" href="gst-plugins-good-plugins-ossmixer.html" title="ossmixer">ossmixer</a></span></p></td>
+<td><p><span class="term"><a href="http://gstreamer.freedesktop.org/data/doc/gstreamer/head/gst-plugins-good/html/gst-plugins-good-plugins-ossmixer.html">ossmixer</a></span></p></td>
<td>Control sound input and output levels with OSS</td>
</tr>
<tr>
diff --git a/docs/plugins/html/gst-plugins-good-plugins-plugin-osxaudio.html b/docs/plugins/html/gst-plugins-good-plugins-plugin-osxaudio.html
index 3df07d3e40c1ee7dd41ab8ce12b73d6dde26985a..1887dfa5f17af84b91eb065ad5a60fc866141439 100644
--- a/docs/plugins/html/gst-plugins-good-plugins-plugin-osxaudio.html
+++ b/docs/plugins/html/gst-plugins-good-plugins-plugin-osxaudio.html
@@ -29,7 +29,7 @@
<td valign="top" align="right"></td>
</tr></table></div>
<div class="refsect1">
-<a name="idp24038496"></a><h2>Plugin Information</h2>
+<a name="idp23352656"></a><h2>Plugin Information</h2>
<div class="variablelist"><table border="0">
<col align="left" valign="top">
<tbody>
@@ -57,7 +57,7 @@
</table></div>
</div>
<div class="refsect1">
-<a name="idp25366304"></a><h2>Elements</h2>
+<a name="idp25610496"></a><h2>Elements</h2>
<div class="variablelist"><table border="0">
<col align="left" valign="top">
<tbody>
diff --git a/docs/plugins/html/gst-plugins-good-plugins-plugin-osxvideo.html b/docs/plugins/html/gst-plugins-good-plugins-plugin-osxvideo.html
index 4280b6d05a554431e771ea37784feb07da8fb44e..38045ce1c44655713c47e4c9061ade2fff9bec59 100644
--- a/docs/plugins/html/gst-plugins-good-plugins-plugin-osxvideo.html
+++ b/docs/plugins/html/gst-plugins-good-plugins-plugin-osxvideo.html
@@ -29,7 +29,7 @@
<td valign="top" align="right"></td>
</tr></table></div>
<div class="refsect1">
-<a name="idp25815968"></a><h2>Plugin Information</h2>
+<a name="idp24882800"></a><h2>Plugin Information</h2>
<div class="variablelist"><table border="0">
<col align="left" valign="top">
<tbody>
@@ -57,7 +57,7 @@
</table></div>
</div>
<div class="refsect1">
-<a name="idp25410512"></a><h2>Elements</h2>
+<a name="idp16941504"></a><h2>Elements</h2>
<div class="variablelist"><table border="0">
<col align="left" valign="top">
<tbody><tr>
diff --git a/docs/plugins/html/gst-plugins-good-plugins-plugin-png.html b/docs/plugins/html/gst-plugins-good-plugins-plugin-png.html
index 277f411bc6b6ed4c8bb89b9da47ba11b2bfb64f6..d706e3f0e69df44c355b41fbb8d2fc2673c57d91 100644
--- a/docs/plugins/html/gst-plugins-good-plugins-plugin-png.html
+++ b/docs/plugins/html/gst-plugins-good-plugins-plugin-png.html
@@ -29,7 +29,7 @@
<td valign="top" align="right"></td>
</tr></table></div>
<div class="refsect1">
-<a name="idp25062560"></a><h2>Plugin Information</h2>
+<a name="idp24059648"></a><h2>Plugin Information</h2>
<div class="variablelist"><table border="0">
<col align="left" valign="top">
<tbody>
@@ -57,7 +57,7 @@
</table></div>
</div>
<div class="refsect1">
-<a name="idp18202992"></a><h2>Elements</h2>
+<a name="idp25729424"></a><h2>Elements</h2>
<div class="variablelist"><table border="0">
<col align="left" valign="top">
<tbody>
diff --git a/docs/plugins/html/gst-plugins-good-plugins-plugin-pulseaudio.html b/docs/plugins/html/gst-plugins-good-plugins-plugin-pulseaudio.html
index 165a90c2235356a602fcd03d2054a0c8ab33a94a..7e55a91a01188fd6460d28ac330d9e1a6c53efcf 100644
--- a/docs/plugins/html/gst-plugins-good-plugins-plugin-pulseaudio.html
+++ b/docs/plugins/html/gst-plugins-good-plugins-plugin-pulseaudio.html
@@ -29,7 +29,7 @@
<td valign="top" align="right"></td>
</tr></table></div>
<div class="refsect1">
-<a name="idp25802240"></a><h2>Plugin Information</h2>
+<a name="idp23968848"></a><h2>Plugin Information</h2>
<div class="variablelist"><table border="0">
<col align="left" valign="top">
<tbody>
@@ -57,7 +57,7 @@
</table></div>
</div>
<div class="refsect1">
-<a name="idp25869376"></a><h2>Elements</h2>
+<a name="idp23564768"></a><h2>Elements</h2>
<div class="variablelist"><table border="0">
<col align="left" valign="top">
<tbody>
diff --git a/docs/plugins/html/gst-plugins-good-plugins-plugin-replaygain.html b/docs/plugins/html/gst-plugins-good-plugins-plugin-replaygain.html
index 3c46470db20017a198ea56becea5dc54adfea7e5..bde66dccc253ba58b537030cdb577fd62b083207 100644
--- a/docs/plugins/html/gst-plugins-good-plugins-plugin-replaygain.html
+++ b/docs/plugins/html/gst-plugins-good-plugins-plugin-replaygain.html
@@ -29,7 +29,7 @@
<td valign="top" align="right"></td>
</tr></table></div>
<div class="refsect1">
-<a name="idp23900560"></a><h2>Plugin Information</h2>
+<a name="idp22348336"></a><h2>Plugin Information</h2>
<div class="variablelist"><table border="0">
<col align="left" valign="top">
<tbody>
@@ -57,7 +57,7 @@
</table></div>
</div>
<div class="refsect1">
-<a name="idp23927904"></a><h2>Elements</h2>
+<a name="idp24838096"></a><h2>Elements</h2>
<div class="variablelist"><table border="0">
<col align="left" valign="top">
<tbody>
diff --git a/docs/plugins/html/gst-plugins-good-plugins-plugin-rtp.html b/docs/plugins/html/gst-plugins-good-plugins-plugin-rtp.html
index a1aa96d4efdf0f75da086b2808aa4828b369fc95..bfb9681eff1c808245f447aa11de3241d43ada89 100644
--- a/docs/plugins/html/gst-plugins-good-plugins-plugin-rtp.html
+++ b/docs/plugins/html/gst-plugins-good-plugins-plugin-rtp.html
@@ -29,7 +29,7 @@
<td valign="top" align="right"></td>
</tr></table></div>
<div class="refsect1">
-<a name="idp24730112"></a><h2>Plugin Information</h2>
+<a name="idp22348464"></a><h2>Plugin Information</h2>
<div class="variablelist"><table border="0">
<col align="left" valign="top">
<tbody>
@@ -57,7 +57,7 @@
</table></div>
</div>
<div class="refsect1">
-<a name="idp24981856"></a><h2>Elements</h2>
+<a name="idp25585248"></a><h2>Elements</h2>
<div class="variablelist"><table border="0">
<col align="left" valign="top">
<tbody>
diff --git a/docs/plugins/html/gst-plugins-good-plugins-plugin-rtpmanager.html b/docs/plugins/html/gst-plugins-good-plugins-plugin-rtpmanager.html
index 4907b75358b46bcca3a3850bb36aa27a134f7c9e..ec0ebbec47a46eb850e0083ffbbe67135194af2b 100644
--- a/docs/plugins/html/gst-plugins-good-plugins-plugin-rtpmanager.html
+++ b/docs/plugins/html/gst-plugins-good-plugins-plugin-rtpmanager.html
@@ -29,7 +29,7 @@
<td valign="top" align="right"></td>
</tr></table></div>
<div class="refsect1">
-<a name="idp25428528"></a><h2>Plugin Information</h2>
+<a name="idp21396432"></a><h2>Plugin Information</h2>
<div class="variablelist"><table border="0">
<col align="left" valign="top">
<tbody>
@@ -57,7 +57,7 @@
</table></div>
</div>
<div class="refsect1">
-<a name="idp24185264"></a><h2>Elements</h2>
+<a name="idp25537344"></a><h2>Elements</h2>
<div class="variablelist"><table border="0">
<col align="left" valign="top">
<tbody>
diff --git a/docs/plugins/html/gst-plugins-good-plugins-plugin-rtsp.html b/docs/plugins/html/gst-plugins-good-plugins-plugin-rtsp.html
index 8ac94d4d2a245c96aecd94c3b31b41d56d4d7986..f75c89f23c545cb2deac19c8b26bd76f81a0bc9c 100644
--- a/docs/plugins/html/gst-plugins-good-plugins-plugin-rtsp.html
+++ b/docs/plugins/html/gst-plugins-good-plugins-plugin-rtsp.html
@@ -29,7 +29,7 @@
<td valign="top" align="right"></td>
</tr></table></div>
<div class="refsect1">
-<a name="idp25461232"></a><h2>Plugin Information</h2>
+<a name="idp25694464"></a><h2>Plugin Information</h2>
<div class="variablelist"><table border="0">
<col align="left" valign="top">
<tbody>
@@ -57,7 +57,7 @@
</table></div>
</div>
<div class="refsect1">
-<a name="idp25373888"></a><h2>Elements</h2>
+<a name="idp25398016"></a><h2>Elements</h2>
<div class="variablelist"><table border="0">
<col align="left" valign="top">
<tbody>
diff --git a/docs/plugins/html/gst-plugins-good-plugins-plugin-shapewipe.html b/docs/plugins/html/gst-plugins-good-plugins-plugin-shapewipe.html
index f0692547b27d63260477fe5843f18d08ed7ba6ee..6a1d4be770aabff55a765c68165a3ad148435b8e 100644
--- a/docs/plugins/html/gst-plugins-good-plugins-plugin-shapewipe.html
+++ b/docs/plugins/html/gst-plugins-good-plugins-plugin-shapewipe.html
@@ -29,7 +29,7 @@
<td valign="top" align="right"></td>
</tr></table></div>
<div class="refsect1">
-<a name="idp25697312"></a><h2>Plugin Information</h2>
+<a name="idp25417680"></a><h2>Plugin Information</h2>
<div class="variablelist"><table border="0">
<col align="left" valign="top">
<tbody>
@@ -57,7 +57,7 @@
</table></div>
</div>
<div class="refsect1">
-<a name="idp25353200"></a><h2>Elements</h2>
+<a name="idp25492128"></a><h2>Elements</h2>
<div class="variablelist"><table border="0">
<col align="left" valign="top">
<tbody><tr>
diff --git a/docs/plugins/html/gst-plugins-good-plugins-plugin-shout2send.html b/docs/plugins/html/gst-plugins-good-plugins-plugin-shout2send.html
index 577aa0bd519ce4f6066f20b8c3fab71c89635dd7..720bb7ca6d994bc8b1bae7064da5dd6976597dfa 100644
--- a/docs/plugins/html/gst-plugins-good-plugins-plugin-shout2send.html
+++ b/docs/plugins/html/gst-plugins-good-plugins-plugin-shout2send.html
@@ -29,7 +29,7 @@
<td valign="top" align="right"></td>
</tr></table></div>
<div class="refsect1">
-<a name="idp23614400"></a><h2>Plugin Information</h2>
+<a name="idp25684320"></a><h2>Plugin Information</h2>
<div class="variablelist"><table border="0">
<col align="left" valign="top">
<tbody>
@@ -57,7 +57,7 @@
</table></div>
</div>
<div class="refsect1">
-<a name="idp25333952"></a><h2>Elements</h2>
+<a name="idp16953568"></a><h2>Elements</h2>
<div class="variablelist"><table border="0">
<col align="left" valign="top">
<tbody><tr>
diff --git a/docs/plugins/html/gst-plugins-good-plugins-plugin-smpte.html b/docs/plugins/html/gst-plugins-good-plugins-plugin-smpte.html
index d4349f48939830ecd8e0ca299ad971f73cd9b904..61e1c971e80b8a48cbdb4bb8338445c31724c348 100644
--- a/docs/plugins/html/gst-plugins-good-plugins-plugin-smpte.html
+++ b/docs/plugins/html/gst-plugins-good-plugins-plugin-smpte.html
@@ -29,7 +29,7 @@
<td valign="top" align="right"></td>
</tr></table></div>
<div class="refsect1">
-<a name="idp23883984"></a><h2>Plugin Information</h2>
+<a name="idp25462560"></a><h2>Plugin Information</h2>
<div class="variablelist"><table border="0">
<col align="left" valign="top">
<tbody>
@@ -57,7 +57,7 @@
</table></div>
</div>
<div class="refsect1">
-<a name="idp25717152"></a><h2>Elements</h2>
+<a name="idp24472880"></a><h2>Elements</h2>
<div class="variablelist"><table border="0">
<col align="left" valign="top">
<tbody>
diff --git a/docs/plugins/html/gst-plugins-good-plugins-plugin-soup.html b/docs/plugins/html/gst-plugins-good-plugins-plugin-soup.html
index dabb5ccb8d3e1a63ecffcb8e61e0c0731e245a83..b8918a587c7823718df491ebf23cc8c9d4b12e71 100644
--- a/docs/plugins/html/gst-plugins-good-plugins-plugin-soup.html
+++ b/docs/plugins/html/gst-plugins-good-plugins-plugin-soup.html
@@ -29,7 +29,7 @@
<td valign="top" align="right"></td>
</tr></table></div>
<div class="refsect1">
-<a name="idp23673040"></a><h2>Plugin Information</h2>
+<a name="idp22434592"></a><h2>Plugin Information</h2>
<div class="variablelist"><table border="0">
<col align="left" valign="top">
<tbody>
@@ -57,7 +57,7 @@
</table></div>
</div>
<div class="refsect1">
-<a name="idp25916320"></a><h2>Elements</h2>
+<a name="idp25504816"></a><h2>Elements</h2>
<div class="variablelist"><table border="0">
<col align="left" valign="top">
<tbody>
diff --git a/docs/plugins/html/gst-plugins-good-plugins-plugin-spectrum.html b/docs/plugins/html/gst-plugins-good-plugins-plugin-spectrum.html
index a715fd8d8661dfb8f3188cbcb1b1a4288a3a7557..2e2a8264d29d8f9fd430b39058357b967718fc62 100644
--- a/docs/plugins/html/gst-plugins-good-plugins-plugin-spectrum.html
+++ b/docs/plugins/html/gst-plugins-good-plugins-plugin-spectrum.html
@@ -29,7 +29,7 @@
<td valign="top" align="right"></td>
</tr></table></div>
<div class="refsect1">
-<a name="idp24471440"></a><h2>Plugin Information</h2>
+<a name="idp25511536"></a><h2>Plugin Information</h2>
<div class="variablelist"><table border="0">
<col align="left" valign="top">
<tbody>
@@ -57,7 +57,7 @@
</table></div>
</div>
<div class="refsect1">
-<a name="idp25337360"></a><h2>Elements</h2>
+<a name="idp24892224"></a><h2>Elements</h2>
<div class="variablelist"><table border="0">
<col align="left" valign="top">
<tbody><tr>
diff --git a/docs/plugins/html/gst-plugins-good-plugins-plugin-speex.html b/docs/plugins/html/gst-plugins-good-plugins-plugin-speex.html
index 42470b8a2c3c2cb6e22368837663dafa133b8cf4..a0d2f7a64e023544223e143b82ec1f72b7b97d39 100644
--- a/docs/plugins/html/gst-plugins-good-plugins-plugin-speex.html
+++ b/docs/plugins/html/gst-plugins-good-plugins-plugin-speex.html
@@ -29,7 +29,7 @@
<td valign="top" align="right"></td>
</tr></table></div>
<div class="refsect1">
-<a name="idp25890240"></a><h2>Plugin Information</h2>
+<a name="idp24411168"></a><h2>Plugin Information</h2>
<div class="variablelist"><table border="0">
<col align="left" valign="top">
<tbody>
@@ -57,7 +57,7 @@
</table></div>
</div>
<div class="refsect1">
-<a name="idp24487008"></a><h2>Elements</h2>
+<a name="idp22690256"></a><h2>Elements</h2>
<div class="variablelist"><table border="0">
<col align="left" valign="top">
<tbody>
diff --git a/docs/plugins/html/gst-plugins-good-plugins-plugin-taglib.html b/docs/plugins/html/gst-plugins-good-plugins-plugin-taglib.html
index f44d75535720ed3611e897d6156b4d62478556ed..53cc6cc896b386643f00fe842022a57e2f7ba272 100644
--- a/docs/plugins/html/gst-plugins-good-plugins-plugin-taglib.html
+++ b/docs/plugins/html/gst-plugins-good-plugins-plugin-taglib.html
@@ -29,7 +29,7 @@
<td valign="top" align="right"></td>
</tr></table></div>
<div class="refsect1">
-<a name="idp25914992"></a><h2>Plugin Information</h2>
+<a name="idp24998816"></a><h2>Plugin Information</h2>
<div class="variablelist"><table border="0">
<col align="left" valign="top">
<tbody>
@@ -57,7 +57,7 @@
</table></div>
</div>
<div class="refsect1">
-<a name="idp25758160"></a><h2>Elements</h2>
+<a name="idp23714224"></a><h2>Elements</h2>
<div class="variablelist"><table border="0">
<col align="left" valign="top">
<tbody>
diff --git a/docs/plugins/html/gst-plugins-good-plugins-plugin-udp.html b/docs/plugins/html/gst-plugins-good-plugins-plugin-udp.html
index 77395481bc409beb12715ddded355d101cfcc0e4..7028d665ea11500bfa603a12cceae4ab84b42114 100644
--- a/docs/plugins/html/gst-plugins-good-plugins-plugin-udp.html
+++ b/docs/plugins/html/gst-plugins-good-plugins-plugin-udp.html
@@ -29,7 +29,7 @@
<td valign="top" align="right"></td>
</tr></table></div>
<div class="refsect1">
-<a name="idp25330576"></a><h2>Plugin Information</h2>
+<a name="idp25742368"></a><h2>Plugin Information</h2>
<div class="variablelist"><table border="0">
<col align="left" valign="top">
<tbody>
@@ -57,7 +57,7 @@
</table></div>
</div>
<div class="refsect1">
-<a name="idp23664416"></a><h2>Elements</h2>
+<a name="idp23944176"></a><h2>Elements</h2>
<div class="variablelist"><table border="0">
<col align="left" valign="top">
<tbody>
diff --git a/docs/plugins/html/gst-plugins-good-plugins-plugin-video4linux2.html b/docs/plugins/html/gst-plugins-good-plugins-plugin-video4linux2.html
index 5421ad872987374c645d7a99d14e4f62d28a2e3e..85a8db8d352e9cc4d80a95901ad364c8266d458e 100644
--- a/docs/plugins/html/gst-plugins-good-plugins-plugin-video4linux2.html
+++ b/docs/plugins/html/gst-plugins-good-plugins-plugin-video4linux2.html
@@ -29,7 +29,7 @@
<td valign="top" align="right"></td>
</tr></table></div>
<div class="refsect1">
-<a name="idp25365376"></a><h2>Plugin Information</h2>
+<a name="idp25202752"></a><h2>Plugin Information</h2>
<div class="variablelist"><table border="0">
<col align="left" valign="top">
<tbody>
@@ -57,7 +57,7 @@
</table></div>
</div>
<div class="refsect1">
-<a name="idp25782272"></a><h2>Elements</h2>
+<a name="idp23521792"></a><h2>Elements</h2>
<div class="variablelist"><table border="0">
<col align="left" valign="top">
<tbody>
diff --git a/docs/plugins/html/gst-plugins-good-plugins-plugin-videobox.html b/docs/plugins/html/gst-plugins-good-plugins-plugin-videobox.html
index 8b092c6d8158e41c352276e1a70e331363048fe8..473b3f17f58cb477dace66fbd73be4ed653341d4 100644
--- a/docs/plugins/html/gst-plugins-good-plugins-plugin-videobox.html
+++ b/docs/plugins/html/gst-plugins-good-plugins-plugin-videobox.html
@@ -29,7 +29,7 @@
<td valign="top" align="right"></td>
</tr></table></div>
<div class="refsect1">
-<a name="idp24774864"></a><h2>Plugin Information</h2>
+<a name="idp25118400"></a><h2>Plugin Information</h2>
<div class="variablelist"><table border="0">
<col align="left" valign="top">
<tbody>
@@ -57,7 +57,7 @@
</table></div>
</div>
<div class="refsect1">
-<a name="idp25820544"></a><h2>Elements</h2>
+<a name="idp23682384"></a><h2>Elements</h2>
<div class="variablelist"><table border="0">
<col align="left" valign="top">
<tbody><tr>
diff --git a/docs/plugins/html/gst-plugins-good-plugins-plugin-videocrop.html b/docs/plugins/html/gst-plugins-good-plugins-plugin-videocrop.html
index 689512e01b49f8196256ee37697e041baad4bb9a..168e648719e63178c96923756f8eeb9eb331664a 100644
--- a/docs/plugins/html/gst-plugins-good-plugins-plugin-videocrop.html
+++ b/docs/plugins/html/gst-plugins-good-plugins-plugin-videocrop.html
@@ -29,7 +29,7 @@
<td valign="top" align="right"></td>
</tr></table></div>
<div class="refsect1">
-<a name="idp24556336"></a><h2>Plugin Information</h2>
+<a name="idp24309920"></a><h2>Plugin Information</h2>
<div class="variablelist"><table border="0">
<col align="left" valign="top">
<tbody>
@@ -57,7 +57,7 @@
</table></div>
</div>
<div class="refsect1">
-<a name="idp26281504"></a><h2>Elements</h2>
+<a name="idp25896208"></a><h2>Elements</h2>
<div class="variablelist"><table border="0">
<col align="left" valign="top">
<tbody>
diff --git a/docs/plugins/html/gst-plugins-good-plugins-plugin-videofilter.html b/docs/plugins/html/gst-plugins-good-plugins-plugin-videofilter.html
index 48afcb9394d5a041a1f2015396b465db71f2c236..05500661d5d0dc65aeb7f5b197aa5ff75511398c 100644
--- a/docs/plugins/html/gst-plugins-good-plugins-plugin-videofilter.html
+++ b/docs/plugins/html/gst-plugins-good-plugins-plugin-videofilter.html
@@ -29,7 +29,7 @@
<td valign="top" align="right"></td>
</tr></table></div>
<div class="refsect1">
-<a name="idp25492496"></a><h2>Plugin Information</h2>
+<a name="idp24734896"></a><h2>Plugin Information</h2>
<div class="variablelist"><table border="0">
<col align="left" valign="top">
<tbody>
@@ -57,7 +57,7 @@
</table></div>
</div>
<div class="refsect1">
-<a name="idp25283168"></a><h2>Elements</h2>
+<a name="idp23640976"></a><h2>Elements</h2>
<div class="variablelist"><table border="0">
<col align="left" valign="top">
<tbody>
diff --git a/docs/plugins/html/gst-plugins-good-plugins-plugin-videomixer.html b/docs/plugins/html/gst-plugins-good-plugins-plugin-videomixer.html
index 6fcf3ea28f53837cfe7ea3afb5d93e4bc2a2c2c3..6264bb3d50e5f97f8023f704bbaf761c1b63864a 100644
--- a/docs/plugins/html/gst-plugins-good-plugins-plugin-videomixer.html
+++ b/docs/plugins/html/gst-plugins-good-plugins-plugin-videomixer.html
@@ -29,7 +29,7 @@
<td valign="top" align="right"></td>
</tr></table></div>
<div class="refsect1">
-<a name="idp25631200"></a><h2>Plugin Information</h2>
+<a name="idp25448816"></a><h2>Plugin Information</h2>
<div class="variablelist"><table border="0">
<col align="left" valign="top">
<tbody>
@@ -57,7 +57,7 @@
</table></div>
</div>
<div class="refsect1">
-<a name="idp25396128"></a><h2>Elements</h2>
+<a name="idp24020080"></a><h2>Elements</h2>
<div class="variablelist"><table border="0">
<col align="left" valign="top">
<tbody><tr>
diff --git a/docs/plugins/html/gst-plugins-good-plugins-plugin-waveform.html b/docs/plugins/html/gst-plugins-good-plugins-plugin-waveform.html
index cf695c6a116ff63e23f49057181d7e4de2a57f3b..4d19947c80ae028b4490eb41375b8710df1f4cf6 100644
--- a/docs/plugins/html/gst-plugins-good-plugins-plugin-waveform.html
+++ b/docs/plugins/html/gst-plugins-good-plugins-plugin-waveform.html
@@ -29,7 +29,7 @@
<td valign="top" align="right"></td>
</tr></table></div>
<div class="refsect1">
-<a name="idp25600912"></a><h2>Plugin Information</h2>
+<a name="idp25602448"></a><h2>Plugin Information</h2>
<div class="variablelist"><table border="0">
<col align="left" valign="top">
<tbody>
@@ -57,7 +57,7 @@
</table></div>
</div>
<div class="refsect1">
-<a name="idp25491200"></a><h2>Elements</h2>
+<a name="idp25400112"></a><h2>Elements</h2>
<div class="variablelist"><table border="0">
<col align="left" valign="top">
<tbody><tr>
diff --git a/docs/plugins/html/gst-plugins-good-plugins-plugin-wavenc.html b/docs/plugins/html/gst-plugins-good-plugins-plugin-wavenc.html
index e9c452b2e80820ab2cff8f0e294b1f2337c6c8da..6e993858665d7c7a6098b2dbf4e89c6d1a6239e6 100644
--- a/docs/plugins/html/gst-plugins-good-plugins-plugin-wavenc.html
+++ b/docs/plugins/html/gst-plugins-good-plugins-plugin-wavenc.html
@@ -29,7 +29,7 @@
<td valign="top" align="right"></td>
</tr></table></div>
<div class="refsect1">
-<a name="idp25911392"></a><h2>Plugin Information</h2>
+<a name="idp25840016"></a><h2>Plugin Information</h2>
<div class="variablelist"><table border="0">
<col align="left" valign="top">
<tbody>
@@ -57,7 +57,7 @@
</table></div>
</div>
<div class="refsect1">
-<a name="idp23639504"></a><h2>Elements</h2>
+<a name="idp24021760"></a><h2>Elements</h2>
<div class="variablelist"><table border="0">
<col align="left" valign="top">
<tbody><tr>
diff --git a/docs/plugins/html/gst-plugins-good-plugins-plugin-wavpack.html b/docs/plugins/html/gst-plugins-good-plugins-plugin-wavpack.html
index 7b16ecce9e17f9dda198cac4c96bc0803321555f..cebaceffcad3dcdb5c7f6cbe5f785db1ce9db43d 100644
--- a/docs/plugins/html/gst-plugins-good-plugins-plugin-wavpack.html
+++ b/docs/plugins/html/gst-plugins-good-plugins-plugin-wavpack.html
@@ -29,7 +29,7 @@
<td valign="top" align="right"></td>
</tr></table></div>
<div class="refsect1">
-<a name="idp25842336"></a><h2>Plugin Information</h2>
+<a name="idp25677776"></a><h2>Plugin Information</h2>
<div class="variablelist"><table border="0">
<col align="left" valign="top">
<tbody>
@@ -57,7 +57,7 @@
</table></div>
</div>
<div class="refsect1">
-<a name="idp20034384"></a><h2>Elements</h2>
+<a name="idp23324752"></a><h2>Elements</h2>
<div class="variablelist"><table border="0">
<col align="left" valign="top">
<tbody>
diff --git a/docs/plugins/html/gst-plugins-good-plugins-plugin-wavparse.html b/docs/plugins/html/gst-plugins-good-plugins-plugin-wavparse.html
index cb815c7b50da6b3a76c00fa67a31a92c143c5b86..1a18437e8c99bea36d79f79ef1623a530ab698d2 100644
--- a/docs/plugins/html/gst-plugins-good-plugins-plugin-wavparse.html
+++ b/docs/plugins/html/gst-plugins-good-plugins-plugin-wavparse.html
@@ -29,7 +29,7 @@
<td valign="top" align="right"></td>
</tr></table></div>
<div class="refsect1">
-<a name="idp25662016"></a><h2>Plugin Information</h2>
+<a name="idp25753920"></a><h2>Plugin Information</h2>
<div class="variablelist"><table border="0">
<col align="left" valign="top">
<tbody>
@@ -57,7 +57,7 @@
</table></div>
</div>
<div class="refsect1">
-<a name="idp25325072"></a><h2>Elements</h2>
+<a name="idp20506976"></a><h2>Elements</h2>
<div class="variablelist"><table border="0">
<col align="left" valign="top">
<tbody><tr>
diff --git a/docs/plugins/html/gst-plugins-good-plugins-plugin-ximagesrc.html b/docs/plugins/html/gst-plugins-good-plugins-plugin-ximagesrc.html
index 1b54acb15912cf665fe2b4c38cdb6b942b54b2b9..f3c4c183df6340685af16f448c6c6a4b2d09779a 100644
--- a/docs/plugins/html/gst-plugins-good-plugins-plugin-ximagesrc.html
+++ b/docs/plugins/html/gst-plugins-good-plugins-plugin-ximagesrc.html
@@ -29,7 +29,7 @@
<td valign="top" align="right"></td>
</tr></table></div>
<div class="refsect1">
-<a name="idp24824816"></a><h2>Plugin Information</h2>
+<a name="idp22367568"></a><h2>Plugin Information</h2>
<div class="variablelist"><table border="0">
<col align="left" valign="top">
<tbody>
@@ -57,7 +57,7 @@
</table></div>
</div>
<div class="refsect1">
-<a name="idp24415696"></a><h2>Elements</h2>
+<a name="idp23535504"></a><h2>Elements</h2>
<div class="variablelist"><table border="0">
<col align="left" valign="top">
<tbody><tr>
diff --git a/docs/plugins/html/gst-plugins-good-plugins-plugin-y4menc.html b/docs/plugins/html/gst-plugins-good-plugins-plugin-y4menc.html
index 9e113838a057c408948f84d92fdaa5bbb2e01663..933f6ef1f20d174d589ffe2e23f7f3644ccecb1e 100644
--- a/docs/plugins/html/gst-plugins-good-plugins-plugin-y4menc.html
+++ b/docs/plugins/html/gst-plugins-good-plugins-plugin-y4menc.html
@@ -29,7 +29,7 @@
<td valign="top" align="right"></td>
</tr></table></div>
<div class="refsect1">
-<a name="idp25014640"></a><h2>Plugin Information</h2>
+<a name="idp26295152"></a><h2>Plugin Information</h2>
<div class="variablelist"><table border="0">
<col align="left" valign="top">
<tbody>
@@ -57,7 +57,7 @@
</table></div>
</div>
<div class="refsect1">
-<a name="idp22717824"></a><h2>Elements</h2>
+<a name="idp24831392"></a><h2>Elements</h2>
<div class="variablelist"><table border="0">
<col align="left" valign="top">
<tbody><tr>
diff --git a/docs/plugins/html/gst-plugins-good-plugins-pngdec.html b/docs/plugins/html/gst-plugins-good-plugins-pngdec.html
index a5c5f9ce5042bae3f490a4078b56569f250a4ec2..d6afe8d203aca731a13a66d27b01408a77dda98a 100644
--- a/docs/plugins/html/gst-plugins-good-plugins-pngdec.html
+++ b/docs/plugins/html/gst-plugins-good-plugins-pngdec.html
@@ -57,7 +57,7 @@
<div class="refsynopsisdiv">
<h2>Synopsis</h2>
<div class="refsect2">
-<a name="idp15945632"></a><h3>Element Information</h3>
+<a name="idp13508640"></a><h3>Element Information</h3>
<div class="variablelist"><table border="0">
<col align="left" valign="top">
<tbody>
@@ -80,7 +80,7 @@
</div>
<hr>
<div class="refsect2">
-<a name="idp12621872"></a><h3>Element Pads</h3>
+<a name="idp15764176"></a><h3>Element Pads</h3>
<div class="variablelist"><table border="0">
<col align="left" valign="top">
<tbody>
diff --git a/docs/plugins/html/gst-plugins-good-plugins-pngenc.html b/docs/plugins/html/gst-plugins-good-plugins-pngenc.html
index d05e64f7376f6c5779bcab297aa92b1fea18775f..c655076916249066c8c81db199b9ba646d45f819 100644
--- a/docs/plugins/html/gst-plugins-good-plugins-pngenc.html
+++ b/docs/plugins/html/gst-plugins-good-plugins-pngenc.html
@@ -66,7 +66,7 @@
<div class="refsynopsisdiv">
<h2>Synopsis</h2>
<div class="refsect2">
-<a name="idp16649952"></a><h3>Element Information</h3>
+<a name="idp13316944"></a><h3>Element Information</h3>
<div class="variablelist"><table border="0">
<col align="left" valign="top">
<tbody>
@@ -89,7 +89,7 @@
</div>
<hr>
<div class="refsect2">
-<a name="idp15355568"></a><h3>Element Pads</h3>
+<a name="idp15239952"></a><h3>Element Pads</h3>
<div class="variablelist"><table border="0">
<col align="left" valign="top">
<tbody>
diff --git a/docs/plugins/html/gst-plugins-good-plugins-progressreport.html b/docs/plugins/html/gst-plugins-good-plugins-progressreport.html
index 1f77f4a17de4f25608dc88a6a5865bf8a2265847..1b1bdfeee95a493a4ef31fe8be6e0b9c3e0bfc7c 100644
--- a/docs/plugins/html/gst-plugins-good-plugins-progressreport.html
+++ b/docs/plugins/html/gst-plugins-good-plugins-progressreport.html
@@ -104,7 +104,7 @@ a whole).
<p>
</p>
<div class="refsect2">
-<a name="idp12550160"></a><h3>Example launch line</h3>
+<a name="idp13991040"></a><h3>Example launch line</h3>
<div class="informalexample">
<table class="listing_frame" border="0" cellpadding="0" cellspacing="0">
<tbody>
@@ -133,7 +133,7 @@ a whole).
<div class="refsynopsisdiv">
<h2>Synopsis</h2>
<div class="refsect2">
-<a name="idp17552032"></a><h3>Element Information</h3>
+<a name="idp7256736"></a><h3>Element Information</h3>
<div class="variablelist"><table border="0">
<col align="left" valign="top">
<tbody>
@@ -156,7 +156,7 @@ a whole).
</div>
<hr>
<div class="refsect2">
-<a name="idp13621664"></a><h3>Element Pads</h3>
+<a name="idp18138176"></a><h3>Element Pads</h3>
<div class="variablelist"><table border="0">
<col align="left" valign="top">
<tbody>
diff --git a/docs/plugins/html/gst-plugins-good-plugins-pulsemixer.html b/docs/plugins/html/gst-plugins-good-plugins-pulsemixer.html
index eda9ca5466fe9b21070aa68d3acadec5ed71f835..8a9f1cb8b910f9a2b47760a4b103a9b1e8a6520b 100644
--- a/docs/plugins/html/gst-plugins-good-plugins-pulsemixer.html
+++ b/docs/plugins/html/gst-plugins-good-plugins-pulsemixer.html
@@ -24,12 +24,6 @@
<a href="#gst-plugins-good-plugins-pulsemixer.synopsis" class="shortcut">Top</a>
 |Â
<a href="#gst-plugins-good-plugins-pulsemixer.description" class="shortcut">Description</a>
- Â |Â
- <a href="#gst-plugins-good-plugins-pulsemixer.object-hierarchy" class="shortcut">Object Hierarchy</a>
- Â |Â
- <a href="#gst-plugins-good-plugins-pulsemixer.implemented-interfaces" class="shortcut">Implemented Interfaces</a>
- Â |Â
- <a href="#gst-plugins-good-plugins-pulsemixer.properties" class="shortcut">Properties</a>
</td></tr>
</table>
<div class="refentry">
@@ -43,39 +37,14 @@
</tr></table></div>
<div class="refsynopsisdiv">
<a name="gst-plugins-good-plugins-pulsemixer.synopsis"></a><h2>Synopsis</h2>
-<a name="GstPulseMixer"></a><pre class="synopsis">struct <a class="link" href="gst-plugins-good-plugins-pulsemixer.html#GstPulseMixer-struct" title="struct GstPulseMixer">GstPulseMixer</a>;
-</pre>
-</div>
-<div class="refsect1">
-<a name="gst-plugins-good-plugins-pulsemixer.object-hierarchy"></a><h2>Object Hierarchy</h2>
-<pre class="synopsis">
- <a href="http://library.gnome.org/devel/gobject/unstable/gobject-The-Base-Object-Type.html#GObject">GObject</a>
- +----<a href="http://library.gnome.org/devel/gobject/unstable/gobject-The-Base-Object-Type.html#GInitiallyUnowned">GInitiallyUnowned</a>
- +----<a href="http://gstreamer.freedesktop.org/data/doc/gstreamer/head/gstreamer/html/GstObject.html">GstObject</a>
- +----<a href="http://gstreamer.freedesktop.org/data/doc/gstreamer/head/gstreamer/html/GstElement.html">GstElement</a>
- +----GstPulseMixer
-</pre>
-</div>
-<div class="refsect1">
-<a name="gst-plugins-good-plugins-pulsemixer.implemented-interfaces"></a><h2>Implemented Interfaces</h2>
-<p>
-GstPulseMixer implements
- <a href="http://gstreamer.freedesktop.org/data/doc/gstreamer/head/gst-plugins-base-libs/html/gst-plugins-base-libs-gstmixer.html#GstMixer">GstMixer</a>.</p>
-</div>
-<div class="refsect1">
-<a name="gst-plugins-good-plugins-pulsemixer.properties"></a><h2>Properties</h2>
-<pre class="synopsis">
- "<a class="link" href="gst-plugins-good-plugins-pulsemixer.html#GstPulseMixer--device" title='The "device" property'>device</a>" <a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gchar"><span class="type">gchar</span></a>* : Read / Write
- "<a class="link" href="gst-plugins-good-plugins-pulsemixer.html#GstPulseMixer--device-name" title='The "device-name" property'>device-name</a>" <a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gchar"><span class="type">gchar</span></a>* : Read
- "<a class="link" href="gst-plugins-good-plugins-pulsemixer.html#GstPulseMixer--server" title='The "server" property'>server</a>" <a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gchar"><span class="type">gchar</span></a>* : Read / Write
-</pre>
+<pre class="synopsis"></pre>
</div>
<div class="refsect1">
<a name="gst-plugins-good-plugins-pulsemixer.description"></a><h2>Description</h2>
<div class="refsynopsisdiv">
<h2>Synopsis</h2>
<div class="refsect2">
-<a name="idp15014608"></a><h3>Element Information</h3>
+<a name="idp12358688"></a><h3>Element Information</h3>
<div class="variablelist"><table border="0">
<col align="left" valign="top">
<tbody>
@@ -98,7 +67,7 @@ GstPulseMixer implements
</div>
<hr>
<div class="refsect2">
-<a name="idp16442464"></a><h3>Element Pads</h3>
+<a name="idp17805504"></a><h3>Element Pads</h3>
</div>
</div>
<p>
@@ -106,35 +75,6 @@ GstPulseMixer implements
</div>
<div class="refsect1">
<a name="gst-plugins-good-plugins-pulsemixer.details"></a><h2>Details</h2>
-<div class="refsect2">
-<a name="GstPulseMixer-struct"></a><h3>struct GstPulseMixer</h3>
-<pre class="programlisting">struct GstPulseMixer;</pre>
-<p>
-</p>
-</div>
-</div>
-<div class="refsect1">
-<a name="gst-plugins-good-plugins-pulsemixer.property-details"></a><h2>Property Details</h2>
-<div class="refsect2">
-<a name="GstPulseMixer--device"></a><h3>The <code class="literal">"device"</code> property</h3>
-<pre class="programlisting"> "device" <a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gchar"><span class="type">gchar</span></a>* : Read / Write</pre>
-<p>The PulseAudio sink or source to control.</p>
-<p>Default value: NULL</p>
-</div>
-<hr>
-<div class="refsect2">
-<a name="GstPulseMixer--device-name"></a><h3>The <code class="literal">"device-name"</code> property</h3>
-<pre class="programlisting"> "device-name" <a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gchar"><span class="type">gchar</span></a>* : Read</pre>
-<p>Human-readable name of the sound device.</p>
-<p>Default value: NULL</p>
-</div>
-<hr>
-<div class="refsect2">
-<a name="GstPulseMixer--server"></a><h3>The <code class="literal">"server"</code> property</h3>
-<pre class="programlisting"> "server" <a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gchar"><span class="type">gchar</span></a>* : Read / Write</pre>
-<p>The PulseAudio server to connect to.</p>
-<p>Default value: NULL</p>
-</div>
</div>
</div>
<div class="footer">
diff --git a/docs/plugins/html/gst-plugins-good-plugins-pulsesink.html b/docs/plugins/html/gst-plugins-good-plugins-pulsesink.html
index 12fa2c91af4514140ed0bb2dba876627c278318c..ef496d5a38a2f6c42017aa93e081bbad93a088ea 100644
--- a/docs/plugins/html/gst-plugins-good-plugins-pulsesink.html
+++ b/docs/plugins/html/gst-plugins-good-plugins-pulsesink.html
@@ -54,7 +54,7 @@
+----<a href="http://gstreamer.freedesktop.org/data/doc/gstreamer/head/gstreamer/html/GstObject.html">GstObject</a>
+----<a href="http://gstreamer.freedesktop.org/data/doc/gstreamer/head/gstreamer/html/GstElement.html">GstElement</a>
+----<a href="http://gstreamer.freedesktop.org/data/doc/gstreamer/head/gstreamer-libs/html/GstBaseSink.html">GstBaseSink</a>
- +----GstAudioBaseSink
+ +----<a href="http://gstreamer.freedesktop.org/data/doc/gstreamer/head/gst-plugins-base-libs/html/gst-plugins-base-libs-gstaudiobasesink.html#GstAudioBaseSink">GstAudioBaseSink</a>
+----GstPulseSink
</pre>
</div>
@@ -82,7 +82,7 @@ GstPulseSink implements
<div class="refsynopsisdiv">
<h2>Synopsis</h2>
<div class="refsect2">
-<a name="idp14691120"></a><h3>Element Information</h3>
+<a name="idp10988000"></a><h3>Element Information</h3>
<div class="variablelist"><table border="0">
<col align="left" valign="top">
<tbody>
@@ -105,7 +105,7 @@ GstPulseSink implements
</div>
<hr>
<div class="refsect2">
-<a name="idp18142160"></a><h3>Element Pads</h3>
+<a name="idp16601440"></a><h3>Element Pads</h3>
<div class="variablelist"><table border="0">
<col align="left" valign="top">
<tbody>
diff --git a/docs/plugins/html/gst-plugins-good-plugins-pulsesrc.html b/docs/plugins/html/gst-plugins-good-plugins-pulsesrc.html
index d53794d55b7c68ec1faecd18e94e25b1c3aa2a46..d6e333fc7d5a906eaa53326a757162730ccc4cd6 100644
--- a/docs/plugins/html/gst-plugins-good-plugins-pulsesrc.html
+++ b/docs/plugins/html/gst-plugins-good-plugins-pulsesrc.html
@@ -55,7 +55,7 @@
+----<a href="http://gstreamer.freedesktop.org/data/doc/gstreamer/head/gstreamer/html/GstElement.html">GstElement</a>
+----<a href="http://gstreamer.freedesktop.org/data/doc/gstreamer/head/gstreamer-libs/html/GstBaseSrc.html">GstBaseSrc</a>
+----<a href="http://gstreamer.freedesktop.org/data/doc/gstreamer/head/gstreamer-libs/html/GstPushSrc.html">GstPushSrc</a>
- +----GstAudioBaseSrc
+ +----<a href="http://gstreamer.freedesktop.org/data/doc/gstreamer/head/gst-plugins-base-libs/html/gst-plugins-base-libs-gstaudiobasesrc.html#GstAudioBaseSrc">GstAudioBaseSrc</a>
+----<a href="http://gstreamer.freedesktop.org/data/doc/gstreamer/head/gst-plugins-base-libs/html/gst-plugins-base-libs-gstaudiosrc.html#GstAudioSrc">GstAudioSrc</a>
+----GstPulseSrc
</pre>
@@ -85,7 +85,7 @@ GstPulseSrc implements
<div class="refsynopsisdiv">
<h2>Synopsis</h2>
<div class="refsect2">
-<a name="idp14332336"></a><h3>Element Information</h3>
+<a name="idp17836224"></a><h3>Element Information</h3>
<div class="variablelist"><table border="0">
<col align="left" valign="top">
<tbody>
@@ -108,7 +108,7 @@ GstPulseSrc implements
</div>
<hr>
<div class="refsect2">
-<a name="idp16679552"></a><h3>Element Pads</h3>
+<a name="idp17185552"></a><h3>Element Pads</h3>
<div class="variablelist"><table border="0">
<col align="left" valign="top">
<tbody>
diff --git a/docs/plugins/html/gst-plugins-good-plugins-qtdemux.html b/docs/plugins/html/gst-plugins-good-plugins-qtdemux.html
index 180b93df36f2f2125f601e893c3481e5f9976bf8..ff087f5dd859db7e626d25f8ee3e6021896fbcbd 100644
--- a/docs/plugins/html/gst-plugins-good-plugins-qtdemux.html
+++ b/docs/plugins/html/gst-plugins-good-plugins-qtdemux.html
@@ -72,7 +72,7 @@ capabilities of the upstream elements.
<p>
</p>
<div class="refsect2">
-<a name="idp15020656"></a><h3>Example launch line</h3>
+<a name="idp16198944"></a><h3>Example launch line</h3>
<div class="informalexample">
<table class="listing_frame" border="0" cellpadding="0" cellspacing="0">
<tbody>
@@ -96,7 +96,7 @@ Last reviewed on 2006-12-29 (0.10.5)
<div class="refsynopsisdiv">
<h2>Synopsis</h2>
<div class="refsect2">
-<a name="idp15524320"></a><h3>Element Information</h3>
+<a name="idp17206640"></a><h3>Element Information</h3>
<div class="variablelist"><table border="0">
<col align="left" valign="top">
<tbody>
@@ -119,7 +119,7 @@ Last reviewed on 2006-12-29 (0.10.5)
</div>
<hr>
<div class="refsect2">
-<a name="idp15016384"></a><h3>Element Pads</h3>
+<a name="idp18403552"></a><h3>Element Pads</h3>
<div class="variablelist"><table border="0">
<col align="left" valign="top">
<tbody>
diff --git a/docs/plugins/html/gst-plugins-good-plugins-qtmoovrecover.html b/docs/plugins/html/gst-plugins-good-plugins-qtmoovrecover.html
index 9e5a7d06e34f3a8f2a56c71a78cca284cae70536..d50551bc74f85587d0b724c9112a2e4172d75bd3 100644
--- a/docs/plugins/html/gst-plugins-good-plugins-qtmoovrecover.html
+++ b/docs/plugins/html/gst-plugins-good-plugins-qtmoovrecover.html
@@ -81,7 +81,7 @@ GstQTMoovRecover implements
<p>
</p>
<div class="refsect2">
-<a name="idp10728128"></a><h3>Example pipelines</h3>
+<a name="idp17765248"></a><h3>Example pipelines</h3>
<p>
This element recovers quicktime files created with qtmux using the moov
recovery feature.
@@ -102,7 +102,7 @@ Documentation last reviewed on 2011-04-21
<div class="refsynopsisdiv">
<h2>Synopsis</h2>
<div class="refsect2">
-<a name="idp17483184"></a><h3>Element Information</h3>
+<a name="idp14195840"></a><h3>Element Information</h3>
<div class="variablelist"><table border="0">
<col align="left" valign="top">
<tbody>
@@ -125,7 +125,7 @@ Documentation last reviewed on 2011-04-21
</div>
<hr>
<div class="refsect2">
-<a name="idp15966784"></a><h3>Element Pads</h3>
+<a name="idp16410720"></a><h3>Element Pads</h3>
</div>
</div>
<p>
diff --git a/docs/plugins/html/gst-plugins-good-plugins-qtmux.html b/docs/plugins/html/gst-plugins-good-plugins-qtmux.html
index fb37fade8b589489e027ab2050bf714e1c513a59..b21d023c7b39bc54053ee10daaa90c9087fe753e 100644
--- a/docs/plugins/html/gst-plugins-good-plugins-qtmux.html
+++ b/docs/plugins/html/gst-plugins-good-plugins-qtmux.html
@@ -133,7 +133,7 @@ presentation-timestamp.
<p>
</p>
<div class="refsect2">
-<a name="idp17404912"></a><h3>Example pipelines</h3>
+<a name="idp16989280"></a><h3>Example pipelines</h3>
<div class="informalexample">
<table class="listing_frame" border="0" cellpadding="0" cellspacing="0">
<tbody>
@@ -155,7 +155,7 @@ Last reviewed on 2010-12-03
<div class="refsynopsisdiv">
<h2>Synopsis</h2>
<div class="refsect2">
-<a name="idp15927056"></a><h3>Element Information</h3>
+<a name="idp16172624"></a><h3>Element Information</h3>
<div class="variablelist"><table border="0">
<col align="left" valign="top">
<tbody>
@@ -178,7 +178,7 @@ Last reviewed on 2010-12-03
</div>
<hr>
<div class="refsect2">
-<a name="idp16462880"></a><h3>Element Pads</h3>
+<a name="idp12515216"></a><h3>Element Pads</h3>
<div class="variablelist"><table border="0">
<col align="left" valign="top">
<tbody>
diff --git a/docs/plugins/html/gst-plugins-good-plugins-quarktv.html b/docs/plugins/html/gst-plugins-good-plugins-quarktv.html
index 5c9781aa18dba544d873f4f1e35465327dfbdc7a..9c7476107aa43260a4f53c43a8d0689dde370545 100644
--- a/docs/plugins/html/gst-plugins-good-plugins-quarktv.html
+++ b/docs/plugins/html/gst-plugins-good-plugins-quarktv.html
@@ -72,7 +72,7 @@ of the video along each line.
<p>
</p>
<div class="refsect2">
-<a name="idp15983952"></a><h3>Example launch line</h3>
+<a name="idp7403632"></a><h3>Example launch line</h3>
<div class="informalexample">
<table class="listing_frame" border="0" cellpadding="0" cellspacing="0">
<tbody>
@@ -90,7 +90,7 @@ of the video along each line.
<div class="refsynopsisdiv">
<h2>Synopsis</h2>
<div class="refsect2">
-<a name="idp14445824"></a><h3>Element Information</h3>
+<a name="idp16391712"></a><h3>Element Information</h3>
<div class="variablelist"><table border="0">
<col align="left" valign="top">
<tbody>
@@ -113,7 +113,7 @@ of the video along each line.
</div>
<hr>
<div class="refsect2">
-<a name="idp12663680"></a><h3>Element Pads</h3>
+<a name="idp17691664"></a><h3>Element Pads</h3>
<div class="variablelist"><table border="0">
<col align="left" valign="top">
<tbody>
diff --git a/docs/plugins/html/gst-plugins-good-plugins-radioactv.html b/docs/plugins/html/gst-plugins-good-plugins-radioactv.html
index b670f470262a3348d43018af4c1b4e4f0070af27..a1f40f32281af8c738120b7879b4d00e4ce78318 100644
--- a/docs/plugins/html/gst-plugins-good-plugins-radioactv.html
+++ b/docs/plugins/html/gst-plugins-good-plugins-radioactv.html
@@ -83,7 +83,7 @@ previous frame displayed. The effect of strobe2 is stronger than strobe1.
<p>
</p>
<div class="refsect2">
-<a name="idp14409600"></a><h3>Example launch line</h3>
+<a name="idp10854224"></a><h3>Example launch line</h3>
<div class="informalexample">
<table class="listing_frame" border="0" cellpadding="0" cellspacing="0">
<tbody>
@@ -101,7 +101,7 @@ previous frame displayed. The effect of strobe2 is stronger than strobe1.
<div class="refsynopsisdiv">
<h2>Synopsis</h2>
<div class="refsect2">
-<a name="idp17200336"></a><h3>Element Information</h3>
+<a name="idp18848112"></a><h3>Element Information</h3>
<div class="variablelist"><table border="0">
<col align="left" valign="top">
<tbody>
@@ -124,7 +124,7 @@ previous frame displayed. The effect of strobe2 is stronger than strobe1.
</div>
<hr>
<div class="refsect2">
-<a name="idp17884160"></a><h3>Element Pads</h3>
+<a name="idp15835168"></a><h3>Element Pads</h3>
<div class="variablelist"><table border="0">
<col align="left" valign="top">
<tbody>
diff --git a/docs/plugins/html/gst-plugins-good-plugins-revtv.html b/docs/plugins/html/gst-plugins-good-plugins-revtv.html
index e137a8e2e336afb04971b597e1d31b890c0094bd..eaeda0fb47e99aa9bb8b1c73bc98b58a70007abc 100644
--- a/docs/plugins/html/gst-plugins-good-plugins-revtv.html
+++ b/docs/plugins/html/gst-plugins-good-plugins-revtv.html
@@ -69,7 +69,7 @@
<div class="refsynopsisdiv">
<h2>Synopsis</h2>
<div class="refsect2">
-<a name="idp13727888"></a><h3>Element Information</h3>
+<a name="idp16197088"></a><h3>Element Information</h3>
<div class="variablelist"><table border="0">
<col align="left" valign="top">
<tbody>
@@ -92,7 +92,7 @@
</div>
<hr>
<div class="refsect2">
-<a name="idp14594624"></a><h3>Element Pads</h3>
+<a name="idp15120032"></a><h3>Element Pads</h3>
<div class="variablelist"><table border="0">
<col align="left" valign="top">
<tbody>
diff --git a/docs/plugins/html/gst-plugins-good-plugins-rganalysis.html b/docs/plugins/html/gst-plugins-good-plugins-rganalysis.html
index 1091d73f564625d3a1a028f6cab83875140f9ae6..8366ef9d7c55c53b7616b4c3ef4167306464e888 100644
--- a/docs/plugins/html/gst-plugins-good-plugins-rganalysis.html
+++ b/docs/plugins/html/gst-plugins-good-plugins-rganalysis.html
@@ -90,7 +90,7 @@ an album, not just the last one.
<p>
</p>
<div class="refsect2">
-<a name="idp16557488"></a><h3>Example launch lines</h3>
+<a name="idp18237024"></a><h3>Example launch lines</h3>
<div class="informalexample">
<table class="listing_frame" border="0" cellpadding="0" cellspacing="0">
<tbody>
@@ -138,7 +138,7 @@ property documentation for more information.
</p>
<hr>
<div class="refsect2">
-<a name="idp15253792"></a><h3>Acknowledgements</h3>
+<a name="idp15245040"></a><h3>Acknowledgements</h3>
<p>
This element is based on code used in the <a class="ulink" href="http://sjeng.org/vorbisgain.html" target="_top">vorbisgain</a> program and many
others. The relevant parts are copyrighted by David Robinson, Glen Sawyer
@@ -150,7 +150,7 @@ and Frank Klemm.
<div class="refsynopsisdiv">
<h2>Synopsis</h2>
<div class="refsect2">
-<a name="idp15988928"></a><h3>Element Information</h3>
+<a name="idp17882816"></a><h3>Element Information</h3>
<div class="variablelist"><table border="0">
<col align="left" valign="top">
<tbody>
@@ -173,7 +173,7 @@ and Frank Klemm.
</div>
<hr>
<div class="refsect2">
-<a name="idp16675600"></a><h3>Element Pads</h3>
+<a name="idp17377328"></a><h3>Element Pads</h3>
<div class="variablelist"><table border="0">
<col align="left" valign="top">
<tbody>
diff --git a/docs/plugins/html/gst-plugins-good-plugins-rglimiter.html b/docs/plugins/html/gst-plugins-good-plugins-rglimiter.html
index 5c42a5b0726819ccfb913666a806fbc0c90a1358..c103d233c802f6b9fb99663aa8dddc5869a9afa3 100644
--- a/docs/plugins/html/gst-plugins-good-plugins-rglimiter.html
+++ b/docs/plugins/html/gst-plugins-good-plugins-rglimiter.html
@@ -71,7 +71,7 @@ threshold of -6 dB. This type of filter is mentioned in the proposed <a class="
<p>
</p>
<div class="refsect2">
-<a name="idp16367360"></a><h3>Example launch line</h3>
+<a name="idp16485264"></a><h3>Example launch line</h3>
<div class="informalexample">
<table class="listing_frame" border="0" cellpadding="0" cellspacing="0">
<tbody>
@@ -93,7 +93,7 @@ Playback of a file
<div class="refsynopsisdiv">
<h2>Synopsis</h2>
<div class="refsect2">
-<a name="idp18661104"></a><h3>Element Information</h3>
+<a name="idp18422224"></a><h3>Element Information</h3>
<div class="variablelist"><table border="0">
<col align="left" valign="top">
<tbody>
@@ -116,7 +116,7 @@ Playback of a file
</div>
<hr>
<div class="refsect2">
-<a name="idp15407888"></a><h3>Element Pads</h3>
+<a name="idp18081200"></a><h3>Element Pads</h3>
<div class="variablelist"><table border="0">
<col align="left" valign="top">
<tbody>
diff --git a/docs/plugins/html/gst-plugins-good-plugins-rgvolume.html b/docs/plugins/html/gst-plugins-good-plugins-rgvolume.html
index 89bd1a6cec011459d15311398447605f896e82bb..8c7723d1ee09ffd4ade71cb55fa78d08eb11071e 100644
--- a/docs/plugins/html/gst-plugins-good-plugins-rgvolume.html
+++ b/docs/plugins/html/gst-plugins-good-plugins-rgvolume.html
@@ -104,7 +104,7 @@ element applies -6 dB hard limiting as mentioned in the ReplayGain standard.
<p>
</p>
<div class="refsect2">
-<a name="idp15961168"></a><h3>Example launch line</h3>
+<a name="idp17808000"></a><h3>Example launch line</h3>
<div class="informalexample">
<table class="listing_frame" border="0" cellpadding="0" cellspacing="0">
<tbody>
@@ -124,7 +124,7 @@ element applies -6 dB hard limiting as mentioned in the ReplayGain standard.
<div class="refsynopsisdiv">
<h2>Synopsis</h2>
<div class="refsect2">
-<a name="idp17400640"></a><h3>Element Information</h3>
+<a name="idp16300672"></a><h3>Element Information</h3>
<div class="variablelist"><table border="0">
<col align="left" valign="top">
<tbody>
@@ -147,7 +147,7 @@ element applies -6 dB hard limiting as mentioned in the ReplayGain standard.
</div>
<hr>
<div class="refsect2">
-<a name="idp17949744"></a><h3>Element Pads</h3>
+<a name="idp18297472"></a><h3>Element Pads</h3>
<div class="variablelist"><table border="0">
<col align="left" valign="top">
<tbody>
diff --git a/docs/plugins/html/gst-plugins-good-plugins-rippletv.html b/docs/plugins/html/gst-plugins-good-plugins-rippletv.html
index 89aa0d7e30c0fc47b47e42a14260a2ca344618aa..d3a928728077f8979a7c533d28a6caf61375261e 100644
--- a/docs/plugins/html/gst-plugins-good-plugins-rippletv.html
+++ b/docs/plugins/html/gst-plugins-good-plugins-rippletv.html
@@ -72,7 +72,7 @@ by motion or random rain drops.
<p>
</p>
<div class="refsect2">
-<a name="idp18404432"></a><h3>Example launch line</h3>
+<a name="idp15442720"></a><h3>Example launch line</h3>
<div class="informalexample">
<table class="listing_frame" border="0" cellpadding="0" cellspacing="0">
<tbody>
@@ -90,7 +90,7 @@ by motion or random rain drops.
<div class="refsynopsisdiv">
<h2>Synopsis</h2>
<div class="refsect2">
-<a name="idp19182240"></a><h3>Element Information</h3>
+<a name="idp17495024"></a><h3>Element Information</h3>
<div class="variablelist"><table border="0">
<col align="left" valign="top">
<tbody>
@@ -113,7 +113,7 @@ by motion or random rain drops.
</div>
<hr>
<div class="refsect2">
-<a name="idp16942064"></a><h3>Element Pads</h3>
+<a name="idp17383984"></a><h3>Element Pads</h3>
<div class="variablelist"><table border="0">
<col align="left" valign="top">
<tbody>
diff --git a/docs/plugins/html/gst-plugins-good-plugins-rtpbin.html b/docs/plugins/html/gst-plugins-good-plugins-rtpbin.html
index 81c5714c9fac534dfdad698080665bae8f283e36..ecbedefd7095d9b4cb3364c97c170fa970aff825 100644
--- a/docs/plugins/html/gst-plugins-good-plugins-rtpbin.html
+++ b/docs/plugins/html/gst-plugins-good-plugins-rtpbin.html
@@ -105,7 +105,7 @@ GstRtpBin implements
<div class="refsynopsisdiv">
<h2>Synopsis</h2>
<div class="refsect2">
-<a name="idp20267888"></a><h3>Element Information</h3>
+<a name="idp20120176"></a><h3>Element Information</h3>
<div class="variablelist"><table border="0">
<col align="left" valign="top">
<tbody>
@@ -128,7 +128,7 @@ GstRtpBin implements
</div>
<hr>
<div class="refsect2">
-<a name="idp20275296"></a><h3>Element Pads</h3>
+<a name="idp20127632"></a><h3>Element Pads</h3>
<div class="variablelist"><table border="0">
<col align="left" valign="top">
<tbody>
diff --git a/docs/plugins/html/gst-plugins-good-plugins-rtpdec.html b/docs/plugins/html/gst-plugins-good-plugins-rtpdec.html
index afd7ba1f33af3c3b5f0ffcf423410e9da71e56a9..9da97f8b1709d47d54cccb210812b30a5c82bcc5 100644
--- a/docs/plugins/html/gst-plugins-good-plugins-rtpdec.html
+++ b/docs/plugins/html/gst-plugins-good-plugins-rtpdec.html
@@ -87,7 +87,7 @@ Last reviewed on 2006-06-20 (0.10.4)
<div class="refsynopsisdiv">
<h2>Synopsis</h2>
<div class="refsect2">
-<a name="idp15824080"></a><h3>Element Information</h3>
+<a name="idp18076736"></a><h3>Element Information</h3>
<div class="variablelist"><table border="0">
<col align="left" valign="top">
<tbody>
@@ -110,7 +110,7 @@ Last reviewed on 2006-06-20 (0.10.4)
</div>
<hr>
<div class="refsect2">
-<a name="idp18848928"></a><h3>Element Pads</h3>
+<a name="idp16741456"></a><h3>Element Pads</h3>
<div class="variablelist"><table border="0">
<col align="left" valign="top">
<tbody>
diff --git a/docs/plugins/html/gst-plugins-good-plugins-rtpj2kpay.html b/docs/plugins/html/gst-plugins-good-plugins-rtpj2kpay.html
index 2f4a43d13281815412b6b5fa30baa840f304f077..19a59d9018cedc109b4ee609d5e451c731681ac8 100644
--- a/docs/plugins/html/gst-plugins-good-plugins-rtpj2kpay.html
+++ b/docs/plugins/html/gst-plugins-good-plugins-rtpj2kpay.html
@@ -51,7 +51,7 @@
+----<a href="http://library.gnome.org/devel/gobject/unstable/gobject-The-Base-Object-Type.html#GInitiallyUnowned">GInitiallyUnowned</a>
+----<a href="http://gstreamer.freedesktop.org/data/doc/gstreamer/head/gstreamer/html/GstObject.html">GstObject</a>
+----<a href="http://gstreamer.freedesktop.org/data/doc/gstreamer/head/gstreamer/html/GstElement.html">GstElement</a>
- +----GstRTPBasePayload
+ +----<a href="http://gstreamer.freedesktop.org/data/doc/gstreamer/head/gst-plugins-base-libs/html/gst-plugins-base-libs-gstrtpbasepayload.html#GstRTPBasePayload">GstRTPBasePayload</a>
+----GstRtpJ2KPay
</pre>
</div>
@@ -75,7 +75,7 @@ codestream.
<div class="refsynopsisdiv">
<h2>Synopsis</h2>
<div class="refsect2">
-<a name="idp17425904"></a><h3>Element Information</h3>
+<a name="idp16409504"></a><h3>Element Information</h3>
<div class="variablelist"><table border="0">
<col align="left" valign="top">
<tbody>
@@ -98,7 +98,7 @@ codestream.
</div>
<hr>
<div class="refsect2">
-<a name="idp19224912"></a><h3>Element Pads</h3>
+<a name="idp15968496"></a><h3>Element Pads</h3>
<div class="variablelist"><table border="0">
<col align="left" valign="top">
<tbody>
diff --git a/docs/plugins/html/gst-plugins-good-plugins-rtpjitterbuffer.html b/docs/plugins/html/gst-plugins-good-plugins-rtpjitterbuffer.html
index 2154d43cb70688961925afa788a6a93edfafff22..399247f0d007368849d59153a9ff28b70606ee2b 100644
--- a/docs/plugins/html/gst-plugins-good-plugins-rtpjitterbuffer.html
+++ b/docs/plugins/html/gst-plugins-good-plugins-rtpjitterbuffer.html
@@ -82,7 +82,7 @@
<div class="refsynopsisdiv">
<h2>Synopsis</h2>
<div class="refsect2">
-<a name="idp19880016"></a><h3>Element Information</h3>
+<a name="idp19063808"></a><h3>Element Information</h3>
<div class="variablelist"><table border="0">
<col align="left" valign="top">
<tbody>
@@ -105,7 +105,7 @@
</div>
<hr>
<div class="refsect2">
-<a name="idp19791056"></a><h3>Element Pads</h3>
+<a name="idp18771664"></a><h3>Element Pads</h3>
<div class="variablelist"><table border="0">
<col align="left" valign="top">
<tbody>
diff --git a/docs/plugins/html/gst-plugins-good-plugins-rtpjpegpay.html b/docs/plugins/html/gst-plugins-good-plugins-rtpjpegpay.html
index a1e4ba154ddba4e556ebcc8962eea1a406b76773..a5c2d919bce930e6debeb423924f9809203da9cf 100644
--- a/docs/plugins/html/gst-plugins-good-plugins-rtpjpegpay.html
+++ b/docs/plugins/html/gst-plugins-good-plugins-rtpjpegpay.html
@@ -51,7 +51,7 @@
+----<a href="http://library.gnome.org/devel/gobject/unstable/gobject-The-Base-Object-Type.html#GInitiallyUnowned">GInitiallyUnowned</a>
+----<a href="http://gstreamer.freedesktop.org/data/doc/gstreamer/head/gstreamer/html/GstObject.html">GstObject</a>
+----<a href="http://gstreamer.freedesktop.org/data/doc/gstreamer/head/gstreamer/html/GstElement.html">GstElement</a>
- +----GstRTPBasePayload
+ +----<a href="http://gstreamer.freedesktop.org/data/doc/gstreamer/head/gst-plugins-base-libs/html/gst-plugins-base-libs-gstrtpbasepayload.html#GstRTPBasePayload">GstRTPBasePayload</a>
+----GstRtpJPEGPay
</pre>
</div>
@@ -80,7 +80,7 @@ The payloader assumes that correct width and height is found in the caps.
<div class="refsynopsisdiv">
<h2>Synopsis</h2>
<div class="refsect2">
-<a name="idp15304144"></a><h3>Element Information</h3>
+<a name="idp19177456"></a><h3>Element Information</h3>
<div class="variablelist"><table border="0">
<col align="left" valign="top">
<tbody>
@@ -103,7 +103,7 @@ The payloader assumes that correct width and height is found in the caps.
</div>
<hr>
<div class="refsect2">
-<a name="idp19238016"></a><h3>Element Pads</h3>
+<a name="idp19227808"></a><h3>Element Pads</h3>
<div class="variablelist"><table border="0">
<col align="left" valign="top">
<tbody>
diff --git a/docs/plugins/html/gst-plugins-good-plugins-rtpptdemux.html b/docs/plugins/html/gst-plugins-good-plugins-rtpptdemux.html
index 416f90436226a807b4a1925885a95047fdaebb0c..35326fa7a996e3835b3b02650b3df1fbf1b1e988 100644
--- a/docs/plugins/html/gst-plugins-good-plugins-rtpptdemux.html
+++ b/docs/plugins/html/gst-plugins-good-plugins-rtpptdemux.html
@@ -68,7 +68,7 @@
<div class="refsynopsisdiv">
<h2>Synopsis</h2>
<div class="refsect2">
-<a name="idp17925264"></a><h3>Element Information</h3>
+<a name="idp18007024"></a><h3>Element Information</h3>
<div class="variablelist"><table border="0">
<col align="left" valign="top">
<tbody>
@@ -91,7 +91,7 @@
</div>
<hr>
<div class="refsect2">
-<a name="idp19279328"></a><h3>Element Pads</h3>
+<a name="idp10848784"></a><h3>Element Pads</h3>
<div class="variablelist"><table border="0">
<col align="left" valign="top">
<tbody>
diff --git a/docs/plugins/html/gst-plugins-good-plugins-rtpsession.html b/docs/plugins/html/gst-plugins-good-plugins-rtpsession.html
index 4cd99fdabdf2d2a5c830e75aaf83b5861871b4a9..f085d3d5da49383dd7dd4731712f736edf25a1dd 100644
--- a/docs/plugins/html/gst-plugins-good-plugins-rtpsession.html
+++ b/docs/plugins/html/gst-plugins-good-plugins-rtpsession.html
@@ -93,7 +93,7 @@
<div class="refsynopsisdiv">
<h2>Synopsis</h2>
<div class="refsect2">
-<a name="idp18211632"></a><h3>Element Information</h3>
+<a name="idp16718688"></a><h3>Element Information</h3>
<div class="variablelist"><table border="0">
<col align="left" valign="top">
<tbody>
@@ -116,7 +116,7 @@
</div>
<hr>
<div class="refsect2">
-<a name="idp18915808"></a><h3>Element Pads</h3>
+<a name="idp16750032"></a><h3>Element Pads</h3>
<div class="variablelist"><table border="0">
<col align="left" valign="top">
<tbody>
diff --git a/docs/plugins/html/gst-plugins-good-plugins-rtpssrcdemux.html b/docs/plugins/html/gst-plugins-good-plugins-rtpssrcdemux.html
index e66c637a012d549c43951fca084f3f73b456d00a..e975329ec1261e3d0028a1fc499c7b5eb2a33721 100644
--- a/docs/plugins/html/gst-plugins-good-plugins-rtpssrcdemux.html
+++ b/docs/plugins/html/gst-plugins-good-plugins-rtpssrcdemux.html
@@ -67,7 +67,7 @@
<div class="refsynopsisdiv">
<h2>Synopsis</h2>
<div class="refsect2">
-<a name="idp20155088"></a><h3>Element Information</h3>
+<a name="idp18382192"></a><h3>Element Information</h3>
<div class="variablelist"><table border="0">
<col align="left" valign="top">
<tbody>
@@ -90,7 +90,7 @@
</div>
<hr>
<div class="refsect2">
-<a name="idp18065936"></a><h3>Element Pads</h3>
+<a name="idp10443728"></a><h3>Element Pads</h3>
<div class="variablelist"><table border="0">
<col align="left" valign="top">
<tbody>
diff --git a/docs/plugins/html/gst-plugins-good-plugins-rtspsrc.html b/docs/plugins/html/gst-plugins-good-plugins-rtspsrc.html
index ee72ca48bdaeae12b591bfbffb37e1db2615db40..4ab5ddbb6cfd3374d9a3616afef81e2d3e3b260b 100644
--- a/docs/plugins/html/gst-plugins-good-plugins-rtspsrc.html
+++ b/docs/plugins/html/gst-plugins-good-plugins-rtspsrc.html
@@ -120,7 +120,7 @@ PLAYING state.
<p>
</p>
<div class="refsect2">
-<a name="idp18656768"></a><h3>Example launch line</h3>
+<a name="idp17495856"></a><h3>Example launch line</h3>
<div class="informalexample">
<table class="listing_frame" border="0" cellpadding="0" cellspacing="0">
<tbody>
@@ -142,7 +142,7 @@ Last reviewed on 2006-08-18 (0.10.5)
<div class="refsynopsisdiv">
<h2>Synopsis</h2>
<div class="refsect2">
-<a name="idp18806864"></a><h3>Element Information</h3>
+<a name="idp14815408"></a><h3>Element Information</h3>
<div class="variablelist"><table border="0">
<col align="left" valign="top">
<tbody>
@@ -165,7 +165,7 @@ Last reviewed on 2006-08-18 (0.10.5)
</div>
<hr>
<div class="refsect2">
-<a name="idp19436816"></a><h3>Element Pads</h3>
+<a name="idp19109360"></a><h3>Element Pads</h3>
<div class="variablelist"><table border="0">
<col align="left" valign="top">
<tbody>
diff --git a/docs/plugins/html/gst-plugins-good-plugins-shagadelictv.html b/docs/plugins/html/gst-plugins-good-plugins-shagadelictv.html
index 7fd2dfb15256de7e97cf283f3d092674a12cb6fe..e429624664034b852fc37a1594cd64aa8fe2a37a 100644
--- a/docs/plugins/html/gst-plugins-good-plugins-shagadelictv.html
+++ b/docs/plugins/html/gst-plugins-good-plugins-shagadelictv.html
@@ -62,7 +62,7 @@ Oh behave, ShagedelicTV makes images shagadelic!
<p>
</p>
<div class="refsect2">
-<a name="idp19856896"></a><h3>Example launch line</h3>
+<a name="idp17609472"></a><h3>Example launch line</h3>
<div class="informalexample">
<table class="listing_frame" border="0" cellpadding="0" cellspacing="0">
<tbody>
@@ -80,7 +80,7 @@ Oh behave, ShagedelicTV makes images shagadelic!
<div class="refsynopsisdiv">
<h2>Synopsis</h2>
<div class="refsect2">
-<a name="idp11929824"></a><h3>Element Information</h3>
+<a name="idp10381440"></a><h3>Element Information</h3>
<div class="variablelist"><table border="0">
<col align="left" valign="top">
<tbody>
@@ -103,7 +103,7 @@ Oh behave, ShagedelicTV makes images shagadelic!
</div>
<hr>
<div class="refsect2">
-<a name="idp15036288"></a><h3>Element Pads</h3>
+<a name="idp18154080"></a><h3>Element Pads</h3>
<div class="variablelist"><table border="0">
<col align="left" valign="top">
<tbody>
diff --git a/docs/plugins/html/gst-plugins-good-plugins-shapewipe.html b/docs/plugins/html/gst-plugins-good-plugins-shapewipe.html
index 82dcf8c7f1ebfdc623e9acbd6d2286aac14ba7c6..7d96529aab876dce31d32a8f826b96890281375b 100644
--- a/docs/plugins/html/gst-plugins-good-plugins-shapewipe.html
+++ b/docs/plugins/html/gst-plugins-good-plugins-shapewipe.html
@@ -77,7 +77,7 @@ page.
<p>
</p>
<div class="refsect2">
-<a name="idp18963216"></a><h3>Example launch line</h3>
+<a name="idp20575168"></a><h3>Example launch line</h3>
<div class="informalexample">
<table class="listing_frame" border="0" cellpadding="0" cellspacing="0">
<tbody>
@@ -95,7 +95,7 @@ page.
<div class="refsynopsisdiv">
<h2>Synopsis</h2>
<div class="refsect2">
-<a name="idp18258032"></a><h3>Element Information</h3>
+<a name="idp18048304"></a><h3>Element Information</h3>
<div class="variablelist"><table border="0">
<col align="left" valign="top">
<tbody>
@@ -118,7 +118,7 @@ page.
</div>
<hr>
<div class="refsect2">
-<a name="idp16639392"></a><h3>Element Pads</h3>
+<a name="idp19229200"></a><h3>Element Pads</h3>
<div class="variablelist"><table border="0">
<col align="left" valign="top">
<tbody>
diff --git a/docs/plugins/html/gst-plugins-good-plugins-smpte.html b/docs/plugins/html/gst-plugins-good-plugins-smpte.html
index b3db1a5c63ec918972739072763217e07cb296c3..d91621aec82d4fe18b60ce900a3f79fa65751001 100644
--- a/docs/plugins/html/gst-plugins-good-plugins-smpte.html
+++ b/docs/plugins/html/gst-plugins-good-plugins-smpte.html
@@ -80,7 +80,7 @@ banding.
<p>
</p>
<div class="refsect2">
-<a name="idp19705712"></a><h3>Sample pipelines</h3>
+<a name="idp14059248"></a><h3>Sample pipelines</h3>
<div class="informalexample">
<table class="listing_frame" border="0" cellpadding="0" cellspacing="0">
<tbody>
@@ -101,7 +101,7 @@ edges of the transition are smoothed with a 20000 big border.
<div class="refsynopsisdiv">
<h2>Synopsis</h2>
<div class="refsect2">
-<a name="idp19858848"></a><h3>Element Information</h3>
+<a name="idp18850944"></a><h3>Element Information</h3>
<div class="variablelist"><table border="0">
<col align="left" valign="top">
<tbody>
@@ -124,7 +124,7 @@ edges of the transition are smoothed with a 20000 big border.
</div>
<hr>
<div class="refsect2">
-<a name="idp19697552"></a><h3>Element Pads</h3>
+<a name="idp21636624"></a><h3>Element Pads</h3>
<div class="variablelist"><table border="0">
<col align="left" valign="top">
<tbody>
diff --git a/docs/plugins/html/gst-plugins-good-plugins-smptealpha.html b/docs/plugins/html/gst-plugins-good-plugins-smptealpha.html
index 4e24f02eccb194d8f4cce95d6f1e0ac5f27e182c..eef233f5cb95165f0025b0a0d52dfe9b9a608593 100644
--- a/docs/plugins/html/gst-plugins-good-plugins-smptealpha.html
+++ b/docs/plugins/html/gst-plugins-good-plugins-smptealpha.html
@@ -87,7 +87,7 @@ avoid banding.
<p>
</p>
<div class="refsect2">
-<a name="idp17936464"></a><h3>Sample pipelines</h3>
+<a name="idp18566688"></a><h3>Sample pipelines</h3>
<p>
Here is a pipeline to demonstrate the smpte transition :
</p>
@@ -106,7 +106,7 @@ transparent image. The edges of the transition are smoothed with a
<div class="refsynopsisdiv">
<h2>Synopsis</h2>
<div class="refsect2">
-<a name="idp17658672"></a><h3>Element Information</h3>
+<a name="idp16653744"></a><h3>Element Information</h3>
<div class="variablelist"><table border="0">
<col align="left" valign="top">
<tbody>
@@ -129,7 +129,7 @@ transparent image. The edges of the transition are smoothed with a
</div>
<hr>
<div class="refsect2">
-<a name="idp19461120"></a><h3>Element Pads</h3>
+<a name="idp21153392"></a><h3>Element Pads</h3>
<div class="variablelist"><table border="0">
<col align="left" valign="top">
<tbody>
diff --git a/docs/plugins/html/gst-plugins-good-plugins-souphttpsrc.html b/docs/plugins/html/gst-plugins-good-plugins-souphttpsrc.html
index aceb6cc67e5ad89421c3a52a623d275429ca25f5..55e62a00b5470d29fdf7f12bfc9e60840ef18c10 100644
--- a/docs/plugins/html/gst-plugins-good-plugins-souphttpsrc.html
+++ b/docs/plugins/html/gst-plugins-good-plugins-souphttpsrc.html
@@ -91,7 +91,7 @@ GstSoupHTTPSrc implements
<div class="refsynopsisdiv">
<h2>Synopsis</h2>
<div class="refsect2">
-<a name="idp21773040"></a><h3>Element Information</h3>
+<a name="idp17570512"></a><h3>Element Information</h3>
<div class="variablelist"><table border="0">
<col align="left" valign="top">
<tbody>
@@ -114,7 +114,7 @@ GstSoupHTTPSrc implements
</div>
<hr>
<div class="refsect2">
-<a name="idp19053104"></a><h3>Element Pads</h3>
+<a name="idp11179712"></a><h3>Element Pads</h3>
<div class="variablelist"><table border="0">
<col align="left" valign="top">
<tbody>
diff --git a/docs/plugins/html/gst-plugins-good-plugins-spectrum.html b/docs/plugins/html/gst-plugins-good-plugins-spectrum.html
index 19e2a392939eb469459e2a6a68f669151cf0a213..8f04cfc328b02b75ccecd3a077e12ed5062e2806 100644
--- a/docs/plugins/html/gst-plugins-good-plugins-spectrum.html
+++ b/docs/plugins/html/gst-plugins-good-plugins-spectrum.html
@@ -132,7 +132,7 @@ channels and the second dimension are the values.
<p>
</p>
<div class="refsect2">
-<a name="idp18066720"></a><h3>Example application</h3>
+<a name="idp21423072"></a><h3>Example application</h3>
<div class="informalexample">
<table class="listing_frame" border="0" cellpadding="0" cellspacing="0">
<tbody>
@@ -399,7 +399,7 @@ Last reviewed on 2011-03-10 (0.10.29)
<div class="refsynopsisdiv">
<h2>Synopsis</h2>
<div class="refsect2">
-<a name="idp15712032"></a><h3>Element Information</h3>
+<a name="idp21273264"></a><h3>Element Information</h3>
<div class="variablelist"><table border="0">
<col align="left" valign="top">
<tbody>
@@ -422,7 +422,7 @@ Last reviewed on 2011-03-10 (0.10.29)
</div>
<hr>
<div class="refsect2">
-<a name="idp21858320"></a><h3>Element Pads</h3>
+<a name="idp21732432"></a><h3>Element Pads</h3>
<div class="variablelist"><table border="0">
<col align="left" valign="top">
<tbody>
diff --git a/docs/plugins/html/gst-plugins-good-plugins-speexdec.html b/docs/plugins/html/gst-plugins-good-plugins-speexdec.html
index 691fe25dfc7ad2cd590d30f2c7852ab17ec43fcf..e9fb3ee963ac6a5ba336916cc5b9185d3939a9f5 100644
--- a/docs/plugins/html/gst-plugins-good-plugins-speexdec.html
+++ b/docs/plugins/html/gst-plugins-good-plugins-speexdec.html
@@ -66,7 +66,7 @@
<div class="refsynopsisdiv">
<h2>Synopsis</h2>
<div class="refsect2">
-<a name="idp19150256"></a><h3>Element Information</h3>
+<a name="idp21834736"></a><h3>Element Information</h3>
<div class="variablelist"><table border="0">
<col align="left" valign="top">
<tbody>
@@ -89,7 +89,7 @@
</div>
<hr>
<div class="refsect2">
-<a name="idp14388896"></a><h3>Element Pads</h3>
+<a name="idp18938016"></a><h3>Element Pads</h3>
<div class="variablelist"><table border="0">
<col align="left" valign="top">
<tbody>
diff --git a/docs/plugins/html/gst-plugins-good-plugins-speexenc.html b/docs/plugins/html/gst-plugins-good-plugins-speexenc.html
index da20d254028528859c423043717f90b0a6301f3f..bc8f42c3b3f05525a1de0fc6585bc60822251371 100644
--- a/docs/plugins/html/gst-plugins-good-plugins-speexenc.html
+++ b/docs/plugins/html/gst-plugins-good-plugins-speexenc.html
@@ -83,7 +83,7 @@ GstSpeexEnc implements
<div class="refsynopsisdiv">
<h2>Synopsis</h2>
<div class="refsect2">
-<a name="idp21867920"></a><h3>Element Information</h3>
+<a name="idp15066320"></a><h3>Element Information</h3>
<div class="variablelist"><table border="0">
<col align="left" valign="top">
<tbody>
@@ -106,7 +106,7 @@ GstSpeexEnc implements
</div>
<hr>
<div class="refsect2">
-<a name="idp22182320"></a><h3>Element Pads</h3>
+<a name="idp14957872"></a><h3>Element Pads</h3>
<div class="variablelist"><table border="0">
<col align="left" valign="top">
<tbody>
diff --git a/docs/plugins/html/gst-plugins-good-plugins-splitfilesrc.html b/docs/plugins/html/gst-plugins-good-plugins-splitfilesrc.html
index 09a6272094e17566f530367b76b5c44553d750cd..3b7d9c356866e63244fe050d3182b8c39c65be91 100644
--- a/docs/plugins/html/gst-plugins-good-plugins-splitfilesrc.html
+++ b/docs/plugins/html/gst-plugins-good-plugins-splitfilesrc.html
@@ -77,7 +77,7 @@ directories). The results will be sorted.
<p>
</p>
<div class="refsect2">
-<a name="idp7529648"></a><h3>Example launch line</h3>
+<a name="idp21668256"></a><h3>Example launch line</h3>
<div class="informalexample">
<table class="listing_frame" border="0" cellpadding="0" cellspacing="0">
<tbody>
@@ -95,7 +95,7 @@ directories). The results will be sorted.
<div class="refsynopsisdiv">
<h2>Synopsis</h2>
<div class="refsect2">
-<a name="idp20707904"></a><h3>Element Information</h3>
+<a name="idp16295984"></a><h3>Element Information</h3>
<div class="variablelist"><table border="0">
<col align="left" valign="top">
<tbody>
@@ -118,7 +118,7 @@ directories). The results will be sorted.
</div>
<hr>
<div class="refsect2">
-<a name="idp18176944"></a><h3>Element Pads</h3>
+<a name="idp21942352"></a><h3>Element Pads</h3>
<div class="variablelist"><table border="0">
<col align="left" valign="top">
<tbody>
diff --git a/docs/plugins/html/gst-plugins-good-plugins-streaktv.html b/docs/plugins/html/gst-plugins-good-plugins-streaktv.html
index cfcc6fca4dab01d871f1121201c04b14ac2d2c98..8b5e67ad94f87f5c19dbdd27b6d04bf630fb3d87 100644
--- a/docs/plugins/html/gst-plugins-good-plugins-streaktv.html
+++ b/docs/plugins/html/gst-plugins-good-plugins-streaktv.html
@@ -70,7 +70,7 @@ StreakTV makes after images of moving objects.
<p>
</p>
<div class="refsect2">
-<a name="idp19376432"></a><h3>Example launch line</h3>
+<a name="idp19882688"></a><h3>Example launch line</h3>
<div class="informalexample">
<table class="listing_frame" border="0" cellpadding="0" cellspacing="0">
<tbody>
@@ -88,7 +88,7 @@ StreakTV makes after images of moving objects.
<div class="refsynopsisdiv">
<h2>Synopsis</h2>
<div class="refsect2">
-<a name="idp12861968"></a><h3>Element Information</h3>
+<a name="idp17242032"></a><h3>Element Information</h3>
<div class="variablelist"><table border="0">
<col align="left" valign="top">
<tbody>
@@ -111,7 +111,7 @@ StreakTV makes after images of moving objects.
</div>
<hr>
<div class="refsect2">
-<a name="idp18358048"></a><h3>Element Pads</h3>
+<a name="idp22099168"></a><h3>Element Pads</h3>
<div class="variablelist"><table border="0">
<col align="left" valign="top">
<tbody>
diff --git a/docs/plugins/html/gst-plugins-good-plugins-taginject.html b/docs/plugins/html/gst-plugins-good-plugins-taginject.html
index 1c6994e86d9b682b8f40bd56fe9dda2b466a76c6..39b22b2b94035ec046074798197564213bbc9e2e 100644
--- a/docs/plugins/html/gst-plugins-good-plugins-taginject.html
+++ b/docs/plugins/html/gst-plugins-good-plugins-taginject.html
@@ -70,7 +70,7 @@ unmodified.
<p>
</p>
<div class="refsect2">
-<a name="idp19276832"></a><h3>Example launch lines</h3>
+<a name="idp12697936"></a><h3>Example launch lines</h3>
<div class="informalexample">
<table class="listing_frame" border="0" cellpadding="0" cellspacing="0">
<tbody>
@@ -99,7 +99,7 @@ unmodified.
<div class="refsynopsisdiv">
<h2>Synopsis</h2>
<div class="refsect2">
-<a name="idp14951088"></a><h3>Element Information</h3>
+<a name="idp18853472"></a><h3>Element Information</h3>
<div class="variablelist"><table border="0">
<col align="left" valign="top">
<tbody>
@@ -122,7 +122,7 @@ unmodified.
</div>
<hr>
<div class="refsect2">
-<a name="idp18190512"></a><h3>Element Pads</h3>
+<a name="idp18307872"></a><h3>Element Pads</h3>
<div class="variablelist"><table border="0">
<col align="left" valign="top">
<tbody>
diff --git a/docs/plugins/html/gst-plugins-good-plugins-udpsink.html b/docs/plugins/html/gst-plugins-good-plugins-udpsink.html
index c68e58208927b14d72f04e28bdd1a464f9661134..1f77f526926e1cd729ca3c1a50c71533ffdf7efe 100644
--- a/docs/plugins/html/gst-plugins-good-plugins-udpsink.html
+++ b/docs/plugins/html/gst-plugins-good-plugins-udpsink.html
@@ -80,7 +80,7 @@ It can be combined with RTP payloaders to implement RTP streaming.
<p>
</p>
<div class="refsect2">
-<a name="idp22737536"></a><h3>Examples</h3>
+<a name="idp14730480"></a><h3>Examples</h3>
<div class="informalexample">
<table class="listing_frame" border="0" cellpadding="0" cellspacing="0">
<tbody>
@@ -98,7 +98,7 @@ It can be combined with RTP payloaders to implement RTP streaming.
<div class="refsynopsisdiv">
<h2>Synopsis</h2>
<div class="refsect2">
-<a name="idp14815184"></a><h3>Element Information</h3>
+<a name="idp19869808"></a><h3>Element Information</h3>
<div class="variablelist"><table border="0">
<col align="left" valign="top">
<tbody>
@@ -121,7 +121,7 @@ It can be combined with RTP payloaders to implement RTP streaming.
</div>
<hr>
<div class="refsect2">
-<a name="idp22754688"></a><h3>Element Pads</h3>
+<a name="idp22819600"></a><h3>Element Pads</h3>
<div class="variablelist"><table border="0">
<col align="left" valign="top">
<tbody>
diff --git a/docs/plugins/html/gst-plugins-good-plugins-udpsrc.html b/docs/plugins/html/gst-plugins-good-plugins-udpsrc.html
index e587198747be459ee483ae01e60e479d17fc08ea..4a878a4557dbbe5d0b5ea495abed46709a9c6f22 100644
--- a/docs/plugins/html/gst-plugins-good-plugins-udpsrc.html
+++ b/docs/plugins/html/gst-plugins-good-plugins-udpsrc.html
@@ -160,7 +160,7 @@ is responsible for closing the file descriptor.
<p>
</p>
<div class="refsect2">
-<a name="idp19099504"></a><h3>Examples</h3>
+<a name="idp19232304"></a><h3>Examples</h3>
<div class="informalexample">
<table class="listing_frame" border="0" cellpadding="0" cellspacing="0">
<tbody>
@@ -206,7 +206,7 @@ Last reviewed on 2007-09-20 (0.10.7)
<div class="refsynopsisdiv">
<h2>Synopsis</h2>
<div class="refsect2">
-<a name="idp18331024"></a><h3>Element Information</h3>
+<a name="idp22226064"></a><h3>Element Information</h3>
<div class="variablelist"><table border="0">
<col align="left" valign="top">
<tbody>
@@ -229,7 +229,7 @@ Last reviewed on 2007-09-20 (0.10.7)
</div>
<hr>
<div class="refsect2">
-<a name="idp21550016"></a><h3>Element Pads</h3>
+<a name="idp21817312"></a><h3>Element Pads</h3>
<div class="variablelist"><table border="0">
<col align="left" valign="top">
<tbody>
diff --git a/docs/plugins/html/gst-plugins-good-plugins-v4l2radio.html b/docs/plugins/html/gst-plugins-good-plugins-v4l2radio.html
index cb5684764e19e082a90f3948378e261dc9387f85..2aa55da7a3ac12551de4fb27fe32a2847fdf1db0 100644
--- a/docs/plugins/html/gst-plugins-good-plugins-v4l2radio.html
+++ b/docs/plugins/html/gst-plugins-good-plugins-v4l2radio.html
@@ -74,7 +74,7 @@ GstV4l2Radio implements
<div class="refsynopsisdiv">
<h2>Synopsis</h2>
<div class="refsect2">
-<a name="idp17588944"></a><h3>Element Information</h3>
+<a name="idp21944288"></a><h3>Element Information</h3>
<div class="variablelist"><table border="0">
<col align="left" valign="top">
<tbody>
@@ -97,7 +97,7 @@ GstV4l2Radio implements
</div>
<hr>
<div class="refsect2">
-<a name="idp21907440"></a><h3>Element Pads</h3>
+<a name="idp17997584"></a><h3>Element Pads</h3>
</div>
</div>
<p>
diff --git a/docs/plugins/html/gst-plugins-good-plugins-v4l2sink.html b/docs/plugins/html/gst-plugins-good-plugins-v4l2sink.html
index 4f382b89c68ff6c15d36a491147f2ee160751c3e..2beb61c3f2b7bd0ccb3e41864fd089cbe5f8d3ae 100644
--- a/docs/plugins/html/gst-plugins-good-plugins-v4l2sink.html
+++ b/docs/plugins/html/gst-plugins-good-plugins-v4l2sink.html
@@ -62,7 +62,7 @@
<a name="gst-plugins-good-plugins-v4l2sink.implemented-interfaces"></a><h2>Implemented Interfaces</h2>
<p>
GstV4l2Sink implements
- <a href="http://gstreamer.freedesktop.org/data/doc/gstreamer/head/gst-plugins-base-libs/html/gst-plugins-base-libs-gsttuner.html#GstTuner">GstTuner</a>, GstVideoOverlay, <a href="http://gstreamer.freedesktop.org/data/doc/gstreamer/head/gst-plugins-base-libs/html/gst-plugins-base-libs-gstnavigation.html#GstNavigation">GstNavigation</a>, <a href="http://gstreamer.freedesktop.org/data/doc/gstreamer/head/gst-plugins-base-libs/html/gst-plugins-base-libs-gstcolorbalance.html#GstColorBalance">GstColorBalance</a> and <a href="http://gstreamer.freedesktop.org/data/doc/gstreamer/head/gst-plugins-base-libs/html/gst-plugins-base-libs-gstvideoorientation.html#GstVideoOrientation">GstVideoOrientation</a>.</p>
+ <a href="http://gstreamer.freedesktop.org/data/doc/gstreamer/head/gst-plugins-base-libs/html/gst-plugins-base-libs-gsttuner.html#GstTuner">GstTuner</a>, <a href="http://gstreamer.freedesktop.org/data/doc/gstreamer/head/gst-plugins-base-libs/html/gst-plugins-base-libs-gstvideooverlay.html#GstVideoOverlay">GstVideoOverlay</a>, <a href="http://gstreamer.freedesktop.org/data/doc/gstreamer/head/gst-plugins-base-libs/html/gst-plugins-base-libs-gstnavigation.html#GstNavigation">GstNavigation</a>, <a href="http://gstreamer.freedesktop.org/data/doc/gstreamer/head/gst-plugins-base-libs/html/gst-plugins-base-libs-gstcolorbalance.html#GstColorBalance">GstColorBalance</a> and <a href="http://gstreamer.freedesktop.org/data/doc/gstreamer/head/gst-plugins-base-libs/html/gst-plugins-base-libs-gstvideoorientation.html#GstVideoOrientation">GstVideoOrientation</a>.</p>
</div>
<div class="refsect1">
<a name="gst-plugins-good-plugins-v4l2sink.properties"></a><h2>Properties</h2>
@@ -94,7 +94,7 @@ GstV4l2Sink implements
<div class="refsynopsisdiv">
<h2>Synopsis</h2>
<div class="refsect2">
-<a name="idp18122336"></a><h3>Element Information</h3>
+<a name="idp21526592"></a><h3>Element Information</h3>
<div class="variablelist"><table border="0">
<col align="left" valign="top">
<tbody>
@@ -117,7 +117,7 @@ GstV4l2Sink implements
</div>
<hr>
<div class="refsect2">
-<a name="idp17718560"></a><h3>Element Pads</h3>
+<a name="idp19178192"></a><h3>Element Pads</h3>
<div class="variablelist"><table border="0">
<col align="left" valign="top">
<tbody>
diff --git a/docs/plugins/html/gst-plugins-good-plugins-v4l2src.html b/docs/plugins/html/gst-plugins-good-plugins-v4l2src.html
index 82f0da0ed91f13c0dc1a82de483189c86f19dc66..0bd7eb6625457c254fefffc0e2371335f1f53cb1 100644
--- a/docs/plugins/html/gst-plugins-good-plugins-v4l2src.html
+++ b/docs/plugins/html/gst-plugins-good-plugins-v4l2src.html
@@ -87,7 +87,7 @@ GstV4l2Src implements
<div class="refsynopsisdiv">
<h2>Synopsis</h2>
<div class="refsect2">
-<a name="idp11966528"></a><h3>Element Information</h3>
+<a name="idp21517520"></a><h3>Element Information</h3>
<div class="variablelist"><table border="0">
<col align="left" valign="top">
<tbody>
@@ -110,7 +110,7 @@ GstV4l2Src implements
</div>
<hr>
<div class="refsect2">
-<a name="idp17431344"></a><h3>Element Pads</h3>
+<a name="idp16213136"></a><h3>Element Pads</h3>
<div class="variablelist"><table border="0">
<col align="left" valign="top">
<tbody>
diff --git a/docs/plugins/html/gst-plugins-good-plugins-vertigotv.html b/docs/plugins/html/gst-plugins-good-plugins-vertigotv.html
index 1ca23b6127fad33dcdc26a0196f063f0e37b81dd..f9b494336b7a5f1aaeb0315b82566dee5888d9a4 100644
--- a/docs/plugins/html/gst-plugins-good-plugins-vertigotv.html
+++ b/docs/plugins/html/gst-plugins-good-plugins-vertigotv.html
@@ -79,7 +79,7 @@ VertigoTV is a loopback alpha blending effector with rotating and scaling.
<p>
</p>
<div class="refsect2">
-<a name="idp19455984"></a><h3>Example launch line</h3>
+<a name="idp5308992"></a><h3>Example launch line</h3>
<div class="informalexample">
<table class="listing_frame" border="0" cellpadding="0" cellspacing="0">
<tbody>
@@ -97,7 +97,7 @@ VertigoTV is a loopback alpha blending effector with rotating and scaling.
<div class="refsynopsisdiv">
<h2>Synopsis</h2>
<div class="refsect2">
-<a name="idp21404384"></a><h3>Element Information</h3>
+<a name="idp20062160"></a><h3>Element Information</h3>
<div class="variablelist"><table border="0">
<col align="left" valign="top">
<tbody>
@@ -120,7 +120,7 @@ VertigoTV is a loopback alpha blending effector with rotating and scaling.
</div>
<hr>
<div class="refsect2">
-<a name="idp22397952"></a><h3>Element Pads</h3>
+<a name="idp22485984"></a><h3>Element Pads</h3>
<div class="variablelist"><table border="0">
<col align="left" valign="top">
<tbody>
diff --git a/docs/plugins/html/gst-plugins-good-plugins-videobalance.html b/docs/plugins/html/gst-plugins-good-plugins-videobalance.html
index ed337d86f34c91d71e78bd85507097c975f23603..6fffa6acc3c062ee333c6d765f53a288625a6611 100644
--- a/docs/plugins/html/gst-plugins-good-plugins-videobalance.html
+++ b/docs/plugins/html/gst-plugins-good-plugins-videobalance.html
@@ -81,7 +81,7 @@ Adjusts brightness, contrast, hue, saturation on a video stream.
<p>
</p>
<div class="refsect2">
-<a name="idp15850192"></a><h3>Example launch line</h3>
+<a name="idp21176496"></a><h3>Example launch line</h3>
<div class="informalexample">
<table class="listing_frame" border="0" cellpadding="0" cellspacing="0">
<tbody>
@@ -103,7 +103,7 @@ Last reviewed on 2010-04-18 (0.10.22)
<div class="refsynopsisdiv">
<h2>Synopsis</h2>
<div class="refsect2">
-<a name="idp21595360"></a><h3>Element Information</h3>
+<a name="idp22550640"></a><h3>Element Information</h3>
<div class="variablelist"><table border="0">
<col align="left" valign="top">
<tbody>
@@ -126,7 +126,7 @@ Last reviewed on 2010-04-18 (0.10.22)
</div>
<hr>
<div class="refsect2">
-<a name="idp20083648"></a><h3>Element Pads</h3>
+<a name="idp22067088"></a><h3>Element Pads</h3>
<div class="variablelist"><table border="0">
<col align="left" valign="top">
<tbody>
diff --git a/docs/plugins/html/gst-plugins-good-plugins-videobox.html b/docs/plugins/html/gst-plugins-good-plugins-videobox.html
index b490be8a58b3bcc045d3dffec27c7c369811b1ef..cb210d3083feeb9b47be65e47c1fda4a8b58f491 100644
--- a/docs/plugins/html/gst-plugins-good-plugins-videobox.html
+++ b/docs/plugins/html/gst-plugins-good-plugins-videobox.html
@@ -108,7 +108,7 @@ Sample pipeline:
<div class="refsynopsisdiv">
<h2>Synopsis</h2>
<div class="refsect2">
-<a name="idp21614416"></a><h3>Element Information</h3>
+<a name="idp17690768"></a><h3>Element Information</h3>
<div class="variablelist"><table border="0">
<col align="left" valign="top">
<tbody>
@@ -131,7 +131,7 @@ Sample pipeline:
</div>
<hr>
<div class="refsect2">
-<a name="idp19257840"></a><h3>Element Pads</h3>
+<a name="idp21687024"></a><h3>Element Pads</h3>
<div class="variablelist"><table border="0">
<col align="left" valign="top">
<tbody>
@@ -352,7 +352,7 @@ Sample pipeline:
<div class="refsect2">
<a name="GstVideoBox"></a><h3>struct GstVideoBox</h3>
<pre class="programlisting">struct GstVideoBox {
- GstBaseTransform element;
+ GstVideoFilter element;
};
</pre>
<p>
diff --git a/docs/plugins/html/gst-plugins-good-plugins-videocrop.html b/docs/plugins/html/gst-plugins-good-plugins-videocrop.html
index 648c9e7fa8609906b9188b073d862782aa991afa..4013ef3b73b7a8a71eeb6c715b8bba2aab35b3cd 100644
--- a/docs/plugins/html/gst-plugins-good-plugins-videocrop.html
+++ b/docs/plugins/html/gst-plugins-good-plugins-videocrop.html
@@ -91,7 +91,7 @@ most use cases, but it might matter for yours.
<p>
</p>
<div class="refsect2">
-<a name="idp18734016"></a><h3>Example launch line</h3>
+<a name="idp23662672"></a><h3>Example launch line</h3>
<div class="informalexample">
<table class="listing_frame" border="0" cellpadding="0" cellspacing="0">
<tbody>
@@ -109,7 +109,7 @@ most use cases, but it might matter for yours.
<div class="refsynopsisdiv">
<h2>Synopsis</h2>
<div class="refsect2">
-<a name="idp16421552"></a><h3>Element Information</h3>
+<a name="idp17591952"></a><h3>Element Information</h3>
<div class="variablelist"><table border="0">
<col align="left" valign="top">
<tbody>
@@ -132,7 +132,7 @@ most use cases, but it might matter for yours.
</div>
<hr>
<div class="refsect2">
-<a name="idp22579408"></a><h3>Element Pads</h3>
+<a name="idp18797280"></a><h3>Element Pads</h3>
<div class="variablelist"><table border="0">
<col align="left" valign="top">
<tbody>
diff --git a/docs/plugins/html/gst-plugins-good-plugins-videoflip.html b/docs/plugins/html/gst-plugins-good-plugins-videoflip.html
index 37318b95041a9477d45c193afabd104dea1e719a..20c3ea72545895b2aaebbc0bd9be7f4650918286 100644
--- a/docs/plugins/html/gst-plugins-good-plugins-videoflip.html
+++ b/docs/plugins/html/gst-plugins-good-plugins-videoflip.html
@@ -71,7 +71,7 @@ Flips and rotates video.
<p>
</p>
<div class="refsect2">
-<a name="idp21551648"></a><h3>Example launch line</h3>
+<a name="idp16174512"></a><h3>Example launch line</h3>
<div class="informalexample">
<table class="listing_frame" border="0" cellpadding="0" cellspacing="0">
<tbody>
@@ -92,7 +92,7 @@ Last reviewed on 2010-04-18 (0.10.22)
<div class="refsynopsisdiv">
<h2>Synopsis</h2>
<div class="refsect2">
-<a name="idp19364672"></a><h3>Element Information</h3>
+<a name="idp19044400"></a><h3>Element Information</h3>
<div class="variablelist"><table border="0">
<col align="left" valign="top">
<tbody>
@@ -115,7 +115,7 @@ Last reviewed on 2010-04-18 (0.10.22)
</div>
<hr>
<div class="refsect2">
-<a name="idp22178432"></a><h3>Element Pads</h3>
+<a name="idp21619792"></a><h3>Element Pads</h3>
<div class="variablelist"><table border="0">
<col align="left" valign="top">
<tbody>
diff --git a/docs/plugins/html/gst-plugins-good-plugins-videomixer.html b/docs/plugins/html/gst-plugins-good-plugins-videomixer.html
index 05b3591cb4ba28f97c716aeb350887e36a09bb5b..0873ef128e402b6fccf3c498b1f0ca52582be940 100644
--- a/docs/plugins/html/gst-plugins-good-plugins-videomixer.html
+++ b/docs/plugins/html/gst-plugins-good-plugins-videomixer.html
@@ -59,7 +59,7 @@ Individual parameters for each input stream can be configured on the
<p>
</p>
<div class="refsect2">
-<a name="idp16590480"></a><h3>Sample pipelines</h3>
+<a name="idp21787088"></a><h3>Sample pipelines</h3>
<div class="informalexample">
<table class="listing_frame" border="0" cellpadding="0" cellspacing="0">
<tbody>
@@ -160,7 +160,7 @@ framerate of the output video is 10 frames per second.
<div class="refsynopsisdiv">
<h2>Synopsis</h2>
<div class="refsect2">
-<a name="idp18700272"></a><h3>Element Information</h3>
+<a name="idp19379936"></a><h3>Element Information</h3>
<div class="variablelist"><table border="0">
<col align="left" valign="top">
<tbody>
@@ -183,7 +183,7 @@ framerate of the output video is 10 frames per second.
</div>
<hr>
<div class="refsect2">
-<a name="idp20660272"></a><h3>Element Pads</h3>
+<a name="idp22037008"></a><h3>Element Pads</h3>
<div class="variablelist"><table border="0">
<col align="left" valign="top">
<tbody>
diff --git a/docs/plugins/html/gst-plugins-good-plugins-warptv.html b/docs/plugins/html/gst-plugins-good-plugins-warptv.html
index 3249e5750ea69acdc6d25b2e62e2b0a8781469f5..9fcdd6e52e49c16b0db0e8a9f80761b7de53298e 100644
--- a/docs/plugins/html/gst-plugins-good-plugins-warptv.html
+++ b/docs/plugins/html/gst-plugins-good-plugins-warptv.html
@@ -62,7 +62,7 @@ WarpTV does realtime goo'ing of the video input.
<p>
</p>
<div class="refsect2">
-<a name="idp18050080"></a><h3>Example launch line</h3>
+<a name="idp23554528"></a><h3>Example launch line</h3>
<div class="informalexample">
<table class="listing_frame" border="0" cellpadding="0" cellspacing="0">
<tbody>
@@ -80,7 +80,7 @@ WarpTV does realtime goo'ing of the video input.
<div class="refsynopsisdiv">
<h2>Synopsis</h2>
<div class="refsect2">
-<a name="idp23761728"></a><h3>Element Information</h3>
+<a name="idp19931600"></a><h3>Element Information</h3>
<div class="variablelist"><table border="0">
<col align="left" valign="top">
<tbody>
@@ -103,7 +103,7 @@ WarpTV does realtime goo'ing of the video input.
</div>
<hr>
<div class="refsect2">
-<a name="idp22981008"></a><h3>Element Pads</h3>
+<a name="idp18221472"></a><h3>Element Pads</h3>
<div class="variablelist"><table border="0">
<col align="left" valign="top">
<tbody>
diff --git a/docs/plugins/html/gst-plugins-good-plugins-waveformsink.html b/docs/plugins/html/gst-plugins-good-plugins-waveformsink.html
index 2bfa4d42b7cb0e1a552773c46a89cb91c1a920ad..1ae4d375802c5f76ba468bf2e1257926d594d5a7 100644
--- a/docs/plugins/html/gst-plugins-good-plugins-waveformsink.html
+++ b/docs/plugins/html/gst-plugins-good-plugins-waveformsink.html
@@ -45,7 +45,7 @@
<div class="refsynopsisdiv">
<h2>Synopsis</h2>
<div class="refsect2">
-<a name="idp22858768"></a><h3>Element Information</h3>
+<a name="idp22500896"></a><h3>Element Information</h3>
<div class="variablelist"><table border="0">
<col align="left" valign="top">
<tbody>
@@ -68,7 +68,7 @@
</div>
<hr>
<div class="refsect2">
-<a name="idp21918288"></a><h3>Element Pads</h3>
+<a name="idp24153296"></a><h3>Element Pads</h3>
</div>
</div>
<p>
diff --git a/docs/plugins/html/gst-plugins-good-plugins-wavenc.html b/docs/plugins/html/gst-plugins-good-plugins-wavenc.html
index 574192d2c54b202b1cac47aadd491926ba5478f6..fc9b4d52e0d6d66a29ce5347be4096800d5716dc 100644
--- a/docs/plugins/html/gst-plugins-good-plugins-wavenc.html
+++ b/docs/plugins/html/gst-plugins-good-plugins-wavenc.html
@@ -60,7 +60,7 @@ Format a audio stream into the wav format.
<div class="refsynopsisdiv">
<h2>Synopsis</h2>
<div class="refsect2">
-<a name="idp22505568"></a><h3>Element Information</h3>
+<a name="idp16677424"></a><h3>Element Information</h3>
<div class="variablelist"><table border="0">
<col align="left" valign="top">
<tbody>
@@ -83,7 +83,7 @@ Format a audio stream into the wav format.
</div>
<hr>
<div class="refsect2">
-<a name="idp17975200"></a><h3>Element Pads</h3>
+<a name="idp21719888"></a><h3>Element Pads</h3>
<div class="variablelist"><table border="0">
<col align="left" valign="top">
<tbody>
diff --git a/docs/plugins/html/gst-plugins-good-plugins-wavpackdec.html b/docs/plugins/html/gst-plugins-good-plugins-wavpackdec.html
index 33891fdf6e82eca90915610e9588e7b8e3662d5f..19cccb553904b43c46e3cd02e7f3e17d3534b73c 100644
--- a/docs/plugins/html/gst-plugins-good-plugins-wavpackdec.html
+++ b/docs/plugins/html/gst-plugins-good-plugins-wavpackdec.html
@@ -58,7 +58,7 @@
<div class="refsynopsisdiv">
<h2>Synopsis</h2>
<div class="refsect2">
-<a name="idp18838608"></a><h3>Element Information</h3>
+<a name="idp19207504"></a><h3>Element Information</h3>
<div class="variablelist"><table border="0">
<col align="left" valign="top">
<tbody>
@@ -81,7 +81,7 @@
</div>
<hr>
<div class="refsect2">
-<a name="idp21919040"></a><h3>Element Pads</h3>
+<a name="idp23715184"></a><h3>Element Pads</h3>
<div class="variablelist"><table border="0">
<col align="left" valign="top">
<tbody>
diff --git a/docs/plugins/html/gst-plugins-good-plugins-wavpackenc.html b/docs/plugins/html/gst-plugins-good-plugins-wavpackenc.html
index c0631d7d9e2b3981f2539f3905a609204b90b23a..9ddb7c473cc44806994216d4e271b8759dffb6cb 100644
--- a/docs/plugins/html/gst-plugins-good-plugins-wavpackenc.html
+++ b/docs/plugins/html/gst-plugins-good-plugins-wavpackenc.html
@@ -80,7 +80,7 @@ GstWavpackEnc implements
<div class="refsynopsisdiv">
<h2>Synopsis</h2>
<div class="refsect2">
-<a name="idp20184480"></a><h3>Element Information</h3>
+<a name="idp19987648"></a><h3>Element Information</h3>
<div class="variablelist"><table border="0">
<col align="left" valign="top">
<tbody>
@@ -103,7 +103,7 @@ GstWavpackEnc implements
</div>
<hr>
<div class="refsect2">
-<a name="idp22929264"></a><h3>Element Pads</h3>
+<a name="idp24350064"></a><h3>Element Pads</h3>
<div class="variablelist"><table border="0">
<col align="left" valign="top">
<tbody>
diff --git a/docs/plugins/html/gst-plugins-good-plugins-wavpackparse.html b/docs/plugins/html/gst-plugins-good-plugins-wavpackparse.html
index 607f604beaefcee158efcc2329ead50d87a461d4..9449ec36310bedea8a72ec76a0113cb1d454024c 100644
--- a/docs/plugins/html/gst-plugins-good-plugins-wavpackparse.html
+++ b/docs/plugins/html/gst-plugins-good-plugins-wavpackparse.html
@@ -61,7 +61,7 @@ This is an Wavpack parser.
<p>
</p>
<div class="refsect2">
-<a name="idp21290768"></a><h3>Example launch line</h3>
+<a name="idp24132576"></a><h3>Example launch line</h3>
<div class="informalexample">
<table class="listing_frame" border="0" cellpadding="0" cellspacing="0">
<tbody>
@@ -79,7 +79,7 @@ This is an Wavpack parser.
<div class="refsynopsisdiv">
<h2>Synopsis</h2>
<div class="refsect2">
-<a name="idp22795120"></a><h3>Element Information</h3>
+<a name="idp22571296"></a><h3>Element Information</h3>
<div class="variablelist"><table border="0">
<col align="left" valign="top">
<tbody>
@@ -102,7 +102,7 @@ This is an Wavpack parser.
</div>
<hr>
<div class="refsect2">
-<a name="idp21408528"></a><h3>Element Pads</h3>
+<a name="idp20807616"></a><h3>Element Pads</h3>
<div class="variablelist"><table border="0">
<col align="left" valign="top">
<tbody>
diff --git a/docs/plugins/html/gst-plugins-good-plugins-wavparse.html b/docs/plugins/html/gst-plugins-good-plugins-wavparse.html
index 5e00b43978840f9f3667e0fc86f038c051ef7afb..a93f278ba5f5115e1256ebdebc5516213a4d8d2e 100644
--- a/docs/plugins/html/gst-plugins-good-plugins-wavparse.html
+++ b/docs/plugins/html/gst-plugins-good-plugins-wavparse.html
@@ -72,7 +72,7 @@ stream from a network source.
<p>
</p>
<div class="refsect2">
-<a name="idp24233888"></a><h3>Example launch line</h3>
+<a name="idp19868720"></a><h3>Example launch line</h3>
<div class="informalexample">
<table class="listing_frame" border="0" cellpadding="0" cellspacing="0">
<tbody>
@@ -105,7 +105,7 @@ Last reviewed on 2007-02-14 (0.10.6)
<div class="refsynopsisdiv">
<h2>Synopsis</h2>
<div class="refsect2">
-<a name="idp21935776"></a><h3>Element Information</h3>
+<a name="idp21882848"></a><h3>Element Information</h3>
<div class="variablelist"><table border="0">
<col align="left" valign="top">
<tbody>
@@ -128,7 +128,7 @@ Last reviewed on 2007-02-14 (0.10.6)
</div>
<hr>
<div class="refsect2">
-<a name="idp23800000"></a><h3>Element Pads</h3>
+<a name="idp22682112"></a><h3>Element Pads</h3>
<div class="variablelist"><table border="0">
<col align="left" valign="top">
<tbody>
diff --git a/docs/plugins/html/gst-plugins-good-plugins-webmmux.html b/docs/plugins/html/gst-plugins-good-plugins-webmmux.html
index 162c6c439ab98896eb2833ec49c86dff270773fd..6a70f72b6d6e1330eb924984533687d39afcbfb1 100644
--- a/docs/plugins/html/gst-plugins-good-plugins-webmmux.html
+++ b/docs/plugins/html/gst-plugins-good-plugins-webmmux.html
@@ -59,7 +59,7 @@
<a name="gst-plugins-good-plugins-webmmux.implemented-interfaces"></a><h2>Implemented Interfaces</h2>
<p>
GstWebMMux implements
- <a href="http://gstreamer.freedesktop.org/data/doc/gstreamer/head/gstreamer/html/GstTagSetter.html">GstTagSetter</a> and GstTocSetter.</p>
+ <a href="http://gstreamer.freedesktop.org/data/doc/gstreamer/head/gstreamer/html/GstTagSetter.html">GstTagSetter</a> and <a href="http://gstreamer.freedesktop.org/data/doc/gstreamer/head/gstreamer/html/gstreamer-GstTocSetter.html#GstTocSetter">GstTocSetter</a>.</p>
</div>
<div class="refsect1">
<a name="gst-plugins-good-plugins-webmmux.description"></a><h2>Description</h2>
@@ -69,7 +69,7 @@ webmmux muxes VP8 video and Vorbis audio streams into a WebM file.
<p>
</p>
<div class="refsect2">
-<a name="idp20202032"></a><h3>Example launch line</h3>
+<a name="idp22755776"></a><h3>Example launch line</h3>
<div class="informalexample">
<table class="listing_frame" border="0" cellpadding="0" cellspacing="0">
<tbody>
@@ -108,7 +108,7 @@ webmmux muxes VP8 video and Vorbis audio streams into a WebM file.
<div class="refsynopsisdiv">
<h2>Synopsis</h2>
<div class="refsect2">
-<a name="idp17647008"></a><h3>Element Information</h3>
+<a name="idp22437056"></a><h3>Element Information</h3>
<div class="variablelist"><table border="0">
<col align="left" valign="top">
<tbody>
@@ -131,7 +131,7 @@ webmmux muxes VP8 video and Vorbis audio streams into a WebM file.
</div>
<hr>
<div class="refsect2">
-<a name="idp21889952"></a><h3>Element Pads</h3>
+<a name="idp18311792"></a><h3>Element Pads</h3>
<div class="variablelist"><table border="0">
<col align="left" valign="top">
<tbody>
diff --git a/docs/plugins/html/gst-plugins-good-plugins-ximagesrc.html b/docs/plugins/html/gst-plugins-good-plugins-ximagesrc.html
index 18e628f433d657c9f63fdf87fa16c6133306ad6e..0a6b86d6473c44adda39642ed7e811740ee17424 100644
--- a/docs/plugins/html/gst-plugins-good-plugins-ximagesrc.html
+++ b/docs/plugins/html/gst-plugins-good-plugins-ximagesrc.html
@@ -77,7 +77,7 @@
<div class="refsynopsisdiv">
<h2>Synopsis</h2>
<div class="refsect2">
-<a name="idp22052384"></a><h3>Element Information</h3>
+<a name="idp22041664"></a><h3>Element Information</h3>
<div class="variablelist"><table border="0">
<col align="left" valign="top">
<tbody>
@@ -100,7 +100,7 @@
</div>
<hr>
<div class="refsect2">
-<a name="idp22653648"></a><h3>Element Pads</h3>
+<a name="idp23743728"></a><h3>Element Pads</h3>
<div class="variablelist"><table border="0">
<col align="left" valign="top">
<tbody>
diff --git a/docs/plugins/html/gst-plugins-good-plugins-y4menc.html b/docs/plugins/html/gst-plugins-good-plugins-y4menc.html
index e347f3c7b65a42cfcee483912aa7e96f933c2701..44e95d3d37b905679c2965e9b68135323d85a3f7 100644
--- a/docs/plugins/html/gst-plugins-good-plugins-y4menc.html
+++ b/docs/plugins/html/gst-plugins-good-plugins-y4menc.html
@@ -57,7 +57,7 @@
<p>
</p>
<div class="refsect2">
-<a name="idp22193136"></a><h3>Example launch line</h3>
+<a name="idp17943328"></a><h3>Example launch line</h3>
<p>
Creates a YU4MPEG2 raw video stream as defined by the mjpegtools project.
</p>
@@ -77,7 +77,7 @@ gst-launch-0.10 videotestsrc num-buffers=250 \
<div class="refsynopsisdiv">
<h2>Synopsis</h2>
<div class="refsect2">
-<a name="idp24433984"></a><h3>Element Information</h3>
+<a name="idp18609632"></a><h3>Element Information</h3>
<div class="variablelist"><table border="0">
<col align="left" valign="top">
<tbody>
@@ -100,7 +100,7 @@ gst-launch-0.10 videotestsrc num-buffers=250 \
</div>
<hr>
<div class="refsect2">
-<a name="idp24075648"></a><h3>Element Pads</h3>
+<a name="idp5499840"></a><h3>Element Pads</h3>
<div class="variablelist"><table border="0">
<col align="left" valign="top">
<tbody>
diff --git a/docs/plugins/html/gst-plugins-good-plugins.devhelp2 b/docs/plugins/html/gst-plugins-good-plugins.devhelp2
index ebe0419bb6a4147bc88a94b4ec5280dded0db2a6..cf0f18c41f8a43c9486702d3db459651955a4dd2 100644
--- a/docs/plugins/html/gst-plugins-good-plugins.devhelp2
+++ b/docs/plugins/html/gst-plugins-good-plugins.devhelp2
@@ -96,10 +96,8 @@
<sub name="multipartmux" link="gst-plugins-good-plugins-multipartmux.html"/>
<sub name="multiudpsink" link="gst-plugins-good-plugins-multiudpsink.html"/>
<sub name="optv" link="gst-plugins-good-plugins-optv.html"/>
- <sub name="oss4mixer" link="gst-plugins-good-plugins-oss4mixer.html"/>
<sub name="oss4sink" link="gst-plugins-good-plugins-oss4sink.html"/>
<sub name="oss4src" link="gst-plugins-good-plugins-oss4src.html"/>
- <sub name="ossmixer" link="gst-plugins-good-plugins-ossmixer.html"/>
<sub name="osssink" link="gst-plugins-good-plugins-osssink.html"/>
<sub name="osssrc" link="gst-plugins-good-plugins-osssrc.html"/>
<sub name="osxaudiosink" link="gst-plugins-good-plugins-osxaudiosink.html"/>
@@ -245,15 +243,15 @@
</sub>
</chapters>
<functions>
- <keyword type="" name="Example pipelines" link="gst-plugins-good-plugins-3gppmux.html#idp7133232"/>
- <keyword type="" name="Element Information" link="gst-plugins-good-plugins-3gppmux.html#idp7789616"/>
- <keyword type="" name="Element Pads" link="gst-plugins-good-plugins-3gppmux.html#idp7718416"/>
- <keyword type="" name="Example launch line" link="gst-plugins-good-plugins-aacparse.html#idp9795264"/>
- <keyword type="" name="Element Information" link="gst-plugins-good-plugins-aacparse.html#idp8507408"/>
- <keyword type="" name="Element Pads" link="gst-plugins-good-plugins-aacparse.html#idp6572032"/>
+ <keyword type="" name="Example pipelines" link="gst-plugins-good-plugins-3gppmux.html#idp9398192"/>
+ <keyword type="" name="Element Information" link="gst-plugins-good-plugins-3gppmux.html#idp9135536"/>
+ <keyword type="" name="Element Pads" link="gst-plugins-good-plugins-3gppmux.html#idp7843984"/>
+ <keyword type="" name="Example launch line" link="gst-plugins-good-plugins-aacparse.html#idp6492544"/>
+ <keyword type="" name="Element Information" link="gst-plugins-good-plugins-aacparse.html#idp4505456"/>
+ <keyword type="" name="Element Pads" link="gst-plugins-good-plugins-aacparse.html#idp7993424"/>
<keyword type="struct" name="struct GstAacParse" link="gst-plugins-good-plugins-aacparse.html#GstAacParse-struct"/>
- <keyword type="" name="Element Information" link="gst-plugins-good-plugins-aasink.html#idp5850448"/>
- <keyword type="" name="Element Pads" link="gst-plugins-good-plugins-aasink.html#idp9485456"/>
+ <keyword type="" name="Element Information" link="gst-plugins-good-plugins-aasink.html#idp5374656"/>
+ <keyword type="" name="Element Pads" link="gst-plugins-good-plugins-aasink.html#idp8617504"/>
<keyword type="struct" name="struct GstAASink" link="gst-plugins-good-plugins-aasink.html#GstAASink-struct"/>
<keyword type="property" name="The "brightness" property" link="gst-plugins-good-plugins-aasink.html#GstAASink--brightness"/>
<keyword type="property" name="The "contrast" property" link="gst-plugins-good-plugins-aasink.html#GstAASink--contrast"/>
@@ -268,20 +266,20 @@
<keyword type="property" name="The "width" property" link="gst-plugins-good-plugins-aasink.html#GstAASink--width"/>
<keyword type="signal" name="The "frame-displayed" signal" link="gst-plugins-good-plugins-aasink.html#GstAASink-frame-displayed"/>
<keyword type="signal" name="The "have-size" signal" link="gst-plugins-good-plugins-aasink.html#GstAASink-have-size"/>
- <keyword type="" name="Example launch line" link="gst-plugins-good-plugins-ac3parse.html#idm13232"/>
- <keyword type="" name="Element Information" link="gst-plugins-good-plugins-ac3parse.html#idp7914112"/>
- <keyword type="" name="Element Pads" link="gst-plugins-good-plugins-ac3parse.html#idp9665088"/>
+ <keyword type="" name="Example launch line" link="gst-plugins-good-plugins-ac3parse.html#idp5885568"/>
+ <keyword type="" name="Element Information" link="gst-plugins-good-plugins-ac3parse.html#idp5794640"/>
+ <keyword type="" name="Element Pads" link="gst-plugins-good-plugins-ac3parse.html#idp8081552"/>
<keyword type="struct" name="struct GstAc3Parse" link="gst-plugins-good-plugins-ac3parse.html#GstAc3Parse-struct"/>
- <keyword type="" name="Example launch line" link="gst-plugins-good-plugins-agingtv.html#idp5862032"/>
- <keyword type="" name="Element Information" link="gst-plugins-good-plugins-agingtv.html#idp5687920"/>
- <keyword type="" name="Element Pads" link="gst-plugins-good-plugins-agingtv.html#idp5050400"/>
+ <keyword type="" name="Example launch line" link="gst-plugins-good-plugins-agingtv.html#idp9792304"/>
+ <keyword type="" name="Element Information" link="gst-plugins-good-plugins-agingtv.html#idp8947712"/>
+ <keyword type="" name="Element Pads" link="gst-plugins-good-plugins-agingtv.html#idp7299200"/>
<keyword type="struct" name="struct GstAgingTV" link="gst-plugins-good-plugins-agingtv.html#GstAgingTV-struct"/>
<keyword type="property" name="The "color-aging" property" link="gst-plugins-good-plugins-agingtv.html#GstAgingTV--color-aging"/>
<keyword type="property" name="The "dusts" property" link="gst-plugins-good-plugins-agingtv.html#GstAgingTV--dusts"/>
<keyword type="property" name="The "pits" property" link="gst-plugins-good-plugins-agingtv.html#GstAgingTV--pits"/>
<keyword type="property" name="The "scratch-lines" property" link="gst-plugins-good-plugins-agingtv.html#GstAgingTV--scratch-lines"/>
- <keyword type="" name="Element Information" link="gst-plugins-good-plugins-alpha.html#idp9400512"/>
- <keyword type="" name="Element Pads" link="gst-plugins-good-plugins-alpha.html#idp9319120"/>
+ <keyword type="" name="Element Information" link="gst-plugins-good-plugins-alpha.html#idp7693376"/>
+ <keyword type="" name="Element Pads" link="gst-plugins-good-plugins-alpha.html#idp5828128"/>
<keyword type="struct" name="struct GstAlpha" link="gst-plugins-good-plugins-alpha.html#GstAlpha-struct"/>
<keyword type="enum" name="enum GstAlphaMethod" link="gst-plugins-good-plugins-alpha.html#GstAlphaMethod"/>
<keyword type="property" name="The "alpha" property" link="gst-plugins-good-plugins-alpha.html#GstAlpha--alpha"/>
@@ -294,41 +292,41 @@
<keyword type="property" name="The "black-sensitivity" property" link="gst-plugins-good-plugins-alpha.html#GstAlpha--black-sensitivity"/>
<keyword type="property" name="The "white-sensitivity" property" link="gst-plugins-good-plugins-alpha.html#GstAlpha--white-sensitivity"/>
<keyword type="property" name="The "prefer-passthrough" property" link="gst-plugins-good-plugins-alpha.html#GstAlpha--prefer-passthrough"/>
- <keyword type="" name="Element Information" link="gst-plugins-good-plugins-alphacolor.html#idp6869408"/>
- <keyword type="" name="Element Pads" link="gst-plugins-good-plugins-alphacolor.html#idp8128464"/>
+ <keyword type="" name="Element Information" link="gst-plugins-good-plugins-alphacolor.html#idp5656096"/>
+ <keyword type="" name="Element Pads" link="gst-plugins-good-plugins-alphacolor.html#idp6968704"/>
<keyword type="struct" name="struct GstAlphaColor" link="gst-plugins-good-plugins-alphacolor.html#GstAlphaColor-struct"/>
- <keyword type="" name="Element Information" link="gst-plugins-good-plugins-alawdec.html#idp9236320"/>
- <keyword type="" name="Element Pads" link="gst-plugins-good-plugins-alawdec.html#idp5640176"/>
+ <keyword type="" name="Element Information" link="gst-plugins-good-plugins-alawdec.html#idp9033600"/>
+ <keyword type="" name="Element Pads" link="gst-plugins-good-plugins-alawdec.html#idp5484128"/>
<keyword type="struct" name="struct GstALawDec" link="gst-plugins-good-plugins-alawdec.html#GstALawDec-struct"/>
- <keyword type="" name="Element Information" link="gst-plugins-good-plugins-alawenc.html#idp7856992"/>
- <keyword type="" name="Element Pads" link="gst-plugins-good-plugins-alawenc.html#idp9804848"/>
+ <keyword type="" name="Element Information" link="gst-plugins-good-plugins-alawenc.html#idp7489152"/>
+ <keyword type="" name="Element Pads" link="gst-plugins-good-plugins-alawenc.html#idp9499328"/>
<keyword type="struct" name="struct GstALawDec" link="gst-plugins-good-plugins-alawenc.html#GstALawDec-struct"/>
<keyword type="struct" name="struct GstALawEnc" link="gst-plugins-good-plugins-alawenc.html#GstALawEnc"/>
- <keyword type="" name="Example launch line" link="gst-plugins-good-plugins-amrparse.html#idp5739040"/>
- <keyword type="" name="Element Information" link="gst-plugins-good-plugins-amrparse.html#idp7986816"/>
- <keyword type="" name="Element Pads" link="gst-plugins-good-plugins-amrparse.html#idp9125312"/>
+ <keyword type="" name="Example launch line" link="gst-plugins-good-plugins-amrparse.html#idp7306176"/>
+ <keyword type="" name="Element Information" link="gst-plugins-good-plugins-amrparse.html#idp9919136"/>
+ <keyword type="" name="Element Pads" link="gst-plugins-good-plugins-amrparse.html#idp5826544"/>
<keyword type="struct" name="struct GstAmrParse" link="gst-plugins-good-plugins-amrparse.html#GstAmrParse-struct"/>
- <keyword type="" name="Example launch line" link="gst-plugins-good-plugins-apedemux.html#idp7463872"/>
- <keyword type="" name="Element Information" link="gst-plugins-good-plugins-apedemux.html#idp8111344"/>
- <keyword type="" name="Element Pads" link="gst-plugins-good-plugins-apedemux.html#idp6695680"/>
+ <keyword type="" name="Example launch line" link="gst-plugins-good-plugins-apedemux.html#idp8171328"/>
+ <keyword type="" name="Element Information" link="gst-plugins-good-plugins-apedemux.html#idp9800000"/>
+ <keyword type="" name="Element Pads" link="gst-plugins-good-plugins-apedemux.html#idp9114816"/>
<keyword type="struct" name="struct GstApeDemux" link="gst-plugins-good-plugins-apedemux.html#GstApeDemux-struct"/>
- <keyword type="" name="Element Information" link="gst-plugins-good-plugins-apev2mux.html#idp9243808"/>
- <keyword type="" name="Element Pads" link="gst-plugins-good-plugins-apev2mux.html#idp5754960"/>
+ <keyword type="" name="Element Information" link="gst-plugins-good-plugins-apev2mux.html#idp7630320"/>
+ <keyword type="" name="Element Pads" link="gst-plugins-good-plugins-apev2mux.html#idp5530256"/>
<keyword type="struct" name="struct GstApev2Mux" link="gst-plugins-good-plugins-apev2mux.html#GstApev2Mux-struct"/>
- <keyword type="" name="Example launch line" link="gst-plugins-good-plugins-aspectratiocrop.html#idp6818544"/>
- <keyword type="" name="Element Information" link="gst-plugins-good-plugins-aspectratiocrop.html#idp5913808"/>
- <keyword type="" name="Element Pads" link="gst-plugins-good-plugins-aspectratiocrop.html#idp8351552"/>
+ <keyword type="" name="Example launch line" link="gst-plugins-good-plugins-aspectratiocrop.html#idp8244624"/>
+ <keyword type="" name="Element Information" link="gst-plugins-good-plugins-aspectratiocrop.html#idp9218592"/>
+ <keyword type="" name="Element Pads" link="gst-plugins-good-plugins-aspectratiocrop.html#idp6577024"/>
<keyword type="struct" name="struct GstAspectRatioCrop" link="gst-plugins-good-plugins-aspectratiocrop.html#GstAspectRatioCrop-struct"/>
<keyword type="property" name="The "aspect-ratio" property" link="gst-plugins-good-plugins-aspectratiocrop.html#GstAspectRatioCrop--aspect-ratio"/>
- <keyword type="" name="Example launch line" link="gst-plugins-good-plugins-audioamplify.html#idp7217808"/>
- <keyword type="" name="Element Information" link="gst-plugins-good-plugins-audioamplify.html#idp5075680"/>
- <keyword type="" name="Element Pads" link="gst-plugins-good-plugins-audioamplify.html#idp8673968"/>
+ <keyword type="" name="Example launch line" link="gst-plugins-good-plugins-audioamplify.html#idp7361040"/>
+ <keyword type="" name="Element Information" link="gst-plugins-good-plugins-audioamplify.html#idp10685616"/>
+ <keyword type="" name="Element Pads" link="gst-plugins-good-plugins-audioamplify.html#idp9453504"/>
<keyword type="struct" name="struct GstAudioAmplify" link="gst-plugins-good-plugins-audioamplify.html#GstAudioAmplify-struct"/>
<keyword type="property" name="The "amplification" property" link="gst-plugins-good-plugins-audioamplify.html#GstAudioAmplify--amplification"/>
<keyword type="property" name="The "clipping-method" property" link="gst-plugins-good-plugins-audioamplify.html#GstAudioAmplify--clipping-method"/>
- <keyword type="" name="Example launch line" link="gst-plugins-good-plugins-audiochebband.html#idp5105376"/>
- <keyword type="" name="Element Information" link="gst-plugins-good-plugins-audiochebband.html#idp8916048"/>
- <keyword type="" name="Element Pads" link="gst-plugins-good-plugins-audiochebband.html#idp9181488"/>
+ <keyword type="" name="Example launch line" link="gst-plugins-good-plugins-audiochebband.html#idp5931136"/>
+ <keyword type="" name="Element Information" link="gst-plugins-good-plugins-audiochebband.html#idp6868224"/>
+ <keyword type="" name="Element Pads" link="gst-plugins-good-plugins-audiochebband.html#idp10155648"/>
<keyword type="struct" name="struct GstAudioChebBand" link="gst-plugins-good-plugins-audiochebband.html#GstAudioChebBand-struct"/>
<keyword type="property" name="The "lower-frequency" property" link="gst-plugins-good-plugins-audiochebband.html#GstAudioChebBand--lower-frequency"/>
<keyword type="property" name="The "mode" property" link="gst-plugins-good-plugins-audiochebband.html#GstAudioChebBand--mode"/>
@@ -336,127 +334,127 @@
<keyword type="property" name="The "ripple" property" link="gst-plugins-good-plugins-audiochebband.html#GstAudioChebBand--ripple"/>
<keyword type="property" name="The "type" property" link="gst-plugins-good-plugins-audiochebband.html#GstAudioChebBand--type"/>
<keyword type="property" name="The "upper-frequency" property" link="gst-plugins-good-plugins-audiochebband.html#GstAudioChebBand--upper-frequency"/>
- <keyword type="" name="Example launch line" link="gst-plugins-good-plugins-audiocheblimit.html#idp5304368"/>
- <keyword type="" name="Element Information" link="gst-plugins-good-plugins-audiocheblimit.html#idp8974784"/>
- <keyword type="" name="Element Pads" link="gst-plugins-good-plugins-audiocheblimit.html#idp7116480"/>
+ <keyword type="" name="Example launch line" link="gst-plugins-good-plugins-audiocheblimit.html#idp9289040"/>
+ <keyword type="" name="Element Information" link="gst-plugins-good-plugins-audiocheblimit.html#idp9722064"/>
+ <keyword type="" name="Element Pads" link="gst-plugins-good-plugins-audiocheblimit.html#idp6156160"/>
<keyword type="struct" name="struct GstAudioChebLimit" link="gst-plugins-good-plugins-audiocheblimit.html#GstAudioChebLimit-struct"/>
<keyword type="property" name="The "cutoff" property" link="gst-plugins-good-plugins-audiocheblimit.html#GstAudioChebLimit--cutoff"/>
<keyword type="property" name="The "mode" property" link="gst-plugins-good-plugins-audiocheblimit.html#GstAudioChebLimit--mode"/>
<keyword type="property" name="The "poles" property" link="gst-plugins-good-plugins-audiocheblimit.html#GstAudioChebLimit--poles"/>
<keyword type="property" name="The "ripple" property" link="gst-plugins-good-plugins-audiocheblimit.html#GstAudioChebLimit--ripple"/>
<keyword type="property" name="The "type" property" link="gst-plugins-good-plugins-audiocheblimit.html#GstAudioChebLimit--type"/>
- <keyword type="" name="Example application" link="gst-plugins-good-plugins-audiofirfilter.html#idp10021936"/>
- <keyword type="" name="Element Information" link="gst-plugins-good-plugins-audiofirfilter.html#idp5279776"/>
- <keyword type="" name="Element Pads" link="gst-plugins-good-plugins-audiofirfilter.html#idp9212336"/>
+ <keyword type="" name="Example application" link="gst-plugins-good-plugins-audiofirfilter.html#idp5737296"/>
+ <keyword type="" name="Element Information" link="gst-plugins-good-plugins-audiofirfilter.html#idp8854768"/>
+ <keyword type="" name="Element Pads" link="gst-plugins-good-plugins-audiofirfilter.html#idp6572736"/>
<keyword type="struct" name="struct GstAudioFIRFilter" link="gst-plugins-good-plugins-audiofirfilter.html#GstAudioFIRFilter-struct"/>
<keyword type="property" name="The "kernel" property" link="gst-plugins-good-plugins-audiofirfilter.html#GstAudioFIRFilter--kernel"/>
<keyword type="property" name="The "latency" property" link="gst-plugins-good-plugins-audiofirfilter.html#GstAudioFIRFilter--latency"/>
<keyword type="signal" name="The "rate-changed" signal" link="gst-plugins-good-plugins-audiofirfilter.html#GstAudioFIRFilter-rate-changed"/>
- <keyword type="" name="Example application" link="gst-plugins-good-plugins-audioiirfilter.html#idp6557344"/>
- <keyword type="" name="Element Information" link="gst-plugins-good-plugins-audioiirfilter.html#idp9439360"/>
- <keyword type="" name="Element Pads" link="gst-plugins-good-plugins-audioiirfilter.html#idp8298496"/>
+ <keyword type="" name="Example application" link="gst-plugins-good-plugins-audioiirfilter.html#idp5979696"/>
+ <keyword type="" name="Element Information" link="gst-plugins-good-plugins-audioiirfilter.html#idp8061232"/>
+ <keyword type="" name="Element Pads" link="gst-plugins-good-plugins-audioiirfilter.html#idp7643008"/>
<keyword type="struct" name="struct GstAudioIIRFilter" link="gst-plugins-good-plugins-audioiirfilter.html#GstAudioIIRFilter-struct"/>
<keyword type="property" name="The "a" property" link="gst-plugins-good-plugins-audioiirfilter.html#GstAudioIIRFilter--a"/>
<keyword type="property" name="The "b" property" link="gst-plugins-good-plugins-audioiirfilter.html#GstAudioIIRFilter--b"/>
<keyword type="signal" name="The "rate-changed" signal" link="gst-plugins-good-plugins-audioiirfilter.html#GstAudioIIRFilter-rate-changed"/>
- <keyword type="" name="Example launch line" link="gst-plugins-good-plugins-audiowsincband.html#idp9591024"/>
- <keyword type="" name="Element Information" link="gst-plugins-good-plugins-audiowsincband.html#idp5876224"/>
- <keyword type="" name="Element Pads" link="gst-plugins-good-plugins-audiowsincband.html#idp5132304"/>
+ <keyword type="" name="Example launch line" link="gst-plugins-good-plugins-audiowsincband.html#idp7767040"/>
+ <keyword type="" name="Element Information" link="gst-plugins-good-plugins-audiowsincband.html#idp10068864"/>
+ <keyword type="" name="Element Pads" link="gst-plugins-good-plugins-audiowsincband.html#idp6333312"/>
<keyword type="struct" name="struct GstAudioWSincBand" link="gst-plugins-good-plugins-audiowsincband.html#GstAudioWSincBand-struct"/>
<keyword type="property" name="The "lower-frequency" property" link="gst-plugins-good-plugins-audiowsincband.html#GstAudioWSincBand--lower-frequency"/>
<keyword type="property" name="The "upper-frequency" property" link="gst-plugins-good-plugins-audiowsincband.html#GstAudioWSincBand--upper-frequency"/>
<keyword type="property" name="The "mode" property" link="gst-plugins-good-plugins-audiowsincband.html#GstAudioWSincBand--mode"/>
<keyword type="property" name="The "window" property" link="gst-plugins-good-plugins-audiowsincband.html#GstAudioWSincBand--window"/>
<keyword type="property" name="The "length" property" link="gst-plugins-good-plugins-audiowsincband.html#GstAudioWSincBand--length"/>
- <keyword type="" name="Example launch line" link="gst-plugins-good-plugins-audiowsinclimit.html#idp8949296"/>
- <keyword type="" name="Element Information" link="gst-plugins-good-plugins-audiowsinclimit.html#idp7665744"/>
- <keyword type="" name="Element Pads" link="gst-plugins-good-plugins-audiowsinclimit.html#idp10267440"/>
+ <keyword type="" name="Example launch line" link="gst-plugins-good-plugins-audiowsinclimit.html#idp7146640"/>
+ <keyword type="" name="Element Information" link="gst-plugins-good-plugins-audiowsinclimit.html#idp6506432"/>
+ <keyword type="" name="Element Pads" link="gst-plugins-good-plugins-audiowsinclimit.html#idp5621488"/>
<keyword type="struct" name="struct GstAudioWSincLimit" link="gst-plugins-good-plugins-audiowsinclimit.html#GstAudioWSincLimit-struct"/>
<keyword type="property" name="The "frequency" property" link="gst-plugins-good-plugins-audiowsinclimit.html#GstAudioWSincLimit--frequency"/>
<keyword type="property" name="The "length" property" link="gst-plugins-good-plugins-audiowsinclimit.html#GstAudioWSincLimit--length"/>
<keyword type="property" name="The "mode" property" link="gst-plugins-good-plugins-audiowsinclimit.html#GstAudioWSincLimit--mode"/>
<keyword type="property" name="The "window" property" link="gst-plugins-good-plugins-audiowsinclimit.html#GstAudioWSincLimit--window"/>
<keyword type="property" name="The "cutoff" property" link="gst-plugins-good-plugins-audiowsinclimit.html#GstAudioWSincLimit--cutoff"/>
- <keyword type="" name="Example launch line" link="gst-plugins-good-plugins-audioecho.html#idp5473392"/>
- <keyword type="" name="Element Information" link="gst-plugins-good-plugins-audioecho.html#idp5266112"/>
- <keyword type="" name="Element Pads" link="gst-plugins-good-plugins-audioecho.html#idp10502512"/>
+ <keyword type="" name="Example launch line" link="gst-plugins-good-plugins-audioecho.html#idp8240144"/>
+ <keyword type="" name="Element Information" link="gst-plugins-good-plugins-audioecho.html#idp7131664"/>
+ <keyword type="" name="Element Pads" link="gst-plugins-good-plugins-audioecho.html#idp5696480"/>
<keyword type="struct" name="struct GstAudioEcho" link="gst-plugins-good-plugins-audioecho.html#GstAudioEcho-struct"/>
<keyword type="property" name="The "delay" property" link="gst-plugins-good-plugins-audioecho.html#GstAudioEcho--delay"/>
<keyword type="property" name="The "feedback" property" link="gst-plugins-good-plugins-audioecho.html#GstAudioEcho--feedback"/>
<keyword type="property" name="The "intensity" property" link="gst-plugins-good-plugins-audioecho.html#GstAudioEcho--intensity"/>
<keyword type="property" name="The "max-delay" property" link="gst-plugins-good-plugins-audioecho.html#GstAudioEcho--max-delay"/>
- <keyword type="" name="Example launch line" link="gst-plugins-good-plugins-audiodynamic.html#idp9260592"/>
- <keyword type="" name="Element Information" link="gst-plugins-good-plugins-audiodynamic.html#idp8968144"/>
- <keyword type="" name="Element Pads" link="gst-plugins-good-plugins-audiodynamic.html#idp8418848"/>
+ <keyword type="" name="Example launch line" link="gst-plugins-good-plugins-audiodynamic.html#idm7184"/>
+ <keyword type="" name="Element Information" link="gst-plugins-good-plugins-audiodynamic.html#idp7281264"/>
+ <keyword type="" name="Element Pads" link="gst-plugins-good-plugins-audiodynamic.html#idp7251216"/>
<keyword type="struct" name="struct GstAudioDynamic" link="gst-plugins-good-plugins-audiodynamic.html#GstAudioDynamic-struct"/>
<keyword type="property" name="The "characteristics" property" link="gst-plugins-good-plugins-audiodynamic.html#GstAudioDynamic--characteristics"/>
<keyword type="property" name="The "mode" property" link="gst-plugins-good-plugins-audiodynamic.html#GstAudioDynamic--mode"/>
<keyword type="property" name="The "ratio" property" link="gst-plugins-good-plugins-audiodynamic.html#GstAudioDynamic--ratio"/>
<keyword type="property" name="The "threshold" property" link="gst-plugins-good-plugins-audiodynamic.html#GstAudioDynamic--threshold"/>
- <keyword type="" name="Example launch line" link="gst-plugins-good-plugins-audioinvert.html#idp8807968"/>
- <keyword type="" name="Element Information" link="gst-plugins-good-plugins-audioinvert.html#idp6082656"/>
- <keyword type="" name="Element Pads" link="gst-plugins-good-plugins-audioinvert.html#idp8996992"/>
+ <keyword type="" name="Example launch line" link="gst-plugins-good-plugins-audioinvert.html#idp8744464"/>
+ <keyword type="" name="Element Information" link="gst-plugins-good-plugins-audioinvert.html#idp10117632"/>
+ <keyword type="" name="Element Pads" link="gst-plugins-good-plugins-audioinvert.html#idp7165968"/>
<keyword type="struct" name="struct GstAudioInvert" link="gst-plugins-good-plugins-audioinvert.html#GstAudioInvert-struct"/>
<keyword type="property" name="The "degree" property" link="gst-plugins-good-plugins-audioinvert.html#GstAudioInvert--degree"/>
- <keyword type="" name="Example launch line" link="gst-plugins-good-plugins-audiopanorama.html#idp6094896"/>
- <keyword type="" name="Element Information" link="gst-plugins-good-plugins-audiopanorama.html#idp6594448"/>
- <keyword type="" name="Element Pads" link="gst-plugins-good-plugins-audiopanorama.html#idp5068096"/>
+ <keyword type="" name="Example launch line" link="gst-plugins-good-plugins-audiopanorama.html#idp6898352"/>
+ <keyword type="" name="Element Information" link="gst-plugins-good-plugins-audiopanorama.html#idp9239664"/>
+ <keyword type="" name="Element Pads" link="gst-plugins-good-plugins-audiopanorama.html#idp10045600"/>
<keyword type="struct" name="struct GstAudioPanorama" link="gst-plugins-good-plugins-audiopanorama.html#GstAudioPanorama-struct"/>
<keyword type="property" name="The "panorama" property" link="gst-plugins-good-plugins-audiopanorama.html#GstAudioPanorama--panorama"/>
<keyword type="property" name="The "method" property" link="gst-plugins-good-plugins-audiopanorama.html#GstAudioPanorama--method"/>
- <keyword type="" name="Example launch line" link="gst-plugins-good-plugins-audiokaraoke.html#idp7015696"/>
- <keyword type="" name="Element Information" link="gst-plugins-good-plugins-audiokaraoke.html#idp8183184"/>
- <keyword type="" name="Element Pads" link="gst-plugins-good-plugins-audiokaraoke.html#idp5638784"/>
+ <keyword type="" name="Example launch line" link="gst-plugins-good-plugins-audiokaraoke.html#idp9808992"/>
+ <keyword type="" name="Element Information" link="gst-plugins-good-plugins-audiokaraoke.html#idp7990032"/>
+ <keyword type="" name="Element Pads" link="gst-plugins-good-plugins-audiokaraoke.html#idm5296"/>
<keyword type="struct" name="struct GstAudioKaraoke" link="gst-plugins-good-plugins-audiokaraoke.html#GstAudioKaraoke-struct"/>
<keyword type="property" name="The "filter-band" property" link="gst-plugins-good-plugins-audiokaraoke.html#GstAudioKaraoke--filter-band"/>
<keyword type="property" name="The "filter-width" property" link="gst-plugins-good-plugins-audiokaraoke.html#GstAudioKaraoke--filter-width"/>
<keyword type="property" name="The "level" property" link="gst-plugins-good-plugins-audiokaraoke.html#GstAudioKaraoke--level"/>
<keyword type="property" name="The "mono-level" property" link="gst-plugins-good-plugins-audiokaraoke.html#GstAudioKaraoke--mono-level"/>
- <keyword type="" name="Element Information" link="gst-plugins-good-plugins-auparse.html#idp11536224"/>
- <keyword type="" name="Element Pads" link="gst-plugins-good-plugins-auparse.html#idp5866736"/>
+ <keyword type="" name="Element Information" link="gst-plugins-good-plugins-auparse.html#idp7290656"/>
+ <keyword type="" name="Element Pads" link="gst-plugins-good-plugins-auparse.html#idp6911408"/>
<keyword type="struct" name="struct GstAuParse" link="gst-plugins-good-plugins-auparse.html#GstAuParse-struct"/>
- <keyword type="" name="Example launch line" link="gst-plugins-good-plugins-autoaudiosink.html#idp8908384"/>
- <keyword type="" name="Element Information" link="gst-plugins-good-plugins-autoaudiosink.html#idp7627968"/>
- <keyword type="" name="Element Pads" link="gst-plugins-good-plugins-autoaudiosink.html#idp11906320"/>
+ <keyword type="" name="Example launch line" link="gst-plugins-good-plugins-autoaudiosink.html#idp7451552"/>
+ <keyword type="" name="Element Information" link="gst-plugins-good-plugins-autoaudiosink.html#idp10052208"/>
+ <keyword type="" name="Element Pads" link="gst-plugins-good-plugins-autoaudiosink.html#idp7658096"/>
<keyword type="struct" name="GstAutoAudioSink" link="gst-plugins-good-plugins-autoaudiosink.html#GstAutoAudioSink-struct"/>
<keyword type="property" name="The "filter-caps" property" link="gst-plugins-good-plugins-autoaudiosink.html#GstAutoAudioSink--filter-caps"/>
- <keyword type="" name="Example launch line" link="gst-plugins-good-plugins-autoaudiosrc.html#idp11617456"/>
- <keyword type="" name="Element Information" link="gst-plugins-good-plugins-autoaudiosrc.html#idp11344848"/>
- <keyword type="" name="Element Pads" link="gst-plugins-good-plugins-autoaudiosrc.html#idp7745728"/>
+ <keyword type="" name="Example launch line" link="gst-plugins-good-plugins-autoaudiosrc.html#idp7388048"/>
+ <keyword type="" name="Element Information" link="gst-plugins-good-plugins-autoaudiosrc.html#idp6433824"/>
+ <keyword type="" name="Element Pads" link="gst-plugins-good-plugins-autoaudiosrc.html#idp7519456"/>
<keyword type="struct" name="GstAutoAudioSrc" link="gst-plugins-good-plugins-autoaudiosrc.html#GstAutoAudioSrc-struct"/>
<keyword type="property" name="The "filter-caps" property" link="gst-plugins-good-plugins-autoaudiosrc.html#GstAutoAudioSrc--filter-caps"/>
- <keyword type="" name="Example launch line" link="gst-plugins-good-plugins-autovideosink.html#idp6973552"/>
- <keyword type="" name="Element Information" link="gst-plugins-good-plugins-autovideosink.html#idp8454768"/>
- <keyword type="" name="Element Pads" link="gst-plugins-good-plugins-autovideosink.html#idp10799680"/>
+ <keyword type="" name="Example launch line" link="gst-plugins-good-plugins-autovideosink.html#idp5033936"/>
+ <keyword type="" name="Element Information" link="gst-plugins-good-plugins-autovideosink.html#idp7376240"/>
+ <keyword type="" name="Element Pads" link="gst-plugins-good-plugins-autovideosink.html#idp5968880"/>
<keyword type="struct" name="GstAutoVideoSink" link="gst-plugins-good-plugins-autovideosink.html#GstAutoVideoSink-struct"/>
<keyword type="property" name="The "filter-caps" property" link="gst-plugins-good-plugins-autovideosink.html#GstAutoVideoSink--filter-caps"/>
- <keyword type="" name="Example launch line" link="gst-plugins-good-plugins-autovideosrc.html#idp8819584"/>
- <keyword type="" name="Element Information" link="gst-plugins-good-plugins-autovideosrc.html#idp5103184"/>
- <keyword type="" name="Element Pads" link="gst-plugins-good-plugins-autovideosrc.html#idp5505744"/>
+ <keyword type="" name="Example launch line" link="gst-plugins-good-plugins-autovideosrc.html#idp5941360"/>
+ <keyword type="" name="Element Information" link="gst-plugins-good-plugins-autovideosrc.html#idp11212608"/>
+ <keyword type="" name="Element Pads" link="gst-plugins-good-plugins-autovideosrc.html#idp10080320"/>
<keyword type="struct" name="GstAutoVideoSrc" link="gst-plugins-good-plugins-autovideosrc.html#GstAutoVideoSrc-struct"/>
<keyword type="property" name="The "filter-caps" property" link="gst-plugins-good-plugins-autovideosrc.html#GstAutoVideoSrc--filter-caps"/>
- <keyword type="" name="Example launch line" link="gst-plugins-good-plugins-avidemux.html#idp11699392"/>
- <keyword type="" name="Element Information" link="gst-plugins-good-plugins-avidemux.html#idp11696192"/>
- <keyword type="" name="Element Pads" link="gst-plugins-good-plugins-avidemux.html#idp11690416"/>
+ <keyword type="" name="Example launch line" link="gst-plugins-good-plugins-avidemux.html#idp10829264"/>
+ <keyword type="" name="Element Information" link="gst-plugins-good-plugins-avidemux.html#idp10826064"/>
+ <keyword type="" name="Element Pads" link="gst-plugins-good-plugins-avidemux.html#idp10820288"/>
<keyword type="struct" name="GstAviDemux" link="gst-plugins-good-plugins-avidemux.html#GstAviDemux-struct"/>
- <keyword type="" name="Example launch lines" link="gst-plugins-good-plugins-avimux.html#idp7166496"/>
- <keyword type="" name="Element Information" link="gst-plugins-good-plugins-avimux.html#idp10906592"/>
- <keyword type="" name="Element Pads" link="gst-plugins-good-plugins-avimux.html#idp11724560"/>
+ <keyword type="" name="Example launch lines" link="gst-plugins-good-plugins-avimux.html#idp9384352"/>
+ <keyword type="" name="Element Information" link="gst-plugins-good-plugins-avimux.html#idp9136560"/>
+ <keyword type="" name="Element Pads" link="gst-plugins-good-plugins-avimux.html#idp6523328"/>
<keyword type="struct" name="struct GstAviMux" link="gst-plugins-good-plugins-avimux.html#GstAviMux-struct"/>
<keyword type="property" name="The "bigfile" property" link="gst-plugins-good-plugins-avimux.html#GstAviMux--bigfile"/>
- <keyword type="" name="Example launch line" link="gst-plugins-good-plugins-avisubtitle.html#idp7119296"/>
- <keyword type="" name="Element Information" link="gst-plugins-good-plugins-avisubtitle.html#idp5799328"/>
- <keyword type="" name="Element Pads" link="gst-plugins-good-plugins-avisubtitle.html#idp9609760"/>
+ <keyword type="" name="Example launch line" link="gst-plugins-good-plugins-avisubtitle.html#idp5684848"/>
+ <keyword type="" name="Element Information" link="gst-plugins-good-plugins-avisubtitle.html#idp10139664"/>
+ <keyword type="" name="Element Pads" link="gst-plugins-good-plugins-avisubtitle.html#idp11705264"/>
<keyword type="struct" name="struct GstAviSubtitle" link="gst-plugins-good-plugins-avisubtitle.html#GstAviSubtitle-struct"/>
- <keyword type="" name="Element Information" link="gst-plugins-good-plugins-cacasink.html#idp12063120"/>
- <keyword type="" name="Element Pads" link="gst-plugins-good-plugins-cacasink.html#idp11576768"/>
+ <keyword type="" name="Element Information" link="gst-plugins-good-plugins-cacasink.html#idp7448224"/>
+ <keyword type="" name="Element Pads" link="gst-plugins-good-plugins-cacasink.html#idp9739808"/>
<keyword type="struct" name="struct GstCACASink" link="gst-plugins-good-plugins-cacasink.html#GstCACASink-struct"/>
<keyword type="property" name="The "anti-aliasing" property" link="gst-plugins-good-plugins-cacasink.html#GstCACASink--anti-aliasing"/>
<keyword type="property" name="The "dither" property" link="gst-plugins-good-plugins-cacasink.html#GstCACASink--dither"/>
<keyword type="property" name="The "screen-height" property" link="gst-plugins-good-plugins-cacasink.html#GstCACASink--screen-height"/>
<keyword type="property" name="The "screen-width" property" link="gst-plugins-good-plugins-cacasink.html#GstCACASink--screen-width"/>
- <keyword type="" name="Element Information" link="gst-plugins-good-plugins-cairotextoverlay.html#idp7627744"/>
- <keyword type="" name="Element Pads" link="gst-plugins-good-plugins-cairotextoverlay.html#idp7705424"/>
+ <keyword type="" name="Element Information" link="gst-plugins-good-plugins-cairotextoverlay.html#idp5318272"/>
+ <keyword type="" name="Element Pads" link="gst-plugins-good-plugins-cairotextoverlay.html#idp12091712"/>
<keyword type="struct" name="struct GstCairoTextOverlay" link="gst-plugins-good-plugins-cairotextoverlay.html#GstCairoTextOverlay"/>
<keyword type="property" name="The "deltax" property" link="gst-plugins-good-plugins-cairotextoverlay.html#GstCairoTextOverlay--deltax"/>
<keyword type="property" name="The "deltay" property" link="gst-plugins-good-plugins-cairotextoverlay.html#GstCairoTextOverlay--deltay"/>
@@ -468,50 +466,50 @@
<keyword type="property" name="The "xpad" property" link="gst-plugins-good-plugins-cairotextoverlay.html#GstCairoTextOverlay--xpad"/>
<keyword type="property" name="The "ypad" property" link="gst-plugins-good-plugins-cairotextoverlay.html#GstCairoTextOverlay--ypad"/>
<keyword type="property" name="The "silent" property" link="gst-plugins-good-plugins-cairotextoverlay.html#GstCairoTextOverlay--silent"/>
- <keyword type="" name="Element Information" link="gst-plugins-good-plugins-cairotimeoverlay.html#idp10029312"/>
- <keyword type="" name="Element Pads" link="gst-plugins-good-plugins-cairotimeoverlay.html#idp6062224"/>
+ <keyword type="" name="Element Information" link="gst-plugins-good-plugins-cairotimeoverlay.html#idp9575648"/>
+ <keyword type="" name="Element Pads" link="gst-plugins-good-plugins-cairotimeoverlay.html#idp11024432"/>
<keyword type="struct" name="GstCairoTimeOverlay" link="gst-plugins-good-plugins-cairotimeoverlay.html#GstCairoTimeOverlay"/>
- <keyword type="" name="Element Information" link="gst-plugins-good-plugins-cairorender.html#idp12132864"/>
- <keyword type="" name="Element Pads" link="gst-plugins-good-plugins-cairorender.html#idp9227312"/>
+ <keyword type="" name="Element Information" link="gst-plugins-good-plugins-cairorender.html#idp9220544"/>
+ <keyword type="" name="Element Pads" link="gst-plugins-good-plugins-cairorender.html#idp7482848"/>
<keyword type="struct" name="struct GstCairoRender" link="gst-plugins-good-plugins-cairorender.html#GstCairoRender"/>
- <keyword type="" name="Element Information" link="gst-plugins-good-plugins-cairooverlay.html#idp9694880"/>
- <keyword type="" name="Element Pads" link="gst-plugins-good-plugins-cairooverlay.html#idp3480640"/>
+ <keyword type="" name="Element Information" link="gst-plugins-good-plugins-cairooverlay.html#idp7042880"/>
+ <keyword type="" name="Element Pads" link="gst-plugins-good-plugins-cairooverlay.html#idp9743824"/>
<keyword type="struct" name="struct GstCairoOverlay" link="gst-plugins-good-plugins-cairooverlay.html#GstCairoOverlay"/>
<keyword type="signal" name="The "caps-changed" signal" link="gst-plugins-good-plugins-cairooverlay.html#GstCairoOverlay-caps-changed"/>
<keyword type="signal" name="The "draw" signal" link="gst-plugins-good-plugins-cairooverlay.html#GstCairoOverlay-draw"/>
- <keyword type="" name="" link="gst-plugins-good-plugins-capssetter.html#idp6364544"/>
- <keyword type="" name="Element Information" link="gst-plugins-good-plugins-capssetter.html#idp11995488"/>
- <keyword type="" name="Element Pads" link="gst-plugins-good-plugins-capssetter.html#idp6573376"/>
+ <keyword type="" name="" link="gst-plugins-good-plugins-capssetter.html#idp6126832"/>
+ <keyword type="" name="Element Information" link="gst-plugins-good-plugins-capssetter.html#idp5148688"/>
+ <keyword type="" name="Element Pads" link="gst-plugins-good-plugins-capssetter.html#idp7369216"/>
<keyword type="struct" name="struct GstCapsSetter" link="gst-plugins-good-plugins-capssetter.html#GstCapsSetter-struct"/>
<keyword type="property" name="The "caps" property" link="gst-plugins-good-plugins-capssetter.html#GstCapsSetter--caps"/>
<keyword type="property" name="The "join" property" link="gst-plugins-good-plugins-capssetter.html#GstCapsSetter--join"/>
<keyword type="property" name="The "replace" property" link="gst-plugins-good-plugins-capssetter.html#GstCapsSetter--replace"/>
- <keyword type="" name="Element Information" link="gst-plugins-good-plugins-cmmldec.html#idp7826000"/>
- <keyword type="" name="Element Pads" link="gst-plugins-good-plugins-cmmldec.html#idp10986064"/>
+ <keyword type="" name="Element Information" link="gst-plugins-good-plugins-cmmldec.html#idp12697024"/>
+ <keyword type="" name="Element Pads" link="gst-plugins-good-plugins-cmmldec.html#idp7453904"/>
<keyword type="struct" name="struct GstCmmlDec" link="gst-plugins-good-plugins-cmmldec.html#GstCmmlDec-struct"/>
<keyword type="property" name="The "wait-clip-end-time" property" link="gst-plugins-good-plugins-cmmldec.html#GstCmmlDec--wait-clip-end-time"/>
- <keyword type="" name="Element Information" link="gst-plugins-good-plugins-cmmlenc.html#idp11538144"/>
- <keyword type="" name="Element Pads" link="gst-plugins-good-plugins-cmmlenc.html#idp6311696"/>
+ <keyword type="" name="Element Information" link="gst-plugins-good-plugins-cmmlenc.html#idp8019104"/>
+ <keyword type="" name="Element Pads" link="gst-plugins-good-plugins-cmmlenc.html#idp6488208"/>
<keyword type="struct" name="struct GstCmmlEnc" link="gst-plugins-good-plugins-cmmlenc.html#GstCmmlEnc-struct"/>
<keyword type="property" name="The "granule-rate-denominator" property" link="gst-plugins-good-plugins-cmmlenc.html#GstCmmlEnc--granule-rate-denominator"/>
<keyword type="property" name="The "granule-rate-numerator" property" link="gst-plugins-good-plugins-cmmlenc.html#GstCmmlEnc--granule-rate-numerator"/>
<keyword type="property" name="The "granule-shift" property" link="gst-plugins-good-plugins-cmmlenc.html#GstCmmlEnc--granule-shift"/>
- <keyword type="" name="Example launch line" link="gst-plugins-good-plugins-cutter.html#idp11712656"/>
- <keyword type="" name="Element Information" link="gst-plugins-good-plugins-cutter.html#idp5508864"/>
- <keyword type="" name="Element Pads" link="gst-plugins-good-plugins-cutter.html#idp12766800"/>
+ <keyword type="" name="Example launch line" link="gst-plugins-good-plugins-cutter.html#idp6820592"/>
+ <keyword type="" name="Element Information" link="gst-plugins-good-plugins-cutter.html#idp11220400"/>
+ <keyword type="" name="Element Pads" link="gst-plugins-good-plugins-cutter.html#idp12243184"/>
<keyword type="struct" name="struct GstCutter" link="gst-plugins-good-plugins-cutter.html#GstCutter-struct"/>
<keyword type="property" name="The "leaky" property" link="gst-plugins-good-plugins-cutter.html#GstCutter--leaky"/>
<keyword type="property" name="The "pre-length" property" link="gst-plugins-good-plugins-cutter.html#GstCutter--pre-length"/>
<keyword type="property" name="The "run-length" property" link="gst-plugins-good-plugins-cutter.html#GstCutter--run-length"/>
<keyword type="property" name="The "threshold" property" link="gst-plugins-good-plugins-cutter.html#GstCutter--threshold"/>
<keyword type="property" name="The "threshold-dB" property" link="gst-plugins-good-plugins-cutter.html#GstCutter--threshold-dB"/>
- <keyword type="" name="Example launch line" link="gst-plugins-good-plugins-dcaparse.html#idp10982288"/>
- <keyword type="" name="Element Information" link="gst-plugins-good-plugins-dcaparse.html#idp9627808"/>
- <keyword type="" name="Element Pads" link="gst-plugins-good-plugins-dcaparse.html#idp11091584"/>
+ <keyword type="" name="Example launch line" link="gst-plugins-good-plugins-dcaparse.html#idp6247152"/>
+ <keyword type="" name="Element Information" link="gst-plugins-good-plugins-dcaparse.html#idp10880000"/>
+ <keyword type="" name="Element Pads" link="gst-plugins-good-plugins-dcaparse.html#idp12005760"/>
<keyword type="struct" name="struct GstDcaParse" link="gst-plugins-good-plugins-dcaparse.html#GstDcaParse-struct"/>
- <keyword type="" name="Example launch line" link="gst-plugins-good-plugins-deinterlace.html#idp11994912"/>
- <keyword type="" name="Element Information" link="gst-plugins-good-plugins-deinterlace.html#idp10388496"/>
- <keyword type="" name="Element Pads" link="gst-plugins-good-plugins-deinterlace.html#idp8695888"/>
+ <keyword type="" name="Example launch line" link="gst-plugins-good-plugins-deinterlace.html#idp12433392"/>
+ <keyword type="" name="Element Information" link="gst-plugins-good-plugins-deinterlace.html#idp11957088"/>
+ <keyword type="" name="Element Pads" link="gst-plugins-good-plugins-deinterlace.html#idp12030128"/>
<keyword type="struct" name="struct GstDeinterlace" link="gst-plugins-good-plugins-deinterlace.html#GstDeinterlace"/>
<keyword type="property" name="The "fields" property" link="gst-plugins-good-plugins-deinterlace.html#GstDeinterlace--fields"/>
<keyword type="property" name="The "method" property" link="gst-plugins-good-plugins-deinterlace.html#GstDeinterlace--method"/>
@@ -520,22 +518,22 @@
<keyword type="property" name="The "drop-orphans" property" link="gst-plugins-good-plugins-deinterlace.html#GstDeinterlace--drop-orphans"/>
<keyword type="property" name="The "ignore-obscure" property" link="gst-plugins-good-plugins-deinterlace.html#GstDeinterlace--ignore-obscure"/>
<keyword type="property" name="The "locking" property" link="gst-plugins-good-plugins-deinterlace.html#GstDeinterlace--locking"/>
- <keyword type="" name="Example launch line" link="gst-plugins-good-plugins-deinterleave.html#idp12756192"/>
- <keyword type="" name="Element Information" link="gst-plugins-good-plugins-deinterleave.html#idp12176304"/>
- <keyword type="" name="Element Pads" link="gst-plugins-good-plugins-deinterleave.html#idp10755376"/>
+ <keyword type="" name="Example launch line" link="gst-plugins-good-plugins-deinterleave.html#idp10211568"/>
+ <keyword type="" name="Element Information" link="gst-plugins-good-plugins-deinterleave.html#idp11802256"/>
+ <keyword type="" name="Element Pads" link="gst-plugins-good-plugins-deinterleave.html#idp6094560"/>
<keyword type="struct" name="struct GstDeinterleave" link="gst-plugins-good-plugins-deinterleave.html#GstDeinterleave-struct"/>
<keyword type="property" name="The "keep-positions" property" link="gst-plugins-good-plugins-deinterleave.html#GstDeinterleave--keep-positions"/>
- <keyword type="" name="Example launch line" link="gst-plugins-good-plugins-dicetv.html#idp5826480"/>
- <keyword type="" name="Element Information" link="gst-plugins-good-plugins-dicetv.html#idp10679472"/>
- <keyword type="" name="Element Pads" link="gst-plugins-good-plugins-dicetv.html#idp11025600"/>
+ <keyword type="" name="Example launch line" link="gst-plugins-good-plugins-dicetv.html#idp6313056"/>
+ <keyword type="" name="Element Information" link="gst-plugins-good-plugins-dicetv.html#idp11138992"/>
+ <keyword type="" name="Element Pads" link="gst-plugins-good-plugins-dicetv.html#idp6793888"/>
<keyword type="struct" name="struct GstDiceTV" link="gst-plugins-good-plugins-dicetv.html#GstDiceTV-struct"/>
<keyword type="property" name="The "square-bits" property" link="gst-plugins-good-plugins-dicetv.html#GstDiceTV--square-bits"/>
<keyword type="signal" name="The "reset" signal" link="gst-plugins-good-plugins-dicetv.html#GstDiceTV-reset"/>
- <keyword type="" name="Element Information" link="gst-plugins-good-plugins-directsoundsink.html#idp7587152"/>
- <keyword type="" name="Element Pads" link="gst-plugins-good-plugins-directsoundsink.html#idp12665504"/>
+ <keyword type="" name="Element Information" link="gst-plugins-good-plugins-directsoundsink.html#idp11550240"/>
+ <keyword type="" name="Element Pads" link="gst-plugins-good-plugins-directsoundsink.html#idp12563776"/>
<keyword type="struct" name="struct GstDirectSoundSink" link="gst-plugins-good-plugins-directsoundsink.html#GstDirectSoundSink"/>
- <keyword type="" name="Element Information" link="gst-plugins-good-plugins-dv1394src.html#idp12575152"/>
- <keyword type="" name="Element Pads" link="gst-plugins-good-plugins-dv1394src.html#idp10077376"/>
+ <keyword type="" name="Element Information" link="gst-plugins-good-plugins-dv1394src.html#idp12148768"/>
+ <keyword type="" name="Element Pads" link="gst-plugins-good-plugins-dv1394src.html#idp11487712"/>
<keyword type="struct" name="struct GstDV1394Src" link="gst-plugins-good-plugins-dv1394src.html#GstDV1394Src"/>
<keyword type="property" name="The "channel" property" link="gst-plugins-good-plugins-dv1394src.html#GstDV1394Src--channel"/>
<keyword type="property" name="The "consecutive" property" link="gst-plugins-good-plugins-dv1394src.html#GstDV1394Src--consecutive"/>
@@ -546,23 +544,23 @@
<keyword type="property" name="The "use-avc" property" link="gst-plugins-good-plugins-dv1394src.html#GstDV1394Src--use-avc"/>
<keyword type="property" name="The "device-name" property" link="gst-plugins-good-plugins-dv1394src.html#GstDV1394Src--device-name"/>
<keyword type="signal" name="The "frame-dropped" signal" link="gst-plugins-good-plugins-dv1394src.html#GstDV1394Src-frame-dropped"/>
- <keyword type="" name="Element Information" link="gst-plugins-good-plugins-dvdec.html#idp5450608"/>
- <keyword type="" name="Element Pads" link="gst-plugins-good-plugins-dvdec.html#idp13027280"/>
+ <keyword type="" name="Element Information" link="gst-plugins-good-plugins-dvdec.html#idp10268272"/>
+ <keyword type="" name="Element Pads" link="gst-plugins-good-plugins-dvdec.html#idp10917088"/>
<keyword type="struct" name="struct GstDVDec" link="gst-plugins-good-plugins-dvdec.html#GstDVDec-struct"/>
<keyword type="property" name="The "clamp-chroma" property" link="gst-plugins-good-plugins-dvdec.html#GstDVDec--clamp-chroma"/>
<keyword type="property" name="The "clamp-luma" property" link="gst-plugins-good-plugins-dvdec.html#GstDVDec--clamp-luma"/>
<keyword type="property" name="The "drop-factor" property" link="gst-plugins-good-plugins-dvdec.html#GstDVDec--drop-factor"/>
<keyword type="property" name="The "quality" property" link="gst-plugins-good-plugins-dvdec.html#GstDVDec--quality"/>
- <keyword type="" name="Element Information" link="gst-plugins-good-plugins-dvdemux.html#idp9232800"/>
- <keyword type="" name="Element Pads" link="gst-plugins-good-plugins-dvdemux.html#idp6448336"/>
+ <keyword type="" name="Element Information" link="gst-plugins-good-plugins-dvdemux.html#idp10746464"/>
+ <keyword type="" name="Element Pads" link="gst-plugins-good-plugins-dvdemux.html#idp8336992"/>
<keyword type="struct" name="struct GstDVDemux" link="gst-plugins-good-plugins-dvdemux.html#GstDVDemux-struct"/>
- <keyword type="" name="Example launch line" link="gst-plugins-good-plugins-edgetv.html#idp8191568"/>
- <keyword type="" name="Element Information" link="gst-plugins-good-plugins-edgetv.html#idp10518512"/>
- <keyword type="" name="Element Pads" link="gst-plugins-good-plugins-edgetv.html#idp10488208"/>
+ <keyword type="" name="Example launch line" link="gst-plugins-good-plugins-edgetv.html#idp7492944"/>
+ <keyword type="" name="Element Information" link="gst-plugins-good-plugins-edgetv.html#idp6725056"/>
+ <keyword type="" name="Element Pads" link="gst-plugins-good-plugins-edgetv.html#idp7995024"/>
<keyword type="struct" name="struct GstEdgeTV" link="gst-plugins-good-plugins-edgetv.html#GstEdgeTV-struct"/>
- <keyword type="" name="Example launch line" link="gst-plugins-good-plugins-equalizer-10bands.html#idp6800144"/>
- <keyword type="" name="Element Information" link="gst-plugins-good-plugins-equalizer-10bands.html#idp12385936"/>
- <keyword type="" name="Element Pads" link="gst-plugins-good-plugins-equalizer-10bands.html#idp8495904"/>
+ <keyword type="" name="Example launch line" link="gst-plugins-good-plugins-equalizer-10bands.html#idp10621088"/>
+ <keyword type="" name="Element Information" link="gst-plugins-good-plugins-equalizer-10bands.html#idp10844480"/>
+ <keyword type="" name="Element Pads" link="gst-plugins-good-plugins-equalizer-10bands.html#idp12502864"/>
<keyword type="struct" name="struct GstIirEqualizer10Bands" link="gst-plugins-good-plugins-equalizer-10bands.html#GstIirEqualizer10Bands-struct"/>
<keyword type="property" name="The "band0" property" link="gst-plugins-good-plugins-equalizer-10bands.html#GstIirEqualizer10Bands--band0"/>
<keyword type="property" name="The "band1" property" link="gst-plugins-good-plugins-equalizer-10bands.html#GstIirEqualizer10Bands--band1"/>
@@ -574,24 +572,24 @@
<keyword type="property" name="The "band7" property" link="gst-plugins-good-plugins-equalizer-10bands.html#GstIirEqualizer10Bands--band7"/>
<keyword type="property" name="The "band8" property" link="gst-plugins-good-plugins-equalizer-10bands.html#GstIirEqualizer10Bands--band8"/>
<keyword type="property" name="The "band9" property" link="gst-plugins-good-plugins-equalizer-10bands.html#GstIirEqualizer10Bands--band9"/>
- <keyword type="" name="Example launch line" link="gst-plugins-good-plugins-equalizer-3bands.html#idp4491920"/>
- <keyword type="" name="Element Information" link="gst-plugins-good-plugins-equalizer-3bands.html#idp9189216"/>
- <keyword type="" name="Element Pads" link="gst-plugins-good-plugins-equalizer-3bands.html#idp9553744"/>
+ <keyword type="" name="Example launch line" link="gst-plugins-good-plugins-equalizer-3bands.html#idp8414880"/>
+ <keyword type="" name="Element Information" link="gst-plugins-good-plugins-equalizer-3bands.html#idp11754272"/>
+ <keyword type="" name="Element Pads" link="gst-plugins-good-plugins-equalizer-3bands.html#idp8398928"/>
<keyword type="struct" name="struct GstIirEqualizer3Bands" link="gst-plugins-good-plugins-equalizer-3bands.html#GstIirEqualizer3Bands-struct"/>
<keyword type="property" name="The "band0" property" link="gst-plugins-good-plugins-equalizer-3bands.html#GstIirEqualizer3Bands--band0"/>
<keyword type="property" name="The "band1" property" link="gst-plugins-good-plugins-equalizer-3bands.html#GstIirEqualizer3Bands--band1"/>
<keyword type="property" name="The "band2" property" link="gst-plugins-good-plugins-equalizer-3bands.html#GstIirEqualizer3Bands--band2"/>
- <keyword type="" name="Example launch line" link="gst-plugins-good-plugins-equalizer-nbands.html#idp11790448"/>
- <keyword type="" name="Example code" link="gst-plugins-good-plugins-equalizer-nbands.html#idp8747536"/>
- <keyword type="" name="Element Information" link="gst-plugins-good-plugins-equalizer-nbands.html#idp13765696"/>
- <keyword type="" name="Element Pads" link="gst-plugins-good-plugins-equalizer-nbands.html#idp13644912"/>
+ <keyword type="" name="Example launch line" link="gst-plugins-good-plugins-equalizer-nbands.html#idp5958288"/>
+ <keyword type="" name="Example code" link="gst-plugins-good-plugins-equalizer-nbands.html#idp11468416"/>
+ <keyword type="" name="Element Information" link="gst-plugins-good-plugins-equalizer-nbands.html#idp14072800"/>
+ <keyword type="" name="Element Pads" link="gst-plugins-good-plugins-equalizer-nbands.html#idp5990880"/>
<keyword type="struct" name="struct GstIirEqualizerNBands" link="gst-plugins-good-plugins-equalizer-nbands.html#GstIirEqualizerNBands-struct"/>
<keyword type="property" name="The "num-bands" property" link="gst-plugins-good-plugins-equalizer-nbands.html#GstIirEqualizerNBands--num-bands"/>
- <keyword type="" name="Element Information" link="gst-plugins-good-plugins-flacdec.html#idp5392880"/>
- <keyword type="" name="Element Pads" link="gst-plugins-good-plugins-flacdec.html#idp8187264"/>
+ <keyword type="" name="Element Information" link="gst-plugins-good-plugins-flacdec.html#idp5717312"/>
+ <keyword type="" name="Element Pads" link="gst-plugins-good-plugins-flacdec.html#idp9572240"/>
<keyword type="struct" name="struct GstFlacDec" link="gst-plugins-good-plugins-flacdec.html#GstFlacDec-struct"/>
- <keyword type="" name="Element Information" link="gst-plugins-good-plugins-flacenc.html#idp9460448"/>
- <keyword type="" name="Element Pads" link="gst-plugins-good-plugins-flacenc.html#idp13448912"/>
+ <keyword type="" name="Element Information" link="gst-plugins-good-plugins-flacenc.html#idp12549504"/>
+ <keyword type="" name="Element Pads" link="gst-plugins-good-plugins-flacenc.html#idp13589536"/>
<keyword type="struct" name="struct GstFlacEnc" link="gst-plugins-good-plugins-flacenc.html#GstFlacEnc-struct"/>
<keyword type="property" name="The "blocksize" property" link="gst-plugins-good-plugins-flacenc.html#GstFlacEnc--blocksize"/>
<keyword type="property" name="The "escape-coding" property" link="gst-plugins-good-plugins-flacenc.html#GstFlacEnc--escape-coding"/>
@@ -608,134 +606,134 @@
<keyword type="property" name="The "streamable-subset" property" link="gst-plugins-good-plugins-flacenc.html#GstFlacEnc--streamable-subset"/>
<keyword type="property" name="The "padding" property" link="gst-plugins-good-plugins-flacenc.html#GstFlacEnc--padding"/>
<keyword type="property" name="The "seekpoints" property" link="gst-plugins-good-plugins-flacenc.html#GstFlacEnc--seekpoints"/>
- <keyword type="" name="Example pipelines" link="gst-plugins-good-plugins-flacparse.html#idp9256656"/>
- <keyword type="" name="Element Information" link="gst-plugins-good-plugins-flacparse.html#idp6694880"/>
- <keyword type="" name="Element Pads" link="gst-plugins-good-plugins-flacparse.html#idp11214336"/>
+ <keyword type="" name="Example pipelines" link="gst-plugins-good-plugins-flacparse.html#idp5064016"/>
+ <keyword type="" name="Element Information" link="gst-plugins-good-plugins-flacparse.html#idp9737008"/>
+ <keyword type="" name="Element Pads" link="gst-plugins-good-plugins-flacparse.html#idp3341648"/>
<keyword type="struct" name="struct GstFlacParse" link="gst-plugins-good-plugins-flacparse.html#GstFlacParse-struct"/>
<keyword type="property" name="The "check-frame-checksums" property" link="gst-plugins-good-plugins-flacparse.html#GstFlacParse--check-frame-checksums"/>
- <keyword type="" name="Element Information" link="gst-plugins-good-plugins-flactag.html#idp9633552"/>
- <keyword type="" name="Element Pads" link="gst-plugins-good-plugins-flactag.html#idp8307824"/>
+ <keyword type="" name="Element Information" link="gst-plugins-good-plugins-flactag.html#idp9432064"/>
+ <keyword type="" name="Element Pads" link="gst-plugins-good-plugins-flactag.html#idp8078464"/>
<keyword type="struct" name="struct GstFlacTag" link="gst-plugins-good-plugins-flactag.html#GstFlacTag-struct"/>
- <keyword type="" name="Example launch line" link="gst-plugins-good-plugins-flvdemux.html#idp12614624"/>
- <keyword type="" name="Element Information" link="gst-plugins-good-plugins-flvdemux.html#idp14361792"/>
- <keyword type="" name="Element Pads" link="gst-plugins-good-plugins-flvdemux.html#idp12363360"/>
+ <keyword type="" name="Example launch line" link="gst-plugins-good-plugins-flvdemux.html#idp5941616"/>
+ <keyword type="" name="Element Information" link="gst-plugins-good-plugins-flvdemux.html#idp14008096"/>
+ <keyword type="" name="Element Pads" link="gst-plugins-good-plugins-flvdemux.html#idp13551456"/>
<keyword type="struct" name="struct GstFlvDemux" link="gst-plugins-good-plugins-flvdemux.html#GstFlvDemux-struct"/>
- <keyword type="" name="Example launch line" link="gst-plugins-good-plugins-flvmux.html#idp8102464"/>
- <keyword type="" name="Element Information" link="gst-plugins-good-plugins-flvmux.html#idp5675984"/>
- <keyword type="" name="Element Pads" link="gst-plugins-good-plugins-flvmux.html#idp6998704"/>
+ <keyword type="" name="Example launch line" link="gst-plugins-good-plugins-flvmux.html#idp13049856"/>
+ <keyword type="" name="Element Information" link="gst-plugins-good-plugins-flvmux.html#idp10897440"/>
+ <keyword type="" name="Element Pads" link="gst-plugins-good-plugins-flvmux.html#idp11521824"/>
<keyword type="struct" name="GstFlvMux" link="gst-plugins-good-plugins-flvmux.html#GstFlvMux-struct"/>
<keyword type="property" name="The "is-live" property" link="gst-plugins-good-plugins-flvmux.html#GstFlvMux--is-live"/>
<keyword type="property" name="The "streamable" property" link="gst-plugins-good-plugins-flvmux.html#GstFlvMux--streamable"/>
- <keyword type="" name="Element Information" link="gst-plugins-good-plugins-flxdec.html#idp12197840"/>
- <keyword type="" name="Element Pads" link="gst-plugins-good-plugins-flxdec.html#idp5597472"/>
+ <keyword type="" name="Element Information" link="gst-plugins-good-plugins-flxdec.html#idp5757568"/>
+ <keyword type="" name="Element Pads" link="gst-plugins-good-plugins-flxdec.html#idp8040848"/>
<keyword type="struct" name="struct GstFlxDec" link="gst-plugins-good-plugins-flxdec.html#GstFlxDec"/>
- <keyword type="" name="Example launch line" link="gst-plugins-good-plugins-gamma.html#idp10949360"/>
- <keyword type="" name="Element Information" link="gst-plugins-good-plugins-gamma.html#idp12807632"/>
- <keyword type="" name="Element Pads" link="gst-plugins-good-plugins-gamma.html#idp14192112"/>
+ <keyword type="" name="Example launch line" link="gst-plugins-good-plugins-gamma.html#idp10885728"/>
+ <keyword type="" name="Element Information" link="gst-plugins-good-plugins-gamma.html#idp10088416"/>
+ <keyword type="" name="Element Pads" link="gst-plugins-good-plugins-gamma.html#idp6598992"/>
<keyword type="struct" name="struct GstGamma" link="gst-plugins-good-plugins-gamma.html#GstGamma-struct"/>
<keyword type="property" name="The "gamma" property" link="gst-plugins-good-plugins-gamma.html#GstGamma--gamma"/>
- <keyword type="" name="Element Information" link="gst-plugins-good-plugins-gdkpixbufsink.html#idp9792320"/>
- <keyword type="" name="Element Pads" link="gst-plugins-good-plugins-gdkpixbufsink.html#idp8833680"/>
+ <keyword type="" name="Element Information" link="gst-plugins-good-plugins-gdkpixbufsink.html#idp10658096"/>
+ <keyword type="" name="Element Pads" link="gst-plugins-good-plugins-gdkpixbufsink.html#idp13592688"/>
<keyword type="struct" name="struct GstGdkPixbufSink" link="gst-plugins-good-plugins-gdkpixbufsink.html#GstGdkPixbufSink"/>
<keyword type="property" name="The "last-pixbuf" property" link="gst-plugins-good-plugins-gdkpixbufsink.html#GstGdkPixbufSink--last-pixbuf"/>
<keyword type="property" name="The "send-messages" property" link="gst-plugins-good-plugins-gdkpixbufsink.html#GstGdkPixbufSink--send-messages"/>
<keyword type="property" name="The "post-messages" property" link="gst-plugins-good-plugins-gdkpixbufsink.html#GstGdkPixbufSink--post-messages"/>
- <keyword type="" name="Example launch line" link="gst-plugins-good-plugins-goom.html#idp5138944"/>
- <keyword type="" name="Element Information" link="gst-plugins-good-plugins-goom.html#idp5096144"/>
- <keyword type="" name="Element Pads" link="gst-plugins-good-plugins-goom.html#idp12024128"/>
+ <keyword type="" name="Example launch line" link="gst-plugins-good-plugins-goom.html#idp6342000"/>
+ <keyword type="" name="Element Information" link="gst-plugins-good-plugins-goom.html#idp8318784"/>
+ <keyword type="" name="Element Pads" link="gst-plugins-good-plugins-goom.html#idp10618592"/>
<keyword type="struct" name="struct GstGoom" link="gst-plugins-good-plugins-goom.html#GstGoom-struct"/>
- <keyword type="" name="Example launch line" link="gst-plugins-good-plugins-goom2k1.html#idp8850208"/>
- <keyword type="" name="Element Information" link="gst-plugins-good-plugins-goom2k1.html#idp6255424"/>
- <keyword type="" name="Element Pads" link="gst-plugins-good-plugins-goom2k1.html#idp10508000"/>
+ <keyword type="" name="Example launch line" link="gst-plugins-good-plugins-goom2k1.html#idp5035872"/>
+ <keyword type="" name="Element Information" link="gst-plugins-good-plugins-goom2k1.html#idp11061456"/>
+ <keyword type="" name="Element Pads" link="gst-plugins-good-plugins-goom2k1.html#idp9258848"/>
<keyword type="struct" name="struct GstGoom" link="gst-plugins-good-plugins-goom2k1.html#GstGoom-struct"/>
- <keyword type="" name="Element Information" link="gst-plugins-good-plugins-halaudiosink.html#idp4394432"/>
- <keyword type="" name="Element Pads" link="gst-plugins-good-plugins-halaudiosink.html#idp10946784"/>
- <keyword type="" name="Element Information" link="gst-plugins-good-plugins-halaudiosrc.html#idp9250400"/>
- <keyword type="" name="Element Pads" link="gst-plugins-good-plugins-halaudiosrc.html#idp4899104"/>
- <keyword type="" name="Element Information" link="gst-plugins-good-plugins-hdv1394src.html#idp14765888"/>
- <keyword type="" name="Element Pads" link="gst-plugins-good-plugins-hdv1394src.html#idp13610944"/>
+ <keyword type="" name="Element Information" link="gst-plugins-good-plugins-halaudiosink.html#idp14428960"/>
+ <keyword type="" name="Element Pads" link="gst-plugins-good-plugins-halaudiosink.html#idp12532944"/>
+ <keyword type="" name="Element Information" link="gst-plugins-good-plugins-halaudiosrc.html#idp9748224"/>
+ <keyword type="" name="Element Pads" link="gst-plugins-good-plugins-halaudiosrc.html#idp7339280"/>
+ <keyword type="" name="Element Information" link="gst-plugins-good-plugins-hdv1394src.html#idp13761712"/>
+ <keyword type="" name="Element Pads" link="gst-plugins-good-plugins-hdv1394src.html#idp8682320"/>
<keyword type="struct" name="struct GstHDV1394Src" link="gst-plugins-good-plugins-hdv1394src.html#GstHDV1394Src"/>
<keyword type="property" name="The "channel" property" link="gst-plugins-good-plugins-hdv1394src.html#GstHDV1394Src--channel"/>
<keyword type="property" name="The "device-name" property" link="gst-plugins-good-plugins-hdv1394src.html#GstHDV1394Src--device-name"/>
<keyword type="property" name="The "guid" property" link="gst-plugins-good-plugins-hdv1394src.html#GstHDV1394Src--guid"/>
<keyword type="property" name="The "port" property" link="gst-plugins-good-plugins-hdv1394src.html#GstHDV1394Src--port"/>
<keyword type="property" name="The "use-avc" property" link="gst-plugins-good-plugins-hdv1394src.html#GstHDV1394Src--use-avc"/>
- <keyword type="" name="Example launch line" link="gst-plugins-good-plugins-icydemux.html#idp6903120"/>
- <keyword type="" name="Element Information" link="gst-plugins-good-plugins-icydemux.html#idp6415744"/>
- <keyword type="" name="Element Pads" link="gst-plugins-good-plugins-icydemux.html#idp6108064"/>
+ <keyword type="" name="Example launch line" link="gst-plugins-good-plugins-icydemux.html#idp13006848"/>
+ <keyword type="" name="Element Information" link="gst-plugins-good-plugins-icydemux.html#idp6244576"/>
+ <keyword type="" name="Element Pads" link="gst-plugins-good-plugins-icydemux.html#idp6616864"/>
<keyword type="struct" name="struct GstICYDemux" link="gst-plugins-good-plugins-icydemux.html#GstICYDemux-struct"/>
- <keyword type="" name="Example launch line" link="gst-plugins-good-plugins-id3demux.html#idp5298544"/>
- <keyword type="" name="Element Information" link="gst-plugins-good-plugins-id3demux.html#idp8120816"/>
- <keyword type="" name="Element Pads" link="gst-plugins-good-plugins-id3demux.html#idp15313664"/>
+ <keyword type="" name="Example launch line" link="gst-plugins-good-plugins-id3demux.html#idp7559680"/>
+ <keyword type="" name="Element Information" link="gst-plugins-good-plugins-id3demux.html#idp8137184"/>
+ <keyword type="" name="Element Pads" link="gst-plugins-good-plugins-id3demux.html#idp8566864"/>
<keyword type="struct" name="struct GstID3Demux" link="gst-plugins-good-plugins-id3demux.html#GstID3Demux-struct"/>
<keyword type="property" name="The "prefer-v1" property" link="gst-plugins-good-plugins-id3demux.html#GstID3Demux--prefer-v1"/>
- <keyword type="" name="Element Information" link="gst-plugins-good-plugins-id3v2mux.html#idp8863408"/>
- <keyword type="" name="Element Pads" link="gst-plugins-good-plugins-id3v2mux.html#idp10480576"/>
+ <keyword type="" name="Element Information" link="gst-plugins-good-plugins-id3v2mux.html#idp8416128"/>
+ <keyword type="" name="Element Pads" link="gst-plugins-good-plugins-id3v2mux.html#idp14839472"/>
<keyword type="struct" name="struct GstId3v2Mux" link="gst-plugins-good-plugins-id3v2mux.html#GstId3v2Mux-struct"/>
- <keyword type="" name="Example launch line" link="gst-plugins-good-plugins-imagefreeze.html#idp7989952"/>
- <keyword type="" name="Element Information" link="gst-plugins-good-plugins-imagefreeze.html#idp10796848"/>
- <keyword type="" name="Element Pads" link="gst-plugins-good-plugins-imagefreeze.html#idp12932000"/>
+ <keyword type="" name="Example launch line" link="gst-plugins-good-plugins-imagefreeze.html#idp8924032"/>
+ <keyword type="" name="Element Information" link="gst-plugins-good-plugins-imagefreeze.html#idp9672688"/>
+ <keyword type="" name="Element Pads" link="gst-plugins-good-plugins-imagefreeze.html#idp5205616"/>
<keyword type="struct" name="struct GstImageFreeze" link="gst-plugins-good-plugins-imagefreeze.html#GstImageFreeze-struct"/>
- <keyword type="" name="Example launch line" link="gst-plugins-good-plugins-interleave.html#idp7266960"/>
- <keyword type="" name="Element Information" link="gst-plugins-good-plugins-interleave.html#idp9772160"/>
- <keyword type="" name="Element Pads" link="gst-plugins-good-plugins-interleave.html#idp8204304"/>
+ <keyword type="" name="Example launch line" link="gst-plugins-good-plugins-interleave.html#idp13596320"/>
+ <keyword type="" name="Element Information" link="gst-plugins-good-plugins-interleave.html#idp7032912"/>
+ <keyword type="" name="Element Pads" link="gst-plugins-good-plugins-interleave.html#idp12196880"/>
<keyword type="struct" name="struct GstInterleave" link="gst-plugins-good-plugins-interleave.html#GstInterleave-struct"/>
<keyword type="property" name="The "channel-positions" property" link="gst-plugins-good-plugins-interleave.html#GstInterleave--channel-positions"/>
<keyword type="property" name="The "channel-positions-from-input" property" link="gst-plugins-good-plugins-interleave.html#GstInterleave--channel-positions-from-input"/>
- <keyword type="" name="Example pipelines" link="gst-plugins-good-plugins-ismlmux.html#idp6554064"/>
- <keyword type="" name="Element Information" link="gst-plugins-good-plugins-ismlmux.html#idp15153392"/>
- <keyword type="" name="Element Pads" link="gst-plugins-good-plugins-ismlmux.html#idp13395984"/>
- <keyword type="" name="Element Information" link="gst-plugins-good-plugins-jackaudiosrc.html#idp13821568"/>
- <keyword type="" name="Element Pads" link="gst-plugins-good-plugins-jackaudiosrc.html#idp14604528"/>
+ <keyword type="" name="Example pipelines" link="gst-plugins-good-plugins-ismlmux.html#idp9354800"/>
+ <keyword type="" name="Element Information" link="gst-plugins-good-plugins-ismlmux.html#idp9369808"/>
+ <keyword type="" name="Element Pads" link="gst-plugins-good-plugins-ismlmux.html#idp10051120"/>
+ <keyword type="" name="Element Information" link="gst-plugins-good-plugins-jackaudiosrc.html#idp14340064"/>
+ <keyword type="" name="Element Pads" link="gst-plugins-good-plugins-jackaudiosrc.html#idp7321280"/>
<keyword type="struct" name="struct GstJackAudioSrc" link="gst-plugins-good-plugins-jackaudiosrc.html#GstJackAudioSrc-struct"/>
<keyword type="property" name="The "client" property" link="gst-plugins-good-plugins-jackaudiosrc.html#GstJackAudioSrc--client"/>
<keyword type="property" name="The "connect" property" link="gst-plugins-good-plugins-jackaudiosrc.html#GstJackAudioSrc--connect"/>
<keyword type="property" name="The "server" property" link="gst-plugins-good-plugins-jackaudiosrc.html#GstJackAudioSrc--server"/>
<keyword type="property" name="The "client-name" property" link="gst-plugins-good-plugins-jackaudiosrc.html#GstJackAudioSrc--client-name"/>
<keyword type="property" name="The "transport" property" link="gst-plugins-good-plugins-jackaudiosrc.html#GstJackAudioSrc--transport"/>
- <keyword type="" name="Element Information" link="gst-plugins-good-plugins-jackaudiosink.html#idp11494176"/>
- <keyword type="" name="Element Pads" link="gst-plugins-good-plugins-jackaudiosink.html#idp13199184"/>
+ <keyword type="" name="Element Information" link="gst-plugins-good-plugins-jackaudiosink.html#idp13848400"/>
+ <keyword type="" name="Element Pads" link="gst-plugins-good-plugins-jackaudiosink.html#idp13211280"/>
<keyword type="struct" name="struct GstJackAudioSink" link="gst-plugins-good-plugins-jackaudiosink.html#GstJackAudioSink-struct"/>
<keyword type="property" name="The "client" property" link="gst-plugins-good-plugins-jackaudiosink.html#GstJackAudioSink--client"/>
<keyword type="property" name="The "connect" property" link="gst-plugins-good-plugins-jackaudiosink.html#GstJackAudioSink--connect"/>
<keyword type="property" name="The "server" property" link="gst-plugins-good-plugins-jackaudiosink.html#GstJackAudioSink--server"/>
<keyword type="property" name="The "client-name" property" link="gst-plugins-good-plugins-jackaudiosink.html#GstJackAudioSink--client-name"/>
<keyword type="property" name="The "transport" property" link="gst-plugins-good-plugins-jackaudiosink.html#GstJackAudioSink--transport"/>
- <keyword type="" name="Element Information" link="gst-plugins-good-plugins-jpegdec.html#idp11057744"/>
- <keyword type="" name="Element Pads" link="gst-plugins-good-plugins-jpegdec.html#idp11927568"/>
+ <keyword type="" name="Element Information" link="gst-plugins-good-plugins-jpegdec.html#idp6471584"/>
+ <keyword type="" name="Element Pads" link="gst-plugins-good-plugins-jpegdec.html#idp15465520"/>
<keyword type="struct" name="struct GstJpegDec" link="gst-plugins-good-plugins-jpegdec.html#GstJpegDec-struct"/>
<keyword type="property" name="The "idct-method" property" link="gst-plugins-good-plugins-jpegdec.html#GstJpegDec--idct-method"/>
<keyword type="property" name="The "max-errors" property" link="gst-plugins-good-plugins-jpegdec.html#GstJpegDec--max-errors"/>
- <keyword type="" name="Element Information" link="gst-plugins-good-plugins-jpegenc.html#idp6380416"/>
- <keyword type="" name="Element Pads" link="gst-plugins-good-plugins-jpegenc.html#idp13799104"/>
+ <keyword type="" name="Element Information" link="gst-plugins-good-plugins-jpegenc.html#idp10954112"/>
+ <keyword type="" name="Element Pads" link="gst-plugins-good-plugins-jpegenc.html#idp12254656"/>
<keyword type="struct" name="struct GstJpegEnc" link="gst-plugins-good-plugins-jpegenc.html#GstJpegEnc-struct"/>
<keyword type="property" name="The "quality" property" link="gst-plugins-good-plugins-jpegenc.html#GstJpegEnc--quality"/>
<keyword type="property" name="The "idct-method" property" link="gst-plugins-good-plugins-jpegenc.html#GstJpegEnc--idct-method"/>
<keyword type="signal" name="The "frame-encoded" signal" link="gst-plugins-good-plugins-jpegenc.html#GstJpegEnc-frame-encoded"/>
- <keyword type="" name="Example application" link="gst-plugins-good-plugins-level.html#idp15712800"/>
- <keyword type="" name="Element Information" link="gst-plugins-good-plugins-level.html#idp12836656"/>
- <keyword type="" name="Element Pads" link="gst-plugins-good-plugins-level.html#idp14086784"/>
+ <keyword type="" name="Example application" link="gst-plugins-good-plugins-level.html#idp15820688"/>
+ <keyword type="" name="Element Information" link="gst-plugins-good-plugins-level.html#idp14201312"/>
+ <keyword type="" name="Element Pads" link="gst-plugins-good-plugins-level.html#idp13629760"/>
<keyword type="struct" name="struct GstLevel" link="gst-plugins-good-plugins-level.html#GstLevel-struct"/>
<keyword type="property" name="The "interval" property" link="gst-plugins-good-plugins-level.html#GstLevel--interval"/>
<keyword type="property" name="The "message" property" link="gst-plugins-good-plugins-level.html#GstLevel--message"/>
<keyword type="property" name="The "peak-falloff" property" link="gst-plugins-good-plugins-level.html#GstLevel--peak-falloff"/>
<keyword type="property" name="The "peak-ttl" property" link="gst-plugins-good-plugins-level.html#GstLevel--peak-ttl"/>
- <keyword type="" name="Example launch line" link="gst-plugins-good-plugins-matroskamux.html#idp5256896"/>
- <keyword type="" name="Element Information" link="gst-plugins-good-plugins-matroskamux.html#idp12868448"/>
- <keyword type="" name="Element Pads" link="gst-plugins-good-plugins-matroskamux.html#idp9117392"/>
+ <keyword type="" name="Example launch line" link="gst-plugins-good-plugins-matroskamux.html#idp15449936"/>
+ <keyword type="" name="Element Information" link="gst-plugins-good-plugins-matroskamux.html#idp15713440"/>
+ <keyword type="" name="Element Pads" link="gst-plugins-good-plugins-matroskamux.html#idp14706336"/>
<keyword type="struct" name="GstMatroskaMux" link="gst-plugins-good-plugins-matroskamux.html#GstMatroskaMux-struct"/>
<keyword type="property" name="The "writing-app" property" link="gst-plugins-good-plugins-matroskamux.html#GstMatroskaMux--writing-app"/>
<keyword type="property" name="The "version" property" link="gst-plugins-good-plugins-matroskamux.html#GstMatroskaMux--version"/>
<keyword type="property" name="The "min-index-interval" property" link="gst-plugins-good-plugins-matroskamux.html#GstMatroskaMux--min-index-interval"/>
<keyword type="property" name="The "streamable" property" link="gst-plugins-good-plugins-matroskamux.html#GstMatroskaMux--streamable"/>
- <keyword type="" name="Example launch line" link="gst-plugins-good-plugins-matroskademux.html#idp16107600"/>
- <keyword type="" name="Element Information" link="gst-plugins-good-plugins-matroskademux.html#idp11863200"/>
- <keyword type="" name="Element Pads" link="gst-plugins-good-plugins-matroskademux.html#idp10634736"/>
+ <keyword type="" name="Example launch line" link="gst-plugins-good-plugins-matroskademux.html#idp14757488"/>
+ <keyword type="" name="Element Information" link="gst-plugins-good-plugins-matroskademux.html#idp12345616"/>
+ <keyword type="" name="Element Pads" link="gst-plugins-good-plugins-matroskademux.html#idp14781968"/>
<keyword type="struct" name="GstMatroskaDemux" link="gst-plugins-good-plugins-matroskademux.html#GstMatroskaDemux-struct"/>
<keyword type="property" name="The "max-gap-time" property" link="gst-plugins-good-plugins-matroskademux.html#GstMatroskaDemux--max-gap-time"/>
- <keyword type="" name="Example pipelines" link="gst-plugins-good-plugins-mj2mux.html#idp15754800"/>
- <keyword type="" name="Element Information" link="gst-plugins-good-plugins-mj2mux.html#idp15758144"/>
- <keyword type="" name="Element Pads" link="gst-plugins-good-plugins-mj2mux.html#idp11110672"/>
+ <keyword type="" name="Example pipelines" link="gst-plugins-good-plugins-mj2mux.html#idp16227872"/>
+ <keyword type="" name="Element Information" link="gst-plugins-good-plugins-mj2mux.html#idp16231216"/>
+ <keyword type="" name="Element Pads" link="gst-plugins-good-plugins-mj2mux.html#idp16076064"/>
<keyword type="struct" name="GstMJ2Mux" link="gst-plugins-good-plugins-mj2mux.html#GstMJ2Mux-struct"/>
<keyword type="property" name="The "dts-method" property" link="gst-plugins-good-plugins-mj2mux.html#GstMJ2Mux--dts-method"/>
<keyword type="property" name="The "faststart" property" link="gst-plugins-good-plugins-mj2mux.html#GstMJ2Mux--faststart"/>
@@ -746,17 +744,17 @@
<keyword type="property" name="The "presentation-time" property" link="gst-plugins-good-plugins-mj2mux.html#GstMJ2Mux--presentation-time"/>
<keyword type="property" name="The "streamable" property" link="gst-plugins-good-plugins-mj2mux.html#GstMJ2Mux--streamable"/>
<keyword type="property" name="The "trak-timescale" property" link="gst-plugins-good-plugins-mj2mux.html#GstMJ2Mux--trak-timescale"/>
- <keyword type="" name="Example launch line" link="gst-plugins-good-plugins-monoscope.html#idp5369040"/>
- <keyword type="" name="Element Information" link="gst-plugins-good-plugins-monoscope.html#idp6626400"/>
- <keyword type="" name="Element Pads" link="gst-plugins-good-plugins-monoscope.html#idp6720928"/>
+ <keyword type="" name="Example launch line" link="gst-plugins-good-plugins-monoscope.html#idp14456208"/>
+ <keyword type="" name="Element Information" link="gst-plugins-good-plugins-monoscope.html#idp13497744"/>
+ <keyword type="" name="Element Pads" link="gst-plugins-good-plugins-monoscope.html#idp15224656"/>
<keyword type="struct" name="struct GstMonoscope" link="gst-plugins-good-plugins-monoscope.html#GstMonoscope"/>
- <keyword type="" name="Example launch line" link="gst-plugins-good-plugins-mpegaudioparse.html#idp10750496"/>
- <keyword type="" name="Element Information" link="gst-plugins-good-plugins-mpegaudioparse.html#idp13407296"/>
- <keyword type="" name="Element Pads" link="gst-plugins-good-plugins-mpegaudioparse.html#idp13680528"/>
+ <keyword type="" name="Example launch line" link="gst-plugins-good-plugins-mpegaudioparse.html#idp11237264"/>
+ <keyword type="" name="Element Information" link="gst-plugins-good-plugins-mpegaudioparse.html#idp6217696"/>
+ <keyword type="" name="Element Pads" link="gst-plugins-good-plugins-mpegaudioparse.html#idp14659808"/>
<keyword type="struct" name="struct GstMpegAudioParse" link="gst-plugins-good-plugins-mpegaudioparse.html#GstMpegAudioParse-struct"/>
- <keyword type="" name="Example pipelines" link="gst-plugins-good-plugins-mp4mux.html#idp11208816"/>
- <keyword type="" name="Element Information" link="gst-plugins-good-plugins-mp4mux.html#idp16138016"/>
- <keyword type="" name="Element Pads" link="gst-plugins-good-plugins-mp4mux.html#idp15738784"/>
+ <keyword type="" name="Example pipelines" link="gst-plugins-good-plugins-mp4mux.html#idp5329152"/>
+ <keyword type="" name="Element Information" link="gst-plugins-good-plugins-mp4mux.html#idp16136848"/>
+ <keyword type="" name="Element Pads" link="gst-plugins-good-plugins-mp4mux.html#idp13547440"/>
<keyword type="typedef" name="GstMP4Mux" link="gst-plugins-good-plugins-mp4mux.html#GstMP4Mux"/>
<keyword type="property" name="The "dts-method" property" link="gst-plugins-good-plugins-mp4mux.html#GstMP4Mux--dts-method"/>
<keyword type="property" name="The "faststart" property" link="gst-plugins-good-plugins-mp4mux.html#GstMP4Mux--faststart"/>
@@ -767,16 +765,16 @@
<keyword type="property" name="The "presentation-time" property" link="gst-plugins-good-plugins-mp4mux.html#GstMP4Mux--presentation-time"/>
<keyword type="property" name="The "streamable" property" link="gst-plugins-good-plugins-mp4mux.html#GstMP4Mux--streamable"/>
<keyword type="property" name="The "trak-timescale" property" link="gst-plugins-good-plugins-mp4mux.html#GstMP4Mux--trak-timescale"/>
- <keyword type="" name="Element Information" link="gst-plugins-good-plugins-mulawdec.html#idp13244144"/>
- <keyword type="" name="Element Pads" link="gst-plugins-good-plugins-mulawdec.html#idp12116528"/>
+ <keyword type="" name="Element Information" link="gst-plugins-good-plugins-mulawdec.html#idp15506880"/>
+ <keyword type="" name="Element Pads" link="gst-plugins-good-plugins-mulawdec.html#idp11003504"/>
<keyword type="struct" name="struct GstMuLawDec" link="gst-plugins-good-plugins-mulawdec.html#GstMuLawDec-struct"/>
- <keyword type="" name="Element Information" link="gst-plugins-good-plugins-mulawenc.html#idp8936144"/>
- <keyword type="" name="Element Pads" link="gst-plugins-good-plugins-mulawenc.html#idp8053920"/>
+ <keyword type="" name="Element Information" link="gst-plugins-good-plugins-mulawenc.html#idp10734560"/>
+ <keyword type="" name="Element Pads" link="gst-plugins-good-plugins-mulawenc.html#idp12655776"/>
<keyword type="struct" name="struct GstMuLawDec" link="gst-plugins-good-plugins-mulawenc.html#GstMuLawDec-struct"/>
<keyword type="struct" name="struct GstMuLawEnc" link="gst-plugins-good-plugins-mulawenc.html#GstMuLawEnc"/>
- <keyword type="" name="Example launch line" link="gst-plugins-good-plugins-multifilesink.html#idp14473728"/>
- <keyword type="" name="Element Information" link="gst-plugins-good-plugins-multifilesink.html#idp15565040"/>
- <keyword type="" name="Element Pads" link="gst-plugins-good-plugins-multifilesink.html#idp14207776"/>
+ <keyword type="" name="Example launch line" link="gst-plugins-good-plugins-multifilesink.html#idp13200880"/>
+ <keyword type="" name="Element Information" link="gst-plugins-good-plugins-multifilesink.html#idp16612912"/>
+ <keyword type="" name="Element Pads" link="gst-plugins-good-plugins-multifilesink.html#idp16730464"/>
<keyword type="struct" name="struct GstMultiFileSink" link="gst-plugins-good-plugins-multifilesink.html#GstMultiFileSink-struct"/>
<keyword type="enum" name="enum GstMultiFileSinkNext" link="gst-plugins-good-plugins-multifilesink.html#GstMultiFileSinkNext"/>
<keyword type="property" name="The "location" property" link="gst-plugins-good-plugins-multifilesink.html#GstMultiFileSink--location"/>
@@ -785,9 +783,9 @@
<keyword type="property" name="The "post-messages" property" link="gst-plugins-good-plugins-multifilesink.html#GstMultiFileSink--post-messages"/>
<keyword type="property" name="The "max-files" property" link="gst-plugins-good-plugins-multifilesink.html#GstMultiFileSink--max-files"/>
<keyword type="property" name="The "max-file-size" property" link="gst-plugins-good-plugins-multifilesink.html#GstMultiFileSink--max-file-size"/>
- <keyword type="" name="Example launch line" link="gst-plugins-good-plugins-multifilesrc.html#idp13591632"/>
- <keyword type="" name="Element Information" link="gst-plugins-good-plugins-multifilesrc.html#idp9376400"/>
- <keyword type="" name="Element Pads" link="gst-plugins-good-plugins-multifilesrc.html#idp15502032"/>
+ <keyword type="" name="Example launch line" link="gst-plugins-good-plugins-multifilesrc.html#idp16235120"/>
+ <keyword type="" name="Element Information" link="gst-plugins-good-plugins-multifilesrc.html#idp13479456"/>
+ <keyword type="" name="Element Pads" link="gst-plugins-good-plugins-multifilesrc.html#idp15940160"/>
<keyword type="struct" name="struct GstMultiFileSrc" link="gst-plugins-good-plugins-multifilesrc.html#GstMultiFileSrc-struct"/>
<keyword type="property" name="The "caps" property" link="gst-plugins-good-plugins-multifilesrc.html#GstMultiFileSrc--caps"/>
<keyword type="property" name="The "index" property" link="gst-plugins-good-plugins-multifilesrc.html#GstMultiFileSrc--index"/>
@@ -795,20 +793,20 @@
<keyword type="property" name="The "loop" property" link="gst-plugins-good-plugins-multifilesrc.html#GstMultiFileSrc--loop"/>
<keyword type="property" name="The "start-index" property" link="gst-plugins-good-plugins-multifilesrc.html#GstMultiFileSrc--start-index"/>
<keyword type="property" name="The "stop-index" property" link="gst-plugins-good-plugins-multifilesrc.html#GstMultiFileSrc--stop-index"/>
- <keyword type="" name="Sample pipelines" link="gst-plugins-good-plugins-multipartdemux.html#idp7148944"/>
- <keyword type="" name="Element Information" link="gst-plugins-good-plugins-multipartdemux.html#idp13040640"/>
- <keyword type="" name="Element Pads" link="gst-plugins-good-plugins-multipartdemux.html#idp14664544"/>
+ <keyword type="" name="Sample pipelines" link="gst-plugins-good-plugins-multipartdemux.html#idp15142160"/>
+ <keyword type="" name="Element Information" link="gst-plugins-good-plugins-multipartdemux.html#idp14411344"/>
+ <keyword type="" name="Element Pads" link="gst-plugins-good-plugins-multipartdemux.html#idp7772000"/>
<keyword type="struct" name="struct GstMultipartDemux" link="gst-plugins-good-plugins-multipartdemux.html#GstMultipartDemux-struct"/>
<keyword type="property" name="The "autoscan" property" link="gst-plugins-good-plugins-multipartdemux.html#GstMultipartDemux--autoscan"/>
<keyword type="property" name="The "boundary" property" link="gst-plugins-good-plugins-multipartdemux.html#GstMultipartDemux--boundary"/>
<keyword type="property" name="The "single-stream" property" link="gst-plugins-good-plugins-multipartdemux.html#GstMultipartDemux--single-stream"/>
- <keyword type="" name="Sample pipelines" link="gst-plugins-good-plugins-multipartmux.html#idp11873552"/>
- <keyword type="" name="Element Information" link="gst-plugins-good-plugins-multipartmux.html#idp10302384"/>
- <keyword type="" name="Element Pads" link="gst-plugins-good-plugins-multipartmux.html#idp11784064"/>
+ <keyword type="" name="Sample pipelines" link="gst-plugins-good-plugins-multipartmux.html#idp14421168"/>
+ <keyword type="" name="Element Information" link="gst-plugins-good-plugins-multipartmux.html#idp5602048"/>
+ <keyword type="" name="Element Pads" link="gst-plugins-good-plugins-multipartmux.html#idp15429392"/>
<keyword type="struct" name="struct GstMultipartMux" link="gst-plugins-good-plugins-multipartmux.html#GstMultipartMux-struct"/>
<keyword type="property" name="The "boundary" property" link="gst-plugins-good-plugins-multipartmux.html#GstMultipartMux--boundary"/>
- <keyword type="" name="Element Information" link="gst-plugins-good-plugins-multiudpsink.html#idp14356256"/>
- <keyword type="" name="Element Pads" link="gst-plugins-good-plugins-multiudpsink.html#idp15865152"/>
+ <keyword type="" name="Element Information" link="gst-plugins-good-plugins-multiudpsink.html#idp14505456"/>
+ <keyword type="" name="Element Pads" link="gst-plugins-good-plugins-multiudpsink.html#idp15816512"/>
<keyword type="struct" name="struct GstMultiUDPSink" link="gst-plugins-good-plugins-multiudpsink.html#GstMultiUDPSink-struct"/>
<keyword type="property" name="The "bytes-served" property" link="gst-plugins-good-plugins-multiudpsink.html#GstMultiUDPSink--bytes-served"/>
<keyword type="property" name="The "bytes-to-serve" property" link="gst-plugins-good-plugins-multiudpsink.html#GstMultiUDPSink--bytes-to-serve"/>
@@ -832,75 +830,65 @@
<keyword type="signal" name="The "client-removed" signal" link="gst-plugins-good-plugins-multiudpsink.html#GstMultiUDPSink-client-removed"/>
<keyword type="signal" name="The "get-stats" signal" link="gst-plugins-good-plugins-multiudpsink.html#GstMultiUDPSink-get-stats"/>
<keyword type="signal" name="The "remove" signal" link="gst-plugins-good-plugins-multiudpsink.html#GstMultiUDPSink-remove"/>
- <keyword type="" name="Example launch line" link="gst-plugins-good-plugins-optv.html#idp14867088"/>
- <keyword type="" name="Element Information" link="gst-plugins-good-plugins-optv.html#idp10483840"/>
- <keyword type="" name="Element Pads" link="gst-plugins-good-plugins-optv.html#idp14992928"/>
+ <keyword type="" name="Example launch line" link="gst-plugins-good-plugins-optv.html#idp15002736"/>
+ <keyword type="" name="Element Information" link="gst-plugins-good-plugins-optv.html#idp13362336"/>
+ <keyword type="" name="Element Pads" link="gst-plugins-good-plugins-optv.html#idp11497760"/>
<keyword type="struct" name="struct GstOpTV" link="gst-plugins-good-plugins-optv.html#GstOpTV-struct"/>
<keyword type="property" name="The "mode" property" link="gst-plugins-good-plugins-optv.html#GstOpTV--mode"/>
<keyword type="property" name="The "speed" property" link="gst-plugins-good-plugins-optv.html#GstOpTV--speed"/>
<keyword type="property" name="The "threshold" property" link="gst-plugins-good-plugins-optv.html#GstOpTV--threshold"/>
- <keyword type="" name="Element Information" link="gst-plugins-good-plugins-oss4mixer.html#idp13001632"/>
- <keyword type="" name="Element Pads" link="gst-plugins-good-plugins-oss4mixer.html#idp17410032"/>
- <keyword type="struct" name="struct GstOss4Mixer" link="gst-plugins-good-plugins-oss4mixer.html#GstOss4Mixer"/>
- <keyword type="property" name="The "device" property" link="gst-plugins-good-plugins-oss4mixer.html#GstOss4Mixer--device"/>
- <keyword type="property" name="The "device-name" property" link="gst-plugins-good-plugins-oss4mixer.html#GstOss4Mixer--device-name"/>
- <keyword type="" name="Element Information" link="gst-plugins-good-plugins-oss4sink.html#idp13682496"/>
- <keyword type="" name="Element Pads" link="gst-plugins-good-plugins-oss4sink.html#idp17088432"/>
+ <keyword type="" name="Element Information" link="gst-plugins-good-plugins-oss4sink.html#idp8117088"/>
+ <keyword type="" name="Element Pads" link="gst-plugins-good-plugins-oss4sink.html#idp14692912"/>
<keyword type="struct" name="struct GstOss4Sink" link="gst-plugins-good-plugins-oss4sink.html#GstOss4Sink"/>
<keyword type="property" name="The "device" property" link="gst-plugins-good-plugins-oss4sink.html#GstOss4Sink--device"/>
<keyword type="property" name="The "device-name" property" link="gst-plugins-good-plugins-oss4sink.html#GstOss4Sink--device-name"/>
<keyword type="property" name="The "mute" property" link="gst-plugins-good-plugins-oss4sink.html#GstOss4Sink--mute"/>
<keyword type="property" name="The "volume" property" link="gst-plugins-good-plugins-oss4sink.html#GstOss4Sink--volume"/>
- <keyword type="" name="Element Information" link="gst-plugins-good-plugins-oss4src.html#idp8104880"/>
- <keyword type="" name="Element Pads" link="gst-plugins-good-plugins-oss4src.html#idp16561184"/>
+ <keyword type="" name="Element Information" link="gst-plugins-good-plugins-oss4src.html#idp11797904"/>
+ <keyword type="" name="Element Pads" link="gst-plugins-good-plugins-oss4src.html#idp8055664"/>
<keyword type="struct" name="struct GstOss4Source" link="gst-plugins-good-plugins-oss4src.html#GstOss4Source"/>
<keyword type="property" name="The "device" property" link="gst-plugins-good-plugins-oss4src.html#GstOss4Source--device"/>
<keyword type="property" name="The "device-name" property" link="gst-plugins-good-plugins-oss4src.html#GstOss4Source--device-name"/>
- <keyword type="" name="Element Information" link="gst-plugins-good-plugins-ossmixer.html#idp16705424"/>
- <keyword type="" name="Element Pads" link="gst-plugins-good-plugins-ossmixer.html#idp14909488"/>
- <keyword type="struct" name="struct GstOssMixerElement" link="gst-plugins-good-plugins-ossmixer.html#GstOssMixerElement"/>
- <keyword type="property" name="The "device-name" property" link="gst-plugins-good-plugins-ossmixer.html#GstOssMixerElement--device-name"/>
- <keyword type="property" name="The "device" property" link="gst-plugins-good-plugins-ossmixer.html#GstOssMixerElement--device"/>
- <keyword type="" name="Element Information" link="gst-plugins-good-plugins-osssink.html#idp16899776"/>
- <keyword type="" name="Element Pads" link="gst-plugins-good-plugins-osssink.html#idp15990432"/>
+ <keyword type="" name="Element Information" link="gst-plugins-good-plugins-osssink.html#idp13056000"/>
+ <keyword type="" name="Element Pads" link="gst-plugins-good-plugins-osssink.html#idp17481680"/>
<keyword type="struct" name="struct GstOssSink" link="gst-plugins-good-plugins-osssink.html#GstOssSink"/>
<keyword type="property" name="The "device" property" link="gst-plugins-good-plugins-osssink.html#GstOssSink--device"/>
- <keyword type="" name="Element Information" link="gst-plugins-good-plugins-osssrc.html#idp13825120"/>
- <keyword type="" name="Element Pads" link="gst-plugins-good-plugins-osssrc.html#idp16494896"/>
+ <keyword type="" name="Element Information" link="gst-plugins-good-plugins-osssrc.html#idp12812400"/>
+ <keyword type="" name="Element Pads" link="gst-plugins-good-plugins-osssrc.html#idp17962560"/>
<keyword type="struct" name="struct GstOssSrc" link="gst-plugins-good-plugins-osssrc.html#GstOssSrc"/>
<keyword type="property" name="The "device" property" link="gst-plugins-good-plugins-osssrc.html#GstOssSrc--device"/>
<keyword type="property" name="The "device-name" property" link="gst-plugins-good-plugins-osssrc.html#GstOssSrc--device-name"/>
- <keyword type="" name="Element Information" link="gst-plugins-good-plugins-osxaudiosink.html#idp14471904"/>
- <keyword type="" name="Element Pads" link="gst-plugins-good-plugins-osxaudiosink.html#idp12538752"/>
+ <keyword type="" name="Element Information" link="gst-plugins-good-plugins-osxaudiosink.html#idp14807232"/>
+ <keyword type="" name="Element Pads" link="gst-plugins-good-plugins-osxaudiosink.html#idp15043200"/>
<keyword type="struct" name="struct GstOsxAudioSink" link="gst-plugins-good-plugins-osxaudiosink.html#GstOsxAudioSink"/>
<keyword type="property" name="The "device" property" link="gst-plugins-good-plugins-osxaudiosink.html#GstOsxAudioSink--device"/>
- <keyword type="" name="Element Information" link="gst-plugins-good-plugins-osxaudiosrc.html#idp14259728"/>
- <keyword type="" name="Element Pads" link="gst-plugins-good-plugins-osxaudiosrc.html#idp15763312"/>
+ <keyword type="" name="Element Information" link="gst-plugins-good-plugins-osxaudiosrc.html#idp17002976"/>
+ <keyword type="" name="Element Pads" link="gst-plugins-good-plugins-osxaudiosrc.html#idp11916176"/>
<keyword type="struct" name="struct GstOsxAudioSrc" link="gst-plugins-good-plugins-osxaudiosrc.html#GstOsxAudioSrc"/>
<keyword type="property" name="The "device" property" link="gst-plugins-good-plugins-osxaudiosrc.html#GstOsxAudioSrc--device"/>
- <keyword type="" name="Element Information" link="gst-plugins-good-plugins-osxvideosink.html#idp6419984"/>
- <keyword type="" name="Element Pads" link="gst-plugins-good-plugins-osxvideosink.html#idp10726304"/>
+ <keyword type="" name="Element Information" link="gst-plugins-good-plugins-osxvideosink.html#idp14177904"/>
+ <keyword type="" name="Element Pads" link="gst-plugins-good-plugins-osxvideosink.html#idp16961024"/>
<keyword type="struct" name="struct GstOSXVideoSink" link="gst-plugins-good-plugins-osxvideosink.html#GstOSXVideoSink"/>
<keyword type="property" name="The "embed" property" link="gst-plugins-good-plugins-osxvideosink.html#GstOSXVideoSink--embed"/>
<keyword type="property" name="The "fullscreen" property" link="gst-plugins-good-plugins-osxvideosink.html#GstOSXVideoSink--fullscreen"/>
- <keyword type="" name="Element Information" link="gst-plugins-good-plugins-pngdec.html#idp15945632"/>
- <keyword type="" name="Element Pads" link="gst-plugins-good-plugins-pngdec.html#idp12621872"/>
+ <keyword type="" name="Element Information" link="gst-plugins-good-plugins-pngdec.html#idp13508640"/>
+ <keyword type="" name="Element Pads" link="gst-plugins-good-plugins-pngdec.html#idp15764176"/>
<keyword type="struct" name="struct GstPngDec" link="gst-plugins-good-plugins-pngdec.html#GstPngDec-struct"/>
- <keyword type="" name="Element Information" link="gst-plugins-good-plugins-pngenc.html#idp16649952"/>
- <keyword type="" name="Element Pads" link="gst-plugins-good-plugins-pngenc.html#idp15355568"/>
+ <keyword type="" name="Element Information" link="gst-plugins-good-plugins-pngenc.html#idp13316944"/>
+ <keyword type="" name="Element Pads" link="gst-plugins-good-plugins-pngenc.html#idp15239952"/>
<keyword type="struct" name="struct GstPngEnc" link="gst-plugins-good-plugins-pngenc.html#GstPngEnc-struct"/>
<keyword type="property" name="The "compression-level" property" link="gst-plugins-good-plugins-pngenc.html#GstPngEnc--compression-level"/>
<keyword type="property" name="The "snapshot" property" link="gst-plugins-good-plugins-pngenc.html#GstPngEnc--snapshot"/>
- <keyword type="" name="Example launch line" link="gst-plugins-good-plugins-progressreport.html#idp12550160"/>
- <keyword type="" name="Element Information" link="gst-plugins-good-plugins-progressreport.html#idp17552032"/>
- <keyword type="" name="Element Pads" link="gst-plugins-good-plugins-progressreport.html#idp13621664"/>
+ <keyword type="" name="Example launch line" link="gst-plugins-good-plugins-progressreport.html#idp13991040"/>
+ <keyword type="" name="Element Information" link="gst-plugins-good-plugins-progressreport.html#idp7256736"/>
+ <keyword type="" name="Element Pads" link="gst-plugins-good-plugins-progressreport.html#idp18138176"/>
<keyword type="struct" name="struct GstProgressReport" link="gst-plugins-good-plugins-progressreport.html#GstProgressReport-struct"/>
<keyword type="property" name="The "silent" property" link="gst-plugins-good-plugins-progressreport.html#GstProgressReport--silent"/>
<keyword type="property" name="The "update-freq" property" link="gst-plugins-good-plugins-progressreport.html#GstProgressReport--update-freq"/>
<keyword type="property" name="The "format" property" link="gst-plugins-good-plugins-progressreport.html#GstProgressReport--format"/>
<keyword type="property" name="The "do-query" property" link="gst-plugins-good-plugins-progressreport.html#GstProgressReport--do-query"/>
- <keyword type="" name="Element Information" link="gst-plugins-good-plugins-pulsesink.html#idp14691120"/>
- <keyword type="" name="Element Pads" link="gst-plugins-good-plugins-pulsesink.html#idp18142160"/>
+ <keyword type="" name="Element Information" link="gst-plugins-good-plugins-pulsesink.html#idp10988000"/>
+ <keyword type="" name="Element Pads" link="gst-plugins-good-plugins-pulsesink.html#idp16601440"/>
<keyword type="struct" name="struct GstPulseSink" link="gst-plugins-good-plugins-pulsesink.html#GstPulseSink-struct"/>
<keyword type="property" name="The "device" property" link="gst-plugins-good-plugins-pulsesink.html#GstPulseSink--device"/>
<keyword type="property" name="The "server" property" link="gst-plugins-good-plugins-pulsesink.html#GstPulseSink--server"/>
@@ -910,8 +898,8 @@
<keyword type="property" name="The "client" property" link="gst-plugins-good-plugins-pulsesink.html#GstPulseSink--client"/>
<keyword type="property" name="The "stream-properties" property" link="gst-plugins-good-plugins-pulsesink.html#GstPulseSink--stream-properties"/>
<keyword type="property" name="The "client-name" property" link="gst-plugins-good-plugins-pulsesink.html#GstPulseSink--client-name"/>
- <keyword type="" name="Element Information" link="gst-plugins-good-plugins-pulsesrc.html#idp14332336"/>
- <keyword type="" name="Element Pads" link="gst-plugins-good-plugins-pulsesrc.html#idp16679552"/>
+ <keyword type="" name="Element Information" link="gst-plugins-good-plugins-pulsesrc.html#idp17836224"/>
+ <keyword type="" name="Element Pads" link="gst-plugins-good-plugins-pulsesrc.html#idp17185552"/>
<keyword type="struct" name="struct GstPulseSrc" link="gst-plugins-good-plugins-pulsesrc.html#GstPulseSrc-struct"/>
<keyword type="property" name="The "device" property" link="gst-plugins-good-plugins-pulsesrc.html#GstPulseSrc--device"/>
<keyword type="property" name="The "server" property" link="gst-plugins-good-plugins-pulsesrc.html#GstPulseSrc--server"/>
@@ -922,25 +910,21 @@
<keyword type="property" name="The "source-output-index" property" link="gst-plugins-good-plugins-pulsesrc.html#GstPulseSrc--source-output-index"/>
<keyword type="property" name="The "volume" property" link="gst-plugins-good-plugins-pulsesrc.html#GstPulseSrc--volume"/>
<keyword type="property" name="The "client-name" property" link="gst-plugins-good-plugins-pulsesrc.html#GstPulseSrc--client-name"/>
- <keyword type="" name="Element Information" link="gst-plugins-good-plugins-pulsemixer.html#idp15014608"/>
- <keyword type="" name="Element Pads" link="gst-plugins-good-plugins-pulsemixer.html#idp16442464"/>
- <keyword type="struct" name="struct GstPulseMixer" link="gst-plugins-good-plugins-pulsemixer.html#GstPulseMixer-struct"/>
- <keyword type="property" name="The "device" property" link="gst-plugins-good-plugins-pulsemixer.html#GstPulseMixer--device"/>
- <keyword type="property" name="The "device-name" property" link="gst-plugins-good-plugins-pulsemixer.html#GstPulseMixer--device-name"/>
- <keyword type="property" name="The "server" property" link="gst-plugins-good-plugins-pulsemixer.html#GstPulseMixer--server"/>
- <keyword type="" name="Example launch line" link="gst-plugins-good-plugins-quarktv.html#idp15983952"/>
- <keyword type="" name="Element Information" link="gst-plugins-good-plugins-quarktv.html#idp14445824"/>
- <keyword type="" name="Element Pads" link="gst-plugins-good-plugins-quarktv.html#idp12663680"/>
+ <keyword type="" name="Element Information" link="gst-plugins-good-plugins-pulsemixer.html#idp12358688"/>
+ <keyword type="" name="Element Pads" link="gst-plugins-good-plugins-pulsemixer.html#idp17805504"/>
+ <keyword type="" name="Example launch line" link="gst-plugins-good-plugins-quarktv.html#idp7403632"/>
+ <keyword type="" name="Element Information" link="gst-plugins-good-plugins-quarktv.html#idp16391712"/>
+ <keyword type="" name="Element Pads" link="gst-plugins-good-plugins-quarktv.html#idp17691664"/>
<keyword type="struct" name="struct GstQuarkTV" link="gst-plugins-good-plugins-quarktv.html#GstQuarkTV-struct"/>
<keyword type="property" name="The "planes" property" link="gst-plugins-good-plugins-quarktv.html#GstQuarkTV--planes"/>
- <keyword type="" name="Example launch line" link="gst-plugins-good-plugins-qtdemux.html#idp15020656"/>
- <keyword type="" name="Element Information" link="gst-plugins-good-plugins-qtdemux.html#idp15524320"/>
- <keyword type="" name="Element Pads" link="gst-plugins-good-plugins-qtdemux.html#idp15016384"/>
+ <keyword type="" name="Example launch line" link="gst-plugins-good-plugins-qtdemux.html#idp16198944"/>
+ <keyword type="" name="Element Information" link="gst-plugins-good-plugins-qtdemux.html#idp17206640"/>
+ <keyword type="" name="Element Pads" link="gst-plugins-good-plugins-qtdemux.html#idp18403552"/>
<keyword type="struct" name="struct GstQTDemux" link="gst-plugins-good-plugins-qtdemux.html#GstQTDemux-struct"/>
<keyword type="signal" name="The "got-redirect" signal" link="gst-plugins-good-plugins-qtdemux.html#GstQTDemux-got-redirect"/>
- <keyword type="" name="Example pipelines" link="gst-plugins-good-plugins-qtmux.html#idp17404912"/>
- <keyword type="" name="Element Information" link="gst-plugins-good-plugins-qtmux.html#idp15927056"/>
- <keyword type="" name="Element Pads" link="gst-plugins-good-plugins-qtmux.html#idp16462880"/>
+ <keyword type="" name="Example pipelines" link="gst-plugins-good-plugins-qtmux.html#idp16989280"/>
+ <keyword type="" name="Element Information" link="gst-plugins-good-plugins-qtmux.html#idp16172624"/>
+ <keyword type="" name="Element Pads" link="gst-plugins-good-plugins-qtmux.html#idp12515216"/>
<keyword type="struct" name="struct GstQTMux" link="gst-plugins-good-plugins-qtmux.html#GstQTMux-struct"/>
<keyword type="property" name="The "dts-method" property" link="gst-plugins-good-plugins-qtmux.html#GstQTMux--dts-method"/>
<keyword type="property" name="The "faststart" property" link="gst-plugins-good-plugins-qtmux.html#GstQTMux--faststart"/>
@@ -951,9 +935,9 @@
<keyword type="property" name="The "presentation-time" property" link="gst-plugins-good-plugins-qtmux.html#GstQTMux--presentation-time"/>
<keyword type="property" name="The "streamable" property" link="gst-plugins-good-plugins-qtmux.html#GstQTMux--streamable"/>
<keyword type="property" name="The "trak-timescale" property" link="gst-plugins-good-plugins-qtmux.html#GstQTMux--trak-timescale"/>
- <keyword type="" name="Example pipelines" link="gst-plugins-good-plugins-qtmoovrecover.html#idp10728128"/>
- <keyword type="" name="Element Information" link="gst-plugins-good-plugins-qtmoovrecover.html#idp17483184"/>
- <keyword type="" name="Element Pads" link="gst-plugins-good-plugins-qtmoovrecover.html#idp15966784"/>
+ <keyword type="" name="Example pipelines" link="gst-plugins-good-plugins-qtmoovrecover.html#idp17765248"/>
+ <keyword type="" name="Element Information" link="gst-plugins-good-plugins-qtmoovrecover.html#idp14195840"/>
+ <keyword type="" name="Element Pads" link="gst-plugins-good-plugins-qtmoovrecover.html#idp16410720"/>
<keyword type="struct" name="struct GstQTMoovRecover" link="gst-plugins-good-plugins-qtmoovrecover.html#GstQTMoovRecover-struct"/>
<keyword type="struct" name="struct GstQTMoovRecoverClass" link="gst-plugins-good-plugins-qtmoovrecover.html#GstQTMoovRecoverClass"/>
<keyword type="function" name="gst_qt_moov_recover_get_type ()" link="gst-plugins-good-plugins-qtmoovrecover.html#gst-qt-moov-recover-get-type"/>
@@ -962,37 +946,37 @@
<keyword type="property" name="The "faststart-mode" property" link="gst-plugins-good-plugins-qtmoovrecover.html#GstQTMoovRecover--faststart-mode"/>
<keyword type="property" name="The "fixed-output" property" link="gst-plugins-good-plugins-qtmoovrecover.html#GstQTMoovRecover--fixed-output"/>
<keyword type="property" name="The "recovery-input" property" link="gst-plugins-good-plugins-qtmoovrecover.html#GstQTMoovRecover--recovery-input"/>
- <keyword type="" name="Example launch line" link="gst-plugins-good-plugins-radioactv.html#idp14409600"/>
- <keyword type="" name="Element Information" link="gst-plugins-good-plugins-radioactv.html#idp17200336"/>
- <keyword type="" name="Element Pads" link="gst-plugins-good-plugins-radioactv.html#idp17884160"/>
+ <keyword type="" name="Example launch line" link="gst-plugins-good-plugins-radioactv.html#idp10854224"/>
+ <keyword type="" name="Element Information" link="gst-plugins-good-plugins-radioactv.html#idp18848112"/>
+ <keyword type="" name="Element Pads" link="gst-plugins-good-plugins-radioactv.html#idp15835168"/>
<keyword type="struct" name="struct GstRadioacTV" link="gst-plugins-good-plugins-radioactv.html#GstRadioacTV-struct"/>
<keyword type="property" name="The "color" property" link="gst-plugins-good-plugins-radioactv.html#GstRadioacTV--color"/>
<keyword type="property" name="The "interval" property" link="gst-plugins-good-plugins-radioactv.html#GstRadioacTV--interval"/>
<keyword type="property" name="The "mode" property" link="gst-plugins-good-plugins-radioactv.html#GstRadioacTV--mode"/>
<keyword type="property" name="The "trigger" property" link="gst-plugins-good-plugins-radioactv.html#GstRadioacTV--trigger"/>
- <keyword type="" name="Element Information" link="gst-plugins-good-plugins-revtv.html#idp13727888"/>
- <keyword type="" name="Element Pads" link="gst-plugins-good-plugins-revtv.html#idp14594624"/>
+ <keyword type="" name="Element Information" link="gst-plugins-good-plugins-revtv.html#idp16197088"/>
+ <keyword type="" name="Element Pads" link="gst-plugins-good-plugins-revtv.html#idp15120032"/>
<keyword type="struct" name="struct GstRevTV" link="gst-plugins-good-plugins-revtv.html#GstRevTV-struct"/>
<keyword type="property" name="The "delay" property" link="gst-plugins-good-plugins-revtv.html#GstRevTV--delay"/>
<keyword type="property" name="The "gain" property" link="gst-plugins-good-plugins-revtv.html#GstRevTV--gain"/>
<keyword type="property" name="The "linespace" property" link="gst-plugins-good-plugins-revtv.html#GstRevTV--linespace"/>
- <keyword type="" name="Example launch lines" link="gst-plugins-good-plugins-rganalysis.html#idp16557488"/>
- <keyword type="" name="Acknowledgements" link="gst-plugins-good-plugins-rganalysis.html#idp15253792"/>
- <keyword type="" name="Element Information" link="gst-plugins-good-plugins-rganalysis.html#idp15988928"/>
- <keyword type="" name="Element Pads" link="gst-plugins-good-plugins-rganalysis.html#idp16675600"/>
+ <keyword type="" name="Example launch lines" link="gst-plugins-good-plugins-rganalysis.html#idp18237024"/>
+ <keyword type="" name="Acknowledgements" link="gst-plugins-good-plugins-rganalysis.html#idp15245040"/>
+ <keyword type="" name="Element Information" link="gst-plugins-good-plugins-rganalysis.html#idp17882816"/>
+ <keyword type="" name="Element Pads" link="gst-plugins-good-plugins-rganalysis.html#idp17377328"/>
<keyword type="struct" name="struct GstRgAnalysis" link="gst-plugins-good-plugins-rganalysis.html#GstRgAnalysis-struct"/>
<keyword type="property" name="The "forced" property" link="gst-plugins-good-plugins-rganalysis.html#GstRgAnalysis--forced"/>
<keyword type="property" name="The "num-tracks" property" link="gst-plugins-good-plugins-rganalysis.html#GstRgAnalysis--num-tracks"/>
<keyword type="property" name="The "reference-level" property" link="gst-plugins-good-plugins-rganalysis.html#GstRgAnalysis--reference-level"/>
<keyword type="property" name="The "message" property" link="gst-plugins-good-plugins-rganalysis.html#GstRgAnalysis--message"/>
- <keyword type="" name="Example launch line" link="gst-plugins-good-plugins-rglimiter.html#idp16367360"/>
- <keyword type="" name="Element Information" link="gst-plugins-good-plugins-rglimiter.html#idp18661104"/>
- <keyword type="" name="Element Pads" link="gst-plugins-good-plugins-rglimiter.html#idp15407888"/>
+ <keyword type="" name="Example launch line" link="gst-plugins-good-plugins-rglimiter.html#idp16485264"/>
+ <keyword type="" name="Element Information" link="gst-plugins-good-plugins-rglimiter.html#idp18422224"/>
+ <keyword type="" name="Element Pads" link="gst-plugins-good-plugins-rglimiter.html#idp18081200"/>
<keyword type="struct" name="struct GstRgLimiter" link="gst-plugins-good-plugins-rglimiter.html#GstRgLimiter-struct"/>
<keyword type="property" name="The "enabled" property" link="gst-plugins-good-plugins-rglimiter.html#GstRgLimiter--enabled"/>
- <keyword type="" name="Example launch line" link="gst-plugins-good-plugins-rgvolume.html#idp15961168"/>
- <keyword type="" name="Element Information" link="gst-plugins-good-plugins-rgvolume.html#idp17400640"/>
- <keyword type="" name="Element Pads" link="gst-plugins-good-plugins-rgvolume.html#idp17949744"/>
+ <keyword type="" name="Example launch line" link="gst-plugins-good-plugins-rgvolume.html#idp17808000"/>
+ <keyword type="" name="Element Information" link="gst-plugins-good-plugins-rgvolume.html#idp16300672"/>
+ <keyword type="" name="Element Pads" link="gst-plugins-good-plugins-rgvolume.html#idp18297472"/>
<keyword type="struct" name="struct GstRgVolume" link="gst-plugins-good-plugins-rgvolume.html#GstRgVolume-struct"/>
<keyword type="property" name="The "album-mode" property" link="gst-plugins-good-plugins-rgvolume.html#GstRgVolume--album-mode"/>
<keyword type="property" name="The "fallback-gain" property" link="gst-plugins-good-plugins-rgvolume.html#GstRgVolume--fallback-gain"/>
@@ -1000,14 +984,14 @@
<keyword type="property" name="The "pre-amp" property" link="gst-plugins-good-plugins-rgvolume.html#GstRgVolume--pre-amp"/>
<keyword type="property" name="The "result-gain" property" link="gst-plugins-good-plugins-rgvolume.html#GstRgVolume--result-gain"/>
<keyword type="property" name="The "target-gain" property" link="gst-plugins-good-plugins-rgvolume.html#GstRgVolume--target-gain"/>
- <keyword type="" name="Example launch line" link="gst-plugins-good-plugins-rippletv.html#idp18404432"/>
- <keyword type="" name="Element Information" link="gst-plugins-good-plugins-rippletv.html#idp19182240"/>
- <keyword type="" name="Element Pads" link="gst-plugins-good-plugins-rippletv.html#idp16942064"/>
+ <keyword type="" name="Example launch line" link="gst-plugins-good-plugins-rippletv.html#idp15442720"/>
+ <keyword type="" name="Element Information" link="gst-plugins-good-plugins-rippletv.html#idp17495024"/>
+ <keyword type="" name="Element Pads" link="gst-plugins-good-plugins-rippletv.html#idp17383984"/>
<keyword type="struct" name="struct GstRippleTV" link="gst-plugins-good-plugins-rippletv.html#GstRippleTV-struct"/>
<keyword type="property" name="The "mode" property" link="gst-plugins-good-plugins-rippletv.html#GstRippleTV--mode"/>
<keyword type="property" name="The "reset" property" link="gst-plugins-good-plugins-rippletv.html#GstRippleTV--reset"/>
- <keyword type="" name="Element Information" link="gst-plugins-good-plugins-rtpdec.html#idp15824080"/>
- <keyword type="" name="Element Pads" link="gst-plugins-good-plugins-rtpdec.html#idp18848928"/>
+ <keyword type="" name="Element Information" link="gst-plugins-good-plugins-rtpdec.html#idp18076736"/>
+ <keyword type="" name="Element Pads" link="gst-plugins-good-plugins-rtpdec.html#idp16741456"/>
<keyword type="struct" name="struct GstRTPDec" link="gst-plugins-good-plugins-rtpdec.html#GstRTPDec-struct"/>
<keyword type="property" name="The "skip" property" link="gst-plugins-good-plugins-rtpdec.html#GstRTPDec--skip"/>
<keyword type="property" name="The "latency" property" link="gst-plugins-good-plugins-rtpdec.html#GstRTPDec--latency"/>
@@ -1019,19 +1003,19 @@
<keyword type="signal" name="The "on-ssrc-collision" signal" link="gst-plugins-good-plugins-rtpdec.html#GstRTPDec-on-ssrc-collision"/>
<keyword type="signal" name="The "on-ssrc-validated" signal" link="gst-plugins-good-plugins-rtpdec.html#GstRTPDec-on-ssrc-validated"/>
<keyword type="signal" name="The "on-timeout" signal" link="gst-plugins-good-plugins-rtpdec.html#GstRTPDec-on-timeout"/>
- <keyword type="" name="Element Information" link="gst-plugins-good-plugins-rtpj2kpay.html#idp17425904"/>
- <keyword type="" name="Element Pads" link="gst-plugins-good-plugins-rtpj2kpay.html#idp19224912"/>
+ <keyword type="" name="Element Information" link="gst-plugins-good-plugins-rtpj2kpay.html#idp16409504"/>
+ <keyword type="" name="Element Pads" link="gst-plugins-good-plugins-rtpj2kpay.html#idp15968496"/>
<keyword type="struct" name="struct GstRtpJ2KPay" link="gst-plugins-good-plugins-rtpj2kpay.html#GstRtpJ2KPay-struct"/>
<keyword type="property" name="The "buffer-list" property" link="gst-plugins-good-plugins-rtpj2kpay.html#GstRtpJ2KPay--buffer-list"/>
- <keyword type="" name="Element Information" link="gst-plugins-good-plugins-rtpjpegpay.html#idp15304144"/>
- <keyword type="" name="Element Pads" link="gst-plugins-good-plugins-rtpjpegpay.html#idp19238016"/>
+ <keyword type="" name="Element Information" link="gst-plugins-good-plugins-rtpjpegpay.html#idp19177456"/>
+ <keyword type="" name="Element Pads" link="gst-plugins-good-plugins-rtpjpegpay.html#idp19227808"/>
<keyword type="struct" name="struct GstRtpJPEGPay" link="gst-plugins-good-plugins-rtpjpegpay.html#GstRtpJPEGPay-struct"/>
<keyword type="property" name="The "quality" property" link="gst-plugins-good-plugins-rtpjpegpay.html#GstRtpJPEGPay--quality"/>
<keyword type="property" name="The "type" property" link="gst-plugins-good-plugins-rtpjpegpay.html#GstRtpJPEGPay--type"/>
<keyword type="property" name="The "buffer-list" property" link="gst-plugins-good-plugins-rtpjpegpay.html#GstRtpJPEGPay--buffer-list"/>
- <keyword type="" name="Example launch line" link="gst-plugins-good-plugins-rtspsrc.html#idp18656768"/>
- <keyword type="" name="Element Information" link="gst-plugins-good-plugins-rtspsrc.html#idp18806864"/>
- <keyword type="" name="Element Pads" link="gst-plugins-good-plugins-rtspsrc.html#idp19436816"/>
+ <keyword type="" name="Example launch line" link="gst-plugins-good-plugins-rtspsrc.html#idp17495856"/>
+ <keyword type="" name="Element Information" link="gst-plugins-good-plugins-rtspsrc.html#idp14815408"/>
+ <keyword type="" name="Element Pads" link="gst-plugins-good-plugins-rtspsrc.html#idp19109360"/>
<keyword type="struct" name="struct GstRTSPSrc" link="gst-plugins-good-plugins-rtspsrc.html#GstRTSPSrc-struct"/>
<keyword type="property" name="The "debug" property" link="gst-plugins-good-plugins-rtspsrc.html#GstRTSPSrc--debug"/>
<keyword type="property" name="The "location" property" link="gst-plugins-good-plugins-rtspsrc.html#GstRTSPSrc--location"/>
@@ -1052,8 +1036,8 @@
<keyword type="property" name="The "udp-buffer-size" property" link="gst-plugins-good-plugins-rtspsrc.html#GstRTSPSrc--udp-buffer-size"/>
<keyword type="property" name="The "short-header" property" link="gst-plugins-good-plugins-rtspsrc.html#GstRTSPSrc--short-header"/>
<keyword type="property" name="The "do-rtsp-keep-alive" property" link="gst-plugins-good-plugins-rtspsrc.html#GstRTSPSrc--do-rtsp-keep-alive"/>
- <keyword type="" name="Element Information" link="gst-plugins-good-plugins-rtpbin.html#idp20267888"/>
- <keyword type="" name="Element Pads" link="gst-plugins-good-plugins-rtpbin.html#idp20275296"/>
+ <keyword type="" name="Element Information" link="gst-plugins-good-plugins-rtpbin.html#idp20120176"/>
+ <keyword type="" name="Element Pads" link="gst-plugins-good-plugins-rtpbin.html#idp20127632"/>
<keyword type="struct" name="struct GstRtpBin" link="gst-plugins-good-plugins-rtpbin.html#GstRtpBin-struct"/>
<keyword type="property" name="The "do-lost" property" link="gst-plugins-good-plugins-rtpbin.html#GstRtpBin--do-lost"/>
<keyword type="property" name="The "latency" property" link="gst-plugins-good-plugins-rtpbin.html#GstRtpBin--latency"/>
@@ -1080,8 +1064,8 @@
<keyword type="signal" name="The "request-pt-map" signal" link="gst-plugins-good-plugins-rtpbin.html#GstRtpBin-request-pt-map"/>
<keyword type="signal" name="The "reset-sync" signal" link="gst-plugins-good-plugins-rtpbin.html#GstRtpBin-reset-sync"/>
<keyword type="signal" name="The "payload-type-change" signal" link="gst-plugins-good-plugins-rtpbin.html#GstRtpBin-payload-type-change"/>
- <keyword type="" name="Element Information" link="gst-plugins-good-plugins-rtpjitterbuffer.html#idp19880016"/>
- <keyword type="" name="Element Pads" link="gst-plugins-good-plugins-rtpjitterbuffer.html#idp19791056"/>
+ <keyword type="" name="Element Information" link="gst-plugins-good-plugins-rtpjitterbuffer.html#idp19063808"/>
+ <keyword type="" name="Element Pads" link="gst-plugins-good-plugins-rtpjitterbuffer.html#idp18771664"/>
<keyword type="struct" name="struct GstRtpJitterBuffer" link="gst-plugins-good-plugins-rtpjitterbuffer.html#GstRtpJitterBuffer-struct"/>
<keyword type="property" name="The "do-lost" property" link="gst-plugins-good-plugins-rtpjitterbuffer.html#GstRtpJitterBuffer--do-lost"/>
<keyword type="property" name="The "drop-on-latency" property" link="gst-plugins-good-plugins-rtpjitterbuffer.html#GstRtpJitterBuffer--drop-on-latency"/>
@@ -1094,15 +1078,15 @@
<keyword type="signal" name="The "on-npt-stop" signal" link="gst-plugins-good-plugins-rtpjitterbuffer.html#GstRtpJitterBuffer-on-npt-stop"/>
<keyword type="signal" name="The "request-pt-map" signal" link="gst-plugins-good-plugins-rtpjitterbuffer.html#GstRtpJitterBuffer-request-pt-map"/>
<keyword type="signal" name="The "set-active" signal" link="gst-plugins-good-plugins-rtpjitterbuffer.html#GstRtpJitterBuffer-set-active"/>
- <keyword type="" name="Element Information" link="gst-plugins-good-plugins-rtpptdemux.html#idp17925264"/>
- <keyword type="" name="Element Pads" link="gst-plugins-good-plugins-rtpptdemux.html#idp19279328"/>
+ <keyword type="" name="Element Information" link="gst-plugins-good-plugins-rtpptdemux.html#idp18007024"/>
+ <keyword type="" name="Element Pads" link="gst-plugins-good-plugins-rtpptdemux.html#idp10848784"/>
<keyword type="struct" name="struct GstRtpPtDemux" link="gst-plugins-good-plugins-rtpptdemux.html#GstRtpPtDemux-struct"/>
<keyword type="signal" name="The "clear-pt-map" signal" link="gst-plugins-good-plugins-rtpptdemux.html#GstRtpPtDemux-clear-pt-map"/>
<keyword type="signal" name="The "new-payload-type" signal" link="gst-plugins-good-plugins-rtpptdemux.html#GstRtpPtDemux-new-payload-type"/>
<keyword type="signal" name="The "payload-type-change" signal" link="gst-plugins-good-plugins-rtpptdemux.html#GstRtpPtDemux-payload-type-change"/>
<keyword type="signal" name="The "request-pt-map" signal" link="gst-plugins-good-plugins-rtpptdemux.html#GstRtpPtDemux-request-pt-map"/>
- <keyword type="" name="Element Information" link="gst-plugins-good-plugins-rtpsession.html#idp18211632"/>
- <keyword type="" name="Element Pads" link="gst-plugins-good-plugins-rtpsession.html#idp18915808"/>
+ <keyword type="" name="Element Information" link="gst-plugins-good-plugins-rtpsession.html#idp16718688"/>
+ <keyword type="" name="Element Pads" link="gst-plugins-good-plugins-rtpsession.html#idp16750032"/>
<keyword type="struct" name="struct GstRtpSession" link="gst-plugins-good-plugins-rtpsession.html#GstRtpSession-struct"/>
<keyword type="property" name="The "bandwidth" property" link="gst-plugins-good-plugins-rtpsession.html#GstRtpSession--bandwidth"/>
<keyword type="property" name="The "internal-session" property" link="gst-plugins-good-plugins-rtpsession.html#GstRtpSession--internal-session"/>
@@ -1126,19 +1110,19 @@
<keyword type="signal" name="The "on-ssrc-validated" signal" link="gst-plugins-good-plugins-rtpsession.html#GstRtpSession-on-ssrc-validated"/>
<keyword type="signal" name="The "on-timeout" signal" link="gst-plugins-good-plugins-rtpsession.html#GstRtpSession-on-timeout"/>
<keyword type="signal" name="The "request-pt-map" signal" link="gst-plugins-good-plugins-rtpsession.html#GstRtpSession-request-pt-map"/>
- <keyword type="" name="Element Information" link="gst-plugins-good-plugins-rtpssrcdemux.html#idp20155088"/>
- <keyword type="" name="Element Pads" link="gst-plugins-good-plugins-rtpssrcdemux.html#idp18065936"/>
+ <keyword type="" name="Element Information" link="gst-plugins-good-plugins-rtpssrcdemux.html#idp18382192"/>
+ <keyword type="" name="Element Pads" link="gst-plugins-good-plugins-rtpssrcdemux.html#idp10443728"/>
<keyword type="struct" name="struct GstRtpSsrcDemux" link="gst-plugins-good-plugins-rtpssrcdemux.html#GstRtpSsrcDemux-struct"/>
<keyword type="signal" name="The "clear-ssrc" signal" link="gst-plugins-good-plugins-rtpssrcdemux.html#GstRtpSsrcDemux-clear-ssrc"/>
<keyword type="signal" name="The "new-ssrc-pad" signal" link="gst-plugins-good-plugins-rtpssrcdemux.html#GstRtpSsrcDemux-new-ssrc-pad"/>
<keyword type="signal" name="The "removed-ssrc-pad" signal" link="gst-plugins-good-plugins-rtpssrcdemux.html#GstRtpSsrcDemux-removed-ssrc-pad"/>
- <keyword type="" name="Example launch line" link="gst-plugins-good-plugins-shagadelictv.html#idp19856896"/>
- <keyword type="" name="Element Information" link="gst-plugins-good-plugins-shagadelictv.html#idp11929824"/>
- <keyword type="" name="Element Pads" link="gst-plugins-good-plugins-shagadelictv.html#idp15036288"/>
+ <keyword type="" name="Example launch line" link="gst-plugins-good-plugins-shagadelictv.html#idp17609472"/>
+ <keyword type="" name="Element Information" link="gst-plugins-good-plugins-shagadelictv.html#idp10381440"/>
+ <keyword type="" name="Element Pads" link="gst-plugins-good-plugins-shagadelictv.html#idp18154080"/>
<keyword type="struct" name="struct GstShagadelicTV" link="gst-plugins-good-plugins-shagadelictv.html#GstShagadelicTV-struct"/>
- <keyword type="" name="Example launch line" link="gst-plugins-good-plugins-shapewipe.html#idp18963216"/>
- <keyword type="" name="Element Information" link="gst-plugins-good-plugins-shapewipe.html#idp18258032"/>
- <keyword type="" name="Element Pads" link="gst-plugins-good-plugins-shapewipe.html#idp16639392"/>
+ <keyword type="" name="Example launch line" link="gst-plugins-good-plugins-shapewipe.html#idp20575168"/>
+ <keyword type="" name="Element Information" link="gst-plugins-good-plugins-shapewipe.html#idp18048304"/>
+ <keyword type="" name="Element Pads" link="gst-plugins-good-plugins-shapewipe.html#idp19229200"/>
<keyword type="struct" name="struct GstShapeWipe" link="gst-plugins-good-plugins-shapewipe.html#GstShapeWipe-struct"/>
<keyword type="property" name="The "border" property" link="gst-plugins-good-plugins-shapewipe.html#GstShapeWipe--border"/>
<keyword type="property" name="The "position" property" link="gst-plugins-good-plugins-shapewipe.html#GstShapeWipe--position"/>
@@ -1148,9 +1132,9 @@
<keyword type="property" name="The "qmax" property" link="gst-plugins-good-plugins-smokeenc.html#GstSmokeEnc--qmax"/>
<keyword type="property" name="The "qmin" property" link="gst-plugins-good-plugins-smokeenc.html#GstSmokeEnc--qmin"/>
<keyword type="property" name="The "threshold" property" link="gst-plugins-good-plugins-smokeenc.html#GstSmokeEnc--threshold"/>
- <keyword type="" name="Sample pipelines" link="gst-plugins-good-plugins-smpte.html#idp19705712"/>
- <keyword type="" name="Element Information" link="gst-plugins-good-plugins-smpte.html#idp19858848"/>
- <keyword type="" name="Element Pads" link="gst-plugins-good-plugins-smpte.html#idp19697552"/>
+ <keyword type="" name="Sample pipelines" link="gst-plugins-good-plugins-smpte.html#idp14059248"/>
+ <keyword type="" name="Element Information" link="gst-plugins-good-plugins-smpte.html#idp18850944"/>
+ <keyword type="" name="Element Pads" link="gst-plugins-good-plugins-smpte.html#idp21636624"/>
<keyword type="struct" name="struct GstSMPTE" link="gst-plugins-good-plugins-smpte.html#GstSMPTE-struct"/>
<keyword type="property" name="The "border" property" link="gst-plugins-good-plugins-smpte.html#GstSMPTE--border"/>
<keyword type="property" name="The "depth" property" link="gst-plugins-good-plugins-smpte.html#GstSMPTE--depth"/>
@@ -1158,17 +1142,17 @@
<keyword type="property" name="The "type" property" link="gst-plugins-good-plugins-smpte.html#GstSMPTE--type"/>
<keyword type="property" name="The "duration" property" link="gst-plugins-good-plugins-smpte.html#GstSMPTE--duration"/>
<keyword type="property" name="The "invert" property" link="gst-plugins-good-plugins-smpte.html#GstSMPTE--invert"/>
- <keyword type="" name="Sample pipelines" link="gst-plugins-good-plugins-smptealpha.html#idp17936464"/>
- <keyword type="" name="Element Information" link="gst-plugins-good-plugins-smptealpha.html#idp17658672"/>
- <keyword type="" name="Element Pads" link="gst-plugins-good-plugins-smptealpha.html#idp19461120"/>
+ <keyword type="" name="Sample pipelines" link="gst-plugins-good-plugins-smptealpha.html#idp18566688"/>
+ <keyword type="" name="Element Information" link="gst-plugins-good-plugins-smptealpha.html#idp16653744"/>
+ <keyword type="" name="Element Pads" link="gst-plugins-good-plugins-smptealpha.html#idp21153392"/>
<keyword type="struct" name="struct GstSMPTEAlpha" link="gst-plugins-good-plugins-smptealpha.html#GstSMPTEAlpha-struct"/>
<keyword type="property" name="The "border" property" link="gst-plugins-good-plugins-smptealpha.html#GstSMPTEAlpha--border"/>
<keyword type="property" name="The "depth" property" link="gst-plugins-good-plugins-smptealpha.html#GstSMPTEAlpha--depth"/>
<keyword type="property" name="The "position" property" link="gst-plugins-good-plugins-smptealpha.html#GstSMPTEAlpha--position"/>
<keyword type="property" name="The "type" property" link="gst-plugins-good-plugins-smptealpha.html#GstSMPTEAlpha--type"/>
<keyword type="property" name="The "invert" property" link="gst-plugins-good-plugins-smptealpha.html#GstSMPTEAlpha--invert"/>
- <keyword type="" name="Element Information" link="gst-plugins-good-plugins-souphttpsrc.html#idp21773040"/>
- <keyword type="" name="Element Pads" link="gst-plugins-good-plugins-souphttpsrc.html#idp19053104"/>
+ <keyword type="" name="Element Information" link="gst-plugins-good-plugins-souphttpsrc.html#idp17570512"/>
+ <keyword type="" name="Element Pads" link="gst-plugins-good-plugins-souphttpsrc.html#idp11179712"/>
<keyword type="struct" name="struct GstSoupHTTPSrc" link="gst-plugins-good-plugins-souphttpsrc.html#GstSoupHTTPSrc-struct"/>
<keyword type="property" name="The "automatic-redirect" property" link="gst-plugins-good-plugins-souphttpsrc.html#GstSoupHTTPSrc--automatic-redirect"/>
<keyword type="property" name="The "cookies" property" link="gst-plugins-good-plugins-souphttpsrc.html#GstSoupHTTPSrc--cookies"/>
@@ -1187,9 +1171,9 @@
<keyword type="property" name="The "user-pw" property" link="gst-plugins-good-plugins-souphttpsrc.html#GstSoupHTTPSrc--user-pw"/>
<keyword type="property" name="The "extra-headers" property" link="gst-plugins-good-plugins-souphttpsrc.html#GstSoupHTTPSrc--extra-headers"/>
<keyword type="property" name="The "timeout" property" link="gst-plugins-good-plugins-souphttpsrc.html#GstSoupHTTPSrc--timeout"/>
- <keyword type="" name="Example application" link="gst-plugins-good-plugins-spectrum.html#idp18066720"/>
- <keyword type="" name="Element Information" link="gst-plugins-good-plugins-spectrum.html#idp15712032"/>
- <keyword type="" name="Element Pads" link="gst-plugins-good-plugins-spectrum.html#idp21858320"/>
+ <keyword type="" name="Example application" link="gst-plugins-good-plugins-spectrum.html#idp21423072"/>
+ <keyword type="" name="Element Information" link="gst-plugins-good-plugins-spectrum.html#idp21273264"/>
+ <keyword type="" name="Element Pads" link="gst-plugins-good-plugins-spectrum.html#idp21732432"/>
<keyword type="struct" name="struct GstSpectrum" link="gst-plugins-good-plugins-spectrum.html#GstSpectrum-struct"/>
<keyword type="property" name="The "bands" property" link="gst-plugins-good-plugins-spectrum.html#GstSpectrum--bands"/>
<keyword type="property" name="The "interval" property" link="gst-plugins-good-plugins-spectrum.html#GstSpectrum--interval"/>
@@ -1199,8 +1183,8 @@
<keyword type="property" name="The "message-phase" property" link="gst-plugins-good-plugins-spectrum.html#GstSpectrum--message-phase"/>
<keyword type="property" name="The "post-messages" property" link="gst-plugins-good-plugins-spectrum.html#GstSpectrum--post-messages"/>
<keyword type="property" name="The "multi-channel" property" link="gst-plugins-good-plugins-spectrum.html#GstSpectrum--multi-channel"/>
- <keyword type="" name="Element Information" link="gst-plugins-good-plugins-speexenc.html#idp21867920"/>
- <keyword type="" name="Element Pads" link="gst-plugins-good-plugins-speexenc.html#idp22182320"/>
+ <keyword type="" name="Element Information" link="gst-plugins-good-plugins-speexenc.html#idp15066320"/>
+ <keyword type="" name="Element Pads" link="gst-plugins-good-plugins-speexenc.html#idp14957872"/>
<keyword type="struct" name="struct GstSpeexEnc" link="gst-plugins-good-plugins-speexenc.html#GstSpeexEnc-struct"/>
<keyword type="property" name="The "abr" property" link="gst-plugins-good-plugins-speexenc.html#GstSpeexEnc--abr"/>
<keyword type="property" name="The "bitrate" property" link="gst-plugins-good-plugins-speexenc.html#GstSpeexEnc--bitrate"/>
@@ -1212,28 +1196,28 @@
<keyword type="property" name="The "vad" property" link="gst-plugins-good-plugins-speexenc.html#GstSpeexEnc--vad"/>
<keyword type="property" name="The "vbr" property" link="gst-plugins-good-plugins-speexenc.html#GstSpeexEnc--vbr"/>
<keyword type="property" name="The "mode" property" link="gst-plugins-good-plugins-speexenc.html#GstSpeexEnc--mode"/>
- <keyword type="" name="Element Information" link="gst-plugins-good-plugins-speexdec.html#idp19150256"/>
- <keyword type="" name="Element Pads" link="gst-plugins-good-plugins-speexdec.html#idp14388896"/>
+ <keyword type="" name="Element Information" link="gst-plugins-good-plugins-speexdec.html#idp21834736"/>
+ <keyword type="" name="Element Pads" link="gst-plugins-good-plugins-speexdec.html#idp18938016"/>
<keyword type="struct" name="struct GstSpeexDec" link="gst-plugins-good-plugins-speexdec.html#GstSpeexDec-struct"/>
<keyword type="property" name="The "enh" property" link="gst-plugins-good-plugins-speexdec.html#GstSpeexDec--enh"/>
- <keyword type="" name="Example launch line" link="gst-plugins-good-plugins-splitfilesrc.html#idp7529648"/>
- <keyword type="" name="Element Information" link="gst-plugins-good-plugins-splitfilesrc.html#idp20707904"/>
- <keyword type="" name="Element Pads" link="gst-plugins-good-plugins-splitfilesrc.html#idp18176944"/>
+ <keyword type="" name="Example launch line" link="gst-plugins-good-plugins-splitfilesrc.html#idp21668256"/>
+ <keyword type="" name="Element Information" link="gst-plugins-good-plugins-splitfilesrc.html#idp16295984"/>
+ <keyword type="" name="Element Pads" link="gst-plugins-good-plugins-splitfilesrc.html#idp21942352"/>
<keyword type="struct" name="struct GstSplitFileSrc" link="gst-plugins-good-plugins-splitfilesrc.html#GstSplitFileSrc-struct"/>
<keyword type="property" name="The "location" property" link="gst-plugins-good-plugins-splitfilesrc.html#GstSplitFileSrc--location"/>
- <keyword type="" name="Example launch line" link="gst-plugins-good-plugins-streaktv.html#idp19376432"/>
- <keyword type="" name="Element Information" link="gst-plugins-good-plugins-streaktv.html#idp12861968"/>
- <keyword type="" name="Element Pads" link="gst-plugins-good-plugins-streaktv.html#idp18358048"/>
+ <keyword type="" name="Example launch line" link="gst-plugins-good-plugins-streaktv.html#idp19882688"/>
+ <keyword type="" name="Element Information" link="gst-plugins-good-plugins-streaktv.html#idp17242032"/>
+ <keyword type="" name="Element Pads" link="gst-plugins-good-plugins-streaktv.html#idp22099168"/>
<keyword type="struct" name="struct GstStreakTV" link="gst-plugins-good-plugins-streaktv.html#GstStreakTV-struct"/>
<keyword type="property" name="The "feedback" property" link="gst-plugins-good-plugins-streaktv.html#GstStreakTV--feedback"/>
- <keyword type="" name="Example launch lines" link="gst-plugins-good-plugins-taginject.html#idp19276832"/>
- <keyword type="" name="Element Information" link="gst-plugins-good-plugins-taginject.html#idp14951088"/>
- <keyword type="" name="Element Pads" link="gst-plugins-good-plugins-taginject.html#idp18190512"/>
+ <keyword type="" name="Example launch lines" link="gst-plugins-good-plugins-taginject.html#idp12697936"/>
+ <keyword type="" name="Element Information" link="gst-plugins-good-plugins-taginject.html#idp18853472"/>
+ <keyword type="" name="Element Pads" link="gst-plugins-good-plugins-taginject.html#idp18307872"/>
<keyword type="struct" name="struct GstTagInject" link="gst-plugins-good-plugins-taginject.html#GstTagInject-struct"/>
<keyword type="property" name="The "tags" property" link="gst-plugins-good-plugins-taginject.html#GstTagInject--tags"/>
- <keyword type="" name="Examples" link="gst-plugins-good-plugins-udpsrc.html#idp19099504"/>
- <keyword type="" name="Element Information" link="gst-plugins-good-plugins-udpsrc.html#idp18331024"/>
- <keyword type="" name="Element Pads" link="gst-plugins-good-plugins-udpsrc.html#idp21550016"/>
+ <keyword type="" name="Examples" link="gst-plugins-good-plugins-udpsrc.html#idp19232304"/>
+ <keyword type="" name="Element Information" link="gst-plugins-good-plugins-udpsrc.html#idp22226064"/>
+ <keyword type="" name="Element Pads" link="gst-plugins-good-plugins-udpsrc.html#idp21817312"/>
<keyword type="struct" name="struct GstUDPSrc" link="gst-plugins-good-plugins-udpsrc.html#GstUDPSrc-struct"/>
<keyword type="property" name="The "caps" property" link="gst-plugins-good-plugins-udpsrc.html#GstUDPSrc--caps"/>
<keyword type="property" name="The "multicast-group" property" link="gst-plugins-good-plugins-udpsrc.html#GstUDPSrc--multicast-group"/>
@@ -1251,14 +1235,14 @@
<keyword type="property" name="The "close-socket" property" link="gst-plugins-good-plugins-udpsrc.html#GstUDPSrc--close-socket"/>
<keyword type="property" name="The "socket" property" link="gst-plugins-good-plugins-udpsrc.html#GstUDPSrc--socket"/>
<keyword type="property" name="The "used-socket" property" link="gst-plugins-good-plugins-udpsrc.html#GstUDPSrc--used-socket"/>
- <keyword type="" name="Examples" link="gst-plugins-good-plugins-udpsink.html#idp22737536"/>
- <keyword type="" name="Element Information" link="gst-plugins-good-plugins-udpsink.html#idp14815184"/>
- <keyword type="" name="Element Pads" link="gst-plugins-good-plugins-udpsink.html#idp22754688"/>
+ <keyword type="" name="Examples" link="gst-plugins-good-plugins-udpsink.html#idp14730480"/>
+ <keyword type="" name="Element Information" link="gst-plugins-good-plugins-udpsink.html#idp19869808"/>
+ <keyword type="" name="Element Pads" link="gst-plugins-good-plugins-udpsink.html#idp22819600"/>
<keyword type="struct" name="struct GstUDPSink" link="gst-plugins-good-plugins-udpsink.html#GstUDPSink-struct"/>
<keyword type="property" name="The "host" property" link="gst-plugins-good-plugins-udpsink.html#GstUDPSink--host"/>
<keyword type="property" name="The "port" property" link="gst-plugins-good-plugins-udpsink.html#GstUDPSink--port"/>
- <keyword type="" name="Element Information" link="gst-plugins-good-plugins-v4l2src.html#idp11966528"/>
- <keyword type="" name="Element Pads" link="gst-plugins-good-plugins-v4l2src.html#idp17431344"/>
+ <keyword type="" name="Element Information" link="gst-plugins-good-plugins-v4l2src.html#idp21517520"/>
+ <keyword type="" name="Element Pads" link="gst-plugins-good-plugins-v4l2src.html#idp16213136"/>
<keyword type="struct" name="struct GstV4l2Src" link="gst-plugins-good-plugins-v4l2src.html#GstV4l2Src-struct"/>
<keyword type="property" name="The "device" property" link="gst-plugins-good-plugins-v4l2src.html#GstV4l2Src--device"/>
<keyword type="property" name="The "device-name" property" link="gst-plugins-good-plugins-v4l2src.html#GstV4l2Src--device-name"/>
@@ -1273,8 +1257,8 @@
<keyword type="property" name="The "saturation" property" link="gst-plugins-good-plugins-v4l2src.html#GstV4l2Src--saturation"/>
<keyword type="property" name="The "norm" property" link="gst-plugins-good-plugins-v4l2src.html#GstV4l2Src--norm"/>
<keyword type="property" name="The "io-mode" property" link="gst-plugins-good-plugins-v4l2src.html#GstV4l2Src--io-mode"/>
- <keyword type="" name="Element Information" link="gst-plugins-good-plugins-v4l2sink.html#idp18122336"/>
- <keyword type="" name="Element Pads" link="gst-plugins-good-plugins-v4l2sink.html#idp17718560"/>
+ <keyword type="" name="Element Information" link="gst-plugins-good-plugins-v4l2sink.html#idp21526592"/>
+ <keyword type="" name="Element Pads" link="gst-plugins-good-plugins-v4l2sink.html#idp19178192"/>
<keyword type="struct" name="struct GstV4l2Sink" link="gst-plugins-good-plugins-v4l2sink.html#GstV4l2Sink-struct"/>
<keyword type="property" name="The "device" property" link="gst-plugins-good-plugins-v4l2sink.html#GstV4l2Sink--device"/>
<keyword type="property" name="The "device-fd" property" link="gst-plugins-good-plugins-v4l2sink.html#GstV4l2Sink--device-fd"/>
@@ -1296,28 +1280,28 @@
<keyword type="property" name="The "min-queued-bufs" property" link="gst-plugins-good-plugins-v4l2sink.html#GstV4l2Sink--min-queued-bufs"/>
<keyword type="property" name="The "io-mode" property" link="gst-plugins-good-plugins-v4l2sink.html#GstV4l2Sink--io-mode"/>
<keyword type="property" name="The "norm" property" link="gst-plugins-good-plugins-v4l2sink.html#GstV4l2Sink--norm"/>
- <keyword type="" name="Element Information" link="gst-plugins-good-plugins-v4l2radio.html#idp17588944"/>
- <keyword type="" name="Element Pads" link="gst-plugins-good-plugins-v4l2radio.html#idp21907440"/>
+ <keyword type="" name="Element Information" link="gst-plugins-good-plugins-v4l2radio.html#idp21944288"/>
+ <keyword type="" name="Element Pads" link="gst-plugins-good-plugins-v4l2radio.html#idp17997584"/>
<keyword type="struct" name="struct GstV4l2Radio" link="gst-plugins-good-plugins-v4l2radio.html#GstV4l2Radio-struct"/>
<keyword type="property" name="The "device" property" link="gst-plugins-good-plugins-v4l2radio.html#GstV4l2Radio--device"/>
<keyword type="property" name="The "frequency" property" link="gst-plugins-good-plugins-v4l2radio.html#GstV4l2Radio--frequency"/>
- <keyword type="" name="Example launch line" link="gst-plugins-good-plugins-vertigotv.html#idp19455984"/>
- <keyword type="" name="Element Information" link="gst-plugins-good-plugins-vertigotv.html#idp21404384"/>
- <keyword type="" name="Element Pads" link="gst-plugins-good-plugins-vertigotv.html#idp22397952"/>
+ <keyword type="" name="Example launch line" link="gst-plugins-good-plugins-vertigotv.html#idp5308992"/>
+ <keyword type="" name="Element Information" link="gst-plugins-good-plugins-vertigotv.html#idp20062160"/>
+ <keyword type="" name="Element Pads" link="gst-plugins-good-plugins-vertigotv.html#idp22485984"/>
<keyword type="struct" name="struct GstVertigoTV" link="gst-plugins-good-plugins-vertigotv.html#GstVertigoTV-struct"/>
<keyword type="property" name="The "speed" property" link="gst-plugins-good-plugins-vertigotv.html#GstVertigoTV--speed"/>
<keyword type="property" name="The "zoom-speed" property" link="gst-plugins-good-plugins-vertigotv.html#GstVertigoTV--zoom-speed"/>
<keyword type="signal" name="The "reset-parms" signal" link="gst-plugins-good-plugins-vertigotv.html#GstVertigoTV-reset-parms"/>
- <keyword type="" name="Example launch line" link="gst-plugins-good-plugins-videobalance.html#idp15850192"/>
- <keyword type="" name="Element Information" link="gst-plugins-good-plugins-videobalance.html#idp21595360"/>
- <keyword type="" name="Element Pads" link="gst-plugins-good-plugins-videobalance.html#idp20083648"/>
+ <keyword type="" name="Example launch line" link="gst-plugins-good-plugins-videobalance.html#idp21176496"/>
+ <keyword type="" name="Element Information" link="gst-plugins-good-plugins-videobalance.html#idp22550640"/>
+ <keyword type="" name="Element Pads" link="gst-plugins-good-plugins-videobalance.html#idp22067088"/>
<keyword type="struct" name="struct GstVideoBalance" link="gst-plugins-good-plugins-videobalance.html#GstVideoBalance-struct"/>
<keyword type="property" name="The "brightness" property" link="gst-plugins-good-plugins-videobalance.html#GstVideoBalance--brightness"/>
<keyword type="property" name="The "contrast" property" link="gst-plugins-good-plugins-videobalance.html#GstVideoBalance--contrast"/>
<keyword type="property" name="The "hue" property" link="gst-plugins-good-plugins-videobalance.html#GstVideoBalance--hue"/>
<keyword type="property" name="The "saturation" property" link="gst-plugins-good-plugins-videobalance.html#GstVideoBalance--saturation"/>
- <keyword type="" name="Element Information" link="gst-plugins-good-plugins-videobox.html#idp21614416"/>
- <keyword type="" name="Element Pads" link="gst-plugins-good-plugins-videobox.html#idp19257840"/>
+ <keyword type="" name="Element Information" link="gst-plugins-good-plugins-videobox.html#idp17690768"/>
+ <keyword type="" name="Element Pads" link="gst-plugins-good-plugins-videobox.html#idp21687024"/>
<keyword type="struct" name="struct GstVideoBox" link="gst-plugins-good-plugins-videobox.html#GstVideoBox"/>
<keyword type="property" name="The "alpha" property" link="gst-plugins-good-plugins-videobox.html#GstVideoBox--alpha"/>
<keyword type="property" name="The "border-alpha" property" link="gst-plugins-good-plugins-videobox.html#GstVideoBox--border-alpha"/>
@@ -1327,41 +1311,41 @@
<keyword type="property" name="The "right" property" link="gst-plugins-good-plugins-videobox.html#GstVideoBox--right"/>
<keyword type="property" name="The "top" property" link="gst-plugins-good-plugins-videobox.html#GstVideoBox--top"/>
<keyword type="property" name="The "autocrop" property" link="gst-plugins-good-plugins-videobox.html#GstVideoBox--autocrop"/>
- <keyword type="" name="Example launch line" link="gst-plugins-good-plugins-videocrop.html#idp18734016"/>
- <keyword type="" name="Element Information" link="gst-plugins-good-plugins-videocrop.html#idp16421552"/>
- <keyword type="" name="Element Pads" link="gst-plugins-good-plugins-videocrop.html#idp22579408"/>
+ <keyword type="" name="Example launch line" link="gst-plugins-good-plugins-videocrop.html#idp23662672"/>
+ <keyword type="" name="Element Information" link="gst-plugins-good-plugins-videocrop.html#idp17591952"/>
+ <keyword type="" name="Element Pads" link="gst-plugins-good-plugins-videocrop.html#idp18797280"/>
<keyword type="struct" name="struct GstVideoCrop" link="gst-plugins-good-plugins-videocrop.html#GstVideoCrop-struct"/>
<keyword type="property" name="The "bottom" property" link="gst-plugins-good-plugins-videocrop.html#GstVideoCrop--bottom"/>
<keyword type="property" name="The "left" property" link="gst-plugins-good-plugins-videocrop.html#GstVideoCrop--left"/>
<keyword type="property" name="The "right" property" link="gst-plugins-good-plugins-videocrop.html#GstVideoCrop--right"/>
<keyword type="property" name="The "top" property" link="gst-plugins-good-plugins-videocrop.html#GstVideoCrop--top"/>
- <keyword type="" name="Example launch line" link="gst-plugins-good-plugins-videoflip.html#idp21551648"/>
- <keyword type="" name="Element Information" link="gst-plugins-good-plugins-videoflip.html#idp19364672"/>
- <keyword type="" name="Element Pads" link="gst-plugins-good-plugins-videoflip.html#idp22178432"/>
+ <keyword type="" name="Example launch line" link="gst-plugins-good-plugins-videoflip.html#idp16174512"/>
+ <keyword type="" name="Element Information" link="gst-plugins-good-plugins-videoflip.html#idp19044400"/>
+ <keyword type="" name="Element Pads" link="gst-plugins-good-plugins-videoflip.html#idp21619792"/>
<keyword type="struct" name="struct GstVideoFlip" link="gst-plugins-good-plugins-videoflip.html#GstVideoFlip-struct"/>
<keyword type="enum" name="enum GstVideoFlipMethod" link="gst-plugins-good-plugins-videoflip.html#GstVideoFlipMethod"/>
<keyword type="property" name="The "method" property" link="gst-plugins-good-plugins-videoflip.html#GstVideoFlip--method"/>
- <keyword type="" name="Sample pipelines" link="gst-plugins-good-plugins-videomixer.html#idp16590480"/>
- <keyword type="" name="Element Information" link="gst-plugins-good-plugins-videomixer.html#idp18700272"/>
- <keyword type="" name="Element Pads" link="gst-plugins-good-plugins-videomixer.html#idp20660272"/>
+ <keyword type="" name="Sample pipelines" link="gst-plugins-good-plugins-videomixer.html#idp21787088"/>
+ <keyword type="" name="Element Information" link="gst-plugins-good-plugins-videomixer.html#idp19379936"/>
+ <keyword type="" name="Element Pads" link="gst-plugins-good-plugins-videomixer.html#idp22037008"/>
<keyword type="struct" name="struct GstVideoMixer2" link="gst-plugins-good-plugins-videomixer2.html#GstVideoMixer2-struct"/>
<keyword type="enum" name="enum GstVideoMixer2Background" link="gst-plugins-good-plugins-videomixer2.html#GstVideoMixer2Background"/>
<keyword type="property" name="The "background" property" link="gst-plugins-good-plugins-videomixer2.html#GstVideoMixer2--background"/>
- <keyword type="" name="Example launch line" link="gst-plugins-good-plugins-warptv.html#idp18050080"/>
- <keyword type="" name="Element Information" link="gst-plugins-good-plugins-warptv.html#idp23761728"/>
- <keyword type="" name="Element Pads" link="gst-plugins-good-plugins-warptv.html#idp22981008"/>
+ <keyword type="" name="Example launch line" link="gst-plugins-good-plugins-warptv.html#idp23554528"/>
+ <keyword type="" name="Element Information" link="gst-plugins-good-plugins-warptv.html#idp19931600"/>
+ <keyword type="" name="Element Pads" link="gst-plugins-good-plugins-warptv.html#idp18221472"/>
<keyword type="struct" name="struct GstWarpTV" link="gst-plugins-good-plugins-warptv.html#GstWarpTV-struct"/>
- <keyword type="" name="Element Information" link="gst-plugins-good-plugins-wavenc.html#idp22505568"/>
- <keyword type="" name="Element Pads" link="gst-plugins-good-plugins-wavenc.html#idp17975200"/>
+ <keyword type="" name="Element Information" link="gst-plugins-good-plugins-wavenc.html#idp16677424"/>
+ <keyword type="" name="Element Pads" link="gst-plugins-good-plugins-wavenc.html#idp21719888"/>
<keyword type="struct" name="struct GstWavEnc" link="gst-plugins-good-plugins-wavenc.html#GstWavEnc-struct"/>
- <keyword type="" name="Element Information" link="gst-plugins-good-plugins-waveformsink.html#idp22858768"/>
- <keyword type="" name="Element Pads" link="gst-plugins-good-plugins-waveformsink.html#idp21918288"/>
+ <keyword type="" name="Element Information" link="gst-plugins-good-plugins-waveformsink.html#idp22500896"/>
+ <keyword type="" name="Element Pads" link="gst-plugins-good-plugins-waveformsink.html#idp24153296"/>
<keyword type="struct" name="struct GstWaveFormSink" link="gst-plugins-good-plugins-waveformsink.html#GstWaveFormSink"/>
- <keyword type="" name="Element Information" link="gst-plugins-good-plugins-wavpackdec.html#idp18838608"/>
- <keyword type="" name="Element Pads" link="gst-plugins-good-plugins-wavpackdec.html#idp21919040"/>
+ <keyword type="" name="Element Information" link="gst-plugins-good-plugins-wavpackdec.html#idp19207504"/>
+ <keyword type="" name="Element Pads" link="gst-plugins-good-plugins-wavpackdec.html#idp23715184"/>
<keyword type="struct" name="struct GstWavpackDec" link="gst-plugins-good-plugins-wavpackdec.html#GstWavpackDec-struct"/>
- <keyword type="" name="Element Information" link="gst-plugins-good-plugins-wavpackenc.html#idp20184480"/>
- <keyword type="" name="Element Pads" link="gst-plugins-good-plugins-wavpackenc.html#idp22929264"/>
+ <keyword type="" name="Element Information" link="gst-plugins-good-plugins-wavpackenc.html#idp19987648"/>
+ <keyword type="" name="Element Pads" link="gst-plugins-good-plugins-wavpackenc.html#idp24350064"/>
<keyword type="struct" name="struct GstWavpackEnc" link="gst-plugins-good-plugins-wavpackenc.html#GstWavpackEnc-struct"/>
<keyword type="property" name="The "bitrate" property" link="gst-plugins-good-plugins-wavpackenc.html#GstWavpackEnc--bitrate"/>
<keyword type="property" name="The "bits-per-sample" property" link="gst-plugins-good-plugins-wavpackenc.html#GstWavpackEnc--bits-per-sample"/>
@@ -1370,21 +1354,21 @@
<keyword type="property" name="The "joint-stereo-mode" property" link="gst-plugins-good-plugins-wavpackenc.html#GstWavpackEnc--joint-stereo-mode"/>
<keyword type="property" name="The "md5" property" link="gst-plugins-good-plugins-wavpackenc.html#GstWavpackEnc--md5"/>
<keyword type="property" name="The "mode" property" link="gst-plugins-good-plugins-wavpackenc.html#GstWavpackEnc--mode"/>
- <keyword type="" name="Example launch line" link="gst-plugins-good-plugins-wavpackparse.html#idp21290768"/>
- <keyword type="" name="Element Information" link="gst-plugins-good-plugins-wavpackparse.html#idp22795120"/>
- <keyword type="" name="Element Pads" link="gst-plugins-good-plugins-wavpackparse.html#idp21408528"/>
+ <keyword type="" name="Example launch line" link="gst-plugins-good-plugins-wavpackparse.html#idp24132576"/>
+ <keyword type="" name="Element Information" link="gst-plugins-good-plugins-wavpackparse.html#idp22571296"/>
+ <keyword type="" name="Element Pads" link="gst-plugins-good-plugins-wavpackparse.html#idp20807616"/>
<keyword type="struct" name="struct GstWavpackParse" link="gst-plugins-good-plugins-wavpackparse.html#GstWavpackParse-struct"/>
- <keyword type="" name="Example launch line" link="gst-plugins-good-plugins-wavparse.html#idp24233888"/>
- <keyword type="" name="Element Information" link="gst-plugins-good-plugins-wavparse.html#idp21935776"/>
- <keyword type="" name="Element Pads" link="gst-plugins-good-plugins-wavparse.html#idp23800000"/>
+ <keyword type="" name="Example launch line" link="gst-plugins-good-plugins-wavparse.html#idp19868720"/>
+ <keyword type="" name="Element Information" link="gst-plugins-good-plugins-wavparse.html#idp21882848"/>
+ <keyword type="" name="Element Pads" link="gst-plugins-good-plugins-wavparse.html#idp22682112"/>
<keyword type="struct" name="struct GstWavParse" link="gst-plugins-good-plugins-wavparse.html#GstWavParse-struct"/>
<keyword type="property" name="The "ignore-length" property" link="gst-plugins-good-plugins-wavparse.html#GstWavParse--ignore-length"/>
- <keyword type="" name="Example launch line" link="gst-plugins-good-plugins-webmmux.html#idp20202032"/>
- <keyword type="" name="Element Information" link="gst-plugins-good-plugins-webmmux.html#idp17647008"/>
- <keyword type="" name="Element Pads" link="gst-plugins-good-plugins-webmmux.html#idp21889952"/>
+ <keyword type="" name="Example launch line" link="gst-plugins-good-plugins-webmmux.html#idp22755776"/>
+ <keyword type="" name="Element Information" link="gst-plugins-good-plugins-webmmux.html#idp22437056"/>
+ <keyword type="" name="Element Pads" link="gst-plugins-good-plugins-webmmux.html#idp18311792"/>
<keyword type="struct" name="struct GstWebMMux" link="gst-plugins-good-plugins-webmmux.html#GstWebMMux-struct"/>
- <keyword type="" name="Element Information" link="gst-plugins-good-plugins-ximagesrc.html#idp22052384"/>
- <keyword type="" name="Element Pads" link="gst-plugins-good-plugins-ximagesrc.html#idp22653648"/>
+ <keyword type="" name="Element Information" link="gst-plugins-good-plugins-ximagesrc.html#idp22041664"/>
+ <keyword type="" name="Element Pads" link="gst-plugins-good-plugins-ximagesrc.html#idp23743728"/>
<keyword type="struct" name="struct GstXImageSrc" link="gst-plugins-good-plugins-ximagesrc.html#GstXImageSrc-struct"/>
<keyword type="property" name="The "display-name" property" link="gst-plugins-good-plugins-ximagesrc.html#GstXImageSrc--display-name"/>
<keyword type="property" name="The "screen-num" property" link="gst-plugins-good-plugins-ximagesrc.html#GstXImageSrc--screen-num"/>
@@ -1397,9 +1381,9 @@
<keyword type="property" name="The "remote" property" link="gst-plugins-good-plugins-ximagesrc.html#GstXImageSrc--remote"/>
<keyword type="property" name="The "xid" property" link="gst-plugins-good-plugins-ximagesrc.html#GstXImageSrc--xid"/>
<keyword type="property" name="The "xname" property" link="gst-plugins-good-plugins-ximagesrc.html#GstXImageSrc--xname"/>
- <keyword type="" name="Example launch line" link="gst-plugins-good-plugins-y4menc.html#idp22193136"/>
- <keyword type="" name="Element Information" link="gst-plugins-good-plugins-y4menc.html#idp24433984"/>
- <keyword type="" name="Element Pads" link="gst-plugins-good-plugins-y4menc.html#idp24075648"/>
+ <keyword type="" name="Example launch line" link="gst-plugins-good-plugins-y4menc.html#idp17943328"/>
+ <keyword type="" name="Element Information" link="gst-plugins-good-plugins-y4menc.html#idp18609632"/>
+ <keyword type="" name="Element Pads" link="gst-plugins-good-plugins-y4menc.html#idp5499840"/>
<keyword type="struct" name="struct GstY4mEncode" link="gst-plugins-good-plugins-y4menc.html#GstY4mEncode-struct"/>
<keyword type="struct" name="struct GstIirEqualizer" link="GstIirEqualizer.html#GstIirEqualizer-struct"/>
<keyword type="struct" name="struct GstVideoMixer2Pad" link="GstVideoMixer2Pad.html#GstVideoMixer2Pad-struct"/>
diff --git a/docs/plugins/html/index.html b/docs/plugins/html/index.html
index 2cccdc18fd2d1c98f089f4dd8e8acdf4a9bc629e..0f8bf6600e628f8b88d57390199b0613b17ca7d3 100644
--- a/docs/plugins/html/index.html
+++ b/docs/plugins/html/index.html
@@ -15,7 +15,7 @@
<div>
<div><table class="navigation" id="top" width="100%" cellpadding="2" cellspacing="0"><tr><th valign="middle"><p class="title">GStreamer Good Plugins 1.0 Plugins Reference Manual</p></th></tr></table></div>
<div><p class="releaseinfo">
- for GStreamer Good Plugins 1.0 (0.11.90)
+ for GStreamer Good Plugins 1.0 (0.11.90.1)
The latest version of this documentation can be found on-line at
<a class="ulink" href="http://gstreamer.freedesktop.org/data/doc/gstreamer/head/gst-plugins-good/html/" target="_top">http://gstreamer.freedesktop.org/data/doc/gstreamer/head/gst-plugins-good/html/</a>.
</p></div>
@@ -305,18 +305,12 @@
<span class="refentrytitle"><a href="gst-plugins-good-plugins-optv.html">optv</a></span><span class="refpurpose"> — Optical art meets real-time video effect</span>
</dt>
<dt>
-<span class="refentrytitle"><a href="gst-plugins-good-plugins-oss4mixer.html">oss4mixer</a></span><span class="refpurpose"> — Control sound input and output levels with OSS4</span>
-</dt>
-<dt>
<span class="refentrytitle"><a href="gst-plugins-good-plugins-oss4sink.html">oss4sink</a></span><span class="refpurpose"> — Output to a sound card via OSS version 4</span>
</dt>
<dt>
<span class="refentrytitle"><a href="gst-plugins-good-plugins-oss4src.html">oss4src</a></span><span class="refpurpose"> — Capture from a sound card via OSS version 4</span>
</dt>
<dt>
-<span class="refentrytitle"><a href="gst-plugins-good-plugins-ossmixer.html">ossmixer</a></span><span class="refpurpose"> — Control sound input and output levels with OSS</span>
-</dt>
-<dt>
<span class="refentrytitle"><a href="gst-plugins-good-plugins-osssink.html">osssink</a></span><span class="refpurpose"> — Output to a sound card via OSS</span>
</dt>
<dt>
diff --git a/docs/plugins/html/index.sgml b/docs/plugins/html/index.sgml
index 1d1fcdea7bca2d0a3a23114d774053b51e0b5f91..b493a3ae1b2d64a4eb993c937c2c0cb099bebdd6 100644
--- a/docs/plugins/html/index.sgml
+++ b/docs/plugins/html/index.sgml
@@ -1054,16 +1054,6 @@
<ANCHOR id="GstOpTV--mode" href="gst-plugins-good-plugins-1.0/gst-plugins-good-plugins-optv.html#GstOpTV--mode">
<ANCHOR id="GstOpTV--speed" href="gst-plugins-good-plugins-1.0/gst-plugins-good-plugins-optv.html#GstOpTV--speed">
<ANCHOR id="GstOpTV--threshold" href="gst-plugins-good-plugins-1.0/gst-plugins-good-plugins-optv.html#GstOpTV--threshold">
-<ANCHOR id="gst-plugins-good-plugins-oss4mixer" href="gst-plugins-good-plugins-1.0/gst-plugins-good-plugins-oss4mixer.html">
-<ANCHOR id="gst-plugins-good-plugins-oss4mixer.synopsis" href="gst-plugins-good-plugins-1.0/gst-plugins-good-plugins-oss4mixer.html#gst-plugins-good-plugins-oss4mixer.synopsis">
-<ANCHOR id="gst-plugins-good-plugins-oss4mixer.implemented-interfaces" href="gst-plugins-good-plugins-1.0/gst-plugins-good-plugins-oss4mixer.html#gst-plugins-good-plugins-oss4mixer.implemented-interfaces">
-<ANCHOR id="gst-plugins-good-plugins-oss4mixer.properties" href="gst-plugins-good-plugins-1.0/gst-plugins-good-plugins-oss4mixer.html#gst-plugins-good-plugins-oss4mixer.properties">
-<ANCHOR id="gst-plugins-good-plugins-oss4mixer.description" href="gst-plugins-good-plugins-1.0/gst-plugins-good-plugins-oss4mixer.html#gst-plugins-good-plugins-oss4mixer.description">
-<ANCHOR id="gst-plugins-good-plugins-oss4mixer.details" href="gst-plugins-good-plugins-1.0/gst-plugins-good-plugins-oss4mixer.html#gst-plugins-good-plugins-oss4mixer.details">
-<ANCHOR id="GstOss4Mixer" href="gst-plugins-good-plugins-1.0/gst-plugins-good-plugins-oss4mixer.html#GstOss4Mixer">
-<ANCHOR id="gst-plugins-good-plugins-oss4mixer.property-details" href="gst-plugins-good-plugins-1.0/gst-plugins-good-plugins-oss4mixer.html#gst-plugins-good-plugins-oss4mixer.property-details">
-<ANCHOR id="GstOss4Mixer--device" href="gst-plugins-good-plugins-1.0/gst-plugins-good-plugins-oss4mixer.html#GstOss4Mixer--device">
-<ANCHOR id="GstOss4Mixer--device-name" href="gst-plugins-good-plugins-1.0/gst-plugins-good-plugins-oss4mixer.html#GstOss4Mixer--device-name">
<ANCHOR id="gst-plugins-good-plugins-oss4sink" href="gst-plugins-good-plugins-1.0/gst-plugins-good-plugins-oss4sink.html">
<ANCHOR id="gst-plugins-good-plugins-oss4sink.synopsis" href="gst-plugins-good-plugins-1.0/gst-plugins-good-plugins-oss4sink.html#gst-plugins-good-plugins-oss4sink.synopsis">
<ANCHOR id="gst-plugins-good-plugins-oss4sink.implemented-interfaces" href="gst-plugins-good-plugins-1.0/gst-plugins-good-plugins-oss4sink.html#gst-plugins-good-plugins-oss4sink.implemented-interfaces">
@@ -1086,16 +1076,6 @@
<ANCHOR id="gst-plugins-good-plugins-oss4src.property-details" href="gst-plugins-good-plugins-1.0/gst-plugins-good-plugins-oss4src.html#gst-plugins-good-plugins-oss4src.property-details">
<ANCHOR id="GstOss4Source--device" href="gst-plugins-good-plugins-1.0/gst-plugins-good-plugins-oss4src.html#GstOss4Source--device">
<ANCHOR id="GstOss4Source--device-name" href="gst-plugins-good-plugins-1.0/gst-plugins-good-plugins-oss4src.html#GstOss4Source--device-name">
-<ANCHOR id="gst-plugins-good-plugins-ossmixer" href="gst-plugins-good-plugins-1.0/gst-plugins-good-plugins-ossmixer.html">
-<ANCHOR id="gst-plugins-good-plugins-ossmixer.synopsis" href="gst-plugins-good-plugins-1.0/gst-plugins-good-plugins-ossmixer.html#gst-plugins-good-plugins-ossmixer.synopsis">
-<ANCHOR id="gst-plugins-good-plugins-ossmixer.implemented-interfaces" href="gst-plugins-good-plugins-1.0/gst-plugins-good-plugins-ossmixer.html#gst-plugins-good-plugins-ossmixer.implemented-interfaces">
-<ANCHOR id="gst-plugins-good-plugins-ossmixer.properties" href="gst-plugins-good-plugins-1.0/gst-plugins-good-plugins-ossmixer.html#gst-plugins-good-plugins-ossmixer.properties">
-<ANCHOR id="gst-plugins-good-plugins-ossmixer.description" href="gst-plugins-good-plugins-1.0/gst-plugins-good-plugins-ossmixer.html#gst-plugins-good-plugins-ossmixer.description">
-<ANCHOR id="gst-plugins-good-plugins-ossmixer.details" href="gst-plugins-good-plugins-1.0/gst-plugins-good-plugins-ossmixer.html#gst-plugins-good-plugins-ossmixer.details">
-<ANCHOR id="GstOssMixerElement" href="gst-plugins-good-plugins-1.0/gst-plugins-good-plugins-ossmixer.html#GstOssMixerElement">
-<ANCHOR id="gst-plugins-good-plugins-ossmixer.property-details" href="gst-plugins-good-plugins-1.0/gst-plugins-good-plugins-ossmixer.html#gst-plugins-good-plugins-ossmixer.property-details">
-<ANCHOR id="GstOssMixerElement--device-name" href="gst-plugins-good-plugins-1.0/gst-plugins-good-plugins-ossmixer.html#GstOssMixerElement--device-name">
-<ANCHOR id="GstOssMixerElement--device" href="gst-plugins-good-plugins-1.0/gst-plugins-good-plugins-ossmixer.html#GstOssMixerElement--device">
<ANCHOR id="gst-plugins-good-plugins-osssink" href="gst-plugins-good-plugins-1.0/gst-plugins-good-plugins-osssink.html">
<ANCHOR id="gst-plugins-good-plugins-osssink.synopsis" href="gst-plugins-good-plugins-1.0/gst-plugins-good-plugins-osssink.html#gst-plugins-good-plugins-osssink.synopsis">
<ANCHOR id="gst-plugins-good-plugins-osssink.properties" href="gst-plugins-good-plugins-1.0/gst-plugins-good-plugins-osssink.html#gst-plugins-good-plugins-osssink.properties">
@@ -1209,17 +1189,8 @@
<ANCHOR id="GstPulseSrc--client-name" href="gst-plugins-good-plugins-1.0/gst-plugins-good-plugins-pulsesrc.html#GstPulseSrc--client-name">
<ANCHOR id="gst-plugins-good-plugins-pulsemixer" href="gst-plugins-good-plugins-1.0/gst-plugins-good-plugins-pulsemixer.html">
<ANCHOR id="gst-plugins-good-plugins-pulsemixer.synopsis" href="gst-plugins-good-plugins-1.0/gst-plugins-good-plugins-pulsemixer.html#gst-plugins-good-plugins-pulsemixer.synopsis">
-<ANCHOR id="GstPulseMixer" href="gst-plugins-good-plugins-1.0/gst-plugins-good-plugins-pulsemixer.html#GstPulseMixer">
-<ANCHOR id="gst-plugins-good-plugins-pulsemixer.object-hierarchy" href="gst-plugins-good-plugins-1.0/gst-plugins-good-plugins-pulsemixer.html#gst-plugins-good-plugins-pulsemixer.object-hierarchy">
-<ANCHOR id="gst-plugins-good-plugins-pulsemixer.implemented-interfaces" href="gst-plugins-good-plugins-1.0/gst-plugins-good-plugins-pulsemixer.html#gst-plugins-good-plugins-pulsemixer.implemented-interfaces">
-<ANCHOR id="gst-plugins-good-plugins-pulsemixer.properties" href="gst-plugins-good-plugins-1.0/gst-plugins-good-plugins-pulsemixer.html#gst-plugins-good-plugins-pulsemixer.properties">
<ANCHOR id="gst-plugins-good-plugins-pulsemixer.description" href="gst-plugins-good-plugins-1.0/gst-plugins-good-plugins-pulsemixer.html#gst-plugins-good-plugins-pulsemixer.description">
<ANCHOR id="gst-plugins-good-plugins-pulsemixer.details" href="gst-plugins-good-plugins-1.0/gst-plugins-good-plugins-pulsemixer.html#gst-plugins-good-plugins-pulsemixer.details">
-<ANCHOR id="GstPulseMixer-struct" href="gst-plugins-good-plugins-1.0/gst-plugins-good-plugins-pulsemixer.html#GstPulseMixer-struct">
-<ANCHOR id="gst-plugins-good-plugins-pulsemixer.property-details" href="gst-plugins-good-plugins-1.0/gst-plugins-good-plugins-pulsemixer.html#gst-plugins-good-plugins-pulsemixer.property-details">
-<ANCHOR id="GstPulseMixer--device" href="gst-plugins-good-plugins-1.0/gst-plugins-good-plugins-pulsemixer.html#GstPulseMixer--device">
-<ANCHOR id="GstPulseMixer--device-name" href="gst-plugins-good-plugins-1.0/gst-plugins-good-plugins-pulsemixer.html#GstPulseMixer--device-name">
-<ANCHOR id="GstPulseMixer--server" href="gst-plugins-good-plugins-1.0/gst-plugins-good-plugins-pulsemixer.html#GstPulseMixer--server">
<ANCHOR id="gst-plugins-good-plugins-quarktv" href="gst-plugins-good-plugins-1.0/gst-plugins-good-plugins-quarktv.html">
<ANCHOR id="gst-plugins-good-plugins-quarktv.synopsis" href="gst-plugins-good-plugins-1.0/gst-plugins-good-plugins-quarktv.html#gst-plugins-good-plugins-quarktv.synopsis">
<ANCHOR id="GstQuarkTV" href="gst-plugins-good-plugins-1.0/gst-plugins-good-plugins-quarktv.html#GstQuarkTV">
diff --git a/ext/Makefile.in b/ext/Makefile.in
index 191e4092a6b9b3b2554cb3b31727c43bbdae8ab4..cda405a95a8e02ee9bfb736d9551f61694191a26 100644
--- a/ext/Makefile.in
+++ b/ext/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.11.4 from Makefile.am.
+# Makefile.in generated by automake 1.11.5 from Makefile.am.
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -63,6 +63,7 @@ am__aclocal_m4_deps = $(top_srcdir)/common/m4/as-ac-expand.m4 \
$(top_srcdir)/common/m4/as-auto-alt.m4 \
$(top_srcdir)/common/m4/as-compiler-flag.m4 \
$(top_srcdir)/common/m4/as-gcc-inline-assembly.m4 \
+ $(top_srcdir)/common/m4/as-libtool.m4 \
$(top_srcdir)/common/m4/as-objc.m4 \
$(top_srcdir)/common/m4/as-python.m4 \
$(top_srcdir)/common/m4/as-scrub-include.m4 \
@@ -233,6 +234,7 @@ GMSGFMT_015 = @GMSGFMT_015@
GREP = @GREP@
GSTPB_PLUGINS_DIR = @GSTPB_PLUGINS_DIR@
GSTPB_PREFIX = @GSTPB_PREFIX@
+GST_AGE = @GST_AGE@
GST_ALL_LDFLAGS = @GST_ALL_LDFLAGS@
GST_API_VERSION = @GST_API_VERSION@
GST_BASE_CFLAGS = @GST_BASE_CFLAGS@
@@ -242,9 +244,11 @@ GST_CHECK_CFLAGS = @GST_CHECK_CFLAGS@
GST_CHECK_LIBS = @GST_CHECK_LIBS@
GST_CONTROLLER_CFLAGS = @GST_CONTROLLER_CFLAGS@
GST_CONTROLLER_LIBS = @GST_CONTROLLER_LIBS@
+GST_CURRENT = @GST_CURRENT@
GST_CXXFLAGS = @GST_CXXFLAGS@
GST_LEVEL_DEFAULT = @GST_LEVEL_DEFAULT@
GST_LIBS = @GST_LIBS@
+GST_LIBVERSION = @GST_LIBVERSION@
GST_LICENSE = @GST_LICENSE@
GST_LT_LDFLAGS = @GST_LT_LDFLAGS@
GST_NET_CFLAGS = @GST_NET_CFLAGS@
@@ -262,6 +266,7 @@ GST_PLUGINS_NONPORTED = @GST_PLUGINS_NONPORTED@
GST_PLUGINS_SELECTED = @GST_PLUGINS_SELECTED@
GST_PLUGIN_LDFLAGS = @GST_PLUGIN_LDFLAGS@
GST_PREFIX = @GST_PREFIX@
+GST_REVISION = @GST_REVISION@
GST_TOOLS_DIR = @GST_TOOLS_DIR@
GTKDOC_CHECK = @GTKDOC_CHECK@
GTK_CFLAGS = @GTK_CFLAGS@
diff --git a/ext/aalib/Makefile.in b/ext/aalib/Makefile.in
index 3f74823049d87bee725e340f9bffb7de2fd4d5f5..bd542559de295bedb4e1a885b19d8a481e3a4644 100644
--- a/ext/aalib/Makefile.in
+++ b/ext/aalib/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.11.4 from Makefile.am.
+# Makefile.in generated by automake 1.11.5 from Makefile.am.
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -60,6 +60,7 @@ am__aclocal_m4_deps = $(top_srcdir)/common/m4/as-ac-expand.m4 \
$(top_srcdir)/common/m4/as-auto-alt.m4 \
$(top_srcdir)/common/m4/as-compiler-flag.m4 \
$(top_srcdir)/common/m4/as-gcc-inline-assembly.m4 \
+ $(top_srcdir)/common/m4/as-libtool.m4 \
$(top_srcdir)/common/m4/as-objc.m4 \
$(top_srcdir)/common/m4/as-python.m4 \
$(top_srcdir)/common/m4/as-scrub-include.m4 \
@@ -256,6 +257,7 @@ GMSGFMT_015 = @GMSGFMT_015@
GREP = @GREP@
GSTPB_PLUGINS_DIR = @GSTPB_PLUGINS_DIR@
GSTPB_PREFIX = @GSTPB_PREFIX@
+GST_AGE = @GST_AGE@
GST_ALL_LDFLAGS = @GST_ALL_LDFLAGS@
GST_API_VERSION = @GST_API_VERSION@
GST_BASE_CFLAGS = @GST_BASE_CFLAGS@
@@ -265,9 +267,11 @@ GST_CHECK_CFLAGS = @GST_CHECK_CFLAGS@
GST_CHECK_LIBS = @GST_CHECK_LIBS@
GST_CONTROLLER_CFLAGS = @GST_CONTROLLER_CFLAGS@
GST_CONTROLLER_LIBS = @GST_CONTROLLER_LIBS@
+GST_CURRENT = @GST_CURRENT@
GST_CXXFLAGS = @GST_CXXFLAGS@
GST_LEVEL_DEFAULT = @GST_LEVEL_DEFAULT@
GST_LIBS = @GST_LIBS@
+GST_LIBVERSION = @GST_LIBVERSION@
GST_LICENSE = @GST_LICENSE@
GST_LT_LDFLAGS = @GST_LT_LDFLAGS@
GST_NET_CFLAGS = @GST_NET_CFLAGS@
@@ -285,6 +289,7 @@ GST_PLUGINS_NONPORTED = @GST_PLUGINS_NONPORTED@
GST_PLUGINS_SELECTED = @GST_PLUGINS_SELECTED@
GST_PLUGIN_LDFLAGS = @GST_PLUGIN_LDFLAGS@
GST_PREFIX = @GST_PREFIX@
+GST_REVISION = @GST_REVISION@
GST_TOOLS_DIR = @GST_TOOLS_DIR@
GTKDOC_CHECK = @GTKDOC_CHECK@
GTK_CFLAGS = @GTK_CFLAGS@
@@ -535,7 +540,7 @@ install-pluginLTLIBRARIES: $(plugin_LTLIBRARIES)
done; \
test -z "$$list2" || { \
echo " $(MKDIR_P) '$(DESTDIR)$(plugindir)'"; \
- $(MKDIR_P) '$(DESTDIR)$(plugindir)' || exit 1; \
+ $(MKDIR_P) "$(DESTDIR)$(plugindir)" || exit 1; \
echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 '$(DESTDIR)$(plugindir)'"; \
$(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 "$(DESTDIR)$(plugindir)"; \
}
diff --git a/ext/annodex/Makefile.in b/ext/annodex/Makefile.in
index 5fa6046de0ef778d0518c5a25e5ca44a690c9c1e..b2184eca78f8890d70278323e88b1ee08a0d0d61 100644
--- a/ext/annodex/Makefile.in
+++ b/ext/annodex/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.11.4 from Makefile.am.
+# Makefile.in generated by automake 1.11.5 from Makefile.am.
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -60,6 +60,7 @@ am__aclocal_m4_deps = $(top_srcdir)/common/m4/as-ac-expand.m4 \
$(top_srcdir)/common/m4/as-auto-alt.m4 \
$(top_srcdir)/common/m4/as-compiler-flag.m4 \
$(top_srcdir)/common/m4/as-gcc-inline-assembly.m4 \
+ $(top_srcdir)/common/m4/as-libtool.m4 \
$(top_srcdir)/common/m4/as-objc.m4 \
$(top_srcdir)/common/m4/as-python.m4 \
$(top_srcdir)/common/m4/as-scrub-include.m4 \
@@ -262,6 +263,7 @@ GMSGFMT_015 = @GMSGFMT_015@
GREP = @GREP@
GSTPB_PLUGINS_DIR = @GSTPB_PLUGINS_DIR@
GSTPB_PREFIX = @GSTPB_PREFIX@
+GST_AGE = @GST_AGE@
GST_ALL_LDFLAGS = @GST_ALL_LDFLAGS@
GST_API_VERSION = @GST_API_VERSION@
GST_BASE_CFLAGS = @GST_BASE_CFLAGS@
@@ -271,9 +273,11 @@ GST_CHECK_CFLAGS = @GST_CHECK_CFLAGS@
GST_CHECK_LIBS = @GST_CHECK_LIBS@
GST_CONTROLLER_CFLAGS = @GST_CONTROLLER_CFLAGS@
GST_CONTROLLER_LIBS = @GST_CONTROLLER_LIBS@
+GST_CURRENT = @GST_CURRENT@
GST_CXXFLAGS = @GST_CXXFLAGS@
GST_LEVEL_DEFAULT = @GST_LEVEL_DEFAULT@
GST_LIBS = @GST_LIBS@
+GST_LIBVERSION = @GST_LIBVERSION@
GST_LICENSE = @GST_LICENSE@
GST_LT_LDFLAGS = @GST_LT_LDFLAGS@
GST_NET_CFLAGS = @GST_NET_CFLAGS@
@@ -291,6 +295,7 @@ GST_PLUGINS_NONPORTED = @GST_PLUGINS_NONPORTED@
GST_PLUGINS_SELECTED = @GST_PLUGINS_SELECTED@
GST_PLUGIN_LDFLAGS = @GST_PLUGIN_LDFLAGS@
GST_PREFIX = @GST_PREFIX@
+GST_REVISION = @GST_REVISION@
GST_TOOLS_DIR = @GST_TOOLS_DIR@
GTKDOC_CHECK = @GTKDOC_CHECK@
GTK_CFLAGS = @GTK_CFLAGS@
@@ -554,7 +559,7 @@ install-pluginLTLIBRARIES: $(plugin_LTLIBRARIES)
done; \
test -z "$$list2" || { \
echo " $(MKDIR_P) '$(DESTDIR)$(plugindir)'"; \
- $(MKDIR_P) '$(DESTDIR)$(plugindir)' || exit 1; \
+ $(MKDIR_P) "$(DESTDIR)$(plugindir)" || exit 1; \
echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 '$(DESTDIR)$(plugindir)'"; \
$(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 "$(DESTDIR)$(plugindir)"; \
}
diff --git a/ext/cairo/Makefile.in b/ext/cairo/Makefile.in
index 574711f788d9abb7d88df640b3403c673d319afb..e16ada0d98e83662c1489253fa2c9d28621d3fd1 100644
--- a/ext/cairo/Makefile.in
+++ b/ext/cairo/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.11.4 from Makefile.am.
+# Makefile.in generated by automake 1.11.5 from Makefile.am.
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -68,6 +68,7 @@ am__aclocal_m4_deps = $(top_srcdir)/common/m4/as-ac-expand.m4 \
$(top_srcdir)/common/m4/as-auto-alt.m4 \
$(top_srcdir)/common/m4/as-compiler-flag.m4 \
$(top_srcdir)/common/m4/as-gcc-inline-assembly.m4 \
+ $(top_srcdir)/common/m4/as-libtool.m4 \
$(top_srcdir)/common/m4/as-objc.m4 \
$(top_srcdir)/common/m4/as-python.m4 \
$(top_srcdir)/common/m4/as-scrub-include.m4 \
@@ -278,6 +279,7 @@ GMSGFMT_015 = @GMSGFMT_015@
GREP = @GREP@
GSTPB_PLUGINS_DIR = @GSTPB_PLUGINS_DIR@
GSTPB_PREFIX = @GSTPB_PREFIX@
+GST_AGE = @GST_AGE@
GST_ALL_LDFLAGS = @GST_ALL_LDFLAGS@
GST_API_VERSION = @GST_API_VERSION@
GST_BASE_CFLAGS = @GST_BASE_CFLAGS@
@@ -287,9 +289,11 @@ GST_CHECK_CFLAGS = @GST_CHECK_CFLAGS@
GST_CHECK_LIBS = @GST_CHECK_LIBS@
GST_CONTROLLER_CFLAGS = @GST_CONTROLLER_CFLAGS@
GST_CONTROLLER_LIBS = @GST_CONTROLLER_LIBS@
+GST_CURRENT = @GST_CURRENT@
GST_CXXFLAGS = @GST_CXXFLAGS@
GST_LEVEL_DEFAULT = @GST_LEVEL_DEFAULT@
GST_LIBS = @GST_LIBS@
+GST_LIBVERSION = @GST_LIBVERSION@
GST_LICENSE = @GST_LICENSE@
GST_LT_LDFLAGS = @GST_LT_LDFLAGS@
GST_NET_CFLAGS = @GST_NET_CFLAGS@
@@ -307,6 +311,7 @@ GST_PLUGINS_NONPORTED = @GST_PLUGINS_NONPORTED@
GST_PLUGINS_SELECTED = @GST_PLUGINS_SELECTED@
GST_PLUGIN_LDFLAGS = @GST_PLUGIN_LDFLAGS@
GST_PREFIX = @GST_PREFIX@
+GST_REVISION = @GST_REVISION@
GST_TOOLS_DIR = @GST_TOOLS_DIR@
GTKDOC_CHECK = @GTKDOC_CHECK@
GTK_CFLAGS = @GTK_CFLAGS@
@@ -591,7 +596,7 @@ install-pluginLTLIBRARIES: $(plugin_LTLIBRARIES)
done; \
test -z "$$list2" || { \
echo " $(MKDIR_P) '$(DESTDIR)$(plugindir)'"; \
- $(MKDIR_P) '$(DESTDIR)$(plugindir)' || exit 1; \
+ $(MKDIR_P) "$(DESTDIR)$(plugindir)" || exit 1; \
echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 '$(DESTDIR)$(plugindir)'"; \
$(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 "$(DESTDIR)$(plugindir)"; \
}
diff --git a/ext/cairo/gsttextoverlay.c b/ext/cairo/gsttextoverlay.c
index 6c01a31ebce0d99b133a8662d4dff50385e7f9bc..d14c50a3a5affc0dc89997d2a3f2b6ae53c44f8e 100644
--- a/ext/cairo/gsttextoverlay.c
+++ b/ext/cairo/gsttextoverlay.c
@@ -106,7 +106,7 @@ static gboolean gst_text_overlay_setcaps (GstPad * pad, GstCaps * caps);
static GstPadLinkReturn gst_text_overlay_text_pad_linked (GstPad * pad,
GstPad * peer);
static void gst_text_overlay_text_pad_unlinked (GstPad * pad);
-static GstFlowReturn gst_text_overlay_collected (GstCollectPads2 * pads,
+static GstFlowReturn gst_text_overlay_collected (GstCollectPads * pads,
gpointer data);
static void gst_text_overlay_finalize (GObject * object);
static void gst_text_overlay_font_init (GstCairoTextOverlay * overlay);
@@ -215,7 +215,7 @@ gst_text_overlay_finalize (GObject * object)
{
GstCairoTextOverlay *overlay = GST_CAIRO_TEXT_OVERLAY (object);
- gst_collect_pads2_stop (overlay->collect);
+ gst_collect_pads_stop (overlay->collect);
gst_object_unref (overlay->collect);
g_free (overlay->text_fill_image);
@@ -279,16 +279,16 @@ gst_text_overlay_init (GstCairoTextOverlay * overlay,
overlay->fps_n = 0;
overlay->fps_d = 1;
- overlay->collect = gst_collect_pads2_new ();
+ overlay->collect = gst_collect_pads_new ();
- gst_collect_pads2_set_function (overlay->collect,
+ gst_collect_pads_set_function (overlay->collect,
GST_DEBUG_FUNCPTR (gst_text_overlay_collected), overlay);
- overlay->video_collect_data = gst_collect_pads2_add_pad (overlay->collect,
- overlay->video_sinkpad, sizeof (GstCollectData2));
+ overlay->video_collect_data = gst_collect_pads_add_pad (overlay->collect,
+ overlay->video_sinkpad, sizeof (GstCollectData));
/* FIXME: hacked way to override/extend the event function of
- * GstCollectPads2; because it sets its own event function giving the
+ * GstCollectPads; because it sets its own event function giving the
* element no access to events. Nicked from avimux. */
overlay->collect_event =
(GstPadEventFunction) GST_PAD_EVENTFUNC (overlay->video_sinkpad);
@@ -640,8 +640,8 @@ gst_text_overlay_text_pad_linked (GstPad * pad, GstPad * peer)
GST_DEBUG_OBJECT (overlay, "Text pad linked");
if (overlay->text_collect_data == NULL) {
- overlay->text_collect_data = gst_collect_pads2_add_pad (overlay->collect,
- overlay->text_sinkpad, sizeof (GstCollectData2));
+ overlay->text_collect_data = gst_collect_pads_add_pad (overlay->collect,
+ overlay->text_sinkpad, sizeof (GstCollectData));
}
overlay->need_render = TRUE;
@@ -660,7 +660,7 @@ gst_text_overlay_text_pad_unlinked (GstPad * pad)
GST_DEBUG_OBJECT (overlay, "Text pad unlinked");
if (overlay->text_collect_data) {
- gst_collect_pads2_remove_pad (overlay->collect, overlay->text_sinkpad);
+ gst_collect_pads_remove_pad (overlay->collect, overlay->text_sinkpad);
overlay->text_collect_data = NULL;
}
@@ -807,7 +807,7 @@ gst_text_overlay_pop_video (GstCairoTextOverlay * overlay)
{
GstBuffer *buf;
- buf = gst_collect_pads2_pop (overlay->collect, overlay->video_collect_data);
+ buf = gst_collect_pads_pop (overlay->collect, overlay->video_collect_data);
g_return_if_fail (buf != NULL);
gst_buffer_unref (buf);
}
@@ -818,7 +818,7 @@ gst_text_overlay_pop_text (GstCairoTextOverlay * overlay)
GstBuffer *buf;
if (overlay->text_collect_data) {
- buf = gst_collect_pads2_pop (overlay->collect, overlay->text_collect_data);
+ buf = gst_collect_pads_pop (overlay->collect, overlay->text_collect_data);
g_return_if_fail (buf != NULL);
gst_buffer_unref (buf);
}
@@ -828,7 +828,7 @@ gst_text_overlay_pop_text (GstCairoTextOverlay * overlay)
/* This function is called when there is data on all pads */
static GstFlowReturn
-gst_text_overlay_collected (GstCollectPads2 * pads, gpointer data)
+gst_text_overlay_collected (GstCollectPads * pads, gpointer data)
{
GstCairoTextOverlay *overlay;
GstFlowReturn ret = GST_FLOW_OK;
@@ -842,14 +842,14 @@ gst_text_overlay_collected (GstCollectPads2 * pads, gpointer data)
GST_DEBUG ("Collecting");
- video_frame = gst_collect_pads2_peek (overlay->collect,
+ video_frame = gst_collect_pads_peek (overlay->collect,
overlay->video_collect_data);
/* send EOS if video stream EOSed regardless of text stream */
if (video_frame == NULL) {
GST_DEBUG ("Video stream at EOS");
if (overlay->text_collect_data) {
- text_buf = gst_collect_pads2_pop (overlay->collect,
+ text_buf = gst_collect_pads_pop (overlay->collect,
overlay->text_collect_data);
}
gst_pad_push_event (overlay->srcpad, gst_event_new_eos ());
@@ -892,7 +892,7 @@ gst_text_overlay_collected (GstCollectPads2 * pads, gpointer data)
goto done;
}
- text_buf = gst_collect_pads2_peek (overlay->collect,
+ text_buf = gst_collect_pads_peek (overlay->collect,
overlay->text_collect_data);
/* just push the video frame if the text stream has EOSed */
@@ -1004,7 +1004,7 @@ gst_text_overlay_video_event (GstPad * pad, GstEvent * event)
gst_pad_push_event (overlay->srcpad, event);
}
- /* now GstCollectPads2 can take care of the rest, e.g. EOS */
+ /* now GstCollectPads can take care of the rest, e.g. EOS */
ret = overlay->collect_event (pad, event);
gst_object_unref (overlay);
return ret;
@@ -1018,12 +1018,12 @@ gst_text_overlay_change_state (GstElement * element, GstStateChange transition)
switch (transition) {
case GST_STATE_CHANGE_READY_TO_PAUSED:
- gst_collect_pads2_start (overlay->collect);
+ gst_collect_pads_start (overlay->collect);
break;
case GST_STATE_CHANGE_PAUSED_TO_READY:
/* need to unblock the collectpads before calling the
* parent change_state so that streaming can finish */
- gst_collect_pads2_stop (overlay->collect);
+ gst_collect_pads_stop (overlay->collect);
break;
default:
break;
diff --git a/ext/cairo/gsttextoverlay.h b/ext/cairo/gsttextoverlay.h
index 1f98d3d58b5c56c36057c87038ead1159da0707e..34763194f5e2c201e98622575a9421193e1c45d2 100644
--- a/ext/cairo/gsttextoverlay.h
+++ b/ext/cairo/gsttextoverlay.h
@@ -3,7 +3,7 @@
#define __GST_CAIRO_TEXT_OVERLAY_H__
#include <gst/gst.h>
-#include <gst/base/gstcollectpads2.h>
+#include <gst/base/gstcollectpads.h>
G_BEGIN_DECLS
@@ -45,9 +45,9 @@ struct _GstCairoTextOverlay {
GstPad *text_sinkpad;
GstPad *srcpad;
- GstCollectPads2 *collect;
- GstCollectData2 *video_collect_data;
- GstCollectData2 *text_collect_data;
+ GstCollectPads *collect;
+ GstCollectData *video_collect_data;
+ GstCollectData *text_collect_data;
GstPadEventFunction collect_event;
gint width;
diff --git a/ext/dv/Makefile.in b/ext/dv/Makefile.in
index d1bd8e7600939021fd7b655b8682cba8f7ed116e..7b9de37e4204ddee788ce1a8ca717efe36a65807 100644
--- a/ext/dv/Makefile.in
+++ b/ext/dv/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.11.4 from Makefile.am.
+# Makefile.in generated by automake 1.11.5 from Makefile.am.
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -62,6 +62,7 @@ am__aclocal_m4_deps = $(top_srcdir)/common/m4/as-ac-expand.m4 \
$(top_srcdir)/common/m4/as-auto-alt.m4 \
$(top_srcdir)/common/m4/as-compiler-flag.m4 \
$(top_srcdir)/common/m4/as-gcc-inline-assembly.m4 \
+ $(top_srcdir)/common/m4/as-libtool.m4 \
$(top_srcdir)/common/m4/as-objc.m4 \
$(top_srcdir)/common/m4/as-python.m4 \
$(top_srcdir)/common/m4/as-scrub-include.m4 \
@@ -266,6 +267,7 @@ GMSGFMT_015 = @GMSGFMT_015@
GREP = @GREP@
GSTPB_PLUGINS_DIR = @GSTPB_PLUGINS_DIR@
GSTPB_PREFIX = @GSTPB_PREFIX@
+GST_AGE = @GST_AGE@
GST_ALL_LDFLAGS = @GST_ALL_LDFLAGS@
GST_API_VERSION = @GST_API_VERSION@
GST_BASE_CFLAGS = @GST_BASE_CFLAGS@
@@ -275,9 +277,11 @@ GST_CHECK_CFLAGS = @GST_CHECK_CFLAGS@
GST_CHECK_LIBS = @GST_CHECK_LIBS@
GST_CONTROLLER_CFLAGS = @GST_CONTROLLER_CFLAGS@
GST_CONTROLLER_LIBS = @GST_CONTROLLER_LIBS@
+GST_CURRENT = @GST_CURRENT@
GST_CXXFLAGS = @GST_CXXFLAGS@
GST_LEVEL_DEFAULT = @GST_LEVEL_DEFAULT@
GST_LIBS = @GST_LIBS@
+GST_LIBVERSION = @GST_LIBVERSION@
GST_LICENSE = @GST_LICENSE@
GST_LT_LDFLAGS = @GST_LT_LDFLAGS@
GST_NET_CFLAGS = @GST_NET_CFLAGS@
@@ -295,6 +299,7 @@ GST_PLUGINS_NONPORTED = @GST_PLUGINS_NONPORTED@
GST_PLUGINS_SELECTED = @GST_PLUGINS_SELECTED@
GST_PLUGIN_LDFLAGS = @GST_PLUGIN_LDFLAGS@
GST_PREFIX = @GST_PREFIX@
+GST_REVISION = @GST_REVISION@
GST_TOOLS_DIR = @GST_TOOLS_DIR@
GTKDOC_CHECK = @GTKDOC_CHECK@
GTK_CFLAGS = @GTK_CFLAGS@
@@ -552,7 +557,7 @@ install-pluginLTLIBRARIES: $(plugin_LTLIBRARIES)
done; \
test -z "$$list2" || { \
echo " $(MKDIR_P) '$(DESTDIR)$(plugindir)'"; \
- $(MKDIR_P) '$(DESTDIR)$(plugindir)' || exit 1; \
+ $(MKDIR_P) "$(DESTDIR)$(plugindir)" || exit 1; \
echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 '$(DESTDIR)$(plugindir)'"; \
$(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 "$(DESTDIR)$(plugindir)"; \
}
diff --git a/ext/dv/gstdvdec.c b/ext/dv/gstdvdec.c
index b38af9a9512c7dcacafdf3ec36e66916ce71d1ee..39aead09cd0c8d7bb0718a619512c05714c4c4a4 100644
--- a/ext/dv/gstdvdec.c
+++ b/ext/dv/gstdvdec.c
@@ -342,10 +342,8 @@ gst_dvdec_src_negotiate (GstDVDec * dvdec)
dvdec->vinfo.par_d = dvdec->par_y;
if (dvdec->interlaced) {
dvdec->vinfo.interlace_mode = GST_VIDEO_INTERLACE_MODE_INTERLEAVED;
- dvdec->vinfo.flags |= GST_VIDEO_FLAG_INTERLACED;
} else {
dvdec->vinfo.interlace_mode = GST_VIDEO_INTERLACE_MODE_PROGRESSIVE;
- dvdec->vinfo.flags &= GST_VIDEO_FLAG_INTERLACED;
}
othercaps = gst_video_info_to_caps (&dvdec->vinfo);
diff --git a/ext/flac/Makefile.in b/ext/flac/Makefile.in
index 666aefef7211542ca20a87c5d0419b6311b7a72c..8f265bee619b2ffc311d1bb074d8ee4986f90df9 100644
--- a/ext/flac/Makefile.in
+++ b/ext/flac/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.11.4 from Makefile.am.
+# Makefile.in generated by automake 1.11.5 from Makefile.am.
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -60,6 +60,7 @@ am__aclocal_m4_deps = $(top_srcdir)/common/m4/as-ac-expand.m4 \
$(top_srcdir)/common/m4/as-auto-alt.m4 \
$(top_srcdir)/common/m4/as-compiler-flag.m4 \
$(top_srcdir)/common/m4/as-gcc-inline-assembly.m4 \
+ $(top_srcdir)/common/m4/as-libtool.m4 \
$(top_srcdir)/common/m4/as-objc.m4 \
$(top_srcdir)/common/m4/as-python.m4 \
$(top_srcdir)/common/m4/as-scrub-include.m4 \
@@ -258,6 +259,7 @@ GMSGFMT_015 = @GMSGFMT_015@
GREP = @GREP@
GSTPB_PLUGINS_DIR = @GSTPB_PLUGINS_DIR@
GSTPB_PREFIX = @GSTPB_PREFIX@
+GST_AGE = @GST_AGE@
GST_ALL_LDFLAGS = @GST_ALL_LDFLAGS@
GST_API_VERSION = @GST_API_VERSION@
GST_BASE_CFLAGS = @GST_BASE_CFLAGS@
@@ -267,9 +269,11 @@ GST_CHECK_CFLAGS = @GST_CHECK_CFLAGS@
GST_CHECK_LIBS = @GST_CHECK_LIBS@
GST_CONTROLLER_CFLAGS = @GST_CONTROLLER_CFLAGS@
GST_CONTROLLER_LIBS = @GST_CONTROLLER_LIBS@
+GST_CURRENT = @GST_CURRENT@
GST_CXXFLAGS = @GST_CXXFLAGS@
GST_LEVEL_DEFAULT = @GST_LEVEL_DEFAULT@
GST_LIBS = @GST_LIBS@
+GST_LIBVERSION = @GST_LIBVERSION@
GST_LICENSE = @GST_LICENSE@
GST_LT_LDFLAGS = @GST_LT_LDFLAGS@
GST_NET_CFLAGS = @GST_NET_CFLAGS@
@@ -287,6 +291,7 @@ GST_PLUGINS_NONPORTED = @GST_PLUGINS_NONPORTED@
GST_PLUGINS_SELECTED = @GST_PLUGINS_SELECTED@
GST_PLUGIN_LDFLAGS = @GST_PLUGIN_LDFLAGS@
GST_PREFIX = @GST_PREFIX@
+GST_REVISION = @GST_REVISION@
GST_TOOLS_DIR = @GST_TOOLS_DIR@
GTKDOC_CHECK = @GTKDOC_CHECK@
GTK_CFLAGS = @GTK_CFLAGS@
@@ -543,7 +548,7 @@ install-pluginLTLIBRARIES: $(plugin_LTLIBRARIES)
done; \
test -z "$$list2" || { \
echo " $(MKDIR_P) '$(DESTDIR)$(plugindir)'"; \
- $(MKDIR_P) '$(DESTDIR)$(plugindir)' || exit 1; \
+ $(MKDIR_P) "$(DESTDIR)$(plugindir)" || exit 1; \
echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 '$(DESTDIR)$(plugindir)'"; \
$(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 "$(DESTDIR)$(plugindir)"; \
}
diff --git a/ext/gdk_pixbuf/Makefile.in b/ext/gdk_pixbuf/Makefile.in
index 549f0edba6c4ee487947619c9cb3ed565766baa7..5137a2fcd6ea007dd28af6675be8c24feb00da94 100644
--- a/ext/gdk_pixbuf/Makefile.in
+++ b/ext/gdk_pixbuf/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.11.4 from Makefile.am.
+# Makefile.in generated by automake 1.11.5 from Makefile.am.
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -60,6 +60,7 @@ am__aclocal_m4_deps = $(top_srcdir)/common/m4/as-ac-expand.m4 \
$(top_srcdir)/common/m4/as-auto-alt.m4 \
$(top_srcdir)/common/m4/as-compiler-flag.m4 \
$(top_srcdir)/common/m4/as-gcc-inline-assembly.m4 \
+ $(top_srcdir)/common/m4/as-libtool.m4 \
$(top_srcdir)/common/m4/as-objc.m4 \
$(top_srcdir)/common/m4/as-python.m4 \
$(top_srcdir)/common/m4/as-scrub-include.m4 \
@@ -259,6 +260,7 @@ GMSGFMT_015 = @GMSGFMT_015@
GREP = @GREP@
GSTPB_PLUGINS_DIR = @GSTPB_PLUGINS_DIR@
GSTPB_PREFIX = @GSTPB_PREFIX@
+GST_AGE = @GST_AGE@
GST_ALL_LDFLAGS = @GST_ALL_LDFLAGS@
GST_API_VERSION = @GST_API_VERSION@
GST_BASE_CFLAGS = @GST_BASE_CFLAGS@
@@ -268,9 +270,11 @@ GST_CHECK_CFLAGS = @GST_CHECK_CFLAGS@
GST_CHECK_LIBS = @GST_CHECK_LIBS@
GST_CONTROLLER_CFLAGS = @GST_CONTROLLER_CFLAGS@
GST_CONTROLLER_LIBS = @GST_CONTROLLER_LIBS@
+GST_CURRENT = @GST_CURRENT@
GST_CXXFLAGS = @GST_CXXFLAGS@
GST_LEVEL_DEFAULT = @GST_LEVEL_DEFAULT@
GST_LIBS = @GST_LIBS@
+GST_LIBVERSION = @GST_LIBVERSION@
GST_LICENSE = @GST_LICENSE@
GST_LT_LDFLAGS = @GST_LT_LDFLAGS@
GST_NET_CFLAGS = @GST_NET_CFLAGS@
@@ -288,6 +292,7 @@ GST_PLUGINS_NONPORTED = @GST_PLUGINS_NONPORTED@
GST_PLUGINS_SELECTED = @GST_PLUGINS_SELECTED@
GST_PLUGIN_LDFLAGS = @GST_PLUGIN_LDFLAGS@
GST_PREFIX = @GST_PREFIX@
+GST_REVISION = @GST_REVISION@
GST_TOOLS_DIR = @GST_TOOLS_DIR@
GTKDOC_CHECK = @GTKDOC_CHECK@
GTK_CFLAGS = @GTK_CFLAGS@
@@ -556,7 +561,7 @@ install-pluginLTLIBRARIES: $(plugin_LTLIBRARIES)
done; \
test -z "$$list2" || { \
echo " $(MKDIR_P) '$(DESTDIR)$(plugindir)'"; \
- $(MKDIR_P) '$(DESTDIR)$(plugindir)' || exit 1; \
+ $(MKDIR_P) "$(DESTDIR)$(plugindir)" || exit 1; \
echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 '$(DESTDIR)$(plugindir)'"; \
$(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 "$(DESTDIR)$(plugindir)"; \
}
diff --git a/ext/jack/Makefile.in b/ext/jack/Makefile.in
index 8bbfb9e5b2aa0350a7279467f23b9e1a9ab27ad4..6f41859b3933a2627a5bf5d934b79d76011e2388 100644
--- a/ext/jack/Makefile.in
+++ b/ext/jack/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.11.4 from Makefile.am.
+# Makefile.in generated by automake 1.11.5 from Makefile.am.
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -60,6 +60,7 @@ am__aclocal_m4_deps = $(top_srcdir)/common/m4/as-ac-expand.m4 \
$(top_srcdir)/common/m4/as-auto-alt.m4 \
$(top_srcdir)/common/m4/as-compiler-flag.m4 \
$(top_srcdir)/common/m4/as-gcc-inline-assembly.m4 \
+ $(top_srcdir)/common/m4/as-libtool.m4 \
$(top_srcdir)/common/m4/as-objc.m4 \
$(top_srcdir)/common/m4/as-python.m4 \
$(top_srcdir)/common/m4/as-scrub-include.m4 \
@@ -258,6 +259,7 @@ GMSGFMT_015 = @GMSGFMT_015@
GREP = @GREP@
GSTPB_PLUGINS_DIR = @GSTPB_PLUGINS_DIR@
GSTPB_PREFIX = @GSTPB_PREFIX@
+GST_AGE = @GST_AGE@
GST_ALL_LDFLAGS = @GST_ALL_LDFLAGS@
GST_API_VERSION = @GST_API_VERSION@
GST_BASE_CFLAGS = @GST_BASE_CFLAGS@
@@ -267,9 +269,11 @@ GST_CHECK_CFLAGS = @GST_CHECK_CFLAGS@
GST_CHECK_LIBS = @GST_CHECK_LIBS@
GST_CONTROLLER_CFLAGS = @GST_CONTROLLER_CFLAGS@
GST_CONTROLLER_LIBS = @GST_CONTROLLER_LIBS@
+GST_CURRENT = @GST_CURRENT@
GST_CXXFLAGS = @GST_CXXFLAGS@
GST_LEVEL_DEFAULT = @GST_LEVEL_DEFAULT@
GST_LIBS = @GST_LIBS@
+GST_LIBVERSION = @GST_LIBVERSION@
GST_LICENSE = @GST_LICENSE@
GST_LT_LDFLAGS = @GST_LT_LDFLAGS@
GST_NET_CFLAGS = @GST_NET_CFLAGS@
@@ -287,6 +291,7 @@ GST_PLUGINS_NONPORTED = @GST_PLUGINS_NONPORTED@
GST_PLUGINS_SELECTED = @GST_PLUGINS_SELECTED@
GST_PLUGIN_LDFLAGS = @GST_PLUGIN_LDFLAGS@
GST_PREFIX = @GST_PREFIX@
+GST_REVISION = @GST_REVISION@
GST_TOOLS_DIR = @GST_TOOLS_DIR@
GTKDOC_CHECK = @GTKDOC_CHECK@
GTK_CFLAGS = @GTK_CFLAGS@
@@ -537,7 +542,7 @@ install-pluginLTLIBRARIES: $(plugin_LTLIBRARIES)
done; \
test -z "$$list2" || { \
echo " $(MKDIR_P) '$(DESTDIR)$(plugindir)'"; \
- $(MKDIR_P) '$(DESTDIR)$(plugindir)' || exit 1; \
+ $(MKDIR_P) "$(DESTDIR)$(plugindir)" || exit 1; \
echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 '$(DESTDIR)$(plugindir)'"; \
$(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 "$(DESTDIR)$(plugindir)"; \
}
diff --git a/ext/jpeg/Makefile.in b/ext/jpeg/Makefile.in
index 1730f9327d0d439ce225d7abc450dda7e0694200..626dbda81c3cebf2ced86d8fbb4e9a615d742379 100644
--- a/ext/jpeg/Makefile.in
+++ b/ext/jpeg/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.11.4 from Makefile.am.
+# Makefile.in generated by automake 1.11.5 from Makefile.am.
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -60,6 +60,7 @@ am__aclocal_m4_deps = $(top_srcdir)/common/m4/as-ac-expand.m4 \
$(top_srcdir)/common/m4/as-auto-alt.m4 \
$(top_srcdir)/common/m4/as-compiler-flag.m4 \
$(top_srcdir)/common/m4/as-gcc-inline-assembly.m4 \
+ $(top_srcdir)/common/m4/as-libtool.m4 \
$(top_srcdir)/common/m4/as-objc.m4 \
$(top_srcdir)/common/m4/as-python.m4 \
$(top_srcdir)/common/m4/as-scrub-include.m4 \
@@ -257,6 +258,7 @@ GMSGFMT_015 = @GMSGFMT_015@
GREP = @GREP@
GSTPB_PLUGINS_DIR = @GSTPB_PLUGINS_DIR@
GSTPB_PREFIX = @GSTPB_PREFIX@
+GST_AGE = @GST_AGE@
GST_ALL_LDFLAGS = @GST_ALL_LDFLAGS@
GST_API_VERSION = @GST_API_VERSION@
GST_BASE_CFLAGS = @GST_BASE_CFLAGS@
@@ -266,9 +268,11 @@ GST_CHECK_CFLAGS = @GST_CHECK_CFLAGS@
GST_CHECK_LIBS = @GST_CHECK_LIBS@
GST_CONTROLLER_CFLAGS = @GST_CONTROLLER_CFLAGS@
GST_CONTROLLER_LIBS = @GST_CONTROLLER_LIBS@
+GST_CURRENT = @GST_CURRENT@
GST_CXXFLAGS = @GST_CXXFLAGS@
GST_LEVEL_DEFAULT = @GST_LEVEL_DEFAULT@
GST_LIBS = @GST_LIBS@
+GST_LIBVERSION = @GST_LIBVERSION@
GST_LICENSE = @GST_LICENSE@
GST_LT_LDFLAGS = @GST_LT_LDFLAGS@
GST_NET_CFLAGS = @GST_NET_CFLAGS@
@@ -286,6 +290,7 @@ GST_PLUGINS_NONPORTED = @GST_PLUGINS_NONPORTED@
GST_PLUGINS_SELECTED = @GST_PLUGINS_SELECTED@
GST_PLUGIN_LDFLAGS = @GST_PLUGIN_LDFLAGS@
GST_PREFIX = @GST_PREFIX@
+GST_REVISION = @GST_REVISION@
GST_TOOLS_DIR = @GST_TOOLS_DIR@
GTKDOC_CHECK = @GTKDOC_CHECK@
GTK_CFLAGS = @GTK_CFLAGS@
@@ -546,7 +551,7 @@ install-pluginLTLIBRARIES: $(plugin_LTLIBRARIES)
done; \
test -z "$$list2" || { \
echo " $(MKDIR_P) '$(DESTDIR)$(plugindir)'"; \
- $(MKDIR_P) '$(DESTDIR)$(plugindir)' || exit 1; \
+ $(MKDIR_P) "$(DESTDIR)$(plugindir)" || exit 1; \
echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 '$(DESTDIR)$(plugindir)'"; \
$(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 "$(DESTDIR)$(plugindir)"; \
}
diff --git a/ext/jpeg/gstjpegenc.c b/ext/jpeg/gstjpegenc.c
index 0644aa5b7b776d758c9d72bbe82979c1fab33901..0e9ef275b5ef3b60686934042d436a87869e02c5 100644
--- a/ext/jpeg/gstjpegenc.c
+++ b/ext/jpeg/gstjpegenc.c
@@ -304,14 +304,29 @@ gst_jpegenc_getcaps (GstPad * pad, GstCaps * filter)
{
GstJpegEnc *jpegenc = GST_JPEGENC (gst_pad_get_parent (pad));
GstCaps *caps, *othercaps;
+ GstCaps *otherfilter;
GstCaps *templ;
gint i, j;
GstStructure *structure = NULL;
/* we want to proxy properties like width, height and framerate from the
other end of the element */
+ if (filter) {
+ otherfilter = gst_caps_new_empty ();
+ for (i = 0; i < gst_caps_get_size (filter); i++) {
+ GstStructure *s = gst_structure_copy (gst_caps_get_structure (filter, i));
+
+ gst_structure_set_name (s, "image/jpeg");
+
+ gst_caps_append_structure (otherfilter, s);
+ }
+ } else {
+ otherfilter = NULL;
+ }
+ othercaps = gst_pad_peer_query_caps (jpegenc->srcpad, otherfilter);
+ if (otherfilter)
+ gst_caps_unref (otherfilter);
- othercaps = gst_pad_peer_query_caps (jpegenc->srcpad, filter);
templ = gst_pad_get_pad_template_caps (pad);
if (othercaps == NULL ||
gst_caps_is_empty (othercaps) || gst_caps_is_any (othercaps)) {
diff --git a/ext/libcaca/Makefile.in b/ext/libcaca/Makefile.in
index 9c06224d405dfbb311dc8259f7aa7b6867ee4d51..3f81501fbb034f84d65bcaa0d7c91075fcf223b8 100644
--- a/ext/libcaca/Makefile.in
+++ b/ext/libcaca/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.11.4 from Makefile.am.
+# Makefile.in generated by automake 1.11.5 from Makefile.am.
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -60,6 +60,7 @@ am__aclocal_m4_deps = $(top_srcdir)/common/m4/as-ac-expand.m4 \
$(top_srcdir)/common/m4/as-auto-alt.m4 \
$(top_srcdir)/common/m4/as-compiler-flag.m4 \
$(top_srcdir)/common/m4/as-gcc-inline-assembly.m4 \
+ $(top_srcdir)/common/m4/as-libtool.m4 \
$(top_srcdir)/common/m4/as-objc.m4 \
$(top_srcdir)/common/m4/as-python.m4 \
$(top_srcdir)/common/m4/as-scrub-include.m4 \
@@ -255,6 +256,7 @@ GMSGFMT_015 = @GMSGFMT_015@
GREP = @GREP@
GSTPB_PLUGINS_DIR = @GSTPB_PLUGINS_DIR@
GSTPB_PREFIX = @GSTPB_PREFIX@
+GST_AGE = @GST_AGE@
GST_ALL_LDFLAGS = @GST_ALL_LDFLAGS@
GST_API_VERSION = @GST_API_VERSION@
GST_BASE_CFLAGS = @GST_BASE_CFLAGS@
@@ -264,9 +266,11 @@ GST_CHECK_CFLAGS = @GST_CHECK_CFLAGS@
GST_CHECK_LIBS = @GST_CHECK_LIBS@
GST_CONTROLLER_CFLAGS = @GST_CONTROLLER_CFLAGS@
GST_CONTROLLER_LIBS = @GST_CONTROLLER_LIBS@
+GST_CURRENT = @GST_CURRENT@
GST_CXXFLAGS = @GST_CXXFLAGS@
GST_LEVEL_DEFAULT = @GST_LEVEL_DEFAULT@
GST_LIBS = @GST_LIBS@
+GST_LIBVERSION = @GST_LIBVERSION@
GST_LICENSE = @GST_LICENSE@
GST_LT_LDFLAGS = @GST_LT_LDFLAGS@
GST_NET_CFLAGS = @GST_NET_CFLAGS@
@@ -284,6 +288,7 @@ GST_PLUGINS_NONPORTED = @GST_PLUGINS_NONPORTED@
GST_PLUGINS_SELECTED = @GST_PLUGINS_SELECTED@
GST_PLUGIN_LDFLAGS = @GST_PLUGIN_LDFLAGS@
GST_PREFIX = @GST_PREFIX@
+GST_REVISION = @GST_REVISION@
GST_TOOLS_DIR = @GST_TOOLS_DIR@
GTKDOC_CHECK = @GTKDOC_CHECK@
GTK_CFLAGS = @GTK_CFLAGS@
@@ -544,7 +549,7 @@ install-pluginLTLIBRARIES: $(plugin_LTLIBRARIES)
done; \
test -z "$$list2" || { \
echo " $(MKDIR_P) '$(DESTDIR)$(plugindir)'"; \
- $(MKDIR_P) '$(DESTDIR)$(plugindir)' || exit 1; \
+ $(MKDIR_P) "$(DESTDIR)$(plugindir)" || exit 1; \
echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 '$(DESTDIR)$(plugindir)'"; \
$(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 "$(DESTDIR)$(plugindir)"; \
}
diff --git a/ext/libpng/Makefile.in b/ext/libpng/Makefile.in
index c7988f28a08c45a4c57ac542390bd014af63814e..22ea82bb449cbaf657bdcbc191f83c833f2ae320 100644
--- a/ext/libpng/Makefile.in
+++ b/ext/libpng/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.11.4 from Makefile.am.
+# Makefile.in generated by automake 1.11.5 from Makefile.am.
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -60,6 +60,7 @@ am__aclocal_m4_deps = $(top_srcdir)/common/m4/as-ac-expand.m4 \
$(top_srcdir)/common/m4/as-auto-alt.m4 \
$(top_srcdir)/common/m4/as-compiler-flag.m4 \
$(top_srcdir)/common/m4/as-gcc-inline-assembly.m4 \
+ $(top_srcdir)/common/m4/as-libtool.m4 \
$(top_srcdir)/common/m4/as-objc.m4 \
$(top_srcdir)/common/m4/as-python.m4 \
$(top_srcdir)/common/m4/as-scrub-include.m4 \
@@ -256,6 +257,7 @@ GMSGFMT_015 = @GMSGFMT_015@
GREP = @GREP@
GSTPB_PLUGINS_DIR = @GSTPB_PLUGINS_DIR@
GSTPB_PREFIX = @GSTPB_PREFIX@
+GST_AGE = @GST_AGE@
GST_ALL_LDFLAGS = @GST_ALL_LDFLAGS@
GST_API_VERSION = @GST_API_VERSION@
GST_BASE_CFLAGS = @GST_BASE_CFLAGS@
@@ -265,9 +267,11 @@ GST_CHECK_CFLAGS = @GST_CHECK_CFLAGS@
GST_CHECK_LIBS = @GST_CHECK_LIBS@
GST_CONTROLLER_CFLAGS = @GST_CONTROLLER_CFLAGS@
GST_CONTROLLER_LIBS = @GST_CONTROLLER_LIBS@
+GST_CURRENT = @GST_CURRENT@
GST_CXXFLAGS = @GST_CXXFLAGS@
GST_LEVEL_DEFAULT = @GST_LEVEL_DEFAULT@
GST_LIBS = @GST_LIBS@
+GST_LIBVERSION = @GST_LIBVERSION@
GST_LICENSE = @GST_LICENSE@
GST_LT_LDFLAGS = @GST_LT_LDFLAGS@
GST_NET_CFLAGS = @GST_NET_CFLAGS@
@@ -285,6 +289,7 @@ GST_PLUGINS_NONPORTED = @GST_PLUGINS_NONPORTED@
GST_PLUGINS_SELECTED = @GST_PLUGINS_SELECTED@
GST_PLUGIN_LDFLAGS = @GST_PLUGIN_LDFLAGS@
GST_PREFIX = @GST_PREFIX@
+GST_REVISION = @GST_REVISION@
GST_TOOLS_DIR = @GST_TOOLS_DIR@
GTKDOC_CHECK = @GTKDOC_CHECK@
GTK_CFLAGS = @GTK_CFLAGS@
@@ -537,7 +542,7 @@ install-pluginLTLIBRARIES: $(plugin_LTLIBRARIES)
done; \
test -z "$$list2" || { \
echo " $(MKDIR_P) '$(DESTDIR)$(plugindir)'"; \
- $(MKDIR_P) '$(DESTDIR)$(plugindir)' || exit 1; \
+ $(MKDIR_P) "$(DESTDIR)$(plugindir)" || exit 1; \
echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 '$(DESTDIR)$(plugindir)'"; \
$(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 "$(DESTDIR)$(plugindir)"; \
}
diff --git a/ext/pulse/Makefile.am b/ext/pulse/Makefile.am
index 693aa16caaac3eed53708cabe37b5e958eabc5a8..5aa6db07437efa371472556e6bb1dbe569038b96 100644
--- a/ext/pulse/Makefile.am
+++ b/ext/pulse/Makefile.am
@@ -2,9 +2,6 @@ plugin_LTLIBRARIES = libgstpulse.la
libgstpulse_la_SOURCES = \
plugin.c \
- pulsemixer.c \
- pulsemixerctrl.c \
- pulsemixertrack.c \
pulseprobe.c \
pulsesink.c \
pulsesrc.c \
@@ -12,15 +9,12 @@ libgstpulse_la_SOURCES = \
libgstpulse_la_CFLAGS = $(GST_PLUGINS_BASE_CFLAGS) $(GST_BASE_CFLAGS) $(GST_CFLAGS) $(PULSE_CFLAGS)
libgstpulse_la_LIBADD = $(GST_PLUGINS_BASE_LIBS) -lgstaudio-$(GST_API_VERSION) \
- -lgstinterfaces-$(GST_API_VERSION) -lgstpbutils-$(GST_API_VERSION) \
+ -lgstpbutils-$(GST_API_VERSION) \
$(GST_BASE_LIBS) $(GST_LIBS) $(PULSE_LIBS)
libgstpulse_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS)
libgstpulse_la_LIBTOOLFLAGS = --tag=disable-static
noinst_HEADERS = \
- pulsemixerctrl.h \
- pulsemixer.h \
- pulsemixertrack.h \
pulseprobe.h \
pulsesink.h \
pulsesrc.h \
diff --git a/ext/pulse/Makefile.in b/ext/pulse/Makefile.in
index 10d7aad11e97abb1a57b1764bffbb423307e8de3..15b49ff6293dbd554c7089811448198b46b073f2 100644
--- a/ext/pulse/Makefile.in
+++ b/ext/pulse/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.11.4 from Makefile.am.
+# Makefile.in generated by automake 1.11.5 from Makefile.am.
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -60,6 +60,7 @@ am__aclocal_m4_deps = $(top_srcdir)/common/m4/as-ac-expand.m4 \
$(top_srcdir)/common/m4/as-auto-alt.m4 \
$(top_srcdir)/common/m4/as-compiler-flag.m4 \
$(top_srcdir)/common/m4/as-gcc-inline-assembly.m4 \
+ $(top_srcdir)/common/m4/as-libtool.m4 \
$(top_srcdir)/common/m4/as-objc.m4 \
$(top_srcdir)/common/m4/as-python.m4 \
$(top_srcdir)/common/m4/as-scrub-include.m4 \
@@ -131,10 +132,8 @@ libgstpulse_la_DEPENDENCIES = $(am__DEPENDENCIES_1) \
$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
$(am__DEPENDENCIES_1)
am_libgstpulse_la_OBJECTS = libgstpulse_la-plugin.lo \
- libgstpulse_la-pulsemixer.lo libgstpulse_la-pulsemixerctrl.lo \
- libgstpulse_la-pulsemixertrack.lo libgstpulse_la-pulseprobe.lo \
- libgstpulse_la-pulsesink.lo libgstpulse_la-pulsesrc.lo \
- libgstpulse_la-pulseutil.lo
+ libgstpulse_la-pulseprobe.lo libgstpulse_la-pulsesink.lo \
+ libgstpulse_la-pulsesrc.lo libgstpulse_la-pulseutil.lo
libgstpulse_la_OBJECTS = $(am_libgstpulse_la_OBJECTS)
AM_V_lt = $(am__v_lt_@AM_V@)
am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@)
@@ -260,6 +259,7 @@ GMSGFMT_015 = @GMSGFMT_015@
GREP = @GREP@
GSTPB_PLUGINS_DIR = @GSTPB_PLUGINS_DIR@
GSTPB_PREFIX = @GSTPB_PREFIX@
+GST_AGE = @GST_AGE@
GST_ALL_LDFLAGS = @GST_ALL_LDFLAGS@
GST_API_VERSION = @GST_API_VERSION@
GST_BASE_CFLAGS = @GST_BASE_CFLAGS@
@@ -269,9 +269,11 @@ GST_CHECK_CFLAGS = @GST_CHECK_CFLAGS@
GST_CHECK_LIBS = @GST_CHECK_LIBS@
GST_CONTROLLER_CFLAGS = @GST_CONTROLLER_CFLAGS@
GST_CONTROLLER_LIBS = @GST_CONTROLLER_LIBS@
+GST_CURRENT = @GST_CURRENT@
GST_CXXFLAGS = @GST_CXXFLAGS@
GST_LEVEL_DEFAULT = @GST_LEVEL_DEFAULT@
GST_LIBS = @GST_LIBS@
+GST_LIBVERSION = @GST_LIBVERSION@
GST_LICENSE = @GST_LICENSE@
GST_LT_LDFLAGS = @GST_LT_LDFLAGS@
GST_NET_CFLAGS = @GST_NET_CFLAGS@
@@ -289,6 +291,7 @@ GST_PLUGINS_NONPORTED = @GST_PLUGINS_NONPORTED@
GST_PLUGINS_SELECTED = @GST_PLUGINS_SELECTED@
GST_PLUGIN_LDFLAGS = @GST_PLUGIN_LDFLAGS@
GST_PREFIX = @GST_PREFIX@
+GST_REVISION = @GST_REVISION@
GST_TOOLS_DIR = @GST_TOOLS_DIR@
GTKDOC_CHECK = @GTKDOC_CHECK@
GTK_CFLAGS = @GTK_CFLAGS@
@@ -491,9 +494,6 @@ top_srcdir = @top_srcdir@
plugin_LTLIBRARIES = libgstpulse.la
libgstpulse_la_SOURCES = \
plugin.c \
- pulsemixer.c \
- pulsemixerctrl.c \
- pulsemixertrack.c \
pulseprobe.c \
pulsesink.c \
pulsesrc.c \
@@ -501,15 +501,12 @@ libgstpulse_la_SOURCES = \
libgstpulse_la_CFLAGS = $(GST_PLUGINS_BASE_CFLAGS) $(GST_BASE_CFLAGS) $(GST_CFLAGS) $(PULSE_CFLAGS)
libgstpulse_la_LIBADD = $(GST_PLUGINS_BASE_LIBS) -lgstaudio-$(GST_API_VERSION) \
- -lgstinterfaces-$(GST_API_VERSION) -lgstpbutils-$(GST_API_VERSION) \
+ -lgstpbutils-$(GST_API_VERSION) \
$(GST_BASE_LIBS) $(GST_LIBS) $(PULSE_LIBS)
libgstpulse_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS)
libgstpulse_la_LIBTOOLFLAGS = --tag=disable-static
noinst_HEADERS = \
- pulsemixerctrl.h \
- pulsemixer.h \
- pulsemixertrack.h \
pulseprobe.h \
pulsesink.h \
pulsesrc.h \
@@ -559,7 +556,7 @@ install-pluginLTLIBRARIES: $(plugin_LTLIBRARIES)
done; \
test -z "$$list2" || { \
echo " $(MKDIR_P) '$(DESTDIR)$(plugindir)'"; \
- $(MKDIR_P) '$(DESTDIR)$(plugindir)' || exit 1; \
+ $(MKDIR_P) "$(DESTDIR)$(plugindir)" || exit 1; \
echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 '$(DESTDIR)$(plugindir)'"; \
$(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 "$(DESTDIR)$(plugindir)"; \
}
@@ -591,9 +588,6 @@ distclean-compile:
-rm -f *.tab.c
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libgstpulse_la-plugin.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libgstpulse_la-pulsemixer.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libgstpulse_la-pulsemixerctrl.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libgstpulse_la-pulsemixertrack.Plo@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libgstpulse_la-pulseprobe.Plo@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libgstpulse_la-pulsesink.Plo@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libgstpulse_la-pulsesrc.Plo@am__quote@
@@ -627,27 +621,6 @@ libgstpulse_la-plugin.lo: plugin.c
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(libgstpulse_la_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgstpulse_la_CFLAGS) $(CFLAGS) -c -o libgstpulse_la-plugin.lo `test -f 'plugin.c' || echo '$(srcdir)/'`plugin.c
-libgstpulse_la-pulsemixer.lo: pulsemixer.c
-@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(libgstpulse_la_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgstpulse_la_CFLAGS) $(CFLAGS) -MT libgstpulse_la-pulsemixer.lo -MD -MP -MF $(DEPDIR)/libgstpulse_la-pulsemixer.Tpo -c -o libgstpulse_la-pulsemixer.lo `test -f 'pulsemixer.c' || echo '$(srcdir)/'`pulsemixer.c
-@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libgstpulse_la-pulsemixer.Tpo $(DEPDIR)/libgstpulse_la-pulsemixer.Plo
-@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='pulsemixer.c' object='libgstpulse_la-pulsemixer.lo' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(libgstpulse_la_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgstpulse_la_CFLAGS) $(CFLAGS) -c -o libgstpulse_la-pulsemixer.lo `test -f 'pulsemixer.c' || echo '$(srcdir)/'`pulsemixer.c
-
-libgstpulse_la-pulsemixerctrl.lo: pulsemixerctrl.c
-@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(libgstpulse_la_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgstpulse_la_CFLAGS) $(CFLAGS) -MT libgstpulse_la-pulsemixerctrl.lo -MD -MP -MF $(DEPDIR)/libgstpulse_la-pulsemixerctrl.Tpo -c -o libgstpulse_la-pulsemixerctrl.lo `test -f 'pulsemixerctrl.c' || echo '$(srcdir)/'`pulsemixerctrl.c
-@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libgstpulse_la-pulsemixerctrl.Tpo $(DEPDIR)/libgstpulse_la-pulsemixerctrl.Plo
-@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='pulsemixerctrl.c' object='libgstpulse_la-pulsemixerctrl.lo' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(libgstpulse_la_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgstpulse_la_CFLAGS) $(CFLAGS) -c -o libgstpulse_la-pulsemixerctrl.lo `test -f 'pulsemixerctrl.c' || echo '$(srcdir)/'`pulsemixerctrl.c
-
-libgstpulse_la-pulsemixertrack.lo: pulsemixertrack.c
-@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(libgstpulse_la_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgstpulse_la_CFLAGS) $(CFLAGS) -MT libgstpulse_la-pulsemixertrack.lo -MD -MP -MF $(DEPDIR)/libgstpulse_la-pulsemixertrack.Tpo -c -o libgstpulse_la-pulsemixertrack.lo `test -f 'pulsemixertrack.c' || echo '$(srcdir)/'`pulsemixertrack.c
-@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libgstpulse_la-pulsemixertrack.Tpo $(DEPDIR)/libgstpulse_la-pulsemixertrack.Plo
-@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='pulsemixertrack.c' object='libgstpulse_la-pulsemixertrack.lo' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(libgstpulse_la_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgstpulse_la_CFLAGS) $(CFLAGS) -c -o libgstpulse_la-pulsemixertrack.lo `test -f 'pulsemixertrack.c' || echo '$(srcdir)/'`pulsemixertrack.c
-
libgstpulse_la-pulseprobe.lo: pulseprobe.c
@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(libgstpulse_la_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgstpulse_la_CFLAGS) $(CFLAGS) -MT libgstpulse_la-pulseprobe.lo -MD -MP -MF $(DEPDIR)/libgstpulse_la-pulseprobe.Tpo -c -o libgstpulse_la-pulseprobe.lo `test -f 'pulseprobe.c' || echo '$(srcdir)/'`pulseprobe.c
@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libgstpulse_la-pulseprobe.Tpo $(DEPDIR)/libgstpulse_la-pulseprobe.Plo
diff --git a/ext/pulse/plugin.c b/ext/pulse/plugin.c
index 598f5a5be21b3bda7ec4f9907c25d7d410178cea..5903a5ebeae10f9d0ae0da3d956a34accbe578dc 100644
--- a/ext/pulse/plugin.c
+++ b/ext/pulse/plugin.c
@@ -27,7 +27,6 @@
#include "pulsesink.h"
#include "pulsesrc.h"
-#include "pulsemixer.h"
GST_DEBUG_CATEGORY (pulse_debug);
@@ -49,10 +48,6 @@ plugin_init (GstPlugin * plugin)
GST_TYPE_PULSESRC))
return FALSE;
- if (!gst_element_register (plugin, "pulsemixer", GST_RANK_NONE,
- GST_TYPE_PULSEMIXER))
- return FALSE;
-
GST_DEBUG_CATEGORY_INIT (pulse_debug, "pulse", 0, "PulseAudio elements");
return TRUE;
}
diff --git a/ext/pulse/pulsemixer.c b/ext/pulse/pulsemixer.c
deleted file mode 100644
index 336690960c8ee69b227d9fda735bd6850497d0e0..0000000000000000000000000000000000000000
--- a/ext/pulse/pulsemixer.c
+++ /dev/null
@@ -1,232 +0,0 @@
-/*
- * GStreamer pulseaudio plugin
- *
- * Copyright (c) 2004-2008 Lennart Poettering
- *
- * gst-pulse is free software; you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of the
- * License, or (at your option) any later version.
- *
- * gst-pulse is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with gst-pulse; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
- * USA.
- */
-
-/**
- * SECTION:element-pulsemixer
- * @see_also: pulsesrc, pulsesink
- *
- * This element lets you adjust sound input and output levels for the
- * PulseAudio sound server. It supports the GstMixer interface, which can be
- * used to obtain a list of available mixer tracks. Set the mixer element to
- * READY state before using the GstMixer interface on it.
- *
- * <refsect2>
- * <title>Example pipelines</title>
- * <para>
- * pulsemixer can't be used in a sensible way in gst-launch.
- * </para>
- * </refsect2>
- */
-
-#ifdef HAVE_CONFIG_H
-#include "config.h"
-#endif
-
-#include <string.h>
-#include <stdio.h>
-
-#include "pulsemixer.h"
-
-enum
-{
- PROP_SERVER = 1,
- PROP_DEVICE,
- PROP_DEVICE_NAME
-};
-
-GST_DEBUG_CATEGORY_EXTERN (pulse_debug);
-#define GST_CAT_DEFAULT pulse_debug
-
-static void gst_pulsemixer_set_property (GObject * object, guint prop_id,
- const GValue * value, GParamSpec * pspec);
-static void gst_pulsemixer_get_property (GObject * object, guint prop_id,
- GValue * value, GParamSpec * pspec);
-static void gst_pulsemixer_finalize (GObject * object);
-
-static GstStateChangeReturn gst_pulsemixer_change_state (GstElement * element,
- GstStateChange transition);
-
-GST_IMPLEMENT_PULSEMIXER_CTRL_METHODS (GstPulseMixer, gst_pulsemixer);
-
-
-#define gst_pulsemixer_parent_class parent_class
-G_DEFINE_TYPE_WITH_CODE (GstPulseMixer, gst_pulsemixer, GST_TYPE_ELEMENT,
- G_IMPLEMENT_INTERFACE (GST_TYPE_MIXER,
- gst_pulsemixer_mixer_interface_init));
-
-static void
-gst_pulsemixer_class_init (GstPulseMixerClass * g_class)
-{
- GstElementClass *gstelement_class = GST_ELEMENT_CLASS (g_class);
- GObjectClass *gobject_class = G_OBJECT_CLASS (g_class);
-
- gstelement_class->change_state =
- GST_DEBUG_FUNCPTR (gst_pulsemixer_change_state);
-
- gobject_class->finalize = gst_pulsemixer_finalize;
- gobject_class->get_property = gst_pulsemixer_get_property;
- gobject_class->set_property = gst_pulsemixer_set_property;
-
- g_object_class_install_property (gobject_class,
- PROP_SERVER,
- g_param_spec_string ("server", "Server",
- "The PulseAudio server to connect to", NULL,
- G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
-
- g_object_class_install_property (gobject_class,
- PROP_DEVICE,
- g_param_spec_string ("device", "Device",
- "The PulseAudio sink or source to control", NULL,
- G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
-
- g_object_class_install_property (gobject_class,
- PROP_DEVICE_NAME,
- g_param_spec_string ("device-name", "Device name",
- "Human-readable name of the sound device", NULL,
- G_PARAM_READABLE | G_PARAM_STATIC_STRINGS));
-
- gst_element_class_set_static_metadata (GST_ELEMENT_CLASS (g_class),
- "PulseAudio Mixer",
- "Generic/Audio",
- "Control sound input and output levels for PulseAudio",
- "Lennart Poettering");
-}
-
-static void
-gst_pulsemixer_init (GstPulseMixer * this)
-{
- this->mixer = NULL;
- this->server = NULL;
- this->device = NULL;
-
- this->probe =
- gst_pulseprobe_new (G_OBJECT (this), G_OBJECT_GET_CLASS (this),
- PROP_DEVICE, this->device, TRUE, TRUE);
-}
-
-static void
-gst_pulsemixer_finalize (GObject * object)
-{
- GstPulseMixer *this = GST_PULSEMIXER (object);
-
- g_free (this->server);
- g_free (this->device);
-
- if (this->mixer) {
- gst_pulsemixer_ctrl_free (this->mixer);
- this->mixer = NULL;
- }
-
- if (this->probe) {
- gst_pulseprobe_free (this->probe);
- this->probe = NULL;
- }
-
- G_OBJECT_CLASS (parent_class)->finalize (object);
-}
-
-static void
-gst_pulsemixer_set_property (GObject * object,
- guint prop_id, const GValue * value, GParamSpec * pspec)
-{
- GstPulseMixer *this = GST_PULSEMIXER (object);
-
- switch (prop_id) {
- case PROP_SERVER:
- g_free (this->server);
- this->server = g_value_dup_string (value);
-
- if (this->probe)
- gst_pulseprobe_set_server (this->probe, this->server);
-
- break;
-
- case PROP_DEVICE:
- g_free (this->device);
- this->device = g_value_dup_string (value);
- break;
-
- default:
- G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
- break;
- }
-}
-
-static void
-gst_pulsemixer_get_property (GObject * object,
- guint prop_id, GValue * value, GParamSpec * pspec)
-{
- GstPulseMixer *this = GST_PULSEMIXER (object);
-
- switch (prop_id) {
- case PROP_SERVER:
- g_value_set_string (value, this->server);
- break;
- case PROP_DEVICE:
- g_value_set_string (value, this->device);
- break;
- case PROP_DEVICE_NAME:
- if (this->mixer) {
- char *t = g_strdup_printf ("%s: %s",
- this->mixer->type == GST_PULSEMIXER_SINK ? "Playback" : "Capture",
- this->mixer->description);
- g_value_take_string (value, t);
- } else
- g_value_set_string (value, NULL);
- break;
- default:
- G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
- break;
- }
-}
-
-static GstStateChangeReturn
-gst_pulsemixer_change_state (GstElement * element, GstStateChange transition)
-{
- GstPulseMixer *this = GST_PULSEMIXER (element);
- GstStateChangeReturn res;
-
- switch (transition) {
- case GST_STATE_CHANGE_NULL_TO_READY:
- if (!this->mixer)
- this->mixer =
- gst_pulsemixer_ctrl_new (G_OBJECT (this), this->server,
- this->device, GST_PULSEMIXER_UNKNOWN);
- break;
- default:
- ;
- }
-
- res = GST_ELEMENT_CLASS (parent_class)->change_state (element, transition);
-
- switch (transition) {
- case GST_STATE_CHANGE_READY_TO_NULL:
- if (this->mixer) {
- gst_pulsemixer_ctrl_free (this->mixer);
- this->mixer = NULL;
- }
- break;
- default:
- ;
- }
-
- return res;
-}
diff --git a/ext/pulse/pulsemixer.h b/ext/pulse/pulsemixer.h
deleted file mode 100644
index 7ba3d2fa8cb3caa09a8232796090fe7eafd92842..0000000000000000000000000000000000000000
--- a/ext/pulse/pulsemixer.h
+++ /dev/null
@@ -1,68 +0,0 @@
-/*
- * GStreamer pulseaudio plugin
- *
- * Copyright (c) 2004-2008 Lennart Poettering
- *
- * gst-pulse is free software; you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of the
- * License, or (at your option) any later version.
- *
- * gst-pulse is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with gst-pulse; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
- * USA.
- */
-
-#ifndef __GST_PULSEMIXER_H__
-#define __GST_PULSEMIXER_H__
-
-#include <gst/gst.h>
-
-#include <pulse/pulseaudio.h>
-#include <pulse/thread-mainloop.h>
-
-#include "pulsemixerctrl.h"
-#include "pulseprobe.h"
-
-G_BEGIN_DECLS
-
-#define GST_TYPE_PULSEMIXER \
- (gst_pulsemixer_get_type())
-#define GST_PULSEMIXER(obj) \
- (G_TYPE_CHECK_INSTANCE_CAST((obj),GST_TYPE_PULSEMIXER,GstPulseMixer))
-#define GST_PULSEMIXER_CLASS(klass) \
- (G_TYPE_CHECK_CLASS_CAST((klass),GST_TYPE_PULSEMIXER,GstPulseMixerClass))
-#define GST_IS_PULSEMIXER(obj) \
- (G_TYPE_CHECK_INSTANCE_TYPE((obj),GST_TYPE_PULSEMIXER))
-#define GST_IS_PULSEMIXER_CLASS(obj) \
- (G_TYPE_CHECK_CLASS_TYPE((klass),GST_TYPE_PULSEMIXER))
-
-typedef struct _GstPulseMixer GstPulseMixer;
-typedef struct _GstPulseMixerClass GstPulseMixerClass;
-
-struct _GstPulseMixer
-{
- GstElement parent;
-
- gchar *server, *device;
-
- GstPulseMixerCtrl *mixer;
- GstPulseProbe *probe;
-};
-
-struct _GstPulseMixerClass
-{
- GstElementClass parent_class;
-};
-
-GType gst_pulsemixer_get_type (void);
-
-G_END_DECLS
-
-#endif /* __GST_PULSEMIXER_H__ */
diff --git a/ext/pulse/pulsemixerctrl.c b/ext/pulse/pulsemixerctrl.c
deleted file mode 100644
index 220c8d0655c7496691ff676f32122380bcf5c122..0000000000000000000000000000000000000000
--- a/ext/pulse/pulsemixerctrl.c
+++ /dev/null
@@ -1,640 +0,0 @@
-/*-*- Mode: C; c-basic-offset: 2 -*-*/
-
-/*
- * GStreamer pulseaudio plugin
- *
- * Copyright (c) 2004-2008 Lennart Poettering
- *
- * gst-pulse is free software; you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of the
- * License, or (at your option) any later version.
- *
- * gst-pulse is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with gst-pulse; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
- * USA.
- */
-
-#ifdef HAVE_CONFIG_H
-#include "config.h"
-#endif
-
-#include <gst/gst.h>
-
-#include "pulsemixerctrl.h"
-#include "pulsemixertrack.h"
-#include "pulseutil.h"
-
-GST_DEBUG_CATEGORY_EXTERN (pulse_debug);
-#define GST_CAT_DEFAULT pulse_debug
-
-static void
-gst_pulsemixer_ctrl_context_state_cb (pa_context * context, void *userdata)
-{
- GstPulseMixerCtrl *c = GST_PULSEMIXER_CTRL (userdata);
-
- /* Called from the background thread! */
-
- switch (pa_context_get_state (context)) {
- case PA_CONTEXT_READY:
- case PA_CONTEXT_TERMINATED:
- case PA_CONTEXT_FAILED:
- pa_threaded_mainloop_signal (c->mainloop, 0);
- break;
-
- case PA_CONTEXT_UNCONNECTED:
- case PA_CONTEXT_CONNECTING:
- case PA_CONTEXT_AUTHORIZING:
- case PA_CONTEXT_SETTING_NAME:
- break;
- }
-}
-
-static void
-gst_pulsemixer_ctrl_sink_info_cb (pa_context * context, const pa_sink_info * i,
- int eol, void *userdata)
-{
- GstPulseMixerCtrl *c = userdata;
- gboolean vol_chg = FALSE;
- gboolean old_mute;
-
- /* Called from the background thread! */
-
- if (c->outstandig_queries > 0)
- c->outstandig_queries--;
-
- if (c->ignore_queries > 0 || c->time_event) {
-
- if (c->ignore_queries > 0)
- c->ignore_queries--;
-
- return;
- }
-
- if (!i && eol < 0) {
- c->operation_success = FALSE;
- pa_threaded_mainloop_signal (c->mainloop, 0);
- return;
- }
-
- if (eol)
- return;
-
- g_free (c->name);
- g_free (c->description);
- c->name = g_strdup (i->name);
- c->description = g_strdup (i->description);
- c->index = i->index;
- c->channel_map = i->channel_map;
- vol_chg = !pa_cvolume_equal (&c->volume, &i->volume);
- c->volume = i->volume;
- old_mute = c->muted;
- c->muted = !!i->mute;
- c->type = GST_PULSEMIXER_SINK;
-
- if (c->track) {
- GstMixerTrackFlags flags = c->track->flags;
-
- flags =
- (flags & ~GST_MIXER_TRACK_MUTE) | (c->muted ? GST_MIXER_TRACK_MUTE : 0);
- c->track->flags = flags;
- }
-
- c->operation_success = TRUE;
- pa_threaded_mainloop_signal (c->mainloop, 0);
-
- if (vol_chg && c->track) {
- gint volumes[PA_CHANNELS_MAX];
- gint i;
- for (i = 0; i < c->volume.channels; i++)
- volumes[i] = (gint) (c->volume.values[i]);
- GST_LOG_OBJECT (c->object, "Sending volume change notification");
- gst_mixer_volume_changed (GST_MIXER (c->object), c->track, volumes);
- }
- if ((c->muted != old_mute) && c->track) {
- GST_LOG_OBJECT (c->object, "Sending mute toggled notification");
- gst_mixer_mute_toggled (GST_MIXER (c->object), c->track, c->muted);
- }
-}
-
-static void
-gst_pulsemixer_ctrl_source_info_cb (pa_context * context,
- const pa_source_info * i, int eol, void *userdata)
-{
- GstPulseMixerCtrl *c = userdata;
- gboolean vol_chg = FALSE;
- gboolean old_mute;
-
- /* Called from the background thread! */
-
- if (c->outstandig_queries > 0)
- c->outstandig_queries--;
-
- if (c->ignore_queries > 0 || c->time_event) {
-
- if (c->ignore_queries > 0)
- c->ignore_queries--;
-
- return;
- }
-
- if (!i && eol < 0) {
- c->operation_success = FALSE;
- pa_threaded_mainloop_signal (c->mainloop, 0);
- return;
- }
-
- if (eol)
- return;
-
- g_free (c->name);
- g_free (c->description);
- c->name = g_strdup (i->name);
- c->description = g_strdup (i->description);
- c->index = i->index;
- c->channel_map = i->channel_map;
- vol_chg = !pa_cvolume_equal (&c->volume, &i->volume);
- c->volume = i->volume;
- old_mute = c->muted;
- c->muted = !!i->mute;
- c->type = GST_PULSEMIXER_SOURCE;
-
- if (c->track) {
- GstMixerTrackFlags flags = c->track->flags;
-
- flags =
- (flags & ~GST_MIXER_TRACK_MUTE) | (c->muted ? GST_MIXER_TRACK_MUTE : 0);
- c->track->flags = flags;
- }
-
- c->operation_success = TRUE;
- pa_threaded_mainloop_signal (c->mainloop, 0);
-
- if (vol_chg && c->track) {
- gint volumes[PA_CHANNELS_MAX];
- gint i;
- for (i = 0; i < c->volume.channels; i++)
- volumes[i] = (gint) (c->volume.values[i]);
- GST_LOG_OBJECT (c->object, "Sending volume change notification");
- gst_mixer_volume_changed (GST_MIXER (c->object), c->track, volumes);
- }
- if ((c->muted != old_mute) && c->track) {
- GST_LOG_OBJECT (c->object, "Sending mute toggled notification");
- gst_mixer_mute_toggled (GST_MIXER (c->object), c->track, c->muted);
- }
-}
-
-static void
-gst_pulsemixer_ctrl_subscribe_cb (pa_context * context,
- pa_subscription_event_type_t t, uint32_t idx, void *userdata)
-{
- GstPulseMixerCtrl *c = GST_PULSEMIXER_CTRL (userdata);
- pa_operation *o = NULL;
-
- /* Called from the background thread! */
-
- if (c->index != idx)
- return;
-
- if ((t & PA_SUBSCRIPTION_EVENT_TYPE_MASK) != PA_SUBSCRIPTION_EVENT_CHANGE)
- return;
-
- if (c->type == GST_PULSEMIXER_SINK)
- o = pa_context_get_sink_info_by_index (c->context, c->index,
- gst_pulsemixer_ctrl_sink_info_cb, c);
- else
- o = pa_context_get_source_info_by_index (c->context, c->index,
- gst_pulsemixer_ctrl_source_info_cb, c);
-
- if (!o) {
- GST_WARNING_OBJECT (c->object, "Failed to get sink info: %s",
- pa_strerror (pa_context_errno (c->context)));
- return;
- }
-
- pa_operation_unref (o);
-
- c->outstandig_queries++;
-}
-
-static void
-gst_pulsemixer_ctrl_success_cb (pa_context * context, int success,
- void *userdata)
-{
- GstPulseMixerCtrl *c = (GstPulseMixerCtrl *) userdata;
-
- c->operation_success = !!success;
- pa_threaded_mainloop_signal (c->mainloop, 0);
-}
-
-#define CHECK_DEAD_GOTO(c, label) \
- G_STMT_START { \
- if (!(c)->context || \
- !PA_CONTEXT_IS_GOOD(pa_context_get_state((c)->context))) { \
- GST_WARNING_OBJECT ((c)->object, "Not connected: %s", \
- (c)->context ? pa_strerror(pa_context_errno((c)->context)) : "NULL"); \
- goto label; \
- } \
- } G_STMT_END
-
-static gboolean
-gst_pulsemixer_ctrl_open (GstPulseMixerCtrl * c)
-{
- int e;
- gchar *name;
- pa_operation *o = NULL;
-
- g_assert (c);
-
- GST_DEBUG_OBJECT (c->object, "ctrl open");
-
- c->mainloop = pa_threaded_mainloop_new ();
- if (!c->mainloop)
- return FALSE;
-
- e = pa_threaded_mainloop_start (c->mainloop);
- if (e < 0)
- return FALSE;
-
- name = gst_pulse_client_name ();
-
- pa_threaded_mainloop_lock (c->mainloop);
-
- if (!(c->context =
- pa_context_new (pa_threaded_mainloop_get_api (c->mainloop), name))) {
- GST_WARNING_OBJECT (c->object, "Failed to create context");
- goto unlock_and_fail;
- }
-
- pa_context_set_state_callback (c->context,
- gst_pulsemixer_ctrl_context_state_cb, c);
- pa_context_set_subscribe_callback (c->context,
- gst_pulsemixer_ctrl_subscribe_cb, c);
-
- if (pa_context_connect (c->context, c->server, 0, NULL) < 0) {
- GST_WARNING_OBJECT (c->object, "Failed to connect context: %s",
- pa_strerror (pa_context_errno (c->context)));
- goto unlock_and_fail;
- }
-
- /* Wait until the context is ready */
- while (pa_context_get_state (c->context) != PA_CONTEXT_READY) {
- CHECK_DEAD_GOTO (c, unlock_and_fail);
- pa_threaded_mainloop_wait (c->mainloop);
- }
-
- /* Subscribe to events */
- if (!(o =
- pa_context_subscribe (c->context,
- PA_SUBSCRIPTION_MASK_SINK | PA_SUBSCRIPTION_MASK_SOURCE,
- gst_pulsemixer_ctrl_success_cb, c))) {
- GST_WARNING_OBJECT (c->object, "Failed to subscribe to events: %s",
- pa_strerror (pa_context_errno (c->context)));
- goto unlock_and_fail;
- }
-
- c->operation_success = FALSE;
- while (pa_operation_get_state (o) != PA_OPERATION_DONE) {
- CHECK_DEAD_GOTO (c, unlock_and_fail);
- pa_threaded_mainloop_wait (c->mainloop);
- }
-
- if (!c->operation_success) {
- GST_WARNING_OBJECT (c->object, "Failed to subscribe to events: %s",
- pa_strerror (pa_context_errno (c->context)));
- goto unlock_and_fail;
- }
- pa_operation_unref (o);
- o = NULL;
-
- /* Get sink info */
-
- if (c->type == GST_PULSEMIXER_UNKNOWN || c->type == GST_PULSEMIXER_SINK) {
- GST_WARNING_OBJECT (c->object, "Get info for '%s'", c->device);
- if (!(o =
- pa_context_get_sink_info_by_name (c->context, c->device,
- gst_pulsemixer_ctrl_sink_info_cb, c))) {
- GST_WARNING_OBJECT (c->object, "Failed to get sink info: %s",
- pa_strerror (pa_context_errno (c->context)));
- goto unlock_and_fail;
- }
-
- c->operation_success = FALSE;
- while (pa_operation_get_state (o) != PA_OPERATION_DONE) {
- CHECK_DEAD_GOTO (c, unlock_and_fail);
- pa_threaded_mainloop_wait (c->mainloop);
- }
-
- pa_operation_unref (o);
- o = NULL;
-
- if (!c->operation_success && (c->type == GST_PULSEMIXER_SINK
- || pa_context_errno (c->context) != PA_ERR_NOENTITY)) {
- GST_WARNING_OBJECT (c->object, "Failed to get sink info: %s",
- pa_strerror (pa_context_errno (c->context)));
- goto unlock_and_fail;
- }
- }
-
- if (c->type == GST_PULSEMIXER_UNKNOWN || c->type == GST_PULSEMIXER_SOURCE) {
- if (!(o =
- pa_context_get_source_info_by_name (c->context, c->device,
- gst_pulsemixer_ctrl_source_info_cb, c))) {
- GST_WARNING_OBJECT (c->object, "Failed to get source info: %s",
- pa_strerror (pa_context_errno (c->context)));
- goto unlock_and_fail;
- }
-
- c->operation_success = FALSE;
- while (pa_operation_get_state (o) != PA_OPERATION_DONE) {
- CHECK_DEAD_GOTO (c, unlock_and_fail);
- pa_threaded_mainloop_wait (c->mainloop);
- }
-
- pa_operation_unref (o);
- o = NULL;
-
- if (!c->operation_success) {
- GST_WARNING_OBJECT (c->object, "Failed to get source info: %s",
- pa_strerror (pa_context_errno (c->context)));
- goto unlock_and_fail;
- }
- }
-
- g_assert (c->type != GST_PULSEMIXER_UNKNOWN);
-
- c->track = gst_pulsemixer_track_new (c);
- c->tracklist = g_list_append (c->tracklist, c->track);
-
- pa_threaded_mainloop_unlock (c->mainloop);
- g_free (name);
-
- return TRUE;
-
-unlock_and_fail:
-
- if (o)
- pa_operation_unref (o);
-
- if (c->mainloop)
- pa_threaded_mainloop_unlock (c->mainloop);
-
- g_free (name);
-
- return FALSE;
-}
-
-static void
-gst_pulsemixer_ctrl_close (GstPulseMixerCtrl * c)
-{
- g_assert (c);
-
- GST_DEBUG_OBJECT (c->object, "ctrl close");
-
- if (c->mainloop)
- pa_threaded_mainloop_stop (c->mainloop);
-
- if (c->context) {
- pa_context_disconnect (c->context);
- pa_context_unref (c->context);
- c->context = NULL;
- }
-
- if (c->mainloop) {
- pa_threaded_mainloop_free (c->mainloop);
- c->mainloop = NULL;
- c->time_event = NULL;
- }
-
- if (c->tracklist) {
- g_list_free (c->tracklist);
- c->tracklist = NULL;
- }
-
- if (c->track) {
- GST_PULSEMIXER_TRACK (c->track)->control = NULL;
- g_object_unref (c->track);
- c->track = NULL;
- }
-}
-
-GstPulseMixerCtrl *
-gst_pulsemixer_ctrl_new (GObject * object, const gchar * server,
- const gchar * device, GstPulseMixerType type)
-{
- GstPulseMixerCtrl *c = NULL;
- g_return_val_if_fail (G_TYPE_CHECK_INSTANCE_TYPE ((object),
- GST_TYPE_MIXER), c);
-
- GST_DEBUG_OBJECT (object, "new mixer ctrl for %s", device);
- c = g_new (GstPulseMixerCtrl, 1);
- c->object = g_object_ref (object);
- c->tracklist = NULL;
- c->server = g_strdup (server);
- c->device = g_strdup (device);
- c->mainloop = NULL;
- c->context = NULL;
- c->track = NULL;
- c->ignore_queries = c->outstandig_queries = 0;
-
- pa_cvolume_mute (&c->volume, PA_CHANNELS_MAX);
- pa_channel_map_init (&c->channel_map);
- c->muted = FALSE;
- c->index = PA_INVALID_INDEX;
- c->type = type;
- c->name = NULL;
- c->description = NULL;
-
- c->time_event = NULL;
- c->update_volume = c->update_mute = FALSE;
-
- if (!(gst_pulsemixer_ctrl_open (c))) {
- gst_pulsemixer_ctrl_free (c);
- return NULL;
- }
-
- return c;
-}
-
-void
-gst_pulsemixer_ctrl_free (GstPulseMixerCtrl * c)
-{
- g_assert (c);
-
- gst_pulsemixer_ctrl_close (c);
-
- g_free (c->server);
- g_free (c->device);
- g_free (c->name);
- g_free (c->description);
- g_object_unref (c->object);
- g_free (c);
-}
-
-const GList *
-gst_pulsemixer_ctrl_list_tracks (GstPulseMixerCtrl * c)
-{
- g_assert (c);
-
- return c->tracklist;
-}
-
-static void
-gst_pulsemixer_ctrl_timeout_event (pa_mainloop_api * a, pa_time_event * e,
- const struct timeval *tv, void *userdata)
-{
- pa_operation *o;
- GstPulseMixerCtrl *c = GST_PULSEMIXER_CTRL (userdata);
-
- if (c->update_volume) {
- if (c->type == GST_PULSEMIXER_SINK)
- o = pa_context_set_sink_volume_by_index (c->context, c->index, &c->volume,
- NULL, NULL);
- else
- o = pa_context_set_source_volume_by_index (c->context, c->index,
- &c->volume, NULL, NULL);
-
- if (!o)
- GST_WARNING_OBJECT (c->object, "Failed to set device volume: %s",
- pa_strerror (pa_context_errno (c->context)));
- else
- pa_operation_unref (o);
-
- c->update_volume = FALSE;
- }
-
- if (c->update_mute) {
- if (c->type == GST_PULSEMIXER_SINK)
- o = pa_context_set_sink_mute_by_index (c->context, c->index, c->muted,
- NULL, NULL);
- else
- o = pa_context_set_source_mute_by_index (c->context, c->index, c->muted,
- NULL, NULL);
-
- if (!o)
- GST_WARNING_OBJECT (c->object, "Failed to set device mute: %s",
- pa_strerror (pa_context_errno (c->context)));
- else
- pa_operation_unref (o);
-
- c->update_mute = FALSE;
- }
-
- /* Make sure that all outstanding queries are being ignored */
- c->ignore_queries = c->outstandig_queries;
-
- g_assert (e == c->time_event);
- a->time_free (e);
- c->time_event = NULL;
-}
-
-#define UPDATE_DELAY 50000
-
-static void
-restart_time_event (GstPulseMixerCtrl * c)
-{
- struct timeval tv;
- pa_mainloop_api *api;
-
- g_assert (c);
-
- if (c->time_event)
- return;
-
- /* Updating the volume too often will cause a lot of traffic
- * when accessing a networked server. Therefore we make sure
- * to update the volume only once every 50ms */
-
- api = pa_threaded_mainloop_get_api (c->mainloop);
-
- c->time_event =
- api->time_new (api, pa_timeval_add (pa_gettimeofday (&tv), UPDATE_DELAY),
- gst_pulsemixer_ctrl_timeout_event, c);
-}
-
-void
-gst_pulsemixer_ctrl_set_volume (GstPulseMixerCtrl * c, GstMixerTrack * track,
- gint * volumes)
-{
- pa_cvolume v;
- int i;
-
- g_assert (c);
- g_assert (track == c->track);
-
- pa_threaded_mainloop_lock (c->mainloop);
-
- for (i = 0; i < c->channel_map.channels; i++)
- v.values[i] = (pa_volume_t) volumes[i];
-
- v.channels = c->channel_map.channels;
-
- c->volume = v;
- c->update_volume = TRUE;
-
- restart_time_event (c);
-
- pa_threaded_mainloop_unlock (c->mainloop);
-}
-
-void
-gst_pulsemixer_ctrl_get_volume (GstPulseMixerCtrl * c, GstMixerTrack * track,
- gint * volumes)
-{
- int i;
-
- g_assert (c);
- g_assert (track == c->track);
-
- pa_threaded_mainloop_lock (c->mainloop);
-
- for (i = 0; i < c->channel_map.channels; i++)
- volumes[i] = c->volume.values[i];
-
- pa_threaded_mainloop_unlock (c->mainloop);
-}
-
-void
-gst_pulsemixer_ctrl_set_record (GstPulseMixerCtrl * c, GstMixerTrack * track,
- gboolean record)
-{
- g_assert (c);
- g_assert (track == c->track);
-}
-
-void
-gst_pulsemixer_ctrl_set_mute (GstPulseMixerCtrl * c, GstMixerTrack * track,
- gboolean mute)
-{
- g_assert (c);
- g_assert (track == c->track);
-
- pa_threaded_mainloop_lock (c->mainloop);
-
- c->muted = mute;
- c->update_mute = TRUE;
-
- if (c->track) {
- GstMixerTrackFlags flags = c->track->flags;
-
- flags =
- (flags & ~GST_MIXER_TRACK_MUTE) | (c->muted ? GST_MIXER_TRACK_MUTE : 0);
- c->track->flags = flags;
- }
-
- restart_time_event (c);
-
- pa_threaded_mainloop_unlock (c->mainloop);
-}
-
-GstMixerFlags
-gst_pulsemixer_ctrl_get_mixer_flags (GstPulseMixerCtrl * mixer)
-{
- return GST_MIXER_FLAG_AUTO_NOTIFICATIONS;
-}
diff --git a/ext/pulse/pulsemixerctrl.h b/ext/pulse/pulsemixerctrl.h
deleted file mode 100644
index dbb0f99aa1c1321ed5f4d9bb0bc848f6c42b0a7f..0000000000000000000000000000000000000000
--- a/ext/pulse/pulsemixerctrl.h
+++ /dev/null
@@ -1,179 +0,0 @@
-/*-*- Mode: C; c-basic-offset: 2 -*-*/
-
-/*
- * GStreamer pulseaudio plugin
- *
- * Copyright (c) 2004-2008 Lennart Poettering
- *
- * gst-pulse is free software; you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of the
- * License, or (at your option) any later version.
- *
- * gst-pulse is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with gst-pulse; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
- * USA.
- */
-
-#ifndef __GST_PULSEMIXERCTRL_H__
-#define __GST_PULSEMIXERCTRL_H__
-
-#include <gst/gst.h>
-#include <gst/audio/mixer.h>
-
-#include <pulse/pulseaudio.h>
-#include <pulse/thread-mainloop.h>
-
-G_BEGIN_DECLS
-
-#define GST_PULSEMIXER_CTRL(obj) ((GstPulseMixerCtrl*)(obj))
-typedef struct _GstPulseMixerCtrl GstPulseMixerCtrl;
-
-typedef enum
-{
- GST_PULSEMIXER_UNKNOWN,
- GST_PULSEMIXER_SINK,
- GST_PULSEMIXER_SOURCE
-} GstPulseMixerType;
-
-struct _GstPulseMixerCtrl
-{
- GObject *object;
-
- GList *tracklist;
-
- gchar *server, *device;
-
- pa_threaded_mainloop *mainloop;
- pa_context *context;
-
- gchar *name, *description;
- pa_channel_map channel_map;
-
- pa_cvolume volume;
- gboolean muted:1;
-
- gboolean update_volume:1;
- gboolean update_mute:1;
-
- gboolean operation_success:1;
-
- guint32 index;
- GstPulseMixerType type;
-
- GstMixerTrack *track;
-
- pa_time_event *time_event;
-
- int outstandig_queries;
- int ignore_queries;
-
-};
-
-GstPulseMixerCtrl *gst_pulsemixer_ctrl_new (GObject *object, const gchar * server,
- const gchar * device, GstPulseMixerType type);
-void gst_pulsemixer_ctrl_free (GstPulseMixerCtrl * mixer);
-
-const GList *gst_pulsemixer_ctrl_list_tracks (GstPulseMixerCtrl * mixer);
-
-void gst_pulsemixer_ctrl_set_volume (GstPulseMixerCtrl * mixer,
- GstMixerTrack * track, gint * volumes);
-void gst_pulsemixer_ctrl_get_volume (GstPulseMixerCtrl * mixer,
- GstMixerTrack * track, gint * volumes);
-void gst_pulsemixer_ctrl_set_mute (GstPulseMixerCtrl * mixer,
- GstMixerTrack * track, gboolean mute);
-void gst_pulsemixer_ctrl_set_record (GstPulseMixerCtrl * mixer,
- GstMixerTrack * track, gboolean record);
-GstMixerFlags gst_pulsemixer_ctrl_get_mixer_flags (GstPulseMixerCtrl * mixer);
-
-#define GST_IMPLEMENT_PULSEMIXER_CTRL_METHODS(Type, interface_as_function) \
-static const GList* \
-interface_as_function ## _list_tracks (GstMixer * mixer) \
-{ \
- Type *this = (Type*) mixer; \
- \
- g_return_val_if_fail (this != NULL, NULL); \
- g_return_val_if_fail (this->mixer != NULL, NULL); \
- \
- return gst_pulsemixer_ctrl_list_tracks (this->mixer); \
-} \
-static void \
-interface_as_function ## _set_volume (GstMixer * mixer, GstMixerTrack * track, \
- gint * volumes) \
-{ \
- Type *this = (Type*) mixer; \
- \
- g_return_if_fail (this != NULL); \
- g_return_if_fail (this->mixer != NULL); \
- \
- gst_pulsemixer_ctrl_set_volume (this->mixer, track, volumes); \
-} \
-static void \
-interface_as_function ## _get_volume (GstMixer * mixer, GstMixerTrack * track, \
- gint * volumes) \
-{ \
- Type *this = (Type*) mixer; \
- \
- g_return_if_fail (this != NULL); \
- g_return_if_fail (this->mixer != NULL); \
- \
- gst_pulsemixer_ctrl_get_volume (this->mixer, track, volumes); \
-} \
-static void \
-interface_as_function ## _set_record (GstMixer * mixer, GstMixerTrack * track, \
- gboolean record) \
-{ \
- Type *this = (Type*) mixer; \
- \
- g_return_if_fail (this != NULL); \
- g_return_if_fail (this->mixer != NULL); \
- \
- gst_pulsemixer_ctrl_set_record (this->mixer, track, record); \
-} \
-static void \
-interface_as_function ## _set_mute (GstMixer * mixer, GstMixerTrack * track, \
- gboolean mute) \
-{ \
- Type *this = (Type*) mixer; \
- \
- g_return_if_fail (this != NULL); \
- g_return_if_fail (this->mixer != NULL); \
- \
- gst_pulsemixer_ctrl_set_mute (this->mixer, track, mute); \
-} \
-static GstMixerFlags \
-interface_as_function ## _get_mixer_flags (GstMixer * mixer) \
-{ \
- Type *this = (Type*) mixer; \
- \
- g_return_val_if_fail (this != NULL, GST_MIXER_FLAG_NONE); \
- g_return_val_if_fail (this->mixer != NULL, GST_MIXER_FLAG_NONE); \
- \
- return gst_pulsemixer_ctrl_get_mixer_flags (this->mixer); \
-} \
-static GstMixerType \
-interface_as_function ## _get_mixer_type (GstMixer * mixer) \
-{ \
- return GST_MIXER_HARDWARE; \
-} \
-static void \
-interface_as_function ## _mixer_interface_init (GstMixerInterface * iface) \
-{ \
- iface->list_tracks = interface_as_function ## _list_tracks; \
- iface->set_volume = interface_as_function ## _set_volume; \
- iface->get_volume = interface_as_function ## _get_volume; \
- iface->set_mute = interface_as_function ## _set_mute; \
- iface->set_record = interface_as_function ## _set_record; \
- iface->get_mixer_flags = interface_as_function ## _get_mixer_flags; \
- iface->get_mixer_type = interface_as_function ## _get_mixer_type; \
-}
-
-G_END_DECLS
-
-#endif
diff --git a/ext/pulse/pulsemixertrack.c b/ext/pulse/pulsemixertrack.c
deleted file mode 100644
index 981351cb3a8f9a0103d271317640fad9f8ad2647..0000000000000000000000000000000000000000
--- a/ext/pulse/pulsemixertrack.c
+++ /dev/null
@@ -1,67 +0,0 @@
-/*
- * GStreamer pulseaudio plugin
- *
- * Copyright (c) 2004-2008 Lennart Poettering
- *
- * gst-pulse is free software; you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of the
- * License, or (at your option) any later version.
- *
- * gst-pulse is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with gst-pulse; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
- * USA.
- */
-
-#ifdef HAVE_CONFIG_H
-#include "config.h"
-#endif
-
-#include <gst/gst.h>
-
-#include "pulsemixertrack.h"
-
-GST_DEBUG_CATEGORY_EXTERN (pulse_debug);
-#define GST_CAT_DEFAULT pulse_debug
-
-G_DEFINE_TYPE (GstPulseMixerTrack, gst_pulsemixer_track, GST_TYPE_MIXER_TRACK);
-
-static void
-gst_pulsemixer_track_class_init (GstPulseMixerTrackClass * klass)
-{
-}
-
-static void
-gst_pulsemixer_track_init (GstPulseMixerTrack * track)
-{
- track->control = NULL;
-}
-
-GstMixerTrack *
-gst_pulsemixer_track_new (GstPulseMixerCtrl * control)
-{
- GstPulseMixerTrack *pulsetrack;
- GstMixerTrack *track;
-
- pulsetrack = g_object_new (GST_TYPE_PULSEMIXER_TRACK, NULL);
- pulsetrack->control = control;
-
- track = GST_MIXER_TRACK (pulsetrack);
- track->label = g_strdup ("Master");
- track->num_channels = control->channel_map.channels;
- track->flags =
- (control->type ==
- GST_PULSEMIXER_SINK ? GST_MIXER_TRACK_OUTPUT | GST_MIXER_TRACK_MASTER :
- GST_MIXER_TRACK_INPUT | GST_MIXER_TRACK_RECORD) | (control->muted ?
- GST_MIXER_TRACK_MUTE : 0);
- track->min_volume = PA_VOLUME_MUTED;
- track->max_volume = PA_VOLUME_NORM;
-
- return track;
-}
diff --git a/ext/pulse/pulsemixertrack.h b/ext/pulse/pulsemixertrack.h
deleted file mode 100644
index 5c958ed0e0c074ed3c7656b062f0ccc575fe98f4..0000000000000000000000000000000000000000
--- a/ext/pulse/pulsemixertrack.h
+++ /dev/null
@@ -1,60 +0,0 @@
-/*
- * GStreamer pulseaudio plugin
- *
- * Copyright (c) 2004-2008 Lennart Poettering
- *
- * gst-pulse is free software; you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of the
- * License, or (at your option) any later version.
- *
- * gst-pulse is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with gst-pulse; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
- * USA.
- */
-
-#ifndef __GST_PULSEMIXERTRACK_H__
-#define __GST_PULSEMIXERTRACK_H__
-
-#include <gst/gst.h>
-
-#include "pulsemixerctrl.h"
-
-G_BEGIN_DECLS
-
-#define GST_TYPE_PULSEMIXER_TRACK \
- (gst_pulsemixer_track_get_type())
-#define GST_PULSEMIXER_TRACK(obj) \
- (G_TYPE_CHECK_INSTANCE_CAST((obj), GST_TYPE_PULSEMIXER_TRACK, GstPulseMixerTrack))
-#define GST_PULSEMIXER_TRACK_CLASS(klass) \
- (G_TYPE_CHECK_CLASS_CAST((klass), GST_TYPE_PULSEMIXER_TRACK, GstPulseMixerTrackClass))
-#define GST_IS_PULSEMIXER_TRACK(obj) \
- (G_TYPE_CHECK_INSTANCE_TYPE((obj), GST_TYPE_PULSEMIXER_TRACK))
-#define GST_IS_PULSEMIXER_TRACK_CLASS(klass) \
- (G_TYPE_CHECK_CLASS_TYPE((klass), GST_TYPE_PULSEMIXER_TRACK))
-
-
-typedef struct _GstPulseMixerTrack
-{
- GstMixerTrack parent;
- GstPulseMixerCtrl *control;
-} GstPulseMixerTrack;
-
-typedef struct _GstPulseMixerTrackClass
-{
- GstMixerTrackClass parent;
-} GstPulseMixerTrackClass;
-
-GType gst_pulsemixer_track_get_type (void);
-
-GstMixerTrack *gst_pulsemixer_track_new (GstPulseMixerCtrl * control);
-
-G_END_DECLS
-
-#endif
diff --git a/ext/pulse/pulsesink.c b/ext/pulse/pulsesink.c
index c8bcac4408307e153c2cf247766e06dc4c919d3e..8f3389de1bbef198b7bd9d8f42ef9b5554d5463b 100644
--- a/ext/pulse/pulsesink.c
+++ b/ext/pulse/pulsesink.c
@@ -23,7 +23,7 @@
/**
* SECTION:element-pulsesink
- * @see_also: pulsesrc, pulsemixer
+ * @see_also: pulsesrc
*
* This element outputs audio to a
* <ulink href="http://www.pulseaudio.org">PulseAudio sound server</ulink>.
@@ -407,7 +407,7 @@ gst_pulsering_context_subscribe_cb (pa_context * c,
GstPulseRingBuffer *pbuf = (GstPulseRingBuffer *) walk->data;
psink = GST_PULSESINK_CAST (GST_OBJECT_PARENT (pbuf));
- GST_LOG_OBJECT (psink, "type %d, idx %u", t, idx);
+ GST_LOG_OBJECT (psink, "type %04x, idx %u", t, idx);
if (!pbuf->stream)
continue;
@@ -904,8 +904,12 @@ gst_pulseringbuffer_acquire (GstAudioRingBuffer * buf,
flags = PA_STREAM_INTERPOLATE_TIMING | PA_STREAM_AUTO_TIMING_UPDATE |
PA_STREAM_ADJUST_LATENCY | PA_STREAM_START_CORKED;
- if (psink->mute_set && psink->mute)
- flags |= PA_STREAM_START_MUTED;
+ if (psink->mute_set) {
+ if (psink->mute)
+ flags |= PA_STREAM_START_MUTED;
+ else
+ flags |= PA_STREAM_START_UNMUTED;
+ }
/* we always start corked (see flags above) */
pbuf->corked = TRUE;
diff --git a/ext/pulse/pulsesrc.c b/ext/pulse/pulsesrc.c
index 3c965ae4ea6ce9e118ed36e6e82a864724da4e28..b4afe370a4853966c0fc28894824f604c2b45134 100644
--- a/ext/pulse/pulsesrc.c
+++ b/ext/pulse/pulsesrc.c
@@ -21,7 +21,7 @@
/**
* SECTION:element-pulsesrc
- * @see_also: pulsesink, pulsemixer
+ * @see_also: pulsesink
*
* This element captures audio from a
* <ulink href="http://www.pulseaudio.org">PulseAudio sound server</ulink>.
@@ -47,7 +47,6 @@
#include "pulsesrc.h"
#include "pulseutil.h"
-#include "pulsemixerctrl.h"
GST_DEBUG_CATEGORY_EXTERN (pulse_debug);
#define GST_CAT_DEFAULT pulse_debug
@@ -127,11 +126,8 @@ static GstStaticPadTemplate pad_template = GST_STATIC_PAD_TEMPLATE ("src",
);
-GST_IMPLEMENT_PULSEMIXER_CTRL_METHODS (GstPulseSrc, gst_pulsesrc);
-
#define gst_pulsesrc_parent_class parent_class
G_DEFINE_TYPE_WITH_CODE (GstPulseSrc, gst_pulsesrc, GST_TYPE_AUDIO_SRC,
- G_IMPLEMENT_INTERFACE (GST_TYPE_MIXER, gst_pulsesrc_mixer_interface_init);
G_IMPLEMENT_INTERFACE (GST_TYPE_STREAM_VOLUME, NULL));
static void
@@ -287,8 +283,6 @@ gst_pulsesrc_init (GstPulseSrc * pulsesrc)
pulsesrc->notify = 0;
- pulsesrc->mixer = NULL;
-
pulsesrc->properties = NULL;
pulsesrc->proplist = NULL;
@@ -348,11 +342,6 @@ gst_pulsesrc_finalize (GObject * object)
if (pulsesrc->proplist)
pa_proplist_free (pulsesrc->proplist);
- if (pulsesrc->mixer) {
- gst_pulsemixer_ctrl_free (pulsesrc->mixer);
- pulsesrc->mixer = NULL;
- }
-
if (pulsesrc->probe) {
gst_pulseprobe_free (pulsesrc->probe);
pulsesrc->probe = NULL;
@@ -1616,11 +1605,6 @@ gst_pulsesrc_change_state (GstElement * element, GstStateChange transition)
this->mainloop = NULL;
goto mainloop_start_failed;
}
-
- if (!this->mixer)
- this->mixer =
- gst_pulsemixer_ctrl_new (G_OBJECT (this), this->server,
- this->device, GST_PULSEMIXER_SOURCE);
break;
case GST_STATE_CHANGE_PAUSED_TO_PLAYING:
/* uncork and start recording */
@@ -1645,11 +1629,6 @@ gst_pulsesrc_change_state (GstElement * element, GstStateChange transition)
gst_pulsesrc_pause (this);
break;
case GST_STATE_CHANGE_READY_TO_NULL:
- if (this->mixer) {
- gst_pulsemixer_ctrl_free (this->mixer);
- this->mixer = NULL;
- }
-
if (this->mainloop)
pa_threaded_mainloop_stop (this->mainloop);
diff --git a/ext/pulse/pulsesrc.h b/ext/pulse/pulsesrc.h
index d4d20f8c3bfff670d4d623d38d171e2ca342e088..18ba1522cf2b9e9ed3c0bbfeaf008742d8808389 100644
--- a/ext/pulse/pulsesrc.h
+++ b/ext/pulse/pulsesrc.h
@@ -30,7 +30,6 @@
#include <pulse/pulseaudio.h>
#include <pulse/thread-mainloop.h>
-#include "pulsemixerctrl.h"
#include "pulseprobe.h"
G_BEGIN_DECLS
@@ -69,7 +68,6 @@ struct _GstPulseSrc
size_t read_buffer_length;
gchar *device_description;
- GstPulseMixerCtrl *mixer;
GstPulseProbe *probe;
gdouble volume;
diff --git a/ext/raw1394/Makefile.am b/ext/raw1394/Makefile.am
index c0fb57469952f4dd3761b071f08a4e1ba9577bd9..03f448b58dae459f1d2d1bb2c4150fd60442dcdd 100644
--- a/ext/raw1394/Makefile.am
+++ b/ext/raw1394/Makefile.am
@@ -17,7 +17,7 @@ libgst1394_la_CFLAGS = \
$(GST_CFLAGS) \
$(DV1394_CFLAGS)
libgst1394_la_LIBADD = \
- $(GST_PLUGINS_BASE_LIBS) -lgstinterfaces-$(GST_API_VERSION) \
+ $(GST_PLUGINS_BASE_LIBS) \
$(GST_BASE_LIBS) \
$(GST_LIBS) \
$(DV1394_LIBS)
diff --git a/ext/raw1394/Makefile.in b/ext/raw1394/Makefile.in
index e74ed24fcb310beedd9ff91c0c8f46547fe7f562..af2eef5b9c20c66e8e7553ce743427577615f48e 100644
--- a/ext/raw1394/Makefile.in
+++ b/ext/raw1394/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.11.4 from Makefile.am.
+# Makefile.in generated by automake 1.11.5 from Makefile.am.
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -60,6 +60,7 @@ am__aclocal_m4_deps = $(top_srcdir)/common/m4/as-ac-expand.m4 \
$(top_srcdir)/common/m4/as-auto-alt.m4 \
$(top_srcdir)/common/m4/as-compiler-flag.m4 \
$(top_srcdir)/common/m4/as-gcc-inline-assembly.m4 \
+ $(top_srcdir)/common/m4/as-libtool.m4 \
$(top_srcdir)/common/m4/as-objc.m4 \
$(top_srcdir)/common/m4/as-python.m4 \
$(top_srcdir)/common/m4/as-scrub-include.m4 \
@@ -263,6 +264,7 @@ GMSGFMT_015 = @GMSGFMT_015@
GREP = @GREP@
GSTPB_PLUGINS_DIR = @GSTPB_PLUGINS_DIR@
GSTPB_PREFIX = @GSTPB_PREFIX@
+GST_AGE = @GST_AGE@
GST_ALL_LDFLAGS = @GST_ALL_LDFLAGS@
GST_API_VERSION = @GST_API_VERSION@
GST_BASE_CFLAGS = @GST_BASE_CFLAGS@
@@ -272,9 +274,11 @@ GST_CHECK_CFLAGS = @GST_CHECK_CFLAGS@
GST_CHECK_LIBS = @GST_CHECK_LIBS@
GST_CONTROLLER_CFLAGS = @GST_CONTROLLER_CFLAGS@
GST_CONTROLLER_LIBS = @GST_CONTROLLER_LIBS@
+GST_CURRENT = @GST_CURRENT@
GST_CXXFLAGS = @GST_CXXFLAGS@
GST_LEVEL_DEFAULT = @GST_LEVEL_DEFAULT@
GST_LIBS = @GST_LIBS@
+GST_LIBVERSION = @GST_LIBVERSION@
GST_LICENSE = @GST_LICENSE@
GST_LT_LDFLAGS = @GST_LT_LDFLAGS@
GST_NET_CFLAGS = @GST_NET_CFLAGS@
@@ -292,6 +296,7 @@ GST_PLUGINS_NONPORTED = @GST_PLUGINS_NONPORTED@
GST_PLUGINS_SELECTED = @GST_PLUGINS_SELECTED@
GST_PLUGIN_LDFLAGS = @GST_PLUGIN_LDFLAGS@
GST_PREFIX = @GST_PREFIX@
+GST_REVISION = @GST_REVISION@
GST_TOOLS_DIR = @GST_TOOLS_DIR@
GTKDOC_CHECK = @GTKDOC_CHECK@
GTK_CFLAGS = @GTK_CFLAGS@
@@ -507,7 +512,7 @@ libgst1394_la_CFLAGS = \
$(DV1394_CFLAGS)
libgst1394_la_LIBADD = \
- $(GST_PLUGINS_BASE_LIBS) -lgstinterfaces-$(GST_API_VERSION) \
+ $(GST_PLUGINS_BASE_LIBS) \
$(GST_BASE_LIBS) \
$(GST_LIBS) \
$(DV1394_LIBS)
@@ -561,7 +566,7 @@ install-pluginLTLIBRARIES: $(plugin_LTLIBRARIES)
done; \
test -z "$$list2" || { \
echo " $(MKDIR_P) '$(DESTDIR)$(plugindir)'"; \
- $(MKDIR_P) '$(DESTDIR)$(plugindir)' || exit 1; \
+ $(MKDIR_P) "$(DESTDIR)$(plugindir)" || exit 1; \
echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 '$(DESTDIR)$(plugindir)'"; \
$(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 "$(DESTDIR)$(plugindir)"; \
}
diff --git a/ext/raw1394/gst1394probe.c b/ext/raw1394/gst1394probe.c
index ee51ba0c6875ed6ce27dc73cd2dd94b2020e8331..1118aad547ae1b1c79ae59b002697f737af79baf 100644
--- a/ext/raw1394/gst1394probe.c
+++ b/ext/raw1394/gst1394probe.c
@@ -25,7 +25,8 @@
#include <gst/gst.h>
#include "gst1394probe.h"
-#include "gst/interfaces/propertyprobe.h"
+
+#if 0
static GValueArray *
gst_1394_get_guid_array (void)
@@ -138,3 +139,5 @@ gst_1394_type_add_property_probe_interface (GType type)
g_type_add_interface_static (type, GST_TYPE_PROPERTY_PROBE,
&probe_iface_info);
}
+
+#endif
diff --git a/ext/raw1394/gst1394probe.h b/ext/raw1394/gst1394probe.h
index 8436e70cf24c95f9233c040961cdeaeea093d6e0..85af8d306ce8b96234d86ac7da32f65b915990c0 100644
--- a/ext/raw1394/gst1394probe.h
+++ b/ext/raw1394/gst1394probe.h
@@ -24,7 +24,9 @@
G_BEGIN_DECLS
+#if 0
void gst_1394_type_add_property_probe_interface (GType type);
+#endif
G_END_DECLS
diff --git a/ext/raw1394/gstdv1394src.c b/ext/raw1394/gstdv1394src.c
index 7c3964971e35847805d738cf15455d629b98784b..1c769d3c78b576bec879724887052e20d7b366b0 100644
--- a/ext/raw1394/gstdv1394src.c
+++ b/ext/raw1394/gstdv1394src.c
@@ -142,45 +142,13 @@ static GstFlowReturn gst_dv1394src_create (GstPushSrc * psrc, GstBuffer ** buf);
static gboolean gst_dv1394src_query (GstBaseSrc * src, GstQuery * query);
static void gst_dv1394src_update_device_name (GstDV1394Src * src);
-static void
-_do_init (GType type)
-{
- static const GInterfaceInfo urihandler_info = {
- gst_dv1394src_uri_handler_init,
- NULL,
- NULL,
- };
- g_type_add_interface_static (type, GST_TYPE_URI_HANDLER, &urihandler_info);
-
- gst_1394_type_add_property_probe_interface (type);
-
- GST_DEBUG_CATEGORY_INIT (dv1394src_debug, "dv1394src", 0,
- "DV firewire source");
-}
-
-GST_BOILERPLATE_FULL (GstDV1394Src, gst_dv1394src, GstPushSrc,
- GST_TYPE_PUSH_SRC, _do_init);
-
+#define gst_dv1394src_parent_class parent_class
+G_DEFINE_TYPE_WITH_CODE (GstDV1394Src, gst_dv1394src, GST_TYPE_PUSH_SRC,
+ G_IMPLEMENT_INTERFACE (GST_TYPE_URI_HANDLER,
+ gst_dv1394src_uri_handler_init));
static guint gst_dv1394src_signals[LAST_SIGNAL] = { 0 };
-
-static void
-gst_dv1394src_base_init (gpointer g_class)
-{
- GstElementClass *element_class = GST_ELEMENT_CLASS (g_class);
-
- gst_element_class_add_pad_template (element_class,
- gst_static_pad_template_get (&src_factory));
-
- gst_element_class_set_static_metadata (element_class,
- "Firewire (1394) DV video source", "Source/Video",
- "Source for DV video data from firewire port",
- "Erik Walthinsen <omega@temple-baptist.com>, "
- "Daniel Fischer <dan@f3c.com>, " "Wim Taymans <wim@fluendo.com>, "
- "Zaheer Abbas Merali <zaheerabbas at merali dot org>");
-}
-
static void
gst_dv1394src_class_init (GstDV1394SrcClass * klass)
{
@@ -251,10 +219,23 @@ gst_dv1394src_class_init (GstDV1394SrcClass * klass)
gstbasesrc_class->query = gst_dv1394src_query;
gstpushsrc_class->create = gst_dv1394src_create;
+
+ gst_element_class_add_pad_template (gstelement_class,
+ gst_static_pad_template_get (&src_factory));
+
+ gst_element_class_set_static_metadata (gstelement_class,
+ "Firewire (1394) DV video source", "Source/Video",
+ "Source for DV video data from firewire port",
+ "Erik Walthinsen <omega@temple-baptist.com>, "
+ "Daniel Fischer <dan@f3c.com>, " "Wim Taymans <wim@fluendo.com>, "
+ "Zaheer Abbas Merali <zaheerabbas at merali dot org>");
+
+ GST_DEBUG_CATEGORY_INIT (dv1394src_debug, "dv1394src", 0,
+ "DV firewire source");
}
static void
-gst_dv1394src_init (GstDV1394Src * dv1394src, GstDV1394SrcClass * klass)
+gst_dv1394src_init (GstDV1394Src * dv1394src)
{
GstPad *srcpad = GST_BASE_SRC_PAD (dv1394src);
@@ -443,7 +424,7 @@ gst_dv1394src_iec61883_receive (unsigned char *data, int len,
{
GstDV1394Src *dv1394src = GST_DV1394SRC (cbdata);
- if (G_UNLIKELY (!GST_PAD_CAPS (GST_BASE_SRC_PAD (dv1394src)))) {
+ if (G_UNLIKELY (!gst_pad_has_current_caps (GST_BASE_SRC_PAD (dv1394src)))) {
GstCaps *caps;
unsigned char *p = data;
@@ -474,14 +455,12 @@ gst_dv1394src_iec61883_receive (unsigned char *data, int len,
if (G_LIKELY ((dv1394src->frame_sequence + 1) % (dv1394src->skip +
dv1394src->consecutive) < dv1394src->consecutive)) {
if (complete && len == dv1394src->frame_size) {
- guint8 *bufdata;
GstBuffer *buf;
buf = gst_buffer_new_and_alloc (dv1394src->frame_size);
GST_BUFFER_OFFSET (buf) = dv1394src->frame_sequence;
- bufdata = GST_BUFFER_DATA (buf);
- memcpy (bufdata, data, len);
+ gst_buffer_fill (buf, 0, data, len);
dv1394src->buf = buf;
}
}
@@ -667,7 +646,6 @@ static GstFlowReturn
gst_dv1394src_create (GstPushSrc * psrc, GstBuffer ** buf)
{
GstDV1394Src *dv1394src = GST_DV1394SRC (psrc);
- GstCaps *caps;
struct pollfd pollfds[2];
pollfds[0].fd = raw1394_get_fd (dv1394src->handle);
@@ -709,10 +687,6 @@ gst_dv1394src_create (GstPushSrc * psrc, GstBuffer ** buf)
g_assert (dv1394src->buf);
- caps = gst_pad_get_caps (GST_BASE_SRC_PAD (psrc));
- gst_buffer_set_caps (dv1394src->buf, caps);
- gst_caps_unref (caps);
-
*buf = dv1394src->buf;
dv1394src->buf = NULL;
return GST_FLOW_OK;
@@ -1075,21 +1049,21 @@ gethandle_failed:
/*** GSTURIHANDLER INTERFACE *************************************************/
-static guint
-gst_dv1394src_uri_get_type (void)
+static GstURIType
+gst_dv1394src_uri_get_type (GType type)
{
return GST_URI_SRC;
}
-static gchar **
-gst_dv1394src_uri_get_protocols (void)
+static const gchar *const *
+gst_dv1394src_uri_get_protocols (GType type)
{
- static gchar *protocols[] = { (char *) "dv", NULL };
+ static const gchar *protocols[] = { (char *) "dv", NULL };
return protocols;
}
-static const gchar *
+static gchar *
gst_dv1394src_uri_get_uri (GstURIHandler * handler)
{
GstDV1394Src *gst_dv1394src = GST_DV1394SRC (handler);
@@ -1098,7 +1072,8 @@ gst_dv1394src_uri_get_uri (GstURIHandler * handler)
}
static gboolean
-gst_dv1394src_uri_set_uri (GstURIHandler * handler, const gchar * uri)
+gst_dv1394src_uri_set_uri (GstURIHandler * handler, const gchar * uri,
+ GError ** error)
{
gchar *protocol, *location;
gboolean ret = TRUE;
@@ -1107,6 +1082,7 @@ gst_dv1394src_uri_set_uri (GstURIHandler * handler, const gchar * uri)
protocol = gst_uri_get_protocol (uri);
if (strcmp (protocol, "dv") != 0) {
g_free (protocol);
+ g_set_error (error, GST_URI_ERROR, GST_URI_ERROR_BAD_URI, "Invalid DV URI");
return FALSE;
}
g_free (protocol);
diff --git a/ext/raw1394/gsthdv1394src.c b/ext/raw1394/gsthdv1394src.c
index eb5d04442c6ac6649e52e2cdb294e6374b047cac..9197972c3e6fe73a8b7c349b7db7932a83d48072 100644
--- a/ext/raw1394/gsthdv1394src.c
+++ b/ext/raw1394/gsthdv1394src.c
@@ -115,48 +115,21 @@ static GstFlowReturn gst_hdv1394src_create (GstPushSrc * psrc,
static void gst_hdv1394src_update_device_name (GstHDV1394Src * src);
-static void
-_do_init (GType type)
-{
- static const GInterfaceInfo urihandler_info = {
- gst_hdv1394src_uri_handler_init,
- NULL,
- NULL,
- };
- g_type_add_interface_static (type, GST_TYPE_URI_HANDLER, &urihandler_info);
-
- gst_1394_type_add_property_probe_interface (type);
-
- GST_DEBUG_CATEGORY_INIT (hdv1394src_debug, "hdv1394src", 0,
- "MPEG-TS firewire source");
-}
-
-GST_BOILERPLATE_FULL (GstHDV1394Src, gst_hdv1394src, GstPushSrc,
- GST_TYPE_PUSH_SRC, _do_init);
-
-
-static void
-gst_hdv1394src_base_init (gpointer g_class)
-{
- GstElementClass *element_class = GST_ELEMENT_CLASS (g_class);
-
- gst_element_class_add_pad_template (element_class,
- gst_static_pad_template_get (&src_factory));
-
- gst_element_class_set_static_metadata (element_class,
- "Firewire (1394) HDV video source", "Source/Video",
- "Source for MPEG-TS video data from firewire port",
- "Edward Hervey <bilboed@bilboed.com>");
-}
+#define gst_hdv1394src_parent_class parent_class
+G_DEFINE_TYPE_WITH_CODE (GstHDV1394Src, gst_hdv1394src, GST_TYPE_PUSH_SRC,
+ G_IMPLEMENT_INTERFACE (GST_TYPE_URI_HANDLER,
+ gst_hdv1394src_uri_handler_init));
static void
gst_hdv1394src_class_init (GstHDV1394SrcClass * klass)
{
GObjectClass *gobject_class;
+ GstElementClass *gstelement_class;
GstBaseSrcClass *gstbasesrc_class;
GstPushSrcClass *gstpushsrc_class;
gobject_class = (GObjectClass *) klass;
+ gstelement_class = (GstElementClass *) klass;
gstbasesrc_class = (GstBaseSrcClass *) klass;
gstpushsrc_class = (GstPushSrcClass *) klass;
@@ -196,10 +169,21 @@ gst_hdv1394src_class_init (GstHDV1394SrcClass * klass)
gstbasesrc_class->unlock = gst_hdv1394src_unlock;
gstpushsrc_class->create = gst_hdv1394src_create;
+
+ gst_element_class_add_pad_template (gstelement_class,
+ gst_static_pad_template_get (&src_factory));
+
+ gst_element_class_set_static_metadata (gstelement_class,
+ "Firewire (1394) HDV video source", "Source/Video",
+ "Source for MPEG-TS video data from firewire port",
+ "Edward Hervey <bilboed@bilboed.com>");
+
+ GST_DEBUG_CATEGORY_INIT (hdv1394src_debug, "hdv1394src", 0,
+ "MPEG-TS firewire source");
}
static void
-gst_hdv1394src_init (GstHDV1394Src * dv1394src, GstHDV1394SrcClass * klass)
+gst_hdv1394src_init (GstHDV1394Src * dv1394src)
{
GstPad *srcpad = GST_BASE_SRC_PAD (dv1394src);
@@ -387,7 +371,6 @@ static GstFlowReturn
gst_hdv1394src_create (GstPushSrc * psrc, GstBuffer ** buf)
{
GstHDV1394Src *dv1394src = GST_HDV1394SRC (psrc);
- GstCaps *caps;
struct pollfd pollfds[2];
pollfds[0].fd = raw1394_get_fd (dv1394src->handle);
@@ -439,17 +422,10 @@ gst_hdv1394src_create (GstPushSrc * psrc, GstBuffer ** buf)
GST_LOG ("We have some frames (%u bytes)", (guint) dv1394src->outoffset);
/* Create the buffer */
- *buf = gst_buffer_new ();
- GST_BUFFER_DATA (*buf) = dv1394src->outdata;
- GST_BUFFER_MALLOCDATA (*buf) = dv1394src->outdata;
- GST_BUFFER_SIZE (*buf) = dv1394src->outoffset;
+ *buf = gst_buffer_new_wrapped (dv1394src->outdata, dv1394src->outoffset);
dv1394src->outdata = NULL;
dv1394src->outoffset = 0;
- caps = gst_pad_get_caps (GST_BASE_SRC_PAD (psrc));
- gst_buffer_set_caps (*buf, caps);
- gst_caps_unref (caps);
-
return GST_FLOW_OK;
error_while_polling:
@@ -785,21 +761,21 @@ gethandle_failed:
/*** GSTURIHANDLER INTERFACE *************************************************/
-static guint
-gst_hdv1394src_uri_get_type (void)
+static GstURIType
+gst_hdv1394src_uri_get_type (GType type)
{
return GST_URI_SRC;
}
-static gchar **
-gst_hdv1394src_uri_get_protocols (void)
+static const gchar *const *
+gst_hdv1394src_uri_get_protocols (GType type)
{
- static gchar *protocols[] = { (char *) "hdv", NULL };
+ static const gchar *protocols[] = { (char *) "hdv", NULL };
return protocols;
}
-static const gchar *
+static gchar *
gst_hdv1394src_uri_get_uri (GstURIHandler * handler)
{
GstHDV1394Src *gst_hdv1394src = GST_HDV1394SRC (handler);
@@ -808,7 +784,8 @@ gst_hdv1394src_uri_get_uri (GstURIHandler * handler)
}
static gboolean
-gst_hdv1394src_uri_set_uri (GstURIHandler * handler, const gchar * uri)
+gst_hdv1394src_uri_set_uri (GstURIHandler * handler, const gchar * uri,
+ GError ** error)
{
gchar *protocol, *location;
gboolean ret = TRUE;
@@ -817,6 +794,8 @@ gst_hdv1394src_uri_set_uri (GstURIHandler * handler, const gchar * uri)
protocol = gst_uri_get_protocol (uri);
if (strcmp (protocol, "hdv") != 0) {
g_free (protocol);
+ g_set_error (error, GST_URI_ERROR, GST_URI_ERROR_BAD_URI,
+ "Invalid HDV URI");
return FALSE;
}
g_free (protocol);
diff --git a/ext/shout2/Makefile.in b/ext/shout2/Makefile.in
index ca2c114cf9dd5da038dbb8858fbde39d22524bdd..73796b97a65534abaa10e11917d2cd0355f97bf2 100644
--- a/ext/shout2/Makefile.in
+++ b/ext/shout2/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.11.4 from Makefile.am.
+# Makefile.in generated by automake 1.11.5 from Makefile.am.
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -60,6 +60,7 @@ am__aclocal_m4_deps = $(top_srcdir)/common/m4/as-ac-expand.m4 \
$(top_srcdir)/common/m4/as-auto-alt.m4 \
$(top_srcdir)/common/m4/as-compiler-flag.m4 \
$(top_srcdir)/common/m4/as-gcc-inline-assembly.m4 \
+ $(top_srcdir)/common/m4/as-libtool.m4 \
$(top_srcdir)/common/m4/as-objc.m4 \
$(top_srcdir)/common/m4/as-python.m4 \
$(top_srcdir)/common/m4/as-scrub-include.m4 \
@@ -255,6 +256,7 @@ GMSGFMT_015 = @GMSGFMT_015@
GREP = @GREP@
GSTPB_PLUGINS_DIR = @GSTPB_PLUGINS_DIR@
GSTPB_PREFIX = @GSTPB_PREFIX@
+GST_AGE = @GST_AGE@
GST_ALL_LDFLAGS = @GST_ALL_LDFLAGS@
GST_API_VERSION = @GST_API_VERSION@
GST_BASE_CFLAGS = @GST_BASE_CFLAGS@
@@ -264,9 +266,11 @@ GST_CHECK_CFLAGS = @GST_CHECK_CFLAGS@
GST_CHECK_LIBS = @GST_CHECK_LIBS@
GST_CONTROLLER_CFLAGS = @GST_CONTROLLER_CFLAGS@
GST_CONTROLLER_LIBS = @GST_CONTROLLER_LIBS@
+GST_CURRENT = @GST_CURRENT@
GST_CXXFLAGS = @GST_CXXFLAGS@
GST_LEVEL_DEFAULT = @GST_LEVEL_DEFAULT@
GST_LIBS = @GST_LIBS@
+GST_LIBVERSION = @GST_LIBVERSION@
GST_LICENSE = @GST_LICENSE@
GST_LT_LDFLAGS = @GST_LT_LDFLAGS@
GST_NET_CFLAGS = @GST_NET_CFLAGS@
@@ -284,6 +288,7 @@ GST_PLUGINS_NONPORTED = @GST_PLUGINS_NONPORTED@
GST_PLUGINS_SELECTED = @GST_PLUGINS_SELECTED@
GST_PLUGIN_LDFLAGS = @GST_PLUGIN_LDFLAGS@
GST_PREFIX = @GST_PREFIX@
+GST_REVISION = @GST_REVISION@
GST_TOOLS_DIR = @GST_TOOLS_DIR@
GTKDOC_CHECK = @GTKDOC_CHECK@
GTK_CFLAGS = @GTK_CFLAGS@
@@ -534,7 +539,7 @@ install-pluginLTLIBRARIES: $(plugin_LTLIBRARIES)
done; \
test -z "$$list2" || { \
echo " $(MKDIR_P) '$(DESTDIR)$(plugindir)'"; \
- $(MKDIR_P) '$(DESTDIR)$(plugindir)' || exit 1; \
+ $(MKDIR_P) "$(DESTDIR)$(plugindir)" || exit 1; \
echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 '$(DESTDIR)$(plugindir)'"; \
$(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 "$(DESTDIR)$(plugindir)"; \
}
diff --git a/ext/shout2/gstshout2.c b/ext/shout2/gstshout2.c
index b703ecc8618443caa5c6577a71e640919a416797..58a0da773b35abfc766e27229027b6f3da7a0f0c 100644
--- a/ext/shout2/gstshout2.c
+++ b/ext/shout2/gstshout2.c
@@ -77,7 +77,7 @@ enum
static GstStaticPadTemplate sink_template = GST_STATIC_PAD_TEMPLATE ("sink",
GST_PAD_SINK,
GST_PAD_ALWAYS,
- GST_STATIC_CAPS ("application/ogg; "
+ GST_STATIC_CAPS ("application/ogg; audio/ogg; video/ogg; "
"audio/mpeg, mpegversion = (int) 1, layer = (int) [ 1, 3 ]" WEBM_CAPS));
static void gst_shout2send_finalize (GstShout2send * shout2send);
diff --git a/ext/soup/Makefile.in b/ext/soup/Makefile.in
index c6f6568bdf5e4a1004c4b9a00e332ef991a96955..2c4c589ac26eb4cc4bb395a5da76fb10d035802c 100644
--- a/ext/soup/Makefile.in
+++ b/ext/soup/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.11.4 from Makefile.am.
+# Makefile.in generated by automake 1.11.5 from Makefile.am.
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -60,6 +60,7 @@ am__aclocal_m4_deps = $(top_srcdir)/common/m4/as-ac-expand.m4 \
$(top_srcdir)/common/m4/as-auto-alt.m4 \
$(top_srcdir)/common/m4/as-compiler-flag.m4 \
$(top_srcdir)/common/m4/as-gcc-inline-assembly.m4 \
+ $(top_srcdir)/common/m4/as-libtool.m4 \
$(top_srcdir)/common/m4/as-objc.m4 \
$(top_srcdir)/common/m4/as-python.m4 \
$(top_srcdir)/common/m4/as-scrub-include.m4 \
@@ -258,6 +259,7 @@ GMSGFMT_015 = @GMSGFMT_015@
GREP = @GREP@
GSTPB_PLUGINS_DIR = @GSTPB_PLUGINS_DIR@
GSTPB_PREFIX = @GSTPB_PREFIX@
+GST_AGE = @GST_AGE@
GST_ALL_LDFLAGS = @GST_ALL_LDFLAGS@
GST_API_VERSION = @GST_API_VERSION@
GST_BASE_CFLAGS = @GST_BASE_CFLAGS@
@@ -267,9 +269,11 @@ GST_CHECK_CFLAGS = @GST_CHECK_CFLAGS@
GST_CHECK_LIBS = @GST_CHECK_LIBS@
GST_CONTROLLER_CFLAGS = @GST_CONTROLLER_CFLAGS@
GST_CONTROLLER_LIBS = @GST_CONTROLLER_LIBS@
+GST_CURRENT = @GST_CURRENT@
GST_CXXFLAGS = @GST_CXXFLAGS@
GST_LEVEL_DEFAULT = @GST_LEVEL_DEFAULT@
GST_LIBS = @GST_LIBS@
+GST_LIBVERSION = @GST_LIBVERSION@
GST_LICENSE = @GST_LICENSE@
GST_LT_LDFLAGS = @GST_LT_LDFLAGS@
GST_NET_CFLAGS = @GST_NET_CFLAGS@
@@ -287,6 +291,7 @@ GST_PLUGINS_NONPORTED = @GST_PLUGINS_NONPORTED@
GST_PLUGINS_SELECTED = @GST_PLUGINS_SELECTED@
GST_PLUGIN_LDFLAGS = @GST_PLUGIN_LDFLAGS@
GST_PREFIX = @GST_PREFIX@
+GST_REVISION = @GST_REVISION@
GST_TOOLS_DIR = @GST_TOOLS_DIR@
GTKDOC_CHECK = @GTKDOC_CHECK@
GTK_CFLAGS = @GTK_CFLAGS@
@@ -537,7 +542,7 @@ install-pluginLTLIBRARIES: $(plugin_LTLIBRARIES)
done; \
test -z "$$list2" || { \
echo " $(MKDIR_P) '$(DESTDIR)$(plugindir)'"; \
- $(MKDIR_P) '$(DESTDIR)$(plugindir)' || exit 1; \
+ $(MKDIR_P) "$(DESTDIR)$(plugindir)" || exit 1; \
echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 '$(DESTDIR)$(plugindir)'"; \
$(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 "$(DESTDIR)$(plugindir)"; \
}
diff --git a/ext/soup/gstsouphttpsrc.c b/ext/soup/gstsouphttpsrc.c
index 8c84d67e229c0d918c477670931270c26ceeb81c..e35e39a511232b439579e6b01f65f9873dbe496a 100644
--- a/ext/soup/gstsouphttpsrc.c
+++ b/ext/soup/gstsouphttpsrc.c
@@ -1362,10 +1362,25 @@ static gboolean
gst_soup_http_src_set_location (GstSoupHTTPSrc * src, const gchar * uri,
GError ** error)
{
+ const char *alt_schemes[] = { "icy://", "icyx://" };
+ guint i;
+
if (src->location) {
g_free (src->location);
src->location = NULL;
}
+
+ if (uri == NULL)
+ return FALSE;
+
+ for (i = 0; i < G_N_ELEMENTS (alt_schemes); i++) {
+ if (g_str_has_prefix (uri, alt_schemes[i])) {
+ src->location =
+ g_strdup_printf ("http://%s", uri + strlen (alt_schemes[i]));
+ return TRUE;
+ }
+ }
+
src->location = g_strdup (uri);
return TRUE;
@@ -1399,7 +1414,7 @@ gst_soup_http_src_uri_get_type (GType type)
static const gchar *const *
gst_soup_http_src_uri_get_protocols (GType type)
{
- static const gchar *protocols[] = { "http", "https", NULL };
+ static const gchar *protocols[] = { "http", "https", "icy", "icyx", NULL };
return protocols;
}
diff --git a/ext/speex/Makefile.in b/ext/speex/Makefile.in
index f91a2ce8e686dd930c5248c765ab0da52541ded0..4a96d52a1fdad76bcb6292ceef3238b3929dae0d 100644
--- a/ext/speex/Makefile.in
+++ b/ext/speex/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.11.4 from Makefile.am.
+# Makefile.in generated by automake 1.11.5 from Makefile.am.
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -60,6 +60,7 @@ am__aclocal_m4_deps = $(top_srcdir)/common/m4/as-ac-expand.m4 \
$(top_srcdir)/common/m4/as-auto-alt.m4 \
$(top_srcdir)/common/m4/as-compiler-flag.m4 \
$(top_srcdir)/common/m4/as-gcc-inline-assembly.m4 \
+ $(top_srcdir)/common/m4/as-libtool.m4 \
$(top_srcdir)/common/m4/as-objc.m4 \
$(top_srcdir)/common/m4/as-python.m4 \
$(top_srcdir)/common/m4/as-scrub-include.m4 \
@@ -257,6 +258,7 @@ GMSGFMT_015 = @GMSGFMT_015@
GREP = @GREP@
GSTPB_PLUGINS_DIR = @GSTPB_PLUGINS_DIR@
GSTPB_PREFIX = @GSTPB_PREFIX@
+GST_AGE = @GST_AGE@
GST_ALL_LDFLAGS = @GST_ALL_LDFLAGS@
GST_API_VERSION = @GST_API_VERSION@
GST_BASE_CFLAGS = @GST_BASE_CFLAGS@
@@ -266,9 +268,11 @@ GST_CHECK_CFLAGS = @GST_CHECK_CFLAGS@
GST_CHECK_LIBS = @GST_CHECK_LIBS@
GST_CONTROLLER_CFLAGS = @GST_CONTROLLER_CFLAGS@
GST_CONTROLLER_LIBS = @GST_CONTROLLER_LIBS@
+GST_CURRENT = @GST_CURRENT@
GST_CXXFLAGS = @GST_CXXFLAGS@
GST_LEVEL_DEFAULT = @GST_LEVEL_DEFAULT@
GST_LIBS = @GST_LIBS@
+GST_LIBVERSION = @GST_LIBVERSION@
GST_LICENSE = @GST_LICENSE@
GST_LT_LDFLAGS = @GST_LT_LDFLAGS@
GST_NET_CFLAGS = @GST_NET_CFLAGS@
@@ -286,6 +290,7 @@ GST_PLUGINS_NONPORTED = @GST_PLUGINS_NONPORTED@
GST_PLUGINS_SELECTED = @GST_PLUGINS_SELECTED@
GST_PLUGIN_LDFLAGS = @GST_PLUGIN_LDFLAGS@
GST_PREFIX = @GST_PREFIX@
+GST_REVISION = @GST_REVISION@
GST_TOOLS_DIR = @GST_TOOLS_DIR@
GTKDOC_CHECK = @GTKDOC_CHECK@
GTK_CFLAGS = @GTK_CFLAGS@
@@ -547,7 +552,7 @@ install-pluginLTLIBRARIES: $(plugin_LTLIBRARIES)
done; \
test -z "$$list2" || { \
echo " $(MKDIR_P) '$(DESTDIR)$(plugindir)'"; \
- $(MKDIR_P) '$(DESTDIR)$(plugindir)' || exit 1; \
+ $(MKDIR_P) "$(DESTDIR)$(plugindir)" || exit 1; \
echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 '$(DESTDIR)$(plugindir)'"; \
$(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 "$(DESTDIR)$(plugindir)"; \
}
diff --git a/ext/taglib/Makefile.in b/ext/taglib/Makefile.in
index 62b63f07872130f1c74d4a126122bb3909f95b60..3eed1090abdfeaec6ec11db518d83910e4400885 100644
--- a/ext/taglib/Makefile.in
+++ b/ext/taglib/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.11.4 from Makefile.am.
+# Makefile.in generated by automake 1.11.5 from Makefile.am.
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -60,6 +60,7 @@ am__aclocal_m4_deps = $(top_srcdir)/common/m4/as-ac-expand.m4 \
$(top_srcdir)/common/m4/as-auto-alt.m4 \
$(top_srcdir)/common/m4/as-compiler-flag.m4 \
$(top_srcdir)/common/m4/as-gcc-inline-assembly.m4 \
+ $(top_srcdir)/common/m4/as-libtool.m4 \
$(top_srcdir)/common/m4/as-objc.m4 \
$(top_srcdir)/common/m4/as-python.m4 \
$(top_srcdir)/common/m4/as-scrub-include.m4 \
@@ -272,6 +273,7 @@ GMSGFMT_015 = @GMSGFMT_015@
GREP = @GREP@
GSTPB_PLUGINS_DIR = @GSTPB_PLUGINS_DIR@
GSTPB_PREFIX = @GSTPB_PREFIX@
+GST_AGE = @GST_AGE@
GST_ALL_LDFLAGS = @GST_ALL_LDFLAGS@
GST_API_VERSION = @GST_API_VERSION@
GST_BASE_CFLAGS = @GST_BASE_CFLAGS@
@@ -281,9 +283,11 @@ GST_CHECK_CFLAGS = @GST_CHECK_CFLAGS@
GST_CHECK_LIBS = @GST_CHECK_LIBS@
GST_CONTROLLER_CFLAGS = @GST_CONTROLLER_CFLAGS@
GST_CONTROLLER_LIBS = @GST_CONTROLLER_LIBS@
+GST_CURRENT = @GST_CURRENT@
GST_CXXFLAGS = @GST_CXXFLAGS@
GST_LEVEL_DEFAULT = @GST_LEVEL_DEFAULT@
GST_LIBS = @GST_LIBS@
+GST_LIBVERSION = @GST_LIBVERSION@
GST_LICENSE = @GST_LICENSE@
GST_LT_LDFLAGS = @GST_LT_LDFLAGS@
GST_NET_CFLAGS = @GST_NET_CFLAGS@
@@ -301,6 +305,7 @@ GST_PLUGINS_NONPORTED = @GST_PLUGINS_NONPORTED@
GST_PLUGINS_SELECTED = @GST_PLUGINS_SELECTED@
GST_PLUGIN_LDFLAGS = @GST_PLUGIN_LDFLAGS@
GST_PREFIX = @GST_PREFIX@
+GST_REVISION = @GST_REVISION@
GST_TOOLS_DIR = @GST_TOOLS_DIR@
GTKDOC_CHECK = @GTKDOC_CHECK@
GTK_CFLAGS = @GTK_CFLAGS@
@@ -564,7 +569,7 @@ install-pluginLTLIBRARIES: $(plugin_LTLIBRARIES)
done; \
test -z "$$list2" || { \
echo " $(MKDIR_P) '$(DESTDIR)$(plugindir)'"; \
- $(MKDIR_P) '$(DESTDIR)$(plugindir)' || exit 1; \
+ $(MKDIR_P) "$(DESTDIR)$(plugindir)" || exit 1; \
echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 '$(DESTDIR)$(plugindir)'"; \
$(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 "$(DESTDIR)$(plugindir)"; \
}
diff --git a/ext/wavpack/Makefile.in b/ext/wavpack/Makefile.in
index 383200bee066961f19333fa3f7d457b197b7081a..5f9081cb1659d03706dae87cac307be721925115 100644
--- a/ext/wavpack/Makefile.in
+++ b/ext/wavpack/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.11.4 from Makefile.am.
+# Makefile.in generated by automake 1.11.5 from Makefile.am.
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -60,6 +60,7 @@ am__aclocal_m4_deps = $(top_srcdir)/common/m4/as-ac-expand.m4 \
$(top_srcdir)/common/m4/as-auto-alt.m4 \
$(top_srcdir)/common/m4/as-compiler-flag.m4 \
$(top_srcdir)/common/m4/as-gcc-inline-assembly.m4 \
+ $(top_srcdir)/common/m4/as-libtool.m4 \
$(top_srcdir)/common/m4/as-objc.m4 \
$(top_srcdir)/common/m4/as-python.m4 \
$(top_srcdir)/common/m4/as-scrub-include.m4 \
@@ -260,6 +261,7 @@ GMSGFMT_015 = @GMSGFMT_015@
GREP = @GREP@
GSTPB_PLUGINS_DIR = @GSTPB_PLUGINS_DIR@
GSTPB_PREFIX = @GSTPB_PREFIX@
+GST_AGE = @GST_AGE@
GST_ALL_LDFLAGS = @GST_ALL_LDFLAGS@
GST_API_VERSION = @GST_API_VERSION@
GST_BASE_CFLAGS = @GST_BASE_CFLAGS@
@@ -269,9 +271,11 @@ GST_CHECK_CFLAGS = @GST_CHECK_CFLAGS@
GST_CHECK_LIBS = @GST_CHECK_LIBS@
GST_CONTROLLER_CFLAGS = @GST_CONTROLLER_CFLAGS@
GST_CONTROLLER_LIBS = @GST_CONTROLLER_LIBS@
+GST_CURRENT = @GST_CURRENT@
GST_CXXFLAGS = @GST_CXXFLAGS@
GST_LEVEL_DEFAULT = @GST_LEVEL_DEFAULT@
GST_LIBS = @GST_LIBS@
+GST_LIBVERSION = @GST_LIBVERSION@
GST_LICENSE = @GST_LICENSE@
GST_LT_LDFLAGS = @GST_LT_LDFLAGS@
GST_NET_CFLAGS = @GST_NET_CFLAGS@
@@ -289,6 +293,7 @@ GST_PLUGINS_NONPORTED = @GST_PLUGINS_NONPORTED@
GST_PLUGINS_SELECTED = @GST_PLUGINS_SELECTED@
GST_PLUGIN_LDFLAGS = @GST_PLUGIN_LDFLAGS@
GST_PREFIX = @GST_PREFIX@
+GST_REVISION = @GST_REVISION@
GST_TOOLS_DIR = @GST_TOOLS_DIR@
GTKDOC_CHECK = @GTKDOC_CHECK@
GTK_CFLAGS = @GTK_CFLAGS@
@@ -554,7 +559,7 @@ install-pluginLTLIBRARIES: $(plugin_LTLIBRARIES)
done; \
test -z "$$list2" || { \
echo " $(MKDIR_P) '$(DESTDIR)$(plugindir)'"; \
- $(MKDIR_P) '$(DESTDIR)$(plugindir)' || exit 1; \
+ $(MKDIR_P) "$(DESTDIR)$(plugindir)" || exit 1; \
echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 '$(DESTDIR)$(plugindir)'"; \
$(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 "$(DESTDIR)$(plugindir)"; \
}
diff --git a/gst-plugins-good.doap b/gst-plugins-good.doap
index e1d85208b965042eade1a9879cecd7380ea29cdf..da421d15962076921b7c2b458dc50263106ad246 100644
--- a/gst-plugins-good.doap
+++ b/gst-plugins-good.doap
@@ -32,6 +32,16 @@ the plug-in code, LGPL or LGPL-compatible for the supporting library).
</GitRepository>
</repository>
+ <release>
+ <Version>
+ <revision>0.11.91</revision>
+ <branch>0.11</branch>
+ <name>I smell the blood of an Englishman</name>
+ <created>2012-05-13</created>
+ <file-release rdf:resource="http://gstreamer.freedesktop.org/src/gst-plugins-good/gst-plugins-good-0.11.91.tar.xz" />
+ </Version>
+ </release>
+
<release>
<Version>
<revision>0.11.90</revision>
diff --git a/gst-plugins-good.spec b/gst-plugins-good.spec
index c1fa497307d1b7dcb9dfb2d580af65e99228e5a2..6ebfede1663cb995a62b3c929d4b11aab0c471f4 100644
--- a/gst-plugins-good.spec
+++ b/gst-plugins-good.spec
@@ -4,7 +4,7 @@
%define gst_minver 0.11.0
Name: %{gstreamer}-plugins-good
-Version: 0.11.90
+Version: 0.11.91
Release: 1.gst
Summary: GStreamer plug-ins with good code and licensing
@@ -25,16 +25,16 @@ BuildRequires: libjpeg-devel
BuildRequires: libcaca-devel
BuildRequires: libdv-devel
BuildRequires: libpng-devel >= 1.2.0
-#BuildRequires: glibc-devel
+BuildRequires: glibc-devel
BuildRequires: speex-devel
BuildRequires: libshout-devel >= 2.0
BuildRequires: aalib-devel >= 1.3
Provides: gstreamer-aasink = %{version}-%{release}
BuildRequires: pulseaudio-libs-devel
-#BuildRequires: libavc1394-devel
-#BuildRequires: libdc1394-devel
-#BuildRequires: libiec61883-devel
-#BuildRequires: libraw1394-devel
+BuildRequires: libavc1394-devel
+BuildRequires: libdc1394-devel
+BuildRequires: libiec61883-devel
+BuildRequires: libraw1394-devel
%description
GStreamer is a streaming media framework, based on graphs of filters which
@@ -118,7 +118,7 @@ rm -rf $RPM_BUILD_ROOT
%{_libdir}/gstreamer-%{majorminor}/libgstmultifile.so
%{_libdir}/gstreamer-%{majorminor}/libgstspectrum.so
%{_libdir}/gstreamer-%{majorminor}/libgstgoom2k1.so
-# %{_libdir}/gstreamer-%{majorminor}/libgstinterleave.so
+%{_libdir}/gstreamer-%{majorminor}/libgstinterleave.so
%{_libdir}/gstreamer-%{majorminor}/libgstreplaygain.so
# %{_libdir}/gstreamer-%{majorminor}/libgstdeinterlace.so
%{_libdir}/gstreamer-%{majorminor}/libgstflv.so
@@ -138,12 +138,12 @@ rm -rf $RPM_BUILD_ROOT
%{_libdir}/gstreamer-%{majorminor}/libgstjack.so
%{_libdir}/gstreamer-%{majorminor}/libgstjpeg.so
%{_libdir}/gstreamer-%{majorminor}/libgstpng.so
-#%{_libdir}/gstreamer-%{majorminor}/libgstossaudio.so
+%{_libdir}/gstreamer-%{majorminor}/libgstossaudio.so
%{_libdir}/gstreamer-%{majorminor}/libgstspeex.so
%{_libdir}/gstreamer-%{majorminor}/libgstshout2.so
%{_libdir}/gstreamer-%{majorminor}/libgstaasink.so
%{_libdir}/gstreamer-%{majorminor}/libgstdv.so
-#%{_libdir}/gstreamer-%{majorminor}/libgst1394.so
+%{_libdir}/gstreamer-%{majorminor}/libgst1394.so
%{_libdir}/gstreamer-%{majorminor}/libgstwavpack.so
%{_libdir}/gstreamer-%{majorminor}/libgstsouphttpsrc.so
%{_libdir}/gstreamer-%{majorminor}/libgstpulse.so
diff --git a/gst-plugins-good.spec.in b/gst-plugins-good.spec.in
index 388fef1d34d309e01b7e567fe2d55f4480a2a75b..cb1d1d5143aa9eac227e81b36146cc32aa909811 100644
--- a/gst-plugins-good.spec.in
+++ b/gst-plugins-good.spec.in
@@ -118,7 +118,7 @@ rm -rf $RPM_BUILD_ROOT
%{_libdir}/gstreamer-%{majorminor}/libgstmultifile.so
%{_libdir}/gstreamer-%{majorminor}/libgstspectrum.so
%{_libdir}/gstreamer-%{majorminor}/libgstgoom2k1.so
-# %{_libdir}/gstreamer-%{majorminor}/libgstinterleave.so
+%{_libdir}/gstreamer-%{majorminor}/libgstinterleave.so
%{_libdir}/gstreamer-%{majorminor}/libgstreplaygain.so
# %{_libdir}/gstreamer-%{majorminor}/libgstdeinterlace.so
%{_libdir}/gstreamer-%{majorminor}/libgstflv.so
diff --git a/gst/Makefile.in b/gst/Makefile.in
index 22f39c67985db00773e7c1c266bae5131a46703f..b9974aba16e833f7cb9e62e39333dbc7bea353cf 100644
--- a/gst/Makefile.in
+++ b/gst/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.11.4 from Makefile.am.
+# Makefile.in generated by automake 1.11.5 from Makefile.am.
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -63,6 +63,7 @@ am__aclocal_m4_deps = $(top_srcdir)/common/m4/as-ac-expand.m4 \
$(top_srcdir)/common/m4/as-auto-alt.m4 \
$(top_srcdir)/common/m4/as-compiler-flag.m4 \
$(top_srcdir)/common/m4/as-gcc-inline-assembly.m4 \
+ $(top_srcdir)/common/m4/as-libtool.m4 \
$(top_srcdir)/common/m4/as-objc.m4 \
$(top_srcdir)/common/m4/as-python.m4 \
$(top_srcdir)/common/m4/as-scrub-include.m4 \
@@ -233,6 +234,7 @@ GMSGFMT_015 = @GMSGFMT_015@
GREP = @GREP@
GSTPB_PLUGINS_DIR = @GSTPB_PLUGINS_DIR@
GSTPB_PREFIX = @GSTPB_PREFIX@
+GST_AGE = @GST_AGE@
GST_ALL_LDFLAGS = @GST_ALL_LDFLAGS@
GST_API_VERSION = @GST_API_VERSION@
GST_BASE_CFLAGS = @GST_BASE_CFLAGS@
@@ -242,9 +244,11 @@ GST_CHECK_CFLAGS = @GST_CHECK_CFLAGS@
GST_CHECK_LIBS = @GST_CHECK_LIBS@
GST_CONTROLLER_CFLAGS = @GST_CONTROLLER_CFLAGS@
GST_CONTROLLER_LIBS = @GST_CONTROLLER_LIBS@
+GST_CURRENT = @GST_CURRENT@
GST_CXXFLAGS = @GST_CXXFLAGS@
GST_LEVEL_DEFAULT = @GST_LEVEL_DEFAULT@
GST_LIBS = @GST_LIBS@
+GST_LIBVERSION = @GST_LIBVERSION@
GST_LICENSE = @GST_LICENSE@
GST_LT_LDFLAGS = @GST_LT_LDFLAGS@
GST_NET_CFLAGS = @GST_NET_CFLAGS@
@@ -262,6 +266,7 @@ GST_PLUGINS_NONPORTED = @GST_PLUGINS_NONPORTED@
GST_PLUGINS_SELECTED = @GST_PLUGINS_SELECTED@
GST_PLUGIN_LDFLAGS = @GST_PLUGIN_LDFLAGS@
GST_PREFIX = @GST_PREFIX@
+GST_REVISION = @GST_REVISION@
GST_TOOLS_DIR = @GST_TOOLS_DIR@
GTKDOC_CHECK = @GTKDOC_CHECK@
GTK_CFLAGS = @GTK_CFLAGS@
diff --git a/gst/alpha/Makefile.in b/gst/alpha/Makefile.in
index a6b72e69a5487ce9ad000adafcd43215fc16eecb..49511b57d0c9eb8324814dfbacf7d1bcb802be4c 100644
--- a/gst/alpha/Makefile.in
+++ b/gst/alpha/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.11.4 from Makefile.am.
+# Makefile.in generated by automake 1.11.5 from Makefile.am.
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -60,6 +60,7 @@ am__aclocal_m4_deps = $(top_srcdir)/common/m4/as-ac-expand.m4 \
$(top_srcdir)/common/m4/as-auto-alt.m4 \
$(top_srcdir)/common/m4/as-compiler-flag.m4 \
$(top_srcdir)/common/m4/as-gcc-inline-assembly.m4 \
+ $(top_srcdir)/common/m4/as-libtool.m4 \
$(top_srcdir)/common/m4/as-objc.m4 \
$(top_srcdir)/common/m4/as-python.m4 \
$(top_srcdir)/common/m4/as-scrub-include.m4 \
@@ -265,6 +266,7 @@ GMSGFMT_015 = @GMSGFMT_015@
GREP = @GREP@
GSTPB_PLUGINS_DIR = @GSTPB_PLUGINS_DIR@
GSTPB_PREFIX = @GSTPB_PREFIX@
+GST_AGE = @GST_AGE@
GST_ALL_LDFLAGS = @GST_ALL_LDFLAGS@
GST_API_VERSION = @GST_API_VERSION@
GST_BASE_CFLAGS = @GST_BASE_CFLAGS@
@@ -274,9 +276,11 @@ GST_CHECK_CFLAGS = @GST_CHECK_CFLAGS@
GST_CHECK_LIBS = @GST_CHECK_LIBS@
GST_CONTROLLER_CFLAGS = @GST_CONTROLLER_CFLAGS@
GST_CONTROLLER_LIBS = @GST_CONTROLLER_LIBS@
+GST_CURRENT = @GST_CURRENT@
GST_CXXFLAGS = @GST_CXXFLAGS@
GST_LEVEL_DEFAULT = @GST_LEVEL_DEFAULT@
GST_LIBS = @GST_LIBS@
+GST_LIBVERSION = @GST_LIBVERSION@
GST_LICENSE = @GST_LICENSE@
GST_LT_LDFLAGS = @GST_LT_LDFLAGS@
GST_NET_CFLAGS = @GST_NET_CFLAGS@
@@ -294,6 +298,7 @@ GST_PLUGINS_NONPORTED = @GST_PLUGINS_NONPORTED@
GST_PLUGINS_SELECTED = @GST_PLUGINS_SELECTED@
GST_PLUGIN_LDFLAGS = @GST_PLUGIN_LDFLAGS@
GST_PREFIX = @GST_PREFIX@
+GST_REVISION = @GST_REVISION@
GST_TOOLS_DIR = @GST_TOOLS_DIR@
GTKDOC_CHECK = @GTKDOC_CHECK@
GTK_CFLAGS = @GTK_CFLAGS@
@@ -557,7 +562,7 @@ install-pluginLTLIBRARIES: $(plugin_LTLIBRARIES)
done; \
test -z "$$list2" || { \
echo " $(MKDIR_P) '$(DESTDIR)$(plugindir)'"; \
- $(MKDIR_P) '$(DESTDIR)$(plugindir)' || exit 1; \
+ $(MKDIR_P) "$(DESTDIR)$(plugindir)" || exit 1; \
echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 '$(DESTDIR)$(plugindir)'"; \
$(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 "$(DESTDIR)$(plugindir)"; \
}
diff --git a/gst/alpha/gstalpha.c b/gst/alpha/gstalpha.c
index cb934e5652d6c5c44719e4e4bfa729d52db571d5..2eba2965c9852c62d95d841f196f44507b5ba736 100644
--- a/gst/alpha/gstalpha.c
+++ b/gst/alpha/gstalpha.c
@@ -171,7 +171,7 @@ static GstFlowReturn gst_alpha_transform_frame (GstVideoFilter * filter,
static void gst_alpha_init_params_full (GstAlpha * alpha,
const GstVideoFormatInfo * in_info, const GstVideoFormatInfo * out_info);
static void gst_alpha_init_params (GstAlpha * alpha);
-static gboolean gst_alpha_set_process_function (GstAlpha * alpha);
+static void gst_alpha_set_process_function (GstAlpha * alpha);
static gboolean gst_alpha_set_process_function_full (GstAlpha * alpha,
GstVideoInfo * in_info, GstVideoInfo * out_info);
@@ -457,7 +457,7 @@ gst_alpha_transform_caps (GstBaseTransform * btrans,
structure = gst_structure_copy (gst_caps_get_structure (caps, i));
gst_structure_remove_field (structure, "format");
- gst_structure_remove_field (structure, "color-matrix");
+ gst_structure_remove_field (structure, "colorimetry");
gst_structure_remove_field (structure, "chroma-site");
gst_caps_append_structure (tmp, structure);
@@ -515,8 +515,9 @@ gst_alpha_set_info (GstVideoFilter * filter,
GST_ALPHA_LOCK (alpha);
- alpha->in_sdtv = in_info->colorimetry.matrix = GST_VIDEO_COLOR_MATRIX_BT601;
- alpha->out_sdtv = out_info->colorimetry.matrix = GST_VIDEO_COLOR_MATRIX_BT601;
+ alpha->in_sdtv = in_info->colorimetry.matrix == GST_VIDEO_COLOR_MATRIX_BT601;
+ alpha->out_sdtv =
+ out_info->colorimetry.matrix == GST_VIDEO_COLOR_MATRIX_BT601;
passthrough = alpha->prefer_passthrough &&
GST_VIDEO_INFO_FORMAT (in_info) == GST_VIDEO_INFO_FORMAT (out_info)
@@ -2362,8 +2363,16 @@ gst_alpha_init_params_full (GstAlpha * alpha,
static void
gst_alpha_init_params (GstAlpha * alpha)
{
- gst_alpha_init_params_full (alpha, GST_VIDEO_FILTER (alpha)->in_info.finfo,
- GST_VIDEO_FILTER (alpha)->out_info.finfo);
+ const GstVideoFormatInfo *finfo_in, *finfo_out;
+
+ finfo_in = GST_VIDEO_FILTER (alpha)->in_info.finfo;
+ finfo_out = GST_VIDEO_FILTER (alpha)->out_info.finfo;
+
+ if (finfo_in != NULL && finfo_out != NULL) {
+ gst_alpha_init_params_full (alpha, finfo_in, finfo_out);
+ } else {
+ GST_DEBUG_OBJECT (alpha, "video formats not set yet");
+ }
}
/* Protected with the alpha lock */
@@ -2542,12 +2551,19 @@ gst_alpha_set_process_function_full (GstAlpha * alpha, GstVideoInfo * in_info,
return alpha->process != NULL;
}
-static gboolean
+static void
gst_alpha_set_process_function (GstAlpha * alpha)
{
- return gst_alpha_set_process_function_full (alpha,
- &GST_VIDEO_FILTER_CAST (alpha)->in_info,
- &GST_VIDEO_FILTER_CAST (alpha)->out_info);
+ GstVideoInfo *info_in, *info_out;
+
+ info_in = &GST_VIDEO_FILTER (alpha)->in_info;
+ info_out = &GST_VIDEO_FILTER (alpha)->out_info;
+
+ if (info_in->finfo != NULL && info_out->finfo != NULL) {
+ gst_alpha_set_process_function_full (alpha, info_in, info_out);
+ } else {
+ GST_DEBUG_OBJECT (alpha, "video formats not set yet");
+ }
}
static void
diff --git a/gst/alpha/gstalphacolor.c b/gst/alpha/gstalphacolor.c
index 84494339fd4bb14639680b621d5f3c3799f18dd2..3cf63408ee37bd66eeb54738098655b0fa6aefe5 100644
--- a/gst/alpha/gstalphacolor.c
+++ b/gst/alpha/gstalphacolor.c
@@ -123,7 +123,7 @@ gst_alpha_color_transform_caps (GstBaseTransform * btrans,
/* Remove any specific parameter from the structure */
gst_structure_remove_field (structure, "format");
- gst_structure_remove_field (structure, "color-matrix");
+ gst_structure_remove_field (structure, "colorimetry");
gst_structure_remove_field (structure, "chroma-site");
gst_structure_set_name (structure, "video/x-raw");
@@ -479,8 +479,8 @@ gst_alpha_color_set_info (GstVideoFilter * filter, GstCaps * incaps,
GST_VIDEO_INFO_HEIGHT (in_info) != GST_VIDEO_INFO_HEIGHT (out_info))
goto invalid_caps;
- in_sdtv = in_info->colorimetry.matrix = GST_VIDEO_COLOR_MATRIX_BT601;
- out_sdtv = out_info->colorimetry.matrix = GST_VIDEO_COLOR_MATRIX_BT601;
+ in_sdtv = in_info->colorimetry.matrix == GST_VIDEO_COLOR_MATRIX_BT601;
+ out_sdtv = out_info->colorimetry.matrix == GST_VIDEO_COLOR_MATRIX_BT601;
switch (GST_VIDEO_INFO_FORMAT (in_info)) {
case GST_VIDEO_FORMAT_ARGB:
diff --git a/gst/apetag/Makefile.in b/gst/apetag/Makefile.in
index f64cc3fde63d8560b6f0b593644be1eb5b9c9aa9..d74119941bfcab16423ebc53caeb17d5e79c779a 100644
--- a/gst/apetag/Makefile.in
+++ b/gst/apetag/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.11.4 from Makefile.am.
+# Makefile.in generated by automake 1.11.5 from Makefile.am.
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -60,6 +60,7 @@ am__aclocal_m4_deps = $(top_srcdir)/common/m4/as-ac-expand.m4 \
$(top_srcdir)/common/m4/as-auto-alt.m4 \
$(top_srcdir)/common/m4/as-compiler-flag.m4 \
$(top_srcdir)/common/m4/as-gcc-inline-assembly.m4 \
+ $(top_srcdir)/common/m4/as-libtool.m4 \
$(top_srcdir)/common/m4/as-objc.m4 \
$(top_srcdir)/common/m4/as-python.m4 \
$(top_srcdir)/common/m4/as-scrub-include.m4 \
@@ -255,6 +256,7 @@ GMSGFMT_015 = @GMSGFMT_015@
GREP = @GREP@
GSTPB_PLUGINS_DIR = @GSTPB_PLUGINS_DIR@
GSTPB_PREFIX = @GSTPB_PREFIX@
+GST_AGE = @GST_AGE@
GST_ALL_LDFLAGS = @GST_ALL_LDFLAGS@
GST_API_VERSION = @GST_API_VERSION@
GST_BASE_CFLAGS = @GST_BASE_CFLAGS@
@@ -264,9 +266,11 @@ GST_CHECK_CFLAGS = @GST_CHECK_CFLAGS@
GST_CHECK_LIBS = @GST_CHECK_LIBS@
GST_CONTROLLER_CFLAGS = @GST_CONTROLLER_CFLAGS@
GST_CONTROLLER_LIBS = @GST_CONTROLLER_LIBS@
+GST_CURRENT = @GST_CURRENT@
GST_CXXFLAGS = @GST_CXXFLAGS@
GST_LEVEL_DEFAULT = @GST_LEVEL_DEFAULT@
GST_LIBS = @GST_LIBS@
+GST_LIBVERSION = @GST_LIBVERSION@
GST_LICENSE = @GST_LICENSE@
GST_LT_LDFLAGS = @GST_LT_LDFLAGS@
GST_NET_CFLAGS = @GST_NET_CFLAGS@
@@ -284,6 +288,7 @@ GST_PLUGINS_NONPORTED = @GST_PLUGINS_NONPORTED@
GST_PLUGINS_SELECTED = @GST_PLUGINS_SELECTED@
GST_PLUGIN_LDFLAGS = @GST_PLUGIN_LDFLAGS@
GST_PREFIX = @GST_PREFIX@
+GST_REVISION = @GST_REVISION@
GST_TOOLS_DIR = @GST_TOOLS_DIR@
GTKDOC_CHECK = @GTKDOC_CHECK@
GTK_CFLAGS = @GTK_CFLAGS@
@@ -543,7 +548,7 @@ install-pluginLTLIBRARIES: $(plugin_LTLIBRARIES)
done; \
test -z "$$list2" || { \
echo " $(MKDIR_P) '$(DESTDIR)$(plugindir)'"; \
- $(MKDIR_P) '$(DESTDIR)$(plugindir)' || exit 1; \
+ $(MKDIR_P) "$(DESTDIR)$(plugindir)" || exit 1; \
echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 '$(DESTDIR)$(plugindir)'"; \
$(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 "$(DESTDIR)$(plugindir)"; \
}
diff --git a/gst/audiofx/Makefile.in b/gst/audiofx/Makefile.in
index 2f664cbf4ddf1776ef95c992e8b0544ee9e0ecdc..cedfbe220fb7c10dbb1511e442d4f4c722304312 100644
--- a/gst/audiofx/Makefile.in
+++ b/gst/audiofx/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.11.4 from Makefile.am.
+# Makefile.in generated by automake 1.11.5 from Makefile.am.
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -62,6 +62,7 @@ am__aclocal_m4_deps = $(top_srcdir)/common/m4/as-ac-expand.m4 \
$(top_srcdir)/common/m4/as-auto-alt.m4 \
$(top_srcdir)/common/m4/as-compiler-flag.m4 \
$(top_srcdir)/common/m4/as-gcc-inline-assembly.m4 \
+ $(top_srcdir)/common/m4/as-libtool.m4 \
$(top_srcdir)/common/m4/as-objc.m4 \
$(top_srcdir)/common/m4/as-python.m4 \
$(top_srcdir)/common/m4/as-scrub-include.m4 \
@@ -274,6 +275,7 @@ GMSGFMT_015 = @GMSGFMT_015@
GREP = @GREP@
GSTPB_PLUGINS_DIR = @GSTPB_PLUGINS_DIR@
GSTPB_PREFIX = @GSTPB_PREFIX@
+GST_AGE = @GST_AGE@
GST_ALL_LDFLAGS = @GST_ALL_LDFLAGS@
GST_API_VERSION = @GST_API_VERSION@
GST_BASE_CFLAGS = @GST_BASE_CFLAGS@
@@ -283,9 +285,11 @@ GST_CHECK_CFLAGS = @GST_CHECK_CFLAGS@
GST_CHECK_LIBS = @GST_CHECK_LIBS@
GST_CONTROLLER_CFLAGS = @GST_CONTROLLER_CFLAGS@
GST_CONTROLLER_LIBS = @GST_CONTROLLER_LIBS@
+GST_CURRENT = @GST_CURRENT@
GST_CXXFLAGS = @GST_CXXFLAGS@
GST_LEVEL_DEFAULT = @GST_LEVEL_DEFAULT@
GST_LIBS = @GST_LIBS@
+GST_LIBVERSION = @GST_LIBVERSION@
GST_LICENSE = @GST_LICENSE@
GST_LT_LDFLAGS = @GST_LT_LDFLAGS@
GST_NET_CFLAGS = @GST_NET_CFLAGS@
@@ -303,6 +307,7 @@ GST_PLUGINS_NONPORTED = @GST_PLUGINS_NONPORTED@
GST_PLUGINS_SELECTED = @GST_PLUGINS_SELECTED@
GST_PLUGIN_LDFLAGS = @GST_PLUGIN_LDFLAGS@
GST_PREFIX = @GST_PREFIX@
+GST_REVISION = @GST_REVISION@
GST_TOOLS_DIR = @GST_TOOLS_DIR@
GTKDOC_CHECK = @GTKDOC_CHECK@
GTK_CFLAGS = @GTK_CFLAGS@
@@ -598,7 +603,7 @@ install-pluginLTLIBRARIES: $(plugin_LTLIBRARIES)
done; \
test -z "$$list2" || { \
echo " $(MKDIR_P) '$(DESTDIR)$(plugindir)'"; \
- $(MKDIR_P) '$(DESTDIR)$(plugindir)' || exit 1; \
+ $(MKDIR_P) "$(DESTDIR)$(plugindir)" || exit 1; \
echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 '$(DESTDIR)$(plugindir)'"; \
$(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 "$(DESTDIR)$(plugindir)"; \
}
diff --git a/gst/audiofx/audiofxbasefirfilter.c b/gst/audiofx/audiofxbasefirfilter.c
index d19af6b8a65b715a1fd3d7d7ff4733fa1b1e27f8..aaa6f0685ecc2ccf9893b95c2c3addc15f98b674 100644
--- a/gst/audiofx/audiofxbasefirfilter.c
+++ b/gst/audiofx/audiofxbasefirfilter.c
@@ -156,7 +156,7 @@ process_##channels##_##width (GstAudioFXBaseFIRFilter * self, const g##ctype * s
if (self->buffer_fill > kernel_length) \
self->buffer_fill = kernel_length; \
\
- return input_samples / channels; \
+ return input_samples; \
} G_STMT_END
DEFINE_PROCESS_FUNC (32, float);
diff --git a/gst/audioparsers/Makefile.in b/gst/audioparsers/Makefile.in
index a3f821e03f0c0594e951984fc828ed8ad6b0afc8..e7d5bbd380fa0f9e0c7490777a1e6cd445930482 100644
--- a/gst/audioparsers/Makefile.in
+++ b/gst/audioparsers/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.11.4 from Makefile.am.
+# Makefile.in generated by automake 1.11.5 from Makefile.am.
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -60,6 +60,7 @@ am__aclocal_m4_deps = $(top_srcdir)/common/m4/as-ac-expand.m4 \
$(top_srcdir)/common/m4/as-auto-alt.m4 \
$(top_srcdir)/common/m4/as-compiler-flag.m4 \
$(top_srcdir)/common/m4/as-gcc-inline-assembly.m4 \
+ $(top_srcdir)/common/m4/as-libtool.m4 \
$(top_srcdir)/common/m4/as-objc.m4 \
$(top_srcdir)/common/m4/as-python.m4 \
$(top_srcdir)/common/m4/as-scrub-include.m4 \
@@ -263,6 +264,7 @@ GMSGFMT_015 = @GMSGFMT_015@
GREP = @GREP@
GSTPB_PLUGINS_DIR = @GSTPB_PLUGINS_DIR@
GSTPB_PREFIX = @GSTPB_PREFIX@
+GST_AGE = @GST_AGE@
GST_ALL_LDFLAGS = @GST_ALL_LDFLAGS@
GST_API_VERSION = @GST_API_VERSION@
GST_BASE_CFLAGS = @GST_BASE_CFLAGS@
@@ -272,9 +274,11 @@ GST_CHECK_CFLAGS = @GST_CHECK_CFLAGS@
GST_CHECK_LIBS = @GST_CHECK_LIBS@
GST_CONTROLLER_CFLAGS = @GST_CONTROLLER_CFLAGS@
GST_CONTROLLER_LIBS = @GST_CONTROLLER_LIBS@
+GST_CURRENT = @GST_CURRENT@
GST_CXXFLAGS = @GST_CXXFLAGS@
GST_LEVEL_DEFAULT = @GST_LEVEL_DEFAULT@
GST_LIBS = @GST_LIBS@
+GST_LIBVERSION = @GST_LIBVERSION@
GST_LICENSE = @GST_LICENSE@
GST_LT_LDFLAGS = @GST_LT_LDFLAGS@
GST_NET_CFLAGS = @GST_NET_CFLAGS@
@@ -292,6 +296,7 @@ GST_PLUGINS_NONPORTED = @GST_PLUGINS_NONPORTED@
GST_PLUGINS_SELECTED = @GST_PLUGINS_SELECTED@
GST_PLUGIN_LDFLAGS = @GST_PLUGIN_LDFLAGS@
GST_PREFIX = @GST_PREFIX@
+GST_REVISION = @GST_REVISION@
GST_TOOLS_DIR = @GST_TOOLS_DIR@
GTKDOC_CHECK = @GTKDOC_CHECK@
GTK_CFLAGS = @GTK_CFLAGS@
@@ -554,7 +559,7 @@ install-pluginLTLIBRARIES: $(plugin_LTLIBRARIES)
done; \
test -z "$$list2" || { \
echo " $(MKDIR_P) '$(DESTDIR)$(plugindir)'"; \
- $(MKDIR_P) '$(DESTDIR)$(plugindir)' || exit 1; \
+ $(MKDIR_P) "$(DESTDIR)$(plugindir)" || exit 1; \
echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 '$(DESTDIR)$(plugindir)'"; \
$(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 "$(DESTDIR)$(plugindir)"; \
}
diff --git a/gst/audioparsers/gstaacparse.c b/gst/audioparsers/gstaacparse.c
index 912380781a52c9e5633469198d08c0f41c1630af..b0820768ccb3c13ee6c7d5b5defe9a735f08cbd5 100644
--- a/gst/audioparsers/gstaacparse.c
+++ b/gst/audioparsers/gstaacparse.c
@@ -478,7 +478,8 @@ gst_aac_parse_read_loas_config (GstAacParse * aacparse, const guint8 * data,
gst_bit_reader_init (&br, data, avail);
/* skip sync word (11 bits) and size (13 bits) */
- gst_bit_reader_skip (&br, 11 + 13);
+ if (!gst_bit_reader_skip (&br, 11 + 13))
+ return FALSE;
/* First bit is "use last config" */
if (!gst_bit_reader_get_bits_uint8 (&br, &u8, 1))
@@ -547,7 +548,8 @@ gst_aac_parse_read_loas_config (GstAacParse * aacparse, const guint8 * data,
sample_rate, channels, &bits))
return FALSE;
asc_len -= bits;
- gst_bit_reader_skip (&br, asc_len);
+ if (!gst_bit_reader_skip (&br, asc_len))
+ return FALSE;
}
}
}
diff --git a/gst/audioparsers/gstflacparse.c b/gst/audioparsers/gstflacparse.c
index 026e760b52245993e9e2b660bb5f2edbf7df36b2..5ca2ca1804eb7454b99213cf2102fe4e0b9a0d79 100644
--- a/gst/audioparsers/gstflacparse.c
+++ b/gst/audioparsers/gstflacparse.c
@@ -865,7 +865,8 @@ gst_flac_parse_handle_streaminfo (GstFlacParse * flacparse, GstBuffer * buffer)
}
/* Skip metadata block header */
- gst_bit_reader_skip (&reader, 32);
+ if (!gst_bit_reader_skip (&reader, 32))
+ goto error;
if (!gst_bit_reader_get_bits_uint16 (&reader, &flacparse->min_blocksize, 16))
goto error;
diff --git a/gst/audioparsers/gstwavpackparse.c b/gst/audioparsers/gstwavpackparse.c
index 211e04c33faa4e433e9d192368d30a7603b09c8f..c3bcb68068264b320e05982b0068f94cffe9c83e 100644
--- a/gst/audioparsers/gstwavpackparse.c
+++ b/gst/audioparsers/gstwavpackparse.c
@@ -385,6 +385,7 @@ gst_wavpack_parse_frame_header (GstWavpackParse * parse, GstBuffer * buf,
GstByteReader br;
WavpackHeader wph = { {0,}, 0, };
GstMapInfo map;
+ gboolean hdl = TRUE;
g_return_val_if_fail (gst_buffer_get_size (buf) >=
skip + sizeof (WavpackHeader), FALSE);
@@ -396,15 +397,18 @@ gst_wavpack_parse_frame_header (GstWavpackParse * parse, GstBuffer * buf,
gst_byte_reader_skip_unchecked (&br, skip + 4);
/* read */
- gst_byte_reader_get_uint32_le (&br, &wph.ckSize);
- gst_byte_reader_get_uint16_le (&br, &wph.version);
- gst_byte_reader_get_uint8 (&br, &wph.track_no);
- gst_byte_reader_get_uint8 (&br, &wph.index_no);
- gst_byte_reader_get_uint32_le (&br, &wph.total_samples);
- gst_byte_reader_get_uint32_le (&br, &wph.block_index);
- gst_byte_reader_get_uint32_le (&br, &wph.block_samples);
- gst_byte_reader_get_uint32_le (&br, &wph.flags);
- gst_byte_reader_get_uint32_le (&br, &wph.crc);
+ hdl &= gst_byte_reader_get_uint32_le (&br, &wph.ckSize);
+ hdl &= gst_byte_reader_get_uint16_le (&br, &wph.version);
+ hdl &= gst_byte_reader_get_uint8 (&br, &wph.track_no);
+ hdl &= gst_byte_reader_get_uint8 (&br, &wph.index_no);
+ hdl &= gst_byte_reader_get_uint32_le (&br, &wph.total_samples);
+ hdl &= gst_byte_reader_get_uint32_le (&br, &wph.block_index);
+ hdl &= gst_byte_reader_get_uint32_le (&br, &wph.block_samples);
+ hdl &= gst_byte_reader_get_uint32_le (&br, &wph.flags);
+ hdl &= gst_byte_reader_get_uint32_le (&br, &wph.crc);
+
+ if (!hdl)
+ GST_WARNING_OBJECT (parse, "Error reading header");
/* dump */
GST_LOG_OBJECT (parse, "size %d", wph.ckSize);
diff --git a/gst/auparse/Makefile.in b/gst/auparse/Makefile.in
index c6ffc95187854366d427af65df33aa07fb3128e1..ae0820eae7a39978d0e441125ecbd908ddbcf924 100644
--- a/gst/auparse/Makefile.in
+++ b/gst/auparse/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.11.4 from Makefile.am.
+# Makefile.in generated by automake 1.11.5 from Makefile.am.
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -60,6 +60,7 @@ am__aclocal_m4_deps = $(top_srcdir)/common/m4/as-ac-expand.m4 \
$(top_srcdir)/common/m4/as-auto-alt.m4 \
$(top_srcdir)/common/m4/as-compiler-flag.m4 \
$(top_srcdir)/common/m4/as-gcc-inline-assembly.m4 \
+ $(top_srcdir)/common/m4/as-libtool.m4 \
$(top_srcdir)/common/m4/as-objc.m4 \
$(top_srcdir)/common/m4/as-python.m4 \
$(top_srcdir)/common/m4/as-scrub-include.m4 \
@@ -255,6 +256,7 @@ GMSGFMT_015 = @GMSGFMT_015@
GREP = @GREP@
GSTPB_PLUGINS_DIR = @GSTPB_PLUGINS_DIR@
GSTPB_PREFIX = @GSTPB_PREFIX@
+GST_AGE = @GST_AGE@
GST_ALL_LDFLAGS = @GST_ALL_LDFLAGS@
GST_API_VERSION = @GST_API_VERSION@
GST_BASE_CFLAGS = @GST_BASE_CFLAGS@
@@ -264,9 +266,11 @@ GST_CHECK_CFLAGS = @GST_CHECK_CFLAGS@
GST_CHECK_LIBS = @GST_CHECK_LIBS@
GST_CONTROLLER_CFLAGS = @GST_CONTROLLER_CFLAGS@
GST_CONTROLLER_LIBS = @GST_CONTROLLER_LIBS@
+GST_CURRENT = @GST_CURRENT@
GST_CXXFLAGS = @GST_CXXFLAGS@
GST_LEVEL_DEFAULT = @GST_LEVEL_DEFAULT@
GST_LIBS = @GST_LIBS@
+GST_LIBVERSION = @GST_LIBVERSION@
GST_LICENSE = @GST_LICENSE@
GST_LT_LDFLAGS = @GST_LT_LDFLAGS@
GST_NET_CFLAGS = @GST_NET_CFLAGS@
@@ -284,6 +288,7 @@ GST_PLUGINS_NONPORTED = @GST_PLUGINS_NONPORTED@
GST_PLUGINS_SELECTED = @GST_PLUGINS_SELECTED@
GST_PLUGIN_LDFLAGS = @GST_PLUGIN_LDFLAGS@
GST_PREFIX = @GST_PREFIX@
+GST_REVISION = @GST_REVISION@
GST_TOOLS_DIR = @GST_TOOLS_DIR@
GTKDOC_CHECK = @GTKDOC_CHECK@
GTK_CFLAGS = @GTK_CFLAGS@
@@ -534,7 +539,7 @@ install-pluginLTLIBRARIES: $(plugin_LTLIBRARIES)
done; \
test -z "$$list2" || { \
echo " $(MKDIR_P) '$(DESTDIR)$(plugindir)'"; \
- $(MKDIR_P) '$(DESTDIR)$(plugindir)' || exit 1; \
+ $(MKDIR_P) "$(DESTDIR)$(plugindir)" || exit 1; \
echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 '$(DESTDIR)$(plugindir)'"; \
$(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 "$(DESTDIR)$(plugindir)"; \
}
diff --git a/gst/autodetect/Makefile.in b/gst/autodetect/Makefile.in
index 63d7094ee43cd4a91644ca6e4a11824fccc36535..b3ab2e05214b54c7fa12da2a666d7e36a919ce37 100644
--- a/gst/autodetect/Makefile.in
+++ b/gst/autodetect/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.11.4 from Makefile.am.
+# Makefile.in generated by automake 1.11.5 from Makefile.am.
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -60,6 +60,7 @@ am__aclocal_m4_deps = $(top_srcdir)/common/m4/as-ac-expand.m4 \
$(top_srcdir)/common/m4/as-auto-alt.m4 \
$(top_srcdir)/common/m4/as-compiler-flag.m4 \
$(top_srcdir)/common/m4/as-gcc-inline-assembly.m4 \
+ $(top_srcdir)/common/m4/as-libtool.m4 \
$(top_srcdir)/common/m4/as-objc.m4 \
$(top_srcdir)/common/m4/as-python.m4 \
$(top_srcdir)/common/m4/as-scrub-include.m4 \
@@ -259,6 +260,7 @@ GMSGFMT_015 = @GMSGFMT_015@
GREP = @GREP@
GSTPB_PLUGINS_DIR = @GSTPB_PLUGINS_DIR@
GSTPB_PREFIX = @GSTPB_PREFIX@
+GST_AGE = @GST_AGE@
GST_ALL_LDFLAGS = @GST_ALL_LDFLAGS@
GST_API_VERSION = @GST_API_VERSION@
GST_BASE_CFLAGS = @GST_BASE_CFLAGS@
@@ -268,9 +270,11 @@ GST_CHECK_CFLAGS = @GST_CHECK_CFLAGS@
GST_CHECK_LIBS = @GST_CHECK_LIBS@
GST_CONTROLLER_CFLAGS = @GST_CONTROLLER_CFLAGS@
GST_CONTROLLER_LIBS = @GST_CONTROLLER_LIBS@
+GST_CURRENT = @GST_CURRENT@
GST_CXXFLAGS = @GST_CXXFLAGS@
GST_LEVEL_DEFAULT = @GST_LEVEL_DEFAULT@
GST_LIBS = @GST_LIBS@
+GST_LIBVERSION = @GST_LIBVERSION@
GST_LICENSE = @GST_LICENSE@
GST_LT_LDFLAGS = @GST_LT_LDFLAGS@
GST_NET_CFLAGS = @GST_NET_CFLAGS@
@@ -288,6 +292,7 @@ GST_PLUGINS_NONPORTED = @GST_PLUGINS_NONPORTED@
GST_PLUGINS_SELECTED = @GST_PLUGINS_SELECTED@
GST_PLUGIN_LDFLAGS = @GST_PLUGIN_LDFLAGS@
GST_PREFIX = @GST_PREFIX@
+GST_REVISION = @GST_REVISION@
GST_TOOLS_DIR = @GST_TOOLS_DIR@
GTKDOC_CHECK = @GTKDOC_CHECK@
GTK_CFLAGS = @GTK_CFLAGS@
@@ -550,7 +555,7 @@ install-pluginLTLIBRARIES: $(plugin_LTLIBRARIES)
done; \
test -z "$$list2" || { \
echo " $(MKDIR_P) '$(DESTDIR)$(plugindir)'"; \
- $(MKDIR_P) '$(DESTDIR)$(plugindir)' || exit 1; \
+ $(MKDIR_P) "$(DESTDIR)$(plugindir)" || exit 1; \
echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 '$(DESTDIR)$(plugindir)'"; \
$(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 "$(DESTDIR)$(plugindir)"; \
}
diff --git a/gst/avi/Makefile.in b/gst/avi/Makefile.in
index c82f564e47b34955dee3c49836987d0292361b70..811fe48e79fc43feeed5fa55307e15fe46ab5ec9 100644
--- a/gst/avi/Makefile.in
+++ b/gst/avi/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.11.4 from Makefile.am.
+# Makefile.in generated by automake 1.11.5 from Makefile.am.
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -60,6 +60,7 @@ am__aclocal_m4_deps = $(top_srcdir)/common/m4/as-ac-expand.m4 \
$(top_srcdir)/common/m4/as-auto-alt.m4 \
$(top_srcdir)/common/m4/as-compiler-flag.m4 \
$(top_srcdir)/common/m4/as-gcc-inline-assembly.m4 \
+ $(top_srcdir)/common/m4/as-libtool.m4 \
$(top_srcdir)/common/m4/as-objc.m4 \
$(top_srcdir)/common/m4/as-python.m4 \
$(top_srcdir)/common/m4/as-scrub-include.m4 \
@@ -257,6 +258,7 @@ GMSGFMT_015 = @GMSGFMT_015@
GREP = @GREP@
GSTPB_PLUGINS_DIR = @GSTPB_PLUGINS_DIR@
GSTPB_PREFIX = @GSTPB_PREFIX@
+GST_AGE = @GST_AGE@
GST_ALL_LDFLAGS = @GST_ALL_LDFLAGS@
GST_API_VERSION = @GST_API_VERSION@
GST_BASE_CFLAGS = @GST_BASE_CFLAGS@
@@ -266,9 +268,11 @@ GST_CHECK_CFLAGS = @GST_CHECK_CFLAGS@
GST_CHECK_LIBS = @GST_CHECK_LIBS@
GST_CONTROLLER_CFLAGS = @GST_CONTROLLER_CFLAGS@
GST_CONTROLLER_LIBS = @GST_CONTROLLER_LIBS@
+GST_CURRENT = @GST_CURRENT@
GST_CXXFLAGS = @GST_CXXFLAGS@
GST_LEVEL_DEFAULT = @GST_LEVEL_DEFAULT@
GST_LIBS = @GST_LIBS@
+GST_LIBVERSION = @GST_LIBVERSION@
GST_LICENSE = @GST_LICENSE@
GST_LT_LDFLAGS = @GST_LT_LDFLAGS@
GST_NET_CFLAGS = @GST_NET_CFLAGS@
@@ -286,6 +290,7 @@ GST_PLUGINS_NONPORTED = @GST_PLUGINS_NONPORTED@
GST_PLUGINS_SELECTED = @GST_PLUGINS_SELECTED@
GST_PLUGIN_LDFLAGS = @GST_PLUGIN_LDFLAGS@
GST_PREFIX = @GST_PREFIX@
+GST_REVISION = @GST_REVISION@
GST_TOOLS_DIR = @GST_TOOLS_DIR@
GTKDOC_CHECK = @GTKDOC_CHECK@
GTK_CFLAGS = @GTK_CFLAGS@
@@ -555,7 +560,7 @@ install-pluginLTLIBRARIES: $(plugin_LTLIBRARIES)
done; \
test -z "$$list2" || { \
echo " $(MKDIR_P) '$(DESTDIR)$(plugindir)'"; \
- $(MKDIR_P) '$(DESTDIR)$(plugindir)' || exit 1; \
+ $(MKDIR_P) "$(DESTDIR)$(plugindir)" || exit 1; \
echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 '$(DESTDIR)$(plugindir)'"; \
$(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 "$(DESTDIR)$(plugindir)"; \
}
diff --git a/gst/avi/gstavidemux.c b/gst/avi/gstavidemux.c
index 578565bb9f22c65d1e0a7e0ddd2e3a0dd26f37de..55589fd53a8a19a1b1b94afa393ba1f463c9729f 100644
--- a/gst/avi/gstavidemux.c
+++ b/gst/avi/gstavidemux.c
@@ -72,6 +72,13 @@ static GstStaticPadTemplate sink_templ = GST_STATIC_PAD_TEMPLATE ("sink",
GST_STATIC_CAPS ("video/x-msvideo")
);
+#ifndef GST_DISABLE_GST_DEBUG
+static const char *const snap_types[2][2] = {
+ {"any", "before"},
+ {"after", "nearest"},
+};
+#endif
+
static void gst_avi_demux_finalize (GObject * object);
static void gst_avi_demux_reset (GstAviDemux * avi);
@@ -3979,15 +3986,18 @@ static gboolean
gst_avi_demux_do_seek (GstAviDemux * avi, GstSegment * segment)
{
GstClockTime seek_time;
- gboolean keyframe;
+ gboolean keyframe, before, after;
guint i, index;
GstAviStream *stream;
seek_time = segment->position;
keyframe = ! !(segment->flags & GST_SEEK_FLAG_KEY_UNIT);
+ before = ! !(segment->flags & GST_SEEK_FLAG_SNAP_BEFORE);
+ after = ! !(segment->flags & GST_SEEK_FLAG_SNAP_AFTER);
GST_DEBUG_OBJECT (avi, "seek to: %" GST_TIME_FORMAT
- " keyframe seeking:%d", GST_TIME_ARGS (seek_time), keyframe);
+ " keyframe seeking:%d, %s", GST_TIME_ARGS (seek_time), keyframe,
+ snap_types[before ? 1 : 0][after ? 1 : 0]);
/* FIXME, this code assumes the main stream with keyframes is stream 0,
* which is mostly correct... */
@@ -3999,11 +4009,25 @@ gst_avi_demux_do_seek (GstAviDemux * avi, GstSegment * segment)
/* check if we are already on a keyframe */
if (!ENTRY_IS_KEYFRAME (&stream->index[index])) {
- GST_DEBUG_OBJECT (avi, "not keyframe, searching back");
- /* now go to the previous keyframe, this is where we should start
- * decoding from. */
- index = gst_avi_demux_index_prev (avi, stream, index, TRUE);
- GST_DEBUG_OBJECT (avi, "previous keyframe at %u", index);
+ gboolean next;
+
+ next = after && !before;
+ if (segment->rate < 0)
+ next = !next;
+
+ if (next) {
+ GST_DEBUG_OBJECT (avi, "not keyframe, searching forward");
+ /* now go to the next keyframe, this is where we should start
+ * decoding from. */
+ index = gst_avi_demux_index_next (avi, stream, index, TRUE);
+ GST_DEBUG_OBJECT (avi, "next keyframe at %u", index);
+ } else {
+ GST_DEBUG_OBJECT (avi, "not keyframe, searching back");
+ /* now go to the previous keyframe, this is where we should start
+ * decoding from. */
+ index = gst_avi_demux_index_prev (avi, stream, index, TRUE);
+ GST_DEBUG_OBJECT (avi, "previous keyframe at %u", index);
+ }
}
/* move the main stream to this position */
@@ -4184,7 +4208,7 @@ avi_demux_handle_seek_push (GstAviDemux * avi, GstPad * pad, GstEvent * event)
GstSeekFlags flags;
GstSeekType cur_type = GST_SEEK_TYPE_NONE, stop_type;
gint64 cur, stop;
- gboolean keyframe;
+ gboolean keyframe, before, after;
GstAviStream *stream;
guint index;
guint n, str_num;
@@ -4226,11 +4250,13 @@ avi_demux_handle_seek_push (GstAviDemux * avi, GstPad * pad, GstEvent * event)
keyframe = ! !(flags & GST_SEEK_FLAG_KEY_UNIT);
cur = seeksegment.position;
+ before = ! !(flags & GST_SEEK_FLAG_SNAP_BEFORE);
+ after = ! !(flags & GST_SEEK_FLAG_SNAP_AFTER);
GST_DEBUG_OBJECT (avi,
"Seek requested: ts %" GST_TIME_FORMAT " stop %" GST_TIME_FORMAT
- ", kf %u, rate %lf", GST_TIME_ARGS (cur), GST_TIME_ARGS (stop), keyframe,
- rate);
+ ", kf %u, %s, rate %lf", GST_TIME_ARGS (cur), GST_TIME_ARGS (stop),
+ keyframe, snap_types[before ? 1 : 0][after ? 1 : 0], rate);
if (rate < 0) {
GST_DEBUG_OBJECT (avi, "negative rate seek not supported in push mode");
@@ -4249,11 +4275,25 @@ avi_demux_handle_seek_push (GstAviDemux * avi, GstPad * pad, GstEvent * event)
/* check if we are already on a keyframe */
if (!ENTRY_IS_KEYFRAME (&stream->index[index])) {
- GST_DEBUG_OBJECT (avi, "Entry is not a keyframe - searching back");
- /* now go to the previous keyframe, this is where we should start
- * decoding from. */
- index = gst_avi_demux_index_prev (avi, stream, index, TRUE);
- GST_DEBUG_OBJECT (avi, "Found previous keyframe at %u", index);
+ gboolean next;
+
+ next = after && !before;
+ if (seeksegment.rate < 0)
+ next = !next;
+
+ if (next) {
+ GST_DEBUG_OBJECT (avi, "Entry is not a keyframe - searching forward");
+ /* now go to the next keyframe, this is where we should start
+ * decoding from. */
+ index = gst_avi_demux_index_next (avi, stream, index, TRUE);
+ GST_DEBUG_OBJECT (avi, "Found previous keyframe at %u", index);
+ } else {
+ GST_DEBUG_OBJECT (avi, "Entry is not a keyframe - searching back");
+ /* now go to the previous keyframe, this is where we should start
+ * decoding from. */
+ index = gst_avi_demux_index_prev (avi, stream, index, TRUE);
+ GST_DEBUG_OBJECT (avi, "Found previous keyframe at %u", index);
+ }
}
gst_avi_demux_get_buffer_info (avi, stream, index,
@@ -4285,11 +4325,19 @@ avi_demux_handle_seek_push (GstAviDemux * avi, GstPad * pad, GstEvent * event)
/* check if we are already on a keyframe */
if (!ENTRY_IS_KEYFRAME (&str->index[idx])) {
- GST_DEBUG_OBJECT (avi, "Entry is not a keyframe - searching back");
- /* now go to the previous keyframe, this is where we should start
- * decoding from. */
- idx = gst_avi_demux_index_prev (avi, str, idx, TRUE);
- GST_DEBUG_OBJECT (avi, "Found previous keyframe at %u", idx);
+ if (after && !before) {
+ GST_DEBUG_OBJECT (avi, "Entry is not a keyframe - searching forward");
+ /* now go to the next keyframe, this is where we should start
+ * decoding from. */
+ idx = gst_avi_demux_index_next (avi, str, idx, TRUE);
+ GST_DEBUG_OBJECT (avi, "Found next keyframe at %u", idx);
+ } else {
+ GST_DEBUG_OBJECT (avi, "Entry is not a keyframe - searching back");
+ /* now go to the previous keyframe, this is where we should start
+ * decoding from. */
+ idx = gst_avi_demux_index_prev (avi, str, idx, TRUE);
+ GST_DEBUG_OBJECT (avi, "Found previous keyframe at %u", idx);
+ }
}
gst_avi_demux_get_buffer_info (avi, str, idx,
diff --git a/gst/avi/gstavimux.c b/gst/avi/gstavimux.c
index 50948bbe6cbc57bb288f3f323fc53515fa683507..573de479589861fd28f1929af0fa8782d83d998c 100644
--- a/gst/avi/gstavimux.c
+++ b/gst/avi/gstavimux.c
@@ -190,10 +190,10 @@ static GstStaticPadTemplate audio_sink_factory =
static void gst_avi_mux_pad_reset (GstAviPad * avipad, gboolean free);
-static GstFlowReturn gst_avi_mux_collect_pads (GstCollectPads2 * pads,
+static GstFlowReturn gst_avi_mux_collect_pads (GstCollectPads * pads,
GstAviMux * avimux);
-static gboolean gst_avi_mux_handle_event (GstCollectPads2 * pad,
- GstCollectData2 * data, GstEvent * event, gpointer user_data);
+static gboolean gst_avi_mux_handle_event (GstCollectPads * pad,
+ GstCollectData * data, GstEvent * event, gpointer user_data);
static GstPad *gst_avi_mux_request_new_pad (GstElement * element,
GstPadTemplate * templ, const gchar * name, const GstCaps * caps);
static void gst_avi_mux_release_pad (GstElement * element, GstPad * pad);
@@ -378,12 +378,12 @@ gst_avi_mux_init (GstAviMux * avimux)
/* property */
avimux->enable_large_avi = DEFAULT_BIGFILE;
- avimux->collect = gst_collect_pads2_new ();
- gst_collect_pads2_set_function (avimux->collect,
- (GstCollectPads2Function) (GST_DEBUG_FUNCPTR (gst_avi_mux_collect_pads)),
+ avimux->collect = gst_collect_pads_new ();
+ gst_collect_pads_set_function (avimux->collect,
+ (GstCollectPadsFunction) (GST_DEBUG_FUNCPTR (gst_avi_mux_collect_pads)),
avimux);
- gst_collect_pads2_set_event_function (avimux->collect,
- (GstCollectPads2EventFunction) (GST_DEBUG_FUNCPTR
+ gst_collect_pads_set_event_function (avimux->collect,
+ (GstCollectPadsEventFunction) (GST_DEBUG_FUNCPTR
(gst_avi_mux_handle_event)), avimux);
/* set to clean state */
@@ -979,7 +979,7 @@ gst_avi_mux_request_new_pad (GstElement * element,
g_free (name);
- avipad->collect = gst_collect_pads2_add_pad (avimux->collect,
+ avipad->collect = gst_collect_pads_add_pad (avimux->collect,
newpad, sizeof (GstAviCollectData));
((GstAviCollectData *) (avipad->collect))->avipad = avipad;
@@ -1034,7 +1034,7 @@ gst_avi_mux_release_pad (GstElement * element, GstPad * pad)
* as it also represent number of streams present */
avipad->collect = NULL;
GST_DEBUG_OBJECT (avimux, "removed pad '%s'", GST_PAD_NAME (pad));
- gst_collect_pads2_remove_pad (avimux->collect, pad);
+ gst_collect_pads_remove_pad (avimux->collect, pad);
gst_element_remove_pad (element, pad);
/* if not started yet, we can remove any sign this pad ever existed */
/* in this case _start will take care of the real pad count */
@@ -1056,15 +1056,16 @@ static inline guint
gst_avi_mux_start_chunk (GstByteWriter * bw, const gchar * tag, guint32 fourcc)
{
guint chunk_offset;
+ gboolean hdl = TRUE;
if (tag)
- gst_byte_writer_put_data (bw, (const guint8 *) tag, 4);
+ hdl &= gst_byte_writer_put_data (bw, (const guint8 *) tag, 4);
else
- gst_byte_writer_put_uint32_le (bw, fourcc);
+ hdl &= gst_byte_writer_put_uint32_le (bw, fourcc);
chunk_offset = gst_byte_writer_get_pos (bw);
/* real chunk size comes later */
- gst_byte_writer_put_uint32_le (bw, 0);
+ hdl &= gst_byte_writer_put_uint32_le (bw, 0);
return chunk_offset;
}
@@ -1073,16 +1074,17 @@ static inline void
gst_avi_mux_end_chunk (GstByteWriter * bw, guint chunk_offset)
{
guint size;
+ gboolean hdl = TRUE;
size = gst_byte_writer_get_pos (bw);
gst_byte_writer_set_pos (bw, chunk_offset);
- gst_byte_writer_put_uint32_le (bw, size - chunk_offset - 4);
+ hdl &= gst_byte_writer_put_uint32_le (bw, size - chunk_offset - 4);
gst_byte_writer_set_pos (bw, size);
/* arrange for even padding */
if (size & 1)
- gst_byte_writer_put_uint8 (bw, 0);
+ hdl &= gst_byte_writer_put_uint8 (bw, 0);
}
/* maybe some of these functions should be moved to riff.h? */
@@ -1130,12 +1132,13 @@ static GstBuffer *
gst_avi_mux_riff_get_avi_header (GstAviMux * avimux)
{
const GstTagList *tags;
- GstBuffer *buffer;
+ GstBuffer *buffer = NULL;
gint size = 0;
GstByteWriter bw;
GSList *node;
guint avih, riff, hdrl;
GstMapInfo map;
+ gboolean hdl = TRUE;
GST_DEBUG_OBJECT (avimux, "creating avi header, data_size %u, idx_size %u",
avimux->data_size, avimux->idx_size);
@@ -1154,26 +1157,26 @@ gst_avi_mux_riff_get_avi_header (GstAviMux * avimux)
/* avi header metadata */
riff = gst_avi_mux_start_chunk (&bw, "RIFF", 0);
- gst_byte_writer_put_data (&bw, (guint8 *) "AVI ", 4);
+ hdl &= gst_byte_writer_put_data (&bw, (guint8 *) "AVI ", 4);
hdrl = gst_avi_mux_start_chunk (&bw, "LIST", 0);
- gst_byte_writer_put_data (&bw, (guint8 *) "hdrl", 4);
+ hdl &= gst_byte_writer_put_data (&bw, (guint8 *) "hdrl", 4);
avih = gst_avi_mux_start_chunk (&bw, "avih", 0);
/* the AVI header itself */
- gst_byte_writer_put_uint32_le (&bw, avimux->avi_hdr.us_frame);
- gst_byte_writer_put_uint32_le (&bw, avimux->avi_hdr.max_bps);
- gst_byte_writer_put_uint32_le (&bw, avimux->avi_hdr.pad_gran);
- gst_byte_writer_put_uint32_le (&bw, avimux->avi_hdr.flags);
- gst_byte_writer_put_uint32_le (&bw, avimux->avi_hdr.tot_frames);
- gst_byte_writer_put_uint32_le (&bw, avimux->avi_hdr.init_frames);
- gst_byte_writer_put_uint32_le (&bw, avimux->avi_hdr.streams);
- gst_byte_writer_put_uint32_le (&bw, avimux->avi_hdr.bufsize);
- gst_byte_writer_put_uint32_le (&bw, avimux->avi_hdr.width);
- gst_byte_writer_put_uint32_le (&bw, avimux->avi_hdr.height);
- gst_byte_writer_put_uint32_le (&bw, avimux->avi_hdr.scale);
- gst_byte_writer_put_uint32_le (&bw, avimux->avi_hdr.rate);
- gst_byte_writer_put_uint32_le (&bw, avimux->avi_hdr.start);
- gst_byte_writer_put_uint32_le (&bw, avimux->avi_hdr.length);
+ hdl &= gst_byte_writer_put_uint32_le (&bw, avimux->avi_hdr.us_frame);
+ hdl &= gst_byte_writer_put_uint32_le (&bw, avimux->avi_hdr.max_bps);
+ hdl &= gst_byte_writer_put_uint32_le (&bw, avimux->avi_hdr.pad_gran);
+ hdl &= gst_byte_writer_put_uint32_le (&bw, avimux->avi_hdr.flags);
+ hdl &= gst_byte_writer_put_uint32_le (&bw, avimux->avi_hdr.tot_frames);
+ hdl &= gst_byte_writer_put_uint32_le (&bw, avimux->avi_hdr.init_frames);
+ hdl &= gst_byte_writer_put_uint32_le (&bw, avimux->avi_hdr.streams);
+ hdl &= gst_byte_writer_put_uint32_le (&bw, avimux->avi_hdr.bufsize);
+ hdl &= gst_byte_writer_put_uint32_le (&bw, avimux->avi_hdr.width);
+ hdl &= gst_byte_writer_put_uint32_le (&bw, avimux->avi_hdr.height);
+ hdl &= gst_byte_writer_put_uint32_le (&bw, avimux->avi_hdr.scale);
+ hdl &= gst_byte_writer_put_uint32_le (&bw, avimux->avi_hdr.rate);
+ hdl &= gst_byte_writer_put_uint32_le (&bw, avimux->avi_hdr.start);
+ hdl &= gst_byte_writer_put_uint32_le (&bw, avimux->avi_hdr.length);
gst_avi_mux_end_chunk (&bw, avih);
/* stream data */
@@ -1187,26 +1190,26 @@ gst_avi_mux_riff_get_avi_header (GstAviMux * avimux)
/* stream list metadata */
strl = gst_avi_mux_start_chunk (&bw, "LIST", 0);
- gst_byte_writer_put_data (&bw, (guint8 *) "strl", 4);
+ hdl &= gst_byte_writer_put_data (&bw, (guint8 *) "strl", 4);
/* generic header */
strh = gst_avi_mux_start_chunk (&bw, "strh", 0);
- gst_byte_writer_put_uint32_le (&bw, avipad->hdr.type);
- gst_byte_writer_put_uint32_le (&bw, avipad->hdr.fcc_handler);
- gst_byte_writer_put_uint32_le (&bw, avipad->hdr.flags);
- gst_byte_writer_put_uint32_le (&bw, avipad->hdr.priority);
- gst_byte_writer_put_uint32_le (&bw, avipad->hdr.init_frames);
- gst_byte_writer_put_uint32_le (&bw, avipad->hdr.scale);
- gst_byte_writer_put_uint32_le (&bw, avipad->hdr.rate);
- gst_byte_writer_put_uint32_le (&bw, avipad->hdr.start);
- gst_byte_writer_put_uint32_le (&bw, avipad->hdr.length);
- gst_byte_writer_put_uint32_le (&bw, avipad->hdr.bufsize);
- gst_byte_writer_put_uint32_le (&bw, avipad->hdr.quality);
- gst_byte_writer_put_uint32_le (&bw, avipad->hdr.samplesize);
- gst_byte_writer_put_uint16_le (&bw, 0);
- gst_byte_writer_put_uint16_le (&bw, 0);
- gst_byte_writer_put_uint16_le (&bw, 0);
- gst_byte_writer_put_uint16_le (&bw, 0);
+ hdl &= gst_byte_writer_put_uint32_le (&bw, avipad->hdr.type);
+ hdl &= gst_byte_writer_put_uint32_le (&bw, avipad->hdr.fcc_handler);
+ hdl &= gst_byte_writer_put_uint32_le (&bw, avipad->hdr.flags);
+ hdl &= gst_byte_writer_put_uint32_le (&bw, avipad->hdr.priority);
+ hdl &= gst_byte_writer_put_uint32_le (&bw, avipad->hdr.init_frames);
+ hdl &= gst_byte_writer_put_uint32_le (&bw, avipad->hdr.scale);
+ hdl &= gst_byte_writer_put_uint32_le (&bw, avipad->hdr.rate);
+ hdl &= gst_byte_writer_put_uint32_le (&bw, avipad->hdr.start);
+ hdl &= gst_byte_writer_put_uint32_le (&bw, avipad->hdr.length);
+ hdl &= gst_byte_writer_put_uint32_le (&bw, avipad->hdr.bufsize);
+ hdl &= gst_byte_writer_put_uint32_le (&bw, avipad->hdr.quality);
+ hdl &= gst_byte_writer_put_uint32_le (&bw, avipad->hdr.samplesize);
+ hdl &= gst_byte_writer_put_uint16_le (&bw, 0);
+ hdl &= gst_byte_writer_put_uint16_le (&bw, 0);
+ hdl &= gst_byte_writer_put_uint16_le (&bw, 0);
+ hdl &= gst_byte_writer_put_uint16_le (&bw, 0);
gst_avi_mux_end_chunk (&bw, strh);
if (avipad->is_video) {
@@ -1215,20 +1218,21 @@ gst_avi_mux_riff_get_avi_header (GstAviMux * avimux)
/* the video header */
strf = gst_avi_mux_start_chunk (&bw, "strf", 0);
/* the actual header */
- gst_byte_writer_put_uint32_le (&bw, vidpad->vids.size + codec_size);
- gst_byte_writer_put_uint32_le (&bw, vidpad->vids.width);
- gst_byte_writer_put_uint32_le (&bw, vidpad->vids.height);
- gst_byte_writer_put_uint16_le (&bw, vidpad->vids.planes);
- gst_byte_writer_put_uint16_le (&bw, vidpad->vids.bit_cnt);
- gst_byte_writer_put_uint32_le (&bw, vidpad->vids.compression);
- gst_byte_writer_put_uint32_le (&bw, vidpad->vids.image_size);
- gst_byte_writer_put_uint32_le (&bw, vidpad->vids.xpels_meter);
- gst_byte_writer_put_uint32_le (&bw, vidpad->vids.ypels_meter);
- gst_byte_writer_put_uint32_le (&bw, vidpad->vids.num_colors);
- gst_byte_writer_put_uint32_le (&bw, vidpad->vids.imp_colors);
+ hdl &=
+ gst_byte_writer_put_uint32_le (&bw, vidpad->vids.size + codec_size);
+ hdl &= gst_byte_writer_put_uint32_le (&bw, vidpad->vids.width);
+ hdl &= gst_byte_writer_put_uint32_le (&bw, vidpad->vids.height);
+ hdl &= gst_byte_writer_put_uint16_le (&bw, vidpad->vids.planes);
+ hdl &= gst_byte_writer_put_uint16_le (&bw, vidpad->vids.bit_cnt);
+ hdl &= gst_byte_writer_put_uint32_le (&bw, vidpad->vids.compression);
+ hdl &= gst_byte_writer_put_uint32_le (&bw, vidpad->vids.image_size);
+ hdl &= gst_byte_writer_put_uint32_le (&bw, vidpad->vids.xpels_meter);
+ hdl &= gst_byte_writer_put_uint32_le (&bw, vidpad->vids.ypels_meter);
+ hdl &= gst_byte_writer_put_uint32_le (&bw, vidpad->vids.num_colors);
+ hdl &= gst_byte_writer_put_uint32_le (&bw, vidpad->vids.imp_colors);
if (vidpad->vids_codec_data) {
gst_buffer_map (vidpad->vids_codec_data, &map, GST_MAP_READ);
- gst_byte_writer_put_data (&bw, map.data, map.size);
+ hdl &= gst_byte_writer_put_data (&bw, map.data, map.size);
gst_buffer_unmap (vidpad->vids_codec_data, &map);
}
gst_avi_mux_end_chunk (&bw, strf);
@@ -1244,28 +1248,28 @@ gst_avi_mux_riff_get_avi_header (GstAviMux * avimux)
/* the vprp header */
vprp = gst_avi_mux_start_chunk (&bw, "vprp", 0);
/* the actual data */
- gst_byte_writer_put_uint32_le (&bw, vidpad->vprp.format_token);
- gst_byte_writer_put_uint32_le (&bw, vidpad->vprp.standard);
- gst_byte_writer_put_uint32_le (&bw, vidpad->vprp.vert_rate);
- gst_byte_writer_put_uint32_le (&bw, vidpad->vprp.hor_t_total);
- gst_byte_writer_put_uint32_le (&bw, vidpad->vprp.vert_lines);
- gst_byte_writer_put_uint32_le (&bw, vidpad->vprp.aspect);
- gst_byte_writer_put_uint32_le (&bw, vidpad->vprp.width);
- gst_byte_writer_put_uint32_le (&bw, vidpad->vprp.height);
- gst_byte_writer_put_uint32_le (&bw, vidpad->vprp.fields);
+ hdl &= gst_byte_writer_put_uint32_le (&bw, vidpad->vprp.format_token);
+ hdl &= gst_byte_writer_put_uint32_le (&bw, vidpad->vprp.standard);
+ hdl &= gst_byte_writer_put_uint32_le (&bw, vidpad->vprp.vert_rate);
+ hdl &= gst_byte_writer_put_uint32_le (&bw, vidpad->vprp.hor_t_total);
+ hdl &= gst_byte_writer_put_uint32_le (&bw, vidpad->vprp.vert_lines);
+ hdl &= gst_byte_writer_put_uint32_le (&bw, vidpad->vprp.aspect);
+ hdl &= gst_byte_writer_put_uint32_le (&bw, vidpad->vprp.width);
+ hdl &= gst_byte_writer_put_uint32_le (&bw, vidpad->vprp.height);
+ hdl &= gst_byte_writer_put_uint32_le (&bw, vidpad->vprp.fields);
for (f = 0; f < vidpad->vprp.fields; ++f) {
gst_riff_vprp_video_field_desc *fd;
fd = &(vidpad->vprp.field_info[f]);
- gst_byte_writer_put_uint32_le (&bw, fd->compressed_bm_height);
- gst_byte_writer_put_uint32_le (&bw, fd->compressed_bm_width);
- gst_byte_writer_put_uint32_le (&bw, fd->valid_bm_height);
- gst_byte_writer_put_uint32_le (&bw, fd->valid_bm_width);
- gst_byte_writer_put_uint32_le (&bw, fd->valid_bm_x_offset);
- gst_byte_writer_put_uint32_le (&bw, fd->valid_bm_y_offset);
- gst_byte_writer_put_uint32_le (&bw, fd->video_x_t_offset);
- gst_byte_writer_put_uint32_le (&bw, fd->video_y_start);
+ hdl &= gst_byte_writer_put_uint32_le (&bw, fd->compressed_bm_height);
+ hdl &= gst_byte_writer_put_uint32_le (&bw, fd->compressed_bm_width);
+ hdl &= gst_byte_writer_put_uint32_le (&bw, fd->valid_bm_height);
+ hdl &= gst_byte_writer_put_uint32_le (&bw, fd->valid_bm_width);
+ hdl &= gst_byte_writer_put_uint32_le (&bw, fd->valid_bm_x_offset);
+ hdl &= gst_byte_writer_put_uint32_le (&bw, fd->valid_bm_y_offset);
+ hdl &= gst_byte_writer_put_uint32_le (&bw, fd->video_x_t_offset);
+ hdl &= gst_byte_writer_put_uint32_le (&bw, fd->video_y_start);
}
gst_avi_mux_end_chunk (&bw, vprp);
}
@@ -1275,16 +1279,16 @@ gst_avi_mux_riff_get_avi_header (GstAviMux * avimux)
/* the audio header */
strf = gst_avi_mux_start_chunk (&bw, "strf", 0);
/* the actual header */
- gst_byte_writer_put_uint16_le (&bw, audpad->auds.format);
- gst_byte_writer_put_uint16_le (&bw, audpad->auds.channels);
- gst_byte_writer_put_uint32_le (&bw, audpad->auds.rate);
- gst_byte_writer_put_uint32_le (&bw, audpad->auds.av_bps);
- gst_byte_writer_put_uint16_le (&bw, audpad->auds.blockalign);
- gst_byte_writer_put_uint16_le (&bw, audpad->auds.size);
- gst_byte_writer_put_uint16_le (&bw, codec_size);
+ hdl &= gst_byte_writer_put_uint16_le (&bw, audpad->auds.format);
+ hdl &= gst_byte_writer_put_uint16_le (&bw, audpad->auds.channels);
+ hdl &= gst_byte_writer_put_uint32_le (&bw, audpad->auds.rate);
+ hdl &= gst_byte_writer_put_uint32_le (&bw, audpad->auds.av_bps);
+ hdl &= gst_byte_writer_put_uint16_le (&bw, audpad->auds.blockalign);
+ hdl &= gst_byte_writer_put_uint16_le (&bw, audpad->auds.size);
+ hdl &= gst_byte_writer_put_uint16_le (&bw, codec_size);
if (audpad->auds_codec_data) {
gst_buffer_map (audpad->auds_codec_data, &map, GST_MAP_READ);
- gst_byte_writer_put_data (&bw, map.data, map.size);
+ hdl &= gst_byte_writer_put_data (&bw, map.data, map.size);
gst_buffer_unmap (vidpad->vids_codec_data, &map);
}
gst_avi_mux_end_chunk (&bw, strf);
@@ -1295,15 +1299,15 @@ gst_avi_mux_riff_get_avi_header (GstAviMux * avimux)
indx = gst_avi_mux_start_chunk (&bw, "indx", 0);
else
indx = gst_avi_mux_start_chunk (&bw, "JUNK", 0);
- gst_byte_writer_put_uint16_le (&bw, 4); /* bytes per entry */
- gst_byte_writer_put_uint8 (&bw, 0); /* index subtype */
- gst_byte_writer_put_uint8 (&bw, GST_AVI_INDEX_OF_INDEXES); /* index type */
- gst_byte_writer_put_uint32_le (&bw, avipad->idx_index); /* entries in use */
- gst_byte_writer_put_data (&bw, (guint8 *) avipad->tag, 4); /* stream id */
- gst_byte_writer_put_uint32_le (&bw, 0); /* reserved */
- gst_byte_writer_put_uint32_le (&bw, 0); /* reserved */
- gst_byte_writer_put_uint32_le (&bw, 0); /* reserved */
- gst_byte_writer_put_data (&bw, (guint8 *) avipad->idx,
+ hdl &= gst_byte_writer_put_uint16_le (&bw, 4); /* bytes per entry */
+ hdl &= gst_byte_writer_put_uint8 (&bw, 0); /* index subtype */
+ hdl &= gst_byte_writer_put_uint8 (&bw, GST_AVI_INDEX_OF_INDEXES); /* index type */
+ hdl &= gst_byte_writer_put_uint32_le (&bw, avipad->idx_index); /* entries in use */
+ hdl &= gst_byte_writer_put_data (&bw, (guint8 *) avipad->tag, 4); /* stream id */
+ hdl &= gst_byte_writer_put_uint32_le (&bw, 0); /* reserved */
+ hdl &= gst_byte_writer_put_uint32_le (&bw, 0); /* reserved */
+ hdl &= gst_byte_writer_put_uint32_le (&bw, 0); /* reserved */
+ hdl &= gst_byte_writer_put_data (&bw, (guint8 *) avipad->idx,
GST_AVI_SUPERINDEX_COUNT * sizeof (gst_avi_superindex_entry));
gst_avi_mux_end_chunk (&bw, indx);
@@ -1317,9 +1321,9 @@ gst_avi_mux_riff_get_avi_header (GstAviMux * avimux)
guint odml, dmlh;
/* odml header */
odml = gst_avi_mux_start_chunk (&bw, "LIST", 0);
- gst_byte_writer_put_data (&bw, (guint8 *) "odml", 4);
+ hdl &= gst_byte_writer_put_data (&bw, (guint8 *) "odml", 4);
dmlh = gst_avi_mux_start_chunk (&bw, "dmlh", 0);
- gst_byte_writer_put_uint32_le (&bw, avimux->total_frames);
+ hdl &= gst_byte_writer_put_uint32_le (&bw, avimux->total_frames);
gst_avi_mux_end_chunk (&bw, dmlh);
gst_avi_mux_end_chunk (&bw, odml);
}
@@ -1332,7 +1336,7 @@ gst_avi_mux_riff_get_avi_header (GstAviMux * avimux)
guint info;
info = gst_avi_mux_start_chunk (&bw, "LIST", 0);
- gst_byte_writer_put_data (&bw, (guint8 *) "INFO", 4);
+ hdl &= gst_byte_writer_put_data (&bw, (guint8 *) "INFO", 4);
gst_tag_list_foreach (tags, gst_avi_mux_write_tag, &bw);
if (info + 8 == gst_byte_writer_get_pos (&bw)) {
@@ -1348,9 +1352,12 @@ gst_avi_mux_riff_get_avi_header (GstAviMux * avimux)
gst_avi_mux_end_chunk (&bw, riff);
/* avi data header */
- gst_byte_writer_put_data (&bw, (guint8 *) "LIST", 4);
- gst_byte_writer_put_uint32_le (&bw, avimux->data_size);
- gst_byte_writer_put_data (&bw, (guint8 *) "movi", 4);
+ hdl &= gst_byte_writer_put_data (&bw, (guint8 *) "LIST", 4);
+ hdl &= gst_byte_writer_put_uint32_le (&bw, avimux->data_size);
+ hdl &= gst_byte_writer_put_data (&bw, (guint8 *) "movi", 4);
+
+ if (!hdl)
+ goto beach;
/* now get the data */
buffer = gst_byte_writer_reset_and_get_buffer (&bw);
@@ -1364,6 +1371,7 @@ gst_avi_mux_riff_get_avi_header (GstAviMux * avimux)
GST_MEMDUMP_OBJECT (avimux, "avi header", map.data, map.size);
gst_buffer_unmap (buffer, &map);
+beach:
return buffer;
}
@@ -1823,11 +1831,11 @@ gst_avi_mux_restart_file (GstAviMux * avimux)
/* handle events (search) */
static gboolean
-gst_avi_mux_handle_event (GstCollectPads2 * pads, GstCollectData2 * data,
+gst_avi_mux_handle_event (GstCollectPads * pads, GstCollectData * data,
GstEvent * event, gpointer user_data)
{
GstAviMux *avimux;
- gboolean ret = FALSE;
+ gboolean ret = TRUE;
avimux = GST_AVI_MUX (user_data);
@@ -1852,6 +1860,7 @@ gst_avi_mux_handle_event (GstCollectPads2 * pads, GstCollectData2 * data,
ret = gst_avi_mux_audsink_set_caps (data->pad, caps);
}
gst_event_unref (event);
+ event = NULL;
break;
}
case GST_EVENT_TAG:{
@@ -1862,19 +1871,16 @@ gst_avi_mux_handle_event (GstCollectPads2 * pads, GstCollectData2 * data,
gst_event_parse_tag (event, &list);
gst_tag_setter_merge_tags (setter, list, mode);
gst_event_unref (event);
- ret = TRUE;
+ event = NULL;
break;
}
- case GST_EVENT_EOS:
- case GST_EVENT_SEGMENT:
- gst_event_unref (event);
- ret = TRUE;
- break;
default:
- ret = gst_pad_event_default (data->pad, GST_OBJECT (avimux), event);
break;
}
+ if (event != NULL)
+ return gst_collect_pads_event_default (pads, data, event, FALSE);
+
return ret;
}
@@ -1900,7 +1906,7 @@ gst_avi_mux_do_buffer (GstAviMux * avimux, GstAviPad * avipad)
guint flags;
gsize datasize;
- data = gst_collect_pads2_pop (avimux->collect, avipad->collect);
+ data = gst_collect_pads_pop (avimux->collect, avipad->collect);
/* arrange downstream running time */
data = gst_buffer_make_writable (data);
GST_BUFFER_TIMESTAMP (data) =
@@ -2024,7 +2030,7 @@ gst_avi_mux_do_one_buffer (GstAviMux * avimux)
if (!avipad->hdr.fcc_handler)
goto not_negotiated;
- buffer = gst_collect_pads2_peek (avimux->collect, avipad->collect);
+ buffer = gst_collect_pads_peek (avimux->collect, avipad->collect);
if (!buffer)
continue;
time = GST_BUFFER_TIMESTAMP (buffer);
@@ -2037,7 +2043,7 @@ gst_avi_mux_do_one_buffer (GstAviMux * avimux)
if (G_UNLIKELY (!GST_CLOCK_TIME_IS_VALID (time))) {
GST_DEBUG_OBJECT (avimux, "clipping buffer on pad %s outside segment",
GST_PAD_NAME (avipad->collect->pad));
- buffer = gst_collect_pads2_pop (avimux->collect, avipad->collect);
+ buffer = gst_collect_pads_pop (avimux->collect, avipad->collect);
gst_buffer_unref (buffer);
return GST_FLOW_OK;
}
@@ -2076,7 +2082,7 @@ not_negotiated:
}
static GstFlowReturn
-gst_avi_mux_collect_pads (GstCollectPads2 * pads, GstAviMux * avimux)
+gst_avi_mux_collect_pads (GstCollectPads * pads, GstAviMux * avimux)
{
GstFlowReturn res;
@@ -2135,12 +2141,12 @@ gst_avi_mux_change_state (GstElement * element, GstStateChange transition)
switch (transition) {
case GST_STATE_CHANGE_READY_TO_PAUSED:
- gst_collect_pads2_start (avimux->collect);
+ gst_collect_pads_start (avimux->collect);
break;
case GST_STATE_CHANGE_PAUSED_TO_PLAYING:
break;
case GST_STATE_CHANGE_PAUSED_TO_READY:
- gst_collect_pads2_stop (avimux->collect);
+ gst_collect_pads_stop (avimux->collect);
break;
default:
break;
diff --git a/gst/avi/gstavimux.h b/gst/avi/gstavimux.h
index cb0cdb7b31d324e9324edd04b0cb651b81fcbcec..f1ce70635ea816a559e95d34044a866b85360c47 100644
--- a/gst/avi/gstavimux.h
+++ b/gst/avi/gstavimux.h
@@ -23,7 +23,7 @@
#include <gst/gst.h>
-#include <gst/base/gstcollectpads2.h>
+#include <gst/base/gstcollectpads.h>
#include <gst/riff/riff-ids.h>
#include "avi-ids.h"
@@ -74,7 +74,7 @@ typedef GstFlowReturn (*GstAviPadHook) (GstAviMux * avi, GstAviPad * avipad,
struct _GstAviPad {
/* do not extend, link to it */
/* is NULL if original sink request pad has been removed */
- GstCollectData2 *collect;
+ GstCollectData *collect;
/* type */
gboolean is_video;
@@ -129,7 +129,7 @@ typedef struct _GstAviAudioPad {
typedef struct _GstAviCollectData {
/* extend the CollectData */
- GstCollectData2 collect;
+ GstCollectData collect;
GstAviPad *avipad;
} GstAviCollectData;
@@ -143,7 +143,7 @@ struct _GstAviMux {
GSList *sinkpads;
/* video restricted to 1 pad */
guint video_pads, audio_pads;
- GstCollectPads2 *collect;
+ GstCollectPads *collect;
/* the AVI header */
/* still some single stream video data in mux struct */
diff --git a/gst/cutter/Makefile.in b/gst/cutter/Makefile.in
index 5be5db6e7083e8d4627d19901e6d17ec45211a2c..069daf03598f557b3fa4cea2caa8200daefb30e5 100644
--- a/gst/cutter/Makefile.in
+++ b/gst/cutter/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.11.4 from Makefile.am.
+# Makefile.in generated by automake 1.11.5 from Makefile.am.
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -60,6 +60,7 @@ am__aclocal_m4_deps = $(top_srcdir)/common/m4/as-ac-expand.m4 \
$(top_srcdir)/common/m4/as-auto-alt.m4 \
$(top_srcdir)/common/m4/as-compiler-flag.m4 \
$(top_srcdir)/common/m4/as-gcc-inline-assembly.m4 \
+ $(top_srcdir)/common/m4/as-libtool.m4 \
$(top_srcdir)/common/m4/as-objc.m4 \
$(top_srcdir)/common/m4/as-python.m4 \
$(top_srcdir)/common/m4/as-scrub-include.m4 \
@@ -255,6 +256,7 @@ GMSGFMT_015 = @GMSGFMT_015@
GREP = @GREP@
GSTPB_PLUGINS_DIR = @GSTPB_PLUGINS_DIR@
GSTPB_PREFIX = @GSTPB_PREFIX@
+GST_AGE = @GST_AGE@
GST_ALL_LDFLAGS = @GST_ALL_LDFLAGS@
GST_API_VERSION = @GST_API_VERSION@
GST_BASE_CFLAGS = @GST_BASE_CFLAGS@
@@ -264,9 +266,11 @@ GST_CHECK_CFLAGS = @GST_CHECK_CFLAGS@
GST_CHECK_LIBS = @GST_CHECK_LIBS@
GST_CONTROLLER_CFLAGS = @GST_CONTROLLER_CFLAGS@
GST_CONTROLLER_LIBS = @GST_CONTROLLER_LIBS@
+GST_CURRENT = @GST_CURRENT@
GST_CXXFLAGS = @GST_CXXFLAGS@
GST_LEVEL_DEFAULT = @GST_LEVEL_DEFAULT@
GST_LIBS = @GST_LIBS@
+GST_LIBVERSION = @GST_LIBVERSION@
GST_LICENSE = @GST_LICENSE@
GST_LT_LDFLAGS = @GST_LT_LDFLAGS@
GST_NET_CFLAGS = @GST_NET_CFLAGS@
@@ -284,6 +288,7 @@ GST_PLUGINS_NONPORTED = @GST_PLUGINS_NONPORTED@
GST_PLUGINS_SELECTED = @GST_PLUGINS_SELECTED@
GST_PLUGIN_LDFLAGS = @GST_PLUGIN_LDFLAGS@
GST_PREFIX = @GST_PREFIX@
+GST_REVISION = @GST_REVISION@
GST_TOOLS_DIR = @GST_TOOLS_DIR@
GTKDOC_CHECK = @GTKDOC_CHECK@
GTK_CFLAGS = @GTK_CFLAGS@
@@ -535,7 +540,7 @@ install-pluginLTLIBRARIES: $(plugin_LTLIBRARIES)
done; \
test -z "$$list2" || { \
echo " $(MKDIR_P) '$(DESTDIR)$(plugindir)'"; \
- $(MKDIR_P) '$(DESTDIR)$(plugindir)' || exit 1; \
+ $(MKDIR_P) "$(DESTDIR)$(plugindir)" || exit 1; \
echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 '$(DESTDIR)$(plugindir)'"; \
$(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 "$(DESTDIR)$(plugindir)"; \
}
diff --git a/gst/debugutils/Makefile.in b/gst/debugutils/Makefile.in
index 859fa14e6f591d385741717dd9cdb35b5dc19dfa..e083626ef61cc25d05db9ada37544186a796c298 100644
--- a/gst/debugutils/Makefile.in
+++ b/gst/debugutils/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.11.4 from Makefile.am.
+# Makefile.in generated by automake 1.11.5 from Makefile.am.
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -60,6 +60,7 @@ am__aclocal_m4_deps = $(top_srcdir)/common/m4/as-ac-expand.m4 \
$(top_srcdir)/common/m4/as-auto-alt.m4 \
$(top_srcdir)/common/m4/as-compiler-flag.m4 \
$(top_srcdir)/common/m4/as-gcc-inline-assembly.m4 \
+ $(top_srcdir)/common/m4/as-libtool.m4 \
$(top_srcdir)/common/m4/as-objc.m4 \
$(top_srcdir)/common/m4/as-python.m4 \
$(top_srcdir)/common/m4/as-scrub-include.m4 \
@@ -272,6 +273,7 @@ GMSGFMT_015 = @GMSGFMT_015@
GREP = @GREP@
GSTPB_PLUGINS_DIR = @GSTPB_PLUGINS_DIR@
GSTPB_PREFIX = @GSTPB_PREFIX@
+GST_AGE = @GST_AGE@
GST_ALL_LDFLAGS = @GST_ALL_LDFLAGS@
GST_API_VERSION = @GST_API_VERSION@
GST_BASE_CFLAGS = @GST_BASE_CFLAGS@
@@ -281,9 +283,11 @@ GST_CHECK_CFLAGS = @GST_CHECK_CFLAGS@
GST_CHECK_LIBS = @GST_CHECK_LIBS@
GST_CONTROLLER_CFLAGS = @GST_CONTROLLER_CFLAGS@
GST_CONTROLLER_LIBS = @GST_CONTROLLER_LIBS@
+GST_CURRENT = @GST_CURRENT@
GST_CXXFLAGS = @GST_CXXFLAGS@
GST_LEVEL_DEFAULT = @GST_LEVEL_DEFAULT@
GST_LIBS = @GST_LIBS@
+GST_LIBVERSION = @GST_LIBVERSION@
GST_LICENSE = @GST_LICENSE@
GST_LT_LDFLAGS = @GST_LT_LDFLAGS@
GST_NET_CFLAGS = @GST_NET_CFLAGS@
@@ -301,6 +305,7 @@ GST_PLUGINS_NONPORTED = @GST_PLUGINS_NONPORTED@
GST_PLUGINS_SELECTED = @GST_PLUGINS_SELECTED@
GST_PLUGIN_LDFLAGS = @GST_PLUGIN_LDFLAGS@
GST_PREFIX = @GST_PREFIX@
+GST_REVISION = @GST_REVISION@
GST_TOOLS_DIR = @GST_TOOLS_DIR@
GTKDOC_CHECK = @GTKDOC_CHECK@
GTK_CFLAGS = @GTK_CFLAGS@
@@ -584,7 +589,7 @@ install-pluginLTLIBRARIES: $(plugin_LTLIBRARIES)
done; \
test -z "$$list2" || { \
echo " $(MKDIR_P) '$(DESTDIR)$(plugindir)'"; \
- $(MKDIR_P) '$(DESTDIR)$(plugindir)' || exit 1; \
+ $(MKDIR_P) "$(DESTDIR)$(plugindir)" || exit 1; \
echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 '$(DESTDIR)$(plugindir)'"; \
$(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 "$(DESTDIR)$(plugindir)"; \
}
diff --git a/gst/debugutils/rndbuffersize.c b/gst/debugutils/rndbuffersize.c
index 99ffcbe50d4253a0604869a432ecab6cdf4e867e..8122212abdbd3cba0769c23659db1de738dd9cd9 100644
--- a/gst/debugutils/rndbuffersize.c
+++ b/gst/debugutils/rndbuffersize.c
@@ -23,7 +23,7 @@
*/
#ifdef HAVE_CONFIG_H
-# include "config.h"
+#include "config.h"
#endif
#include <gst/gst.h>
@@ -51,6 +51,8 @@ struct _GstRndBufferSize
GstPad *sinkpad, *srcpad;
guint64 offset;
+
+ gboolean need_newsegment;
};
struct _GstRndBufferSizeClass
@@ -91,6 +93,8 @@ static gboolean gst_rnd_buffer_size_activate_mode (GstPad * pad,
static void gst_rnd_buffer_size_loop (GstRndBufferSize * self);
static GstStateChangeReturn gst_rnd_buffer_size_change_state (GstElement *
element, GstStateChange transition);
+static gboolean gst_rnd_buffer_size_src_event (GstPad * pad,
+ GstObject * parent, GstEvent * event);
GType gst_rnd_buffer_size_get_type (void);
#define gst_rnd_buffer_size_parent_class parent_class
@@ -150,6 +154,8 @@ gst_rnd_buffer_size_init (GstRndBufferSize * self)
gst_element_add_pad (GST_ELEMENT (self), self->sinkpad);
self->srcpad = gst_pad_new_from_static_template (&src_template, "src");
+ gst_pad_set_event_function (self->srcpad,
+ GST_DEBUG_FUNCPTR (gst_rnd_buffer_size_src_event));
gst_element_add_pad (GST_ELEMENT (self), self->srcpad);
}
@@ -259,6 +265,7 @@ gst_rnd_buffer_size_activate_mode (GstPad * pad, GstObject * parent,
res =
gst_pad_start_task (pad, (GstTaskFunction) gst_rnd_buffer_size_loop,
self);
+ self->need_newsegment = TRUE;
} else {
GST_INFO_OBJECT (self, "stopping pull");
res = gst_pad_stop_task (pad);
@@ -271,6 +278,59 @@ gst_rnd_buffer_size_activate_mode (GstPad * pad, GstObject * parent,
return res;
}
+static gboolean
+gst_rnd_buffer_size_src_event (GstPad * pad, GstObject * parent,
+ GstEvent * event)
+{
+ GstRndBufferSize *self;
+ GstSeekType start_type;
+ GstSeekFlags flags;
+ GstFormat format;
+ gint64 start;
+
+ if (GST_EVENT_TYPE (event) != GST_EVENT_SEEK) {
+ GST_WARNING_OBJECT (pad, "dropping %s event", GST_EVENT_TYPE_NAME (event));
+ return FALSE;
+ }
+
+ self = GST_RND_BUFFER_SIZE (parent);
+ gst_event_parse_seek (event, NULL, &format, &flags, &start_type, &start,
+ NULL, NULL);
+
+ if (format != GST_FORMAT_BYTES) {
+ GST_WARNING_OBJECT (pad, "only BYTE format supported");
+ return FALSE;
+ }
+ if (start_type != GST_SEEK_TYPE_SET) {
+ GST_WARNING_OBJECT (pad, "only SEEK_TYPE_SET supported");
+ return FALSE;
+ }
+
+ if ((flags & GST_SEEK_FLAG_FLUSH)) {
+ gst_pad_push_event (self->srcpad, gst_event_new_flush_start ());
+ gst_pad_push_event (self->sinkpad, gst_event_new_flush_start ());
+ } else {
+ gst_pad_pause_task (self->sinkpad);
+ }
+
+ GST_PAD_STREAM_LOCK (self->sinkpad);
+
+ if ((flags & GST_SEEK_FLAG_FLUSH)) {
+ gst_pad_push_event (self->srcpad, gst_event_new_flush_stop (TRUE));
+ gst_pad_push_event (self->sinkpad, gst_event_new_flush_stop (TRUE));
+ }
+
+ GST_INFO_OBJECT (pad, "seeking to offset %" G_GINT64_FORMAT, start);
+
+ self->offset = start;
+ self->need_newsegment = TRUE;
+
+ gst_pad_start_task (self->sinkpad, (GstTaskFunction) gst_rnd_buffer_size_loop,
+ self);
+
+ GST_PAD_STREAM_UNLOCK (self->sinkpad);
+ return TRUE;
+}
static void
gst_rnd_buffer_size_loop (GstRndBufferSize * self)
@@ -302,6 +362,15 @@ gst_rnd_buffer_size_loop (GstRndBufferSize * self)
GST_WARNING_OBJECT (self, "short buffer: %u bytes", size);
}
+ if (self->need_newsegment) {
+ GstSegment segment;
+
+ gst_segment_init (&segment, GST_FORMAT_BYTES);
+ segment.start = self->offset;
+ gst_pad_push_event (self->srcpad, gst_event_new_segment (&segment));
+ self->need_newsegment = FALSE;
+ }
+
self->offset += size;
ret = gst_pad_push (self->srcpad, buf);
diff --git a/gst/deinterlace/Makefile.in b/gst/deinterlace/Makefile.in
index 697b2eafe3259098bafc2df60fec32119e83be12..632058b350ea83733707dc8201831ea6433f6911 100644
--- a/gst/deinterlace/Makefile.in
+++ b/gst/deinterlace/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.11.4 from Makefile.am.
+# Makefile.in generated by automake 1.11.5 from Makefile.am.
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -82,6 +82,7 @@ am__aclocal_m4_deps = $(top_srcdir)/common/m4/as-ac-expand.m4 \
$(top_srcdir)/common/m4/as-auto-alt.m4 \
$(top_srcdir)/common/m4/as-compiler-flag.m4 \
$(top_srcdir)/common/m4/as-gcc-inline-assembly.m4 \
+ $(top_srcdir)/common/m4/as-libtool.m4 \
$(top_srcdir)/common/m4/as-objc.m4 \
$(top_srcdir)/common/m4/as-python.m4 \
$(top_srcdir)/common/m4/as-scrub-include.m4 \
@@ -291,6 +292,7 @@ GMSGFMT_015 = @GMSGFMT_015@
GREP = @GREP@
GSTPB_PLUGINS_DIR = @GSTPB_PLUGINS_DIR@
GSTPB_PREFIX = @GSTPB_PREFIX@
+GST_AGE = @GST_AGE@
GST_ALL_LDFLAGS = @GST_ALL_LDFLAGS@
GST_API_VERSION = @GST_API_VERSION@
GST_BASE_CFLAGS = @GST_BASE_CFLAGS@
@@ -300,9 +302,11 @@ GST_CHECK_CFLAGS = @GST_CHECK_CFLAGS@
GST_CHECK_LIBS = @GST_CHECK_LIBS@
GST_CONTROLLER_CFLAGS = @GST_CONTROLLER_CFLAGS@
GST_CONTROLLER_LIBS = @GST_CONTROLLER_LIBS@
+GST_CURRENT = @GST_CURRENT@
GST_CXXFLAGS = @GST_CXXFLAGS@
GST_LEVEL_DEFAULT = @GST_LEVEL_DEFAULT@
GST_LIBS = @GST_LIBS@
+GST_LIBVERSION = @GST_LIBVERSION@
GST_LICENSE = @GST_LICENSE@
GST_LT_LDFLAGS = @GST_LT_LDFLAGS@
GST_NET_CFLAGS = @GST_NET_CFLAGS@
@@ -320,6 +324,7 @@ GST_PLUGINS_NONPORTED = @GST_PLUGINS_NONPORTED@
GST_PLUGINS_SELECTED = @GST_PLUGINS_SELECTED@
GST_PLUGIN_LDFLAGS = @GST_PLUGIN_LDFLAGS@
GST_PREFIX = @GST_PREFIX@
+GST_REVISION = @GST_REVISION@
GST_TOOLS_DIR = @GST_TOOLS_DIR@
GTKDOC_CHECK = @GTKDOC_CHECK@
GTK_CFLAGS = @GTK_CFLAGS@
@@ -626,7 +631,7 @@ install-pluginLTLIBRARIES: $(plugin_LTLIBRARIES)
done; \
test -z "$$list2" || { \
echo " $(MKDIR_P) '$(DESTDIR)$(plugindir)'"; \
- $(MKDIR_P) '$(DESTDIR)$(plugindir)' || exit 1; \
+ $(MKDIR_P) "$(DESTDIR)$(plugindir)" || exit 1; \
echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 '$(DESTDIR)$(plugindir)'"; \
$(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 "$(DESTDIR)$(plugindir)"; \
}
diff --git a/gst/effectv/Makefile.in b/gst/effectv/Makefile.in
index bfc05f187f836265573a5d4adb56dd9a12a4806b..f68ccac12870f58cad12fa9bfa3b1f9d1bf3dd95 100644
--- a/gst/effectv/Makefile.in
+++ b/gst/effectv/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.11.4 from Makefile.am.
+# Makefile.in generated by automake 1.11.5 from Makefile.am.
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -60,6 +60,7 @@ am__aclocal_m4_deps = $(top_srcdir)/common/m4/as-ac-expand.m4 \
$(top_srcdir)/common/m4/as-auto-alt.m4 \
$(top_srcdir)/common/m4/as-compiler-flag.m4 \
$(top_srcdir)/common/m4/as-gcc-inline-assembly.m4 \
+ $(top_srcdir)/common/m4/as-libtool.m4 \
$(top_srcdir)/common/m4/as-objc.m4 \
$(top_srcdir)/common/m4/as-python.m4 \
$(top_srcdir)/common/m4/as-scrub-include.m4 \
@@ -263,6 +264,7 @@ GMSGFMT_015 = @GMSGFMT_015@
GREP = @GREP@
GSTPB_PLUGINS_DIR = @GSTPB_PLUGINS_DIR@
GSTPB_PREFIX = @GSTPB_PREFIX@
+GST_AGE = @GST_AGE@
GST_ALL_LDFLAGS = @GST_ALL_LDFLAGS@
GST_API_VERSION = @GST_API_VERSION@
GST_BASE_CFLAGS = @GST_BASE_CFLAGS@
@@ -272,9 +274,11 @@ GST_CHECK_CFLAGS = @GST_CHECK_CFLAGS@
GST_CHECK_LIBS = @GST_CHECK_LIBS@
GST_CONTROLLER_CFLAGS = @GST_CONTROLLER_CFLAGS@
GST_CONTROLLER_LIBS = @GST_CONTROLLER_LIBS@
+GST_CURRENT = @GST_CURRENT@
GST_CXXFLAGS = @GST_CXXFLAGS@
GST_LEVEL_DEFAULT = @GST_LEVEL_DEFAULT@
GST_LIBS = @GST_LIBS@
+GST_LIBVERSION = @GST_LIBVERSION@
GST_LICENSE = @GST_LICENSE@
GST_LT_LDFLAGS = @GST_LT_LDFLAGS@
GST_NET_CFLAGS = @GST_NET_CFLAGS@
@@ -292,6 +296,7 @@ GST_PLUGINS_NONPORTED = @GST_PLUGINS_NONPORTED@
GST_PLUGINS_SELECTED = @GST_PLUGINS_SELECTED@
GST_PLUGIN_LDFLAGS = @GST_PLUGIN_LDFLAGS@
GST_PREFIX = @GST_PREFIX@
+GST_REVISION = @GST_REVISION@
GST_TOOLS_DIR = @GST_TOOLS_DIR@
GTKDOC_CHECK = @GTKDOC_CHECK@
GTK_CFLAGS = @GTK_CFLAGS@
@@ -559,7 +564,7 @@ install-pluginLTLIBRARIES: $(plugin_LTLIBRARIES)
done; \
test -z "$$list2" || { \
echo " $(MKDIR_P) '$(DESTDIR)$(plugindir)'"; \
- $(MKDIR_P) '$(DESTDIR)$(plugindir)' || exit 1; \
+ $(MKDIR_P) "$(DESTDIR)$(plugindir)" || exit 1; \
echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 '$(DESTDIR)$(plugindir)'"; \
$(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 "$(DESTDIR)$(plugindir)"; \
}
diff --git a/gst/equalizer/Makefile.in b/gst/equalizer/Makefile.in
index 597db9e7767ed2ac40050cd690fb5a899f5d924d..ecb15d74b6d17cc1f98b2ba8586377d44f2edc3f 100644
--- a/gst/equalizer/Makefile.in
+++ b/gst/equalizer/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.11.4 from Makefile.am.
+# Makefile.in generated by automake 1.11.5 from Makefile.am.
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -61,6 +61,7 @@ am__aclocal_m4_deps = $(top_srcdir)/common/m4/as-ac-expand.m4 \
$(top_srcdir)/common/m4/as-auto-alt.m4 \
$(top_srcdir)/common/m4/as-compiler-flag.m4 \
$(top_srcdir)/common/m4/as-gcc-inline-assembly.m4 \
+ $(top_srcdir)/common/m4/as-libtool.m4 \
$(top_srcdir)/common/m4/as-objc.m4 \
$(top_srcdir)/common/m4/as-python.m4 \
$(top_srcdir)/common/m4/as-scrub-include.m4 \
@@ -261,6 +262,7 @@ GMSGFMT_015 = @GMSGFMT_015@
GREP = @GREP@
GSTPB_PLUGINS_DIR = @GSTPB_PLUGINS_DIR@
GSTPB_PREFIX = @GSTPB_PREFIX@
+GST_AGE = @GST_AGE@
GST_ALL_LDFLAGS = @GST_ALL_LDFLAGS@
GST_API_VERSION = @GST_API_VERSION@
GST_BASE_CFLAGS = @GST_BASE_CFLAGS@
@@ -270,9 +272,11 @@ GST_CHECK_CFLAGS = @GST_CHECK_CFLAGS@
GST_CHECK_LIBS = @GST_CHECK_LIBS@
GST_CONTROLLER_CFLAGS = @GST_CONTROLLER_CFLAGS@
GST_CONTROLLER_LIBS = @GST_CONTROLLER_LIBS@
+GST_CURRENT = @GST_CURRENT@
GST_CXXFLAGS = @GST_CXXFLAGS@
GST_LEVEL_DEFAULT = @GST_LEVEL_DEFAULT@
GST_LIBS = @GST_LIBS@
+GST_LIBVERSION = @GST_LIBVERSION@
GST_LICENSE = @GST_LICENSE@
GST_LT_LDFLAGS = @GST_LT_LDFLAGS@
GST_NET_CFLAGS = @GST_NET_CFLAGS@
@@ -290,6 +294,7 @@ GST_PLUGINS_NONPORTED = @GST_PLUGINS_NONPORTED@
GST_PLUGINS_SELECTED = @GST_PLUGINS_SELECTED@
GST_PLUGIN_LDFLAGS = @GST_PLUGIN_LDFLAGS@
GST_PREFIX = @GST_PREFIX@
+GST_REVISION = @GST_REVISION@
GST_TOOLS_DIR = @GST_TOOLS_DIR@
GTKDOC_CHECK = @GTKDOC_CHECK@
GTK_CFLAGS = @GTK_CFLAGS@
@@ -553,7 +558,7 @@ install-pluginLTLIBRARIES: $(plugin_LTLIBRARIES)
done; \
test -z "$$list2" || { \
echo " $(MKDIR_P) '$(DESTDIR)$(plugindir)'"; \
- $(MKDIR_P) '$(DESTDIR)$(plugindir)' || exit 1; \
+ $(MKDIR_P) "$(DESTDIR)$(plugindir)" || exit 1; \
echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 '$(DESTDIR)$(plugindir)'"; \
$(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 "$(DESTDIR)$(plugindir)"; \
}
@@ -648,7 +653,7 @@ install-presetDATA: $(preset_DATA)
@list='$(preset_DATA)'; test -n "$(presetdir)" || list=; \
if test -n "$$list"; then \
echo " $(MKDIR_P) '$(DESTDIR)$(presetdir)'"; \
- $(MKDIR_P) '$(DESTDIR)$(presetdir)' || exit 1; \
+ $(MKDIR_P) "$(DESTDIR)$(presetdir)" || exit 1; \
fi; \
for p in $$list; do \
if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
diff --git a/gst/flv/Makefile.in b/gst/flv/Makefile.in
index 2b81ebcb3f50a6269b7ee3767c4b54ad53947e2f..b7aeb444a91759b25b7f291a007af3e9743b313e 100644
--- a/gst/flv/Makefile.in
+++ b/gst/flv/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.11.4 from Makefile.am.
+# Makefile.in generated by automake 1.11.5 from Makefile.am.
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -60,6 +60,7 @@ am__aclocal_m4_deps = $(top_srcdir)/common/m4/as-ac-expand.m4 \
$(top_srcdir)/common/m4/as-auto-alt.m4 \
$(top_srcdir)/common/m4/as-compiler-flag.m4 \
$(top_srcdir)/common/m4/as-gcc-inline-assembly.m4 \
+ $(top_srcdir)/common/m4/as-libtool.m4 \
$(top_srcdir)/common/m4/as-objc.m4 \
$(top_srcdir)/common/m4/as-python.m4 \
$(top_srcdir)/common/m4/as-scrub-include.m4 \
@@ -256,6 +257,7 @@ GMSGFMT_015 = @GMSGFMT_015@
GREP = @GREP@
GSTPB_PLUGINS_DIR = @GSTPB_PLUGINS_DIR@
GSTPB_PREFIX = @GSTPB_PREFIX@
+GST_AGE = @GST_AGE@
GST_ALL_LDFLAGS = @GST_ALL_LDFLAGS@
GST_API_VERSION = @GST_API_VERSION@
GST_BASE_CFLAGS = @GST_BASE_CFLAGS@
@@ -265,9 +267,11 @@ GST_CHECK_CFLAGS = @GST_CHECK_CFLAGS@
GST_CHECK_LIBS = @GST_CHECK_LIBS@
GST_CONTROLLER_CFLAGS = @GST_CONTROLLER_CFLAGS@
GST_CONTROLLER_LIBS = @GST_CONTROLLER_LIBS@
+GST_CURRENT = @GST_CURRENT@
GST_CXXFLAGS = @GST_CXXFLAGS@
GST_LEVEL_DEFAULT = @GST_LEVEL_DEFAULT@
GST_LIBS = @GST_LIBS@
+GST_LIBVERSION = @GST_LIBVERSION@
GST_LICENSE = @GST_LICENSE@
GST_LT_LDFLAGS = @GST_LT_LDFLAGS@
GST_NET_CFLAGS = @GST_NET_CFLAGS@
@@ -285,6 +289,7 @@ GST_PLUGINS_NONPORTED = @GST_PLUGINS_NONPORTED@
GST_PLUGINS_SELECTED = @GST_PLUGINS_SELECTED@
GST_PLUGIN_LDFLAGS = @GST_PLUGIN_LDFLAGS@
GST_PREFIX = @GST_PREFIX@
+GST_REVISION = @GST_REVISION@
GST_TOOLS_DIR = @GST_TOOLS_DIR@
GTKDOC_CHECK = @GTKDOC_CHECK@
GTK_CFLAGS = @GTK_CFLAGS@
@@ -538,7 +543,7 @@ install-pluginLTLIBRARIES: $(plugin_LTLIBRARIES)
done; \
test -z "$$list2" || { \
echo " $(MKDIR_P) '$(DESTDIR)$(plugindir)'"; \
- $(MKDIR_P) '$(DESTDIR)$(plugindir)' || exit 1; \
+ $(MKDIR_P) "$(DESTDIR)$(plugindir)" || exit 1; \
echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 '$(DESTDIR)$(plugindir)'"; \
$(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 "$(DESTDIR)$(plugindir)"; \
}
diff --git a/gst/flv/gstflvdemux.c b/gst/flv/gstflvdemux.c
index a0dc9386f26e9f1faf6a4375b47f2ace0e9baafd..da2b13a711b206154f7c0135f3d3ea4d1b9e8e7a 100644
--- a/gst/flv/gstflvdemux.c
+++ b/gst/flv/gstflvdemux.c
@@ -544,7 +544,7 @@ gst_flv_demux_parse_tag_script (GstFlvDemux * demux, GstBuffer * buffer)
gst_buffer_map (buffer, &map, GST_MAP_READ);
gst_byte_reader_init (&reader, map.data, map.size);
- gst_byte_reader_skip (&reader, 7);
+ gst_byte_reader_skip_unchecked (&reader, 7);
GST_LOG_OBJECT (demux, "parsing a script tag");
diff --git a/gst/flv/gstflvmux.c b/gst/flv/gstflvmux.c
index b28087144eb41235ef6a715ad8bc762936b333c0..2b44a18875491311cb78da8460f2f1ce9c889958 100644
--- a/gst/flv/gstflvmux.c
+++ b/gst/flv/gstflvmux.c
@@ -91,10 +91,10 @@ G_DEFINE_TYPE_WITH_CODE (GstFlvMux, gst_flv_mux, GST_TYPE_ELEMENT,
static void gst_flv_mux_finalize (GObject * object);
static GstFlowReturn
-gst_flv_mux_handle_buffer (GstCollectPads2 * pads, GstCollectData2 * cdata,
+gst_flv_mux_handle_buffer (GstCollectPads * pads, GstCollectData * cdata,
GstBuffer * buf, gpointer user_data);
static gboolean
-gst_flv_mux_handle_sink_event (GstCollectPads2 * pads, GstCollectData2 * data,
+gst_flv_mux_handle_sink_event (GstCollectPads * pads, GstCollectData * data,
GstEvent * event, gpointer user_data);
static gboolean gst_flv_mux_handle_src_event (GstPad * pad, GstObject * parent,
@@ -215,13 +215,13 @@ gst_flv_mux_init (GstFlvMux * mux)
mux->new_tags = FALSE;
- mux->collect = gst_collect_pads2_new ();
- gst_collect_pads2_set_buffer_function (mux->collect,
+ mux->collect = gst_collect_pads_new ();
+ gst_collect_pads_set_buffer_function (mux->collect,
GST_DEBUG_FUNCPTR (gst_flv_mux_handle_buffer), mux);
- gst_collect_pads2_set_event_function (mux->collect,
+ gst_collect_pads_set_event_function (mux->collect,
GST_DEBUG_FUNCPTR (gst_flv_mux_handle_sink_event), mux);
- gst_collect_pads2_set_clip_function (mux->collect,
- GST_DEBUG_FUNCPTR (gst_collect_pads2_clip_running_time), mux);
+ gst_collect_pads_set_clip_function (mux->collect,
+ GST_DEBUG_FUNCPTR (gst_collect_pads_clip_running_time), mux);
gst_flv_mux_reset (GST_ELEMENT (mux));
}
@@ -283,11 +283,11 @@ gst_flv_mux_handle_src_event (GstPad * pad, GstObject * parent,
}
static gboolean
-gst_flv_mux_handle_sink_event (GstCollectPads2 * pads, GstCollectData2 * data,
+gst_flv_mux_handle_sink_event (GstCollectPads * pads, GstCollectData * data,
GstEvent * event, gpointer user_data)
{
GstFlvMux *mux = GST_FLV_MUX (user_data);
- gboolean ret = FALSE;
+ gboolean ret = TRUE;
switch (GST_EVENT_TYPE (event)) {
case GST_EVENT_CAPS:
@@ -308,6 +308,7 @@ gst_flv_mux_handle_sink_event (GstCollectPads2 * pads, GstCollectData2 * data,
}
/* and eat */
gst_event_unref (event);
+ event = NULL;
break;
}
case GST_EVENT_TAG:{
@@ -320,18 +321,16 @@ gst_flv_mux_handle_sink_event (GstCollectPads2 * pads, GstCollectData2 * data,
mux->new_tags = TRUE;
ret = TRUE;
gst_event_unref (event);
+ event = NULL;
break;
}
- case GST_EVENT_EOS:
- case GST_EVENT_SEGMENT:
- gst_event_unref (event);
- ret = TRUE;
- break;
default:
- ret = gst_pad_event_default (data->pad, GST_OBJECT (mux), event);
break;
}
+ if (event != NULL)
+ return gst_collect_pads_event_default (pads, data, event, FALSE);
+
return ret;
}
@@ -574,7 +573,7 @@ gst_flv_mux_request_new_pad (GstElement * element,
pad = gst_pad_new_from_template (templ, name);
cpad = (GstFlvPad *)
- gst_collect_pads2_add_pad (mux->collect, pad, sizeof (GstFlvPad));
+ gst_collect_pads_add_pad (mux->collect, pad, sizeof (GstFlvPad));
cpad->audio_codec_data = NULL;
cpad->video_codec_data = NULL;
@@ -593,7 +592,7 @@ gst_flv_mux_release_pad (GstElement * element, GstPad * pad)
GstFlvPad *cpad = (GstFlvPad *) gst_pad_get_element_private (pad);
gst_flv_mux_reset_pad (mux, cpad, cpad->video);
- gst_collect_pads2_remove_pad (mux->collect, pad);
+ gst_collect_pads_remove_pad (mux->collect, pad);
gst_element_remove_pad (element, pad);
}
@@ -789,7 +788,7 @@ tags:
guint64 dur;
for (l = mux->collect->data; l; l = l->next) {
- GstCollectData2 *cdata = l->data;
+ GstCollectData *cdata = l->data;
if (gst_pad_peer_query_duration (cdata->pad, GST_FORMAT_TIME,
(gint64 *) & dur) && dur != GST_CLOCK_TIME_NONE) {
@@ -1456,7 +1455,7 @@ gst_flv_mux_rewrite_header (GstFlvMux * mux)
}
static GstFlowReturn
-gst_flv_mux_handle_buffer (GstCollectPads2 * pads, GstCollectData2 * cdata,
+gst_flv_mux_handle_buffer (GstCollectPads * pads, GstCollectData * cdata,
GstBuffer * buffer, gpointer user_data)
{
GstFlvMux *mux = GST_FLV_MUX (user_data);
@@ -1567,12 +1566,12 @@ gst_flv_mux_change_state (GstElement * element, GstStateChange transition)
case GST_STATE_CHANGE_NULL_TO_READY:
break;
case GST_STATE_CHANGE_READY_TO_PAUSED:
- gst_collect_pads2_start (mux->collect);
+ gst_collect_pads_start (mux->collect);
break;
case GST_STATE_CHANGE_PAUSED_TO_PLAYING:
break;
case GST_STATE_CHANGE_PAUSED_TO_READY:
- gst_collect_pads2_stop (mux->collect);
+ gst_collect_pads_stop (mux->collect);
break;
default:
break;
diff --git a/gst/flv/gstflvmux.h b/gst/flv/gstflvmux.h
index b0e10ea320e1dac6cf40103fc7eb08983105e5be..ca0b2e12fad401bc01771599e31b70ad4f70d798 100644
--- a/gst/flv/gstflvmux.h
+++ b/gst/flv/gstflvmux.h
@@ -22,7 +22,7 @@
#define __GST_FLV_MUX_H__
#include <gst/gst.h>
-#include <gst/base/gstcollectpads2.h>
+#include <gst/base/gstcollectpads.h>
G_BEGIN_DECLS
@@ -39,7 +39,7 @@ G_BEGIN_DECLS
typedef struct
{
- GstCollectData2 collect;
+ GstCollectData collect;
gboolean video;
@@ -65,7 +65,7 @@ typedef struct _GstFlvMux {
GstElement element;
GstPad *srcpad;
- GstCollectPads2 *collect;
+ GstCollectPads *collect;
/* <private> */
GstFlvMuxState state;
diff --git a/gst/flx/Makefile.in b/gst/flx/Makefile.in
index 1a6ea6a7cc24ecf0851ee1d01c2b920bba37db83..e6cf3ba6488c7cee1defdf638978e1dd85eec1de 100644
--- a/gst/flx/Makefile.in
+++ b/gst/flx/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.11.4 from Makefile.am.
+# Makefile.in generated by automake 1.11.5 from Makefile.am.
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -60,6 +60,7 @@ am__aclocal_m4_deps = $(top_srcdir)/common/m4/as-ac-expand.m4 \
$(top_srcdir)/common/m4/as-auto-alt.m4 \
$(top_srcdir)/common/m4/as-compiler-flag.m4 \
$(top_srcdir)/common/m4/as-gcc-inline-assembly.m4 \
+ $(top_srcdir)/common/m4/as-libtool.m4 \
$(top_srcdir)/common/m4/as-objc.m4 \
$(top_srcdir)/common/m4/as-python.m4 \
$(top_srcdir)/common/m4/as-scrub-include.m4 \
@@ -256,6 +257,7 @@ GMSGFMT_015 = @GMSGFMT_015@
GREP = @GREP@
GSTPB_PLUGINS_DIR = @GSTPB_PLUGINS_DIR@
GSTPB_PREFIX = @GSTPB_PREFIX@
+GST_AGE = @GST_AGE@
GST_ALL_LDFLAGS = @GST_ALL_LDFLAGS@
GST_API_VERSION = @GST_API_VERSION@
GST_BASE_CFLAGS = @GST_BASE_CFLAGS@
@@ -265,9 +267,11 @@ GST_CHECK_CFLAGS = @GST_CHECK_CFLAGS@
GST_CHECK_LIBS = @GST_CHECK_LIBS@
GST_CONTROLLER_CFLAGS = @GST_CONTROLLER_CFLAGS@
GST_CONTROLLER_LIBS = @GST_CONTROLLER_LIBS@
+GST_CURRENT = @GST_CURRENT@
GST_CXXFLAGS = @GST_CXXFLAGS@
GST_LEVEL_DEFAULT = @GST_LEVEL_DEFAULT@
GST_LIBS = @GST_LIBS@
+GST_LIBVERSION = @GST_LIBVERSION@
GST_LICENSE = @GST_LICENSE@
GST_LT_LDFLAGS = @GST_LT_LDFLAGS@
GST_NET_CFLAGS = @GST_NET_CFLAGS@
@@ -285,6 +289,7 @@ GST_PLUGINS_NONPORTED = @GST_PLUGINS_NONPORTED@
GST_PLUGINS_SELECTED = @GST_PLUGINS_SELECTED@
GST_PLUGIN_LDFLAGS = @GST_PLUGIN_LDFLAGS@
GST_PREFIX = @GST_PREFIX@
+GST_REVISION = @GST_REVISION@
GST_TOOLS_DIR = @GST_TOOLS_DIR@
GTKDOC_CHECK = @GTKDOC_CHECK@
GTK_CFLAGS = @GTK_CFLAGS@
@@ -535,7 +540,7 @@ install-pluginLTLIBRARIES: $(plugin_LTLIBRARIES)
done; \
test -z "$$list2" || { \
echo " $(MKDIR_P) '$(DESTDIR)$(plugindir)'"; \
- $(MKDIR_P) '$(DESTDIR)$(plugindir)' || exit 1; \
+ $(MKDIR_P) "$(DESTDIR)$(plugindir)" || exit 1; \
echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 '$(DESTDIR)$(plugindir)'"; \
$(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 "$(DESTDIR)$(plugindir)"; \
}
diff --git a/gst/flx/gstflxdec.c b/gst/flx/gstflxdec.c
index eb61c32ef2c257d7ab1f71f973a6f7b94c2d15c7..bd169528aaa35a3cfc058180c9e6648564d143bc 100644
--- a/gst/flx/gstflxdec.c
+++ b/gst/flx/gstflxdec.c
@@ -51,23 +51,25 @@ static GstStaticPadTemplate sink_factory = GST_STATIC_PAD_TEMPLATE ("sink",
static GstStaticPadTemplate src_video_factory = GST_STATIC_PAD_TEMPLATE ("src",
GST_PAD_SRC,
GST_PAD_ALWAYS,
- GST_STATIC_CAPS (GST_VIDEO_CAPS_xRGB_HOST_ENDIAN)
+#if G_BYTE_ORDER == G_BIG_ENDIAN
+ GST_STATIC_CAPS (GST_VIDEO_CAPS_MAKE ("xRGB"))
+#else
+ GST_STATIC_CAPS (GST_VIDEO_CAPS_MAKE ("BGRx"))
+#endif
);
-
-static void gst_flxdec_class_init (GstFlxDecClass * klass);
-static void gst_flxdec_base_init (GstFlxDecClass * klass);
-static void gst_flxdec_init (GstFlxDec * flxdec);
static void gst_flxdec_dispose (GstFlxDec * flxdec);
-static GstFlowReturn gst_flxdec_chain (GstPad * pad, GstBuffer * buf);
+static GstFlowReturn gst_flxdec_chain (GstPad * pad, GstObject * parent,
+ GstBuffer * buf);
+static gboolean gst_flxdec_sink_event_handler (GstPad * pad,
+ GstObject * parent, GstEvent * event);
static GstStateChangeReturn gst_flxdec_change_state (GstElement * element,
GstStateChange transition);
-static gboolean gst_flxdec_src_query_handler (GstPad * pad, GstQuery * query);
-static gboolean gst_flxdec_src_event_handler (GstPad * pad, GstEvent * event);
-static gboolean gst_flxdec_sink_event_handler (GstPad * pad, GstEvent * event);
+static gboolean gst_flxdec_src_query_handler (GstPad * pad, GstObject * parent,
+ GstQuery * query);
static void flx_decode_color (GstFlxDec *, guchar *, guchar *, gint);
static void flx_decode_brun (GstFlxDec *, guchar *, guchar *);
@@ -76,46 +78,8 @@ static void flx_decode_delta_flc (GstFlxDec *, guchar *, guchar *);
#define rndalign(off) ((off) + ((off) & 1))
-static GstElementClass *parent_class = NULL;
-
-GType
-gst_flxdec_get_type (void)
-{
- static GType flxdec_type = 0;
-
- if (!flxdec_type) {
- static const GTypeInfo flxdec_info = {
- sizeof (GstFlxDecClass),
- (GBaseInitFunc) gst_flxdec_base_init,
- NULL,
- (GClassInitFunc) gst_flxdec_class_init,
- NULL,
- NULL,
- sizeof (GstFlxDec),
- 0,
- (GInstanceInitFunc) gst_flxdec_init,
- };
-
- flxdec_type =
- g_type_register_static (GST_TYPE_ELEMENT, "GstFlxDec", &flxdec_info, 0);
- }
- return flxdec_type;
-}
-
-static void
-gst_flxdec_base_init (GstFlxDecClass * klass)
-{
- GstElementClass *gstelement_class = GST_ELEMENT_CLASS (klass);
-
- gst_element_class_set_static_metadata (gstelement_class, "FLX video decoder",
- "Codec/Decoder/Video",
- "FLC/FLI/FLX video decoder",
- "Sepp Wijnands <mrrazz@garbage-coderz.net>, Zeeshan Ali <zeenix@gmail.com>");
- gst_element_class_add_pad_template (gstelement_class,
- gst_static_pad_template_get (&sink_factory));
- gst_element_class_add_pad_template (gstelement_class,
- gst_static_pad_template_get (&src_video_factory));
-}
+#define gst_flxdec_parent_class parent_class
+G_DEFINE_TYPE (GstFlxDec, gst_flxdec, GST_TYPE_ELEMENT);
static void
gst_flxdec_class_init (GstFlxDecClass * klass)
@@ -132,7 +96,16 @@ gst_flxdec_class_init (GstFlxDecClass * klass)
GST_DEBUG_CATEGORY_INIT (flxdec_debug, "flxdec", 0, "FLX video decoder");
- gstelement_class->change_state = gst_flxdec_change_state;
+ gstelement_class->change_state = GST_DEBUG_FUNCPTR (gst_flxdec_change_state);
+
+ gst_element_class_set_static_metadata (gstelement_class, "FLX video decoder",
+ "Codec/Decoder/Video",
+ "FLC/FLI/FLX video decoder",
+ "Sepp Wijnands <mrrazz@garbage-coderz.net>, Zeeshan Ali <zeenix@gmail.com>");
+ gst_element_class_add_pad_template (gstelement_class,
+ gst_static_pad_template_get (&sink_factory));
+ gst_element_class_add_pad_template (gstelement_class,
+ gst_static_pad_template_get (&src_video_factory));
}
static void
@@ -140,19 +113,18 @@ gst_flxdec_init (GstFlxDec * flxdec)
{
flxdec->sinkpad = gst_pad_new_from_static_template (&sink_factory, "sink");
gst_element_add_pad (GST_ELEMENT (flxdec), flxdec->sinkpad);
- gst_pad_set_chain_function (flxdec->sinkpad, gst_flxdec_chain);
- gst_pad_set_event_function (flxdec->sinkpad, gst_flxdec_sink_event_handler);
+ gst_pad_set_chain_function (flxdec->sinkpad,
+ GST_DEBUG_FUNCPTR (gst_flxdec_chain));
+ gst_pad_set_event_function (flxdec->sinkpad,
+ GST_DEBUG_FUNCPTR (gst_flxdec_sink_event_handler));
flxdec->srcpad = gst_pad_new_from_static_template (&src_video_factory, "src");
gst_element_add_pad (GST_ELEMENT (flxdec), flxdec->srcpad);
- gst_pad_set_query_function (flxdec->srcpad, gst_flxdec_src_query_handler);
- gst_pad_set_event_function (flxdec->srcpad, gst_flxdec_src_event_handler);
+ gst_pad_set_query_function (flxdec->srcpad,
+ GST_DEBUG_FUNCPTR (gst_flxdec_src_query_handler));
gst_pad_use_fixed_caps (flxdec->srcpad);
- flxdec->frame = NULL;
- flxdec->delta = NULL;
-
flxdec->adapter = gst_adapter_new ();
}
@@ -168,9 +140,10 @@ gst_flxdec_dispose (GstFlxDec * flxdec)
}
static gboolean
-gst_flxdec_src_query_handler (GstPad * pad, GstQuery * query)
+gst_flxdec_src_query_handler (GstPad * pad, GstObject * parent,
+ GstQuery * query)
{
- GstFlxDec *flxdec = (GstFlxDec *) gst_pad_get_parent (pad);
+ GstFlxDec *flxdec = (GstFlxDec *) parent;
gboolean ret = FALSE;
switch (GST_QUERY_TYPE (query)) {
@@ -191,37 +164,40 @@ gst_flxdec_src_query_handler (GstPad * pad, GstQuery * query)
break;
}
done:
- gst_object_unref (flxdec);
-
- return ret;
-}
-
-static gboolean
-gst_flxdec_src_event_handler (GstPad * pad, GstEvent * event)
-{
- GstFlxDec *flxdec = (GstFlxDec *) gst_pad_get_parent (pad);
- gboolean ret;
-
- /* TODO: implement the seek and other event handling */
-
- ret = gst_pad_push_event (flxdec->sinkpad, event);
-
- gst_object_unref (flxdec);
+ if (!ret)
+ ret = gst_pad_query_default (pad, parent, query);
return ret;
}
static gboolean
-gst_flxdec_sink_event_handler (GstPad * pad, GstEvent * event)
+gst_flxdec_sink_event_handler (GstPad * pad, GstObject * parent,
+ GstEvent * event)
{
GstFlxDec *flxdec;
gboolean ret;
- flxdec = GST_FLXDEC (gst_pad_get_parent (pad));
+ flxdec = GST_FLXDEC (parent);
- ret = gst_pad_push_event (flxdec->srcpad, event);
+ switch (GST_EVENT_TYPE (event)) {
+ case GST_EVENT_SEGMENT:
+ {
+ GstSegment segment;
+
+ gst_event_copy_segment (event, &segment);
+ if (segment.format != GST_FORMAT_TIME) {
+ GST_DEBUG_OBJECT (flxdec, "generating TIME segment");
+ gst_segment_init (&segment, GST_FORMAT_TIME);
+ gst_event_unref (event);
+ event = gst_event_new_segment (&segment);
+ }
+ /* fall-through */
+ }
+ default:
+ ret = gst_pad_event_default (pad, parent, event);
+ break;
+ }
- gst_object_unref (flxdec);
return ret;
}
@@ -359,11 +335,10 @@ flx_decode_delta_fli (GstFlxDec * flxdec, guchar * data, guchar * dest)
guchar *start_p, x;
g_return_if_fail (flxdec != NULL);
- g_return_if_fail (flxdec->delta != NULL);
+ g_return_if_fail (flxdec->delta_data != NULL);
/* use last frame for delta */
- memcpy (dest, GST_BUFFER_DATA (flxdec->delta),
- GST_BUFFER_SIZE (flxdec->delta));
+ memcpy (dest, flxdec->delta_data, flxdec->size);
start_line = (data[0] + (data[1] << 8));
lines = (data[2] + (data[3] << 8));
@@ -410,11 +385,10 @@ flx_decode_delta_flc (GstFlxDec * flxdec, guchar * data, guchar * dest)
guchar *start_p;
g_return_if_fail (flxdec != NULL);
- g_return_if_fail (flxdec->delta != NULL);
+ g_return_if_fail (flxdec->delta_data != NULL);
/* use last frame for delta */
- memcpy (dest, GST_BUFFER_DATA (flxdec->delta),
- GST_BUFFER_SIZE (flxdec->delta));
+ memcpy (dest, flxdec->delta_data, flxdec->size);
lines = (data[0] + (data[1] << 8));
data += 2;
@@ -469,7 +443,7 @@ flx_decode_delta_flc (GstFlxDec * flxdec, guchar * data, guchar * dest)
}
static GstFlowReturn
-gst_flxdec_chain (GstPad * pad, GstBuffer * buf)
+gst_flxdec_chain (GstPad * pad, GstObject * parent, GstBuffer * buf)
{
GstCaps *caps;
guint avail;
@@ -479,7 +453,7 @@ gst_flxdec_chain (GstPad * pad, GstBuffer * buf)
FlxHeader *flxh;
g_return_val_if_fail (buf != NULL, GST_FLOW_ERROR);
- flxdec = (GstFlxDec *) gst_pad_get_parent (pad);
+ flxdec = (GstFlxDec *) parent;
g_return_val_if_fail (flxdec != NULL, GST_FLOW_ERROR);
gst_adapter_push (flxdec->adapter, buf);
@@ -487,10 +461,12 @@ gst_flxdec_chain (GstPad * pad, GstBuffer * buf)
if (flxdec->state == GST_FLXDEC_READ_HEADER) {
if (avail >= FlxHeaderSize) {
- const guint8 *data = gst_adapter_peek (flxdec->adapter, FlxHeaderSize);
+ const guint8 *data = gst_adapter_map (flxdec->adapter, FlxHeaderSize);
+ GstCaps *templ;
memcpy ((gchar *) & flxdec->hdr, data, FlxHeaderSize);
FLX_HDR_FIX_ENDIANNESS (&(flxdec->hdr));
+ gst_adapter_unmap (flxdec->adapter);
gst_adapter_flush (flxdec->adapter, FlxHeaderSize);
flxh = &flxdec->hdr;
@@ -521,7 +497,9 @@ gst_flxdec_chain (GstPad * pad, GstBuffer * buf)
GST_LOG ("duration : %" GST_TIME_FORMAT,
GST_TIME_ARGS (flxdec->duration));
- caps = gst_caps_from_string (GST_VIDEO_CAPS_xRGB_HOST_ENDIAN);
+ templ = gst_pad_get_pad_template_caps (flxdec->srcpad);
+ caps = gst_caps_copy (templ);
+ gst_caps_unref (templ);
gst_caps_set_simple (caps,
"width", G_TYPE_INT, flxh->width,
"height", G_TYPE_INT, flxh->height,
@@ -545,14 +523,8 @@ gst_flxdec_chain (GstPad * pad, GstBuffer * buf)
flxdec->size = (flxh->width * flxh->height);
/* create delta and output frame */
- flxdec->frame = gst_buffer_new ();
- flxdec->delta = gst_buffer_new ();
- GST_BUFFER_DATA (flxdec->frame) = g_malloc (flxdec->size);
- GST_BUFFER_MALLOCDATA (flxdec->frame) = GST_BUFFER_DATA (flxdec->frame);
- GST_BUFFER_SIZE (flxdec->frame) = flxdec->size;
- GST_BUFFER_DATA (flxdec->delta) = g_malloc (flxdec->size);
- GST_BUFFER_MALLOCDATA (flxdec->delta) = GST_BUFFER_DATA (flxdec->delta);
- GST_BUFFER_SIZE (flxdec->delta) = flxdec->size;
+ flxdec->frame_data = g_malloc (flxdec->size);
+ flxdec->delta_data = g_malloc (flxdec->size);
flxdec->state = GST_FLXDEC_PLAYING;
}
@@ -560,15 +532,17 @@ gst_flxdec_chain (GstPad * pad, GstBuffer * buf)
GstBuffer *out;
/* while we have enough data in the adapter */
- while (avail >= FlxFrameChunkSize) {
+ while (avail >= FlxFrameChunkSize && res == GST_FLOW_OK) {
FlxFrameChunk flxfh;
guchar *chunk;
const guint8 *data;
+ GstMapInfo map;
chunk = NULL;
- data = gst_adapter_peek (flxdec->adapter, FlxFrameChunkSize);
+ data = gst_adapter_map (flxdec->adapter, FlxFrameChunkSize);
memcpy (&flxfh, data, FlxFrameChunkSize);
FLX_FRAME_CHUNK_FIX_ENDIANNESS (&flxfh);
+ gst_adapter_unmap (flxdec->adapter);
switch (flxfh.id) {
case FLX_FRAME_TYPE:
@@ -586,29 +560,32 @@ gst_flxdec_chain (GstPad * pad, GstBuffer * buf)
break;
/* create 32 bits output frame */
- res = gst_pad_alloc_buffer_and_set_caps (flxdec->srcpad,
- GST_BUFFER_OFFSET_NONE,
- flxdec->size * 4, GST_PAD_CAPS (flxdec->srcpad), &out);
- if (res != GST_FLOW_OK)
- break;
+// res = gst_pad_alloc_buffer_and_set_caps (flxdec->srcpad,
+// GST_BUFFER_OFFSET_NONE,
+// flxdec->size * 4, GST_PAD_CAPS (flxdec->srcpad), &out);
+// if (res != GST_FLOW_OK)
+// break;
+
+ out = gst_buffer_new_and_alloc (flxdec->size * 4);
/* decode chunks */
flx_decode_chunks (flxdec,
((FlxFrameType *) chunk)->chunks,
- chunk + FlxFrameTypeSize, GST_BUFFER_DATA (flxdec->frame));
+ chunk + FlxFrameTypeSize, flxdec->frame_data);
/* save copy of the current frame for possible delta. */
- memcpy (GST_BUFFER_DATA (flxdec->delta),
- GST_BUFFER_DATA (flxdec->frame), GST_BUFFER_SIZE (flxdec->delta));
+ memcpy (flxdec->delta_data, flxdec->frame_data, flxdec->size);
+ gst_buffer_map (out, &map, GST_MAP_WRITE);
/* convert current frame. */
- flx_colorspace_convert (flxdec->converter,
- GST_BUFFER_DATA (flxdec->frame), GST_BUFFER_DATA (out));
+ flx_colorspace_convert (flxdec->converter, flxdec->frame_data,
+ map.data);
+ gst_buffer_unmap (out, &map);
GST_BUFFER_TIMESTAMP (out) = flxdec->next_time;
flxdec->next_time += flxdec->frame_time;
- gst_pad_push (flxdec->srcpad, out);
+ res = gst_pad_push (flxdec->srcpad, out);
break;
}
@@ -619,7 +596,6 @@ gst_flxdec_chain (GstPad * pad, GstBuffer * buf)
}
}
need_more_data:
- gst_object_unref (flxdec);
return res;
/* ERRORS */
@@ -653,19 +629,23 @@ gst_flxdec_change_state (GstElement * element, GstStateChange transition)
break;
}
- ret = parent_class->change_state (element, transition);
+ ret = GST_ELEMENT_CLASS (parent_class)->change_state (element, transition);
switch (transition) {
case GST_STATE_CHANGE_PLAYING_TO_PAUSED:
break;
case GST_STATE_CHANGE_PAUSED_TO_READY:
- if (flxdec->frame) {
- gst_buffer_unref (flxdec->frame);
- flxdec->frame = NULL;
+ if (flxdec->frame_data) {
+ g_free (flxdec->frame_data);
+ flxdec->frame_data = NULL;
+ }
+ if (flxdec->delta_data) {
+ g_free (flxdec->delta_data);
+ flxdec->delta_data = NULL;
}
- if (flxdec->delta) {
- gst_buffer_unref (flxdec->delta);
- flxdec->delta = NULL;
+ if (flxdec->converter) {
+ flx_colorspace_converter_destroy (flxdec->converter);
+ flxdec->converter = NULL;
}
break;
case GST_STATE_CHANGE_READY_TO_NULL:
diff --git a/gst/flx/gstflxdec.h b/gst/flx/gstflxdec.h
index d447c7db39f9a5d45c2e09b1b17d701297455a82..55f5b7f401634ee65018337023e69a550798cd7f 100644
--- a/gst/flx/gstflxdec.h
+++ b/gst/flx/gstflxdec.h
@@ -43,7 +43,7 @@ struct _GstFlxDec {
gboolean active, new_meta;
- GstBuffer *delta, *frame;
+ guint8 *delta_data, *frame_data;
GstAdapter *adapter;
gulong size;
GstFlxDecState state;
diff --git a/gst/goom/Makefile.in b/gst/goom/Makefile.in
index af721060972aa2f2cd95387b9d49a3ad524e1b29..bf1620c25a2fde7eb43a70c14911c23bd94e5703 100644
--- a/gst/goom/Makefile.in
+++ b/gst/goom/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.11.4 from Makefile.am.
+# Makefile.in generated by automake 1.11.5 from Makefile.am.
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -58,6 +58,7 @@ am__aclocal_m4_deps = $(top_srcdir)/common/m4/as-ac-expand.m4 \
$(top_srcdir)/common/m4/as-auto-alt.m4 \
$(top_srcdir)/common/m4/as-compiler-flag.m4 \
$(top_srcdir)/common/m4/as-gcc-inline-assembly.m4 \
+ $(top_srcdir)/common/m4/as-libtool.m4 \
$(top_srcdir)/common/m4/as-objc.m4 \
$(top_srcdir)/common/m4/as-python.m4 \
$(top_srcdir)/common/m4/as-scrub-include.m4 \
@@ -274,6 +275,7 @@ GMSGFMT_015 = @GMSGFMT_015@
GREP = @GREP@
GSTPB_PLUGINS_DIR = @GSTPB_PLUGINS_DIR@
GSTPB_PREFIX = @GSTPB_PREFIX@
+GST_AGE = @GST_AGE@
GST_ALL_LDFLAGS = @GST_ALL_LDFLAGS@
GST_API_VERSION = @GST_API_VERSION@
GST_BASE_CFLAGS = @GST_BASE_CFLAGS@
@@ -283,9 +285,11 @@ GST_CHECK_CFLAGS = @GST_CHECK_CFLAGS@
GST_CHECK_LIBS = @GST_CHECK_LIBS@
GST_CONTROLLER_CFLAGS = @GST_CONTROLLER_CFLAGS@
GST_CONTROLLER_LIBS = @GST_CONTROLLER_LIBS@
+GST_CURRENT = @GST_CURRENT@
GST_CXXFLAGS = @GST_CXXFLAGS@
GST_LEVEL_DEFAULT = @GST_LEVEL_DEFAULT@
GST_LIBS = @GST_LIBS@
+GST_LIBVERSION = @GST_LIBVERSION@
GST_LICENSE = @GST_LICENSE@
GST_LT_LDFLAGS = @GST_LT_LDFLAGS@
GST_NET_CFLAGS = @GST_NET_CFLAGS@
@@ -303,6 +307,7 @@ GST_PLUGINS_NONPORTED = @GST_PLUGINS_NONPORTED@
GST_PLUGINS_SELECTED = @GST_PLUGINS_SELECTED@
GST_PLUGIN_LDFLAGS = @GST_PLUGIN_LDFLAGS@
GST_PREFIX = @GST_PREFIX@
+GST_REVISION = @GST_REVISION@
GST_TOOLS_DIR = @GST_TOOLS_DIR@
GTKDOC_CHECK = @GTKDOC_CHECK@
GTK_CFLAGS = @GTK_CFLAGS@
@@ -581,7 +586,7 @@ install-pluginLTLIBRARIES: $(plugin_LTLIBRARIES)
done; \
test -z "$$list2" || { \
echo " $(MKDIR_P) '$(DESTDIR)$(plugindir)'"; \
- $(MKDIR_P) '$(DESTDIR)$(plugindir)' || exit 1; \
+ $(MKDIR_P) "$(DESTDIR)$(plugindir)" || exit 1; \
echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 '$(DESTDIR)$(plugindir)'"; \
$(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 "$(DESTDIR)$(plugindir)"; \
}
diff --git a/gst/goom2k1/Makefile.in b/gst/goom2k1/Makefile.in
index 72f72444602a5d156d8a9a720943650844c107f5..950ca47ab1b694208aa6f71ccb91b20670c5f8f6 100644
--- a/gst/goom2k1/Makefile.in
+++ b/gst/goom2k1/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.11.4 from Makefile.am.
+# Makefile.in generated by automake 1.11.5 from Makefile.am.
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -60,6 +60,7 @@ am__aclocal_m4_deps = $(top_srcdir)/common/m4/as-ac-expand.m4 \
$(top_srcdir)/common/m4/as-auto-alt.m4 \
$(top_srcdir)/common/m4/as-compiler-flag.m4 \
$(top_srcdir)/common/m4/as-gcc-inline-assembly.m4 \
+ $(top_srcdir)/common/m4/as-libtool.m4 \
$(top_srcdir)/common/m4/as-objc.m4 \
$(top_srcdir)/common/m4/as-python.m4 \
$(top_srcdir)/common/m4/as-scrub-include.m4 \
@@ -258,6 +259,7 @@ GMSGFMT_015 = @GMSGFMT_015@
GREP = @GREP@
GSTPB_PLUGINS_DIR = @GSTPB_PLUGINS_DIR@
GSTPB_PREFIX = @GSTPB_PREFIX@
+GST_AGE = @GST_AGE@
GST_ALL_LDFLAGS = @GST_ALL_LDFLAGS@
GST_API_VERSION = @GST_API_VERSION@
GST_BASE_CFLAGS = @GST_BASE_CFLAGS@
@@ -267,9 +269,11 @@ GST_CHECK_CFLAGS = @GST_CHECK_CFLAGS@
GST_CHECK_LIBS = @GST_CHECK_LIBS@
GST_CONTROLLER_CFLAGS = @GST_CONTROLLER_CFLAGS@
GST_CONTROLLER_LIBS = @GST_CONTROLLER_LIBS@
+GST_CURRENT = @GST_CURRENT@
GST_CXXFLAGS = @GST_CXXFLAGS@
GST_LEVEL_DEFAULT = @GST_LEVEL_DEFAULT@
GST_LIBS = @GST_LIBS@
+GST_LIBVERSION = @GST_LIBVERSION@
GST_LICENSE = @GST_LICENSE@
GST_LT_LDFLAGS = @GST_LT_LDFLAGS@
GST_NET_CFLAGS = @GST_NET_CFLAGS@
@@ -287,6 +291,7 @@ GST_PLUGINS_NONPORTED = @GST_PLUGINS_NONPORTED@
GST_PLUGINS_SELECTED = @GST_PLUGINS_SELECTED@
GST_PLUGIN_LDFLAGS = @GST_PLUGIN_LDFLAGS@
GST_PREFIX = @GST_PREFIX@
+GST_REVISION = @GST_REVISION@
GST_TOOLS_DIR = @GST_TOOLS_DIR@
GTKDOC_CHECK = @GTKDOC_CHECK@
GTK_CFLAGS = @GTK_CFLAGS@
@@ -540,7 +545,7 @@ install-pluginLTLIBRARIES: $(plugin_LTLIBRARIES)
done; \
test -z "$$list2" || { \
echo " $(MKDIR_P) '$(DESTDIR)$(plugindir)'"; \
- $(MKDIR_P) '$(DESTDIR)$(plugindir)' || exit 1; \
+ $(MKDIR_P) "$(DESTDIR)$(plugindir)" || exit 1; \
echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 '$(DESTDIR)$(plugindir)'"; \
$(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 "$(DESTDIR)$(plugindir)"; \
}
diff --git a/gst/icydemux/Makefile.in b/gst/icydemux/Makefile.in
index 6d28a6d4ba19991d6e201ca7e4f3f4af9e6ed634..c385bba74b3f4a24ebf734c21a63c885c416598e 100644
--- a/gst/icydemux/Makefile.in
+++ b/gst/icydemux/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.11.4 from Makefile.am.
+# Makefile.in generated by automake 1.11.5 from Makefile.am.
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -60,6 +60,7 @@ am__aclocal_m4_deps = $(top_srcdir)/common/m4/as-ac-expand.m4 \
$(top_srcdir)/common/m4/as-auto-alt.m4 \
$(top_srcdir)/common/m4/as-compiler-flag.m4 \
$(top_srcdir)/common/m4/as-gcc-inline-assembly.m4 \
+ $(top_srcdir)/common/m4/as-libtool.m4 \
$(top_srcdir)/common/m4/as-objc.m4 \
$(top_srcdir)/common/m4/as-python.m4 \
$(top_srcdir)/common/m4/as-scrub-include.m4 \
@@ -256,6 +257,7 @@ GMSGFMT_015 = @GMSGFMT_015@
GREP = @GREP@
GSTPB_PLUGINS_DIR = @GSTPB_PLUGINS_DIR@
GSTPB_PREFIX = @GSTPB_PREFIX@
+GST_AGE = @GST_AGE@
GST_ALL_LDFLAGS = @GST_ALL_LDFLAGS@
GST_API_VERSION = @GST_API_VERSION@
GST_BASE_CFLAGS = @GST_BASE_CFLAGS@
@@ -265,9 +267,11 @@ GST_CHECK_CFLAGS = @GST_CHECK_CFLAGS@
GST_CHECK_LIBS = @GST_CHECK_LIBS@
GST_CONTROLLER_CFLAGS = @GST_CONTROLLER_CFLAGS@
GST_CONTROLLER_LIBS = @GST_CONTROLLER_LIBS@
+GST_CURRENT = @GST_CURRENT@
GST_CXXFLAGS = @GST_CXXFLAGS@
GST_LEVEL_DEFAULT = @GST_LEVEL_DEFAULT@
GST_LIBS = @GST_LIBS@
+GST_LIBVERSION = @GST_LIBVERSION@
GST_LICENSE = @GST_LICENSE@
GST_LT_LDFLAGS = @GST_LT_LDFLAGS@
GST_NET_CFLAGS = @GST_NET_CFLAGS@
@@ -285,6 +289,7 @@ GST_PLUGINS_NONPORTED = @GST_PLUGINS_NONPORTED@
GST_PLUGINS_SELECTED = @GST_PLUGINS_SELECTED@
GST_PLUGIN_LDFLAGS = @GST_PLUGIN_LDFLAGS@
GST_PREFIX = @GST_PREFIX@
+GST_REVISION = @GST_REVISION@
GST_TOOLS_DIR = @GST_TOOLS_DIR@
GTKDOC_CHECK = @GTKDOC_CHECK@
GTK_CFLAGS = @GTK_CFLAGS@
@@ -535,7 +540,7 @@ install-pluginLTLIBRARIES: $(plugin_LTLIBRARIES)
done; \
test -z "$$list2" || { \
echo " $(MKDIR_P) '$(DESTDIR)$(plugindir)'"; \
- $(MKDIR_P) '$(DESTDIR)$(plugindir)' || exit 1; \
+ $(MKDIR_P) "$(DESTDIR)$(plugindir)" || exit 1; \
echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 '$(DESTDIR)$(plugindir)'"; \
$(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 "$(DESTDIR)$(plugindir)"; \
}
diff --git a/gst/id3demux/Makefile.in b/gst/id3demux/Makefile.in
index 5ff22226ad26307b3ff85191ccb89852d605102a..2bee50a44ddc58853e894238299c9bc34228f686 100644
--- a/gst/id3demux/Makefile.in
+++ b/gst/id3demux/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.11.4 from Makefile.am.
+# Makefile.in generated by automake 1.11.5 from Makefile.am.
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -60,6 +60,7 @@ am__aclocal_m4_deps = $(top_srcdir)/common/m4/as-ac-expand.m4 \
$(top_srcdir)/common/m4/as-auto-alt.m4 \
$(top_srcdir)/common/m4/as-compiler-flag.m4 \
$(top_srcdir)/common/m4/as-gcc-inline-assembly.m4 \
+ $(top_srcdir)/common/m4/as-libtool.m4 \
$(top_srcdir)/common/m4/as-objc.m4 \
$(top_srcdir)/common/m4/as-python.m4 \
$(top_srcdir)/common/m4/as-scrub-include.m4 \
@@ -255,6 +256,7 @@ GMSGFMT_015 = @GMSGFMT_015@
GREP = @GREP@
GSTPB_PLUGINS_DIR = @GSTPB_PLUGINS_DIR@
GSTPB_PREFIX = @GSTPB_PREFIX@
+GST_AGE = @GST_AGE@
GST_ALL_LDFLAGS = @GST_ALL_LDFLAGS@
GST_API_VERSION = @GST_API_VERSION@
GST_BASE_CFLAGS = @GST_BASE_CFLAGS@
@@ -264,9 +266,11 @@ GST_CHECK_CFLAGS = @GST_CHECK_CFLAGS@
GST_CHECK_LIBS = @GST_CHECK_LIBS@
GST_CONTROLLER_CFLAGS = @GST_CONTROLLER_CFLAGS@
GST_CONTROLLER_LIBS = @GST_CONTROLLER_LIBS@
+GST_CURRENT = @GST_CURRENT@
GST_CXXFLAGS = @GST_CXXFLAGS@
GST_LEVEL_DEFAULT = @GST_LEVEL_DEFAULT@
GST_LIBS = @GST_LIBS@
+GST_LIBVERSION = @GST_LIBVERSION@
GST_LICENSE = @GST_LICENSE@
GST_LT_LDFLAGS = @GST_LT_LDFLAGS@
GST_NET_CFLAGS = @GST_NET_CFLAGS@
@@ -284,6 +288,7 @@ GST_PLUGINS_NONPORTED = @GST_PLUGINS_NONPORTED@
GST_PLUGINS_SELECTED = @GST_PLUGINS_SELECTED@
GST_PLUGIN_LDFLAGS = @GST_PLUGIN_LDFLAGS@
GST_PREFIX = @GST_PREFIX@
+GST_REVISION = @GST_REVISION@
GST_TOOLS_DIR = @GST_TOOLS_DIR@
GTKDOC_CHECK = @GTKDOC_CHECK@
GTK_CFLAGS = @GTK_CFLAGS@
@@ -536,7 +541,7 @@ install-pluginLTLIBRARIES: $(plugin_LTLIBRARIES)
done; \
test -z "$$list2" || { \
echo " $(MKDIR_P) '$(DESTDIR)$(plugindir)'"; \
- $(MKDIR_P) '$(DESTDIR)$(plugindir)' || exit 1; \
+ $(MKDIR_P) "$(DESTDIR)$(plugindir)" || exit 1; \
echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 '$(DESTDIR)$(plugindir)'"; \
$(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 "$(DESTDIR)$(plugindir)"; \
}
diff --git a/gst/imagefreeze/Makefile.in b/gst/imagefreeze/Makefile.in
index 19db13c2197a79fdb349f8fe456bbe8664d040ed..e2d8fddf2ff25e1c3e59a079a50c54ab7b963ff4 100644
--- a/gst/imagefreeze/Makefile.in
+++ b/gst/imagefreeze/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.11.4 from Makefile.am.
+# Makefile.in generated by automake 1.11.5 from Makefile.am.
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -60,6 +60,7 @@ am__aclocal_m4_deps = $(top_srcdir)/common/m4/as-ac-expand.m4 \
$(top_srcdir)/common/m4/as-auto-alt.m4 \
$(top_srcdir)/common/m4/as-compiler-flag.m4 \
$(top_srcdir)/common/m4/as-gcc-inline-assembly.m4 \
+ $(top_srcdir)/common/m4/as-libtool.m4 \
$(top_srcdir)/common/m4/as-objc.m4 \
$(top_srcdir)/common/m4/as-python.m4 \
$(top_srcdir)/common/m4/as-scrub-include.m4 \
@@ -255,6 +256,7 @@ GMSGFMT_015 = @GMSGFMT_015@
GREP = @GREP@
GSTPB_PLUGINS_DIR = @GSTPB_PLUGINS_DIR@
GSTPB_PREFIX = @GSTPB_PREFIX@
+GST_AGE = @GST_AGE@
GST_ALL_LDFLAGS = @GST_ALL_LDFLAGS@
GST_API_VERSION = @GST_API_VERSION@
GST_BASE_CFLAGS = @GST_BASE_CFLAGS@
@@ -264,9 +266,11 @@ GST_CHECK_CFLAGS = @GST_CHECK_CFLAGS@
GST_CHECK_LIBS = @GST_CHECK_LIBS@
GST_CONTROLLER_CFLAGS = @GST_CONTROLLER_CFLAGS@
GST_CONTROLLER_LIBS = @GST_CONTROLLER_LIBS@
+GST_CURRENT = @GST_CURRENT@
GST_CXXFLAGS = @GST_CXXFLAGS@
GST_LEVEL_DEFAULT = @GST_LEVEL_DEFAULT@
GST_LIBS = @GST_LIBS@
+GST_LIBVERSION = @GST_LIBVERSION@
GST_LICENSE = @GST_LICENSE@
GST_LT_LDFLAGS = @GST_LT_LDFLAGS@
GST_NET_CFLAGS = @GST_NET_CFLAGS@
@@ -284,6 +288,7 @@ GST_PLUGINS_NONPORTED = @GST_PLUGINS_NONPORTED@
GST_PLUGINS_SELECTED = @GST_PLUGINS_SELECTED@
GST_PLUGIN_LDFLAGS = @GST_PLUGIN_LDFLAGS@
GST_PREFIX = @GST_PREFIX@
+GST_REVISION = @GST_REVISION@
GST_TOOLS_DIR = @GST_TOOLS_DIR@
GTKDOC_CHECK = @GTKDOC_CHECK@
GTK_CFLAGS = @GTK_CFLAGS@
@@ -534,7 +539,7 @@ install-pluginLTLIBRARIES: $(plugin_LTLIBRARIES)
done; \
test -z "$$list2" || { \
echo " $(MKDIR_P) '$(DESTDIR)$(plugindir)'"; \
- $(MKDIR_P) '$(DESTDIR)$(plugindir)' || exit 1; \
+ $(MKDIR_P) "$(DESTDIR)$(plugindir)" || exit 1; \
echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 '$(DESTDIR)$(plugindir)'"; \
$(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 "$(DESTDIR)$(plugindir)"; \
}
diff --git a/gst/interleave/Makefile.in b/gst/interleave/Makefile.in
index 951ca734125df64d65fd511c987616cb9010d2ef..ccbdf762ad5ab29c8f5e7bd00071b9aa5de1dbf4 100644
--- a/gst/interleave/Makefile.in
+++ b/gst/interleave/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.11.4 from Makefile.am.
+# Makefile.in generated by automake 1.11.5 from Makefile.am.
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -60,6 +60,7 @@ am__aclocal_m4_deps = $(top_srcdir)/common/m4/as-ac-expand.m4 \
$(top_srcdir)/common/m4/as-auto-alt.m4 \
$(top_srcdir)/common/m4/as-compiler-flag.m4 \
$(top_srcdir)/common/m4/as-gcc-inline-assembly.m4 \
+ $(top_srcdir)/common/m4/as-libtool.m4 \
$(top_srcdir)/common/m4/as-objc.m4 \
$(top_srcdir)/common/m4/as-python.m4 \
$(top_srcdir)/common/m4/as-scrub-include.m4 \
@@ -257,6 +258,7 @@ GMSGFMT_015 = @GMSGFMT_015@
GREP = @GREP@
GSTPB_PLUGINS_DIR = @GSTPB_PLUGINS_DIR@
GSTPB_PREFIX = @GSTPB_PREFIX@
+GST_AGE = @GST_AGE@
GST_ALL_LDFLAGS = @GST_ALL_LDFLAGS@
GST_API_VERSION = @GST_API_VERSION@
GST_BASE_CFLAGS = @GST_BASE_CFLAGS@
@@ -266,9 +268,11 @@ GST_CHECK_CFLAGS = @GST_CHECK_CFLAGS@
GST_CHECK_LIBS = @GST_CHECK_LIBS@
GST_CONTROLLER_CFLAGS = @GST_CONTROLLER_CFLAGS@
GST_CONTROLLER_LIBS = @GST_CONTROLLER_LIBS@
+GST_CURRENT = @GST_CURRENT@
GST_CXXFLAGS = @GST_CXXFLAGS@
GST_LEVEL_DEFAULT = @GST_LEVEL_DEFAULT@
GST_LIBS = @GST_LIBS@
+GST_LIBVERSION = @GST_LIBVERSION@
GST_LICENSE = @GST_LICENSE@
GST_LT_LDFLAGS = @GST_LT_LDFLAGS@
GST_NET_CFLAGS = @GST_NET_CFLAGS@
@@ -286,6 +290,7 @@ GST_PLUGINS_NONPORTED = @GST_PLUGINS_NONPORTED@
GST_PLUGINS_SELECTED = @GST_PLUGINS_SELECTED@
GST_PLUGIN_LDFLAGS = @GST_PLUGIN_LDFLAGS@
GST_PREFIX = @GST_PREFIX@
+GST_REVISION = @GST_REVISION@
GST_TOOLS_DIR = @GST_TOOLS_DIR@
GTKDOC_CHECK = @GTKDOC_CHECK@
GTK_CFLAGS = @GTK_CFLAGS@
@@ -536,7 +541,7 @@ install-pluginLTLIBRARIES: $(plugin_LTLIBRARIES)
done; \
test -z "$$list2" || { \
echo " $(MKDIR_P) '$(DESTDIR)$(plugindir)'"; \
- $(MKDIR_P) '$(DESTDIR)$(plugindir)' || exit 1; \
+ $(MKDIR_P) "$(DESTDIR)$(plugindir)" || exit 1; \
echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 '$(DESTDIR)$(plugindir)'"; \
$(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 "$(DESTDIR)$(plugindir)"; \
}
diff --git a/gst/interleave/interleave.c b/gst/interleave/interleave.c
index e51490a0d356266b04c94bd36daa7f0620c5c088..5055969c00857716f648e27936174836b696846b 100644
--- a/gst/interleave/interleave.c
+++ b/gst/interleave/interleave.c
@@ -57,6 +57,10 @@
* </refsect2>
*/
+/* FIXME 0.11: suppress warnings for deprecated API such as GValueArray
+ * with newer GLib versions (>= 2.31.0) */
+#define GLIB_DISABLE_DEPRECATION_WARNINGS
+
#ifdef HAVE_CONFIG_H
# include "config.h"
#endif
@@ -211,8 +215,8 @@ static gboolean gst_interleave_src_query (GstPad * pad, GstObject * parent,
static gboolean gst_interleave_src_event (GstPad * pad, GstObject * parent,
GstEvent * event);
-static gboolean gst_interleave_sink_event (GstCollectPads2 * pads,
- GstCollectData2 * data, GstEvent * event, gpointer user_data);
+static gboolean gst_interleave_sink_event (GstCollectPads * pads,
+ GstCollectData * data, GstEvent * event, gpointer user_data);
static gboolean gst_interleave_sink_setcaps (GstInterleave * self,
GstPad * pad, const GstCaps * caps);
@@ -220,7 +224,7 @@ static gboolean gst_interleave_sink_setcaps (GstInterleave * self,
static GstCaps *gst_interleave_sink_getcaps (GstPad * pad, GstObject * parent,
GstCaps * filter);
-static GstFlowReturn gst_interleave_collected (GstCollectPads2 * pads,
+static GstFlowReturn gst_interleave_collected (GstCollectPads * pads,
GstInterleave * self);
static void
@@ -388,9 +392,9 @@ gst_interleave_init (GstInterleave * self)
gst_pad_set_active (self->src, TRUE);
gst_element_add_pad (GST_ELEMENT (self), self->src);
- self->collect = gst_collect_pads2_new ();
- gst_collect_pads2_set_function (self->collect,
- (GstCollectPads2Function) gst_interleave_collected, self);
+ self->collect = gst_collect_pads_new ();
+ gst_collect_pads_set_function (self->collect,
+ (GstCollectPadsFunction) gst_interleave_collected, self);
self->input_channel_positions = g_value_array_new (0);
self->channel_positions_from_input = TRUE;
@@ -477,10 +481,10 @@ gst_interleave_request_new_pad (GstElement * element, GstPadTemplate * templ,
gst_pad_use_fixed_caps (new_pad);
- gst_collect_pads2_add_pad (self->collect, new_pad, sizeof (GstCollectData2));
+ gst_collect_pads_add_pad (self->collect, new_pad, sizeof (GstCollectData));
- gst_collect_pads2_set_event_function (self->collect,
- (GstCollectPads2EventFunction)
+ gst_collect_pads_set_event_function (self->collect,
+ (GstCollectPadsEventFunction)
GST_DEBUG_FUNCPTR (gst_interleave_sink_event), self);
if (!gst_element_add_pad (element, new_pad))
@@ -524,7 +528,7 @@ not_sink_pad:
could_not_add:
{
GST_DEBUG_OBJECT (self, "could not add pad %s", GST_PAD_NAME (new_pad));
- gst_collect_pads2_remove_pad (self->collect, new_pad);
+ gst_collect_pads_remove_pad (self->collect, new_pad);
gst_object_unref (new_pad);
return NULL;
}
@@ -579,7 +583,7 @@ gst_interleave_release_pad (GstElement * element, GstPad * pad)
GST_OBJECT_UNLOCK (self->collect);
- gst_collect_pads2_remove_pad (self->collect, pad);
+ gst_collect_pads_remove_pad (self->collect, pad);
gst_element_remove_pad (element, pad);
}
@@ -601,7 +605,7 @@ gst_interleave_change_state (GstElement * element, GstStateChange transition)
self->segment_position = 0;
self->segment_rate = 1.0;
gst_segment_init (&self->segment, GST_FORMAT_UNDEFINED);
- gst_collect_pads2_start (self->collect);
+ gst_collect_pads_start (self->collect);
break;
case GST_STATE_CHANGE_PAUSED_TO_PLAYING:
break;
@@ -610,11 +614,11 @@ gst_interleave_change_state (GstElement * element, GstStateChange transition)
}
/* Stop before calling the parent's state change function as
- * GstCollectPads2 might take locks and we would deadlock in that
+ * GstCollectPads might take locks and we would deadlock in that
* case
*/
if (transition == GST_STATE_CHANGE_PAUSED_TO_READY)
- gst_collect_pads2_stop (self->collect);
+ gst_collect_pads_stop (self->collect);
ret = GST_ELEMENT_CLASS (parent_class)->change_state (element, transition);
@@ -786,6 +790,8 @@ gst_interleave_sink_setcaps (GstInterleave * self, GstPad * pad,
gst_structure_remove_field (s, "channel-mask");
+ GST_DEBUG_OBJECT (self, "setting sinkcaps %" GST_PTR_FORMAT, sinkcaps);
+
gst_caps_replace (&self->sinkcaps, sinkcaps);
gst_caps_unref (sinkcaps);
@@ -812,11 +818,11 @@ invalid_caps:
}
static gboolean
-gst_interleave_sink_event (GstCollectPads2 * pads, GstCollectData2 * data,
+gst_interleave_sink_event (GstCollectPads * pads, GstCollectData * data,
GstEvent * event, gpointer user_data)
{
GstInterleave *self = GST_INTERLEAVE (user_data);
- gboolean ret = FALSE;
+ gboolean ret = TRUE;
GST_DEBUG ("Got %s event on pad %s:%s", GST_EVENT_TYPE_NAME (event),
GST_DEBUG_PAD_NAME (data->pad));
@@ -838,14 +844,17 @@ gst_interleave_sink_event (GstCollectPads2 * pads, GstCollectData2 * data,
gst_event_parse_caps (event, &caps);
ret = gst_interleave_sink_setcaps (self, data->pad, caps);
gst_event_unref (event);
+ event = NULL;
break;
}
default:
- ret = gst_pad_event_default (data->pad, GST_OBJECT (self), event);
break;
}
- /* now GstCollectPads2 can take care of the rest, e.g. EOS */
+ /* now GstCollectPads can take care of the rest, e.g. EOS */
+ if (event != NULL)
+ return gst_collect_pads_event_default (pads, data, event, FALSE);
+
return ret;
}
@@ -1135,7 +1144,7 @@ gst_interleave_src_event (GstPad * pad, GstObject * parent, GstEvent * event)
/* check if we are flushing */
if (flags & GST_SEEK_FLAG_FLUSH) {
/* make sure we accept nothing anymore and return WRONG_STATE */
- gst_collect_pads2_set_flushing (self->collect, TRUE);
+ gst_collect_pads_set_flushing (self->collect, TRUE);
/* flushing seek, start flush downstream, the flush will be done
* when all pads received a FLUSH_STOP. */
@@ -1169,10 +1178,10 @@ gst_interleave_src_event (GstPad * pad, GstObject * parent, GstEvent * event)
}
static GstFlowReturn
-gst_interleave_collected (GstCollectPads2 * pads, GstInterleave * self)
+gst_interleave_collected (GstCollectPads * pads, GstInterleave * self)
{
guint size;
- GstBuffer *outbuf;
+ GstBuffer *outbuf = NULL;
GstFlowReturn ret = GST_FLOW_OK;
GSList *collected;
guint nsamples;
@@ -1181,13 +1190,15 @@ gst_interleave_collected (GstCollectPads2 * pads, GstInterleave * self)
gint width = self->width / 8;
GstMapInfo write_info;
+ size = gst_collect_pads_available (pads);
+ if (size == 0)
+ goto eos;
+
g_return_val_if_fail (self->func != NULL, GST_FLOW_NOT_NEGOTIATED);
g_return_val_if_fail (self->width > 0, GST_FLOW_NOT_NEGOTIATED);
g_return_val_if_fail (self->channels > 0, GST_FLOW_NOT_NEGOTIATED);
g_return_val_if_fail (self->rate > 0, GST_FLOW_NOT_NEGOTIATED);
- size = gst_collect_pads2_available (pads);
-
g_return_val_if_fail (size % width == 0, GST_FLOW_ERROR);
GST_DEBUG_OBJECT (self, "Starting to collect %u bytes from %d channels", size,
@@ -1206,14 +1217,14 @@ gst_interleave_collected (GstCollectPads2 * pads, GstInterleave * self)
memset (write_info.data, 0, size * self->channels);
for (collected = pads->data; collected != NULL; collected = collected->next) {
- GstCollectData2 *cdata;
+ GstCollectData *cdata;
GstBuffer *inbuf;
guint8 *outdata;
GstMapInfo input_info;
- cdata = (GstCollectData2 *) collected->data;
+ cdata = (GstCollectData *) collected->data;
- inbuf = gst_collect_pads2_take_buffer (pads, cdata, size);
+ inbuf = gst_collect_pads_take_buffer (pads, cdata, size);
if (inbuf == NULL) {
GST_DEBUG_OBJECT (cdata->pad, "No buffer available");
goto next;
@@ -1276,7 +1287,8 @@ gst_interleave_collected (GstCollectPads2 * pads, GstInterleave * self)
eos:
{
GST_DEBUG_OBJECT (self, "no data available, must be EOS");
- gst_buffer_unref (outbuf);
+ if (outbuf)
+ gst_buffer_unref (outbuf);
gst_pad_push_event (self->src, gst_event_new_eos ());
return GST_FLOW_EOS;
}
diff --git a/gst/interleave/interleave.h b/gst/interleave/interleave.h
index abe3439e4b3042dd8b82ea99c4b3e512df1f1ce9..fb3b27415d87f8b6c39474b5792c1d1c29f5d6ee 100644
--- a/gst/interleave/interleave.h
+++ b/gst/interleave/interleave.h
@@ -27,7 +27,7 @@
#define __INTERLEAVE_H__
#include <gst/gst.h>
-#include <gst/base/gstcollectpads2.h>
+#include <gst/base/gstcollectpads.h>
G_BEGIN_DECLS
@@ -49,7 +49,7 @@ struct _GstInterleave
GstElement element;
/*< private >*/
- GstCollectPads2 *collect;
+ GstCollectPads *collect;
gint channels;
gint padcounter;
diff --git a/gst/isomp4/Makefile.in b/gst/isomp4/Makefile.in
index 34f6a72a83ec159143ed117086908a058e3eb6d7..23beb5ce9a6d58891539590935ba1e88176b4edf 100644
--- a/gst/isomp4/Makefile.in
+++ b/gst/isomp4/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.11.4 from Makefile.am.
+# Makefile.in generated by automake 1.11.5 from Makefile.am.
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -60,6 +60,7 @@ am__aclocal_m4_deps = $(top_srcdir)/common/m4/as-ac-expand.m4 \
$(top_srcdir)/common/m4/as-auto-alt.m4 \
$(top_srcdir)/common/m4/as-compiler-flag.m4 \
$(top_srcdir)/common/m4/as-gcc-inline-assembly.m4 \
+ $(top_srcdir)/common/m4/as-libtool.m4 \
$(top_srcdir)/common/m4/as-objc.m4 \
$(top_srcdir)/common/m4/as-python.m4 \
$(top_srcdir)/common/m4/as-scrub-include.m4 \
@@ -264,6 +265,7 @@ GMSGFMT_015 = @GMSGFMT_015@
GREP = @GREP@
GSTPB_PLUGINS_DIR = @GSTPB_PLUGINS_DIR@
GSTPB_PREFIX = @GSTPB_PREFIX@
+GST_AGE = @GST_AGE@
GST_ALL_LDFLAGS = @GST_ALL_LDFLAGS@
GST_API_VERSION = @GST_API_VERSION@
GST_BASE_CFLAGS = @GST_BASE_CFLAGS@
@@ -273,9 +275,11 @@ GST_CHECK_CFLAGS = @GST_CHECK_CFLAGS@
GST_CHECK_LIBS = @GST_CHECK_LIBS@
GST_CONTROLLER_CFLAGS = @GST_CONTROLLER_CFLAGS@
GST_CONTROLLER_LIBS = @GST_CONTROLLER_LIBS@
+GST_CURRENT = @GST_CURRENT@
GST_CXXFLAGS = @GST_CXXFLAGS@
GST_LEVEL_DEFAULT = @GST_LEVEL_DEFAULT@
GST_LIBS = @GST_LIBS@
+GST_LIBVERSION = @GST_LIBVERSION@
GST_LICENSE = @GST_LICENSE@
GST_LT_LDFLAGS = @GST_LT_LDFLAGS@
GST_NET_CFLAGS = @GST_NET_CFLAGS@
@@ -293,6 +297,7 @@ GST_PLUGINS_NONPORTED = @GST_PLUGINS_NONPORTED@
GST_PLUGINS_SELECTED = @GST_PLUGINS_SELECTED@
GST_PLUGIN_LDFLAGS = @GST_PLUGIN_LDFLAGS@
GST_PREFIX = @GST_PREFIX@
+GST_REVISION = @GST_REVISION@
GST_TOOLS_DIR = @GST_TOOLS_DIR@
GTKDOC_CHECK = @GTKDOC_CHECK@
GTK_CFLAGS = @GTK_CFLAGS@
@@ -578,7 +583,7 @@ install-pluginLTLIBRARIES: $(plugin_LTLIBRARIES)
done; \
test -z "$$list2" || { \
echo " $(MKDIR_P) '$(DESTDIR)$(plugindir)'"; \
- $(MKDIR_P) '$(DESTDIR)$(plugindir)' || exit 1; \
+ $(MKDIR_P) "$(DESTDIR)$(plugindir)" || exit 1; \
echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 '$(DESTDIR)$(plugindir)'"; \
$(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 "$(DESTDIR)$(plugindir)"; \
}
diff --git a/gst/isomp4/atoms.c b/gst/isomp4/atoms.c
index 68a90de5dddd471462ae5ea62525ec72368d0b8f..5f02bdb1fefa1742314c8ce68c8e05b420702a8c 100644
--- a/gst/isomp4/atoms.c
+++ b/gst/isomp4/atoms.c
@@ -4215,36 +4215,38 @@ build_jp2h_extension (AtomTRAK * trak, gint width, gint height,
idhr_size + colr_size + cmap_size + cdef_size, TRUE);
/* ihdr = image header box */
- gst_byte_writer_put_uint32_be (&writer, 22);
- gst_byte_writer_put_uint32_le (&writer, GST_MAKE_FOURCC ('i', 'h', 'd', 'r'));
- gst_byte_writer_put_uint32_be (&writer, height);
- gst_byte_writer_put_uint32_be (&writer, width);
- gst_byte_writer_put_uint16_be (&writer, ncomp);
+ gst_byte_writer_put_uint32_be_unchecked (&writer, 22);
+ gst_byte_writer_put_uint32_le_unchecked (&writer, GST_MAKE_FOURCC ('i', 'h',
+ 'd', 'r'));
+ gst_byte_writer_put_uint32_be_unchecked (&writer, height);
+ gst_byte_writer_put_uint32_be_unchecked (&writer, width);
+ gst_byte_writer_put_uint16_be_unchecked (&writer, ncomp);
/* 8 bits per component, unsigned */
- gst_byte_writer_put_uint8 (&writer, 0x7);
+ gst_byte_writer_put_uint8_unchecked (&writer, 0x7);
/* compression type; reserved */
- gst_byte_writer_put_uint8 (&writer, 0x7);
+ gst_byte_writer_put_uint8_unchecked (&writer, 0x7);
/* colour space (un)known */
- gst_byte_writer_put_uint8 (&writer, 0x0);
+ gst_byte_writer_put_uint8_unchecked (&writer, 0x0);
/* intellectual property right (box present) */
- gst_byte_writer_put_uint8 (&writer, 0x0);
+ gst_byte_writer_put_uint8_unchecked (&writer, 0x0);
/* colour specification box */
- gst_byte_writer_put_uint32_be (&writer, 15);
- gst_byte_writer_put_uint32_le (&writer, GST_MAKE_FOURCC ('c', 'o', 'l', 'r'));
+ gst_byte_writer_put_uint32_be_unchecked (&writer, 15);
+ gst_byte_writer_put_uint32_le_unchecked (&writer, GST_MAKE_FOURCC ('c', 'o',
+ 'l', 'r'));
/* specification method: enumerated */
- gst_byte_writer_put_uint8 (&writer, 0x1);
+ gst_byte_writer_put_uint8_unchecked (&writer, 0x1);
/* precedence; reserved */
- gst_byte_writer_put_uint8 (&writer, 0x0);
+ gst_byte_writer_put_uint8_unchecked (&writer, 0x0);
/* approximation; reserved */
- gst_byte_writer_put_uint8 (&writer, 0x0);
+ gst_byte_writer_put_uint8_unchecked (&writer, 0x0);
/* enumerated colourspace */
- gst_byte_writer_put_uint32_be (&writer, cenum);
+ gst_byte_writer_put_uint32_be_unchecked (&writer, cenum);
if (cmap_array) {
- gst_byte_writer_put_uint32_be (&writer, cmap_size);
- gst_byte_writer_put_uint32_le (&writer,
+ gst_byte_writer_put_uint32_be_unchecked (&writer, cmap_size);
+ gst_byte_writer_put_uint32_le_unchecked (&writer,
GST_MAKE_FOURCC ('c', 'm', 'a', 'p'));
for (i = 0; i < cmap_array_size; i++) {
const GValue *item;
@@ -4264,33 +4266,33 @@ build_jp2h_extension (AtomTRAK * trak, gint width, gint height,
GST_WARNING ("MTYP of cmap atom signals Pallete Mapping, but we don't "
"handle Pallete mapping atoms yet");
- gst_byte_writer_put_uint16_be (&writer, cmp);
- gst_byte_writer_put_uint8 (&writer, mtyp);
- gst_byte_writer_put_uint8 (&writer, pcol);
+ gst_byte_writer_put_uint16_be_unchecked (&writer, cmp);
+ gst_byte_writer_put_uint8_unchecked (&writer, mtyp);
+ gst_byte_writer_put_uint8_unchecked (&writer, pcol);
}
}
if (cdef_array) {
- gst_byte_writer_put_uint32_be (&writer, cdef_size);
- gst_byte_writer_put_uint32_le (&writer,
+ gst_byte_writer_put_uint32_be_unchecked (&writer, cdef_size);
+ gst_byte_writer_put_uint32_le_unchecked (&writer,
GST_MAKE_FOURCC ('c', 'd', 'e', 'f'));
- gst_byte_writer_put_uint16_be (&writer, cdef_array_size);
+ gst_byte_writer_put_uint16_be_unchecked (&writer, cdef_array_size);
for (i = 0; i < cdef_array_size; i++) {
const GValue *item;
gint value;
item = gst_value_array_get_value (cdef_array, i);
value = g_value_get_int (item);
- gst_byte_writer_put_uint16_be (&writer, i);
+ gst_byte_writer_put_uint16_be_unchecked (&writer, i);
if (value > 0) {
- gst_byte_writer_put_uint16_be (&writer, 0);
- gst_byte_writer_put_uint16_be (&writer, value);
+ gst_byte_writer_put_uint16_be_unchecked (&writer, 0);
+ gst_byte_writer_put_uint16_be_unchecked (&writer, value);
} else if (value < 0) {
- gst_byte_writer_put_uint16_be (&writer, -value);
- gst_byte_writer_put_uint16_be (&writer, 0); /* TODO what here? */
+ gst_byte_writer_put_uint16_be_unchecked (&writer, -value);
+ gst_byte_writer_put_uint16_be_unchecked (&writer, 0); /* TODO what here? */
} else {
- gst_byte_writer_put_uint16_be (&writer, 1);
- gst_byte_writer_put_uint16_be (&writer, 0);
+ gst_byte_writer_put_uint16_be_unchecked (&writer, 1);
+ gst_byte_writer_put_uint16_be_unchecked (&writer, 0);
}
}
}
diff --git a/gst/isomp4/gstqtmux.c b/gst/isomp4/gstqtmux.c
index 4d4b9c93950b346facfb2412901464a43fc8c1ac..3c1636abd184a738dad7b93450d2ca6678814691 100644
--- a/gst/isomp4/gstqtmux.c
+++ b/gst/isomp4/gstqtmux.c
@@ -116,7 +116,7 @@
#include <glib/gstdio.h>
#include <gst/gst.h>
-#include <gst/base/gstcollectpads2.h>
+#include <gst/base/gstcollectpads.h>
#include <gst/audio/audio.h>
#include <gst/video/video.h>
#include <gst/tag/xmpwriter.h>
@@ -226,11 +226,11 @@ static GstPad *gst_qt_mux_request_new_pad (GstElement * element,
static void gst_qt_mux_release_pad (GstElement * element, GstPad * pad);
/* event */
-static gboolean gst_qt_mux_sink_event (GstCollectPads2 * pads,
- GstCollectData2 * data, GstEvent * event, gpointer user_data);
+static gboolean gst_qt_mux_sink_event (GstCollectPads * pads,
+ GstCollectData * data, GstEvent * event, gpointer user_data);
-static GstFlowReturn gst_qt_mux_handle_buffer (GstCollectPads2 * pads,
- GstCollectData2 * cdata, GstBuffer * buf, gpointer user_data);
+static GstFlowReturn gst_qt_mux_handle_buffer (GstCollectPads * pads,
+ GstCollectData * cdata, GstBuffer * buf, gpointer user_data);
static GstFlowReturn gst_qt_mux_add_buffer (GstQTMux * qtmux, GstQTPad * pad,
GstBuffer * buf);
@@ -482,13 +482,13 @@ gst_qt_mux_init (GstQTMux * qtmux, GstQTMuxClass * qtmux_klass)
gst_element_add_pad (GST_ELEMENT (qtmux), qtmux->srcpad);
qtmux->sinkpads = NULL;
- qtmux->collect = gst_collect_pads2_new ();
- gst_collect_pads2_set_buffer_function (qtmux->collect,
+ qtmux->collect = gst_collect_pads_new ();
+ gst_collect_pads_set_buffer_function (qtmux->collect,
GST_DEBUG_FUNCPTR (gst_qt_mux_handle_buffer), qtmux);
- gst_collect_pads2_set_event_function (qtmux->collect,
+ gst_collect_pads_set_event_function (qtmux->collect,
GST_DEBUG_FUNCPTR (gst_qt_mux_sink_event), qtmux);
- gst_collect_pads2_set_clip_function (qtmux->collect,
- GST_DEBUG_FUNCPTR (gst_collect_pads2_clip_running_time), qtmux);
+ gst_collect_pads_set_clip_function (qtmux->collect,
+ GST_DEBUG_FUNCPTR (gst_collect_pads_clip_running_time), qtmux);
/* properties set to default upon construction */
@@ -1691,7 +1691,7 @@ gst_qt_mux_start_file (GstQTMux * qtmux)
gst_buffer_unref (prefix);
for (walk = qtmux->sinkpads; walk && !fail; walk = g_slist_next (walk)) {
- GstCollectData2 *cdata = (GstCollectData2 *) walk->data;
+ GstCollectData *cdata = (GstCollectData *) walk->data;
GstQTPad *qpad = (GstQTPad *) cdata;
/* write info for each stream */
fail = atoms_recov_write_trak_info (qtmux->moov_recov_file, qpad->trak);
@@ -1791,7 +1791,7 @@ gst_qt_mux_stop_file (GstQTMux * qtmux)
/* pushing last buffers for each pad */
for (walk = qtmux->collect->data; walk; walk = g_slist_next (walk)) {
- GstCollectData2 *cdata = (GstCollectData2 *) walk->data;
+ GstCollectData *cdata = (GstCollectData *) walk->data;
GstQTPad *qtpad = (GstQTPad *) cdata;
/* avoid add_buffer complaining if not negotiated
@@ -1883,7 +1883,7 @@ gst_qt_mux_stop_file (GstQTMux * qtmux)
/* check for late streams */
first_ts = GST_CLOCK_TIME_NONE;
for (walk = qtmux->collect->data; walk; walk = g_slist_next (walk)) {
- GstCollectData2 *cdata = (GstCollectData2 *) walk->data;
+ GstCollectData *cdata = (GstCollectData *) walk->data;
GstQTPad *qtpad = (GstQTPad *) cdata;
if (!GST_CLOCK_TIME_IS_VALID (first_ts) ||
@@ -1896,7 +1896,7 @@ gst_qt_mux_stop_file (GstQTMux * qtmux)
GST_TIME_ARGS (first_ts));
/* add EDTSs for late streams */
for (walk = qtmux->collect->data; walk; walk = g_slist_next (walk)) {
- GstCollectData2 *cdata = (GstCollectData2 *) walk->data;
+ GstCollectData *cdata = (GstCollectData *) walk->data;
GstQTPad *qtpad = (GstQTPad *) cdata;
guint32 lateness;
guint32 duration;
@@ -2550,7 +2550,7 @@ not_negotiated:
}
static GstFlowReturn
-gst_qt_mux_handle_buffer (GstCollectPads2 * pads, GstCollectData2 * cdata,
+gst_qt_mux_handle_buffer (GstCollectPads * pads, GstCollectData * cdata,
GstBuffer * buf, gpointer user_data)
{
GstFlowReturn ret = GST_FLOW_OK;
@@ -3274,13 +3274,13 @@ refuse_renegotiation:
}
static gboolean
-gst_qt_mux_sink_event (GstCollectPads2 * pads, GstCollectData2 * data,
+gst_qt_mux_sink_event (GstCollectPads * pads, GstCollectData * data,
GstEvent * event, gpointer user_data)
{
GstQTMux *qtmux;
guint32 avg_bitrate = 0, max_bitrate = 0;
GstPad *pad = data->pad;
- gboolean ret = FALSE;
+ gboolean ret = TRUE;
qtmux = GST_QT_MUX_CAST (user_data);
switch (GST_EVENT_TYPE (event)) {
@@ -3298,6 +3298,7 @@ gst_qt_mux_sink_event (GstCollectPads2 * pads, GstCollectData2 * data,
ret = collect_pad->set_caps (pad, caps);
gst_event_unref (event);
+ event = NULL;
break;
}
case GST_EVENT_TAG:{
@@ -3327,19 +3328,17 @@ gst_qt_mux_sink_event (GstCollectPads2 * pads, GstCollectData2 * data,
}
gst_event_unref (event);
+ event = NULL;
ret = TRUE;
break;
}
default:
- ret = gst_pad_event_default (data->pad, GST_OBJECT (qtmux), event);
- break;
- case GST_EVENT_EOS:
- case GST_EVENT_SEGMENT:
- gst_event_unref (event);
- ret = TRUE;
break;
}
+ if (event != NULL)
+ return gst_collect_pads_event_default (pads, data, event, FALSE);
+
return ret;
}
@@ -3362,7 +3361,7 @@ gst_qt_mux_release_pad (GstElement * element, GstPad * pad)
}
}
- gst_collect_pads2_remove_pad (mux->collect, pad);
+ gst_collect_pads_remove_pad (mux->collect, pad);
}
static GstPad *
@@ -3406,8 +3405,8 @@ gst_qt_mux_request_new_pad (GstElement * element,
newpad = gst_pad_new_from_template (templ, name);
g_free (name);
collect_pad = (GstQTPad *)
- gst_collect_pads2_add_pad_full (qtmux->collect, newpad, sizeof (GstQTPad),
- (GstCollectData2DestroyNotify) (gst_qt_mux_pad_reset), TRUE);
+ gst_collect_pads_add_pad_full (qtmux->collect, newpad, sizeof (GstQTPad),
+ (GstCollectDataDestroyNotify) (gst_qt_mux_pad_reset), TRUE);
/* set up pad */
gst_qt_mux_pad_reset (collect_pad);
collect_pad->trak = atom_trak_new (qtmux->context);
@@ -3557,13 +3556,13 @@ gst_qt_mux_change_state (GstElement * element, GstStateChange transition)
case GST_STATE_CHANGE_NULL_TO_READY:
break;
case GST_STATE_CHANGE_READY_TO_PAUSED:
- gst_collect_pads2_start (qtmux->collect);
+ gst_collect_pads_start (qtmux->collect);
qtmux->state = GST_QT_MUX_STATE_STARTED;
break;
case GST_STATE_CHANGE_PAUSED_TO_PLAYING:
break;
case GST_STATE_CHANGE_PAUSED_TO_READY:
- gst_collect_pads2_stop (qtmux->collect);
+ gst_collect_pads_stop (qtmux->collect);
break;
default:
break;
diff --git a/gst/isomp4/gstqtmux.h b/gst/isomp4/gstqtmux.h
index c17ff25de8ea94f151578f283f5e2f3fdceb8769..a0d2b53301da31b3027592c6b8fb98c200780e96 100644
--- a/gst/isomp4/gstqtmux.h
+++ b/gst/isomp4/gstqtmux.h
@@ -44,7 +44,7 @@
#define __GST_QT_MUX_H__
#include <gst/gst.h>
-#include <gst/base/gstcollectpads2.h>
+#include <gst/base/gstcollectpads.h>
#include "fourcc.h"
#include "atoms.h"
@@ -82,7 +82,7 @@ typedef GstBuffer * (*GstQTPadPrepareBufferFunc) (GstQTPad * pad,
struct _GstQTPad
{
- GstCollectData2 collect; /* we extend the CollectData2 */
+ GstCollectData collect; /* we extend the CollectData */
/* fourcc id of stream */
guint32 fourcc;
@@ -145,7 +145,7 @@ struct _GstQTMux
GstElement element;
GstPad *srcpad;
- GstCollectPads2 *collect;
+ GstCollectPads *collect;
GSList *sinkpads;
/* state */
diff --git a/gst/isomp4/qtdemux.c b/gst/isomp4/qtdemux.c
index a99ea0b5db91b636774a7ea621f5284b4869e467..21dc47a58cebfefd50749ca5ec50dc692bd4ada2 100644
--- a/gst/isomp4/qtdemux.c
+++ b/gst/isomp4/qtdemux.c
@@ -6251,7 +6251,8 @@ qtdemux_get_rtsp_uri_from_hndl (GstQTDemux * qtdemux, GNode * minf)
break;
}
/* skipping to the next entry */
- gst_byte_reader_skip (&dref, atom_size - 8);
+ if (!gst_byte_reader_skip (&dref, atom_size - 8))
+ break;
} else {
GST_WARNING_OBJECT (qtdemux, "Failed to parse hndl child "
"atom header");
@@ -6261,7 +6262,8 @@ qtdemux_get_rtsp_uri_from_hndl (GstQTDemux * qtdemux, GNode * minf)
break;
}
/* skip to the next entry */
- gst_byte_reader_skip (&dref, size - 8);
+ if (!gst_byte_reader_skip (&dref, size - 8))
+ break;
} else {
GST_WARNING_OBJECT (qtdemux, "Error parsing dref atom");
}
@@ -9535,7 +9537,8 @@ qtdemux_audio_caps (GstQTDemux * qtdemux, QtDemuxStream * stream,
case GST_MAKE_FOURCC ('r', 'a', 'w', ' '):
_codec ("Raw 8-bit PCM audio");
caps = gst_caps_new_simple ("audio/x-raw",
- "format", G_TYPE_STRING, "U8", NULL);
+ "format", G_TYPE_STRING, "U8",
+ "layout", G_TYPE_STRING, "interleaved", NULL);
break;
case GST_MAKE_FOURCC ('t', 'w', 'o', 's'):
endian = G_BIG_ENDIAN;
@@ -9557,30 +9560,35 @@ qtdemux_audio_caps (GstQTDemux * qtdemux, QtDemuxStream * stream,
g_free (str);
caps = gst_caps_new_simple ("audio/x-raw",
- "format", G_TYPE_STRING, gst_audio_format_to_string (format), NULL);
+ "format", G_TYPE_STRING, gst_audio_format_to_string (format),
+ "layout", G_TYPE_STRING, "interleaved", NULL);
break;
}
case GST_MAKE_FOURCC ('f', 'l', '6', '4'):
_codec ("Raw 64-bit floating-point audio");
caps = gst_caps_new_simple ("audio/x-raw",
- "format", G_TYPE_STRING, "F64BE", NULL);
+ "format", G_TYPE_STRING, "F64BE",
+ "layout", G_TYPE_STRING, "interleaved", NULL);
break;
case GST_MAKE_FOURCC ('f', 'l', '3', '2'):
_codec ("Raw 32-bit floating-point audio");
caps = gst_caps_new_simple ("audio/x-raw",
- "format", G_TYPE_STRING, "F32BE", NULL);
+ "format", G_TYPE_STRING, "F32BE",
+ "layout", G_TYPE_STRING, "interleaved", NULL);
break;
case FOURCC_in24:
_codec ("Raw 24-bit PCM audio");
/* we assume BIG ENDIAN, an enda box will tell us to change this to little
* endian later */
caps = gst_caps_new_simple ("audio/x-raw",
- "format", G_TYPE_STRING, "S24BE", NULL);
+ "format", G_TYPE_STRING, "S24BE",
+ "layout", G_TYPE_STRING, "interleaved", NULL);
break;
case GST_MAKE_FOURCC ('i', 'n', '3', '2'):
_codec ("Raw 32-bit PCM audio");
caps = gst_caps_new_simple ("audio/x-raw",
- "format", G_TYPE_STRING, "S32BE", NULL);
+ "format", G_TYPE_STRING, "S32BE",
+ "layout", G_TYPE_STRING, "interleaved", NULL);
break;
case GST_MAKE_FOURCC ('u', 'l', 'a', 'w'):
_codec ("Mu-law audio");
diff --git a/gst/isomp4/qtdemux_dump.c b/gst/isomp4/qtdemux_dump.c
index 799cd51497d13e309dac18c2c9b53860d4f5c292..71350a6fa096d186e86dcd0ba3a76133ce473eda 100644
--- a/gst/isomp4/qtdemux_dump.c
+++ b/gst/isomp4/qtdemux_dump.c
@@ -64,7 +64,7 @@ qtdemux_dump_mvhd (GstQTDemux * qtdemux, GstByteReader * data, int depth)
GST_LOG ("%*s pref. rate: %g", depth, "", GET_FP32 (data));
GST_LOG ("%*s pref. volume: %g", depth, "", GET_FP16 (data));
- gst_byte_reader_skip (data, 46);
+ gst_byte_reader_skip_unchecked (data, 46);
GST_LOG ("%*s preview time: %u", depth, "", GET_UINT32 (data));
GST_LOG ("%*s preview dur.: %u", depth, "", GET_UINT32 (data));
GST_LOG ("%*s poster time: %u", depth, "", GET_UINT32 (data));
@@ -281,7 +281,7 @@ qtdemux_dump_stsd (GstQTDemux * qtdemux, GstByteReader * data, int depth)
return FALSE;
qt_atom_parser_peek_sub (data, 0, 78, &sub);
- gst_byte_reader_skip (&sub, 6);
+ gst_byte_reader_skip_unchecked (&sub, 6);
GST_LOG ("%*s data reference:%d", depth, "", GET_UINT16 (&sub));
GST_LOG ("%*s version/rev.: %08x", depth, "", GET_UINT32 (&sub));
fourcc = GET_FOURCC (&sub);
@@ -297,7 +297,7 @@ qtdemux_dump_stsd (GstQTDemux * qtdemux, GstByteReader * data, int depth)
GST_LOG ("%*s frame count: %u", depth, "", GET_UINT16 (&sub));
/* something is not right with this, it's supposed to be a string but it's
* not apparently, so just skip this for now */
- gst_byte_reader_skip (&sub, 1 + 31);
+ gst_byte_reader_skip_unchecked (&sub, 1 + 31);
GST_LOG ("%*s compressor: (skipped)", depth, "");
GST_LOG ("%*s depth: %u", depth, "", GET_UINT16 (&sub));
GST_LOG ("%*s color table ID:%u", depth, "", GET_UINT16 (&sub));
diff --git a/gst/law/Makefile.in b/gst/law/Makefile.in
index 8777bb380c4f725b239400590e9c275fcf65e3f8..c47b7f16fd99a535299b1d96a1771a1cd8ed283e 100644
--- a/gst/law/Makefile.in
+++ b/gst/law/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.11.4 from Makefile.am.
+# Makefile.in generated by automake 1.11.5 from Makefile.am.
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -60,6 +60,7 @@ am__aclocal_m4_deps = $(top_srcdir)/common/m4/as-ac-expand.m4 \
$(top_srcdir)/common/m4/as-auto-alt.m4 \
$(top_srcdir)/common/m4/as-compiler-flag.m4 \
$(top_srcdir)/common/m4/as-gcc-inline-assembly.m4 \
+ $(top_srcdir)/common/m4/as-libtool.m4 \
$(top_srcdir)/common/m4/as-objc.m4 \
$(top_srcdir)/common/m4/as-python.m4 \
$(top_srcdir)/common/m4/as-scrub-include.m4 \
@@ -266,6 +267,7 @@ GMSGFMT_015 = @GMSGFMT_015@
GREP = @GREP@
GSTPB_PLUGINS_DIR = @GSTPB_PLUGINS_DIR@
GSTPB_PREFIX = @GSTPB_PREFIX@
+GST_AGE = @GST_AGE@
GST_ALL_LDFLAGS = @GST_ALL_LDFLAGS@
GST_API_VERSION = @GST_API_VERSION@
GST_BASE_CFLAGS = @GST_BASE_CFLAGS@
@@ -275,9 +277,11 @@ GST_CHECK_CFLAGS = @GST_CHECK_CFLAGS@
GST_CHECK_LIBS = @GST_CHECK_LIBS@
GST_CONTROLLER_CFLAGS = @GST_CONTROLLER_CFLAGS@
GST_CONTROLLER_LIBS = @GST_CONTROLLER_LIBS@
+GST_CURRENT = @GST_CURRENT@
GST_CXXFLAGS = @GST_CXXFLAGS@
GST_LEVEL_DEFAULT = @GST_LEVEL_DEFAULT@
GST_LIBS = @GST_LIBS@
+GST_LIBVERSION = @GST_LIBVERSION@
GST_LICENSE = @GST_LICENSE@
GST_LT_LDFLAGS = @GST_LT_LDFLAGS@
GST_NET_CFLAGS = @GST_NET_CFLAGS@
@@ -295,6 +299,7 @@ GST_PLUGINS_NONPORTED = @GST_PLUGINS_NONPORTED@
GST_PLUGINS_SELECTED = @GST_PLUGINS_SELECTED@
GST_PLUGIN_LDFLAGS = @GST_PLUGIN_LDFLAGS@
GST_PREFIX = @GST_PREFIX@
+GST_REVISION = @GST_REVISION@
GST_TOOLS_DIR = @GST_TOOLS_DIR@
GTKDOC_CHECK = @GTKDOC_CHECK@
GTK_CFLAGS = @GTK_CFLAGS@
@@ -554,7 +559,7 @@ install-pluginLTLIBRARIES: $(plugin_LTLIBRARIES)
done; \
test -z "$$list2" || { \
echo " $(MKDIR_P) '$(DESTDIR)$(plugindir)'"; \
- $(MKDIR_P) '$(DESTDIR)$(plugindir)' || exit 1; \
+ $(MKDIR_P) "$(DESTDIR)$(plugindir)" || exit 1; \
echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 '$(DESTDIR)$(plugindir)'"; \
$(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 "$(DESTDIR)$(plugindir)"; \
}
diff --git a/gst/level/Makefile.in b/gst/level/Makefile.in
index 2f10d97b30e4b4117cbdea679fc78aa13d14b947..46fa113b7e290a66e49a129ef3c832491a3a99d5 100644
--- a/gst/level/Makefile.in
+++ b/gst/level/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.11.4 from Makefile.am.
+# Makefile.in generated by automake 1.11.5 from Makefile.am.
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -60,6 +60,7 @@ am__aclocal_m4_deps = $(top_srcdir)/common/m4/as-ac-expand.m4 \
$(top_srcdir)/common/m4/as-auto-alt.m4 \
$(top_srcdir)/common/m4/as-compiler-flag.m4 \
$(top_srcdir)/common/m4/as-gcc-inline-assembly.m4 \
+ $(top_srcdir)/common/m4/as-libtool.m4 \
$(top_srcdir)/common/m4/as-objc.m4 \
$(top_srcdir)/common/m4/as-python.m4 \
$(top_srcdir)/common/m4/as-scrub-include.m4 \
@@ -255,6 +256,7 @@ GMSGFMT_015 = @GMSGFMT_015@
GREP = @GREP@
GSTPB_PLUGINS_DIR = @GSTPB_PLUGINS_DIR@
GSTPB_PREFIX = @GSTPB_PREFIX@
+GST_AGE = @GST_AGE@
GST_ALL_LDFLAGS = @GST_ALL_LDFLAGS@
GST_API_VERSION = @GST_API_VERSION@
GST_BASE_CFLAGS = @GST_BASE_CFLAGS@
@@ -264,9 +266,11 @@ GST_CHECK_CFLAGS = @GST_CHECK_CFLAGS@
GST_CHECK_LIBS = @GST_CHECK_LIBS@
GST_CONTROLLER_CFLAGS = @GST_CONTROLLER_CFLAGS@
GST_CONTROLLER_LIBS = @GST_CONTROLLER_LIBS@
+GST_CURRENT = @GST_CURRENT@
GST_CXXFLAGS = @GST_CXXFLAGS@
GST_LEVEL_DEFAULT = @GST_LEVEL_DEFAULT@
GST_LIBS = @GST_LIBS@
+GST_LIBVERSION = @GST_LIBVERSION@
GST_LICENSE = @GST_LICENSE@
GST_LT_LDFLAGS = @GST_LT_LDFLAGS@
GST_NET_CFLAGS = @GST_NET_CFLAGS@
@@ -284,6 +288,7 @@ GST_PLUGINS_NONPORTED = @GST_PLUGINS_NONPORTED@
GST_PLUGINS_SELECTED = @GST_PLUGINS_SELECTED@
GST_PLUGIN_LDFLAGS = @GST_PLUGIN_LDFLAGS@
GST_PREFIX = @GST_PREFIX@
+GST_REVISION = @GST_REVISION@
GST_TOOLS_DIR = @GST_TOOLS_DIR@
GTKDOC_CHECK = @GTKDOC_CHECK@
GTK_CFLAGS = @GTK_CFLAGS@
@@ -534,7 +539,7 @@ install-pluginLTLIBRARIES: $(plugin_LTLIBRARIES)
done; \
test -z "$$list2" || { \
echo " $(MKDIR_P) '$(DESTDIR)$(plugindir)'"; \
- $(MKDIR_P) '$(DESTDIR)$(plugindir)' || exit 1; \
+ $(MKDIR_P) "$(DESTDIR)$(plugindir)" || exit 1; \
echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 '$(DESTDIR)$(plugindir)'"; \
$(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 "$(DESTDIR)$(plugindir)"; \
}
diff --git a/gst/matroska/Makefile.in b/gst/matroska/Makefile.in
index 55f1bd870530d5e6809aa1ea59b5152ad660887f..eb087d7c9573ef1e34316ec5fada312509f1c141 100644
--- a/gst/matroska/Makefile.in
+++ b/gst/matroska/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.11.4 from Makefile.am.
+# Makefile.in generated by automake 1.11.5 from Makefile.am.
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -60,6 +60,7 @@ am__aclocal_m4_deps = $(top_srcdir)/common/m4/as-ac-expand.m4 \
$(top_srcdir)/common/m4/as-auto-alt.m4 \
$(top_srcdir)/common/m4/as-compiler-flag.m4 \
$(top_srcdir)/common/m4/as-gcc-inline-assembly.m4 \
+ $(top_srcdir)/common/m4/as-libtool.m4 \
$(top_srcdir)/common/m4/as-objc.m4 \
$(top_srcdir)/common/m4/as-python.m4 \
$(top_srcdir)/common/m4/as-scrub-include.m4 \
@@ -264,6 +265,7 @@ GMSGFMT_015 = @GMSGFMT_015@
GREP = @GREP@
GSTPB_PLUGINS_DIR = @GSTPB_PLUGINS_DIR@
GSTPB_PREFIX = @GSTPB_PREFIX@
+GST_AGE = @GST_AGE@
GST_ALL_LDFLAGS = @GST_ALL_LDFLAGS@
GST_API_VERSION = @GST_API_VERSION@
GST_BASE_CFLAGS = @GST_BASE_CFLAGS@
@@ -273,9 +275,11 @@ GST_CHECK_CFLAGS = @GST_CHECK_CFLAGS@
GST_CHECK_LIBS = @GST_CHECK_LIBS@
GST_CONTROLLER_CFLAGS = @GST_CONTROLLER_CFLAGS@
GST_CONTROLLER_LIBS = @GST_CONTROLLER_LIBS@
+GST_CURRENT = @GST_CURRENT@
GST_CXXFLAGS = @GST_CXXFLAGS@
GST_LEVEL_DEFAULT = @GST_LEVEL_DEFAULT@
GST_LIBS = @GST_LIBS@
+GST_LIBVERSION = @GST_LIBVERSION@
GST_LICENSE = @GST_LICENSE@
GST_LT_LDFLAGS = @GST_LT_LDFLAGS@
GST_NET_CFLAGS = @GST_NET_CFLAGS@
@@ -293,6 +297,7 @@ GST_PLUGINS_NONPORTED = @GST_PLUGINS_NONPORTED@
GST_PLUGINS_SELECTED = @GST_PLUGINS_SELECTED@
GST_PLUGIN_LDFLAGS = @GST_PLUGIN_LDFLAGS@
GST_PREFIX = @GST_PREFIX@
+GST_REVISION = @GST_REVISION@
GST_TOOLS_DIR = @GST_TOOLS_DIR@
GTKDOC_CHECK = @GTKDOC_CHECK@
GTK_CFLAGS = @GTK_CFLAGS@
@@ -580,7 +585,7 @@ install-pluginLTLIBRARIES: $(plugin_LTLIBRARIES)
done; \
test -z "$$list2" || { \
echo " $(MKDIR_P) '$(DESTDIR)$(plugindir)'"; \
- $(MKDIR_P) '$(DESTDIR)$(plugindir)' || exit 1; \
+ $(MKDIR_P) "$(DESTDIR)$(plugindir)" || exit 1; \
echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 '$(DESTDIR)$(plugindir)'"; \
$(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 "$(DESTDIR)$(plugindir)"; \
}
diff --git a/gst/matroska/ebml-read.c b/gst/matroska/ebml-read.c
index 2fd5a4cdc0764a9aa1ca229a65063aa34ad23c2b..42a06fe82c6838c90624ba14fffc333a7b8c06c3 100644
--- a/gst/matroska/ebml-read.c
+++ b/gst/matroska/ebml-read.c
@@ -223,11 +223,12 @@ gst_ebml_peek_id_full (GstEbmlRead * ebml, guint32 * id, guint64 * length,
GstByteReader *br = gst_ebml_read_br (ebml);
guint size = gst_byte_reader_get_remaining (br);
- gst_byte_reader_peek_data (br, size, &data);
+ if (gst_byte_reader_peek_data (br, size, &data)) {
- GST_LOG_OBJECT (ebml->el, "current br %p; remaining %d", br, size);
- if (data)
- GST_MEMDUMP_OBJECT (ebml->el, "element", data, MIN (size, *length));
+ GST_LOG_OBJECT (ebml->el, "current br %p; remaining %d", br, size);
+ if (data)
+ GST_MEMDUMP_OBJECT (ebml->el, "element", data, MIN (size, *length));
+ }
}
#endif
diff --git a/gst/matroska/ebml-write.c b/gst/matroska/ebml-write.c
index 456cfa943366809368bc0c84712d1942c451ba96..0c7584e12fdfa1b4a0f99c95c0d8e1bfadfd4719 100644
--- a/gst/matroska/ebml-write.c
+++ b/gst/matroska/ebml-write.c
@@ -427,14 +427,16 @@ gst_ebml_write_element_push (GstEbmlWrite * ebml, GstBuffer * buf,
gst_buffer_map (buf, &map, GST_MAP_READ);
buf_data = map.data;
}
- gst_byte_writer_put_data (ebml->streamheader, buf_data, data_size);
+ if (!gst_byte_writer_put_data (ebml->streamheader, buf_data, data_size))
+ GST_WARNING ("Error writing data to streamheader");
}
if (ebml->cache) {
if (!buf_data) {
gst_buffer_map (buf, &map, GST_MAP_READ);
buf_data = map.data;
}
- gst_byte_writer_put_data (ebml->cache, buf_data, data_size);
+ if (!gst_byte_writer_put_data (ebml->cache, buf_data, data_size))
+ GST_WARNING ("Error writing data to cache");
if (map.data)
gst_buffer_unmap (buf, &map);
gst_buffer_unref (buf);
diff --git a/gst/matroska/matroska-demux.c b/gst/matroska/matroska-demux.c
index bfe64e1ce0627cce82d7382400f7bae87489ce1b..34c3699a2a0380213778f54aec56d911cee56546 100644
--- a/gst/matroska/matroska-demux.c
+++ b/gst/matroska/matroska-demux.c
@@ -90,7 +90,8 @@ enum
static GstStaticPadTemplate sink_templ = GST_STATIC_PAD_TEMPLATE ("sink",
GST_PAD_SINK,
GST_PAD_ALWAYS,
- GST_STATIC_CAPS ("video/x-matroska; video/webm")
+ GST_STATIC_CAPS ("audio/x-matroska; video/x-matroska; "
+ "video/x-matroska-3d; audio/webm; video/webm")
);
/* TODO: fill in caps! */
@@ -1669,7 +1670,10 @@ gst_matroska_demux_search_cluster (GstMatroskaDemux * demux, gint64 * pos)
if (cluster_pos >= 0) {
newpos += cluster_pos;
/* prepare resuming at next byte */
- gst_byte_reader_skip (&reader, cluster_pos + 1);
+ if (!gst_byte_reader_skip (&reader, cluster_pos + 1)) {
+ GST_DEBUG_OBJECT (demux, "Need more data -> continue");
+ continue;
+ }
GST_DEBUG_OBJECT (demux,
"found cluster ebml id at offset %" G_GINT64_FORMAT, newpos);
/* extra checks whether we really sync'ed to a cluster:
@@ -1921,7 +1925,7 @@ gst_matroska_demux_handle_seek_event (GstMatroskaDemux * demux,
GstSeekFlags flags;
GstSeekType cur_type, stop_type;
GstFormat format;
- gboolean flush, keyunit;
+ gboolean flush, keyunit, before, after, snap_next;
gdouble rate;
gint64 cur, stop;
GstMatroskaTrackContext *track = NULL;
@@ -1971,8 +1975,10 @@ gst_matroska_demux_handle_seek_event (GstMatroskaDemux * demux,
* would be determined again when parsing, but anyway ... */
seeksegment.duration = demux->common.segment.duration;
- flush = ! !(flags & GST_SEEK_FLAG_FLUSH);
- keyunit = ! !(flags & GST_SEEK_FLAG_KEY_UNIT);
+ flush = !!(flags & GST_SEEK_FLAG_FLUSH);
+ keyunit = !!(flags & GST_SEEK_FLAG_KEY_UNIT);
+ after = !!(flags & GST_SEEK_FLAG_SNAP_AFTER);
+ before = !!(flags & GST_SEEK_FLAG_SNAP_BEFORE);
GST_DEBUG_OBJECT (demux, "New segment %" GST_SEGMENT_FORMAT, &seeksegment);
@@ -1985,11 +1991,14 @@ gst_matroska_demux_handle_seek_event (GstMatroskaDemux * demux,
}
/* check sanity before we start flushing and all that */
+ snap_next = after && !before;
+ if (seeksegment.rate < 0)
+ snap_next = !snap_next;
GST_OBJECT_LOCK (demux);
track = gst_matroska_read_common_get_seek_track (&demux->common, track);
if ((entry = gst_matroska_read_common_do_index_seek (&demux->common, track,
- seeksegment.position, &demux->seek_index, &demux->seek_entry)) ==
- NULL) {
+ seeksegment.position, &demux->seek_index, &demux->seek_entry,
+ snap_next)) == NULL) {
/* pull mode without index can scan later on */
if (demux->streaming) {
GST_DEBUG_OBJECT (demux, "No matching seek entry in index");
@@ -2049,8 +2058,9 @@ next:
}
if (keyunit) {
- GST_DEBUG_OBJECT (demux, "seek to key unit, adjusting segment start to %"
- GST_TIME_FORMAT, GST_TIME_ARGS (entry->time));
+ GST_DEBUG_OBJECT (demux, "seek to key unit, adjusting segment start from %"
+ GST_TIME_FORMAT " to %" GST_TIME_FORMAT,
+ GST_TIME_ARGS (seeksegment.start), GST_TIME_ARGS (entry->time));
seeksegment.start = MAX (entry->time, demux->stream_start_time);
seeksegment.position = seeksegment.start;
seeksegment.time = seeksegment.start - demux->stream_start_time;
diff --git a/gst/matroska/matroska-mux.c b/gst/matroska/matroska-mux.c
index 67c5668e19560037de719d05bca30e0d10e54792..91d1a1cffefeeda7e3bfafb873ea3be629ec0878 100644
--- a/gst/matroska/matroska-mux.c
+++ b/gst/matroska/matroska-mux.c
@@ -82,7 +82,7 @@ enum
static GstStaticPadTemplate src_templ = GST_STATIC_PAD_TEMPLATE ("src",
GST_PAD_SRC,
GST_PAD_ALWAYS,
- GST_STATIC_CAPS ("video/x-matroska")
+ GST_STATIC_CAPS ("video/x-matroska; video/x-matroska-3d; audio/x-matroska")
);
#define COMMON_VIDEO_CAPS \
@@ -208,10 +208,10 @@ G_DEFINE_TYPE_WITH_CODE (GstMatroskaMux, gst_matroska_mux, GST_TYPE_ELEMENT,
static void gst_matroska_mux_finalize (GObject * object);
/* Pads collected callback */
-static GstFlowReturn gst_matroska_mux_handle_buffer (GstCollectPads2 * pads,
- GstCollectData2 * data, GstBuffer * buf, gpointer user_data);
-static gboolean gst_matroska_mux_handle_sink_event (GstCollectPads2 * pads,
- GstCollectData2 * data, GstEvent * event, gpointer user_data);
+static GstFlowReturn gst_matroska_mux_handle_buffer (GstCollectPads * pads,
+ GstCollectData * data, GstBuffer * buf, gpointer user_data);
+static gboolean gst_matroska_mux_handle_sink_event (GstCollectPads * pads,
+ GstCollectData * data, GstEvent * event, gpointer user_data);
/* pad functions */
static gboolean gst_matroska_mux_handle_src_event (GstPad * pad,
@@ -425,13 +425,14 @@ gst_matroska_mux_init (GstMatroskaMux * mux)
gst_pad_set_event_function (mux->srcpad, gst_matroska_mux_handle_src_event);
gst_element_add_pad (GST_ELEMENT (mux), mux->srcpad);
+ gst_pad_use_fixed_caps (mux->srcpad);
- mux->collect = gst_collect_pads2_new ();
- gst_collect_pads2_set_clip_function (mux->collect,
- GST_DEBUG_FUNCPTR (gst_collect_pads2_clip_running_time), mux);
- gst_collect_pads2_set_buffer_function (mux->collect,
+ mux->collect = gst_collect_pads_new ();
+ gst_collect_pads_set_clip_function (mux->collect,
+ GST_DEBUG_FUNCPTR (gst_collect_pads_clip_running_time), mux);
+ gst_collect_pads_set_buffer_function (mux->collect,
GST_DEBUG_FUNCPTR (gst_matroska_mux_handle_buffer), mux);
- gst_collect_pads2_set_event_function (mux->collect,
+ gst_collect_pads_set_event_function (mux->collect,
GST_DEBUG_FUNCPTR (gst_matroska_mux_handle_sink_event), mux);
mux->ebml_write = gst_ebml_write_new (mux->srcpad);
@@ -738,15 +739,15 @@ gst_matroska_mux_build_vobsub_private (GstMatroskaTrackContext * context,
* Returns: #TRUE on success.
*/
static gboolean
-gst_matroska_mux_handle_sink_event (GstCollectPads2 * pads,
- GstCollectData2 * data, GstEvent * event, gpointer user_data)
+gst_matroska_mux_handle_sink_event (GstCollectPads * pads,
+ GstCollectData * data, GstEvent * event, gpointer user_data)
{
GstMatroskaPad *collect_pad;
GstMatroskaTrackContext *context;
GstMatroskaMux *mux;
GstPad *pad;
GstTagList *list;
- gboolean ret = FALSE;
+ gboolean ret = TRUE;
mux = GST_MATROSKA_MUX (user_data);
collect_pad = (GstMatroskaPad *) data;
@@ -796,18 +797,6 @@ gst_matroska_mux_handle_sink_event (GstCollectPads2 * pads,
ret = TRUE;
break;
}
- case GST_EVENT_SEGMENT:{
- const GstSegment *segment;
-
- gst_event_parse_segment (event, &segment);
- if (segment->format != GST_FORMAT_TIME) {
- ret = FALSE;
- }
- gst_event_unref (event);
- event = NULL;
- ret = TRUE;
- break;
- }
case GST_EVENT_TOC:{
GstToc *toc;
@@ -869,14 +858,12 @@ gst_matroska_mux_handle_sink_event (GstCollectPads2 * pads,
}
/* fall through */
default:
- ret = gst_pad_event_default (data->pad, GST_OBJECT (mux), event);
- break;
- case GST_EVENT_EOS:
- gst_event_unref (event);
- ret = TRUE;
break;
}
+ if (event != NULL)
+ return gst_collect_pads_event_default (pads, data, event, FALSE);
+
return ret;
}
@@ -2160,9 +2147,9 @@ gst_matroska_mux_request_new_pad (GstElement * element,
gst_matroskamux_pad_init (newpad);
collect_pad = (GstMatroskaPad *)
- gst_collect_pads2_add_pad_full (mux->collect, GST_PAD (newpad),
+ gst_collect_pads_add_pad_full (mux->collect, GST_PAD (newpad),
sizeof (GstMatroskamuxPad),
- (GstCollectData2DestroyNotify) gst_matroska_pad_free, locked);
+ (GstCollectDataDestroyNotify) gst_matroska_pad_free, locked);
collect_pad->track = context;
gst_matroska_pad_reset (collect_pad, FALSE);
@@ -2204,7 +2191,7 @@ gst_matroska_mux_release_pad (GstElement * element, GstPad * pad)
mux = GST_MATROSKA_MUX (GST_PAD_PARENT (pad));
for (walk = mux->collect->data; walk; walk = g_slist_next (walk)) {
- GstCollectData2 *cdata = (GstCollectData2 *) walk->data;
+ GstCollectData *cdata = (GstCollectData *) walk->data;
GstMatroskaPad *collect_pad = (GstMatroskaPad *) cdata;
if (cdata->pad == pad) {
@@ -2225,7 +2212,7 @@ gst_matroska_mux_release_pad (GstElement * element, GstPad * pad)
}
}
- gst_collect_pads2_remove_pad (mux->collect, pad);
+ gst_collect_pads_remove_pad (mux->collect, pad);
if (gst_element_remove_pad (element, pad))
mux->num_streams--;
}
@@ -2472,6 +2459,8 @@ gst_matroska_mux_start (GstMatroskaMux * mux)
GST_MATROSKA_ID_TAGS,
0
};
+ const gchar *media_type;
+ gboolean audio_only;
guint64 master, child;
GSList *collected;
int i;
@@ -2504,11 +2493,14 @@ gst_matroska_mux_start (GstMatroskaMux * mux)
gst_query_unref (query);
}
+ audio_only = mux->num_v_streams == 0 && mux->num_a_streams > 0;
if (!strcmp (mux->doctype, GST_MATROSKA_DOCTYPE_WEBM)) {
- ebml->caps = gst_caps_new_empty_simple ("video/webm");
+ media_type = (audio_only) ? "audio/webm" : "video/webm";
} else {
- ebml->caps = gst_caps_new_empty_simple ("video/x-matroska");
+ media_type = (audio_only) ? "audio/x-matroska" : "video/x-matroska";
}
+ ebml->caps = gst_caps_new_empty_simple (media_type);
+ gst_pad_set_caps (mux->srcpad, ebml->caps);
/* we start with a EBML header */
doctype = mux->doctype;
GST_INFO_OBJECT (ebml, "DocType: %s, Version: %d",
@@ -2654,11 +2646,11 @@ gst_matroska_mux_start (GstMatroskaMux * mux)
cur = cur->next;
}
- gst_toc_entry_get_start_stop (((GstTocEntry *) toc_entry->
- subentries->data), &start, NULL);
+ gst_toc_entry_get_start_stop (((GstTocEntry *) toc_entry->subentries->
+ data), &start, NULL);
toc_entry->subentries = g_list_reverse (toc_entry->subentries);
- gst_toc_entry_get_start_stop (((GstTocEntry *) toc_entry->
- subentries->data), NULL, &stop);
+ gst_toc_entry_get_start_stop (((GstTocEntry *) toc_entry->subentries->
+ data), NULL, &stop);
gst_toc_entry_set_start_stop (toc_entry, start, stop);
to_write = g_list_append (to_write, toc_entry);
@@ -3143,11 +3135,7 @@ gst_matroska_mux_stop_streamheader (GstMatroskaMux * mux)
GstEbmlWrite *ebml = mux->ebml_write;
streamheader_buffer = gst_ebml_stop_streamheader (ebml);
- if (!strcmp (mux->doctype, GST_MATROSKA_DOCTYPE_WEBM)) {
- caps = gst_caps_new_empty_simple ("video/webm");
- } else {
- caps = gst_caps_new_empty_simple ("video/x-matroska");
- }
+ caps = gst_caps_copy (mux->ebml_write->caps);
s = gst_caps_get_structure (caps, 0);
g_value_init (&streamheader, GST_TYPE_ARRAY);
g_value_init (&bufval, GST_TYPE_BUFFER);
@@ -3159,6 +3147,7 @@ gst_matroska_mux_stop_streamheader (GstMatroskaMux * mux)
g_value_unset (&streamheader);
gst_caps_replace (&ebml->caps, caps);
gst_buffer_unref (streamheader_buffer);
+ gst_pad_set_caps (mux->srcpad, caps);
gst_caps_unref (caps);
}
@@ -3377,7 +3366,7 @@ gst_matroska_mux_write_data (GstMatroskaMux * mux, GstMatroskaPad * collect_pad,
/**
* gst_matroska_mux_handle_buffer:
- * @pads: #GstCollectPads2
+ * @pads: #GstCollectPads
* @uuser_data: #GstMatroskaMux
*
* Collectpads callback.
@@ -3385,7 +3374,7 @@ gst_matroska_mux_write_data (GstMatroskaMux * mux, GstMatroskaPad * collect_pad,
* Returns: #GstFlowReturn
*/
static GstFlowReturn
-gst_matroska_mux_handle_buffer (GstCollectPads2 * pads, GstCollectData2 * data,
+gst_matroska_mux_handle_buffer (GstCollectPads * pads, GstCollectData * data,
GstBuffer * buf, gpointer user_data)
{
GstMatroskaMux *mux = GST_MATROSKA_MUX (user_data);
@@ -3479,12 +3468,12 @@ gst_matroska_mux_change_state (GstElement * element, GstStateChange transition)
case GST_STATE_CHANGE_NULL_TO_READY:
break;
case GST_STATE_CHANGE_READY_TO_PAUSED:
- gst_collect_pads2_start (mux->collect);
+ gst_collect_pads_start (mux->collect);
break;
case GST_STATE_CHANGE_PAUSED_TO_PLAYING:
break;
case GST_STATE_CHANGE_PAUSED_TO_READY:
- gst_collect_pads2_stop (mux->collect);
+ gst_collect_pads_stop (mux->collect);
break;
default:
break;
diff --git a/gst/matroska/matroska-mux.h b/gst/matroska/matroska-mux.h
index 3e146271c18b23c313bb7425c0427fd2b40524f0..2df0ec94c4a0e52ceb4ab256794c3de3c8a1c8e1 100644
--- a/gst/matroska/matroska-mux.h
+++ b/gst/matroska/matroska-mux.h
@@ -24,7 +24,7 @@
#define __GST_MATROSKA_MUX_H__
#include <gst/gst.h>
-#include <gst/base/gstcollectpads2.h>
+#include <gst/base/gstcollectpads.h>
#include "ebml-write.h"
#include "matroska-ids.h"
@@ -58,7 +58,7 @@ typedef gboolean (*GstMatroskaCapsFunc) (GstPad *pad, GstCaps *caps);
/* all information needed for one matroska stream */
typedef struct
{
- GstCollectData2 collect; /* we extend the CollectData */
+ GstCollectData collect; /* we extend the CollectData */
GstMatroskaCapsFunc capsfunc;
GstMatroskaTrackContext *track;
@@ -77,7 +77,7 @@ typedef struct _GstMatroskaMux {
/* pads */
GstPad *srcpad;
- GstCollectPads2 *collect;
+ GstCollectPads *collect;
GstEbmlWrite *ebml_write;
guint num_streams,
diff --git a/gst/matroska/matroska-parse.c b/gst/matroska/matroska-parse.c
index e54fc87394f875b7281e1d483e7f0997a42f8080..c7acb89982a137a950759b5790dbb6aa7ea71f8f 100644
--- a/gst/matroska/matroska-parse.c
+++ b/gst/matroska/matroska-parse.c
@@ -87,13 +87,15 @@ enum
static GstStaticPadTemplate sink_templ = GST_STATIC_PAD_TEMPLATE ("sink",
GST_PAD_SINK,
GST_PAD_ALWAYS,
- GST_STATIC_CAPS ("video/x-matroska; video/webm")
+ GST_STATIC_CAPS ("audio/x-matroska; video/x-matroska; "
+ "video/x-matroska-3d; audio/webm; video/webm")
);
static GstStaticPadTemplate src_templ = GST_STATIC_PAD_TEMPLATE ("src",
GST_PAD_SRC,
GST_PAD_ALWAYS,
- GST_STATIC_CAPS ("video/x-matroska; video/webm")
+ GST_STATIC_CAPS ("audio/x-matroska; video/x-matroska; "
+ "video/x-matroska-3d; audio/webm; video/webm")
);
static GstFlowReturn gst_matroska_parse_parse_id (GstMatroskaParse * parse,
@@ -1362,8 +1364,8 @@ gst_matroska_parse_handle_seek_event (GstMatroskaParse * parse,
/* check sanity before we start flushing and all that */
GST_OBJECT_LOCK (parse);
if ((entry = gst_matroska_read_common_do_index_seek (&parse->common, track,
- seeksegment.position, &parse->seek_index, &parse->seek_entry)) ==
- NULL) {
+ seeksegment.position, &parse->seek_index, &parse->seek_entry,
+ FALSE)) == NULL) {
/* pull mode without index can scan later on */
GST_DEBUG_OBJECT (parse, "No matching seek entry in index");
GST_OBJECT_UNLOCK (parse);
@@ -2523,7 +2525,13 @@ gst_matroska_parse_output (GstMatroskaParse * parse, GstBuffer * buffer,
GValue bufval = { 0 };
GstBuffer *buf;
- caps = gst_caps_new_empty_simple ("video/x-matroska");
+ caps = gst_pad_get_current_caps (parse->common.sinkpad);
+ /* FIXME: could run typefinding over header and pick better default */
+ if (caps == NULL)
+ caps = gst_caps_new_empty_simple ("video/x-matroska");
+ else
+ caps = gst_caps_make_writable (caps);
+
s = gst_caps_get_structure (caps, 0);
g_value_init (&streamheader, GST_TYPE_ARRAY);
g_value_init (&bufval, GST_TYPE_BUFFER);
diff --git a/gst/matroska/matroska-read-common.c b/gst/matroska/matroska-read-common.c
index a95a95ee557e66c907a885804c9ee587e7b577c2..146255c5e21fa2b409ba28a571e31eb5abb21215 100644
--- a/gst/matroska/matroska-read-common.c
+++ b/gst/matroska/matroska-read-common.c
@@ -365,7 +365,7 @@ gst_matroska_index_seek_find (GstMatroskaIndex * i1, GstClockTime * time,
GstMatroskaIndex *
gst_matroska_read_common_do_index_seek (GstMatroskaReadCommon * common,
GstMatroskaTrackContext * track, gint64 seek_pos, GArray ** _index,
- gint * _entry_index)
+ gint * _entry_index, gboolean next)
{
GstMatroskaIndex *entry = NULL;
GArray *index;
@@ -382,11 +382,16 @@ gst_matroska_read_common_do_index_seek (GstMatroskaReadCommon * common,
entry =
gst_util_array_binary_search (index->data, index->len,
sizeof (GstMatroskaIndex),
- (GCompareDataFunc) gst_matroska_index_seek_find, GST_SEARCH_MODE_BEFORE,
- &seek_pos, NULL);
+ (GCompareDataFunc) gst_matroska_index_seek_find,
+ next ? GST_SEARCH_MODE_AFTER : GST_SEARCH_MODE_BEFORE, &seek_pos, NULL);
- if (entry == NULL)
- entry = &g_array_index (index, GstMatroskaIndex, 0);
+ if (entry == NULL) {
+ if (next) {
+ return NULL;
+ } else {
+ entry = &g_array_index (index, GstMatroskaIndex, 0);
+ }
+ }
if (_index)
*_index = index;
diff --git a/gst/matroska/matroska-read-common.h b/gst/matroska/matroska-read-common.h
index 7488bc0ded1471888894769813c3a1ffb6a15632..0a18eaa81a9d205ca3c3fd3244d24bce8f9c00f2 100644
--- a/gst/matroska/matroska-read-common.h
+++ b/gst/matroska/matroska-read-common.h
@@ -106,7 +106,7 @@ gint gst_matroska_index_seek_find (GstMatroskaIndex * i1, GstClockTime * time,
gpointer user_data);
GstMatroskaIndex * gst_matroska_read_common_do_index_seek (
GstMatroskaReadCommon * common, GstMatroskaTrackContext * track, gint64
- seek_pos, GArray ** _index, gint * _entry_index);
+ seek_pos, GArray ** _index, gint * _entry_index, gboolean next);
void gst_matroska_read_common_found_global_tag (GstMatroskaReadCommon * common,
GstElement * el, GstTagList * taglist);
gint64 gst_matroska_read_common_get_length (GstMatroskaReadCommon * common);
diff --git a/gst/matroska/webm-mux.c b/gst/matroska/webm-mux.c
index 933c53bd8c5adc320b2e1e57ea2bc8f9f3683dff..84d3f6b2bb281eacf1b24781e3c9a5b130d3987a 100644
--- a/gst/matroska/webm-mux.c
+++ b/gst/matroska/webm-mux.c
@@ -58,7 +58,7 @@ G_DEFINE_TYPE (GstWebMMux, gst_webm_mux, GST_TYPE_MATROSKA_MUX);
static GstStaticPadTemplate webm_src_templ = GST_STATIC_PAD_TEMPLATE ("src",
GST_PAD_SRC,
GST_PAD_ALWAYS,
- GST_STATIC_CAPS ("video/webm")
+ GST_STATIC_CAPS ("video/webm; audio/webm")
);
static GstStaticPadTemplate webm_videosink_templ =
diff --git a/gst/monoscope/Makefile.in b/gst/monoscope/Makefile.in
index 619712198229590d595f4cbf235d89efa020d709..b6ff945fe7f01e853c9f56155bccfb8ec3da3bfa 100644
--- a/gst/monoscope/Makefile.in
+++ b/gst/monoscope/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.11.4 from Makefile.am.
+# Makefile.in generated by automake 1.11.5 from Makefile.am.
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -60,6 +60,7 @@ am__aclocal_m4_deps = $(top_srcdir)/common/m4/as-ac-expand.m4 \
$(top_srcdir)/common/m4/as-auto-alt.m4 \
$(top_srcdir)/common/m4/as-compiler-flag.m4 \
$(top_srcdir)/common/m4/as-gcc-inline-assembly.m4 \
+ $(top_srcdir)/common/m4/as-libtool.m4 \
$(top_srcdir)/common/m4/as-objc.m4 \
$(top_srcdir)/common/m4/as-python.m4 \
$(top_srcdir)/common/m4/as-scrub-include.m4 \
@@ -256,6 +257,7 @@ GMSGFMT_015 = @GMSGFMT_015@
GREP = @GREP@
GSTPB_PLUGINS_DIR = @GSTPB_PLUGINS_DIR@
GSTPB_PREFIX = @GSTPB_PREFIX@
+GST_AGE = @GST_AGE@
GST_ALL_LDFLAGS = @GST_ALL_LDFLAGS@
GST_API_VERSION = @GST_API_VERSION@
GST_BASE_CFLAGS = @GST_BASE_CFLAGS@
@@ -265,9 +267,11 @@ GST_CHECK_CFLAGS = @GST_CHECK_CFLAGS@
GST_CHECK_LIBS = @GST_CHECK_LIBS@
GST_CONTROLLER_CFLAGS = @GST_CONTROLLER_CFLAGS@
GST_CONTROLLER_LIBS = @GST_CONTROLLER_LIBS@
+GST_CURRENT = @GST_CURRENT@
GST_CXXFLAGS = @GST_CXXFLAGS@
GST_LEVEL_DEFAULT = @GST_LEVEL_DEFAULT@
GST_LIBS = @GST_LIBS@
+GST_LIBVERSION = @GST_LIBVERSION@
GST_LICENSE = @GST_LICENSE@
GST_LT_LDFLAGS = @GST_LT_LDFLAGS@
GST_NET_CFLAGS = @GST_NET_CFLAGS@
@@ -285,6 +289,7 @@ GST_PLUGINS_NONPORTED = @GST_PLUGINS_NONPORTED@
GST_PLUGINS_SELECTED = @GST_PLUGINS_SELECTED@
GST_PLUGIN_LDFLAGS = @GST_PLUGIN_LDFLAGS@
GST_PREFIX = @GST_PREFIX@
+GST_REVISION = @GST_REVISION@
GST_TOOLS_DIR = @GST_TOOLS_DIR@
GTKDOC_CHECK = @GTKDOC_CHECK@
GTK_CFLAGS = @GTK_CFLAGS@
@@ -535,7 +540,7 @@ install-pluginLTLIBRARIES: $(plugin_LTLIBRARIES)
done; \
test -z "$$list2" || { \
echo " $(MKDIR_P) '$(DESTDIR)$(plugindir)'"; \
- $(MKDIR_P) '$(DESTDIR)$(plugindir)' || exit 1; \
+ $(MKDIR_P) "$(DESTDIR)$(plugindir)" || exit 1; \
echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 '$(DESTDIR)$(plugindir)'"; \
$(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 "$(DESTDIR)$(plugindir)"; \
}
diff --git a/gst/multifile/Makefile.in b/gst/multifile/Makefile.in
index 86926e195d430b9d663c41175d9992fcf1485a09..a730bed62a09f8c90cf2743bfd7bb9ea2fbe8f93 100644
--- a/gst/multifile/Makefile.in
+++ b/gst/multifile/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.11.4 from Makefile.am.
+# Makefile.in generated by automake 1.11.5 from Makefile.am.
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -60,6 +60,7 @@ am__aclocal_m4_deps = $(top_srcdir)/common/m4/as-ac-expand.m4 \
$(top_srcdir)/common/m4/as-auto-alt.m4 \
$(top_srcdir)/common/m4/as-compiler-flag.m4 \
$(top_srcdir)/common/m4/as-gcc-inline-assembly.m4 \
+ $(top_srcdir)/common/m4/as-libtool.m4 \
$(top_srcdir)/common/m4/as-objc.m4 \
$(top_srcdir)/common/m4/as-python.m4 \
$(top_srcdir)/common/m4/as-scrub-include.m4 \
@@ -261,6 +262,7 @@ GMSGFMT_015 = @GMSGFMT_015@
GREP = @GREP@
GSTPB_PLUGINS_DIR = @GSTPB_PLUGINS_DIR@
GSTPB_PREFIX = @GSTPB_PREFIX@
+GST_AGE = @GST_AGE@
GST_ALL_LDFLAGS = @GST_ALL_LDFLAGS@
GST_API_VERSION = @GST_API_VERSION@
GST_BASE_CFLAGS = @GST_BASE_CFLAGS@
@@ -270,9 +272,11 @@ GST_CHECK_CFLAGS = @GST_CHECK_CFLAGS@
GST_CHECK_LIBS = @GST_CHECK_LIBS@
GST_CONTROLLER_CFLAGS = @GST_CONTROLLER_CFLAGS@
GST_CONTROLLER_LIBS = @GST_CONTROLLER_LIBS@
+GST_CURRENT = @GST_CURRENT@
GST_CXXFLAGS = @GST_CXXFLAGS@
GST_LEVEL_DEFAULT = @GST_LEVEL_DEFAULT@
GST_LIBS = @GST_LIBS@
+GST_LIBVERSION = @GST_LIBVERSION@
GST_LICENSE = @GST_LICENSE@
GST_LT_LDFLAGS = @GST_LT_LDFLAGS@
GST_NET_CFLAGS = @GST_NET_CFLAGS@
@@ -290,6 +294,7 @@ GST_PLUGINS_NONPORTED = @GST_PLUGINS_NONPORTED@
GST_PLUGINS_SELECTED = @GST_PLUGINS_SELECTED@
GST_PLUGIN_LDFLAGS = @GST_PLUGIN_LDFLAGS@
GST_PREFIX = @GST_PREFIX@
+GST_REVISION = @GST_REVISION@
GST_TOOLS_DIR = @GST_TOOLS_DIR@
GTKDOC_CHECK = @GTKDOC_CHECK@
GTK_CFLAGS = @GTK_CFLAGS@
@@ -546,7 +551,7 @@ install-pluginLTLIBRARIES: $(plugin_LTLIBRARIES)
done; \
test -z "$$list2" || { \
echo " $(MKDIR_P) '$(DESTDIR)$(plugindir)'"; \
- $(MKDIR_P) '$(DESTDIR)$(plugindir)' || exit 1; \
+ $(MKDIR_P) "$(DESTDIR)$(plugindir)" || exit 1; \
echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 '$(DESTDIR)$(plugindir)'"; \
$(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 "$(DESTDIR)$(plugindir)"; \
}
diff --git a/gst/multifile/gstmultifilesink.c b/gst/multifile/gstmultifilesink.c
index ce439c11fc257f05b0cd955a007095648b8c9e69..1be86615af9b9c52e82cf08ac18a6c00fd37f1cc 100644
--- a/gst/multifile/gstmultifilesink.c
+++ b/gst/multifile/gstmultifilesink.c
@@ -512,6 +512,7 @@ gst_multi_file_sink_render (GstBaseSink * sink, GstBuffer * buffer)
gchar *filename;
gboolean ret;
GError *error = NULL;
+ gboolean first_file = TRUE;
gst_buffer_map (buffer, &map, GST_MAP_READ);
@@ -561,9 +562,10 @@ gst_multi_file_sink_render (GstBaseSink * sink, GstBuffer * buffer)
if (GST_BUFFER_TIMESTAMP_IS_VALID (buffer) &&
GST_BUFFER_TIMESTAMP (buffer) >= multifilesink->next_segment &&
!GST_BUFFER_FLAG_IS_SET (buffer, GST_BUFFER_FLAG_DELTA_UNIT)) {
- if (multifilesink->file)
+ if (multifilesink->file) {
+ first_file = FALSE;
gst_multi_file_sink_close_file (multifilesink, buffer);
-
+ }
multifilesink->next_segment += 10 * GST_SECOND;
}
@@ -571,7 +573,8 @@ gst_multi_file_sink_render (GstBaseSink * sink, GstBuffer * buffer)
if (!gst_multi_file_sink_open_next_file (multifilesink))
goto stdio_write_error;
- gst_multi_file_sink_write_stream_headers (multifilesink);
+ if (!first_file)
+ gst_multi_file_sink_write_stream_headers (multifilesink);
}
ret = fwrite (map.data, map.size, 1, multifilesink->file);
@@ -605,15 +608,18 @@ gst_multi_file_sink_render (GstBaseSink * sink, GstBuffer * buffer)
multifilesink->cur_file_size, new_size,
multifilesink->max_file_size);
- if (multifilesink->file != NULL)
+ if (multifilesink->file != NULL) {
+ first_file = FALSE;
gst_multi_file_sink_close_file (multifilesink, NULL);
+ }
}
if (multifilesink->file == NULL) {
if (!gst_multi_file_sink_open_next_file (multifilesink))
goto stdio_write_error;
- gst_multi_file_sink_write_stream_headers (multifilesink);
+ if (!first_file)
+ gst_multi_file_sink_write_stream_headers (multifilesink);
}
ret = fwrite (map.data, map.size, 1, multifilesink->file);
@@ -706,7 +712,7 @@ static GstFlowReturn
gst_multi_file_sink_render_list (GstBaseSink * sink, GstBufferList * list)
{
GstBuffer *buf;
- guint size;
+ guint size = 0;
gst_buffer_list_foreach (list, buffer_list_calc_size, &size);
GST_LOG_OBJECT (sink, "total size of buffer list %p: %u", list, size);
diff --git a/gst/multifile/gstmultifilesrc.c b/gst/multifile/gstmultifilesrc.c
index da9d59ba177f5cb990c77bee49b0b611bfbe3c8c..e79d837fce3d83a23e0b698439b06b86a14be74a 100644
--- a/gst/multifile/gstmultifilesrc.c
+++ b/gst/multifile/gstmultifilesrc.c
@@ -138,11 +138,6 @@ gst_multi_file_src_class_init (GstMultiFileSrcClass * klass)
gstpushsrc_class->create = gst_multi_file_src_create;
- if (sizeof (off_t) < 8) {
- GST_LOG ("No large file support, sizeof (off_t) = %" G_GSIZE_FORMAT,
- sizeof (off_t));
- }
-
GST_DEBUG_CATEGORY_INIT (gst_multi_file_src_debug, "multifilesrc", 0,
"multifilesrc element");
diff --git a/gst/multipart/Makefile.in b/gst/multipart/Makefile.in
index dec3dac331cd32e6ef9cbd3bd1ebacb06856a5a5..7ec44b656483e86f07fb19a922615087496f6e56 100644
--- a/gst/multipart/Makefile.in
+++ b/gst/multipart/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.11.4 from Makefile.am.
+# Makefile.in generated by automake 1.11.5 from Makefile.am.
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -60,6 +60,7 @@ am__aclocal_m4_deps = $(top_srcdir)/common/m4/as-ac-expand.m4 \
$(top_srcdir)/common/m4/as-auto-alt.m4 \
$(top_srcdir)/common/m4/as-compiler-flag.m4 \
$(top_srcdir)/common/m4/as-gcc-inline-assembly.m4 \
+ $(top_srcdir)/common/m4/as-libtool.m4 \
$(top_srcdir)/common/m4/as-objc.m4 \
$(top_srcdir)/common/m4/as-python.m4 \
$(top_srcdir)/common/m4/as-scrub-include.m4 \
@@ -257,6 +258,7 @@ GMSGFMT_015 = @GMSGFMT_015@
GREP = @GREP@
GSTPB_PLUGINS_DIR = @GSTPB_PLUGINS_DIR@
GSTPB_PREFIX = @GSTPB_PREFIX@
+GST_AGE = @GST_AGE@
GST_ALL_LDFLAGS = @GST_ALL_LDFLAGS@
GST_API_VERSION = @GST_API_VERSION@
GST_BASE_CFLAGS = @GST_BASE_CFLAGS@
@@ -266,9 +268,11 @@ GST_CHECK_CFLAGS = @GST_CHECK_CFLAGS@
GST_CHECK_LIBS = @GST_CHECK_LIBS@
GST_CONTROLLER_CFLAGS = @GST_CONTROLLER_CFLAGS@
GST_CONTROLLER_LIBS = @GST_CONTROLLER_LIBS@
+GST_CURRENT = @GST_CURRENT@
GST_CXXFLAGS = @GST_CXXFLAGS@
GST_LEVEL_DEFAULT = @GST_LEVEL_DEFAULT@
GST_LIBS = @GST_LIBS@
+GST_LIBVERSION = @GST_LIBVERSION@
GST_LICENSE = @GST_LICENSE@
GST_LT_LDFLAGS = @GST_LT_LDFLAGS@
GST_NET_CFLAGS = @GST_NET_CFLAGS@
@@ -286,6 +290,7 @@ GST_PLUGINS_NONPORTED = @GST_PLUGINS_NONPORTED@
GST_PLUGINS_SELECTED = @GST_PLUGINS_SELECTED@
GST_PLUGIN_LDFLAGS = @GST_PLUGIN_LDFLAGS@
GST_PREFIX = @GST_PREFIX@
+GST_REVISION = @GST_REVISION@
GST_TOOLS_DIR = @GST_TOOLS_DIR@
GTKDOC_CHECK = @GTKDOC_CHECK@
GTK_CFLAGS = @GTK_CFLAGS@
@@ -536,7 +541,7 @@ install-pluginLTLIBRARIES: $(plugin_LTLIBRARIES)
done; \
test -z "$$list2" || { \
echo " $(MKDIR_P) '$(DESTDIR)$(plugindir)'"; \
- $(MKDIR_P) '$(DESTDIR)$(plugindir)' || exit 1; \
+ $(MKDIR_P) "$(DESTDIR)$(plugindir)" || exit 1; \
echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 '$(DESTDIR)$(plugindir)'"; \
$(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 "$(DESTDIR)$(plugindir)"; \
}
diff --git a/gst/multipart/multipartdemux.c b/gst/multipart/multipartdemux.c
index 208755274b2fb630f81422c7894c36ca1607ef63..ab9dacbaf22ed6040ce3bdcddbd82656881682d8 100644
--- a/gst/multipart/multipartdemux.c
+++ b/gst/multipart/multipartdemux.c
@@ -313,14 +313,6 @@ gst_multipart_find_pad_by_mime (GstMultipartDemux * demux, gchar * mime,
name);
g_free (name);
- /* take the mime type, convert it to the caps name */
- capsname = gst_multipart_demux_get_gstname (demux, mime);
- caps = gst_caps_from_string (capsname);
- GST_DEBUG_OBJECT (demux, "caps for pad: %s", capsname);
- gst_pad_use_fixed_caps (pad);
- gst_pad_set_caps (pad, caps);
- gst_caps_unref (caps);
-
mppad->pad = pad;
mppad->mime = g_strdup (mime);
mppad->last_ret = GST_FLOW_OK;
@@ -328,7 +320,15 @@ gst_multipart_find_pad_by_mime (GstMultipartDemux * demux, gchar * mime,
demux->srcpads = g_slist_prepend (demux->srcpads, mppad);
demux->numpads++;
+ /* take the mime type, convert it to the caps name */
+ capsname = gst_multipart_demux_get_gstname (demux, mime);
+ caps = gst_caps_from_string (capsname);
+ GST_DEBUG_OBJECT (demux, "caps for pad: %s", capsname);
+ gst_pad_use_fixed_caps (pad);
gst_pad_set_active (pad, TRUE);
+ gst_pad_set_caps (pad, caps);
+ gst_caps_unref (caps);
+
gst_element_add_pad (GST_ELEMENT_CAST (demux), pad);
if (created) {
diff --git a/gst/multipart/multipartmux.c b/gst/multipart/multipartmux.c
index daeb11b336294bbab1ce33dccc5019e0a7a08ed8..38d3711fffc8bde9d59a43b678067b6e64931b97 100644
--- a/gst/multipart/multipartmux.c
+++ b/gst/multipart/multipartmux.c
@@ -84,7 +84,7 @@ static GstPad *gst_multipart_mux_request_new_pad (GstElement * element,
static GstStateChangeReturn gst_multipart_mux_change_state (GstElement *
element, GstStateChange transition);
-static GstFlowReturn gst_multipart_mux_collected (GstCollectPads2 * pads,
+static GstFlowReturn gst_multipart_mux_collected (GstCollectPads * pads,
GstMultipartMux * mux);
static void gst_multipart_mux_set_property (GObject * object, guint prop_id,
@@ -148,9 +148,9 @@ gst_multipart_mux_init (GstMultipartMux * multipart_mux)
multipart_mux->boundary = g_strdup (DEFAULT_BOUNDARY);
- multipart_mux->collect = gst_collect_pads2_new ();
- gst_collect_pads2_set_function (multipart_mux->collect,
- (GstCollectPads2Function) GST_DEBUG_FUNCPTR (gst_multipart_mux_collected),
+ multipart_mux->collect = gst_collect_pads_new ();
+ gst_collect_pads_set_function (multipart_mux->collect,
+ (GstCollectPadsFunction) GST_DEBUG_FUNCPTR (gst_multipart_mux_collected),
multipart_mux);
}
@@ -194,7 +194,7 @@ gst_multipart_mux_request_new_pad (GstElement * element,
GstMultipartPadData *multipartpad;
multipartpad = (GstMultipartPadData *)
- gst_collect_pads2_add_pad (multipart_mux->collect, newpad,
+ gst_collect_pads_add_pad (multipart_mux->collect, newpad,
sizeof (GstMultipartPadData));
/* save a pointer to our data in the pad */
@@ -340,7 +340,7 @@ gst_multipart_mux_queue_pads (GstMultipartMux * mux)
/* try to make sure we have a buffer from each usable pad first */
walk = mux->collect->data;
while (walk) {
- GstCollectData2 *data = (GstCollectData2 *) walk->data;
+ GstCollectData *data = (GstCollectData *) walk->data;
GstMultipartPadData *pad = (GstMultipartPadData *) data;
walk = g_slist_next (walk);
@@ -349,7 +349,7 @@ gst_multipart_mux_queue_pads (GstMultipartMux * mux)
if (pad->buffer == NULL) {
GstBuffer *buf = NULL;
- buf = gst_collect_pads2_pop (mux->collect, data);
+ buf = gst_collect_pads_pop (mux->collect, data);
/* Store timestamp with segment_start and preroll */
if (buf && GST_BUFFER_TIMESTAMP_IS_VALID (buf)) {
@@ -383,7 +383,7 @@ gst_multipart_mux_queue_pads (GstMultipartMux * mux)
* 3) push both buffers on best pad, go to 1
*/
static GstFlowReturn
-gst_multipart_mux_collected (GstCollectPads2 * pads, GstMultipartMux * mux)
+gst_multipart_mux_collected (GstCollectPads * pads, GstMultipartMux * mux)
{
GstMultipartPadData *best;
GstFlowReturn ret = GST_FLOW_OK;
@@ -606,11 +606,11 @@ gst_multipart_mux_change_state (GstElement * element, GstStateChange transition)
multipart_mux->negotiated = FALSE;
multipart_mux->need_segment = TRUE;
GST_DEBUG_OBJECT (multipart_mux, "starting collect pads");
- gst_collect_pads2_start (multipart_mux->collect);
+ gst_collect_pads_start (multipart_mux->collect);
break;
case GST_STATE_CHANGE_PAUSED_TO_READY:
GST_DEBUG_OBJECT (multipart_mux, "stopping collect pads");
- gst_collect_pads2_stop (multipart_mux->collect);
+ gst_collect_pads_stop (multipart_mux->collect);
break;
default:
break;
diff --git a/gst/multipart/multipartmux.h b/gst/multipart/multipartmux.h
index 4583b5098d44e8d9a623e238e98ccbf0594dad2e..d2711ac0ea142fb89558b19a74e3b7d83f87536a 100644
--- a/gst/multipart/multipartmux.h
+++ b/gst/multipart/multipartmux.h
@@ -23,7 +23,7 @@
#define __GST_MULTIPART_MUX__
#include <gst/gst.h>
-#include <gst/base/gstcollectpads2.h>
+#include <gst/base/gstcollectpads.h>
#include <string.h>
@@ -42,7 +42,7 @@ typedef struct _GstMultipartMuxClass GstMultipartMuxClass;
/* all information needed for one multipart stream */
typedef struct
{
- GstCollectData2 collect; /* we extend the CollectData2 */
+ GstCollectData collect; /* we extend the CollectData */
GstBuffer *buffer; /* the queued buffer for this pad */
GstClockTime timestamp; /* its timestamp, converted to running_time so that we can
@@ -64,7 +64,7 @@ struct _GstMultipartMux
GstPad *srcpad;
/* sinkpads */
- GstCollectPads2 *collect;
+ GstCollectPads *collect;
gint numpads;
diff --git a/gst/replaygain/Makefile.in b/gst/replaygain/Makefile.in
index ae7c6092d9aff60fc3a1679e186466c720eb6fae..59e862b6cb00e5d5bdede86c24738660346e9cd4 100644
--- a/gst/replaygain/Makefile.in
+++ b/gst/replaygain/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.11.4 from Makefile.am.
+# Makefile.in generated by automake 1.11.5 from Makefile.am.
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -60,6 +60,7 @@ am__aclocal_m4_deps = $(top_srcdir)/common/m4/as-ac-expand.m4 \
$(top_srcdir)/common/m4/as-auto-alt.m4 \
$(top_srcdir)/common/m4/as-compiler-flag.m4 \
$(top_srcdir)/common/m4/as-gcc-inline-assembly.m4 \
+ $(top_srcdir)/common/m4/as-libtool.m4 \
$(top_srcdir)/common/m4/as-objc.m4 \
$(top_srcdir)/common/m4/as-python.m4 \
$(top_srcdir)/common/m4/as-scrub-include.m4 \
@@ -260,6 +261,7 @@ GMSGFMT_015 = @GMSGFMT_015@
GREP = @GREP@
GSTPB_PLUGINS_DIR = @GSTPB_PLUGINS_DIR@
GSTPB_PREFIX = @GSTPB_PREFIX@
+GST_AGE = @GST_AGE@
GST_ALL_LDFLAGS = @GST_ALL_LDFLAGS@
GST_API_VERSION = @GST_API_VERSION@
GST_BASE_CFLAGS = @GST_BASE_CFLAGS@
@@ -269,9 +271,11 @@ GST_CHECK_CFLAGS = @GST_CHECK_CFLAGS@
GST_CHECK_LIBS = @GST_CHECK_LIBS@
GST_CONTROLLER_CFLAGS = @GST_CONTROLLER_CFLAGS@
GST_CONTROLLER_LIBS = @GST_CONTROLLER_LIBS@
+GST_CURRENT = @GST_CURRENT@
GST_CXXFLAGS = @GST_CXXFLAGS@
GST_LEVEL_DEFAULT = @GST_LEVEL_DEFAULT@
GST_LIBS = @GST_LIBS@
+GST_LIBVERSION = @GST_LIBVERSION@
GST_LICENSE = @GST_LICENSE@
GST_LT_LDFLAGS = @GST_LT_LDFLAGS@
GST_NET_CFLAGS = @GST_NET_CFLAGS@
@@ -289,6 +293,7 @@ GST_PLUGINS_NONPORTED = @GST_PLUGINS_NONPORTED@
GST_PLUGINS_SELECTED = @GST_PLUGINS_SELECTED@
GST_PLUGIN_LDFLAGS = @GST_PLUGIN_LDFLAGS@
GST_PREFIX = @GST_PREFIX@
+GST_REVISION = @GST_REVISION@
GST_TOOLS_DIR = @GST_TOOLS_DIR@
GTKDOC_CHECK = @GTKDOC_CHECK@
GTK_CFLAGS = @GTK_CFLAGS@
@@ -558,7 +563,7 @@ install-pluginLTLIBRARIES: $(plugin_LTLIBRARIES)
done; \
test -z "$$list2" || { \
echo " $(MKDIR_P) '$(DESTDIR)$(plugindir)'"; \
- $(MKDIR_P) '$(DESTDIR)$(plugindir)' || exit 1; \
+ $(MKDIR_P) "$(DESTDIR)$(plugindir)" || exit 1; \
echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 '$(DESTDIR)$(plugindir)'"; \
$(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 "$(DESTDIR)$(plugindir)"; \
}
diff --git a/gst/rtp/Makefile.in b/gst/rtp/Makefile.in
index 5bc8a77a3b45059b85b92d454393119b3c7bd363..67c9009d4865b6e934a22e4b6f9f5c93194f9a67 100644
--- a/gst/rtp/Makefile.in
+++ b/gst/rtp/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.11.4 from Makefile.am.
+# Makefile.in generated by automake 1.11.5 from Makefile.am.
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -60,6 +60,7 @@ am__aclocal_m4_deps = $(top_srcdir)/common/m4/as-ac-expand.m4 \
$(top_srcdir)/common/m4/as-auto-alt.m4 \
$(top_srcdir)/common/m4/as-compiler-flag.m4 \
$(top_srcdir)/common/m4/as-gcc-inline-assembly.m4 \
+ $(top_srcdir)/common/m4/as-libtool.m4 \
$(top_srcdir)/common/m4/as-objc.m4 \
$(top_srcdir)/common/m4/as-python.m4 \
$(top_srcdir)/common/m4/as-scrub-include.m4 \
@@ -296,6 +297,7 @@ GMSGFMT_015 = @GMSGFMT_015@
GREP = @GREP@
GSTPB_PLUGINS_DIR = @GSTPB_PLUGINS_DIR@
GSTPB_PREFIX = @GSTPB_PREFIX@
+GST_AGE = @GST_AGE@
GST_ALL_LDFLAGS = @GST_ALL_LDFLAGS@
GST_API_VERSION = @GST_API_VERSION@
GST_BASE_CFLAGS = @GST_BASE_CFLAGS@
@@ -305,9 +307,11 @@ GST_CHECK_CFLAGS = @GST_CHECK_CFLAGS@
GST_CHECK_LIBS = @GST_CHECK_LIBS@
GST_CONTROLLER_CFLAGS = @GST_CONTROLLER_CFLAGS@
GST_CONTROLLER_LIBS = @GST_CONTROLLER_LIBS@
+GST_CURRENT = @GST_CURRENT@
GST_CXXFLAGS = @GST_CXXFLAGS@
GST_LEVEL_DEFAULT = @GST_LEVEL_DEFAULT@
GST_LIBS = @GST_LIBS@
+GST_LIBVERSION = @GST_LIBVERSION@
GST_LICENSE = @GST_LICENSE@
GST_LT_LDFLAGS = @GST_LT_LDFLAGS@
GST_NET_CFLAGS = @GST_NET_CFLAGS@
@@ -325,6 +329,7 @@ GST_PLUGINS_NONPORTED = @GST_PLUGINS_NONPORTED@
GST_PLUGINS_SELECTED = @GST_PLUGINS_SELECTED@
GST_PLUGIN_LDFLAGS = @GST_PLUGIN_LDFLAGS@
GST_PREFIX = @GST_PREFIX@
+GST_REVISION = @GST_REVISION@
GST_TOOLS_DIR = @GST_TOOLS_DIR@
GTKDOC_CHECK = @GTKDOC_CHECK@
GTK_CFLAGS = @GTK_CFLAGS@
@@ -726,7 +731,7 @@ install-pluginLTLIBRARIES: $(plugin_LTLIBRARIES)
done; \
test -z "$$list2" || { \
echo " $(MKDIR_P) '$(DESTDIR)$(plugindir)'"; \
- $(MKDIR_P) '$(DESTDIR)$(plugindir)' || exit 1; \
+ $(MKDIR_P) "$(DESTDIR)$(plugindir)" || exit 1; \
echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 '$(DESTDIR)$(plugindir)'"; \
$(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 "$(DESTDIR)$(plugindir)"; \
}
diff --git a/gst/rtp/gstrtpceltdepay.c b/gst/rtp/gstrtpceltdepay.c
index 36e7f595c03c0c269d44d5a2d4521ecd5b06b06b..90c126390ad4c2a9271434da24197df8b4519b94 100644
--- a/gst/rtp/gstrtpceltdepay.c
+++ b/gst/rtp/gstrtpceltdepay.c
@@ -247,7 +247,7 @@ gst_rtp_celt_depay_process (GstRTPBaseDepayload * depayload, GstBuffer * buf)
do {
s = payload[pos++];
size += s;
- total_size += size + 1;
+ total_size += s + 1;
} while (s == 0xff);
outbuf = gst_rtp_buffer_get_payload_subbuffer (&rtp, offset, size);
diff --git a/gst/rtp/gstrtpmparobustdepay.c b/gst/rtp/gstrtpmparobustdepay.c
index fdd724eb2671d23f1dad88808ad2b6ed65044db0..47ec61b8227422f191003cf89c2ec20e8b2e7b7c 100644
--- a/gst/rtp/gstrtpmparobustdepay.c
+++ b/gst/rtp/gstrtpmparobustdepay.c
@@ -525,12 +525,12 @@ gst_rtp_mpa_robust_depay_push_mp3_frames (GstRtpMPARobustDepay * rtpmpadepay)
head->size, head->side_info);
rtpmpadepay->mp3_frame = gst_byte_writer_new_with_size (head->size, TRUE);
/* 0-fill possible gaps */
- gst_byte_writer_fill (rtpmpadepay->mp3_frame, 0, head->size);
+ gst_byte_writer_fill_unchecked (rtpmpadepay->mp3_frame, 0, head->size);
gst_byte_writer_set_pos (rtpmpadepay->mp3_frame, 0);
/* bytewriter corresponds to head frame,
* i.e. the header and the side info must match */
gst_buffer_map (head->buffer, &map, GST_MAP_READ);
- gst_byte_writer_put_data (rtpmpadepay->mp3_frame,
+ gst_byte_writer_put_data_unchecked (rtpmpadepay->mp3_frame,
map.data, 4 + head->side_info);
gst_buffer_unmap (head->buffer, &map);
}
@@ -549,7 +549,7 @@ gst_rtp_mpa_robust_depay_push_mp3_frames (GstRtpMPARobustDepay * rtpmpadepay)
GST_LOG_OBJECT (rtpmpadepay,
"appending %d bytes from ADU frame at offset %d", av,
rtpmpadepay->offset);
- gst_byte_writer_put_data (rtpmpadepay->mp3_frame,
+ gst_byte_writer_put_data_unchecked (rtpmpadepay->mp3_frame,
map.data + rtpmpadepay->offset, av);
rtpmpadepay->offset += av;
gst_buffer_unmap (buf, &map);
@@ -594,7 +594,7 @@ gst_rtp_mpa_robust_depay_push_mp3_frames (GstRtpMPARobustDepay * rtpmpadepay)
GST_LOG_OBJECT (rtpmpadepay, "adding to current MP3 frame");
gst_byte_writer_set_pos (rtpmpadepay->mp3_frame, tpos);
av = MIN (av, map.size - 4 - frame->side_info);
- gst_byte_writer_put_data (rtpmpadepay->mp3_frame,
+ gst_byte_writer_put_data_unchecked (rtpmpadepay->mp3_frame,
map.data + 4 + frame->side_info, av);
rtpmpadepay->offset += av + 4 + frame->side_info;
gst_buffer_unmap (buf, &map);
diff --git a/gst/rtp/gstrtpvrawpay.c b/gst/rtp/gstrtpvrawpay.c
index 3a53d662da529366cb7b27078ef4f8dcc8fe2700..2ac0fcd97a65d2e44affee77d1187434253b01fa 100644
--- a/gst/rtp/gstrtpvrawpay.c
+++ b/gst/rtp/gstrtpvrawpay.c
@@ -187,7 +187,7 @@ gst_rtp_vraw_pay_setcaps (GstRTPBasePayload * payload, GstCaps * caps)
break;
}
- if (info.flags & GST_VIDEO_FLAG_INTERLACED) {
+ if (GST_VIDEO_INFO_IS_INTERLACED (&info)) {
yinc *= 2;
}
@@ -204,7 +204,7 @@ gst_rtp_vraw_pay_setcaps (GstRTPBasePayload * payload, GstCaps * caps)
hstr = g_strdup_printf ("%d", GST_VIDEO_INFO_HEIGHT (&info));
gst_rtp_base_payload_set_options (payload, "video", TRUE, "RAW", 90000);
- if (info.flags & GST_VIDEO_FLAG_INTERLACED) {
+ if (GST_VIDEO_INFO_IS_INTERLACED (&info)) {
res = gst_rtp_base_payload_set_outcaps (payload, "sampling", G_TYPE_STRING,
samplingstr, "depth", G_TYPE_STRING, depthstr, "width", G_TYPE_STRING,
wstr, "height", G_TYPE_STRING, hstr, "colorimetry", G_TYPE_STRING,
@@ -271,7 +271,7 @@ gst_rtp_vraw_pay_handle_buffer (GstRTPBasePayload * payload, GstBuffer * buffer)
width = GST_VIDEO_INFO_WIDTH (&rtpvrawpay->vinfo);
height = GST_VIDEO_INFO_HEIGHT (&rtpvrawpay->vinfo);
- interlaced = ! !(rtpvrawpay->vinfo.flags & GST_VIDEO_FLAG_INTERLACED);
+ interlaced = GST_VIDEO_INFO_IS_INTERLACED (&rtpvrawpay->vinfo);
/* start with line 0, offset 0 */
for (field = 0; field < 1 + interlaced; field++) {
diff --git a/gst/rtpmanager/Makefile.in b/gst/rtpmanager/Makefile.in
index 93eaf94f866958a7cfc22dc86b334834f72f9a6c..b7590c2d635ec156a38825df56eb831332a7235b 100644
--- a/gst/rtpmanager/Makefile.in
+++ b/gst/rtpmanager/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.11.4 from Makefile.am.
+# Makefile.in generated by automake 1.11.5 from Makefile.am.
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -68,6 +68,7 @@ am__aclocal_m4_deps = $(top_srcdir)/common/m4/as-ac-expand.m4 \
$(top_srcdir)/common/m4/as-auto-alt.m4 \
$(top_srcdir)/common/m4/as-compiler-flag.m4 \
$(top_srcdir)/common/m4/as-gcc-inline-assembly.m4 \
+ $(top_srcdir)/common/m4/as-libtool.m4 \
$(top_srcdir)/common/m4/as-objc.m4 \
$(top_srcdir)/common/m4/as-python.m4 \
$(top_srcdir)/common/m4/as-scrub-include.m4 \
@@ -278,6 +279,7 @@ GMSGFMT_015 = @GMSGFMT_015@
GREP = @GREP@
GSTPB_PLUGINS_DIR = @GSTPB_PLUGINS_DIR@
GSTPB_PREFIX = @GSTPB_PREFIX@
+GST_AGE = @GST_AGE@
GST_ALL_LDFLAGS = @GST_ALL_LDFLAGS@
GST_API_VERSION = @GST_API_VERSION@
GST_BASE_CFLAGS = @GST_BASE_CFLAGS@
@@ -287,9 +289,11 @@ GST_CHECK_CFLAGS = @GST_CHECK_CFLAGS@
GST_CHECK_LIBS = @GST_CHECK_LIBS@
GST_CONTROLLER_CFLAGS = @GST_CONTROLLER_CFLAGS@
GST_CONTROLLER_LIBS = @GST_CONTROLLER_LIBS@
+GST_CURRENT = @GST_CURRENT@
GST_CXXFLAGS = @GST_CXXFLAGS@
GST_LEVEL_DEFAULT = @GST_LEVEL_DEFAULT@
GST_LIBS = @GST_LIBS@
+GST_LIBVERSION = @GST_LIBVERSION@
GST_LICENSE = @GST_LICENSE@
GST_LT_LDFLAGS = @GST_LT_LDFLAGS@
GST_NET_CFLAGS = @GST_NET_CFLAGS@
@@ -307,6 +311,7 @@ GST_PLUGINS_NONPORTED = @GST_PLUGINS_NONPORTED@
GST_PLUGINS_SELECTED = @GST_PLUGINS_SELECTED@
GST_PLUGIN_LDFLAGS = @GST_PLUGIN_LDFLAGS@
GST_PREFIX = @GST_PREFIX@
+GST_REVISION = @GST_REVISION@
GST_TOOLS_DIR = @GST_TOOLS_DIR@
GTKDOC_CHECK = @GTKDOC_CHECK@
GTK_CFLAGS = @GTK_CFLAGS@
@@ -595,7 +600,7 @@ install-pluginLTLIBRARIES: $(plugin_LTLIBRARIES)
done; \
test -z "$$list2" || { \
echo " $(MKDIR_P) '$(DESTDIR)$(plugindir)'"; \
- $(MKDIR_P) '$(DESTDIR)$(plugindir)' || exit 1; \
+ $(MKDIR_P) "$(DESTDIR)$(plugindir)" || exit 1; \
echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 '$(DESTDIR)$(plugindir)'"; \
$(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 "$(DESTDIR)$(plugindir)"; \
}
diff --git a/gst/rtpmanager/rtpsession.c b/gst/rtpmanager/rtpsession.c
index b994d94108e10b96f0e2a1c355bd26c80dc8c057..bb39c0801bda97145b67b72158334a1b6b4526c8 100644
--- a/gst/rtpmanager/rtpsession.c
+++ b/gst/rtpmanager/rtpsession.c
@@ -2007,6 +2007,9 @@ rtp_session_process_sdes (RTPSession * sess, GstRTCPPacket * packet,
validated = !RTP_SOURCE_IS_ACTIVE (source);
source->validated = TRUE;
+ if (created)
+ on_new_ssrc (sess, source);
+
/* source became active */
if (validated) {
sess->stats.active_sources++;
@@ -2015,8 +2018,6 @@ rtp_session_process_sdes (RTPSession * sess, GstRTCPPacket * packet,
on_ssrc_validated (sess, source);
}
- if (created)
- on_new_ssrc (sess, source);
if (changed)
on_ssrc_sdes (sess, source);
diff --git a/gst/rtsp/Makefile.am b/gst/rtsp/Makefile.am
index 76896cca45dab2a6b1233fa74e2f300f61817bed..5c2307d9d2035ad0b34072b8e6fa359429f3fd4d 100644
--- a/gst/rtsp/Makefile.am
+++ b/gst/rtsp/Makefile.am
@@ -5,7 +5,6 @@ libgstrtsp_la_SOURCES = gstrtsp.c gstrtspsrc.c \
libgstrtsp_la_CFLAGS = $(GST_PLUGINS_BASE_CFLAGS) $(GST_CFLAGS)
libgstrtsp_la_LIBADD = $(GST_PLUGINS_BASE_LIBS) $(GST_BASE_LIBS) \
- -lgstinterfaces-@GST_API_VERSION@ \
-lgstrtp-@GST_API_VERSION@ -lgstrtsp-@GST_API_VERSION@ \
-lgstsdp-@GST_API_VERSION@ $(GST_LIBS)
libgstrtsp_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS)
diff --git a/gst/rtsp/Makefile.in b/gst/rtsp/Makefile.in
index 8b8924f7c2527e96e62448f522feee7856e707d8..f5794a4af7fda66c2d05948b72bf5e526de5c8c7 100644
--- a/gst/rtsp/Makefile.in
+++ b/gst/rtsp/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.11.4 from Makefile.am.
+# Makefile.in generated by automake 1.11.5 from Makefile.am.
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -60,6 +60,7 @@ am__aclocal_m4_deps = $(top_srcdir)/common/m4/as-ac-expand.m4 \
$(top_srcdir)/common/m4/as-auto-alt.m4 \
$(top_srcdir)/common/m4/as-compiler-flag.m4 \
$(top_srcdir)/common/m4/as-gcc-inline-assembly.m4 \
+ $(top_srcdir)/common/m4/as-libtool.m4 \
$(top_srcdir)/common/m4/as-objc.m4 \
$(top_srcdir)/common/m4/as-python.m4 \
$(top_srcdir)/common/m4/as-scrub-include.m4 \
@@ -257,6 +258,7 @@ GMSGFMT_015 = @GMSGFMT_015@
GREP = @GREP@
GSTPB_PLUGINS_DIR = @GSTPB_PLUGINS_DIR@
GSTPB_PREFIX = @GSTPB_PREFIX@
+GST_AGE = @GST_AGE@
GST_ALL_LDFLAGS = @GST_ALL_LDFLAGS@
GST_API_VERSION = @GST_API_VERSION@
GST_BASE_CFLAGS = @GST_BASE_CFLAGS@
@@ -266,9 +268,11 @@ GST_CHECK_CFLAGS = @GST_CHECK_CFLAGS@
GST_CHECK_LIBS = @GST_CHECK_LIBS@
GST_CONTROLLER_CFLAGS = @GST_CONTROLLER_CFLAGS@
GST_CONTROLLER_LIBS = @GST_CONTROLLER_LIBS@
+GST_CURRENT = @GST_CURRENT@
GST_CXXFLAGS = @GST_CXXFLAGS@
GST_LEVEL_DEFAULT = @GST_LEVEL_DEFAULT@
GST_LIBS = @GST_LIBS@
+GST_LIBVERSION = @GST_LIBVERSION@
GST_LICENSE = @GST_LICENSE@
GST_LT_LDFLAGS = @GST_LT_LDFLAGS@
GST_NET_CFLAGS = @GST_NET_CFLAGS@
@@ -286,6 +290,7 @@ GST_PLUGINS_NONPORTED = @GST_PLUGINS_NONPORTED@
GST_PLUGINS_SELECTED = @GST_PLUGINS_SELECTED@
GST_PLUGIN_LDFLAGS = @GST_PLUGIN_LDFLAGS@
GST_PREFIX = @GST_PREFIX@
+GST_REVISION = @GST_REVISION@
GST_TOOLS_DIR = @GST_TOOLS_DIR@
GTKDOC_CHECK = @GTKDOC_CHECK@
GTK_CFLAGS = @GTK_CFLAGS@
@@ -491,7 +496,6 @@ libgstrtsp_la_SOURCES = gstrtsp.c gstrtspsrc.c \
libgstrtsp_la_CFLAGS = $(GST_PLUGINS_BASE_CFLAGS) $(GST_CFLAGS)
libgstrtsp_la_LIBADD = $(GST_PLUGINS_BASE_LIBS) $(GST_BASE_LIBS) \
- -lgstinterfaces-@GST_API_VERSION@ \
-lgstrtp-@GST_API_VERSION@ -lgstrtsp-@GST_API_VERSION@ \
-lgstsdp-@GST_API_VERSION@ $(GST_LIBS)
@@ -546,7 +550,7 @@ install-pluginLTLIBRARIES: $(plugin_LTLIBRARIES)
done; \
test -z "$$list2" || { \
echo " $(MKDIR_P) '$(DESTDIR)$(plugindir)'"; \
- $(MKDIR_P) '$(DESTDIR)$(plugindir)' || exit 1; \
+ $(MKDIR_P) "$(DESTDIR)$(plugindir)" || exit 1; \
echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 '$(DESTDIR)$(plugindir)'"; \
$(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 "$(DESTDIR)$(plugindir)"; \
}
diff --git a/gst/shapewipe/Makefile.in b/gst/shapewipe/Makefile.in
index 5d694894f5313cbd1f3938b8f937042db18fd0ec..eef47ad048bdeb59f97a7c19409930da820ffae4 100644
--- a/gst/shapewipe/Makefile.in
+++ b/gst/shapewipe/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.11.4 from Makefile.am.
+# Makefile.in generated by automake 1.11.5 from Makefile.am.
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -60,6 +60,7 @@ am__aclocal_m4_deps = $(top_srcdir)/common/m4/as-ac-expand.m4 \
$(top_srcdir)/common/m4/as-auto-alt.m4 \
$(top_srcdir)/common/m4/as-compiler-flag.m4 \
$(top_srcdir)/common/m4/as-gcc-inline-assembly.m4 \
+ $(top_srcdir)/common/m4/as-libtool.m4 \
$(top_srcdir)/common/m4/as-objc.m4 \
$(top_srcdir)/common/m4/as-python.m4 \
$(top_srcdir)/common/m4/as-scrub-include.m4 \
@@ -255,6 +256,7 @@ GMSGFMT_015 = @GMSGFMT_015@
GREP = @GREP@
GSTPB_PLUGINS_DIR = @GSTPB_PLUGINS_DIR@
GSTPB_PREFIX = @GSTPB_PREFIX@
+GST_AGE = @GST_AGE@
GST_ALL_LDFLAGS = @GST_ALL_LDFLAGS@
GST_API_VERSION = @GST_API_VERSION@
GST_BASE_CFLAGS = @GST_BASE_CFLAGS@
@@ -264,9 +266,11 @@ GST_CHECK_CFLAGS = @GST_CHECK_CFLAGS@
GST_CHECK_LIBS = @GST_CHECK_LIBS@
GST_CONTROLLER_CFLAGS = @GST_CONTROLLER_CFLAGS@
GST_CONTROLLER_LIBS = @GST_CONTROLLER_LIBS@
+GST_CURRENT = @GST_CURRENT@
GST_CXXFLAGS = @GST_CXXFLAGS@
GST_LEVEL_DEFAULT = @GST_LEVEL_DEFAULT@
GST_LIBS = @GST_LIBS@
+GST_LIBVERSION = @GST_LIBVERSION@
GST_LICENSE = @GST_LICENSE@
GST_LT_LDFLAGS = @GST_LT_LDFLAGS@
GST_NET_CFLAGS = @GST_NET_CFLAGS@
@@ -284,6 +288,7 @@ GST_PLUGINS_NONPORTED = @GST_PLUGINS_NONPORTED@
GST_PLUGINS_SELECTED = @GST_PLUGINS_SELECTED@
GST_PLUGIN_LDFLAGS = @GST_PLUGIN_LDFLAGS@
GST_PREFIX = @GST_PREFIX@
+GST_REVISION = @GST_REVISION@
GST_TOOLS_DIR = @GST_TOOLS_DIR@
GTKDOC_CHECK = @GTKDOC_CHECK@
GTK_CFLAGS = @GTK_CFLAGS@
@@ -534,7 +539,7 @@ install-pluginLTLIBRARIES: $(plugin_LTLIBRARIES)
done; \
test -z "$$list2" || { \
echo " $(MKDIR_P) '$(DESTDIR)$(plugindir)'"; \
- $(MKDIR_P) '$(DESTDIR)$(plugindir)' || exit 1; \
+ $(MKDIR_P) "$(DESTDIR)$(plugindir)" || exit 1; \
echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 '$(DESTDIR)$(plugindir)'"; \
$(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 "$(DESTDIR)$(plugindir)"; \
}
diff --git a/gst/smpte/Makefile.in b/gst/smpte/Makefile.in
index 7e843e114feca1e2c903d41ef209cecd962da3e3..5836c64bc83145fcb9ea951e1a0cc36ecd99720c 100644
--- a/gst/smpte/Makefile.in
+++ b/gst/smpte/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.11.4 from Makefile.am.
+# Makefile.in generated by automake 1.11.5 from Makefile.am.
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -60,6 +60,7 @@ am__aclocal_m4_deps = $(top_srcdir)/common/m4/as-ac-expand.m4 \
$(top_srcdir)/common/m4/as-auto-alt.m4 \
$(top_srcdir)/common/m4/as-compiler-flag.m4 \
$(top_srcdir)/common/m4/as-gcc-inline-assembly.m4 \
+ $(top_srcdir)/common/m4/as-libtool.m4 \
$(top_srcdir)/common/m4/as-objc.m4 \
$(top_srcdir)/common/m4/as-python.m4 \
$(top_srcdir)/common/m4/as-scrub-include.m4 \
@@ -258,6 +259,7 @@ GMSGFMT_015 = @GMSGFMT_015@
GREP = @GREP@
GSTPB_PLUGINS_DIR = @GSTPB_PLUGINS_DIR@
GSTPB_PREFIX = @GSTPB_PREFIX@
+GST_AGE = @GST_AGE@
GST_ALL_LDFLAGS = @GST_ALL_LDFLAGS@
GST_API_VERSION = @GST_API_VERSION@
GST_BASE_CFLAGS = @GST_BASE_CFLAGS@
@@ -267,9 +269,11 @@ GST_CHECK_CFLAGS = @GST_CHECK_CFLAGS@
GST_CHECK_LIBS = @GST_CHECK_LIBS@
GST_CONTROLLER_CFLAGS = @GST_CONTROLLER_CFLAGS@
GST_CONTROLLER_LIBS = @GST_CONTROLLER_LIBS@
+GST_CURRENT = @GST_CURRENT@
GST_CXXFLAGS = @GST_CXXFLAGS@
GST_LEVEL_DEFAULT = @GST_LEVEL_DEFAULT@
GST_LIBS = @GST_LIBS@
+GST_LIBVERSION = @GST_LIBVERSION@
GST_LICENSE = @GST_LICENSE@
GST_LT_LDFLAGS = @GST_LT_LDFLAGS@
GST_NET_CFLAGS = @GST_NET_CFLAGS@
@@ -287,6 +291,7 @@ GST_PLUGINS_NONPORTED = @GST_PLUGINS_NONPORTED@
GST_PLUGINS_SELECTED = @GST_PLUGINS_SELECTED@
GST_PLUGIN_LDFLAGS = @GST_PLUGIN_LDFLAGS@
GST_PREFIX = @GST_PREFIX@
+GST_REVISION = @GST_REVISION@
GST_TOOLS_DIR = @GST_TOOLS_DIR@
GTKDOC_CHECK = @GTKDOC_CHECK@
GTK_CFLAGS = @GTK_CFLAGS@
@@ -539,7 +544,7 @@ install-pluginLTLIBRARIES: $(plugin_LTLIBRARIES)
done; \
test -z "$$list2" || { \
echo " $(MKDIR_P) '$(DESTDIR)$(plugindir)'"; \
- $(MKDIR_P) '$(DESTDIR)$(plugindir)' || exit 1; \
+ $(MKDIR_P) "$(DESTDIR)$(plugindir)" || exit 1; \
echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 '$(DESTDIR)$(plugindir)'"; \
$(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 "$(DESTDIR)$(plugindir)"; \
}
diff --git a/gst/smpte/gstsmpte.c b/gst/smpte/gstsmpte.c
index 14cdea56bf3590c4f6e89a2a518188e975c7df8c..c2ed40af1883dd0e1c6d6d2c24799cd1a355657d 100644
--- a/gst/smpte/gstsmpte.c
+++ b/gst/smpte/gstsmpte.c
@@ -146,11 +146,9 @@ gst_smpte_transition_type_get_type (void)
}
-static void gst_smpte_class_init (GstSMPTEClass * klass);
-static void gst_smpte_init (GstSMPTE * smpte);
static void gst_smpte_finalize (GstSMPTE * smpte);
-static GstFlowReturn gst_smpte_collected (GstCollectPads2 * pads,
+static GstFlowReturn gst_smpte_collected (GstCollectPads * pads,
GstSMPTE * smpte);
static void gst_smpte_set_property (GObject * object, guint prop_id,
@@ -161,33 +159,10 @@ static void gst_smpte_get_property (GObject * object, guint prop_id,
static GstStateChangeReturn gst_smpte_change_state (GstElement * element,
GstStateChange transition);
-static GstElementClass *parent_class = NULL;
-
/*static guint gst_smpte_signals[LAST_SIGNAL] = { 0 }; */
-static GType
-gst_smpte_get_type (void)
-{
- static GType smpte_type = 0;
-
- if (!smpte_type) {
- static const GTypeInfo smpte_info = {
- sizeof (GstSMPTEClass),
- NULL,
- NULL,
- (GClassInitFunc) gst_smpte_class_init,
- NULL,
- NULL,
- sizeof (GstSMPTE),
- 0,
- (GInstanceInitFunc) gst_smpte_init,
- };
-
- smpte_type =
- g_type_register_static (GST_TYPE_ELEMENT, "GstSMPTE", &smpte_info, 0);
- }
- return smpte_type;
-}
+#define gst_smpte_parent_class parent_class
+G_DEFINE_TYPE (GstSMPTE, gst_smpte, GST_TYPE_ELEMENT);
static void
gst_smpte_class_init (GstSMPTEClass * klass)
@@ -338,8 +313,8 @@ gst_smpte_setcaps (GstPad * pad, GstCaps * caps)
}
static gboolean
-gst_smpte_sink_event (GstCollectPads2 * pads,
- GstCollectData2 * data, GstEvent * event, gpointer user_data)
+gst_smpte_sink_event (GstCollectPads * pads,
+ GstCollectData * data, GstEvent * event, gpointer user_data)
{
GstPad *pad;
gboolean ret = FALSE;
@@ -358,10 +333,12 @@ gst_smpte_sink_event (GstCollectPads2 * pads,
break;
}
default:
- ret = gst_pad_event_default (pad,
- GST_OBJECT_CAST (GST_PAD_PARENT (pad)), event);
+ break;
}
+ if (event != NULL)
+ return gst_collect_pads_event_default (pads, data, event, FALSE);
+
return ret;
}
@@ -382,16 +359,16 @@ gst_smpte_init (GstSMPTE * smpte)
gst_pad_new_from_static_template (&gst_smpte_src_template, "src");
gst_element_add_pad (GST_ELEMENT (smpte), smpte->srcpad);
- smpte->collect = gst_collect_pads2_new ();
- gst_collect_pads2_set_function (smpte->collect,
- (GstCollectPads2Function) GST_DEBUG_FUNCPTR (gst_smpte_collected), smpte);
- gst_collect_pads2_set_event_function (smpte->collect,
+ smpte->collect = gst_collect_pads_new ();
+ gst_collect_pads_set_function (smpte->collect,
+ (GstCollectPadsFunction) GST_DEBUG_FUNCPTR (gst_smpte_collected), smpte);
+ gst_collect_pads_set_event_function (smpte->collect,
GST_DEBUG_FUNCPTR (gst_smpte_sink_event), smpte);
- gst_collect_pads2_add_pad (smpte->collect, smpte->sinkpad1,
- sizeof (GstCollectData2));
- gst_collect_pads2_add_pad (smpte->collect, smpte->sinkpad2,
- sizeof (GstCollectData2));
+ gst_collect_pads_add_pad (smpte->collect, smpte->sinkpad1,
+ sizeof (GstCollectData));
+ gst_collect_pads_add_pad (smpte->collect, smpte->sinkpad2,
+ sizeof (GstCollectData));
smpte->fps = DEFAULT_PROP_FPS;
smpte->type = DEFAULT_PROP_TYPE;
@@ -485,7 +462,7 @@ gst_smpte_blend_i420 (GstVideoFrame * frame1, GstVideoFrame * frame2,
}
static GstFlowReturn
-gst_smpte_collected (GstCollectPads2 * pads, GstSMPTE * smpte)
+gst_smpte_collected (GstCollectPads * pads, GstSMPTE * smpte)
{
GstBuffer *outbuf;
GstClockTime ts;
@@ -505,14 +482,14 @@ gst_smpte_collected (GstCollectPads2 * pads, GstSMPTE * smpte)
smpte->fps_denom, smpte->fps_num);
for (collected = pads->data; collected; collected = g_slist_next (collected)) {
- GstCollectData2 *data;
+ GstCollectData *data;
- data = (GstCollectData2 *) collected->data;
+ data = (GstCollectData *) collected->data;
if (data->pad == smpte->sinkpad1)
- in1 = gst_collect_pads2_pop (pads, data);
+ in1 = gst_collect_pads_pop (pads, data);
else if (data->pad == smpte->sinkpad2)
- in2 = gst_collect_pads2_pop (pads, data);
+ in2 = gst_collect_pads_pop (pads, data);
}
if (in1 == NULL) {
@@ -684,17 +661,17 @@ gst_smpte_change_state (GstElement * element, GstStateChange transition)
case GST_STATE_CHANGE_READY_TO_PAUSED:
gst_smpte_reset (smpte);
GST_LOG_OBJECT (smpte, "starting collectpads");
- gst_collect_pads2_start (smpte->collect);
+ gst_collect_pads_start (smpte->collect);
break;
case GST_STATE_CHANGE_PAUSED_TO_READY:
GST_LOG_OBJECT (smpte, "stopping collectpads");
- gst_collect_pads2_stop (smpte->collect);
+ gst_collect_pads_stop (smpte->collect);
break;
default:
break;
}
- ret = parent_class->change_state (element, transition);
+ ret = GST_ELEMENT_CLASS (parent_class)->change_state (element, transition);
switch (transition) {
case GST_STATE_CHANGE_PAUSED_TO_READY:
diff --git a/gst/smpte/gstsmpte.h b/gst/smpte/gstsmpte.h
index 1d2bace882203e6b356623ce2a3cc2fc0414a3ce..cc48108a7097a92a3256ca9350cf83a1135d0549 100644
--- a/gst/smpte/gstsmpte.h
+++ b/gst/smpte/gstsmpte.h
@@ -22,7 +22,7 @@
#define __GST_SMPTE_H__
#include <gst/gst.h>
-#include <gst/base/gstcollectpads2.h>
+#include <gst/base/gstcollectpads.h>
#include <gst/video/video.h>
G_BEGIN_DECLS
@@ -50,7 +50,7 @@ struct _GstSMPTE {
GstPad *srcpad,
*sinkpad1,
*sinkpad2;
- GstCollectPads2 *collect;
+ GstCollectPads *collect;
/* properties */
gint type;
@@ -79,6 +79,7 @@ struct _GstSMPTEClass {
GstElementClass parent_class;
};
+GType gst_smpte_get_type (void);
gboolean gst_smpte_plugin_init (GstPlugin * plugin);
G_END_DECLS
diff --git a/gst/smpte/gstsmptealpha.c b/gst/smpte/gstsmptealpha.c
index c0b643b2b3bf1da32d3ddfe809b65cd551c8e76f..4009c121b76b7a0ba12d81e83e198ece419c06b6 100644
--- a/gst/smpte/gstsmptealpha.c
+++ b/gst/smpte/gstsmptealpha.c
@@ -571,7 +571,7 @@ gst_smpte_alpha_transform_caps (GstBaseTransform * trans,
gst_structure_remove_field (structure, "format");
}
- gst_structure_remove_field (structure, "color-matrix");
+ gst_structure_remove_field (structure, "colorimetry");
gst_structure_remove_field (structure, "chroma-site");
gst_caps_append_structure (tmp_caps, structure);
diff --git a/gst/spectrum/Makefile.in b/gst/spectrum/Makefile.in
index 88b37e40a062fd250306909d7b7e3bc94f7a868d..01f5311e9d67ba8f6ddadcb9d1125c32d12c6891 100644
--- a/gst/spectrum/Makefile.in
+++ b/gst/spectrum/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.11.4 from Makefile.am.
+# Makefile.in generated by automake 1.11.5 from Makefile.am.
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -60,6 +60,7 @@ am__aclocal_m4_deps = $(top_srcdir)/common/m4/as-ac-expand.m4 \
$(top_srcdir)/common/m4/as-auto-alt.m4 \
$(top_srcdir)/common/m4/as-compiler-flag.m4 \
$(top_srcdir)/common/m4/as-gcc-inline-assembly.m4 \
+ $(top_srcdir)/common/m4/as-libtool.m4 \
$(top_srcdir)/common/m4/as-objc.m4 \
$(top_srcdir)/common/m4/as-python.m4 \
$(top_srcdir)/common/m4/as-scrub-include.m4 \
@@ -256,6 +257,7 @@ GMSGFMT_015 = @GMSGFMT_015@
GREP = @GREP@
GSTPB_PLUGINS_DIR = @GSTPB_PLUGINS_DIR@
GSTPB_PREFIX = @GSTPB_PREFIX@
+GST_AGE = @GST_AGE@
GST_ALL_LDFLAGS = @GST_ALL_LDFLAGS@
GST_API_VERSION = @GST_API_VERSION@
GST_BASE_CFLAGS = @GST_BASE_CFLAGS@
@@ -265,9 +267,11 @@ GST_CHECK_CFLAGS = @GST_CHECK_CFLAGS@
GST_CHECK_LIBS = @GST_CHECK_LIBS@
GST_CONTROLLER_CFLAGS = @GST_CONTROLLER_CFLAGS@
GST_CONTROLLER_LIBS = @GST_CONTROLLER_LIBS@
+GST_CURRENT = @GST_CURRENT@
GST_CXXFLAGS = @GST_CXXFLAGS@
GST_LEVEL_DEFAULT = @GST_LEVEL_DEFAULT@
GST_LIBS = @GST_LIBS@
+GST_LIBVERSION = @GST_LIBVERSION@
GST_LICENSE = @GST_LICENSE@
GST_LT_LDFLAGS = @GST_LT_LDFLAGS@
GST_NET_CFLAGS = @GST_NET_CFLAGS@
@@ -285,6 +289,7 @@ GST_PLUGINS_NONPORTED = @GST_PLUGINS_NONPORTED@
GST_PLUGINS_SELECTED = @GST_PLUGINS_SELECTED@
GST_PLUGIN_LDFLAGS = @GST_PLUGIN_LDFLAGS@
GST_PREFIX = @GST_PREFIX@
+GST_REVISION = @GST_REVISION@
GST_TOOLS_DIR = @GST_TOOLS_DIR@
GTKDOC_CHECK = @GTKDOC_CHECK@
GTK_CFLAGS = @GTK_CFLAGS@
@@ -540,7 +545,7 @@ install-pluginLTLIBRARIES: $(plugin_LTLIBRARIES)
done; \
test -z "$$list2" || { \
echo " $(MKDIR_P) '$(DESTDIR)$(plugindir)'"; \
- $(MKDIR_P) '$(DESTDIR)$(plugindir)' || exit 1; \
+ $(MKDIR_P) "$(DESTDIR)$(plugindir)" || exit 1; \
echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 '$(DESTDIR)$(plugindir)'"; \
$(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 "$(DESTDIR)$(plugindir)"; \
}
diff --git a/gst/udp/Makefile.in b/gst/udp/Makefile.in
index 8e5ac2c73930b123f92118139f6696bd90c3f059..904a6c9073e546e98410c32cf0caefb853727f21 100644
--- a/gst/udp/Makefile.in
+++ b/gst/udp/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.11.4 from Makefile.am.
+# Makefile.in generated by automake 1.11.5 from Makefile.am.
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -68,6 +68,7 @@ am__aclocal_m4_deps = $(top_srcdir)/common/m4/as-ac-expand.m4 \
$(top_srcdir)/common/m4/as-auto-alt.m4 \
$(top_srcdir)/common/m4/as-compiler-flag.m4 \
$(top_srcdir)/common/m4/as-gcc-inline-assembly.m4 \
+ $(top_srcdir)/common/m4/as-libtool.m4 \
$(top_srcdir)/common/m4/as-objc.m4 \
$(top_srcdir)/common/m4/as-python.m4 \
$(top_srcdir)/common/m4/as-scrub-include.m4 \
@@ -271,6 +272,7 @@ GMSGFMT_015 = @GMSGFMT_015@
GREP = @GREP@
GSTPB_PLUGINS_DIR = @GSTPB_PLUGINS_DIR@
GSTPB_PREFIX = @GSTPB_PREFIX@
+GST_AGE = @GST_AGE@
GST_ALL_LDFLAGS = @GST_ALL_LDFLAGS@
GST_API_VERSION = @GST_API_VERSION@
GST_BASE_CFLAGS = @GST_BASE_CFLAGS@
@@ -280,9 +282,11 @@ GST_CHECK_CFLAGS = @GST_CHECK_CFLAGS@
GST_CHECK_LIBS = @GST_CHECK_LIBS@
GST_CONTROLLER_CFLAGS = @GST_CONTROLLER_CFLAGS@
GST_CONTROLLER_LIBS = @GST_CONTROLLER_LIBS@
+GST_CURRENT = @GST_CURRENT@
GST_CXXFLAGS = @GST_CXXFLAGS@
GST_LEVEL_DEFAULT = @GST_LEVEL_DEFAULT@
GST_LIBS = @GST_LIBS@
+GST_LIBVERSION = @GST_LIBVERSION@
GST_LICENSE = @GST_LICENSE@
GST_LT_LDFLAGS = @GST_LT_LDFLAGS@
GST_NET_CFLAGS = @GST_NET_CFLAGS@
@@ -300,6 +304,7 @@ GST_PLUGINS_NONPORTED = @GST_PLUGINS_NONPORTED@
GST_PLUGINS_SELECTED = @GST_PLUGINS_SELECTED@
GST_PLUGIN_LDFLAGS = @GST_PLUGIN_LDFLAGS@
GST_PREFIX = @GST_PREFIX@
+GST_REVISION = @GST_REVISION@
GST_TOOLS_DIR = @GST_TOOLS_DIR@
GTKDOC_CHECK = @GTKDOC_CHECK@
GTK_CFLAGS = @GTK_CFLAGS@
@@ -567,7 +572,7 @@ install-pluginLTLIBRARIES: $(plugin_LTLIBRARIES)
done; \
test -z "$$list2" || { \
echo " $(MKDIR_P) '$(DESTDIR)$(plugindir)'"; \
- $(MKDIR_P) '$(DESTDIR)$(plugindir)' || exit 1; \
+ $(MKDIR_P) "$(DESTDIR)$(plugindir)" || exit 1; \
echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 '$(DESTDIR)$(plugindir)'"; \
$(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 "$(DESTDIR)$(plugindir)"; \
}
diff --git a/gst/videobox/Makefile.in b/gst/videobox/Makefile.in
index f1e61b6d9b374bd7fe0cd871f0671da8cbe6c9ab..d8b1c38acde4908efe51d88785cda61412f407ee 100644
--- a/gst/videobox/Makefile.in
+++ b/gst/videobox/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.11.4 from Makefile.am.
+# Makefile.in generated by automake 1.11.5 from Makefile.am.
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -82,6 +82,7 @@ am__aclocal_m4_deps = $(top_srcdir)/common/m4/as-ac-expand.m4 \
$(top_srcdir)/common/m4/as-auto-alt.m4 \
$(top_srcdir)/common/m4/as-compiler-flag.m4 \
$(top_srcdir)/common/m4/as-gcc-inline-assembly.m4 \
+ $(top_srcdir)/common/m4/as-libtool.m4 \
$(top_srcdir)/common/m4/as-objc.m4 \
$(top_srcdir)/common/m4/as-python.m4 \
$(top_srcdir)/common/m4/as-scrub-include.m4 \
@@ -282,6 +283,7 @@ GMSGFMT_015 = @GMSGFMT_015@
GREP = @GREP@
GSTPB_PLUGINS_DIR = @GSTPB_PLUGINS_DIR@
GSTPB_PREFIX = @GSTPB_PREFIX@
+GST_AGE = @GST_AGE@
GST_ALL_LDFLAGS = @GST_ALL_LDFLAGS@
GST_API_VERSION = @GST_API_VERSION@
GST_BASE_CFLAGS = @GST_BASE_CFLAGS@
@@ -291,9 +293,11 @@ GST_CHECK_CFLAGS = @GST_CHECK_CFLAGS@
GST_CHECK_LIBS = @GST_CHECK_LIBS@
GST_CONTROLLER_CFLAGS = @GST_CONTROLLER_CFLAGS@
GST_CONTROLLER_LIBS = @GST_CONTROLLER_LIBS@
+GST_CURRENT = @GST_CURRENT@
GST_CXXFLAGS = @GST_CXXFLAGS@
GST_LEVEL_DEFAULT = @GST_LEVEL_DEFAULT@
GST_LIBS = @GST_LIBS@
+GST_LIBVERSION = @GST_LIBVERSION@
GST_LICENSE = @GST_LICENSE@
GST_LT_LDFLAGS = @GST_LT_LDFLAGS@
GST_NET_CFLAGS = @GST_NET_CFLAGS@
@@ -311,6 +315,7 @@ GST_PLUGINS_NONPORTED = @GST_PLUGINS_NONPORTED@
GST_PLUGINS_SELECTED = @GST_PLUGINS_SELECTED@
GST_PLUGIN_LDFLAGS = @GST_PLUGIN_LDFLAGS@
GST_PREFIX = @GST_PREFIX@
+GST_REVISION = @GST_REVISION@
GST_TOOLS_DIR = @GST_TOOLS_DIR@
GTKDOC_CHECK = @GTKDOC_CHECK@
GTK_CFLAGS = @GTK_CFLAGS@
@@ -583,7 +588,7 @@ install-pluginLTLIBRARIES: $(plugin_LTLIBRARIES)
done; \
test -z "$$list2" || { \
echo " $(MKDIR_P) '$(DESTDIR)$(plugindir)'"; \
- $(MKDIR_P) '$(DESTDIR)$(plugindir)' || exit 1; \
+ $(MKDIR_P) "$(DESTDIR)$(plugindir)" || exit 1; \
echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 '$(DESTDIR)$(plugindir)'"; \
$(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 "$(DESTDIR)$(plugindir)"; \
}
diff --git a/gst/videobox/gstvideobox.c b/gst/videobox/gstvideobox.c
index 95bfaac476a5cd10e9435b6294bd842a48f73469..0cb2200eabe2f0053f91b628e6e363f788282095 100644
--- a/gst/videobox/gstvideobox.c
+++ b/gst/videobox/gstvideobox.c
@@ -135,10 +135,16 @@ static const gint cog_identity_matrix_8bit[] = {
#define APPLY_MATRIX(m,o,v1,v2,v3) ((m[o*4] * v1 + m[o*4+1] * v2 + m[o*4+2] * v3 + m[o*4+3]) >> 8)
static void
-fill_ayuv (GstVideoBoxFill fill_type, guint b_alpha, GstVideoFormat format,
- guint8 * dest, gboolean sdtv, gint width, gint height)
+fill_ayuv (GstVideoBoxFill fill_type, guint b_alpha,
+ GstVideoFrame * frame, gboolean sdtv)
{
guint32 empty_pixel;
+ guint8 *dest;
+ gint width, height;
+ gint stride;
+
+ width = GST_VIDEO_FRAME_WIDTH (frame);
+ height = GST_VIDEO_FRAME_HEIGHT (frame);
b_alpha = CLAMP (b_alpha, 0, 255);
@@ -151,22 +157,37 @@ fill_ayuv (GstVideoBoxFill fill_type, guint b_alpha, GstVideoFormat format,
(yuv_hdtv_colors_Y[fill_type] << 16) |
(yuv_hdtv_colors_U[fill_type] << 8) | yuv_hdtv_colors_V[fill_type]);
- orc_splat_u32 ((guint32 *) dest, empty_pixel, width * height);
+ dest = GST_VIDEO_FRAME_PLANE_DATA (frame, 0);
+ stride = GST_VIDEO_FRAME_PLANE_STRIDE (frame, 0);
+
+ if (G_LIKELY (stride == 4 * width))
+ orc_splat_u32 ((guint32 *) dest, empty_pixel, width * height);
+ else if (height) {
+ for (; height; --height) {
+ orc_splat_u32 ((guint32 *) dest, empty_pixel, width);
+ dest += stride;
+ }
+ }
}
static void
-copy_ayuv_ayuv (guint i_alpha, GstVideoFormat dest_format, guint8 * dest,
- gboolean dest_sdtv, gint dest_width, gint dest_height, gint dest_x,
- gint dest_y, GstVideoFormat src_format, const guint8 * src,
- gboolean src_sdtv, gint src_width, gint src_height, gint src_x, gint src_y,
- gint w, gint h)
+copy_ayuv_ayuv (guint i_alpha, GstVideoFrame * dest_frame,
+ gboolean dest_sdtv, gint dest_x, gint dest_y, GstVideoFrame * src_frame,
+ gboolean src_sdtv, gint src_x, gint src_y, gint w, gint h)
{
gint i, j;
- gint src_stride = 4 * src_width;
- gint dest_stride = 4 * dest_width;
+ gint src_stride;
+ gint dest_stride;
+ guint8 *dest, *src;
+
+ src_stride = GST_VIDEO_FRAME_PLANE_STRIDE (src_frame, 0);
+ dest_stride = GST_VIDEO_FRAME_PLANE_STRIDE (dest_frame, 0);
- dest = dest + dest_y * dest_width * 4 + dest_x * 4;
- src = src + src_y * src_width * 4 + src_x * 4;
+ src = GST_VIDEO_FRAME_PLANE_DATA (src_frame, 0);
+ dest = GST_VIDEO_FRAME_PLANE_DATA (dest_frame, 0);
+
+ dest = dest + dest_y * dest_stride + dest_x * 4;
+ src = src + src_y * src_stride + src_x * 4;
w *= 4;
@@ -208,15 +229,13 @@ copy_ayuv_ayuv (guint i_alpha, GstVideoFormat dest_format, guint8 * dest,
}
static void
-copy_ayuv_i420 (guint i_alpha, GstVideoFormat dest_format, guint8 * dest,
- gboolean dest_sdtv, gint dest_width, gint dest_height, gint dest_x,
- gint dest_y, GstVideoFormat src_format, const guint8 * src,
- gboolean src_sdtv, gint src_width, gint src_height, gint src_x, gint src_y,
- gint w, gint h)
+copy_ayuv_i420 (guint i_alpha, GstVideoFrame * dest_frame,
+ gboolean dest_sdtv, gint dest_x, gint dest_y, GstVideoFrame * src_frame,
+ gboolean src_sdtv, gint src_x, gint src_y, gint w, gint h)
{
gint i, j;
guint8 *destY, *destY2, *destU, *destV;
- gint dest_strideY, dest_strideUV;
+ gint dest_strideY, dest_strideU, dest_strideV;
const guint8 *src2;
gint src_stride;
gint y_idx, uv_idx;
@@ -224,27 +243,29 @@ copy_ayuv_i420 (guint i_alpha, GstVideoFormat dest_format, guint8 * dest,
gint u1, u2, u3, u4;
gint v1, v2, v3, v4;
gint matrix[12];
+ guint8 *src;
+ gint dest_height, src_height, dest_width;
- dest_strideY = gst_video_format_get_row_stride (dest_format, 0, dest_width);
- dest_strideUV = gst_video_format_get_row_stride (dest_format, 1, dest_width);
+ dest_height = GST_VIDEO_FRAME_HEIGHT (dest_frame);
+ dest_width = GST_VIDEO_FRAME_WIDTH (dest_frame);
+ src_height = GST_VIDEO_FRAME_HEIGHT (src_frame);
- src_stride = 4 * src_width;
+ dest_strideY = GST_VIDEO_FRAME_COMP_STRIDE (dest_frame, 0);
+ dest_strideU = GST_VIDEO_FRAME_COMP_STRIDE (dest_frame, 1);
+ dest_strideV = GST_VIDEO_FRAME_COMP_STRIDE (dest_frame, 2);
- destY =
- dest + gst_video_format_get_component_offset (dest_format, 0,
- dest_width, dest_height);
- destU =
- dest + gst_video_format_get_component_offset (dest_format, 1,
- dest_width, dest_height);
- destV =
- dest + gst_video_format_get_component_offset (dest_format, 2,
- dest_width, dest_height);
+ src_stride = GST_VIDEO_FRAME_PLANE_STRIDE (src_frame, 0);
+
+ destY = GST_VIDEO_FRAME_COMP_DATA (dest_frame, 0);
+ destU = GST_VIDEO_FRAME_COMP_DATA (dest_frame, 1);
+ destV = GST_VIDEO_FRAME_COMP_DATA (dest_frame, 2);
destY = destY + dest_y * dest_strideY + dest_x;
destY2 = (dest_y < dest_height) ? destY + dest_strideY : destY;
- destU = destU + (dest_y / 2) * dest_strideUV + dest_x / 2;
- destV = destV + (dest_y / 2) * dest_strideUV + dest_x / 2;
+ destU = destU + (dest_y / 2) * dest_strideU + dest_x / 2;
+ destV = destV + (dest_y / 2) * dest_strideV + dest_x / 2;
+ src = GST_VIDEO_FRAME_PLANE_DATA (src_frame, 0);
src = src + src_y * src_stride + src_x * 4;
src2 = (src_y < src_height) ? src + src_stride : src;
@@ -341,8 +362,8 @@ copy_ayuv_i420 (guint i_alpha, GstVideoFormat dest_format, guint8 * dest,
destY += dest_strideY;
destY2 += dest_strideY;
- destU += dest_strideUV;
- destV += dest_strideUV;
+ destU += dest_strideU;
+ destV += dest_strideV;
src += src_stride;
src2 += src_stride;
i = dest_y + 1;
@@ -460,8 +481,8 @@ copy_ayuv_i420 (guint i_alpha, GstVideoFormat dest_format, guint8 * dest,
destY += 2 * dest_strideY;
destY2 += 2 * dest_strideY;
- destU += dest_strideUV;
- destV += dest_strideUV;
+ destU += dest_strideU;
+ destV += dest_strideV;
src += 2 * src_stride;
src2 += 2 * src_stride;
}
@@ -628,13 +649,13 @@ copy_ayuv_i420 (guint i_alpha, GstVideoFormat dest_format, guint8 * dest,
static void
fill_planar_yuv (GstVideoBoxFill fill_type, guint b_alpha,
- GstVideoFormat format, guint8 * dest, gboolean sdtv, gint width,
- gint height)
+ GstVideoFrame * frame, gboolean sdtv)
{
guint8 empty_pixel[3];
guint8 *destY, *destU, *destV;
- gint strideY, strideUV;
- gint heightY, heightUV;
+ gint strideY, strideU, strideV;
+ gint heightY, heightU, heightV;
+ gint widthY, widthU, widthV;
if (sdtv) {
empty_pixel[0] = yuv_sdtv_colors_Y[fill_type];
@@ -646,67 +667,82 @@ fill_planar_yuv (GstVideoBoxFill fill_type, guint b_alpha,
empty_pixel[2] = yuv_hdtv_colors_V[fill_type];
}
- strideY = gst_video_format_get_row_stride (format, 0, width);
- strideUV = gst_video_format_get_row_stride (format, 1, width);
+ strideY = GST_VIDEO_FRAME_COMP_STRIDE (frame, 0);
+ strideU = GST_VIDEO_FRAME_COMP_STRIDE (frame, 1);
+ strideV = GST_VIDEO_FRAME_COMP_STRIDE (frame, 2);
+
+ destY = GST_VIDEO_FRAME_COMP_DATA (frame, 0);
+ destU = GST_VIDEO_FRAME_COMP_DATA (frame, 1);
+ destV = GST_VIDEO_FRAME_COMP_DATA (frame, 2);
- destY =
- dest + gst_video_format_get_component_offset (format, 0, width, height);
- destU =
- dest + gst_video_format_get_component_offset (format, 1, width, height);
- destV =
- dest + gst_video_format_get_component_offset (format, 2, width, height);
+ widthY = GST_VIDEO_FRAME_COMP_WIDTH (frame, 0);
+ widthU = GST_VIDEO_FRAME_COMP_WIDTH (frame, 1);
+ widthV = GST_VIDEO_FRAME_COMP_WIDTH (frame, 2);
- heightY = gst_video_format_get_component_height (format, 0, height);
- heightUV = gst_video_format_get_component_height (format, 1, height);
+ heightY = GST_VIDEO_FRAME_COMP_HEIGHT (frame, 0);
+ heightU = GST_VIDEO_FRAME_COMP_HEIGHT (frame, 0);
+ heightV = GST_VIDEO_FRAME_COMP_HEIGHT (frame, 0);
- memset (destY, empty_pixel[0], strideY * heightY);
- memset (destU, empty_pixel[1], strideUV * heightUV);
- memset (destV, empty_pixel[2], strideUV * heightUV);
+ if (strideY == widthY) {
+ memset (destY, empty_pixel[0], strideY * heightY);
+ } else if (heightY) {
+ for (; heightY; --heightY) {
+ memset (destY, empty_pixel[0], widthY);
+ destY += strideY;
+ }
+ }
+ if (strideU == widthU) {
+ memset (destU, empty_pixel[1], strideU * heightU);
+ } else if (heightU) {
+ for (; heightU; --heightU) {
+ memset (destU, empty_pixel[0], widthY);
+ destU += strideU;
+ }
+ }
+ if (strideV == widthV) {
+ memset (destV, empty_pixel[2], strideV * heightV);
+ } else if (heightV) {
+ for (; heightV; --heightV) {
+ memset (destV, empty_pixel[0], widthV);
+ destV += strideV;
+ }
+ }
}
static void
-copy_y444_y444 (guint i_alpha, GstVideoFormat dest_format, guint8 * dest,
- gboolean dest_sdtv, gint dest_width, gint dest_height, gint dest_x,
- gint dest_y, GstVideoFormat src_format, const guint8 * src,
- gboolean src_sdtv, gint src_width, gint src_height, gint src_x, gint src_y,
- gint w, gint h)
+copy_y444_y444 (guint i_alpha, GstVideoFrame * dest,
+ gboolean dest_sdtv, gint dest_x, gint dest_y, GstVideoFrame * src,
+ gboolean src_sdtv, gint src_x, gint src_y, gint w, gint h)
{
gint i, j;
guint8 *destY, *destU, *destV;
const guint8 *srcY, *srcU, *srcV;
- gint dest_stride;
- gint src_stride;
+ gint dest_strideY, dest_strideU, dest_strideV;
+ gint src_strideY, src_strideU, src_strideV;
+
+ dest_strideY = GST_VIDEO_FRAME_COMP_STRIDE (dest, 0);
+ dest_strideU = GST_VIDEO_FRAME_COMP_STRIDE (dest, 1);
+ dest_strideV = GST_VIDEO_FRAME_COMP_STRIDE (dest, 2);
+
+ src_strideY = GST_VIDEO_FRAME_COMP_STRIDE (src, 0);
+ src_strideU = GST_VIDEO_FRAME_COMP_STRIDE (src, 1);
+ src_strideV = GST_VIDEO_FRAME_COMP_STRIDE (src, 2);
- dest_stride = gst_video_format_get_row_stride (dest_format, 0, dest_width);
- src_stride = gst_video_format_get_row_stride (src_format, 0, src_width);
-
- destY =
- dest + gst_video_format_get_component_offset (dest_format, 0,
- dest_width, dest_height);
- destU =
- dest + gst_video_format_get_component_offset (dest_format, 1,
- dest_width, dest_height);
- destV =
- dest + gst_video_format_get_component_offset (dest_format, 2,
- dest_width, dest_height);
-
- srcY =
- src + gst_video_format_get_component_offset (src_format, 0,
- src_width, src_height);
- srcU =
- src + gst_video_format_get_component_offset (src_format, 1,
- src_width, src_height);
- srcV =
- src + gst_video_format_get_component_offset (src_format, 2,
- src_width, src_height);
-
- destY = destY + dest_y * dest_stride + dest_x;
- destU = destU + dest_y * dest_stride + dest_x;
- destV = destV + dest_y * dest_stride + dest_x;
-
- srcY = srcY + src_y * src_stride + src_x;
- srcU = srcU + src_y * src_stride + src_x;
- srcV = srcV + src_y * src_stride + src_x;
+ destY = GST_VIDEO_FRAME_COMP_DATA (dest, 0);
+ destU = GST_VIDEO_FRAME_COMP_DATA (dest, 1);
+ destV = GST_VIDEO_FRAME_COMP_DATA (dest, 2);
+
+ srcY = GST_VIDEO_FRAME_COMP_DATA (src, 0);
+ srcU = GST_VIDEO_FRAME_COMP_DATA (src, 1);
+ srcV = GST_VIDEO_FRAME_COMP_DATA (src, 2);
+
+ destY = destY + dest_y * dest_strideY + dest_x;
+ destU = destU + dest_y * dest_strideU + dest_x;
+ destV = destV + dest_y * dest_strideV + dest_x;
+
+ srcY = srcY + src_y * src_strideY + src_x;
+ srcU = srcU + src_y * src_strideU + src_x;
+ srcV = srcV + src_y * src_strideV + src_x;
if (src_sdtv != dest_sdtv) {
gint matrix[12];
@@ -726,13 +762,13 @@ copy_y444_y444 (guint i_alpha, GstVideoFormat dest_format, guint8 * dest,
destU[j] = u;
destV[j] = v;
}
- destY += dest_stride;
- destU += dest_stride;
- destV += dest_stride;
+ destY += dest_strideY;
+ destU += dest_strideU;
+ destV += dest_strideV;
- srcY += src_stride;
- srcU += src_stride;
- srcV += src_stride;
+ srcY += src_strideY;
+ srcU += src_strideU;
+ srcV += src_strideV;
}
} else {
for (i = 0; i < h; i++) {
@@ -740,69 +776,60 @@ copy_y444_y444 (guint i_alpha, GstVideoFormat dest_format, guint8 * dest,
memcpy (destU, srcU, w);
memcpy (destV, srcV, w);
- destY += dest_stride;
- destU += dest_stride;
- destV += dest_stride;
+ destY += dest_strideY;
+ destU += dest_strideU;
+ destV += dest_strideV;
- srcY += src_stride;
- srcU += src_stride;
- srcV += src_stride;
+ srcY += src_strideY;
+ srcU += src_strideU;
+ srcV += src_strideV;
}
}
}
static void
-copy_y42b_y42b (guint i_alpha, GstVideoFormat dest_format, guint8 * dest,
- gboolean dest_sdtv, gint dest_width, gint dest_height, gint dest_x,
- gint dest_y, GstVideoFormat src_format, const guint8 * src,
- gboolean src_sdtv, gint src_width, gint src_height, gint src_x, gint src_y,
- gint w, gint h)
+copy_y42b_y42b (guint i_alpha, GstVideoFrame * dest,
+ gboolean dest_sdtv, gint dest_x, gint dest_y, GstVideoFrame * src,
+ gboolean src_sdtv, gint src_x, gint src_y, gint w, gint h)
{
gint i, j;
guint8 *destY, *destU, *destV;
const guint8 *srcY, *srcU, *srcV;
- gint dest_strideY, dest_strideUV;
- gint src_strideY, src_strideUV;
+ gint dest_strideY, dest_strideU, dest_strideV;
+ gint src_strideY, src_strideU, src_strideV;
gint src_y_idx, src_uv_idx;
gint dest_y_idx, dest_uv_idx;
gint matrix[12];
gint y1, y2;
gint u1, u2;
gint v1, v2;
+ gint dest_width;
+
+ dest_width = GST_VIDEO_FRAME_WIDTH (dest);
+
+ dest_strideY = GST_VIDEO_FRAME_COMP_STRIDE (dest, 0);
+ dest_strideU = GST_VIDEO_FRAME_COMP_STRIDE (dest, 0);
+ dest_strideV = GST_VIDEO_FRAME_COMP_STRIDE (dest, 0);
- dest_strideY = gst_video_format_get_row_stride (dest_format, 0, dest_width);
- dest_strideUV = gst_video_format_get_row_stride (dest_format, 1, dest_width);
- src_strideY = gst_video_format_get_row_stride (src_format, 0, src_width);
- src_strideUV = gst_video_format_get_row_stride (src_format, 1, src_width);
-
- destY =
- dest + gst_video_format_get_component_offset (dest_format, 0,
- dest_width, dest_height);
- destU =
- dest + gst_video_format_get_component_offset (dest_format, 1,
- dest_width, dest_height);
- destV =
- dest + gst_video_format_get_component_offset (dest_format, 2,
- dest_width, dest_height);
-
- srcY =
- src + gst_video_format_get_component_offset (src_format, 0,
- src_width, src_height);
- srcU =
- src + gst_video_format_get_component_offset (src_format, 1,
- src_width, src_height);
- srcV =
- src + gst_video_format_get_component_offset (src_format, 2,
- src_width, src_height);
+ src_strideY = GST_VIDEO_FRAME_COMP_STRIDE (src, 0);
+ src_strideU = GST_VIDEO_FRAME_COMP_STRIDE (src, 1);
+ src_strideV = GST_VIDEO_FRAME_COMP_STRIDE (src, 2);
+ destY = GST_VIDEO_FRAME_COMP_DATA (dest, 0);
+ destU = GST_VIDEO_FRAME_COMP_DATA (dest, 1);
+ destV = GST_VIDEO_FRAME_COMP_DATA (dest, 2);
+
+ srcY = GST_VIDEO_FRAME_COMP_DATA (src, 0);
+ srcU = GST_VIDEO_FRAME_COMP_DATA (src, 1);
+ srcV = GST_VIDEO_FRAME_COMP_DATA (src, 2);
destY = destY + dest_y * dest_strideY + dest_x;
- destU = destU + dest_y * dest_strideUV + dest_x / 2;
- destV = destV + dest_y * dest_strideUV + dest_x / 2;
+ destU = destU + dest_y * dest_strideU + dest_x / 2;
+ destV = destV + dest_y * dest_strideV + dest_x / 2;
srcY = srcY + src_y * src_strideY + src_x;
- srcU = srcU + src_y * src_strideUV + src_x / 2;
- srcV = srcV + src_y * src_strideUV + src_x / 2;
+ srcU = srcU + src_y * src_strideU + src_x / 2;
+ srcV = srcV + src_y * src_strideV + src_x / 2;
h = dest_y + h;
w = dest_x + w;
@@ -896,67 +923,58 @@ copy_y42b_y42b (guint i_alpha, GstVideoFormat dest_format, guint8 * dest,
}
destY += dest_strideY;
- destU += dest_strideUV;
- destV += dest_strideUV;
+ destU += dest_strideU;
+ destV += dest_strideV;
srcY += src_strideY;
- srcU += src_strideUV;
- srcV += src_strideUV;
+ srcU += src_strideU;
+ srcV += src_strideV;
}
}
static void
-copy_y41b_y41b (guint i_alpha, GstVideoFormat dest_format, guint8 * dest,
- gboolean dest_sdtv, gint dest_width, gint dest_height, gint dest_x,
- gint dest_y, GstVideoFormat src_format, const guint8 * src,
- gboolean src_sdtv, gint src_width, gint src_height, gint src_x, gint src_y,
- gint w, gint h)
+copy_y41b_y41b (guint i_alpha, GstVideoFrame * dest,
+ gboolean dest_sdtv, gint dest_x, gint dest_y, GstVideoFrame * src,
+ gboolean src_sdtv, gint src_x, gint src_y, gint w, gint h)
{
gint i, j;
guint8 *destY, *destU, *destV;
const guint8 *srcY, *srcU, *srcV;
- gint dest_strideY, dest_strideUV;
- gint src_strideY, src_strideUV;
+ gint dest_strideY, dest_strideU, dest_strideV;
+ gint src_strideY, src_strideU, src_strideV;
gint src_y_idx, src_uv_idx;
gint dest_y_idx, dest_uv_idx;
gint matrix[12];
gint y1, y2, y3, y4;
gint u1, u2, u3, u4;
gint v1, v2, v3, v4;
+ gint dest_width;
+
+ dest_width = GST_VIDEO_FRAME_WIDTH (dest);
+
+ dest_strideY = GST_VIDEO_FRAME_COMP_STRIDE (dest, 0);
+ dest_strideU = GST_VIDEO_FRAME_COMP_STRIDE (dest, 0);
+ dest_strideV = GST_VIDEO_FRAME_COMP_STRIDE (dest, 0);
- dest_strideY = gst_video_format_get_row_stride (dest_format, 0, dest_width);
- dest_strideUV = gst_video_format_get_row_stride (dest_format, 1, dest_width);
- src_strideY = gst_video_format_get_row_stride (src_format, 0, src_width);
- src_strideUV = gst_video_format_get_row_stride (src_format, 1, src_width);
-
- destY =
- dest + gst_video_format_get_component_offset (dest_format, 0,
- dest_width, dest_height);
- destU =
- dest + gst_video_format_get_component_offset (dest_format, 1,
- dest_width, dest_height);
- destV =
- dest + gst_video_format_get_component_offset (dest_format, 2,
- dest_width, dest_height);
-
- srcY =
- src + gst_video_format_get_component_offset (src_format, 0,
- src_width, src_height);
- srcU =
- src + gst_video_format_get_component_offset (src_format, 1,
- src_width, src_height);
- srcV =
- src + gst_video_format_get_component_offset (src_format, 2,
- src_width, src_height);
+ src_strideY = GST_VIDEO_FRAME_COMP_STRIDE (src, 0);
+ src_strideU = GST_VIDEO_FRAME_COMP_STRIDE (src, 1);
+ src_strideV = GST_VIDEO_FRAME_COMP_STRIDE (src, 2);
+ destY = GST_VIDEO_FRAME_COMP_DATA (dest, 0);
+ destU = GST_VIDEO_FRAME_COMP_DATA (dest, 1);
+ destV = GST_VIDEO_FRAME_COMP_DATA (dest, 2);
+
+ srcY = GST_VIDEO_FRAME_COMP_DATA (src, 0);
+ srcU = GST_VIDEO_FRAME_COMP_DATA (src, 1);
+ srcV = GST_VIDEO_FRAME_COMP_DATA (src, 2);
destY = destY + dest_y * dest_strideY + dest_x;
- destU = destU + dest_y * dest_strideUV + dest_x / 4;
- destV = destV + dest_y * dest_strideUV + dest_x / 4;
+ destU = destU + dest_y * dest_strideU + dest_x / 4;
+ destV = destV + dest_y * dest_strideV + dest_x / 4;
srcY = srcY + src_y * src_strideY + src_x;
- srcU = srcU + src_y * src_strideUV + src_x / 4;
- srcV = srcV + src_y * src_strideUV + src_x / 4;
+ srcU = srcU + src_y * src_strideU + src_x / 4;
+ srcV = srcV + src_y * src_strideV + src_x / 4;
h = dest_y + h;
w = dest_x + w;
@@ -1169,72 +1187,60 @@ copy_y41b_y41b (guint i_alpha, GstVideoFormat dest_format, guint8 * dest,
}
destY += dest_strideY;
- destU += dest_strideUV;
- destV += dest_strideUV;
+ destU += dest_strideU;
+ destV += dest_strideV;
srcY += src_strideY;
- srcU += src_strideUV;
- srcV += src_strideUV;
+ srcU += src_strideU;
+ srcV += src_strideV;
}
}
static void
-copy_i420_i420 (guint i_alpha, GstVideoFormat dest_format, guint8 * dest,
- gboolean dest_sdtv, gint dest_width, gint dest_height, gint dest_x,
- gint dest_y, GstVideoFormat src_format, const guint8 * src,
- gboolean src_sdtv, gint src_width, gint src_height, gint src_x, gint src_y,
- gint w, gint h)
+copy_i420_i420 (guint i_alpha, GstVideoFrame * dest,
+ gboolean dest_sdtv, gint dest_x, gint dest_y, GstVideoFrame * src,
+ gboolean src_sdtv, gint src_x, gint src_y, gint w, gint h)
{
gint i, j;
guint8 *destY, *destU, *destV;
const guint8 *srcY, *srcU, *srcV;
guint8 *destY2;
const guint8 *srcY2, *srcU2, *srcV2;
- gint dest_strideY, dest_strideUV;
- gint src_strideY, src_strideUV;
+ gint dest_strideY, dest_strideU, dest_strideV;
+ gint src_strideY, src_strideU, src_strideV;
gint src_y_idx, src_uv_idx;
gint dest_y_idx, dest_uv_idx;
gint matrix[12];
gint y1, y2, y3, y4;
gint u1, u2, u3, u4;
gint v1, v2, v3, v4;
+ gint dest_width, dest_height;
+
+ dest_width = GST_VIDEO_FRAME_WIDTH (dest);
+ dest_height = GST_VIDEO_FRAME_HEIGHT (dest);
+
+ dest_strideY = GST_VIDEO_FRAME_COMP_STRIDE (dest, 0);
+ dest_strideU = GST_VIDEO_FRAME_COMP_STRIDE (dest, 0);
+ dest_strideV = GST_VIDEO_FRAME_COMP_STRIDE (dest, 0);
- dest_strideY =
- gst_video_format_get_row_stride (GST_VIDEO_FORMAT_I420, 0, dest_width);
- dest_strideUV =
- gst_video_format_get_row_stride (GST_VIDEO_FORMAT_I420, 1, dest_width);
- src_strideY =
- gst_video_format_get_row_stride (GST_VIDEO_FORMAT_I420, 0, src_width);
- src_strideUV =
- gst_video_format_get_row_stride (GST_VIDEO_FORMAT_I420, 1, src_width);
-
- destY =
- dest + gst_video_format_get_component_offset (GST_VIDEO_FORMAT_I420, 0,
- dest_width, dest_height);
- destU =
- dest + gst_video_format_get_component_offset (dest_format, 1,
- dest_width, dest_height);
- destV =
- dest + gst_video_format_get_component_offset (dest_format, 2,
- dest_width, dest_height);
-
- srcY =
- src + gst_video_format_get_component_offset (GST_VIDEO_FORMAT_I420, 0,
- src_width, src_height);
- srcU =
- src + gst_video_format_get_component_offset (src_format, 1,
- src_width, src_height);
- srcV =
- src + gst_video_format_get_component_offset (src_format, 2,
- src_width, src_height);
+ src_strideY = GST_VIDEO_FRAME_COMP_STRIDE (src, 0);
+ src_strideU = GST_VIDEO_FRAME_COMP_STRIDE (src, 1);
+ src_strideV = GST_VIDEO_FRAME_COMP_STRIDE (src, 2);
+ destY = GST_VIDEO_FRAME_COMP_DATA (dest, 0);
+ destU = GST_VIDEO_FRAME_COMP_DATA (dest, 1);
+ destV = GST_VIDEO_FRAME_COMP_DATA (dest, 2);
+
+ srcY = GST_VIDEO_FRAME_COMP_DATA (src, 0);
+ srcU = GST_VIDEO_FRAME_COMP_DATA (src, 1);
+ srcV = GST_VIDEO_FRAME_COMP_DATA (src, 2);
destY = destY + dest_y * dest_strideY + dest_x;
- destU = destU + (dest_y / 2) * dest_strideUV + dest_x / 2;
- destV = destV + (dest_y / 2) * dest_strideUV + dest_x / 2;
+ destU = destU + (dest_y / 2) * dest_strideU + dest_x / 2;
+ destV = destV + (dest_y / 2) * dest_strideV + dest_x / 2;
srcY = srcY + src_y * src_strideY + src_x;
- srcU = srcU + (src_y / 2) * src_strideUV + src_x / 2;
- srcV = srcV + (src_y / 2) * src_strideUV + src_x / 2;
+ srcU = srcU + (src_y / 2) * src_strideU + src_x / 2;
+ srcV = srcV + (src_y / 2) * src_strideV + src_x / 2;
destY2 = destY + dest_strideY;
srcY2 = srcY + src_strideY;
@@ -1339,14 +1345,14 @@ copy_i420_i420 (guint i_alpha, GstVideoFormat dest_format, guint8 * dest,
destY += dest_strideY;
destY2 += dest_strideY;
- destU += dest_strideUV;
- destV += dest_strideUV;
+ destU += dest_strideU;
+ destV += dest_strideV;
srcY += src_strideY;
srcY2 += src_strideY;
src_y++;
if (src_y % 2 == 0) {
- srcU += src_strideUV;
- srcV += src_strideUV;
+ srcU += src_strideU;
+ srcV += src_strideV;
}
i = dest_y + 1;
} else {
@@ -1363,8 +1369,8 @@ copy_i420_i420 (guint i_alpha, GstVideoFormat dest_format, guint8 * dest,
srcU2 = srcU;
srcV2 = srcV;
if (src_y % 2 == 1) {
- srcU2 += src_strideUV;
- srcV2 += src_strideUV;
+ srcU2 += src_strideU;
+ srcV2 += src_strideV;
}
if (dest_x % 2 == 1) {
@@ -1477,14 +1483,14 @@ copy_i420_i420 (guint i_alpha, GstVideoFormat dest_format, guint8 * dest,
destY += 2 * dest_strideY;
destY2 += 2 * dest_strideY;
- destU += dest_strideUV;
- destV += dest_strideUV;
+ destU += dest_strideU;
+ destV += dest_strideV;
srcY += 2 * src_strideY;
srcY2 += 2 * src_strideY;
src_y += 2;
- srcU += src_strideUV;
- srcV += src_strideUV;
+ srcU += src_strideU;
+ srcV += src_strideV;
}
/* 3. Handle the last scanline if one exists. This again
@@ -1662,38 +1668,31 @@ copy_i420_i420 (guint i_alpha, GstVideoFormat dest_format, guint8 * dest,
}
static void
-copy_i420_ayuv (guint i_alpha, GstVideoFormat dest_format, guint8 * dest,
- gboolean dest_sdtv, gint dest_width, gint dest_height, gint dest_x,
- gint dest_y, GstVideoFormat src_format, const guint8 * src,
- gboolean src_sdtv, gint src_width, gint src_height, gint src_x, gint src_y,
- gint w, gint h)
+copy_i420_ayuv (guint i_alpha, GstVideoFrame * dest_frame,
+ gboolean dest_sdtv, gint dest_x, gint dest_y, GstVideoFrame * src_frame,
+ gboolean src_sdtv, gint src_x, gint src_y, gint w, gint h)
{
const guint8 *srcY, *srcU, *srcV;
- gint src_strideY, src_strideUV;
+ gint src_strideY, src_strideU, src_strideV;
gint dest_stride;
+ guint8 *dest;
- src_strideY =
- gst_video_format_get_row_stride (GST_VIDEO_FORMAT_I420, 0, src_width);
- src_strideUV =
- gst_video_format_get_row_stride (GST_VIDEO_FORMAT_I420, 1, src_width);
+ src_strideY = GST_VIDEO_FRAME_COMP_STRIDE (src_frame, 0);
+ src_strideU = GST_VIDEO_FRAME_COMP_STRIDE (src_frame, 1);
+ src_strideV = GST_VIDEO_FRAME_COMP_STRIDE (src_frame, 2);
- srcY =
- src + gst_video_format_get_component_offset (GST_VIDEO_FORMAT_I420, 0,
- src_width, src_height);
- srcU =
- src + gst_video_format_get_component_offset (src_format, 1,
- src_width, src_height);
- srcV =
- src + gst_video_format_get_component_offset (src_format, 2,
- src_width, src_height);
+ srcY = GST_VIDEO_FRAME_COMP_DATA (src_frame, 0);
+ srcU = GST_VIDEO_FRAME_COMP_DATA (src_frame, 1);
+ srcV = GST_VIDEO_FRAME_COMP_DATA (src_frame, 2);
- dest_stride = dest_width * 4;
+ dest_stride = GST_VIDEO_FRAME_PLANE_STRIDE (dest_frame, 0);
+ dest = GST_VIDEO_FRAME_PLANE_DATA (dest_frame, 0);
dest = dest + dest_y * dest_stride + dest_x * 4;
srcY = srcY + src_y * src_strideY + src_x;
- srcU = srcU + (src_y / 2) * src_strideUV + src_x / 2;
- srcV = srcV + (src_y / 2) * src_strideUV + src_x / 2;
+ srcU = srcU + (src_y / 2) * src_strideU + src_x / 2;
+ srcV = srcV + (src_y / 2) * src_strideV + src_x / 2;
i_alpha = CLAMP (i_alpha, 0, 255);
@@ -1727,8 +1726,8 @@ copy_i420_ayuv (guint i_alpha, GstVideoFormat dest_format, guint8 * dest,
src_y++;
srcY += src_strideY;
if (src_y % 2 == 0) {
- srcU += src_strideUV;
- srcV += src_strideUV;
+ srcU += src_strideU;
+ srcV += src_strideV;
}
}
} else {
@@ -1751,24 +1750,33 @@ copy_i420_ayuv (guint i_alpha, GstVideoFormat dest_format, guint8 * dest,
src_y++;
srcY += src_strideY;
if (src_y % 2 == 0) {
- srcU += src_strideUV;
- srcV += src_strideUV;
+ srcU += src_strideU;
+ srcV += src_strideV;
}
}
}
}
static void
-fill_rgb32 (GstVideoBoxFill fill_type, guint b_alpha, GstVideoFormat format,
- guint8 * dest, gboolean sdtv, gint width, gint height)
+fill_rgb32 (GstVideoBoxFill fill_type, guint b_alpha,
+ GstVideoFrame * frame, gboolean sdtv)
{
guint32 empty_pixel;
gint p[4];
+ guint8 *dest;
+ guint stride;
+ gint width, height;
+
+ width = GST_VIDEO_FRAME_WIDTH (frame);
+ height = GST_VIDEO_FRAME_HEIGHT (frame);
- p[0] = gst_video_format_get_component_offset (format, 3, width, height);
- p[1] = gst_video_format_get_component_offset (format, 0, width, height);
- p[2] = gst_video_format_get_component_offset (format, 1, width, height);
- p[3] = gst_video_format_get_component_offset (format, 2, width, height);
+ dest = GST_VIDEO_FRAME_PLANE_DATA (frame, 0);
+ stride = GST_VIDEO_FRAME_PLANE_STRIDE (frame, 0);
+
+ p[0] = GST_VIDEO_FRAME_COMP_OFFSET (frame, 3);
+ p[1] = GST_VIDEO_FRAME_COMP_OFFSET (frame, 0);
+ p[2] = GST_VIDEO_FRAME_COMP_OFFSET (frame, 1);
+ p[3] = GST_VIDEO_FRAME_COMP_OFFSET (frame, 2);
b_alpha = CLAMP (b_alpha, 0, 255);
@@ -1777,21 +1785,35 @@ fill_rgb32 (GstVideoBoxFill fill_type, guint b_alpha, GstVideoFormat format,
(rgb_colors_G[fill_type] << (p[2] * 8)) |
(rgb_colors_B[fill_type] << (p[3] * 8)));
- orc_splat_u32 ((guint32 *) dest, empty_pixel, width * height);
+ if (stride == width * 4) {
+ orc_splat_u32 ((guint32 *) dest, empty_pixel, width * height);
+ } else if (height) {
+ for (; height; --height) {
+ orc_splat_u32 ((guint32 *) dest, empty_pixel, width);
+ dest += stride;
+ }
+ }
}
static void
-fill_rgb24 (GstVideoBoxFill fill_type, guint b_alpha, GstVideoFormat format,
- guint8 * dest, gboolean sdtv, gint width, gint height)
+fill_rgb24 (GstVideoBoxFill fill_type, guint b_alpha,
+ GstVideoFrame * frame, gboolean sdtv)
{
- gint dest_stride = GST_ROUND_UP_4 (width * 3);
+ gint dest_stride;
gint p[4];
gint i, j;
+ guint8 *dest;
+ gint width, height;
+
+ width = GST_VIDEO_FRAME_WIDTH (frame);
+ height = GST_VIDEO_FRAME_HEIGHT (frame);
+
+ dest = GST_VIDEO_FRAME_PLANE_DATA (frame, 0);
+ dest_stride = GST_VIDEO_FRAME_PLANE_STRIDE (frame, 0);
- p[0] = gst_video_format_get_component_offset (format, 3, width, height);
- p[1] = gst_video_format_get_component_offset (format, 0, width, height);
- p[2] = gst_video_format_get_component_offset (format, 1, width, height);
- p[3] = gst_video_format_get_component_offset (format, 2, width, height);
+ p[1] = GST_VIDEO_FRAME_COMP_OFFSET (frame, 0);
+ p[2] = GST_VIDEO_FRAME_COMP_OFFSET (frame, 1);
+ p[3] = GST_VIDEO_FRAME_COMP_OFFSET (frame, 2);
for (i = 0; i < height; i++) {
for (j = 0; j < width; j++) {
@@ -1804,11 +1826,9 @@ fill_rgb24 (GstVideoBoxFill fill_type, guint b_alpha, GstVideoFormat format,
}
static void
-copy_rgb32 (guint i_alpha, GstVideoFormat dest_format, guint8 * dest,
- gboolean dest_sdtv, gint dest_width, gint dest_height, gint dest_x,
- gint dest_y, GstVideoFormat src_format, const guint8 * src,
- gboolean src_sdtv, gint src_width, gint src_height, gint src_x, gint src_y,
- gint w, gint h)
+copy_rgb32 (guint i_alpha, GstVideoFrame * dest_frame,
+ gboolean dest_sdtv, gint dest_x, gint dest_y, GstVideoFrame * src_frame,
+ gboolean src_sdtv, gint src_x, gint src_y, gint w, gint h)
{
gint i, j;
gint src_stride, dest_stride;
@@ -1816,45 +1836,32 @@ copy_rgb32 (guint i_alpha, GstVideoFormat dest_format, guint8 * dest,
gint in_bpp, out_bpp;
gint p_out[4];
gint p_in[4];
- gboolean packed_out = (dest_format == GST_VIDEO_FORMAT_RGB
- || dest_format == GST_VIDEO_FORMAT_BGR);
- gboolean packed_in = (src_format == GST_VIDEO_FORMAT_RGB
- || src_format == GST_VIDEO_FORMAT_BGR);
-
- src_stride = (packed_in) ? GST_ROUND_UP_4 (3 * src_width) : 4 * src_width;
- dest_stride = (packed_out) ? GST_ROUND_UP_4 (3 * dest_width) : 4 * dest_width;
- in_bpp = (packed_in) ? 3 : 4;
- out_bpp = (packed_out) ? 3 : 4;
-
- out_alpha = gst_video_format_has_alpha (dest_format);
- p_out[0] =
- gst_video_format_get_component_offset (dest_format, 3, dest_width,
- dest_height);
- p_out[1] =
- gst_video_format_get_component_offset (dest_format, 0, dest_width,
- dest_height);
- p_out[2] =
- gst_video_format_get_component_offset (dest_format, 1, dest_width,
- dest_height);
- p_out[3] =
- gst_video_format_get_component_offset (dest_format, 2, dest_width,
- dest_height);
-
- in_alpha = gst_video_format_has_alpha (src_format);
- p_in[0] =
- gst_video_format_get_component_offset (src_format, 3, src_width,
- src_height);
- p_in[1] =
- gst_video_format_get_component_offset (src_format, 0, src_width,
- src_height);
- p_in[2] =
- gst_video_format_get_component_offset (src_format, 1, src_width,
- src_height);
- p_in[3] =
- gst_video_format_get_component_offset (src_format, 2, src_width,
- src_height);
-
+ gboolean packed_out;
+ gboolean packed_in;
+ guint8 *src, *dest;
+
+ src_stride = GST_VIDEO_FRAME_PLANE_STRIDE (src_frame, 0);
+ dest_stride = GST_VIDEO_FRAME_PLANE_STRIDE (dest_frame, 0);
+ in_bpp = GST_VIDEO_FRAME_COMP_PSTRIDE (src_frame, 0);
+ out_bpp = GST_VIDEO_FRAME_COMP_PSTRIDE (dest_frame, 0);
+ packed_in = (in_bpp < 4);
+ packed_out = (out_bpp < 4);
+
+ out_alpha = GST_VIDEO_INFO_HAS_ALPHA (&dest_frame->info);
+ p_out[0] = GST_VIDEO_FRAME_COMP_OFFSET (dest_frame, 3);
+ p_out[1] = GST_VIDEO_FRAME_COMP_OFFSET (dest_frame, 0);
+ p_out[2] = GST_VIDEO_FRAME_COMP_OFFSET (dest_frame, 1);
+ p_out[3] = GST_VIDEO_FRAME_COMP_OFFSET (dest_frame, 2);
+
+ in_alpha = GST_VIDEO_INFO_HAS_ALPHA (&src_frame->info);
+ p_in[0] = GST_VIDEO_FRAME_COMP_OFFSET (src_frame, 3);
+ p_in[1] = GST_VIDEO_FRAME_COMP_OFFSET (src_frame, 0);
+ p_in[2] = GST_VIDEO_FRAME_COMP_OFFSET (src_frame, 1);
+ p_in[3] = GST_VIDEO_FRAME_COMP_OFFSET (src_frame, 2);
+
+ dest = GST_VIDEO_FRAME_PLANE_DATA (dest_frame, 0);
dest = dest + dest_y * dest_stride + dest_x * out_bpp;
+ src = GST_VIDEO_FRAME_PLANE_DATA (src_frame, 0);
src = src + src_y * src_stride + src_x * in_bpp;
if (in_alpha && out_alpha) {
@@ -1921,47 +1928,42 @@ copy_rgb32 (guint i_alpha, GstVideoFormat dest_format, guint8 * dest,
}
static void
-copy_rgb32_ayuv (guint i_alpha, GstVideoFormat dest_format, guint8 * dest,
- gboolean dest_sdtv, gint dest_width, gint dest_height, gint dest_x,
- gint dest_y, GstVideoFormat src_format, const guint8 * src,
- gboolean src_sdtv, gint src_width, gint src_height, gint src_x, gint src_y,
- gint w, gint h)
+copy_rgb32_ayuv (guint i_alpha, GstVideoFrame * dest_frame,
+ gboolean dest_sdtv, gint dest_x, gint dest_y, GstVideoFrame * src_frame,
+ gboolean src_sdtv, gint src_x, gint src_y, gint w, gint h)
{
gint i, j;
gint src_stride, dest_stride;
gboolean in_alpha;
gint in_bpp;
gint p_in[4];
- gboolean packed_in = (src_format == GST_VIDEO_FORMAT_RGB
- || src_format == GST_VIDEO_FORMAT_BGR);
+ gboolean packed_in;
gint matrix[12];
gint a;
gint y, u, v;
gint r, g, b;
+ guint8 *dest, *src;
+
+ dest = GST_VIDEO_FRAME_PLANE_DATA (dest_frame, 0);
+ dest_stride = GST_VIDEO_FRAME_PLANE_STRIDE (dest_frame, 0);
+
+ src_stride = GST_VIDEO_FRAME_PLANE_STRIDE (src_frame, 0);
+ in_bpp = GST_VIDEO_FRAME_COMP_PSTRIDE (src_frame, 0);
+ packed_in = (in_bpp < 4);
- src_stride = (packed_in) ? GST_ROUND_UP_4 (3 * src_width) : 4 * src_width;
- dest_stride = 4 * dest_width;
- in_bpp = (packed_in) ? 3 : 4;
-
- in_alpha = gst_video_format_has_alpha (src_format);
- p_in[0] =
- gst_video_format_get_component_offset (src_format, 3, src_width,
- src_height);
- p_in[1] =
- gst_video_format_get_component_offset (src_format, 0, src_width,
- src_height);
- p_in[2] =
- gst_video_format_get_component_offset (src_format, 1, src_width,
- src_height);
- p_in[3] =
- gst_video_format_get_component_offset (src_format, 2, src_width,
- src_height);
+ in_alpha = GST_VIDEO_INFO_HAS_ALPHA (&src_frame->info);
+ p_in[0] = GST_VIDEO_FRAME_COMP_OFFSET (src_frame, 3);
+ p_in[1] = GST_VIDEO_FRAME_COMP_OFFSET (src_frame, 0);
+ p_in[2] = GST_VIDEO_FRAME_COMP_OFFSET (src_frame, 1);
+ p_in[3] = GST_VIDEO_FRAME_COMP_OFFSET (src_frame, 2);
memcpy (matrix,
(dest_sdtv) ? cog_rgb_to_ycbcr_matrix_8bit_sdtv :
cog_rgb_to_ycbcr_matrix_8bit_hdtv, 12 * sizeof (gint));
+ dest = GST_VIDEO_FRAME_PLANE_DATA (dest_frame, 0);
dest = dest + dest_y * dest_stride + dest_x * 4;
+ src = GST_VIDEO_FRAME_PLANE_DATA (src_frame, 0);
src = src + src_y * src_stride + src_x * in_bpp;
if (in_alpha) {
@@ -2034,47 +2036,42 @@ copy_rgb32_ayuv (guint i_alpha, GstVideoFormat dest_format, guint8 * dest,
}
static void
-copy_ayuv_rgb32 (guint i_alpha, GstVideoFormat dest_format, guint8 * dest,
- gboolean dest_sdtv, gint dest_width, gint dest_height, gint dest_x,
- gint dest_y, GstVideoFormat src_format, const guint8 * src,
- gboolean src_sdtv, gint src_width, gint src_height, gint src_x, gint src_y,
- gint w, gint h)
+copy_ayuv_rgb32 (guint i_alpha, GstVideoFrame * dest_frame,
+ gboolean dest_sdtv, gint dest_x, gint dest_y, GstVideoFrame * src_frame,
+ gboolean src_sdtv, gint src_x, gint src_y, gint w, gint h)
{
gint i, j;
gint src_stride, dest_stride;
gboolean out_alpha;
gint out_bpp;
gint p_out[4];
- gboolean packed_out = (dest_format == GST_VIDEO_FORMAT_RGB
- || dest_format == GST_VIDEO_FORMAT_BGR);
+ gboolean packed_out;
gint matrix[12];
gint a;
gint y, u, v;
gint r, g, b;
+ guint8 *src, *dest;
- dest_stride = (packed_out) ? GST_ROUND_UP_4 (3 * dest_width) : 4 * dest_width;
- src_stride = 4 * src_width;
- out_bpp = (packed_out) ? 3 : 4;
-
- out_alpha = gst_video_format_has_alpha (dest_format);
- p_out[0] =
- gst_video_format_get_component_offset (dest_format, 3, dest_width,
- dest_height);
- p_out[1] =
- gst_video_format_get_component_offset (dest_format, 0, dest_width,
- dest_height);
- p_out[2] =
- gst_video_format_get_component_offset (dest_format, 1, dest_width,
- dest_height);
- p_out[3] =
- gst_video_format_get_component_offset (dest_format, 2, dest_width,
- dest_height);
+ src = GST_VIDEO_FRAME_PLANE_DATA (src_frame, 0);
+ src_stride = GST_VIDEO_FRAME_PLANE_STRIDE (src_frame, 0);
+
+ dest_stride = GST_VIDEO_FRAME_PLANE_STRIDE (dest_frame, 0);
+ out_bpp = GST_VIDEO_FRAME_COMP_PSTRIDE (dest_frame, 0);
+ packed_out = (out_bpp < 4);
+
+ out_alpha = GST_VIDEO_INFO_HAS_ALPHA (&dest_frame->info);
+ p_out[0] = GST_VIDEO_FRAME_COMP_OFFSET (dest_frame, 3);
+ p_out[1] = GST_VIDEO_FRAME_COMP_OFFSET (dest_frame, 0);
+ p_out[2] = GST_VIDEO_FRAME_COMP_OFFSET (dest_frame, 1);
+ p_out[3] = GST_VIDEO_FRAME_COMP_OFFSET (dest_frame, 2);
memcpy (matrix,
(src_sdtv) ? cog_ycbcr_to_rgb_matrix_8bit_sdtv :
cog_ycbcr_to_rgb_matrix_8bit_hdtv, 12 * sizeof (gint));
+ dest = GST_VIDEO_FRAME_PLANE_DATA (dest_frame, 0);
dest = dest + dest_y * dest_stride + dest_x * out_bpp;
+ src = GST_VIDEO_FRAME_PLANE_DATA (src_frame, 0);
src = src + src_y * src_stride + src_x * 4;
if (out_alpha) {
@@ -2139,16 +2136,26 @@ copy_ayuv_rgb32 (guint i_alpha, GstVideoFormat dest_format, guint8 * dest,
}
static void
-fill_gray (GstVideoBoxFill fill_type, guint b_alpha, GstVideoFormat format,
- guint8 * dest, gboolean sdtv, gint width, gint height)
+fill_gray (GstVideoBoxFill fill_type, guint b_alpha,
+ GstVideoFrame * frame, gboolean sdtv)
{
gint i, j;
gint dest_stride;
+ guint8 *dest;
+ gint width, height;
+ GstVideoFormat format;
+
+ format = GST_VIDEO_FRAME_FORMAT (frame);
+
+ width = GST_VIDEO_FRAME_WIDTH (frame);
+ height = GST_VIDEO_FRAME_WIDTH (frame);
+
+ dest = GST_VIDEO_FRAME_PLANE_DATA (frame, 0);
+ dest_stride = GST_VIDEO_FRAME_PLANE_STRIDE (frame, 0);
if (format == GST_VIDEO_FORMAT_GRAY8) {
guint8 val = yuv_sdtv_colors_Y[fill_type];
- dest_stride = GST_ROUND_UP_4 (width);
for (i = 0; i < height; i++) {
memset (dest, val, width);
dest += dest_stride;
@@ -2156,7 +2163,6 @@ fill_gray (GstVideoBoxFill fill_type, guint b_alpha, GstVideoFormat format,
} else {
guint16 val = yuv_sdtv_colors_Y[fill_type] << 8;
- dest_stride = GST_ROUND_UP_4 (width * 2);
if (format == GST_VIDEO_FORMAT_GRAY16_BE) {
for (i = 0; i < height; i++) {
for (j = 0; j < width; j++) {
@@ -2176,22 +2182,23 @@ fill_gray (GstVideoBoxFill fill_type, guint b_alpha, GstVideoFormat format,
}
static void
-copy_packed_simple (guint i_alpha, GstVideoFormat dest_format, guint8 * dest,
- gboolean dest_sdtv, gint dest_width, gint dest_height, gint dest_x,
- gint dest_y, GstVideoFormat src_format, const guint8 * src,
- gboolean src_sdtv, gint src_width, gint src_height, gint src_x, gint src_y,
- gint w, gint h)
+copy_packed_simple (guint i_alpha, GstVideoFrame * dest_frame,
+ gboolean dest_sdtv, gint dest_x, gint dest_y, GstVideoFrame * src_frame,
+ gboolean src_sdtv, gint src_x, gint src_y, gint w, gint h)
{
gint i;
gint src_stride, dest_stride;
gint pixel_stride, row_size;
+ guint8 *src, *dest;
- src_stride = gst_video_format_get_row_stride (src_format, 0, src_width);
- dest_stride = gst_video_format_get_row_stride (dest_format, 0, dest_width);
- pixel_stride = gst_video_format_get_pixel_stride (dest_format, 0);
+ src_stride = GST_VIDEO_FRAME_PLANE_STRIDE (src_frame, 0);
+ dest_stride = GST_VIDEO_FRAME_PLANE_STRIDE (dest_frame, 0);
+ pixel_stride = GST_VIDEO_FRAME_COMP_PSTRIDE (dest_frame, 0);
row_size = w * pixel_stride;
+ dest = GST_VIDEO_FRAME_PLANE_DATA (dest_frame, 0);
dest = dest + dest_y * dest_stride + dest_x * pixel_stride;
+ src = GST_VIDEO_FRAME_PLANE_DATA (src_frame, 0);
src = src + src_y * src_stride + src_x * pixel_stride;
for (i = 0; i < h; i++) {
@@ -2202,12 +2209,23 @@ copy_packed_simple (guint i_alpha, GstVideoFormat dest_format, guint8 * dest,
}
static void
-fill_yuy2 (GstVideoBoxFill fill_type, guint b_alpha, GstVideoFormat format,
- guint8 * dest, gboolean sdtv, gint width, gint height)
+fill_yuy2 (GstVideoBoxFill fill_type, guint b_alpha,
+ GstVideoFrame * frame, gboolean sdtv)
{
guint8 y, u, v;
gint i, j;
- gint stride = gst_video_format_get_row_stride (format, 0, width);
+ gint stride;
+ gint width, height;
+ guint8 *dest;
+ GstVideoFormat format;
+
+ format = GST_VIDEO_FRAME_FORMAT (frame);
+
+ width = GST_VIDEO_FRAME_WIDTH (frame);
+ height = GST_VIDEO_FRAME_HEIGHT (frame);
+
+ dest = GST_VIDEO_FRAME_PLANE_DATA (frame, 0);
+ stride = GST_VIDEO_FRAME_PLANE_STRIDE (frame, 0);
y = (sdtv) ? yuv_sdtv_colors_Y[fill_type] : yuv_hdtv_colors_Y[fill_type];
u = (sdtv) ? yuv_sdtv_colors_U[fill_type] : yuv_hdtv_colors_U[fill_type];
@@ -2252,24 +2270,28 @@ fill_yuy2 (GstVideoBoxFill fill_type, guint b_alpha, GstVideoFormat format,
}
static void
-copy_yuy2_yuy2 (guint i_alpha, GstVideoFormat dest_format, guint8 * dest,
- gboolean dest_sdtv, gint dest_width, gint dest_height, gint dest_x,
- gint dest_y, GstVideoFormat src_format, const guint8 * src,
- gboolean src_sdtv, gint src_width, gint src_height, gint src_x, gint src_y,
- gint w, gint h)
+copy_yuy2_yuy2 (guint i_alpha, GstVideoFrame * dest_frame,
+ gboolean dest_sdtv, gint dest_x, gint dest_y, GstVideoFrame * src_frame,
+ gboolean src_sdtv, gint src_x, gint src_y, gint w, gint h)
{
gint i, j;
gint src_stride, dest_stride;
+ guint8 *src, *dest;
+ GstVideoFormat src_format;
- src_stride = gst_video_format_get_row_stride (src_format, 0, src_width);
- dest_stride = gst_video_format_get_row_stride (dest_format, 0, dest_width);
+ src_format = GST_VIDEO_FRAME_FORMAT (src_frame);
+
+ src_stride = GST_VIDEO_FRAME_PLANE_STRIDE (src_frame, 0);
+ dest_stride = GST_VIDEO_FRAME_PLANE_STRIDE (dest_frame, 0);
dest_x = (dest_x & ~1);
src_x = (src_x & ~1);
w = w + (w % 2);
+ dest = GST_VIDEO_FRAME_PLANE_DATA (dest_frame, 0);
dest = dest + dest_y * dest_stride + dest_x * 2;
+ src = GST_VIDEO_FRAME_PLANE_DATA (src_frame, 0);
src = src + src_y * src_stride + src_x * 2;
if (src_sdtv != dest_sdtv) {
@@ -2362,53 +2384,27 @@ enum
};
static GstStaticPadTemplate gst_video_box_src_template =
- GST_STATIC_PAD_TEMPLATE ("src",
+GST_STATIC_PAD_TEMPLATE ("src",
GST_PAD_SRC,
GST_PAD_ALWAYS,
- GST_STATIC_CAPS (GST_VIDEO_CAPS_YUV ("AYUV") ";"
- GST_VIDEO_CAPS_ARGB ";" GST_VIDEO_CAPS_BGRA ";"
- GST_VIDEO_CAPS_ABGR ";" GST_VIDEO_CAPS_RGBA ";"
- GST_VIDEO_CAPS_xRGB ";" GST_VIDEO_CAPS_BGRx ";"
- GST_VIDEO_CAPS_xBGR ";" GST_VIDEO_CAPS_RGBx ";"
- GST_VIDEO_CAPS_RGB ";" GST_VIDEO_CAPS_BGR ";"
- GST_VIDEO_CAPS_YUV ("Y444") ";"
- GST_VIDEO_CAPS_YUV ("Y42B") ";"
- GST_VIDEO_CAPS_YUV ("YUY2") ";"
- GST_VIDEO_CAPS_YUV ("YVYU") ";"
- GST_VIDEO_CAPS_YUV ("UYVY") ";"
- GST_VIDEO_CAPS_YUV ("I420") ";"
- GST_VIDEO_CAPS_YUV ("YV12") ";"
- GST_VIDEO_CAPS_YUV ("Y41B") ";"
- GST_VIDEO_CAPS_GRAY8 ";"
- GST_VIDEO_CAPS_GRAY16 ("BIG_ENDIAN") ";"
- GST_VIDEO_CAPS_GRAY16 ("LITTLE_ENDIAN"))
+ GST_STATIC_CAPS (GST_VIDEO_CAPS_MAKE ("{ AYUV, "
+ "ARGB, BGRA, ABGR, RGBA, xRGB, BGRx, xBGR, RGBx, RGB, BGR, "
+ "Y444, Y42B, YUY2, YVYU, UYVY, I420, YV12, Y41B, "
+ "GRAY8, GRAY16_BE, GRAY16_LE } "))
);
static GstStaticPadTemplate gst_video_box_sink_template =
- GST_STATIC_PAD_TEMPLATE ("sink",
+GST_STATIC_PAD_TEMPLATE ("sink",
GST_PAD_SINK,
GST_PAD_ALWAYS,
- GST_STATIC_CAPS (GST_VIDEO_CAPS_YUV ("AYUV") ";"
- GST_VIDEO_CAPS_ARGB ";" GST_VIDEO_CAPS_BGRA ";"
- GST_VIDEO_CAPS_ABGR ";" GST_VIDEO_CAPS_RGBA ";"
- GST_VIDEO_CAPS_xRGB ";" GST_VIDEO_CAPS_BGRx ";"
- GST_VIDEO_CAPS_xBGR ";" GST_VIDEO_CAPS_RGBx ";"
- GST_VIDEO_CAPS_RGB ";" GST_VIDEO_CAPS_BGR ";"
- GST_VIDEO_CAPS_YUV ("Y444") ";"
- GST_VIDEO_CAPS_YUV ("Y42B") ";"
- GST_VIDEO_CAPS_YUV ("YUY2") ";"
- GST_VIDEO_CAPS_YUV ("YVYU") ";"
- GST_VIDEO_CAPS_YUV ("UYVY") ";"
- GST_VIDEO_CAPS_YUV ("I420") ";"
- GST_VIDEO_CAPS_YUV ("YV12") ";"
- GST_VIDEO_CAPS_YUV ("Y41B") ";"
- GST_VIDEO_CAPS_GRAY8 ";"
- GST_VIDEO_CAPS_GRAY16 ("BIG_ENDIAN") ";"
- GST_VIDEO_CAPS_GRAY16 ("LITTLE_ENDIAN"))
+ GST_STATIC_CAPS (GST_VIDEO_CAPS_MAKE ("{ AYUV, "
+ "ARGB, BGRA, ABGR, RGBA, xRGB, BGRx, xBGR, RGBx, RGB, BGR, "
+ "Y444, Y42B, YUY2, YVYU, UYVY, I420, YV12, Y41B, "
+ "GRAY8, GRAY16_BE, GRAY16_LE } "))
);
-GST_BOILERPLATE (GstVideoBox, gst_video_box, GstBaseTransform,
- GST_TYPE_BASE_TRANSFORM);
+#define gst_video_box_parent_class parent_class
+G_DEFINE_TYPE (GstVideoBox, gst_video_box, GST_TYPE_VIDEO_FILTER);
static void gst_video_box_set_property (GObject * object, guint prop_id,
const GValue * value, GParamSpec * pspec);
@@ -2417,20 +2413,17 @@ static void gst_video_box_get_property (GObject * object, guint prop_id,
static gboolean gst_video_box_recalc_transform (GstVideoBox * video_box);
static GstCaps *gst_video_box_transform_caps (GstBaseTransform * trans,
- GstPadDirection direction, GstCaps * from);
-static gboolean gst_video_box_set_caps (GstBaseTransform * trans,
- GstCaps * in, GstCaps * out);
-static gboolean gst_video_box_get_unit_size (GstBaseTransform * trans,
- GstCaps * caps, guint * size);
-static GstFlowReturn gst_video_box_transform (GstBaseTransform * trans,
- GstBuffer * in, GstBuffer * out);
+ GstPadDirection direction, GstCaps * from, GstCaps * filter);
static void gst_video_box_before_transform (GstBaseTransform * trans,
GstBuffer * in);
-static void gst_video_box_fixate_caps (GstBaseTransform * trans,
- GstPadDirection direction, GstCaps * caps, GstCaps * othercaps);
static gboolean gst_video_box_src_event (GstBaseTransform * trans,
GstEvent * event);
+static gboolean gst_video_box_set_info (GstVideoFilter * vfilter, GstCaps * in,
+ GstVideoInfo * in_info, GstCaps * out, GstVideoInfo * out_info);
+static GstFlowReturn gst_video_box_transform_frame (GstVideoFilter * vfilter,
+ GstVideoFrame * in_frame, GstVideoFrame * out_frame);
+
#define GST_TYPE_VIDEO_BOX_FILL (gst_video_box_fill_get_type())
static GType
gst_video_box_fill_get_type (void)
@@ -2453,32 +2446,12 @@ gst_video_box_fill_get_type (void)
return video_box_fill_type;
}
-
-static void
-gst_video_box_base_init (gpointer g_class)
-{
- GstElementClass *element_class = GST_ELEMENT_CLASS (g_class);
-
- gst_element_class_set_static_metadata (element_class, "Video box filter",
- "Filter/Effect/Video",
- "Resizes a video by adding borders or cropping",
- "Wim Taymans <wim@fluendo.com>");
-
- gst_element_class_add_pad_template (element_class,
- gst_static_pad_template_get (&gst_video_box_sink_template));
- gst_element_class_add_pad_template (element_class,
- gst_static_pad_template_get (&gst_video_box_src_template));
-}
-
static void
gst_video_box_finalize (GObject * object)
{
GstVideoBox *video_box = GST_VIDEO_BOX (object);
- if (video_box->mutex) {
- g_mutex_free (video_box->mutex);
- video_box->mutex = NULL;
- }
+ g_mutex_clear (&video_box->mutex);
G_OBJECT_CLASS (parent_class)->finalize (object);
}
@@ -2487,7 +2460,9 @@ static void
gst_video_box_class_init (GstVideoBoxClass * klass)
{
GObjectClass *gobject_class = (GObjectClass *) klass;
+ GstElementClass *element_class = (GstElementClass *) (klass);
GstBaseTransformClass *trans_class = (GstBaseTransformClass *) klass;
+ GstVideoFilterClass *vfilter_class = (GstVideoFilterClass *) klass;
gobject_class->set_property = gst_video_box_set_property;
gobject_class->get_property = gst_video_box_get_property;
@@ -2537,19 +2512,29 @@ gst_video_box_class_init (GstVideoBoxClass * klass)
g_param_spec_boolean ("autocrop", "Auto crop",
"Auto crop", FALSE, G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
- trans_class->transform = GST_DEBUG_FUNCPTR (gst_video_box_transform);
trans_class->before_transform =
GST_DEBUG_FUNCPTR (gst_video_box_before_transform);
trans_class->transform_caps =
GST_DEBUG_FUNCPTR (gst_video_box_transform_caps);
- trans_class->set_caps = GST_DEBUG_FUNCPTR (gst_video_box_set_caps);
- trans_class->get_unit_size = GST_DEBUG_FUNCPTR (gst_video_box_get_unit_size);
- trans_class->fixate_caps = GST_DEBUG_FUNCPTR (gst_video_box_fixate_caps);
trans_class->src_event = GST_DEBUG_FUNCPTR (gst_video_box_src_event);
+
+ vfilter_class->set_info = GST_DEBUG_FUNCPTR (gst_video_box_set_info);
+ vfilter_class->transform_frame =
+ GST_DEBUG_FUNCPTR (gst_video_box_transform_frame);
+
+ gst_element_class_set_static_metadata (element_class, "Video box filter",
+ "Filter/Effect/Video",
+ "Resizes a video by adding borders or cropping",
+ "Wim Taymans <wim@fluendo.com>");
+
+ gst_element_class_add_pad_template (element_class,
+ gst_static_pad_template_get (&gst_video_box_sink_template));
+ gst_element_class_add_pad_template (element_class,
+ gst_static_pad_template_get (&gst_video_box_src_template));
}
static void
-gst_video_box_init (GstVideoBox * video_box, GstVideoBoxClass * g_class)
+gst_video_box_init (GstVideoBox * video_box)
{
video_box->box_right = DEFAULT_RIGHT;
video_box->box_left = DEFAULT_LEFT;
@@ -2564,7 +2549,7 @@ gst_video_box_init (GstVideoBox * video_box, GstVideoBoxClass * g_class)
video_box->border_alpha = DEFAULT_BORDER_ALPHA;
video_box->autocrop = FALSE;
- video_box->mutex = g_mutex_new ();
+ g_mutex_init (&video_box->mutex);
}
static void
@@ -2573,7 +2558,7 @@ gst_video_box_set_property (GObject * object, guint prop_id,
{
GstVideoBox *video_box = GST_VIDEO_BOX (object);
- g_mutex_lock (video_box->mutex);
+ g_mutex_lock (&video_box->mutex);
switch (prop_id) {
case PROP_LEFT:
video_box->box_left = g_value_get_int (value);
@@ -2634,9 +2619,9 @@ gst_video_box_set_property (GObject * object, guint prop_id,
gst_video_box_recalc_transform (video_box);
GST_DEBUG_OBJECT (video_box, "Calling reconfigure");
- gst_base_transform_reconfigure (GST_BASE_TRANSFORM_CAST (video_box));
+ gst_base_transform_reconfigure_src (GST_BASE_TRANSFORM_CAST (video_box));
- g_mutex_unlock (video_box->mutex);
+ g_mutex_unlock (&video_box->mutex);
}
static void
@@ -2793,186 +2778,204 @@ gst_video_box_transform_dimension_value (const GValue * src_val,
static GstCaps *
gst_video_box_transform_caps (GstBaseTransform * trans,
- GstPadDirection direction, GstCaps * from)
+ GstPadDirection direction, GstCaps * from, GstCaps * filter)
{
GstVideoBox *video_box = GST_VIDEO_BOX (trans);
GstCaps *to, *ret;
- const GstCaps *templ;
- const gchar *name;
+ GstCaps *templ;
GstStructure *structure;
GstPad *other;
+ gint i, j;
- to = gst_caps_copy (from);
- /* Just to be sure... */
- gst_caps_truncate (to);
- structure = gst_caps_get_structure (to, 0);
+ to = gst_caps_new_empty ();
+ for (i = 0; i < gst_caps_get_size (from); i++) {
+ const GValue *fval, *lval;
+ GValue list = { 0, };
+ GValue val = { 0, };
+ gboolean seen_yuv = FALSE, seen_rgb = FALSE;
+ const gchar *str;
- /* Transform width/height */
- if (video_box->autocrop) {
- gst_structure_remove_field (structure, "width");
- gst_structure_remove_field (structure, "height");
- } else {
- gint dw = 0, dh = 0;
- const GValue *v;
- GValue w_val = { 0, };
- GValue h_val = { 0, };
-
- /* calculate width and height */
- if (direction == GST_PAD_SINK) {
- dw -= video_box->box_left;
- dw -= video_box->box_right;
- } else {
- dw += video_box->box_left;
- dw += video_box->box_right;
- }
+ structure = gst_structure_copy (gst_caps_get_structure (from, i));
- if (direction == GST_PAD_SINK) {
- dh -= video_box->box_top;
- dh -= video_box->box_bottom;
+ /* Transform width/height */
+ if (video_box->autocrop) {
+ gst_structure_remove_field (structure, "width");
+ gst_structure_remove_field (structure, "height");
} else {
- dh += video_box->box_top;
- dh += video_box->box_bottom;
- }
+ gint dw = 0, dh = 0;
+ const GValue *v;
+ GValue w_val = { 0, };
+ GValue h_val = { 0, };
+
+ /* calculate width and height */
+ if (direction == GST_PAD_SINK) {
+ dw -= video_box->box_left;
+ dw -= video_box->box_right;
+ } else {
+ dw += video_box->box_left;
+ dw += video_box->box_right;
+ }
- v = gst_structure_get_value (structure, "width");
- if (!gst_video_box_transform_dimension_value (v, dw, &w_val)) {
- GST_WARNING_OBJECT (video_box, "could not tranform width value with dw=%d"
- ", caps structure=%" GST_PTR_FORMAT, dw, structure);
- gst_caps_unref (to);
- to = gst_caps_new_empty ();
- return to;
- }
- gst_structure_set_value (structure, "width", &w_val);
+ if (direction == GST_PAD_SINK) {
+ dh -= video_box->box_top;
+ dh -= video_box->box_bottom;
+ } else {
+ dh += video_box->box_top;
+ dh += video_box->box_bottom;
+ }
- v = gst_structure_get_value (structure, "height");
- if (!gst_video_box_transform_dimension_value (v, dh, &h_val)) {
+ v = gst_structure_get_value (structure, "width");
+ if (!gst_video_box_transform_dimension_value (v, dw, &w_val)) {
+ GST_WARNING_OBJECT (video_box,
+ "could not tranform width value with dw=%d" ", caps structure=%"
+ GST_PTR_FORMAT, dw, structure);
+ goto bail;
+ }
+ gst_structure_set_value (structure, "width", &w_val);
+
+ v = gst_structure_get_value (structure, "height");
+ if (!gst_video_box_transform_dimension_value (v, dh, &h_val)) {
+ g_value_unset (&w_val);
+ GST_WARNING_OBJECT (video_box,
+ "could not tranform height value with dh=%d" ", caps structure=%"
+ GST_PTR_FORMAT, dh, structure);
+ goto bail;
+ }
+ gst_structure_set_value (structure, "height", &h_val);
g_value_unset (&w_val);
- GST_WARNING_OBJECT (video_box,
- "could not tranform height value with dh=%d" ", caps structure=%"
- GST_PTR_FORMAT, dh, structure);
- gst_caps_unref (to);
- to = gst_caps_new_empty ();
- return to;
- }
- gst_structure_set_value (structure, "height", &h_val);
- g_value_unset (&w_val);
- g_value_unset (&h_val);
- }
-
- /* Supported conversions:
- * I420->AYUV
- * I420->YV12
- * YV12->AYUV
- * YV12->I420
- * AYUV->I420
- * AYUV->YV12
- * AYUV->xRGB (24bpp, 32bpp, incl. alpha)
- * xRGB->xRGB (24bpp, 32bpp, from/to all variants, incl. alpha)
- * xRGB->AYUV (24bpp, 32bpp, incl. alpha)
- *
- * Passthrough only for everything else.
- */
- name = gst_structure_get_name (structure);
- if (g_str_equal (name, "video/x-raw-yuv")) {
- guint32 fourcc;
-
- if (gst_structure_get_fourcc (structure, "format", &fourcc) &&
- (fourcc == GST_STR_FOURCC ("AYUV") ||
- fourcc == GST_STR_FOURCC ("I420") ||
- fourcc == GST_STR_FOURCC ("YV12"))) {
- GValue list = { 0, };
- GValue val = { 0, };
- GstStructure *s2;
-
- /* get rid of format */
- gst_structure_remove_field (structure, "format");
- gst_structure_remove_field (structure, "color-matrix");
- gst_structure_remove_field (structure, "chroma-site");
-
- s2 = gst_structure_copy (structure);
+ g_value_unset (&h_val);
+ }
+
+ /* Supported conversions:
+ * I420->AYUV
+ * I420->YV12
+ * YV12->AYUV
+ * YV12->I420
+ * AYUV->I420
+ * AYUV->YV12
+ * AYUV->xRGB (24bpp, 32bpp, incl. alpha)
+ * xRGB->xRGB (24bpp, 32bpp, from/to all variants, incl. alpha)
+ * xRGB->AYUV (24bpp, 32bpp, incl. alpha)
+ *
+ * Passthrough only for everything else.
+ */
+ fval = gst_structure_get_value (structure, "format");
+ if (fval && GST_VALUE_HOLDS_LIST (fval)) {
+ for (j = 0; j < gst_value_list_get_size (fval); j++) {
+ lval = gst_value_list_get_value (fval, j);
+ if ((str = g_value_get_string (lval))) {
+ if (strstr (str, "RGB") || strstr (str, "BGR") ||
+ strcmp (str, "AYUV") == 0)
+ seen_rgb = TRUE;
+ else if (strcmp (str, "I420") == 0 || strcmp (str, "YV12") == 0 ||
+ strcmp (str, "AYUV") == 0)
+ seen_yuv = TRUE;
+ }
+ }
+ } else if (fval && G_VALUE_HOLDS_STRING (fval)) {
+ if ((str = g_value_get_string (fval))) {
+ if (strstr (str, "RGB") || strstr (str, "BGR") ||
+ strcmp (str, "AYUV") == 0)
+ seen_rgb = TRUE;
+ else if (strcmp (str, "I420") == 0 || strcmp (str, "YV12") == 0 ||
+ strcmp (str, "AYUV") == 0)
+ seen_yuv = TRUE;
+ }
+ }
+ if (seen_yuv || seen_rgb) {
g_value_init (&list, GST_TYPE_LIST);
- g_value_init (&val, GST_TYPE_FOURCC);
- gst_value_set_fourcc (&val, GST_STR_FOURCC ("AYUV"));
- gst_value_list_append_value (&list, &val);
- g_value_reset (&val);
- gst_value_set_fourcc (&val, GST_STR_FOURCC ("I420"));
- gst_value_list_append_value (&list, &val);
- g_value_reset (&val);
- gst_value_set_fourcc (&val, GST_STR_FOURCC ("YV12"));
+
+ g_value_init (&val, G_TYPE_STRING);
+ g_value_set_string (&val, "AYUV");
gst_value_list_append_value (&list, &val);
g_value_unset (&val);
- gst_structure_set_value (structure, "format", &list);
- g_value_unset (&list);
- /* We can only convert to RGB if input is AYUV */
- if (fourcc == GST_STR_FOURCC ("AYUV")) {
- gst_structure_set_name (s2, "video/x-raw-rgb");
- g_value_init (&list, GST_TYPE_LIST);
- g_value_init (&val, G_TYPE_INT);
- g_value_set_int (&val, 32);
+ if (seen_yuv) {
+ g_value_init (&val, G_TYPE_STRING);
+ g_value_set_string (&val, "I420");
gst_value_list_append_value (&list, &val);
g_value_reset (&val);
- g_value_set_int (&val, 24);
+ g_value_set_string (&val, "YV12");
gst_value_list_append_value (&list, &val);
g_value_unset (&val);
- gst_structure_set_value (s2, "depth", &list);
- gst_structure_set_value (s2, "bpp", &list);
- g_value_unset (&list);
- gst_caps_append_structure (to, s2);
- } else {
- gst_structure_free (s2);
}
- }
- } else if (g_str_equal (name, "video/x-raw-rgb")) {
- gint bpp;
-
- if (gst_structure_get_int (structure, "bpp", &bpp) &&
- (bpp == 32 || bpp == 24)) {
- GValue list = { 0, };
- GValue val = { 0, };
- GstStructure *s2;
-
- /* get rid of format */
- gst_structure_remove_field (structure, "depth");
- gst_structure_remove_field (structure, "bpp");
- gst_structure_remove_field (structure, "red_mask");
- gst_structure_remove_field (structure, "green_mask");
- gst_structure_remove_field (structure, "blue_mask");
- gst_structure_remove_field (structure, "alpha_mask");
-
- s2 = gst_structure_copy (structure);
-
- g_value_init (&list, GST_TYPE_LIST);
- g_value_init (&val, G_TYPE_INT);
- g_value_set_int (&val, 32);
- gst_value_list_append_value (&list, &val);
- g_value_reset (&val);
- g_value_set_int (&val, 24);
- gst_value_list_append_value (&list, &val);
+ if (seen_rgb) {
+ g_value_init (&val, G_TYPE_STRING);
+ g_value_set_string (&val, "RGBx");
+ gst_value_list_append_value (&list, &val);
+ g_value_reset (&val);
+ g_value_set_string (&val, "BGRx");
+ gst_value_list_append_value (&list, &val);
+ g_value_reset (&val);
+ g_value_set_string (&val, "xRGB");
+ gst_value_list_append_value (&list, &val);
+ g_value_reset (&val);
+ g_value_set_string (&val, "xBGR");
+ gst_value_list_append_value (&list, &val);
+ g_value_reset (&val);
+ g_value_set_string (&val, "RGBA");
+ gst_value_list_append_value (&list, &val);
+ g_value_reset (&val);
+ g_value_set_string (&val, "BGRA");
+ gst_value_list_append_value (&list, &val);
+ g_value_reset (&val);
+ g_value_set_string (&val, "ARGB");
+ gst_value_list_append_value (&list, &val);
+ g_value_reset (&val);
+ g_value_set_string (&val, "ABGR");
+ gst_value_list_append_value (&list, &val);
+ g_value_reset (&val);
+ g_value_set_string (&val, "RGB");
+ gst_value_list_append_value (&list, &val);
+ g_value_reset (&val);
+ g_value_set_string (&val, "BGR");
+ gst_value_list_append_value (&list, &val);
+ g_value_unset (&val);
+ }
+ gst_value_list_merge (&val, fval, &list);
+ gst_structure_set_value (structure, "format", &val);
g_value_unset (&val);
- gst_structure_set_value (structure, "depth", &list);
- gst_structure_set_value (structure, "bpp", &list);
g_value_unset (&list);
-
- gst_structure_set_name (s2, "video/x-raw-yuv");
- gst_structure_set (s2, "format", GST_TYPE_FOURCC, GST_STR_FOURCC ("AYUV"),
- NULL);
- gst_caps_append_structure (to, s2);
}
+
+ gst_structure_remove_field (structure, "colorimetry");
+ gst_structure_remove_field (structure, "chroma-site");
+
+ gst_caps_append_structure (to, structure);
}
/* filter against set allowed caps on the pad */
other = (direction == GST_PAD_SINK) ? trans->srcpad : trans->sinkpad;
-
templ = gst_pad_get_pad_template_caps (other);
ret = gst_caps_intersect (to, templ);
gst_caps_unref (to);
+ gst_caps_unref (templ);
GST_DEBUG_OBJECT (video_box, "direction %d, transformed %" GST_PTR_FORMAT
" to %" GST_PTR_FORMAT, direction, from, ret);
+ if (ret && filter) {
+ GstCaps *intersection;
+
+ GST_DEBUG_OBJECT (video_box, "Using filter caps %" GST_PTR_FORMAT, filter);
+ intersection =
+ gst_caps_intersect_full (filter, ret, GST_CAPS_INTERSECT_FIRST);
+ gst_caps_unref (ret);
+ ret = intersection;
+ GST_DEBUG_OBJECT (video_box, "Intersection %" GST_PTR_FORMAT, ret);
+ }
+
return ret;
+
+ /* ERRORS */
+bail:
+ {
+ gst_structure_free (structure);
+ gst_caps_unref (to);
+ to = gst_caps_new_empty ();
+ return to;
+ }
}
static gboolean
@@ -3129,33 +3132,30 @@ gst_video_box_select_processing_functions (GstVideoBox * video_box)
}
static gboolean
-gst_video_box_set_caps (GstBaseTransform * trans, GstCaps * in, GstCaps * out)
+gst_video_box_set_info (GstVideoFilter * vfilter, GstCaps * in,
+ GstVideoInfo * in_info, GstCaps * out, GstVideoInfo * out_info)
{
- GstVideoBox *video_box = GST_VIDEO_BOX (trans);
+ GstVideoBox *video_box = GST_VIDEO_BOX (vfilter);
gboolean ret;
- const gchar *matrix;
- g_mutex_lock (video_box->mutex);
+ g_mutex_lock (&video_box->mutex);
- ret =
- gst_video_format_parse_caps (in, &video_box->in_format,
- &video_box->in_width, &video_box->in_height);
- ret &=
- gst_video_format_parse_caps (out, &video_box->out_format,
- &video_box->out_width, &video_box->out_height);
+ video_box->in_format = GST_VIDEO_INFO_FORMAT (in_info);
+ video_box->in_width = GST_VIDEO_INFO_WIDTH (in_info);
+ video_box->in_height = GST_VIDEO_INFO_HEIGHT (in_info);
- matrix = gst_video_parse_caps_color_matrix (in);
- video_box->in_sdtv = matrix ? g_str_equal (matrix, "sdtv") : TRUE;
- matrix = gst_video_parse_caps_color_matrix (out);
- video_box->out_sdtv = matrix ? g_str_equal (matrix, "sdtv") : TRUE;
+ video_box->out_format = GST_VIDEO_INFO_FORMAT (in_info);
+ video_box->out_width = GST_VIDEO_INFO_WIDTH (in_info);
+ video_box->out_height = GST_VIDEO_INFO_HEIGHT (in_info);
- /* something wrong getting the caps */
- if (!ret)
- goto no_caps;
+ video_box->in_sdtv =
+ in_info->colorimetry.matrix == GST_VIDEO_COLOR_MATRIX_BT601;
+ video_box->out_sdtv =
+ out_info->colorimetry.matrix == GST_VIDEO_COLOR_MATRIX_BT601;
- GST_DEBUG_OBJECT (trans, "Input w: %d h: %d", video_box->in_width,
+ GST_DEBUG_OBJECT (video_box, "Input w: %d h: %d", video_box->in_width,
video_box->in_height);
- GST_DEBUG_OBJECT (trans, "Output w: %d h: %d", video_box->out_width,
+ GST_DEBUG_OBJECT (video_box, "Output w: %d h: %d", video_box->out_width,
video_box->out_height);
if (video_box->autocrop)
@@ -3166,58 +3166,9 @@ gst_video_box_set_caps (GstBaseTransform * trans, GstCaps * in, GstCaps * out)
if (ret)
ret = gst_video_box_select_processing_functions (video_box);
- g_mutex_unlock (video_box->mutex);
+ g_mutex_unlock (&video_box->mutex);
return ret;
-
- /* ERRORS */
-no_caps:
- {
- GST_DEBUG_OBJECT (video_box,
- "Invalid caps: %" GST_PTR_FORMAT " -> %" GST_PTR_FORMAT, in, out);
- g_mutex_unlock (video_box->mutex);
- return FALSE;
- }
-}
-
-static gboolean
-gst_video_box_get_unit_size (GstBaseTransform * trans, GstCaps * caps,
- guint * size)
-{
- GstVideoFormat format;
- gint width, height;
- gboolean ret;
-
- g_assert (size);
-
- ret = gst_video_format_parse_caps (caps, &format, &width, &height);
- if (!ret) {
- GST_ERROR_OBJECT (trans, "Invalid caps: %" GST_PTR_FORMAT, caps);
- return FALSE;
- }
-
- *size = gst_video_format_get_size (format, width, height);
-
- GST_LOG_OBJECT (trans, "Returning from _unit_size %d", *size);
-
- return TRUE;
-}
-
-static void
-gst_video_box_fixate_caps (GstBaseTransform * trans,
- GstPadDirection direction, GstCaps * caps, GstCaps * othercaps)
-{
- gint width, height;
- GstStructure *s;
- gboolean ret;
-
- ret = gst_video_format_parse_caps (caps, NULL, &width, &height);
- if (!ret)
- return;
-
- s = gst_caps_get_structure (othercaps, 0);
- gst_structure_fixate_field_nearest_int (s, "width", width);
- gst_structure_fixate_field_nearest_int (s, "height", height);
}
static gboolean
@@ -3267,8 +3218,8 @@ gst_video_box_src_event (GstBaseTransform * trans, GstEvent * event)
}
static void
-gst_video_box_process (GstVideoBox * video_box, const guint8 * src,
- guint8 * dest)
+gst_video_box_process (GstVideoBox * video_box, GstVideoFrame * in,
+ GstVideoFrame * out)
{
guint b_alpha = CLAMP (video_box->border_alpha * 256, 0, 255);
guint i_alpha = CLAMP (video_box->alpha * 256, 0, 255);
@@ -3309,21 +3260,17 @@ gst_video_box_process (GstVideoBox * video_box, const guint8 * src,
i_alpha, b_alpha);
if (crop_h < 0 || crop_w < 0) {
- video_box->fill (fill_type, b_alpha, video_box->out_format, dest,
- video_box->out_sdtv, video_box->out_width, video_box->out_height);
+ video_box->fill (fill_type, b_alpha, out, video_box->out_sdtv);
} else if (bb == 0 && bt == 0 && br == 0 && bl == 0) {
- video_box->copy (i_alpha, video_box->out_format, dest, video_box->out_sdtv,
- video_box->out_width, video_box->out_height, 0, 0, video_box->in_format,
- src, video_box->in_sdtv, video_box->in_width, video_box->in_height, 0,
- 0, crop_w, crop_h);
+ video_box->copy (i_alpha, out, video_box->out_sdtv, 0, 0, in,
+ video_box->in_sdtv, 0, 0, crop_w, crop_h);
} else {
gint src_x = 0, src_y = 0;
gint dest_x = 0, dest_y = 0;
/* Fill everything if a border should be added somewhere */
if (bt < 0 || bb < 0 || br < 0 || bl < 0)
- video_box->fill (fill_type, b_alpha, video_box->out_format, dest,
- video_box->out_sdtv, video_box->out_width, video_box->out_height);
+ video_box->fill (fill_type, b_alpha, out, video_box->out_sdtv);
/* Top border */
if (bt < 0) {
@@ -3340,10 +3287,8 @@ gst_video_box_process (GstVideoBox * video_box, const guint8 * src,
}
/* Frame */
- video_box->copy (i_alpha, video_box->out_format, dest, video_box->out_sdtv,
- video_box->out_width, video_box->out_height, dest_x, dest_y,
- video_box->in_format, src, video_box->in_sdtv, video_box->in_width,
- video_box->in_height, src_x, src_y, crop_w, crop_h);
+ video_box->copy (i_alpha, out, video_box->out_sdtv, dest_x, dest_y,
+ in, video_box->in_sdtv, src_x, src_y, crop_w, crop_h);
}
GST_LOG_OBJECT (video_box, "image created");
@@ -3367,19 +3312,14 @@ gst_video_box_before_transform (GstBaseTransform * trans, GstBuffer * in)
}
static GstFlowReturn
-gst_video_box_transform (GstBaseTransform * trans, GstBuffer * in,
- GstBuffer * out)
+gst_video_box_transform_frame (GstVideoFilter * vfilter,
+ GstVideoFrame * in_frame, GstVideoFrame * out_frame)
{
- GstVideoBox *video_box = GST_VIDEO_BOX (trans);
- const guint8 *indata;
- guint8 *outdata;
-
- indata = GST_BUFFER_DATA (in);
- outdata = GST_BUFFER_DATA (out);
+ GstVideoBox *video_box = GST_VIDEO_BOX (vfilter);
- g_mutex_lock (video_box->mutex);
- gst_video_box_process (video_box, indata, outdata);
- g_mutex_unlock (video_box->mutex);
+ g_mutex_lock (&video_box->mutex);
+ gst_video_box_process (video_box, in_frame, out_frame);
+ g_mutex_unlock (&video_box->mutex);
return GST_FLOW_OK;
}
diff --git a/gst/videobox/gstvideobox.h b/gst/videobox/gstvideobox.h
index f85f216fa2bf0350960e9afeb48eb5a50448e98f..2dec46d6f97b5bc5f60be08d2876e9b0b54f86b2 100644
--- a/gst/videobox/gstvideobox.h
+++ b/gst/videobox/gstvideobox.h
@@ -18,7 +18,7 @@
*/
#include <gst/gst.h>
-#include <gst/base/gstbasetransform.h>
+#include <gst/video/gstvideofilter.h>
#include <gst/video/video.h>
#ifndef __GST_VIDEO_BOX_H__
@@ -52,12 +52,12 @@ GstVideoBoxFill;
struct _GstVideoBox
{
- GstBaseTransform element;
+ GstVideoFilter element;
/* <private> */
/* Guarding everything below */
- GMutex *mutex;
+ GMutex mutex;
/* caps */
GstVideoFormat in_format;
gint in_width, in_height;
@@ -78,13 +78,13 @@ struct _GstVideoBox
gboolean autocrop;
- void (*fill) (GstVideoBoxFill fill_type, guint b_alpha, GstVideoFormat format, guint8 *dest, gboolean sdtv, gint width, gint height);
- void (*copy) (guint i_alpha, GstVideoFormat dest_format, guint8 *dest, gboolean dest_sdtv, gint dest_width, gint dest_height, gint dest_x, gint dest_y, GstVideoFormat src_format, const guint8 *src, gboolean src_sdtv, gint src_width, gint src_height, gint src_x, gint src_y, gint w, gint h);
+ void (*fill) (GstVideoBoxFill fill_type, guint b_alpha, GstVideoFrame *dest, gboolean sdtv);
+ void (*copy) (guint i_alpha, GstVideoFrame * dest, gboolean dest_sdtv, gint dest_x, gint dest_y, GstVideoFrame * src, gboolean src_sdtv, gint src_x, gint src_y, gint w, gint h);
};
struct _GstVideoBoxClass
{
- GstBaseTransformClass parent_class;
+ GstVideoFilterClass parent_class;
};
GType gst_video_box_get_type (void);
diff --git a/gst/videocrop/Makefile.in b/gst/videocrop/Makefile.in
index 6fe2a3b88d21c718ff8d62cff73601254e2b06f1..b47c174c4b5dd3851f2a15eb85e020cddf0a3a34 100644
--- a/gst/videocrop/Makefile.in
+++ b/gst/videocrop/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.11.4 from Makefile.am.
+# Makefile.in generated by automake 1.11.5 from Makefile.am.
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -60,6 +60,7 @@ am__aclocal_m4_deps = $(top_srcdir)/common/m4/as-ac-expand.m4 \
$(top_srcdir)/common/m4/as-auto-alt.m4 \
$(top_srcdir)/common/m4/as-compiler-flag.m4 \
$(top_srcdir)/common/m4/as-gcc-inline-assembly.m4 \
+ $(top_srcdir)/common/m4/as-libtool.m4 \
$(top_srcdir)/common/m4/as-objc.m4 \
$(top_srcdir)/common/m4/as-python.m4 \
$(top_srcdir)/common/m4/as-scrub-include.m4 \
@@ -255,6 +256,7 @@ GMSGFMT_015 = @GMSGFMT_015@
GREP = @GREP@
GSTPB_PLUGINS_DIR = @GSTPB_PLUGINS_DIR@
GSTPB_PREFIX = @GSTPB_PREFIX@
+GST_AGE = @GST_AGE@
GST_ALL_LDFLAGS = @GST_ALL_LDFLAGS@
GST_API_VERSION = @GST_API_VERSION@
GST_BASE_CFLAGS = @GST_BASE_CFLAGS@
@@ -264,9 +266,11 @@ GST_CHECK_CFLAGS = @GST_CHECK_CFLAGS@
GST_CHECK_LIBS = @GST_CHECK_LIBS@
GST_CONTROLLER_CFLAGS = @GST_CONTROLLER_CFLAGS@
GST_CONTROLLER_LIBS = @GST_CONTROLLER_LIBS@
+GST_CURRENT = @GST_CURRENT@
GST_CXXFLAGS = @GST_CXXFLAGS@
GST_LEVEL_DEFAULT = @GST_LEVEL_DEFAULT@
GST_LIBS = @GST_LIBS@
+GST_LIBVERSION = @GST_LIBVERSION@
GST_LICENSE = @GST_LICENSE@
GST_LT_LDFLAGS = @GST_LT_LDFLAGS@
GST_NET_CFLAGS = @GST_NET_CFLAGS@
@@ -284,6 +288,7 @@ GST_PLUGINS_NONPORTED = @GST_PLUGINS_NONPORTED@
GST_PLUGINS_SELECTED = @GST_PLUGINS_SELECTED@
GST_PLUGIN_LDFLAGS = @GST_PLUGIN_LDFLAGS@
GST_PREFIX = @GST_PREFIX@
+GST_REVISION = @GST_REVISION@
GST_TOOLS_DIR = @GST_TOOLS_DIR@
GTKDOC_CHECK = @GTKDOC_CHECK@
GTK_CFLAGS = @GTK_CFLAGS@
@@ -539,7 +544,7 @@ install-pluginLTLIBRARIES: $(plugin_LTLIBRARIES)
done; \
test -z "$$list2" || { \
echo " $(MKDIR_P) '$(DESTDIR)$(plugindir)'"; \
- $(MKDIR_P) '$(DESTDIR)$(plugindir)' || exit 1; \
+ $(MKDIR_P) "$(DESTDIR)$(plugindir)" || exit 1; \
echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 '$(DESTDIR)$(plugindir)'"; \
$(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 "$(DESTDIR)$(plugindir)"; \
}
diff --git a/gst/videofilter/Makefile.in b/gst/videofilter/Makefile.in
index 98bbee2b657ab056181b89941779ededd26cbeae..b23cae69897397ad28d3dd205210171c7df31e35 100644
--- a/gst/videofilter/Makefile.in
+++ b/gst/videofilter/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.11.4 from Makefile.am.
+# Makefile.in generated by automake 1.11.5 from Makefile.am.
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -60,6 +60,7 @@ am__aclocal_m4_deps = $(top_srcdir)/common/m4/as-ac-expand.m4 \
$(top_srcdir)/common/m4/as-auto-alt.m4 \
$(top_srcdir)/common/m4/as-compiler-flag.m4 \
$(top_srcdir)/common/m4/as-gcc-inline-assembly.m4 \
+ $(top_srcdir)/common/m4/as-libtool.m4 \
$(top_srcdir)/common/m4/as-objc.m4 \
$(top_srcdir)/common/m4/as-python.m4 \
$(top_srcdir)/common/m4/as-scrub-include.m4 \
@@ -258,6 +259,7 @@ GMSGFMT_015 = @GMSGFMT_015@
GREP = @GREP@
GSTPB_PLUGINS_DIR = @GSTPB_PLUGINS_DIR@
GSTPB_PREFIX = @GSTPB_PREFIX@
+GST_AGE = @GST_AGE@
GST_ALL_LDFLAGS = @GST_ALL_LDFLAGS@
GST_API_VERSION = @GST_API_VERSION@
GST_BASE_CFLAGS = @GST_BASE_CFLAGS@
@@ -267,9 +269,11 @@ GST_CHECK_CFLAGS = @GST_CHECK_CFLAGS@
GST_CHECK_LIBS = @GST_CHECK_LIBS@
GST_CONTROLLER_CFLAGS = @GST_CONTROLLER_CFLAGS@
GST_CONTROLLER_LIBS = @GST_CONTROLLER_LIBS@
+GST_CURRENT = @GST_CURRENT@
GST_CXXFLAGS = @GST_CXXFLAGS@
GST_LEVEL_DEFAULT = @GST_LEVEL_DEFAULT@
GST_LIBS = @GST_LIBS@
+GST_LIBVERSION = @GST_LIBVERSION@
GST_LICENSE = @GST_LICENSE@
GST_LT_LDFLAGS = @GST_LT_LDFLAGS@
GST_NET_CFLAGS = @GST_NET_CFLAGS@
@@ -287,6 +291,7 @@ GST_PLUGINS_NONPORTED = @GST_PLUGINS_NONPORTED@
GST_PLUGINS_SELECTED = @GST_PLUGINS_SELECTED@
GST_PLUGIN_LDFLAGS = @GST_PLUGIN_LDFLAGS@
GST_PREFIX = @GST_PREFIX@
+GST_REVISION = @GST_REVISION@
GST_TOOLS_DIR = @GST_TOOLS_DIR@
GTKDOC_CHECK = @GTKDOC_CHECK@
GTK_CFLAGS = @GTK_CFLAGS@
@@ -549,7 +554,7 @@ install-pluginLTLIBRARIES: $(plugin_LTLIBRARIES)
done; \
test -z "$$list2" || { \
echo " $(MKDIR_P) '$(DESTDIR)$(plugindir)'"; \
- $(MKDIR_P) '$(DESTDIR)$(plugindir)' || exit 1; \
+ $(MKDIR_P) "$(DESTDIR)$(plugindir)" || exit 1; \
echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 '$(DESTDIR)$(plugindir)'"; \
$(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 "$(DESTDIR)$(plugindir)"; \
}
diff --git a/gst/videomixer/Makefile.in b/gst/videomixer/Makefile.in
index 93b1583a2df86ed7bae9290a1233a50fe7dc68ed..b3d816806402e222091b01365699764a4fa57bf8 100644
--- a/gst/videomixer/Makefile.in
+++ b/gst/videomixer/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.11.4 from Makefile.am.
+# Makefile.in generated by automake 1.11.5 from Makefile.am.
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -82,6 +82,7 @@ am__aclocal_m4_deps = $(top_srcdir)/common/m4/as-ac-expand.m4 \
$(top_srcdir)/common/m4/as-auto-alt.m4 \
$(top_srcdir)/common/m4/as-compiler-flag.m4 \
$(top_srcdir)/common/m4/as-gcc-inline-assembly.m4 \
+ $(top_srcdir)/common/m4/as-libtool.m4 \
$(top_srcdir)/common/m4/as-objc.m4 \
$(top_srcdir)/common/m4/as-python.m4 \
$(top_srcdir)/common/m4/as-scrub-include.m4 \
@@ -283,6 +284,7 @@ GMSGFMT_015 = @GMSGFMT_015@
GREP = @GREP@
GSTPB_PLUGINS_DIR = @GSTPB_PLUGINS_DIR@
GSTPB_PREFIX = @GSTPB_PREFIX@
+GST_AGE = @GST_AGE@
GST_ALL_LDFLAGS = @GST_ALL_LDFLAGS@
GST_API_VERSION = @GST_API_VERSION@
GST_BASE_CFLAGS = @GST_BASE_CFLAGS@
@@ -292,9 +294,11 @@ GST_CHECK_CFLAGS = @GST_CHECK_CFLAGS@
GST_CHECK_LIBS = @GST_CHECK_LIBS@
GST_CONTROLLER_CFLAGS = @GST_CONTROLLER_CFLAGS@
GST_CONTROLLER_LIBS = @GST_CONTROLLER_LIBS@
+GST_CURRENT = @GST_CURRENT@
GST_CXXFLAGS = @GST_CXXFLAGS@
GST_LEVEL_DEFAULT = @GST_LEVEL_DEFAULT@
GST_LIBS = @GST_LIBS@
+GST_LIBVERSION = @GST_LIBVERSION@
GST_LICENSE = @GST_LICENSE@
GST_LT_LDFLAGS = @GST_LT_LDFLAGS@
GST_NET_CFLAGS = @GST_NET_CFLAGS@
@@ -312,6 +316,7 @@ GST_PLUGINS_NONPORTED = @GST_PLUGINS_NONPORTED@
GST_PLUGINS_SELECTED = @GST_PLUGINS_SELECTED@
GST_PLUGIN_LDFLAGS = @GST_PLUGIN_LDFLAGS@
GST_PREFIX = @GST_PREFIX@
+GST_REVISION = @GST_REVISION@
GST_TOOLS_DIR = @GST_TOOLS_DIR@
GTKDOC_CHECK = @GTKDOC_CHECK@
GTK_CFLAGS = @GTK_CFLAGS@
@@ -589,7 +594,7 @@ install-pluginLTLIBRARIES: $(plugin_LTLIBRARIES)
done; \
test -z "$$list2" || { \
echo " $(MKDIR_P) '$(DESTDIR)$(plugindir)'"; \
- $(MKDIR_P) '$(DESTDIR)$(plugindir)' || exit 1; \
+ $(MKDIR_P) "$(DESTDIR)$(plugindir)" || exit 1; \
echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 '$(DESTDIR)$(plugindir)'"; \
$(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 "$(DESTDIR)$(plugindir)"; \
}
diff --git a/gst/videomixer/videomixer2.c b/gst/videomixer/videomixer2.c
index 6a49f933654602fe3df58420aab306e96e1e95f0..0d2d97ec166c7695ba1a4cf23a567075868d9243 100644
--- a/gst/videomixer/videomixer2.c
+++ b/gst/videomixer/videomixer2.c
@@ -112,7 +112,7 @@ static GstStaticPadTemplate src_factory = GST_STATIC_PAD_TEMPLATE ("src",
GST_STATIC_CAPS (GST_VIDEO_CAPS_MAKE (FORMATS))
);
-static GstStaticPadTemplate sink_factory = GST_STATIC_PAD_TEMPLATE ("sink_%d",
+static GstStaticPadTemplate sink_factory = GST_STATIC_PAD_TEMPLATE ("sink_%u",
GST_PAD_SINK,
GST_PAD_REQUEST,
GST_STATIC_CAPS (GST_VIDEO_CAPS_MAKE (FORMATS))
@@ -127,7 +127,7 @@ static void gst_videomixer2_reset_qos (GstVideoMixer2 * mix);
struct _GstVideoMixer2Collect
{
- GstCollectData2 collect; /* we extend the CollectData */
+ GstCollectData collect; /* we extend the CollectData */
GstVideoMixer2Pad *mixpad;
@@ -154,7 +154,7 @@ enum
G_DEFINE_TYPE (GstVideoMixer2Pad, gst_videomixer2_pad, GST_TYPE_PAD);
static void
-gst_videomixer2_collect_free (GstCollectData2 * data)
+gst_videomixer2_collect_free (GstCollectData * data)
{
GstVideoMixer2Collect *cdata = (GstVideoMixer2Collect *) data;
@@ -660,7 +660,7 @@ gst_videomixer2_fill_queues (GstVideoMixer2 * mix,
GstSegment *segment = &pad->mixcol->collect.segment;
GstBuffer *buf;
- buf = gst_collect_pads2_peek (mix->collect, &mixcol->collect);
+ buf = gst_collect_pads_peek (mix->collect, &mixcol->collect);
if (buf) {
GstClockTime start_time, end_time;
@@ -678,7 +678,7 @@ gst_videomixer2_fill_queues (GstVideoMixer2 * mix,
&& start_time < GST_BUFFER_TIMESTAMP (mixcol->queued))) {
GST_WARNING_OBJECT (pad, "Buffer from the past, dropping");
gst_buffer_unref (buf);
- buf = gst_collect_pads2_pop (mix->collect, &mixcol->collect);
+ buf = gst_collect_pads_pop (mix->collect, &mixcol->collect);
gst_buffer_unref (buf);
need_more_data = TRUE;
continue;
@@ -709,7 +709,7 @@ gst_videomixer2_fill_queues (GstVideoMixer2 * mix,
gst_buffer_replace (&mixcol->queued, NULL);
} else {
gst_buffer_unref (buf);
- buf = gst_collect_pads2_pop (mix->collect, &mixcol->collect);
+ buf = gst_collect_pads_pop (mix->collect, &mixcol->collect);
gst_buffer_unref (buf);
}
@@ -726,7 +726,7 @@ gst_videomixer2_fill_queues (GstVideoMixer2 * mix,
gst_buffer_replace (&mixcol->queued, NULL);
} else {
gst_buffer_unref (buf);
- buf = gst_collect_pads2_pop (mix->collect, &mixcol->collect);
+ buf = gst_collect_pads_pop (mix->collect, &mixcol->collect);
gst_buffer_unref (buf);
}
@@ -763,7 +763,7 @@ gst_videomixer2_fill_queues (GstVideoMixer2 * mix,
gst_buffer_replace (&mixcol->queued, NULL);
} else {
gst_buffer_unref (buf);
- buf = gst_collect_pads2_pop (mix->collect, &mixcol->collect);
+ buf = gst_collect_pads_pop (mix->collect, &mixcol->collect);
gst_buffer_unref (buf);
}
eos = FALSE;
@@ -779,7 +779,7 @@ gst_videomixer2_fill_queues (GstVideoMixer2 * mix,
gst_buffer_replace (&mixcol->queued, NULL);
} else {
gst_buffer_unref (buf);
- buf = gst_collect_pads2_pop (mix->collect, &mixcol->collect);
+ buf = gst_collect_pads_pop (mix->collect, &mixcol->collect);
gst_buffer_unref (buf);
}
@@ -791,8 +791,8 @@ gst_videomixer2_fill_queues (GstVideoMixer2 * mix,
if (mixcol->end_time < output_start_time) {
gst_buffer_replace (&mixcol->buffer, NULL);
mixcol->start_time = mixcol->end_time = -1;
- if (!GST_COLLECT_PADS2_STATE_IS_SET (mixcol,
- GST_COLLECT_PADS2_STATE_EOS))
+ if (!GST_COLLECT_PADS_STATE_IS_SET (mixcol,
+ GST_COLLECT_PADS_STATE_EOS))
need_more_data = TRUE;
} else {
eos = FALSE;
@@ -923,7 +923,7 @@ gst_videomixer2_do_qos (GstVideoMixer2 * mix, GstClockTime timestamp)
}
static GstFlowReturn
-gst_videomixer2_collected (GstCollectPads2 * pads, GstVideoMixer2 * mix)
+gst_videomixer2_collected (GstCollectPads * pads, GstVideoMixer2 * mix)
{
GstFlowReturn ret;
GstClockTime output_start_time, output_end_time;
@@ -1313,12 +1313,12 @@ gst_videomixer2_src_event (GstPad * pad, GstObject * parent, GstEvent * event)
gst_pad_push_event (mix->srcpad, gst_event_new_flush_start ());
/* make sure we accept nothing anymore and return WRONG_STATE */
- gst_collect_pads2_set_flushing (mix->collect, TRUE);
+ gst_collect_pads_set_flushing (mix->collect, TRUE);
}
/* now wait for the collected to be finished and mark a new
* segment */
- GST_COLLECT_PADS2_STREAM_LOCK (mix->collect);
+ GST_COLLECT_PADS_STREAM_LOCK (mix->collect);
abs_rate = ABS (rate);
@@ -1354,7 +1354,7 @@ gst_videomixer2_src_event (GstPad * pad, GstObject * parent, GstEvent * event)
mix->newseg_pending = TRUE;
if (flags & GST_SEEK_FLAG_FLUSH) {
- gst_collect_pads2_set_flushing (mix->collect, FALSE);
+ gst_collect_pads_set_flushing (mix->collect, FALSE);
/* we can't send FLUSH_STOP here since upstream could start pushing data
* after we unlock mix->collect.
@@ -1365,7 +1365,7 @@ gst_videomixer2_src_event (GstPad * pad, GstObject * parent, GstEvent * event)
mix->flush_stop_pending = TRUE;
}
- GST_COLLECT_PADS2_STREAM_UNLOCK (mix->collect);
+ GST_COLLECT_PADS_STREAM_UNLOCK (mix->collect);
gst_videomixer2_reset_qos (mix);
@@ -1568,8 +1568,8 @@ done:
}
static GstFlowReturn
-gst_videomixer2_sink_clip (GstCollectPads2 * pads,
- GstCollectData2 * data, GstBuffer * buf, GstBuffer ** outbuf,
+gst_videomixer2_sink_clip (GstCollectPads * pads,
+ GstCollectData * data, GstBuffer * buf, GstBuffer ** outbuf,
GstVideoMixer2 * mix)
{
GstVideoMixer2Pad *pad = GST_VIDEO_MIXER2_PAD (data->pad);
@@ -1622,7 +1622,7 @@ gst_videomixer2_sink_clip (GstCollectPads2 * pads,
}
static gboolean
-gst_videomixer2_sink_event (GstCollectPads2 * pads, GstCollectData2 * cdata,
+gst_videomixer2_sink_event (GstCollectPads * pads, GstCollectData * cdata,
GstEvent * event, GstVideoMixer2 * mix)
{
GstVideoMixer2Pad *pad = GST_VIDEO_MIXER2_PAD (cdata->pad);
@@ -1631,7 +1631,6 @@ gst_videomixer2_sink_event (GstCollectPads2 * pads, GstCollectData2 * cdata,
GST_DEBUG_OBJECT (pad, "Got %s event on pad %s:%s",
GST_EVENT_TYPE_NAME (event), GST_DEBUG_PAD_NAME (pad));
- /* return FALSE => event will be forwarded */
switch (GST_EVENT_TYPE (event)) {
case GST_EVENT_CAPS:
{
@@ -1642,6 +1641,7 @@ gst_videomixer2_sink_event (GstCollectPads2 * pads, GstCollectData2 * cdata,
gst_videomixer2_pad_sink_setcaps (GST_PAD (pad), GST_OBJECT (mix),
caps);
gst_event_unref (event);
+ event = NULL;
break;
}
case GST_EVENT_SEGMENT:{
@@ -1649,9 +1649,6 @@ gst_videomixer2_sink_event (GstCollectPads2 * pads, GstCollectData2 * cdata,
gst_event_copy_segment (event, &seg);
g_assert (seg.format == GST_FORMAT_TIME);
- /* eat SEGMENT events */
- ret = TRUE;
- gst_event_unref (event);
break;
}
case GST_EVENT_FLUSH_STOP:
@@ -1666,18 +1663,14 @@ gst_videomixer2_sink_event (GstCollectPads2 * pads, GstCollectData2 * cdata,
mix->segment.position = -1;
mix->ts_offset = 0;
mix->nframes = 0;
-
- ret = gst_pad_event_default (cdata->pad, GST_OBJECT (mix), event);
- break;
- case GST_EVENT_EOS:
- gst_event_unref (event);
- ret = TRUE;
break;
default:
- ret = gst_pad_event_default (cdata->pad, GST_OBJECT (mix), event);
break;
}
+ if (event != NULL)
+ return gst_collect_pads_event_default (pads, cdata, event, FALSE);
+
return ret;
}
@@ -1728,11 +1721,11 @@ gst_videomixer2_change_state (GstElement * element, GstStateChange transition)
switch (transition) {
case GST_STATE_CHANGE_READY_TO_PAUSED:
GST_LOG_OBJECT (mix, "starting collectpads");
- gst_collect_pads2_start (mix->collect);
+ gst_collect_pads_start (mix->collect);
break;
case GST_STATE_CHANGE_PAUSED_TO_READY:
GST_LOG_OBJECT (mix, "stopping collectpads");
- gst_collect_pads2_stop (mix->collect);
+ gst_collect_pads_stop (mix->collect);
break;
default:
break;
@@ -1761,8 +1754,8 @@ gst_videomixer2_request_new_pad (GstElement * element,
mix = GST_VIDEO_MIXER2 (element);
- if (templ == gst_element_class_get_pad_template (klass, "sink_%d")) {
- gint serial = 0;
+ if (templ == gst_element_class_get_pad_template (klass, "sink_%u")) {
+ guint serial = 0;
gchar *name = NULL;
GstVideoMixer2Collect *mixcol = NULL;
@@ -1778,7 +1771,7 @@ gst_videomixer2_request_new_pad (GstElement * element,
mix->next_sinkpad = serial + 1;
}
/* create new pad with the name */
- name = g_strdup_printf ("sink_%d", serial);
+ name = g_strdup_printf ("sink_%u", serial);
mixpad = g_object_new (GST_TYPE_VIDEO_MIXER2_PAD, "name", name, "direction",
templ->direction, "template", templ, NULL);
g_free (name);
@@ -1789,9 +1782,9 @@ gst_videomixer2_request_new_pad (GstElement * element,
mixpad->alpha = DEFAULT_PAD_ALPHA;
mixcol = (GstVideoMixer2Collect *)
- gst_collect_pads2_add_pad_full (mix->collect, GST_PAD (mixpad),
+ gst_collect_pads_add_pad_full (mix->collect, GST_PAD (mixpad),
sizeof (GstVideoMixer2Collect),
- (GstCollectData2DestroyNotify) gst_videomixer2_collect_free, TRUE);
+ (GstCollectDataDestroyNotify) gst_videomixer2_collect_free, TRUE);
/* Keep track of each other */
mixcol->mixpad = mixpad;
@@ -1843,7 +1836,7 @@ gst_videomixer2_release_pad (GstElement * element, GstPad * pad)
update_caps = GST_VIDEO_INFO_FORMAT (&mix->info) != GST_VIDEO_FORMAT_UNKNOWN;
GST_VIDEO_MIXER2_UNLOCK (mix);
- gst_collect_pads2_remove_pad (mix->collect, pad);
+ gst_collect_pads_remove_pad (mix->collect, pad);
if (update_caps)
gst_videomixer2_update_src_caps (mix);
@@ -1988,16 +1981,16 @@ gst_videomixer2_init (GstVideoMixer2 * mix)
GST_DEBUG_FUNCPTR (gst_videomixer2_src_event));
gst_element_add_pad (GST_ELEMENT (mix), mix->srcpad);
- mix->collect = gst_collect_pads2_new ();
+ mix->collect = gst_collect_pads_new ();
mix->background = DEFAULT_BACKGROUND;
- gst_collect_pads2_set_function (mix->collect,
- (GstCollectPads2Function) GST_DEBUG_FUNCPTR (gst_videomixer2_collected),
+ gst_collect_pads_set_function (mix->collect,
+ (GstCollectPadsFunction) GST_DEBUG_FUNCPTR (gst_videomixer2_collected),
mix);
- gst_collect_pads2_set_event_function (mix->collect,
- (GstCollectPads2EventFunction) gst_videomixer2_sink_event, mix);
- gst_collect_pads2_set_clip_function (mix->collect,
- (GstCollectPads2ClipFunction) gst_videomixer2_sink_clip, mix);
+ gst_collect_pads_set_event_function (mix->collect,
+ (GstCollectPadsEventFunction) gst_videomixer2_sink_event, mix);
+ gst_collect_pads_set_clip_function (mix->collect,
+ (GstCollectPadsClipFunction) gst_videomixer2_sink_clip, mix);
g_mutex_init (&mix->lock);
/* initialize variables */
diff --git a/gst/videomixer/videomixer2.h b/gst/videomixer/videomixer2.h
index 02f7d11ebcfb99d284a9337fd0cbf491e4be319b..bc547fe21009f3957dbe5a07321178945963e170 100644
--- a/gst/videomixer/videomixer2.h
+++ b/gst/videomixer/videomixer2.h
@@ -25,7 +25,7 @@
#include <gst/video/video.h>
#include "blend.h"
-#include <gst/base/gstcollectpads2.h>
+#include <gst/base/gstcollectpads.h>
G_BEGIN_DECLS
@@ -77,13 +77,13 @@ struct _GstVideoMixer2
/* Lock to prevent the state to change while blending */
GMutex lock;
/* Sink pads using Collect Pads 2*/
- GstCollectPads2 *collect;
+ GstCollectPads *collect;
/* sinkpads, a GSList of GstVideoMixer2Pads */
GSList *sinkpads;
gint numpads;
/* Next available sinkpad index */
- gint next_sinkpad;
+ guint next_sinkpad;
/* Output caps */
GstVideoInfo info;
diff --git a/gst/videomixer/videomixer2pad.h b/gst/videomixer/videomixer2pad.h
index d77519ceb961bd68b0346ddc3a1ed4603976f53e..cd344200040fb549e928ed74481ef6e8efd6b97e 100644
--- a/gst/videomixer/videomixer2pad.h
+++ b/gst/videomixer/videomixer2pad.h
@@ -24,7 +24,7 @@
#include <gst/gst.h>
#include <gst/video/video.h>
-#include <gst/base/gstcollectpads2.h>
+#include <gst/base/gstcollectpads.h>
G_BEGIN_DECLS
diff --git a/gst/wavenc/Makefile.in b/gst/wavenc/Makefile.in
index 6d71157d7cf52fc9af8e6310c99f37a6a2f0ab0d..79fb86781134a77f19327d390dadc8a045fae048 100644
--- a/gst/wavenc/Makefile.in
+++ b/gst/wavenc/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.11.4 from Makefile.am.
+# Makefile.in generated by automake 1.11.5 from Makefile.am.
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -60,6 +60,7 @@ am__aclocal_m4_deps = $(top_srcdir)/common/m4/as-ac-expand.m4 \
$(top_srcdir)/common/m4/as-auto-alt.m4 \
$(top_srcdir)/common/m4/as-compiler-flag.m4 \
$(top_srcdir)/common/m4/as-gcc-inline-assembly.m4 \
+ $(top_srcdir)/common/m4/as-libtool.m4 \
$(top_srcdir)/common/m4/as-objc.m4 \
$(top_srcdir)/common/m4/as-python.m4 \
$(top_srcdir)/common/m4/as-scrub-include.m4 \
@@ -255,6 +256,7 @@ GMSGFMT_015 = @GMSGFMT_015@
GREP = @GREP@
GSTPB_PLUGINS_DIR = @GSTPB_PLUGINS_DIR@
GSTPB_PREFIX = @GSTPB_PREFIX@
+GST_AGE = @GST_AGE@
GST_ALL_LDFLAGS = @GST_ALL_LDFLAGS@
GST_API_VERSION = @GST_API_VERSION@
GST_BASE_CFLAGS = @GST_BASE_CFLAGS@
@@ -264,9 +266,11 @@ GST_CHECK_CFLAGS = @GST_CHECK_CFLAGS@
GST_CHECK_LIBS = @GST_CHECK_LIBS@
GST_CONTROLLER_CFLAGS = @GST_CONTROLLER_CFLAGS@
GST_CONTROLLER_LIBS = @GST_CONTROLLER_LIBS@
+GST_CURRENT = @GST_CURRENT@
GST_CXXFLAGS = @GST_CXXFLAGS@
GST_LEVEL_DEFAULT = @GST_LEVEL_DEFAULT@
GST_LIBS = @GST_LIBS@
+GST_LIBVERSION = @GST_LIBVERSION@
GST_LICENSE = @GST_LICENSE@
GST_LT_LDFLAGS = @GST_LT_LDFLAGS@
GST_NET_CFLAGS = @GST_NET_CFLAGS@
@@ -284,6 +288,7 @@ GST_PLUGINS_NONPORTED = @GST_PLUGINS_NONPORTED@
GST_PLUGINS_SELECTED = @GST_PLUGINS_SELECTED@
GST_PLUGIN_LDFLAGS = @GST_PLUGIN_LDFLAGS@
GST_PREFIX = @GST_PREFIX@
+GST_REVISION = @GST_REVISION@
GST_TOOLS_DIR = @GST_TOOLS_DIR@
GTKDOC_CHECK = @GTKDOC_CHECK@
GTK_CFLAGS = @GTK_CFLAGS@
@@ -542,7 +547,7 @@ install-pluginLTLIBRARIES: $(plugin_LTLIBRARIES)
done; \
test -z "$$list2" || { \
echo " $(MKDIR_P) '$(DESTDIR)$(plugindir)'"; \
- $(MKDIR_P) '$(DESTDIR)$(plugindir)' || exit 1; \
+ $(MKDIR_P) "$(DESTDIR)$(plugindir)" || exit 1; \
echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 '$(DESTDIR)$(plugindir)'"; \
$(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 "$(DESTDIR)$(plugindir)"; \
}
diff --git a/gst/wavparse/Makefile.in b/gst/wavparse/Makefile.in
index 6faae3b70ef11084096aa1832fbdbefc73016020..2e0ae34118345be2568603f7ac4f2d96147ef9c2 100644
--- a/gst/wavparse/Makefile.in
+++ b/gst/wavparse/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.11.4 from Makefile.am.
+# Makefile.in generated by automake 1.11.5 from Makefile.am.
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -60,6 +60,7 @@ am__aclocal_m4_deps = $(top_srcdir)/common/m4/as-ac-expand.m4 \
$(top_srcdir)/common/m4/as-auto-alt.m4 \
$(top_srcdir)/common/m4/as-compiler-flag.m4 \
$(top_srcdir)/common/m4/as-gcc-inline-assembly.m4 \
+ $(top_srcdir)/common/m4/as-libtool.m4 \
$(top_srcdir)/common/m4/as-objc.m4 \
$(top_srcdir)/common/m4/as-python.m4 \
$(top_srcdir)/common/m4/as-scrub-include.m4 \
@@ -256,6 +257,7 @@ GMSGFMT_015 = @GMSGFMT_015@
GREP = @GREP@
GSTPB_PLUGINS_DIR = @GSTPB_PLUGINS_DIR@
GSTPB_PREFIX = @GSTPB_PREFIX@
+GST_AGE = @GST_AGE@
GST_ALL_LDFLAGS = @GST_ALL_LDFLAGS@
GST_API_VERSION = @GST_API_VERSION@
GST_BASE_CFLAGS = @GST_BASE_CFLAGS@
@@ -265,9 +267,11 @@ GST_CHECK_CFLAGS = @GST_CHECK_CFLAGS@
GST_CHECK_LIBS = @GST_CHECK_LIBS@
GST_CONTROLLER_CFLAGS = @GST_CONTROLLER_CFLAGS@
GST_CONTROLLER_LIBS = @GST_CONTROLLER_LIBS@
+GST_CURRENT = @GST_CURRENT@
GST_CXXFLAGS = @GST_CXXFLAGS@
GST_LEVEL_DEFAULT = @GST_LEVEL_DEFAULT@
GST_LIBS = @GST_LIBS@
+GST_LIBVERSION = @GST_LIBVERSION@
GST_LICENSE = @GST_LICENSE@
GST_LT_LDFLAGS = @GST_LT_LDFLAGS@
GST_NET_CFLAGS = @GST_NET_CFLAGS@
@@ -285,6 +289,7 @@ GST_PLUGINS_NONPORTED = @GST_PLUGINS_NONPORTED@
GST_PLUGINS_SELECTED = @GST_PLUGINS_SELECTED@
GST_PLUGIN_LDFLAGS = @GST_PLUGIN_LDFLAGS@
GST_PREFIX = @GST_PREFIX@
+GST_REVISION = @GST_REVISION@
GST_TOOLS_DIR = @GST_TOOLS_DIR@
GTKDOC_CHECK = @GTKDOC_CHECK@
GTK_CFLAGS = @GTK_CFLAGS@
@@ -547,7 +552,7 @@ install-pluginLTLIBRARIES: $(plugin_LTLIBRARIES)
done; \
test -z "$$list2" || { \
echo " $(MKDIR_P) '$(DESTDIR)$(plugindir)'"; \
- $(MKDIR_P) '$(DESTDIR)$(plugindir)' || exit 1; \
+ $(MKDIR_P) "$(DESTDIR)$(plugindir)" || exit 1; \
echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 '$(DESTDIR)$(plugindir)'"; \
$(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 "$(DESTDIR)$(plugindir)"; \
}
diff --git a/gst/y4m/Makefile.in b/gst/y4m/Makefile.in
index 8cbd982dc9f2c2e7c393b9ba0ea46ed3e1f0e5dd..9ae05b2168f3896c24397aa3759cf0a517c6dff1 100644
--- a/gst/y4m/Makefile.in
+++ b/gst/y4m/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.11.4 from Makefile.am.
+# Makefile.in generated by automake 1.11.5 from Makefile.am.
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -60,6 +60,7 @@ am__aclocal_m4_deps = $(top_srcdir)/common/m4/as-ac-expand.m4 \
$(top_srcdir)/common/m4/as-auto-alt.m4 \
$(top_srcdir)/common/m4/as-compiler-flag.m4 \
$(top_srcdir)/common/m4/as-gcc-inline-assembly.m4 \
+ $(top_srcdir)/common/m4/as-libtool.m4 \
$(top_srcdir)/common/m4/as-objc.m4 \
$(top_srcdir)/common/m4/as-python.m4 \
$(top_srcdir)/common/m4/as-scrub-include.m4 \
@@ -254,6 +255,7 @@ GMSGFMT_015 = @GMSGFMT_015@
GREP = @GREP@
GSTPB_PLUGINS_DIR = @GSTPB_PLUGINS_DIR@
GSTPB_PREFIX = @GSTPB_PREFIX@
+GST_AGE = @GST_AGE@
GST_ALL_LDFLAGS = @GST_ALL_LDFLAGS@
GST_API_VERSION = @GST_API_VERSION@
GST_BASE_CFLAGS = @GST_BASE_CFLAGS@
@@ -263,9 +265,11 @@ GST_CHECK_CFLAGS = @GST_CHECK_CFLAGS@
GST_CHECK_LIBS = @GST_CHECK_LIBS@
GST_CONTROLLER_CFLAGS = @GST_CONTROLLER_CFLAGS@
GST_CONTROLLER_LIBS = @GST_CONTROLLER_LIBS@
+GST_CURRENT = @GST_CURRENT@
GST_CXXFLAGS = @GST_CXXFLAGS@
GST_LEVEL_DEFAULT = @GST_LEVEL_DEFAULT@
GST_LIBS = @GST_LIBS@
+GST_LIBVERSION = @GST_LIBVERSION@
GST_LICENSE = @GST_LICENSE@
GST_LT_LDFLAGS = @GST_LT_LDFLAGS@
GST_NET_CFLAGS = @GST_NET_CFLAGS@
@@ -283,6 +287,7 @@ GST_PLUGINS_NONPORTED = @GST_PLUGINS_NONPORTED@
GST_PLUGINS_SELECTED = @GST_PLUGINS_SELECTED@
GST_PLUGIN_LDFLAGS = @GST_PLUGIN_LDFLAGS@
GST_PREFIX = @GST_PREFIX@
+GST_REVISION = @GST_REVISION@
GST_TOOLS_DIR = @GST_TOOLS_DIR@
GTKDOC_CHECK = @GTKDOC_CHECK@
GTK_CFLAGS = @GTK_CFLAGS@
@@ -533,7 +538,7 @@ install-pluginLTLIBRARIES: $(plugin_LTLIBRARIES)
done; \
test -z "$$list2" || { \
echo " $(MKDIR_P) '$(DESTDIR)$(plugindir)'"; \
- $(MKDIR_P) '$(DESTDIR)$(plugindir)' || exit 1; \
+ $(MKDIR_P) "$(DESTDIR)$(plugindir)" || exit 1; \
echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 '$(DESTDIR)$(plugindir)'"; \
$(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 "$(DESTDIR)$(plugindir)"; \
}
diff --git a/gst/y4m/gsty4mencode.c b/gst/y4m/gsty4mencode.c
index 2597a9ea39be32d9697097c4b862877b325ab05f..310ee0828b6567b0bf5d483579515761a0307b45 100644
--- a/gst/y4m/gsty4mencode.c
+++ b/gst/y4m/gsty4mencode.c
@@ -220,7 +220,7 @@ gst_y4m_encode_get_stream_header (GstY4mEncode * filter, gboolean tff)
gchar interlaced;
gsize len;
- if (filter->info.flags & GST_VIDEO_FLAG_INTERLACED) {
+ if (GST_VIDEO_INFO_IS_INTERLACED (&filter->info)) {
if (tff)
interlaced = 't';
else
@@ -278,7 +278,7 @@ gst_y4m_encode_chain (GstPad * pad, GstObject * parent, GstBuffer * buf)
if (G_UNLIKELY (!filter->header)) {
gboolean tff;
- if (filter->info.flags & GST_VIDEO_FLAG_INTERLACED) {
+ if (GST_VIDEO_INFO_IS_INTERLACED (&filter->info)) {
tff = GST_BUFFER_FLAG_IS_SET (buf, GST_VIDEO_BUFFER_FLAG_TFF);
}
outbuf = gst_y4m_encode_get_stream_header (filter, tff);
diff --git a/m4/Makefile.in b/m4/Makefile.in
index a0a49f98ced14d7d778d88f32640fba9c32ea5b3..97543633c756cb0632edd43efe1e9f70658a7c6f 100644
--- a/m4/Makefile.in
+++ b/m4/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.11.4 from Makefile.am.
+# Makefile.in generated by automake 1.11.5 from Makefile.am.
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -57,6 +57,7 @@ am__aclocal_m4_deps = $(top_srcdir)/common/m4/as-ac-expand.m4 \
$(top_srcdir)/common/m4/as-auto-alt.m4 \
$(top_srcdir)/common/m4/as-compiler-flag.m4 \
$(top_srcdir)/common/m4/as-gcc-inline-assembly.m4 \
+ $(top_srcdir)/common/m4/as-libtool.m4 \
$(top_srcdir)/common/m4/as-objc.m4 \
$(top_srcdir)/common/m4/as-python.m4 \
$(top_srcdir)/common/m4/as-scrub-include.m4 \
@@ -188,6 +189,7 @@ GMSGFMT_015 = @GMSGFMT_015@
GREP = @GREP@
GSTPB_PLUGINS_DIR = @GSTPB_PLUGINS_DIR@
GSTPB_PREFIX = @GSTPB_PREFIX@
+GST_AGE = @GST_AGE@
GST_ALL_LDFLAGS = @GST_ALL_LDFLAGS@
GST_API_VERSION = @GST_API_VERSION@
GST_BASE_CFLAGS = @GST_BASE_CFLAGS@
@@ -197,9 +199,11 @@ GST_CHECK_CFLAGS = @GST_CHECK_CFLAGS@
GST_CHECK_LIBS = @GST_CHECK_LIBS@
GST_CONTROLLER_CFLAGS = @GST_CONTROLLER_CFLAGS@
GST_CONTROLLER_LIBS = @GST_CONTROLLER_LIBS@
+GST_CURRENT = @GST_CURRENT@
GST_CXXFLAGS = @GST_CXXFLAGS@
GST_LEVEL_DEFAULT = @GST_LEVEL_DEFAULT@
GST_LIBS = @GST_LIBS@
+GST_LIBVERSION = @GST_LIBVERSION@
GST_LICENSE = @GST_LICENSE@
GST_LT_LDFLAGS = @GST_LT_LDFLAGS@
GST_NET_CFLAGS = @GST_NET_CFLAGS@
@@ -217,6 +221,7 @@ GST_PLUGINS_NONPORTED = @GST_PLUGINS_NONPORTED@
GST_PLUGINS_SELECTED = @GST_PLUGINS_SELECTED@
GST_PLUGIN_LDFLAGS = @GST_PLUGIN_LDFLAGS@
GST_PREFIX = @GST_PREFIX@
+GST_REVISION = @GST_REVISION@
GST_TOOLS_DIR = @GST_TOOLS_DIR@
GTKDOC_CHECK = @GTKDOC_CHECK@
GTK_CFLAGS = @GTK_CFLAGS@
diff --git a/pkgconfig/Makefile.in b/pkgconfig/Makefile.in
index d75d64d4adb18bcc776ae56a01eca0a69a8a7971..ce401c29d64cd60bb01eaae3e3edda6344097a37 100644
--- a/pkgconfig/Makefile.in
+++ b/pkgconfig/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.11.4 from Makefile.am.
+# Makefile.in generated by automake 1.11.5 from Makefile.am.
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -58,6 +58,7 @@ am__aclocal_m4_deps = $(top_srcdir)/common/m4/as-ac-expand.m4 \
$(top_srcdir)/common/m4/as-auto-alt.m4 \
$(top_srcdir)/common/m4/as-compiler-flag.m4 \
$(top_srcdir)/common/m4/as-gcc-inline-assembly.m4 \
+ $(top_srcdir)/common/m4/as-libtool.m4 \
$(top_srcdir)/common/m4/as-objc.m4 \
$(top_srcdir)/common/m4/as-python.m4 \
$(top_srcdir)/common/m4/as-scrub-include.m4 \
@@ -189,6 +190,7 @@ GMSGFMT_015 = @GMSGFMT_015@
GREP = @GREP@
GSTPB_PLUGINS_DIR = @GSTPB_PLUGINS_DIR@
GSTPB_PREFIX = @GSTPB_PREFIX@
+GST_AGE = @GST_AGE@
GST_ALL_LDFLAGS = @GST_ALL_LDFLAGS@
GST_API_VERSION = @GST_API_VERSION@
GST_BASE_CFLAGS = @GST_BASE_CFLAGS@
@@ -198,9 +200,11 @@ GST_CHECK_CFLAGS = @GST_CHECK_CFLAGS@
GST_CHECK_LIBS = @GST_CHECK_LIBS@
GST_CONTROLLER_CFLAGS = @GST_CONTROLLER_CFLAGS@
GST_CONTROLLER_LIBS = @GST_CONTROLLER_LIBS@
+GST_CURRENT = @GST_CURRENT@
GST_CXXFLAGS = @GST_CXXFLAGS@
GST_LEVEL_DEFAULT = @GST_LEVEL_DEFAULT@
GST_LIBS = @GST_LIBS@
+GST_LIBVERSION = @GST_LIBVERSION@
GST_LICENSE = @GST_LICENSE@
GST_LT_LDFLAGS = @GST_LT_LDFLAGS@
GST_NET_CFLAGS = @GST_NET_CFLAGS@
@@ -218,6 +222,7 @@ GST_PLUGINS_NONPORTED = @GST_PLUGINS_NONPORTED@
GST_PLUGINS_SELECTED = @GST_PLUGINS_SELECTED@
GST_PLUGIN_LDFLAGS = @GST_PLUGIN_LDFLAGS@
GST_PREFIX = @GST_PREFIX@
+GST_REVISION = @GST_REVISION@
GST_TOOLS_DIR = @GST_TOOLS_DIR@
GTKDOC_CHECK = @GTKDOC_CHECK@
GTK_CFLAGS = @GTK_CFLAGS@
diff --git a/po/POTFILES.in b/po/POTFILES.in
index 5e0ccd2d8a4214ead727e3c50f7d1d526247336a..ae3438c302edf0971cd398248c15d90197132034 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -10,11 +10,8 @@ gst/avi/gstavimux.c
gst/isomp4/qtdemux.c
gst/rtsp/gstrtspsrc.c
gst/wavparse/gstwavparse.c
-sys/oss/gstossmixer.c
-sys/oss/gstossmixertrack.c
sys/oss/gstosssink.c
sys/oss/gstosssrc.c
-sys/oss4/oss4-mixer.c
sys/oss4/oss4-sink.c
sys/oss4/oss4-source.c
sys/sunaudio/gstsunaudiomixertrack.c
diff --git a/po/af.gmo b/po/af.gmo
index 56d775a8734a7ce7fbab60472803d7b033e375cf..245d18789c9d3f986028ae52a16a63c0e11da1e0 100644
Binary files a/po/af.gmo and b/po/af.gmo differ
diff --git a/po/af.po b/po/af.po
index c24f68330563831f295ea80f9307fbcbf0d7ff55..6880951ed9c588dc5489137d876f0f6f1d715e3c 100644
--- a/po/af.po
+++ b/po/af.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: gst-plugins 0.7.6\n"
"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/\n"
-"POT-Creation-Date: 2012-04-12 10:26+0200\n"
+"POT-Creation-Date: 2012-05-13 16:29+0200\n"
"PO-Revision-Date: 2004-03-18 14:16+0200\n"
"Last-Translator: Petri Jooste <rkwjpj@puk.ac.za>\n"
"Language-Team: Afrikaans <i18n@af.org.za>\n"
@@ -94,81 +94,6 @@ msgstr ""
msgid "Internal data flow error."
msgstr ""
-msgid "Volume"
-msgstr "Volume"
-
-msgid "Bass"
-msgstr "Bas"
-
-msgid "Treble"
-msgstr "Treble"
-
-msgid "Synth"
-msgstr "Sintetiseerder"
-
-msgid "PCM"
-msgstr "PCM"
-
-msgid "Speaker"
-msgstr "Luidspreker"
-
-msgid "Line-in"
-msgstr "Lyn-in"
-
-msgid "Microphone"
-msgstr "Mikrofoon"
-
-msgid "CD"
-msgstr "CD"
-
-msgid "Mixer"
-msgstr "Menger"
-
-msgid "PCM-2"
-msgstr "PCM-2"
-
-msgid "Record"
-msgstr "Neem op"
-
-msgid "In-gain"
-msgstr "In-versterking"
-
-msgid "Out-gain"
-msgstr "Uit-versterking"
-
-msgid "Line-1"
-msgstr "Lyn-1"
-
-msgid "Line-2"
-msgstr "Lyn-2"
-
-msgid "Line-3"
-msgstr "Lyn-3"
-
-msgid "Digital-1"
-msgstr "Digitaal-1"
-
-msgid "Digital-2"
-msgstr "Digitaal-2"
-
-msgid "Digital-3"
-msgstr "Digitaal-3"
-
-msgid "Phone-in"
-msgstr "Telefoon-in"
-
-msgid "Phone-out"
-msgstr "Telefoon-uit"
-
-msgid "Video"
-msgstr "Video"
-
-msgid "Radio"
-msgstr "Radio"
-
-msgid "Monitor"
-msgstr "Monitor"
-
msgid ""
"Could not open audio device for playback. Device is being used by another "
"application."
@@ -192,349 +117,49 @@ msgstr ""
msgid "Could not open audio device for recording."
msgstr "Kon nie CD-toestel oopmaak om te lees nie."
-#, fuzzy
-msgid "Could not open audio device for mixer control handling."
-msgstr "Kon nie oudio-toestel \"%s\" oopmaak vir skryf nie."
-
msgid ""
-"Could not open audio device for mixer control handling. This version of the "
-"Open Sound System is not supported by this element."
+"Could not open audio device for playback. This version of the Open Sound "
+"System is not supported by this element."
msgstr ""
-msgid "Master"
+msgid "Playback is not supported by this audio device."
msgstr ""
-msgid "Front"
+msgid "Audio playback error."
msgstr ""
-#, fuzzy
-msgid "Rear"
-msgstr "Neem op"
-
-msgid "Headphones"
+msgid "Recording is not supported by this audio device."
msgstr ""
-msgid "Center"
+msgid "Error recording from audio device."
msgstr ""
-msgid "LFE"
-msgstr ""
+msgid "Volume"
+msgstr "Volume"
-msgid "Surround"
+msgid "Gain"
msgstr ""
-#, fuzzy
-msgid "Side"
-msgstr "Video"
+msgid "Monitor"
+msgstr "Monitor"
#, fuzzy
msgid "Built-in Speaker"
msgstr "Luidspreker"
-msgid "AUX 1 Out"
-msgstr ""
-
-msgid "AUX 2 Out"
-msgstr ""
-
-msgid "AUX Out"
-msgstr ""
-
-msgid "3D Depth"
-msgstr ""
-
-msgid "3D Center"
-msgstr ""
-
-msgid "3D Enhance"
-msgstr ""
-
-msgid "Telephone"
+msgid "Headphone"
msgstr ""
msgid "Line Out"
msgstr ""
-#, fuzzy
-msgid "Line In"
-msgstr "Lyn-in"
-
-msgid "Internal CD"
-msgstr ""
-
-#, fuzzy
-msgid "Video In"
-msgstr "Video"
-
-msgid "AUX 1 In"
-msgstr ""
-
-msgid "AUX 2 In"
-msgstr ""
-
-msgid "AUX In"
-msgstr ""
-
-#, fuzzy
-msgid "Record Gain"
-msgstr "Neem op"
-
-#, fuzzy
-msgid "Output Gain"
-msgstr "Uit-versterking"
-
-#, fuzzy
-msgid "Microphone Boost"
-msgstr "Mikrofoon"
-
-msgid "Loopback"
-msgstr ""
-
-msgid "Diagnostic"
-msgstr ""
-
-msgid "Bass Boost"
-msgstr ""
-
-msgid "Playback Ports"
-msgstr ""
-
-msgid "Input"
-msgstr ""
-
-#, fuzzy
-msgid "Record Source"
-msgstr "Neem op"
-
-#, fuzzy
-msgid "Monitor Source"
-msgstr "Monitor"
-
-msgid "Keyboard Beep"
-msgstr ""
-
-msgid "Simulate Stereo"
-msgstr ""
-
-msgid "Stereo"
-msgstr ""
-
-msgid "Surround Sound"
-msgstr ""
-
-#, fuzzy
-msgid "Microphone Gain"
-msgstr "Mikrofoon"
-
-#, fuzzy
-msgid "Speaker Source"
-msgstr "Luidspreker"
-
-#, fuzzy
-msgid "Microphone Source"
-msgstr "Mikrofoon"
-
-msgid "Jack"
-msgstr ""
-
-msgid "Center / LFE"
-msgstr ""
-
-msgid "Stereo Mix"
-msgstr ""
-
-msgid "Mono Mix"
-msgstr ""
-
-msgid "Input Mix"
-msgstr ""
-
-msgid "SPDIF In"
-msgstr ""
-
msgid "SPDIF Out"
msgstr ""
-#, fuzzy
-msgid "Microphone 1"
-msgstr "Mikrofoon"
-
-#, fuzzy
-msgid "Microphone 2"
-msgstr "Mikrofoon"
-
-#, fuzzy
-msgid "Digital Out"
-msgstr "Digitaal-1"
-
-#, fuzzy
-msgid "Digital In"
-msgstr "Digitaal-1"
-
-msgid "HDMI"
-msgstr ""
-
-msgid "Modem"
-msgstr ""
-
-msgid "Handset"
-msgstr ""
-
-msgid "Other"
-msgstr ""
-
-msgid "None"
-msgstr ""
-
-msgid "On"
-msgstr ""
-
-msgid "Off"
-msgstr ""
-
-msgid "Mute"
-msgstr ""
-
-msgid "Fast"
-msgstr ""
-
-#. TRANSLATORS: "Very Low" is a quality setting here
-msgid "Very Low"
-msgstr ""
-
-#. TRANSLATORS: "Low" is a quality setting here
-msgid "Low"
-msgstr ""
-
-#. TRANSLATORS: "Medium" is a quality setting here
-msgid "Medium"
-msgstr ""
-
-#. TRANSLATORS: "High" is a quality setting here
-msgid "High"
-msgstr ""
-
-#. TRANSLATORS: "Very High" is a quality setting here
-msgid "Very High"
-msgstr ""
-
-#. TRANSLATORS: "Production" is a quality setting here
-msgid "Production"
-msgstr ""
-
-#, fuzzy
-msgid "Front Panel Microphone"
-msgstr "Mikrofoon"
-
-msgid "Front Panel Line In"
-msgstr ""
-
-msgid "Front Panel Headphones"
-msgstr ""
-
-msgid "Front Panel Line Out"
-msgstr ""
-
-msgid "Green Connector"
-msgstr ""
-
-msgid "Pink Connector"
-msgstr ""
-
-msgid "Blue Connector"
-msgstr ""
-
-msgid "White Connector"
-msgstr ""
-
-msgid "Black Connector"
-msgstr ""
-
-msgid "Gray Connector"
-msgstr ""
-
-msgid "Orange Connector"
-msgstr ""
-
-msgid "Red Connector"
-msgstr ""
-
-msgid "Yellow Connector"
-msgstr ""
-
-msgid "Green Front Panel Connector"
-msgstr ""
-
-msgid "Pink Front Panel Connector"
-msgstr ""
-
-msgid "Blue Front Panel Connector"
-msgstr ""
-
-msgid "White Front Panel Connector"
-msgstr ""
-
-msgid "Black Front Panel Connector"
-msgstr ""
-
-msgid "Gray Front Panel Connector"
-msgstr ""
-
-msgid "Orange Front Panel Connector"
-msgstr ""
-
-msgid "Red Front Panel Connector"
-msgstr ""
-
-msgid "Yellow Front Panel Connector"
-msgstr ""
-
-msgid "Spread Output"
-msgstr ""
-
-msgid "Downmix"
-msgstr ""
-
-msgid "Virtual Mixer Input"
-msgstr ""
-
-msgid "Virtual Mixer Output"
-msgstr ""
-
-msgid "Virtual Mixer Channels"
-msgstr ""
-
-#. TRANSLATORS: name + number of a volume mixer control
-#, c-format
-msgid "%s %d Function"
-msgstr ""
-
-#. TRANSLATORS: name of a volume mixer control
-#, c-format
-msgid "%s Function"
-msgstr ""
-
-msgid ""
-"Could not open audio device for playback. This version of the Open Sound "
-"System is not supported by this element."
-msgstr ""
-
-msgid "Playback is not supported by this audio device."
-msgstr ""
-
-msgid "Audio playback error."
-msgstr ""
-
-msgid "Recording is not supported by this audio device."
-msgstr ""
-
-msgid "Error recording from audio device."
-msgstr ""
-
-msgid "Gain"
+msgid "AUX 1 Out"
msgstr ""
-msgid "Headphone"
+msgid "AUX 2 Out"
msgstr ""
#, fuzzy, c-format
@@ -704,6 +329,147 @@ msgstr ""
msgid "Cannot operate without a clock"
msgstr ""
+#~ msgid "Bass"
+#~ msgstr "Bas"
+
+#~ msgid "Treble"
+#~ msgstr "Treble"
+
+#~ msgid "Synth"
+#~ msgstr "Sintetiseerder"
+
+#~ msgid "PCM"
+#~ msgstr "PCM"
+
+#~ msgid "Speaker"
+#~ msgstr "Luidspreker"
+
+#~ msgid "Line-in"
+#~ msgstr "Lyn-in"
+
+#~ msgid "Microphone"
+#~ msgstr "Mikrofoon"
+
+#~ msgid "CD"
+#~ msgstr "CD"
+
+#~ msgid "Mixer"
+#~ msgstr "Menger"
+
+#~ msgid "PCM-2"
+#~ msgstr "PCM-2"
+
+#~ msgid "Record"
+#~ msgstr "Neem op"
+
+#~ msgid "In-gain"
+#~ msgstr "In-versterking"
+
+#~ msgid "Out-gain"
+#~ msgstr "Uit-versterking"
+
+#~ msgid "Line-1"
+#~ msgstr "Lyn-1"
+
+#~ msgid "Line-2"
+#~ msgstr "Lyn-2"
+
+#~ msgid "Line-3"
+#~ msgstr "Lyn-3"
+
+#~ msgid "Digital-1"
+#~ msgstr "Digitaal-1"
+
+#~ msgid "Digital-2"
+#~ msgstr "Digitaal-2"
+
+#~ msgid "Digital-3"
+#~ msgstr "Digitaal-3"
+
+#~ msgid "Phone-in"
+#~ msgstr "Telefoon-in"
+
+#~ msgid "Phone-out"
+#~ msgstr "Telefoon-uit"
+
+#~ msgid "Video"
+#~ msgstr "Video"
+
+#~ msgid "Radio"
+#~ msgstr "Radio"
+
+#, fuzzy
+#~ msgid "Could not open audio device for mixer control handling."
+#~ msgstr "Kon nie oudio-toestel \"%s\" oopmaak vir skryf nie."
+
+#, fuzzy
+#~ msgid "Rear"
+#~ msgstr "Neem op"
+
+#, fuzzy
+#~ msgid "Side"
+#~ msgstr "Video"
+
+#, fuzzy
+#~ msgid "Line In"
+#~ msgstr "Lyn-in"
+
+#, fuzzy
+#~ msgid "Video In"
+#~ msgstr "Video"
+
+#, fuzzy
+#~ msgid "Record Gain"
+#~ msgstr "Neem op"
+
+#, fuzzy
+#~ msgid "Output Gain"
+#~ msgstr "Uit-versterking"
+
+#, fuzzy
+#~ msgid "Microphone Boost"
+#~ msgstr "Mikrofoon"
+
+#, fuzzy
+#~ msgid "Record Source"
+#~ msgstr "Neem op"
+
+#, fuzzy
+#~ msgid "Monitor Source"
+#~ msgstr "Monitor"
+
+#, fuzzy
+#~ msgid "Microphone Gain"
+#~ msgstr "Mikrofoon"
+
+#, fuzzy
+#~ msgid "Speaker Source"
+#~ msgstr "Luidspreker"
+
+#, fuzzy
+#~ msgid "Microphone Source"
+#~ msgstr "Mikrofoon"
+
+#, fuzzy
+#~ msgid "Microphone 1"
+#~ msgstr "Mikrofoon"
+
+#, fuzzy
+#~ msgid "Microphone 2"
+#~ msgstr "Mikrofoon"
+
+#, fuzzy
+#~ msgid "Digital Out"
+#~ msgstr "Digitaal-1"
+
+#, fuzzy
+#~ msgid "Digital In"
+#~ msgstr "Digitaal-1"
+
+#, fuzzy
+#~ msgid "Front Panel Microphone"
+#~ msgstr "Mikrofoon"
+
#, fuzzy
#~ msgid "Could not enqueue buffers in device '%s'."
#~ msgstr "Kon nie buffers vanaf toestel \"%s\" verkry nie."
diff --git a/po/az.gmo b/po/az.gmo
index 86ea70aeae8f2bbf27c9a8e92c1bbe3c648fae5d..414190e866dd241be7f720d1f206f0e91019ea3a 100644
Binary files a/po/az.gmo and b/po/az.gmo differ
diff --git a/po/az.po b/po/az.po
index f6b72afd790107b7da84641cf9d28d1c4f7341ba..dcf156f11460111f00366a7f3bee2a4fbdff7ea7 100644
--- a/po/az.po
+++ b/po/az.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: gst-plugins-0.8.0\n"
"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/\n"
-"POT-Creation-Date: 2012-04-12 10:26+0200\n"
+"POT-Creation-Date: 2012-05-13 16:29+0200\n"
"PO-Revision-Date: 2004-03-19 18:29+0200\n"
"Last-Translator: Metin Amiroff <metin@karegen.com>\n"
"Language-Team: Azerbaijani <translation-team-az@lists.sourceforge.net>\n"
@@ -95,81 +95,6 @@ msgstr ""
msgid "Internal data flow error."
msgstr ""
-msgid "Volume"
-msgstr "Səs"
-
-msgid "Bass"
-msgstr "Bas"
-
-msgid "Treble"
-msgstr "Ä°ncÉ™"
-
-msgid "Synth"
-msgstr "Sint"
-
-msgid "PCM"
-msgstr "PCM"
-
-msgid "Speaker"
-msgstr "Spiker"
-
-msgid "Line-in"
-msgstr "Xətd-giriş"
-
-msgid "Microphone"
-msgstr "Mikrofon"
-
-msgid "CD"
-msgstr "CD"
-
-msgid "Mixer"
-msgstr "Mikser"
-
-msgid "PCM-2"
-msgstr "PCM-2"
-
-msgid "Record"
-msgstr "Qeyd"
-
-msgid "In-gain"
-msgstr "GiriÅŸ-gain"
-
-msgid "Out-gain"
-msgstr "Çıxış-gain"
-
-msgid "Line-1"
-msgstr "Xətd-1"
-
-msgid "Line-2"
-msgstr "Xətd-2"
-
-msgid "Line-3"
-msgstr "Xətd-3"
-
-msgid "Digital-1"
-msgstr "Dijital-1"
-
-msgid "Digital-2"
-msgstr "Dijital-2"
-
-msgid "Digital-3"
-msgstr "Dijital-3"
-
-msgid "Phone-in"
-msgstr "Telefon-giriÅŸi"
-
-msgid "Phone-out"
-msgstr "Telefon-çıxışı"
-
-msgid "Video"
-msgstr "Video"
-
-msgid "Radio"
-msgstr "Radio"
-
-msgid "Monitor"
-msgstr "Monitor"
-
msgid ""
"Could not open audio device for playback. Device is being used by another "
"application."
@@ -193,349 +118,49 @@ msgstr ""
msgid "Could not open audio device for recording."
msgstr "CD avadanlığı oxuma üçün açıla bilmədi."
-#, fuzzy
-msgid "Could not open audio device for mixer control handling."
-msgstr "\"%s\" audio avadanlığı yazma üçün açıla bilmədi."
-
msgid ""
-"Could not open audio device for mixer control handling. This version of the "
-"Open Sound System is not supported by this element."
+"Could not open audio device for playback. This version of the Open Sound "
+"System is not supported by this element."
msgstr ""
-msgid "Master"
+msgid "Playback is not supported by this audio device."
msgstr ""
-msgid "Front"
+msgid "Audio playback error."
msgstr ""
-#, fuzzy
-msgid "Rear"
-msgstr "Qeyd"
-
-msgid "Headphones"
+msgid "Recording is not supported by this audio device."
msgstr ""
-msgid "Center"
+msgid "Error recording from audio device."
msgstr ""
-msgid "LFE"
-msgstr ""
+msgid "Volume"
+msgstr "Səs"
-msgid "Surround"
+msgid "Gain"
msgstr ""
-#, fuzzy
-msgid "Side"
-msgstr "Video"
+msgid "Monitor"
+msgstr "Monitor"
#, fuzzy
msgid "Built-in Speaker"
msgstr "Spiker"
-msgid "AUX 1 Out"
-msgstr ""
-
-msgid "AUX 2 Out"
-msgstr ""
-
-msgid "AUX Out"
-msgstr ""
-
-msgid "3D Depth"
-msgstr ""
-
-msgid "3D Center"
-msgstr ""
-
-msgid "3D Enhance"
-msgstr ""
-
-msgid "Telephone"
+msgid "Headphone"
msgstr ""
msgid "Line Out"
msgstr ""
-#, fuzzy
-msgid "Line In"
-msgstr "Xətd-giriş"
-
-msgid "Internal CD"
-msgstr ""
-
-#, fuzzy
-msgid "Video In"
-msgstr "Video"
-
-msgid "AUX 1 In"
-msgstr ""
-
-msgid "AUX 2 In"
-msgstr ""
-
-msgid "AUX In"
-msgstr ""
-
-#, fuzzy
-msgid "Record Gain"
-msgstr "Qeyd"
-
-#, fuzzy
-msgid "Output Gain"
-msgstr "Çıxış-gain"
-
-#, fuzzy
-msgid "Microphone Boost"
-msgstr "Mikrofon"
-
-msgid "Loopback"
-msgstr ""
-
-msgid "Diagnostic"
-msgstr ""
-
-msgid "Bass Boost"
-msgstr ""
-
-msgid "Playback Ports"
-msgstr ""
-
-msgid "Input"
-msgstr ""
-
-#, fuzzy
-msgid "Record Source"
-msgstr "Qeyd"
-
-#, fuzzy
-msgid "Monitor Source"
-msgstr "Monitor"
-
-msgid "Keyboard Beep"
-msgstr ""
-
-msgid "Simulate Stereo"
-msgstr ""
-
-msgid "Stereo"
-msgstr ""
-
-msgid "Surround Sound"
-msgstr ""
-
-#, fuzzy
-msgid "Microphone Gain"
-msgstr "Mikrofon"
-
-#, fuzzy
-msgid "Speaker Source"
-msgstr "Spiker"
-
-#, fuzzy
-msgid "Microphone Source"
-msgstr "Mikrofon"
-
-msgid "Jack"
-msgstr ""
-
-msgid "Center / LFE"
-msgstr ""
-
-msgid "Stereo Mix"
-msgstr ""
-
-msgid "Mono Mix"
-msgstr ""
-
-msgid "Input Mix"
-msgstr ""
-
-msgid "SPDIF In"
-msgstr ""
-
msgid "SPDIF Out"
msgstr ""
-#, fuzzy
-msgid "Microphone 1"
-msgstr "Mikrofon"
-
-#, fuzzy
-msgid "Microphone 2"
-msgstr "Mikrofon"
-
-#, fuzzy
-msgid "Digital Out"
-msgstr "Dijital-1"
-
-#, fuzzy
-msgid "Digital In"
-msgstr "Dijital-1"
-
-msgid "HDMI"
-msgstr ""
-
-msgid "Modem"
-msgstr ""
-
-msgid "Handset"
-msgstr ""
-
-msgid "Other"
-msgstr ""
-
-msgid "None"
-msgstr ""
-
-msgid "On"
-msgstr ""
-
-msgid "Off"
-msgstr ""
-
-msgid "Mute"
-msgstr ""
-
-msgid "Fast"
-msgstr ""
-
-#. TRANSLATORS: "Very Low" is a quality setting here
-msgid "Very Low"
-msgstr ""
-
-#. TRANSLATORS: "Low" is a quality setting here
-msgid "Low"
-msgstr ""
-
-#. TRANSLATORS: "Medium" is a quality setting here
-msgid "Medium"
-msgstr ""
-
-#. TRANSLATORS: "High" is a quality setting here
-msgid "High"
-msgstr ""
-
-#. TRANSLATORS: "Very High" is a quality setting here
-msgid "Very High"
-msgstr ""
-
-#. TRANSLATORS: "Production" is a quality setting here
-msgid "Production"
-msgstr ""
-
-#, fuzzy
-msgid "Front Panel Microphone"
-msgstr "Mikrofon"
-
-msgid "Front Panel Line In"
-msgstr ""
-
-msgid "Front Panel Headphones"
-msgstr ""
-
-msgid "Front Panel Line Out"
-msgstr ""
-
-msgid "Green Connector"
-msgstr ""
-
-msgid "Pink Connector"
-msgstr ""
-
-msgid "Blue Connector"
-msgstr ""
-
-msgid "White Connector"
-msgstr ""
-
-msgid "Black Connector"
-msgstr ""
-
-msgid "Gray Connector"
-msgstr ""
-
-msgid "Orange Connector"
-msgstr ""
-
-msgid "Red Connector"
-msgstr ""
-
-msgid "Yellow Connector"
-msgstr ""
-
-msgid "Green Front Panel Connector"
-msgstr ""
-
-msgid "Pink Front Panel Connector"
-msgstr ""
-
-msgid "Blue Front Panel Connector"
-msgstr ""
-
-msgid "White Front Panel Connector"
-msgstr ""
-
-msgid "Black Front Panel Connector"
-msgstr ""
-
-msgid "Gray Front Panel Connector"
-msgstr ""
-
-msgid "Orange Front Panel Connector"
-msgstr ""
-
-msgid "Red Front Panel Connector"
-msgstr ""
-
-msgid "Yellow Front Panel Connector"
-msgstr ""
-
-msgid "Spread Output"
-msgstr ""
-
-msgid "Downmix"
-msgstr ""
-
-msgid "Virtual Mixer Input"
-msgstr ""
-
-msgid "Virtual Mixer Output"
-msgstr ""
-
-msgid "Virtual Mixer Channels"
-msgstr ""
-
-#. TRANSLATORS: name + number of a volume mixer control
-#, c-format
-msgid "%s %d Function"
-msgstr ""
-
-#. TRANSLATORS: name of a volume mixer control
-#, c-format
-msgid "%s Function"
-msgstr ""
-
-msgid ""
-"Could not open audio device for playback. This version of the Open Sound "
-"System is not supported by this element."
-msgstr ""
-
-msgid "Playback is not supported by this audio device."
-msgstr ""
-
-msgid "Audio playback error."
-msgstr ""
-
-msgid "Recording is not supported by this audio device."
-msgstr ""
-
-msgid "Error recording from audio device."
-msgstr ""
-
-msgid "Gain"
+msgid "AUX 1 Out"
msgstr ""
-msgid "Headphone"
+msgid "AUX 2 Out"
msgstr ""
#, fuzzy, c-format
@@ -705,6 +330,147 @@ msgstr ""
msgid "Cannot operate without a clock"
msgstr ""
+#~ msgid "Bass"
+#~ msgstr "Bas"
+
+#~ msgid "Treble"
+#~ msgstr "Ä°ncÉ™"
+
+#~ msgid "Synth"
+#~ msgstr "Sint"
+
+#~ msgid "PCM"
+#~ msgstr "PCM"
+
+#~ msgid "Speaker"
+#~ msgstr "Spiker"
+
+#~ msgid "Line-in"
+#~ msgstr "Xətd-giriş"
+
+#~ msgid "Microphone"
+#~ msgstr "Mikrofon"
+
+#~ msgid "CD"
+#~ msgstr "CD"
+
+#~ msgid "Mixer"
+#~ msgstr "Mikser"
+
+#~ msgid "PCM-2"
+#~ msgstr "PCM-2"
+
+#~ msgid "Record"
+#~ msgstr "Qeyd"
+
+#~ msgid "In-gain"
+#~ msgstr "GiriÅŸ-gain"
+
+#~ msgid "Out-gain"
+#~ msgstr "Çıxış-gain"
+
+#~ msgid "Line-1"
+#~ msgstr "Xətd-1"
+
+#~ msgid "Line-2"
+#~ msgstr "Xətd-2"
+
+#~ msgid "Line-3"
+#~ msgstr "Xətd-3"
+
+#~ msgid "Digital-1"
+#~ msgstr "Dijital-1"
+
+#~ msgid "Digital-2"
+#~ msgstr "Dijital-2"
+
+#~ msgid "Digital-3"
+#~ msgstr "Dijital-3"
+
+#~ msgid "Phone-in"
+#~ msgstr "Telefon-giriÅŸi"
+
+#~ msgid "Phone-out"
+#~ msgstr "Telefon-çıxışı"
+
+#~ msgid "Video"
+#~ msgstr "Video"
+
+#~ msgid "Radio"
+#~ msgstr "Radio"
+
+#, fuzzy
+#~ msgid "Could not open audio device for mixer control handling."
+#~ msgstr "\"%s\" audio avadanlığı yazma üçün açıla bilmədi."
+
+#, fuzzy
+#~ msgid "Rear"
+#~ msgstr "Qeyd"
+
+#, fuzzy
+#~ msgid "Side"
+#~ msgstr "Video"
+
+#, fuzzy
+#~ msgid "Line In"
+#~ msgstr "Xətd-giriş"
+
+#, fuzzy
+#~ msgid "Video In"
+#~ msgstr "Video"
+
+#, fuzzy
+#~ msgid "Record Gain"
+#~ msgstr "Qeyd"
+
+#, fuzzy
+#~ msgid "Output Gain"
+#~ msgstr "Çıxış-gain"
+
+#, fuzzy
+#~ msgid "Microphone Boost"
+#~ msgstr "Mikrofon"
+
+#, fuzzy
+#~ msgid "Record Source"
+#~ msgstr "Qeyd"
+
+#, fuzzy
+#~ msgid "Monitor Source"
+#~ msgstr "Monitor"
+
+#, fuzzy
+#~ msgid "Microphone Gain"
+#~ msgstr "Mikrofon"
+
+#, fuzzy
+#~ msgid "Speaker Source"
+#~ msgstr "Spiker"
+
+#, fuzzy
+#~ msgid "Microphone Source"
+#~ msgstr "Mikrofon"
+
+#, fuzzy
+#~ msgid "Microphone 1"
+#~ msgstr "Mikrofon"
+
+#, fuzzy
+#~ msgid "Microphone 2"
+#~ msgstr "Mikrofon"
+
+#, fuzzy
+#~ msgid "Digital Out"
+#~ msgstr "Dijital-1"
+
+#, fuzzy
+#~ msgid "Digital In"
+#~ msgstr "Dijital-1"
+
+#, fuzzy
+#~ msgid "Front Panel Microphone"
+#~ msgstr "Mikrofon"
+
#, fuzzy
#~ msgid "Could not enqueue buffers in device '%s'."
#~ msgstr "\"%s\" avadanlığından bufferlər alına bilmədi."
diff --git a/po/bg.gmo b/po/bg.gmo
index a7c0277ec4ad187ca3ffe5d21745675baba2e310..207efc2782fea4ffdc10626a7c1599a9adb0f82b 100644
Binary files a/po/bg.gmo and b/po/bg.gmo differ
diff --git a/po/bg.po b/po/bg.po
index 9d6441f7f13d5d894e0781fae172dd460ce8acf0..5b307543c74004d17fa1882223dff05ba39310da 100644
--- a/po/bg.po
+++ b/po/bg.po
@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: gst-plugins-good 0.10.28.2\n"
"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/\n"
-"POT-Creation-Date: 2012-04-12 10:26+0200\n"
+"POT-Creation-Date: 2012-05-13 16:29+0200\n"
"PO-Revision-Date: 2011-04-26 22:35+0300\n"
"Last-Translator: Alexander Shopov <ash@kambanaria.org>\n"
"Language-Team: Bulgarian <dict@fsa-bg.org>\n"
@@ -98,81 +98,6 @@ msgstr ""
msgid "Internal data flow error."
msgstr "Вътрешна грешка в потока Ñ Ð´Ð°Ð½Ð½Ð¸."
-msgid "Volume"
-msgstr "Сила на звука"
-
-msgid "Bass"
-msgstr "БаÑи"
-
-msgid "Treble"
-msgstr "ВиÑоки"
-
-msgid "Synth"
-msgstr "Синтезатор"
-
-msgid "PCM"
-msgstr "PCM"
-
-msgid "Speaker"
-msgstr "ВиÑокоговорител"
-
-msgid "Line-in"
-msgstr "Вход"
-
-msgid "Microphone"
-msgstr "Микрофон"
-
-msgid "CD"
-msgstr "CD"
-
-msgid "Mixer"
-msgstr "СмеÑител"
-
-msgid "PCM-2"
-msgstr "PCM-2"
-
-msgid "Record"
-msgstr "ЗапиÑ"
-
-msgid "In-gain"
-msgstr "Входно уÑилване"
-
-msgid "Out-gain"
-msgstr "Изходно уÑилване"
-
-msgid "Line-1"
-msgstr "Вход-1"
-
-msgid "Line-2"
-msgstr "Вход-2"
-
-msgid "Line-3"
-msgstr "Вход-3"
-
-msgid "Digital-1"
-msgstr "Цифрова-1"
-
-msgid "Digital-2"
-msgstr "Цифрова-2"
-
-msgid "Digital-3"
-msgstr "Цифрова-3"
-
-msgid "Phone-in"
-msgstr "Вход за Ñлушалки"
-
-msgid "Phone-out"
-msgstr "Изход за Ñлушалки"
-
-msgid "Video"
-msgstr "Видео"
-
-msgid "Radio"
-msgstr "Радио"
-
-msgid "Monitor"
-msgstr "Монитор"
-
msgid ""
"Could not open audio device for playback. Device is being used by another "
"application."
@@ -198,311 +123,6 @@ msgstr ""
msgid "Could not open audio device for recording."
msgstr "Ðудио уÑтройÑтвото не може да Ñе отвори за запиÑ."
-msgid "Could not open audio device for mixer control handling."
-msgstr "Ðудио уÑтройÑтвото не може да Ñе отвори за управление на ÑмеÑването."
-
-msgid ""
-"Could not open audio device for mixer control handling. This version of the "
-"Open Sound System is not supported by this element."
-msgstr ""
-"Ðудио уÑтройÑтвото не може да Ñе отвори за управление на ÑмеÑването. "
-"Елементът не поддържа тази верÑÐ¸Ñ Ð½Ð° OSS."
-
-msgid "Master"
-msgstr "ОÑновна"
-
-msgid "Front"
-msgstr "Отпред"
-
-msgid "Rear"
-msgstr "Отзад"
-
-msgid "Headphones"
-msgstr "Слушалки"
-
-msgid "Center"
-msgstr "Център"
-
-msgid "LFE"
-msgstr "БаÑи"
-
-msgid "Surround"
-msgstr "Съраунд"
-
-msgid "Side"
-msgstr "ОтÑтрани"
-
-msgid "Built-in Speaker"
-msgstr "Вграден виÑокоговорител"
-
-msgid "AUX 1 Out"
-msgstr "Изход AUX 1"
-
-msgid "AUX 2 Out"
-msgstr "Изход AUX 2"
-
-msgid "AUX Out"
-msgstr "Изход AUX"
-
-msgid "3D Depth"
-msgstr "3D — дълбочина"
-
-msgid "3D Center"
-msgstr "3D — център"
-
-msgid "3D Enhance"
-msgstr "3D — подобрениÑ"
-
-msgid "Telephone"
-msgstr "Телефон"
-
-msgid "Line Out"
-msgstr "Изход"
-
-msgid "Line In"
-msgstr "Вход"
-
-msgid "Internal CD"
-msgstr "Вътрешно CD"
-
-msgid "Video In"
-msgstr "Видео вход"
-
-msgid "AUX 1 In"
-msgstr "Вход AUX 1"
-
-msgid "AUX 2 In"
-msgstr "Вход AUX 2"
-
-msgid "AUX In"
-msgstr "Вход AUX"
-
-msgid "Record Gain"
-msgstr "УÑилване на запиÑа"
-
-msgid "Output Gain"
-msgstr "УÑилване на изхода"
-
-msgid "Microphone Boost"
-msgstr "УÑилване на микрофона"
-
-msgid "Loopback"
-msgstr "Обратна връзка"
-
-msgid "Diagnostic"
-msgstr "ДиагноÑтика"
-
-msgid "Bass Boost"
-msgstr "УÑилване на баÑитe"
-
-msgid "Playback Ports"
-msgstr "Изходни гнезда"
-
-msgid "Input"
-msgstr "Вход"
-
-msgid "Record Source"
-msgstr "Източник за запиÑ"
-
-msgid "Monitor Source"
-msgstr "Източник за звуков монитор"
-
-msgid "Keyboard Beep"
-msgstr "Клавиатурен звънец"
-
-msgid "Simulate Stereo"
-msgstr "Симулирано Ñтерео"
-
-msgid "Stereo"
-msgstr "Стерео"
-
-msgid "Surround Sound"
-msgstr "Стерео и Ñъраунд"
-
-msgid "Microphone Gain"
-msgstr "УÑилване на микрофона"
-
-msgid "Speaker Source"
-msgstr "Източник за виÑокоговорител"
-
-msgid "Microphone Source"
-msgstr "Източник за микрофон"
-
-msgid "Jack"
-msgstr "Жак"
-
-msgid "Center / LFE"
-msgstr "Център/баÑи"
-
-msgid "Stereo Mix"
-msgstr "СмеÑител на Ñтерео"
-
-msgid "Mono Mix"
-msgstr "СмеÑител на моно"
-
-msgid "Input Mix"
-msgstr "СмеÑител на входа"
-
-msgid "SPDIF In"
-msgstr "Вход SPDIF"
-
-msgid "SPDIF Out"
-msgstr "Изход SPDIF"
-
-msgid "Microphone 1"
-msgstr "Микрофон 1"
-
-msgid "Microphone 2"
-msgstr "Микрофон 2"
-
-msgid "Digital Out"
-msgstr "Цифров изход"
-
-msgid "Digital In"
-msgstr "Цифров вход"
-
-msgid "HDMI"
-msgstr "HDMI"
-
-msgid "Modem"
-msgstr "Модем"
-
-msgid "Handset"
-msgstr "Слушалка"
-
-msgid "Other"
-msgstr "Друго"
-
-msgid "None"
-msgstr "ÐÑма"
-
-msgid "On"
-msgstr "Включено"
-
-msgid "Off"
-msgstr "Изключено"
-
-msgid "Mute"
-msgstr "Заглушаване"
-
-msgid "Fast"
-msgstr "Бързо"
-
-#. TRANSLATORS: "Very Low" is a quality setting here
-msgid "Very Low"
-msgstr "Много ниÑко"
-
-#. TRANSLATORS: "Low" is a quality setting here
-msgid "Low"
-msgstr "ÐиÑко"
-
-#. TRANSLATORS: "Medium" is a quality setting here
-msgid "Medium"
-msgstr "Средно"
-
-#. TRANSLATORS: "High" is a quality setting here
-msgid "High"
-msgstr "ВиÑоко"
-
-#. TRANSLATORS: "Very High" is a quality setting here
-msgid "Very High"
-msgstr "Много виÑоко"
-
-#. TRANSLATORS: "Production" is a quality setting here
-msgid "Production"
-msgstr "ПрофеÑионално"
-
-msgid "Front Panel Microphone"
-msgstr "Микрофон на Ð¿Ñ€ÐµÐ´Ð½Ð¸Ñ Ð¿Ð°Ð½ÐµÐ»"
-
-msgid "Front Panel Line In"
-msgstr "Вход на Ð¿Ñ€ÐµÐ´Ð½Ð¸Ñ Ð¿Ð°Ð½ÐµÐ»"
-
-msgid "Front Panel Headphones"
-msgstr "Слушалки на Ð¿Ñ€ÐµÐ´Ð½Ð¸Ñ Ð¿Ð°Ð½ÐµÐ»"
-
-msgid "Front Panel Line Out"
-msgstr "Изход на Ð¿Ñ€ÐµÐ´Ð½Ð¸Ñ Ð¿Ð°Ð½ÐµÐ»"
-
-msgid "Green Connector"
-msgstr "Зелено гнездо"
-
-msgid "Pink Connector"
-msgstr "Розово гнездо"
-
-msgid "Blue Connector"
-msgstr "Синьо гнездо"
-
-msgid "White Connector"
-msgstr "БÑло гнездо"
-
-msgid "Black Connector"
-msgstr "Черно гнездо"
-
-msgid "Gray Connector"
-msgstr "Сиво гнездо"
-
-msgid "Orange Connector"
-msgstr "Оранжево гнездо"
-
-msgid "Red Connector"
-msgstr "Червено гнездо"
-
-msgid "Yellow Connector"
-msgstr "Жълто гнездо"
-
-msgid "Green Front Panel Connector"
-msgstr "Зелено гнездо на Ð¿Ñ€ÐµÐ´Ð½Ð¸Ñ Ð¿Ð°Ð½ÐµÐ»"
-
-msgid "Pink Front Panel Connector"
-msgstr "Розово гнездо на Ð¿Ñ€ÐµÐ´Ð½Ð¸Ñ Ð¿Ð°Ð½ÐµÐ»"
-
-msgid "Blue Front Panel Connector"
-msgstr "Синьо гнездо на Ð¿Ñ€ÐµÐ´Ð½Ð¸Ñ Ð¿Ð°Ð½ÐµÐ»"
-
-msgid "White Front Panel Connector"
-msgstr "БÑло гнездо на Ð¿Ñ€ÐµÐ´Ð½Ð¸Ñ Ð¿Ð°Ð½ÐµÐ»"
-
-msgid "Black Front Panel Connector"
-msgstr "Черно гнездо на Ð¿Ñ€ÐµÐ´Ð½Ð¸Ñ Ð¿Ð°Ð½ÐµÐ»"
-
-msgid "Gray Front Panel Connector"
-msgstr "Сиво гнездо на Ð¿Ñ€ÐµÐ´Ð½Ð¸Ñ Ð¿Ð°Ð½ÐµÐ»"
-
-msgid "Orange Front Panel Connector"
-msgstr "Оранжево гнездо на Ð¿Ñ€ÐµÐ´Ð½Ð¸Ñ Ð¿Ð°Ð½ÐµÐ»"
-
-msgid "Red Front Panel Connector"
-msgstr "Червено гнездо на Ð¿Ñ€ÐµÐ´Ð½Ð¸Ñ Ð¿Ð°Ð½ÐµÐ»"
-
-msgid "Yellow Front Panel Connector"
-msgstr "Жълто гнездо на Ð¿Ñ€ÐµÐ´Ð½Ð¸Ñ Ð¿Ð°Ð½ÐµÐ»"
-
-msgid "Spread Output"
-msgstr "Към повече изходи"
-
-msgid "Downmix"
-msgstr "Към по-малко изходи"
-
-msgid "Virtual Mixer Input"
-msgstr "Вход на виртуален ÑмеÑител"
-
-msgid "Virtual Mixer Output"
-msgstr "Изход на виртуален ÑмеÑител"
-
-msgid "Virtual Mixer Channels"
-msgstr "Канали на виртуален ÑмеÑител"
-
-#. TRANSLATORS: name + number of a volume mixer control
-#, c-format
-msgid "%s %d Function"
-msgstr "Ð¤ÑƒÐ½ÐºÑ†Ð¸Ñ Ð½Ð° %s № %d"
-
-#. TRANSLATORS: name of a volume mixer control
-#, c-format
-msgid "%s Function"
-msgstr "Ð¤ÑƒÐ½ÐºÑ†Ð¸Ñ Ð½Ð° %s"
-
msgid ""
"Could not open audio device for playback. This version of the Open Sound "
"System is not supported by this element."
@@ -522,12 +142,33 @@ msgstr "Това аудио уÑтройÑтво не поддържа запи
msgid "Error recording from audio device."
msgstr "Грешка при запиÑа от аудио уÑтройÑтвото."
+msgid "Volume"
+msgstr "Сила на звука"
+
msgid "Gain"
msgstr "УÑилване"
+msgid "Monitor"
+msgstr "Монитор"
+
+msgid "Built-in Speaker"
+msgstr "Вграден виÑокоговорител"
+
msgid "Headphone"
msgstr "Слушалки"
+msgid "Line Out"
+msgstr "Изход"
+
+msgid "SPDIF Out"
+msgstr "Изход SPDIF"
+
+msgid "AUX 1 Out"
+msgstr "Изход AUX 1"
+
+msgid "AUX 2 Out"
+msgstr "Изход AUX 2"
+
#, c-format
msgid "Error reading %d bytes from device '%s'."
msgstr "Грешка при прочитане %d байта от уÑтройÑтво „%s“."
@@ -706,6 +347,356 @@ msgstr ""
msgid "Cannot operate without a clock"
msgstr "Работата без чаÑовник е невъзможна."
+#~ msgid "Bass"
+#~ msgstr "БаÑи"
+
+#~ msgid "Treble"
+#~ msgstr "ВиÑоки"
+
+#~ msgid "Synth"
+#~ msgstr "Синтезатор"
+
+#~ msgid "PCM"
+#~ msgstr "PCM"
+
+#~ msgid "Speaker"
+#~ msgstr "ВиÑокоговорител"
+
+#~ msgid "Line-in"
+#~ msgstr "Вход"
+
+#~ msgid "Microphone"
+#~ msgstr "Микрофон"
+
+#~ msgid "CD"
+#~ msgstr "CD"
+
+#~ msgid "Mixer"
+#~ msgstr "СмеÑител"
+
+#~ msgid "PCM-2"
+#~ msgstr "PCM-2"
+
+#~ msgid "Record"
+#~ msgstr "ЗапиÑ"
+
+#~ msgid "In-gain"
+#~ msgstr "Входно уÑилване"
+
+#~ msgid "Out-gain"
+#~ msgstr "Изходно уÑилване"
+
+#~ msgid "Line-1"
+#~ msgstr "Вход-1"
+
+#~ msgid "Line-2"
+#~ msgstr "Вход-2"
+
+#~ msgid "Line-3"
+#~ msgstr "Вход-3"
+
+#~ msgid "Digital-1"
+#~ msgstr "Цифрова-1"
+
+#~ msgid "Digital-2"
+#~ msgstr "Цифрова-2"
+
+#~ msgid "Digital-3"
+#~ msgstr "Цифрова-3"
+
+#~ msgid "Phone-in"
+#~ msgstr "Вход за Ñлушалки"
+
+#~ msgid "Phone-out"
+#~ msgstr "Изход за Ñлушалки"
+
+#~ msgid "Video"
+#~ msgstr "Видео"
+
+#~ msgid "Radio"
+#~ msgstr "Радио"
+
+#~ msgid "Could not open audio device for mixer control handling."
+#~ msgstr ""
+#~ "Ðудио уÑтройÑтвото не може да Ñе отвори за управление на ÑмеÑването."
+
+#~ msgid ""
+#~ "Could not open audio device for mixer control handling. This version of "
+#~ "the Open Sound System is not supported by this element."
+#~ msgstr ""
+#~ "Ðудио уÑтройÑтвото не може да Ñе отвори за управление на ÑмеÑването. "
+#~ "Елементът не поддържа тази верÑÐ¸Ñ Ð½Ð° OSS."
+
+#~ msgid "Master"
+#~ msgstr "ОÑновна"
+
+#~ msgid "Front"
+#~ msgstr "Отпред"
+
+#~ msgid "Rear"
+#~ msgstr "Отзад"
+
+#~ msgid "Headphones"
+#~ msgstr "Слушалки"
+
+#~ msgid "Center"
+#~ msgstr "Център"
+
+#~ msgid "LFE"
+#~ msgstr "БаÑи"
+
+#~ msgid "Surround"
+#~ msgstr "Съраунд"
+
+#~ msgid "Side"
+#~ msgstr "ОтÑтрани"
+
+#~ msgid "AUX Out"
+#~ msgstr "Изход AUX"
+
+#~ msgid "3D Depth"
+#~ msgstr "3D — дълбочина"
+
+#~ msgid "3D Center"
+#~ msgstr "3D — център"
+
+#~ msgid "3D Enhance"
+#~ msgstr "3D — подобрениÑ"
+
+#~ msgid "Telephone"
+#~ msgstr "Телефон"
+
+#~ msgid "Line In"
+#~ msgstr "Вход"
+
+#~ msgid "Internal CD"
+#~ msgstr "Вътрешно CD"
+
+#~ msgid "Video In"
+#~ msgstr "Видео вход"
+
+#~ msgid "AUX 1 In"
+#~ msgstr "Вход AUX 1"
+
+#~ msgid "AUX 2 In"
+#~ msgstr "Вход AUX 2"
+
+#~ msgid "AUX In"
+#~ msgstr "Вход AUX"
+
+#~ msgid "Record Gain"
+#~ msgstr "УÑилване на запиÑа"
+
+#~ msgid "Output Gain"
+#~ msgstr "УÑилване на изхода"
+
+#~ msgid "Microphone Boost"
+#~ msgstr "УÑилване на микрофона"
+
+#~ msgid "Loopback"
+#~ msgstr "Обратна връзка"
+
+#~ msgid "Diagnostic"
+#~ msgstr "ДиагноÑтика"
+
+#~ msgid "Bass Boost"
+#~ msgstr "УÑилване на баÑитe"
+
+#~ msgid "Playback Ports"
+#~ msgstr "Изходни гнезда"
+
+#~ msgid "Input"
+#~ msgstr "Вход"
+
+#~ msgid "Record Source"
+#~ msgstr "Източник за запиÑ"
+
+#~ msgid "Monitor Source"
+#~ msgstr "Източник за звуков монитор"
+
+#~ msgid "Keyboard Beep"
+#~ msgstr "Клавиатурен звънец"
+
+#~ msgid "Simulate Stereo"
+#~ msgstr "Симулирано Ñтерео"
+
+#~ msgid "Stereo"
+#~ msgstr "Стерео"
+
+#~ msgid "Surround Sound"
+#~ msgstr "Стерео и Ñъраунд"
+
+#~ msgid "Microphone Gain"
+#~ msgstr "УÑилване на микрофона"
+
+#~ msgid "Speaker Source"
+#~ msgstr "Източник за виÑокоговорител"
+
+#~ msgid "Microphone Source"
+#~ msgstr "Източник за микрофон"
+
+#~ msgid "Jack"
+#~ msgstr "Жак"
+
+#~ msgid "Center / LFE"
+#~ msgstr "Център/баÑи"
+
+#~ msgid "Stereo Mix"
+#~ msgstr "СмеÑител на Ñтерео"
+
+#~ msgid "Mono Mix"
+#~ msgstr "СмеÑител на моно"
+
+#~ msgid "Input Mix"
+#~ msgstr "СмеÑител на входа"
+
+#~ msgid "SPDIF In"
+#~ msgstr "Вход SPDIF"
+
+#~ msgid "Microphone 1"
+#~ msgstr "Микрофон 1"
+
+#~ msgid "Microphone 2"
+#~ msgstr "Микрофон 2"
+
+#~ msgid "Digital Out"
+#~ msgstr "Цифров изход"
+
+#~ msgid "Digital In"
+#~ msgstr "Цифров вход"
+
+#~ msgid "HDMI"
+#~ msgstr "HDMI"
+
+#~ msgid "Modem"
+#~ msgstr "Модем"
+
+#~ msgid "Handset"
+#~ msgstr "Слушалка"
+
+#~ msgid "Other"
+#~ msgstr "Друго"
+
+#~ msgid "None"
+#~ msgstr "ÐÑма"
+
+#~ msgid "On"
+#~ msgstr "Включено"
+
+#~ msgid "Off"
+#~ msgstr "Изключено"
+
+#~ msgid "Mute"
+#~ msgstr "Заглушаване"
+
+#~ msgid "Fast"
+#~ msgstr "Бързо"
+
+#~ msgid "Very Low"
+#~ msgstr "Много ниÑко"
+
+#~ msgid "Low"
+#~ msgstr "ÐиÑко"
+
+#~ msgid "Medium"
+#~ msgstr "Средно"
+
+#~ msgid "High"
+#~ msgstr "ВиÑоко"
+
+#~ msgid "Very High"
+#~ msgstr "Много виÑоко"
+
+#~ msgid "Production"
+#~ msgstr "ПрофеÑионално"
+
+#~ msgid "Front Panel Microphone"
+#~ msgstr "Микрофон на Ð¿Ñ€ÐµÐ´Ð½Ð¸Ñ Ð¿Ð°Ð½ÐµÐ»"
+
+#~ msgid "Front Panel Line In"
+#~ msgstr "Вход на Ð¿Ñ€ÐµÐ´Ð½Ð¸Ñ Ð¿Ð°Ð½ÐµÐ»"
+
+#~ msgid "Front Panel Headphones"
+#~ msgstr "Слушалки на Ð¿Ñ€ÐµÐ´Ð½Ð¸Ñ Ð¿Ð°Ð½ÐµÐ»"
+
+#~ msgid "Front Panel Line Out"
+#~ msgstr "Изход на Ð¿Ñ€ÐµÐ´Ð½Ð¸Ñ Ð¿Ð°Ð½ÐµÐ»"
+
+#~ msgid "Green Connector"
+#~ msgstr "Зелено гнездо"
+
+#~ msgid "Pink Connector"
+#~ msgstr "Розово гнездо"
+
+#~ msgid "Blue Connector"
+#~ msgstr "Синьо гнездо"
+
+#~ msgid "White Connector"
+#~ msgstr "БÑло гнездо"
+
+#~ msgid "Black Connector"
+#~ msgstr "Черно гнездо"
+
+#~ msgid "Gray Connector"
+#~ msgstr "Сиво гнездо"
+
+#~ msgid "Orange Connector"
+#~ msgstr "Оранжево гнездо"
+
+#~ msgid "Red Connector"
+#~ msgstr "Червено гнездо"
+
+#~ msgid "Yellow Connector"
+#~ msgstr "Жълто гнездо"
+
+#~ msgid "Green Front Panel Connector"
+#~ msgstr "Зелено гнездо на Ð¿Ñ€ÐµÐ´Ð½Ð¸Ñ Ð¿Ð°Ð½ÐµÐ»"
+
+#~ msgid "Pink Front Panel Connector"
+#~ msgstr "Розово гнездо на Ð¿Ñ€ÐµÐ´Ð½Ð¸Ñ Ð¿Ð°Ð½ÐµÐ»"
+
+#~ msgid "Blue Front Panel Connector"
+#~ msgstr "Синьо гнездо на Ð¿Ñ€ÐµÐ´Ð½Ð¸Ñ Ð¿Ð°Ð½ÐµÐ»"
+
+#~ msgid "White Front Panel Connector"
+#~ msgstr "БÑло гнездо на Ð¿Ñ€ÐµÐ´Ð½Ð¸Ñ Ð¿Ð°Ð½ÐµÐ»"
+
+#~ msgid "Black Front Panel Connector"
+#~ msgstr "Черно гнездо на Ð¿Ñ€ÐµÐ´Ð½Ð¸Ñ Ð¿Ð°Ð½ÐµÐ»"
+
+#~ msgid "Gray Front Panel Connector"
+#~ msgstr "Сиво гнездо на Ð¿Ñ€ÐµÐ´Ð½Ð¸Ñ Ð¿Ð°Ð½ÐµÐ»"
+
+#~ msgid "Orange Front Panel Connector"
+#~ msgstr "Оранжево гнездо на Ð¿Ñ€ÐµÐ´Ð½Ð¸Ñ Ð¿Ð°Ð½ÐµÐ»"
+
+#~ msgid "Red Front Panel Connector"
+#~ msgstr "Червено гнездо на Ð¿Ñ€ÐµÐ´Ð½Ð¸Ñ Ð¿Ð°Ð½ÐµÐ»"
+
+#~ msgid "Yellow Front Panel Connector"
+#~ msgstr "Жълто гнездо на Ð¿Ñ€ÐµÐ´Ð½Ð¸Ñ Ð¿Ð°Ð½ÐµÐ»"
+
+#~ msgid "Spread Output"
+#~ msgstr "Към повече изходи"
+
+#~ msgid "Downmix"
+#~ msgstr "Към по-малко изходи"
+
+#~ msgid "Virtual Mixer Input"
+#~ msgstr "Вход на виртуален ÑмеÑител"
+
+#~ msgid "Virtual Mixer Output"
+#~ msgstr "Изход на виртуален ÑмеÑител"
+
+#~ msgid "Virtual Mixer Channels"
+#~ msgstr "Канали на виртуален ÑмеÑител"
+
+#~ msgid "%s %d Function"
+#~ msgstr "Ð¤ÑƒÐ½ÐºÑ†Ð¸Ñ Ð½Ð° %s № %d"
+
+#~ msgid "%s Function"
+#~ msgstr "Ð¤ÑƒÐ½ÐºÑ†Ð¸Ñ Ð½Ð° %s"
+
#~ msgid "Error reading %d bytes on device '%s'."
#~ msgstr "Грешка при прочитане на %d байта на уÑтройÑтво „%s“."
diff --git a/po/ca.gmo b/po/ca.gmo
index 458deec402af6e6e896b0c3b49dee72402e1409b..777978d697a43507d0b4b43339d8398660d03ec0 100644
Binary files a/po/ca.gmo and b/po/ca.gmo differ
diff --git a/po/ca.po b/po/ca.po
index f30555f32c8dc3d3ce4558b2f96eba92bdc279eb..26c15e5c986c920412fd519952ae9a6660d91ae0 100644
--- a/po/ca.po
+++ b/po/ca.po
@@ -9,7 +9,7 @@ msgid ""
msgstr ""
"Project-Id-Version: gst-plugins-good 0.10.28.2\n"
"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/\n"
-"POT-Creation-Date: 2012-04-12 10:26+0200\n"
+"POT-Creation-Date: 2012-05-13 16:29+0200\n"
"PO-Revision-Date: 2012-01-01 14:19+0100\n"
"Last-Translator: Gil Forcada <gforcada@gnome.org>\n"
"Language-Team: Catalan <ca@dodds.net>\n"
@@ -102,81 +102,6 @@ msgstr ""
msgid "Internal data flow error."
msgstr "S'ha produït un error intern de flux de dades."
-msgid "Volume"
-msgstr "Volum"
-
-msgid "Bass"
-msgstr "Baixos"
-
-msgid "Treble"
-msgstr "Aguts"
-
-msgid "Synth"
-msgstr "Sintetitzador"
-
-msgid "PCM"
-msgstr "PCM"
-
-msgid "Speaker"
-msgstr "Altaveu"
-
-msgid "Line-in"
-msgstr "LÃnia d'entrada"
-
-msgid "Microphone"
-msgstr "Micròfon"
-
-msgid "CD"
-msgstr "CD"
-
-msgid "Mixer"
-msgstr "Mesclador"
-
-msgid "PCM-2"
-msgstr "PCM-2"
-
-msgid "Record"
-msgstr "Enregistrament"
-
-msgid "In-gain"
-msgstr "Guany d'entrada"
-
-msgid "Out-gain"
-msgstr "Guany de sortida"
-
-msgid "Line-1"
-msgstr "LÃnia-1"
-
-msgid "Line-2"
-msgstr "LÃnia-2"
-
-msgid "Line-3"
-msgstr "LÃnia-3"
-
-msgid "Digital-1"
-msgstr "Digital-1"
-
-msgid "Digital-2"
-msgstr "Digital-2"
-
-msgid "Digital-3"
-msgstr "Digital-3"
-
-msgid "Phone-in"
-msgstr "Entrada del telèfon"
-
-msgid "Phone-out"
-msgstr "Sortida del telèfon"
-
-msgid "Video"
-msgstr "VÃdeo"
-
-msgid "Radio"
-msgstr "RÃ dio"
-
-msgid "Monitor"
-msgstr "Monitor"
-
msgid ""
"Could not open audio device for playback. Device is being used by another "
"application."
@@ -204,314 +129,6 @@ msgstr ""
msgid "Could not open audio device for recording."
msgstr "No s'ha pogut obrir el dispositiu d'àudio per a l'enregistrament."
-msgid "Could not open audio device for mixer control handling."
-msgstr ""
-"No s'ha pogut obrir el dispositiu d'à udio per a la gestió del control del "
-"mesclador."
-
-msgid ""
-"Could not open audio device for mixer control handling. This version of the "
-"Open Sound System is not supported by this element."
-msgstr ""
-"No s'ha pogut obrir el dispositiu d'à udio per a la gestió del control del "
-"mesclador. Aquesta versió de l'Open Sound System no és compatible amb aquest "
-"element."
-
-msgid "Master"
-msgstr "Mestre"
-
-msgid "Front"
-msgstr "Frontal"
-
-msgid "Rear"
-msgstr "Posterior"
-
-msgid "Headphones"
-msgstr "Auriculars"
-
-msgid "Center"
-msgstr "Central"
-
-msgid "LFE"
-msgstr "LFE (efectes de baixa freqüència)"
-
-msgid "Surround"
-msgstr "So envoltant"
-
-msgid "Side"
-msgstr "Lateral"
-
-msgid "Built-in Speaker"
-msgstr "Altaveu incorporat"
-
-msgid "AUX 1 Out"
-msgstr "Sortida AUX 1"
-
-msgid "AUX 2 Out"
-msgstr "Sortida AUX 2"
-
-msgid "AUX Out"
-msgstr "Sortida AUX"
-
-msgid "3D Depth"
-msgstr "Profunditat 3D"
-
-msgid "3D Center"
-msgstr "Centre 3D"
-
-msgid "3D Enhance"
-msgstr "Millora 3D"
-
-msgid "Telephone"
-msgstr "Telèfon"
-
-msgid "Line Out"
-msgstr "LÃnia de sortida"
-
-msgid "Line In"
-msgstr "LÃnia d'entrada"
-
-msgid "Internal CD"
-msgstr "CD intern"
-
-msgid "Video In"
-msgstr "Entrada de vÃdeo"
-
-msgid "AUX 1 In"
-msgstr "Entrada AUX 1"
-
-msgid "AUX 2 In"
-msgstr "Entrada AUX 2"
-
-msgid "AUX In"
-msgstr "Entrada AUX"
-
-msgid "Record Gain"
-msgstr "Guany d'enregistrament"
-
-msgid "Output Gain"
-msgstr "Guany de sortida"
-
-msgid "Microphone Boost"
-msgstr "Amplificació del micròfon"
-
-msgid "Loopback"
-msgstr "Bucle local"
-
-msgid "Diagnostic"
-msgstr "Diagnòstic"
-
-msgid "Bass Boost"
-msgstr "Amplificació dels baixos"
-
-msgid "Playback Ports"
-msgstr "Ports de reproducció"
-
-msgid "Input"
-msgstr "Entrada"
-
-msgid "Record Source"
-msgstr "Font d'enregistrament"
-
-msgid "Monitor Source"
-msgstr "Font del monitor"
-
-msgid "Keyboard Beep"
-msgstr "So del teclat"
-
-msgid "Simulate Stereo"
-msgstr "Estèreo simulat"
-
-msgid "Stereo"
-msgstr "Estèreo"
-
-msgid "Surround Sound"
-msgstr "So envoltant"
-
-msgid "Microphone Gain"
-msgstr "Guany del micròfon"
-
-msgid "Speaker Source"
-msgstr "Font de l'altaveu"
-
-msgid "Microphone Source"
-msgstr "Font del micròfon"
-
-msgid "Jack"
-msgstr "Jack"
-
-msgid "Center / LFE"
-msgstr "Centre / LFE (efectes de baixa freqüència)"
-
-msgid "Stereo Mix"
-msgstr "Mescla estèreo"
-
-msgid "Mono Mix"
-msgstr "Mescla mono"
-
-msgid "Input Mix"
-msgstr "Mescla d'entrada"
-
-msgid "SPDIF In"
-msgstr "Entrada SPDIF"
-
-msgid "SPDIF Out"
-msgstr "Sortida SPDIF"
-
-msgid "Microphone 1"
-msgstr "Micròfon 1"
-
-msgid "Microphone 2"
-msgstr "Micròfon 2"
-
-msgid "Digital Out"
-msgstr "Sortida digital"
-
-msgid "Digital In"
-msgstr "Entrada digital"
-
-msgid "HDMI"
-msgstr "HDMI"
-
-msgid "Modem"
-msgstr "Mòdem"
-
-msgid "Handset"
-msgstr "Comandament a distà ncia"
-
-msgid "Other"
-msgstr "Altres"
-
-msgid "None"
-msgstr "Cap"
-
-msgid "On"
-msgstr "Encès"
-
-msgid "Off"
-msgstr "Apagat"
-
-msgid "Mute"
-msgstr "Silenci"
-
-msgid "Fast"
-msgstr "RÃ pid"
-
-#. TRANSLATORS: "Very Low" is a quality setting here
-msgid "Very Low"
-msgstr "Molt baixa"
-
-#. TRANSLATORS: "Low" is a quality setting here
-msgid "Low"
-msgstr "Baixa"
-
-#. TRANSLATORS: "Medium" is a quality setting here
-msgid "Medium"
-msgstr "Mitjana"
-
-#. TRANSLATORS: "High" is a quality setting here
-msgid "High"
-msgstr "Alta"
-
-#. TRANSLATORS: "Very High" is a quality setting here
-msgid "Very High"
-msgstr "Molt alta"
-
-#. TRANSLATORS: "Production" is a quality setting here
-msgid "Production"
-msgstr "Producció"
-
-msgid "Front Panel Microphone"
-msgstr "Micròfon del quadre frontal"
-
-msgid "Front Panel Line In"
-msgstr "LÃnia d'entrada del quadre frontal"
-
-msgid "Front Panel Headphones"
-msgstr "Auriculars del quadre frontal"
-
-msgid "Front Panel Line Out"
-msgstr "LÃnia de sortida del quadre frontal"
-
-msgid "Green Connector"
-msgstr "Connector verd"
-
-msgid "Pink Connector"
-msgstr "Connector rosa"
-
-msgid "Blue Connector"
-msgstr "Connector blau"
-
-msgid "White Connector"
-msgstr "Connector blanc"
-
-msgid "Black Connector"
-msgstr "Connector negre"
-
-msgid "Gray Connector"
-msgstr "Connector gris"
-
-msgid "Orange Connector"
-msgstr "Connector taronja"
-
-msgid "Red Connector"
-msgstr "Connector vermell"
-
-msgid "Yellow Connector"
-msgstr "Connector groc"
-
-msgid "Green Front Panel Connector"
-msgstr "Connector verd del quadre frontal"
-
-msgid "Pink Front Panel Connector"
-msgstr "Connector rosa del quadre frontal"
-
-msgid "Blue Front Panel Connector"
-msgstr "Connector blau del quadre frontal"
-
-msgid "White Front Panel Connector"
-msgstr "Connector blanc del quadre frontal"
-
-msgid "Black Front Panel Connector"
-msgstr "Connector negre del quadre frontal"
-
-msgid "Gray Front Panel Connector"
-msgstr "Connector gris del quadre frontal"
-
-msgid "Orange Front Panel Connector"
-msgstr "Connector taronja del quadre frontal"
-
-msgid "Red Front Panel Connector"
-msgstr "Connector vermell del quadre frontal"
-
-msgid "Yellow Front Panel Connector"
-msgstr "Connector groc del quadre frontal"
-
-msgid "Spread Output"
-msgstr "Sortida de propagació"
-
-msgid "Downmix"
-msgstr "Downmix"
-
-msgid "Virtual Mixer Input"
-msgstr "Entrada del mesclador virtual"
-
-msgid "Virtual Mixer Output"
-msgstr "Sortida del mesclador virtual"
-
-msgid "Virtual Mixer Channels"
-msgstr "Canals del mesclador virtual"
-
-#. TRANSLATORS: name + number of a volume mixer control
-#, c-format
-msgid "%s %d Function"
-msgstr "Funció %s %d"
-
-#. TRANSLATORS: name of a volume mixer control
-#, c-format
-msgid "%s Function"
-msgstr "Funció %s"
-
msgid ""
"Could not open audio device for playback. This version of the Open Sound "
"System is not supported by this element."
@@ -531,12 +148,33 @@ msgstr "Aquest dispositiu d'Ã udio no permet l'enregistrament."
msgid "Error recording from audio device."
msgstr "S'ha produït un error a l'enregistrar des del dispositiu d'à udio."
+msgid "Volume"
+msgstr "Volum"
+
msgid "Gain"
msgstr "Guany"
+msgid "Monitor"
+msgstr "Monitor"
+
+msgid "Built-in Speaker"
+msgstr "Altaveu incorporat"
+
msgid "Headphone"
msgstr "Auriculars"
+msgid "Line Out"
+msgstr "LÃnia de sortida"
+
+msgid "SPDIF Out"
+msgstr "Sortida SPDIF"
+
+msgid "AUX 1 Out"
+msgstr "Sortida AUX 1"
+
+msgid "AUX 2 Out"
+msgstr "Sortida AUX 2"
+
#, c-format
msgid "Error reading %d bytes from device '%s'."
msgstr "S'ha produït un error al llegir %d bytes des del dispositiu «%s»."
@@ -732,6 +370,358 @@ msgstr "Encara no es permet el canvi de la resolució en temps d'execució."
msgid "Cannot operate without a clock"
msgstr "No es pot operar sense un rellotge"
+#~ msgid "Bass"
+#~ msgstr "Baixos"
+
+#~ msgid "Treble"
+#~ msgstr "Aguts"
+
+#~ msgid "Synth"
+#~ msgstr "Sintetitzador"
+
+#~ msgid "PCM"
+#~ msgstr "PCM"
+
+#~ msgid "Speaker"
+#~ msgstr "Altaveu"
+
+#~ msgid "Line-in"
+#~ msgstr "LÃnia d'entrada"
+
+#~ msgid "Microphone"
+#~ msgstr "Micròfon"
+
+#~ msgid "CD"
+#~ msgstr "CD"
+
+#~ msgid "Mixer"
+#~ msgstr "Mesclador"
+
+#~ msgid "PCM-2"
+#~ msgstr "PCM-2"
+
+#~ msgid "Record"
+#~ msgstr "Enregistrament"
+
+#~ msgid "In-gain"
+#~ msgstr "Guany d'entrada"
+
+#~ msgid "Out-gain"
+#~ msgstr "Guany de sortida"
+
+#~ msgid "Line-1"
+#~ msgstr "LÃnia-1"
+
+#~ msgid "Line-2"
+#~ msgstr "LÃnia-2"
+
+#~ msgid "Line-3"
+#~ msgstr "LÃnia-3"
+
+#~ msgid "Digital-1"
+#~ msgstr "Digital-1"
+
+#~ msgid "Digital-2"
+#~ msgstr "Digital-2"
+
+#~ msgid "Digital-3"
+#~ msgstr "Digital-3"
+
+#~ msgid "Phone-in"
+#~ msgstr "Entrada del telèfon"
+
+#~ msgid "Phone-out"
+#~ msgstr "Sortida del telèfon"
+
+#~ msgid "Video"
+#~ msgstr "VÃdeo"
+
+#~ msgid "Radio"
+#~ msgstr "RÃ dio"
+
+#~ msgid "Could not open audio device for mixer control handling."
+#~ msgstr ""
+#~ "No s'ha pogut obrir el dispositiu d'à udio per a la gestió del control del "
+#~ "mesclador."
+
+#~ msgid ""
+#~ "Could not open audio device for mixer control handling. This version of "
+#~ "the Open Sound System is not supported by this element."
+#~ msgstr ""
+#~ "No s'ha pogut obrir el dispositiu d'à udio per a la gestió del control del "
+#~ "mesclador. Aquesta versió de l'Open Sound System no és compatible amb "
+#~ "aquest element."
+
+#~ msgid "Master"
+#~ msgstr "Mestre"
+
+#~ msgid "Front"
+#~ msgstr "Frontal"
+
+#~ msgid "Rear"
+#~ msgstr "Posterior"
+
+#~ msgid "Headphones"
+#~ msgstr "Auriculars"
+
+#~ msgid "Center"
+#~ msgstr "Central"
+
+#~ msgid "LFE"
+#~ msgstr "LFE (efectes de baixa freqüència)"
+
+#~ msgid "Surround"
+#~ msgstr "So envoltant"
+
+#~ msgid "Side"
+#~ msgstr "Lateral"
+
+#~ msgid "AUX Out"
+#~ msgstr "Sortida AUX"
+
+#~ msgid "3D Depth"
+#~ msgstr "Profunditat 3D"
+
+#~ msgid "3D Center"
+#~ msgstr "Centre 3D"
+
+#~ msgid "3D Enhance"
+#~ msgstr "Millora 3D"
+
+#~ msgid "Telephone"
+#~ msgstr "Telèfon"
+
+#~ msgid "Line In"
+#~ msgstr "LÃnia d'entrada"
+
+#~ msgid "Internal CD"
+#~ msgstr "CD intern"
+
+#~ msgid "Video In"
+#~ msgstr "Entrada de vÃdeo"
+
+#~ msgid "AUX 1 In"
+#~ msgstr "Entrada AUX 1"
+
+#~ msgid "AUX 2 In"
+#~ msgstr "Entrada AUX 2"
+
+#~ msgid "AUX In"
+#~ msgstr "Entrada AUX"
+
+#~ msgid "Record Gain"
+#~ msgstr "Guany d'enregistrament"
+
+#~ msgid "Output Gain"
+#~ msgstr "Guany de sortida"
+
+#~ msgid "Microphone Boost"
+#~ msgstr "Amplificació del micròfon"
+
+#~ msgid "Loopback"
+#~ msgstr "Bucle local"
+
+#~ msgid "Diagnostic"
+#~ msgstr "Diagnòstic"
+
+#~ msgid "Bass Boost"
+#~ msgstr "Amplificació dels baixos"
+
+#~ msgid "Playback Ports"
+#~ msgstr "Ports de reproducció"
+
+#~ msgid "Input"
+#~ msgstr "Entrada"
+
+#~ msgid "Record Source"
+#~ msgstr "Font d'enregistrament"
+
+#~ msgid "Monitor Source"
+#~ msgstr "Font del monitor"
+
+#~ msgid "Keyboard Beep"
+#~ msgstr "So del teclat"
+
+#~ msgid "Simulate Stereo"
+#~ msgstr "Estèreo simulat"
+
+#~ msgid "Stereo"
+#~ msgstr "Estèreo"
+
+#~ msgid "Surround Sound"
+#~ msgstr "So envoltant"
+
+#~ msgid "Microphone Gain"
+#~ msgstr "Guany del micròfon"
+
+#~ msgid "Speaker Source"
+#~ msgstr "Font de l'altaveu"
+
+#~ msgid "Microphone Source"
+#~ msgstr "Font del micròfon"
+
+#~ msgid "Jack"
+#~ msgstr "Jack"
+
+#~ msgid "Center / LFE"
+#~ msgstr "Centre / LFE (efectes de baixa freqüència)"
+
+#~ msgid "Stereo Mix"
+#~ msgstr "Mescla estèreo"
+
+#~ msgid "Mono Mix"
+#~ msgstr "Mescla mono"
+
+#~ msgid "Input Mix"
+#~ msgstr "Mescla d'entrada"
+
+#~ msgid "SPDIF In"
+#~ msgstr "Entrada SPDIF"
+
+#~ msgid "Microphone 1"
+#~ msgstr "Micròfon 1"
+
+#~ msgid "Microphone 2"
+#~ msgstr "Micròfon 2"
+
+#~ msgid "Digital Out"
+#~ msgstr "Sortida digital"
+
+#~ msgid "Digital In"
+#~ msgstr "Entrada digital"
+
+#~ msgid "HDMI"
+#~ msgstr "HDMI"
+
+#~ msgid "Modem"
+#~ msgstr "Mòdem"
+
+#~ msgid "Handset"
+#~ msgstr "Comandament a distà ncia"
+
+#~ msgid "Other"
+#~ msgstr "Altres"
+
+#~ msgid "None"
+#~ msgstr "Cap"
+
+#~ msgid "On"
+#~ msgstr "Encès"
+
+#~ msgid "Off"
+#~ msgstr "Apagat"
+
+#~ msgid "Mute"
+#~ msgstr "Silenci"
+
+#~ msgid "Fast"
+#~ msgstr "RÃ pid"
+
+#~ msgid "Very Low"
+#~ msgstr "Molt baixa"
+
+#~ msgid "Low"
+#~ msgstr "Baixa"
+
+#~ msgid "Medium"
+#~ msgstr "Mitjana"
+
+#~ msgid "High"
+#~ msgstr "Alta"
+
+#~ msgid "Very High"
+#~ msgstr "Molt alta"
+
+#~ msgid "Production"
+#~ msgstr "Producció"
+
+#~ msgid "Front Panel Microphone"
+#~ msgstr "Micròfon del quadre frontal"
+
+#~ msgid "Front Panel Line In"
+#~ msgstr "LÃnia d'entrada del quadre frontal"
+
+#~ msgid "Front Panel Headphones"
+#~ msgstr "Auriculars del quadre frontal"
+
+#~ msgid "Front Panel Line Out"
+#~ msgstr "LÃnia de sortida del quadre frontal"
+
+#~ msgid "Green Connector"
+#~ msgstr "Connector verd"
+
+#~ msgid "Pink Connector"
+#~ msgstr "Connector rosa"
+
+#~ msgid "Blue Connector"
+#~ msgstr "Connector blau"
+
+#~ msgid "White Connector"
+#~ msgstr "Connector blanc"
+
+#~ msgid "Black Connector"
+#~ msgstr "Connector negre"
+
+#~ msgid "Gray Connector"
+#~ msgstr "Connector gris"
+
+#~ msgid "Orange Connector"
+#~ msgstr "Connector taronja"
+
+#~ msgid "Red Connector"
+#~ msgstr "Connector vermell"
+
+#~ msgid "Yellow Connector"
+#~ msgstr "Connector groc"
+
+#~ msgid "Green Front Panel Connector"
+#~ msgstr "Connector verd del quadre frontal"
+
+#~ msgid "Pink Front Panel Connector"
+#~ msgstr "Connector rosa del quadre frontal"
+
+#~ msgid "Blue Front Panel Connector"
+#~ msgstr "Connector blau del quadre frontal"
+
+#~ msgid "White Front Panel Connector"
+#~ msgstr "Connector blanc del quadre frontal"
+
+#~ msgid "Black Front Panel Connector"
+#~ msgstr "Connector negre del quadre frontal"
+
+#~ msgid "Gray Front Panel Connector"
+#~ msgstr "Connector gris del quadre frontal"
+
+#~ msgid "Orange Front Panel Connector"
+#~ msgstr "Connector taronja del quadre frontal"
+
+#~ msgid "Red Front Panel Connector"
+#~ msgstr "Connector vermell del quadre frontal"
+
+#~ msgid "Yellow Front Panel Connector"
+#~ msgstr "Connector groc del quadre frontal"
+
+#~ msgid "Spread Output"
+#~ msgstr "Sortida de propagació"
+
+#~ msgid "Downmix"
+#~ msgstr "Downmix"
+
+#~ msgid "Virtual Mixer Input"
+#~ msgstr "Entrada del mesclador virtual"
+
+#~ msgid "Virtual Mixer Output"
+#~ msgstr "Sortida del mesclador virtual"
+
+#~ msgid "Virtual Mixer Channels"
+#~ msgstr "Canals del mesclador virtual"
+
+#~ msgid "%s %d Function"
+#~ msgstr "Funció %s %d"
+
+#~ msgid "%s Function"
+#~ msgstr "Funció %s"
+
#~ msgid "Could not establish connection to sound server"
#~ msgstr "No s'ha pogut establir la connexió al servidor de so"
diff --git a/po/cs.gmo b/po/cs.gmo
index 03d3d829a3d4d42dd7c9f48c3e1e26b058b98ff7..96c71efe9afe99c3b5f2fcb8fbd10ea0315baf97 100644
Binary files a/po/cs.gmo and b/po/cs.gmo differ
diff --git a/po/cs.po b/po/cs.po
index 0516d343b7898183f00b6f72c65493fcbfab9eaa..4008c31ebf15de111dcb11d15a79ffaf03fa0bc5 100644
--- a/po/cs.po
+++ b/po/cs.po
@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: gst-plugins-good-0.10.26.2\n"
"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/\n"
-"POT-Creation-Date: 2012-04-12 10:26+0200\n"
+"POT-Creation-Date: 2012-05-13 16:29+0200\n"
"PO-Revision-Date: 2011-01-12 23:07+0100\n"
"Last-Translator: Petr Kovar <pknbe@volny.cz>\n"
"Language-Team: Czech <translation-team-cs@lists.sourceforge.net>\n"
@@ -99,81 +99,6 @@ msgstr ""
msgid "Internal data flow error."
msgstr "Vnitřnà chyba datového toku."
-msgid "Volume"
-msgstr "Hlasitost"
-
-msgid "Bass"
-msgstr "Basy"
-
-msgid "Treble"
-msgstr "Výšky"
-
-msgid "Synth"
-msgstr "Syntezátor"
-
-msgid "PCM"
-msgstr "PCM"
-
-msgid "Speaker"
-msgstr "Reproduktor"
-
-msgid "Line-in"
-msgstr "Linkový vstup"
-
-msgid "Microphone"
-msgstr "Mikrofon"
-
-msgid "CD"
-msgstr "CD"
-
-msgid "Mixer"
-msgstr "SměšovaÄ"
-
-msgid "PCM-2"
-msgstr "PCM 2"
-
-msgid "Record"
-msgstr "NahrávánÃ"
-
-msgid "In-gain"
-msgstr "Vstupnà zesÃlenÃ"
-
-msgid "Out-gain"
-msgstr "Výstupnà zesÃlenÃ"
-
-msgid "Line-1"
-msgstr "Linka 1"
-
-msgid "Line-2"
-msgstr "Linka 2"
-
-msgid "Line-3"
-msgstr "Linka 3"
-
-msgid "Digital-1"
-msgstr "Digitálnà 1"
-
-msgid "Digital-2"
-msgstr "Digitálnà 2"
-
-msgid "Digital-3"
-msgstr "Digitálnà 3"
-
-msgid "Phone-in"
-msgstr "Telefonnà vstup"
-
-msgid "Phone-out"
-msgstr "Telefonnà výstup"
-
-msgid "Video"
-msgstr "Video"
-
-msgid "Radio"
-msgstr "Rádio"
-
-msgid "Monitor"
-msgstr "Monitor"
-
msgid ""
"Could not open audio device for playback. Device is being used by another "
"application."
@@ -201,312 +126,6 @@ msgstr ""
msgid "Could not open audio device for recording."
msgstr "Zvukové zaÅ™Ãzenà nelze otevÅ™Ãt k nahrávánÃ."
-msgid "Could not open audio device for mixer control handling."
-msgstr ""
-"NezdaÅ™ilo se otevÅ™enà zvukového zaÅ™Ãzenà pro obsluhu ovládánà směšovaÄe."
-
-msgid ""
-"Could not open audio device for mixer control handling. This version of the "
-"Open Sound System is not supported by this element."
-msgstr ""
-"NezdaÅ™ilo se otevÅ™enà zvukového zaÅ™Ãzenà k obsluze ovládánà směšovaÄe. Tato "
-"verze Open Sound System nenà pÅ™ÃsluÅ¡ným prvkem podporována."
-
-msgid "Master"
-msgstr "Master"
-
-msgid "Front"
-msgstr "PÅ™ednÃ"
-
-msgid "Rear"
-msgstr "ZadnÃ"
-
-msgid "Headphones"
-msgstr "Sluchátka"
-
-msgid "Center"
-msgstr "Středový"
-
-msgid "LFE"
-msgstr "LFE"
-
-msgid "Surround"
-msgstr "Prostorový zvuk"
-
-msgid "Side"
-msgstr "BoÄnÃ"
-
-msgid "Built-in Speaker"
-msgstr "Zabudovaný reproduktor"
-
-msgid "AUX 1 Out"
-msgstr "Výstup AUX 1"
-
-msgid "AUX 2 Out"
-msgstr "Výstup AUX 2"
-
-msgid "AUX Out"
-msgstr "Výstup AUX"
-
-msgid "3D Depth"
-msgstr "Hloubka prostorového zvuku"
-
-msgid "3D Center"
-msgstr "Střed prostorového zvuku"
-
-msgid "3D Enhance"
-msgstr "Prostorové rozÅ¡ÃÅ™enÃ"
-
-msgid "Telephone"
-msgstr "Telefon"
-
-msgid "Line Out"
-msgstr "Linkový výstup"
-
-msgid "Line In"
-msgstr "Linkový vstup"
-
-msgid "Internal CD"
-msgstr "Vnitřnà CD"
-
-msgid "Video In"
-msgstr "Vstup videa"
-
-msgid "AUX 1 In"
-msgstr "Vstup AUX 1"
-
-msgid "AUX 2 In"
-msgstr "Vstup AUX 2"
-
-msgid "AUX In"
-msgstr "Vstup AUX"
-
-msgid "Record Gain"
-msgstr "ZesÃlenà záznamu"
-
-msgid "Output Gain"
-msgstr "Výstupnà zesÃlenÃ"
-
-msgid "Microphone Boost"
-msgstr "ZesÃlenà mikrofonu"
-
-msgid "Loopback"
-msgstr "ZpÄ›tná smyÄka"
-
-msgid "Diagnostic"
-msgstr "Diagnostika"
-
-msgid "Bass Boost"
-msgstr "ZesÃlenà basů"
-
-msgid "Playback Ports"
-msgstr "Porty pÅ™ehrávánÃ"
-
-msgid "Input"
-msgstr "Vstup"
-
-msgid "Record Source"
-msgstr "Zdroj záznamu"
-
-msgid "Monitor Source"
-msgstr "Zdroj monitoru"
-
-msgid "Keyboard Beep"
-msgstr "Zvukové znamenà klávesnice"
-
-msgid "Simulate Stereo"
-msgstr "Napodobit stereo"
-
-msgid "Stereo"
-msgstr "Stereo"
-
-msgid "Surround Sound"
-msgstr "Prostorový zvuk"
-
-msgid "Microphone Gain"
-msgstr "ZesÃlenà mikrofonu"
-
-msgid "Speaker Source"
-msgstr "Zdroj reproduktoru"
-
-msgid "Microphone Source"
-msgstr "Zdroj mikrofonu"
-
-msgid "Jack"
-msgstr "Jack"
-
-msgid "Center / LFE"
-msgstr "Středový / LFE"
-
-msgid "Stereo Mix"
-msgstr "SměšovaÄ stereo"
-
-msgid "Mono Mix"
-msgstr "SměšovaÄ mono"
-
-msgid "Input Mix"
-msgstr "SměšovaÄ vstupu"
-
-msgid "SPDIF In"
-msgstr "Vstup SPDIF"
-
-msgid "SPDIF Out"
-msgstr "Výstup SPDIF"
-
-msgid "Microphone 1"
-msgstr "Mikrofon 1"
-
-msgid "Microphone 2"
-msgstr "Mikrofon 2"
-
-msgid "Digital Out"
-msgstr "Digitálnà výstup"
-
-msgid "Digital In"
-msgstr "Digitálnà vstup"
-
-msgid "HDMI"
-msgstr "HDMI"
-
-msgid "Modem"
-msgstr "Modem"
-
-msgid "Handset"
-msgstr "Telefonnà sluchátko"
-
-msgid "Other"
-msgstr "Jiné"
-
-msgid "None"
-msgstr "Žádné"
-
-msgid "On"
-msgstr "Zapnuto"
-
-msgid "Off"
-msgstr "Vypnuto"
-
-msgid "Mute"
-msgstr "Ztlumit"
-
-msgid "Fast"
-msgstr "Rychlé"
-
-#. TRANSLATORS: "Very Low" is a quality setting here
-msgid "Very Low"
-msgstr "Velmi nÃzké"
-
-#. TRANSLATORS: "Low" is a quality setting here
-msgid "Low"
-msgstr "NÃzké"
-
-#. TRANSLATORS: "Medium" is a quality setting here
-msgid "Medium"
-msgstr "StÅ™ednÃ"
-
-#. TRANSLATORS: "High" is a quality setting here
-msgid "High"
-msgstr "Vysoké"
-
-#. TRANSLATORS: "Very High" is a quality setting here
-msgid "Very High"
-msgstr "Velmi vysoké"
-
-#. TRANSLATORS: "Production" is a quality setting here
-msgid "Production"
-msgstr "Výroba"
-
-msgid "Front Panel Microphone"
-msgstr "Mikrofon na pÅ™ednÃm panelu"
-
-msgid "Front Panel Line In"
-msgstr "Linkový vstup na pÅ™ednÃm panelu"
-
-msgid "Front Panel Headphones"
-msgstr "Sluchátka na pÅ™ednÃm panelu"
-
-msgid "Front Panel Line Out"
-msgstr "Linkový výstup na pÅ™ednÃm panelu"
-
-msgid "Green Connector"
-msgstr "Zelený konektor"
-
-msgid "Pink Connector"
-msgstr "Růžový konektor"
-
-msgid "Blue Connector"
-msgstr "Modrý konektor"
-
-msgid "White Connector"
-msgstr "BÃlý konektor"
-
-msgid "Black Connector"
-msgstr "Černý konektor"
-
-msgid "Gray Connector"
-msgstr "Šedý konektor"
-
-msgid "Orange Connector"
-msgstr "Oranžový konektor"
-
-msgid "Red Connector"
-msgstr "Červený konektor"
-
-msgid "Yellow Connector"
-msgstr "Žlutý konektor"
-
-msgid "Green Front Panel Connector"
-msgstr "Zelený konektor na pÅ™ednÃm panelu"
-
-msgid "Pink Front Panel Connector"
-msgstr "Růžový konektor na pÅ™ednÃm panelu"
-
-msgid "Blue Front Panel Connector"
-msgstr "Modrý konektor na pÅ™ednÃm panelu"
-
-msgid "White Front Panel Connector"
-msgstr "BÃlý konektor na pÅ™ednÃm panelu"
-
-msgid "Black Front Panel Connector"
-msgstr "ÄŒerný konektor na pÅ™ednÃm panelu"
-
-msgid "Gray Front Panel Connector"
-msgstr "Å edý konektor na pÅ™ednÃm panelu"
-
-msgid "Orange Front Panel Connector"
-msgstr "Oranžový konektor na pÅ™ednÃm panelu"
-
-msgid "Red Front Panel Connector"
-msgstr "ÄŒervený konektor na pÅ™ednÃm panelu"
-
-msgid "Yellow Front Panel Connector"
-msgstr "Žlutý konektor na pÅ™ednÃm panelu"
-
-msgid "Spread Output"
-msgstr "Rozložený výstup"
-
-msgid "Downmix"
-msgstr "SnÞenà poÄtu kanálů"
-
-msgid "Virtual Mixer Input"
-msgstr "Vstup virtuálnÃho směšovaÄe"
-
-msgid "Virtual Mixer Output"
-msgstr "Výstup virtuálnÃho směšovaÄe"
-
-msgid "Virtual Mixer Channels"
-msgstr "Kanály virtuálnÃho směšovaÄe"
-
-#. TRANSLATORS: name + number of a volume mixer control
-#, c-format
-msgid "%s %d Function"
-msgstr "%s %d (funkce)"
-
-#. TRANSLATORS: name of a volume mixer control
-#, c-format
-msgid "%s Function"
-msgstr "%s (funkce)"
-
msgid ""
"Could not open audio device for playback. This version of the Open Sound "
"System is not supported by this element."
@@ -526,12 +145,33 @@ msgstr "Toto zvukové zaÅ™Ãzenà nepodporuje nahrávánÃ."
msgid "Error recording from audio device."
msgstr "Chyba pÅ™i nahrávánà ze zvukového zaÅ™ÃzenÃ."
+msgid "Volume"
+msgstr "Hlasitost"
+
msgid "Gain"
msgstr "ZesÃlenÃ"
+msgid "Monitor"
+msgstr "Monitor"
+
+msgid "Built-in Speaker"
+msgstr "Zabudovaný reproduktor"
+
msgid "Headphone"
msgstr "Sluchátko"
+msgid "Line Out"
+msgstr "Linkový výstup"
+
+msgid "SPDIF Out"
+msgstr "Výstup SPDIF"
+
+msgid "AUX 1 Out"
+msgstr "Výstup AUX 1"
+
+msgid "AUX 2 Out"
+msgstr "Výstup AUX 2"
+
#, c-format
msgid "Error reading %d bytes from device '%s'."
msgstr "Chyba pÅ™i Ätenà %d bajtů na zaÅ™Ãzenà \"%s\"."
@@ -710,6 +350,356 @@ msgstr "Změna rozlišenà za běhu doposud nenà podporována."
msgid "Cannot operate without a clock"
msgstr "Nenà možné fungovat bez hodin"
+#~ msgid "Bass"
+#~ msgstr "Basy"
+
+#~ msgid "Treble"
+#~ msgstr "Výšky"
+
+#~ msgid "Synth"
+#~ msgstr "Syntezátor"
+
+#~ msgid "PCM"
+#~ msgstr "PCM"
+
+#~ msgid "Speaker"
+#~ msgstr "Reproduktor"
+
+#~ msgid "Line-in"
+#~ msgstr "Linkový vstup"
+
+#~ msgid "Microphone"
+#~ msgstr "Mikrofon"
+
+#~ msgid "CD"
+#~ msgstr "CD"
+
+#~ msgid "Mixer"
+#~ msgstr "SměšovaÄ"
+
+#~ msgid "PCM-2"
+#~ msgstr "PCM 2"
+
+#~ msgid "Record"
+#~ msgstr "NahrávánÃ"
+
+#~ msgid "In-gain"
+#~ msgstr "Vstupnà zesÃlenÃ"
+
+#~ msgid "Out-gain"
+#~ msgstr "Výstupnà zesÃlenÃ"
+
+#~ msgid "Line-1"
+#~ msgstr "Linka 1"
+
+#~ msgid "Line-2"
+#~ msgstr "Linka 2"
+
+#~ msgid "Line-3"
+#~ msgstr "Linka 3"
+
+#~ msgid "Digital-1"
+#~ msgstr "Digitálnà 1"
+
+#~ msgid "Digital-2"
+#~ msgstr "Digitálnà 2"
+
+#~ msgid "Digital-3"
+#~ msgstr "Digitálnà 3"
+
+#~ msgid "Phone-in"
+#~ msgstr "Telefonnà vstup"
+
+#~ msgid "Phone-out"
+#~ msgstr "Telefonnà výstup"
+
+#~ msgid "Video"
+#~ msgstr "Video"
+
+#~ msgid "Radio"
+#~ msgstr "Rádio"
+
+#~ msgid "Could not open audio device for mixer control handling."
+#~ msgstr ""
+#~ "NezdaÅ™ilo se otevÅ™enà zvukového zaÅ™Ãzenà pro obsluhu ovládánà směšovaÄe."
+
+#~ msgid ""
+#~ "Could not open audio device for mixer control handling. This version of "
+#~ "the Open Sound System is not supported by this element."
+#~ msgstr ""
+#~ "NezdaÅ™ilo se otevÅ™enà zvukového zaÅ™Ãzenà k obsluze ovládánà směšovaÄe. "
+#~ "Tato verze Open Sound System nenà pÅ™ÃsluÅ¡ným prvkem podporována."
+
+#~ msgid "Master"
+#~ msgstr "Master"
+
+#~ msgid "Front"
+#~ msgstr "PÅ™ednÃ"
+
+#~ msgid "Rear"
+#~ msgstr "ZadnÃ"
+
+#~ msgid "Headphones"
+#~ msgstr "Sluchátka"
+
+#~ msgid "Center"
+#~ msgstr "Středový"
+
+#~ msgid "LFE"
+#~ msgstr "LFE"
+
+#~ msgid "Surround"
+#~ msgstr "Prostorový zvuk"
+
+#~ msgid "Side"
+#~ msgstr "BoÄnÃ"
+
+#~ msgid "AUX Out"
+#~ msgstr "Výstup AUX"
+
+#~ msgid "3D Depth"
+#~ msgstr "Hloubka prostorového zvuku"
+
+#~ msgid "3D Center"
+#~ msgstr "Střed prostorového zvuku"
+
+#~ msgid "3D Enhance"
+#~ msgstr "Prostorové rozÅ¡ÃÅ™enÃ"
+
+#~ msgid "Telephone"
+#~ msgstr "Telefon"
+
+#~ msgid "Line In"
+#~ msgstr "Linkový vstup"
+
+#~ msgid "Internal CD"
+#~ msgstr "Vnitřnà CD"
+
+#~ msgid "Video In"
+#~ msgstr "Vstup videa"
+
+#~ msgid "AUX 1 In"
+#~ msgstr "Vstup AUX 1"
+
+#~ msgid "AUX 2 In"
+#~ msgstr "Vstup AUX 2"
+
+#~ msgid "AUX In"
+#~ msgstr "Vstup AUX"
+
+#~ msgid "Record Gain"
+#~ msgstr "ZesÃlenà záznamu"
+
+#~ msgid "Output Gain"
+#~ msgstr "Výstupnà zesÃlenÃ"
+
+#~ msgid "Microphone Boost"
+#~ msgstr "ZesÃlenà mikrofonu"
+
+#~ msgid "Loopback"
+#~ msgstr "ZpÄ›tná smyÄka"
+
+#~ msgid "Diagnostic"
+#~ msgstr "Diagnostika"
+
+#~ msgid "Bass Boost"
+#~ msgstr "ZesÃlenà basů"
+
+#~ msgid "Playback Ports"
+#~ msgstr "Porty pÅ™ehrávánÃ"
+
+#~ msgid "Input"
+#~ msgstr "Vstup"
+
+#~ msgid "Record Source"
+#~ msgstr "Zdroj záznamu"
+
+#~ msgid "Monitor Source"
+#~ msgstr "Zdroj monitoru"
+
+#~ msgid "Keyboard Beep"
+#~ msgstr "Zvukové znamenà klávesnice"
+
+#~ msgid "Simulate Stereo"
+#~ msgstr "Napodobit stereo"
+
+#~ msgid "Stereo"
+#~ msgstr "Stereo"
+
+#~ msgid "Surround Sound"
+#~ msgstr "Prostorový zvuk"
+
+#~ msgid "Microphone Gain"
+#~ msgstr "ZesÃlenà mikrofonu"
+
+#~ msgid "Speaker Source"
+#~ msgstr "Zdroj reproduktoru"
+
+#~ msgid "Microphone Source"
+#~ msgstr "Zdroj mikrofonu"
+
+#~ msgid "Jack"
+#~ msgstr "Jack"
+
+#~ msgid "Center / LFE"
+#~ msgstr "Středový / LFE"
+
+#~ msgid "Stereo Mix"
+#~ msgstr "SměšovaÄ stereo"
+
+#~ msgid "Mono Mix"
+#~ msgstr "SměšovaÄ mono"
+
+#~ msgid "Input Mix"
+#~ msgstr "SměšovaÄ vstupu"
+
+#~ msgid "SPDIF In"
+#~ msgstr "Vstup SPDIF"
+
+#~ msgid "Microphone 1"
+#~ msgstr "Mikrofon 1"
+
+#~ msgid "Microphone 2"
+#~ msgstr "Mikrofon 2"
+
+#~ msgid "Digital Out"
+#~ msgstr "Digitálnà výstup"
+
+#~ msgid "Digital In"
+#~ msgstr "Digitálnà vstup"
+
+#~ msgid "HDMI"
+#~ msgstr "HDMI"
+
+#~ msgid "Modem"
+#~ msgstr "Modem"
+
+#~ msgid "Handset"
+#~ msgstr "Telefonnà sluchátko"
+
+#~ msgid "Other"
+#~ msgstr "Jiné"
+
+#~ msgid "None"
+#~ msgstr "Žádné"
+
+#~ msgid "On"
+#~ msgstr "Zapnuto"
+
+#~ msgid "Off"
+#~ msgstr "Vypnuto"
+
+#~ msgid "Mute"
+#~ msgstr "Ztlumit"
+
+#~ msgid "Fast"
+#~ msgstr "Rychlé"
+
+#~ msgid "Very Low"
+#~ msgstr "Velmi nÃzké"
+
+#~ msgid "Low"
+#~ msgstr "NÃzké"
+
+#~ msgid "Medium"
+#~ msgstr "StÅ™ednÃ"
+
+#~ msgid "High"
+#~ msgstr "Vysoké"
+
+#~ msgid "Very High"
+#~ msgstr "Velmi vysoké"
+
+#~ msgid "Production"
+#~ msgstr "Výroba"
+
+#~ msgid "Front Panel Microphone"
+#~ msgstr "Mikrofon na pÅ™ednÃm panelu"
+
+#~ msgid "Front Panel Line In"
+#~ msgstr "Linkový vstup na pÅ™ednÃm panelu"
+
+#~ msgid "Front Panel Headphones"
+#~ msgstr "Sluchátka na pÅ™ednÃm panelu"
+
+#~ msgid "Front Panel Line Out"
+#~ msgstr "Linkový výstup na pÅ™ednÃm panelu"
+
+#~ msgid "Green Connector"
+#~ msgstr "Zelený konektor"
+
+#~ msgid "Pink Connector"
+#~ msgstr "Růžový konektor"
+
+#~ msgid "Blue Connector"
+#~ msgstr "Modrý konektor"
+
+#~ msgid "White Connector"
+#~ msgstr "BÃlý konektor"
+
+#~ msgid "Black Connector"
+#~ msgstr "Černý konektor"
+
+#~ msgid "Gray Connector"
+#~ msgstr "Šedý konektor"
+
+#~ msgid "Orange Connector"
+#~ msgstr "Oranžový konektor"
+
+#~ msgid "Red Connector"
+#~ msgstr "Červený konektor"
+
+#~ msgid "Yellow Connector"
+#~ msgstr "Žlutý konektor"
+
+#~ msgid "Green Front Panel Connector"
+#~ msgstr "Zelený konektor na pÅ™ednÃm panelu"
+
+#~ msgid "Pink Front Panel Connector"
+#~ msgstr "Růžový konektor na pÅ™ednÃm panelu"
+
+#~ msgid "Blue Front Panel Connector"
+#~ msgstr "Modrý konektor na pÅ™ednÃm panelu"
+
+#~ msgid "White Front Panel Connector"
+#~ msgstr "BÃlý konektor na pÅ™ednÃm panelu"
+
+#~ msgid "Black Front Panel Connector"
+#~ msgstr "ÄŒerný konektor na pÅ™ednÃm panelu"
+
+#~ msgid "Gray Front Panel Connector"
+#~ msgstr "Å edý konektor na pÅ™ednÃm panelu"
+
+#~ msgid "Orange Front Panel Connector"
+#~ msgstr "Oranžový konektor na pÅ™ednÃm panelu"
+
+#~ msgid "Red Front Panel Connector"
+#~ msgstr "ÄŒervený konektor na pÅ™ednÃm panelu"
+
+#~ msgid "Yellow Front Panel Connector"
+#~ msgstr "Žlutý konektor na pÅ™ednÃm panelu"
+
+#~ msgid "Spread Output"
+#~ msgstr "Rozložený výstup"
+
+#~ msgid "Downmix"
+#~ msgstr "SnÞenà poÄtu kanálů"
+
+#~ msgid "Virtual Mixer Input"
+#~ msgstr "Vstup virtuálnÃho směšovaÄe"
+
+#~ msgid "Virtual Mixer Output"
+#~ msgstr "Výstup virtuálnÃho směšovaÄe"
+
+#~ msgid "Virtual Mixer Channels"
+#~ msgstr "Kanály virtuálnÃho směšovaÄe"
+
+#~ msgid "%s %d Function"
+#~ msgstr "%s %d (funkce)"
+
+#~ msgid "%s Function"
+#~ msgstr "%s (funkce)"
+
#~ msgid "Error reading %d bytes on device '%s'."
#~ msgstr "Chyba pÅ™i Ätenà %d bajtů na zaÅ™Ãzenà \"%s\"."
diff --git a/po/da.gmo b/po/da.gmo
index cce72103f3a38873309592fed2aa47b836621fba..e267a4048ca2ef9be99ada23cb513ff1239def51 100644
Binary files a/po/da.gmo and b/po/da.gmo differ
diff --git a/po/da.po b/po/da.po
index 37a991efba83ded60d3b9b4003707d7e6486f3c6..e42b0744824ba17e6097cdd5057ec43c14ca105e 100644
--- a/po/da.po
+++ b/po/da.po
@@ -12,7 +12,7 @@ msgid ""
msgstr ""
"Project-Id-Version: gst-plugins-good-0.10.26.2\n"
"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/\n"
-"POT-Creation-Date: 2012-04-12 10:26+0200\n"
+"POT-Creation-Date: 2012-05-13 16:29+0200\n"
"PO-Revision-Date: 2011-01-07 23:54+0200\n"
"Last-Translator: Joe Hansen <joedalton2@yahoo.dk>\n"
"Language-Team: Danish <dansk@dansk-gruppen.dk>\n"
@@ -105,83 +105,6 @@ msgstr ""
msgid "Internal data flow error."
msgstr "Intern datastrømsfejl."
-msgid "Volume"
-msgstr "Lydstyrke"
-
-msgid "Bass"
-msgstr "Bas"
-
-msgid "Treble"
-msgstr "Diskant"
-
-msgid "Synth"
-msgstr "Synth"
-
-msgid "PCM"
-msgstr "PCM"
-
-msgid "Speaker"
-msgstr "Højtaler"
-
-msgid "Line-in"
-msgstr "Linje-ind"
-
-msgid "Microphone"
-msgstr "Mikrofon"
-
-msgid "CD"
-msgstr "Cd"
-
-msgid "Mixer"
-msgstr "Mikser"
-
-msgid "PCM-2"
-msgstr "PCM-2"
-
-msgid "Record"
-msgstr "Optag"
-
-msgid "In-gain"
-msgstr "Ind-forhøjelse"
-
-msgid "Out-gain"
-msgstr "Ud-forhøjelse"
-
-msgid "Line-1"
-msgstr "Linje-1"
-
-msgid "Line-2"
-msgstr "Linje-2"
-
-msgid "Line-3"
-msgstr "Linje-3"
-
-msgid "Digital-1"
-msgstr "Digital-1"
-
-msgid "Digital-2"
-msgstr "Digital-2"
-
-msgid "Digital-3"
-msgstr "Digital-3"
-
-# Eller Phono-ind
-msgid "Phone-in"
-msgstr "Lyd-ind"
-
-# Eller Phono-ud
-msgid "Phone-out"
-msgstr "Lyd-ud"
-
-msgid "Video"
-msgstr "Video"
-
-msgid "Radio"
-msgstr "Radio"
-
-msgid "Monitor"
-msgstr "Monitor"
-
msgid ""
"Could not open audio device for playback. Device is being used by another "
"application."
@@ -209,312 +132,6 @@ msgstr ""
msgid "Could not open audio device for recording."
msgstr "Kunne ikke åbne lydenhed til optagelse."
-msgid "Could not open audio device for mixer control handling."
-msgstr "Kunne ikke åbne lydenhed til håndtering af mikserkontrol."
-
-msgid ""
-"Could not open audio device for mixer control handling. This version of the "
-"Open Sound System is not supported by this element."
-msgstr ""
-"Kunne ikke åbne lydenhed til håndtering af mikserkontrol. Denne version af "
-"Open Sound System er ikke understøttet af dette element."
-
-msgid "Master"
-msgstr "Master"
-
-msgid "Front"
-msgstr "Front"
-
-msgid "Rear"
-msgstr "Bagende"
-
-msgid "Headphones"
-msgstr "Hovedtelefoner"
-
-msgid "Center"
-msgstr "Centrum"
-
-# Low-frequency effect
-msgid "LFE"
-msgstr "LFE"
-
-msgid "Surround"
-msgstr "Surround"
-
-msgid "Side"
-msgstr "Side"
-
-msgid "Built-in Speaker"
-msgstr "Indbygget højtaler"
-
-msgid "AUX 1 Out"
-msgstr "AUX 1 ud"
-
-msgid "AUX 2 Out"
-msgstr "AUX 2 ud"
-
-msgid "AUX Out"
-msgstr "AUX ud"
-
-msgid "3D Depth"
-msgstr "3D-dybde"
-
-msgid "3D Center"
-msgstr "3D-centrum"
-
-msgid "3D Enhance"
-msgstr "3D-forstærkning"
-
-msgid "Telephone"
-msgstr "Telefon"
-
-msgid "Line Out"
-msgstr "Linje ud"
-
-msgid "Line In"
-msgstr "Linje ind"
-
-msgid "Internal CD"
-msgstr "Intern cd"
-
-msgid "Video In"
-msgstr "Video ind"
-
-msgid "AUX 1 In"
-msgstr "AUX 1 ind"
-
-msgid "AUX 2 In"
-msgstr "AUX 2 ind"
-
-msgid "AUX In"
-msgstr "AUX ind"
-
-msgid "Record Gain"
-msgstr "Optag - forhøjelse"
-
-msgid "Output Gain"
-msgstr "Uddata - forhøjelse"
-
-msgid "Microphone Boost"
-msgstr "Mikrofonøgning"
-
-msgid "Loopback"
-msgstr "Loopback"
-
-msgid "Diagnostic"
-msgstr "Diagnostik"
-
-msgid "Bass Boost"
-msgstr "Bas-øgning"
-
-msgid "Playback Ports"
-msgstr "Afspilningsporte"
-
-msgid "Input"
-msgstr "Inddata"
-
-msgid "Record Source"
-msgstr "Optag kilde"
-
-msgid "Monitor Source"
-msgstr "Skærmkilde"
-
-msgid "Keyboard Beep"
-msgstr "Tastaturbeep"
-
-msgid "Simulate Stereo"
-msgstr "Simuler stereo"
-
-msgid "Stereo"
-msgstr "Stereo"
-
-msgid "Surround Sound"
-msgstr "Surroundlyd"
-
-msgid "Microphone Gain"
-msgstr "Mikrofonforhøjelse"
-
-msgid "Speaker Source"
-msgstr "Højtalerkilde"
-
-msgid "Microphone Source"
-msgstr "Mikrofonkilde"
-
-msgid "Jack"
-msgstr "Jack"
-
-msgid "Center / LFE"
-msgstr "Center / LFE"
-
-msgid "Stereo Mix"
-msgstr "Stereomiks"
-
-msgid "Mono Mix"
-msgstr "Monomiks"
-
-msgid "Input Mix"
-msgstr "Inddatamiks"
-
-msgid "SPDIF In"
-msgstr "SPDIF ind"
-
-msgid "SPDIF Out"
-msgstr "SPDIF ud"
-
-msgid "Microphone 1"
-msgstr "Mikrofon 1"
-
-msgid "Microphone 2"
-msgstr "Mikrofon 2"
-
-msgid "Digital Out"
-msgstr "Digital ud"
-
-msgid "Digital In"
-msgstr "Digital ind"
-
-msgid "HDMI"
-msgstr "HDMI"
-
-msgid "Modem"
-msgstr "Modem"
-
-msgid "Handset"
-msgstr "Håndsæt"
-
-msgid "Other"
-msgstr "Andet"
-
-msgid "None"
-msgstr "Ingen"
-
-msgid "On"
-msgstr "Tænd"
-
-msgid "Off"
-msgstr "Sluk"
-
-msgid "Mute"
-msgstr "Slukket"
-
-msgid "Fast"
-msgstr "Hurtig"
-
-#. TRANSLATORS: "Very Low" is a quality setting here
-msgid "Very Low"
-msgstr "Meget lav"
-
-#. TRANSLATORS: "Low" is a quality setting here
-msgid "Low"
-msgstr "Lav"
-
-#. TRANSLATORS: "Medium" is a quality setting here
-msgid "Medium"
-msgstr "Mellem"
-
-#. TRANSLATORS: "High" is a quality setting here
-msgid "High"
-msgstr "Høj"
-
-#. TRANSLATORS: "Very High" is a quality setting here
-msgid "Very High"
-msgstr "Meget høj"
-
-#. TRANSLATORS: "Production" is a quality setting here
-msgid "Production"
-msgstr "Produktion"
-
-msgid "Front Panel Microphone"
-msgstr "Frontpanelmikrofon"
-
-msgid "Front Panel Line In"
-msgstr "Frontpanels linje ind"
-
-msgid "Front Panel Headphones"
-msgstr "Frontpanels hovedtelefoner"
-
-msgid "Front Panel Line Out"
-msgstr "Frontpanels linje ud"
-
-msgid "Green Connector"
-msgstr "Grøn forbindelse "
-
-msgid "Pink Connector"
-msgstr "Lyserød forbindelse"
-
-msgid "Blue Connector"
-msgstr "Blå forbindelse"
-
-msgid "White Connector"
-msgstr "Hvid forbindelse"
-
-msgid "Black Connector"
-msgstr "Sort forbindelse"
-
-msgid "Gray Connector"
-msgstr "Grå forbindelse"
-
-msgid "Orange Connector"
-msgstr "Orange forbindelse"
-
-msgid "Red Connector"
-msgstr "Rød forbindelse"
-
-msgid "Yellow Connector"
-msgstr "Gul forbindelse"
-
-msgid "Green Front Panel Connector"
-msgstr "Grøn frontpanelforbindelse"
-
-msgid "Pink Front Panel Connector"
-msgstr "Lyserød frontpanelforbindelse"
-
-msgid "Blue Front Panel Connector"
-msgstr "Blå frontpanelforbindelse"
-
-msgid "White Front Panel Connector"
-msgstr "Hvid frontpanelforbindelse"
-
-msgid "Black Front Panel Connector"
-msgstr "Sort frontpanelforbindelse"
-
-msgid "Gray Front Panel Connector"
-msgstr "Grå frontpanelforbindelse"
-
-msgid "Orange Front Panel Connector"
-msgstr "Orange frontpanelforbindelse"
-
-msgid "Red Front Panel Connector"
-msgstr "Rød frontpanelforbindelse"
-
-msgid "Yellow Front Panel Connector"
-msgstr "Gul frontpanelforbindelse"
-
-msgid "Spread Output"
-msgstr "Spred uddata"
-
-msgid "Downmix"
-msgstr "Downmix"
-
-msgid "Virtual Mixer Input"
-msgstr "Virtuel mikserinddata"
-
-msgid "Virtual Mixer Output"
-msgstr "Virtuel mikseruddata"
-
-msgid "Virtual Mixer Channels"
-msgstr "Virtuel mikserkanaler"
-
-#. TRANSLATORS: name + number of a volume mixer control
-#, c-format
-msgid "%s %d Function"
-msgstr "%s %d funktion"
-
-#. TRANSLATORS: name of a volume mixer control
-#, c-format
-msgid "%s Function"
-msgstr "%s funktion"
-
msgid ""
"Could not open audio device for playback. This version of the Open Sound "
"System is not supported by this element."
@@ -534,12 +151,33 @@ msgstr "Optagelse er ikke understøttet af denne lydenhed."
msgid "Error recording from audio device."
msgstr "Fejl ved optagelse fra lydenhed."
+msgid "Volume"
+msgstr "Lydstyrke"
+
msgid "Gain"
msgstr "Forhøjelse"
+msgid "Monitor"
+msgstr "Monitor"
+
+msgid "Built-in Speaker"
+msgstr "Indbygget højtaler"
+
msgid "Headphone"
msgstr "Hovedtelefon"
+msgid "Line Out"
+msgstr "Linje ud"
+
+msgid "SPDIF Out"
+msgstr "SPDIF ud"
+
+msgid "AUX 1 Out"
+msgstr "AUX 1 ud"
+
+msgid "AUX 2 Out"
+msgstr "AUX 2 ud"
+
#, c-format
msgid "Error reading %d bytes from device '%s'."
msgstr "Fejl ved læsning af %d byte på enhed '%s'."
@@ -715,6 +353,358 @@ msgstr "Ændring af opløsning under kørsel er endnu ikke understøttet."
msgid "Cannot operate without a clock"
msgstr "Kan ikke fungere uden et ur"
+#~ msgid "Bass"
+#~ msgstr "Bas"
+
+#~ msgid "Treble"
+#~ msgstr "Diskant"
+
+#~ msgid "Synth"
+#~ msgstr "Synth"
+
+#~ msgid "PCM"
+#~ msgstr "PCM"
+
+#~ msgid "Speaker"
+#~ msgstr "Højtaler"
+
+#~ msgid "Line-in"
+#~ msgstr "Linje-ind"
+
+#~ msgid "Microphone"
+#~ msgstr "Mikrofon"
+
+#~ msgid "CD"
+#~ msgstr "Cd"
+
+#~ msgid "Mixer"
+#~ msgstr "Mikser"
+
+#~ msgid "PCM-2"
+#~ msgstr "PCM-2"
+
+#~ msgid "Record"
+#~ msgstr "Optag"
+
+#~ msgid "In-gain"
+#~ msgstr "Ind-forhøjelse"
+
+#~ msgid "Out-gain"
+#~ msgstr "Ud-forhøjelse"
+
+#~ msgid "Line-1"
+#~ msgstr "Linje-1"
+
+#~ msgid "Line-2"
+#~ msgstr "Linje-2"
+
+#~ msgid "Line-3"
+#~ msgstr "Linje-3"
+
+#~ msgid "Digital-1"
+#~ msgstr "Digital-1"
+
+#~ msgid "Digital-2"
+#~ msgstr "Digital-2"
+
+#~ msgid "Digital-3"
+#~ msgstr "Digital-3"
+
+# Eller Phono-ind
+#~ msgid "Phone-in"
+#~ msgstr "Lyd-ind"
+
+# Eller Phono-ud
+#~ msgid "Phone-out"
+#~ msgstr "Lyd-ud"
+
+#~ msgid "Video"
+#~ msgstr "Video"
+
+#~ msgid "Radio"
+#~ msgstr "Radio"
+
+#~ msgid "Could not open audio device for mixer control handling."
+#~ msgstr "Kunne ikke åbne lydenhed til håndtering af mikserkontrol."
+
+#~ msgid ""
+#~ "Could not open audio device for mixer control handling. This version of "
+#~ "the Open Sound System is not supported by this element."
+#~ msgstr ""
+#~ "Kunne ikke åbne lydenhed til håndtering af mikserkontrol. Denne version "
+#~ "af Open Sound System er ikke understøttet af dette element."
+
+#~ msgid "Master"
+#~ msgstr "Master"
+
+#~ msgid "Front"
+#~ msgstr "Front"
+
+#~ msgid "Rear"
+#~ msgstr "Bagende"
+
+#~ msgid "Headphones"
+#~ msgstr "Hovedtelefoner"
+
+#~ msgid "Center"
+#~ msgstr "Centrum"
+
+# Low-frequency effect
+#~ msgid "LFE"
+#~ msgstr "LFE"
+
+#~ msgid "Surround"
+#~ msgstr "Surround"
+
+#~ msgid "Side"
+#~ msgstr "Side"
+
+#~ msgid "AUX Out"
+#~ msgstr "AUX ud"
+
+#~ msgid "3D Depth"
+#~ msgstr "3D-dybde"
+
+#~ msgid "3D Center"
+#~ msgstr "3D-centrum"
+
+#~ msgid "3D Enhance"
+#~ msgstr "3D-forstærkning"
+
+#~ msgid "Telephone"
+#~ msgstr "Telefon"
+
+#~ msgid "Line In"
+#~ msgstr "Linje ind"
+
+#~ msgid "Internal CD"
+#~ msgstr "Intern cd"
+
+#~ msgid "Video In"
+#~ msgstr "Video ind"
+
+#~ msgid "AUX 1 In"
+#~ msgstr "AUX 1 ind"
+
+#~ msgid "AUX 2 In"
+#~ msgstr "AUX 2 ind"
+
+#~ msgid "AUX In"
+#~ msgstr "AUX ind"
+
+#~ msgid "Record Gain"
+#~ msgstr "Optag - forhøjelse"
+
+#~ msgid "Output Gain"
+#~ msgstr "Uddata - forhøjelse"
+
+#~ msgid "Microphone Boost"
+#~ msgstr "Mikrofonøgning"
+
+#~ msgid "Loopback"
+#~ msgstr "Loopback"
+
+#~ msgid "Diagnostic"
+#~ msgstr "Diagnostik"
+
+#~ msgid "Bass Boost"
+#~ msgstr "Bas-øgning"
+
+#~ msgid "Playback Ports"
+#~ msgstr "Afspilningsporte"
+
+#~ msgid "Input"
+#~ msgstr "Inddata"
+
+#~ msgid "Record Source"
+#~ msgstr "Optag kilde"
+
+#~ msgid "Monitor Source"
+#~ msgstr "Skærmkilde"
+
+#~ msgid "Keyboard Beep"
+#~ msgstr "Tastaturbeep"
+
+#~ msgid "Simulate Stereo"
+#~ msgstr "Simuler stereo"
+
+#~ msgid "Stereo"
+#~ msgstr "Stereo"
+
+#~ msgid "Surround Sound"
+#~ msgstr "Surroundlyd"
+
+#~ msgid "Microphone Gain"
+#~ msgstr "Mikrofonforhøjelse"
+
+#~ msgid "Speaker Source"
+#~ msgstr "Højtalerkilde"
+
+#~ msgid "Microphone Source"
+#~ msgstr "Mikrofonkilde"
+
+#~ msgid "Jack"
+#~ msgstr "Jack"
+
+#~ msgid "Center / LFE"
+#~ msgstr "Center / LFE"
+
+#~ msgid "Stereo Mix"
+#~ msgstr "Stereomiks"
+
+#~ msgid "Mono Mix"
+#~ msgstr "Monomiks"
+
+#~ msgid "Input Mix"
+#~ msgstr "Inddatamiks"
+
+#~ msgid "SPDIF In"
+#~ msgstr "SPDIF ind"
+
+#~ msgid "Microphone 1"
+#~ msgstr "Mikrofon 1"
+
+#~ msgid "Microphone 2"
+#~ msgstr "Mikrofon 2"
+
+#~ msgid "Digital Out"
+#~ msgstr "Digital ud"
+
+#~ msgid "Digital In"
+#~ msgstr "Digital ind"
+
+#~ msgid "HDMI"
+#~ msgstr "HDMI"
+
+#~ msgid "Modem"
+#~ msgstr "Modem"
+
+#~ msgid "Handset"
+#~ msgstr "Håndsæt"
+
+#~ msgid "Other"
+#~ msgstr "Andet"
+
+#~ msgid "None"
+#~ msgstr "Ingen"
+
+#~ msgid "On"
+#~ msgstr "Tænd"
+
+#~ msgid "Off"
+#~ msgstr "Sluk"
+
+#~ msgid "Mute"
+#~ msgstr "Slukket"
+
+#~ msgid "Fast"
+#~ msgstr "Hurtig"
+
+#~ msgid "Very Low"
+#~ msgstr "Meget lav"
+
+#~ msgid "Low"
+#~ msgstr "Lav"
+
+#~ msgid "Medium"
+#~ msgstr "Mellem"
+
+#~ msgid "High"
+#~ msgstr "Høj"
+
+#~ msgid "Very High"
+#~ msgstr "Meget høj"
+
+#~ msgid "Production"
+#~ msgstr "Produktion"
+
+#~ msgid "Front Panel Microphone"
+#~ msgstr "Frontpanelmikrofon"
+
+#~ msgid "Front Panel Line In"
+#~ msgstr "Frontpanels linje ind"
+
+#~ msgid "Front Panel Headphones"
+#~ msgstr "Frontpanels hovedtelefoner"
+
+#~ msgid "Front Panel Line Out"
+#~ msgstr "Frontpanels linje ud"
+
+#~ msgid "Green Connector"
+#~ msgstr "Grøn forbindelse "
+
+#~ msgid "Pink Connector"
+#~ msgstr "Lyserød forbindelse"
+
+#~ msgid "Blue Connector"
+#~ msgstr "Blå forbindelse"
+
+#~ msgid "White Connector"
+#~ msgstr "Hvid forbindelse"
+
+#~ msgid "Black Connector"
+#~ msgstr "Sort forbindelse"
+
+#~ msgid "Gray Connector"
+#~ msgstr "Grå forbindelse"
+
+#~ msgid "Orange Connector"
+#~ msgstr "Orange forbindelse"
+
+#~ msgid "Red Connector"
+#~ msgstr "Rød forbindelse"
+
+#~ msgid "Yellow Connector"
+#~ msgstr "Gul forbindelse"
+
+#~ msgid "Green Front Panel Connector"
+#~ msgstr "Grøn frontpanelforbindelse"
+
+#~ msgid "Pink Front Panel Connector"
+#~ msgstr "Lyserød frontpanelforbindelse"
+
+#~ msgid "Blue Front Panel Connector"
+#~ msgstr "Blå frontpanelforbindelse"
+
+#~ msgid "White Front Panel Connector"
+#~ msgstr "Hvid frontpanelforbindelse"
+
+#~ msgid "Black Front Panel Connector"
+#~ msgstr "Sort frontpanelforbindelse"
+
+#~ msgid "Gray Front Panel Connector"
+#~ msgstr "Grå frontpanelforbindelse"
+
+#~ msgid "Orange Front Panel Connector"
+#~ msgstr "Orange frontpanelforbindelse"
+
+#~ msgid "Red Front Panel Connector"
+#~ msgstr "Rød frontpanelforbindelse"
+
+#~ msgid "Yellow Front Panel Connector"
+#~ msgstr "Gul frontpanelforbindelse"
+
+#~ msgid "Spread Output"
+#~ msgstr "Spred uddata"
+
+#~ msgid "Downmix"
+#~ msgstr "Downmix"
+
+#~ msgid "Virtual Mixer Input"
+#~ msgstr "Virtuel mikserinddata"
+
+#~ msgid "Virtual Mixer Output"
+#~ msgstr "Virtuel mikseruddata"
+
+#~ msgid "Virtual Mixer Channels"
+#~ msgstr "Virtuel mikserkanaler"
+
+#~ msgid "%s %d Function"
+#~ msgstr "%s %d funktion"
+
+#~ msgid "%s Function"
+#~ msgstr "%s funktion"
+
#~ msgid "Error reading %d bytes on device '%s'."
#~ msgstr "Fejl ved læsning af %d byte på enhed '%s'."
diff --git a/po/de.gmo b/po/de.gmo
index ce36d8e4456c2370046185f7b51ab8800453eba8..302e30c12d1f3809d4c1a85aeda39a147a74ae14 100644
Binary files a/po/de.gmo and b/po/de.gmo differ
diff --git a/po/de.po b/po/de.po
index 3b1bda923d4884a7ebaa67f69b7e9a57c594d6ae..ac13f113c5891a3f1e752c9fa2bd45f6d24f43b3 100644
--- a/po/de.po
+++ b/po/de.po
@@ -14,7 +14,7 @@ msgid ""
msgstr ""
"Project-Id-Version: gst-plugins-good 0.10.26.2\n"
"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/\n"
-"POT-Creation-Date: 2012-04-12 10:26+0200\n"
+"POT-Creation-Date: 2012-05-13 16:29+0200\n"
"PO-Revision-Date: 2011-01-21 22:36+0100\n"
"Last-Translator: Christian Kirbach <christian.kirbach@googlemail.com>\n"
"Language-Team: German <translation-team-de@lists.sourceforge.net>\n"
@@ -110,83 +110,6 @@ msgstr ""
msgid "Internal data flow error."
msgstr "Interner Datenstromfehler."
-msgid "Volume"
-msgstr "Lautstärke"
-
-msgid "Bass"
-msgstr "Bass"
-
-msgid "Treble"
-msgstr "Höhen"
-
-msgid "Synth"
-msgstr "Synth"
-
-msgid "PCM"
-msgstr "PCM"
-
-msgid "Speaker"
-msgstr "Lautsprecher"
-
-msgid "Line-in"
-msgstr "Line-Eingang"
-
-msgid "Microphone"
-msgstr "Mikrofon"
-
-msgid "CD"
-msgstr "CD"
-
-msgid "Mixer"
-msgstr "Mischer"
-
-msgid "PCM-2"
-msgstr "PCM 2"
-
-msgid "Record"
-msgstr "Aufnahme"
-
-msgid "In-gain"
-msgstr "Eingangspegel"
-
-msgid "Out-gain"
-msgstr "Ausgangspegel"
-
-msgid "Line-1"
-msgstr "Eingang-1"
-
-msgid "Line-2"
-msgstr "Eingang-2"
-
-msgid "Line-3"
-msgstr "Eingang-3"
-
-msgid "Digital-1"
-msgstr "Digital-1"
-
-msgid "Digital-2"
-msgstr "Digital-2"
-
-msgid "Digital-3"
-msgstr "Digital-3"
-
-# Mikrofon? Zweifelhaft. Eher Kopfhörer oder Telefon.
-msgid "Phone-in"
-msgstr "Mikrofoneingang"
-
-# Ist hier Kopfhörer oder Telefon gemeint?
-msgid "Phone-out"
-msgstr "Mikrofonausgang"
-
-msgid "Video"
-msgstr "Video"
-
-msgid "Radio"
-msgstr "Radio"
-
-msgid "Monitor"
-msgstr "Monitor"
-
msgid ""
"Could not open audio device for playback. Device is being used by another "
"application."
@@ -214,312 +137,6 @@ msgstr ""
msgid "Could not open audio device for recording."
msgstr "Das Audio-Gerät konnte nicht zur Aufnahme geöffnet werden. "
-msgid "Could not open audio device for mixer control handling."
-msgstr "Das Audio-Gerät konnte nicht für das Mischpult geöffnet werden."
-
-msgid ""
-"Could not open audio device for mixer control handling. This version of the "
-"Open Sound System is not supported by this element."
-msgstr ""
-"Das Audio-Gerät konnte nicht für das Mischpult geöffnet werden. Diese "
-"Version des Open Sound System (OSS) wird nicht unterstützt."
-
-msgid "Master"
-msgstr "Hauptregler"
-
-msgid "Front"
-msgstr "Front"
-
-msgid "Rear"
-msgstr "AufnahmeRückseite"
-
-msgid "Headphones"
-msgstr "Kopfhörer"
-
-msgid "Center"
-msgstr "Mitte"
-
-msgid "LFE"
-msgstr "LFE"
-
-msgid "Surround"
-msgstr "Surround"
-
-msgid "Side"
-msgstr "Seite"
-
-msgid "Built-in Speaker"
-msgstr "Eingebaute Lautsprecher"
-
-msgid "AUX 1 Out"
-msgstr "AUX-Ausgang 1"
-
-msgid "AUX 2 Out"
-msgstr "AUX-Ausgang 2"
-
-msgid "AUX Out"
-msgstr "AUX-Ausgang"
-
-msgid "3D Depth"
-msgstr "3D-Tiefe"
-
-msgid "3D Center"
-msgstr "3D-Mitte"
-
-msgid "3D Enhance"
-msgstr "Erweitertes 3D"
-
-msgid "Telephone"
-msgstr "Telefon"
-
-# Hier ist mir noch nichts Besseres eingefallen.
-msgid "Line Out"
-msgstr "Line-Ausgang"
-
-msgid "Line In"
-msgstr "Line-Eingang"
-
-msgid "Internal CD"
-msgstr "Interne CD"
-
-msgid "Video In"
-msgstr "Video-Eingang"
-
-msgid "AUX 1 In"
-msgstr "AUX-Eingang 1"
-
-msgid "AUX 2 In"
-msgstr "AUX-Eingang 2"
-
-msgid "AUX In"
-msgstr "AUX-Eingang"
-
-msgid "Record Gain"
-msgstr "Aufnahmepegel"
-
-msgid "Output Gain"
-msgstr "Ausgangspegel"
-
-msgid "Microphone Boost"
-msgstr "Mikrofonverstärkung"
-
-msgid "Loopback"
-msgstr "Schleife"
-
-msgid "Diagnostic"
-msgstr "Zur Diagnose"
-
-msgid "Bass Boost"
-msgstr "Bassverstärkung"
-
-msgid "Playback Ports"
-msgstr "Wiedergabe-Ports"
-
-msgid "Input"
-msgstr "Eingang"
-
-msgid "Record Source"
-msgstr "Aufnahmequelle"
-
-msgid "Monitor Source"
-msgstr "Ãœberwachungsquelle"
-
-msgid "Keyboard Beep"
-msgstr "Tastatur-Piepsen"
-
-msgid "Simulate Stereo"
-msgstr "Stereo simulieren"
-
-msgid "Stereo"
-msgstr "Stereo"
-
-msgid "Surround Sound"
-msgstr "Surround-Audio"
-
-msgid "Microphone Gain"
-msgstr "Mikrofonpegel"
-
-msgid "Speaker Source"
-msgstr "Lautsprecherquelle"
-
-msgid "Microphone Source"
-msgstr "Mikrofonquelle"
-
-msgid "Jack"
-msgstr "Stecker"
-
-msgid "Center / LFE"
-msgstr "Mitte / LFE"
-
-msgid "Stereo Mix"
-msgstr "Stereo-Mischpult"
-
-msgid "Mono Mix"
-msgstr "Mono-Mischpult"
-
-msgid "Input Mix"
-msgstr "Eingangs-Mischpult"
-
-msgid "SPDIF In"
-msgstr "SPDIF-Eingang"
-
-msgid "SPDIF Out"
-msgstr "SPDIF-Ausgang"
-
-msgid "Microphone 1"
-msgstr "Mikrofon 1"
-
-msgid "Microphone 2"
-msgstr "Mikrofon 2"
-
-msgid "Digital Out"
-msgstr "Digital-Ausgang"
-
-msgid "Digital In"
-msgstr "Digital-Eingang"
-
-msgid "HDMI"
-msgstr "HDMI"
-
-msgid "Modem"
-msgstr "Modem"
-
-msgid "Handset"
-msgstr "Hörer"
-
-msgid "Other"
-msgstr "Anderes"
-
-msgid "None"
-msgstr "Kein"
-
-msgid "On"
-msgstr "Aktiviert"
-
-msgid "Off"
-msgstr "Deaktiviert"
-
-msgid "Mute"
-msgstr "Stumm"
-
-msgid "Fast"
-msgstr "Schnell"
-
-#. TRANSLATORS: "Very Low" is a quality setting here
-msgid "Very Low"
-msgstr "Sehr niedrig"
-
-#. TRANSLATORS: "Low" is a quality setting here
-msgid "Low"
-msgstr "Niedrig"
-
-#. TRANSLATORS: "Medium" is a quality setting here
-msgid "Medium"
-msgstr "Medium"
-
-#. TRANSLATORS: "High" is a quality setting here
-msgid "High"
-msgstr "Hoch"
-
-#. TRANSLATORS: "Very High" is a quality setting here
-msgid "Very High"
-msgstr "Sehr hoch"
-
-#. TRANSLATORS: "Production" is a quality setting here
-msgid "Production"
-msgstr "Produktion"
-
-msgid "Front Panel Microphone"
-msgstr "Mikrofon am Vordereingang"
-
-msgid "Front Panel Line In"
-msgstr "Line-Eingang am Vordereingang"
-
-msgid "Front Panel Headphones"
-msgstr "Kopfhörer am Vordereingang"
-
-msgid "Front Panel Line Out"
-msgstr "Line-Ausgang am Vordereingang"
-
-msgid "Green Connector"
-msgstr "Grüner Stecker"
-
-msgid "Pink Connector"
-msgstr "Rosa Stecker"
-
-msgid "Blue Connector"
-msgstr "Blauer Stecker"
-
-msgid "White Connector"
-msgstr "Weißer Stecker"
-
-msgid "Black Connector"
-msgstr "Schwarzer Stecker"
-
-msgid "Gray Connector"
-msgstr "Grauer Stecker"
-
-msgid "Orange Connector"
-msgstr "Oranger Stecker"
-
-msgid "Red Connector"
-msgstr "Roter Stecker"
-
-msgid "Yellow Connector"
-msgstr "Gelber Stecker"
-
-msgid "Green Front Panel Connector"
-msgstr "Grüner Stecker am Vordereingang"
-
-msgid "Pink Front Panel Connector"
-msgstr "Rosa Stecker am Vordereingang"
-
-msgid "Blue Front Panel Connector"
-msgstr "Blauer Stecker am Vordereingang"
-
-msgid "White Front Panel Connector"
-msgstr "Weißer Stecker am Vordereingang"
-
-msgid "Black Front Panel Connector"
-msgstr "Schwarzer Stecker am Vordereingang"
-
-msgid "Gray Front Panel Connector"
-msgstr "Grauer Stecker am Vordereingang"
-
-msgid "Orange Front Panel Connector"
-msgstr "Oranger Stecker am Vordereingang"
-
-msgid "Red Front Panel Connector"
-msgstr "Roter Stecker am Vordereingang"
-
-msgid "Yellow Front Panel Connector"
-msgstr "Gelber Stecker am Vordereingang"
-
-msgid "Spread Output"
-msgstr "Ausgabe verstreuen"
-
-msgid "Downmix"
-msgstr "Heruntermischen"
-
-msgid "Virtual Mixer Input"
-msgstr "Eingang des virtuellen Mischpults"
-
-msgid "Virtual Mixer Output"
-msgstr "Ausgang des virtuellen Mischpults"
-
-msgid "Virtual Mixer Channels"
-msgstr "Kanäle des virtuellen Mischpults"
-
-#. TRANSLATORS: name + number of a volume mixer control
-#, c-format
-msgid "%s %d Function"
-msgstr "%s %d Function"
-
-#. TRANSLATORS: name of a volume mixer control
-#, c-format
-msgid "%s Function"
-msgstr "%s-Funktion"
-
msgid ""
"Could not open audio device for playback. This version of the Open Sound "
"System is not supported by this element."
@@ -539,12 +156,34 @@ msgstr "Aufnahme wird von diesem Audio-Gerät nicht unterstützt."
msgid "Error recording from audio device."
msgstr "Fehler beim Aufnehmen vom Audio-Gerät."
+msgid "Volume"
+msgstr "Lautstärke"
+
msgid "Gain"
msgstr "Pegel"
+msgid "Monitor"
+msgstr "Monitor"
+
+msgid "Built-in Speaker"
+msgstr "Eingebaute Lautsprecher"
+
msgid "Headphone"
msgstr "Kopfhörer"
+# Hier ist mir noch nichts Besseres eingefallen.
+msgid "Line Out"
+msgstr "Line-Ausgang"
+
+msgid "SPDIF Out"
+msgstr "SPDIF-Ausgang"
+
+msgid "AUX 1 Out"
+msgstr "AUX-Ausgang 1"
+
+msgid "AUX 2 Out"
+msgstr "AUX-Ausgang 2"
+
#, c-format
msgid "Error reading %d bytes from device '%s'."
msgstr "Fehler beim Lesen von %d Bytes von Gerät »%s«."
@@ -734,6 +373,357 @@ msgstr "Ein Wechsel der Auflösung zur Laufzeit wird noch nicht unterstützt."
msgid "Cannot operate without a clock"
msgstr "Es kann nicht ohne einen Taktgeber gearbeitet werden."
+#~ msgid "Bass"
+#~ msgstr "Bass"
+
+#~ msgid "Treble"
+#~ msgstr "Höhen"
+
+#~ msgid "Synth"
+#~ msgstr "Synth"
+
+#~ msgid "PCM"
+#~ msgstr "PCM"
+
+#~ msgid "Speaker"
+#~ msgstr "Lautsprecher"
+
+#~ msgid "Line-in"
+#~ msgstr "Line-Eingang"
+
+#~ msgid "Microphone"
+#~ msgstr "Mikrofon"
+
+#~ msgid "CD"
+#~ msgstr "CD"
+
+#~ msgid "Mixer"
+#~ msgstr "Mischer"
+
+#~ msgid "PCM-2"
+#~ msgstr "PCM 2"
+
+#~ msgid "Record"
+#~ msgstr "Aufnahme"
+
+#~ msgid "In-gain"
+#~ msgstr "Eingangspegel"
+
+#~ msgid "Out-gain"
+#~ msgstr "Ausgangspegel"
+
+#~ msgid "Line-1"
+#~ msgstr "Eingang-1"
+
+#~ msgid "Line-2"
+#~ msgstr "Eingang-2"
+
+#~ msgid "Line-3"
+#~ msgstr "Eingang-3"
+
+#~ msgid "Digital-1"
+#~ msgstr "Digital-1"
+
+#~ msgid "Digital-2"
+#~ msgstr "Digital-2"
+
+#~ msgid "Digital-3"
+#~ msgstr "Digital-3"
+
+# Mikrofon? Zweifelhaft. Eher Kopfhörer oder Telefon.
+#~ msgid "Phone-in"
+#~ msgstr "Mikrofoneingang"
+
+# Ist hier Kopfhörer oder Telefon gemeint?
+#~ msgid "Phone-out"
+#~ msgstr "Mikrofonausgang"
+
+#~ msgid "Video"
+#~ msgstr "Video"
+
+#~ msgid "Radio"
+#~ msgstr "Radio"
+
+#~ msgid "Could not open audio device for mixer control handling."
+#~ msgstr "Das Audio-Gerät konnte nicht für das Mischpult geöffnet werden."
+
+#~ msgid ""
+#~ "Could not open audio device for mixer control handling. This version of "
+#~ "the Open Sound System is not supported by this element."
+#~ msgstr ""
+#~ "Das Audio-Gerät konnte nicht für das Mischpult geöffnet werden. Diese "
+#~ "Version des Open Sound System (OSS) wird nicht unterstützt."
+
+#~ msgid "Master"
+#~ msgstr "Hauptregler"
+
+#~ msgid "Front"
+#~ msgstr "Front"
+
+#~ msgid "Rear"
+#~ msgstr "AufnahmeRückseite"
+
+#~ msgid "Headphones"
+#~ msgstr "Kopfhörer"
+
+#~ msgid "Center"
+#~ msgstr "Mitte"
+
+#~ msgid "LFE"
+#~ msgstr "LFE"
+
+#~ msgid "Surround"
+#~ msgstr "Surround"
+
+#~ msgid "Side"
+#~ msgstr "Seite"
+
+#~ msgid "AUX Out"
+#~ msgstr "AUX-Ausgang"
+
+#~ msgid "3D Depth"
+#~ msgstr "3D-Tiefe"
+
+#~ msgid "3D Center"
+#~ msgstr "3D-Mitte"
+
+#~ msgid "3D Enhance"
+#~ msgstr "Erweitertes 3D"
+
+#~ msgid "Telephone"
+#~ msgstr "Telefon"
+
+#~ msgid "Line In"
+#~ msgstr "Line-Eingang"
+
+#~ msgid "Internal CD"
+#~ msgstr "Interne CD"
+
+#~ msgid "Video In"
+#~ msgstr "Video-Eingang"
+
+#~ msgid "AUX 1 In"
+#~ msgstr "AUX-Eingang 1"
+
+#~ msgid "AUX 2 In"
+#~ msgstr "AUX-Eingang 2"
+
+#~ msgid "AUX In"
+#~ msgstr "AUX-Eingang"
+
+#~ msgid "Record Gain"
+#~ msgstr "Aufnahmepegel"
+
+#~ msgid "Output Gain"
+#~ msgstr "Ausgangspegel"
+
+#~ msgid "Microphone Boost"
+#~ msgstr "Mikrofonverstärkung"
+
+#~ msgid "Loopback"
+#~ msgstr "Schleife"
+
+#~ msgid "Diagnostic"
+#~ msgstr "Zur Diagnose"
+
+#~ msgid "Bass Boost"
+#~ msgstr "Bassverstärkung"
+
+#~ msgid "Playback Ports"
+#~ msgstr "Wiedergabe-Ports"
+
+#~ msgid "Input"
+#~ msgstr "Eingang"
+
+#~ msgid "Record Source"
+#~ msgstr "Aufnahmequelle"
+
+#~ msgid "Monitor Source"
+#~ msgstr "Ãœberwachungsquelle"
+
+#~ msgid "Keyboard Beep"
+#~ msgstr "Tastatur-Piepsen"
+
+#~ msgid "Simulate Stereo"
+#~ msgstr "Stereo simulieren"
+
+#~ msgid "Stereo"
+#~ msgstr "Stereo"
+
+#~ msgid "Surround Sound"
+#~ msgstr "Surround-Audio"
+
+#~ msgid "Microphone Gain"
+#~ msgstr "Mikrofonpegel"
+
+#~ msgid "Speaker Source"
+#~ msgstr "Lautsprecherquelle"
+
+#~ msgid "Microphone Source"
+#~ msgstr "Mikrofonquelle"
+
+#~ msgid "Jack"
+#~ msgstr "Stecker"
+
+#~ msgid "Center / LFE"
+#~ msgstr "Mitte / LFE"
+
+#~ msgid "Stereo Mix"
+#~ msgstr "Stereo-Mischpult"
+
+#~ msgid "Mono Mix"
+#~ msgstr "Mono-Mischpult"
+
+#~ msgid "Input Mix"
+#~ msgstr "Eingangs-Mischpult"
+
+#~ msgid "SPDIF In"
+#~ msgstr "SPDIF-Eingang"
+
+#~ msgid "Microphone 1"
+#~ msgstr "Mikrofon 1"
+
+#~ msgid "Microphone 2"
+#~ msgstr "Mikrofon 2"
+
+#~ msgid "Digital Out"
+#~ msgstr "Digital-Ausgang"
+
+#~ msgid "Digital In"
+#~ msgstr "Digital-Eingang"
+
+#~ msgid "HDMI"
+#~ msgstr "HDMI"
+
+#~ msgid "Modem"
+#~ msgstr "Modem"
+
+#~ msgid "Handset"
+#~ msgstr "Hörer"
+
+#~ msgid "Other"
+#~ msgstr "Anderes"
+
+#~ msgid "None"
+#~ msgstr "Kein"
+
+#~ msgid "On"
+#~ msgstr "Aktiviert"
+
+#~ msgid "Off"
+#~ msgstr "Deaktiviert"
+
+#~ msgid "Mute"
+#~ msgstr "Stumm"
+
+#~ msgid "Fast"
+#~ msgstr "Schnell"
+
+#~ msgid "Very Low"
+#~ msgstr "Sehr niedrig"
+
+#~ msgid "Low"
+#~ msgstr "Niedrig"
+
+#~ msgid "Medium"
+#~ msgstr "Medium"
+
+#~ msgid "High"
+#~ msgstr "Hoch"
+
+#~ msgid "Very High"
+#~ msgstr "Sehr hoch"
+
+#~ msgid "Production"
+#~ msgstr "Produktion"
+
+#~ msgid "Front Panel Microphone"
+#~ msgstr "Mikrofon am Vordereingang"
+
+#~ msgid "Front Panel Line In"
+#~ msgstr "Line-Eingang am Vordereingang"
+
+#~ msgid "Front Panel Headphones"
+#~ msgstr "Kopfhörer am Vordereingang"
+
+#~ msgid "Front Panel Line Out"
+#~ msgstr "Line-Ausgang am Vordereingang"
+
+#~ msgid "Green Connector"
+#~ msgstr "Grüner Stecker"
+
+#~ msgid "Pink Connector"
+#~ msgstr "Rosa Stecker"
+
+#~ msgid "Blue Connector"
+#~ msgstr "Blauer Stecker"
+
+#~ msgid "White Connector"
+#~ msgstr "Weißer Stecker"
+
+#~ msgid "Black Connector"
+#~ msgstr "Schwarzer Stecker"
+
+#~ msgid "Gray Connector"
+#~ msgstr "Grauer Stecker"
+
+#~ msgid "Orange Connector"
+#~ msgstr "Oranger Stecker"
+
+#~ msgid "Red Connector"
+#~ msgstr "Roter Stecker"
+
+#~ msgid "Yellow Connector"
+#~ msgstr "Gelber Stecker"
+
+#~ msgid "Green Front Panel Connector"
+#~ msgstr "Grüner Stecker am Vordereingang"
+
+#~ msgid "Pink Front Panel Connector"
+#~ msgstr "Rosa Stecker am Vordereingang"
+
+#~ msgid "Blue Front Panel Connector"
+#~ msgstr "Blauer Stecker am Vordereingang"
+
+#~ msgid "White Front Panel Connector"
+#~ msgstr "Weißer Stecker am Vordereingang"
+
+#~ msgid "Black Front Panel Connector"
+#~ msgstr "Schwarzer Stecker am Vordereingang"
+
+#~ msgid "Gray Front Panel Connector"
+#~ msgstr "Grauer Stecker am Vordereingang"
+
+#~ msgid "Orange Front Panel Connector"
+#~ msgstr "Oranger Stecker am Vordereingang"
+
+#~ msgid "Red Front Panel Connector"
+#~ msgstr "Roter Stecker am Vordereingang"
+
+#~ msgid "Yellow Front Panel Connector"
+#~ msgstr "Gelber Stecker am Vordereingang"
+
+#~ msgid "Spread Output"
+#~ msgstr "Ausgabe verstreuen"
+
+#~ msgid "Downmix"
+#~ msgstr "Heruntermischen"
+
+#~ msgid "Virtual Mixer Input"
+#~ msgstr "Eingang des virtuellen Mischpults"
+
+#~ msgid "Virtual Mixer Output"
+#~ msgstr "Ausgang des virtuellen Mischpults"
+
+#~ msgid "Virtual Mixer Channels"
+#~ msgstr "Kanäle des virtuellen Mischpults"
+
+#~ msgid "%s %d Function"
+#~ msgstr "%s %d Function"
+
+#~ msgid "%s Function"
+#~ msgstr "%s-Funktion"
+
#~ msgid "Error reading %d bytes on device '%s'."
#~ msgstr "Fehler beim Lesen von %d Bytes auf Gerät »%s«."
diff --git a/po/el.gmo b/po/el.gmo
index 7c332b410ff12cbe9af8e8b99cda3cfb7d338dbb..f1b303598007568886002af0eab018f7e6344c3b 100644
Binary files a/po/el.gmo and b/po/el.gmo differ
diff --git a/po/el.po b/po/el.po
index d88c3bb5656d0ff807df36ccf849e9bff35824b0..7f1696ff5701ddc9bfde6c1d691ac0908baa41a4 100644
--- a/po/el.po
+++ b/po/el.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: gst-plugins-good 0.10.25.3\n"
"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/\n"
-"POT-Creation-Date: 2012-04-12 10:26+0200\n"
+"POT-Creation-Date: 2012-05-13 16:29+0200\n"
"PO-Revision-Date: 2010-10-27 12:16+0200\n"
"Last-Translator: Michael Kotsarinis <mk73628@gmail.com>\n"
"Language-Team: Greek <team@lists.gnome.gr>\n"
@@ -99,81 +99,6 @@ msgstr ""
msgid "Internal data flow error."
msgstr "ΕσωτεÏικό σφάλμα Ïοής δεδομÎνων."
-msgid "Volume"
-msgstr "Ένταση"
-
-msgid "Bass"
-msgstr "Μπάσα"
-
-msgid "Treble"
-msgstr "Î Ïίμα (treble)"
-
-msgid "Synth"
-msgstr "Synth"
-
-msgid "PCM"
-msgstr "PCM"
-
-msgid "Speaker"
-msgstr "Μεγάφωνο"
-
-msgid "Line-in"
-msgstr "ΓÏαμμή-εισόδου"
-
-msgid "Microphone"
-msgstr "ΜικÏόφωνο"
-
-msgid "CD"
-msgstr "CD"
-
-msgid "Mixer"
-msgstr "Μείκτης"
-
-msgid "PCM-2"
-msgstr "PCM-2"
-
-msgid "Record"
-msgstr "ΕγγÏαφή"
-
-msgid "In-gain"
-msgstr "ΚÎÏδος εισόδου"
-
-msgid "Out-gain"
-msgstr "ΚÎÏδος εξόδου"
-
-msgid "Line-1"
-msgstr "ΓÏαμμή-1"
-
-msgid "Line-2"
-msgstr "ΓÏαμμή-2"
-
-msgid "Line-3"
-msgstr "ΓÏαμμή-3"
-
-msgid "Digital-1"
-msgstr "Ψηφιακό-1"
-
-msgid "Digital-2"
-msgstr "Ψηφιακό-2"
-
-msgid "Digital-3"
-msgstr "Ψηφιακό-3"
-
-msgid "Phone-in"
-msgstr "Είσοδος τηλεφώνου"
-
-msgid "Phone-out"
-msgstr "Έξοδος τηλεφώνου"
-
-msgid "Video"
-msgstr "Βίντεο"
-
-msgid "Radio"
-msgstr "Ράδιο"
-
-msgid "Monitor"
-msgstr "Οθόνη"
-
msgid ""
"Could not open audio device for playback. Device is being used by another "
"application."
@@ -201,314 +126,6 @@ msgstr ""
msgid "Could not open audio device for recording."
msgstr "Δεν ήταν δυνατό το άνοιγμα της συσκευής ήχου για εγγÏαφή. "
-msgid "Could not open audio device for mixer control handling."
-msgstr ""
-"Δεν ήταν δυνατό το άνοιγμα της συσκευής ήχου για χειÏισμό του ελÎγχου του "
-"μίκτη. "
-
-msgid ""
-"Could not open audio device for mixer control handling. This version of the "
-"Open Sound System is not supported by this element."
-msgstr ""
-"Δεν ήταν δυνατό το άνοιγμα της συσκευής ήχου για χειÏισμό του ελÎγχου του "
-"μίκτη. Αυτή η Îκδοση του Open Sound System δεν υποστηÏίζεται από αυτό οτ "
-"στοιχείο."
-
-msgid "Master"
-msgstr "Γενικός (Master)"
-
-msgid "Front"
-msgstr "ΜπÏοστά"
-
-msgid "Rear"
-msgstr "Πίσω"
-
-msgid "Headphones"
-msgstr "Ακουστικά"
-
-msgid "Center"
-msgstr "ΚÎντÏο"
-
-msgid "LFE"
-msgstr "Χαμηλών συχνοτήτων (LFE)"
-
-msgid "Surround"
-msgstr "ΠεÏιβάλλων (Surround)"
-
-msgid "Side"
-msgstr "ΠλευÏικό"
-
-msgid "Built-in Speaker"
-msgstr "ΕνσωματωμÎνο μεγάφωνο"
-
-msgid "AUX 1 Out"
-msgstr "AUX 1 Out"
-
-msgid "AUX 2 Out"
-msgstr "AUX 2 Out"
-
-msgid "AUX Out"
-msgstr "Έξοδος AUX"
-
-msgid "3D Depth"
-msgstr "Βάθος 3D"
-
-msgid "3D Center"
-msgstr "ΚÎντÏο 3D"
-
-msgid "3D Enhance"
-msgstr "Ενίσχυση 3D"
-
-msgid "Telephone"
-msgstr "ΤηλÎφωνο"
-
-msgid "Line Out"
-msgstr "ΓÏαμμή εξόδου"
-
-msgid "Line In"
-msgstr "Είσοδος γÏαμμής"
-
-msgid "Internal CD"
-msgstr "ΕσωτεÏικό CD"
-
-msgid "Video In"
-msgstr "Είσοδος βίντεο"
-
-msgid "AUX 1 In"
-msgstr "Είσοδις AUX 1"
-
-msgid "AUX 2 In"
-msgstr "Είσοδος AUX 2"
-
-msgid "AUX In"
-msgstr "Είσοδος AUX"
-
-msgid "Record Gain"
-msgstr "ΚÎÏδος ΕγγÏαφής"
-
-msgid "Output Gain"
-msgstr "ΚÎÏδος εξόδου"
-
-msgid "Microphone Boost"
-msgstr "Ενίσχυση μικÏοφώνου"
-
-msgid "Loopback"
-msgstr "ΑνατÏοφοδότηση"
-
-msgid "Diagnostic"
-msgstr "Διαγνωστικό"
-
-msgid "Bass Boost"
-msgstr "Ενίσχυση χαμηλών"
-
-msgid "Playback Ports"
-msgstr "ΘÏÏες ΑναπαÏαγωγής"
-
-msgid "Input"
-msgstr "Είσοδος"
-
-msgid "Record Source"
-msgstr "Πηγή εγγÏαφής"
-
-msgid "Monitor Source"
-msgstr "ΠαÏακολοÏθηση πηγής"
-
-msgid "Keyboard Beep"
-msgstr "Ήχος πληκτÏολογίου"
-
-msgid "Simulate Stereo"
-msgstr "Î Ïοσομοίωση στÎÏεο"
-
-msgid "Stereo"
-msgstr "ΣτÎÏεο"
-
-msgid "Surround Sound"
-msgstr "Ήχος Surround"
-
-msgid "Microphone Gain"
-msgstr "ΚÎÏδος μικÏοφώνου"
-
-msgid "Speaker Source"
-msgstr "Πηγή μεγαφώνου"
-
-msgid "Microphone Source"
-msgstr "Πηγή μικÏοφώνου"
-
-msgid "Jack"
-msgstr "Î’Ïσμα"
-
-msgid "Center / LFE"
-msgstr "ΚεντÏικό / Χαμηλών συχνοτήτων"
-
-msgid "Stereo Mix"
-msgstr "ΣτεÏεοφωνική μίξη"
-
-msgid "Mono Mix"
-msgstr "Μονοφωνική μίξη"
-
-msgid "Input Mix"
-msgstr "Μίξη εισόδου"
-
-msgid "SPDIF In"
-msgstr "Είσδος SPDIF"
-
-msgid "SPDIF Out"
-msgstr "SPDIF Out"
-
-msgid "Microphone 1"
-msgstr "ΜικÏόφωνο 1"
-
-msgid "Microphone 2"
-msgstr "ΜικÏόφωνο 2"
-
-msgid "Digital Out"
-msgstr "Ψηφιακή Îξοδος"
-
-msgid "Digital In"
-msgstr "Ψηφιακή είσοδος"
-
-msgid "HDMI"
-msgstr "HDMI"
-
-msgid "Modem"
-msgstr "Modem"
-
-msgid "Handset"
-msgstr "Τηλεφωνική συσκευή"
-
-msgid "Other"
-msgstr "Άλλο"
-
-msgid "None"
-msgstr "ΚανÎνα"
-
-msgid "On"
-msgstr "On"
-
-msgid "Off"
-msgstr "Off"
-
-msgid "Mute"
-msgstr "Σίγαση"
-
-msgid "Fast"
-msgstr "ΓÏήγοÏα"
-
-#. TRANSLATORS: "Very Low" is a quality setting here
-msgid "Very Low"
-msgstr "Î Î¿Î»Ï Ï‡Î±Î¼Î·Î»Î®"
-
-#. TRANSLATORS: "Low" is a quality setting here
-msgid "Low"
-msgstr "Χαμηλή"
-
-#. TRANSLATORS: "Medium" is a quality setting here
-msgid "Medium"
-msgstr "Μεσαία"
-
-#. TRANSLATORS: "High" is a quality setting here
-msgid "High"
-msgstr "Υψηλή"
-
-#. TRANSLATORS: "Very High" is a quality setting here
-msgid "Very High"
-msgstr "Î Î¿Î»Ï Ï…ÏˆÎ·Î»Î®"
-
-#. TRANSLATORS: "Production" is a quality setting here
-msgid "Production"
-msgstr "ΠαÏαγωγής"
-
-msgid "Front Panel Microphone"
-msgstr "ΜικÏόφωνο μπÏÎ¿ÏƒÏ„Î¹Î½Î¿Ï Ï€Î¬Î½ÎµÎ»"
-
-msgid "Front Panel Line In"
-msgstr "Είσοδος γÏαμμής μπÏÎ¿ÏƒÏ„Î¹Î½Î¿Ï Ï€Î¬Î½ÎµÎ»"
-
-msgid "Front Panel Headphones"
-msgstr "Ακουστικά μπÏÎ¿ÏƒÏ„Î¹Î½Î¿Ï Ï€Î¬Î½ÎµÎ»"
-
-msgid "Front Panel Line Out"
-msgstr "Έξοδος γÏαμμής μπÏÎ¿ÏƒÏ„Î¹Î½Î¿Ï Ï€Î¬Î½ÎµÎ»"
-
-msgid "Green Connector"
-msgstr "Î Ïάσινη υποδοχή"
-
-msgid "Pink Connector"
-msgstr "Ροζ υποδοχή"
-
-msgid "Blue Connector"
-msgstr "Μπλε υποδοχή"
-
-msgid "White Connector"
-msgstr "Λευκή υποδοχή"
-
-msgid "Black Connector"
-msgstr "ΜαÏÏη υποδοχή"
-
-msgid "Gray Connector"
-msgstr "ΓκÏι υποδοχή"
-
-msgid "Orange Connector"
-msgstr "ΠοÏτοκαλί υποδοχή"
-
-msgid "Red Connector"
-msgstr "Κόκκινη υποδοχή"
-
-msgid "Yellow Connector"
-msgstr "ΚίτÏινη υποδοχή"
-
-msgid "Green Front Panel Connector"
-msgstr "Î Ïάσινη υποδοχή μπÏÎ¿ÏƒÏ„Î¹Î½Î¿Ï Ï€Î¬Î½ÎµÎ»"
-
-msgid "Pink Front Panel Connector"
-msgstr "Ροζ υποδοχή μπÏÎ¿ÏƒÏ„Î¹Î½Î¿Ï Ï€Î¬Î½ÎµÎ»"
-
-msgid "Blue Front Panel Connector"
-msgstr "Μπλε υποδοχή μπÏÎ¿ÏƒÏ„Î¹Î½Î¿Ï Ï€Î¬Î½ÎµÎ»"
-
-msgid "White Front Panel Connector"
-msgstr "Λευκή υποδοχή μπÏÎ¿ÏƒÏ„Î¹Î½Î¿Ï Ï€Î¬Î½ÎµÎ»"
-
-msgid "Black Front Panel Connector"
-msgstr "ΜαÏÏη υποδοχή μπÏÎ¿ÏƒÏ„Î¹Î½Î¿Ï Ï€Î¬Î½ÎµÎ»"
-
-msgid "Gray Front Panel Connector"
-msgstr "ΓκÏι υποδοχή μπÏÎ¿ÏƒÏ„Î¹Î½Î¿Ï Ï€Î¬Î½ÎµÎ»"
-
-msgid "Orange Front Panel Connector"
-msgstr "ΠοÏτοκαλί υποδοχή μπÏÎ¿ÏƒÏ„Î¹Î½Î¿Ï Ï€Î¬Î½ÎµÎ»"
-
-msgid "Red Front Panel Connector"
-msgstr "Κόκκινη υποδοχή μπÏÎ¿ÏƒÏ„Î¹Î½Î¿Ï Ï€Î¬Î½ÎµÎ»"
-
-msgid "Yellow Front Panel Connector"
-msgstr "ΚίτÏινη υποδοχή μπÏÎ¿ÏƒÏ„Î¹Î½Î¿Ï Ï€Î¬Î½ÎµÎ»"
-
-msgid "Spread Output"
-msgstr "ΕυÏεία Îξοδος"
-
-msgid "Downmix"
-msgstr "Μίξη συγχώνευσης (Downmix)"
-
-msgid "Virtual Mixer Input"
-msgstr "Είσοδος ÎµÎ¹ÎºÎ¿Î½Î¹ÎºÎ¿Ï Î¼Î¯ÎºÏ„Î·"
-
-msgid "Virtual Mixer Output"
-msgstr "Έξοδος ÎµÎ¹ÎºÎ¿Î½Î¹ÎºÎ¿Ï Î¼Î¯ÎºÏ„Î·"
-
-msgid "Virtual Mixer Channels"
-msgstr "Κανάλια ÎµÎ¹ÎºÎ¿Î½Î¹ÎºÎ¿Ï Î¼Î¯ÎºÏ„Î·"
-
-#. TRANSLATORS: name + number of a volume mixer control
-#, c-format
-msgid "%s %d Function"
-msgstr "ΛειτουÏγία %s %d"
-
-#. TRANSLATORS: name of a volume mixer control
-#, c-format
-msgid "%s Function"
-msgstr "ΛειτουÏγία %s"
-
msgid ""
"Could not open audio device for playback. This version of the Open Sound "
"System is not supported by this element."
@@ -528,12 +145,33 @@ msgstr "Αυτή η συσκευή ήχου δεν υποστηÏίζει εγγ
msgid "Error recording from audio device."
msgstr "Σφάλμα κατά την εγγÏαφή από τη συσκευή ήχου."
+msgid "Volume"
+msgstr "Ένταση"
+
msgid "Gain"
msgstr "ΚÎÏδος"
+msgid "Monitor"
+msgstr "Οθόνη"
+
+msgid "Built-in Speaker"
+msgstr "ΕνσωματωμÎνο μεγάφωνο"
+
msgid "Headphone"
msgstr "Ακουστικό"
+msgid "Line Out"
+msgstr "ΓÏαμμή εξόδου"
+
+msgid "SPDIF Out"
+msgstr "SPDIF Out"
+
+msgid "AUX 1 Out"
+msgstr "AUX 1 Out"
+
+msgid "AUX 2 Out"
+msgstr "AUX 2 Out"
+
#, c-format
msgid "Error reading %d bytes from device '%s'."
msgstr "Σφάλμα κατά την ανάγνωση %d bytes απο την συσκευή '%s'."
@@ -713,6 +351,358 @@ msgstr ""
msgid "Cannot operate without a clock"
msgstr "Δεν είναι δυνατή η λειτουÏγία χωÏίς Ïολόι "
+#~ msgid "Bass"
+#~ msgstr "Μπάσα"
+
+#~ msgid "Treble"
+#~ msgstr "Î Ïίμα (treble)"
+
+#~ msgid "Synth"
+#~ msgstr "Synth"
+
+#~ msgid "PCM"
+#~ msgstr "PCM"
+
+#~ msgid "Speaker"
+#~ msgstr "Μεγάφωνο"
+
+#~ msgid "Line-in"
+#~ msgstr "ΓÏαμμή-εισόδου"
+
+#~ msgid "Microphone"
+#~ msgstr "ΜικÏόφωνο"
+
+#~ msgid "CD"
+#~ msgstr "CD"
+
+#~ msgid "Mixer"
+#~ msgstr "Μείκτης"
+
+#~ msgid "PCM-2"
+#~ msgstr "PCM-2"
+
+#~ msgid "Record"
+#~ msgstr "ΕγγÏαφή"
+
+#~ msgid "In-gain"
+#~ msgstr "ΚÎÏδος εισόδου"
+
+#~ msgid "Out-gain"
+#~ msgstr "ΚÎÏδος εξόδου"
+
+#~ msgid "Line-1"
+#~ msgstr "ΓÏαμμή-1"
+
+#~ msgid "Line-2"
+#~ msgstr "ΓÏαμμή-2"
+
+#~ msgid "Line-3"
+#~ msgstr "ΓÏαμμή-3"
+
+#~ msgid "Digital-1"
+#~ msgstr "Ψηφιακό-1"
+
+#~ msgid "Digital-2"
+#~ msgstr "Ψηφιακό-2"
+
+#~ msgid "Digital-3"
+#~ msgstr "Ψηφιακό-3"
+
+#~ msgid "Phone-in"
+#~ msgstr "Είσοδος τηλεφώνου"
+
+#~ msgid "Phone-out"
+#~ msgstr "Έξοδος τηλεφώνου"
+
+#~ msgid "Video"
+#~ msgstr "Βίντεο"
+
+#~ msgid "Radio"
+#~ msgstr "Ράδιο"
+
+#~ msgid "Could not open audio device for mixer control handling."
+#~ msgstr ""
+#~ "Δεν ήταν δυνατό το άνοιγμα της συσκευής ήχου για χειÏισμό του ελÎγχου του "
+#~ "μίκτη. "
+
+#~ msgid ""
+#~ "Could not open audio device for mixer control handling. This version of "
+#~ "the Open Sound System is not supported by this element."
+#~ msgstr ""
+#~ "Δεν ήταν δυνατό το άνοιγμα της συσκευής ήχου για χειÏισμό του ελÎγχου του "
+#~ "μίκτη. Αυτή η Îκδοση του Open Sound System δεν υποστηÏίζεται από αυτό οτ "
+#~ "στοιχείο."
+
+#~ msgid "Master"
+#~ msgstr "Γενικός (Master)"
+
+#~ msgid "Front"
+#~ msgstr "ΜπÏοστά"
+
+#~ msgid "Rear"
+#~ msgstr "Πίσω"
+
+#~ msgid "Headphones"
+#~ msgstr "Ακουστικά"
+
+#~ msgid "Center"
+#~ msgstr "ΚÎντÏο"
+
+#~ msgid "LFE"
+#~ msgstr "Χαμηλών συχνοτήτων (LFE)"
+
+#~ msgid "Surround"
+#~ msgstr "ΠεÏιβάλλων (Surround)"
+
+#~ msgid "Side"
+#~ msgstr "ΠλευÏικό"
+
+#~ msgid "AUX Out"
+#~ msgstr "Έξοδος AUX"
+
+#~ msgid "3D Depth"
+#~ msgstr "Βάθος 3D"
+
+#~ msgid "3D Center"
+#~ msgstr "ΚÎντÏο 3D"
+
+#~ msgid "3D Enhance"
+#~ msgstr "Ενίσχυση 3D"
+
+#~ msgid "Telephone"
+#~ msgstr "ΤηλÎφωνο"
+
+#~ msgid "Line In"
+#~ msgstr "Είσοδος γÏαμμής"
+
+#~ msgid "Internal CD"
+#~ msgstr "ΕσωτεÏικό CD"
+
+#~ msgid "Video In"
+#~ msgstr "Είσοδος βίντεο"
+
+#~ msgid "AUX 1 In"
+#~ msgstr "Είσοδις AUX 1"
+
+#~ msgid "AUX 2 In"
+#~ msgstr "Είσοδος AUX 2"
+
+#~ msgid "AUX In"
+#~ msgstr "Είσοδος AUX"
+
+#~ msgid "Record Gain"
+#~ msgstr "ΚÎÏδος ΕγγÏαφής"
+
+#~ msgid "Output Gain"
+#~ msgstr "ΚÎÏδος εξόδου"
+
+#~ msgid "Microphone Boost"
+#~ msgstr "Ενίσχυση μικÏοφώνου"
+
+#~ msgid "Loopback"
+#~ msgstr "ΑνατÏοφοδότηση"
+
+#~ msgid "Diagnostic"
+#~ msgstr "Διαγνωστικό"
+
+#~ msgid "Bass Boost"
+#~ msgstr "Ενίσχυση χαμηλών"
+
+#~ msgid "Playback Ports"
+#~ msgstr "ΘÏÏες ΑναπαÏαγωγής"
+
+#~ msgid "Input"
+#~ msgstr "Είσοδος"
+
+#~ msgid "Record Source"
+#~ msgstr "Πηγή εγγÏαφής"
+
+#~ msgid "Monitor Source"
+#~ msgstr "ΠαÏακολοÏθηση πηγής"
+
+#~ msgid "Keyboard Beep"
+#~ msgstr "Ήχος πληκτÏολογίου"
+
+#~ msgid "Simulate Stereo"
+#~ msgstr "Î Ïοσομοίωση στÎÏεο"
+
+#~ msgid "Stereo"
+#~ msgstr "ΣτÎÏεο"
+
+#~ msgid "Surround Sound"
+#~ msgstr "Ήχος Surround"
+
+#~ msgid "Microphone Gain"
+#~ msgstr "ΚÎÏδος μικÏοφώνου"
+
+#~ msgid "Speaker Source"
+#~ msgstr "Πηγή μεγαφώνου"
+
+#~ msgid "Microphone Source"
+#~ msgstr "Πηγή μικÏοφώνου"
+
+#~ msgid "Jack"
+#~ msgstr "Î’Ïσμα"
+
+#~ msgid "Center / LFE"
+#~ msgstr "ΚεντÏικό / Χαμηλών συχνοτήτων"
+
+#~ msgid "Stereo Mix"
+#~ msgstr "ΣτεÏεοφωνική μίξη"
+
+#~ msgid "Mono Mix"
+#~ msgstr "Μονοφωνική μίξη"
+
+#~ msgid "Input Mix"
+#~ msgstr "Μίξη εισόδου"
+
+#~ msgid "SPDIF In"
+#~ msgstr "Είσδος SPDIF"
+
+#~ msgid "Microphone 1"
+#~ msgstr "ΜικÏόφωνο 1"
+
+#~ msgid "Microphone 2"
+#~ msgstr "ΜικÏόφωνο 2"
+
+#~ msgid "Digital Out"
+#~ msgstr "Ψηφιακή Îξοδος"
+
+#~ msgid "Digital In"
+#~ msgstr "Ψηφιακή είσοδος"
+
+#~ msgid "HDMI"
+#~ msgstr "HDMI"
+
+#~ msgid "Modem"
+#~ msgstr "Modem"
+
+#~ msgid "Handset"
+#~ msgstr "Τηλεφωνική συσκευή"
+
+#~ msgid "Other"
+#~ msgstr "Άλλο"
+
+#~ msgid "None"
+#~ msgstr "ΚανÎνα"
+
+#~ msgid "On"
+#~ msgstr "On"
+
+#~ msgid "Off"
+#~ msgstr "Off"
+
+#~ msgid "Mute"
+#~ msgstr "Σίγαση"
+
+#~ msgid "Fast"
+#~ msgstr "ΓÏήγοÏα"
+
+#~ msgid "Very Low"
+#~ msgstr "Î Î¿Î»Ï Ï‡Î±Î¼Î·Î»Î®"
+
+#~ msgid "Low"
+#~ msgstr "Χαμηλή"
+
+#~ msgid "Medium"
+#~ msgstr "Μεσαία"
+
+#~ msgid "High"
+#~ msgstr "Υψηλή"
+
+#~ msgid "Very High"
+#~ msgstr "Î Î¿Î»Ï Ï…ÏˆÎ·Î»Î®"
+
+#~ msgid "Production"
+#~ msgstr "ΠαÏαγωγής"
+
+#~ msgid "Front Panel Microphone"
+#~ msgstr "ΜικÏόφωνο μπÏÎ¿ÏƒÏ„Î¹Î½Î¿Ï Ï€Î¬Î½ÎµÎ»"
+
+#~ msgid "Front Panel Line In"
+#~ msgstr "Είσοδος γÏαμμής μπÏÎ¿ÏƒÏ„Î¹Î½Î¿Ï Ï€Î¬Î½ÎµÎ»"
+
+#~ msgid "Front Panel Headphones"
+#~ msgstr "Ακουστικά μπÏÎ¿ÏƒÏ„Î¹Î½Î¿Ï Ï€Î¬Î½ÎµÎ»"
+
+#~ msgid "Front Panel Line Out"
+#~ msgstr "Έξοδος γÏαμμής μπÏÎ¿ÏƒÏ„Î¹Î½Î¿Ï Ï€Î¬Î½ÎµÎ»"
+
+#~ msgid "Green Connector"
+#~ msgstr "Î Ïάσινη υποδοχή"
+
+#~ msgid "Pink Connector"
+#~ msgstr "Ροζ υποδοχή"
+
+#~ msgid "Blue Connector"
+#~ msgstr "Μπλε υποδοχή"
+
+#~ msgid "White Connector"
+#~ msgstr "Λευκή υποδοχή"
+
+#~ msgid "Black Connector"
+#~ msgstr "ΜαÏÏη υποδοχή"
+
+#~ msgid "Gray Connector"
+#~ msgstr "ΓκÏι υποδοχή"
+
+#~ msgid "Orange Connector"
+#~ msgstr "ΠοÏτοκαλί υποδοχή"
+
+#~ msgid "Red Connector"
+#~ msgstr "Κόκκινη υποδοχή"
+
+#~ msgid "Yellow Connector"
+#~ msgstr "ΚίτÏινη υποδοχή"
+
+#~ msgid "Green Front Panel Connector"
+#~ msgstr "Î Ïάσινη υποδοχή μπÏÎ¿ÏƒÏ„Î¹Î½Î¿Ï Ï€Î¬Î½ÎµÎ»"
+
+#~ msgid "Pink Front Panel Connector"
+#~ msgstr "Ροζ υποδοχή μπÏÎ¿ÏƒÏ„Î¹Î½Î¿Ï Ï€Î¬Î½ÎµÎ»"
+
+#~ msgid "Blue Front Panel Connector"
+#~ msgstr "Μπλε υποδοχή μπÏÎ¿ÏƒÏ„Î¹Î½Î¿Ï Ï€Î¬Î½ÎµÎ»"
+
+#~ msgid "White Front Panel Connector"
+#~ msgstr "Λευκή υποδοχή μπÏÎ¿ÏƒÏ„Î¹Î½Î¿Ï Ï€Î¬Î½ÎµÎ»"
+
+#~ msgid "Black Front Panel Connector"
+#~ msgstr "ΜαÏÏη υποδοχή μπÏÎ¿ÏƒÏ„Î¹Î½Î¿Ï Ï€Î¬Î½ÎµÎ»"
+
+#~ msgid "Gray Front Panel Connector"
+#~ msgstr "ΓκÏι υποδοχή μπÏÎ¿ÏƒÏ„Î¹Î½Î¿Ï Ï€Î¬Î½ÎµÎ»"
+
+#~ msgid "Orange Front Panel Connector"
+#~ msgstr "ΠοÏτοκαλί υποδοχή μπÏÎ¿ÏƒÏ„Î¹Î½Î¿Ï Ï€Î¬Î½ÎµÎ»"
+
+#~ msgid "Red Front Panel Connector"
+#~ msgstr "Κόκκινη υποδοχή μπÏÎ¿ÏƒÏ„Î¹Î½Î¿Ï Ï€Î¬Î½ÎµÎ»"
+
+#~ msgid "Yellow Front Panel Connector"
+#~ msgstr "ΚίτÏινη υποδοχή μπÏÎ¿ÏƒÏ„Î¹Î½Î¿Ï Ï€Î¬Î½ÎµÎ»"
+
+#~ msgid "Spread Output"
+#~ msgstr "ΕυÏεία Îξοδος"
+
+#~ msgid "Downmix"
+#~ msgstr "Μίξη συγχώνευσης (Downmix)"
+
+#~ msgid "Virtual Mixer Input"
+#~ msgstr "Είσοδος ÎµÎ¹ÎºÎ¿Î½Î¹ÎºÎ¿Ï Î¼Î¯ÎºÏ„Î·"
+
+#~ msgid "Virtual Mixer Output"
+#~ msgstr "Έξοδος ÎµÎ¹ÎºÎ¿Î½Î¹ÎºÎ¿Ï Î¼Î¯ÎºÏ„Î·"
+
+#~ msgid "Virtual Mixer Channels"
+#~ msgstr "Κανάλια ÎµÎ¹ÎºÎ¿Î½Î¹ÎºÎ¿Ï Î¼Î¯ÎºÏ„Î·"
+
+#~ msgid "%s %d Function"
+#~ msgstr "ΛειτουÏγία %s %d"
+
+#~ msgid "%s Function"
+#~ msgstr "ΛειτουÏγία %s"
+
#~ msgid "Could not establish connection to sound server"
#~ msgstr "Δεν ήταν δυνατή η σÏνδεση με τον διακομιστή ήχου"
diff --git a/po/en_GB.gmo b/po/en_GB.gmo
index ac7b582f4c4bab7934c51ac750c1d18d2712e846..815f72425b734a35485cf289860720c99f604721 100644
Binary files a/po/en_GB.gmo and b/po/en_GB.gmo differ
diff --git a/po/en_GB.po b/po/en_GB.po
index e27324fc407592fbdcb05587e7bd05f816cc4d23..493acff4226c248a976ff734b63d31f218200ffa 100644
--- a/po/en_GB.po
+++ b/po/en_GB.po
@@ -6,7 +6,7 @@ msgid ""
msgstr ""
"Project-Id-Version: gst-plugins 0.8.1\n"
"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/\n"
-"POT-Creation-Date: 2012-04-12 10:26+0200\n"
+"POT-Creation-Date: 2012-05-13 16:29+0200\n"
"PO-Revision-Date: 2004-04-26 10:41-0400\n"
"Last-Translator: Gareth Owen <gowen72@yahoo.com>\n"
"Language-Team: English (British) <en_gb@li.org>\n"
@@ -94,81 +94,6 @@ msgstr ""
msgid "Internal data flow error."
msgstr ""
-msgid "Volume"
-msgstr "Volume"
-
-msgid "Bass"
-msgstr "Bass"
-
-msgid "Treble"
-msgstr "Treble"
-
-msgid "Synth"
-msgstr "Synth"
-
-msgid "PCM"
-msgstr "PCM"
-
-msgid "Speaker"
-msgstr "Speaker"
-
-msgid "Line-in"
-msgstr "Line-in"
-
-msgid "Microphone"
-msgstr "Microphone"
-
-msgid "CD"
-msgstr "CD"
-
-msgid "Mixer"
-msgstr "Mixer"
-
-msgid "PCM-2"
-msgstr "PCM-2"
-
-msgid "Record"
-msgstr "Record"
-
-msgid "In-gain"
-msgstr "In-gain"
-
-msgid "Out-gain"
-msgstr "Out-gain"
-
-msgid "Line-1"
-msgstr "Line-1"
-
-msgid "Line-2"
-msgstr "Line-2"
-
-msgid "Line-3"
-msgstr "Line-3"
-
-msgid "Digital-1"
-msgstr "Digital-1"
-
-msgid "Digital-2"
-msgstr "Digital-2"
-
-msgid "Digital-3"
-msgstr "Digital-3"
-
-msgid "Phone-in"
-msgstr "Phone-in"
-
-msgid "Phone-out"
-msgstr "Phone-out"
-
-msgid "Video"
-msgstr "Video"
-
-msgid "Radio"
-msgstr "Radio"
-
-msgid "Monitor"
-msgstr "Monitor"
-
msgid ""
"Could not open audio device for playback. Device is being used by another "
"application."
@@ -192,349 +117,49 @@ msgstr ""
msgid "Could not open audio device for recording."
msgstr "Could not open CD device for reading."
-#, fuzzy
-msgid "Could not open audio device for mixer control handling."
-msgstr "Could not open audio device \"%s\" for writing."
-
msgid ""
-"Could not open audio device for mixer control handling. This version of the "
-"Open Sound System is not supported by this element."
+"Could not open audio device for playback. This version of the Open Sound "
+"System is not supported by this element."
msgstr ""
-msgid "Master"
+msgid "Playback is not supported by this audio device."
msgstr ""
-msgid "Front"
+msgid "Audio playback error."
msgstr ""
-#, fuzzy
-msgid "Rear"
-msgstr "Record"
-
-msgid "Headphones"
+msgid "Recording is not supported by this audio device."
msgstr ""
-msgid "Center"
+msgid "Error recording from audio device."
msgstr ""
-msgid "LFE"
-msgstr ""
+msgid "Volume"
+msgstr "Volume"
-msgid "Surround"
+msgid "Gain"
msgstr ""
-#, fuzzy
-msgid "Side"
-msgstr "Video"
+msgid "Monitor"
+msgstr "Monitor"
#, fuzzy
msgid "Built-in Speaker"
msgstr "Speaker"
-msgid "AUX 1 Out"
-msgstr ""
-
-msgid "AUX 2 Out"
-msgstr ""
-
-msgid "AUX Out"
-msgstr ""
-
-msgid "3D Depth"
-msgstr ""
-
-msgid "3D Center"
-msgstr ""
-
-msgid "3D Enhance"
-msgstr ""
-
-msgid "Telephone"
+msgid "Headphone"
msgstr ""
msgid "Line Out"
msgstr ""
-#, fuzzy
-msgid "Line In"
-msgstr "Line-in"
-
-msgid "Internal CD"
-msgstr ""
-
-#, fuzzy
-msgid "Video In"
-msgstr "Video"
-
-msgid "AUX 1 In"
-msgstr ""
-
-msgid "AUX 2 In"
-msgstr ""
-
-msgid "AUX In"
-msgstr ""
-
-#, fuzzy
-msgid "Record Gain"
-msgstr "Record"
-
-#, fuzzy
-msgid "Output Gain"
-msgstr "Out-gain"
-
-#, fuzzy
-msgid "Microphone Boost"
-msgstr "Microphone"
-
-msgid "Loopback"
-msgstr ""
-
-msgid "Diagnostic"
-msgstr ""
-
-msgid "Bass Boost"
-msgstr ""
-
-msgid "Playback Ports"
-msgstr ""
-
-msgid "Input"
-msgstr ""
-
-#, fuzzy
-msgid "Record Source"
-msgstr "Record"
-
-#, fuzzy
-msgid "Monitor Source"
-msgstr "Monitor"
-
-msgid "Keyboard Beep"
-msgstr ""
-
-msgid "Simulate Stereo"
-msgstr ""
-
-msgid "Stereo"
-msgstr ""
-
-msgid "Surround Sound"
-msgstr ""
-
-#, fuzzy
-msgid "Microphone Gain"
-msgstr "Microphone"
-
-#, fuzzy
-msgid "Speaker Source"
-msgstr "Speaker"
-
-#, fuzzy
-msgid "Microphone Source"
-msgstr "Microphone"
-
-msgid "Jack"
-msgstr ""
-
-msgid "Center / LFE"
-msgstr ""
-
-msgid "Stereo Mix"
-msgstr ""
-
-msgid "Mono Mix"
-msgstr ""
-
-msgid "Input Mix"
-msgstr ""
-
-msgid "SPDIF In"
-msgstr ""
-
msgid "SPDIF Out"
msgstr ""
-#, fuzzy
-msgid "Microphone 1"
-msgstr "Microphone"
-
-#, fuzzy
-msgid "Microphone 2"
-msgstr "Microphone"
-
-#, fuzzy
-msgid "Digital Out"
-msgstr "Digital-1"
-
-#, fuzzy
-msgid "Digital In"
-msgstr "Digital-1"
-
-msgid "HDMI"
-msgstr ""
-
-msgid "Modem"
-msgstr ""
-
-msgid "Handset"
-msgstr ""
-
-msgid "Other"
-msgstr ""
-
-msgid "None"
-msgstr ""
-
-msgid "On"
-msgstr ""
-
-msgid "Off"
-msgstr ""
-
-msgid "Mute"
-msgstr ""
-
-msgid "Fast"
-msgstr ""
-
-#. TRANSLATORS: "Very Low" is a quality setting here
-msgid "Very Low"
-msgstr ""
-
-#. TRANSLATORS: "Low" is a quality setting here
-msgid "Low"
-msgstr ""
-
-#. TRANSLATORS: "Medium" is a quality setting here
-msgid "Medium"
-msgstr ""
-
-#. TRANSLATORS: "High" is a quality setting here
-msgid "High"
-msgstr ""
-
-#. TRANSLATORS: "Very High" is a quality setting here
-msgid "Very High"
-msgstr ""
-
-#. TRANSLATORS: "Production" is a quality setting here
-msgid "Production"
-msgstr ""
-
-#, fuzzy
-msgid "Front Panel Microphone"
-msgstr "Microphone"
-
-msgid "Front Panel Line In"
-msgstr ""
-
-msgid "Front Panel Headphones"
-msgstr ""
-
-msgid "Front Panel Line Out"
-msgstr ""
-
-msgid "Green Connector"
-msgstr ""
-
-msgid "Pink Connector"
-msgstr ""
-
-msgid "Blue Connector"
-msgstr ""
-
-msgid "White Connector"
-msgstr ""
-
-msgid "Black Connector"
-msgstr ""
-
-msgid "Gray Connector"
-msgstr ""
-
-msgid "Orange Connector"
-msgstr ""
-
-msgid "Red Connector"
-msgstr ""
-
-msgid "Yellow Connector"
-msgstr ""
-
-msgid "Green Front Panel Connector"
-msgstr ""
-
-msgid "Pink Front Panel Connector"
-msgstr ""
-
-msgid "Blue Front Panel Connector"
-msgstr ""
-
-msgid "White Front Panel Connector"
-msgstr ""
-
-msgid "Black Front Panel Connector"
-msgstr ""
-
-msgid "Gray Front Panel Connector"
-msgstr ""
-
-msgid "Orange Front Panel Connector"
-msgstr ""
-
-msgid "Red Front Panel Connector"
-msgstr ""
-
-msgid "Yellow Front Panel Connector"
-msgstr ""
-
-msgid "Spread Output"
-msgstr ""
-
-msgid "Downmix"
-msgstr ""
-
-msgid "Virtual Mixer Input"
-msgstr ""
-
-msgid "Virtual Mixer Output"
-msgstr ""
-
-msgid "Virtual Mixer Channels"
-msgstr ""
-
-#. TRANSLATORS: name + number of a volume mixer control
-#, c-format
-msgid "%s %d Function"
-msgstr ""
-
-#. TRANSLATORS: name of a volume mixer control
-#, c-format
-msgid "%s Function"
-msgstr ""
-
-msgid ""
-"Could not open audio device for playback. This version of the Open Sound "
-"System is not supported by this element."
-msgstr ""
-
-msgid "Playback is not supported by this audio device."
-msgstr ""
-
-msgid "Audio playback error."
-msgstr ""
-
-msgid "Recording is not supported by this audio device."
-msgstr ""
-
-msgid "Error recording from audio device."
-msgstr ""
-
-msgid "Gain"
+msgid "AUX 1 Out"
msgstr ""
-msgid "Headphone"
+msgid "AUX 2 Out"
msgstr ""
#, fuzzy, c-format
@@ -704,6 +329,147 @@ msgstr ""
msgid "Cannot operate without a clock"
msgstr ""
+#~ msgid "Bass"
+#~ msgstr "Bass"
+
+#~ msgid "Treble"
+#~ msgstr "Treble"
+
+#~ msgid "Synth"
+#~ msgstr "Synth"
+
+#~ msgid "PCM"
+#~ msgstr "PCM"
+
+#~ msgid "Speaker"
+#~ msgstr "Speaker"
+
+#~ msgid "Line-in"
+#~ msgstr "Line-in"
+
+#~ msgid "Microphone"
+#~ msgstr "Microphone"
+
+#~ msgid "CD"
+#~ msgstr "CD"
+
+#~ msgid "Mixer"
+#~ msgstr "Mixer"
+
+#~ msgid "PCM-2"
+#~ msgstr "PCM-2"
+
+#~ msgid "Record"
+#~ msgstr "Record"
+
+#~ msgid "In-gain"
+#~ msgstr "In-gain"
+
+#~ msgid "Out-gain"
+#~ msgstr "Out-gain"
+
+#~ msgid "Line-1"
+#~ msgstr "Line-1"
+
+#~ msgid "Line-2"
+#~ msgstr "Line-2"
+
+#~ msgid "Line-3"
+#~ msgstr "Line-3"
+
+#~ msgid "Digital-1"
+#~ msgstr "Digital-1"
+
+#~ msgid "Digital-2"
+#~ msgstr "Digital-2"
+
+#~ msgid "Digital-3"
+#~ msgstr "Digital-3"
+
+#~ msgid "Phone-in"
+#~ msgstr "Phone-in"
+
+#~ msgid "Phone-out"
+#~ msgstr "Phone-out"
+
+#~ msgid "Video"
+#~ msgstr "Video"
+
+#~ msgid "Radio"
+#~ msgstr "Radio"
+
+#, fuzzy
+#~ msgid "Could not open audio device for mixer control handling."
+#~ msgstr "Could not open audio device \"%s\" for writing."
+
+#, fuzzy
+#~ msgid "Rear"
+#~ msgstr "Record"
+
+#, fuzzy
+#~ msgid "Side"
+#~ msgstr "Video"
+
+#, fuzzy
+#~ msgid "Line In"
+#~ msgstr "Line-in"
+
+#, fuzzy
+#~ msgid "Video In"
+#~ msgstr "Video"
+
+#, fuzzy
+#~ msgid "Record Gain"
+#~ msgstr "Record"
+
+#, fuzzy
+#~ msgid "Output Gain"
+#~ msgstr "Out-gain"
+
+#, fuzzy
+#~ msgid "Microphone Boost"
+#~ msgstr "Microphone"
+
+#, fuzzy
+#~ msgid "Record Source"
+#~ msgstr "Record"
+
+#, fuzzy
+#~ msgid "Monitor Source"
+#~ msgstr "Monitor"
+
+#, fuzzy
+#~ msgid "Microphone Gain"
+#~ msgstr "Microphone"
+
+#, fuzzy
+#~ msgid "Speaker Source"
+#~ msgstr "Speaker"
+
+#, fuzzy
+#~ msgid "Microphone Source"
+#~ msgstr "Microphone"
+
+#, fuzzy
+#~ msgid "Microphone 1"
+#~ msgstr "Microphone"
+
+#, fuzzy
+#~ msgid "Microphone 2"
+#~ msgstr "Microphone"
+
+#, fuzzy
+#~ msgid "Digital Out"
+#~ msgstr "Digital-1"
+
+#, fuzzy
+#~ msgid "Digital In"
+#~ msgstr "Digital-1"
+
+#, fuzzy
+#~ msgid "Front Panel Microphone"
+#~ msgstr "Microphone"
+
#, fuzzy
#~ msgid "Could not enqueue buffers in device '%s'."
#~ msgstr "Could not get buffers from device \"%s\"."
diff --git a/po/eo.gmo b/po/eo.gmo
index 991c73192ce0e1b9217b3de561ffcd4fd6c872d5..0e63a78644d8c46b3079231fff4ca8371f61bbe4 100644
Binary files a/po/eo.gmo and b/po/eo.gmo differ
diff --git a/po/eo.po b/po/eo.po
index dda0728653ad861a2e0a2d5cb64918891a169c74..e2ef46aba883634c3ad807e4f5bb5cee4fdc2a11 100644
--- a/po/eo.po
+++ b/po/eo.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: gst-plugins-good 0.10.28.2\n"
"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/\n"
-"POT-Creation-Date: 2012-04-12 10:26+0200\n"
+"POT-Creation-Date: 2012-05-13 16:29+0200\n"
"PO-Revision-Date: 2011-06-04 21:48+0100\n"
"Last-Translator: Kristjan SCHMIDT <kristjan.schmidt@googlemail.com>\n"
"Language-Team: Esperanto <translation-team-eo@lists.sourceforge.net>\n"
@@ -92,81 +92,6 @@ msgstr ""
msgid "Internal data flow error."
msgstr ""
-msgid "Volume"
-msgstr "LaÅteco"
-
-msgid "Bass"
-msgstr "Baso"
-
-msgid "Treble"
-msgstr ""
-
-msgid "Synth"
-msgstr "Sintezilo"
-
-msgid "PCM"
-msgstr ""
-
-msgid "Speaker"
-msgstr "Parolilo"
-
-msgid "Line-in"
-msgstr ""
-
-msgid "Microphone"
-msgstr "Mikrofono"
-
-msgid "CD"
-msgstr "KD"
-
-msgid "Mixer"
-msgstr "Miksilo"
-
-msgid "PCM-2"
-msgstr ""
-
-msgid "Record"
-msgstr "Registri"
-
-msgid "In-gain"
-msgstr ""
-
-msgid "Out-gain"
-msgstr ""
-
-msgid "Line-1"
-msgstr ""
-
-msgid "Line-2"
-msgstr ""
-
-msgid "Line-3"
-msgstr ""
-
-msgid "Digital-1"
-msgstr ""
-
-msgid "Digital-2"
-msgstr ""
-
-msgid "Digital-3"
-msgstr ""
-
-msgid "Phone-in"
-msgstr ""
-
-msgid "Phone-out"
-msgstr ""
-
-msgid "Video"
-msgstr "Video"
-
-msgid "Radio"
-msgstr "Radio"
-
-msgid "Monitor"
-msgstr "Ekrano"
-
msgid ""
"Could not open audio device for playback. Device is being used by another "
"application."
@@ -190,330 +115,48 @@ msgstr ""
msgid "Could not open audio device for recording."
msgstr "Ne eblis malfermi sonaparaton por registrado."
-msgid "Could not open audio device for mixer control handling."
-msgstr ""
-
msgid ""
-"Could not open audio device for mixer control handling. This version of the "
-"Open Sound System is not supported by this element."
+"Could not open audio device for playback. This version of the Open Sound "
+"System is not supported by this element."
msgstr ""
-msgid "Master"
-msgstr "Ĉefe"
-
-msgid "Front"
-msgstr "AntaÅe"
-
-msgid "Rear"
-msgstr "MalantaÅe"
-
-msgid "Headphones"
-msgstr "Kaptelefono"
-
-msgid "Center"
-msgstr "Centre"
-
-msgid "LFE"
+msgid "Playback is not supported by this audio device."
msgstr ""
-msgid "Surround"
-msgstr "ĈirkaÅe"
-
-msgid "Side"
-msgstr "Flanke"
-
-msgid "Built-in Speaker"
+msgid "Audio playback error."
msgstr ""
-msgid "AUX 1 Out"
+msgid "Recording is not supported by this audio device."
msgstr ""
-msgid "AUX 2 Out"
+msgid "Error recording from audio device."
msgstr ""
-msgid "AUX Out"
-msgstr ""
+msgid "Volume"
+msgstr "LaÅteco"
-msgid "3D Depth"
+msgid "Gain"
msgstr ""
-msgid "3D Center"
-msgstr ""
+msgid "Monitor"
+msgstr "Ekrano"
-msgid "3D Enhance"
+msgid "Built-in Speaker"
msgstr ""
-msgid "Telephone"
+msgid "Headphone"
msgstr ""
msgid "Line Out"
msgstr ""
-msgid "Line In"
-msgstr ""
-
-msgid "Internal CD"
-msgstr ""
-
-msgid "Video In"
-msgstr ""
-
-msgid "AUX 1 In"
-msgstr ""
-
-msgid "AUX 2 In"
-msgstr ""
-
-msgid "AUX In"
-msgstr ""
-
-msgid "Record Gain"
-msgstr ""
-
-msgid "Output Gain"
-msgstr ""
-
-msgid "Microphone Boost"
-msgstr ""
-
-msgid "Loopback"
-msgstr ""
-
-msgid "Diagnostic"
-msgstr ""
-
-msgid "Bass Boost"
-msgstr ""
-
-msgid "Playback Ports"
-msgstr ""
-
-msgid "Input"
-msgstr "Enigo"
-
-msgid "Record Source"
-msgstr ""
-
-msgid "Monitor Source"
-msgstr ""
-
-msgid "Keyboard Beep"
-msgstr ""
-
-msgid "Simulate Stereo"
-msgstr ""
-
-msgid "Stereo"
-msgstr "Dukanale"
-
-msgid "Surround Sound"
-msgstr "ĈirkaÅa sono"
-
-msgid "Microphone Gain"
-msgstr ""
-
-msgid "Speaker Source"
-msgstr ""
-
-msgid "Microphone Source"
-msgstr ""
-
-msgid "Jack"
-msgstr ""
-
-msgid "Center / LFE"
-msgstr ""
-
-msgid "Stereo Mix"
-msgstr ""
-
-msgid "Mono Mix"
-msgstr ""
-
-msgid "Input Mix"
-msgstr ""
-
-msgid "SPDIF In"
-msgstr ""
-
msgid "SPDIF Out"
msgstr ""
-msgid "Microphone 1"
-msgstr "Mikrofono 1"
-
-msgid "Microphone 2"
-msgstr "Mikrofono 2"
-
-msgid "Digital Out"
-msgstr ""
-
-msgid "Digital In"
-msgstr ""
-
-msgid "HDMI"
-msgstr ""
-
-msgid "Modem"
-msgstr "Modemo"
-
-msgid "Handset"
-msgstr ""
-
-msgid "Other"
-msgstr "Alia"
-
-msgid "None"
-msgstr "Neniu"
-
-msgid "On"
-msgstr "EnÅaltite"
-
-msgid "Off"
-msgstr "ElÅaltite"
-
-msgid "Mute"
-msgstr "Silentigi"
-
-msgid "Fast"
-msgstr "Rapide"
-
-#. TRANSLATORS: "Very Low" is a quality setting here
-msgid "Very Low"
-msgstr "Tre malalte"
-
-#. TRANSLATORS: "Low" is a quality setting here
-msgid "Low"
-msgstr "Malalte"
-
-#. TRANSLATORS: "Medium" is a quality setting here
-msgid "Medium"
-msgstr "Meze"
-
-#. TRANSLATORS: "High" is a quality setting here
-msgid "High"
-msgstr "Alte"
-
-#. TRANSLATORS: "Very High" is a quality setting here
-msgid "Very High"
-msgstr "Tre alte"
-
-#. TRANSLATORS: "Production" is a quality setting here
-msgid "Production"
-msgstr ""
-
-msgid "Front Panel Microphone"
-msgstr ""
-
-msgid "Front Panel Line In"
-msgstr ""
-
-msgid "Front Panel Headphones"
-msgstr ""
-
-msgid "Front Panel Line Out"
-msgstr ""
-
-msgid "Green Connector"
-msgstr ""
-
-msgid "Pink Connector"
-msgstr ""
-
-msgid "Blue Connector"
-msgstr ""
-
-msgid "White Connector"
-msgstr ""
-
-msgid "Black Connector"
-msgstr ""
-
-msgid "Gray Connector"
-msgstr ""
-
-msgid "Orange Connector"
-msgstr ""
-
-msgid "Red Connector"
-msgstr ""
-
-msgid "Yellow Connector"
-msgstr ""
-
-msgid "Green Front Panel Connector"
-msgstr ""
-
-msgid "Pink Front Panel Connector"
-msgstr ""
-
-msgid "Blue Front Panel Connector"
-msgstr ""
-
-msgid "White Front Panel Connector"
-msgstr ""
-
-msgid "Black Front Panel Connector"
-msgstr ""
-
-msgid "Gray Front Panel Connector"
-msgstr ""
-
-msgid "Orange Front Panel Connector"
-msgstr ""
-
-msgid "Red Front Panel Connector"
-msgstr ""
-
-msgid "Yellow Front Panel Connector"
-msgstr ""
-
-msgid "Spread Output"
-msgstr ""
-
-msgid "Downmix"
-msgstr ""
-
-msgid "Virtual Mixer Input"
-msgstr ""
-
-msgid "Virtual Mixer Output"
-msgstr ""
-
-msgid "Virtual Mixer Channels"
-msgstr ""
-
-#. TRANSLATORS: name + number of a volume mixer control
-#, c-format
-msgid "%s %d Function"
-msgstr "%s %d funkcio"
-
-#. TRANSLATORS: name of a volume mixer control
-#, c-format
-msgid "%s Function"
-msgstr "%s funcio"
-
-msgid ""
-"Could not open audio device for playback. This version of the Open Sound "
-"System is not supported by this element."
-msgstr ""
-
-msgid "Playback is not supported by this audio device."
-msgstr ""
-
-msgid "Audio playback error."
-msgstr ""
-
-msgid "Recording is not supported by this audio device."
-msgstr ""
-
-msgid "Error recording from audio device."
-msgstr ""
-
-msgid "Gain"
+msgid "AUX 1 Out"
msgstr ""
-msgid "Headphone"
+msgid "AUX 2 Out"
msgstr ""
#, c-format
@@ -682,3 +325,108 @@ msgstr ""
msgid "Cannot operate without a clock"
msgstr ""
+
+#~ msgid "Bass"
+#~ msgstr "Baso"
+
+#~ msgid "Synth"
+#~ msgstr "Sintezilo"
+
+#~ msgid "Speaker"
+#~ msgstr "Parolilo"
+
+#~ msgid "Microphone"
+#~ msgstr "Mikrofono"
+
+#~ msgid "CD"
+#~ msgstr "KD"
+
+#~ msgid "Mixer"
+#~ msgstr "Miksilo"
+
+#~ msgid "Record"
+#~ msgstr "Registri"
+
+#~ msgid "Video"
+#~ msgstr "Video"
+
+#~ msgid "Radio"
+#~ msgstr "Radio"
+
+#~ msgid "Master"
+#~ msgstr "Ĉefe"
+
+#~ msgid "Front"
+#~ msgstr "AntaÅe"
+
+#~ msgid "Rear"
+#~ msgstr "MalantaÅe"
+
+#~ msgid "Headphones"
+#~ msgstr "Kaptelefono"
+
+#~ msgid "Center"
+#~ msgstr "Centre"
+
+#~ msgid "Surround"
+#~ msgstr "ĈirkaÅe"
+
+#~ msgid "Side"
+#~ msgstr "Flanke"
+
+#~ msgid "Input"
+#~ msgstr "Enigo"
+
+#~ msgid "Stereo"
+#~ msgstr "Dukanale"
+
+#~ msgid "Surround Sound"
+#~ msgstr "ĈirkaÅa sono"
+
+#~ msgid "Microphone 1"
+#~ msgstr "Mikrofono 1"
+
+#~ msgid "Microphone 2"
+#~ msgstr "Mikrofono 2"
+
+#~ msgid "Modem"
+#~ msgstr "Modemo"
+
+#~ msgid "Other"
+#~ msgstr "Alia"
+
+#~ msgid "None"
+#~ msgstr "Neniu"
+
+#~ msgid "On"
+#~ msgstr "EnÅaltite"
+
+#~ msgid "Off"
+#~ msgstr "ElÅaltite"
+
+#~ msgid "Mute"
+#~ msgstr "Silentigi"
+
+#~ msgid "Fast"
+#~ msgstr "Rapide"
+
+#~ msgid "Very Low"
+#~ msgstr "Tre malalte"
+
+#~ msgid "Low"
+#~ msgstr "Malalte"
+
+#~ msgid "Medium"
+#~ msgstr "Meze"
+
+#~ msgid "High"
+#~ msgstr "Alte"
+
+#~ msgid "Very High"
+#~ msgstr "Tre alte"
+
+#~ msgid "%s %d Function"
+#~ msgstr "%s %d funkcio"
+
+#~ msgid "%s Function"
+#~ msgstr "%s funcio"
diff --git a/po/es.gmo b/po/es.gmo
index 553e9ab4112c462d751752f54691b8a6082bf4d7..47f55d99b441ab898429f51bdf3a72516d5a2048 100644
Binary files a/po/es.gmo and b/po/es.gmo differ
diff --git a/po/es.po b/po/es.po
index af5612e79d38398017f5936e5549f96a2c238f96..49ac4691949f86163ac9f625d8cc45da3ada1a88 100644
--- a/po/es.po
+++ b/po/es.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: gst-plugins-good 0.10.26.2\n"
"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/\n"
-"POT-Creation-Date: 2012-04-12 10:26+0200\n"
+"POT-Creation-Date: 2012-05-13 16:29+0200\n"
"PO-Revision-Date: 2011-02-12 18:30+0100\n"
"Last-Translator: Jorge González González <aloriel@gmail.com>\n"
"Language-Team: Spanish <es@li.org>\n"
@@ -101,81 +101,6 @@ msgstr ""
msgid "Internal data flow error."
msgstr "Error en el flujo de datos interno."
-msgid "Volume"
-msgstr "Volumen"
-
-msgid "Bass"
-msgstr "Bass"
-
-msgid "Treble"
-msgstr "Agudos"
-
-msgid "Synth"
-msgstr "Sintetizador"
-
-msgid "PCM"
-msgstr "PCM"
-
-msgid "Speaker"
-msgstr "Altavoz"
-
-msgid "Line-in"
-msgstr "LÃnea de entrada"
-
-msgid "Microphone"
-msgstr "Micrófono"
-
-msgid "CD"
-msgstr "CD"
-
-msgid "Mixer"
-msgstr "Mezclador"
-
-msgid "PCM-2"
-msgstr "PCM-2"
-
-msgid "Record"
-msgstr "Grabación"
-
-msgid "In-gain"
-msgstr "Ganancia de entrada"
-
-msgid "Out-gain"
-msgstr "Ganancia de salida"
-
-msgid "Line-1"
-msgstr "LÃnea-1"
-
-msgid "Line-2"
-msgstr "LÃnea-2"
-
-msgid "Line-3"
-msgstr "LÃnea-3"
-
-msgid "Digital-1"
-msgstr "Digital-1"
-
-msgid "Digital-2"
-msgstr "Digital-2"
-
-msgid "Digital-3"
-msgstr "Digital-3"
-
-msgid "Phone-in"
-msgstr "Entrada de teléfono"
-
-msgid "Phone-out"
-msgstr "Salida de teléfono"
-
-msgid "Video"
-msgstr "VÃdeo"
-
-msgid "Radio"
-msgstr "Radio"
-
-msgid "Monitor"
-msgstr "Monitor"
-
msgid ""
"Could not open audio device for playback. Device is being used by another "
"application."
@@ -203,314 +128,6 @@ msgstr ""
msgid "Could not open audio device for recording."
msgstr "No se pudo abrir el dispositivo para grabar."
-msgid "Could not open audio device for mixer control handling."
-msgstr ""
-"No se pudo abrir el dispositivo de sonido para su gestión por el control de "
-"mezclado."
-
-msgid ""
-"Could not open audio device for mixer control handling. This version of the "
-"Open Sound System is not supported by this element."
-msgstr ""
-"No se pudo abrir el dispositivo de sonido para su gestión por el control de "
-"mezclado. Este elemento no soporta esta versión del Sistema de sonido "
-"abierto (OSS)."
-
-msgid "Master"
-msgstr "Maestro"
-
-msgid "Front"
-msgstr "Frontal"
-
-msgid "Rear"
-msgstr "Trasero"
-
-msgid "Headphones"
-msgstr "Auriculares"
-
-msgid "Center"
-msgstr "Centro"
-
-msgid "LFE"
-msgstr "LFE"
-
-msgid "Surround"
-msgstr "Envolvente"
-
-msgid "Side"
-msgstr "Lateral"
-
-msgid "Built-in Speaker"
-msgstr "Altavoz integrado"
-
-msgid "AUX 1 Out"
-msgstr "Salida AUX 1"
-
-msgid "AUX 2 Out"
-msgstr "Salida AUX 2"
-
-msgid "AUX Out"
-msgstr "Salida AUX"
-
-msgid "3D Depth"
-msgstr "Profundidad 3D"
-
-msgid "3D Center"
-msgstr "Centro 3D"
-
-msgid "3D Enhance"
-msgstr "Mejora 3D"
-
-msgid "Telephone"
-msgstr "TeleÌfono"
-
-msgid "Line Out"
-msgstr "LÃnea de salida"
-
-msgid "Line In"
-msgstr "LÃnea de entrada"
-
-msgid "Internal CD"
-msgstr "CD interno"
-
-msgid "Video In"
-msgstr "Entrada de vÃdeo"
-
-msgid "AUX 1 In"
-msgstr "Entrada AUX 1"
-
-msgid "AUX 2 In"
-msgstr "Entrada AUX 2"
-
-msgid "AUX In"
-msgstr "Entrada AUX"
-
-msgid "Record Gain"
-msgstr "Ganancia de grabación"
-
-msgid "Output Gain"
-msgstr "Ganancia de salida"
-
-msgid "Microphone Boost"
-msgstr "Aumento del micrófono"
-
-msgid "Loopback"
-msgstr "Bucle local"
-
-msgid "Diagnostic"
-msgstr "DiagnoÌstico"
-
-msgid "Bass Boost"
-msgstr "Aumento de bajos"
-
-msgid "Playback Ports"
-msgstr "Puertos de reproducción"
-
-msgid "Input"
-msgstr "Entrada"
-
-msgid "Record Source"
-msgstr "Origen de la grabación"
-
-msgid "Monitor Source"
-msgstr "Monitor de origen"
-
-msgid "Keyboard Beep"
-msgstr "Pitido de teclado"
-
-msgid "Simulate Stereo"
-msgstr "Simular estéreo"
-
-msgid "Stereo"
-msgstr "EsteÌreo"
-
-msgid "Surround Sound"
-msgstr "Sonido envolvente"
-
-msgid "Microphone Gain"
-msgstr "Ganancia del micrófono"
-
-msgid "Speaker Source"
-msgstr "Altavoz de origen"
-
-msgid "Microphone Source"
-msgstr "MicroÌfono de origen"
-
-msgid "Jack"
-msgstr "Jack"
-
-msgid "Center / LFE"
-msgstr "Centrado / LFE"
-
-msgid "Stereo Mix"
-msgstr "Mezclador estéreo"
-
-msgid "Mono Mix"
-msgstr "Mezclador mono"
-
-msgid "Input Mix"
-msgstr "Mezclador de entrada"
-
-msgid "SPDIF In"
-msgstr "Entrada S/PDIF"
-
-msgid "SPDIF Out"
-msgstr "Salida S/PDIF"
-
-msgid "Microphone 1"
-msgstr "Micrófono 1"
-
-msgid "Microphone 2"
-msgstr "Micrófono 2"
-
-msgid "Digital Out"
-msgstr "Salida digital"
-
-msgid "Digital In"
-msgstr "Entrada digital"
-
-msgid "HDMI"
-msgstr "HDMI"
-
-msgid "Modem"
-msgstr "MoÌdem"
-
-msgid "Handset"
-msgstr "Auriculares"
-
-msgid "Other"
-msgstr "Otro"
-
-msgid "None"
-msgstr "Ninguno"
-
-msgid "On"
-msgstr "Encendido"
-
-msgid "Off"
-msgstr "Apagado"
-
-msgid "Mute"
-msgstr "Silenciar"
-
-msgid "Fast"
-msgstr "Rápido"
-
-#. TRANSLATORS: "Very Low" is a quality setting here
-msgid "Very Low"
-msgstr "Muy bajo"
-
-#. TRANSLATORS: "Low" is a quality setting here
-msgid "Low"
-msgstr "Bajo"
-
-#. TRANSLATORS: "Medium" is a quality setting here
-msgid "Medium"
-msgstr "Medio"
-
-#. TRANSLATORS: "High" is a quality setting here
-msgid "High"
-msgstr "Alto"
-
-#. TRANSLATORS: "Very High" is a quality setting here
-msgid "Very High"
-msgstr "Muy alto"
-
-#. TRANSLATORS: "Production" is a quality setting here
-msgid "Production"
-msgstr "Producción"
-
-msgid "Front Panel Microphone"
-msgstr "MicroÌfono del panel frontal"
-
-msgid "Front Panel Line In"
-msgstr "Entrada del panel frontal"
-
-msgid "Front Panel Headphones"
-msgstr "Auriculares del panel frontal"
-
-msgid "Front Panel Line Out"
-msgstr "Salida del panel frontal"
-
-msgid "Green Connector"
-msgstr "Conector verde"
-
-msgid "Pink Connector"
-msgstr "Conector rosa"
-
-msgid "Blue Connector"
-msgstr "Conector azul"
-
-msgid "White Connector"
-msgstr "Conector blanco"
-
-msgid "Black Connector"
-msgstr "Conector negro"
-
-msgid "Gray Connector"
-msgstr "Conector gris"
-
-msgid "Orange Connector"
-msgstr "Conector naranja"
-
-msgid "Red Connector"
-msgstr "Conector rojo"
-
-msgid "Yellow Connector"
-msgstr "Conector amarillo"
-
-msgid "Green Front Panel Connector"
-msgstr "Conector verde del panel frontal"
-
-msgid "Pink Front Panel Connector"
-msgstr "Conector rosa del panel frontal"
-
-msgid "Blue Front Panel Connector"
-msgstr "Conector azul del panel frontal"
-
-msgid "White Front Panel Connector"
-msgstr "Conector blanco del panel frontal"
-
-msgid "Black Front Panel Connector"
-msgstr "Conector negro del panel frontal"
-
-msgid "Gray Front Panel Connector"
-msgstr "Conector gris del panel frontal"
-
-msgid "Orange Front Panel Connector"
-msgstr "Conector naranja del panel frontal"
-
-msgid "Red Front Panel Connector"
-msgstr "Conector rojo del panel frontal"
-
-msgid "Yellow Front Panel Connector"
-msgstr "Conector amarillo del panel frontal"
-
-msgid "Spread Output"
-msgstr "Expandir salida"
-
-msgid "Downmix"
-msgstr "Reducción de canales"
-
-msgid "Virtual Mixer Input"
-msgstr "Entrada del mezclador virtual"
-
-msgid "Virtual Mixer Output"
-msgstr "Salida del mezclador virtual"
-
-msgid "Virtual Mixer Channels"
-msgstr "Canales del mezclador virtual"
-
-#. TRANSLATORS: name + number of a volume mixer control
-#, c-format
-msgid "%s %d Function"
-msgstr "Función %s %d"
-
-#. TRANSLATORS: name of a volume mixer control
-#, c-format
-msgid "%s Function"
-msgstr "Función %s"
-
msgid ""
"Could not open audio device for playback. This version of the Open Sound "
"System is not supported by this element."
@@ -531,12 +148,33 @@ msgstr "Este dispositivo de sonido no soporta la grabación."
msgid "Error recording from audio device."
msgstr "Error al grabar del dispositivo de sonido."
+msgid "Volume"
+msgstr "Volumen"
+
msgid "Gain"
msgstr "Ganancia"
+msgid "Monitor"
+msgstr "Monitor"
+
+msgid "Built-in Speaker"
+msgstr "Altavoz integrado"
+
msgid "Headphone"
msgstr "Auriculares"
+msgid "Line Out"
+msgstr "LÃnea de salida"
+
+msgid "SPDIF Out"
+msgstr "Salida S/PDIF"
+
+msgid "AUX 1 Out"
+msgstr "Salida AUX 1"
+
+msgid "AUX 2 Out"
+msgstr "Salida AUX 2"
+
#, c-format
msgid "Error reading %d bytes from device '%s'."
msgstr "Error al leer %d bytes del dispositivo «%s»."
@@ -726,6 +364,358 @@ msgstr "El cambio de resolución durante la reproducción aún no está soportad
msgid "Cannot operate without a clock"
msgstr "No se puede operar sin reloj"
+#~ msgid "Bass"
+#~ msgstr "Bass"
+
+#~ msgid "Treble"
+#~ msgstr "Agudos"
+
+#~ msgid "Synth"
+#~ msgstr "Sintetizador"
+
+#~ msgid "PCM"
+#~ msgstr "PCM"
+
+#~ msgid "Speaker"
+#~ msgstr "Altavoz"
+
+#~ msgid "Line-in"
+#~ msgstr "LÃnea de entrada"
+
+#~ msgid "Microphone"
+#~ msgstr "Micrófono"
+
+#~ msgid "CD"
+#~ msgstr "CD"
+
+#~ msgid "Mixer"
+#~ msgstr "Mezclador"
+
+#~ msgid "PCM-2"
+#~ msgstr "PCM-2"
+
+#~ msgid "Record"
+#~ msgstr "Grabación"
+
+#~ msgid "In-gain"
+#~ msgstr "Ganancia de entrada"
+
+#~ msgid "Out-gain"
+#~ msgstr "Ganancia de salida"
+
+#~ msgid "Line-1"
+#~ msgstr "LÃnea-1"
+
+#~ msgid "Line-2"
+#~ msgstr "LÃnea-2"
+
+#~ msgid "Line-3"
+#~ msgstr "LÃnea-3"
+
+#~ msgid "Digital-1"
+#~ msgstr "Digital-1"
+
+#~ msgid "Digital-2"
+#~ msgstr "Digital-2"
+
+#~ msgid "Digital-3"
+#~ msgstr "Digital-3"
+
+#~ msgid "Phone-in"
+#~ msgstr "Entrada de teléfono"
+
+#~ msgid "Phone-out"
+#~ msgstr "Salida de teléfono"
+
+#~ msgid "Video"
+#~ msgstr "VÃdeo"
+
+#~ msgid "Radio"
+#~ msgstr "Radio"
+
+#~ msgid "Could not open audio device for mixer control handling."
+#~ msgstr ""
+#~ "No se pudo abrir el dispositivo de sonido para su gestión por el control "
+#~ "de mezclado."
+
+#~ msgid ""
+#~ "Could not open audio device for mixer control handling. This version of "
+#~ "the Open Sound System is not supported by this element."
+#~ msgstr ""
+#~ "No se pudo abrir el dispositivo de sonido para su gestión por el control "
+#~ "de mezclado. Este elemento no soporta esta versión del Sistema de sonido "
+#~ "abierto (OSS)."
+
+#~ msgid "Master"
+#~ msgstr "Maestro"
+
+#~ msgid "Front"
+#~ msgstr "Frontal"
+
+#~ msgid "Rear"
+#~ msgstr "Trasero"
+
+#~ msgid "Headphones"
+#~ msgstr "Auriculares"
+
+#~ msgid "Center"
+#~ msgstr "Centro"
+
+#~ msgid "LFE"
+#~ msgstr "LFE"
+
+#~ msgid "Surround"
+#~ msgstr "Envolvente"
+
+#~ msgid "Side"
+#~ msgstr "Lateral"
+
+#~ msgid "AUX Out"
+#~ msgstr "Salida AUX"
+
+#~ msgid "3D Depth"
+#~ msgstr "Profundidad 3D"
+
+#~ msgid "3D Center"
+#~ msgstr "Centro 3D"
+
+#~ msgid "3D Enhance"
+#~ msgstr "Mejora 3D"
+
+#~ msgid "Telephone"
+#~ msgstr "TeleÌfono"
+
+#~ msgid "Line In"
+#~ msgstr "LÃnea de entrada"
+
+#~ msgid "Internal CD"
+#~ msgstr "CD interno"
+
+#~ msgid "Video In"
+#~ msgstr "Entrada de vÃdeo"
+
+#~ msgid "AUX 1 In"
+#~ msgstr "Entrada AUX 1"
+
+#~ msgid "AUX 2 In"
+#~ msgstr "Entrada AUX 2"
+
+#~ msgid "AUX In"
+#~ msgstr "Entrada AUX"
+
+#~ msgid "Record Gain"
+#~ msgstr "Ganancia de grabación"
+
+#~ msgid "Output Gain"
+#~ msgstr "Ganancia de salida"
+
+#~ msgid "Microphone Boost"
+#~ msgstr "Aumento del micrófono"
+
+#~ msgid "Loopback"
+#~ msgstr "Bucle local"
+
+#~ msgid "Diagnostic"
+#~ msgstr "DiagnoÌstico"
+
+#~ msgid "Bass Boost"
+#~ msgstr "Aumento de bajos"
+
+#~ msgid "Playback Ports"
+#~ msgstr "Puertos de reproducción"
+
+#~ msgid "Input"
+#~ msgstr "Entrada"
+
+#~ msgid "Record Source"
+#~ msgstr "Origen de la grabación"
+
+#~ msgid "Monitor Source"
+#~ msgstr "Monitor de origen"
+
+#~ msgid "Keyboard Beep"
+#~ msgstr "Pitido de teclado"
+
+#~ msgid "Simulate Stereo"
+#~ msgstr "Simular estéreo"
+
+#~ msgid "Stereo"
+#~ msgstr "EsteÌreo"
+
+#~ msgid "Surround Sound"
+#~ msgstr "Sonido envolvente"
+
+#~ msgid "Microphone Gain"
+#~ msgstr "Ganancia del micrófono"
+
+#~ msgid "Speaker Source"
+#~ msgstr "Altavoz de origen"
+
+#~ msgid "Microphone Source"
+#~ msgstr "MicroÌfono de origen"
+
+#~ msgid "Jack"
+#~ msgstr "Jack"
+
+#~ msgid "Center / LFE"
+#~ msgstr "Centrado / LFE"
+
+#~ msgid "Stereo Mix"
+#~ msgstr "Mezclador estéreo"
+
+#~ msgid "Mono Mix"
+#~ msgstr "Mezclador mono"
+
+#~ msgid "Input Mix"
+#~ msgstr "Mezclador de entrada"
+
+#~ msgid "SPDIF In"
+#~ msgstr "Entrada S/PDIF"
+
+#~ msgid "Microphone 1"
+#~ msgstr "Micrófono 1"
+
+#~ msgid "Microphone 2"
+#~ msgstr "Micrófono 2"
+
+#~ msgid "Digital Out"
+#~ msgstr "Salida digital"
+
+#~ msgid "Digital In"
+#~ msgstr "Entrada digital"
+
+#~ msgid "HDMI"
+#~ msgstr "HDMI"
+
+#~ msgid "Modem"
+#~ msgstr "MoÌdem"
+
+#~ msgid "Handset"
+#~ msgstr "Auriculares"
+
+#~ msgid "Other"
+#~ msgstr "Otro"
+
+#~ msgid "None"
+#~ msgstr "Ninguno"
+
+#~ msgid "On"
+#~ msgstr "Encendido"
+
+#~ msgid "Off"
+#~ msgstr "Apagado"
+
+#~ msgid "Mute"
+#~ msgstr "Silenciar"
+
+#~ msgid "Fast"
+#~ msgstr "Rápido"
+
+#~ msgid "Very Low"
+#~ msgstr "Muy bajo"
+
+#~ msgid "Low"
+#~ msgstr "Bajo"
+
+#~ msgid "Medium"
+#~ msgstr "Medio"
+
+#~ msgid "High"
+#~ msgstr "Alto"
+
+#~ msgid "Very High"
+#~ msgstr "Muy alto"
+
+#~ msgid "Production"
+#~ msgstr "Producción"
+
+#~ msgid "Front Panel Microphone"
+#~ msgstr "MicroÌfono del panel frontal"
+
+#~ msgid "Front Panel Line In"
+#~ msgstr "Entrada del panel frontal"
+
+#~ msgid "Front Panel Headphones"
+#~ msgstr "Auriculares del panel frontal"
+
+#~ msgid "Front Panel Line Out"
+#~ msgstr "Salida del panel frontal"
+
+#~ msgid "Green Connector"
+#~ msgstr "Conector verde"
+
+#~ msgid "Pink Connector"
+#~ msgstr "Conector rosa"
+
+#~ msgid "Blue Connector"
+#~ msgstr "Conector azul"
+
+#~ msgid "White Connector"
+#~ msgstr "Conector blanco"
+
+#~ msgid "Black Connector"
+#~ msgstr "Conector negro"
+
+#~ msgid "Gray Connector"
+#~ msgstr "Conector gris"
+
+#~ msgid "Orange Connector"
+#~ msgstr "Conector naranja"
+
+#~ msgid "Red Connector"
+#~ msgstr "Conector rojo"
+
+#~ msgid "Yellow Connector"
+#~ msgstr "Conector amarillo"
+
+#~ msgid "Green Front Panel Connector"
+#~ msgstr "Conector verde del panel frontal"
+
+#~ msgid "Pink Front Panel Connector"
+#~ msgstr "Conector rosa del panel frontal"
+
+#~ msgid "Blue Front Panel Connector"
+#~ msgstr "Conector azul del panel frontal"
+
+#~ msgid "White Front Panel Connector"
+#~ msgstr "Conector blanco del panel frontal"
+
+#~ msgid "Black Front Panel Connector"
+#~ msgstr "Conector negro del panel frontal"
+
+#~ msgid "Gray Front Panel Connector"
+#~ msgstr "Conector gris del panel frontal"
+
+#~ msgid "Orange Front Panel Connector"
+#~ msgstr "Conector naranja del panel frontal"
+
+#~ msgid "Red Front Panel Connector"
+#~ msgstr "Conector rojo del panel frontal"
+
+#~ msgid "Yellow Front Panel Connector"
+#~ msgstr "Conector amarillo del panel frontal"
+
+#~ msgid "Spread Output"
+#~ msgstr "Expandir salida"
+
+#~ msgid "Downmix"
+#~ msgstr "Reducción de canales"
+
+#~ msgid "Virtual Mixer Input"
+#~ msgstr "Entrada del mezclador virtual"
+
+#~ msgid "Virtual Mixer Output"
+#~ msgstr "Salida del mezclador virtual"
+
+#~ msgid "Virtual Mixer Channels"
+#~ msgstr "Canales del mezclador virtual"
+
+#~ msgid "%s %d Function"
+#~ msgstr "Función %s %d"
+
+#~ msgid "%s Function"
+#~ msgstr "Función %s"
+
#~ msgid "Error reading %d bytes on device '%s'."
#~ msgstr "Error al leer %d bytes del dispositivo «%s»."
diff --git a/po/eu.gmo b/po/eu.gmo
index cc15962155f920863ee146b98295b6fa5262e13b..28b5acf2a330cd2100deee8e662cce42ae30212b 100644
Binary files a/po/eu.gmo and b/po/eu.gmo differ
diff --git a/po/eu.po b/po/eu.po
index 66c6586c5aa114f1db3e2a05de8480092a6a5e36..08765714756df6979a2ce7f3d4bce8c9d6301890 100644
--- a/po/eu.po
+++ b/po/eu.po
@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: gst-plugins-good-0.10.18.2\n"
"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/\n"
-"POT-Creation-Date: 2012-04-12 10:26+0200\n"
+"POT-Creation-Date: 2012-05-13 16:29+0200\n"
"PO-Revision-Date: 2010-03-25 12:37+0100\n"
"Last-Translator: Mikel Olasagasti Uranga <hey_neken@mundurat.net>\n"
"Language-Team: Basque <translation-team-eu@lists.sourceforge.net>\n"
@@ -104,81 +104,6 @@ msgstr ""
msgid "Internal data flow error."
msgstr "Datu-fluxuaren barne-errorea."
-msgid "Volume"
-msgstr "Bolumena"
-
-msgid "Bass"
-msgstr "Baxua"
-
-msgid "Treble"
-msgstr "Altua"
-
-msgid "Synth"
-msgstr "Sintetizadorea"
-
-msgid "PCM"
-msgstr "PCM"
-
-msgid "Speaker"
-msgstr "Bozgorailua"
-
-msgid "Line-in"
-msgstr "Linea-sarrera"
-
-msgid "Microphone"
-msgstr "Mikrofonoa"
-
-msgid "CD"
-msgstr "CDa"
-
-msgid "Mixer"
-msgstr "Nahastailea"
-
-msgid "PCM-2"
-msgstr "PCM-2"
-
-msgid "Record"
-msgstr "Grabazioa"
-
-msgid "In-gain"
-msgstr "Sarrerako irabazia"
-
-msgid "Out-gain"
-msgstr "Irteerako irabazia"
-
-msgid "Line-1"
-msgstr "1. linea"
-
-msgid "Line-2"
-msgstr "2. linea"
-
-msgid "Line-3"
-msgstr "3. linea"
-
-msgid "Digital-1"
-msgstr "1. digitala"
-
-msgid "Digital-2"
-msgstr "2. digitala"
-
-msgid "Digital-3"
-msgstr "3. digitala"
-
-msgid "Phone-in"
-msgstr "Aurikularren sarrera"
-
-msgid "Phone-out"
-msgstr "Aurikularren irteera"
-
-msgid "Video"
-msgstr "Bideoa"
-
-msgid "Radio"
-msgstr "Irratia"
-
-msgid "Monitor"
-msgstr "Monitorea"
-
msgid ""
"Could not open audio device for playback. Device is being used by another "
"application."
@@ -206,311 +131,6 @@ msgstr ""
msgid "Could not open audio device for recording."
msgstr "Ezin izan da audioaren gailua ireki grabatzeko."
-msgid "Could not open audio device for mixer control handling."
-msgstr "Ezin izan da audioko gailua ireki nahastailearen kontrola kudeatzeko."
-
-msgid ""
-"Could not open audio device for mixer control handling. This version of the "
-"Open Sound System is not supported by this element."
-msgstr ""
-"Ezin izan da audioko gailua ireki nahastailearen kontrola kudeatzeko. "
-"Elementu honek ez du onartzen Open Sound System-en bertsio hau."
-
-msgid "Master"
-msgstr "Maisua"
-
-msgid "Front"
-msgstr "Aurrealdekoa"
-
-msgid "Rear"
-msgstr "Atzealdekoa"
-
-msgid "Headphones"
-msgstr "Aurikularrak"
-
-msgid "Center"
-msgstr "Erdikoa"
-
-msgid "LFE"
-msgstr "LFE"
-
-msgid "Surround"
-msgstr "Inguratzailea"
-
-msgid "Side"
-msgstr "Albokoa"
-
-msgid "Built-in Speaker"
-msgstr "Barneko bozgorailua"
-
-msgid "AUX 1 Out"
-msgstr "1. irteera lagungarria"
-
-msgid "AUX 2 Out"
-msgstr "2. irteera lagungarria"
-
-msgid "AUX Out"
-msgstr "Irteera lagungarria"
-
-msgid "3D Depth"
-msgstr "3D sakonera"
-
-msgid "3D Center"
-msgstr "3D zentrua"
-
-msgid "3D Enhance"
-msgstr "3D hobetua"
-
-msgid "Telephone"
-msgstr "Telefonoa"
-
-msgid "Line Out"
-msgstr "Irteerako linea"
-
-msgid "Line In"
-msgstr "Sarrerako linea"
-
-msgid "Internal CD"
-msgstr "Barneko CDa"
-
-msgid "Video In"
-msgstr "Bideo-sarrera"
-
-msgid "AUX 1 In"
-msgstr "1. sarrera lagungarria"
-
-msgid "AUX 2 In"
-msgstr "2. sarrera lagungarria"
-
-msgid "AUX In"
-msgstr "Sarrera lagungarria"
-
-msgid "Record Gain"
-msgstr "Grabazioaren irabazia"
-
-msgid "Output Gain"
-msgstr "Irteeraren irabazia"
-
-msgid "Microphone Boost"
-msgstr "Mikrofonoaren bultzada"
-
-msgid "Loopback"
-msgstr "Atzera-begizta"
-
-msgid "Diagnostic"
-msgstr "Diagnostikoa"
-
-msgid "Bass Boost"
-msgstr "Baxuaren bultzada"
-
-msgid "Playback Ports"
-msgstr "Erreprodukzioaren atakak"
-
-msgid "Input"
-msgstr "Sarrera"
-
-msgid "Record Source"
-msgstr "Grabazioaren iturburua"
-
-msgid "Monitor Source"
-msgstr "Monitorearen iturburua"
-
-msgid "Keyboard Beep"
-msgstr "Teklatuaren soinua"
-
-msgid "Simulate Stereo"
-msgstr "Simulatu estereoa"
-
-msgid "Stereo"
-msgstr "Estereoa"
-
-msgid "Surround Sound"
-msgstr "Soinu inguratzailea"
-
-msgid "Microphone Gain"
-msgstr "Mikrofonoaren irabazia"
-
-msgid "Speaker Source"
-msgstr "Bozgorailuaren iturburua"
-
-msgid "Microphone Source"
-msgstr "Mikrofonoaren iturburua"
-
-msgid "Jack"
-msgstr "Jack"
-
-msgid "Center / LFE"
-msgstr "Zentratua / LFE"
-
-msgid "Stereo Mix"
-msgstr "Estereozko nahasketa"
-
-msgid "Mono Mix"
-msgstr "Monozko nahasketa"
-
-msgid "Input Mix"
-msgstr "Sarrerako nahasketa"
-
-msgid "SPDIF In"
-msgstr "SPDIF sarrera"
-
-msgid "SPDIF Out"
-msgstr "SPDIF irteera"
-
-msgid "Microphone 1"
-msgstr "1. mikrofonoa"
-
-msgid "Microphone 2"
-msgstr "2. mikrofonoa"
-
-msgid "Digital Out"
-msgstr "Irteera digitala"
-
-msgid "Digital In"
-msgstr "Sarrera digitala"
-
-msgid "HDMI"
-msgstr "HDMI"
-
-msgid "Modem"
-msgstr "Modema"
-
-msgid "Handset"
-msgstr "Aurikular+mikrofonoa"
-
-msgid "Other"
-msgstr "Bestelakoa"
-
-msgid "None"
-msgstr "Bat ere ez"
-
-msgid "On"
-msgstr "Piztu"
-
-msgid "Off"
-msgstr "Itzali"
-
-msgid "Mute"
-msgstr "Mututu"
-
-msgid "Fast"
-msgstr "Bizkorra"
-
-#. TRANSLATORS: "Very Low" is a quality setting here
-msgid "Very Low"
-msgstr "Oso motela"
-
-#. TRANSLATORS: "Low" is a quality setting here
-msgid "Low"
-msgstr "Motela"
-
-#. TRANSLATORS: "Medium" is a quality setting here
-msgid "Medium"
-msgstr "Tartekoa"
-
-#. TRANSLATORS: "High" is a quality setting here
-msgid "High"
-msgstr "Altua"
-
-#. TRANSLATORS: "Very High" is a quality setting here
-msgid "Very High"
-msgstr "Oso altua"
-
-#. TRANSLATORS: "Production" is a quality setting here
-msgid "Production"
-msgstr "Ekoizpena"
-
-msgid "Front Panel Microphone"
-msgstr "Aurrealdeko paneleko mikrofonoa"
-
-msgid "Front Panel Line In"
-msgstr "Aurrealdeko paneleko sarrerako linea"
-
-msgid "Front Panel Headphones"
-msgstr "Aurrealdeko paneleko aurikularrak"
-
-msgid "Front Panel Line Out"
-msgstr "Aurrealdeko paneleko irteerako linea"
-
-msgid "Green Connector"
-msgstr "Konektore berdea"
-
-msgid "Pink Connector"
-msgstr "Konektore arrosa"
-
-msgid "Blue Connector"
-msgstr "Konektore urdina"
-
-msgid "White Connector"
-msgstr "Konektore zuria"
-
-msgid "Black Connector"
-msgstr "Konektore beltza"
-
-msgid "Gray Connector"
-msgstr "Konektore grisa"
-
-msgid "Orange Connector"
-msgstr "Konektore laranja"
-
-msgid "Red Connector"
-msgstr "Konektore gorria"
-
-msgid "Yellow Connector"
-msgstr "Konektore horia"
-
-msgid "Green Front Panel Connector"
-msgstr "Aurrealdeko paneleko konektore berdea"
-
-msgid "Pink Front Panel Connector"
-msgstr "Aurrealdeko paneleko konektore arrosa"
-
-msgid "Blue Front Panel Connector"
-msgstr "Aurrealdeko paneleko konektore urdina"
-
-msgid "White Front Panel Connector"
-msgstr "Aurrealdeko paneleko konektore zuria"
-
-msgid "Black Front Panel Connector"
-msgstr "Aurrealdeko paneleko konektore beltza"
-
-msgid "Gray Front Panel Connector"
-msgstr "Aurrealdeko paneleko konektore grisa"
-
-msgid "Orange Front Panel Connector"
-msgstr "Aurrealdeko paneleko konektore laranja"
-
-msgid "Red Front Panel Connector"
-msgstr "Aurrealdeko paneleko konektore gorria"
-
-msgid "Yellow Front Panel Connector"
-msgstr "Aurrealdeko paneleko konektore horia"
-
-msgid "Spread Output"
-msgstr "Zabaldu irteera"
-
-msgid "Downmix"
-msgstr "Tolestu nahasketa"
-
-msgid "Virtual Mixer Input"
-msgstr "Nahastaile birtualaren sarrera"
-
-msgid "Virtual Mixer Output"
-msgstr "Nahastaile birtualaren irteera"
-
-msgid "Virtual Mixer Channels"
-msgstr "Nahastaile birtualaren kanalak"
-
-#. TRANSLATORS: name + number of a volume mixer control
-#, fuzzy, c-format
-msgid "%s %d Function"
-msgstr "%s funtzioa"
-
-#. TRANSLATORS: name of a volume mixer control
-#, c-format
-msgid "%s Function"
-msgstr "%s funtzioa"
-
msgid ""
"Could not open audio device for playback. This version of the Open Sound "
"System is not supported by this element."
@@ -530,12 +150,33 @@ msgstr "Audio gailu honek ez du grabatzea onartzen."
msgid "Error recording from audio device."
msgstr "Errorea audioko gailutik grabatzean."
+msgid "Volume"
+msgstr "Bolumena"
+
msgid "Gain"
msgstr "Irabazia"
+msgid "Monitor"
+msgstr "Monitorea"
+
+msgid "Built-in Speaker"
+msgstr "Barneko bozgorailua"
+
msgid "Headphone"
msgstr "Entzungailua"
+msgid "Line Out"
+msgstr "Irteerako linea"
+
+msgid "SPDIF Out"
+msgstr "SPDIF irteera"
+
+msgid "AUX 1 Out"
+msgstr "1. irteera lagungarria"
+
+msgid "AUX 2 Out"
+msgstr "2. irteera lagungarria"
+
#, c-format
msgid "Error reading %d bytes from device '%s'."
msgstr "Errorea gertatu da '%2$s' gailuan %1$d byte irakurtzean."
@@ -720,6 +361,357 @@ msgstr "Oraindik ez dago onartua exekutatu bitartean bereizmena aldatzea."
msgid "Cannot operate without a clock"
msgstr "Ezin du funtzionatu erlojurik gabe"
+#~ msgid "Bass"
+#~ msgstr "Baxua"
+
+#~ msgid "Treble"
+#~ msgstr "Altua"
+
+#~ msgid "Synth"
+#~ msgstr "Sintetizadorea"
+
+#~ msgid "PCM"
+#~ msgstr "PCM"
+
+#~ msgid "Speaker"
+#~ msgstr "Bozgorailua"
+
+#~ msgid "Line-in"
+#~ msgstr "Linea-sarrera"
+
+#~ msgid "Microphone"
+#~ msgstr "Mikrofonoa"
+
+#~ msgid "CD"
+#~ msgstr "CDa"
+
+#~ msgid "Mixer"
+#~ msgstr "Nahastailea"
+
+#~ msgid "PCM-2"
+#~ msgstr "PCM-2"
+
+#~ msgid "Record"
+#~ msgstr "Grabazioa"
+
+#~ msgid "In-gain"
+#~ msgstr "Sarrerako irabazia"
+
+#~ msgid "Out-gain"
+#~ msgstr "Irteerako irabazia"
+
+#~ msgid "Line-1"
+#~ msgstr "1. linea"
+
+#~ msgid "Line-2"
+#~ msgstr "2. linea"
+
+#~ msgid "Line-3"
+#~ msgstr "3. linea"
+
+#~ msgid "Digital-1"
+#~ msgstr "1. digitala"
+
+#~ msgid "Digital-2"
+#~ msgstr "2. digitala"
+
+#~ msgid "Digital-3"
+#~ msgstr "3. digitala"
+
+#~ msgid "Phone-in"
+#~ msgstr "Aurikularren sarrera"
+
+#~ msgid "Phone-out"
+#~ msgstr "Aurikularren irteera"
+
+#~ msgid "Video"
+#~ msgstr "Bideoa"
+
+#~ msgid "Radio"
+#~ msgstr "Irratia"
+
+#~ msgid "Could not open audio device for mixer control handling."
+#~ msgstr ""
+#~ "Ezin izan da audioko gailua ireki nahastailearen kontrola kudeatzeko."
+
+#~ msgid ""
+#~ "Could not open audio device for mixer control handling. This version of "
+#~ "the Open Sound System is not supported by this element."
+#~ msgstr ""
+#~ "Ezin izan da audioko gailua ireki nahastailearen kontrola kudeatzeko. "
+#~ "Elementu honek ez du onartzen Open Sound System-en bertsio hau."
+
+#~ msgid "Master"
+#~ msgstr "Maisua"
+
+#~ msgid "Front"
+#~ msgstr "Aurrealdekoa"
+
+#~ msgid "Rear"
+#~ msgstr "Atzealdekoa"
+
+#~ msgid "Headphones"
+#~ msgstr "Aurikularrak"
+
+#~ msgid "Center"
+#~ msgstr "Erdikoa"
+
+#~ msgid "LFE"
+#~ msgstr "LFE"
+
+#~ msgid "Surround"
+#~ msgstr "Inguratzailea"
+
+#~ msgid "Side"
+#~ msgstr "Albokoa"
+
+#~ msgid "AUX Out"
+#~ msgstr "Irteera lagungarria"
+
+#~ msgid "3D Depth"
+#~ msgstr "3D sakonera"
+
+#~ msgid "3D Center"
+#~ msgstr "3D zentrua"
+
+#~ msgid "3D Enhance"
+#~ msgstr "3D hobetua"
+
+#~ msgid "Telephone"
+#~ msgstr "Telefonoa"
+
+#~ msgid "Line In"
+#~ msgstr "Sarrerako linea"
+
+#~ msgid "Internal CD"
+#~ msgstr "Barneko CDa"
+
+#~ msgid "Video In"
+#~ msgstr "Bideo-sarrera"
+
+#~ msgid "AUX 1 In"
+#~ msgstr "1. sarrera lagungarria"
+
+#~ msgid "AUX 2 In"
+#~ msgstr "2. sarrera lagungarria"
+
+#~ msgid "AUX In"
+#~ msgstr "Sarrera lagungarria"
+
+#~ msgid "Record Gain"
+#~ msgstr "Grabazioaren irabazia"
+
+#~ msgid "Output Gain"
+#~ msgstr "Irteeraren irabazia"
+
+#~ msgid "Microphone Boost"
+#~ msgstr "Mikrofonoaren bultzada"
+
+#~ msgid "Loopback"
+#~ msgstr "Atzera-begizta"
+
+#~ msgid "Diagnostic"
+#~ msgstr "Diagnostikoa"
+
+#~ msgid "Bass Boost"
+#~ msgstr "Baxuaren bultzada"
+
+#~ msgid "Playback Ports"
+#~ msgstr "Erreprodukzioaren atakak"
+
+#~ msgid "Input"
+#~ msgstr "Sarrera"
+
+#~ msgid "Record Source"
+#~ msgstr "Grabazioaren iturburua"
+
+#~ msgid "Monitor Source"
+#~ msgstr "Monitorearen iturburua"
+
+#~ msgid "Keyboard Beep"
+#~ msgstr "Teklatuaren soinua"
+
+#~ msgid "Simulate Stereo"
+#~ msgstr "Simulatu estereoa"
+
+#~ msgid "Stereo"
+#~ msgstr "Estereoa"
+
+#~ msgid "Surround Sound"
+#~ msgstr "Soinu inguratzailea"
+
+#~ msgid "Microphone Gain"
+#~ msgstr "Mikrofonoaren irabazia"
+
+#~ msgid "Speaker Source"
+#~ msgstr "Bozgorailuaren iturburua"
+
+#~ msgid "Microphone Source"
+#~ msgstr "Mikrofonoaren iturburua"
+
+#~ msgid "Jack"
+#~ msgstr "Jack"
+
+#~ msgid "Center / LFE"
+#~ msgstr "Zentratua / LFE"
+
+#~ msgid "Stereo Mix"
+#~ msgstr "Estereozko nahasketa"
+
+#~ msgid "Mono Mix"
+#~ msgstr "Monozko nahasketa"
+
+#~ msgid "Input Mix"
+#~ msgstr "Sarrerako nahasketa"
+
+#~ msgid "SPDIF In"
+#~ msgstr "SPDIF sarrera"
+
+#~ msgid "Microphone 1"
+#~ msgstr "1. mikrofonoa"
+
+#~ msgid "Microphone 2"
+#~ msgstr "2. mikrofonoa"
+
+#~ msgid "Digital Out"
+#~ msgstr "Irteera digitala"
+
+#~ msgid "Digital In"
+#~ msgstr "Sarrera digitala"
+
+#~ msgid "HDMI"
+#~ msgstr "HDMI"
+
+#~ msgid "Modem"
+#~ msgstr "Modema"
+
+#~ msgid "Handset"
+#~ msgstr "Aurikular+mikrofonoa"
+
+#~ msgid "Other"
+#~ msgstr "Bestelakoa"
+
+#~ msgid "None"
+#~ msgstr "Bat ere ez"
+
+#~ msgid "On"
+#~ msgstr "Piztu"
+
+#~ msgid "Off"
+#~ msgstr "Itzali"
+
+#~ msgid "Mute"
+#~ msgstr "Mututu"
+
+#~ msgid "Fast"
+#~ msgstr "Bizkorra"
+
+#~ msgid "Very Low"
+#~ msgstr "Oso motela"
+
+#~ msgid "Low"
+#~ msgstr "Motela"
+
+#~ msgid "Medium"
+#~ msgstr "Tartekoa"
+
+#~ msgid "High"
+#~ msgstr "Altua"
+
+#~ msgid "Very High"
+#~ msgstr "Oso altua"
+
+#~ msgid "Production"
+#~ msgstr "Ekoizpena"
+
+#~ msgid "Front Panel Microphone"
+#~ msgstr "Aurrealdeko paneleko mikrofonoa"
+
+#~ msgid "Front Panel Line In"
+#~ msgstr "Aurrealdeko paneleko sarrerako linea"
+
+#~ msgid "Front Panel Headphones"
+#~ msgstr "Aurrealdeko paneleko aurikularrak"
+
+#~ msgid "Front Panel Line Out"
+#~ msgstr "Aurrealdeko paneleko irteerako linea"
+
+#~ msgid "Green Connector"
+#~ msgstr "Konektore berdea"
+
+#~ msgid "Pink Connector"
+#~ msgstr "Konektore arrosa"
+
+#~ msgid "Blue Connector"
+#~ msgstr "Konektore urdina"
+
+#~ msgid "White Connector"
+#~ msgstr "Konektore zuria"
+
+#~ msgid "Black Connector"
+#~ msgstr "Konektore beltza"
+
+#~ msgid "Gray Connector"
+#~ msgstr "Konektore grisa"
+
+#~ msgid "Orange Connector"
+#~ msgstr "Konektore laranja"
+
+#~ msgid "Red Connector"
+#~ msgstr "Konektore gorria"
+
+#~ msgid "Yellow Connector"
+#~ msgstr "Konektore horia"
+
+#~ msgid "Green Front Panel Connector"
+#~ msgstr "Aurrealdeko paneleko konektore berdea"
+
+#~ msgid "Pink Front Panel Connector"
+#~ msgstr "Aurrealdeko paneleko konektore arrosa"
+
+#~ msgid "Blue Front Panel Connector"
+#~ msgstr "Aurrealdeko paneleko konektore urdina"
+
+#~ msgid "White Front Panel Connector"
+#~ msgstr "Aurrealdeko paneleko konektore zuria"
+
+#~ msgid "Black Front Panel Connector"
+#~ msgstr "Aurrealdeko paneleko konektore beltza"
+
+#~ msgid "Gray Front Panel Connector"
+#~ msgstr "Aurrealdeko paneleko konektore grisa"
+
+#~ msgid "Orange Front Panel Connector"
+#~ msgstr "Aurrealdeko paneleko konektore laranja"
+
+#~ msgid "Red Front Panel Connector"
+#~ msgstr "Aurrealdeko paneleko konektore gorria"
+
+#~ msgid "Yellow Front Panel Connector"
+#~ msgstr "Aurrealdeko paneleko konektore horia"
+
+#~ msgid "Spread Output"
+#~ msgstr "Zabaldu irteera"
+
+#~ msgid "Downmix"
+#~ msgstr "Tolestu nahasketa"
+
+#~ msgid "Virtual Mixer Input"
+#~ msgstr "Nahastaile birtualaren sarrera"
+
+#~ msgid "Virtual Mixer Output"
+#~ msgstr "Nahastaile birtualaren irteera"
+
+#~ msgid "Virtual Mixer Channels"
+#~ msgstr "Nahastaile birtualaren kanalak"
+
+#, fuzzy
+#~ msgid "%s %d Function"
+#~ msgstr "%s funtzioa"
+
+#~ msgid "%s Function"
+#~ msgstr "%s funtzioa"
+
#~ msgid "Error reading %d bytes on device '%s'."
#~ msgstr "Errorea gertatu da '%2$s' gailuan %1$d byte irakurtzean."
diff --git a/po/fi.gmo b/po/fi.gmo
index caaef48af7601f927fadc7396be997e4f0912bf5..7b1dc927d3997a3f0e40601a02289ea12b255820 100644
Binary files a/po/fi.gmo and b/po/fi.gmo differ
diff --git a/po/fi.po b/po/fi.po
index 4d94137046d88061bddc3299b3049173ed81f1e1..c0633e0afee029734800a3698e35e0adc809b1e4 100644
--- a/po/fi.po
+++ b/po/fi.po
@@ -11,7 +11,7 @@ msgid ""
msgstr ""
"Project-Id-Version: gst-plugins-good 0.10.25.3\n"
"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/\n"
-"POT-Creation-Date: 2012-04-12 10:26+0200\n"
+"POT-Creation-Date: 2012-05-13 16:29+0200\n"
"PO-Revision-Date: 2010-11-17 23:03+0200\n"
"Last-Translator: Tommi Vainikainen <Tommi.Vainikainen@iki.fi>\n"
"Language-Team: Finnish <translation-team-fi@lists.sourceforge.net>\n"
@@ -103,81 +103,6 @@ msgstr ""
msgid "Internal data flow error."
msgstr "Sisäisen tietovirran virhe."
-msgid "Volume"
-msgstr "Äänenvoimakkuus"
-
-msgid "Bass"
-msgstr "Basso"
-
-msgid "Treble"
-msgstr "Ylä-äänet"
-
-msgid "Synth"
-msgstr "Synth"
-
-msgid "PCM"
-msgstr "PCM"
-
-msgid "Speaker"
-msgstr "Kaiutin"
-
-msgid "Line-in"
-msgstr "Linjatulo"
-
-msgid "Microphone"
-msgstr "Mikrofoni"
-
-msgid "CD"
-msgstr "CD"
-
-msgid "Mixer"
-msgstr "Mikseri"
-
-msgid "PCM-2"
-msgstr "PCM-2"
-
-msgid "Record"
-msgstr "Nauhoitus"
-
-msgid "In-gain"
-msgstr "Gain-sisään"
-
-msgid "Out-gain"
-msgstr "Gain-ulos"
-
-msgid "Line-1"
-msgstr "Linja-1"
-
-msgid "Line-2"
-msgstr "Linja-2"
-
-msgid "Line-3"
-msgstr "Linja-3"
-
-msgid "Digital-1"
-msgstr "Digitaalinen-1"
-
-msgid "Digital-2"
-msgstr "Digitaalinen-2"
-
-msgid "Digital-3"
-msgstr "Digitaalinen-3"
-
-msgid "Phone-in"
-msgstr "Levysoitintulo"
-
-msgid "Phone-out"
-msgstr "Levysoitinlähtö"
-
-msgid "Video"
-msgstr "Video"
-
-msgid "Radio"
-msgstr "Radio"
-
-msgid "Monitor"
-msgstr "Tarkkailu"
-
msgid ""
"Could not open audio device for playback. Device is being used by another "
"application."
@@ -205,311 +130,6 @@ msgstr ""
msgid "Could not open audio device for recording."
msgstr "Äänilaitetta ei voitu avata nauhoitusta varten."
-msgid "Could not open audio device for mixer control handling."
-msgstr "Äänilaitetta ei voitu avata mikserinhallintaa varten."
-
-msgid ""
-"Could not open audio device for mixer control handling. This version of the "
-"Open Sound System is not supported by this element."
-msgstr ""
-"Äänilaitetta ei voitu avata mikserinhallintaa varten. Tämä elementti ei tue "
-"tätä versiota Open Sound Systemistä."
-
-msgid "Master"
-msgstr "Pää"
-
-msgid "Front"
-msgstr "Etu"
-
-msgid "Rear"
-msgstr "Taka"
-
-msgid "Headphones"
-msgstr "Kuulokkeet"
-
-msgid "Center"
-msgstr "Keski"
-
-msgid "LFE"
-msgstr "LFE"
-
-msgid "Surround"
-msgstr "Surround"
-
-msgid "Side"
-msgstr "Sivu"
-
-msgid "Built-in Speaker"
-msgstr "Sisäänrakennettu kaiutin"
-
-msgid "AUX 1 Out"
-msgstr "AUX 1 ulos"
-
-msgid "AUX 2 Out"
-msgstr "AUX 2 ulos"
-
-msgid "AUX Out"
-msgstr "AUX ulos"
-
-msgid "3D Depth"
-msgstr "3D-syvyys"
-
-msgid "3D Center"
-msgstr "3D-keski"
-
-msgid "3D Enhance"
-msgstr "3D-tehostus"
-
-msgid "Telephone"
-msgstr "Puhelin"
-
-msgid "Line Out"
-msgstr "Linja ulos"
-
-msgid "Line In"
-msgstr "Linjatulo"
-
-msgid "Internal CD"
-msgstr "Sisäinen CD"
-
-msgid "Video In"
-msgstr "Videotulo"
-
-msgid "AUX 1 In"
-msgstr "AUX 1 sisään"
-
-msgid "AUX 2 In"
-msgstr "AUX 2 sisään"
-
-msgid "AUX In"
-msgstr "AUX sisään"
-
-msgid "Record Gain"
-msgstr "Nauhoitusgain"
-
-msgid "Output Gain"
-msgstr "Gain-ulos"
-
-msgid "Microphone Boost"
-msgstr "Mikrofonitehostin"
-
-msgid "Loopback"
-msgstr "Takaisinkytkentä"
-
-msgid "Diagnostic"
-msgstr "Diagnosointi"
-
-msgid "Bass Boost"
-msgstr "Bassotehostin"
-
-msgid "Playback Ports"
-msgstr "Toistoportit"
-
-msgid "Input"
-msgstr "Sisään"
-
-msgid "Record Source"
-msgstr "Nauhoituslähde"
-
-msgid "Monitor Source"
-msgstr "Tarkkailulähde"
-
-msgid "Keyboard Beep"
-msgstr "Näppäimistöpiippaus"
-
-msgid "Simulate Stereo"
-msgstr "Simuloitu stereo"
-
-msgid "Stereo"
-msgstr "Stereo"
-
-msgid "Surround Sound"
-msgstr "Surround-ääni"
-
-msgid "Microphone Gain"
-msgstr "Mikrofoni-gain"
-
-msgid "Speaker Source"
-msgstr "Kaiutinlähde"
-
-msgid "Microphone Source"
-msgstr "Mikrofonilähde"
-
-msgid "Jack"
-msgstr "Pistoke"
-
-msgid "Center / LFE"
-msgstr "Keski / LFE"
-
-msgid "Stereo Mix"
-msgstr "Stereo Mix"
-
-msgid "Mono Mix"
-msgstr "Mono Mix"
-
-msgid "Input Mix"
-msgstr "Sisään Mix"
-
-msgid "SPDIF In"
-msgstr "SPDIF sisään"
-
-msgid "SPDIF Out"
-msgstr "SPDIF ulos"
-
-msgid "Microphone 1"
-msgstr "Mikrofoni 1"
-
-msgid "Microphone 2"
-msgstr "Mikrofoni 2"
-
-msgid "Digital Out"
-msgstr "Digitaalinen ulos"
-
-msgid "Digital In"
-msgstr "Digitaalinen sisään"
-
-msgid "HDMI"
-msgstr "HDMI"
-
-msgid "Modem"
-msgstr "Modeemi"
-
-msgid "Handset"
-msgstr "Kuulokkeet"
-
-msgid "Other"
-msgstr "Muu"
-
-msgid "None"
-msgstr "Ei mikään"
-
-msgid "On"
-msgstr "Päällä"
-
-msgid "Off"
-msgstr "Poissa"
-
-msgid "Mute"
-msgstr "Vaimennettu"
-
-msgid "Fast"
-msgstr "Nopea"
-
-#. TRANSLATORS: "Very Low" is a quality setting here
-msgid "Very Low"
-msgstr "Erittäin matala"
-
-#. TRANSLATORS: "Low" is a quality setting here
-msgid "Low"
-msgstr "Matala"
-
-#. TRANSLATORS: "Medium" is a quality setting here
-msgid "Medium"
-msgstr "Medium"
-
-#. TRANSLATORS: "High" is a quality setting here
-msgid "High"
-msgstr "Korkea"
-
-#. TRANSLATORS: "Very High" is a quality setting here
-msgid "Very High"
-msgstr "Erittäin korkea"
-
-#. TRANSLATORS: "Production" is a quality setting here
-msgid "Production"
-msgstr "Tuotanto"
-
-msgid "Front Panel Microphone"
-msgstr "Etupaneelin mikrofoni"
-
-msgid "Front Panel Line In"
-msgstr "Etupaneelin linjatulo"
-
-msgid "Front Panel Headphones"
-msgstr "Etupaneelin kuulokkeet"
-
-msgid "Front Panel Line Out"
-msgstr "Etupaneelin linja ulos"
-
-msgid "Green Connector"
-msgstr "Vihreä liitin"
-
-msgid "Pink Connector"
-msgstr "Vaaleanpunainen liitin"
-
-msgid "Blue Connector"
-msgstr "Sininen liitin"
-
-msgid "White Connector"
-msgstr "Valkoinen liitin"
-
-msgid "Black Connector"
-msgstr "Musta liitin"
-
-msgid "Gray Connector"
-msgstr "Harmaa liitin"
-
-msgid "Orange Connector"
-msgstr "Oranssi liitin"
-
-msgid "Red Connector"
-msgstr "Punainen liitin"
-
-msgid "Yellow Connector"
-msgstr "Keltainen liitin"
-
-msgid "Green Front Panel Connector"
-msgstr "Vihreä etupaneeliliitin"
-
-msgid "Pink Front Panel Connector"
-msgstr "Vaaleanpunainen etupaneeliliitin"
-
-msgid "Blue Front Panel Connector"
-msgstr "Sininen etupaneeliliitin"
-
-msgid "White Front Panel Connector"
-msgstr "Valkoinen etupaneeliliitin"
-
-msgid "Black Front Panel Connector"
-msgstr "Musta etupaneeliliitin"
-
-msgid "Gray Front Panel Connector"
-msgstr "Harmaa etupaneeliliitin"
-
-msgid "Orange Front Panel Connector"
-msgstr "Oranssi etupaneeliliitin"
-
-msgid "Red Front Panel Connector"
-msgstr "Punainen etupaneeliliitin"
-
-msgid "Yellow Front Panel Connector"
-msgstr "Keltainen etupaneeliliitin"
-
-msgid "Spread Output"
-msgstr "Levitetty ulos"
-
-msgid "Downmix"
-msgstr "Alasmiksaus"
-
-msgid "Virtual Mixer Input"
-msgstr "Virtuaalinen mikseritulo"
-
-msgid "Virtual Mixer Output"
-msgstr "Virtuaalinen mikseri ulos"
-
-msgid "Virtual Mixer Channels"
-msgstr "Virtuaaliset mikserikanavat"
-
-#. TRANSLATORS: name + number of a volume mixer control
-#, c-format
-msgid "%s %d Function"
-msgstr "%s %d -toiminto"
-
-#. TRANSLATORS: name of a volume mixer control
-#, c-format
-msgid "%s Function"
-msgstr "%s -toiminto"
-
msgid ""
"Could not open audio device for playback. This version of the Open Sound "
"System is not supported by this element."
@@ -529,12 +149,33 @@ msgstr "Tämä äänilaite ei tue nauhoitusta."
msgid "Error recording from audio device."
msgstr "Virhe luettaessa äänilaitteelta."
+msgid "Volume"
+msgstr "Äänenvoimakkuus"
+
msgid "Gain"
msgstr "Herkkyys"
+msgid "Monitor"
+msgstr "Tarkkailu"
+
+msgid "Built-in Speaker"
+msgstr "Sisäänrakennettu kaiutin"
+
msgid "Headphone"
msgstr "Kuulokkeet"
+msgid "Line Out"
+msgstr "Linja ulos"
+
+msgid "SPDIF Out"
+msgstr "SPDIF ulos"
+
+msgid "AUX 1 Out"
+msgstr "AUX 1 ulos"
+
+msgid "AUX 2 Out"
+msgstr "AUX 2 ulos"
+
#, c-format
msgid "Error reading %d bytes from device '%s'."
msgstr "Virhe luettaessa %d tavua laitteelta â€%sâ€."
@@ -709,6 +350,355 @@ msgstr "Resoluution vaihto käytön aikana ei ole vielä mahdollista."
msgid "Cannot operate without a clock"
msgstr "Ei voitu toimia ilman kelloa"
+#~ msgid "Bass"
+#~ msgstr "Basso"
+
+#~ msgid "Treble"
+#~ msgstr "Ylä-äänet"
+
+#~ msgid "Synth"
+#~ msgstr "Synth"
+
+#~ msgid "PCM"
+#~ msgstr "PCM"
+
+#~ msgid "Speaker"
+#~ msgstr "Kaiutin"
+
+#~ msgid "Line-in"
+#~ msgstr "Linjatulo"
+
+#~ msgid "Microphone"
+#~ msgstr "Mikrofoni"
+
+#~ msgid "CD"
+#~ msgstr "CD"
+
+#~ msgid "Mixer"
+#~ msgstr "Mikseri"
+
+#~ msgid "PCM-2"
+#~ msgstr "PCM-2"
+
+#~ msgid "Record"
+#~ msgstr "Nauhoitus"
+
+#~ msgid "In-gain"
+#~ msgstr "Gain-sisään"
+
+#~ msgid "Out-gain"
+#~ msgstr "Gain-ulos"
+
+#~ msgid "Line-1"
+#~ msgstr "Linja-1"
+
+#~ msgid "Line-2"
+#~ msgstr "Linja-2"
+
+#~ msgid "Line-3"
+#~ msgstr "Linja-3"
+
+#~ msgid "Digital-1"
+#~ msgstr "Digitaalinen-1"
+
+#~ msgid "Digital-2"
+#~ msgstr "Digitaalinen-2"
+
+#~ msgid "Digital-3"
+#~ msgstr "Digitaalinen-3"
+
+#~ msgid "Phone-in"
+#~ msgstr "Levysoitintulo"
+
+#~ msgid "Phone-out"
+#~ msgstr "Levysoitinlähtö"
+
+#~ msgid "Video"
+#~ msgstr "Video"
+
+#~ msgid "Radio"
+#~ msgstr "Radio"
+
+#~ msgid "Could not open audio device for mixer control handling."
+#~ msgstr "Äänilaitetta ei voitu avata mikserinhallintaa varten."
+
+#~ msgid ""
+#~ "Could not open audio device for mixer control handling. This version of "
+#~ "the Open Sound System is not supported by this element."
+#~ msgstr ""
+#~ "Äänilaitetta ei voitu avata mikserinhallintaa varten. Tämä elementti ei "
+#~ "tue tätä versiota Open Sound Systemistä."
+
+#~ msgid "Master"
+#~ msgstr "Pää"
+
+#~ msgid "Front"
+#~ msgstr "Etu"
+
+#~ msgid "Rear"
+#~ msgstr "Taka"
+
+#~ msgid "Headphones"
+#~ msgstr "Kuulokkeet"
+
+#~ msgid "Center"
+#~ msgstr "Keski"
+
+#~ msgid "LFE"
+#~ msgstr "LFE"
+
+#~ msgid "Surround"
+#~ msgstr "Surround"
+
+#~ msgid "Side"
+#~ msgstr "Sivu"
+
+#~ msgid "AUX Out"
+#~ msgstr "AUX ulos"
+
+#~ msgid "3D Depth"
+#~ msgstr "3D-syvyys"
+
+#~ msgid "3D Center"
+#~ msgstr "3D-keski"
+
+#~ msgid "3D Enhance"
+#~ msgstr "3D-tehostus"
+
+#~ msgid "Telephone"
+#~ msgstr "Puhelin"
+
+#~ msgid "Line In"
+#~ msgstr "Linjatulo"
+
+#~ msgid "Internal CD"
+#~ msgstr "Sisäinen CD"
+
+#~ msgid "Video In"
+#~ msgstr "Videotulo"
+
+#~ msgid "AUX 1 In"
+#~ msgstr "AUX 1 sisään"
+
+#~ msgid "AUX 2 In"
+#~ msgstr "AUX 2 sisään"
+
+#~ msgid "AUX In"
+#~ msgstr "AUX sisään"
+
+#~ msgid "Record Gain"
+#~ msgstr "Nauhoitusgain"
+
+#~ msgid "Output Gain"
+#~ msgstr "Gain-ulos"
+
+#~ msgid "Microphone Boost"
+#~ msgstr "Mikrofonitehostin"
+
+#~ msgid "Loopback"
+#~ msgstr "Takaisinkytkentä"
+
+#~ msgid "Diagnostic"
+#~ msgstr "Diagnosointi"
+
+#~ msgid "Bass Boost"
+#~ msgstr "Bassotehostin"
+
+#~ msgid "Playback Ports"
+#~ msgstr "Toistoportit"
+
+#~ msgid "Input"
+#~ msgstr "Sisään"
+
+#~ msgid "Record Source"
+#~ msgstr "Nauhoituslähde"
+
+#~ msgid "Monitor Source"
+#~ msgstr "Tarkkailulähde"
+
+#~ msgid "Keyboard Beep"
+#~ msgstr "Näppäimistöpiippaus"
+
+#~ msgid "Simulate Stereo"
+#~ msgstr "Simuloitu stereo"
+
+#~ msgid "Stereo"
+#~ msgstr "Stereo"
+
+#~ msgid "Surround Sound"
+#~ msgstr "Surround-ääni"
+
+#~ msgid "Microphone Gain"
+#~ msgstr "Mikrofoni-gain"
+
+#~ msgid "Speaker Source"
+#~ msgstr "Kaiutinlähde"
+
+#~ msgid "Microphone Source"
+#~ msgstr "Mikrofonilähde"
+
+#~ msgid "Jack"
+#~ msgstr "Pistoke"
+
+#~ msgid "Center / LFE"
+#~ msgstr "Keski / LFE"
+
+#~ msgid "Stereo Mix"
+#~ msgstr "Stereo Mix"
+
+#~ msgid "Mono Mix"
+#~ msgstr "Mono Mix"
+
+#~ msgid "Input Mix"
+#~ msgstr "Sisään Mix"
+
+#~ msgid "SPDIF In"
+#~ msgstr "SPDIF sisään"
+
+#~ msgid "Microphone 1"
+#~ msgstr "Mikrofoni 1"
+
+#~ msgid "Microphone 2"
+#~ msgstr "Mikrofoni 2"
+
+#~ msgid "Digital Out"
+#~ msgstr "Digitaalinen ulos"
+
+#~ msgid "Digital In"
+#~ msgstr "Digitaalinen sisään"
+
+#~ msgid "HDMI"
+#~ msgstr "HDMI"
+
+#~ msgid "Modem"
+#~ msgstr "Modeemi"
+
+#~ msgid "Handset"
+#~ msgstr "Kuulokkeet"
+
+#~ msgid "Other"
+#~ msgstr "Muu"
+
+#~ msgid "None"
+#~ msgstr "Ei mikään"
+
+#~ msgid "On"
+#~ msgstr "Päällä"
+
+#~ msgid "Off"
+#~ msgstr "Poissa"
+
+#~ msgid "Mute"
+#~ msgstr "Vaimennettu"
+
+#~ msgid "Fast"
+#~ msgstr "Nopea"
+
+#~ msgid "Very Low"
+#~ msgstr "Erittäin matala"
+
+#~ msgid "Low"
+#~ msgstr "Matala"
+
+#~ msgid "Medium"
+#~ msgstr "Medium"
+
+#~ msgid "High"
+#~ msgstr "Korkea"
+
+#~ msgid "Very High"
+#~ msgstr "Erittäin korkea"
+
+#~ msgid "Production"
+#~ msgstr "Tuotanto"
+
+#~ msgid "Front Panel Microphone"
+#~ msgstr "Etupaneelin mikrofoni"
+
+#~ msgid "Front Panel Line In"
+#~ msgstr "Etupaneelin linjatulo"
+
+#~ msgid "Front Panel Headphones"
+#~ msgstr "Etupaneelin kuulokkeet"
+
+#~ msgid "Front Panel Line Out"
+#~ msgstr "Etupaneelin linja ulos"
+
+#~ msgid "Green Connector"
+#~ msgstr "Vihreä liitin"
+
+#~ msgid "Pink Connector"
+#~ msgstr "Vaaleanpunainen liitin"
+
+#~ msgid "Blue Connector"
+#~ msgstr "Sininen liitin"
+
+#~ msgid "White Connector"
+#~ msgstr "Valkoinen liitin"
+
+#~ msgid "Black Connector"
+#~ msgstr "Musta liitin"
+
+#~ msgid "Gray Connector"
+#~ msgstr "Harmaa liitin"
+
+#~ msgid "Orange Connector"
+#~ msgstr "Oranssi liitin"
+
+#~ msgid "Red Connector"
+#~ msgstr "Punainen liitin"
+
+#~ msgid "Yellow Connector"
+#~ msgstr "Keltainen liitin"
+
+#~ msgid "Green Front Panel Connector"
+#~ msgstr "Vihreä etupaneeliliitin"
+
+#~ msgid "Pink Front Panel Connector"
+#~ msgstr "Vaaleanpunainen etupaneeliliitin"
+
+#~ msgid "Blue Front Panel Connector"
+#~ msgstr "Sininen etupaneeliliitin"
+
+#~ msgid "White Front Panel Connector"
+#~ msgstr "Valkoinen etupaneeliliitin"
+
+#~ msgid "Black Front Panel Connector"
+#~ msgstr "Musta etupaneeliliitin"
+
+#~ msgid "Gray Front Panel Connector"
+#~ msgstr "Harmaa etupaneeliliitin"
+
+#~ msgid "Orange Front Panel Connector"
+#~ msgstr "Oranssi etupaneeliliitin"
+
+#~ msgid "Red Front Panel Connector"
+#~ msgstr "Punainen etupaneeliliitin"
+
+#~ msgid "Yellow Front Panel Connector"
+#~ msgstr "Keltainen etupaneeliliitin"
+
+#~ msgid "Spread Output"
+#~ msgstr "Levitetty ulos"
+
+#~ msgid "Downmix"
+#~ msgstr "Alasmiksaus"
+
+#~ msgid "Virtual Mixer Input"
+#~ msgstr "Virtuaalinen mikseritulo"
+
+#~ msgid "Virtual Mixer Output"
+#~ msgstr "Virtuaalinen mikseri ulos"
+
+#~ msgid "Virtual Mixer Channels"
+#~ msgstr "Virtuaaliset mikserikanavat"
+
+#~ msgid "%s %d Function"
+#~ msgstr "%s %d -toiminto"
+
+#~ msgid "%s Function"
+#~ msgstr "%s -toiminto"
+
#~ msgid "Error reading %d bytes on device '%s'."
#~ msgstr "Virhe luettaessa %d tavua laitteelta â€%sâ€."
diff --git a/po/fr.gmo b/po/fr.gmo
index 5bfa84118a6b8ce8ed43c9db9b184dd922e3fc38..22cf26f0aa553fef96cdedfdd75f81db8c44a17e 100644
Binary files a/po/fr.gmo and b/po/fr.gmo differ
diff --git a/po/fr.po b/po/fr.po
index 901fa841a53a83bcf50df7afad514ef92cfa04c6..c2efbe7f89e79f8f2c211a826a3447c3612aba12 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -9,7 +9,7 @@ msgid ""
msgstr ""
"Project-Id-Version: gst-plugins-good 0.10.28.2\n"
"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/\n"
-"POT-Creation-Date: 2012-04-12 10:26+0200\n"
+"POT-Creation-Date: 2012-05-13 16:29+0200\n"
"PO-Revision-Date: 2011-04-28 09:22+0200\n"
"Last-Translator: Claude Paroz <claude@2xlibre.net>\n"
"Language-Team: French <traduc@traduc.org>\n"
@@ -102,81 +102,6 @@ msgstr ""
msgid "Internal data flow error."
msgstr "Erreur interne de flux de données."
-msgid "Volume"
-msgstr "Volume"
-
-msgid "Bass"
-msgstr "Basses"
-
-msgid "Treble"
-msgstr "Aiguës"
-
-msgid "Synth"
-msgstr "Synth"
-
-msgid "PCM"
-msgstr "PCM"
-
-msgid "Speaker"
-msgstr "Haut-parleur"
-
-msgid "Line-in"
-msgstr "Entrée ligne"
-
-msgid "Microphone"
-msgstr "Micro"
-
-msgid "CD"
-msgstr "CD"
-
-msgid "Mixer"
-msgstr "Mélangeur"
-
-msgid "PCM-2"
-msgstr "PCM-2"
-
-msgid "Record"
-msgstr "Enregistrement"
-
-msgid "In-gain"
-msgstr "Gain d'entrée"
-
-msgid "Out-gain"
-msgstr "Gain de sortie"
-
-msgid "Line-1"
-msgstr "Ligne 1"
-
-msgid "Line-2"
-msgstr "Ligne 2"
-
-msgid "Line-3"
-msgstr "Ligne 3"
-
-msgid "Digital-1"
-msgstr "Numérique 1"
-
-msgid "Digital-2"
-msgstr "Numérique 2"
-
-msgid "Digital-3"
-msgstr "Numérique 3"
-
-msgid "Phone-in"
-msgstr "Entrée casque"
-
-msgid "Phone-out"
-msgstr "Sortie casque"
-
-msgid "Video"
-msgstr "Vidéo"
-
-msgid "Radio"
-msgstr "Radio"
-
-msgid "Monitor"
-msgstr "Moniteur"
-
msgid ""
"Could not open audio device for playback. Device is being used by another "
"application."
@@ -204,314 +129,6 @@ msgstr ""
msgid "Could not open audio device for recording."
msgstr "Impossible d'ouvrir le périphérique audio pour l'enregistrement."
-msgid "Could not open audio device for mixer control handling."
-msgstr ""
-"Impossible d'ouvrir le périphérique audio pour la gestion des contrôles de "
-"mixage."
-
-msgid ""
-"Could not open audio device for mixer control handling. This version of the "
-"Open Sound System is not supported by this element."
-msgstr ""
-"Impossible d'ouvrir le périphérique audio pour la gestion des contrôles de "
-"mixage. Cette version de OSS (Open Sound System) n'est pas prise en charge "
-"par cet élément."
-
-msgid "Master"
-msgstr "Volume général"
-
-msgid "Front"
-msgstr "Avant"
-
-msgid "Rear"
-msgstr "Arrière"
-
-msgid "Headphones"
-msgstr "Écouteurs"
-
-msgid "Center"
-msgstr "Centre"
-
-msgid "LFE"
-msgstr "LFE"
-
-msgid "Surround"
-msgstr "Ambiophonie"
-
-msgid "Side"
-msgstr "Côté"
-
-msgid "Built-in Speaker"
-msgstr "Haut-parleur interne"
-
-msgid "AUX 1 Out"
-msgstr "Sortie AUX 1"
-
-msgid "AUX 2 Out"
-msgstr "Sortie AUX 2"
-
-msgid "AUX Out"
-msgstr "Sortie AUX"
-
-msgid "3D Depth"
-msgstr "Profondeur 3D"
-
-msgid "3D Center"
-msgstr "Centre 3D"
-
-msgid "3D Enhance"
-msgstr "Amélioration 3D"
-
-msgid "Telephone"
-msgstr "Téléphone"
-
-msgid "Line Out"
-msgstr "Sortie ligne"
-
-msgid "Line In"
-msgstr "Entrée ligne"
-
-msgid "Internal CD"
-msgstr "CD interne"
-
-msgid "Video In"
-msgstr "Entrée vidéo"
-
-msgid "AUX 1 In"
-msgstr "Entrée AUX 1"
-
-msgid "AUX 2 In"
-msgstr "Entrée AUX 2"
-
-msgid "AUX In"
-msgstr "Entrée AUX"
-
-msgid "Record Gain"
-msgstr "Gain d'enregistrement"
-
-msgid "Output Gain"
-msgstr "Gain de sortie"
-
-msgid "Microphone Boost"
-msgstr "Amplification micro"
-
-msgid "Loopback"
-msgstr "Boucle interne"
-
-msgid "Diagnostic"
-msgstr "Diagnostic"
-
-msgid "Bass Boost"
-msgstr "Amplification basses"
-
-msgid "Playback Ports"
-msgstr "Ports de lecture"
-
-msgid "Input"
-msgstr "Entrée"
-
-msgid "Record Source"
-msgstr "Source d'enregistrement"
-
-msgid "Monitor Source"
-msgstr "Source de moniteur"
-
-msgid "Keyboard Beep"
-msgstr "Bip de clavier"
-
-msgid "Simulate Stereo"
-msgstr "Stéréo simulée"
-
-msgid "Stereo"
-msgstr "Stéréo"
-
-msgid "Surround Sound"
-msgstr "Son ambiophonique"
-
-msgid "Microphone Gain"
-msgstr "Gain de microphone"
-
-msgid "Speaker Source"
-msgstr "Source de haut-parleur"
-
-msgid "Microphone Source"
-msgstr "Source de microphone"
-
-msgid "Jack"
-msgstr "Jack"
-
-msgid "Center / LFE"
-msgstr "Centre / LFE"
-
-msgid "Stereo Mix"
-msgstr "Mélangeur stéréo"
-
-msgid "Mono Mix"
-msgstr "Mélangeur mono"
-
-msgid "Input Mix"
-msgstr "Mélangeur d'entrée"
-
-msgid "SPDIF In"
-msgstr "Entrée SPDIF"
-
-msgid "SPDIF Out"
-msgstr "Sortie SPDIF"
-
-msgid "Microphone 1"
-msgstr "Microphone 1"
-
-msgid "Microphone 2"
-msgstr "Microphone 2"
-
-msgid "Digital Out"
-msgstr "Sortie numérique"
-
-msgid "Digital In"
-msgstr "Entrée numérique"
-
-msgid "HDMI"
-msgstr "HDMI"
-
-msgid "Modem"
-msgstr "Modem"
-
-msgid "Handset"
-msgstr "Combiné"
-
-msgid "Other"
-msgstr "Autre"
-
-msgid "None"
-msgstr "Aucun"
-
-msgid "On"
-msgstr "Activé"
-
-msgid "Off"
-msgstr "Désactivé"
-
-msgid "Mute"
-msgstr "Son coupé"
-
-msgid "Fast"
-msgstr "Rapide"
-
-#. TRANSLATORS: "Very Low" is a quality setting here
-msgid "Very Low"
-msgstr "Très bas"
-
-#. TRANSLATORS: "Low" is a quality setting here
-msgid "Low"
-msgstr "Bas"
-
-#. TRANSLATORS: "Medium" is a quality setting here
-msgid "Medium"
-msgstr "Moyen"
-
-#. TRANSLATORS: "High" is a quality setting here
-msgid "High"
-msgstr "Élevé"
-
-#. TRANSLATORS: "Very High" is a quality setting here
-msgid "Very High"
-msgstr "Très élevé"
-
-#. TRANSLATORS: "Production" is a quality setting here
-msgid "Production"
-msgstr "Production"
-
-msgid "Front Panel Microphone"
-msgstr "Micro du panneau avant"
-
-msgid "Front Panel Line In"
-msgstr "Entrée ligne du panneau avant"
-
-msgid "Front Panel Headphones"
-msgstr "Écouteurs du panneau avant"
-
-msgid "Front Panel Line Out"
-msgstr "Sortie ligne du panneau avant"
-
-msgid "Green Connector"
-msgstr "Connecteur vert"
-
-msgid "Pink Connector"
-msgstr "Connecteur rose"
-
-msgid "Blue Connector"
-msgstr "Connecteur bleu"
-
-msgid "White Connector"
-msgstr "Connecteur blanc"
-
-msgid "Black Connector"
-msgstr "Connecteur noir"
-
-msgid "Gray Connector"
-msgstr "Connecteur gris"
-
-msgid "Orange Connector"
-msgstr "Connecteur orange"
-
-msgid "Red Connector"
-msgstr "Connecteur rouge"
-
-msgid "Yellow Connector"
-msgstr "Connecteur jaune"
-
-msgid "Green Front Panel Connector"
-msgstr "Connecteur vert du panneau avant"
-
-msgid "Pink Front Panel Connector"
-msgstr "Connecteur rose du panneau avant"
-
-msgid "Blue Front Panel Connector"
-msgstr "Connecteur bleu du panneau avant"
-
-msgid "White Front Panel Connector"
-msgstr "Connecteur blanc du panneau avant"
-
-msgid "Black Front Panel Connector"
-msgstr "Connecteur noir du panneau avant"
-
-msgid "Gray Front Panel Connector"
-msgstr "Connecteur gris du panneau avant"
-
-msgid "Orange Front Panel Connector"
-msgstr "Connecteur orange du panneau avant"
-
-msgid "Red Front Panel Connector"
-msgstr "Connecteur rouge du panneau avant"
-
-msgid "Yellow Front Panel Connector"
-msgstr "Connecteur jaune du panneau avant"
-
-msgid "Spread Output"
-msgstr "Sortie partagée"
-
-msgid "Downmix"
-msgstr "Mélange réduit"
-
-msgid "Virtual Mixer Input"
-msgstr "Entrée de mélangeur virtuel"
-
-msgid "Virtual Mixer Output"
-msgstr "Sortie de mélangeur virtuel"
-
-msgid "Virtual Mixer Channels"
-msgstr "Canaux de mélangeur virtuel"
-
-#. TRANSLATORS: name + number of a volume mixer control
-#, c-format
-msgid "%s %d Function"
-msgstr "Fonction %s %d"
-
-#. TRANSLATORS: name of a volume mixer control
-#, c-format
-msgid "%s Function"
-msgstr "Fonction %s"
-
msgid ""
"Could not open audio device for playback. This version of the Open Sound "
"System is not supported by this element."
@@ -531,12 +148,33 @@ msgstr "L'enregistrement n'est pas pris en charge par ce périphérique audio."
msgid "Error recording from audio device."
msgstr "Erreur lors de l'enregistrement à partir du périphérique audio."
+msgid "Volume"
+msgstr "Volume"
+
msgid "Gain"
msgstr "Gain"
+msgid "Monitor"
+msgstr "Moniteur"
+
+msgid "Built-in Speaker"
+msgstr "Haut-parleur interne"
+
msgid "Headphone"
msgstr "Écouteurs"
+msgid "Line Out"
+msgstr "Sortie ligne"
+
+msgid "SPDIF Out"
+msgstr "Sortie SPDIF"
+
+msgid "AUX 1 Out"
+msgstr "Sortie AUX 1"
+
+msgid "AUX 2 Out"
+msgstr "Sortie AUX 2"
+
#, c-format
msgid "Error reading %d bytes from device '%s'."
msgstr "Erreur de lecture de %d octets sur le périphérique « %s »."
@@ -726,6 +364,358 @@ msgstr ""
msgid "Cannot operate without a clock"
msgstr "Impossible de fonctionner sans horloge"
+#~ msgid "Bass"
+#~ msgstr "Basses"
+
+#~ msgid "Treble"
+#~ msgstr "Aiguës"
+
+#~ msgid "Synth"
+#~ msgstr "Synth"
+
+#~ msgid "PCM"
+#~ msgstr "PCM"
+
+#~ msgid "Speaker"
+#~ msgstr "Haut-parleur"
+
+#~ msgid "Line-in"
+#~ msgstr "Entrée ligne"
+
+#~ msgid "Microphone"
+#~ msgstr "Micro"
+
+#~ msgid "CD"
+#~ msgstr "CD"
+
+#~ msgid "Mixer"
+#~ msgstr "Mélangeur"
+
+#~ msgid "PCM-2"
+#~ msgstr "PCM-2"
+
+#~ msgid "Record"
+#~ msgstr "Enregistrement"
+
+#~ msgid "In-gain"
+#~ msgstr "Gain d'entrée"
+
+#~ msgid "Out-gain"
+#~ msgstr "Gain de sortie"
+
+#~ msgid "Line-1"
+#~ msgstr "Ligne 1"
+
+#~ msgid "Line-2"
+#~ msgstr "Ligne 2"
+
+#~ msgid "Line-3"
+#~ msgstr "Ligne 3"
+
+#~ msgid "Digital-1"
+#~ msgstr "Numérique 1"
+
+#~ msgid "Digital-2"
+#~ msgstr "Numérique 2"
+
+#~ msgid "Digital-3"
+#~ msgstr "Numérique 3"
+
+#~ msgid "Phone-in"
+#~ msgstr "Entrée casque"
+
+#~ msgid "Phone-out"
+#~ msgstr "Sortie casque"
+
+#~ msgid "Video"
+#~ msgstr "Vidéo"
+
+#~ msgid "Radio"
+#~ msgstr "Radio"
+
+#~ msgid "Could not open audio device for mixer control handling."
+#~ msgstr ""
+#~ "Impossible d'ouvrir le périphérique audio pour la gestion des contrôles "
+#~ "de mixage."
+
+#~ msgid ""
+#~ "Could not open audio device for mixer control handling. This version of "
+#~ "the Open Sound System is not supported by this element."
+#~ msgstr ""
+#~ "Impossible d'ouvrir le périphérique audio pour la gestion des contrôles "
+#~ "de mixage. Cette version de OSS (Open Sound System) n'est pas prise en "
+#~ "charge par cet élément."
+
+#~ msgid "Master"
+#~ msgstr "Volume général"
+
+#~ msgid "Front"
+#~ msgstr "Avant"
+
+#~ msgid "Rear"
+#~ msgstr "Arrière"
+
+#~ msgid "Headphones"
+#~ msgstr "Écouteurs"
+
+#~ msgid "Center"
+#~ msgstr "Centre"
+
+#~ msgid "LFE"
+#~ msgstr "LFE"
+
+#~ msgid "Surround"
+#~ msgstr "Ambiophonie"
+
+#~ msgid "Side"
+#~ msgstr "Côté"
+
+#~ msgid "AUX Out"
+#~ msgstr "Sortie AUX"
+
+#~ msgid "3D Depth"
+#~ msgstr "Profondeur 3D"
+
+#~ msgid "3D Center"
+#~ msgstr "Centre 3D"
+
+#~ msgid "3D Enhance"
+#~ msgstr "Amélioration 3D"
+
+#~ msgid "Telephone"
+#~ msgstr "Téléphone"
+
+#~ msgid "Line In"
+#~ msgstr "Entrée ligne"
+
+#~ msgid "Internal CD"
+#~ msgstr "CD interne"
+
+#~ msgid "Video In"
+#~ msgstr "Entrée vidéo"
+
+#~ msgid "AUX 1 In"
+#~ msgstr "Entrée AUX 1"
+
+#~ msgid "AUX 2 In"
+#~ msgstr "Entrée AUX 2"
+
+#~ msgid "AUX In"
+#~ msgstr "Entrée AUX"
+
+#~ msgid "Record Gain"
+#~ msgstr "Gain d'enregistrement"
+
+#~ msgid "Output Gain"
+#~ msgstr "Gain de sortie"
+
+#~ msgid "Microphone Boost"
+#~ msgstr "Amplification micro"
+
+#~ msgid "Loopback"
+#~ msgstr "Boucle interne"
+
+#~ msgid "Diagnostic"
+#~ msgstr "Diagnostic"
+
+#~ msgid "Bass Boost"
+#~ msgstr "Amplification basses"
+
+#~ msgid "Playback Ports"
+#~ msgstr "Ports de lecture"
+
+#~ msgid "Input"
+#~ msgstr "Entrée"
+
+#~ msgid "Record Source"
+#~ msgstr "Source d'enregistrement"
+
+#~ msgid "Monitor Source"
+#~ msgstr "Source de moniteur"
+
+#~ msgid "Keyboard Beep"
+#~ msgstr "Bip de clavier"
+
+#~ msgid "Simulate Stereo"
+#~ msgstr "Stéréo simulée"
+
+#~ msgid "Stereo"
+#~ msgstr "Stéréo"
+
+#~ msgid "Surround Sound"
+#~ msgstr "Son ambiophonique"
+
+#~ msgid "Microphone Gain"
+#~ msgstr "Gain de microphone"
+
+#~ msgid "Speaker Source"
+#~ msgstr "Source de haut-parleur"
+
+#~ msgid "Microphone Source"
+#~ msgstr "Source de microphone"
+
+#~ msgid "Jack"
+#~ msgstr "Jack"
+
+#~ msgid "Center / LFE"
+#~ msgstr "Centre / LFE"
+
+#~ msgid "Stereo Mix"
+#~ msgstr "Mélangeur stéréo"
+
+#~ msgid "Mono Mix"
+#~ msgstr "Mélangeur mono"
+
+#~ msgid "Input Mix"
+#~ msgstr "Mélangeur d'entrée"
+
+#~ msgid "SPDIF In"
+#~ msgstr "Entrée SPDIF"
+
+#~ msgid "Microphone 1"
+#~ msgstr "Microphone 1"
+
+#~ msgid "Microphone 2"
+#~ msgstr "Microphone 2"
+
+#~ msgid "Digital Out"
+#~ msgstr "Sortie numérique"
+
+#~ msgid "Digital In"
+#~ msgstr "Entrée numérique"
+
+#~ msgid "HDMI"
+#~ msgstr "HDMI"
+
+#~ msgid "Modem"
+#~ msgstr "Modem"
+
+#~ msgid "Handset"
+#~ msgstr "Combiné"
+
+#~ msgid "Other"
+#~ msgstr "Autre"
+
+#~ msgid "None"
+#~ msgstr "Aucun"
+
+#~ msgid "On"
+#~ msgstr "Activé"
+
+#~ msgid "Off"
+#~ msgstr "Désactivé"
+
+#~ msgid "Mute"
+#~ msgstr "Son coupé"
+
+#~ msgid "Fast"
+#~ msgstr "Rapide"
+
+#~ msgid "Very Low"
+#~ msgstr "Très bas"
+
+#~ msgid "Low"
+#~ msgstr "Bas"
+
+#~ msgid "Medium"
+#~ msgstr "Moyen"
+
+#~ msgid "High"
+#~ msgstr "Élevé"
+
+#~ msgid "Very High"
+#~ msgstr "Très élevé"
+
+#~ msgid "Production"
+#~ msgstr "Production"
+
+#~ msgid "Front Panel Microphone"
+#~ msgstr "Micro du panneau avant"
+
+#~ msgid "Front Panel Line In"
+#~ msgstr "Entrée ligne du panneau avant"
+
+#~ msgid "Front Panel Headphones"
+#~ msgstr "Écouteurs du panneau avant"
+
+#~ msgid "Front Panel Line Out"
+#~ msgstr "Sortie ligne du panneau avant"
+
+#~ msgid "Green Connector"
+#~ msgstr "Connecteur vert"
+
+#~ msgid "Pink Connector"
+#~ msgstr "Connecteur rose"
+
+#~ msgid "Blue Connector"
+#~ msgstr "Connecteur bleu"
+
+#~ msgid "White Connector"
+#~ msgstr "Connecteur blanc"
+
+#~ msgid "Black Connector"
+#~ msgstr "Connecteur noir"
+
+#~ msgid "Gray Connector"
+#~ msgstr "Connecteur gris"
+
+#~ msgid "Orange Connector"
+#~ msgstr "Connecteur orange"
+
+#~ msgid "Red Connector"
+#~ msgstr "Connecteur rouge"
+
+#~ msgid "Yellow Connector"
+#~ msgstr "Connecteur jaune"
+
+#~ msgid "Green Front Panel Connector"
+#~ msgstr "Connecteur vert du panneau avant"
+
+#~ msgid "Pink Front Panel Connector"
+#~ msgstr "Connecteur rose du panneau avant"
+
+#~ msgid "Blue Front Panel Connector"
+#~ msgstr "Connecteur bleu du panneau avant"
+
+#~ msgid "White Front Panel Connector"
+#~ msgstr "Connecteur blanc du panneau avant"
+
+#~ msgid "Black Front Panel Connector"
+#~ msgstr "Connecteur noir du panneau avant"
+
+#~ msgid "Gray Front Panel Connector"
+#~ msgstr "Connecteur gris du panneau avant"
+
+#~ msgid "Orange Front Panel Connector"
+#~ msgstr "Connecteur orange du panneau avant"
+
+#~ msgid "Red Front Panel Connector"
+#~ msgstr "Connecteur rouge du panneau avant"
+
+#~ msgid "Yellow Front Panel Connector"
+#~ msgstr "Connecteur jaune du panneau avant"
+
+#~ msgid "Spread Output"
+#~ msgstr "Sortie partagée"
+
+#~ msgid "Downmix"
+#~ msgstr "Mélange réduit"
+
+#~ msgid "Virtual Mixer Input"
+#~ msgstr "Entrée de mélangeur virtuel"
+
+#~ msgid "Virtual Mixer Output"
+#~ msgstr "Sortie de mélangeur virtuel"
+
+#~ msgid "Virtual Mixer Channels"
+#~ msgstr "Canaux de mélangeur virtuel"
+
+#~ msgid "%s %d Function"
+#~ msgstr "Fonction %s %d"
+
+#~ msgid "%s Function"
+#~ msgstr "Fonction %s"
+
#~ msgid "Error reading %d bytes on device '%s'."
#~ msgstr "Erreur de lecture de %d octets sur le périphérique « %s »."
diff --git a/po/gl.gmo b/po/gl.gmo
index f00c163a2c657c1e2afe985e92aa5028d3923cc0..bbb271ddebb31dc7051f35967de3ead96e9820d2 100644
Binary files a/po/gl.gmo and b/po/gl.gmo differ
diff --git a/po/gl.po b/po/gl.po
index f66d16be6091c850b26297e0ebde5e014b301dff..4d96e6625b4693f069aa2d0376abb82cad316140 100644
--- a/po/gl.po
+++ b/po/gl.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: gst-plugins-good 0.10.26.2\n"
"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/\n"
-"POT-Creation-Date: 2012-04-12 10:26+0200\n"
+"POT-Creation-Date: 2012-05-13 16:29+0200\n"
"PO-Revision-Date: 2011-01-09 21:20+0100\n"
"Last-Translator: Fran Diéguez <frandieguez@ubuntu.com>\n"
"Language-Team: Galician <proxecto@trasno.net>\n"
@@ -100,81 +100,6 @@ msgstr ""
msgid "Internal data flow error."
msgstr "Produciuse un erro interno no fluxo de datos."
-msgid "Volume"
-msgstr "Volume"
-
-msgid "Bass"
-msgstr "Baixos"
-
-msgid "Treble"
-msgstr "Agudos"
-
-msgid "Synth"
-msgstr "Sintetizador"
-
-msgid "PCM"
-msgstr "PCM"
-
-msgid "Speaker"
-msgstr "Altofalante"
-
-msgid "Line-in"
-msgstr "Liña de entrada"
-
-msgid "Microphone"
-msgstr "Micrófono"
-
-msgid "CD"
-msgstr "CD"
-
-msgid "Mixer"
-msgstr "Misturador"
-
-msgid "PCM-2"
-msgstr "PCM-2"
-
-msgid "Record"
-msgstr "Gravar"
-
-msgid "In-gain"
-msgstr "Ganancia de entrada"
-
-msgid "Out-gain"
-msgstr "Ganancia de saÃda"
-
-msgid "Line-1"
-msgstr "Liña 1"
-
-msgid "Line-2"
-msgstr "Liña 2"
-
-msgid "Line-3"
-msgstr "Liña 3"
-
-msgid "Digital-1"
-msgstr "Dixital 1"
-
-msgid "Digital-2"
-msgstr "Dixital 2"
-
-msgid "Digital-3"
-msgstr "Dixital 3"
-
-msgid "Phone-in"
-msgstr "Entrada teléfono"
-
-msgid "Phone-out"
-msgstr "SaÃda teléfono"
-
-msgid "Video"
-msgstr "VÃdeo"
-
-msgid "Radio"
-msgstr "Radio"
-
-msgid "Monitor"
-msgstr "Monitor"
-
msgid ""
"Could not open audio device for playback. Device is being used by another "
"application."
@@ -202,313 +127,6 @@ msgstr ""
msgid "Could not open audio device for recording."
msgstr "Non foi posÃbel abrir o dispositivo de son para a gravación."
-msgid "Could not open audio device for mixer control handling."
-msgstr ""
-"Non foi posÃbel abrir o dispositivo de son para a súa xestión polo control "
-"de misturado."
-
-msgid ""
-"Could not open audio device for mixer control handling. This version of the "
-"Open Sound System is not supported by this element."
-msgstr ""
-"Non foi posÃbel abrir o dispositivo de son para a súa xestión polo control "
-"de misturado. Este elemento non admite esta versión do Open Sound System."
-
-msgid "Master"
-msgstr "Mestre"
-
-msgid "Front"
-msgstr "Frontal"
-
-msgid "Rear"
-msgstr "Treseiro"
-
-msgid "Headphones"
-msgstr "Auriculares"
-
-msgid "Center"
-msgstr "Centro"
-
-msgid "LFE"
-msgstr "LFE"
-
-msgid "Surround"
-msgstr "Envolvente"
-
-msgid "Side"
-msgstr "Lateral"
-
-msgid "Built-in Speaker"
-msgstr "Altofalante interno"
-
-msgid "AUX 1 Out"
-msgstr "SaÃda AUX 1"
-
-msgid "AUX 2 Out"
-msgstr "SaÃda AUX 2"
-
-msgid "AUX Out"
-msgstr "SaÃda AUX"
-
-msgid "3D Depth"
-msgstr "Profundidade 3D"
-
-msgid "3D Center"
-msgstr "Centro 3D"
-
-msgid "3D Enhance"
-msgstr "Mellora 3D"
-
-msgid "Telephone"
-msgstr "Teléfono"
-
-msgid "Line Out"
-msgstr "Liña de saÃda"
-
-msgid "Line In"
-msgstr "Liña de entrada"
-
-msgid "Internal CD"
-msgstr "CD interno"
-
-msgid "Video In"
-msgstr "Entrada de vÃdeo"
-
-msgid "AUX 1 In"
-msgstr "Entrada AUX 1"
-
-msgid "AUX 2 In"
-msgstr "Entrada AUX 2"
-
-msgid "AUX In"
-msgstr "Entrada AUX"
-
-msgid "Record Gain"
-msgstr "Ganancia de gravación"
-
-msgid "Output Gain"
-msgstr "Ganancia de saÃda"
-
-msgid "Microphone Boost"
-msgstr "Aumento do micrófono"
-
-msgid "Loopback"
-msgstr "Bucle local"
-
-msgid "Diagnostic"
-msgstr "Diagnóstico"
-
-msgid "Bass Boost"
-msgstr "Aumento de baixos"
-
-msgid "Playback Ports"
-msgstr "Portos de reprodución"
-
-msgid "Input"
-msgstr "Entrada"
-
-msgid "Record Source"
-msgstr "Orixe da gravación"
-
-msgid "Monitor Source"
-msgstr "Monitor de orixe"
-
-msgid "Keyboard Beep"
-msgstr "Pitido de teclado"
-
-msgid "Simulate Stereo"
-msgstr "Simular estéreo"
-
-msgid "Stereo"
-msgstr "Estéreo"
-
-msgid "Surround Sound"
-msgstr "Son envolvente"
-
-msgid "Microphone Gain"
-msgstr "Ganancia do micrófono"
-
-msgid "Speaker Source"
-msgstr "Altofalante de orixe"
-
-msgid "Microphone Source"
-msgstr "Micrófono de orixe"
-
-msgid "Jack"
-msgstr "Jack"
-
-msgid "Center / LFE"
-msgstr "Centro / LFE"
-
-msgid "Stereo Mix"
-msgstr "Misturador estéreo"
-
-msgid "Mono Mix"
-msgstr "Misturador mono"
-
-msgid "Input Mix"
-msgstr "Misturador de entrada"
-
-msgid "SPDIF In"
-msgstr "Entrada SPDIF"
-
-msgid "SPDIF Out"
-msgstr "SaÃda SPDIF"
-
-msgid "Microphone 1"
-msgstr "Micrófono 1"
-
-msgid "Microphone 2"
-msgstr "Micrófono 2"
-
-msgid "Digital Out"
-msgstr "SaÃda dixital"
-
-msgid "Digital In"
-msgstr "Entrada dixital"
-
-msgid "HDMI"
-msgstr "HDMI"
-
-msgid "Modem"
-msgstr "Módem"
-
-msgid "Handset"
-msgstr "Auriculares"
-
-msgid "Other"
-msgstr "Outro"
-
-msgid "None"
-msgstr "Ningún"
-
-msgid "On"
-msgstr "Acendido"
-
-msgid "Off"
-msgstr "Apagado"
-
-msgid "Mute"
-msgstr "Silenciar"
-
-msgid "Fast"
-msgstr "Rápido"
-
-#. TRANSLATORS: "Very Low" is a quality setting here
-msgid "Very Low"
-msgstr "Moi baixo"
-
-#. TRANSLATORS: "Low" is a quality setting here
-msgid "Low"
-msgstr "Baixo"
-
-#. TRANSLATORS: "Medium" is a quality setting here
-msgid "Medium"
-msgstr "Medio"
-
-#. TRANSLATORS: "High" is a quality setting here
-msgid "High"
-msgstr "Alto"
-
-#. TRANSLATORS: "Very High" is a quality setting here
-msgid "Very High"
-msgstr "Moi alto"
-
-#. TRANSLATORS: "Production" is a quality setting here
-msgid "Production"
-msgstr "Produción"
-
-msgid "Front Panel Microphone"
-msgstr "Micrófono do panel frontal"
-
-msgid "Front Panel Line In"
-msgstr "Entrada do panel frontal"
-
-msgid "Front Panel Headphones"
-msgstr "Auriculares do panel frontal"
-
-msgid "Front Panel Line Out"
-msgstr "SaÃda do panel frontal"
-
-msgid "Green Connector"
-msgstr "Conectador verde"
-
-msgid "Pink Connector"
-msgstr "Conectador rosa"
-
-msgid "Blue Connector"
-msgstr "Conectador azul"
-
-msgid "White Connector"
-msgstr "Conectador branco"
-
-msgid "Black Connector"
-msgstr "Conectador negro"
-
-msgid "Gray Connector"
-msgstr "Conectador gris"
-
-msgid "Orange Connector"
-msgstr "Conectador laranxa"
-
-msgid "Red Connector"
-msgstr "Conectador vermello"
-
-msgid "Yellow Connector"
-msgstr "Conectador amarelo"
-
-msgid "Green Front Panel Connector"
-msgstr "Conectador verde do panel frontal"
-
-msgid "Pink Front Panel Connector"
-msgstr "Conectador rosa do panel frontal"
-
-msgid "Blue Front Panel Connector"
-msgstr "Conectador azul do panel frontal"
-
-msgid "White Front Panel Connector"
-msgstr "Conectador branco do panel frontal"
-
-msgid "Black Front Panel Connector"
-msgstr "Conectador negro do panel frontal"
-
-msgid "Gray Front Panel Connector"
-msgstr "Conectador gris do panel frontal"
-
-msgid "Orange Front Panel Connector"
-msgstr "Conectador laranxado panel frontal"
-
-msgid "Red Front Panel Connector"
-msgstr "Conectador vermello do panel frontal"
-
-msgid "Yellow Front Panel Connector"
-msgstr "Conectador amarelo do panel frontal"
-
-msgid "Spread Output"
-msgstr "Expandir saÃda"
-
-msgid "Downmix"
-msgstr "Redución de canles"
-
-msgid "Virtual Mixer Input"
-msgstr "Entrada do misturador virtual"
-
-msgid "Virtual Mixer Output"
-msgstr "SaÃda do misturador virtual"
-
-msgid "Virtual Mixer Channels"
-msgstr "Canles do misturador virtual"
-
-#. TRANSLATORS: name + number of a volume mixer control
-#, c-format
-msgid "%s %d Function"
-msgstr "Función %s %d"
-
-#. TRANSLATORS: name of a volume mixer control
-#, c-format
-msgid "%s Function"
-msgstr "Función %s"
-
msgid ""
"Could not open audio device for playback. This version of the Open Sound "
"System is not supported by this element."
@@ -528,12 +146,33 @@ msgstr "Este dispositivo de son non admite a gravación."
msgid "Error recording from audio device."
msgstr "Erro ao gravar do dispositivo de son."
+msgid "Volume"
+msgstr "Volume"
+
msgid "Gain"
msgstr "Ganancia"
+msgid "Monitor"
+msgstr "Monitor"
+
+msgid "Built-in Speaker"
+msgstr "Altofalante interno"
+
msgid "Headphone"
msgstr "Cascos"
+msgid "Line Out"
+msgstr "Liña de saÃda"
+
+msgid "SPDIF Out"
+msgstr "SaÃda SPDIF"
+
+msgid "AUX 1 Out"
+msgstr "SaÃda AUX 1"
+
+msgid "AUX 2 Out"
+msgstr "SaÃda AUX 2"
+
#, c-format
msgid "Error reading %d bytes from device '%s'."
msgstr "Produciuse un erro ao ler %d bytes desde o dispositivo «%s»."
@@ -730,6 +369,358 @@ msgstr "AÃnda non se admite o cambio de resolución durante a reprodución."
msgid "Cannot operate without a clock"
msgstr "Non é posÃbel operar sen reloxo"
+#~ msgid "Bass"
+#~ msgstr "Baixos"
+
+#~ msgid "Treble"
+#~ msgstr "Agudos"
+
+#~ msgid "Synth"
+#~ msgstr "Sintetizador"
+
+#~ msgid "PCM"
+#~ msgstr "PCM"
+
+#~ msgid "Speaker"
+#~ msgstr "Altofalante"
+
+#~ msgid "Line-in"
+#~ msgstr "Liña de entrada"
+
+#~ msgid "Microphone"
+#~ msgstr "Micrófono"
+
+#~ msgid "CD"
+#~ msgstr "CD"
+
+#~ msgid "Mixer"
+#~ msgstr "Misturador"
+
+#~ msgid "PCM-2"
+#~ msgstr "PCM-2"
+
+#~ msgid "Record"
+#~ msgstr "Gravar"
+
+#~ msgid "In-gain"
+#~ msgstr "Ganancia de entrada"
+
+#~ msgid "Out-gain"
+#~ msgstr "Ganancia de saÃda"
+
+#~ msgid "Line-1"
+#~ msgstr "Liña 1"
+
+#~ msgid "Line-2"
+#~ msgstr "Liña 2"
+
+#~ msgid "Line-3"
+#~ msgstr "Liña 3"
+
+#~ msgid "Digital-1"
+#~ msgstr "Dixital 1"
+
+#~ msgid "Digital-2"
+#~ msgstr "Dixital 2"
+
+#~ msgid "Digital-3"
+#~ msgstr "Dixital 3"
+
+#~ msgid "Phone-in"
+#~ msgstr "Entrada teléfono"
+
+#~ msgid "Phone-out"
+#~ msgstr "SaÃda teléfono"
+
+#~ msgid "Video"
+#~ msgstr "VÃdeo"
+
+#~ msgid "Radio"
+#~ msgstr "Radio"
+
+#~ msgid "Could not open audio device for mixer control handling."
+#~ msgstr ""
+#~ "Non foi posÃbel abrir o dispositivo de son para a súa xestión polo "
+#~ "control de misturado."
+
+#~ msgid ""
+#~ "Could not open audio device for mixer control handling. This version of "
+#~ "the Open Sound System is not supported by this element."
+#~ msgstr ""
+#~ "Non foi posÃbel abrir o dispositivo de son para a súa xestión polo "
+#~ "control de misturado. Este elemento non admite esta versión do Open Sound "
+#~ "System."
+
+#~ msgid "Master"
+#~ msgstr "Mestre"
+
+#~ msgid "Front"
+#~ msgstr "Frontal"
+
+#~ msgid "Rear"
+#~ msgstr "Treseiro"
+
+#~ msgid "Headphones"
+#~ msgstr "Auriculares"
+
+#~ msgid "Center"
+#~ msgstr "Centro"
+
+#~ msgid "LFE"
+#~ msgstr "LFE"
+
+#~ msgid "Surround"
+#~ msgstr "Envolvente"
+
+#~ msgid "Side"
+#~ msgstr "Lateral"
+
+#~ msgid "AUX Out"
+#~ msgstr "SaÃda AUX"
+
+#~ msgid "3D Depth"
+#~ msgstr "Profundidade 3D"
+
+#~ msgid "3D Center"
+#~ msgstr "Centro 3D"
+
+#~ msgid "3D Enhance"
+#~ msgstr "Mellora 3D"
+
+#~ msgid "Telephone"
+#~ msgstr "Teléfono"
+
+#~ msgid "Line In"
+#~ msgstr "Liña de entrada"
+
+#~ msgid "Internal CD"
+#~ msgstr "CD interno"
+
+#~ msgid "Video In"
+#~ msgstr "Entrada de vÃdeo"
+
+#~ msgid "AUX 1 In"
+#~ msgstr "Entrada AUX 1"
+
+#~ msgid "AUX 2 In"
+#~ msgstr "Entrada AUX 2"
+
+#~ msgid "AUX In"
+#~ msgstr "Entrada AUX"
+
+#~ msgid "Record Gain"
+#~ msgstr "Ganancia de gravación"
+
+#~ msgid "Output Gain"
+#~ msgstr "Ganancia de saÃda"
+
+#~ msgid "Microphone Boost"
+#~ msgstr "Aumento do micrófono"
+
+#~ msgid "Loopback"
+#~ msgstr "Bucle local"
+
+#~ msgid "Diagnostic"
+#~ msgstr "Diagnóstico"
+
+#~ msgid "Bass Boost"
+#~ msgstr "Aumento de baixos"
+
+#~ msgid "Playback Ports"
+#~ msgstr "Portos de reprodución"
+
+#~ msgid "Input"
+#~ msgstr "Entrada"
+
+#~ msgid "Record Source"
+#~ msgstr "Orixe da gravación"
+
+#~ msgid "Monitor Source"
+#~ msgstr "Monitor de orixe"
+
+#~ msgid "Keyboard Beep"
+#~ msgstr "Pitido de teclado"
+
+#~ msgid "Simulate Stereo"
+#~ msgstr "Simular estéreo"
+
+#~ msgid "Stereo"
+#~ msgstr "Estéreo"
+
+#~ msgid "Surround Sound"
+#~ msgstr "Son envolvente"
+
+#~ msgid "Microphone Gain"
+#~ msgstr "Ganancia do micrófono"
+
+#~ msgid "Speaker Source"
+#~ msgstr "Altofalante de orixe"
+
+#~ msgid "Microphone Source"
+#~ msgstr "Micrófono de orixe"
+
+#~ msgid "Jack"
+#~ msgstr "Jack"
+
+#~ msgid "Center / LFE"
+#~ msgstr "Centro / LFE"
+
+#~ msgid "Stereo Mix"
+#~ msgstr "Misturador estéreo"
+
+#~ msgid "Mono Mix"
+#~ msgstr "Misturador mono"
+
+#~ msgid "Input Mix"
+#~ msgstr "Misturador de entrada"
+
+#~ msgid "SPDIF In"
+#~ msgstr "Entrada SPDIF"
+
+#~ msgid "Microphone 1"
+#~ msgstr "Micrófono 1"
+
+#~ msgid "Microphone 2"
+#~ msgstr "Micrófono 2"
+
+#~ msgid "Digital Out"
+#~ msgstr "SaÃda dixital"
+
+#~ msgid "Digital In"
+#~ msgstr "Entrada dixital"
+
+#~ msgid "HDMI"
+#~ msgstr "HDMI"
+
+#~ msgid "Modem"
+#~ msgstr "Módem"
+
+#~ msgid "Handset"
+#~ msgstr "Auriculares"
+
+#~ msgid "Other"
+#~ msgstr "Outro"
+
+#~ msgid "None"
+#~ msgstr "Ningún"
+
+#~ msgid "On"
+#~ msgstr "Acendido"
+
+#~ msgid "Off"
+#~ msgstr "Apagado"
+
+#~ msgid "Mute"
+#~ msgstr "Silenciar"
+
+#~ msgid "Fast"
+#~ msgstr "Rápido"
+
+#~ msgid "Very Low"
+#~ msgstr "Moi baixo"
+
+#~ msgid "Low"
+#~ msgstr "Baixo"
+
+#~ msgid "Medium"
+#~ msgstr "Medio"
+
+#~ msgid "High"
+#~ msgstr "Alto"
+
+#~ msgid "Very High"
+#~ msgstr "Moi alto"
+
+#~ msgid "Production"
+#~ msgstr "Produción"
+
+#~ msgid "Front Panel Microphone"
+#~ msgstr "Micrófono do panel frontal"
+
+#~ msgid "Front Panel Line In"
+#~ msgstr "Entrada do panel frontal"
+
+#~ msgid "Front Panel Headphones"
+#~ msgstr "Auriculares do panel frontal"
+
+#~ msgid "Front Panel Line Out"
+#~ msgstr "SaÃda do panel frontal"
+
+#~ msgid "Green Connector"
+#~ msgstr "Conectador verde"
+
+#~ msgid "Pink Connector"
+#~ msgstr "Conectador rosa"
+
+#~ msgid "Blue Connector"
+#~ msgstr "Conectador azul"
+
+#~ msgid "White Connector"
+#~ msgstr "Conectador branco"
+
+#~ msgid "Black Connector"
+#~ msgstr "Conectador negro"
+
+#~ msgid "Gray Connector"
+#~ msgstr "Conectador gris"
+
+#~ msgid "Orange Connector"
+#~ msgstr "Conectador laranxa"
+
+#~ msgid "Red Connector"
+#~ msgstr "Conectador vermello"
+
+#~ msgid "Yellow Connector"
+#~ msgstr "Conectador amarelo"
+
+#~ msgid "Green Front Panel Connector"
+#~ msgstr "Conectador verde do panel frontal"
+
+#~ msgid "Pink Front Panel Connector"
+#~ msgstr "Conectador rosa do panel frontal"
+
+#~ msgid "Blue Front Panel Connector"
+#~ msgstr "Conectador azul do panel frontal"
+
+#~ msgid "White Front Panel Connector"
+#~ msgstr "Conectador branco do panel frontal"
+
+#~ msgid "Black Front Panel Connector"
+#~ msgstr "Conectador negro do panel frontal"
+
+#~ msgid "Gray Front Panel Connector"
+#~ msgstr "Conectador gris do panel frontal"
+
+#~ msgid "Orange Front Panel Connector"
+#~ msgstr "Conectador laranxado panel frontal"
+
+#~ msgid "Red Front Panel Connector"
+#~ msgstr "Conectador vermello do panel frontal"
+
+#~ msgid "Yellow Front Panel Connector"
+#~ msgstr "Conectador amarelo do panel frontal"
+
+#~ msgid "Spread Output"
+#~ msgstr "Expandir saÃda"
+
+#~ msgid "Downmix"
+#~ msgstr "Redución de canles"
+
+#~ msgid "Virtual Mixer Input"
+#~ msgstr "Entrada do misturador virtual"
+
+#~ msgid "Virtual Mixer Output"
+#~ msgstr "SaÃda do misturador virtual"
+
+#~ msgid "Virtual Mixer Channels"
+#~ msgstr "Canles do misturador virtual"
+
+#~ msgid "%s %d Function"
+#~ msgstr "Función %s %d"
+
+#~ msgid "%s Function"
+#~ msgstr "Función %s"
+
#~ msgid "Error reading %d bytes on device '%s'."
#~ msgstr "Produciuse un erro ao ler %d bytes do dispositivo «%s»."
diff --git a/po/gst-plugins-good-1.0.pot b/po/gst-plugins-good-1.0.pot
index 65e6c10b015479c6a951d8ac707ce9f2db2d2bd5..d28984f7fb53d1d86e581f8affc2d2be1687d046 100644
--- a/po/gst-plugins-good-1.0.pot
+++ b/po/gst-plugins-good-1.0.pot
@@ -5,9 +5,9 @@
#, fuzzy
msgid ""
msgstr ""
-"Project-Id-Version: gst-plugins-good 0.11.90\n"
+"Project-Id-Version: gst-plugins-good 0.11.91\n"
"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/\n"
-"POT-Creation-Date: 2012-04-12 10:26+0200\n"
+"POT-Creation-Date: 2012-05-13 16:29+0200\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
@@ -17,7 +17,7 @@ msgstr ""
"Content-Transfer-Encoding: 8bit\n"
#. TRANSLATORS: 'song title' by 'artist name'
-#: ext/pulse/pulsesink.c:2772
+#: ext/pulse/pulsesink.c:2776
#, c-format
msgid "'%s' by '%s'"
msgstr ""
@@ -27,7 +27,7 @@ msgid "Failed to decode JPEG image"
msgstr ""
#: ext/libpng/gstpngdec.c:321 ext/libpng/gstpngdec.c:332
-#: ext/libpng/gstpngdec.c:625 gst/avi/gstavidemux.c:5175
+#: ext/libpng/gstpngdec.c:625 gst/avi/gstavidemux.c:5223
msgid "Internal data stream error."
msgstr ""
@@ -64,7 +64,7 @@ msgstr ""
msgid "No URL set."
msgstr ""
-#: gst/avi/gstavimux.c:1770
+#: gst/avi/gstavimux.c:1778
msgid "No or invalid input audio, AVI stream will be corrupt."
msgstr ""
@@ -81,7 +81,7 @@ msgstr ""
#: gst/isomp4/qtdemux.c:2573 gst/isomp4/qtdemux.c:4909
#: gst/isomp4/qtdemux.c:4916 gst/isomp4/qtdemux.c:5533
#: gst/isomp4/qtdemux.c:5961 gst/isomp4/qtdemux.c:5968
-#: gst/isomp4/qtdemux.c:7537
+#: gst/isomp4/qtdemux.c:7539
msgid "This file is corrupt and cannot be played."
msgstr ""
@@ -97,7 +97,7 @@ msgstr ""
msgid "The video in this file might not play correctly."
msgstr ""
-#: gst/isomp4/qtdemux.c:7566
+#: gst/isomp4/qtdemux.c:7568
#, c-format
msgid "This file contains too many streams. Only playing first %d"
msgstr ""
@@ -119,636 +119,162 @@ msgstr ""
msgid "Internal data flow error."
msgstr ""
-#: sys/oss/gstossmixertrack.c:98 sys/oss4/oss4-mixer.c:723
-#: sys/sunaudio/gstsunaudiomixertrack.c:69
-msgid "Volume"
-msgstr ""
-
-#: sys/oss/gstossmixertrack.c:99 sys/oss4/oss4-mixer.c:736
-msgid "Bass"
-msgstr ""
-
-#: sys/oss/gstossmixertrack.c:100 sys/oss4/oss4-mixer.c:737
-msgid "Treble"
-msgstr ""
-
-#: sys/oss/gstossmixertrack.c:101
-msgid "Synth"
-msgstr ""
-
-#: sys/oss/gstossmixertrack.c:102 sys/oss4/oss4-mixer.c:751
-msgid "PCM"
-msgstr ""
-
-#: sys/oss/gstossmixertrack.c:103
-msgid "Speaker"
-msgstr ""
-
-#: sys/oss/gstossmixertrack.c:104
-msgid "Line-in"
-msgstr ""
-
-#: sys/oss/gstossmixertrack.c:105 sys/oss4/oss4-mixer.c:742
-msgid "Microphone"
-msgstr ""
-
-#: sys/oss/gstossmixertrack.c:106
-msgid "CD"
-msgstr ""
-
-#: sys/oss/gstossmixertrack.c:107
-msgid "Mixer"
-msgstr ""
-
-#: sys/oss/gstossmixertrack.c:108
-msgid "PCM-2"
-msgstr ""
-
-#: sys/oss/gstossmixertrack.c:109
-msgid "Record"
-msgstr ""
-
-#: sys/oss/gstossmixertrack.c:110
-msgid "In-gain"
-msgstr ""
-
-#: sys/oss/gstossmixertrack.c:111
-msgid "Out-gain"
-msgstr ""
-
-#: sys/oss/gstossmixertrack.c:112
-msgid "Line-1"
-msgstr ""
-
-#: sys/oss/gstossmixertrack.c:113
-msgid "Line-2"
-msgstr ""
-
-#: sys/oss/gstossmixertrack.c:114
-msgid "Line-3"
-msgstr ""
-
-#: sys/oss/gstossmixertrack.c:115
-msgid "Digital-1"
-msgstr ""
-
-#: sys/oss/gstossmixertrack.c:116
-msgid "Digital-2"
-msgstr ""
-
-#: sys/oss/gstossmixertrack.c:117
-msgid "Digital-3"
-msgstr ""
-
-#: sys/oss/gstossmixertrack.c:118
-msgid "Phone-in"
-msgstr ""
-
-#: sys/oss/gstossmixertrack.c:119
-msgid "Phone-out"
-msgstr ""
-
-#: sys/oss/gstossmixertrack.c:120
-msgid "Video"
-msgstr ""
-
-#: sys/oss/gstossmixertrack.c:121
-msgid "Radio"
-msgstr ""
-
-#: sys/oss/gstossmixertrack.c:122 sys/oss4/oss4-mixer.c:765
-#: sys/sunaudio/gstsunaudiomixertrack.c:71
-msgid "Monitor"
-msgstr ""
-
-#: sys/oss/gstosssink.c:399 sys/oss4/oss4-sink.c:494
-#: sys/oss4/oss4-source.c:361
+#: sys/oss/gstosssink.c:384 sys/oss4/oss4-sink.c:495
+#: sys/oss4/oss4-source.c:360
msgid ""
"Could not open audio device for playback. Device is being used by another "
"application."
msgstr ""
-#: sys/oss/gstosssink.c:406 sys/oss4/oss4-sink.c:504
-#: sys/oss4/oss4-source.c:371
+#: sys/oss/gstosssink.c:391 sys/oss4/oss4-sink.c:505
+#: sys/oss4/oss4-source.c:370
msgid ""
"Could not open audio device for playback. You don't have permission to open "
"the device."
msgstr ""
-#: sys/oss/gstosssink.c:414 sys/oss4/oss4-sink.c:515
-#: sys/oss4/oss4-source.c:382
+#: sys/oss/gstosssink.c:399 sys/oss4/oss4-sink.c:516
+#: sys/oss4/oss4-source.c:381
msgid "Could not open audio device for playback."
msgstr ""
-#: sys/oss/gstosssrc.c:368
+#: sys/oss/gstosssrc.c:376
msgid ""
"Could not open audio device for recording. You don't have permission to open "
"the device."
msgstr ""
-#: sys/oss/gstosssrc.c:376
+#: sys/oss/gstosssrc.c:384
msgid "Could not open audio device for recording."
msgstr ""
-#: sys/oss4/oss4-mixer.c:303
-msgid "Could not open audio device for mixer control handling."
-msgstr ""
-
-#: sys/oss4/oss4-mixer.c:317
+#: sys/oss4/oss4-sink.c:525 sys/oss4/oss4-source.c:391
msgid ""
-"Could not open audio device for mixer control handling. This version of the "
-"Open Sound System is not supported by this element."
-msgstr ""
-
-#: sys/oss4/oss4-mixer.c:724
-msgid "Master"
+"Could not open audio device for playback. This version of the Open Sound "
+"System is not supported by this element."
msgstr ""
-#: sys/oss4/oss4-mixer.c:725
-msgid "Front"
+#: sys/oss4/oss4-sink.c:642
+msgid "Playback is not supported by this audio device."
msgstr ""
-#: sys/oss4/oss4-mixer.c:726
-msgid "Rear"
+#: sys/oss4/oss4-sink.c:649
+msgid "Audio playback error."
msgstr ""
-#: sys/oss4/oss4-mixer.c:727
-msgid "Headphones"
+#: sys/oss4/oss4-source.c:504
+msgid "Recording is not supported by this audio device."
msgstr ""
-#: sys/oss4/oss4-mixer.c:728
-msgid "Center"
+#: sys/oss4/oss4-source.c:511
+msgid "Error recording from audio device."
msgstr ""
-#: sys/oss4/oss4-mixer.c:729
-msgid "LFE"
+#: sys/sunaudio/gstsunaudiomixertrack.c:69
+msgid "Volume"
msgstr ""
-#: sys/oss4/oss4-mixer.c:730
-msgid "Surround"
+#: sys/sunaudio/gstsunaudiomixertrack.c:70
+msgid "Gain"
msgstr ""
-#: sys/oss4/oss4-mixer.c:731
-msgid "Side"
+#: sys/sunaudio/gstsunaudiomixertrack.c:71
+msgid "Monitor"
msgstr ""
-#: sys/oss4/oss4-mixer.c:732 sys/sunaudio/gstsunaudiomixertrack.c:72
+#: sys/sunaudio/gstsunaudiomixertrack.c:72
msgid "Built-in Speaker"
msgstr ""
-#: sys/oss4/oss4-mixer.c:733 sys/sunaudio/gstsunaudiomixertrack.c:76
-msgid "AUX 1 Out"
-msgstr ""
-
-#: sys/oss4/oss4-mixer.c:734 sys/sunaudio/gstsunaudiomixertrack.c:77
-msgid "AUX 2 Out"
-msgstr ""
-
-#: sys/oss4/oss4-mixer.c:735
-msgid "AUX Out"
-msgstr ""
-
-#: sys/oss4/oss4-mixer.c:738
-msgid "3D Depth"
-msgstr ""
-
-#: sys/oss4/oss4-mixer.c:739
-msgid "3D Center"
-msgstr ""
-
-#: sys/oss4/oss4-mixer.c:740
-msgid "3D Enhance"
-msgstr ""
-
-#: sys/oss4/oss4-mixer.c:741
-msgid "Telephone"
+#: sys/sunaudio/gstsunaudiomixertrack.c:73
+msgid "Headphone"
msgstr ""
-#: sys/oss4/oss4-mixer.c:743 sys/sunaudio/gstsunaudiomixertrack.c:74
+#: sys/sunaudio/gstsunaudiomixertrack.c:74
msgid "Line Out"
msgstr ""
-#: sys/oss4/oss4-mixer.c:744 sys/oss4/oss4-mixer.c:745
-msgid "Line In"
-msgstr ""
-
-#: sys/oss4/oss4-mixer.c:746
-msgid "Internal CD"
-msgstr ""
-
-#: sys/oss4/oss4-mixer.c:747
-msgid "Video In"
-msgstr ""
-
-#: sys/oss4/oss4-mixer.c:748
-msgid "AUX 1 In"
-msgstr ""
-
-#: sys/oss4/oss4-mixer.c:749
-msgid "AUX 2 In"
-msgstr ""
-
-#: sys/oss4/oss4-mixer.c:750
-msgid "AUX In"
-msgstr ""
-
-#: sys/oss4/oss4-mixer.c:752 sys/oss4/oss4-mixer.c:753
-msgid "Record Gain"
-msgstr ""
-
-#: sys/oss4/oss4-mixer.c:754
-msgid "Output Gain"
-msgstr ""
-
-#: sys/oss4/oss4-mixer.c:755
-msgid "Microphone Boost"
-msgstr ""
-
-#: sys/oss4/oss4-mixer.c:756
-msgid "Loopback"
-msgstr ""
-
-#: sys/oss4/oss4-mixer.c:757
-msgid "Diagnostic"
-msgstr ""
-
-#: sys/oss4/oss4-mixer.c:758
-msgid "Bass Boost"
-msgstr ""
-
-#: sys/oss4/oss4-mixer.c:759
-msgid "Playback Ports"
-msgstr ""
-
-#: sys/oss4/oss4-mixer.c:760
-msgid "Input"
-msgstr ""
-
-#: sys/oss4/oss4-mixer.c:761 sys/oss4/oss4-mixer.c:762
-msgid "Record Source"
-msgstr ""
-
-#: sys/oss4/oss4-mixer.c:763
-msgid "Monitor Source"
-msgstr ""
-
-#: sys/oss4/oss4-mixer.c:764
-msgid "Keyboard Beep"
-msgstr ""
-
-#: sys/oss4/oss4-mixer.c:766
-msgid "Simulate Stereo"
-msgstr ""
-
-#: sys/oss4/oss4-mixer.c:767 sys/oss4/oss4-mixer.c:787
-msgid "Stereo"
-msgstr ""
-
-#: sys/oss4/oss4-mixer.c:768
-msgid "Surround Sound"
-msgstr ""
-
-#: sys/oss4/oss4-mixer.c:769
-msgid "Microphone Gain"
-msgstr ""
-
-#: sys/oss4/oss4-mixer.c:770
-msgid "Speaker Source"
-msgstr ""
-
-#: sys/oss4/oss4-mixer.c:771
-msgid "Microphone Source"
-msgstr ""
-
-#: sys/oss4/oss4-mixer.c:772
-msgid "Jack"
-msgstr ""
-
-#: sys/oss4/oss4-mixer.c:773
-msgid "Center / LFE"
-msgstr ""
-
-#: sys/oss4/oss4-mixer.c:774
-msgid "Stereo Mix"
-msgstr ""
-
-#: sys/oss4/oss4-mixer.c:775
-msgid "Mono Mix"
-msgstr ""
-
-#: sys/oss4/oss4-mixer.c:776
-msgid "Input Mix"
-msgstr ""
-
-#: sys/oss4/oss4-mixer.c:777
-msgid "SPDIF In"
-msgstr ""
-
-#: sys/oss4/oss4-mixer.c:778 sys/sunaudio/gstsunaudiomixertrack.c:75
+#: sys/sunaudio/gstsunaudiomixertrack.c:75
msgid "SPDIF Out"
msgstr ""
-#: sys/oss4/oss4-mixer.c:779
-msgid "Microphone 1"
-msgstr ""
-
-#: sys/oss4/oss4-mixer.c:780
-msgid "Microphone 2"
-msgstr ""
-
-#: sys/oss4/oss4-mixer.c:781
-msgid "Digital Out"
-msgstr ""
-
-#: sys/oss4/oss4-mixer.c:782
-msgid "Digital In"
-msgstr ""
-
-#: sys/oss4/oss4-mixer.c:783
-msgid "HDMI"
-msgstr ""
-
-#: sys/oss4/oss4-mixer.c:784
-msgid "Modem"
-msgstr ""
-
-#: sys/oss4/oss4-mixer.c:785
-msgid "Handset"
-msgstr ""
-
-#: sys/oss4/oss4-mixer.c:786
-msgid "Other"
-msgstr ""
-
-#: sys/oss4/oss4-mixer.c:788
-msgid "None"
-msgstr ""
-
-#: sys/oss4/oss4-mixer.c:789
-msgid "On"
-msgstr ""
-
-#: sys/oss4/oss4-mixer.c:790
-msgid "Off"
-msgstr ""
-
-#: sys/oss4/oss4-mixer.c:791
-msgid "Mute"
-msgstr ""
-
-#: sys/oss4/oss4-mixer.c:792
-msgid "Fast"
-msgstr ""
-
-#. TRANSLATORS: "Very Low" is a quality setting here
-#: sys/oss4/oss4-mixer.c:794
-msgid "Very Low"
-msgstr ""
-
-#. TRANSLATORS: "Low" is a quality setting here
-#: sys/oss4/oss4-mixer.c:796
-msgid "Low"
-msgstr ""
-
-#. TRANSLATORS: "Medium" is a quality setting here
-#: sys/oss4/oss4-mixer.c:798
-msgid "Medium"
-msgstr ""
-
-#. TRANSLATORS: "High" is a quality setting here
-#: sys/oss4/oss4-mixer.c:800
-msgid "High"
-msgstr ""
-
-#. TRANSLATORS: "Very High" is a quality setting here
-#: sys/oss4/oss4-mixer.c:802 sys/oss4/oss4-mixer.c:803
-msgid "Very High"
-msgstr ""
-
-#. TRANSLATORS: "Production" is a quality setting here
-#: sys/oss4/oss4-mixer.c:805
-msgid "Production"
-msgstr ""
-
-#: sys/oss4/oss4-mixer.c:806
-msgid "Front Panel Microphone"
-msgstr ""
-
-#: sys/oss4/oss4-mixer.c:807
-msgid "Front Panel Line In"
-msgstr ""
-
-#: sys/oss4/oss4-mixer.c:808
-msgid "Front Panel Headphones"
-msgstr ""
-
-#: sys/oss4/oss4-mixer.c:809
-msgid "Front Panel Line Out"
-msgstr ""
-
-#: sys/oss4/oss4-mixer.c:810
-msgid "Green Connector"
-msgstr ""
-
-#: sys/oss4/oss4-mixer.c:811
-msgid "Pink Connector"
-msgstr ""
-
-#: sys/oss4/oss4-mixer.c:812
-msgid "Blue Connector"
-msgstr ""
-
-#: sys/oss4/oss4-mixer.c:813
-msgid "White Connector"
-msgstr ""
-
-#: sys/oss4/oss4-mixer.c:814
-msgid "Black Connector"
-msgstr ""
-
-#: sys/oss4/oss4-mixer.c:815
-msgid "Gray Connector"
-msgstr ""
-
-#: sys/oss4/oss4-mixer.c:816
-msgid "Orange Connector"
-msgstr ""
-
-#: sys/oss4/oss4-mixer.c:817
-msgid "Red Connector"
-msgstr ""
-
-#: sys/oss4/oss4-mixer.c:818
-msgid "Yellow Connector"
-msgstr ""
-
-#: sys/oss4/oss4-mixer.c:819
-msgid "Green Front Panel Connector"
-msgstr ""
-
-#: sys/oss4/oss4-mixer.c:820
-msgid "Pink Front Panel Connector"
-msgstr ""
-
-#: sys/oss4/oss4-mixer.c:821
-msgid "Blue Front Panel Connector"
-msgstr ""
-
-#: sys/oss4/oss4-mixer.c:822
-msgid "White Front Panel Connector"
-msgstr ""
-
-#: sys/oss4/oss4-mixer.c:823
-msgid "Black Front Panel Connector"
-msgstr ""
-
-#: sys/oss4/oss4-mixer.c:824
-msgid "Gray Front Panel Connector"
-msgstr ""
-
-#: sys/oss4/oss4-mixer.c:825
-msgid "Orange Front Panel Connector"
-msgstr ""
-
-#: sys/oss4/oss4-mixer.c:826
-msgid "Red Front Panel Connector"
-msgstr ""
-
-#: sys/oss4/oss4-mixer.c:827
-msgid "Yellow Front Panel Connector"
-msgstr ""
-
-#: sys/oss4/oss4-mixer.c:828
-msgid "Spread Output"
-msgstr ""
-
-#: sys/oss4/oss4-mixer.c:829
-msgid "Downmix"
-msgstr ""
-
-#: sys/oss4/oss4-mixer.c:873
-msgid "Virtual Mixer Input"
-msgstr ""
-
-#: sys/oss4/oss4-mixer.c:875
-msgid "Virtual Mixer Output"
-msgstr ""
-
-#: sys/oss4/oss4-mixer.c:877
-msgid "Virtual Mixer Channels"
-msgstr ""
-
-#. TRANSLATORS: name + number of a volume mixer control
-#: sys/oss4/oss4-mixer.c:928
-#, c-format
-msgid "%s %d Function"
-msgstr ""
-
-#. TRANSLATORS: name of a volume mixer control
-#: sys/oss4/oss4-mixer.c:935
-#, c-format
-msgid "%s Function"
-msgstr ""
-
-#: sys/oss4/oss4-sink.c:524 sys/oss4/oss4-source.c:392
-msgid ""
-"Could not open audio device for playback. This version of the Open Sound "
-"System is not supported by this element."
-msgstr ""
-
-#: sys/oss4/oss4-sink.c:640
-msgid "Playback is not supported by this audio device."
-msgstr ""
-
-#: sys/oss4/oss4-sink.c:647
-msgid "Audio playback error."
-msgstr ""
-
-#: sys/oss4/oss4-source.c:514
-msgid "Recording is not supported by this audio device."
-msgstr ""
-
-#: sys/oss4/oss4-source.c:521
-msgid "Error recording from audio device."
-msgstr ""
-
-#: sys/sunaudio/gstsunaudiomixertrack.c:70
-msgid "Gain"
+#: sys/sunaudio/gstsunaudiomixertrack.c:76
+msgid "AUX 1 Out"
msgstr ""
-#: sys/sunaudio/gstsunaudiomixertrack.c:73
-msgid "Headphone"
+#: sys/sunaudio/gstsunaudiomixertrack.c:77
+msgid "AUX 2 Out"
msgstr ""
-#: sys/v4l2/gstv4l2bufferpool.c:942
+#: sys/v4l2/gstv4l2bufferpool.c:991
#, c-format
msgid "Error reading %d bytes from device '%s'."
msgstr ""
-#: sys/v4l2/gstv4l2object.c:1166
+#: sys/v4l2/gstv4l2object.c:1170
#, c-format
msgid "Failed to enumerate possible video formats device '%s' can work with"
msgstr ""
-#: sys/v4l2/gstv4l2object.c:2164
+#: sys/v4l2/gstv4l2object.c:2177
#, c-format
msgid "Could not map buffers from device '%s'"
msgstr ""
-#: sys/v4l2/gstv4l2object.c:2172
+#: sys/v4l2/gstv4l2object.c:2185
#, c-format
msgid "The driver of device '%s' does not support the IO method %d"
msgstr ""
-#: sys/v4l2/gstv4l2object.c:2179
+#: sys/v4l2/gstv4l2object.c:2192
#, c-format
msgid "The driver of device '%s' does not support any known IO method."
msgstr ""
-#: sys/v4l2/gstv4l2object.c:2367
+#: sys/v4l2/gstv4l2object.c:2386
#, c-format
msgid "Device '%s' does not support video capture"
msgstr ""
-#: sys/v4l2/gstv4l2object.c:2376
+#: sys/v4l2/gstv4l2object.c:2395
#, c-format
msgid "Device '%s' is busy"
msgstr ""
-#: sys/v4l2/gstv4l2object.c:2382 sys/v4l2/gstv4l2object.c:2393
+#: sys/v4l2/gstv4l2object.c:2401 sys/v4l2/gstv4l2object.c:2412
#, c-format
msgid "Device '%s' cannot capture at %dx%d"
msgstr ""
-#: sys/v4l2/gstv4l2object.c:2402
+#: sys/v4l2/gstv4l2object.c:2421
#, c-format
msgid "Device '%s' cannot capture in the specified format"
msgstr ""
-#: sys/v4l2/gstv4l2object.c:2415
+#: sys/v4l2/gstv4l2object.c:2434
#, c-format
msgid "Could not get parameters on device '%s'"
msgstr ""
-#: sys/v4l2/gstv4l2object.c:2423
+#: sys/v4l2/gstv4l2object.c:2442
msgid "Video device did not accept new frame rate setting."
msgstr ""
-#: sys/v4l2/gstv4l2object.c:2430
+#: sys/v4l2/gstv4l2object.c:2449
msgid "Video device could not create buffer pool."
msgstr ""
-#: sys/v4l2/gstv4l2object.c:2507
+#: sys/v4l2/gstv4l2object.c:2526
#, c-format
msgid "Got unexpected frame size of %u instead of %u."
msgstr ""
-#: sys/v4l2/gstv4l2object.c:2573
+#: sys/v4l2/gstv4l2object.c:2592
#, c-format
msgid "Failed trying to get video frames from device '%s'."
msgstr ""
-#: sys/v4l2/gstv4l2object.c:2575
+#: sys/v4l2/gstv4l2object.c:2594
#, c-format
msgid "Failed after %d tries. device %s. system error: %s"
msgstr ""
diff --git a/po/hu.gmo b/po/hu.gmo
index e552e809e7646e3ae8e881283b9208545c724882..aa8719b3741b6219c0e0d0d54efd7b968546273e 100644
Binary files a/po/hu.gmo and b/po/hu.gmo differ
diff --git a/po/hu.po b/po/hu.po
index 27da23b53945120157cb68dde9d268919f2b653d..25508832b2461b58ae870cf5c2e83bd668172ddc 100644
--- a/po/hu.po
+++ b/po/hu.po
@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: gst-plugins-good 0.10.25.3\n"
"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/\n"
-"POT-Creation-Date: 2012-04-12 10:26+0200\n"
+"POT-Creation-Date: 2012-05-13 16:29+0200\n"
"PO-Revision-Date: 2010-11-04 01:21+0100\n"
"Last-Translator: Gabor Kelemen <kelemeng@gnome.hu>\n"
"Language-Team: Hungarian <translation-team-hu@lists.sourceforge.net>\n"
@@ -102,81 +102,6 @@ msgstr ""
msgid "Internal data flow error."
msgstr "Belső adatfolyam-hiba."
-msgid "Volume"
-msgstr "Hangerő"
-
-msgid "Bass"
-msgstr "Basszus"
-
-msgid "Treble"
-msgstr "Magas"
-
-msgid "Synth"
-msgstr "Szintet."
-
-msgid "PCM"
-msgstr "PCM"
-
-msgid "Speaker"
-msgstr "Hangfal"
-
-msgid "Line-in"
-msgstr "Vonalbemenet"
-
-msgid "Microphone"
-msgstr "Mikrofon"
-
-msgid "CD"
-msgstr "CD"
-
-msgid "Mixer"
-msgstr "Keverő"
-
-msgid "PCM-2"
-msgstr "2. PCM"
-
-msgid "Record"
-msgstr "Felvétel"
-
-msgid "In-gain"
-msgstr "Be-erÅ‘sÃtés"
-
-msgid "Out-gain"
-msgstr "Ki-erÅ‘sÃtés"
-
-msgid "Line-1"
-msgstr "1. vonal"
-
-msgid "Line-2"
-msgstr "2. vonal"
-
-msgid "Line-3"
-msgstr "3. vonal"
-
-msgid "Digital-1"
-msgstr "1. digitális"
-
-msgid "Digital-2"
-msgstr "2. digitális"
-
-msgid "Digital-3"
-msgstr "3. digitális"
-
-msgid "Phone-in"
-msgstr "Hang-be"
-
-msgid "Phone-out"
-msgstr "Hang-ki"
-
-msgid "Video"
-msgstr "Video"
-
-msgid "Radio"
-msgstr "Rádió"
-
-msgid "Monitor"
-msgstr "Monitor"
-
msgid ""
"Could not open audio device for playback. Device is being used by another "
"application."
@@ -204,311 +129,6 @@ msgstr ""
msgid "Could not open audio device for recording."
msgstr "Nem nyitható meg hangeszköz a felvételhez."
-msgid "Could not open audio device for mixer control handling."
-msgstr "Nem nyitható meg hangeszköz a keverővezérlő kezeléséhez."
-
-msgid ""
-"Could not open audio device for mixer control handling. This version of the "
-"Open Sound System is not supported by this element."
-msgstr ""
-"Nem nyitható meg hangeszköz a keverővezérlő kezeléséhez. Az Open Sound "
-"System ezen verzióját az elem nem támogatja."
-
-msgid "Master"
-msgstr "Fő hangerő"
-
-msgid "Front"
-msgstr "Elülső"
-
-msgid "Rear"
-msgstr "Hátsó"
-
-msgid "Headphones"
-msgstr "Fülhallgató"
-
-msgid "Center"
-msgstr "Középső"
-
-msgid "LFE"
-msgstr "LFE"
-
-msgid "Surround"
-msgstr "Térhatású"
-
-msgid "Side"
-msgstr "Oldalsó"
-
-msgid "Built-in Speaker"
-msgstr "BeépÃtett hangszóró"
-
-msgid "AUX 1 Out"
-msgstr "1. AUX ki"
-
-msgid "AUX 2 Out"
-msgstr "2. AUX ki"
-
-msgid "AUX Out"
-msgstr "AUX ki"
-
-msgid "3D Depth"
-msgstr "3D mély"
-
-msgid "3D Center"
-msgstr "3D középső"
-
-msgid "3D Enhance"
-msgstr "3D javÃtás"
-
-msgid "Telephone"
-msgstr "Telefon"
-
-msgid "Line Out"
-msgstr "Vonalkimenet"
-
-msgid "Line In"
-msgstr "Vonalbemenet"
-
-msgid "Internal CD"
-msgstr "Belső CD"
-
-msgid "Video In"
-msgstr "Video be"
-
-msgid "AUX 1 In"
-msgstr "1. AUX be"
-
-msgid "AUX 2 In"
-msgstr "2. AUX be"
-
-msgid "AUX In"
-msgstr "AUX be"
-
-msgid "Record Gain"
-msgstr "FelvételerÅ‘sÃtés"
-
-msgid "Output Gain"
-msgstr "KimeneterÅ‘sÃtés"
-
-msgid "Microphone Boost"
-msgstr "MikrofonerÅ‘sÃtés"
-
-msgid "Loopback"
-msgstr "Visszacsatolás"
-
-msgid "Diagnostic"
-msgstr "Diagnosztika"
-
-msgid "Bass Boost"
-msgstr "Basszuskiemelés"
-
-msgid "Playback Ports"
-msgstr "Lejátszási portok"
-
-msgid "Input"
-msgstr "Bemenet"
-
-msgid "Record Source"
-msgstr "Felvétel forrása"
-
-msgid "Monitor Source"
-msgstr "Monitor forrása"
-
-msgid "Keyboard Beep"
-msgstr "Billentyűzetcsengő"
-
-msgid "Simulate Stereo"
-msgstr "Sztereó szimulálása"
-
-msgid "Stereo"
-msgstr "Sztereó"
-
-msgid "Surround Sound"
-msgstr "Térhatású hang"
-
-msgid "Microphone Gain"
-msgstr "MikrofonerÅ‘sÃtés"
-
-msgid "Speaker Source"
-msgstr "Hangfalforrás"
-
-msgid "Microphone Source"
-msgstr "Mikrofonforrás"
-
-msgid "Jack"
-msgstr "Jack"
-
-msgid "Center / LFE"
-msgstr "Középső / LFE"
-
-msgid "Stereo Mix"
-msgstr "Sztereó keverés"
-
-msgid "Mono Mix"
-msgstr "Monó keverés"
-
-msgid "Input Mix"
-msgstr "Bemeneti keverés"
-
-msgid "SPDIF In"
-msgstr "SPDIF be"
-
-msgid "SPDIF Out"
-msgstr "SPDIF ki"
-
-msgid "Microphone 1"
-msgstr "1. mikrofon"
-
-msgid "Microphone 2"
-msgstr "2. mikrofon"
-
-msgid "Digital Out"
-msgstr "Digitális ki"
-
-msgid "Digital In"
-msgstr "Digitális be"
-
-msgid "HDMI"
-msgstr "HDMI"
-
-msgid "Modem"
-msgstr "Modem"
-
-msgid "Handset"
-msgstr "Mobiltelefon"
-
-msgid "Other"
-msgstr "Egyéb"
-
-msgid "None"
-msgstr "Nincs"
-
-msgid "On"
-msgstr "Be"
-
-msgid "Off"
-msgstr "Ki"
-
-msgid "Mute"
-msgstr "NémÃtás"
-
-msgid "Fast"
-msgstr "Gyors"
-
-#. TRANSLATORS: "Very Low" is a quality setting here
-msgid "Very Low"
-msgstr "Nagyon alacsony"
-
-#. TRANSLATORS: "Low" is a quality setting here
-msgid "Low"
-msgstr "Alacsony"
-
-#. TRANSLATORS: "Medium" is a quality setting here
-msgid "Medium"
-msgstr "Közepes"
-
-#. TRANSLATORS: "High" is a quality setting here
-msgid "High"
-msgstr "Magas"
-
-#. TRANSLATORS: "Very High" is a quality setting here
-msgid "Very High"
-msgstr "Nagyon magas"
-
-#. TRANSLATORS: "Production" is a quality setting here
-msgid "Production"
-msgstr "Éles"
-
-msgid "Front Panel Microphone"
-msgstr "Előlapi mikrofon"
-
-msgid "Front Panel Line In"
-msgstr "Előlapi vonalbemenet"
-
-msgid "Front Panel Headphones"
-msgstr "Előlapi fülhallgató"
-
-msgid "Front Panel Line Out"
-msgstr "Előlapi vonalkimenet"
-
-msgid "Green Connector"
-msgstr "Zöld csatlakozó"
-
-msgid "Pink Connector"
-msgstr "RózsaszÃn csatlakozó"
-
-msgid "Blue Connector"
-msgstr "Kék csatlakozó"
-
-msgid "White Connector"
-msgstr "Fehér csatlakozó"
-
-msgid "Black Connector"
-msgstr "Fekete csatlakozó"
-
-msgid "Gray Connector"
-msgstr "Szürke csatlakozó"
-
-msgid "Orange Connector"
-msgstr "Narancs csatlakozó"
-
-msgid "Red Connector"
-msgstr "Vörös csatlakozó"
-
-msgid "Yellow Connector"
-msgstr "Sárga csatlakozó"
-
-msgid "Green Front Panel Connector"
-msgstr "Zöld előoldali csatlakozó"
-
-msgid "Pink Front Panel Connector"
-msgstr "RózsaszÃn elÅ‘oldali csatlakozó"
-
-msgid "Blue Front Panel Connector"
-msgstr "Kék előoldali csatlakozó"
-
-msgid "White Front Panel Connector"
-msgstr "Fehér előoldali csatlakozó"
-
-msgid "Black Front Panel Connector"
-msgstr "Fekete előoldali csatlakozó"
-
-msgid "Gray Front Panel Connector"
-msgstr "Szürke előoldali csatlakozó"
-
-msgid "Orange Front Panel Connector"
-msgstr "Narancs előoldali csatlakozó"
-
-msgid "Red Front Panel Connector"
-msgstr "Vörös előoldali csatlakozó"
-
-msgid "Yellow Front Panel Connector"
-msgstr "Sárga előoldali csatlakozó"
-
-msgid "Spread Output"
-msgstr "Szóráskimenet"
-
-msgid "Downmix"
-msgstr "Lekeverés"
-
-msgid "Virtual Mixer Input"
-msgstr "Virtuális keverőbemenet"
-
-msgid "Virtual Mixer Output"
-msgstr "Virtuális keverőkimenet"
-
-msgid "Virtual Mixer Channels"
-msgstr "Virtuális keverőcsatornák"
-
-#. TRANSLATORS: name + number of a volume mixer control
-#, c-format
-msgid "%s %d Function"
-msgstr "%s %d funkció"
-
-#. TRANSLATORS: name of a volume mixer control
-#, c-format
-msgid "%s Function"
-msgstr "%s funkció"
-
msgid ""
"Could not open audio device for playback. This version of the Open Sound "
"System is not supported by this element."
@@ -528,12 +148,33 @@ msgstr "Ez a hangeszköz nem támogatja a felvételt."
msgid "Error recording from audio device."
msgstr "Hiba a hangeszközről való felvételkor."
+msgid "Volume"
+msgstr "Hangerő"
+
msgid "Gain"
msgstr "ErÅ‘sÃtés"
+msgid "Monitor"
+msgstr "Monitor"
+
+msgid "Built-in Speaker"
+msgstr "BeépÃtett hangszóró"
+
msgid "Headphone"
msgstr "Fejhallgató"
+msgid "Line Out"
+msgstr "Vonalkimenet"
+
+msgid "SPDIF Out"
+msgstr "SPDIF ki"
+
+msgid "AUX 1 Out"
+msgstr "1. AUX ki"
+
+msgid "AUX 2 Out"
+msgstr "2. AUX ki"
+
#, c-format
msgid "Error reading %d bytes from device '%s'."
msgstr "Hiba %d bájt olvasásakor a következÅ‘ eszközrÅ‘l: „%sâ€."
@@ -717,6 +358,355 @@ msgstr "A felbontás módosÃtása futás közben még nem támogatott."
msgid "Cannot operate without a clock"
msgstr "Óra nélkül lehetetlen a működés"
+#~ msgid "Bass"
+#~ msgstr "Basszus"
+
+#~ msgid "Treble"
+#~ msgstr "Magas"
+
+#~ msgid "Synth"
+#~ msgstr "Szintet."
+
+#~ msgid "PCM"
+#~ msgstr "PCM"
+
+#~ msgid "Speaker"
+#~ msgstr "Hangfal"
+
+#~ msgid "Line-in"
+#~ msgstr "Vonalbemenet"
+
+#~ msgid "Microphone"
+#~ msgstr "Mikrofon"
+
+#~ msgid "CD"
+#~ msgstr "CD"
+
+#~ msgid "Mixer"
+#~ msgstr "Keverő"
+
+#~ msgid "PCM-2"
+#~ msgstr "2. PCM"
+
+#~ msgid "Record"
+#~ msgstr "Felvétel"
+
+#~ msgid "In-gain"
+#~ msgstr "Be-erÅ‘sÃtés"
+
+#~ msgid "Out-gain"
+#~ msgstr "Ki-erÅ‘sÃtés"
+
+#~ msgid "Line-1"
+#~ msgstr "1. vonal"
+
+#~ msgid "Line-2"
+#~ msgstr "2. vonal"
+
+#~ msgid "Line-3"
+#~ msgstr "3. vonal"
+
+#~ msgid "Digital-1"
+#~ msgstr "1. digitális"
+
+#~ msgid "Digital-2"
+#~ msgstr "2. digitális"
+
+#~ msgid "Digital-3"
+#~ msgstr "3. digitális"
+
+#~ msgid "Phone-in"
+#~ msgstr "Hang-be"
+
+#~ msgid "Phone-out"
+#~ msgstr "Hang-ki"
+
+#~ msgid "Video"
+#~ msgstr "Video"
+
+#~ msgid "Radio"
+#~ msgstr "Rádió"
+
+#~ msgid "Could not open audio device for mixer control handling."
+#~ msgstr "Nem nyitható meg hangeszköz a keverővezérlő kezeléséhez."
+
+#~ msgid ""
+#~ "Could not open audio device for mixer control handling. This version of "
+#~ "the Open Sound System is not supported by this element."
+#~ msgstr ""
+#~ "Nem nyitható meg hangeszköz a keverővezérlő kezeléséhez. Az Open Sound "
+#~ "System ezen verzióját az elem nem támogatja."
+
+#~ msgid "Master"
+#~ msgstr "Fő hangerő"
+
+#~ msgid "Front"
+#~ msgstr "Elülső"
+
+#~ msgid "Rear"
+#~ msgstr "Hátsó"
+
+#~ msgid "Headphones"
+#~ msgstr "Fülhallgató"
+
+#~ msgid "Center"
+#~ msgstr "Középső"
+
+#~ msgid "LFE"
+#~ msgstr "LFE"
+
+#~ msgid "Surround"
+#~ msgstr "Térhatású"
+
+#~ msgid "Side"
+#~ msgstr "Oldalsó"
+
+#~ msgid "AUX Out"
+#~ msgstr "AUX ki"
+
+#~ msgid "3D Depth"
+#~ msgstr "3D mély"
+
+#~ msgid "3D Center"
+#~ msgstr "3D középső"
+
+#~ msgid "3D Enhance"
+#~ msgstr "3D javÃtás"
+
+#~ msgid "Telephone"
+#~ msgstr "Telefon"
+
+#~ msgid "Line In"
+#~ msgstr "Vonalbemenet"
+
+#~ msgid "Internal CD"
+#~ msgstr "Belső CD"
+
+#~ msgid "Video In"
+#~ msgstr "Video be"
+
+#~ msgid "AUX 1 In"
+#~ msgstr "1. AUX be"
+
+#~ msgid "AUX 2 In"
+#~ msgstr "2. AUX be"
+
+#~ msgid "AUX In"
+#~ msgstr "AUX be"
+
+#~ msgid "Record Gain"
+#~ msgstr "FelvételerÅ‘sÃtés"
+
+#~ msgid "Output Gain"
+#~ msgstr "KimeneterÅ‘sÃtés"
+
+#~ msgid "Microphone Boost"
+#~ msgstr "MikrofonerÅ‘sÃtés"
+
+#~ msgid "Loopback"
+#~ msgstr "Visszacsatolás"
+
+#~ msgid "Diagnostic"
+#~ msgstr "Diagnosztika"
+
+#~ msgid "Bass Boost"
+#~ msgstr "Basszuskiemelés"
+
+#~ msgid "Playback Ports"
+#~ msgstr "Lejátszási portok"
+
+#~ msgid "Input"
+#~ msgstr "Bemenet"
+
+#~ msgid "Record Source"
+#~ msgstr "Felvétel forrása"
+
+#~ msgid "Monitor Source"
+#~ msgstr "Monitor forrása"
+
+#~ msgid "Keyboard Beep"
+#~ msgstr "Billentyűzetcsengő"
+
+#~ msgid "Simulate Stereo"
+#~ msgstr "Sztereó szimulálása"
+
+#~ msgid "Stereo"
+#~ msgstr "Sztereó"
+
+#~ msgid "Surround Sound"
+#~ msgstr "Térhatású hang"
+
+#~ msgid "Microphone Gain"
+#~ msgstr "MikrofonerÅ‘sÃtés"
+
+#~ msgid "Speaker Source"
+#~ msgstr "Hangfalforrás"
+
+#~ msgid "Microphone Source"
+#~ msgstr "Mikrofonforrás"
+
+#~ msgid "Jack"
+#~ msgstr "Jack"
+
+#~ msgid "Center / LFE"
+#~ msgstr "Középső / LFE"
+
+#~ msgid "Stereo Mix"
+#~ msgstr "Sztereó keverés"
+
+#~ msgid "Mono Mix"
+#~ msgstr "Monó keverés"
+
+#~ msgid "Input Mix"
+#~ msgstr "Bemeneti keverés"
+
+#~ msgid "SPDIF In"
+#~ msgstr "SPDIF be"
+
+#~ msgid "Microphone 1"
+#~ msgstr "1. mikrofon"
+
+#~ msgid "Microphone 2"
+#~ msgstr "2. mikrofon"
+
+#~ msgid "Digital Out"
+#~ msgstr "Digitális ki"
+
+#~ msgid "Digital In"
+#~ msgstr "Digitális be"
+
+#~ msgid "HDMI"
+#~ msgstr "HDMI"
+
+#~ msgid "Modem"
+#~ msgstr "Modem"
+
+#~ msgid "Handset"
+#~ msgstr "Mobiltelefon"
+
+#~ msgid "Other"
+#~ msgstr "Egyéb"
+
+#~ msgid "None"
+#~ msgstr "Nincs"
+
+#~ msgid "On"
+#~ msgstr "Be"
+
+#~ msgid "Off"
+#~ msgstr "Ki"
+
+#~ msgid "Mute"
+#~ msgstr "NémÃtás"
+
+#~ msgid "Fast"
+#~ msgstr "Gyors"
+
+#~ msgid "Very Low"
+#~ msgstr "Nagyon alacsony"
+
+#~ msgid "Low"
+#~ msgstr "Alacsony"
+
+#~ msgid "Medium"
+#~ msgstr "Közepes"
+
+#~ msgid "High"
+#~ msgstr "Magas"
+
+#~ msgid "Very High"
+#~ msgstr "Nagyon magas"
+
+#~ msgid "Production"
+#~ msgstr "Éles"
+
+#~ msgid "Front Panel Microphone"
+#~ msgstr "Előlapi mikrofon"
+
+#~ msgid "Front Panel Line In"
+#~ msgstr "Előlapi vonalbemenet"
+
+#~ msgid "Front Panel Headphones"
+#~ msgstr "Előlapi fülhallgató"
+
+#~ msgid "Front Panel Line Out"
+#~ msgstr "Előlapi vonalkimenet"
+
+#~ msgid "Green Connector"
+#~ msgstr "Zöld csatlakozó"
+
+#~ msgid "Pink Connector"
+#~ msgstr "RózsaszÃn csatlakozó"
+
+#~ msgid "Blue Connector"
+#~ msgstr "Kék csatlakozó"
+
+#~ msgid "White Connector"
+#~ msgstr "Fehér csatlakozó"
+
+#~ msgid "Black Connector"
+#~ msgstr "Fekete csatlakozó"
+
+#~ msgid "Gray Connector"
+#~ msgstr "Szürke csatlakozó"
+
+#~ msgid "Orange Connector"
+#~ msgstr "Narancs csatlakozó"
+
+#~ msgid "Red Connector"
+#~ msgstr "Vörös csatlakozó"
+
+#~ msgid "Yellow Connector"
+#~ msgstr "Sárga csatlakozó"
+
+#~ msgid "Green Front Panel Connector"
+#~ msgstr "Zöld előoldali csatlakozó"
+
+#~ msgid "Pink Front Panel Connector"
+#~ msgstr "RózsaszÃn elÅ‘oldali csatlakozó"
+
+#~ msgid "Blue Front Panel Connector"
+#~ msgstr "Kék előoldali csatlakozó"
+
+#~ msgid "White Front Panel Connector"
+#~ msgstr "Fehér előoldali csatlakozó"
+
+#~ msgid "Black Front Panel Connector"
+#~ msgstr "Fekete előoldali csatlakozó"
+
+#~ msgid "Gray Front Panel Connector"
+#~ msgstr "Szürke előoldali csatlakozó"
+
+#~ msgid "Orange Front Panel Connector"
+#~ msgstr "Narancs előoldali csatlakozó"
+
+#~ msgid "Red Front Panel Connector"
+#~ msgstr "Vörös előoldali csatlakozó"
+
+#~ msgid "Yellow Front Panel Connector"
+#~ msgstr "Sárga előoldali csatlakozó"
+
+#~ msgid "Spread Output"
+#~ msgstr "Szóráskimenet"
+
+#~ msgid "Downmix"
+#~ msgstr "Lekeverés"
+
+#~ msgid "Virtual Mixer Input"
+#~ msgstr "Virtuális keverőbemenet"
+
+#~ msgid "Virtual Mixer Output"
+#~ msgstr "Virtuális keverőkimenet"
+
+#~ msgid "Virtual Mixer Channels"
+#~ msgstr "Virtuális keverőcsatornák"
+
+#~ msgid "%s %d Function"
+#~ msgstr "%s %d funkció"
+
+#~ msgid "%s Function"
+#~ msgstr "%s funkció"
+
#~ msgid "Error reading %d bytes on device '%s'."
#~ msgstr "Hiba %d bájt olvasásakor a következÅ‘ eszközrÅ‘l: „%sâ€."
diff --git a/po/id.gmo b/po/id.gmo
index 8925528de5de93203fcf1219265d0c2ec17c26fb..6cd1753ec6f46af8883a6c914736957df1242122 100644
Binary files a/po/id.gmo and b/po/id.gmo differ
diff --git a/po/id.po b/po/id.po
index 3bd88415ef00ad21d1abfdd7009066cf9bd13f96..a44e52ebc2b7a62a0c19d46b2adbe7f917f0bdc5 100644
--- a/po/id.po
+++ b/po/id.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: gst-plugins-good 0.10.26.2\n"
"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/\n"
-"POT-Creation-Date: 2012-04-12 10:26+0200\n"
+"POT-Creation-Date: 2012-05-13 16:29+0200\n"
"PO-Revision-Date: 2011-02-26 18:09+0700\n"
"Last-Translator: Andhika Padmawan <andhika.padmawan@gmail.com>\n"
"Language-Team: Indonesian <translation-team-id@lists.sourceforge.net>\n"
@@ -97,81 +97,6 @@ msgstr ""
msgid "Internal data flow error."
msgstr "Galat aliran data internal."
-msgid "Volume"
-msgstr "Volume"
-
-msgid "Bass"
-msgstr "Bas"
-
-msgid "Treble"
-msgstr "Treble"
-
-msgid "Synth"
-msgstr "Synth"
-
-msgid "PCM"
-msgstr "PCM"
-
-msgid "Speaker"
-msgstr "Pengeras Suara"
-
-msgid "Line-in"
-msgstr "Jalur masuk"
-
-msgid "Microphone"
-msgstr "Mikrofon"
-
-msgid "CD"
-msgstr "CD"
-
-msgid "Mixer"
-msgstr "Mixer"
-
-msgid "PCM-2"
-msgstr "PCM-2"
-
-msgid "Record"
-msgstr "Rekam"
-
-msgid "In-gain"
-msgstr "Masukan-gain"
-
-msgid "Out-gain"
-msgstr "Keluaran-gain"
-
-msgid "Line-1"
-msgstr "Jalur-1"
-
-msgid "Line-2"
-msgstr "Jalur-2"
-
-msgid "Line-3"
-msgstr "Jalur-3"
-
-msgid "Digital-1"
-msgstr "Digital-1"
-
-msgid "Digital-2"
-msgstr "Digital-2"
-
-msgid "Digital-3"
-msgstr "Digital-3"
-
-msgid "Phone-in"
-msgstr "Telepon-masuk"
-
-msgid "Phone-out"
-msgstr "Telepon-keluar"
-
-msgid "Video"
-msgstr "Video"
-
-msgid "Radio"
-msgstr "Radio"
-
-msgid "Monitor"
-msgstr "Monitor"
-
msgid ""
"Could not open audio device for playback. Device is being used by another "
"application."
@@ -199,311 +124,6 @@ msgstr ""
msgid "Could not open audio device for recording."
msgstr "Tak dapat membuka divais audio untuk merekam."
-msgid "Could not open audio device for mixer control handling."
-msgstr "Tak dapat membuka divais audio untuk menangani kontrol mixer."
-
-msgid ""
-"Could not open audio device for mixer control handling. This version of the "
-"Open Sound System is not supported by this element."
-msgstr ""
-"Tak dapat membuka divais audio untuk menangani kontrol mixer. Versi Open "
-"Sound System ini tidak didukung oleh elemen ini."
-
-msgid "Master"
-msgstr "Master"
-
-msgid "Front"
-msgstr "Depan"
-
-msgid "Rear"
-msgstr "Belakang"
-
-msgid "Headphones"
-msgstr "Headphone"
-
-msgid "Center"
-msgstr "Tengah"
-
-msgid "LFE"
-msgstr "LFE"
-
-msgid "Surround"
-msgstr "Sekeliling"
-
-msgid "Side"
-msgstr "Sisi"
-
-msgid "Built-in Speaker"
-msgstr "Pengeras Suara Terbina"
-
-msgid "AUX 1 Out"
-msgstr "AUX 1 Keluar"
-
-msgid "AUX 2 Out"
-msgstr "AUX 2 Keluar"
-
-msgid "AUX Out"
-msgstr "AUX Keluaran"
-
-msgid "3D Depth"
-msgstr "Kedalaman 3D"
-
-msgid "3D Center"
-msgstr "3D Tengah"
-
-msgid "3D Enhance"
-msgstr "Dipercanggih 3D"
-
-msgid "Telephone"
-msgstr "Telepon"
-
-msgid "Line Out"
-msgstr "Jalur Keluar"
-
-msgid "Line In"
-msgstr "Jalur Masuk"
-
-msgid "Internal CD"
-msgstr "CD Internal"
-
-msgid "Video In"
-msgstr "Video Masuk"
-
-msgid "AUX 1 In"
-msgstr "AUX 1 Masuk"
-
-msgid "AUX 2 In"
-msgstr "AUX 2 Masuk"
-
-msgid "AUX In"
-msgstr "AUX Masuk"
-
-msgid "Record Gain"
-msgstr "Rekam Gain"
-
-msgid "Output Gain"
-msgstr "Keluaran Gain"
-
-msgid "Microphone Boost"
-msgstr "Mikrofon Boost"
-
-msgid "Loopback"
-msgstr "Loopback"
-
-msgid "Diagnostic"
-msgstr "Diagnosis"
-
-msgid "Bass Boost"
-msgstr "Bass Boost"
-
-msgid "Playback Ports"
-msgstr "Pangkalan Putar"
-
-msgid "Input"
-msgstr "Masukan"
-
-msgid "Record Source"
-msgstr "Sumber Rekaman"
-
-msgid "Monitor Source"
-msgstr "Sumber Monitor"
-
-msgid "Keyboard Beep"
-msgstr "Bip Papan Ketik"
-
-msgid "Simulate Stereo"
-msgstr "Simulasi Stereo"
-
-msgid "Stereo"
-msgstr "Stereo"
-
-msgid "Surround Sound"
-msgstr "Suara Sekeliling"
-
-msgid "Microphone Gain"
-msgstr "Mikrofon Gain"
-
-msgid "Speaker Source"
-msgstr "Sumber Pengeras Suara"
-
-msgid "Microphone Source"
-msgstr "Sumber Mikrofon"
-
-msgid "Jack"
-msgstr "Jack"
-
-msgid "Center / LFE"
-msgstr "Tengah / LFE"
-
-msgid "Stereo Mix"
-msgstr "Mix Stereo"
-
-msgid "Mono Mix"
-msgstr "Mix Mono"
-
-msgid "Input Mix"
-msgstr "Mix Masukan"
-
-msgid "SPDIF In"
-msgstr "SPDIF Masuk"
-
-msgid "SPDIF Out"
-msgstr "SPDIF Keluar"
-
-msgid "Microphone 1"
-msgstr "Mikrofon 1"
-
-msgid "Microphone 2"
-msgstr "Mikrofon 2"
-
-msgid "Digital Out"
-msgstr "Digital Keluar"
-
-msgid "Digital In"
-msgstr "Digital Masuk"
-
-msgid "HDMI"
-msgstr "HDMI"
-
-msgid "Modem"
-msgstr "Modem"
-
-msgid "Handset"
-msgstr "Handset"
-
-msgid "Other"
-msgstr "Lainnya"
-
-msgid "None"
-msgstr "Tidak Ada"
-
-msgid "On"
-msgstr "Hidup"
-
-msgid "Off"
-msgstr "Mati"
-
-msgid "Mute"
-msgstr "Diam"
-
-msgid "Fast"
-msgstr "Cepat"
-
-#. TRANSLATORS: "Very Low" is a quality setting here
-msgid "Very Low"
-msgstr "Sangat Rendah"
-
-#. TRANSLATORS: "Low" is a quality setting here
-msgid "Low"
-msgstr "Rendah"
-
-#. TRANSLATORS: "Medium" is a quality setting here
-msgid "Medium"
-msgstr "Sedang"
-
-#. TRANSLATORS: "High" is a quality setting here
-msgid "High"
-msgstr "Tinggi"
-
-#. TRANSLATORS: "Very High" is a quality setting here
-msgid "Very High"
-msgstr "Sangat Tinggi"
-
-#. TRANSLATORS: "Production" is a quality setting here
-msgid "Production"
-msgstr "Produksi"
-
-msgid "Front Panel Microphone"
-msgstr "Mikrofon Panel Depan"
-
-msgid "Front Panel Line In"
-msgstr "Masukan Jalur Panel Depan"
-
-msgid "Front Panel Headphones"
-msgstr "Headphone Panel Depan"
-
-msgid "Front Panel Line Out"
-msgstr "Keluaran Jalur Panel Depan"
-
-msgid "Green Connector"
-msgstr "Konektor Hijau"
-
-msgid "Pink Connector"
-msgstr "Konektor Merah Jambu"
-
-msgid "Blue Connector"
-msgstr "Konektor Biru"
-
-msgid "White Connector"
-msgstr "Konektor Putih"
-
-msgid "Black Connector"
-msgstr "Konektor Hitam"
-
-msgid "Gray Connector"
-msgstr "Konektor Abu-Abu"
-
-msgid "Orange Connector"
-msgstr "Konektor Jingga"
-
-msgid "Red Connector"
-msgstr "Konektor Merah"
-
-msgid "Yellow Connector"
-msgstr "Konektor Kuning"
-
-msgid "Green Front Panel Connector"
-msgstr "Konektor Panel Depan Hijau"
-
-msgid "Pink Front Panel Connector"
-msgstr "Konektor Panel Depan Merah Jambu"
-
-msgid "Blue Front Panel Connector"
-msgstr "Konektor Panel Depan Biru"
-
-msgid "White Front Panel Connector"
-msgstr "Konektor Panel Depan Putih"
-
-msgid "Black Front Panel Connector"
-msgstr "Konektor Panel Depan Hitam"
-
-msgid "Gray Front Panel Connector"
-msgstr "Konektor Panel Depan Abu-Abu"
-
-msgid "Orange Front Panel Connector"
-msgstr "Konektor Panel Depan Jingga"
-
-msgid "Red Front Panel Connector"
-msgstr "Konektor Panel Depan Merah"
-
-msgid "Yellow Front Panel Connector"
-msgstr "Konektor Panel Depan Kuning"
-
-msgid "Spread Output"
-msgstr "Keluaran Sebar"
-
-msgid "Downmix"
-msgstr "Downmix"
-
-msgid "Virtual Mixer Input"
-msgstr "Masukan Mixer Virtual"
-
-msgid "Virtual Mixer Output"
-msgstr "Keluaran Mixer Virtual"
-
-msgid "Virtual Mixer Channels"
-msgstr "Kanal Mixer Virtual"
-
-#. TRANSLATORS: name + number of a volume mixer control
-#, c-format
-msgid "%s %d Function"
-msgstr "Fungsi %s %d"
-
-#. TRANSLATORS: name of a volume mixer control
-#, c-format
-msgid "%s Function"
-msgstr "Fungsi %s"
-
msgid ""
"Could not open audio device for playback. This version of the Open Sound "
"System is not supported by this element."
@@ -523,12 +143,33 @@ msgstr "Perekaman tidak didukung oleh divais audio ini."
msgid "Error recording from audio device."
msgstr "Galat merekam dari divais audio."
+msgid "Volume"
+msgstr "Volume"
+
msgid "Gain"
msgstr "Gain"
+msgid "Monitor"
+msgstr "Monitor"
+
+msgid "Built-in Speaker"
+msgstr "Pengeras Suara Terbina"
+
msgid "Headphone"
msgstr "Headphone"
+msgid "Line Out"
+msgstr "Jalur Keluar"
+
+msgid "SPDIF Out"
+msgstr "SPDIF Keluar"
+
+msgid "AUX 1 Out"
+msgstr "AUX 1 Keluar"
+
+msgid "AUX 2 Out"
+msgstr "AUX 2 Keluar"
+
#, c-format
msgid "Error reading %d bytes from device '%s'."
msgstr "Galat membaca %d bita dari divais '%s'."
@@ -705,6 +346,355 @@ msgstr "Mengubah resolusi saat waktu berjalan belum didukung."
msgid "Cannot operate without a clock"
msgstr "Tak dapat beroperasi tanpa jam"
+#~ msgid "Bass"
+#~ msgstr "Bas"
+
+#~ msgid "Treble"
+#~ msgstr "Treble"
+
+#~ msgid "Synth"
+#~ msgstr "Synth"
+
+#~ msgid "PCM"
+#~ msgstr "PCM"
+
+#~ msgid "Speaker"
+#~ msgstr "Pengeras Suara"
+
+#~ msgid "Line-in"
+#~ msgstr "Jalur masuk"
+
+#~ msgid "Microphone"
+#~ msgstr "Mikrofon"
+
+#~ msgid "CD"
+#~ msgstr "CD"
+
+#~ msgid "Mixer"
+#~ msgstr "Mixer"
+
+#~ msgid "PCM-2"
+#~ msgstr "PCM-2"
+
+#~ msgid "Record"
+#~ msgstr "Rekam"
+
+#~ msgid "In-gain"
+#~ msgstr "Masukan-gain"
+
+#~ msgid "Out-gain"
+#~ msgstr "Keluaran-gain"
+
+#~ msgid "Line-1"
+#~ msgstr "Jalur-1"
+
+#~ msgid "Line-2"
+#~ msgstr "Jalur-2"
+
+#~ msgid "Line-3"
+#~ msgstr "Jalur-3"
+
+#~ msgid "Digital-1"
+#~ msgstr "Digital-1"
+
+#~ msgid "Digital-2"
+#~ msgstr "Digital-2"
+
+#~ msgid "Digital-3"
+#~ msgstr "Digital-3"
+
+#~ msgid "Phone-in"
+#~ msgstr "Telepon-masuk"
+
+#~ msgid "Phone-out"
+#~ msgstr "Telepon-keluar"
+
+#~ msgid "Video"
+#~ msgstr "Video"
+
+#~ msgid "Radio"
+#~ msgstr "Radio"
+
+#~ msgid "Could not open audio device for mixer control handling."
+#~ msgstr "Tak dapat membuka divais audio untuk menangani kontrol mixer."
+
+#~ msgid ""
+#~ "Could not open audio device for mixer control handling. This version of "
+#~ "the Open Sound System is not supported by this element."
+#~ msgstr ""
+#~ "Tak dapat membuka divais audio untuk menangani kontrol mixer. Versi Open "
+#~ "Sound System ini tidak didukung oleh elemen ini."
+
+#~ msgid "Master"
+#~ msgstr "Master"
+
+#~ msgid "Front"
+#~ msgstr "Depan"
+
+#~ msgid "Rear"
+#~ msgstr "Belakang"
+
+#~ msgid "Headphones"
+#~ msgstr "Headphone"
+
+#~ msgid "Center"
+#~ msgstr "Tengah"
+
+#~ msgid "LFE"
+#~ msgstr "LFE"
+
+#~ msgid "Surround"
+#~ msgstr "Sekeliling"
+
+#~ msgid "Side"
+#~ msgstr "Sisi"
+
+#~ msgid "AUX Out"
+#~ msgstr "AUX Keluaran"
+
+#~ msgid "3D Depth"
+#~ msgstr "Kedalaman 3D"
+
+#~ msgid "3D Center"
+#~ msgstr "3D Tengah"
+
+#~ msgid "3D Enhance"
+#~ msgstr "Dipercanggih 3D"
+
+#~ msgid "Telephone"
+#~ msgstr "Telepon"
+
+#~ msgid "Line In"
+#~ msgstr "Jalur Masuk"
+
+#~ msgid "Internal CD"
+#~ msgstr "CD Internal"
+
+#~ msgid "Video In"
+#~ msgstr "Video Masuk"
+
+#~ msgid "AUX 1 In"
+#~ msgstr "AUX 1 Masuk"
+
+#~ msgid "AUX 2 In"
+#~ msgstr "AUX 2 Masuk"
+
+#~ msgid "AUX In"
+#~ msgstr "AUX Masuk"
+
+#~ msgid "Record Gain"
+#~ msgstr "Rekam Gain"
+
+#~ msgid "Output Gain"
+#~ msgstr "Keluaran Gain"
+
+#~ msgid "Microphone Boost"
+#~ msgstr "Mikrofon Boost"
+
+#~ msgid "Loopback"
+#~ msgstr "Loopback"
+
+#~ msgid "Diagnostic"
+#~ msgstr "Diagnosis"
+
+#~ msgid "Bass Boost"
+#~ msgstr "Bass Boost"
+
+#~ msgid "Playback Ports"
+#~ msgstr "Pangkalan Putar"
+
+#~ msgid "Input"
+#~ msgstr "Masukan"
+
+#~ msgid "Record Source"
+#~ msgstr "Sumber Rekaman"
+
+#~ msgid "Monitor Source"
+#~ msgstr "Sumber Monitor"
+
+#~ msgid "Keyboard Beep"
+#~ msgstr "Bip Papan Ketik"
+
+#~ msgid "Simulate Stereo"
+#~ msgstr "Simulasi Stereo"
+
+#~ msgid "Stereo"
+#~ msgstr "Stereo"
+
+#~ msgid "Surround Sound"
+#~ msgstr "Suara Sekeliling"
+
+#~ msgid "Microphone Gain"
+#~ msgstr "Mikrofon Gain"
+
+#~ msgid "Speaker Source"
+#~ msgstr "Sumber Pengeras Suara"
+
+#~ msgid "Microphone Source"
+#~ msgstr "Sumber Mikrofon"
+
+#~ msgid "Jack"
+#~ msgstr "Jack"
+
+#~ msgid "Center / LFE"
+#~ msgstr "Tengah / LFE"
+
+#~ msgid "Stereo Mix"
+#~ msgstr "Mix Stereo"
+
+#~ msgid "Mono Mix"
+#~ msgstr "Mix Mono"
+
+#~ msgid "Input Mix"
+#~ msgstr "Mix Masukan"
+
+#~ msgid "SPDIF In"
+#~ msgstr "SPDIF Masuk"
+
+#~ msgid "Microphone 1"
+#~ msgstr "Mikrofon 1"
+
+#~ msgid "Microphone 2"
+#~ msgstr "Mikrofon 2"
+
+#~ msgid "Digital Out"
+#~ msgstr "Digital Keluar"
+
+#~ msgid "Digital In"
+#~ msgstr "Digital Masuk"
+
+#~ msgid "HDMI"
+#~ msgstr "HDMI"
+
+#~ msgid "Modem"
+#~ msgstr "Modem"
+
+#~ msgid "Handset"
+#~ msgstr "Handset"
+
+#~ msgid "Other"
+#~ msgstr "Lainnya"
+
+#~ msgid "None"
+#~ msgstr "Tidak Ada"
+
+#~ msgid "On"
+#~ msgstr "Hidup"
+
+#~ msgid "Off"
+#~ msgstr "Mati"
+
+#~ msgid "Mute"
+#~ msgstr "Diam"
+
+#~ msgid "Fast"
+#~ msgstr "Cepat"
+
+#~ msgid "Very Low"
+#~ msgstr "Sangat Rendah"
+
+#~ msgid "Low"
+#~ msgstr "Rendah"
+
+#~ msgid "Medium"
+#~ msgstr "Sedang"
+
+#~ msgid "High"
+#~ msgstr "Tinggi"
+
+#~ msgid "Very High"
+#~ msgstr "Sangat Tinggi"
+
+#~ msgid "Production"
+#~ msgstr "Produksi"
+
+#~ msgid "Front Panel Microphone"
+#~ msgstr "Mikrofon Panel Depan"
+
+#~ msgid "Front Panel Line In"
+#~ msgstr "Masukan Jalur Panel Depan"
+
+#~ msgid "Front Panel Headphones"
+#~ msgstr "Headphone Panel Depan"
+
+#~ msgid "Front Panel Line Out"
+#~ msgstr "Keluaran Jalur Panel Depan"
+
+#~ msgid "Green Connector"
+#~ msgstr "Konektor Hijau"
+
+#~ msgid "Pink Connector"
+#~ msgstr "Konektor Merah Jambu"
+
+#~ msgid "Blue Connector"
+#~ msgstr "Konektor Biru"
+
+#~ msgid "White Connector"
+#~ msgstr "Konektor Putih"
+
+#~ msgid "Black Connector"
+#~ msgstr "Konektor Hitam"
+
+#~ msgid "Gray Connector"
+#~ msgstr "Konektor Abu-Abu"
+
+#~ msgid "Orange Connector"
+#~ msgstr "Konektor Jingga"
+
+#~ msgid "Red Connector"
+#~ msgstr "Konektor Merah"
+
+#~ msgid "Yellow Connector"
+#~ msgstr "Konektor Kuning"
+
+#~ msgid "Green Front Panel Connector"
+#~ msgstr "Konektor Panel Depan Hijau"
+
+#~ msgid "Pink Front Panel Connector"
+#~ msgstr "Konektor Panel Depan Merah Jambu"
+
+#~ msgid "Blue Front Panel Connector"
+#~ msgstr "Konektor Panel Depan Biru"
+
+#~ msgid "White Front Panel Connector"
+#~ msgstr "Konektor Panel Depan Putih"
+
+#~ msgid "Black Front Panel Connector"
+#~ msgstr "Konektor Panel Depan Hitam"
+
+#~ msgid "Gray Front Panel Connector"
+#~ msgstr "Konektor Panel Depan Abu-Abu"
+
+#~ msgid "Orange Front Panel Connector"
+#~ msgstr "Konektor Panel Depan Jingga"
+
+#~ msgid "Red Front Panel Connector"
+#~ msgstr "Konektor Panel Depan Merah"
+
+#~ msgid "Yellow Front Panel Connector"
+#~ msgstr "Konektor Panel Depan Kuning"
+
+#~ msgid "Spread Output"
+#~ msgstr "Keluaran Sebar"
+
+#~ msgid "Downmix"
+#~ msgstr "Downmix"
+
+#~ msgid "Virtual Mixer Input"
+#~ msgstr "Masukan Mixer Virtual"
+
+#~ msgid "Virtual Mixer Output"
+#~ msgstr "Keluaran Mixer Virtual"
+
+#~ msgid "Virtual Mixer Channels"
+#~ msgstr "Kanal Mixer Virtual"
+
+#~ msgid "%s %d Function"
+#~ msgstr "Fungsi %s %d"
+
+#~ msgid "%s Function"
+#~ msgstr "Fungsi %s"
+
#~ msgid "Error reading %d bytes on device '%s'."
#~ msgstr "Galat membaca %d bita pada divais '%s'."
diff --git a/po/it.gmo b/po/it.gmo
index c7d118f0c0b430b5334920a93249db4070787939..694dcc22838c3628423b29b20d806dc425db435a 100644
Binary files a/po/it.gmo and b/po/it.gmo differ
diff --git a/po/it.po b/po/it.po
index 41d01d54c97ff717d005f0724d95aef36868eb12..1984ad189d4251315767f4fd850c9023fa88a8dd 100644
--- a/po/it.po
+++ b/po/it.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: gst-plugins-good 0.10.25.3\n"
"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/\n"
-"POT-Creation-Date: 2012-04-12 10:26+0200\n"
+"POT-Creation-Date: 2012-05-13 16:29+0200\n"
"PO-Revision-Date: 2010-10-25 10:11+0200\n"
"Last-Translator: Luca Ferretti <elle.uca@infinito.it>\n"
"Language-Team: Italian <tp@lists.linux.it>\n"
@@ -100,81 +100,6 @@ msgstr ""
msgid "Internal data flow error."
msgstr "Errore interno nel flusso di dati."
-msgid "Volume"
-msgstr "Volume"
-
-msgid "Bass"
-msgstr "Bassi"
-
-msgid "Treble"
-msgstr "Acuti"
-
-msgid "Synth"
-msgstr "Sintetiz"
-
-msgid "PCM"
-msgstr "PCM"
-
-msgid "Speaker"
-msgstr "Altoparl"
-
-msgid "Line-in"
-msgstr "Linea in"
-
-msgid "Microphone"
-msgstr "Microfono"
-
-msgid "CD"
-msgstr "CD"
-
-msgid "Mixer"
-msgstr "Mixer"
-
-msgid "PCM-2"
-msgstr "PCM-2"
-
-msgid "Record"
-msgstr "Registr"
-
-msgid "In-gain"
-msgstr "Guad in"
-
-msgid "Out-gain"
-msgstr "Guad out"
-
-msgid "Line-1"
-msgstr "Canale 1"
-
-msgid "Line-2"
-msgstr "Canale 2"
-
-msgid "Line-3"
-msgstr "Canale 3"
-
-msgid "Digital-1"
-msgstr "Digital 1"
-
-msgid "Digital-2"
-msgstr "Digital 2"
-
-msgid "Digital-3"
-msgstr "Digital 3"
-
-msgid "Phone-in"
-msgstr "Telefono in"
-
-msgid "Phone-out"
-msgstr "Telefono out"
-
-msgid "Video"
-msgstr "Video"
-
-msgid "Radio"
-msgstr "Radio"
-
-msgid "Monitor"
-msgstr "Monitor"
-
msgid ""
"Could not open audio device for playback. Device is being used by another "
"application."
@@ -202,317 +127,6 @@ msgstr ""
msgid "Could not open audio device for recording."
msgstr "Impossibile aprire il dispositivo audio per la registrazione."
-msgid "Could not open audio device for mixer control handling."
-msgstr ""
-"Impossibile aprire il device audio per la gestione della regolazione del "
-"mixer."
-
-msgid ""
-"Could not open audio device for mixer control handling. This version of the "
-"Open Sound System is not supported by this element."
-msgstr ""
-"Impossibile aprire il device audio per la gestione della regolazione del "
-"mixer. Questa versione di Open Sound System non è supportata da questo "
-"elemento."
-
-msgid "Master"
-msgstr "Principale"
-
-msgid "Front"
-msgstr "Fronte"
-
-msgid "Rear"
-msgstr "Dietro"
-
-msgid "Headphones"
-msgstr "Cuffie"
-
-msgid "Center"
-msgstr "Centrale"
-
-# NdT: lfe andrebbe tradotto come effetti a bassa frequenza e andrebbe aperto un bug per low frequency emitter che al limite è la cassa ma non il canale
-msgid "LFE"
-msgstr "LFE"
-
-msgid "Surround"
-msgstr "Surround"
-
-msgid "Side"
-msgstr "Laterale"
-
-msgid "Built-in Speaker"
-msgstr "Altop. incorporato"
-
-msgid "AUX 1 Out"
-msgstr "AUX 1 out"
-
-msgid "AUX 2 Out"
-msgstr "AUX 2 out"
-
-msgid "AUX Out"
-msgstr "AUX out"
-
-msgid "3D Depth"
-msgstr "Profondità 3D"
-
-msgid "3D Center"
-msgstr "Centro 3D"
-
-msgid "3D Enhance"
-msgstr "Profondità 3D"
-
-msgid "Telephone"
-msgstr "Telefono"
-
-msgid "Line Out"
-msgstr "Linea out"
-
-msgid "Line In"
-msgstr "Linea in"
-
-msgid "Internal CD"
-msgstr "CD interno"
-
-msgid "Video In"
-msgstr "Video in"
-
-msgid "AUX 1 In"
-msgstr "AUX 1 in"
-
-msgid "AUX 2 In"
-msgstr "AUX 2 in"
-
-msgid "AUX In"
-msgstr "AUX in"
-
-msgid "Record Gain"
-msgstr "Guadagno registrazione"
-
-msgid "Output Gain"
-msgstr "Guadagno uscita"
-
-msgid "Microphone Boost"
-msgstr "Incremento microfono"
-
-msgid "Loopback"
-msgstr "Loopback"
-
-msgid "Diagnostic"
-msgstr "Diagnostica"
-
-msgid "Bass Boost"
-msgstr "Incremento bassi"
-
-msgid "Playback Ports"
-msgstr "Porte riproduzione"
-
-msgid "Input"
-msgstr "Input"
-
-msgid "Record Source"
-msgstr "Sorgente registrazione"
-
-msgid "Monitor Source"
-msgstr "Sorgente monitor"
-
-msgid "Keyboard Beep"
-msgstr "Beep tastiera"
-
-msgid "Simulate Stereo"
-msgstr "Simula stereo"
-
-msgid "Stereo"
-msgstr "Stereo"
-
-msgid "Surround Sound"
-msgstr "Suono surround"
-
-msgid "Microphone Gain"
-msgstr "Guadagno microfono"
-
-msgid "Speaker Source"
-msgstr "Sorgente altoparlante"
-
-msgid "Microphone Source"
-msgstr "Sorgente microfono"
-
-msgid "Jack"
-msgstr "Jack"
-
-# vedi prima per LFE
-msgid "Center / LFE"
-msgstr "Centrale / LFE"
-
-msgid "Stereo Mix"
-msgstr "Mix stereo"
-
-msgid "Mono Mix"
-msgstr "Mix mono"
-
-msgid "Input Mix"
-msgstr "Mix ingresso"
-
-msgid "SPDIF In"
-msgstr "SPDIF in"
-
-msgid "SPDIF Out"
-msgstr "SPDIF out"
-
-msgid "Microphone 1"
-msgstr "Microfono 1"
-
-msgid "Microphone 2"
-msgstr "Microfono 2"
-
-msgid "Digital Out"
-msgstr "Uscita digitale"
-
-msgid "Digital In"
-msgstr "Ingresso digitale"
-
-msgid "HDMI"
-msgstr "HDMI"
-
-msgid "Modem"
-msgstr "Modem"
-
-msgid "Handset"
-msgstr "Auricolare"
-
-msgid "Other"
-msgstr "Altro"
-
-msgid "None"
-msgstr "Nessuno"
-
-msgid "On"
-msgstr "Acceso"
-
-msgid "Off"
-msgstr "Spento"
-
-msgid "Mute"
-msgstr "Escluso"
-
-msgid "Fast"
-msgstr "Veloce"
-
-#. TRANSLATORS: "Very Low" is a quality setting here
-msgid "Very Low"
-msgstr "Molto lento"
-
-#. TRANSLATORS: "Low" is a quality setting here
-msgid "Low"
-msgstr "Lento"
-
-#. TRANSLATORS: "Medium" is a quality setting here
-msgid "Medium"
-msgstr "Medio"
-
-#. TRANSLATORS: "High" is a quality setting here
-msgid "High"
-msgstr "Alto"
-
-#. TRANSLATORS: "Very High" is a quality setting here
-msgid "Very High"
-msgstr "Molto alto"
-
-#. TRANSLATORS: "Production" is a quality setting here
-msgid "Production"
-msgstr "Produzione"
-
-msgid "Front Panel Microphone"
-msgstr "Microfono pannello frontale"
-
-msgid "Front Panel Line In"
-msgstr "Linea in pannello frontale"
-
-msgid "Front Panel Headphones"
-msgstr "Cuffie pannello frontale"
-
-msgid "Front Panel Line Out"
-msgstr "Linea out pannello frontale"
-
-msgid "Green Connector"
-msgstr "Connettore verde"
-
-msgid "Pink Connector"
-msgstr "Connettore rosa"
-
-msgid "Blue Connector"
-msgstr "Connettore blu"
-
-msgid "White Connector"
-msgstr "Connettore bianco"
-
-msgid "Black Connector"
-msgstr "Connettore nero"
-
-msgid "Gray Connector"
-msgstr "Connettore grigio"
-
-msgid "Orange Connector"
-msgstr "Connettore arancione"
-
-msgid "Red Connector"
-msgstr "Connettore rosso"
-
-msgid "Yellow Connector"
-msgstr "Connettore giallo"
-
-msgid "Green Front Panel Connector"
-msgstr "Connettore verde pannello frontale"
-
-msgid "Pink Front Panel Connector"
-msgstr "Connettore rosa pannello frontale"
-
-msgid "Blue Front Panel Connector"
-msgstr "Connettore blu pannello frontale"
-
-msgid "White Front Panel Connector"
-msgstr "Connettore bianco pannello frontale"
-
-msgid "Black Front Panel Connector"
-msgstr "Connettore nero pannello frontale"
-
-msgid "Gray Front Panel Connector"
-msgstr "Connettore grigio pannello frontale"
-
-msgid "Orange Front Panel Connector"
-msgstr "Connettore arancione pannello frontale"
-
-msgid "Red Front Panel Connector"
-msgstr "Connettore rosso pannello frontale"
-
-msgid "Yellow Front Panel Connector"
-msgstr "Connettore giallo pannello frontale"
-
-# int spread; /* copy front to surr/center channels */
-msgid "Spread Output"
-msgstr "Uscita diffusa"
-
-msgid "Downmix"
-msgstr "Downmix"
-
-msgid "Virtual Mixer Input"
-msgstr "Ingresso mixer virtuale"
-
-msgid "Virtual Mixer Output"
-msgstr "Uscita mixer virtuale"
-
-msgid "Virtual Mixer Channels"
-msgstr "Canali mixer virtuale"
-
-#. TRANSLATORS: name + number of a volume mixer control
-#, c-format
-msgid "%s %d Function"
-msgstr "Funzione %s %d"
-
-#. TRANSLATORS: name of a volume mixer control
-#, c-format
-msgid "%s Function"
-msgstr "Funzione %s"
-
msgid ""
"Could not open audio device for playback. This version of the Open Sound "
"System is not supported by this element."
@@ -532,12 +146,33 @@ msgstr "Questo dispositivo audio non supporta la registrazione."
msgid "Error recording from audio device."
msgstr "Errore nel registrare dal dispositivo audio."
+msgid "Volume"
+msgstr "Volume"
+
msgid "Gain"
msgstr "Guadagno"
+msgid "Monitor"
+msgstr "Monitor"
+
+msgid "Built-in Speaker"
+msgstr "Altop. incorporato"
+
msgid "Headphone"
msgstr "Cuffia"
+msgid "Line Out"
+msgstr "Linea out"
+
+msgid "SPDIF Out"
+msgstr "SPDIF out"
+
+msgid "AUX 1 Out"
+msgstr "AUX 1 out"
+
+msgid "AUX 2 Out"
+msgstr "AUX 2 out"
+
#, c-format
msgid "Error reading %d bytes from device '%s'."
msgstr "Errore nel leggere %d byte dal device «%s»."
@@ -730,6 +365,361 @@ msgstr ""
msgid "Cannot operate without a clock"
msgstr "Impossibile operare senza un clock"
+#~ msgid "Bass"
+#~ msgstr "Bassi"
+
+#~ msgid "Treble"
+#~ msgstr "Acuti"
+
+#~ msgid "Synth"
+#~ msgstr "Sintetiz"
+
+#~ msgid "PCM"
+#~ msgstr "PCM"
+
+#~ msgid "Speaker"
+#~ msgstr "Altoparl"
+
+#~ msgid "Line-in"
+#~ msgstr "Linea in"
+
+#~ msgid "Microphone"
+#~ msgstr "Microfono"
+
+#~ msgid "CD"
+#~ msgstr "CD"
+
+#~ msgid "Mixer"
+#~ msgstr "Mixer"
+
+#~ msgid "PCM-2"
+#~ msgstr "PCM-2"
+
+#~ msgid "Record"
+#~ msgstr "Registr"
+
+#~ msgid "In-gain"
+#~ msgstr "Guad in"
+
+#~ msgid "Out-gain"
+#~ msgstr "Guad out"
+
+#~ msgid "Line-1"
+#~ msgstr "Canale 1"
+
+#~ msgid "Line-2"
+#~ msgstr "Canale 2"
+
+#~ msgid "Line-3"
+#~ msgstr "Canale 3"
+
+#~ msgid "Digital-1"
+#~ msgstr "Digital 1"
+
+#~ msgid "Digital-2"
+#~ msgstr "Digital 2"
+
+#~ msgid "Digital-3"
+#~ msgstr "Digital 3"
+
+#~ msgid "Phone-in"
+#~ msgstr "Telefono in"
+
+#~ msgid "Phone-out"
+#~ msgstr "Telefono out"
+
+#~ msgid "Video"
+#~ msgstr "Video"
+
+#~ msgid "Radio"
+#~ msgstr "Radio"
+
+#~ msgid "Could not open audio device for mixer control handling."
+#~ msgstr ""
+#~ "Impossibile aprire il device audio per la gestione della regolazione del "
+#~ "mixer."
+
+#~ msgid ""
+#~ "Could not open audio device for mixer control handling. This version of "
+#~ "the Open Sound System is not supported by this element."
+#~ msgstr ""
+#~ "Impossibile aprire il device audio per la gestione della regolazione del "
+#~ "mixer. Questa versione di Open Sound System non è supportata da questo "
+#~ "elemento."
+
+#~ msgid "Master"
+#~ msgstr "Principale"
+
+#~ msgid "Front"
+#~ msgstr "Fronte"
+
+#~ msgid "Rear"
+#~ msgstr "Dietro"
+
+#~ msgid "Headphones"
+#~ msgstr "Cuffie"
+
+#~ msgid "Center"
+#~ msgstr "Centrale"
+
+# NdT: lfe andrebbe tradotto come effetti a bassa frequenza e andrebbe aperto un bug per low frequency emitter che al limite è la cassa ma non il canale
+#~ msgid "LFE"
+#~ msgstr "LFE"
+
+#~ msgid "Surround"
+#~ msgstr "Surround"
+
+#~ msgid "Side"
+#~ msgstr "Laterale"
+
+#~ msgid "AUX Out"
+#~ msgstr "AUX out"
+
+#~ msgid "3D Depth"
+#~ msgstr "Profondità 3D"
+
+#~ msgid "3D Center"
+#~ msgstr "Centro 3D"
+
+#~ msgid "3D Enhance"
+#~ msgstr "Profondità 3D"
+
+#~ msgid "Telephone"
+#~ msgstr "Telefono"
+
+#~ msgid "Line In"
+#~ msgstr "Linea in"
+
+#~ msgid "Internal CD"
+#~ msgstr "CD interno"
+
+#~ msgid "Video In"
+#~ msgstr "Video in"
+
+#~ msgid "AUX 1 In"
+#~ msgstr "AUX 1 in"
+
+#~ msgid "AUX 2 In"
+#~ msgstr "AUX 2 in"
+
+#~ msgid "AUX In"
+#~ msgstr "AUX in"
+
+#~ msgid "Record Gain"
+#~ msgstr "Guadagno registrazione"
+
+#~ msgid "Output Gain"
+#~ msgstr "Guadagno uscita"
+
+#~ msgid "Microphone Boost"
+#~ msgstr "Incremento microfono"
+
+#~ msgid "Loopback"
+#~ msgstr "Loopback"
+
+#~ msgid "Diagnostic"
+#~ msgstr "Diagnostica"
+
+#~ msgid "Bass Boost"
+#~ msgstr "Incremento bassi"
+
+#~ msgid "Playback Ports"
+#~ msgstr "Porte riproduzione"
+
+#~ msgid "Input"
+#~ msgstr "Input"
+
+#~ msgid "Record Source"
+#~ msgstr "Sorgente registrazione"
+
+#~ msgid "Monitor Source"
+#~ msgstr "Sorgente monitor"
+
+#~ msgid "Keyboard Beep"
+#~ msgstr "Beep tastiera"
+
+#~ msgid "Simulate Stereo"
+#~ msgstr "Simula stereo"
+
+#~ msgid "Stereo"
+#~ msgstr "Stereo"
+
+#~ msgid "Surround Sound"
+#~ msgstr "Suono surround"
+
+#~ msgid "Microphone Gain"
+#~ msgstr "Guadagno microfono"
+
+#~ msgid "Speaker Source"
+#~ msgstr "Sorgente altoparlante"
+
+#~ msgid "Microphone Source"
+#~ msgstr "Sorgente microfono"
+
+#~ msgid "Jack"
+#~ msgstr "Jack"
+
+# vedi prima per LFE
+#~ msgid "Center / LFE"
+#~ msgstr "Centrale / LFE"
+
+#~ msgid "Stereo Mix"
+#~ msgstr "Mix stereo"
+
+#~ msgid "Mono Mix"
+#~ msgstr "Mix mono"
+
+#~ msgid "Input Mix"
+#~ msgstr "Mix ingresso"
+
+#~ msgid "SPDIF In"
+#~ msgstr "SPDIF in"
+
+#~ msgid "Microphone 1"
+#~ msgstr "Microfono 1"
+
+#~ msgid "Microphone 2"
+#~ msgstr "Microfono 2"
+
+#~ msgid "Digital Out"
+#~ msgstr "Uscita digitale"
+
+#~ msgid "Digital In"
+#~ msgstr "Ingresso digitale"
+
+#~ msgid "HDMI"
+#~ msgstr "HDMI"
+
+#~ msgid "Modem"
+#~ msgstr "Modem"
+
+#~ msgid "Handset"
+#~ msgstr "Auricolare"
+
+#~ msgid "Other"
+#~ msgstr "Altro"
+
+#~ msgid "None"
+#~ msgstr "Nessuno"
+
+#~ msgid "On"
+#~ msgstr "Acceso"
+
+#~ msgid "Off"
+#~ msgstr "Spento"
+
+#~ msgid "Mute"
+#~ msgstr "Escluso"
+
+#~ msgid "Fast"
+#~ msgstr "Veloce"
+
+#~ msgid "Very Low"
+#~ msgstr "Molto lento"
+
+#~ msgid "Low"
+#~ msgstr "Lento"
+
+#~ msgid "Medium"
+#~ msgstr "Medio"
+
+#~ msgid "High"
+#~ msgstr "Alto"
+
+#~ msgid "Very High"
+#~ msgstr "Molto alto"
+
+#~ msgid "Production"
+#~ msgstr "Produzione"
+
+#~ msgid "Front Panel Microphone"
+#~ msgstr "Microfono pannello frontale"
+
+#~ msgid "Front Panel Line In"
+#~ msgstr "Linea in pannello frontale"
+
+#~ msgid "Front Panel Headphones"
+#~ msgstr "Cuffie pannello frontale"
+
+#~ msgid "Front Panel Line Out"
+#~ msgstr "Linea out pannello frontale"
+
+#~ msgid "Green Connector"
+#~ msgstr "Connettore verde"
+
+#~ msgid "Pink Connector"
+#~ msgstr "Connettore rosa"
+
+#~ msgid "Blue Connector"
+#~ msgstr "Connettore blu"
+
+#~ msgid "White Connector"
+#~ msgstr "Connettore bianco"
+
+#~ msgid "Black Connector"
+#~ msgstr "Connettore nero"
+
+#~ msgid "Gray Connector"
+#~ msgstr "Connettore grigio"
+
+#~ msgid "Orange Connector"
+#~ msgstr "Connettore arancione"
+
+#~ msgid "Red Connector"
+#~ msgstr "Connettore rosso"
+
+#~ msgid "Yellow Connector"
+#~ msgstr "Connettore giallo"
+
+#~ msgid "Green Front Panel Connector"
+#~ msgstr "Connettore verde pannello frontale"
+
+#~ msgid "Pink Front Panel Connector"
+#~ msgstr "Connettore rosa pannello frontale"
+
+#~ msgid "Blue Front Panel Connector"
+#~ msgstr "Connettore blu pannello frontale"
+
+#~ msgid "White Front Panel Connector"
+#~ msgstr "Connettore bianco pannello frontale"
+
+#~ msgid "Black Front Panel Connector"
+#~ msgstr "Connettore nero pannello frontale"
+
+#~ msgid "Gray Front Panel Connector"
+#~ msgstr "Connettore grigio pannello frontale"
+
+#~ msgid "Orange Front Panel Connector"
+#~ msgstr "Connettore arancione pannello frontale"
+
+#~ msgid "Red Front Panel Connector"
+#~ msgstr "Connettore rosso pannello frontale"
+
+#~ msgid "Yellow Front Panel Connector"
+#~ msgstr "Connettore giallo pannello frontale"
+
+# int spread; /* copy front to surr/center channels */
+#~ msgid "Spread Output"
+#~ msgstr "Uscita diffusa"
+
+#~ msgid "Downmix"
+#~ msgstr "Downmix"
+
+#~ msgid "Virtual Mixer Input"
+#~ msgstr "Ingresso mixer virtuale"
+
+#~ msgid "Virtual Mixer Output"
+#~ msgstr "Uscita mixer virtuale"
+
+#~ msgid "Virtual Mixer Channels"
+#~ msgstr "Canali mixer virtuale"
+
+#~ msgid "%s %d Function"
+#~ msgstr "Funzione %s %d"
+
+#~ msgid "%s Function"
+#~ msgstr "Funzione %s"
+
#~ msgid "Error reading %d bytes on device '%s'."
#~ msgstr "Errore nel leggere %d byte sul device «%s»."
diff --git a/po/ja.gmo b/po/ja.gmo
index 0d55ed0ea00c689417b5eba6e54a725fd9bda191..ff674f3e9b37735d075e7a55340c5fb8c4672401 100644
Binary files a/po/ja.gmo and b/po/ja.gmo differ
diff --git a/po/ja.po b/po/ja.po
index c760c1aae1eca5a1eb165a9017c5c03476cbff0c..25362134d66387b43d03ba0756dac842af2d13bb 100644
--- a/po/ja.po
+++ b/po/ja.po
@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: gst-plugins-good 0.10.28.2\n"
"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/\n"
-"POT-Creation-Date: 2012-04-12 10:26+0200\n"
+"POT-Creation-Date: 2012-05-13 16:29+0200\n"
"PO-Revision-Date: 2011-08-28 23:59+0900\n"
"Last-Translator: Takeshi Hamasaki <hmatrjp@users.sourceforge.jp>\n"
"Language-Team: Japanese <translation-team-ja@lists.sourceforge.net>\n"
@@ -103,105 +103,6 @@ msgstr ""
msgid "Internal data flow error."
msgstr "内部データフãƒãƒ¼ã‚¨ãƒ©ãƒ¼ã€‚"
-# SUN REVIEWED
-msgid "Volume"
-msgstr "音é‡"
-
-# SUN REVIEWED
-msgid "Bass"
-msgstr "低音"
-
-# SUN REVIEWED
-msgid "Treble"
-msgstr "高音"
-
-# SUN REVIEWED
-msgid "Synth"
-msgstr "シンセ"
-
-# SUN REVIEWED
-msgid "PCM"
-msgstr "PCM"
-
-# SUN REVIEWED
-msgid "Speaker"
-msgstr "スピーカ"
-
-msgid "Line-in"
-msgstr "ライン入力"
-
-# SUN REVIEWED
-msgid "Microphone"
-msgstr "マイクãƒãƒ•ã‚©ãƒ³"
-
-# SUN REVIEWED
-msgid "CD"
-msgstr "CD"
-
-# SUN REVIEWED
-msgid "Mixer"
-msgstr "ミã‚サー"
-
-# SUN REVIEWED
-msgid "PCM-2"
-msgstr "PCM-2"
-
-# SUN REVIEWED
-msgid "Record"
-msgstr "録音"
-
-# SUN REVIEWED
-msgid "In-gain"
-msgstr "入力ゲイン"
-
-# SUN REVIEWED
-msgid "Out-gain"
-msgstr "出力ゲイン"
-
-# SUN REVIEWED
-msgid "Line-1"
-msgstr "ライン 1"
-
-# SUN REVIEWED
-msgid "Line-2"
-msgstr "ライン 2"
-
-# SUN REVIEWED
-msgid "Line-3"
-msgstr "ライン 3"
-
-# SUN REVIEWED
-msgid "Digital-1"
-msgstr "デジタル 1"
-
-# SUN REVIEWED
-msgid "Digital-2"
-msgstr "デジタル 2"
-
-# SUN REVIEWED
-msgid "Digital-3"
-msgstr "デジタル 3"
-
-# SUN REVIEWED
-msgid "Phone-in"
-msgstr "フォン入力"
-
-# SUN REVIEWED
-msgid "Phone-out"
-msgstr "フォン出力"
-
-# SUN REVIEWED
-msgid "Video"
-msgstr "ビデオ"
-
-# SUN REVIEWED
-msgid "Radio"
-msgstr "ラジオ"
-
-# SUN REVIEWED
-msgid "Monitor"
-msgstr "モニター"
-
msgid ""
"Could not open audio device for playback. Device is being used by another "
"application."
@@ -231,323 +132,6 @@ msgstr ""
msgid "Could not open audio device for recording."
msgstr "音声デãƒã‚¤ã‚¹ã‚’録音用ã«é–‹ãã“ã¨ãŒã§ãã¾ã›ã‚“。"
-# SUN REVIEWED
-msgid "Could not open audio device for mixer control handling."
-msgstr "音声デãƒã‚¤ã‚¹ã‚’ミã‚サーコントãƒãƒ¼ãƒ«ç”¨ã«é–‹ãã“ã¨ãŒã§ãã¾ã›ã‚“。"
-
-msgid ""
-"Could not open audio device for mixer control handling. This version of the "
-"Open Sound System is not supported by this element."
-msgstr ""
-"ミã‚サーコントãƒãƒ¼ãƒ«ç”¨ã«ã‚ªãƒ¼ãƒ‡ã‚£ã‚ªãƒ‡ãƒã‚¤ã‚¹ã‚’é–‹ãã“ã¨ãŒã§ãã¾ã›ã‚“ã§ã—ãŸã€‚Open "
-"Sound Systemã®ã“ã®ãƒãƒ¼ã‚¸ãƒ§ãƒ³ã§ã¯ã“ã®è¦ç´ ã«ã‚ˆã£ã¦ã‚µãƒãƒ¼ãƒˆã•ã‚Œã¦ã„ã¾ã›ã‚“。"
-
-msgid "Master"
-msgstr "マスタ"
-
-msgid "Front"
-msgstr "フãƒãƒ³ãƒˆ"
-
-msgid "Rear"
-msgstr "リア"
-
-msgid "Headphones"
-msgstr "ヘッドフォン"
-
-msgid "Center"
-msgstr "センター"
-
-msgid "LFE"
-msgstr "LFE"
-
-msgid "Surround"
-msgstr "サラウンド"
-
-msgid "Side"
-msgstr "サイド"
-
-msgid "Built-in Speaker"
-msgstr "ビルトインスピーカ"
-
-msgid "AUX 1 Out"
-msgstr "AUX 1出力"
-
-msgid "AUX 2 Out"
-msgstr "AUX 2出力"
-
-msgid "AUX Out"
-msgstr "AUX出力"
-
-#, fuzzy
-msgid "3D Depth"
-msgstr "最大深度: "
-
-msgid "3D Center"
-msgstr "3Dセンター"
-
-#, fuzzy
-msgid "3D Enhance"
-msgstr "色を強調ã—ã¦ã„ã¾ã™"
-
-msgid "Telephone"
-msgstr "電話"
-
-msgid "Line Out"
-msgstr "ライン出力"
-
-msgid "Line In"
-msgstr "ライン入力"
-
-msgid "Internal CD"
-msgstr "内蔵CD"
-
-msgid "Video In"
-msgstr "ビデオ入力"
-
-msgid "AUX 1 In"
-msgstr "AUX 1入力"
-
-msgid "AUX 2 In"
-msgstr "AUX 2入力"
-
-msgid "AUX In"
-msgstr "AUX入力"
-
-msgid "Record Gain"
-msgstr "録音ゲイン"
-
-msgid "Output Gain"
-msgstr "出力ゲイン"
-
-msgid "Microphone Boost"
-msgstr "マイクãƒãƒ•ã‚©ãƒ³ãƒ–ースト"
-
-msgid "Loopback"
-msgstr "ループãƒãƒƒã‚¯"
-
-msgid "Diagnostic"
-msgstr "診æ–"
-
-msgid "Bass Boost"
-msgstr "低音ブースト"
-
-msgid "Playback Ports"
-msgstr "プレイãƒãƒƒã‚¯ãƒãƒ¼ãƒˆ"
-
-msgid "Input"
-msgstr "入力"
-
-msgid "Record Source"
-msgstr "録音ソース"
-
-msgid "Monitor Source"
-msgstr "モニターソース"
-
-msgid "Keyboard Beep"
-msgstr "ã‚ーボードビープ音"
-
-#, fuzzy
-msgid "Simulate Stereo"
-msgstr "彫金を表ç¾ã—ã¾ã™"
-
-msgid "Stereo"
-msgstr "ステレオ"
-
-msgid "Surround Sound"
-msgstr "サラウンドサウンド"
-
-msgid "Microphone Gain"
-msgstr "マイクãƒãƒ•ã‚©ãƒ³ã‚²ã‚¤ãƒ³"
-
-msgid "Speaker Source"
-msgstr "スピーカソース"
-
-msgid "Microphone Source"
-msgstr "マイクãƒãƒ•ã‚©ãƒ³ã‚½ãƒ¼ã‚¹"
-
-msgid "Jack"
-msgstr "ジャック"
-
-msgid "Center / LFE"
-msgstr "センター / LFE"
-
-msgid "Stereo Mix"
-msgstr "ステレオミックス"
-
-msgid "Mono Mix"
-msgstr "モノラルミックス"
-
-msgid "Input Mix"
-msgstr "入力ミックス"
-
-msgid "SPDIF In"
-msgstr "SPDIF入力"
-
-msgid "SPDIF Out"
-msgstr "SPDIF出力"
-
-msgid "Microphone 1"
-msgstr "マイクãƒãƒ•ã‚©ãƒ³1"
-
-msgid "Microphone 2"
-msgstr "マイクãƒãƒ•ã‚©ãƒ³2"
-
-msgid "Digital Out"
-msgstr "デジタル出力"
-
-msgid "Digital In"
-msgstr "デジタル入力"
-
-msgid "HDMI"
-msgstr "HDMI"
-
-msgid "Modem"
-msgstr "モデム"
-
-msgid "Handset"
-msgstr "ヘッドセット"
-
-msgid "Other"
-msgstr "ãã®ä»–"
-
-msgid "None"
-msgstr "ãªã—"
-
-msgid "On"
-msgstr "オン"
-
-msgid "Off"
-msgstr "オフ"
-
-msgid "Mute"
-msgstr "ミュート"
-
-#, fuzzy
-msgid "Fast"
-msgstr "速ã„"
-
-#. TRANSLATORS: "Very Low" is a quality setting here
-#, fuzzy
-msgid "Very Low"
-msgstr "低å“ä½"
-
-#. TRANSLATORS: "Low" is a quality setting here
-#, fuzzy
-msgid "Low"
-msgstr "低音"
-
-#. TRANSLATORS: "Medium" is a quality setting here
-#, fuzzy
-msgid "Medium"
-msgstr "ä¸éŸ³"
-
-#. TRANSLATORS: "High" is a quality setting here
-#, fuzzy
-msgid "High"
-msgstr "高音"
-
-#. TRANSLATORS: "Very High" is a quality setting here
-#, fuzzy
-msgid "Very High"
-msgstr "高å“ä½"
-
-#. TRANSLATORS: "Production" is a quality setting here
-#, fuzzy
-msgid "Production"
-msgstr "プãƒãƒ€ã‚¯ã‚·ãƒ§ãƒ³"
-
-msgid "Front Panel Microphone"
-msgstr "フãƒãƒ³ãƒˆãƒ‘ãƒãƒ«ã®ãƒžã‚¤ã‚¯ãƒãƒ•ã‚©ãƒ³"
-
-msgid "Front Panel Line In"
-msgstr "フãƒãƒ³ãƒˆãƒ‘ãƒãƒ«ã®ãƒ©ã‚¤ãƒ³å…¥åŠ›"
-
-msgid "Front Panel Headphones"
-msgstr "フãƒãƒ³ãƒˆãƒ‘ãƒãƒ«ã®ãƒ˜ãƒƒãƒ‰ãƒ•ã‚©ãƒ³"
-
-msgid "Front Panel Line Out"
-msgstr "フãƒãƒ³ãƒˆãƒ‘ãƒãƒ«ã®ãƒ©ã‚¤ãƒ³å‡ºåŠ›"
-
-msgid "Green Connector"
-msgstr "緑色コãƒã‚¯ã‚¿"
-
-msgid "Pink Connector"
-msgstr "ピンク色コãƒã‚¯ã‚¿"
-
-msgid "Blue Connector"
-msgstr "é’色コãƒã‚¯ã‚¿"
-
-msgid "White Connector"
-msgstr "白色コãƒã‚¯ã‚¿"
-
-msgid "Black Connector"
-msgstr "黒色コãƒã‚¯ã‚¿"
-
-msgid "Gray Connector"
-msgstr "グレー色コãƒã‚¯ã‚¿"
-
-msgid "Orange Connector"
-msgstr "オレンジ色コãƒã‚¯ã‚¿"
-
-msgid "Red Connector"
-msgstr "赤色コãƒã‚¯ã‚¿"
-
-msgid "Yellow Connector"
-msgstr "黄色コãƒã‚¯ã‚¿"
-
-msgid "Green Front Panel Connector"
-msgstr ""
-
-msgid "Pink Front Panel Connector"
-msgstr ""
-
-msgid "Blue Front Panel Connector"
-msgstr ""
-
-msgid "White Front Panel Connector"
-msgstr ""
-
-msgid "Black Front Panel Connector"
-msgstr ""
-
-msgid "Gray Front Panel Connector"
-msgstr ""
-
-msgid "Orange Front Panel Connector"
-msgstr ""
-
-msgid "Red Front Panel Connector"
-msgstr ""
-
-msgid "Yellow Front Panel Connector"
-msgstr ""
-
-#, fuzzy
-msgid "Spread Output"
-msgstr "æƒ…å ±å‡ºåŠ›:\n"
-
-msgid "Downmix"
-msgstr "ダウンミックス"
-
-msgid "Virtual Mixer Input"
-msgstr "仮想ミã‚サー入力"
-
-msgid "Virtual Mixer Output"
-msgstr "仮想ミã‚サー出力"
-
-msgid "Virtual Mixer Channels"
-msgstr "仮想ミã‚サーãƒãƒ£ãƒ³ãƒãƒ«"
-
-#. TRANSLATORS: name + number of a volume mixer control
-#, fuzzy, c-format
-msgid "%s %d Function"
-msgstr "機能"
-
-#. TRANSLATORS: name of a volume mixer control
-#, fuzzy, c-format
-msgid "%s Function"
-msgstr "機能"
-
msgid ""
"Could not open audio device for playback. This version of the Open Sound "
"System is not supported by this element."
@@ -567,13 +151,36 @@ msgstr "ã“ã®ã‚ªãƒ¼ãƒ‡ã‚£ã‚ªãƒ‡ãƒã‚¤ã‚¹ã«ã‚ˆã£ã¦éŒ²éŸ³ã¯ã‚µãƒãƒ¼ãƒˆã•ã‚Œ
msgid "Error recording from audio device."
msgstr "オーディオデãƒã‚¤ã‚¹ã‹ã‚‰ã®éŒ²éŸ³æ™‚ã«ã‚¨ãƒ©ãƒ¼ãŒç™ºç”Ÿã—ã¾ã—ãŸã€‚"
+# SUN REVIEWED
+msgid "Volume"
+msgstr "音é‡"
+
# SUN REVIEWED
msgid "Gain"
msgstr "ゲイン"
+# SUN REVIEWED
+msgid "Monitor"
+msgstr "モニター"
+
+msgid "Built-in Speaker"
+msgstr "ビルトインスピーカ"
+
msgid "Headphone"
msgstr "ヘッドフォン"
+msgid "Line Out"
+msgstr "ライン出力"
+
+msgid "SPDIF Out"
+msgstr "SPDIF出力"
+
+msgid "AUX 1 Out"
+msgstr "AUX 1出力"
+
+msgid "AUX 2 Out"
+msgstr "AUX 2出力"
+
#, c-format
msgid "Error reading %d bytes from device '%s'."
msgstr "デãƒã‚¤ã‚¹ %2$s ã‹ã‚‰ã€€%1$d ãƒã‚¤ãƒˆèªã¿è¾¼ã¿æ™‚ã«ã‚¨ãƒ©ãƒ¼ãŒç™ºç”Ÿã—ã¾ã—ãŸã€‚"
@@ -762,6 +369,365 @@ msgstr "実行時ã®è§£åƒåº¦å¤‰æ›´ã¯ã‚µãƒãƒ¼ãƒˆã•ã‚Œã¦ã„ã¾ã›ã‚“。"
msgid "Cannot operate without a clock"
msgstr "クãƒãƒƒã‚¯ãªã—ã§ã¯å‹•ä½œã§ãã¾ã›ã‚“。"
+# SUN REVIEWED
+#~ msgid "Bass"
+#~ msgstr "低音"
+
+# SUN REVIEWED
+#~ msgid "Treble"
+#~ msgstr "高音"
+
+# SUN REVIEWED
+#~ msgid "Synth"
+#~ msgstr "シンセ"
+
+# SUN REVIEWED
+#~ msgid "PCM"
+#~ msgstr "PCM"
+
+# SUN REVIEWED
+#~ msgid "Speaker"
+#~ msgstr "スピーカ"
+
+#~ msgid "Line-in"
+#~ msgstr "ライン入力"
+
+# SUN REVIEWED
+#~ msgid "Microphone"
+#~ msgstr "マイクãƒãƒ•ã‚©ãƒ³"
+
+# SUN REVIEWED
+#~ msgid "CD"
+#~ msgstr "CD"
+
+# SUN REVIEWED
+#~ msgid "Mixer"
+#~ msgstr "ミã‚サー"
+
+# SUN REVIEWED
+#~ msgid "PCM-2"
+#~ msgstr "PCM-2"
+
+# SUN REVIEWED
+#~ msgid "Record"
+#~ msgstr "録音"
+
+# SUN REVIEWED
+#~ msgid "In-gain"
+#~ msgstr "入力ゲイン"
+
+# SUN REVIEWED
+#~ msgid "Out-gain"
+#~ msgstr "出力ゲイン"
+
+# SUN REVIEWED
+#~ msgid "Line-1"
+#~ msgstr "ライン 1"
+
+# SUN REVIEWED
+#~ msgid "Line-2"
+#~ msgstr "ライン 2"
+
+# SUN REVIEWED
+#~ msgid "Line-3"
+#~ msgstr "ライン 3"
+
+# SUN REVIEWED
+#~ msgid "Digital-1"
+#~ msgstr "デジタル 1"
+
+# SUN REVIEWED
+#~ msgid "Digital-2"
+#~ msgstr "デジタル 2"
+
+# SUN REVIEWED
+#~ msgid "Digital-3"
+#~ msgstr "デジタル 3"
+
+# SUN REVIEWED
+#~ msgid "Phone-in"
+#~ msgstr "フォン入力"
+
+# SUN REVIEWED
+#~ msgid "Phone-out"
+#~ msgstr "フォン出力"
+
+# SUN REVIEWED
+#~ msgid "Video"
+#~ msgstr "ビデオ"
+
+# SUN REVIEWED
+#~ msgid "Radio"
+#~ msgstr "ラジオ"
+
+# SUN REVIEWED
+#~ msgid "Could not open audio device for mixer control handling."
+#~ msgstr "音声デãƒã‚¤ã‚¹ã‚’ミã‚サーコントãƒãƒ¼ãƒ«ç”¨ã«é–‹ãã“ã¨ãŒã§ãã¾ã›ã‚“。"
+
+#~ msgid ""
+#~ "Could not open audio device for mixer control handling. This version of "
+#~ "the Open Sound System is not supported by this element."
+#~ msgstr ""
+#~ "ミã‚サーコントãƒãƒ¼ãƒ«ç”¨ã«ã‚ªãƒ¼ãƒ‡ã‚£ã‚ªãƒ‡ãƒã‚¤ã‚¹ã‚’é–‹ãã“ã¨ãŒã§ãã¾ã›ã‚“ã§ã—ãŸã€‚"
+#~ "Open Sound Systemã®ã“ã®ãƒãƒ¼ã‚¸ãƒ§ãƒ³ã§ã¯ã“ã®è¦ç´ ã«ã‚ˆã£ã¦ã‚µãƒãƒ¼ãƒˆã•ã‚Œã¦ã„ã¾ã›"
+#~ "ん。"
+
+#~ msgid "Master"
+#~ msgstr "マスタ"
+
+#~ msgid "Front"
+#~ msgstr "フãƒãƒ³ãƒˆ"
+
+#~ msgid "Rear"
+#~ msgstr "リア"
+
+#~ msgid "Headphones"
+#~ msgstr "ヘッドフォン"
+
+#~ msgid "Center"
+#~ msgstr "センター"
+
+#~ msgid "LFE"
+#~ msgstr "LFE"
+
+#~ msgid "Surround"
+#~ msgstr "サラウンド"
+
+#~ msgid "Side"
+#~ msgstr "サイド"
+
+#~ msgid "AUX Out"
+#~ msgstr "AUX出力"
+
+#, fuzzy
+#~ msgid "3D Depth"
+#~ msgstr "最大深度: "
+
+#~ msgid "3D Center"
+#~ msgstr "3Dセンター"
+
+#, fuzzy
+#~ msgid "3D Enhance"
+#~ msgstr "色を強調ã—ã¦ã„ã¾ã™"
+
+#~ msgid "Telephone"
+#~ msgstr "電話"
+
+#~ msgid "Line In"
+#~ msgstr "ライン入力"
+
+#~ msgid "Internal CD"
+#~ msgstr "内蔵CD"
+
+#~ msgid "Video In"
+#~ msgstr "ビデオ入力"
+
+#~ msgid "AUX 1 In"
+#~ msgstr "AUX 1入力"
+
+#~ msgid "AUX 2 In"
+#~ msgstr "AUX 2入力"
+
+#~ msgid "AUX In"
+#~ msgstr "AUX入力"
+
+#~ msgid "Record Gain"
+#~ msgstr "録音ゲイン"
+
+#~ msgid "Output Gain"
+#~ msgstr "出力ゲイン"
+
+#~ msgid "Microphone Boost"
+#~ msgstr "マイクãƒãƒ•ã‚©ãƒ³ãƒ–ースト"
+
+#~ msgid "Loopback"
+#~ msgstr "ループãƒãƒƒã‚¯"
+
+#~ msgid "Diagnostic"
+#~ msgstr "診æ–"
+
+#~ msgid "Bass Boost"
+#~ msgstr "低音ブースト"
+
+#~ msgid "Playback Ports"
+#~ msgstr "プレイãƒãƒƒã‚¯ãƒãƒ¼ãƒˆ"
+
+#~ msgid "Input"
+#~ msgstr "入力"
+
+#~ msgid "Record Source"
+#~ msgstr "録音ソース"
+
+#~ msgid "Monitor Source"
+#~ msgstr "モニターソース"
+
+#~ msgid "Keyboard Beep"
+#~ msgstr "ã‚ーボードビープ音"
+
+#, fuzzy
+#~ msgid "Simulate Stereo"
+#~ msgstr "彫金を表ç¾ã—ã¾ã™"
+
+#~ msgid "Stereo"
+#~ msgstr "ステレオ"
+
+#~ msgid "Surround Sound"
+#~ msgstr "サラウンドサウンド"
+
+#~ msgid "Microphone Gain"
+#~ msgstr "マイクãƒãƒ•ã‚©ãƒ³ã‚²ã‚¤ãƒ³"
+
+#~ msgid "Speaker Source"
+#~ msgstr "スピーカソース"
+
+#~ msgid "Microphone Source"
+#~ msgstr "マイクãƒãƒ•ã‚©ãƒ³ã‚½ãƒ¼ã‚¹"
+
+#~ msgid "Jack"
+#~ msgstr "ジャック"
+
+#~ msgid "Center / LFE"
+#~ msgstr "センター / LFE"
+
+#~ msgid "Stereo Mix"
+#~ msgstr "ステレオミックス"
+
+#~ msgid "Mono Mix"
+#~ msgstr "モノラルミックス"
+
+#~ msgid "Input Mix"
+#~ msgstr "入力ミックス"
+
+#~ msgid "SPDIF In"
+#~ msgstr "SPDIF入力"
+
+#~ msgid "Microphone 1"
+#~ msgstr "マイクãƒãƒ•ã‚©ãƒ³1"
+
+#~ msgid "Microphone 2"
+#~ msgstr "マイクãƒãƒ•ã‚©ãƒ³2"
+
+#~ msgid "Digital Out"
+#~ msgstr "デジタル出力"
+
+#~ msgid "Digital In"
+#~ msgstr "デジタル入力"
+
+#~ msgid "HDMI"
+#~ msgstr "HDMI"
+
+#~ msgid "Modem"
+#~ msgstr "モデム"
+
+#~ msgid "Handset"
+#~ msgstr "ヘッドセット"
+
+#~ msgid "Other"
+#~ msgstr "ãã®ä»–"
+
+#~ msgid "None"
+#~ msgstr "ãªã—"
+
+#~ msgid "On"
+#~ msgstr "オン"
+
+#~ msgid "Off"
+#~ msgstr "オフ"
+
+#~ msgid "Mute"
+#~ msgstr "ミュート"
+
+#, fuzzy
+#~ msgid "Fast"
+#~ msgstr "速ã„"
+
+#, fuzzy
+#~ msgid "Very Low"
+#~ msgstr "低å“ä½"
+
+#, fuzzy
+#~ msgid "Low"
+#~ msgstr "低音"
+
+#, fuzzy
+#~ msgid "Medium"
+#~ msgstr "ä¸éŸ³"
+
+#, fuzzy
+#~ msgid "High"
+#~ msgstr "高音"
+
+#, fuzzy
+#~ msgid "Very High"
+#~ msgstr "高å“ä½"
+
+#, fuzzy
+#~ msgid "Production"
+#~ msgstr "プãƒãƒ€ã‚¯ã‚·ãƒ§ãƒ³"
+
+#~ msgid "Front Panel Microphone"
+#~ msgstr "フãƒãƒ³ãƒˆãƒ‘ãƒãƒ«ã®ãƒžã‚¤ã‚¯ãƒãƒ•ã‚©ãƒ³"
+
+#~ msgid "Front Panel Line In"
+#~ msgstr "フãƒãƒ³ãƒˆãƒ‘ãƒãƒ«ã®ãƒ©ã‚¤ãƒ³å…¥åŠ›"
+
+#~ msgid "Front Panel Headphones"
+#~ msgstr "フãƒãƒ³ãƒˆãƒ‘ãƒãƒ«ã®ãƒ˜ãƒƒãƒ‰ãƒ•ã‚©ãƒ³"
+
+#~ msgid "Front Panel Line Out"
+#~ msgstr "フãƒãƒ³ãƒˆãƒ‘ãƒãƒ«ã®ãƒ©ã‚¤ãƒ³å‡ºåŠ›"
+
+#~ msgid "Green Connector"
+#~ msgstr "緑色コãƒã‚¯ã‚¿"
+
+#~ msgid "Pink Connector"
+#~ msgstr "ピンク色コãƒã‚¯ã‚¿"
+
+#~ msgid "Blue Connector"
+#~ msgstr "é’色コãƒã‚¯ã‚¿"
+
+#~ msgid "White Connector"
+#~ msgstr "白色コãƒã‚¯ã‚¿"
+
+#~ msgid "Black Connector"
+#~ msgstr "黒色コãƒã‚¯ã‚¿"
+
+#~ msgid "Gray Connector"
+#~ msgstr "グレー色コãƒã‚¯ã‚¿"
+
+#~ msgid "Orange Connector"
+#~ msgstr "オレンジ色コãƒã‚¯ã‚¿"
+
+#~ msgid "Red Connector"
+#~ msgstr "赤色コãƒã‚¯ã‚¿"
+
+#~ msgid "Yellow Connector"
+#~ msgstr "黄色コãƒã‚¯ã‚¿"
+
+#, fuzzy
+#~ msgid "Spread Output"
+#~ msgstr "æƒ…å ±å‡ºåŠ›:\n"
+
+#~ msgid "Downmix"
+#~ msgstr "ダウンミックス"
+
+#~ msgid "Virtual Mixer Input"
+#~ msgstr "仮想ミã‚サー入力"
+
+#~ msgid "Virtual Mixer Output"
+#~ msgstr "仮想ミã‚サー出力"
+
+#~ msgid "Virtual Mixer Channels"
+#~ msgstr "仮想ミã‚サーãƒãƒ£ãƒ³ãƒãƒ«"
+
+#, fuzzy
+#~ msgid "%s %d Function"
+#~ msgstr "機能"
+
+#, fuzzy
+#~ msgid "%s Function"
+#~ msgstr "機能"
+
#~ msgid "Could not establish connection to sound server"
#~ msgstr "サウンドサーãƒãƒ¼ã¸ã®æŽ¥ç¶šã«å¤±æ•—ã—ã¾ã—ãŸ"
diff --git a/po/lt.gmo b/po/lt.gmo
index f99d20b9fe39f4fff11d4f45e0ef7a8a80ca9bb0..169c33fcf9cdad049cef42ef9aca8274993bc3b1 100644
Binary files a/po/lt.gmo and b/po/lt.gmo differ
diff --git a/po/lt.po b/po/lt.po
index ffe940b206e859bea5aebdac0b354acba8f2d422..768a479cb0de29dfc239d52950580811f0f7dcf7 100644
--- a/po/lt.po
+++ b/po/lt.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: gst-plugins-good 0.10.23.2\n"
"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/\n"
-"POT-Creation-Date: 2012-04-12 10:26+0200\n"
+"POT-Creation-Date: 2012-05-13 16:29+0200\n"
"PO-Revision-Date: 2010-07-16 19:34+0300\n"
"Last-Translator: Žygimantas BeruÄka <uid0@akl.lt>\n"
"Language-Team: Lithuanian <komp_lt@konferencijos.lt>\n"
@@ -100,81 +100,6 @@ msgstr ""
msgid "Internal data flow error."
msgstr "Vidinė duomenų srauto klaida."
-msgid "Volume"
-msgstr "Garsumas"
-
-msgid "Bass"
-msgstr "Žemi dažniai"
-
-msgid "Treble"
-msgstr "Aukšti dažniai"
-
-msgid "Synth"
-msgstr "Sintezatorius"
-
-msgid "PCM"
-msgstr "PCM"
-
-msgid "Speaker"
-msgstr "Garsiakalbiai"
-
-msgid "Line-in"
-msgstr "Įvedimas"
-
-msgid "Microphone"
-msgstr "Mikrofonas"
-
-msgid "CD"
-msgstr "CD"
-
-msgid "Mixer"
-msgstr "Maišiklis"
-
-msgid "PCM-2"
-msgstr "PCM-2"
-
-msgid "Record"
-msgstr "Įrašymas"
-
-msgid "In-gain"
-msgstr "Garsinimo ribose"
-
-msgid "Out-gain"
-msgstr "Už garsinimo ribų"
-
-msgid "Line-1"
-msgstr "Linija-1"
-
-msgid "Line-2"
-msgstr "Linija-2"
-
-msgid "Line-3"
-msgstr "Linija-3"
-
-msgid "Digital-1"
-msgstr "Skaitmeninis-1"
-
-msgid "Digital-2"
-msgstr "Skaitmeninis-2"
-
-msgid "Digital-3"
-msgstr "Skaitmeninis-3"
-
-msgid "Phone-in"
-msgstr "Telefonas-įv"
-
-msgid "Phone-out"
-msgstr "Telefonas-išv"
-
-msgid "Video"
-msgstr "Video"
-
-msgid "Radio"
-msgstr "Radijas"
-
-msgid "Monitor"
-msgstr "Monitorius"
-
msgid ""
"Could not open audio device for playback. Device is being used by another "
"application."
@@ -201,311 +126,6 @@ msgstr ""
msgid "Could not open audio device for recording."
msgstr "Nepavyko atverti garso įrenginio įrašymui."
-msgid "Could not open audio device for mixer control handling."
-msgstr "Nepavyko atverti garso įrenginio maišiklio valdymo apdorojimui."
-
-msgid ""
-"Could not open audio device for mixer control handling. This version of the "
-"Open Sound System is not supported by this element."
-msgstr ""
-"Nepavyko atverti garso įrenginio maišiklio valdymo apdorojimui. Šis "
-"elementas nepalaiko Å¡ios Open Sound System versijos."
-
-msgid "Master"
-msgstr "Pagrindinis"
-
-msgid "Front"
-msgstr "Priekinis"
-
-msgid "Rear"
-msgstr "Galinis"
-
-msgid "Headphones"
-msgstr "AusinÄ—s"
-
-msgid "Center"
-msgstr "Vidurinis"
-
-msgid "LFE"
-msgstr "LFE"
-
-msgid "Surround"
-msgstr "Supantis"
-
-msgid "Side"
-msgstr "Å oninis"
-
-msgid "Built-in Speaker"
-msgstr "Integruotas garsiakalbis"
-
-msgid "AUX 1 Out"
-msgstr "AUX 1 išvestis"
-
-msgid "AUX 2 Out"
-msgstr "AUX 2 išvestis"
-
-msgid "AUX Out"
-msgstr "AUX išvestis"
-
-msgid "3D Depth"
-msgstr "3D giluminis"
-
-msgid "3D Center"
-msgstr "3D vidurinis"
-
-msgid "3D Enhance"
-msgstr "3D pakeltas"
-
-msgid "Telephone"
-msgstr "Telefonas"
-
-msgid "Line Out"
-msgstr "IÅ¡einanti linija"
-
-msgid "Line In"
-msgstr "Įeinanti linija"
-
-msgid "Internal CD"
-msgstr "Vidinis CD"
-
-msgid "Video In"
-msgstr "Vaizdo įvestis"
-
-msgid "AUX 1 In"
-msgstr "AUX 1 įvestis"
-
-msgid "AUX 2 In"
-msgstr "AUX 2 įvestis"
-
-msgid "AUX In"
-msgstr "AUX įvestis"
-
-msgid "Record Gain"
-msgstr "Įrašymo garsinimas"
-
-msgid "Output Gain"
-msgstr "IÅ¡vesties garsinimas"
-
-msgid "Microphone Boost"
-msgstr "Mikrofono pagarsinimas"
-
-msgid "Loopback"
-msgstr "Perduoti ratu"
-
-msgid "Diagnostic"
-msgstr "Diagnostika"
-
-msgid "Bass Boost"
-msgstr "Žemųjų dažnių sustiprinimas"
-
-msgid "Playback Ports"
-msgstr "Grojimo prievadai"
-
-msgid "Input"
-msgstr "Įvestis"
-
-msgid "Record Source"
-msgstr "Įrašymo šaltinis"
-
-msgid "Monitor Source"
-msgstr "Monitoriaus Å¡altinis"
-
-msgid "Keyboard Beep"
-msgstr "Klaviatūros pypsėjimas"
-
-msgid "Simulate Stereo"
-msgstr "Imituoti stereo"
-
-msgid "Stereo"
-msgstr "Stereo"
-
-msgid "Surround Sound"
-msgstr "Erdvinis garsas"
-
-msgid "Microphone Gain"
-msgstr "Mikrofono garsinimas"
-
-msgid "Speaker Source"
-msgstr "Garsiakalbio Å¡altinis"
-
-msgid "Microphone Source"
-msgstr "Mikrofono Å¡altinis"
-
-msgid "Jack"
-msgstr "Jack"
-
-msgid "Center / LFE"
-msgstr "Centras / LFE"
-
-msgid "Stereo Mix"
-msgstr "Stereo maiša"
-
-msgid "Mono Mix"
-msgstr "Mono maiša"
-
-msgid "Input Mix"
-msgstr "Įvesties maiša"
-
-msgid "SPDIF In"
-msgstr "SPDIF įvestis"
-
-msgid "SPDIF Out"
-msgstr "SPDIF išvestis"
-
-msgid "Microphone 1"
-msgstr "Mikrofonas 1"
-
-msgid "Microphone 2"
-msgstr "Mikrofonas 2"
-
-msgid "Digital Out"
-msgstr "Skaitmeninė išvestis"
-
-msgid "Digital In"
-msgstr "Skaitmeninė įvestis"
-
-msgid "HDMI"
-msgstr "HDMI"
-
-msgid "Modem"
-msgstr "Modemas"
-
-msgid "Handset"
-msgstr "Ragelis"
-
-msgid "Other"
-msgstr "Kita"
-
-msgid "None"
-msgstr "NÄ—ra"
-
-msgid "On"
-msgstr "Įjungta"
-
-msgid "Off"
-msgstr "IÅ¡jungta"
-
-msgid "Mute"
-msgstr "Nutildyta"
-
-msgid "Fast"
-msgstr "Greitas"
-
-#. TRANSLATORS: "Very Low" is a quality setting here
-msgid "Very Low"
-msgstr "Labai žema"
-
-#. TRANSLATORS: "Low" is a quality setting here
-msgid "Low"
-msgstr "Žema"
-
-#. TRANSLATORS: "Medium" is a quality setting here
-msgid "Medium"
-msgstr "VidutinÄ—"
-
-#. TRANSLATORS: "High" is a quality setting here
-msgid "High"
-msgstr "Aukšta"
-
-#. TRANSLATORS: "Very High" is a quality setting here
-msgid "Very High"
-msgstr "Labai aukšta"
-
-#. TRANSLATORS: "Production" is a quality setting here
-msgid "Production"
-msgstr "Sukūrimo"
-
-msgid "Front Panel Microphone"
-msgstr "Priekinio skydelio mikrofonas"
-
-msgid "Front Panel Line In"
-msgstr "Priekinio skydelio įeinanti linija"
-
-msgid "Front Panel Headphones"
-msgstr "Priekinio skydelio ausinÄ—s"
-
-msgid "Front Panel Line Out"
-msgstr "Priekinio skydelio išeinanti linija"
-
-msgid "Green Connector"
-msgstr "Žalias kištukas"
-
-msgid "Pink Connector"
-msgstr "Rožinis kištukas"
-
-msgid "Blue Connector"
-msgstr "Mėlynas kištukas"
-
-msgid "White Connector"
-msgstr "Baltas kištukas"
-
-msgid "Black Connector"
-msgstr "Juodas kištukas"
-
-msgid "Gray Connector"
-msgstr "Pilkas kištukas"
-
-msgid "Orange Connector"
-msgstr "Oranžinis kištukas"
-
-msgid "Red Connector"
-msgstr "Raudonas kištukas"
-
-msgid "Yellow Connector"
-msgstr "Geltonas kištukas"
-
-msgid "Green Front Panel Connector"
-msgstr "Žalias priekinio skydelio kištukas"
-
-msgid "Pink Front Panel Connector"
-msgstr "Rožinis priekinio skydelio kištukas"
-
-msgid "Blue Front Panel Connector"
-msgstr "Mėlynas priekinio skydelio kištukas"
-
-msgid "White Front Panel Connector"
-msgstr "Baltas priekinio skydelio kištukas"
-
-msgid "Black Front Panel Connector"
-msgstr "Juodas priekinio skydelio kištukas"
-
-msgid "Gray Front Panel Connector"
-msgstr "Pilkas priekinio skydelio kištukas"
-
-msgid "Orange Front Panel Connector"
-msgstr "Oranžinis priekinio skydelio kištukas"
-
-msgid "Red Front Panel Connector"
-msgstr "Raudonas priekinio skydelio kištukas"
-
-msgid "Yellow Front Panel Connector"
-msgstr "Geltonas priekinio skydelio kištukas"
-
-msgid "Spread Output"
-msgstr "Skleisti išvestį"
-
-msgid "Downmix"
-msgstr "Sumaišyti"
-
-msgid "Virtual Mixer Input"
-msgstr "Virtualaus maišiklio įvestis"
-
-msgid "Virtual Mixer Output"
-msgstr "Virtualaus maišiklio išvestis"
-
-msgid "Virtual Mixer Channels"
-msgstr "Virtualaus maišiklio kanalai"
-
-#. TRANSLATORS: name + number of a volume mixer control
-#, c-format
-msgid "%s %d Function"
-msgstr "%s %d funkcija"
-
-#. TRANSLATORS: name of a volume mixer control
-#, c-format
-msgid "%s Function"
-msgstr "%s funkcija"
-
msgid ""
"Could not open audio device for playback. This version of the Open Sound "
"System is not supported by this element."
@@ -525,12 +145,33 @@ msgstr "Šis garso įrenginys nepalaiko grojimo."
msgid "Error recording from audio device."
msgstr "Klaida įrašant iš garso įrenginio."
+msgid "Volume"
+msgstr "Garsumas"
+
msgid "Gain"
msgstr "Garsinimas"
+msgid "Monitor"
+msgstr "Monitorius"
+
+msgid "Built-in Speaker"
+msgstr "Integruotas garsiakalbis"
+
msgid "Headphone"
msgstr "AusinÄ—s"
+msgid "Line Out"
+msgstr "IÅ¡einanti linija"
+
+msgid "SPDIF Out"
+msgstr "SPDIF išvestis"
+
+msgid "AUX 1 Out"
+msgstr "AUX 1 išvestis"
+
+msgid "AUX 2 Out"
+msgstr "AUX 2 išvestis"
+
#, c-format
msgid "Error reading %d bytes from device '%s'."
msgstr "Klaida skaitant %d baitus (-ų) iš įrenginio „%s“."
@@ -705,6 +346,355 @@ msgstr "GalimybÄ—s keisti skiriamÄ…jÄ… gebÄ… operacijos vykdymo metu dar nÄ—ra."
msgid "Cannot operate without a clock"
msgstr "Negali veikti be laikrodžio"
+#~ msgid "Bass"
+#~ msgstr "Žemi dažniai"
+
+#~ msgid "Treble"
+#~ msgstr "Aukšti dažniai"
+
+#~ msgid "Synth"
+#~ msgstr "Sintezatorius"
+
+#~ msgid "PCM"
+#~ msgstr "PCM"
+
+#~ msgid "Speaker"
+#~ msgstr "Garsiakalbiai"
+
+#~ msgid "Line-in"
+#~ msgstr "Įvedimas"
+
+#~ msgid "Microphone"
+#~ msgstr "Mikrofonas"
+
+#~ msgid "CD"
+#~ msgstr "CD"
+
+#~ msgid "Mixer"
+#~ msgstr "Maišiklis"
+
+#~ msgid "PCM-2"
+#~ msgstr "PCM-2"
+
+#~ msgid "Record"
+#~ msgstr "Įrašymas"
+
+#~ msgid "In-gain"
+#~ msgstr "Garsinimo ribose"
+
+#~ msgid "Out-gain"
+#~ msgstr "Už garsinimo ribų"
+
+#~ msgid "Line-1"
+#~ msgstr "Linija-1"
+
+#~ msgid "Line-2"
+#~ msgstr "Linija-2"
+
+#~ msgid "Line-3"
+#~ msgstr "Linija-3"
+
+#~ msgid "Digital-1"
+#~ msgstr "Skaitmeninis-1"
+
+#~ msgid "Digital-2"
+#~ msgstr "Skaitmeninis-2"
+
+#~ msgid "Digital-3"
+#~ msgstr "Skaitmeninis-3"
+
+#~ msgid "Phone-in"
+#~ msgstr "Telefonas-įv"
+
+#~ msgid "Phone-out"
+#~ msgstr "Telefonas-išv"
+
+#~ msgid "Video"
+#~ msgstr "Video"
+
+#~ msgid "Radio"
+#~ msgstr "Radijas"
+
+#~ msgid "Could not open audio device for mixer control handling."
+#~ msgstr "Nepavyko atverti garso įrenginio maišiklio valdymo apdorojimui."
+
+#~ msgid ""
+#~ "Could not open audio device for mixer control handling. This version of "
+#~ "the Open Sound System is not supported by this element."
+#~ msgstr ""
+#~ "Nepavyko atverti garso įrenginio maišiklio valdymo apdorojimui. Šis "
+#~ "elementas nepalaiko Å¡ios Open Sound System versijos."
+
+#~ msgid "Master"
+#~ msgstr "Pagrindinis"
+
+#~ msgid "Front"
+#~ msgstr "Priekinis"
+
+#~ msgid "Rear"
+#~ msgstr "Galinis"
+
+#~ msgid "Headphones"
+#~ msgstr "AusinÄ—s"
+
+#~ msgid "Center"
+#~ msgstr "Vidurinis"
+
+#~ msgid "LFE"
+#~ msgstr "LFE"
+
+#~ msgid "Surround"
+#~ msgstr "Supantis"
+
+#~ msgid "Side"
+#~ msgstr "Å oninis"
+
+#~ msgid "AUX Out"
+#~ msgstr "AUX išvestis"
+
+#~ msgid "3D Depth"
+#~ msgstr "3D giluminis"
+
+#~ msgid "3D Center"
+#~ msgstr "3D vidurinis"
+
+#~ msgid "3D Enhance"
+#~ msgstr "3D pakeltas"
+
+#~ msgid "Telephone"
+#~ msgstr "Telefonas"
+
+#~ msgid "Line In"
+#~ msgstr "Įeinanti linija"
+
+#~ msgid "Internal CD"
+#~ msgstr "Vidinis CD"
+
+#~ msgid "Video In"
+#~ msgstr "Vaizdo įvestis"
+
+#~ msgid "AUX 1 In"
+#~ msgstr "AUX 1 įvestis"
+
+#~ msgid "AUX 2 In"
+#~ msgstr "AUX 2 įvestis"
+
+#~ msgid "AUX In"
+#~ msgstr "AUX įvestis"
+
+#~ msgid "Record Gain"
+#~ msgstr "Įrašymo garsinimas"
+
+#~ msgid "Output Gain"
+#~ msgstr "IÅ¡vesties garsinimas"
+
+#~ msgid "Microphone Boost"
+#~ msgstr "Mikrofono pagarsinimas"
+
+#~ msgid "Loopback"
+#~ msgstr "Perduoti ratu"
+
+#~ msgid "Diagnostic"
+#~ msgstr "Diagnostika"
+
+#~ msgid "Bass Boost"
+#~ msgstr "Žemųjų dažnių sustiprinimas"
+
+#~ msgid "Playback Ports"
+#~ msgstr "Grojimo prievadai"
+
+#~ msgid "Input"
+#~ msgstr "Įvestis"
+
+#~ msgid "Record Source"
+#~ msgstr "Įrašymo šaltinis"
+
+#~ msgid "Monitor Source"
+#~ msgstr "Monitoriaus Å¡altinis"
+
+#~ msgid "Keyboard Beep"
+#~ msgstr "Klaviatūros pypsėjimas"
+
+#~ msgid "Simulate Stereo"
+#~ msgstr "Imituoti stereo"
+
+#~ msgid "Stereo"
+#~ msgstr "Stereo"
+
+#~ msgid "Surround Sound"
+#~ msgstr "Erdvinis garsas"
+
+#~ msgid "Microphone Gain"
+#~ msgstr "Mikrofono garsinimas"
+
+#~ msgid "Speaker Source"
+#~ msgstr "Garsiakalbio Å¡altinis"
+
+#~ msgid "Microphone Source"
+#~ msgstr "Mikrofono Å¡altinis"
+
+#~ msgid "Jack"
+#~ msgstr "Jack"
+
+#~ msgid "Center / LFE"
+#~ msgstr "Centras / LFE"
+
+#~ msgid "Stereo Mix"
+#~ msgstr "Stereo maiša"
+
+#~ msgid "Mono Mix"
+#~ msgstr "Mono maiša"
+
+#~ msgid "Input Mix"
+#~ msgstr "Įvesties maiša"
+
+#~ msgid "SPDIF In"
+#~ msgstr "SPDIF įvestis"
+
+#~ msgid "Microphone 1"
+#~ msgstr "Mikrofonas 1"
+
+#~ msgid "Microphone 2"
+#~ msgstr "Mikrofonas 2"
+
+#~ msgid "Digital Out"
+#~ msgstr "Skaitmeninė išvestis"
+
+#~ msgid "Digital In"
+#~ msgstr "Skaitmeninė įvestis"
+
+#~ msgid "HDMI"
+#~ msgstr "HDMI"
+
+#~ msgid "Modem"
+#~ msgstr "Modemas"
+
+#~ msgid "Handset"
+#~ msgstr "Ragelis"
+
+#~ msgid "Other"
+#~ msgstr "Kita"
+
+#~ msgid "None"
+#~ msgstr "NÄ—ra"
+
+#~ msgid "On"
+#~ msgstr "Įjungta"
+
+#~ msgid "Off"
+#~ msgstr "IÅ¡jungta"
+
+#~ msgid "Mute"
+#~ msgstr "Nutildyta"
+
+#~ msgid "Fast"
+#~ msgstr "Greitas"
+
+#~ msgid "Very Low"
+#~ msgstr "Labai žema"
+
+#~ msgid "Low"
+#~ msgstr "Žema"
+
+#~ msgid "Medium"
+#~ msgstr "VidutinÄ—"
+
+#~ msgid "High"
+#~ msgstr "Aukšta"
+
+#~ msgid "Very High"
+#~ msgstr "Labai aukšta"
+
+#~ msgid "Production"
+#~ msgstr "Sukūrimo"
+
+#~ msgid "Front Panel Microphone"
+#~ msgstr "Priekinio skydelio mikrofonas"
+
+#~ msgid "Front Panel Line In"
+#~ msgstr "Priekinio skydelio įeinanti linija"
+
+#~ msgid "Front Panel Headphones"
+#~ msgstr "Priekinio skydelio ausinÄ—s"
+
+#~ msgid "Front Panel Line Out"
+#~ msgstr "Priekinio skydelio išeinanti linija"
+
+#~ msgid "Green Connector"
+#~ msgstr "Žalias kištukas"
+
+#~ msgid "Pink Connector"
+#~ msgstr "Rožinis kištukas"
+
+#~ msgid "Blue Connector"
+#~ msgstr "Mėlynas kištukas"
+
+#~ msgid "White Connector"
+#~ msgstr "Baltas kištukas"
+
+#~ msgid "Black Connector"
+#~ msgstr "Juodas kištukas"
+
+#~ msgid "Gray Connector"
+#~ msgstr "Pilkas kištukas"
+
+#~ msgid "Orange Connector"
+#~ msgstr "Oranžinis kištukas"
+
+#~ msgid "Red Connector"
+#~ msgstr "Raudonas kištukas"
+
+#~ msgid "Yellow Connector"
+#~ msgstr "Geltonas kištukas"
+
+#~ msgid "Green Front Panel Connector"
+#~ msgstr "Žalias priekinio skydelio kištukas"
+
+#~ msgid "Pink Front Panel Connector"
+#~ msgstr "Rožinis priekinio skydelio kištukas"
+
+#~ msgid "Blue Front Panel Connector"
+#~ msgstr "Mėlynas priekinio skydelio kištukas"
+
+#~ msgid "White Front Panel Connector"
+#~ msgstr "Baltas priekinio skydelio kištukas"
+
+#~ msgid "Black Front Panel Connector"
+#~ msgstr "Juodas priekinio skydelio kištukas"
+
+#~ msgid "Gray Front Panel Connector"
+#~ msgstr "Pilkas priekinio skydelio kištukas"
+
+#~ msgid "Orange Front Panel Connector"
+#~ msgstr "Oranžinis priekinio skydelio kištukas"
+
+#~ msgid "Red Front Panel Connector"
+#~ msgstr "Raudonas priekinio skydelio kištukas"
+
+#~ msgid "Yellow Front Panel Connector"
+#~ msgstr "Geltonas priekinio skydelio kištukas"
+
+#~ msgid "Spread Output"
+#~ msgstr "Skleisti išvestį"
+
+#~ msgid "Downmix"
+#~ msgstr "Sumaišyti"
+
+#~ msgid "Virtual Mixer Input"
+#~ msgstr "Virtualaus maišiklio įvestis"
+
+#~ msgid "Virtual Mixer Output"
+#~ msgstr "Virtualaus maišiklio išvestis"
+
+#~ msgid "Virtual Mixer Channels"
+#~ msgstr "Virtualaus maišiklio kanalai"
+
+#~ msgid "%s %d Function"
+#~ msgstr "%s %d funkcija"
+
+#~ msgid "%s Function"
+#~ msgstr "%s funkcija"
+
#~ msgid "Error reading %d bytes on device '%s'."
#~ msgstr "Klaida skaitant %d baitus (-ų) įrenginyje „%s“."
diff --git a/po/lv.gmo b/po/lv.gmo
index bb3d3b9fe5d50e1d33d2b1bd64182b310a9ec735..b87dff7f69d1cdecf9965af9db6382aad28c495e 100644
Binary files a/po/lv.gmo and b/po/lv.gmo differ
diff --git a/po/lv.po b/po/lv.po
index 4e2023dd7c5ff1d92147c85229cc39a652aab416..db461512a7ea1e4987e1c6cbaf7fb77a16bc40b2 100644
--- a/po/lv.po
+++ b/po/lv.po
@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: gst-plugins-good 0.10.28.2\n"
"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/\n"
-"POT-Creation-Date: 2012-04-12 10:26+0200\n"
+"POT-Creation-Date: 2012-05-13 16:29+0200\n"
"PO-Revision-Date: 2011-09-02 11:23-0000\n"
"Last-Translator: Rihards Priedītis <rprieditis@gmail.com>\n"
"Language-Team: Latvian <translation-team-lv@lists.sourceforge.net>\n"
@@ -99,81 +99,6 @@ msgstr ""
msgid "Internal data flow error."
msgstr "IekÅ¡Ä“jÄ datu plÅ«smas kļūda."
-msgid "Volume"
-msgstr "Skaļums"
-
-msgid "Bass"
-msgstr "Basi"
-
-msgid "Treble"
-msgstr "Diskants"
-
-msgid "Synth"
-msgstr "Sintēze"
-
-msgid "PCM"
-msgstr "PCM"
-
-msgid "Speaker"
-msgstr "Skaļrunis"
-
-msgid "Line-in"
-msgstr "Skaņas ieeja"
-
-msgid "Microphone"
-msgstr "Mikrofons"
-
-msgid "CD"
-msgstr "CD"
-
-msgid "Mixer"
-msgstr "Jaucējs"
-
-msgid "PCM-2"
-msgstr "PCM-2"
-
-msgid "Record"
-msgstr "Ierakstīt"
-
-msgid "In-gain"
-msgstr "Ievades pieaugums"
-
-msgid "Out-gain"
-msgstr "Izvades pieaugums"
-
-msgid "Line-1"
-msgstr "LÄ«nija-1"
-
-msgid "Line-2"
-msgstr "LÄ«nija-2"
-
-msgid "Line-3"
-msgstr "LÄ«nija-3"
-
-msgid "Digital-1"
-msgstr "DigitÄlais-1"
-
-msgid "Digital-2"
-msgstr "DigitÄlais-2"
-
-msgid "Digital-3"
-msgstr "DigitÄlais-3"
-
-msgid "Phone-in"
-msgstr "Telefona ievade"
-
-msgid "Phone-out"
-msgstr "Telefona izvade"
-
-msgid "Video"
-msgstr "Video"
-
-msgid "Radio"
-msgstr "Radio"
-
-msgid "Monitor"
-msgstr "Monitors"
-
msgid ""
"Could not open audio device for playback. Device is being used by another "
"application."
@@ -201,311 +126,6 @@ msgstr ""
msgid "Could not open audio device for recording."
msgstr "Nevarēja atvērt audio ierīci ierakstīšanai."
-msgid "Could not open audio device for mixer control handling."
-msgstr "Nevarēja atvērt audio ierīci miksera kontroles vadīšanai."
-
-msgid ""
-"Could not open audio device for mixer control handling. This version of the "
-"Open Sound System is not supported by this element."
-msgstr ""
-"Nevar atvÄ“rt audio ierÄ«ci miksera kontrolas vadÄ«Å¡anai. Å Ä« AtvertÄs Skaņas "
-"Sistemas versija neatbalsta Å¡o elementu."
-
-msgid "Master"
-msgstr "Galvenais"
-
-msgid "Front"
-msgstr "Priekšējais"
-
-msgid "Rear"
-msgstr "SÄni"
-
-msgid "Headphones"
-msgstr "Austiņas"
-
-msgid "Center"
-msgstr "Centrs"
-
-msgid "LFE"
-msgstr "LFE"
-
-msgid "Surround"
-msgstr "IeskaujoÅ¡Ä"
-
-msgid "Side"
-msgstr "Puse"
-
-msgid "Built-in Speaker"
-msgstr "Iebūvētais skaļrunis"
-
-msgid "AUX 1 Out"
-msgstr "AUX 1 izeja"
-
-msgid "AUX 2 Out"
-msgstr "AUX 2 izeja"
-
-msgid "AUX Out"
-msgstr "AUX izeja"
-
-msgid "3D Depth"
-msgstr "3D dziļums"
-
-msgid "3D Center"
-msgstr "3D centrs"
-
-msgid "3D Enhance"
-msgstr "3D uzlabojums"
-
-msgid "Telephone"
-msgstr "Telefons"
-
-msgid "Line Out"
-msgstr "Skaņas izeja"
-
-msgid "Line In"
-msgstr "LÄ«nijas ieeja"
-
-msgid "Internal CD"
-msgstr "Iekšējais CD"
-
-msgid "Video In"
-msgstr "Video ieeja"
-
-msgid "AUX 1 In"
-msgstr "AUX 1 ieeja"
-
-msgid "AUX 2 In"
-msgstr "AUX 2 ieeja"
-
-msgid "AUX In"
-msgstr "AUC ieeja"
-
-msgid "Record Gain"
-msgstr "Ierakstīta pieaugums"
-
-msgid "Output Gain"
-msgstr "Izvada pieaugums"
-
-msgid "Microphone Boost"
-msgstr "Mikrofona pastiprinÄjums"
-
-msgid "Loopback"
-msgstr "Atpakaļcikls"
-
-msgid "Diagnostic"
-msgstr "Diagnostika"
-
-msgid "Bass Boost"
-msgstr "Bassa pastiprinÄjums"
-
-msgid "Playback Ports"
-msgstr "Atskaņošanas porti"
-
-msgid "Input"
-msgstr "Ievads"
-
-msgid "Record Source"
-msgstr "Ierakstīšanas avots"
-
-msgid "Monitor Source"
-msgstr "Monitora avots"
-
-msgid "Keyboard Beep"
-msgstr "Klaviatūras pīkstieni"
-
-msgid "Simulate Stereo"
-msgstr "Simulēt stereo"
-
-msgid "Stereo"
-msgstr "Stereo"
-
-msgid "Surround Sound"
-msgstr "IeskaujoÅ¡Ä skaņa"
-
-msgid "Microphone Gain"
-msgstr "Mikrofona pieaugums"
-
-msgid "Speaker Source"
-msgstr "Skaļruņa avots"
-
-msgid "Microphone Source"
-msgstr "Mikrofona avots"
-
-msgid "Jack"
-msgstr "Ligzda"
-
-msgid "Center / LFE"
-msgstr "Centrs / LFE"
-
-msgid "Stereo Mix"
-msgstr "Stereo mikseris"
-
-msgid "Mono Mix"
-msgstr "Mono miskeris"
-
-msgid "Input Mix"
-msgstr "Ieejas mikseris"
-
-msgid "SPDIF In"
-msgstr "SPDIF ieeja"
-
-msgid "SPDIF Out"
-msgstr "SPDIF izeja"
-
-msgid "Microphone 1"
-msgstr "Mikrofons 1"
-
-msgid "Microphone 2"
-msgstr "Mikrofons 2"
-
-msgid "Digital Out"
-msgstr "DigitÄlÄ izeja"
-
-msgid "Digital In"
-msgstr "DigitÄlÄ ieeja"
-
-msgid "HDMI"
-msgstr "HDMI"
-
-msgid "Modem"
-msgstr "Modēms"
-
-msgid "Handset"
-msgstr "Klausule"
-
-msgid "Other"
-msgstr "Cits"
-
-msgid "None"
-msgstr "Nekas"
-
-msgid "On"
-msgstr "Ieslēgts"
-
-msgid "Off"
-msgstr "Izslēgts"
-
-msgid "Mute"
-msgstr "Klusums"
-
-msgid "Fast"
-msgstr "Ä€trs"
-
-#. TRANSLATORS: "Very Low" is a quality setting here
-msgid "Very Low"
-msgstr "Ļoti zems"
-
-#. TRANSLATORS: "Low" is a quality setting here
-msgid "Low"
-msgstr "Zems"
-
-#. TRANSLATORS: "Medium" is a quality setting here
-msgid "Medium"
-msgstr "Vidējs"
-
-#. TRANSLATORS: "High" is a quality setting here
-msgid "High"
-msgstr "Augsts"
-
-#. TRANSLATORS: "Very High" is a quality setting here
-msgid "Very High"
-msgstr "Ļoti augsts"
-
-#. TRANSLATORS: "Production" is a quality setting here
-msgid "Production"
-msgstr "Produkcija"
-
-msgid "Front Panel Microphone"
-msgstr "PriekÅ¡Ä“jÄ paneļa mikrofons"
-
-msgid "Front Panel Line In"
-msgstr "PriekÅ¡Ä“jÄ paneļa ieejas lÄ«nija"
-
-msgid "Front Panel Headphones"
-msgstr "PriekÅ¡Ä“jÄ paneļa austiņas"
-
-msgid "Front Panel Line Out"
-msgstr "PriekÅ¡Ä“jÄ paneļa lÄ«nijas izeja"
-
-msgid "Green Connector"
-msgstr "Zaļais savienotÄjs"
-
-msgid "Pink Connector"
-msgstr "RozÄ savienotÄjs"
-
-msgid "Blue Connector"
-msgstr "Zilais savienotÄjs"
-
-msgid "White Connector"
-msgstr "Baltais savienotÄjs"
-
-msgid "Black Connector"
-msgstr "Melnais savienotÄjs"
-
-msgid "Gray Connector"
-msgstr "PelÄkais savienotÄjs"
-
-msgid "Orange Connector"
-msgstr "Oranžais savienotÄjs"
-
-msgid "Red Connector"
-msgstr "Sarkanais savienotÄjs"
-
-msgid "Yellow Connector"
-msgstr "Dzeltains savienotÄjs"
-
-msgid "Green Front Panel Connector"
-msgstr "Zaļais priekÅ¡Ä“jÄ paneļa savienotÄjs"
-
-msgid "Pink Front Panel Connector"
-msgstr "RozÄ priekÅ¡Ä“jÄ paneļa savienotÄjs"
-
-msgid "Blue Front Panel Connector"
-msgstr "Zilais priekÅ¡Ä“jÄ paneļa savienotÄjs"
-
-msgid "White Front Panel Connector"
-msgstr "Baltais priekÅ¡Ä“jÄ paneļa savienotÄjs"
-
-msgid "Black Front Panel Connector"
-msgstr "Melnais priekÅ¡Ä“jÄ paneļa savienotÄjs"
-
-msgid "Gray Front Panel Connector"
-msgstr "PelÄ“kais priekÅ¡Ä“jÄ paneļa savienotÄjs"
-
-msgid "Orange Front Panel Connector"
-msgstr "Oranžais priekÅ¡Ä“jÄ paneļa savienotÄjs"
-
-msgid "Red Front Panel Connector"
-msgstr "Sarkanais priekÅ¡Ä“jÄ paneļa savienotÄjs"
-
-msgid "Yellow Front Panel Connector"
-msgstr "Dzeltenais priekÅ¡Ä“jÄ paneļa savienotÄjs"
-
-msgid "Spread Output"
-msgstr "Izplest izvadu"
-
-msgid "Downmix"
-msgstr "Lejupmiksēšana"
-
-msgid "Virtual Mixer Input"
-msgstr "VirtuÄlÄ miksera ievads"
-
-msgid "Virtual Mixer Output"
-msgstr "VirtuÄlÄ miksera izvads"
-
-msgid "Virtual Mixer Channels"
-msgstr "VirtuÄlÄ miksera kanÄli"
-
-#. TRANSLATORS: name + number of a volume mixer control
-#, c-format
-msgid "%s %d Function"
-msgstr "%s %d funkcija"
-
-#. TRANSLATORS: name of a volume mixer control
-#, c-format
-msgid "%s Function"
-msgstr "%s funkcija"
-
msgid ""
"Could not open audio device for playback. This version of the Open Sound "
"System is not supported by this element."
@@ -525,12 +145,33 @@ msgstr "Šī audio ierīce neatablsta ierkastīšanu."
msgid "Error recording from audio device."
msgstr "Kļūda ierakstot no audio iekÄrtas."
+msgid "Volume"
+msgstr "Skaļums"
+
msgid "Gain"
msgstr "Pieaugums"
+msgid "Monitor"
+msgstr "Monitors"
+
+msgid "Built-in Speaker"
+msgstr "Iebūvētais skaļrunis"
+
msgid "Headphone"
msgstr "Austiņas"
+msgid "Line Out"
+msgstr "Skaņas izeja"
+
+msgid "SPDIF Out"
+msgstr "SPDIF izeja"
+
+msgid "AUX 1 Out"
+msgstr "AUX 1 izeja"
+
+msgid "AUX 2 Out"
+msgstr "AUX 2 izeja"
+
#, c-format
msgid "Error reading %d bytes from device '%s'."
msgstr "RadÄs kļūda nolasot %d baitus no ierÄ«ces \"%s\"."
@@ -708,6 +349,355 @@ msgstr "IzÅ¡Ä·irtspÄ“jas mainÄ«Å¡ana izpildlaikÄ paÅ¡alik netiek atbalstÄ«ta."
msgid "Cannot operate without a clock"
msgstr "Nevar veikt darbības bez pulksteņa"
+#~ msgid "Bass"
+#~ msgstr "Basi"
+
+#~ msgid "Treble"
+#~ msgstr "Diskants"
+
+#~ msgid "Synth"
+#~ msgstr "Sintēze"
+
+#~ msgid "PCM"
+#~ msgstr "PCM"
+
+#~ msgid "Speaker"
+#~ msgstr "Skaļrunis"
+
+#~ msgid "Line-in"
+#~ msgstr "Skaņas ieeja"
+
+#~ msgid "Microphone"
+#~ msgstr "Mikrofons"
+
+#~ msgid "CD"
+#~ msgstr "CD"
+
+#~ msgid "Mixer"
+#~ msgstr "Jaucējs"
+
+#~ msgid "PCM-2"
+#~ msgstr "PCM-2"
+
+#~ msgid "Record"
+#~ msgstr "Ierakstīt"
+
+#~ msgid "In-gain"
+#~ msgstr "Ievades pieaugums"
+
+#~ msgid "Out-gain"
+#~ msgstr "Izvades pieaugums"
+
+#~ msgid "Line-1"
+#~ msgstr "LÄ«nija-1"
+
+#~ msgid "Line-2"
+#~ msgstr "LÄ«nija-2"
+
+#~ msgid "Line-3"
+#~ msgstr "LÄ«nija-3"
+
+#~ msgid "Digital-1"
+#~ msgstr "DigitÄlais-1"
+
+#~ msgid "Digital-2"
+#~ msgstr "DigitÄlais-2"
+
+#~ msgid "Digital-3"
+#~ msgstr "DigitÄlais-3"
+
+#~ msgid "Phone-in"
+#~ msgstr "Telefona ievade"
+
+#~ msgid "Phone-out"
+#~ msgstr "Telefona izvade"
+
+#~ msgid "Video"
+#~ msgstr "Video"
+
+#~ msgid "Radio"
+#~ msgstr "Radio"
+
+#~ msgid "Could not open audio device for mixer control handling."
+#~ msgstr "Nevarēja atvērt audio ierīci miksera kontroles vadīšanai."
+
+#~ msgid ""
+#~ "Could not open audio device for mixer control handling. This version of "
+#~ "the Open Sound System is not supported by this element."
+#~ msgstr ""
+#~ "Nevar atvÄ“rt audio ierÄ«ci miksera kontrolas vadÄ«Å¡anai. Å Ä« AtvertÄs Skaņas "
+#~ "Sistemas versija neatbalsta Å¡o elementu."
+
+#~ msgid "Master"
+#~ msgstr "Galvenais"
+
+#~ msgid "Front"
+#~ msgstr "Priekšējais"
+
+#~ msgid "Rear"
+#~ msgstr "SÄni"
+
+#~ msgid "Headphones"
+#~ msgstr "Austiņas"
+
+#~ msgid "Center"
+#~ msgstr "Centrs"
+
+#~ msgid "LFE"
+#~ msgstr "LFE"
+
+#~ msgid "Surround"
+#~ msgstr "IeskaujoÅ¡Ä"
+
+#~ msgid "Side"
+#~ msgstr "Puse"
+
+#~ msgid "AUX Out"
+#~ msgstr "AUX izeja"
+
+#~ msgid "3D Depth"
+#~ msgstr "3D dziļums"
+
+#~ msgid "3D Center"
+#~ msgstr "3D centrs"
+
+#~ msgid "3D Enhance"
+#~ msgstr "3D uzlabojums"
+
+#~ msgid "Telephone"
+#~ msgstr "Telefons"
+
+#~ msgid "Line In"
+#~ msgstr "LÄ«nijas ieeja"
+
+#~ msgid "Internal CD"
+#~ msgstr "Iekšējais CD"
+
+#~ msgid "Video In"
+#~ msgstr "Video ieeja"
+
+#~ msgid "AUX 1 In"
+#~ msgstr "AUX 1 ieeja"
+
+#~ msgid "AUX 2 In"
+#~ msgstr "AUX 2 ieeja"
+
+#~ msgid "AUX In"
+#~ msgstr "AUC ieeja"
+
+#~ msgid "Record Gain"
+#~ msgstr "Ierakstīta pieaugums"
+
+#~ msgid "Output Gain"
+#~ msgstr "Izvada pieaugums"
+
+#~ msgid "Microphone Boost"
+#~ msgstr "Mikrofona pastiprinÄjums"
+
+#~ msgid "Loopback"
+#~ msgstr "Atpakaļcikls"
+
+#~ msgid "Diagnostic"
+#~ msgstr "Diagnostika"
+
+#~ msgid "Bass Boost"
+#~ msgstr "Bassa pastiprinÄjums"
+
+#~ msgid "Playback Ports"
+#~ msgstr "Atskaņošanas porti"
+
+#~ msgid "Input"
+#~ msgstr "Ievads"
+
+#~ msgid "Record Source"
+#~ msgstr "Ierakstīšanas avots"
+
+#~ msgid "Monitor Source"
+#~ msgstr "Monitora avots"
+
+#~ msgid "Keyboard Beep"
+#~ msgstr "Klaviatūras pīkstieni"
+
+#~ msgid "Simulate Stereo"
+#~ msgstr "Simulēt stereo"
+
+#~ msgid "Stereo"
+#~ msgstr "Stereo"
+
+#~ msgid "Surround Sound"
+#~ msgstr "IeskaujoÅ¡Ä skaņa"
+
+#~ msgid "Microphone Gain"
+#~ msgstr "Mikrofona pieaugums"
+
+#~ msgid "Speaker Source"
+#~ msgstr "Skaļruņa avots"
+
+#~ msgid "Microphone Source"
+#~ msgstr "Mikrofona avots"
+
+#~ msgid "Jack"
+#~ msgstr "Ligzda"
+
+#~ msgid "Center / LFE"
+#~ msgstr "Centrs / LFE"
+
+#~ msgid "Stereo Mix"
+#~ msgstr "Stereo mikseris"
+
+#~ msgid "Mono Mix"
+#~ msgstr "Mono miskeris"
+
+#~ msgid "Input Mix"
+#~ msgstr "Ieejas mikseris"
+
+#~ msgid "SPDIF In"
+#~ msgstr "SPDIF ieeja"
+
+#~ msgid "Microphone 1"
+#~ msgstr "Mikrofons 1"
+
+#~ msgid "Microphone 2"
+#~ msgstr "Mikrofons 2"
+
+#~ msgid "Digital Out"
+#~ msgstr "DigitÄlÄ izeja"
+
+#~ msgid "Digital In"
+#~ msgstr "DigitÄlÄ ieeja"
+
+#~ msgid "HDMI"
+#~ msgstr "HDMI"
+
+#~ msgid "Modem"
+#~ msgstr "Modēms"
+
+#~ msgid "Handset"
+#~ msgstr "Klausule"
+
+#~ msgid "Other"
+#~ msgstr "Cits"
+
+#~ msgid "None"
+#~ msgstr "Nekas"
+
+#~ msgid "On"
+#~ msgstr "Ieslēgts"
+
+#~ msgid "Off"
+#~ msgstr "Izslēgts"
+
+#~ msgid "Mute"
+#~ msgstr "Klusums"
+
+#~ msgid "Fast"
+#~ msgstr "Ä€trs"
+
+#~ msgid "Very Low"
+#~ msgstr "Ļoti zems"
+
+#~ msgid "Low"
+#~ msgstr "Zems"
+
+#~ msgid "Medium"
+#~ msgstr "Vidējs"
+
+#~ msgid "High"
+#~ msgstr "Augsts"
+
+#~ msgid "Very High"
+#~ msgstr "Ļoti augsts"
+
+#~ msgid "Production"
+#~ msgstr "Produkcija"
+
+#~ msgid "Front Panel Microphone"
+#~ msgstr "PriekÅ¡Ä“jÄ paneļa mikrofons"
+
+#~ msgid "Front Panel Line In"
+#~ msgstr "PriekÅ¡Ä“jÄ paneļa ieejas lÄ«nija"
+
+#~ msgid "Front Panel Headphones"
+#~ msgstr "PriekÅ¡Ä“jÄ paneļa austiņas"
+
+#~ msgid "Front Panel Line Out"
+#~ msgstr "PriekÅ¡Ä“jÄ paneļa lÄ«nijas izeja"
+
+#~ msgid "Green Connector"
+#~ msgstr "Zaļais savienotÄjs"
+
+#~ msgid "Pink Connector"
+#~ msgstr "RozÄ savienotÄjs"
+
+#~ msgid "Blue Connector"
+#~ msgstr "Zilais savienotÄjs"
+
+#~ msgid "White Connector"
+#~ msgstr "Baltais savienotÄjs"
+
+#~ msgid "Black Connector"
+#~ msgstr "Melnais savienotÄjs"
+
+#~ msgid "Gray Connector"
+#~ msgstr "PelÄkais savienotÄjs"
+
+#~ msgid "Orange Connector"
+#~ msgstr "Oranžais savienotÄjs"
+
+#~ msgid "Red Connector"
+#~ msgstr "Sarkanais savienotÄjs"
+
+#~ msgid "Yellow Connector"
+#~ msgstr "Dzeltains savienotÄjs"
+
+#~ msgid "Green Front Panel Connector"
+#~ msgstr "Zaļais priekÅ¡Ä“jÄ paneļa savienotÄjs"
+
+#~ msgid "Pink Front Panel Connector"
+#~ msgstr "RozÄ priekÅ¡Ä“jÄ paneļa savienotÄjs"
+
+#~ msgid "Blue Front Panel Connector"
+#~ msgstr "Zilais priekÅ¡Ä“jÄ paneļa savienotÄjs"
+
+#~ msgid "White Front Panel Connector"
+#~ msgstr "Baltais priekÅ¡Ä“jÄ paneļa savienotÄjs"
+
+#~ msgid "Black Front Panel Connector"
+#~ msgstr "Melnais priekÅ¡Ä“jÄ paneļa savienotÄjs"
+
+#~ msgid "Gray Front Panel Connector"
+#~ msgstr "PelÄ“kais priekÅ¡Ä“jÄ paneļa savienotÄjs"
+
+#~ msgid "Orange Front Panel Connector"
+#~ msgstr "Oranžais priekÅ¡Ä“jÄ paneļa savienotÄjs"
+
+#~ msgid "Red Front Panel Connector"
+#~ msgstr "Sarkanais priekÅ¡Ä“jÄ paneļa savienotÄjs"
+
+#~ msgid "Yellow Front Panel Connector"
+#~ msgstr "Dzeltenais priekÅ¡Ä“jÄ paneļa savienotÄjs"
+
+#~ msgid "Spread Output"
+#~ msgstr "Izplest izvadu"
+
+#~ msgid "Downmix"
+#~ msgstr "Lejupmiksēšana"
+
+#~ msgid "Virtual Mixer Input"
+#~ msgstr "VirtuÄlÄ miksera ievads"
+
+#~ msgid "Virtual Mixer Output"
+#~ msgstr "VirtuÄlÄ miksera izvads"
+
+#~ msgid "Virtual Mixer Channels"
+#~ msgstr "VirtuÄlÄ miksera kanÄli"
+
+#~ msgid "%s %d Function"
+#~ msgstr "%s %d funkcija"
+
+#~ msgid "%s Function"
+#~ msgstr "%s funkcija"
+
#~ msgid "Could not establish connection to sound server"
#~ msgstr "Nevar izveidot savienojumu ar skaņas serveri"
diff --git a/po/mt.gmo b/po/mt.gmo
index 79572fe838b6fc01519cfabfd045834bea4edfff..28b68f7d77f5c3988fc2e8c65e48f4135451b1b9 100644
Binary files a/po/mt.gmo and b/po/mt.gmo differ
diff --git a/po/mt.po b/po/mt.po
index 4d00baf6d6009c63b088f6804acb04ae08605742..ee84871c8a69e31b2581b4d975a54e682edeba01 100644
--- a/po/mt.po
+++ b/po/mt.po
@@ -5,7 +5,7 @@ msgid ""
msgstr ""
"Project-Id-Version: gst-plugins-good-0.10.10.3\n"
"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/\n"
-"POT-Creation-Date: 2012-04-12 10:26+0200\n"
+"POT-Creation-Date: 2012-05-13 16:29+0200\n"
"PO-Revision-Date: 2008-10-26 19:09+0100\n"
"Last-Translator: Michel Bugeja <michelbugeja@rabatmalta.com>\n"
"Language-Team: Maltese <translation-team-mt@lists.sourceforge.net>\n"
@@ -94,81 +94,6 @@ msgstr ""
msgid "Internal data flow error."
msgstr "Problema interna ta' data flow"
-msgid "Volume"
-msgstr "Volum"
-
-msgid "Bass"
-msgstr "Bass"
-
-msgid "Treble"
-msgstr "Treble"
-
-msgid "Synth"
-msgstr "Synth"
-
-msgid "PCM"
-msgstr "PCM"
-
-msgid "Speaker"
-msgstr "Speaker"
-
-msgid "Line-in"
-msgstr "Line-in"
-
-msgid "Microphone"
-msgstr "Mikrofonu"
-
-msgid "CD"
-msgstr "CD"
-
-msgid "Mixer"
-msgstr "Mixer"
-
-msgid "PCM-2"
-msgstr "PCM-2"
-
-msgid "Record"
-msgstr "Record"
-
-msgid "In-gain"
-msgstr "In-gain"
-
-msgid "Out-gain"
-msgstr "Out-gain"
-
-msgid "Line-1"
-msgstr "Line-1"
-
-msgid "Line-2"
-msgstr "Line-2"
-
-msgid "Line-3"
-msgstr "Line-3"
-
-msgid "Digital-1"
-msgstr "Digital-1"
-
-msgid "Digital-2"
-msgstr "Digital-2"
-
-msgid "Digital-3"
-msgstr "Digital-3"
-
-msgid "Phone-in"
-msgstr "Phone-in"
-
-msgid "Phone-out"
-msgstr "Phone-out"
-
-msgid "Video"
-msgstr "Vidjo"
-
-msgid "Radio"
-msgstr "Radju"
-
-msgid "Monitor"
-msgstr "Monitor"
-
msgid ""
"Could not open audio device for playback. Device is being used by another "
"application."
@@ -193,374 +118,51 @@ msgstr ""
msgid "Could not open audio device for recording."
msgstr "Audio device ma jistax jintuża biex tirrekordja."
-msgid "Could not open audio device for mixer control handling."
-msgstr "Ma nistax niftaħ apparat tal-awdjo għal mixer control handling."
-
msgid ""
-"Could not open audio device for mixer control handling. This version of the "
-"Open Sound System is not supported by this element."
+"Could not open audio device for playback. This version of the Open Sound "
+"System is not supported by this element."
msgstr ""
-"Ma nistax niftaħ apparat tal-awdjo għal mixer control handling. Din il-"
-"verzjoni ta' Open Sound System mhux issapportjata minn din l-element."
-
-#, fuzzy
-msgid "Master"
-msgstr "Fast"
+"Ma nistax niftaħ apparat tal-awdjo biex indoqq. Dil il-verżjoni ta' Open "
+"Sound System mhux issapportjatha minn dan l-element."
-msgid "Front"
-msgstr "Quddiem"
+msgid "Playback is not supported by this audio device."
+msgstr "Id-daqq mhux issappartjat minn dan l-apparat tal-awdjo."
-msgid "Rear"
-msgstr "Wara"
+msgid "Audio playback error."
+msgstr "Żball fiid-daqq tal-awdjo."
-msgid "Headphones"
-msgstr "Headphones"
+msgid "Recording is not supported by this audio device."
+msgstr "Irrekordjar mhux issapportjat minn dan l-apparat tal-awdjo."
-#, fuzzy
-msgid "Center"
-msgstr "Center / LFE"
+msgid "Error recording from audio device."
+msgstr "Żball fl-irrekordjar mill-apparat tal-awdjo."
-msgid "LFE"
-msgstr ""
+msgid "Volume"
+msgstr "Volum"
-#, fuzzy
-msgid "Surround"
-msgstr "Surround sound"
+msgid "Gain"
+msgstr "Gain"
-msgid "Side"
-msgstr "Ä enb"
+msgid "Monitor"
+msgstr "Monitor"
#, fuzzy
msgid "Built-in Speaker"
msgstr "Speaker"
-msgid "AUX 1 Out"
-msgstr ""
-
-msgid "AUX 2 Out"
-msgstr ""
-
-msgid "AUX Out"
-msgstr ""
-
-msgid "3D Depth"
-msgstr ""
-
-msgid "3D Center"
-msgstr ""
-
-msgid "3D Enhance"
+msgid "Headphone"
msgstr ""
-#, fuzzy
-msgid "Telephone"
-msgstr "Headphones"
-
msgid "Line Out"
msgstr ""
-#, fuzzy
-msgid "Line In"
-msgstr "Line-in"
-
-msgid "Internal CD"
-msgstr ""
-
-msgid "Video In"
-msgstr ""
-
-msgid "AUX 1 In"
-msgstr ""
-
-msgid "AUX 2 In"
-msgstr ""
-
-msgid "AUX In"
-msgstr ""
-
-msgid "Record Gain"
-msgstr ""
-
-msgid "Output Gain"
-msgstr ""
-
-#, fuzzy
-msgid "Microphone Boost"
-msgstr "Mikrofonu"
-
-msgid "Loopback"
-msgstr ""
-
-msgid "Diagnostic"
-msgstr ""
-
-msgid "Bass Boost"
-msgstr ""
-
-msgid "Playback Ports"
-msgstr ""
-
-msgid "Input"
-msgstr "Input"
-
-msgid "Record Source"
-msgstr ""
-
-msgid "Monitor Source"
-msgstr ""
-
-msgid "Keyboard Beep"
-msgstr ""
-
-msgid "Simulate Stereo"
-msgstr ""
-
-msgid "Stereo"
-msgstr "Stereo"
-
-#, fuzzy
-msgid "Surround Sound"
-msgstr "Surround sound"
-
-#, fuzzy
-msgid "Microphone Gain"
-msgstr "Mikrofonu"
-
-msgid "Speaker Source"
-msgstr ""
-
-#, fuzzy
-msgid "Microphone Source"
-msgstr "Mikrofonu"
-
-msgid "Jack"
-msgstr ""
-
-msgid "Center / LFE"
-msgstr "Center / LFE"
-
-#, fuzzy
-msgid "Stereo Mix"
-msgstr "Stereo"
-
-msgid "Mono Mix"
-msgstr ""
-
-#, fuzzy
-msgid "Input Mix"
-msgstr "Input mix"
-
-msgid "SPDIF In"
-msgstr ""
-
msgid "SPDIF Out"
msgstr ""
-#, fuzzy
-msgid "Microphone 1"
-msgstr "Mikrofonu"
-
-#, fuzzy
-msgid "Microphone 2"
-msgstr "Mikrofonu"
-
-msgid "Digital Out"
-msgstr ""
-
-msgid "Digital In"
-msgstr ""
-
-msgid "HDMI"
-msgstr ""
-
-msgid "Modem"
-msgstr ""
-
-msgid "Handset"
-msgstr ""
-
-msgid "Other"
-msgstr ""
-
-msgid "None"
-msgstr ""
-
-msgid "On"
-msgstr "On"
-
-msgid "Off"
-msgstr "Off"
-
-msgid "Mute"
-msgstr ""
-
-msgid "Fast"
-msgstr "Fast"
-
-#. TRANSLATORS: "Very Low" is a quality setting here
-msgid "Very Low"
-msgstr ""
-
-#. TRANSLATORS: "Low" is a quality setting here
-msgid "Low"
-msgstr "Low"
-
-#. TRANSLATORS: "Medium" is a quality setting here
-msgid "Medium"
-msgstr "Medium"
-
-#. TRANSLATORS: "High" is a quality setting here
-msgid "High"
-msgstr "High"
-
-#. TRANSLATORS: "Very High" is a quality setting here
-#, fuzzy
-msgid "Very High"
-msgstr "Very high"
-
-#. TRANSLATORS: "Production" is a quality setting here
-msgid "Production"
-msgstr "Production"
-
-#, fuzzy
-msgid "Front Panel Microphone"
-msgstr "Mikrofonu tal-panella ta' quddiem"
-
-#, fuzzy
-msgid "Front Panel Line In"
-msgstr "Front panel line-in"
-
-#, fuzzy
-msgid "Front Panel Headphones"
-msgstr "Front panel headphones"
-
-#, fuzzy
-msgid "Front Panel Line Out"
-msgstr "Front panel line-in"
-
-#, fuzzy
-msgid "Green Connector"
-msgstr "Connector aħdar"
-
-#, fuzzy
-msgid "Pink Connector"
-msgstr "Connector roża"
-
-#, fuzzy
-msgid "Blue Connector"
-msgstr "Connector Blu"
-
-#, fuzzy
-msgid "White Connector"
-msgstr "Connector abjad"
-
-#, fuzzy
-msgid "Black Connector"
-msgstr "Connector iswed"
-
-#, fuzzy
-msgid "Gray Connector"
-msgstr "Connector Griż"
-
-#, fuzzy
-msgid "Orange Connector"
-msgstr "Connector oranġjo"
-
-#, fuzzy
-msgid "Red Connector"
-msgstr "Connector aħmar"
-
-#, fuzzy
-msgid "Yellow Connector"
-msgstr "Connector isfar"
-
-#, fuzzy
-msgid "Green Front Panel Connector"
-msgstr "Front panel connector aħdar"
-
-#, fuzzy
-msgid "Pink Front Panel Connector"
-msgstr "Front panel connector roża"
-
-#, fuzzy
-msgid "Blue Front Panel Connector"
-msgstr "Front panel connector blu"
-
-#, fuzzy
-msgid "White Front Panel Connector"
-msgstr "Front panel connector abjad"
-
-#, fuzzy
-msgid "Black Front Panel Connector"
-msgstr "Front panel connector iswed"
-
-#, fuzzy
-msgid "Gray Front Panel Connector"
-msgstr "Front panel connector Griż"
-
-#, fuzzy
-msgid "Orange Front Panel Connector"
-msgstr "Front Panel connector oranġjo"
-
-#, fuzzy
-msgid "Red Front Panel Connector"
-msgstr "Front panel connector aħmar"
-
-#, fuzzy
-msgid "Yellow Front Panel Connector"
-msgstr "Front panel connector isfar"
-
-msgid "Spread Output"
-msgstr ""
-
-msgid "Downmix"
-msgstr ""
-
-#, fuzzy
-msgid "Virtual Mixer Input"
-msgstr "Virtual mixer input"
-
-#, fuzzy
-msgid "Virtual Mixer Output"
-msgstr "Virtual mixer output"
-
-#, fuzzy
-msgid "Virtual Mixer Channels"
-msgstr "Virtual mixer input"
-
-#. TRANSLATORS: name + number of a volume mixer control
-#, c-format
-msgid "%s %d Function"
-msgstr ""
-
-#. TRANSLATORS: name of a volume mixer control
-#, c-format
-msgid "%s Function"
-msgstr ""
-
-msgid ""
-"Could not open audio device for playback. This version of the Open Sound "
-"System is not supported by this element."
+msgid "AUX 1 Out"
msgstr ""
-"Ma nistax niftaħ apparat tal-awdjo biex indoqq. Dil il-verżjoni ta' Open "
-"Sound System mhux issapportjatha minn dan l-element."
-
-msgid "Playback is not supported by this audio device."
-msgstr "Id-daqq mhux issappartjat minn dan l-apparat tal-awdjo."
-msgid "Audio playback error."
-msgstr "Żball fiid-daqq tal-awdjo."
-
-msgid "Recording is not supported by this audio device."
-msgstr "Irrekordjar mhux issapportjat minn dan l-apparat tal-awdjo."
-
-msgid "Error recording from audio device."
-msgstr "Żball fl-irrekordjar mill-apparat tal-awdjo."
-
-msgid "Gain"
-msgstr "Gain"
-
-msgid "Headphone"
+msgid "AUX 2 Out"
msgstr ""
#, fuzzy, c-format
@@ -742,6 +344,283 @@ msgstr "Ma tistax tibdel ir-resolution waqt runtime."
msgid "Cannot operate without a clock"
msgstr "Ma nistax nħaddem mingħajr arloġġ"
+#~ msgid "Bass"
+#~ msgstr "Bass"
+
+#~ msgid "Treble"
+#~ msgstr "Treble"
+
+#~ msgid "Synth"
+#~ msgstr "Synth"
+
+#~ msgid "PCM"
+#~ msgstr "PCM"
+
+#~ msgid "Speaker"
+#~ msgstr "Speaker"
+
+#~ msgid "Line-in"
+#~ msgstr "Line-in"
+
+#~ msgid "Microphone"
+#~ msgstr "Mikrofonu"
+
+#~ msgid "CD"
+#~ msgstr "CD"
+
+#~ msgid "Mixer"
+#~ msgstr "Mixer"
+
+#~ msgid "PCM-2"
+#~ msgstr "PCM-2"
+
+#~ msgid "Record"
+#~ msgstr "Record"
+
+#~ msgid "In-gain"
+#~ msgstr "In-gain"
+
+#~ msgid "Out-gain"
+#~ msgstr "Out-gain"
+
+#~ msgid "Line-1"
+#~ msgstr "Line-1"
+
+#~ msgid "Line-2"
+#~ msgstr "Line-2"
+
+#~ msgid "Line-3"
+#~ msgstr "Line-3"
+
+#~ msgid "Digital-1"
+#~ msgstr "Digital-1"
+
+#~ msgid "Digital-2"
+#~ msgstr "Digital-2"
+
+#~ msgid "Digital-3"
+#~ msgstr "Digital-3"
+
+#~ msgid "Phone-in"
+#~ msgstr "Phone-in"
+
+#~ msgid "Phone-out"
+#~ msgstr "Phone-out"
+
+#~ msgid "Video"
+#~ msgstr "Vidjo"
+
+#~ msgid "Radio"
+#~ msgstr "Radju"
+
+#~ msgid "Could not open audio device for mixer control handling."
+#~ msgstr "Ma nistax niftaħ apparat tal-awdjo għal mixer control handling."
+
+#~ msgid ""
+#~ "Could not open audio device for mixer control handling. This version of "
+#~ "the Open Sound System is not supported by this element."
+#~ msgstr ""
+#~ "Ma nistax niftaħ apparat tal-awdjo għal mixer control handling. Din il-"
+#~ "verzjoni ta' Open Sound System mhux issapportjata minn din l-element."
+
+#, fuzzy
+#~ msgid "Master"
+#~ msgstr "Fast"
+
+#~ msgid "Front"
+#~ msgstr "Quddiem"
+
+#~ msgid "Rear"
+#~ msgstr "Wara"
+
+#~ msgid "Headphones"
+#~ msgstr "Headphones"
+
+#, fuzzy
+#~ msgid "Center"
+#~ msgstr "Center / LFE"
+
+#, fuzzy
+#~ msgid "Surround"
+#~ msgstr "Surround sound"
+
+#~ msgid "Side"
+#~ msgstr "Ä enb"
+
+#, fuzzy
+#~ msgid "Telephone"
+#~ msgstr "Headphones"
+
+#, fuzzy
+#~ msgid "Line In"
+#~ msgstr "Line-in"
+
+#, fuzzy
+#~ msgid "Microphone Boost"
+#~ msgstr "Mikrofonu"
+
+#~ msgid "Input"
+#~ msgstr "Input"
+
+#~ msgid "Stereo"
+#~ msgstr "Stereo"
+
+#, fuzzy
+#~ msgid "Surround Sound"
+#~ msgstr "Surround sound"
+
+#, fuzzy
+#~ msgid "Microphone Gain"
+#~ msgstr "Mikrofonu"
+
+#, fuzzy
+#~ msgid "Microphone Source"
+#~ msgstr "Mikrofonu"
+
+#~ msgid "Center / LFE"
+#~ msgstr "Center / LFE"
+
+#, fuzzy
+#~ msgid "Stereo Mix"
+#~ msgstr "Stereo"
+
+#, fuzzy
+#~ msgid "Input Mix"
+#~ msgstr "Input mix"
+
+#, fuzzy
+#~ msgid "Microphone 1"
+#~ msgstr "Mikrofonu"
+
+#, fuzzy
+#~ msgid "Microphone 2"
+#~ msgstr "Mikrofonu"
+
+#~ msgid "On"
+#~ msgstr "On"
+
+#~ msgid "Off"
+#~ msgstr "Off"
+
+#~ msgid "Fast"
+#~ msgstr "Fast"
+
+#~ msgid "Low"
+#~ msgstr "Low"
+
+#~ msgid "Medium"
+#~ msgstr "Medium"
+
+#~ msgid "High"
+#~ msgstr "High"
+
+#, fuzzy
+#~ msgid "Very High"
+#~ msgstr "Very high"
+
+#~ msgid "Production"
+#~ msgstr "Production"
+
+#, fuzzy
+#~ msgid "Front Panel Microphone"
+#~ msgstr "Mikrofonu tal-panella ta' quddiem"
+
+#, fuzzy
+#~ msgid "Front Panel Line In"
+#~ msgstr "Front panel line-in"
+
+#, fuzzy
+#~ msgid "Front Panel Headphones"
+#~ msgstr "Front panel headphones"
+
+#, fuzzy
+#~ msgid "Front Panel Line Out"
+#~ msgstr "Front panel line-in"
+
+#, fuzzy
+#~ msgid "Green Connector"
+#~ msgstr "Connector aħdar"
+
+#, fuzzy
+#~ msgid "Pink Connector"
+#~ msgstr "Connector roża"
+
+#, fuzzy
+#~ msgid "Blue Connector"
+#~ msgstr "Connector Blu"
+
+#, fuzzy
+#~ msgid "White Connector"
+#~ msgstr "Connector abjad"
+
+#, fuzzy
+#~ msgid "Black Connector"
+#~ msgstr "Connector iswed"
+
+#, fuzzy
+#~ msgid "Gray Connector"
+#~ msgstr "Connector Griż"
+
+#, fuzzy
+#~ msgid "Orange Connector"
+#~ msgstr "Connector oranġjo"
+
+#, fuzzy
+#~ msgid "Red Connector"
+#~ msgstr "Connector aħmar"
+
+#, fuzzy
+#~ msgid "Yellow Connector"
+#~ msgstr "Connector isfar"
+
+#, fuzzy
+#~ msgid "Green Front Panel Connector"
+#~ msgstr "Front panel connector aħdar"
+
+#, fuzzy
+#~ msgid "Pink Front Panel Connector"
+#~ msgstr "Front panel connector roża"
+
+#, fuzzy
+#~ msgid "Blue Front Panel Connector"
+#~ msgstr "Front panel connector blu"
+
+#, fuzzy
+#~ msgid "White Front Panel Connector"
+#~ msgstr "Front panel connector abjad"
+
+#, fuzzy
+#~ msgid "Black Front Panel Connector"
+#~ msgstr "Front panel connector iswed"
+
+#, fuzzy
+#~ msgid "Gray Front Panel Connector"
+#~ msgstr "Front panel connector Griż"
+
+#, fuzzy
+#~ msgid "Orange Front Panel Connector"
+#~ msgstr "Front Panel connector oranġjo"
+
+#, fuzzy
+#~ msgid "Red Front Panel Connector"
+#~ msgstr "Front panel connector aħmar"
+
+#, fuzzy
+#~ msgid "Yellow Front Panel Connector"
+#~ msgstr "Front panel connector isfar"
+
+#, fuzzy
+#~ msgid "Virtual Mixer Input"
+#~ msgstr "Virtual mixer input"
+
+#, fuzzy
+#~ msgid "Virtual Mixer Output"
+#~ msgstr "Virtual mixer output"
+
+#, fuzzy
+#~ msgid "Virtual Mixer Channels"
+#~ msgstr "Virtual mixer input"
+
#, fuzzy
#~ msgid "Error reading %d bytes on device '%s'."
#~ msgstr "Problema fil-qar()i %d bytes fid-device '%s'."
diff --git a/po/nb.gmo b/po/nb.gmo
index ee9f20952ec6c4ad8a67efd0ff8528de8ea44bd6..a71021e79911100cf3ae81fac9ab6275ba8f1f21 100644
Binary files a/po/nb.gmo and b/po/nb.gmo differ
diff --git a/po/nb.po b/po/nb.po
index f45b82bffc4853da445c3f8628d3f2cf57100e12..4a076fb57396ecab51223e61496f2eaebe2ddc52 100644
--- a/po/nb.po
+++ b/po/nb.po
@@ -6,7 +6,7 @@ msgid ""
msgstr ""
"Project-Id-Version: gst-plugins-good 0.10.25.3\n"
"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/\n"
-"POT-Creation-Date: 2012-04-12 10:26+0200\n"
+"POT-Creation-Date: 2012-05-13 16:29+0200\n"
"PO-Revision-Date: 2010-10-24 21:53+0200\n"
"Last-Translator: Kjartan Maraas <kmaraas@gnome.org>\n"
"Language-Team: Norwegian Bokmaal <i18n-nb@lister.ping.uio.no>\n"
@@ -90,81 +90,6 @@ msgstr ""
msgid "Internal data flow error."
msgstr ""
-msgid "Volume"
-msgstr "Volum"
-
-msgid "Bass"
-msgstr "Bass"
-
-msgid "Treble"
-msgstr "Diskant"
-
-msgid "Synth"
-msgstr "Synth"
-
-msgid "PCM"
-msgstr "PCM"
-
-msgid "Speaker"
-msgstr "Høyttaler"
-
-msgid "Line-in"
-msgstr "Linje inn"
-
-msgid "Microphone"
-msgstr "Mikrofon"
-
-msgid "CD"
-msgstr "CD"
-
-msgid "Mixer"
-msgstr "Mikser"
-
-msgid "PCM-2"
-msgstr "PCM-2"
-
-msgid "Record"
-msgstr "Opptak"
-
-msgid "In-gain"
-msgstr ""
-
-msgid "Out-gain"
-msgstr ""
-
-msgid "Line-1"
-msgstr "Linje 1"
-
-msgid "Line-2"
-msgstr "Linje 2"
-
-msgid "Line-3"
-msgstr "Linje 3"
-
-msgid "Digital-1"
-msgstr "Digital 1"
-
-msgid "Digital-2"
-msgstr "Digital 2"
-
-msgid "Digital-3"
-msgstr "Digital 3"
-
-msgid "Phone-in"
-msgstr "Telefon inn"
-
-msgid "Phone-out"
-msgstr "Telefon ut"
-
-msgid "Video"
-msgstr "Video"
-
-msgid "Radio"
-msgstr "Radio"
-
-msgid "Monitor"
-msgstr "Monitor"
-
msgid ""
"Could not open audio device for playback. Device is being used by another "
"application."
@@ -186,310 +111,6 @@ msgstr ""
msgid "Could not open audio device for recording."
msgstr "Kunne ikke åpne lydenhet for opptak."
-#, fuzzy
-msgid "Could not open audio device for mixer control handling."
-msgstr "Kunne ikke åpne filen «%s» for lesing."
-
-msgid ""
-"Could not open audio device for mixer control handling. This version of the "
-"Open Sound System is not supported by this element."
-msgstr ""
-
-msgid "Master"
-msgstr "Hovedvolum"
-
-msgid "Front"
-msgstr "Front"
-
-msgid "Rear"
-msgstr "Bak"
-
-msgid "Headphones"
-msgstr "Hodetelefoner"
-
-msgid "Center"
-msgstr "Senter"
-
-msgid "LFE"
-msgstr ""
-
-msgid "Surround"
-msgstr "Surround"
-
-msgid "Side"
-msgstr "Side"
-
-msgid "Built-in Speaker"
-msgstr "Innebygget høyttaler"
-
-msgid "AUX 1 Out"
-msgstr "AUX 1 ut"
-
-msgid "AUX 2 Out"
-msgstr "AUX 2 ut"
-
-msgid "AUX Out"
-msgstr "AUX ut"
-
-msgid "3D Depth"
-msgstr "3D dybde"
-
-msgid "3D Center"
-msgstr "3D senter"
-
-msgid "3D Enhance"
-msgstr ""
-
-msgid "Telephone"
-msgstr "Telefon"
-
-msgid "Line Out"
-msgstr "Linje ut"
-
-msgid "Line In"
-msgstr "Linje inn"
-
-msgid "Internal CD"
-msgstr "Intern CD"
-
-msgid "Video In"
-msgstr "Video inn"
-
-msgid "AUX 1 In"
-msgstr "AUX 1 inn"
-
-msgid "AUX 2 In"
-msgstr "AUX 2 inn"
-
-msgid "AUX In"
-msgstr "AUX inn"
-
-msgid "Record Gain"
-msgstr ""
-
-msgid "Output Gain"
-msgstr ""
-
-msgid "Microphone Boost"
-msgstr ""
-
-msgid "Loopback"
-msgstr ""
-
-msgid "Diagnostic"
-msgstr ""
-
-msgid "Bass Boost"
-msgstr ""
-
-msgid "Playback Ports"
-msgstr ""
-
-msgid "Input"
-msgstr ""
-
-msgid "Record Source"
-msgstr ""
-
-msgid "Monitor Source"
-msgstr ""
-
-msgid "Keyboard Beep"
-msgstr ""
-
-msgid "Simulate Stereo"
-msgstr ""
-
-msgid "Stereo"
-msgstr "Stereo"
-
-msgid "Surround Sound"
-msgstr ""
-
-msgid "Microphone Gain"
-msgstr ""
-
-msgid "Speaker Source"
-msgstr ""
-
-msgid "Microphone Source"
-msgstr ""
-
-msgid "Jack"
-msgstr ""
-
-msgid "Center / LFE"
-msgstr ""
-
-msgid "Stereo Mix"
-msgstr ""
-
-msgid "Mono Mix"
-msgstr ""
-
-msgid "Input Mix"
-msgstr ""
-
-msgid "SPDIF In"
-msgstr ""
-
-msgid "SPDIF Out"
-msgstr ""
-
-msgid "Microphone 1"
-msgstr "Mikrofon 1"
-
-msgid "Microphone 2"
-msgstr "Mikrofon 2"
-
-msgid "Digital Out"
-msgstr "Digital ut"
-
-msgid "Digital In"
-msgstr "Digital inn"
-
-msgid "HDMI"
-msgstr "HDMI"
-
-msgid "Modem"
-msgstr "Modem"
-
-msgid "Handset"
-msgstr "HÃ¥ndsett"
-
-msgid "Other"
-msgstr "Annet"
-
-msgid "None"
-msgstr "Ingen"
-
-msgid "On"
-msgstr "PÃ¥"
-
-msgid "Off"
-msgstr "Av"
-
-msgid "Mute"
-msgstr "Demp"
-
-msgid "Fast"
-msgstr "Rask"
-
-#. TRANSLATORS: "Very Low" is a quality setting here
-msgid "Very Low"
-msgstr "Meget lav"
-
-#. TRANSLATORS: "Low" is a quality setting here
-msgid "Low"
-msgstr "Lav"
-
-#. TRANSLATORS: "Medium" is a quality setting here
-msgid "Medium"
-msgstr "Middels"
-
-#. TRANSLATORS: "High" is a quality setting here
-msgid "High"
-msgstr "Høy"
-
-#. TRANSLATORS: "Very High" is a quality setting here
-msgid "Very High"
-msgstr "Meget høy"
-
-#. TRANSLATORS: "Production" is a quality setting here
-msgid "Production"
-msgstr "Produksjon"
-
-msgid "Front Panel Microphone"
-msgstr ""
-
-msgid "Front Panel Line In"
-msgstr ""
-
-msgid "Front Panel Headphones"
-msgstr ""
-
-msgid "Front Panel Line Out"
-msgstr ""
-
-msgid "Green Connector"
-msgstr ""
-
-msgid "Pink Connector"
-msgstr ""
-
-msgid "Blue Connector"
-msgstr ""
-
-msgid "White Connector"
-msgstr ""
-
-msgid "Black Connector"
-msgstr ""
-
-msgid "Gray Connector"
-msgstr ""
-
-msgid "Orange Connector"
-msgstr ""
-
-msgid "Red Connector"
-msgstr ""
-
-msgid "Yellow Connector"
-msgstr ""
-
-msgid "Green Front Panel Connector"
-msgstr ""
-
-msgid "Pink Front Panel Connector"
-msgstr ""
-
-msgid "Blue Front Panel Connector"
-msgstr ""
-
-msgid "White Front Panel Connector"
-msgstr ""
-
-msgid "Black Front Panel Connector"
-msgstr ""
-
-msgid "Gray Front Panel Connector"
-msgstr ""
-
-msgid "Orange Front Panel Connector"
-msgstr ""
-
-msgid "Red Front Panel Connector"
-msgstr ""
-
-msgid "Yellow Front Panel Connector"
-msgstr ""
-
-msgid "Spread Output"
-msgstr ""
-
-msgid "Downmix"
-msgstr ""
-
-msgid "Virtual Mixer Input"
-msgstr ""
-
-msgid "Virtual Mixer Output"
-msgstr ""
-
-msgid "Virtual Mixer Channels"
-msgstr ""
-
-#. TRANSLATORS: name + number of a volume mixer control
-#, c-format
-msgid "%s %d Function"
-msgstr ""
-
-#. TRANSLATORS: name of a volume mixer control
-#, c-format
-msgid "%s Function"
-msgstr ""
-
msgid ""
"Could not open audio device for playback. This version of the Open Sound "
"System is not supported by this element."
@@ -507,12 +128,33 @@ msgstr ""
msgid "Error recording from audio device."
msgstr ""
+msgid "Volume"
+msgstr "Volum"
+
msgid "Gain"
msgstr ""
+msgid "Monitor"
+msgstr "Monitor"
+
+msgid "Built-in Speaker"
+msgstr "Innebygget høyttaler"
+
msgid "Headphone"
msgstr "Hodetelefon"
+msgid "Line Out"
+msgstr "Linje ut"
+
+msgid "SPDIF Out"
+msgstr ""
+
+msgid "AUX 1 Out"
+msgstr "AUX 1 ut"
+
+msgid "AUX 2 Out"
+msgstr "AUX 2 ut"
+
#, fuzzy, c-format
msgid "Error reading %d bytes from device '%s'."
msgstr "Kunne ikke lukke VFS-fil «%s»."
@@ -680,6 +322,184 @@ msgstr ""
msgid "Cannot operate without a clock"
msgstr "Kan ikke operere uten en klokke"
+#~ msgid "Bass"
+#~ msgstr "Bass"
+
+#~ msgid "Treble"
+#~ msgstr "Diskant"
+
+#~ msgid "Synth"
+#~ msgstr "Synth"
+
+#~ msgid "PCM"
+#~ msgstr "PCM"
+
+#~ msgid "Speaker"
+#~ msgstr "Høyttaler"
+
+#~ msgid "Line-in"
+#~ msgstr "Linje inn"
+
+#~ msgid "Microphone"
+#~ msgstr "Mikrofon"
+
+#~ msgid "CD"
+#~ msgstr "CD"
+
+#~ msgid "Mixer"
+#~ msgstr "Mikser"
+
+#~ msgid "PCM-2"
+#~ msgstr "PCM-2"
+
+#~ msgid "Record"
+#~ msgstr "Opptak"
+
+#~ msgid "Line-1"
+#~ msgstr "Linje 1"
+
+#~ msgid "Line-2"
+#~ msgstr "Linje 2"
+
+#~ msgid "Line-3"
+#~ msgstr "Linje 3"
+
+#~ msgid "Digital-1"
+#~ msgstr "Digital 1"
+
+#~ msgid "Digital-2"
+#~ msgstr "Digital 2"
+
+#~ msgid "Digital-3"
+#~ msgstr "Digital 3"
+
+#~ msgid "Phone-in"
+#~ msgstr "Telefon inn"
+
+#~ msgid "Phone-out"
+#~ msgstr "Telefon ut"
+
+#~ msgid "Video"
+#~ msgstr "Video"
+
+#~ msgid "Radio"
+#~ msgstr "Radio"
+
+#, fuzzy
+#~ msgid "Could not open audio device for mixer control handling."
+#~ msgstr "Kunne ikke åpne filen «%s» for lesing."
+
+#~ msgid "Master"
+#~ msgstr "Hovedvolum"
+
+#~ msgid "Front"
+#~ msgstr "Front"
+
+#~ msgid "Rear"
+#~ msgstr "Bak"
+
+#~ msgid "Headphones"
+#~ msgstr "Hodetelefoner"
+
+#~ msgid "Center"
+#~ msgstr "Senter"
+
+#~ msgid "Surround"
+#~ msgstr "Surround"
+
+#~ msgid "Side"
+#~ msgstr "Side"
+
+#~ msgid "AUX Out"
+#~ msgstr "AUX ut"
+
+#~ msgid "3D Depth"
+#~ msgstr "3D dybde"
+
+#~ msgid "3D Center"
+#~ msgstr "3D senter"
+
+#~ msgid "Telephone"
+#~ msgstr "Telefon"
+
+#~ msgid "Line In"
+#~ msgstr "Linje inn"
+
+#~ msgid "Internal CD"
+#~ msgstr "Intern CD"
+
+#~ msgid "Video In"
+#~ msgstr "Video inn"
+
+#~ msgid "AUX 1 In"
+#~ msgstr "AUX 1 inn"
+
+#~ msgid "AUX 2 In"
+#~ msgstr "AUX 2 inn"
+
+#~ msgid "AUX In"
+#~ msgstr "AUX inn"
+
+#~ msgid "Stereo"
+#~ msgstr "Stereo"
+
+#~ msgid "Microphone 1"
+#~ msgstr "Mikrofon 1"
+
+#~ msgid "Microphone 2"
+#~ msgstr "Mikrofon 2"
+
+#~ msgid "Digital Out"
+#~ msgstr "Digital ut"
+
+#~ msgid "Digital In"
+#~ msgstr "Digital inn"
+
+#~ msgid "HDMI"
+#~ msgstr "HDMI"
+
+#~ msgid "Modem"
+#~ msgstr "Modem"
+
+#~ msgid "Handset"
+#~ msgstr "HÃ¥ndsett"
+
+#~ msgid "Other"
+#~ msgstr "Annet"
+
+#~ msgid "None"
+#~ msgstr "Ingen"
+
+#~ msgid "On"
+#~ msgstr "PÃ¥"
+
+#~ msgid "Off"
+#~ msgstr "Av"
+
+#~ msgid "Mute"
+#~ msgstr "Demp"
+
+#~ msgid "Fast"
+#~ msgstr "Rask"
+
+#~ msgid "Very Low"
+#~ msgstr "Meget lav"
+
+#~ msgid "Low"
+#~ msgstr "Lav"
+
+#~ msgid "Medium"
+#~ msgstr "Middels"
+
+#~ msgid "High"
+#~ msgstr "Høy"
+
+#~ msgid "Very High"
+#~ msgstr "Meget høy"
+
+#~ msgid "Production"
+#~ msgstr "Produksjon"
+
#, fuzzy
#~ msgid "Error reading %d bytes on device '%s'."
#~ msgstr "Kunne ikke lukke VFS-fil «%s»."
diff --git a/po/nl.gmo b/po/nl.gmo
index 87f40bf0a0e182979a960adb3c3a1cc560d23024..9d0ced3b1a4825d85aa0e426f5a0634c25eb2f5d 100644
Binary files a/po/nl.gmo and b/po/nl.gmo differ
diff --git a/po/nl.po b/po/nl.po
index 37c32f2e5c448d3ec624e2eaddf198b92b2a8da2..86f6a60e52059872bf80625ac5f5dc19a990bb94 100644
--- a/po/nl.po
+++ b/po/nl.po
@@ -6,7 +6,7 @@ msgid ""
msgstr ""
"Project-Id-Version: gst-plugins-good 0.10.28.2\n"
"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/\n"
-"POT-Creation-Date: 2012-04-12 10:26+0200\n"
+"POT-Creation-Date: 2012-05-13 16:29+0200\n"
"PO-Revision-Date: 2011-04-27 00:05+0200\n"
"Last-Translator: Freek de Kruijf <f.de.kruijf@gmail.com>\n"
"Language-Team: Dutch <vertaling@vrijschrift.org>\n"
@@ -100,81 +100,6 @@ msgstr ""
msgid "Internal data flow error."
msgstr "Interne fout in de gegevensdoorvoer."
-msgid "Volume"
-msgstr "Volume"
-
-msgid "Bass"
-msgstr "Lage tonen"
-
-msgid "Treble"
-msgstr "Hoge tonen"
-
-msgid "Synth"
-msgstr "Synth"
-
-msgid "PCM"
-msgstr "PCM"
-
-msgid "Speaker"
-msgstr "Luidspreker"
-
-msgid "Line-in"
-msgstr "Lijn-in"
-
-msgid "Microphone"
-msgstr "Microfoon"
-
-msgid "CD"
-msgstr "CD"
-
-msgid "Mixer"
-msgstr "Mixer"
-
-msgid "PCM-2"
-msgstr "PCM-2"
-
-msgid "Record"
-msgstr "Opname"
-
-msgid "In-gain"
-msgstr "Ingangsversterking"
-
-msgid "Out-gain"
-msgstr "Uitgangsversterking"
-
-msgid "Line-1"
-msgstr "Lijn-1"
-
-msgid "Line-2"
-msgstr "Lijn-2"
-
-msgid "Line-3"
-msgstr "Lijn-3"
-
-msgid "Digital-1"
-msgstr "Digitaal-1"
-
-msgid "Digital-2"
-msgstr "Digitaal-2"
-
-msgid "Digital-3"
-msgstr "Digitaal-3"
-
-msgid "Phone-in"
-msgstr "Telefooningang"
-
-msgid "Phone-out"
-msgstr "Telefoonuitgang"
-
-msgid "Video"
-msgstr "Video"
-
-msgid "Radio"
-msgstr "Radio"
-
-msgid "Monitor"
-msgstr "Monitor"
-
msgid ""
"Could not open audio device for playback. Device is being used by another "
"application."
@@ -202,311 +127,6 @@ msgstr ""
msgid "Could not open audio device for recording."
msgstr "Kan het audio-apparaat niet openen voor opnemen."
-msgid "Could not open audio device for mixer control handling."
-msgstr "Kan het audio-apparaat niet openen voor het besturen van de mixer."
-
-msgid ""
-"Could not open audio device for mixer control handling. This version of the "
-"Open Sound System is not supported by this element."
-msgstr ""
-"Kan het audio-apparaat niet openen voor besturen van de mixer. Deze versie "
-"van het Open Sound System wordt niet ondersteunt door dit element."
-
-msgid "Master"
-msgstr "Master"
-
-msgid "Front"
-msgstr "Voorkant"
-
-msgid "Rear"
-msgstr "Achterzijde"
-
-msgid "Headphones"
-msgstr "Hoofdtelefoons"
-
-msgid "Center"
-msgstr "Midden"
-
-msgid "LFE"
-msgstr "LFE"
-
-msgid "Surround"
-msgstr "Surround"
-
-msgid "Side"
-msgstr "Zijkant"
-
-msgid "Built-in Speaker"
-msgstr "Ingebouwde luidspreker"
-
-msgid "AUX 1 Out"
-msgstr "AUX 1-out"
-
-msgid "AUX 2 Out"
-msgstr "AUX 2-out"
-
-msgid "AUX Out"
-msgstr "AUX-uit"
-
-msgid "3D Depth"
-msgstr "3D-diepte"
-
-msgid "3D Center"
-msgstr "3D-centrum"
-
-msgid "3D Enhance"
-msgstr "3D-verbeteren"
-
-msgid "Telephone"
-msgstr "Telefoon"
-
-msgid "Line Out"
-msgstr "Line-out"
-
-msgid "Line In"
-msgstr "Lijn-in"
-
-msgid "Internal CD"
-msgstr "Interne cd"
-
-msgid "Video In"
-msgstr "Video-in"
-
-msgid "AUX 1 In"
-msgstr "AUX 1-in"
-
-msgid "AUX 2 In"
-msgstr "AUX 2-in"
-
-msgid "AUX In"
-msgstr "AUX-in"
-
-msgid "Record Gain"
-msgstr "Opnameversterking"
-
-msgid "Output Gain"
-msgstr "Uitgangsversterking"
-
-msgid "Microphone Boost"
-msgstr "Microfoon-boost"
-
-msgid "Loopback"
-msgstr "Loopback"
-
-msgid "Diagnostic"
-msgstr "Diagnose"
-
-msgid "Bass Boost"
-msgstr "Bas-boost"
-
-msgid "Playback Ports"
-msgstr "Afspeelpoorten"
-
-msgid "Input"
-msgstr "Invoer"
-
-msgid "Record Source"
-msgstr "Opnamebron"
-
-msgid "Monitor Source"
-msgstr "Monitorbron"
-
-msgid "Keyboard Beep"
-msgstr "Toetsenbordpiep"
-
-msgid "Simulate Stereo"
-msgstr "Stereo simuleren"
-
-msgid "Stereo"
-msgstr "Stereo"
-
-msgid "Surround Sound"
-msgstr "Surround-geluid"
-
-msgid "Microphone Gain"
-msgstr "Microfoonversterking"
-
-msgid "Speaker Source"
-msgstr "Luidsprekerbron"
-
-msgid "Microphone Source"
-msgstr "Microfoonbron"
-
-msgid "Jack"
-msgstr "Plug"
-
-msgid "Center / LFE"
-msgstr "Midden / LFE"
-
-msgid "Stereo Mix"
-msgstr "Stereo-mix"
-
-msgid "Mono Mix"
-msgstr "Mono-mix"
-
-msgid "Input Mix"
-msgstr "Invoer-mix"
-
-msgid "SPDIF In"
-msgstr "SPDIF-in"
-
-msgid "SPDIF Out"
-msgstr "SPDIF-out"
-
-msgid "Microphone 1"
-msgstr "Microfoon-1"
-
-msgid "Microphone 2"
-msgstr "Microfoon-2"
-
-msgid "Digital Out"
-msgstr "Digitaal-uit"
-
-msgid "Digital In"
-msgstr "Digitaal-in"
-
-msgid "HDMI"
-msgstr "HDMI"
-
-msgid "Modem"
-msgstr "Modem"
-
-msgid "Handset"
-msgstr "Handset"
-
-msgid "Other"
-msgstr "Overig"
-
-msgid "None"
-msgstr "Geen"
-
-msgid "On"
-msgstr "Aan"
-
-msgid "Off"
-msgstr "Uit"
-
-msgid "Mute"
-msgstr "Dempen"
-
-msgid "Fast"
-msgstr "Snel"
-
-#. TRANSLATORS: "Very Low" is a quality setting here
-msgid "Very Low"
-msgstr "Zeer laag"
-
-#. TRANSLATORS: "Low" is a quality setting here
-msgid "Low"
-msgstr "Laag"
-
-#. TRANSLATORS: "Medium" is a quality setting here
-msgid "Medium"
-msgstr "Middel"
-
-#. TRANSLATORS: "High" is a quality setting here
-msgid "High"
-msgstr "Hoog"
-
-#. TRANSLATORS: "Very High" is a quality setting here
-msgid "Very High"
-msgstr "Zeer hoog"
-
-#. TRANSLATORS: "Production" is a quality setting here
-msgid "Production"
-msgstr "Productie"
-
-msgid "Front Panel Microphone"
-msgstr "Microfoon in frontpaneel"
-
-msgid "Front Panel Line In"
-msgstr "Lijn-in in frontpaneel"
-
-msgid "Front Panel Headphones"
-msgstr "Hoofdtelefoons in frontpaneel"
-
-msgid "Front Panel Line Out"
-msgstr "Lijn-uit in frontpaneel"
-
-msgid "Green Connector"
-msgstr "Groene connector"
-
-msgid "Pink Connector"
-msgstr "Roze connector"
-
-msgid "Blue Connector"
-msgstr "Blauwe connector"
-
-msgid "White Connector"
-msgstr "Witte connector"
-
-msgid "Black Connector"
-msgstr "Zwarte connector"
-
-msgid "Gray Connector"
-msgstr "Grijze connector"
-
-msgid "Orange Connector"
-msgstr "Oranje connector"
-
-msgid "Red Connector"
-msgstr "Rode connector"
-
-msgid "Yellow Connector"
-msgstr "Gele connector"
-
-msgid "Green Front Panel Connector"
-msgstr "Groene connector in frontpaneel"
-
-msgid "Pink Front Panel Connector"
-msgstr "Roze connector in frontpaneel"
-
-msgid "Blue Front Panel Connector"
-msgstr "Blauwe connector in frontpaneel"
-
-msgid "White Front Panel Connector"
-msgstr "Witte connector in frontpaneel"
-
-msgid "Black Front Panel Connector"
-msgstr "Zwarte connector in frontpaneel"
-
-msgid "Gray Front Panel Connector"
-msgstr "Grijze connector in frontpaneel"
-
-msgid "Orange Front Panel Connector"
-msgstr "Oranje connector in frontpaneel"
-
-msgid "Red Front Panel Connector"
-msgstr "Rode connector in frontpaneel"
-
-msgid "Yellow Front Panel Connector"
-msgstr "Gele connector in frontpaneel"
-
-msgid "Spread Output"
-msgstr "Uitvoer spreiden"
-
-msgid "Downmix"
-msgstr "Downmix"
-
-msgid "Virtual Mixer Input"
-msgstr "Virtuele mixer-invoer"
-
-msgid "Virtual Mixer Output"
-msgstr "Virtuele mixer-uitvoer"
-
-msgid "Virtual Mixer Channels"
-msgstr "Virtuele mixer-kanalen"
-
-#. TRANSLATORS: name + number of a volume mixer control
-#, c-format
-msgid "%s %d Function"
-msgstr "%s %d functie"
-
-#. TRANSLATORS: name of a volume mixer control
-#, c-format
-msgid "%s Function"
-msgstr "%s-function"
-
msgid ""
"Could not open audio device for playback. This version of the Open Sound "
"System is not supported by this element."
@@ -526,12 +146,33 @@ msgstr "Opnemen wordt niet ondersteund door dit audio-apparaat"
msgid "Error recording from audio device."
msgstr "Fout bij opnemen vanaf audio-apparaat."
+msgid "Volume"
+msgstr "Volume"
+
msgid "Gain"
msgstr "Versterking"
+msgid "Monitor"
+msgstr "Monitor"
+
+msgid "Built-in Speaker"
+msgstr "Ingebouwde luidspreker"
+
msgid "Headphone"
msgstr "Hoofdtelefoon"
+msgid "Line Out"
+msgstr "Line-out"
+
+msgid "SPDIF Out"
+msgstr "SPDIF-out"
+
+msgid "AUX 1 Out"
+msgstr "AUX 1-out"
+
+msgid "AUX 2 Out"
+msgstr "AUX 2-out"
+
#, c-format
msgid "Error reading %d bytes from device '%s'."
msgstr "Fout bij het lezen van %d bytes van apparaat '%s'."
@@ -710,6 +351,355 @@ msgstr "Tijdens het draaien kan de resolutie nog niet gewijzigd worden."
msgid "Cannot operate without a clock"
msgstr "Kan niet werken zonder een klok."
+#~ msgid "Bass"
+#~ msgstr "Lage tonen"
+
+#~ msgid "Treble"
+#~ msgstr "Hoge tonen"
+
+#~ msgid "Synth"
+#~ msgstr "Synth"
+
+#~ msgid "PCM"
+#~ msgstr "PCM"
+
+#~ msgid "Speaker"
+#~ msgstr "Luidspreker"
+
+#~ msgid "Line-in"
+#~ msgstr "Lijn-in"
+
+#~ msgid "Microphone"
+#~ msgstr "Microfoon"
+
+#~ msgid "CD"
+#~ msgstr "CD"
+
+#~ msgid "Mixer"
+#~ msgstr "Mixer"
+
+#~ msgid "PCM-2"
+#~ msgstr "PCM-2"
+
+#~ msgid "Record"
+#~ msgstr "Opname"
+
+#~ msgid "In-gain"
+#~ msgstr "Ingangsversterking"
+
+#~ msgid "Out-gain"
+#~ msgstr "Uitgangsversterking"
+
+#~ msgid "Line-1"
+#~ msgstr "Lijn-1"
+
+#~ msgid "Line-2"
+#~ msgstr "Lijn-2"
+
+#~ msgid "Line-3"
+#~ msgstr "Lijn-3"
+
+#~ msgid "Digital-1"
+#~ msgstr "Digitaal-1"
+
+#~ msgid "Digital-2"
+#~ msgstr "Digitaal-2"
+
+#~ msgid "Digital-3"
+#~ msgstr "Digitaal-3"
+
+#~ msgid "Phone-in"
+#~ msgstr "Telefooningang"
+
+#~ msgid "Phone-out"
+#~ msgstr "Telefoonuitgang"
+
+#~ msgid "Video"
+#~ msgstr "Video"
+
+#~ msgid "Radio"
+#~ msgstr "Radio"
+
+#~ msgid "Could not open audio device for mixer control handling."
+#~ msgstr "Kan het audio-apparaat niet openen voor het besturen van de mixer."
+
+#~ msgid ""
+#~ "Could not open audio device for mixer control handling. This version of "
+#~ "the Open Sound System is not supported by this element."
+#~ msgstr ""
+#~ "Kan het audio-apparaat niet openen voor besturen van de mixer. Deze "
+#~ "versie van het Open Sound System wordt niet ondersteunt door dit element."
+
+#~ msgid "Master"
+#~ msgstr "Master"
+
+#~ msgid "Front"
+#~ msgstr "Voorkant"
+
+#~ msgid "Rear"
+#~ msgstr "Achterzijde"
+
+#~ msgid "Headphones"
+#~ msgstr "Hoofdtelefoons"
+
+#~ msgid "Center"
+#~ msgstr "Midden"
+
+#~ msgid "LFE"
+#~ msgstr "LFE"
+
+#~ msgid "Surround"
+#~ msgstr "Surround"
+
+#~ msgid "Side"
+#~ msgstr "Zijkant"
+
+#~ msgid "AUX Out"
+#~ msgstr "AUX-uit"
+
+#~ msgid "3D Depth"
+#~ msgstr "3D-diepte"
+
+#~ msgid "3D Center"
+#~ msgstr "3D-centrum"
+
+#~ msgid "3D Enhance"
+#~ msgstr "3D-verbeteren"
+
+#~ msgid "Telephone"
+#~ msgstr "Telefoon"
+
+#~ msgid "Line In"
+#~ msgstr "Lijn-in"
+
+#~ msgid "Internal CD"
+#~ msgstr "Interne cd"
+
+#~ msgid "Video In"
+#~ msgstr "Video-in"
+
+#~ msgid "AUX 1 In"
+#~ msgstr "AUX 1-in"
+
+#~ msgid "AUX 2 In"
+#~ msgstr "AUX 2-in"
+
+#~ msgid "AUX In"
+#~ msgstr "AUX-in"
+
+#~ msgid "Record Gain"
+#~ msgstr "Opnameversterking"
+
+#~ msgid "Output Gain"
+#~ msgstr "Uitgangsversterking"
+
+#~ msgid "Microphone Boost"
+#~ msgstr "Microfoon-boost"
+
+#~ msgid "Loopback"
+#~ msgstr "Loopback"
+
+#~ msgid "Diagnostic"
+#~ msgstr "Diagnose"
+
+#~ msgid "Bass Boost"
+#~ msgstr "Bas-boost"
+
+#~ msgid "Playback Ports"
+#~ msgstr "Afspeelpoorten"
+
+#~ msgid "Input"
+#~ msgstr "Invoer"
+
+#~ msgid "Record Source"
+#~ msgstr "Opnamebron"
+
+#~ msgid "Monitor Source"
+#~ msgstr "Monitorbron"
+
+#~ msgid "Keyboard Beep"
+#~ msgstr "Toetsenbordpiep"
+
+#~ msgid "Simulate Stereo"
+#~ msgstr "Stereo simuleren"
+
+#~ msgid "Stereo"
+#~ msgstr "Stereo"
+
+#~ msgid "Surround Sound"
+#~ msgstr "Surround-geluid"
+
+#~ msgid "Microphone Gain"
+#~ msgstr "Microfoonversterking"
+
+#~ msgid "Speaker Source"
+#~ msgstr "Luidsprekerbron"
+
+#~ msgid "Microphone Source"
+#~ msgstr "Microfoonbron"
+
+#~ msgid "Jack"
+#~ msgstr "Plug"
+
+#~ msgid "Center / LFE"
+#~ msgstr "Midden / LFE"
+
+#~ msgid "Stereo Mix"
+#~ msgstr "Stereo-mix"
+
+#~ msgid "Mono Mix"
+#~ msgstr "Mono-mix"
+
+#~ msgid "Input Mix"
+#~ msgstr "Invoer-mix"
+
+#~ msgid "SPDIF In"
+#~ msgstr "SPDIF-in"
+
+#~ msgid "Microphone 1"
+#~ msgstr "Microfoon-1"
+
+#~ msgid "Microphone 2"
+#~ msgstr "Microfoon-2"
+
+#~ msgid "Digital Out"
+#~ msgstr "Digitaal-uit"
+
+#~ msgid "Digital In"
+#~ msgstr "Digitaal-in"
+
+#~ msgid "HDMI"
+#~ msgstr "HDMI"
+
+#~ msgid "Modem"
+#~ msgstr "Modem"
+
+#~ msgid "Handset"
+#~ msgstr "Handset"
+
+#~ msgid "Other"
+#~ msgstr "Overig"
+
+#~ msgid "None"
+#~ msgstr "Geen"
+
+#~ msgid "On"
+#~ msgstr "Aan"
+
+#~ msgid "Off"
+#~ msgstr "Uit"
+
+#~ msgid "Mute"
+#~ msgstr "Dempen"
+
+#~ msgid "Fast"
+#~ msgstr "Snel"
+
+#~ msgid "Very Low"
+#~ msgstr "Zeer laag"
+
+#~ msgid "Low"
+#~ msgstr "Laag"
+
+#~ msgid "Medium"
+#~ msgstr "Middel"
+
+#~ msgid "High"
+#~ msgstr "Hoog"
+
+#~ msgid "Very High"
+#~ msgstr "Zeer hoog"
+
+#~ msgid "Production"
+#~ msgstr "Productie"
+
+#~ msgid "Front Panel Microphone"
+#~ msgstr "Microfoon in frontpaneel"
+
+#~ msgid "Front Panel Line In"
+#~ msgstr "Lijn-in in frontpaneel"
+
+#~ msgid "Front Panel Headphones"
+#~ msgstr "Hoofdtelefoons in frontpaneel"
+
+#~ msgid "Front Panel Line Out"
+#~ msgstr "Lijn-uit in frontpaneel"
+
+#~ msgid "Green Connector"
+#~ msgstr "Groene connector"
+
+#~ msgid "Pink Connector"
+#~ msgstr "Roze connector"
+
+#~ msgid "Blue Connector"
+#~ msgstr "Blauwe connector"
+
+#~ msgid "White Connector"
+#~ msgstr "Witte connector"
+
+#~ msgid "Black Connector"
+#~ msgstr "Zwarte connector"
+
+#~ msgid "Gray Connector"
+#~ msgstr "Grijze connector"
+
+#~ msgid "Orange Connector"
+#~ msgstr "Oranje connector"
+
+#~ msgid "Red Connector"
+#~ msgstr "Rode connector"
+
+#~ msgid "Yellow Connector"
+#~ msgstr "Gele connector"
+
+#~ msgid "Green Front Panel Connector"
+#~ msgstr "Groene connector in frontpaneel"
+
+#~ msgid "Pink Front Panel Connector"
+#~ msgstr "Roze connector in frontpaneel"
+
+#~ msgid "Blue Front Panel Connector"
+#~ msgstr "Blauwe connector in frontpaneel"
+
+#~ msgid "White Front Panel Connector"
+#~ msgstr "Witte connector in frontpaneel"
+
+#~ msgid "Black Front Panel Connector"
+#~ msgstr "Zwarte connector in frontpaneel"
+
+#~ msgid "Gray Front Panel Connector"
+#~ msgstr "Grijze connector in frontpaneel"
+
+#~ msgid "Orange Front Panel Connector"
+#~ msgstr "Oranje connector in frontpaneel"
+
+#~ msgid "Red Front Panel Connector"
+#~ msgstr "Rode connector in frontpaneel"
+
+#~ msgid "Yellow Front Panel Connector"
+#~ msgstr "Gele connector in frontpaneel"
+
+#~ msgid "Spread Output"
+#~ msgstr "Uitvoer spreiden"
+
+#~ msgid "Downmix"
+#~ msgstr "Downmix"
+
+#~ msgid "Virtual Mixer Input"
+#~ msgstr "Virtuele mixer-invoer"
+
+#~ msgid "Virtual Mixer Output"
+#~ msgstr "Virtuele mixer-uitvoer"
+
+#~ msgid "Virtual Mixer Channels"
+#~ msgstr "Virtuele mixer-kanalen"
+
+#~ msgid "%s %d Function"
+#~ msgstr "%s %d functie"
+
+#~ msgid "%s Function"
+#~ msgstr "%s-function"
+
#~ msgid "Error reading %d bytes on device '%s'."
#~ msgstr "Fout bij het lezen van %d bytes van apparaat '%s'."
diff --git a/po/or.gmo b/po/or.gmo
index 1d82613e1f1e00df9616ad693a8dd52ac5c5e26f..39f76ad058b3c26a69e64b5b18ae951e1929b0f7 100644
Binary files a/po/or.gmo and b/po/or.gmo differ
diff --git a/po/or.po b/po/or.po
index 0461576dd3afe639c91ce415d593509a1fa79cb0..a45844cdc5035a924f8b7f6ef4cf813385520fe3 100644
--- a/po/or.po
+++ b/po/or.po
@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: gst-plugins-0.8.3\n"
"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/\n"
-"POT-Creation-Date: 2012-04-12 10:26+0200\n"
+"POT-Creation-Date: 2012-05-13 16:29+0200\n"
"PO-Revision-Date: 2004-09-27 13:32+0530\n"
"Last-Translator: Gora Mohanty <gora_mohanty@yahoo.co.in>\n"
"Language-Team: Oriya <gora_mohanty@yahoo.co.in>\n"
@@ -96,81 +96,6 @@ msgstr ""
msgid "Internal data flow error."
msgstr ""
-msgid "Volume"
-msgstr "ପàରବଳତା"
-
-msgid "Bass"
-msgstr "ଅନàଚàଚ ସàବର"
-
-msgid "Treble"
-msgstr "ଉଚàଚ ସàବର"
-
-msgid "Synth"
-msgstr "ସିନàଥà‡à¬¸à¬¾à¬‡à¬œà¬°"
-
-msgid "PCM"
-msgstr "ପି.ସି.à¬à¬®."
-
-msgid "Speaker"
-msgstr "ସàବରବରàଦàଧକ àŸà¬¨àତàର"
-
-msgid "Line-in"
-msgstr "ଲାଇନ-ଇନ"
-
-msgid "Microphone"
-msgstr "ମାଇକàରà‹à¬«à‹à¬¨à"
-
-msgid "CD"
-msgstr "ସି.ଡି."
-
-msgid "Mixer"
-msgstr "ମିଶàରଣ ଯନàତàର"
-
-msgid "PCM-2"
-msgstr "ପି.ସି.à¬à¬®.-à¨"
-
-msgid "Record"
-msgstr "ଅନàଲିପିକରଣ"
-
-msgid "In-gain"
-msgstr "ନିବà‡à¬¶-ବàƒà¬¦àଧି"
-
-msgid "Out-gain"
-msgstr "ନିରàଗମ-ବàƒà¬¦àଧି"
-
-msgid "Line-1"
-msgstr "ଲାଇନ-à§"
-
-msgid "Line-2"
-msgstr "ଲାଇନ-à¨"
-
-msgid "Line-3"
-msgstr "ଲାଇନ-à©"
-
-msgid "Digital-1"
-msgstr "ସାଂଖàଯିକ-à§"
-
-msgid "Digital-2"
-msgstr "ସାଂଖàଯିକ-à¨"
-
-msgid "Digital-3"
-msgstr "ସାଂଖàଯିକ-à©"
-
-msgid "Phone-in"
-msgstr "ଫà‹à¬¨-ନିବà‡à¬¶"
-
-msgid "Phone-out"
-msgstr "ଫà‹à¬¨-ନିରàଗମ"
-
-msgid "Video"
-msgstr "à¬à¬¿à¬¡à¬¿à¬“"
-
-msgid "Radio"
-msgstr "ରà‡à¬¡à¬¿à¬“"
-
-msgid "Monitor"
-msgstr "ପàରଦରàଶିକା"
-
msgid ""
"Could not open audio device for playback. Device is being used by another "
"application."
@@ -196,347 +121,49 @@ msgstr "ସି.ଡି. ଯନàତàର ପଢ଼ିବା ପାଇଠଖà‹
msgid "Could not open audio device for recording."
msgstr "ସି.ଡି. ଯନàତàର ପଢ଼ିବା ପାଇଠଖà‹à¬²à¬¿à¬¹à‡à¬²à¬¾ ନାହିà¬."
-#, fuzzy
-msgid "Could not open audio device for mixer control handling."
-msgstr "\"%s\" ଧàବନି ଯନàତàର ଲà‡à¬–ିବା ପାଇଠଖà‹à¬²à¬¿à¬¹à‡à¬²à¬¾ ନାହିà¬."
-
-#, fuzzy
msgid ""
-"Could not open audio device for mixer control handling. This version of the "
-"Open Sound System is not supported by this element."
-msgstr "\"%s\" ଧàବନି ଯନàତàର ଲà‡à¬–ିବା ପାଇଠଖà‹à¬²à¬¿à¬¹à‡à¬²à¬¾ ନାହିà¬."
-
-msgid "Master"
-msgstr ""
-
-msgid "Front"
-msgstr ""
-
-#, fuzzy
-msgid "Rear"
-msgstr "ଅନàଲିପିକରଣ"
-
-msgid "Headphones"
-msgstr ""
-
-msgid "Center"
-msgstr ""
-
-msgid "LFE"
-msgstr ""
-
-msgid "Surround"
-msgstr ""
-
-#, fuzzy
-msgid "Side"
-msgstr "à¬à¬¿à¬¡à¬¿à¬“"
-
-#, fuzzy
-msgid "Built-in Speaker"
-msgstr "ସàବରବରàଦàଧକ àŸà¬¨àତàର"
-
-msgid "AUX 1 Out"
-msgstr ""
-
-msgid "AUX 2 Out"
-msgstr ""
-
-msgid "AUX Out"
-msgstr ""
-
-msgid "3D Depth"
-msgstr ""
-
-msgid "3D Center"
-msgstr ""
-
-msgid "3D Enhance"
-msgstr ""
-
-msgid "Telephone"
-msgstr ""
-
-msgid "Line Out"
-msgstr ""
-
-#, fuzzy
-msgid "Line In"
-msgstr "ଲାଇନ-ଇନ"
-
-msgid "Internal CD"
-msgstr ""
-
-msgid "Video In"
-msgstr ""
-
-msgid "AUX 1 In"
-msgstr ""
-
-msgid "AUX 2 In"
-msgstr ""
-
-msgid "AUX In"
-msgstr ""
-
-msgid "Record Gain"
+"Could not open audio device for playback. This version of the Open Sound "
+"System is not supported by this element."
msgstr ""
-#, fuzzy
-msgid "Output Gain"
-msgstr "ନିରàଗମ-ବàƒà¬¦àଧି"
-
-#, fuzzy
-msgid "Microphone Boost"
-msgstr "ମାଇକàରà‹à¬«à‹à¬¨à"
-
-msgid "Loopback"
+msgid "Playback is not supported by this audio device."
msgstr ""
-msgid "Diagnostic"
+msgid "Audio playback error."
msgstr ""
-msgid "Bass Boost"
+msgid "Recording is not supported by this audio device."
msgstr ""
-msgid "Playback Ports"
+msgid "Error recording from audio device."
msgstr ""
-msgid "Input"
-msgstr ""
+msgid "Volume"
+msgstr "ପàରବଳତା"
-msgid "Record Source"
+msgid "Gain"
msgstr ""
-#, fuzzy
-msgid "Monitor Source"
+msgid "Monitor"
msgstr "ପàରଦରàଶିକା"
-msgid "Keyboard Beep"
-msgstr ""
-
-msgid "Simulate Stereo"
-msgstr ""
-
-msgid "Stereo"
-msgstr ""
-
-msgid "Surround Sound"
-msgstr ""
-
-#, fuzzy
-msgid "Microphone Gain"
-msgstr "ମାଇକàରà‹à¬«à‹à¬¨à"
-
#, fuzzy
-msgid "Speaker Source"
+msgid "Built-in Speaker"
msgstr "ସàବରବରàଦàଧକ àŸà¬¨àତàର"
-#, fuzzy
-msgid "Microphone Source"
-msgstr "ମାଇକàରà‹à¬«à‹à¬¨à"
-
-msgid "Jack"
-msgstr ""
-
-msgid "Center / LFE"
-msgstr ""
-
-msgid "Stereo Mix"
-msgstr ""
-
-msgid "Mono Mix"
-msgstr ""
-
-msgid "Input Mix"
+msgid "Headphone"
msgstr ""
-msgid "SPDIF In"
+msgid "Line Out"
msgstr ""
msgid "SPDIF Out"
msgstr ""
-#, fuzzy
-msgid "Microphone 1"
-msgstr "ମାଇକàରà‹à¬«à‹à¬¨à"
-
-#, fuzzy
-msgid "Microphone 2"
-msgstr "ମାଇକàରà‹à¬«à‹à¬¨à"
-
-#, fuzzy
-msgid "Digital Out"
-msgstr "ସାଂଖàଯିକ-à§"
-
-#, fuzzy
-msgid "Digital In"
-msgstr "ସାଂଖàଯିକ-à§"
-
-msgid "HDMI"
-msgstr ""
-
-msgid "Modem"
-msgstr ""
-
-msgid "Handset"
-msgstr ""
-
-msgid "Other"
-msgstr ""
-
-msgid "None"
-msgstr ""
-
-msgid "On"
-msgstr ""
-
-msgid "Off"
-msgstr ""
-
-msgid "Mute"
-msgstr ""
-
-msgid "Fast"
-msgstr ""
-
-#. TRANSLATORS: "Very Low" is a quality setting here
-msgid "Very Low"
-msgstr ""
-
-#. TRANSLATORS: "Low" is a quality setting here
-msgid "Low"
-msgstr ""
-
-#. TRANSLATORS: "Medium" is a quality setting here
-msgid "Medium"
-msgstr ""
-
-#. TRANSLATORS: "High" is a quality setting here
-msgid "High"
-msgstr ""
-
-#. TRANSLATORS: "Very High" is a quality setting here
-msgid "Very High"
-msgstr ""
-
-#. TRANSLATORS: "Production" is a quality setting here
-msgid "Production"
-msgstr ""
-
-#, fuzzy
-msgid "Front Panel Microphone"
-msgstr "ମାଇକàରà‹à¬«à‹à¬¨à"
-
-msgid "Front Panel Line In"
-msgstr ""
-
-msgid "Front Panel Headphones"
-msgstr ""
-
-msgid "Front Panel Line Out"
-msgstr ""
-
-msgid "Green Connector"
-msgstr ""
-
-msgid "Pink Connector"
-msgstr ""
-
-msgid "Blue Connector"
-msgstr ""
-
-msgid "White Connector"
-msgstr ""
-
-msgid "Black Connector"
-msgstr ""
-
-msgid "Gray Connector"
-msgstr ""
-
-msgid "Orange Connector"
-msgstr ""
-
-msgid "Red Connector"
-msgstr ""
-
-msgid "Yellow Connector"
-msgstr ""
-
-msgid "Green Front Panel Connector"
-msgstr ""
-
-msgid "Pink Front Panel Connector"
-msgstr ""
-
-msgid "Blue Front Panel Connector"
-msgstr ""
-
-msgid "White Front Panel Connector"
-msgstr ""
-
-msgid "Black Front Panel Connector"
-msgstr ""
-
-msgid "Gray Front Panel Connector"
-msgstr ""
-
-msgid "Orange Front Panel Connector"
-msgstr ""
-
-msgid "Red Front Panel Connector"
-msgstr ""
-
-msgid "Yellow Front Panel Connector"
-msgstr ""
-
-msgid "Spread Output"
-msgstr ""
-
-msgid "Downmix"
-msgstr ""
-
-msgid "Virtual Mixer Input"
-msgstr ""
-
-msgid "Virtual Mixer Output"
-msgstr ""
-
-msgid "Virtual Mixer Channels"
-msgstr ""
-
-#. TRANSLATORS: name + number of a volume mixer control
-#, c-format
-msgid "%s %d Function"
-msgstr ""
-
-#. TRANSLATORS: name of a volume mixer control
-#, c-format
-msgid "%s Function"
-msgstr ""
-
-msgid ""
-"Could not open audio device for playback. This version of the Open Sound "
-"System is not supported by this element."
-msgstr ""
-
-msgid "Playback is not supported by this audio device."
-msgstr ""
-
-msgid "Audio playback error."
-msgstr ""
-
-msgid "Recording is not supported by this audio device."
-msgstr ""
-
-msgid "Error recording from audio device."
-msgstr ""
-
-msgid "Gain"
+msgid "AUX 1 Out"
msgstr ""
-msgid "Headphone"
+msgid "AUX 2 Out"
msgstr ""
#, fuzzy, c-format
@@ -706,6 +333,141 @@ msgstr ""
msgid "Cannot operate without a clock"
msgstr ""
+#~ msgid "Bass"
+#~ msgstr "ଅନàଚàଚ ସàବର"
+
+#~ msgid "Treble"
+#~ msgstr "ଉଚàଚ ସàବର"
+
+#~ msgid "Synth"
+#~ msgstr "ସିନàଥà‡à¬¸à¬¾à¬‡à¬œà¬°"
+
+#~ msgid "PCM"
+#~ msgstr "ପି.ସି.à¬à¬®."
+
+#~ msgid "Speaker"
+#~ msgstr "ସàବରବରàଦàଧକ àŸà¬¨àତàର"
+
+#~ msgid "Line-in"
+#~ msgstr "ଲାଇନ-ଇନ"
+
+#~ msgid "Microphone"
+#~ msgstr "ମାଇକàରà‹à¬«à‹à¬¨à"
+
+#~ msgid "CD"
+#~ msgstr "ସି.ଡି."
+
+#~ msgid "Mixer"
+#~ msgstr "ମିଶàରଣ ଯନàତàର"
+
+#~ msgid "PCM-2"
+#~ msgstr "ପି.ସି.à¬à¬®.-à¨"
+
+#~ msgid "Record"
+#~ msgstr "ଅନàଲିପିକରଣ"
+
+#~ msgid "In-gain"
+#~ msgstr "ନିବà‡à¬¶-ବàƒà¬¦àଧି"
+
+#~ msgid "Out-gain"
+#~ msgstr "ନିରàଗମ-ବàƒà¬¦àଧି"
+
+#~ msgid "Line-1"
+#~ msgstr "ଲାଇନ-à§"
+
+#~ msgid "Line-2"
+#~ msgstr "ଲାଇନ-à¨"
+
+#~ msgid "Line-3"
+#~ msgstr "ଲାଇନ-à©"
+
+#~ msgid "Digital-1"
+#~ msgstr "ସାଂଖàଯିକ-à§"
+
+#~ msgid "Digital-2"
+#~ msgstr "ସାଂଖàଯିକ-à¨"
+
+#~ msgid "Digital-3"
+#~ msgstr "ସାଂଖàଯିକ-à©"
+
+#~ msgid "Phone-in"
+#~ msgstr "ଫà‹à¬¨-ନିବà‡à¬¶"
+
+#~ msgid "Phone-out"
+#~ msgstr "ଫà‹à¬¨-ନିରàଗମ"
+
+#~ msgid "Video"
+#~ msgstr "à¬à¬¿à¬¡à¬¿à¬“"
+
+#~ msgid "Radio"
+#~ msgstr "ରà‡à¬¡à¬¿à¬“"
+
+#, fuzzy
+#~ msgid "Could not open audio device for mixer control handling."
+#~ msgstr "\"%s\" ଧàବନି ଯନàତàର ଲà‡à¬–ିବା ପାଇଠଖà‹à¬²à¬¿à¬¹à‡à¬²à¬¾ ନାହିà¬."
+
+#, fuzzy
+#~ msgid ""
+#~ "Could not open audio device for mixer control handling. This version of "
+#~ "the Open Sound System is not supported by this element."
+#~ msgstr "\"%s\" ଧàବନି ଯନàତàର ଲà‡à¬–ିବା ପାଇଠଖà‹à¬²à¬¿à¬¹à‡à¬²à¬¾ ନାହିà¬."
+
+#, fuzzy
+#~ msgid "Rear"
+#~ msgstr "ଅନàଲିପିକରଣ"
+
+#, fuzzy
+#~ msgid "Side"
+#~ msgstr "à¬à¬¿à¬¡à¬¿à¬“"
+
+#, fuzzy
+#~ msgid "Line In"
+#~ msgstr "ଲାଇନ-ଇନ"
+
+#, fuzzy
+#~ msgid "Output Gain"
+#~ msgstr "ନିରàଗମ-ବàƒà¬¦àଧି"
+
+#, fuzzy
+#~ msgid "Microphone Boost"
+#~ msgstr "ମାଇକàରà‹à¬«à‹à¬¨à"
+
+#, fuzzy
+#~ msgid "Monitor Source"
+#~ msgstr "ପàରଦରàଶିକା"
+
+#, fuzzy
+#~ msgid "Microphone Gain"
+#~ msgstr "ମାଇକàରà‹à¬«à‹à¬¨à"
+
+#, fuzzy
+#~ msgid "Speaker Source"
+#~ msgstr "ସàବରବରàଦàଧକ àŸà¬¨àତàର"
+
+#, fuzzy
+#~ msgid "Microphone Source"
+#~ msgstr "ମାଇକàରà‹à¬«à‹à¬¨à"
+
+#, fuzzy
+#~ msgid "Microphone 1"
+#~ msgstr "ମାଇକàରà‹à¬«à‹à¬¨à"
+
+#, fuzzy
+#~ msgid "Microphone 2"
+#~ msgstr "ମାଇକàରà‹à¬«à‹à¬¨à"
+
+#, fuzzy
+#~ msgid "Digital Out"
+#~ msgstr "ସାଂଖàଯିକ-à§"
+
+#, fuzzy
+#~ msgid "Digital In"
+#~ msgstr "ସାଂଖàଯିକ-à§"
+
+#, fuzzy
+#~ msgid "Front Panel Microphone"
+#~ msgstr "ମାଇକàରà‹à¬«à‹à¬¨à"
+
#, fuzzy
#~ msgid "Could not enqueue buffers in device '%s'."
#~ msgstr "\"%s\" ଯନàତàରରà ଅସàଥାàŸà€ ସଞàà¬šàŸ à¬¸àଥାନ ଆଣିହà‡à¬²à¬¾ ନାହିà¬."
diff --git a/po/pl.gmo b/po/pl.gmo
index fd78b88ee415e86cf6b30ff49a86022e64372fff..8d89fbe24d0e8ae6b1424c0bb42df52a4860b910 100644
Binary files a/po/pl.gmo and b/po/pl.gmo differ
diff --git a/po/pl.po b/po/pl.po
index 298fb26f21296e54bc199562d11af0883fd71a07..f79f72cf185cf7d1388dce9ba5cbd3e9709ac822 100644
--- a/po/pl.po
+++ b/po/pl.po
@@ -6,7 +6,7 @@ msgid ""
msgstr ""
"Project-Id-Version: gst-plugins-good 0.10.26.2\n"
"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/\n"
-"POT-Creation-Date: 2012-04-12 10:26+0200\n"
+"POT-Creation-Date: 2012-05-13 16:29+0200\n"
"PO-Revision-Date: 2011-01-07 21:53+0100\n"
"Last-Translator: Jakub Bogusz <qboosh@pld-linux.org>\n"
"Language-Team: Polish <translation-team-pl@lists.sourceforge.net>\n"
@@ -95,81 +95,6 @@ msgstr ""
msgid "Internal data flow error."
msgstr "Błąd wewnętrzny przepływu danych."
-msgid "Volume"
-msgstr "Głośność"
-
-msgid "Bass"
-msgstr "Niskie"
-
-msgid "Treble"
-msgstr "Wysokie"
-
-msgid "Synth"
-msgstr "Syntezator"
-
-msgid "PCM"
-msgstr "PCM"
-
-msgid "Speaker"
-msgstr "Głośniczek"
-
-msgid "Line-in"
-msgstr "Wejście"
-
-msgid "Microphone"
-msgstr "Mikrofon"
-
-msgid "CD"
-msgstr "CD"
-
-msgid "Mixer"
-msgstr "Mikser"
-
-msgid "PCM-2"
-msgstr "PCM-2"
-
-msgid "Record"
-msgstr "Nagrywanie"
-
-msgid "In-gain"
-msgstr "Wzmocnienie we"
-
-msgid "Out-gain"
-msgstr "Wzmocnienie wy"
-
-msgid "Line-1"
-msgstr "Linia 1"
-
-msgid "Line-2"
-msgstr "Linia 2"
-
-msgid "Line-3"
-msgstr "Linia 3"
-
-msgid "Digital-1"
-msgstr "Cyfrowe 1"
-
-msgid "Digital-2"
-msgstr "Cyfrowe 2"
-
-msgid "Digital-3"
-msgstr "Cyfrowe 3"
-
-msgid "Phone-in"
-msgstr "Mikrofon"
-
-msgid "Phone-out"
-msgstr "SÅ‚uchawki"
-
-msgid "Video"
-msgstr "Obraz"
-
-msgid "Radio"
-msgstr "Radio"
-
-msgid "Monitor"
-msgstr "Monitor"
-
msgid ""
"Could not open audio device for playback. Device is being used by another "
"application."
@@ -197,311 +122,6 @@ msgstr ""
msgid "Could not open audio device for recording."
msgstr "Nie udało się otworzyć urządzenia dźwiękowego do nagrywania."
-msgid "Could not open audio device for mixer control handling."
-msgstr "Nie udało się otworzyć urządzenia dźwiękowego do sterowania mikserem."
-
-msgid ""
-"Could not open audio device for mixer control handling. This version of the "
-"Open Sound System is not supported by this element."
-msgstr ""
-"Nie udało się otworzyć urządzenia dźwiękowego do sterowania mikserem. Ta "
-"wersja Open Sound System nie jest obsługiwana przez ten element."
-
-msgid "Master"
-msgstr "Główna"
-
-msgid "Front"
-msgstr "Przód"
-
-msgid "Rear"
-msgstr "Tył"
-
-msgid "Headphones"
-msgstr "SÅ‚uchawki"
-
-msgid "Center"
-msgstr "Åšrodek"
-
-msgid "LFE"
-msgstr "LFE"
-
-msgid "Surround"
-msgstr "Surround"
-
-msgid "Side"
-msgstr "Boki"
-
-msgid "Built-in Speaker"
-msgstr "Wbudowany głośniczek"
-
-msgid "AUX 1 Out"
-msgstr "Wyjście AUX 1"
-
-msgid "AUX 2 Out"
-msgstr "Wyjście AUX 2"
-
-msgid "AUX Out"
-msgstr "Wyjście AUX"
-
-msgid "3D Depth"
-msgstr "Głębia 3D"
-
-msgid "3D Center"
-msgstr "Åšrodek 3D"
-
-msgid "3D Enhance"
-msgstr "Rozszerzenie 3D"
-
-msgid "Telephone"
-msgstr "Telefon"
-
-msgid "Line Out"
-msgstr "Wyjście linii"
-
-msgid "Line In"
-msgstr "Wejście linii"
-
-msgid "Internal CD"
-msgstr "Wewnętrzny CD"
-
-msgid "Video In"
-msgstr "Wejście video"
-
-msgid "AUX 1 In"
-msgstr "Wejście AUX 1"
-
-msgid "AUX 2 In"
-msgstr "Wejście AUX 2"
-
-msgid "AUX In"
-msgstr "Wejście AUX"
-
-msgid "Record Gain"
-msgstr "Wzmocnienie nagrywania"
-
-msgid "Output Gain"
-msgstr "Wzmocnienie wyjścia"
-
-msgid "Microphone Boost"
-msgstr "Podbicie mikrofonu"
-
-msgid "Loopback"
-msgstr "Pętla zwrotna"
-
-msgid "Diagnostic"
-msgstr "Diagnostyka"
-
-msgid "Bass Boost"
-msgstr "Podbicie basów"
-
-msgid "Playback Ports"
-msgstr "Porty odtwarzania"
-
-msgid "Input"
-msgstr "Wejście"
-
-msgid "Record Source"
-msgstr "Źródło nagrywania"
-
-msgid "Monitor Source"
-msgstr "Źródło monitora"
-
-msgid "Keyboard Beep"
-msgstr "Piszczenie klawiatury"
-
-msgid "Simulate Stereo"
-msgstr "Symulacja stereo"
-
-msgid "Stereo"
-msgstr "Stereo"
-
-msgid "Surround Sound"
-msgstr "Dźwięk surround"
-
-msgid "Microphone Gain"
-msgstr "Wzmocnienie mikrofonu"
-
-msgid "Speaker Source"
-msgstr "Źródło głośniczka"
-
-msgid "Microphone Source"
-msgstr "Źródło mikrofonu"
-
-msgid "Jack"
-msgstr "Gniazdo jack"
-
-msgid "Center / LFE"
-msgstr "Åšrodek / LFE"
-
-msgid "Stereo Mix"
-msgstr "Miksowanie stereo"
-
-msgid "Mono Mix"
-msgstr "Miksowanie mono"
-
-msgid "Input Mix"
-msgstr "Miksowanie wejścia"
-
-msgid "SPDIF In"
-msgstr "Wejście SPDIF"
-
-msgid "SPDIF Out"
-msgstr "Wyjście SPDIF"
-
-msgid "Microphone 1"
-msgstr "Mikrofon 1"
-
-msgid "Microphone 2"
-msgstr "Mikrofon 2"
-
-msgid "Digital Out"
-msgstr "Wyjście cyfrowe"
-
-msgid "Digital In"
-msgstr "Wejście cyfrowe"
-
-msgid "HDMI"
-msgstr "HDMI"
-
-msgid "Modem"
-msgstr "Modem"
-
-msgid "Handset"
-msgstr "Zestaw słuchawkowy"
-
-msgid "Other"
-msgstr "Inne"
-
-msgid "None"
-msgstr "Brak"
-
-msgid "On"
-msgstr "WÅ‚Ä…czone"
-
-msgid "Off"
-msgstr "Wyłączone"
-
-msgid "Mute"
-msgstr "Wyciszenie"
-
-msgid "Fast"
-msgstr "Szybko"
-
-#. TRANSLATORS: "Very Low" is a quality setting here
-msgid "Very Low"
-msgstr "Bardzo małe"
-
-#. TRANSLATORS: "Low" is a quality setting here
-msgid "Low"
-msgstr "Małe"
-
-#. TRANSLATORS: "Medium" is a quality setting here
-msgid "Medium"
-msgstr "Åšrednie"
-
-#. TRANSLATORS: "High" is a quality setting here
-msgid "High"
-msgstr "Duże"
-
-#. TRANSLATORS: "Very High" is a quality setting here
-msgid "Very High"
-msgstr "Bardzo duże"
-
-#. TRANSLATORS: "Production" is a quality setting here
-msgid "Production"
-msgstr "Produkcja"
-
-msgid "Front Panel Microphone"
-msgstr "Mikrofon na panelu przednim"
-
-msgid "Front Panel Line In"
-msgstr "Wejście linii na panelu przednim"
-
-msgid "Front Panel Headphones"
-msgstr "SÅ‚uchawki na panelu przednim"
-
-msgid "Front Panel Line Out"
-msgstr "Wyjśćie linii na panelu przednim"
-
-msgid "Green Connector"
-msgstr "ZÅ‚Ä…cze zielone"
-
-msgid "Pink Connector"
-msgstr "Złącze różowe"
-
-msgid "Blue Connector"
-msgstr "ZÅ‚Ä…cze niebieskie"
-
-msgid "White Connector"
-msgstr "Złącze białe"
-
-msgid "Black Connector"
-msgstr "ZÅ‚Ä…cze czarne"
-
-msgid "Gray Connector"
-msgstr "ZÅ‚Ä…cze szare"
-
-msgid "Orange Connector"
-msgstr "Złącze pomarańczowe"
-
-msgid "Red Connector"
-msgstr "ZÅ‚Ä…cze czerwone"
-
-msgid "Yellow Connector"
-msgstr "Złącze żółte"
-
-msgid "Green Front Panel Connector"
-msgstr "ZÅ‚Ä…cze zielone na panelu przednim"
-
-msgid "Pink Front Panel Connector"
-msgstr "Złącze różowe na panelu przednim"
-
-msgid "Blue Front Panel Connector"
-msgstr "ZÅ‚Ä…cze niebieskie na panelu przednim"
-
-msgid "White Front Panel Connector"
-msgstr "Złącze białe na panelu przednim"
-
-msgid "Black Front Panel Connector"
-msgstr "ZÅ‚Ä…cze czarne na panelu przednim"
-
-msgid "Gray Front Panel Connector"
-msgstr "ZÅ‚Ä…cze szare na panelu przednim"
-
-msgid "Orange Front Panel Connector"
-msgstr "Złącze pomarańczowe na panelu przednim"
-
-msgid "Red Front Panel Connector"
-msgstr "ZÅ‚Ä…cze czerwone na panelu przednim"
-
-msgid "Yellow Front Panel Connector"
-msgstr "Złącze żółte na panelu przednim"
-
-msgid "Spread Output"
-msgstr "Rozprowadzenie wyjścia"
-
-msgid "Downmix"
-msgstr "Miksowanie w dół"
-
-msgid "Virtual Mixer Input"
-msgstr "Wejście miksera wirtualnego"
-
-msgid "Virtual Mixer Output"
-msgstr "Wyjście miksera wirtualnego"
-
-msgid "Virtual Mixer Channels"
-msgstr "Kanały miksera wirtualnego"
-
-#. TRANSLATORS: name + number of a volume mixer control
-#, c-format
-msgid "%s %d Function"
-msgstr "Funkcja %s %d"
-
-#. TRANSLATORS: name of a volume mixer control
-#, c-format
-msgid "%s Function"
-msgstr "Funkcja %s"
-
msgid ""
"Could not open audio device for playback. This version of the Open Sound "
"System is not supported by this element."
@@ -521,12 +141,33 @@ msgstr "Nagrywanie nie jest obsługiwane przez to urządzenie dźwiękowe."
msgid "Error recording from audio device."
msgstr "Błąd nagrywania z urządzenia dźwiękowego."
+msgid "Volume"
+msgstr "Głośność"
+
msgid "Gain"
msgstr "Wzmocnienie"
+msgid "Monitor"
+msgstr "Monitor"
+
+msgid "Built-in Speaker"
+msgstr "Wbudowany głośniczek"
+
msgid "Headphone"
msgstr "SÅ‚uchawki"
+msgid "Line Out"
+msgstr "Wyjście linii"
+
+msgid "SPDIF Out"
+msgstr "Wyjście SPDIF"
+
+msgid "AUX 1 Out"
+msgstr "Wyjście AUX 1"
+
+msgid "AUX 2 Out"
+msgstr "Wyjście AUX 2"
+
#, c-format
msgid "Error reading %d bytes from device '%s'."
msgstr "Błąd odczytu %d bajtów z urządzenia '%s'."
@@ -706,6 +347,356 @@ msgstr "Zmiana rozdzielczości w czasie działania nie jest jeszcze obsługiwana
msgid "Cannot operate without a clock"
msgstr "Nie można pracować bez zegara"
+#~ msgid "Bass"
+#~ msgstr "Niskie"
+
+#~ msgid "Treble"
+#~ msgstr "Wysokie"
+
+#~ msgid "Synth"
+#~ msgstr "Syntezator"
+
+#~ msgid "PCM"
+#~ msgstr "PCM"
+
+#~ msgid "Speaker"
+#~ msgstr "Głośniczek"
+
+#~ msgid "Line-in"
+#~ msgstr "Wejście"
+
+#~ msgid "Microphone"
+#~ msgstr "Mikrofon"
+
+#~ msgid "CD"
+#~ msgstr "CD"
+
+#~ msgid "Mixer"
+#~ msgstr "Mikser"
+
+#~ msgid "PCM-2"
+#~ msgstr "PCM-2"
+
+#~ msgid "Record"
+#~ msgstr "Nagrywanie"
+
+#~ msgid "In-gain"
+#~ msgstr "Wzmocnienie we"
+
+#~ msgid "Out-gain"
+#~ msgstr "Wzmocnienie wy"
+
+#~ msgid "Line-1"
+#~ msgstr "Linia 1"
+
+#~ msgid "Line-2"
+#~ msgstr "Linia 2"
+
+#~ msgid "Line-3"
+#~ msgstr "Linia 3"
+
+#~ msgid "Digital-1"
+#~ msgstr "Cyfrowe 1"
+
+#~ msgid "Digital-2"
+#~ msgstr "Cyfrowe 2"
+
+#~ msgid "Digital-3"
+#~ msgstr "Cyfrowe 3"
+
+#~ msgid "Phone-in"
+#~ msgstr "Mikrofon"
+
+#~ msgid "Phone-out"
+#~ msgstr "SÅ‚uchawki"
+
+#~ msgid "Video"
+#~ msgstr "Obraz"
+
+#~ msgid "Radio"
+#~ msgstr "Radio"
+
+#~ msgid "Could not open audio device for mixer control handling."
+#~ msgstr ""
+#~ "Nie udało się otworzyć urządzenia dźwiękowego do sterowania mikserem."
+
+#~ msgid ""
+#~ "Could not open audio device for mixer control handling. This version of "
+#~ "the Open Sound System is not supported by this element."
+#~ msgstr ""
+#~ "Nie udało się otworzyć urządzenia dźwiękowego do sterowania mikserem. Ta "
+#~ "wersja Open Sound System nie jest obsługiwana przez ten element."
+
+#~ msgid "Master"
+#~ msgstr "Główna"
+
+#~ msgid "Front"
+#~ msgstr "Przód"
+
+#~ msgid "Rear"
+#~ msgstr "Tył"
+
+#~ msgid "Headphones"
+#~ msgstr "SÅ‚uchawki"
+
+#~ msgid "Center"
+#~ msgstr "Åšrodek"
+
+#~ msgid "LFE"
+#~ msgstr "LFE"
+
+#~ msgid "Surround"
+#~ msgstr "Surround"
+
+#~ msgid "Side"
+#~ msgstr "Boki"
+
+#~ msgid "AUX Out"
+#~ msgstr "Wyjście AUX"
+
+#~ msgid "3D Depth"
+#~ msgstr "Głębia 3D"
+
+#~ msgid "3D Center"
+#~ msgstr "Åšrodek 3D"
+
+#~ msgid "3D Enhance"
+#~ msgstr "Rozszerzenie 3D"
+
+#~ msgid "Telephone"
+#~ msgstr "Telefon"
+
+#~ msgid "Line In"
+#~ msgstr "Wejście linii"
+
+#~ msgid "Internal CD"
+#~ msgstr "Wewnętrzny CD"
+
+#~ msgid "Video In"
+#~ msgstr "Wejście video"
+
+#~ msgid "AUX 1 In"
+#~ msgstr "Wejście AUX 1"
+
+#~ msgid "AUX 2 In"
+#~ msgstr "Wejście AUX 2"
+
+#~ msgid "AUX In"
+#~ msgstr "Wejście AUX"
+
+#~ msgid "Record Gain"
+#~ msgstr "Wzmocnienie nagrywania"
+
+#~ msgid "Output Gain"
+#~ msgstr "Wzmocnienie wyjścia"
+
+#~ msgid "Microphone Boost"
+#~ msgstr "Podbicie mikrofonu"
+
+#~ msgid "Loopback"
+#~ msgstr "Pętla zwrotna"
+
+#~ msgid "Diagnostic"
+#~ msgstr "Diagnostyka"
+
+#~ msgid "Bass Boost"
+#~ msgstr "Podbicie basów"
+
+#~ msgid "Playback Ports"
+#~ msgstr "Porty odtwarzania"
+
+#~ msgid "Input"
+#~ msgstr "Wejście"
+
+#~ msgid "Record Source"
+#~ msgstr "Źródło nagrywania"
+
+#~ msgid "Monitor Source"
+#~ msgstr "Źródło monitora"
+
+#~ msgid "Keyboard Beep"
+#~ msgstr "Piszczenie klawiatury"
+
+#~ msgid "Simulate Stereo"
+#~ msgstr "Symulacja stereo"
+
+#~ msgid "Stereo"
+#~ msgstr "Stereo"
+
+#~ msgid "Surround Sound"
+#~ msgstr "Dźwięk surround"
+
+#~ msgid "Microphone Gain"
+#~ msgstr "Wzmocnienie mikrofonu"
+
+#~ msgid "Speaker Source"
+#~ msgstr "Źródło głośniczka"
+
+#~ msgid "Microphone Source"
+#~ msgstr "Źródło mikrofonu"
+
+#~ msgid "Jack"
+#~ msgstr "Gniazdo jack"
+
+#~ msgid "Center / LFE"
+#~ msgstr "Åšrodek / LFE"
+
+#~ msgid "Stereo Mix"
+#~ msgstr "Miksowanie stereo"
+
+#~ msgid "Mono Mix"
+#~ msgstr "Miksowanie mono"
+
+#~ msgid "Input Mix"
+#~ msgstr "Miksowanie wejścia"
+
+#~ msgid "SPDIF In"
+#~ msgstr "Wejście SPDIF"
+
+#~ msgid "Microphone 1"
+#~ msgstr "Mikrofon 1"
+
+#~ msgid "Microphone 2"
+#~ msgstr "Mikrofon 2"
+
+#~ msgid "Digital Out"
+#~ msgstr "Wyjście cyfrowe"
+
+#~ msgid "Digital In"
+#~ msgstr "Wejście cyfrowe"
+
+#~ msgid "HDMI"
+#~ msgstr "HDMI"
+
+#~ msgid "Modem"
+#~ msgstr "Modem"
+
+#~ msgid "Handset"
+#~ msgstr "Zestaw słuchawkowy"
+
+#~ msgid "Other"
+#~ msgstr "Inne"
+
+#~ msgid "None"
+#~ msgstr "Brak"
+
+#~ msgid "On"
+#~ msgstr "WÅ‚Ä…czone"
+
+#~ msgid "Off"
+#~ msgstr "Wyłączone"
+
+#~ msgid "Mute"
+#~ msgstr "Wyciszenie"
+
+#~ msgid "Fast"
+#~ msgstr "Szybko"
+
+#~ msgid "Very Low"
+#~ msgstr "Bardzo małe"
+
+#~ msgid "Low"
+#~ msgstr "Małe"
+
+#~ msgid "Medium"
+#~ msgstr "Åšrednie"
+
+#~ msgid "High"
+#~ msgstr "Duże"
+
+#~ msgid "Very High"
+#~ msgstr "Bardzo duże"
+
+#~ msgid "Production"
+#~ msgstr "Produkcja"
+
+#~ msgid "Front Panel Microphone"
+#~ msgstr "Mikrofon na panelu przednim"
+
+#~ msgid "Front Panel Line In"
+#~ msgstr "Wejście linii na panelu przednim"
+
+#~ msgid "Front Panel Headphones"
+#~ msgstr "SÅ‚uchawki na panelu przednim"
+
+#~ msgid "Front Panel Line Out"
+#~ msgstr "Wyjśćie linii na panelu przednim"
+
+#~ msgid "Green Connector"
+#~ msgstr "ZÅ‚Ä…cze zielone"
+
+#~ msgid "Pink Connector"
+#~ msgstr "Złącze różowe"
+
+#~ msgid "Blue Connector"
+#~ msgstr "ZÅ‚Ä…cze niebieskie"
+
+#~ msgid "White Connector"
+#~ msgstr "Złącze białe"
+
+#~ msgid "Black Connector"
+#~ msgstr "ZÅ‚Ä…cze czarne"
+
+#~ msgid "Gray Connector"
+#~ msgstr "ZÅ‚Ä…cze szare"
+
+#~ msgid "Orange Connector"
+#~ msgstr "Złącze pomarańczowe"
+
+#~ msgid "Red Connector"
+#~ msgstr "ZÅ‚Ä…cze czerwone"
+
+#~ msgid "Yellow Connector"
+#~ msgstr "Złącze żółte"
+
+#~ msgid "Green Front Panel Connector"
+#~ msgstr "ZÅ‚Ä…cze zielone na panelu przednim"
+
+#~ msgid "Pink Front Panel Connector"
+#~ msgstr "Złącze różowe na panelu przednim"
+
+#~ msgid "Blue Front Panel Connector"
+#~ msgstr "ZÅ‚Ä…cze niebieskie na panelu przednim"
+
+#~ msgid "White Front Panel Connector"
+#~ msgstr "Złącze białe na panelu przednim"
+
+#~ msgid "Black Front Panel Connector"
+#~ msgstr "ZÅ‚Ä…cze czarne na panelu przednim"
+
+#~ msgid "Gray Front Panel Connector"
+#~ msgstr "ZÅ‚Ä…cze szare na panelu przednim"
+
+#~ msgid "Orange Front Panel Connector"
+#~ msgstr "Złącze pomarańczowe na panelu przednim"
+
+#~ msgid "Red Front Panel Connector"
+#~ msgstr "ZÅ‚Ä…cze czerwone na panelu przednim"
+
+#~ msgid "Yellow Front Panel Connector"
+#~ msgstr "Złącze żółte na panelu przednim"
+
+#~ msgid "Spread Output"
+#~ msgstr "Rozprowadzenie wyjścia"
+
+#~ msgid "Downmix"
+#~ msgstr "Miksowanie w dół"
+
+#~ msgid "Virtual Mixer Input"
+#~ msgstr "Wejście miksera wirtualnego"
+
+#~ msgid "Virtual Mixer Output"
+#~ msgstr "Wyjście miksera wirtualnego"
+
+#~ msgid "Virtual Mixer Channels"
+#~ msgstr "Kanały miksera wirtualnego"
+
+#~ msgid "%s %d Function"
+#~ msgstr "Funkcja %s %d"
+
+#~ msgid "%s Function"
+#~ msgstr "Funkcja %s"
+
#~ msgid "Error reading %d bytes on device '%s'."
#~ msgstr "Błąd odczytu %d bajtów z urządzenia '%s'."
diff --git a/po/pt_BR.gmo b/po/pt_BR.gmo
index f641040bfba633b857889082eaf1819ea8561306..a7c5eb456fdd97c371d03d0c5d2d93463a6f58b5 100644
Binary files a/po/pt_BR.gmo and b/po/pt_BR.gmo differ
diff --git a/po/pt_BR.po b/po/pt_BR.po
index 7487cc0e066449fcd4d7dead08727b302d9948c0..1c51be92acab7e718027e5453f7ccd618e26b90b 100644
--- a/po/pt_BR.po
+++ b/po/pt_BR.po
@@ -11,7 +11,7 @@ msgid ""
msgstr ""
"Project-Id-Version: gst-plugins-good 0.10.26.2\n"
"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/\n"
-"POT-Creation-Date: 2012-04-12 10:26+0200\n"
+"POT-Creation-Date: 2012-05-13 16:29+0200\n"
"PO-Revision-Date: 2011-01-08 01:28-0300\n"
"Last-Translator: FabrÃcio Godoy <skarllot@gmail.com>\n"
"Language-Team: Brazilian Portuguese <ldp-br@bazar.conectiva.com.br>\n"
@@ -102,81 +102,6 @@ msgstr ""
msgid "Internal data flow error."
msgstr "Erro interno no fluxo de dados."
-msgid "Volume"
-msgstr "Volume"
-
-msgid "Bass"
-msgstr "Grave"
-
-msgid "Treble"
-msgstr "Agudo"
-
-msgid "Synth"
-msgstr "Sintetizador"
-
-msgid "PCM"
-msgstr "PCM"
-
-msgid "Speaker"
-msgstr "Alto-falante"
-
-msgid "Line-in"
-msgstr "Entrada de linha"
-
-msgid "Microphone"
-msgstr "Microfone"
-
-msgid "CD"
-msgstr "CD"
-
-msgid "Mixer"
-msgstr "Mixer"
-
-msgid "PCM-2"
-msgstr "PCM-2"
-
-msgid "Record"
-msgstr "Gravação"
-
-msgid "In-gain"
-msgstr "Ganho de entrada"
-
-msgid "Out-gain"
-msgstr "Ganho de saÃda"
-
-msgid "Line-1"
-msgstr "Linha 1"
-
-msgid "Line-2"
-msgstr "Linha 2"
-
-msgid "Line-3"
-msgstr "Linha 3"
-
-msgid "Digital-1"
-msgstr "Digital 1"
-
-msgid "Digital-2"
-msgstr "Digital 2"
-
-msgid "Digital-3"
-msgstr "Digital 3"
-
-msgid "Phone-in"
-msgstr "Entrada de fone"
-
-msgid "Phone-out"
-msgstr "SaÃda de fone"
-
-msgid "Video"
-msgstr "VÃdeo"
-
-msgid "Radio"
-msgstr "Rádio"
-
-msgid "Monitor"
-msgstr "Monitorador"
-
msgid ""
"Could not open audio device for playback. Device is being used by another "
"application."
@@ -204,314 +129,6 @@ msgstr ""
msgid "Could not open audio device for recording."
msgstr "Não foi possÃvel abrir o dispositivo de áudio para gravação."
-msgid "Could not open audio device for mixer control handling."
-msgstr ""
-"Não foi possÃvel abrir o dispositivo de áudio para manipulação do "
-"controlador do mixer."
-
-msgid ""
-"Could not open audio device for mixer control handling. This version of the "
-"Open Sound System is not supported by this element."
-msgstr ""
-"Não foi possÃvel abrir o dispositivo de áudio para manipulação do "
-"controlador do mixer. Não há suporte a este elemento com esta versão do "
-"Sistema Aberto de Som (OSS)."
-
-msgid "Master"
-msgstr "Principal"
-
-msgid "Front"
-msgstr "Frontal"
-
-msgid "Rear"
-msgstr "Traseira"
-
-msgid "Headphones"
-msgstr "Fones de ouvido"
-
-msgid "Center"
-msgstr "Central"
-
-msgid "LFE"
-msgstr "LFE"
-
-msgid "Surround"
-msgstr "Surround"
-
-msgid "Side"
-msgstr "Lateral"
-
-msgid "Built-in Speaker"
-msgstr "Alto-falante interno"
-
-msgid "AUX 1 Out"
-msgstr "SaÃda aux. 1"
-
-msgid "AUX 2 Out"
-msgstr "SaÃda aux. 2"
-
-msgid "AUX Out"
-msgstr "SaÃda aux."
-
-msgid "3D Depth"
-msgstr "Profundidade 3D"
-
-msgid "3D Center"
-msgstr "3D central"
-
-msgid "3D Enhance"
-msgstr "Realce 3D"
-
-msgid "Telephone"
-msgstr "Telefone"
-
-msgid "Line Out"
-msgstr "SaÃda de linha"
-
-msgid "Line In"
-msgstr "Entrada de linha"
-
-msgid "Internal CD"
-msgstr "CD interno"
-
-msgid "Video In"
-msgstr "Entrada de vÃdeo"
-
-msgid "AUX 1 In"
-msgstr "Entrada aux. 1"
-
-msgid "AUX 2 In"
-msgstr "Entrada aux. 2"
-
-msgid "AUX In"
-msgstr "Entrada aux."
-
-msgid "Record Gain"
-msgstr "Ganho de gravação"
-
-msgid "Output Gain"
-msgstr "Ganho de saÃda"
-
-msgid "Microphone Boost"
-msgstr "Aumento do microfone"
-
-msgid "Loopback"
-msgstr "Loopback"
-
-msgid "Diagnostic"
-msgstr "Diagnóstico"
-
-msgid "Bass Boost"
-msgstr "Aumento de graves"
-
-msgid "Playback Ports"
-msgstr "Portas de reprodução"
-
-msgid "Input"
-msgstr "Entrada"
-
-msgid "Record Source"
-msgstr "Origem de gravação"
-
-msgid "Monitor Source"
-msgstr "Origem de monitoração"
-
-msgid "Keyboard Beep"
-msgstr "Bip do teclado"
-
-msgid "Simulate Stereo"
-msgstr "Simular estéreo"
-
-msgid "Stereo"
-msgstr "Estéreo"
-
-msgid "Surround Sound"
-msgstr "Som surround"
-
-msgid "Microphone Gain"
-msgstr "Ganho do microfone"
-
-msgid "Speaker Source"
-msgstr "Origem do alto-falante"
-
-msgid "Microphone Source"
-msgstr "Origem do microfone"
-
-msgid "Jack"
-msgstr "Jack"
-
-msgid "Center / LFE"
-msgstr "Central/LFE"
-
-msgid "Stereo Mix"
-msgstr "Mixagem estéreo"
-
-msgid "Mono Mix"
-msgstr "Mixagem mono"
-
-msgid "Input Mix"
-msgstr "Mixagem de entrada"
-
-msgid "SPDIF In"
-msgstr "Entrada SPDIF"
-
-msgid "SPDIF Out"
-msgstr "SaÃda SPDIF"
-
-msgid "Microphone 1"
-msgstr "Microfone 1"
-
-msgid "Microphone 2"
-msgstr "Microfone 2"
-
-msgid "Digital Out"
-msgstr "SaÃda digital"
-
-msgid "Digital In"
-msgstr "Entrada digital"
-
-msgid "HDMI"
-msgstr "HDMI"
-
-msgid "Modem"
-msgstr "Modem"
-
-msgid "Handset"
-msgstr "Monofone"
-
-msgid "Other"
-msgstr "Outro"
-
-msgid "None"
-msgstr "Nenhum"
-
-msgid "On"
-msgstr "Ligado"
-
-msgid "Off"
-msgstr "Desligado"
-
-msgid "Mute"
-msgstr "Mudo"
-
-msgid "Fast"
-msgstr "Rápido"
-
-#. TRANSLATORS: "Very Low" is a quality setting here
-msgid "Very Low"
-msgstr "Muito baixa"
-
-#. TRANSLATORS: "Low" is a quality setting here
-msgid "Low"
-msgstr "Baixa"
-
-#. TRANSLATORS: "Medium" is a quality setting here
-msgid "Medium"
-msgstr "Média"
-
-#. TRANSLATORS: "High" is a quality setting here
-msgid "High"
-msgstr "Alta"
-
-#. TRANSLATORS: "Very High" is a quality setting here
-msgid "Very High"
-msgstr "Muito alta"
-
-#. TRANSLATORS: "Production" is a quality setting here
-msgid "Production"
-msgstr "Produção"
-
-msgid "Front Panel Microphone"
-msgstr "Microfone do painel frontal"
-
-msgid "Front Panel Line In"
-msgstr "Entrada de linha do painel frontal"
-
-msgid "Front Panel Headphones"
-msgstr "Fones de ouvido do painel frontal"
-
-msgid "Front Panel Line Out"
-msgstr "SaÃda de linha do painel frontal"
-
-msgid "Green Connector"
-msgstr "Conector verde"
-
-msgid "Pink Connector"
-msgstr "Conector rosa"
-
-msgid "Blue Connector"
-msgstr "Conector azul"
-
-msgid "White Connector"
-msgstr "Conector branco"
-
-msgid "Black Connector"
-msgstr "Conector preto"
-
-msgid "Gray Connector"
-msgstr "Conector cinza"
-
-msgid "Orange Connector"
-msgstr "Conector laranja"
-
-msgid "Red Connector"
-msgstr "Conector vermelho"
-
-msgid "Yellow Connector"
-msgstr "Conector amarelo"
-
-msgid "Green Front Panel Connector"
-msgstr "Conector verde do painel frontal"
-
-msgid "Pink Front Panel Connector"
-msgstr "Conector rosa do painel frontal"
-
-msgid "Blue Front Panel Connector"
-msgstr "Conector azul do painel frontal"
-
-msgid "White Front Panel Connector"
-msgstr "Conector branco do painel frontal"
-
-msgid "Black Front Panel Connector"
-msgstr "Conector preto do painel frontal"
-
-msgid "Gray Front Panel Connector"
-msgstr "Conector cinza do painel frontal"
-
-msgid "Orange Front Panel Connector"
-msgstr "Conector laranja do painel frontal"
-
-msgid "Red Front Panel Connector"
-msgstr "Conector vermelho do painel frontal"
-
-msgid "Yellow Front Panel Connector"
-msgstr "Conector amarelo do painel frontal"
-
-msgid "Spread Output"
-msgstr "SaÃda comum"
-
-msgid "Downmix"
-msgstr "Mesclar canais"
-
-msgid "Virtual Mixer Input"
-msgstr "Entrada do mixer virtual"
-
-msgid "Virtual Mixer Output"
-msgstr "SaÃda do mixer virtual"
-
-msgid "Virtual Mixer Channels"
-msgstr "Canais do mixer virtual"
-
-#. TRANSLATORS: name + number of a volume mixer control
-#, c-format
-msgid "%s %d Function"
-msgstr "%s %d"
-
-#. TRANSLATORS: name of a volume mixer control
-#, c-format
-msgid "%s Function"
-msgstr "%s"
-
msgid ""
"Could not open audio device for playback. This version of the Open Sound "
"System is not supported by this element."
@@ -531,12 +148,33 @@ msgstr "Não há suporte a gravação por este dispositivo de áudio."
msgid "Error recording from audio device."
msgstr "Erro ao gravar do dispositivo de áudio."
+msgid "Volume"
+msgstr "Volume"
+
msgid "Gain"
msgstr "Ganho"
+msgid "Monitor"
+msgstr "Monitorador"
+
+msgid "Built-in Speaker"
+msgstr "Alto-falante interno"
+
msgid "Headphone"
msgstr "Fone de ouvido"
+msgid "Line Out"
+msgstr "SaÃda de linha"
+
+msgid "SPDIF Out"
+msgstr "SaÃda SPDIF"
+
+msgid "AUX 1 Out"
+msgstr "SaÃda aux. 1"
+
+msgid "AUX 2 Out"
+msgstr "SaÃda aux. 2"
+
#, c-format
msgid "Error reading %d bytes from device '%s'."
msgstr "Erro ao ler %d bytes do dispositivo \"%s\"."
@@ -719,6 +357,358 @@ msgstr "Ainda não há suporte a mudança de resolução enquanto está executan
msgid "Cannot operate without a clock"
msgstr "Não é possÃvel operar sem um temporizador"
+#~ msgid "Bass"
+#~ msgstr "Grave"
+
+#~ msgid "Treble"
+#~ msgstr "Agudo"
+
+#~ msgid "Synth"
+#~ msgstr "Sintetizador"
+
+#~ msgid "PCM"
+#~ msgstr "PCM"
+
+#~ msgid "Speaker"
+#~ msgstr "Alto-falante"
+
+#~ msgid "Line-in"
+#~ msgstr "Entrada de linha"
+
+#~ msgid "Microphone"
+#~ msgstr "Microfone"
+
+#~ msgid "CD"
+#~ msgstr "CD"
+
+#~ msgid "Mixer"
+#~ msgstr "Mixer"
+
+#~ msgid "PCM-2"
+#~ msgstr "PCM-2"
+
+#~ msgid "Record"
+#~ msgstr "Gravação"
+
+#~ msgid "In-gain"
+#~ msgstr "Ganho de entrada"
+
+#~ msgid "Out-gain"
+#~ msgstr "Ganho de saÃda"
+
+#~ msgid "Line-1"
+#~ msgstr "Linha 1"
+
+#~ msgid "Line-2"
+#~ msgstr "Linha 2"
+
+#~ msgid "Line-3"
+#~ msgstr "Linha 3"
+
+#~ msgid "Digital-1"
+#~ msgstr "Digital 1"
+
+#~ msgid "Digital-2"
+#~ msgstr "Digital 2"
+
+#~ msgid "Digital-3"
+#~ msgstr "Digital 3"
+
+#~ msgid "Phone-in"
+#~ msgstr "Entrada de fone"
+
+#~ msgid "Phone-out"
+#~ msgstr "SaÃda de fone"
+
+#~ msgid "Video"
+#~ msgstr "VÃdeo"
+
+#~ msgid "Radio"
+#~ msgstr "Rádio"
+
+#~ msgid "Could not open audio device for mixer control handling."
+#~ msgstr ""
+#~ "Não foi possÃvel abrir o dispositivo de áudio para manipulação do "
+#~ "controlador do mixer."
+
+#~ msgid ""
+#~ "Could not open audio device for mixer control handling. This version of "
+#~ "the Open Sound System is not supported by this element."
+#~ msgstr ""
+#~ "Não foi possÃvel abrir o dispositivo de áudio para manipulação do "
+#~ "controlador do mixer. Não há suporte a este elemento com esta versão do "
+#~ "Sistema Aberto de Som (OSS)."
+
+#~ msgid "Master"
+#~ msgstr "Principal"
+
+#~ msgid "Front"
+#~ msgstr "Frontal"
+
+#~ msgid "Rear"
+#~ msgstr "Traseira"
+
+#~ msgid "Headphones"
+#~ msgstr "Fones de ouvido"
+
+#~ msgid "Center"
+#~ msgstr "Central"
+
+#~ msgid "LFE"
+#~ msgstr "LFE"
+
+#~ msgid "Surround"
+#~ msgstr "Surround"
+
+#~ msgid "Side"
+#~ msgstr "Lateral"
+
+#~ msgid "AUX Out"
+#~ msgstr "SaÃda aux."
+
+#~ msgid "3D Depth"
+#~ msgstr "Profundidade 3D"
+
+#~ msgid "3D Center"
+#~ msgstr "3D central"
+
+#~ msgid "3D Enhance"
+#~ msgstr "Realce 3D"
+
+#~ msgid "Telephone"
+#~ msgstr "Telefone"
+
+#~ msgid "Line In"
+#~ msgstr "Entrada de linha"
+
+#~ msgid "Internal CD"
+#~ msgstr "CD interno"
+
+#~ msgid "Video In"
+#~ msgstr "Entrada de vÃdeo"
+
+#~ msgid "AUX 1 In"
+#~ msgstr "Entrada aux. 1"
+
+#~ msgid "AUX 2 In"
+#~ msgstr "Entrada aux. 2"
+
+#~ msgid "AUX In"
+#~ msgstr "Entrada aux."
+
+#~ msgid "Record Gain"
+#~ msgstr "Ganho de gravação"
+
+#~ msgid "Output Gain"
+#~ msgstr "Ganho de saÃda"
+
+#~ msgid "Microphone Boost"
+#~ msgstr "Aumento do microfone"
+
+#~ msgid "Loopback"
+#~ msgstr "Loopback"
+
+#~ msgid "Diagnostic"
+#~ msgstr "Diagnóstico"
+
+#~ msgid "Bass Boost"
+#~ msgstr "Aumento de graves"
+
+#~ msgid "Playback Ports"
+#~ msgstr "Portas de reprodução"
+
+#~ msgid "Input"
+#~ msgstr "Entrada"
+
+#~ msgid "Record Source"
+#~ msgstr "Origem de gravação"
+
+#~ msgid "Monitor Source"
+#~ msgstr "Origem de monitoração"
+
+#~ msgid "Keyboard Beep"
+#~ msgstr "Bip do teclado"
+
+#~ msgid "Simulate Stereo"
+#~ msgstr "Simular estéreo"
+
+#~ msgid "Stereo"
+#~ msgstr "Estéreo"
+
+#~ msgid "Surround Sound"
+#~ msgstr "Som surround"
+
+#~ msgid "Microphone Gain"
+#~ msgstr "Ganho do microfone"
+
+#~ msgid "Speaker Source"
+#~ msgstr "Origem do alto-falante"
+
+#~ msgid "Microphone Source"
+#~ msgstr "Origem do microfone"
+
+#~ msgid "Jack"
+#~ msgstr "Jack"
+
+#~ msgid "Center / LFE"
+#~ msgstr "Central/LFE"
+
+#~ msgid "Stereo Mix"
+#~ msgstr "Mixagem estéreo"
+
+#~ msgid "Mono Mix"
+#~ msgstr "Mixagem mono"
+
+#~ msgid "Input Mix"
+#~ msgstr "Mixagem de entrada"
+
+#~ msgid "SPDIF In"
+#~ msgstr "Entrada SPDIF"
+
+#~ msgid "Microphone 1"
+#~ msgstr "Microfone 1"
+
+#~ msgid "Microphone 2"
+#~ msgstr "Microfone 2"
+
+#~ msgid "Digital Out"
+#~ msgstr "SaÃda digital"
+
+#~ msgid "Digital In"
+#~ msgstr "Entrada digital"
+
+#~ msgid "HDMI"
+#~ msgstr "HDMI"
+
+#~ msgid "Modem"
+#~ msgstr "Modem"
+
+#~ msgid "Handset"
+#~ msgstr "Monofone"
+
+#~ msgid "Other"
+#~ msgstr "Outro"
+
+#~ msgid "None"
+#~ msgstr "Nenhum"
+
+#~ msgid "On"
+#~ msgstr "Ligado"
+
+#~ msgid "Off"
+#~ msgstr "Desligado"
+
+#~ msgid "Mute"
+#~ msgstr "Mudo"
+
+#~ msgid "Fast"
+#~ msgstr "Rápido"
+
+#~ msgid "Very Low"
+#~ msgstr "Muito baixa"
+
+#~ msgid "Low"
+#~ msgstr "Baixa"
+
+#~ msgid "Medium"
+#~ msgstr "Média"
+
+#~ msgid "High"
+#~ msgstr "Alta"
+
+#~ msgid "Very High"
+#~ msgstr "Muito alta"
+
+#~ msgid "Production"
+#~ msgstr "Produção"
+
+#~ msgid "Front Panel Microphone"
+#~ msgstr "Microfone do painel frontal"
+
+#~ msgid "Front Panel Line In"
+#~ msgstr "Entrada de linha do painel frontal"
+
+#~ msgid "Front Panel Headphones"
+#~ msgstr "Fones de ouvido do painel frontal"
+
+#~ msgid "Front Panel Line Out"
+#~ msgstr "SaÃda de linha do painel frontal"
+
+#~ msgid "Green Connector"
+#~ msgstr "Conector verde"
+
+#~ msgid "Pink Connector"
+#~ msgstr "Conector rosa"
+
+#~ msgid "Blue Connector"
+#~ msgstr "Conector azul"
+
+#~ msgid "White Connector"
+#~ msgstr "Conector branco"
+
+#~ msgid "Black Connector"
+#~ msgstr "Conector preto"
+
+#~ msgid "Gray Connector"
+#~ msgstr "Conector cinza"
+
+#~ msgid "Orange Connector"
+#~ msgstr "Conector laranja"
+
+#~ msgid "Red Connector"
+#~ msgstr "Conector vermelho"
+
+#~ msgid "Yellow Connector"
+#~ msgstr "Conector amarelo"
+
+#~ msgid "Green Front Panel Connector"
+#~ msgstr "Conector verde do painel frontal"
+
+#~ msgid "Pink Front Panel Connector"
+#~ msgstr "Conector rosa do painel frontal"
+
+#~ msgid "Blue Front Panel Connector"
+#~ msgstr "Conector azul do painel frontal"
+
+#~ msgid "White Front Panel Connector"
+#~ msgstr "Conector branco do painel frontal"
+
+#~ msgid "Black Front Panel Connector"
+#~ msgstr "Conector preto do painel frontal"
+
+#~ msgid "Gray Front Panel Connector"
+#~ msgstr "Conector cinza do painel frontal"
+
+#~ msgid "Orange Front Panel Connector"
+#~ msgstr "Conector laranja do painel frontal"
+
+#~ msgid "Red Front Panel Connector"
+#~ msgstr "Conector vermelho do painel frontal"
+
+#~ msgid "Yellow Front Panel Connector"
+#~ msgstr "Conector amarelo do painel frontal"
+
+#~ msgid "Spread Output"
+#~ msgstr "SaÃda comum"
+
+#~ msgid "Downmix"
+#~ msgstr "Mesclar canais"
+
+#~ msgid "Virtual Mixer Input"
+#~ msgstr "Entrada do mixer virtual"
+
+#~ msgid "Virtual Mixer Output"
+#~ msgstr "SaÃda do mixer virtual"
+
+#~ msgid "Virtual Mixer Channels"
+#~ msgstr "Canais do mixer virtual"
+
+#~ msgid "%s %d Function"
+#~ msgstr "%s %d"
+
+#~ msgid "%s Function"
+#~ msgstr "%s"
+
#~ msgid "Error reading %d bytes on device '%s'."
#~ msgstr "Erro ao ler %d bytes no dispositivo \"%s\"."
diff --git a/po/ro.gmo b/po/ro.gmo
index 8a20955d5a6f95d5bfc1095a36b03747dac4183d..419586f271169328b1c168c4a37ba21827c398b0 100644
Binary files a/po/ro.gmo and b/po/ro.gmo differ
diff --git a/po/ro.po b/po/ro.po
index 5171ff0f96615511caa6dc37e34c224a1c03523a..a3e73b7748d7e54c6e15d9e871937c92d5167e42 100644
--- a/po/ro.po
+++ b/po/ro.po
@@ -5,7 +5,7 @@ msgid ""
msgstr ""
"Project-Id-Version: gst-plugins-good 0.10.23.2\n"
"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/\n"
-"POT-Creation-Date: 2012-04-12 10:26+0200\n"
+"POT-Creation-Date: 2012-05-13 16:29+0200\n"
"PO-Revision-Date: 2010-08-16 03:22+0300\n"
"Last-Translator: Lucian Adrian Grijincu <lucian.grijincu@gmail.com>\n"
"Language-Team: Romanian <translation-team-ro@lists.sourceforge.net>\n"
@@ -101,81 +101,6 @@ msgstr ""
msgid "Internal data flow error."
msgstr "Eroare internă a fluxului de date."
-msgid "Volume"
-msgstr "Volum"
-
-msgid "Bass"
-msgstr "Bas"
-
-msgid "Treble"
-msgstr "ÃŽnalte"
-
-msgid "Synth"
-msgstr "Synth"
-
-msgid "PCM"
-msgstr "PCM"
-
-msgid "Speaker"
-msgstr "Difuzor"
-
-msgid "Line-in"
-msgstr "Linie intrare"
-
-msgid "Microphone"
-msgstr "Microfon"
-
-msgid "CD"
-msgstr "CD"
-
-msgid "Mixer"
-msgstr "Mixer"
-
-msgid "PCM-2"
-msgstr "PCM-2"
-
-msgid "Record"
-msgstr "ÃŽnregistrare"
-
-msgid "In-gain"
-msgstr "Câștig intrare"
-
-msgid "Out-gain"
-msgstr "Câștig ieșire"
-
-msgid "Line-1"
-msgstr "Linia-1"
-
-msgid "Line-2"
-msgstr "Linia-2"
-
-msgid "Line-3"
-msgstr "Linia-3"
-
-msgid "Digital-1"
-msgstr "Digital-1"
-
-msgid "Digital-2"
-msgstr "Digital-2"
-
-msgid "Digital-3"
-msgstr "Digital-3"
-
-msgid "Phone-in"
-msgstr "Intrare telefon"
-
-msgid "Phone-out"
-msgstr "Ieșire telefon"
-
-msgid "Video"
-msgstr "Video"
-
-msgid "Radio"
-msgstr "Radio"
-
-msgid "Monitor"
-msgstr "Monitor"
-
msgid ""
"Could not open audio device for playback. Device is being used by another "
"application."
@@ -203,314 +128,6 @@ msgstr ""
msgid "Could not open audio device for recording."
msgstr "Nu s-a putut deschide dispozitivul audio pentru înregistrare."
-msgid "Could not open audio device for mixer control handling."
-msgstr ""
-"Nu s-a putut deschide dispozitivul audio pentru gestionarea controlului de "
-"mixaj."
-
-msgid ""
-"Could not open audio device for mixer control handling. This version of the "
-"Open Sound System is not supported by this element."
-msgstr ""
-"Nu s-a putut deschide dispozitivul audio pentru gestionarea controlului de "
-"mixaj. Această versiune a OSS (Open Sound System) nu este suportată de acest "
-"element"
-
-msgid "Master"
-msgstr "Principal"
-
-msgid "Front"
-msgstr "Față"
-
-msgid "Rear"
-msgstr "Spate"
-
-msgid "Headphones"
-msgstr "Căști"
-
-msgid "Center"
-msgstr "Centru"
-
-msgid "LFE"
-msgstr "LFE"
-
-msgid "Surround"
-msgstr "Surround"
-
-msgid "Side"
-msgstr "Lateral"
-
-msgid "Built-in Speaker"
-msgstr "Boxe integrate"
-
-msgid "AUX 1 Out"
-msgstr "Ieșire AUX 1"
-
-msgid "AUX 2 Out"
-msgstr "Ieșire AUX 2"
-
-msgid "AUX Out"
-msgstr "Ieșire AUX"
-
-msgid "3D Depth"
-msgstr "Adâncime 3D"
-
-msgid "3D Center"
-msgstr "Centru 3D"
-
-msgid "3D Enhance"
-msgstr "Îmbunătățire 3D"
-
-msgid "Telephone"
-msgstr "Telefon"
-
-msgid "Line Out"
-msgstr "Linie ieșire"
-
-msgid "Line In"
-msgstr "Linie intrare"
-
-msgid "Internal CD"
-msgstr "CD intern"
-
-msgid "Video In"
-msgstr "Intrare video"
-
-msgid "AUX 1 In"
-msgstr "Intrare AUX 1"
-
-msgid "AUX 2 In"
-msgstr "Intrare AUX 2"
-
-msgid "AUX In"
-msgstr "Intrare AUX"
-
-msgid "Record Gain"
-msgstr "Câștig înregistrare"
-
-msgid "Output Gain"
-msgstr "Câștig ieșire"
-
-msgid "Microphone Boost"
-msgstr "Amplificare microfon"
-
-msgid "Loopback"
-msgstr "Buclă"
-
-msgid "Diagnostic"
-msgstr "Diagnostic"
-
-msgid "Bass Boost"
-msgstr "Amplificare bas"
-
-msgid "Playback Ports"
-msgstr "Porturi redare"
-
-msgid "Input"
-msgstr "Intrare"
-
-msgid "Record Source"
-msgstr "Sursă înregistrare"
-
-msgid "Monitor Source"
-msgstr "Sursă monitor"
-
-msgid "Keyboard Beep"
-msgstr "Bip tastatură"
-
-msgid "Simulate Stereo"
-msgstr "Simulează stereo"
-
-msgid "Stereo"
-msgstr "Stereo"
-
-msgid "Surround Sound"
-msgstr "Sunet surround"
-
-msgid "Microphone Gain"
-msgstr "Câștig microfon"
-
-msgid "Speaker Source"
-msgstr "Sursă difuzor"
-
-msgid "Microphone Source"
-msgstr "Sursă microfon"
-
-msgid "Jack"
-msgstr "Jack"
-
-msgid "Center / LFE"
-msgstr "Centru / LFE"
-
-msgid "Stereo Mix"
-msgstr "Stereo Mix"
-
-msgid "Mono Mix"
-msgstr "Mono Mix"
-
-msgid "Input Mix"
-msgstr "Mix intrare"
-
-msgid "SPDIF In"
-msgstr "Intrare SPDIF"
-
-msgid "SPDIF Out"
-msgstr "Ieșire SPDIF"
-
-msgid "Microphone 1"
-msgstr "Microfon 1"
-
-msgid "Microphone 2"
-msgstr "Microfon 2"
-
-msgid "Digital Out"
-msgstr "Ieșire digitală"
-
-msgid "Digital In"
-msgstr "Intrare digitală"
-
-msgid "HDMI"
-msgstr "HDMI"
-
-msgid "Modem"
-msgstr "Modem"
-
-msgid "Handset"
-msgstr "Căști"
-
-msgid "Other"
-msgstr "Altul"
-
-msgid "None"
-msgstr "Niciunul"
-
-msgid "On"
-msgstr "Activat"
-
-msgid "Off"
-msgstr "Dezactivat"
-
-msgid "Mute"
-msgstr "Mut"
-
-msgid "Fast"
-msgstr "Rapid"
-
-#. TRANSLATORS: "Very Low" is a quality setting here
-msgid "Very Low"
-msgstr "Foarte scăzută"
-
-#. TRANSLATORS: "Low" is a quality setting here
-msgid "Low"
-msgstr "Scăzută"
-
-#. TRANSLATORS: "Medium" is a quality setting here
-msgid "Medium"
-msgstr "Medie"
-
-#. TRANSLATORS: "High" is a quality setting here
-msgid "High"
-msgstr "Ridicată"
-
-#. TRANSLATORS: "Very High" is a quality setting here
-msgid "Very High"
-msgstr "Foarte ridicată"
-
-#. TRANSLATORS: "Production" is a quality setting here
-msgid "Production"
-msgstr "Producție"
-
-msgid "Front Panel Microphone"
-msgstr "Microfon panou frontal"
-
-msgid "Front Panel Line In"
-msgstr "Linie intrare panou frontal"
-
-msgid "Front Panel Headphones"
-msgstr "Căști panou frontal"
-
-msgid "Front Panel Line Out"
-msgstr "Linie ieșire panou frontal"
-
-msgid "Green Connector"
-msgstr "Conector verde"
-
-msgid "Pink Connector"
-msgstr "Conector roz"
-
-msgid "Blue Connector"
-msgstr "Conector albastru"
-
-msgid "White Connector"
-msgstr "Conector alb"
-
-msgid "Black Connector"
-msgstr "Conector negru"
-
-msgid "Gray Connector"
-msgstr "Conector gri"
-
-msgid "Orange Connector"
-msgstr "Conector portocaliu"
-
-msgid "Red Connector"
-msgstr "Conector roșu"
-
-msgid "Yellow Connector"
-msgstr "Conector galben"
-
-msgid "Green Front Panel Connector"
-msgstr "Conector verde panou frontal"
-
-msgid "Pink Front Panel Connector"
-msgstr "Conector roz panou frontal"
-
-msgid "Blue Front Panel Connector"
-msgstr "Conector albastru panou frontal"
-
-msgid "White Front Panel Connector"
-msgstr "Conector alb panou frontal"
-
-msgid "Black Front Panel Connector"
-msgstr "Conector negru panou frontal"
-
-msgid "Gray Front Panel Connector"
-msgstr "Conector gri panou frontal"
-
-msgid "Orange Front Panel Connector"
-msgstr "Conector portocaliu panou frontal"
-
-msgid "Red Front Panel Connector"
-msgstr "Conector roșu panou frontal"
-
-msgid "Yellow Front Panel Connector"
-msgstr "Conector galben panou frontal"
-
-msgid "Spread Output"
-msgstr "Împarte ieșirea"
-
-msgid "Downmix"
-msgstr "Mixaj redus"
-
-msgid "Virtual Mixer Input"
-msgstr "Intrare mixer video"
-
-msgid "Virtual Mixer Output"
-msgstr "Ieșire mixer video"
-
-msgid "Virtual Mixer Channels"
-msgstr "Canale mixer video"
-
-#. TRANSLATORS: name + number of a volume mixer control
-#, c-format
-msgid "%s %d Function"
-msgstr "Funcție %s %d"
-
-#. TRANSLATORS: name of a volume mixer control
-#, c-format
-msgid "%s Function"
-msgstr "Funcție %s"
-
msgid ""
"Could not open audio device for playback. This version of the Open Sound "
"System is not supported by this element."
@@ -530,12 +147,33 @@ msgstr "Înregistrarea nu este suportată de acest dispozitiv audio."
msgid "Error recording from audio device."
msgstr "Eroare la înregistrarea de la dispozitivul audio."
+msgid "Volume"
+msgstr "Volum"
+
msgid "Gain"
msgstr "Amplificare"
+msgid "Monitor"
+msgstr "Monitor"
+
+msgid "Built-in Speaker"
+msgstr "Boxe integrate"
+
msgid "Headphone"
msgstr "Căști"
+msgid "Line Out"
+msgstr "Linie ieșire"
+
+msgid "SPDIF Out"
+msgstr "Ieșire SPDIF"
+
+msgid "AUX 1 Out"
+msgstr "Ieșire AUX 1"
+
+msgid "AUX 2 Out"
+msgstr "Ieșire AUX 2"
+
#, c-format
msgid "Error reading %d bytes from device '%s'."
msgstr "Eroare citire %d octeÈ›i de la dispozitivul „%sâ€."
@@ -720,6 +358,358 @@ msgstr "Schimbarea rezoluției pe durata rulării nu este incă suportată."
msgid "Cannot operate without a clock"
msgstr "Nu se poate opera fără un ceas"
+#~ msgid "Bass"
+#~ msgstr "Bas"
+
+#~ msgid "Treble"
+#~ msgstr "ÃŽnalte"
+
+#~ msgid "Synth"
+#~ msgstr "Synth"
+
+#~ msgid "PCM"
+#~ msgstr "PCM"
+
+#~ msgid "Speaker"
+#~ msgstr "Difuzor"
+
+#~ msgid "Line-in"
+#~ msgstr "Linie intrare"
+
+#~ msgid "Microphone"
+#~ msgstr "Microfon"
+
+#~ msgid "CD"
+#~ msgstr "CD"
+
+#~ msgid "Mixer"
+#~ msgstr "Mixer"
+
+#~ msgid "PCM-2"
+#~ msgstr "PCM-2"
+
+#~ msgid "Record"
+#~ msgstr "ÃŽnregistrare"
+
+#~ msgid "In-gain"
+#~ msgstr "Câștig intrare"
+
+#~ msgid "Out-gain"
+#~ msgstr "Câștig ieșire"
+
+#~ msgid "Line-1"
+#~ msgstr "Linia-1"
+
+#~ msgid "Line-2"
+#~ msgstr "Linia-2"
+
+#~ msgid "Line-3"
+#~ msgstr "Linia-3"
+
+#~ msgid "Digital-1"
+#~ msgstr "Digital-1"
+
+#~ msgid "Digital-2"
+#~ msgstr "Digital-2"
+
+#~ msgid "Digital-3"
+#~ msgstr "Digital-3"
+
+#~ msgid "Phone-in"
+#~ msgstr "Intrare telefon"
+
+#~ msgid "Phone-out"
+#~ msgstr "Ieșire telefon"
+
+#~ msgid "Video"
+#~ msgstr "Video"
+
+#~ msgid "Radio"
+#~ msgstr "Radio"
+
+#~ msgid "Could not open audio device for mixer control handling."
+#~ msgstr ""
+#~ "Nu s-a putut deschide dispozitivul audio pentru gestionarea controlului "
+#~ "de mixaj."
+
+#~ msgid ""
+#~ "Could not open audio device for mixer control handling. This version of "
+#~ "the Open Sound System is not supported by this element."
+#~ msgstr ""
+#~ "Nu s-a putut deschide dispozitivul audio pentru gestionarea controlului "
+#~ "de mixaj. Această versiune a OSS (Open Sound System) nu este suportată de "
+#~ "acest element"
+
+#~ msgid "Master"
+#~ msgstr "Principal"
+
+#~ msgid "Front"
+#~ msgstr "Față"
+
+#~ msgid "Rear"
+#~ msgstr "Spate"
+
+#~ msgid "Headphones"
+#~ msgstr "Căști"
+
+#~ msgid "Center"
+#~ msgstr "Centru"
+
+#~ msgid "LFE"
+#~ msgstr "LFE"
+
+#~ msgid "Surround"
+#~ msgstr "Surround"
+
+#~ msgid "Side"
+#~ msgstr "Lateral"
+
+#~ msgid "AUX Out"
+#~ msgstr "Ieșire AUX"
+
+#~ msgid "3D Depth"
+#~ msgstr "Adâncime 3D"
+
+#~ msgid "3D Center"
+#~ msgstr "Centru 3D"
+
+#~ msgid "3D Enhance"
+#~ msgstr "Îmbunătățire 3D"
+
+#~ msgid "Telephone"
+#~ msgstr "Telefon"
+
+#~ msgid "Line In"
+#~ msgstr "Linie intrare"
+
+#~ msgid "Internal CD"
+#~ msgstr "CD intern"
+
+#~ msgid "Video In"
+#~ msgstr "Intrare video"
+
+#~ msgid "AUX 1 In"
+#~ msgstr "Intrare AUX 1"
+
+#~ msgid "AUX 2 In"
+#~ msgstr "Intrare AUX 2"
+
+#~ msgid "AUX In"
+#~ msgstr "Intrare AUX"
+
+#~ msgid "Record Gain"
+#~ msgstr "Câștig înregistrare"
+
+#~ msgid "Output Gain"
+#~ msgstr "Câștig ieșire"
+
+#~ msgid "Microphone Boost"
+#~ msgstr "Amplificare microfon"
+
+#~ msgid "Loopback"
+#~ msgstr "Buclă"
+
+#~ msgid "Diagnostic"
+#~ msgstr "Diagnostic"
+
+#~ msgid "Bass Boost"
+#~ msgstr "Amplificare bas"
+
+#~ msgid "Playback Ports"
+#~ msgstr "Porturi redare"
+
+#~ msgid "Input"
+#~ msgstr "Intrare"
+
+#~ msgid "Record Source"
+#~ msgstr "Sursă înregistrare"
+
+#~ msgid "Monitor Source"
+#~ msgstr "Sursă monitor"
+
+#~ msgid "Keyboard Beep"
+#~ msgstr "Bip tastatură"
+
+#~ msgid "Simulate Stereo"
+#~ msgstr "Simulează stereo"
+
+#~ msgid "Stereo"
+#~ msgstr "Stereo"
+
+#~ msgid "Surround Sound"
+#~ msgstr "Sunet surround"
+
+#~ msgid "Microphone Gain"
+#~ msgstr "Câștig microfon"
+
+#~ msgid "Speaker Source"
+#~ msgstr "Sursă difuzor"
+
+#~ msgid "Microphone Source"
+#~ msgstr "Sursă microfon"
+
+#~ msgid "Jack"
+#~ msgstr "Jack"
+
+#~ msgid "Center / LFE"
+#~ msgstr "Centru / LFE"
+
+#~ msgid "Stereo Mix"
+#~ msgstr "Stereo Mix"
+
+#~ msgid "Mono Mix"
+#~ msgstr "Mono Mix"
+
+#~ msgid "Input Mix"
+#~ msgstr "Mix intrare"
+
+#~ msgid "SPDIF In"
+#~ msgstr "Intrare SPDIF"
+
+#~ msgid "Microphone 1"
+#~ msgstr "Microfon 1"
+
+#~ msgid "Microphone 2"
+#~ msgstr "Microfon 2"
+
+#~ msgid "Digital Out"
+#~ msgstr "Ieșire digitală"
+
+#~ msgid "Digital In"
+#~ msgstr "Intrare digitală"
+
+#~ msgid "HDMI"
+#~ msgstr "HDMI"
+
+#~ msgid "Modem"
+#~ msgstr "Modem"
+
+#~ msgid "Handset"
+#~ msgstr "Căști"
+
+#~ msgid "Other"
+#~ msgstr "Altul"
+
+#~ msgid "None"
+#~ msgstr "Niciunul"
+
+#~ msgid "On"
+#~ msgstr "Activat"
+
+#~ msgid "Off"
+#~ msgstr "Dezactivat"
+
+#~ msgid "Mute"
+#~ msgstr "Mut"
+
+#~ msgid "Fast"
+#~ msgstr "Rapid"
+
+#~ msgid "Very Low"
+#~ msgstr "Foarte scăzută"
+
+#~ msgid "Low"
+#~ msgstr "Scăzută"
+
+#~ msgid "Medium"
+#~ msgstr "Medie"
+
+#~ msgid "High"
+#~ msgstr "Ridicată"
+
+#~ msgid "Very High"
+#~ msgstr "Foarte ridicată"
+
+#~ msgid "Production"
+#~ msgstr "Producție"
+
+#~ msgid "Front Panel Microphone"
+#~ msgstr "Microfon panou frontal"
+
+#~ msgid "Front Panel Line In"
+#~ msgstr "Linie intrare panou frontal"
+
+#~ msgid "Front Panel Headphones"
+#~ msgstr "Căști panou frontal"
+
+#~ msgid "Front Panel Line Out"
+#~ msgstr "Linie ieșire panou frontal"
+
+#~ msgid "Green Connector"
+#~ msgstr "Conector verde"
+
+#~ msgid "Pink Connector"
+#~ msgstr "Conector roz"
+
+#~ msgid "Blue Connector"
+#~ msgstr "Conector albastru"
+
+#~ msgid "White Connector"
+#~ msgstr "Conector alb"
+
+#~ msgid "Black Connector"
+#~ msgstr "Conector negru"
+
+#~ msgid "Gray Connector"
+#~ msgstr "Conector gri"
+
+#~ msgid "Orange Connector"
+#~ msgstr "Conector portocaliu"
+
+#~ msgid "Red Connector"
+#~ msgstr "Conector roșu"
+
+#~ msgid "Yellow Connector"
+#~ msgstr "Conector galben"
+
+#~ msgid "Green Front Panel Connector"
+#~ msgstr "Conector verde panou frontal"
+
+#~ msgid "Pink Front Panel Connector"
+#~ msgstr "Conector roz panou frontal"
+
+#~ msgid "Blue Front Panel Connector"
+#~ msgstr "Conector albastru panou frontal"
+
+#~ msgid "White Front Panel Connector"
+#~ msgstr "Conector alb panou frontal"
+
+#~ msgid "Black Front Panel Connector"
+#~ msgstr "Conector negru panou frontal"
+
+#~ msgid "Gray Front Panel Connector"
+#~ msgstr "Conector gri panou frontal"
+
+#~ msgid "Orange Front Panel Connector"
+#~ msgstr "Conector portocaliu panou frontal"
+
+#~ msgid "Red Front Panel Connector"
+#~ msgstr "Conector roșu panou frontal"
+
+#~ msgid "Yellow Front Panel Connector"
+#~ msgstr "Conector galben panou frontal"
+
+#~ msgid "Spread Output"
+#~ msgstr "Împarte ieșirea"
+
+#~ msgid "Downmix"
+#~ msgstr "Mixaj redus"
+
+#~ msgid "Virtual Mixer Input"
+#~ msgstr "Intrare mixer video"
+
+#~ msgid "Virtual Mixer Output"
+#~ msgstr "Ieșire mixer video"
+
+#~ msgid "Virtual Mixer Channels"
+#~ msgstr "Canale mixer video"
+
+#~ msgid "%s %d Function"
+#~ msgstr "Funcție %s %d"
+
+#~ msgid "%s Function"
+#~ msgstr "Funcție %s"
+
#~ msgid "Error reading %d bytes on device '%s'."
#~ msgstr "Eroare citire %d octeÈ›i pe dispozitivul „%sâ€."
diff --git a/po/ru.gmo b/po/ru.gmo
index c9463f9f32d73d52a87668848f87b87fbef7902c..2e9d3cc958aab7b748c2359e527e79bf826b327b 100644
Binary files a/po/ru.gmo and b/po/ru.gmo differ
diff --git a/po/ru.po b/po/ru.po
index f5fd1383360ef83847a58930eaf083349f72f2fa..10b3c8a1e720248a48da2275adc9b2b9059afe0f 100644
--- a/po/ru.po
+++ b/po/ru.po
@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: gst-plugins-good 0.10.28.2\n"
"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/\n"
-"POT-Creation-Date: 2012-04-12 10:26+0200\n"
+"POT-Creation-Date: 2012-05-13 16:29+0200\n"
"PO-Revision-Date: 2011-04-26 21:13+0400\n"
"Last-Translator: Yuri Kozlov <yuray@komyakino.ru>\n"
"Language-Team: Russian <gnu@mx.ru>\n"
@@ -102,81 +102,6 @@ msgstr ""
msgid "Internal data flow error."
msgstr "ВнутреннÑÑ Ð¾ÑˆÐ¸Ð±ÐºÐ° потока данных."
-msgid "Volume"
-msgstr "Уровень"
-
-msgid "Bass"
-msgstr "Ðизкие"
-
-msgid "Treble"
-msgstr "Ð’Ñ‹Ñокие"
-
-msgid "Synth"
-msgstr "Синтезатор"
-
-msgid "PCM"
-msgstr "PCM"
-
-msgid "Speaker"
-msgstr "Внутренний динамик"
-
-msgid "Line-in"
-msgstr "Линейный вход"
-
-msgid "Microphone"
-msgstr "Микрофон"
-
-msgid "CD"
-msgstr "CD"
-
-msgid "Mixer"
-msgstr "Микшер"
-
-msgid "PCM-2"
-msgstr "PCM-2"
-
-msgid "Record"
-msgstr "ЗапиÑÑŒ"
-
-msgid "In-gain"
-msgstr "УÑиление на входе"
-
-msgid "Out-gain"
-msgstr "УÑиление на выходе"
-
-msgid "Line-1"
-msgstr "Линейный-1"
-
-msgid "Line-2"
-msgstr "Линейный-2"
-
-msgid "Line-3"
-msgstr "Линейный-3"
-
-msgid "Digital-1"
-msgstr "Цифровой-1"
-
-msgid "Digital-2"
-msgstr "Цифровой-2"
-
-msgid "Digital-3"
-msgstr "Цифровой-3"
-
-msgid "Phone-in"
-msgstr "Тел. вход"
-
-msgid "Phone-out"
-msgstr "Тел. выход"
-
-msgid "Video"
-msgstr "Видео"
-
-msgid "Radio"
-msgstr "Радио"
-
-msgid "Monitor"
-msgstr "Мониторинг"
-
msgid ""
"Could not open audio device for playback. Device is being used by another "
"application."
@@ -204,311 +129,6 @@ msgstr ""
msgid "Could not open audio device for recording."
msgstr "Ðе удалоÑÑŒ открыть аудио-уÑтройÑтво Ð´Ð»Ñ Ð·Ð°Ð¿Ð¸Ñи."
-msgid "Could not open audio device for mixer control handling."
-msgstr "Ðе удалоÑÑŒ открыть аудио-уÑтройÑтво Ð´Ð»Ñ Ð¾Ð±Ñ€Ð°Ð±Ð¾Ñ‚ÐºÐ¸ параметров микшера."
-
-msgid ""
-"Could not open audio device for mixer control handling. This version of the "
-"Open Sound System is not supported by this element."
-msgstr ""
-"Ðе удалоÑÑŒ открыть аудио-уÑтройÑтво Ð´Ð»Ñ Ð¾Ð±Ñ€Ð°Ð±Ð¾Ñ‚ÐºÐ¸ параметров микшера. Ð”Ð°Ð½Ð½Ð°Ñ "
-"верÑÐ¸Ñ Open Sound System не поддерживаетÑÑ Ñтим Ñлементом."
-
-msgid "Master"
-msgstr "Общий"
-
-msgid "Front"
-msgstr "Фронтальные"
-
-msgid "Rear"
-msgstr "Тыловые"
-
-msgid "Headphones"
-msgstr "Ðаушники"
-
-msgid "Center"
-msgstr "Центр"
-
-msgid "LFE"
-msgstr "Сабвуфер"
-
-msgid "Surround"
-msgstr "Объёмный звук"
-
-msgid "Side"
-msgstr "Боковые"
-
-msgid "Built-in Speaker"
-msgstr "Внутренний динамик"
-
-msgid "AUX 1 Out"
-msgstr "Выход AUX 1"
-
-msgid "AUX 2 Out"
-msgstr "Выход AUX 2"
-
-msgid "AUX Out"
-msgstr "Выход AUX"
-
-msgid "3D Depth"
-msgstr "3D глубина"
-
-msgid "3D Center"
-msgstr "3D центр"
-
-msgid "3D Enhance"
-msgstr "3D улучшение"
-
-msgid "Telephone"
-msgstr "Телефон"
-
-msgid "Line Out"
-msgstr "Линейный выход"
-
-msgid "Line In"
-msgstr "Линейный вход"
-
-msgid "Internal CD"
-msgstr "Внутренний CD"
-
-msgid "Video In"
-msgstr "Видео вход"
-
-msgid "AUX 1 In"
-msgstr "Вход AUX 1"
-
-msgid "AUX 2 In"
-msgstr "Вход AUX 2"
-
-msgid "AUX In"
-msgstr "Вход AUX"
-
-msgid "Record Gain"
-msgstr "Уровень запиÑи"
-
-msgid "Output Gain"
-msgstr "Выходной уровень"
-
-msgid "Microphone Boost"
-msgstr "Микрофонный уÑилитель"
-
-msgid "Loopback"
-msgstr "ПетлÑ"
-
-msgid "Diagnostic"
-msgstr "ДиагноÑтика"
-
-msgid "Bass Boost"
-msgstr "УÑиление баÑа"
-
-msgid "Playback Ports"
-msgstr "Порты воÑпроизведениÑ"
-
-msgid "Input"
-msgstr "Вход"
-
-msgid "Record Source"
-msgstr "УÑтройÑтво запиÑи"
-
-msgid "Monitor Source"
-msgstr "УÑтройÑтво вывода"
-
-msgid "Keyboard Beep"
-msgstr "Озвучка клавиатуры"
-
-msgid "Simulate Stereo"
-msgstr "Ð˜Ð¼Ð¸Ñ‚Ð°Ñ†Ð¸Ñ Ñтерео"
-
-msgid "Stereo"
-msgstr "Стерео"
-
-msgid "Surround Sound"
-msgstr "Объёмный звук"
-
-msgid "Microphone Gain"
-msgstr "Уровень микрофона"
-
-msgid "Speaker Source"
-msgstr "УÑтройÑтво динамика"
-
-msgid "Microphone Source"
-msgstr "УÑтройÑтво микрофона"
-
-msgid "Jack"
-msgstr "Jack"
-
-msgid "Center / LFE"
-msgstr "Центр / Сабвуфер"
-
-msgid "Stereo Mix"
-msgstr "Стерео микширование"
-
-msgid "Mono Mix"
-msgstr "Моно микширование"
-
-msgid "Input Mix"
-msgstr "Микширование входа"
-
-msgid "SPDIF In"
-msgstr "Вход SPDIF"
-
-msgid "SPDIF Out"
-msgstr "Выход SPDIF"
-
-msgid "Microphone 1"
-msgstr "Микрофон 1"
-
-msgid "Microphone 2"
-msgstr "Микрофон 2"
-
-msgid "Digital Out"
-msgstr "Цифровой выход"
-
-msgid "Digital In"
-msgstr "Цифровой вход"
-
-msgid "HDMI"
-msgstr "HDMI"
-
-msgid "Modem"
-msgstr "Модем"
-
-msgid "Handset"
-msgstr "Гарнитура"
-
-msgid "Other"
-msgstr "Другой"
-
-msgid "None"
-msgstr "Ðичего"
-
-msgid "On"
-msgstr "Вкл"
-
-msgid "Off"
-msgstr "Выкл"
-
-msgid "Mute"
-msgstr "Заглушить"
-
-msgid "Fast"
-msgstr "СкороÑÑ‚ÑŒ"
-
-#. TRANSLATORS: "Very Low" is a quality setting here
-msgid "Very Low"
-msgstr "Очень низкое"
-
-#. TRANSLATORS: "Low" is a quality setting here
-msgid "Low"
-msgstr "Ðизкое"
-
-#. TRANSLATORS: "Medium" is a quality setting here
-msgid "Medium"
-msgstr "Среднее"
-
-#. TRANSLATORS: "High" is a quality setting here
-msgid "High"
-msgstr "Ð’Ñ‹Ñокое"
-
-#. TRANSLATORS: "Very High" is a quality setting here
-msgid "Very High"
-msgstr "Очень выÑокое"
-
-#. TRANSLATORS: "Production" is a quality setting here
-msgid "Production"
-msgstr "Выдача"
-
-msgid "Front Panel Microphone"
-msgstr "Микрофон на передней панели"
-
-msgid "Front Panel Line In"
-msgstr "Линейный вход на передней панели"
-
-msgid "Front Panel Headphones"
-msgstr "Ðаушники на передней панели"
-
-msgid "Front Panel Line Out"
-msgstr "Линейный выход на передней панели"
-
-msgid "Green Connector"
-msgstr "Зелёный разъём"
-
-msgid "Pink Connector"
-msgstr "Розовый разъём"
-
-msgid "Blue Connector"
-msgstr "Синий разъём"
-
-msgid "White Connector"
-msgstr "Белый разъём"
-
-msgid "Black Connector"
-msgstr "Чёрный разъём"
-
-msgid "Gray Connector"
-msgstr "Серый разъём"
-
-msgid "Orange Connector"
-msgstr "Оранжевый разъём"
-
-msgid "Red Connector"
-msgstr "КраÑный разъём"
-
-msgid "Yellow Connector"
-msgstr "Жёлтый разъём"
-
-msgid "Green Front Panel Connector"
-msgstr "Зелёный разъём на передней панели"
-
-msgid "Pink Front Panel Connector"
-msgstr "Розовый разъём на передней панели"
-
-msgid "Blue Front Panel Connector"
-msgstr "Синий разъём на передней панели"
-
-msgid "White Front Panel Connector"
-msgstr "Белый разъём на передней панели"
-
-msgid "Black Front Panel Connector"
-msgstr "Чёрный разъём на передней панели"
-
-msgid "Gray Front Panel Connector"
-msgstr "Серый разъём на передней панели"
-
-msgid "Orange Front Panel Connector"
-msgstr "Оранжевый разъём на передней панели"
-
-msgid "Red Front Panel Connector"
-msgstr "КраÑный разъём на передней панели"
-
-msgid "Yellow Front Panel Connector"
-msgstr "Жёлтый разъём на передней панели"
-
-msgid "Spread Output"
-msgstr "Развёрнутый вывод"
-
-msgid "Downmix"
-msgstr "Ðизведение"
-
-msgid "Virtual Mixer Input"
-msgstr "Вход виртуального микшера"
-
-msgid "Virtual Mixer Output"
-msgstr "Выход виртуального микшера"
-
-msgid "Virtual Mixer Channels"
-msgstr "Каналы виртуального микшера"
-
-#. TRANSLATORS: name + number of a volume mixer control
-#, c-format
-msgid "%s %d Function"
-msgstr "Ð¤ÑƒÐ½ÐºÑ†Ð¸Ñ %s %d"
-
-#. TRANSLATORS: name of a volume mixer control
-#, c-format
-msgid "%s Function"
-msgstr "Ð¤ÑƒÐ½ÐºÑ†Ð¸Ñ %s"
-
msgid ""
"Could not open audio device for playback. This version of the Open Sound "
"System is not supported by this element."
@@ -528,12 +148,33 @@ msgstr "ЗапиÑÑŒ не поддерживаетÑÑ Ð´Ð°Ð½Ð½Ñ‹Ð¼ аудио-
msgid "Error recording from audio device."
msgstr "Ошибка запиÑи Ñ Ð°ÑƒÐ´Ð¸Ð¾-уÑтройÑтва."
+msgid "Volume"
+msgstr "Уровень"
+
msgid "Gain"
msgstr "Уровень"
+msgid "Monitor"
+msgstr "Мониторинг"
+
+msgid "Built-in Speaker"
+msgstr "Внутренний динамик"
+
msgid "Headphone"
msgstr "Ðаушник"
+msgid "Line Out"
+msgstr "Линейный выход"
+
+msgid "SPDIF Out"
+msgstr "Выход SPDIF"
+
+msgid "AUX 1 Out"
+msgstr "Выход AUX 1"
+
+msgid "AUX 2 Out"
+msgstr "Выход AUX 2"
+
#, c-format
msgid "Error reading %d bytes from device '%s'."
msgstr "Ошибка Ñ‡Ñ‚ÐµÐ½Ð¸Ñ %d байт из уÑтройÑтва «%s»."
@@ -715,6 +356,356 @@ msgstr ""
msgid "Cannot operate without a clock"
msgstr "ÐžÐ¿ÐµÑ€Ð°Ñ†Ð¸Ñ Ð½ÐµÐ²Ð¾Ð·Ð¼Ð¾Ð¶Ð½Ð° без чаÑов"
+#~ msgid "Bass"
+#~ msgstr "Ðизкие"
+
+#~ msgid "Treble"
+#~ msgstr "Ð’Ñ‹Ñокие"
+
+#~ msgid "Synth"
+#~ msgstr "Синтезатор"
+
+#~ msgid "PCM"
+#~ msgstr "PCM"
+
+#~ msgid "Speaker"
+#~ msgstr "Внутренний динамик"
+
+#~ msgid "Line-in"
+#~ msgstr "Линейный вход"
+
+#~ msgid "Microphone"
+#~ msgstr "Микрофон"
+
+#~ msgid "CD"
+#~ msgstr "CD"
+
+#~ msgid "Mixer"
+#~ msgstr "Микшер"
+
+#~ msgid "PCM-2"
+#~ msgstr "PCM-2"
+
+#~ msgid "Record"
+#~ msgstr "ЗапиÑÑŒ"
+
+#~ msgid "In-gain"
+#~ msgstr "УÑиление на входе"
+
+#~ msgid "Out-gain"
+#~ msgstr "УÑиление на выходе"
+
+#~ msgid "Line-1"
+#~ msgstr "Линейный-1"
+
+#~ msgid "Line-2"
+#~ msgstr "Линейный-2"
+
+#~ msgid "Line-3"
+#~ msgstr "Линейный-3"
+
+#~ msgid "Digital-1"
+#~ msgstr "Цифровой-1"
+
+#~ msgid "Digital-2"
+#~ msgstr "Цифровой-2"
+
+#~ msgid "Digital-3"
+#~ msgstr "Цифровой-3"
+
+#~ msgid "Phone-in"
+#~ msgstr "Тел. вход"
+
+#~ msgid "Phone-out"
+#~ msgstr "Тел. выход"
+
+#~ msgid "Video"
+#~ msgstr "Видео"
+
+#~ msgid "Radio"
+#~ msgstr "Радио"
+
+#~ msgid "Could not open audio device for mixer control handling."
+#~ msgstr ""
+#~ "Ðе удалоÑÑŒ открыть аудио-уÑтройÑтво Ð´Ð»Ñ Ð¾Ð±Ñ€Ð°Ð±Ð¾Ñ‚ÐºÐ¸ параметров микшера."
+
+#~ msgid ""
+#~ "Could not open audio device for mixer control handling. This version of "
+#~ "the Open Sound System is not supported by this element."
+#~ msgstr ""
+#~ "Ðе удалоÑÑŒ открыть аудио-уÑтройÑтво Ð´Ð»Ñ Ð¾Ð±Ñ€Ð°Ð±Ð¾Ñ‚ÐºÐ¸ параметров микшера. "
+#~ "Ð”Ð°Ð½Ð½Ð°Ñ Ð²ÐµÑ€ÑÐ¸Ñ Open Sound System не поддерживаетÑÑ Ñтим Ñлементом."
+
+#~ msgid "Master"
+#~ msgstr "Общий"
+
+#~ msgid "Front"
+#~ msgstr "Фронтальные"
+
+#~ msgid "Rear"
+#~ msgstr "Тыловые"
+
+#~ msgid "Headphones"
+#~ msgstr "Ðаушники"
+
+#~ msgid "Center"
+#~ msgstr "Центр"
+
+#~ msgid "LFE"
+#~ msgstr "Сабвуфер"
+
+#~ msgid "Surround"
+#~ msgstr "Объёмный звук"
+
+#~ msgid "Side"
+#~ msgstr "Боковые"
+
+#~ msgid "AUX Out"
+#~ msgstr "Выход AUX"
+
+#~ msgid "3D Depth"
+#~ msgstr "3D глубина"
+
+#~ msgid "3D Center"
+#~ msgstr "3D центр"
+
+#~ msgid "3D Enhance"
+#~ msgstr "3D улучшение"
+
+#~ msgid "Telephone"
+#~ msgstr "Телефон"
+
+#~ msgid "Line In"
+#~ msgstr "Линейный вход"
+
+#~ msgid "Internal CD"
+#~ msgstr "Внутренний CD"
+
+#~ msgid "Video In"
+#~ msgstr "Видео вход"
+
+#~ msgid "AUX 1 In"
+#~ msgstr "Вход AUX 1"
+
+#~ msgid "AUX 2 In"
+#~ msgstr "Вход AUX 2"
+
+#~ msgid "AUX In"
+#~ msgstr "Вход AUX"
+
+#~ msgid "Record Gain"
+#~ msgstr "Уровень запиÑи"
+
+#~ msgid "Output Gain"
+#~ msgstr "Выходной уровень"
+
+#~ msgid "Microphone Boost"
+#~ msgstr "Микрофонный уÑилитель"
+
+#~ msgid "Loopback"
+#~ msgstr "ПетлÑ"
+
+#~ msgid "Diagnostic"
+#~ msgstr "ДиагноÑтика"
+
+#~ msgid "Bass Boost"
+#~ msgstr "УÑиление баÑа"
+
+#~ msgid "Playback Ports"
+#~ msgstr "Порты воÑпроизведениÑ"
+
+#~ msgid "Input"
+#~ msgstr "Вход"
+
+#~ msgid "Record Source"
+#~ msgstr "УÑтройÑтво запиÑи"
+
+#~ msgid "Monitor Source"
+#~ msgstr "УÑтройÑтво вывода"
+
+#~ msgid "Keyboard Beep"
+#~ msgstr "Озвучка клавиатуры"
+
+#~ msgid "Simulate Stereo"
+#~ msgstr "Ð˜Ð¼Ð¸Ñ‚Ð°Ñ†Ð¸Ñ Ñтерео"
+
+#~ msgid "Stereo"
+#~ msgstr "Стерео"
+
+#~ msgid "Surround Sound"
+#~ msgstr "Объёмный звук"
+
+#~ msgid "Microphone Gain"
+#~ msgstr "Уровень микрофона"
+
+#~ msgid "Speaker Source"
+#~ msgstr "УÑтройÑтво динамика"
+
+#~ msgid "Microphone Source"
+#~ msgstr "УÑтройÑтво микрофона"
+
+#~ msgid "Jack"
+#~ msgstr "Jack"
+
+#~ msgid "Center / LFE"
+#~ msgstr "Центр / Сабвуфер"
+
+#~ msgid "Stereo Mix"
+#~ msgstr "Стерео микширование"
+
+#~ msgid "Mono Mix"
+#~ msgstr "Моно микширование"
+
+#~ msgid "Input Mix"
+#~ msgstr "Микширование входа"
+
+#~ msgid "SPDIF In"
+#~ msgstr "Вход SPDIF"
+
+#~ msgid "Microphone 1"
+#~ msgstr "Микрофон 1"
+
+#~ msgid "Microphone 2"
+#~ msgstr "Микрофон 2"
+
+#~ msgid "Digital Out"
+#~ msgstr "Цифровой выход"
+
+#~ msgid "Digital In"
+#~ msgstr "Цифровой вход"
+
+#~ msgid "HDMI"
+#~ msgstr "HDMI"
+
+#~ msgid "Modem"
+#~ msgstr "Модем"
+
+#~ msgid "Handset"
+#~ msgstr "Гарнитура"
+
+#~ msgid "Other"
+#~ msgstr "Другой"
+
+#~ msgid "None"
+#~ msgstr "Ðичего"
+
+#~ msgid "On"
+#~ msgstr "Вкл"
+
+#~ msgid "Off"
+#~ msgstr "Выкл"
+
+#~ msgid "Mute"
+#~ msgstr "Заглушить"
+
+#~ msgid "Fast"
+#~ msgstr "СкороÑÑ‚ÑŒ"
+
+#~ msgid "Very Low"
+#~ msgstr "Очень низкое"
+
+#~ msgid "Low"
+#~ msgstr "Ðизкое"
+
+#~ msgid "Medium"
+#~ msgstr "Среднее"
+
+#~ msgid "High"
+#~ msgstr "Ð’Ñ‹Ñокое"
+
+#~ msgid "Very High"
+#~ msgstr "Очень выÑокое"
+
+#~ msgid "Production"
+#~ msgstr "Выдача"
+
+#~ msgid "Front Panel Microphone"
+#~ msgstr "Микрофон на передней панели"
+
+#~ msgid "Front Panel Line In"
+#~ msgstr "Линейный вход на передней панели"
+
+#~ msgid "Front Panel Headphones"
+#~ msgstr "Ðаушники на передней панели"
+
+#~ msgid "Front Panel Line Out"
+#~ msgstr "Линейный выход на передней панели"
+
+#~ msgid "Green Connector"
+#~ msgstr "Зелёный разъём"
+
+#~ msgid "Pink Connector"
+#~ msgstr "Розовый разъём"
+
+#~ msgid "Blue Connector"
+#~ msgstr "Синий разъём"
+
+#~ msgid "White Connector"
+#~ msgstr "Белый разъём"
+
+#~ msgid "Black Connector"
+#~ msgstr "Чёрный разъём"
+
+#~ msgid "Gray Connector"
+#~ msgstr "Серый разъём"
+
+#~ msgid "Orange Connector"
+#~ msgstr "Оранжевый разъём"
+
+#~ msgid "Red Connector"
+#~ msgstr "КраÑный разъём"
+
+#~ msgid "Yellow Connector"
+#~ msgstr "Жёлтый разъём"
+
+#~ msgid "Green Front Panel Connector"
+#~ msgstr "Зелёный разъём на передней панели"
+
+#~ msgid "Pink Front Panel Connector"
+#~ msgstr "Розовый разъём на передней панели"
+
+#~ msgid "Blue Front Panel Connector"
+#~ msgstr "Синий разъём на передней панели"
+
+#~ msgid "White Front Panel Connector"
+#~ msgstr "Белый разъём на передней панели"
+
+#~ msgid "Black Front Panel Connector"
+#~ msgstr "Чёрный разъём на передней панели"
+
+#~ msgid "Gray Front Panel Connector"
+#~ msgstr "Серый разъём на передней панели"
+
+#~ msgid "Orange Front Panel Connector"
+#~ msgstr "Оранжевый разъём на передней панели"
+
+#~ msgid "Red Front Panel Connector"
+#~ msgstr "КраÑный разъём на передней панели"
+
+#~ msgid "Yellow Front Panel Connector"
+#~ msgstr "Жёлтый разъём на передней панели"
+
+#~ msgid "Spread Output"
+#~ msgstr "Развёрнутый вывод"
+
+#~ msgid "Downmix"
+#~ msgstr "Ðизведение"
+
+#~ msgid "Virtual Mixer Input"
+#~ msgstr "Вход виртуального микшера"
+
+#~ msgid "Virtual Mixer Output"
+#~ msgstr "Выход виртуального микшера"
+
+#~ msgid "Virtual Mixer Channels"
+#~ msgstr "Каналы виртуального микшера"
+
+#~ msgid "%s %d Function"
+#~ msgstr "Ð¤ÑƒÐ½ÐºÑ†Ð¸Ñ %s %d"
+
+#~ msgid "%s Function"
+#~ msgstr "Ð¤ÑƒÐ½ÐºÑ†Ð¸Ñ %s"
+
#~ msgid "Error reading %d bytes on device '%s'."
#~ msgstr "Ошибка Ñ‡Ñ‚ÐµÐ½Ð¸Ñ %d байт из уÑтройÑтва «%s»."
diff --git a/po/sk.gmo b/po/sk.gmo
index 3566b3f953afa98e4522197846c4182be28f7666..40a9314f61b21b0d4cfc936e1d50ca4e15a08447 100644
Binary files a/po/sk.gmo and b/po/sk.gmo differ
diff --git a/po/sk.po b/po/sk.po
index c1ae5736f9f7bd28da7822074f0eeba37bca74a0..658a4f79ccdcf637554f7a4d64f7146ff9e6403f 100644
--- a/po/sk.po
+++ b/po/sk.po
@@ -6,7 +6,7 @@ msgid ""
msgstr ""
"Project-Id-Version: gst-plugins-good 0.10.25.3\n"
"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/\n"
-"POT-Creation-Date: 2012-04-12 10:26+0200\n"
+"POT-Creation-Date: 2012-05-13 16:29+0200\n"
"PO-Revision-Date: 2010-11-08 15:48+0100\n"
"Last-Translator: Peter Tuhársky <tuharsky@misbb.sk>\n"
"Language-Team: Slovak <sk-i18n@lists.linux.sk>\n"
@@ -98,81 +98,6 @@ msgstr ""
msgid "Internal data flow error."
msgstr "Vnútorná chyba toku údajov."
-msgid "Volume"
-msgstr "Hlasitosť"
-
-msgid "Bass"
-msgstr "Basy"
-
-msgid "Treble"
-msgstr "Výšky"
-
-msgid "Synth"
-msgstr "Syntetizér"
-
-msgid "PCM"
-msgstr "PCM"
-
-msgid "Speaker"
-msgstr "Reproduktor"
-
-msgid "Line-in"
-msgstr "Linkový vstup"
-
-msgid "Microphone"
-msgstr "Mikrofón"
-
-msgid "CD"
-msgstr "CD"
-
-msgid "Mixer"
-msgstr "Mixér"
-
-msgid "PCM-2"
-msgstr "PCM-2"
-
-msgid "Record"
-msgstr "Nahrávanie"
-
-msgid "In-gain"
-msgstr "Vstupný zisk"
-
-msgid "Out-gain"
-msgstr "Výstupný zisk"
-
-msgid "Line-1"
-msgstr "Linka-1"
-
-msgid "Line-2"
-msgstr "Linka-2"
-
-msgid "Line-3"
-msgstr "Linka-3"
-
-msgid "Digital-1"
-msgstr "Digitál-1"
-
-msgid "Digital-2"
-msgstr "Digitál-2"
-
-msgid "Digital-3"
-msgstr "Digitál-3"
-
-msgid "Phone-in"
-msgstr "Telefón-vstup"
-
-msgid "Phone-out"
-msgstr "Telefón-výstup"
-
-msgid "Video"
-msgstr "Video"
-
-msgid "Radio"
-msgstr "Rádio"
-
-msgid "Monitor"
-msgstr "Monitor"
-
msgid ""
"Could not open audio device for playback. Device is being used by another "
"application."
@@ -200,311 +125,6 @@ msgstr ""
msgid "Could not open audio device for recording."
msgstr "Nepodarilo sa otvoriť zvukové zariadenie v režime záznamu."
-msgid "Could not open audio device for mixer control handling."
-msgstr "Nepodarilo sa otvoriť zvukové zariadenie v režime obsluhy mixéru."
-
-msgid ""
-"Could not open audio device for mixer control handling. This version of the "
-"Open Sound System is not supported by this element."
-msgstr ""
-"Nepodarilo sa otvoriť zvukové zariadenie v režime obsluhy mixéru. Táto "
-"verzia Open Sound System nie je podporovaná týmto prvkom."
-
-msgid "Master"
-msgstr "Hlavný"
-
-msgid "Front"
-msgstr "Predný"
-
-msgid "Rear"
-msgstr "Zadné"
-
-msgid "Headphones"
-msgstr "Slúchadlá"
-
-msgid "Center"
-msgstr "Stredný"
-
-msgid "LFE"
-msgstr "LFE"
-
-msgid "Surround"
-msgstr "Priestorový"
-
-msgid "Side"
-msgstr "Strana"
-
-msgid "Built-in Speaker"
-msgstr "PC reproduktor"
-
-msgid "AUX 1 Out"
-msgstr "AUX 1 výstup"
-
-msgid "AUX 2 Out"
-msgstr "AUX 2 výstup"
-
-msgid "AUX Out"
-msgstr "AUX výstup"
-
-msgid "3D Depth"
-msgstr "3D hĺbka"
-
-msgid "3D Center"
-msgstr "3D stred"
-
-msgid "3D Enhance"
-msgstr "3D vylepšenie"
-
-msgid "Telephone"
-msgstr "Telefón"
-
-msgid "Line Out"
-msgstr "Linkový výstup"
-
-msgid "Line In"
-msgstr "Linkový vstup"
-
-msgid "Internal CD"
-msgstr "Vnútorne CD"
-
-msgid "Video In"
-msgstr "Video vstup"
-
-msgid "AUX 1 In"
-msgstr "AUX 1 vstup"
-
-msgid "AUX 2 In"
-msgstr "AUX 2 vstup"
-
-msgid "AUX In"
-msgstr "AUX vstup"
-
-msgid "Record Gain"
-msgstr "Zisk záznamu"
-
-msgid "Output Gain"
-msgstr "Výstupný zisk"
-
-msgid "Microphone Boost"
-msgstr "Zosilnenie mikrofónu"
-
-msgid "Loopback"
-msgstr "Spätná sluÄka"
-
-msgid "Diagnostic"
-msgstr "Diagnostika"
-
-msgid "Bass Boost"
-msgstr "Zvýraznenie basov"
-
-msgid "Playback Ports"
-msgstr "Prehrávacie porty"
-
-msgid "Input"
-msgstr "Vstup"
-
-msgid "Record Source"
-msgstr "Zdroj záznamu"
-
-msgid "Monitor Source"
-msgstr "Monitor zdroja"
-
-msgid "Keyboard Beep"
-msgstr "PÃpnutie klávesnice"
-
-msgid "Simulate Stereo"
-msgstr "Simulovať stereo"
-
-msgid "Stereo"
-msgstr "Stereo"
-
-msgid "Surround Sound"
-msgstr "Priestorový zvuk"
-
-msgid "Microphone Gain"
-msgstr "Zisk mikrofónu"
-
-msgid "Speaker Source"
-msgstr "Zdroj reproduktora"
-
-msgid "Microphone Source"
-msgstr "Zdroj mikrofónu"
-
-msgid "Jack"
-msgstr "Jack"
-
-msgid "Center / LFE"
-msgstr "Stred / LFE"
-
-msgid "Stereo Mix"
-msgstr "Stereo Mix"
-
-msgid "Mono Mix"
-msgstr "Mono Mix"
-
-msgid "Input Mix"
-msgstr "Vstup Mix"
-
-msgid "SPDIF In"
-msgstr "SPDIF vstup"
-
-msgid "SPDIF Out"
-msgstr "SPDIF výstup"
-
-msgid "Microphone 1"
-msgstr "Mikrofón 1"
-
-msgid "Microphone 2"
-msgstr "Mikrofón 2"
-
-msgid "Digital Out"
-msgstr "Digitálny výstup"
-
-msgid "Digital In"
-msgstr "Digitálny vstup"
-
-msgid "HDMI"
-msgstr "HDMI"
-
-msgid "Modem"
-msgstr "Modem"
-
-msgid "Handset"
-msgstr ""
-
-msgid "Other"
-msgstr "Iné"
-
-msgid "None"
-msgstr "NiÄ"
-
-msgid "On"
-msgstr "Zapnuté"
-
-msgid "Off"
-msgstr "Vypnuté"
-
-msgid "Mute"
-msgstr "Stlmiť"
-
-msgid "Fast"
-msgstr "Rýchlo"
-
-#. TRANSLATORS: "Very Low" is a quality setting here
-msgid "Very Low"
-msgstr "Veľmi nÃzke"
-
-#. TRANSLATORS: "Low" is a quality setting here
-msgid "Low"
-msgstr "NÃzke"
-
-#. TRANSLATORS: "Medium" is a quality setting here
-msgid "Medium"
-msgstr "Stredné"
-
-#. TRANSLATORS: "High" is a quality setting here
-msgid "High"
-msgstr "Vysoké"
-
-#. TRANSLATORS: "Very High" is a quality setting here
-msgid "Very High"
-msgstr "Veľmi vysoké"
-
-#. TRANSLATORS: "Production" is a quality setting here
-msgid "Production"
-msgstr "Produkcia"
-
-msgid "Front Panel Microphone"
-msgstr "Mikrofón na prednom paneli"
-
-msgid "Front Panel Line In"
-msgstr "Linkový vstup na prednom paneli"
-
-msgid "Front Panel Headphones"
-msgstr "Slúchadlá na prednom paneli"
-
-msgid "Front Panel Line Out"
-msgstr "Linkový výstup na prednom paneli"
-
-msgid "Green Connector"
-msgstr "Zelený konektor"
-
-msgid "Pink Connector"
-msgstr "Ružový konektor"
-
-msgid "Blue Connector"
-msgstr "Modrý konektor"
-
-msgid "White Connector"
-msgstr "Biely konektor"
-
-msgid "Black Connector"
-msgstr "ÄŒierny konektor"
-
-msgid "Gray Connector"
-msgstr "Šedý konektor"
-
-msgid "Orange Connector"
-msgstr "Oranžový konektor"
-
-msgid "Red Connector"
-msgstr "Červený konektor"
-
-msgid "Yellow Connector"
-msgstr "Žltý konektor"
-
-msgid "Green Front Panel Connector"
-msgstr "Zelený konektor na prednom paneli"
-
-msgid "Pink Front Panel Connector"
-msgstr "Ružový konektor na prednom paneli"
-
-msgid "Blue Front Panel Connector"
-msgstr "Modrý konektor na prednom paneli"
-
-msgid "White Front Panel Connector"
-msgstr "Biely konektor na prednom paneli"
-
-msgid "Black Front Panel Connector"
-msgstr "ÄŒierny konektor na prednom paneli"
-
-msgid "Gray Front Panel Connector"
-msgstr "Šedý konektor na prednom paneli"
-
-msgid "Orange Front Panel Connector"
-msgstr "Oranžový konektor na prednom paneli"
-
-msgid "Red Front Panel Connector"
-msgstr "Červený konektor na prednom paneli"
-
-msgid "Yellow Front Panel Connector"
-msgstr "Žltý konektor na prednom paneli"
-
-msgid "Spread Output"
-msgstr "Rozdeliť výstup"
-
-msgid "Downmix"
-msgstr "Zmiešanie"
-
-msgid "Virtual Mixer Input"
-msgstr "Vstup virtuálneho mixéra"
-
-msgid "Virtual Mixer Output"
-msgstr "Výstup virtuálneho mixéra"
-
-msgid "Virtual Mixer Channels"
-msgstr "Kanály virtuálneho mixéra"
-
-#. TRANSLATORS: name + number of a volume mixer control
-#, c-format
-msgid "%s %d Function"
-msgstr "%s %d funkcia"
-
-#. TRANSLATORS: name of a volume mixer control
-#, c-format
-msgid "%s Function"
-msgstr "%s funkcia"
-
msgid ""
"Could not open audio device for playback. This version of the Open Sound "
"System is not supported by this element."
@@ -524,12 +144,33 @@ msgstr "Záznam nie je podporovaný týmto zvukovým zariadenÃm."
msgid "Error recording from audio device."
msgstr "Chyba pri zázname zo zvukového zariadenia."
+msgid "Volume"
+msgstr "Hlasitosť"
+
msgid "Gain"
msgstr "Zisk"
+msgid "Monitor"
+msgstr "Monitor"
+
+msgid "Built-in Speaker"
+msgstr "PC reproduktor"
+
msgid "Headphone"
msgstr "Slúchadlá"
+msgid "Line Out"
+msgstr "Linkový výstup"
+
+msgid "SPDIF Out"
+msgstr "SPDIF výstup"
+
+msgid "AUX 1 Out"
+msgstr "AUX 1 výstup"
+
+msgid "AUX 2 Out"
+msgstr "AUX 2 výstup"
+
#, c-format
msgid "Error reading %d bytes from device '%s'."
msgstr "Chyba pri ÄÃtanà %d bajtov na zariadenà '%s'."
@@ -711,6 +352,352 @@ msgstr "Zmena rozlÃÅ¡enia za chodu nie je zatiaľ podporovaná."
msgid "Cannot operate without a clock"
msgstr "Nemôžem fungovaÅ¥ bez hodÃn"
+#~ msgid "Bass"
+#~ msgstr "Basy"
+
+#~ msgid "Treble"
+#~ msgstr "Výšky"
+
+#~ msgid "Synth"
+#~ msgstr "Syntetizér"
+
+#~ msgid "PCM"
+#~ msgstr "PCM"
+
+#~ msgid "Speaker"
+#~ msgstr "Reproduktor"
+
+#~ msgid "Line-in"
+#~ msgstr "Linkový vstup"
+
+#~ msgid "Microphone"
+#~ msgstr "Mikrofón"
+
+#~ msgid "CD"
+#~ msgstr "CD"
+
+#~ msgid "Mixer"
+#~ msgstr "Mixér"
+
+#~ msgid "PCM-2"
+#~ msgstr "PCM-2"
+
+#~ msgid "Record"
+#~ msgstr "Nahrávanie"
+
+#~ msgid "In-gain"
+#~ msgstr "Vstupný zisk"
+
+#~ msgid "Out-gain"
+#~ msgstr "Výstupný zisk"
+
+#~ msgid "Line-1"
+#~ msgstr "Linka-1"
+
+#~ msgid "Line-2"
+#~ msgstr "Linka-2"
+
+#~ msgid "Line-3"
+#~ msgstr "Linka-3"
+
+#~ msgid "Digital-1"
+#~ msgstr "Digitál-1"
+
+#~ msgid "Digital-2"
+#~ msgstr "Digitál-2"
+
+#~ msgid "Digital-3"
+#~ msgstr "Digitál-3"
+
+#~ msgid "Phone-in"
+#~ msgstr "Telefón-vstup"
+
+#~ msgid "Phone-out"
+#~ msgstr "Telefón-výstup"
+
+#~ msgid "Video"
+#~ msgstr "Video"
+
+#~ msgid "Radio"
+#~ msgstr "Rádio"
+
+#~ msgid "Could not open audio device for mixer control handling."
+#~ msgstr "Nepodarilo sa otvoriť zvukové zariadenie v režime obsluhy mixéru."
+
+#~ msgid ""
+#~ "Could not open audio device for mixer control handling. This version of "
+#~ "the Open Sound System is not supported by this element."
+#~ msgstr ""
+#~ "Nepodarilo sa otvoriť zvukové zariadenie v režime obsluhy mixéru. Táto "
+#~ "verzia Open Sound System nie je podporovaná týmto prvkom."
+
+#~ msgid "Master"
+#~ msgstr "Hlavný"
+
+#~ msgid "Front"
+#~ msgstr "Predný"
+
+#~ msgid "Rear"
+#~ msgstr "Zadné"
+
+#~ msgid "Headphones"
+#~ msgstr "Slúchadlá"
+
+#~ msgid "Center"
+#~ msgstr "Stredný"
+
+#~ msgid "LFE"
+#~ msgstr "LFE"
+
+#~ msgid "Surround"
+#~ msgstr "Priestorový"
+
+#~ msgid "Side"
+#~ msgstr "Strana"
+
+#~ msgid "AUX Out"
+#~ msgstr "AUX výstup"
+
+#~ msgid "3D Depth"
+#~ msgstr "3D hĺbka"
+
+#~ msgid "3D Center"
+#~ msgstr "3D stred"
+
+#~ msgid "3D Enhance"
+#~ msgstr "3D vylepšenie"
+
+#~ msgid "Telephone"
+#~ msgstr "Telefón"
+
+#~ msgid "Line In"
+#~ msgstr "Linkový vstup"
+
+#~ msgid "Internal CD"
+#~ msgstr "Vnútorne CD"
+
+#~ msgid "Video In"
+#~ msgstr "Video vstup"
+
+#~ msgid "AUX 1 In"
+#~ msgstr "AUX 1 vstup"
+
+#~ msgid "AUX 2 In"
+#~ msgstr "AUX 2 vstup"
+
+#~ msgid "AUX In"
+#~ msgstr "AUX vstup"
+
+#~ msgid "Record Gain"
+#~ msgstr "Zisk záznamu"
+
+#~ msgid "Output Gain"
+#~ msgstr "Výstupný zisk"
+
+#~ msgid "Microphone Boost"
+#~ msgstr "Zosilnenie mikrofónu"
+
+#~ msgid "Loopback"
+#~ msgstr "Spätná sluÄka"
+
+#~ msgid "Diagnostic"
+#~ msgstr "Diagnostika"
+
+#~ msgid "Bass Boost"
+#~ msgstr "Zvýraznenie basov"
+
+#~ msgid "Playback Ports"
+#~ msgstr "Prehrávacie porty"
+
+#~ msgid "Input"
+#~ msgstr "Vstup"
+
+#~ msgid "Record Source"
+#~ msgstr "Zdroj záznamu"
+
+#~ msgid "Monitor Source"
+#~ msgstr "Monitor zdroja"
+
+#~ msgid "Keyboard Beep"
+#~ msgstr "PÃpnutie klávesnice"
+
+#~ msgid "Simulate Stereo"
+#~ msgstr "Simulovať stereo"
+
+#~ msgid "Stereo"
+#~ msgstr "Stereo"
+
+#~ msgid "Surround Sound"
+#~ msgstr "Priestorový zvuk"
+
+#~ msgid "Microphone Gain"
+#~ msgstr "Zisk mikrofónu"
+
+#~ msgid "Speaker Source"
+#~ msgstr "Zdroj reproduktora"
+
+#~ msgid "Microphone Source"
+#~ msgstr "Zdroj mikrofónu"
+
+#~ msgid "Jack"
+#~ msgstr "Jack"
+
+#~ msgid "Center / LFE"
+#~ msgstr "Stred / LFE"
+
+#~ msgid "Stereo Mix"
+#~ msgstr "Stereo Mix"
+
+#~ msgid "Mono Mix"
+#~ msgstr "Mono Mix"
+
+#~ msgid "Input Mix"
+#~ msgstr "Vstup Mix"
+
+#~ msgid "SPDIF In"
+#~ msgstr "SPDIF vstup"
+
+#~ msgid "Microphone 1"
+#~ msgstr "Mikrofón 1"
+
+#~ msgid "Microphone 2"
+#~ msgstr "Mikrofón 2"
+
+#~ msgid "Digital Out"
+#~ msgstr "Digitálny výstup"
+
+#~ msgid "Digital In"
+#~ msgstr "Digitálny vstup"
+
+#~ msgid "HDMI"
+#~ msgstr "HDMI"
+
+#~ msgid "Modem"
+#~ msgstr "Modem"
+
+#~ msgid "Other"
+#~ msgstr "Iné"
+
+#~ msgid "None"
+#~ msgstr "NiÄ"
+
+#~ msgid "On"
+#~ msgstr "Zapnuté"
+
+#~ msgid "Off"
+#~ msgstr "Vypnuté"
+
+#~ msgid "Mute"
+#~ msgstr "Stlmiť"
+
+#~ msgid "Fast"
+#~ msgstr "Rýchlo"
+
+#~ msgid "Very Low"
+#~ msgstr "Veľmi nÃzke"
+
+#~ msgid "Low"
+#~ msgstr "NÃzke"
+
+#~ msgid "Medium"
+#~ msgstr "Stredné"
+
+#~ msgid "High"
+#~ msgstr "Vysoké"
+
+#~ msgid "Very High"
+#~ msgstr "Veľmi vysoké"
+
+#~ msgid "Production"
+#~ msgstr "Produkcia"
+
+#~ msgid "Front Panel Microphone"
+#~ msgstr "Mikrofón na prednom paneli"
+
+#~ msgid "Front Panel Line In"
+#~ msgstr "Linkový vstup na prednom paneli"
+
+#~ msgid "Front Panel Headphones"
+#~ msgstr "Slúchadlá na prednom paneli"
+
+#~ msgid "Front Panel Line Out"
+#~ msgstr "Linkový výstup na prednom paneli"
+
+#~ msgid "Green Connector"
+#~ msgstr "Zelený konektor"
+
+#~ msgid "Pink Connector"
+#~ msgstr "Ružový konektor"
+
+#~ msgid "Blue Connector"
+#~ msgstr "Modrý konektor"
+
+#~ msgid "White Connector"
+#~ msgstr "Biely konektor"
+
+#~ msgid "Black Connector"
+#~ msgstr "ÄŒierny konektor"
+
+#~ msgid "Gray Connector"
+#~ msgstr "Šedý konektor"
+
+#~ msgid "Orange Connector"
+#~ msgstr "Oranžový konektor"
+
+#~ msgid "Red Connector"
+#~ msgstr "Červený konektor"
+
+#~ msgid "Yellow Connector"
+#~ msgstr "Žltý konektor"
+
+#~ msgid "Green Front Panel Connector"
+#~ msgstr "Zelený konektor na prednom paneli"
+
+#~ msgid "Pink Front Panel Connector"
+#~ msgstr "Ružový konektor na prednom paneli"
+
+#~ msgid "Blue Front Panel Connector"
+#~ msgstr "Modrý konektor na prednom paneli"
+
+#~ msgid "White Front Panel Connector"
+#~ msgstr "Biely konektor na prednom paneli"
+
+#~ msgid "Black Front Panel Connector"
+#~ msgstr "ÄŒierny konektor na prednom paneli"
+
+#~ msgid "Gray Front Panel Connector"
+#~ msgstr "Šedý konektor na prednom paneli"
+
+#~ msgid "Orange Front Panel Connector"
+#~ msgstr "Oranžový konektor na prednom paneli"
+
+#~ msgid "Red Front Panel Connector"
+#~ msgstr "Červený konektor na prednom paneli"
+
+#~ msgid "Yellow Front Panel Connector"
+#~ msgstr "Žltý konektor na prednom paneli"
+
+#~ msgid "Spread Output"
+#~ msgstr "Rozdeliť výstup"
+
+#~ msgid "Downmix"
+#~ msgstr "Zmiešanie"
+
+#~ msgid "Virtual Mixer Input"
+#~ msgstr "Vstup virtuálneho mixéra"
+
+#~ msgid "Virtual Mixer Output"
+#~ msgstr "Výstup virtuálneho mixéra"
+
+#~ msgid "Virtual Mixer Channels"
+#~ msgstr "Kanály virtuálneho mixéra"
+
+#~ msgid "%s %d Function"
+#~ msgstr "%s %d funkcia"
+
+#~ msgid "%s Function"
+#~ msgstr "%s funkcia"
+
#~ msgid "Error reading %d bytes on device '%s'."
#~ msgstr "Chyba pri ÄÃtanà %d bajtov na zariadenà '%s'."
diff --git a/po/sl.gmo b/po/sl.gmo
index 3a8e69184618070bbff98ae47d79707792cac952..9dcd3f2c97de08ad8567953abb71baed2115c06e 100644
Binary files a/po/sl.gmo and b/po/sl.gmo differ
diff --git a/po/sl.po b/po/sl.po
index 300a001124b6423aad67aa2afcba84b3542a1d4c..598151f08b2228c5c8e9690679a0972b439b1469 100644
--- a/po/sl.po
+++ b/po/sl.po
@@ -9,7 +9,7 @@ msgid ""
msgstr ""
"Project-Id-Version: gst-plugins-good 0.10.26.2\n"
"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/\n"
-"POT-Creation-Date: 2012-04-12 10:26+0200\n"
+"POT-Creation-Date: 2012-05-13 16:29+0200\n"
"PO-Revision-Date: 2011-03-12 18:35+0100\n"
"Last-Translator: Klemen Košir <klemen.kosir@gmx.com>\n"
"Language-Team: Slovenian <translation-team-sl@lists.sourceforge.net>\n"
@@ -103,81 +103,6 @@ msgstr ""
msgid "Internal data flow error."
msgstr "Notranja napaka pretoÄnosti podatkov."
-msgid "Volume"
-msgstr "Glasnost"
-
-msgid "Bass"
-msgstr "Bas"
-
-msgid "Treble"
-msgstr "Visoki toni"
-
-msgid "Synth"
-msgstr "Sintetizator"
-
-msgid "PCM"
-msgstr "PCM"
-
-msgid "Speaker"
-msgstr "ZvoÄnik"
-
-msgid "Line-in"
-msgstr "Analogni vhod"
-
-msgid "Microphone"
-msgstr "Mikrofon"
-
-msgid "CD"
-msgstr "CD"
-
-msgid "Mixer"
-msgstr "Mešalnik"
-
-msgid "PCM-2"
-msgstr "PCM-2"
-
-msgid "Record"
-msgstr "Snemanje"
-
-msgid "In-gain"
-msgstr "Vhodna ojaÄitev"
-
-msgid "Out-gain"
-msgstr "Izhodna ojaÄitev"
-
-msgid "Line-1"
-msgstr "Analogni vhod 1"
-
-msgid "Line-2"
-msgstr "Analogni vhod 2"
-
-msgid "Line-3"
-msgstr "Analogni vhod 3"
-
-msgid "Digital-1"
-msgstr "Digitalni vhod 1"
-
-msgid "Digital-2"
-msgstr "Digitalni vhod 2"
-
-msgid "Digital-3"
-msgstr "Digitalni vhod 3"
-
-msgid "Phone-in"
-msgstr "Telefonski vhod"
-
-msgid "Phone-out"
-msgstr "Telefonski izhod"
-
-msgid "Video"
-msgstr "Video"
-
-msgid "Radio"
-msgstr "Radio"
-
-msgid "Monitor"
-msgstr "Zaslon"
-
msgid ""
"Could not open audio device for playback. Device is being used by another "
"application."
@@ -205,311 +130,6 @@ msgstr ""
msgid "Could not open audio device for recording."
msgstr "ZvoÄne naprave ni mogoÄe odpreti za snemanje."
-msgid "Could not open audio device for mixer control handling."
-msgstr "ZvoÄne naprave ni mogoÄe odpreti za nadzor meÅ¡alnika."
-
-msgid ""
-"Could not open audio device for mixer control handling. This version of the "
-"Open Sound System is not supported by this element."
-msgstr ""
-"ZvoÄne naprave ni mogoÄe odpreti za nadzor meÅ¡alnika. Predmet ne podpira "
-"trenutne razliÄice sistema Open Sound System."
-
-msgid "Master"
-msgstr "Glavni"
-
-msgid "Front"
-msgstr "Sprednji"
-
-msgid "Rear"
-msgstr "Zadnji"
-
-msgid "Headphones"
-msgstr "Slušalke"
-
-msgid "Center"
-msgstr "Sredinski"
-
-msgid "LFE"
-msgstr "LFE"
-
-msgid "Surround"
-msgstr "Prostorski"
-
-msgid "Side"
-msgstr "Stranski"
-
-msgid "Built-in Speaker"
-msgstr "Vgrajen zvoÄnik"
-
-msgid "AUX 1 Out"
-msgstr "Izhod AUX 1"
-
-msgid "AUX 2 Out"
-msgstr "Izhod AUX 2"
-
-msgid "AUX Out"
-msgstr "Izhod AUX"
-
-msgid "3D Depth"
-msgstr "3D globina"
-
-msgid "3D Center"
-msgstr "3D sredina"
-
-msgid "3D Enhance"
-msgstr "3D izboljšava"
-
-msgid "Telephone"
-msgstr "Telefon"
-
-msgid "Line Out"
-msgstr "Analogni izhod"
-
-msgid "Line In"
-msgstr "Analogni vhod"
-
-msgid "Internal CD"
-msgstr "Notranji CD"
-
-msgid "Video In"
-msgstr "Video vhod"
-
-msgid "AUX 1 In"
-msgstr "Vhod AUX 1"
-
-msgid "AUX 2 In"
-msgstr "Vhod AUX 2"
-
-msgid "AUX In"
-msgstr "Vhod AUX"
-
-msgid "Record Gain"
-msgstr "OjaÄitev snemanja"
-
-msgid "Output Gain"
-msgstr "OjaÄitev izhoda"
-
-msgid "Microphone Boost"
-msgstr "OjaÄitev mikrofona"
-
-msgid "Loopback"
-msgstr "Povratna zanka"
-
-msgid "Diagnostic"
-msgstr "Diagnostika"
-
-msgid "Bass Boost"
-msgstr "OjaÄitev basov"
-
-msgid "Playback Ports"
-msgstr "Vrata predvajanja"
-
-msgid "Input"
-msgstr "Vhod"
-
-msgid "Record Source"
-msgstr "Snemaj vir"
-
-msgid "Monitor Source"
-msgstr "Nadzoruj vir"
-
-msgid "Keyboard Beep"
-msgstr "Pisk tipkovnice"
-
-msgid "Simulate Stereo"
-msgstr "Simuliran stereo"
-
-msgid "Stereo"
-msgstr "Stereo"
-
-msgid "Surround Sound"
-msgstr "Prostorski zvok"
-
-msgid "Microphone Gain"
-msgstr "OjaÄitev mikrofona"
-
-msgid "Speaker Source"
-msgstr "Vir zvoÄnika"
-
-msgid "Microphone Source"
-msgstr "Vir mikrofona"
-
-msgid "Jack"
-msgstr "PrikljuÄek"
-
-msgid "Center / LFE"
-msgstr "Srednji / LFE"
-
-msgid "Stereo Mix"
-msgstr "Stereo mešanje"
-
-msgid "Mono Mix"
-msgstr "Mono mešanje"
-
-msgid "Input Mix"
-msgstr "Mešanje vhoda"
-
-msgid "SPDIF In"
-msgstr "Vhod SPDIF"
-
-msgid "SPDIF Out"
-msgstr "Izhod SPDIF"
-
-msgid "Microphone 1"
-msgstr "Mikrofon 1"
-
-msgid "Microphone 2"
-msgstr "Mikrofon 2"
-
-msgid "Digital Out"
-msgstr "Digitalni izhod"
-
-msgid "Digital In"
-msgstr "Digitalni vhod"
-
-msgid "HDMI"
-msgstr "HDMI"
-
-msgid "Modem"
-msgstr "Modem"
-
-msgid "Handset"
-msgstr "ProstoroÄna sluÅ¡alka"
-
-msgid "Other"
-msgstr "Drugo"
-
-msgid "None"
-msgstr "Brez"
-
-msgid "On"
-msgstr "VkljuÄeno"
-
-msgid "Off"
-msgstr "IzkljuÄeno"
-
-msgid "Mute"
-msgstr "Nemo"
-
-msgid "Fast"
-msgstr "Hitro"
-
-#. TRANSLATORS: "Very Low" is a quality setting here
-msgid "Very Low"
-msgstr "Zelo nizko"
-
-#. TRANSLATORS: "Low" is a quality setting here
-msgid "Low"
-msgstr "Nizko"
-
-#. TRANSLATORS: "Medium" is a quality setting here
-msgid "Medium"
-msgstr "Srednje"
-
-#. TRANSLATORS: "High" is a quality setting here
-msgid "High"
-msgstr "Visoko"
-
-#. TRANSLATORS: "Very High" is a quality setting here
-msgid "Very High"
-msgstr "Zelo visoko"
-
-#. TRANSLATORS: "Production" is a quality setting here
-msgid "Production"
-msgstr "Proizvodnja"
-
-msgid "Front Panel Microphone"
-msgstr "Mikrofon spredaj"
-
-msgid "Front Panel Line In"
-msgstr "Analogni vhod spredaj"
-
-msgid "Front Panel Headphones"
-msgstr "Slušalke spredaj"
-
-msgid "Front Panel Line Out"
-msgstr "Analogni izhod spredaj"
-
-msgid "Green Connector"
-msgstr "Zeleni prikljuÄek"
-
-msgid "Pink Connector"
-msgstr "Roza prikljuÄek"
-
-msgid "Blue Connector"
-msgstr "Modri prikljuÄek"
-
-msgid "White Connector"
-msgstr "Beli prikljuÄek"
-
-msgid "Black Connector"
-msgstr "ÄŒrni prikljuÄek"
-
-msgid "Gray Connector"
-msgstr "Sivi prikljuÄek"
-
-msgid "Orange Connector"
-msgstr "Oranžni prikljuÄek"
-
-msgid "Red Connector"
-msgstr "RdeÄi prikljuÄek"
-
-msgid "Yellow Connector"
-msgstr "Rumeni prikljuÄek"
-
-msgid "Green Front Panel Connector"
-msgstr "Zeleni prikljuÄek spredaj"
-
-msgid "Pink Front Panel Connector"
-msgstr "Roza prikljuÄek spredaj"
-
-msgid "Blue Front Panel Connector"
-msgstr "Modri prikljuÄek spredaj"
-
-msgid "White Front Panel Connector"
-msgstr "Beli prikljuÄek spredaj"
-
-msgid "Black Front Panel Connector"
-msgstr "ÄŒrni prikljuÄek spredaj"
-
-msgid "Gray Front Panel Connector"
-msgstr "Sivi prikljuÄek spredaj"
-
-msgid "Orange Front Panel Connector"
-msgstr "Oranžni prikljuÄek spredaj"
-
-msgid "Red Front Panel Connector"
-msgstr "RdeÄi prikljuÄek spredaj"
-
-msgid "Yellow Front Panel Connector"
-msgstr "Rumeni prikljuÄek spredaj"
-
-msgid "Spread Output"
-msgstr "Razširi izhod"
-
-msgid "Downmix"
-msgstr "Zmanjševanje kanalov"
-
-msgid "Virtual Mixer Input"
-msgstr "Vhod navideznega mešalnika"
-
-msgid "Virtual Mixer Output"
-msgstr "Izhod navideznega mešalnika"
-
-msgid "Virtual Mixer Channels"
-msgstr "Kanali navideznega mešalnika"
-
-#. TRANSLATORS: name + number of a volume mixer control
-#, c-format
-msgid "%s %d Function"
-msgstr "Funkcija %s %d"
-
-#. TRANSLATORS: name of a volume mixer control
-#, c-format
-msgid "%s Function"
-msgstr "Funkcija %s"
-
msgid ""
"Could not open audio device for playback. This version of the Open Sound "
"System is not supported by this element."
@@ -529,12 +149,33 @@ msgstr "Snemanje s to zvoÄno napravo ni podprto."
msgid "Error recording from audio device."
msgstr "Napaka med snemanjem z zvoÄno napravo."
+msgid "Volume"
+msgstr "Glasnost"
+
msgid "Gain"
msgstr "OjaÄitev"
+msgid "Monitor"
+msgstr "Zaslon"
+
+msgid "Built-in Speaker"
+msgstr "Vgrajen zvoÄnik"
+
msgid "Headphone"
msgstr "Slušalke"
+msgid "Line Out"
+msgstr "Analogni izhod"
+
+msgid "SPDIF Out"
+msgstr "Izhod SPDIF"
+
+msgid "AUX 1 Out"
+msgstr "Izhod AUX 1"
+
+msgid "AUX 2 Out"
+msgstr "Izhod AUX 2"
+
#, c-format
msgid "Error reading %d bytes from device '%s'."
msgstr "Napaka med branjem %d bajtov iz naprave '%s'."
@@ -714,6 +355,355 @@ msgstr "Spreminjanje loÄljivosti med delovanjem Å¡e ni podprto."
msgid "Cannot operate without a clock"
msgstr "Delovanje brez ure ni mogoÄe"
+#~ msgid "Bass"
+#~ msgstr "Bas"
+
+#~ msgid "Treble"
+#~ msgstr "Visoki toni"
+
+#~ msgid "Synth"
+#~ msgstr "Sintetizator"
+
+#~ msgid "PCM"
+#~ msgstr "PCM"
+
+#~ msgid "Speaker"
+#~ msgstr "ZvoÄnik"
+
+#~ msgid "Line-in"
+#~ msgstr "Analogni vhod"
+
+#~ msgid "Microphone"
+#~ msgstr "Mikrofon"
+
+#~ msgid "CD"
+#~ msgstr "CD"
+
+#~ msgid "Mixer"
+#~ msgstr "Mešalnik"
+
+#~ msgid "PCM-2"
+#~ msgstr "PCM-2"
+
+#~ msgid "Record"
+#~ msgstr "Snemanje"
+
+#~ msgid "In-gain"
+#~ msgstr "Vhodna ojaÄitev"
+
+#~ msgid "Out-gain"
+#~ msgstr "Izhodna ojaÄitev"
+
+#~ msgid "Line-1"
+#~ msgstr "Analogni vhod 1"
+
+#~ msgid "Line-2"
+#~ msgstr "Analogni vhod 2"
+
+#~ msgid "Line-3"
+#~ msgstr "Analogni vhod 3"
+
+#~ msgid "Digital-1"
+#~ msgstr "Digitalni vhod 1"
+
+#~ msgid "Digital-2"
+#~ msgstr "Digitalni vhod 2"
+
+#~ msgid "Digital-3"
+#~ msgstr "Digitalni vhod 3"
+
+#~ msgid "Phone-in"
+#~ msgstr "Telefonski vhod"
+
+#~ msgid "Phone-out"
+#~ msgstr "Telefonski izhod"
+
+#~ msgid "Video"
+#~ msgstr "Video"
+
+#~ msgid "Radio"
+#~ msgstr "Radio"
+
+#~ msgid "Could not open audio device for mixer control handling."
+#~ msgstr "ZvoÄne naprave ni mogoÄe odpreti za nadzor meÅ¡alnika."
+
+#~ msgid ""
+#~ "Could not open audio device for mixer control handling. This version of "
+#~ "the Open Sound System is not supported by this element."
+#~ msgstr ""
+#~ "ZvoÄne naprave ni mogoÄe odpreti za nadzor meÅ¡alnika. Predmet ne podpira "
+#~ "trenutne razliÄice sistema Open Sound System."
+
+#~ msgid "Master"
+#~ msgstr "Glavni"
+
+#~ msgid "Front"
+#~ msgstr "Sprednji"
+
+#~ msgid "Rear"
+#~ msgstr "Zadnji"
+
+#~ msgid "Headphones"
+#~ msgstr "Slušalke"
+
+#~ msgid "Center"
+#~ msgstr "Sredinski"
+
+#~ msgid "LFE"
+#~ msgstr "LFE"
+
+#~ msgid "Surround"
+#~ msgstr "Prostorski"
+
+#~ msgid "Side"
+#~ msgstr "Stranski"
+
+#~ msgid "AUX Out"
+#~ msgstr "Izhod AUX"
+
+#~ msgid "3D Depth"
+#~ msgstr "3D globina"
+
+#~ msgid "3D Center"
+#~ msgstr "3D sredina"
+
+#~ msgid "3D Enhance"
+#~ msgstr "3D izboljšava"
+
+#~ msgid "Telephone"
+#~ msgstr "Telefon"
+
+#~ msgid "Line In"
+#~ msgstr "Analogni vhod"
+
+#~ msgid "Internal CD"
+#~ msgstr "Notranji CD"
+
+#~ msgid "Video In"
+#~ msgstr "Video vhod"
+
+#~ msgid "AUX 1 In"
+#~ msgstr "Vhod AUX 1"
+
+#~ msgid "AUX 2 In"
+#~ msgstr "Vhod AUX 2"
+
+#~ msgid "AUX In"
+#~ msgstr "Vhod AUX"
+
+#~ msgid "Record Gain"
+#~ msgstr "OjaÄitev snemanja"
+
+#~ msgid "Output Gain"
+#~ msgstr "OjaÄitev izhoda"
+
+#~ msgid "Microphone Boost"
+#~ msgstr "OjaÄitev mikrofona"
+
+#~ msgid "Loopback"
+#~ msgstr "Povratna zanka"
+
+#~ msgid "Diagnostic"
+#~ msgstr "Diagnostika"
+
+#~ msgid "Bass Boost"
+#~ msgstr "OjaÄitev basov"
+
+#~ msgid "Playback Ports"
+#~ msgstr "Vrata predvajanja"
+
+#~ msgid "Input"
+#~ msgstr "Vhod"
+
+#~ msgid "Record Source"
+#~ msgstr "Snemaj vir"
+
+#~ msgid "Monitor Source"
+#~ msgstr "Nadzoruj vir"
+
+#~ msgid "Keyboard Beep"
+#~ msgstr "Pisk tipkovnice"
+
+#~ msgid "Simulate Stereo"
+#~ msgstr "Simuliran stereo"
+
+#~ msgid "Stereo"
+#~ msgstr "Stereo"
+
+#~ msgid "Surround Sound"
+#~ msgstr "Prostorski zvok"
+
+#~ msgid "Microphone Gain"
+#~ msgstr "OjaÄitev mikrofona"
+
+#~ msgid "Speaker Source"
+#~ msgstr "Vir zvoÄnika"
+
+#~ msgid "Microphone Source"
+#~ msgstr "Vir mikrofona"
+
+#~ msgid "Jack"
+#~ msgstr "PrikljuÄek"
+
+#~ msgid "Center / LFE"
+#~ msgstr "Srednji / LFE"
+
+#~ msgid "Stereo Mix"
+#~ msgstr "Stereo mešanje"
+
+#~ msgid "Mono Mix"
+#~ msgstr "Mono mešanje"
+
+#~ msgid "Input Mix"
+#~ msgstr "Mešanje vhoda"
+
+#~ msgid "SPDIF In"
+#~ msgstr "Vhod SPDIF"
+
+#~ msgid "Microphone 1"
+#~ msgstr "Mikrofon 1"
+
+#~ msgid "Microphone 2"
+#~ msgstr "Mikrofon 2"
+
+#~ msgid "Digital Out"
+#~ msgstr "Digitalni izhod"
+
+#~ msgid "Digital In"
+#~ msgstr "Digitalni vhod"
+
+#~ msgid "HDMI"
+#~ msgstr "HDMI"
+
+#~ msgid "Modem"
+#~ msgstr "Modem"
+
+#~ msgid "Handset"
+#~ msgstr "ProstoroÄna sluÅ¡alka"
+
+#~ msgid "Other"
+#~ msgstr "Drugo"
+
+#~ msgid "None"
+#~ msgstr "Brez"
+
+#~ msgid "On"
+#~ msgstr "VkljuÄeno"
+
+#~ msgid "Off"
+#~ msgstr "IzkljuÄeno"
+
+#~ msgid "Mute"
+#~ msgstr "Nemo"
+
+#~ msgid "Fast"
+#~ msgstr "Hitro"
+
+#~ msgid "Very Low"
+#~ msgstr "Zelo nizko"
+
+#~ msgid "Low"
+#~ msgstr "Nizko"
+
+#~ msgid "Medium"
+#~ msgstr "Srednje"
+
+#~ msgid "High"
+#~ msgstr "Visoko"
+
+#~ msgid "Very High"
+#~ msgstr "Zelo visoko"
+
+#~ msgid "Production"
+#~ msgstr "Proizvodnja"
+
+#~ msgid "Front Panel Microphone"
+#~ msgstr "Mikrofon spredaj"
+
+#~ msgid "Front Panel Line In"
+#~ msgstr "Analogni vhod spredaj"
+
+#~ msgid "Front Panel Headphones"
+#~ msgstr "Slušalke spredaj"
+
+#~ msgid "Front Panel Line Out"
+#~ msgstr "Analogni izhod spredaj"
+
+#~ msgid "Green Connector"
+#~ msgstr "Zeleni prikljuÄek"
+
+#~ msgid "Pink Connector"
+#~ msgstr "Roza prikljuÄek"
+
+#~ msgid "Blue Connector"
+#~ msgstr "Modri prikljuÄek"
+
+#~ msgid "White Connector"
+#~ msgstr "Beli prikljuÄek"
+
+#~ msgid "Black Connector"
+#~ msgstr "ÄŒrni prikljuÄek"
+
+#~ msgid "Gray Connector"
+#~ msgstr "Sivi prikljuÄek"
+
+#~ msgid "Orange Connector"
+#~ msgstr "Oranžni prikljuÄek"
+
+#~ msgid "Red Connector"
+#~ msgstr "RdeÄi prikljuÄek"
+
+#~ msgid "Yellow Connector"
+#~ msgstr "Rumeni prikljuÄek"
+
+#~ msgid "Green Front Panel Connector"
+#~ msgstr "Zeleni prikljuÄek spredaj"
+
+#~ msgid "Pink Front Panel Connector"
+#~ msgstr "Roza prikljuÄek spredaj"
+
+#~ msgid "Blue Front Panel Connector"
+#~ msgstr "Modri prikljuÄek spredaj"
+
+#~ msgid "White Front Panel Connector"
+#~ msgstr "Beli prikljuÄek spredaj"
+
+#~ msgid "Black Front Panel Connector"
+#~ msgstr "ÄŒrni prikljuÄek spredaj"
+
+#~ msgid "Gray Front Panel Connector"
+#~ msgstr "Sivi prikljuÄek spredaj"
+
+#~ msgid "Orange Front Panel Connector"
+#~ msgstr "Oranžni prikljuÄek spredaj"
+
+#~ msgid "Red Front Panel Connector"
+#~ msgstr "RdeÄi prikljuÄek spredaj"
+
+#~ msgid "Yellow Front Panel Connector"
+#~ msgstr "Rumeni prikljuÄek spredaj"
+
+#~ msgid "Spread Output"
+#~ msgstr "Razširi izhod"
+
+#~ msgid "Downmix"
+#~ msgstr "Zmanjševanje kanalov"
+
+#~ msgid "Virtual Mixer Input"
+#~ msgstr "Vhod navideznega mešalnika"
+
+#~ msgid "Virtual Mixer Output"
+#~ msgstr "Izhod navideznega mešalnika"
+
+#~ msgid "Virtual Mixer Channels"
+#~ msgstr "Kanali navideznega mešalnika"
+
+#~ msgid "%s %d Function"
+#~ msgstr "Funkcija %s %d"
+
+#~ msgid "%s Function"
+#~ msgstr "Funkcija %s"
+
#~ msgid "Error reading %d bytes on device '%s'."
#~ msgstr "Napaka med branjem %d bajtov na napravi '%s'."
diff --git a/po/sq.gmo b/po/sq.gmo
index 1f36a9ef6ecdd996cdab75640e32bb92a4b841c2..124adaad52b6265a05f33fe58f0ba1ffa0888602 100644
Binary files a/po/sq.gmo and b/po/sq.gmo differ
diff --git a/po/sq.po b/po/sq.po
index 3030262b57dfdd63ef6281d2497972f427c84edc..cb5967994cbe9db191e34c6eef5453fa3b1f3639 100644
--- a/po/sq.po
+++ b/po/sq.po
@@ -6,7 +6,7 @@ msgid ""
msgstr ""
"Project-Id-Version: gst-plugins 0.8.3\n"
"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/\n"
-"POT-Creation-Date: 2012-04-12 10:26+0200\n"
+"POT-Creation-Date: 2012-05-13 16:29+0200\n"
"PO-Revision-Date: 2004-08-07 20:29+0200\n"
"Last-Translator: Laurent Dhima <laurenti@alblinux.net>\n"
"Language-Team: Albanian <begraj@hotmail.com>\n"
@@ -94,81 +94,6 @@ msgstr ""
msgid "Internal data flow error."
msgstr ""
-msgid "Volume"
-msgstr "Volumi"
-
-msgid "Bass"
-msgstr "Bas"
-
-msgid "Treble"
-msgstr "Treble"
-
-msgid "Synth"
-msgstr "Sintetizuesi"
-
-msgid "PCM"
-msgstr "PCM"
-
-msgid "Speaker"
-msgstr "Zë folës"
-
-msgid "Line-in"
-msgstr "Linja-hyrje"
-
-msgid "Microphone"
-msgstr "Mikrofoni"
-
-msgid "CD"
-msgstr "CD"
-
-msgid "Mixer"
-msgstr "Kontrolli i volumit"
-
-msgid "PCM-2"
-msgstr "PCM-2"
-
-msgid "Record"
-msgstr "Regjistrimi"
-
-msgid "In-gain"
-msgstr "In-gain"
-
-msgid "Out-gain"
-msgstr "Out-gain"
-
-msgid "Line-1"
-msgstr "Linja-1"
-
-msgid "Line-2"
-msgstr "Linja-2"
-
-msgid "Line-3"
-msgstr "Linja-3"
-
-msgid "Digital-1"
-msgstr "Dixhitale-1"
-
-msgid "Digital-2"
-msgstr "Dixhitale-2"
-
-msgid "Digital-3"
-msgstr "Dixhitale-3"
-
-msgid "Phone-in"
-msgstr "Phone-hyrja"
-
-msgid "Phone-out"
-msgstr "Phone-dalja"
-
-msgid "Video"
-msgstr "Video"
-
-msgid "Radio"
-msgstr "Radio"
-
-msgid "Monitor"
-msgstr "Ekrani"
-
msgid ""
"Could not open audio device for playback. Device is being used by another "
"application."
@@ -192,349 +117,49 @@ msgstr ""
msgid "Could not open audio device for recording."
msgstr "I pamundur hapja e dispozitivit CD për lexim."
-#, fuzzy
-msgid "Could not open audio device for mixer control handling."
-msgstr "E pamundur hapja e dispozitivit të zërit \"%s\" për shkrim."
-
msgid ""
-"Could not open audio device for mixer control handling. This version of the "
-"Open Sound System is not supported by this element."
+"Could not open audio device for playback. This version of the Open Sound "
+"System is not supported by this element."
msgstr ""
-msgid "Master"
+msgid "Playback is not supported by this audio device."
msgstr ""
-msgid "Front"
+msgid "Audio playback error."
msgstr ""
-#, fuzzy
-msgid "Rear"
-msgstr "Regjistrimi"
-
-msgid "Headphones"
+msgid "Recording is not supported by this audio device."
msgstr ""
-msgid "Center"
+msgid "Error recording from audio device."
msgstr ""
-msgid "LFE"
-msgstr ""
+msgid "Volume"
+msgstr "Volumi"
-msgid "Surround"
+msgid "Gain"
msgstr ""
-#, fuzzy
-msgid "Side"
-msgstr "Video"
+msgid "Monitor"
+msgstr "Ekrani"
#, fuzzy
msgid "Built-in Speaker"
msgstr "Zë folës"
-msgid "AUX 1 Out"
-msgstr ""
-
-msgid "AUX 2 Out"
-msgstr ""
-
-msgid "AUX Out"
-msgstr ""
-
-msgid "3D Depth"
-msgstr ""
-
-msgid "3D Center"
-msgstr ""
-
-msgid "3D Enhance"
-msgstr ""
-
-msgid "Telephone"
+msgid "Headphone"
msgstr ""
msgid "Line Out"
msgstr ""
-#, fuzzy
-msgid "Line In"
-msgstr "Linja-hyrje"
-
-msgid "Internal CD"
-msgstr ""
-
-#, fuzzy
-msgid "Video In"
-msgstr "Video"
-
-msgid "AUX 1 In"
-msgstr ""
-
-msgid "AUX 2 In"
-msgstr ""
-
-msgid "AUX In"
-msgstr ""
-
-#, fuzzy
-msgid "Record Gain"
-msgstr "Regjistrimi"
-
-#, fuzzy
-msgid "Output Gain"
-msgstr "Out-gain"
-
-#, fuzzy
-msgid "Microphone Boost"
-msgstr "Mikrofoni"
-
-msgid "Loopback"
-msgstr ""
-
-msgid "Diagnostic"
-msgstr ""
-
-msgid "Bass Boost"
-msgstr ""
-
-msgid "Playback Ports"
-msgstr ""
-
-msgid "Input"
-msgstr ""
-
-#, fuzzy
-msgid "Record Source"
-msgstr "Regjistrimi"
-
-#, fuzzy
-msgid "Monitor Source"
-msgstr "Ekrani"
-
-msgid "Keyboard Beep"
-msgstr ""
-
-msgid "Simulate Stereo"
-msgstr ""
-
-msgid "Stereo"
-msgstr ""
-
-msgid "Surround Sound"
-msgstr ""
-
-#, fuzzy
-msgid "Microphone Gain"
-msgstr "Mikrofoni"
-
-#, fuzzy
-msgid "Speaker Source"
-msgstr "Zë folës"
-
-#, fuzzy
-msgid "Microphone Source"
-msgstr "Mikrofoni"
-
-msgid "Jack"
-msgstr ""
-
-msgid "Center / LFE"
-msgstr ""
-
-msgid "Stereo Mix"
-msgstr ""
-
-msgid "Mono Mix"
-msgstr ""
-
-msgid "Input Mix"
-msgstr ""
-
-msgid "SPDIF In"
-msgstr ""
-
msgid "SPDIF Out"
msgstr ""
-#, fuzzy
-msgid "Microphone 1"
-msgstr "Mikrofoni"
-
-#, fuzzy
-msgid "Microphone 2"
-msgstr "Mikrofoni"
-
-#, fuzzy
-msgid "Digital Out"
-msgstr "Dixhitale-1"
-
-#, fuzzy
-msgid "Digital In"
-msgstr "Dixhitale-1"
-
-msgid "HDMI"
-msgstr ""
-
-msgid "Modem"
-msgstr ""
-
-msgid "Handset"
-msgstr ""
-
-msgid "Other"
-msgstr ""
-
-msgid "None"
-msgstr ""
-
-msgid "On"
-msgstr ""
-
-msgid "Off"
-msgstr ""
-
-msgid "Mute"
-msgstr ""
-
-msgid "Fast"
-msgstr ""
-
-#. TRANSLATORS: "Very Low" is a quality setting here
-msgid "Very Low"
-msgstr ""
-
-#. TRANSLATORS: "Low" is a quality setting here
-msgid "Low"
-msgstr ""
-
-#. TRANSLATORS: "Medium" is a quality setting here
-msgid "Medium"
-msgstr ""
-
-#. TRANSLATORS: "High" is a quality setting here
-msgid "High"
-msgstr ""
-
-#. TRANSLATORS: "Very High" is a quality setting here
-msgid "Very High"
-msgstr ""
-
-#. TRANSLATORS: "Production" is a quality setting here
-msgid "Production"
-msgstr ""
-
-#, fuzzy
-msgid "Front Panel Microphone"
-msgstr "Mikrofoni"
-
-msgid "Front Panel Line In"
-msgstr ""
-
-msgid "Front Panel Headphones"
-msgstr ""
-
-msgid "Front Panel Line Out"
-msgstr ""
-
-msgid "Green Connector"
-msgstr ""
-
-msgid "Pink Connector"
-msgstr ""
-
-msgid "Blue Connector"
-msgstr ""
-
-msgid "White Connector"
-msgstr ""
-
-msgid "Black Connector"
-msgstr ""
-
-msgid "Gray Connector"
-msgstr ""
-
-msgid "Orange Connector"
-msgstr ""
-
-msgid "Red Connector"
-msgstr ""
-
-msgid "Yellow Connector"
-msgstr ""
-
-msgid "Green Front Panel Connector"
-msgstr ""
-
-msgid "Pink Front Panel Connector"
-msgstr ""
-
-msgid "Blue Front Panel Connector"
-msgstr ""
-
-msgid "White Front Panel Connector"
-msgstr ""
-
-msgid "Black Front Panel Connector"
-msgstr ""
-
-msgid "Gray Front Panel Connector"
-msgstr ""
-
-msgid "Orange Front Panel Connector"
-msgstr ""
-
-msgid "Red Front Panel Connector"
-msgstr ""
-
-msgid "Yellow Front Panel Connector"
-msgstr ""
-
-msgid "Spread Output"
-msgstr ""
-
-msgid "Downmix"
-msgstr ""
-
-msgid "Virtual Mixer Input"
-msgstr ""
-
-msgid "Virtual Mixer Output"
-msgstr ""
-
-msgid "Virtual Mixer Channels"
-msgstr ""
-
-#. TRANSLATORS: name + number of a volume mixer control
-#, c-format
-msgid "%s %d Function"
-msgstr ""
-
-#. TRANSLATORS: name of a volume mixer control
-#, c-format
-msgid "%s Function"
-msgstr ""
-
-msgid ""
-"Could not open audio device for playback. This version of the Open Sound "
-"System is not supported by this element."
-msgstr ""
-
-msgid "Playback is not supported by this audio device."
-msgstr ""
-
-msgid "Audio playback error."
-msgstr ""
-
-msgid "Recording is not supported by this audio device."
-msgstr ""
-
-msgid "Error recording from audio device."
-msgstr ""
-
-msgid "Gain"
+msgid "AUX 1 Out"
msgstr ""
-msgid "Headphone"
+msgid "AUX 2 Out"
msgstr ""
#, fuzzy, c-format
@@ -704,6 +329,147 @@ msgstr ""
msgid "Cannot operate without a clock"
msgstr ""
+#~ msgid "Bass"
+#~ msgstr "Bas"
+
+#~ msgid "Treble"
+#~ msgstr "Treble"
+
+#~ msgid "Synth"
+#~ msgstr "Sintetizuesi"
+
+#~ msgid "PCM"
+#~ msgstr "PCM"
+
+#~ msgid "Speaker"
+#~ msgstr "Zë folës"
+
+#~ msgid "Line-in"
+#~ msgstr "Linja-hyrje"
+
+#~ msgid "Microphone"
+#~ msgstr "Mikrofoni"
+
+#~ msgid "CD"
+#~ msgstr "CD"
+
+#~ msgid "Mixer"
+#~ msgstr "Kontrolli i volumit"
+
+#~ msgid "PCM-2"
+#~ msgstr "PCM-2"
+
+#~ msgid "Record"
+#~ msgstr "Regjistrimi"
+
+#~ msgid "In-gain"
+#~ msgstr "In-gain"
+
+#~ msgid "Out-gain"
+#~ msgstr "Out-gain"
+
+#~ msgid "Line-1"
+#~ msgstr "Linja-1"
+
+#~ msgid "Line-2"
+#~ msgstr "Linja-2"
+
+#~ msgid "Line-3"
+#~ msgstr "Linja-3"
+
+#~ msgid "Digital-1"
+#~ msgstr "Dixhitale-1"
+
+#~ msgid "Digital-2"
+#~ msgstr "Dixhitale-2"
+
+#~ msgid "Digital-3"
+#~ msgstr "Dixhitale-3"
+
+#~ msgid "Phone-in"
+#~ msgstr "Phone-hyrja"
+
+#~ msgid "Phone-out"
+#~ msgstr "Phone-dalja"
+
+#~ msgid "Video"
+#~ msgstr "Video"
+
+#~ msgid "Radio"
+#~ msgstr "Radio"
+
+#, fuzzy
+#~ msgid "Could not open audio device for mixer control handling."
+#~ msgstr "E pamundur hapja e dispozitivit të zërit \"%s\" për shkrim."
+
+#, fuzzy
+#~ msgid "Rear"
+#~ msgstr "Regjistrimi"
+
+#, fuzzy
+#~ msgid "Side"
+#~ msgstr "Video"
+
+#, fuzzy
+#~ msgid "Line In"
+#~ msgstr "Linja-hyrje"
+
+#, fuzzy
+#~ msgid "Video In"
+#~ msgstr "Video"
+
+#, fuzzy
+#~ msgid "Record Gain"
+#~ msgstr "Regjistrimi"
+
+#, fuzzy
+#~ msgid "Output Gain"
+#~ msgstr "Out-gain"
+
+#, fuzzy
+#~ msgid "Microphone Boost"
+#~ msgstr "Mikrofoni"
+
+#, fuzzy
+#~ msgid "Record Source"
+#~ msgstr "Regjistrimi"
+
+#, fuzzy
+#~ msgid "Monitor Source"
+#~ msgstr "Ekrani"
+
+#, fuzzy
+#~ msgid "Microphone Gain"
+#~ msgstr "Mikrofoni"
+
+#, fuzzy
+#~ msgid "Speaker Source"
+#~ msgstr "Zë folës"
+
+#, fuzzy
+#~ msgid "Microphone Source"
+#~ msgstr "Mikrofoni"
+
+#, fuzzy
+#~ msgid "Microphone 1"
+#~ msgstr "Mikrofoni"
+
+#, fuzzy
+#~ msgid "Microphone 2"
+#~ msgstr "Mikrofoni"
+
+#, fuzzy
+#~ msgid "Digital Out"
+#~ msgstr "Dixhitale-1"
+
+#, fuzzy
+#~ msgid "Digital In"
+#~ msgstr "Dixhitale-1"
+
+#, fuzzy
+#~ msgid "Front Panel Microphone"
+#~ msgstr "Mikrofoni"
+
#, fuzzy
#~ msgid "Could not enqueue buffers in device '%s'."
#~ msgstr "E pamundur marrja e buffers nga dispozitivi \"%s\"."
diff --git a/po/sr.gmo b/po/sr.gmo
index 4c5d269b38c3c201a5742941ebf7852f91c8010f..df28907bbb1f6891a53522f2ec76c8cc3d2d6e63 100644
Binary files a/po/sr.gmo and b/po/sr.gmo differ
diff --git a/po/sr.po b/po/sr.po
index df9f527c16060506e9fbdab8b64b79953f2e6bae..b044d7b78fd59dc4907b4fda9d9f76934cd02c87 100644
--- a/po/sr.po
+++ b/po/sr.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: gst-plugins-good-0.10.28.2\n"
"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/\n"
-"POT-Creation-Date: 2012-04-12 10:26+0200\n"
+"POT-Creation-Date: 2012-05-13 16:29+0200\n"
"PO-Revision-Date: 2011-12-04 16:44+0200\n"
"Last-Translator: МироÑлав Ðиколић <miroslavnikolic@rocketmail.com>\n"
"Language-Team: Serbian <gnu@prevod.org>\n"
@@ -100,81 +100,6 @@ msgstr ""
msgid "Internal data flow error."
msgstr "Унутрaшња грешка протока података."
-msgid "Volume"
-msgstr "Јачина звука"
-
-msgid "Bass"
-msgstr "БаÑ"
-
-msgid "Treble"
-msgstr "ВиÑокотонац"
-
-msgid "Synth"
-msgstr "СинтиÑајзер"
-
-msgid "PCM"
-msgstr "ПЦМ"
-
-msgid "Speaker"
-msgstr "Звучник"
-
-msgid "Line-in"
-msgstr "ЛинијÑки улаз"
-
-msgid "Microphone"
-msgstr "Микрофон"
-
-msgid "CD"
-msgstr "ЦД"
-
-msgid "Mixer"
-msgstr "Мешач"
-
-msgid "PCM-2"
-msgstr "ПЦМ-2"
-
-msgid "Record"
-msgstr "Снимање"
-
-msgid "In-gain"
-msgstr "Улазно појачање"
-
-msgid "Out-gain"
-msgstr "Излазно појачање"
-
-msgid "Line-1"
-msgstr "Линија 1"
-
-msgid "Line-2"
-msgstr "Линија 2"
-
-msgid "Line-3"
-msgstr "Линија 3"
-
-msgid "Digital-1"
-msgstr "Дигитални 1"
-
-msgid "Digital-2"
-msgstr "Дигитални 2"
-
-msgid "Digital-3"
-msgstr "Дигитални 3"
-
-msgid "Phone-in"
-msgstr "ТелефонÑки улаз"
-
-msgid "Phone-out"
-msgstr "ТелефонÑки излаз"
-
-msgid "Video"
-msgstr "Видео"
-
-msgid "Radio"
-msgstr "Радио"
-
-msgid "Monitor"
-msgstr "Праћење"
-
msgid ""
"Could not open audio device for playback. Device is being used by another "
"application."
@@ -202,311 +127,6 @@ msgstr ""
msgid "Could not open audio device for recording."
msgstr "Ðе могу да покренем звучни уређај ради Ñнимања."
-msgid "Could not open audio device for mixer control handling."
-msgstr "Ðе могу да покренем звучни уређај за руковање управљањем мешача."
-
-msgid ""
-"Could not open audio device for mixer control handling. This version of the "
-"Open Sound System is not supported by this element."
-msgstr ""
-"Ðе могу да покренем звучни уређај за руковање управљањем мешача. Ово издање "
-"ÑиÑтема отвореног звука није подржано овим елементом."
-
-msgid "Master"
-msgstr "Главни"
-
-msgid "Front"
-msgstr "Предњи"
-
-msgid "Rear"
-msgstr "Задњи"
-
-msgid "Headphones"
-msgstr "Слушалице"
-
-msgid "Center"
-msgstr "Средињи"
-
-msgid "LFE"
-msgstr "ЛФЕ"
-
-msgid "Surround"
-msgstr "Окружење"
-
-msgid "Side"
-msgstr "Са Ñтране"
-
-msgid "Built-in Speaker"
-msgstr "Уграђени звучник"
-
-msgid "AUX 1 Out"
-msgstr "ÐУХ 1 излаз"
-
-msgid "AUX 2 Out"
-msgstr "ÐУХ 2 излаз"
-
-msgid "AUX Out"
-msgstr "ÐУХ излаз"
-
-msgid "3D Depth"
-msgstr "3Д дубина"
-
-msgid "3D Center"
-msgstr "3Д Ñредиште"
-
-msgid "3D Enhance"
-msgstr "3Д побољшање"
-
-msgid "Telephone"
-msgstr "Телефон"
-
-msgid "Line Out"
-msgstr "ЛинијÑки излаз"
-
-msgid "Line In"
-msgstr "ЛинијÑки улаз"
-
-msgid "Internal CD"
-msgstr "Унутрашњи ЦД"
-
-msgid "Video In"
-msgstr "Видео улаз"
-
-msgid "AUX 1 In"
-msgstr "ÐУХ 1 улаз"
-
-msgid "AUX 2 In"
-msgstr "ÐУХ 2 улаз"
-
-msgid "AUX In"
-msgstr "ÐУХ улаз"
-
-msgid "Record Gain"
-msgstr "Појачање Ñнимања"
-
-msgid "Output Gain"
-msgstr "Појачање излаза"
-
-msgid "Microphone Boost"
-msgstr "Појачање микрофона"
-
-msgid "Loopback"
-msgstr "Повратна петља"
-
-msgid "Diagnostic"
-msgstr "ДијагноÑтика"
-
-msgid "Bass Boost"
-msgstr "Појачање баÑа"
-
-msgid "Playback Ports"
-msgstr "Портови пуштања"
-
-msgid "Input"
-msgstr "Улаз"
-
-msgid "Record Source"
-msgstr "Извор Ñнимања"
-
-msgid "Monitor Source"
-msgstr "Извор праћења"
-
-msgid "Keyboard Beep"
-msgstr "Звук таÑтатуре"
-
-msgid "Simulate Stereo"
-msgstr "Лажни Ñтерео"
-
-msgid "Stereo"
-msgstr "Стерео"
-
-msgid "Surround Sound"
-msgstr "Звук окружења"
-
-msgid "Microphone Gain"
-msgstr "Појачање микрофона"
-
-msgid "Speaker Source"
-msgstr "Извор звучника"
-
-msgid "Microphone Source"
-msgstr "Извор микрофона"
-
-msgid "Jack"
-msgstr "Утичница"
-
-msgid "Center / LFE"
-msgstr "Средиште / ЛФЕ"
-
-msgid "Stereo Mix"
-msgstr "Стерео микÑ"
-
-msgid "Mono Mix"
-msgstr "Моно микÑ"
-
-msgid "Input Mix"
-msgstr "Улазни микÑ"
-
-msgid "SPDIF In"
-msgstr "СПДИФ улаз"
-
-msgid "SPDIF Out"
-msgstr "СПДИФ излаз"
-
-msgid "Microphone 1"
-msgstr "Микрофон 1"
-
-msgid "Microphone 2"
-msgstr "Микрофон 2"
-
-msgid "Digital Out"
-msgstr "Дигитални излаз"
-
-msgid "Digital In"
-msgstr "Дигитални улаз"
-
-msgid "HDMI"
-msgstr "ХДМИ"
-
-msgid "Modem"
-msgstr "Модем"
-
-msgid "Handset"
-msgstr "Слушалица"
-
-msgid "Other"
-msgstr "ОÑтало"
-
-msgid "None"
-msgstr "Ðишта"
-
-msgid "On"
-msgstr "Укљ."
-
-msgid "Off"
-msgstr "ИÑкљ."
-
-msgid "Mute"
-msgstr "Без звука"
-
-msgid "Fast"
-msgstr "Брзо"
-
-#. TRANSLATORS: "Very Low" is a quality setting here
-msgid "Very Low"
-msgstr "Врло низак"
-
-#. TRANSLATORS: "Low" is a quality setting here
-msgid "Low"
-msgstr "Ðизак"
-
-#. TRANSLATORS: "Medium" is a quality setting here
-msgid "Medium"
-msgstr "Средњи"
-
-#. TRANSLATORS: "High" is a quality setting here
-msgid "High"
-msgstr "ВиÑок"
-
-#. TRANSLATORS: "Very High" is a quality setting here
-msgid "Very High"
-msgstr "Врло виÑок"
-
-#. TRANSLATORS: "Production" is a quality setting here
-msgid "Production"
-msgstr "Производни"
-
-msgid "Front Panel Microphone"
-msgstr "Микрофон предње површи"
-
-msgid "Front Panel Line In"
-msgstr "ЛинијÑки улаз предње површи"
-
-msgid "Front Panel Headphones"
-msgstr "Слушалице предње површи"
-
-msgid "Front Panel Line Out"
-msgstr "ЛинијÑки излаз предње површи"
-
-msgid "Green Connector"
-msgstr "Зелени прикључак"
-
-msgid "Pink Connector"
-msgstr "РужичаÑÑ‚ прикључак"
-
-msgid "Blue Connector"
-msgstr "Плави прикључак"
-
-msgid "White Connector"
-msgstr "Бели прикључак"
-
-msgid "Black Connector"
-msgstr "Црни прикључак"
-
-msgid "Gray Connector"
-msgstr "Сиви прикључак"
-
-msgid "Orange Connector"
-msgstr "ÐаранџаÑти прикључак"
-
-msgid "Red Connector"
-msgstr "Црвени прикључак"
-
-msgid "Yellow Connector"
-msgstr "Жути прикључак"
-
-msgid "Green Front Panel Connector"
-msgstr "Зелени прикључак на предњој површи"
-
-msgid "Pink Front Panel Connector"
-msgstr "РужичаÑти прикључак на предњој површи"
-
-msgid "Blue Front Panel Connector"
-msgstr "Плави прикључак на предњој површи"
-
-msgid "White Front Panel Connector"
-msgstr "Бели прикључак на предњој површи"
-
-msgid "Black Front Panel Connector"
-msgstr "Црни прикључак на предњој површи"
-
-msgid "Gray Front Panel Connector"
-msgstr "Сиви прикључак на предњој површи"
-
-msgid "Orange Front Panel Connector"
-msgstr "ÐаранџаÑти прикључак на предњој површи"
-
-msgid "Red Front Panel Connector"
-msgstr "Црвени прикључак на предњој површи"
-
-msgid "Yellow Front Panel Connector"
-msgstr "Жути прикључак на предњој површи"
-
-msgid "Spread Output"
-msgstr "Излаз ширења"
-
-msgid "Downmix"
-msgstr "Сабирни мешач"
-
-msgid "Virtual Mixer Input"
-msgstr "Улаз виртуелног мешача"
-
-msgid "Virtual Mixer Output"
-msgstr "Излаз виртуелног мешача"
-
-msgid "Virtual Mixer Channels"
-msgstr "Канали виртуелног мешача"
-
-#. TRANSLATORS: name + number of a volume mixer control
-#, c-format
-msgid "%s %d Function"
-msgstr "%s %d функција"
-
-#. TRANSLATORS: name of a volume mixer control
-#, c-format
-msgid "%s Function"
-msgstr "%s функција"
-
msgid ""
"Could not open audio device for playback. This version of the Open Sound "
"System is not supported by this element."
@@ -526,12 +146,33 @@ msgstr "Снимање није подржано од Ñтране овог зв
msgid "Error recording from audio device."
msgstr "Грешка приликом Ñнимања Ñа звучног уређаја."
+msgid "Volume"
+msgstr "Јачина звука"
+
msgid "Gain"
msgstr "Појачање"
+msgid "Monitor"
+msgstr "Праћење"
+
+msgid "Built-in Speaker"
+msgstr "Уграђени звучник"
+
msgid "Headphone"
msgstr "Слушалице"
+msgid "Line Out"
+msgstr "ЛинијÑки излаз"
+
+msgid "SPDIF Out"
+msgstr "СПДИФ излаз"
+
+msgid "AUX 1 Out"
+msgstr "ÐУХ 1 излаз"
+
+msgid "AUX 2 Out"
+msgstr "ÐУХ 2 излаз"
+
#, c-format
msgid "Error reading %d bytes from device '%s'."
msgstr "Грешка приликом читања %d бајтова Ñа уређаја „%s“."
@@ -708,6 +349,355 @@ msgstr "Промена резолуције приликом извршавањ
msgid "Cannot operate without a clock"
msgstr "Ðе могу да радим без Ñата"
+#~ msgid "Bass"
+#~ msgstr "БаÑ"
+
+#~ msgid "Treble"
+#~ msgstr "ВиÑокотонац"
+
+#~ msgid "Synth"
+#~ msgstr "СинтиÑајзер"
+
+#~ msgid "PCM"
+#~ msgstr "ПЦМ"
+
+#~ msgid "Speaker"
+#~ msgstr "Звучник"
+
+#~ msgid "Line-in"
+#~ msgstr "ЛинијÑки улаз"
+
+#~ msgid "Microphone"
+#~ msgstr "Микрофон"
+
+#~ msgid "CD"
+#~ msgstr "ЦД"
+
+#~ msgid "Mixer"
+#~ msgstr "Мешач"
+
+#~ msgid "PCM-2"
+#~ msgstr "ПЦМ-2"
+
+#~ msgid "Record"
+#~ msgstr "Снимање"
+
+#~ msgid "In-gain"
+#~ msgstr "Улазно појачање"
+
+#~ msgid "Out-gain"
+#~ msgstr "Излазно појачање"
+
+#~ msgid "Line-1"
+#~ msgstr "Линија 1"
+
+#~ msgid "Line-2"
+#~ msgstr "Линија 2"
+
+#~ msgid "Line-3"
+#~ msgstr "Линија 3"
+
+#~ msgid "Digital-1"
+#~ msgstr "Дигитални 1"
+
+#~ msgid "Digital-2"
+#~ msgstr "Дигитални 2"
+
+#~ msgid "Digital-3"
+#~ msgstr "Дигитални 3"
+
+#~ msgid "Phone-in"
+#~ msgstr "ТелефонÑки улаз"
+
+#~ msgid "Phone-out"
+#~ msgstr "ТелефонÑки излаз"
+
+#~ msgid "Video"
+#~ msgstr "Видео"
+
+#~ msgid "Radio"
+#~ msgstr "Радио"
+
+#~ msgid "Could not open audio device for mixer control handling."
+#~ msgstr "Ðе могу да покренем звучни уређај за руковање управљањем мешача."
+
+#~ msgid ""
+#~ "Could not open audio device for mixer control handling. This version of "
+#~ "the Open Sound System is not supported by this element."
+#~ msgstr ""
+#~ "Ðе могу да покренем звучни уређај за руковање управљањем мешача. Ово "
+#~ "издање ÑиÑтема отвореног звука није подржано овим елементом."
+
+#~ msgid "Master"
+#~ msgstr "Главни"
+
+#~ msgid "Front"
+#~ msgstr "Предњи"
+
+#~ msgid "Rear"
+#~ msgstr "Задњи"
+
+#~ msgid "Headphones"
+#~ msgstr "Слушалице"
+
+#~ msgid "Center"
+#~ msgstr "Средињи"
+
+#~ msgid "LFE"
+#~ msgstr "ЛФЕ"
+
+#~ msgid "Surround"
+#~ msgstr "Окружење"
+
+#~ msgid "Side"
+#~ msgstr "Са Ñтране"
+
+#~ msgid "AUX Out"
+#~ msgstr "ÐУХ излаз"
+
+#~ msgid "3D Depth"
+#~ msgstr "3Д дубина"
+
+#~ msgid "3D Center"
+#~ msgstr "3Д Ñредиште"
+
+#~ msgid "3D Enhance"
+#~ msgstr "3Д побољшање"
+
+#~ msgid "Telephone"
+#~ msgstr "Телефон"
+
+#~ msgid "Line In"
+#~ msgstr "ЛинијÑки улаз"
+
+#~ msgid "Internal CD"
+#~ msgstr "Унутрашњи ЦД"
+
+#~ msgid "Video In"
+#~ msgstr "Видео улаз"
+
+#~ msgid "AUX 1 In"
+#~ msgstr "ÐУХ 1 улаз"
+
+#~ msgid "AUX 2 In"
+#~ msgstr "ÐУХ 2 улаз"
+
+#~ msgid "AUX In"
+#~ msgstr "ÐУХ улаз"
+
+#~ msgid "Record Gain"
+#~ msgstr "Појачање Ñнимања"
+
+#~ msgid "Output Gain"
+#~ msgstr "Појачање излаза"
+
+#~ msgid "Microphone Boost"
+#~ msgstr "Појачање микрофона"
+
+#~ msgid "Loopback"
+#~ msgstr "Повратна петља"
+
+#~ msgid "Diagnostic"
+#~ msgstr "ДијагноÑтика"
+
+#~ msgid "Bass Boost"
+#~ msgstr "Појачање баÑа"
+
+#~ msgid "Playback Ports"
+#~ msgstr "Портови пуштања"
+
+#~ msgid "Input"
+#~ msgstr "Улаз"
+
+#~ msgid "Record Source"
+#~ msgstr "Извор Ñнимања"
+
+#~ msgid "Monitor Source"
+#~ msgstr "Извор праћења"
+
+#~ msgid "Keyboard Beep"
+#~ msgstr "Звук таÑтатуре"
+
+#~ msgid "Simulate Stereo"
+#~ msgstr "Лажни Ñтерео"
+
+#~ msgid "Stereo"
+#~ msgstr "Стерео"
+
+#~ msgid "Surround Sound"
+#~ msgstr "Звук окружења"
+
+#~ msgid "Microphone Gain"
+#~ msgstr "Појачање микрофона"
+
+#~ msgid "Speaker Source"
+#~ msgstr "Извор звучника"
+
+#~ msgid "Microphone Source"
+#~ msgstr "Извор микрофона"
+
+#~ msgid "Jack"
+#~ msgstr "Утичница"
+
+#~ msgid "Center / LFE"
+#~ msgstr "Средиште / ЛФЕ"
+
+#~ msgid "Stereo Mix"
+#~ msgstr "Стерео микÑ"
+
+#~ msgid "Mono Mix"
+#~ msgstr "Моно микÑ"
+
+#~ msgid "Input Mix"
+#~ msgstr "Улазни микÑ"
+
+#~ msgid "SPDIF In"
+#~ msgstr "СПДИФ улаз"
+
+#~ msgid "Microphone 1"
+#~ msgstr "Микрофон 1"
+
+#~ msgid "Microphone 2"
+#~ msgstr "Микрофон 2"
+
+#~ msgid "Digital Out"
+#~ msgstr "Дигитални излаз"
+
+#~ msgid "Digital In"
+#~ msgstr "Дигитални улаз"
+
+#~ msgid "HDMI"
+#~ msgstr "ХДМИ"
+
+#~ msgid "Modem"
+#~ msgstr "Модем"
+
+#~ msgid "Handset"
+#~ msgstr "Слушалица"
+
+#~ msgid "Other"
+#~ msgstr "ОÑтало"
+
+#~ msgid "None"
+#~ msgstr "Ðишта"
+
+#~ msgid "On"
+#~ msgstr "Укљ."
+
+#~ msgid "Off"
+#~ msgstr "ИÑкљ."
+
+#~ msgid "Mute"
+#~ msgstr "Без звука"
+
+#~ msgid "Fast"
+#~ msgstr "Брзо"
+
+#~ msgid "Very Low"
+#~ msgstr "Врло низак"
+
+#~ msgid "Low"
+#~ msgstr "Ðизак"
+
+#~ msgid "Medium"
+#~ msgstr "Средњи"
+
+#~ msgid "High"
+#~ msgstr "ВиÑок"
+
+#~ msgid "Very High"
+#~ msgstr "Врло виÑок"
+
+#~ msgid "Production"
+#~ msgstr "Производни"
+
+#~ msgid "Front Panel Microphone"
+#~ msgstr "Микрофон предње површи"
+
+#~ msgid "Front Panel Line In"
+#~ msgstr "ЛинијÑки улаз предње површи"
+
+#~ msgid "Front Panel Headphones"
+#~ msgstr "Слушалице предње површи"
+
+#~ msgid "Front Panel Line Out"
+#~ msgstr "ЛинијÑки излаз предње површи"
+
+#~ msgid "Green Connector"
+#~ msgstr "Зелени прикључак"
+
+#~ msgid "Pink Connector"
+#~ msgstr "РужичаÑÑ‚ прикључак"
+
+#~ msgid "Blue Connector"
+#~ msgstr "Плави прикључак"
+
+#~ msgid "White Connector"
+#~ msgstr "Бели прикључак"
+
+#~ msgid "Black Connector"
+#~ msgstr "Црни прикључак"
+
+#~ msgid "Gray Connector"
+#~ msgstr "Сиви прикључак"
+
+#~ msgid "Orange Connector"
+#~ msgstr "ÐаранџаÑти прикључак"
+
+#~ msgid "Red Connector"
+#~ msgstr "Црвени прикључак"
+
+#~ msgid "Yellow Connector"
+#~ msgstr "Жути прикључак"
+
+#~ msgid "Green Front Panel Connector"
+#~ msgstr "Зелени прикључак на предњој површи"
+
+#~ msgid "Pink Front Panel Connector"
+#~ msgstr "РужичаÑти прикључак на предњој површи"
+
+#~ msgid "Blue Front Panel Connector"
+#~ msgstr "Плави прикључак на предњој површи"
+
+#~ msgid "White Front Panel Connector"
+#~ msgstr "Бели прикључак на предњој површи"
+
+#~ msgid "Black Front Panel Connector"
+#~ msgstr "Црни прикључак на предњој површи"
+
+#~ msgid "Gray Front Panel Connector"
+#~ msgstr "Сиви прикључак на предњој површи"
+
+#~ msgid "Orange Front Panel Connector"
+#~ msgstr "ÐаранџаÑти прикључак на предњој површи"
+
+#~ msgid "Red Front Panel Connector"
+#~ msgstr "Црвени прикључак на предњој површи"
+
+#~ msgid "Yellow Front Panel Connector"
+#~ msgstr "Жути прикључак на предњој површи"
+
+#~ msgid "Spread Output"
+#~ msgstr "Излаз ширења"
+
+#~ msgid "Downmix"
+#~ msgstr "Сабирни мешач"
+
+#~ msgid "Virtual Mixer Input"
+#~ msgstr "Улаз виртуелног мешача"
+
+#~ msgid "Virtual Mixer Output"
+#~ msgstr "Излаз виртуелног мешача"
+
+#~ msgid "Virtual Mixer Channels"
+#~ msgstr "Канали виртуелног мешача"
+
+#~ msgid "%s %d Function"
+#~ msgstr "%s %d функција"
+
+#~ msgid "%s Function"
+#~ msgstr "%s функција"
+
#~ msgid "Could not establish connection to sound server"
#~ msgstr "Ðе могу да уÑпоÑтавим везу Ñа Ñервером звука"
diff --git a/po/sv.gmo b/po/sv.gmo
index 9419564009b7e3e6efc8b9acefd8cf813290155a..b8933e6cc567c06fbfa2611dd48197ab69b13109 100644
Binary files a/po/sv.gmo and b/po/sv.gmo differ
diff --git a/po/sv.po b/po/sv.po
index 003b1b602a825a95843193661ba7fe35f6d2032e..4b9b028245e1982fcd578c74263c405ecf841204 100644
--- a/po/sv.po
+++ b/po/sv.po
@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: gst-plugins-good 0.10.26.2\n"
"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/\n"
-"POT-Creation-Date: 2012-04-12 10:26+0200\n"
+"POT-Creation-Date: 2012-05-13 16:29+0200\n"
"PO-Revision-Date: 2011-01-09 19:36+0100\n"
"Last-Translator: Daniel Nylander <po@danielnylander.se>\n"
"Language-Team: Swedish <tp-sv@listor.tp-sv.se>\n"
@@ -98,81 +98,6 @@ msgstr ""
msgid "Internal data flow error."
msgstr "Internt fel i dataflöde."
-msgid "Volume"
-msgstr "Volym"
-
-msgid "Bass"
-msgstr "Bass"
-
-msgid "Treble"
-msgstr "Diskant"
-
-msgid "Synth"
-msgstr "Synt"
-
-msgid "PCM"
-msgstr "PCM"
-
-msgid "Speaker"
-msgstr "Högtalare"
-
-msgid "Line-in"
-msgstr "Linje-in"
-
-msgid "Microphone"
-msgstr "Mikrofon"
-
-msgid "CD"
-msgstr "Cd"
-
-msgid "Mixer"
-msgstr "Mixer"
-
-msgid "PCM-2"
-msgstr "PCM-2"
-
-msgid "Record"
-msgstr "Spela in"
-
-msgid "In-gain"
-msgstr "Införstärkning"
-
-msgid "Out-gain"
-msgstr "Utförstärkning"
-
-msgid "Line-1"
-msgstr "Linje-1"
-
-msgid "Line-2"
-msgstr "Linje-2"
-
-msgid "Line-3"
-msgstr "Linje-3"
-
-msgid "Digital-1"
-msgstr "Digital-1"
-
-msgid "Digital-2"
-msgstr "Digital-2"
-
-msgid "Digital-3"
-msgstr "Digital-3"
-
-msgid "Phone-in"
-msgstr "Tele-in"
-
-msgid "Phone-out"
-msgstr "Tele-ut"
-
-msgid "Video"
-msgstr "Video"
-
-msgid "Radio"
-msgstr "Radio"
-
-msgid "Monitor"
-msgstr "Monitor"
-
msgid ""
"Could not open audio device for playback. Device is being used by another "
"application."
@@ -200,312 +125,6 @@ msgstr ""
msgid "Could not open audio device for recording."
msgstr "Kunde inte öppna ljudenheten för inspelning."
-msgid "Could not open audio device for mixer control handling."
-msgstr "Kunde inte öppna ljudenheten för hantering av mixerstyrning."
-
-msgid ""
-"Could not open audio device for mixer control handling. This version of the "
-"Open Sound System is not supported by this element."
-msgstr ""
-"Kunde inte öppna ljudenheten för mixerhantering. Denna version av Open Sound "
-"System saknar stöd för detta element."
-
-msgid "Master"
-msgstr "Övergripande"
-
-msgid "Front"
-msgstr "Fram"
-
-msgid "Rear"
-msgstr "Bak"
-
-msgid "Headphones"
-msgstr "Hörlurar"
-
-msgid "Center"
-msgstr "Center"
-
-msgid "LFE"
-msgstr "LFE"
-
-msgid "Surround"
-msgstr "Surround"
-
-msgid "Side"
-msgstr "Sida"
-
-msgid "Built-in Speaker"
-msgstr "Inbyggd högtalare"
-
-msgid "AUX 1 Out"
-msgstr "AUX 1 ut"
-
-msgid "AUX 2 Out"
-msgstr "AUX 2 ut"
-
-msgid "AUX Out"
-msgstr "AUX ut"
-
-msgid "3D Depth"
-msgstr "3D-djup"
-
-msgid "3D Center"
-msgstr "3D-center"
-
-msgid "3D Enhance"
-msgstr "3D Enhance"
-
-msgid "Telephone"
-msgstr "Telefon"
-
-msgid "Line Out"
-msgstr "Linje ut"
-
-msgid "Line In"
-msgstr "Linje-in"
-
-msgid "Internal CD"
-msgstr "Intern cd-spelare"
-
-msgid "Video In"
-msgstr "Video-in"
-
-msgid "AUX 1 In"
-msgstr "AUX 1 in"
-
-msgid "AUX 2 In"
-msgstr "AUX 2 in"
-
-msgid "AUX In"
-msgstr "AUX in"
-
-msgid "Record Gain"
-msgstr "Inspelningsförstärkning"
-
-msgid "Output Gain"
-msgstr "Utförstärkning"
-
-msgid "Microphone Boost"
-msgstr "Mikrofonboost"
-
-msgid "Loopback"
-msgstr "Loopback"
-
-msgid "Diagnostic"
-msgstr "Diagnostik"
-
-msgid "Bass Boost"
-msgstr "Bass Boost"
-
-msgid "Playback Ports"
-msgstr "Uppspelningsportar"
-
-msgid "Input"
-msgstr "Ingång"
-
-msgid "Record Source"
-msgstr "Inspelningskälla"
-
-msgid "Monitor Source"
-msgstr "Monitorkälla"
-
-msgid "Keyboard Beep"
-msgstr "Tangentbordspip"
-
-msgid "Simulate Stereo"
-msgstr "Simulera stereo"
-
-msgid "Stereo"
-msgstr "Stereo"
-
-msgid "Surround Sound"
-msgstr "Surroundljud"
-
-msgid "Microphone Gain"
-msgstr "Mikrofonförstärkning"
-
-msgid "Speaker Source"
-msgstr "Högtalarkälla"
-
-msgid "Microphone Source"
-msgstr "Mikrofonkälla"
-
-msgid "Jack"
-msgstr "Jack"
-
-msgid "Center / LFE"
-msgstr "Center / LFE"
-
-msgid "Stereo Mix"
-msgstr "Stereomix"
-
-msgid "Mono Mix"
-msgstr "Monomix"
-
-msgid "Input Mix"
-msgstr "Ingångsmix"
-
-msgid "SPDIF In"
-msgstr "SPDIF in"
-
-msgid "SPDIF Out"
-msgstr "SPDIF ut"
-
-msgid "Microphone 1"
-msgstr "Mikrofon 1"
-
-msgid "Microphone 2"
-msgstr "Mikrofon 2"
-
-msgid "Digital Out"
-msgstr "Digital-ut"
-
-msgid "Digital In"
-msgstr "Digital-in"
-
-msgid "HDMI"
-msgstr "HDMI"
-
-msgid "Modem"
-msgstr "Modem"
-
-# Telefon?
-msgid "Handset"
-msgstr "Handhållen"
-
-msgid "Other"
-msgstr "Annat"
-
-msgid "None"
-msgstr "Ingen"
-
-msgid "On"
-msgstr "PÃ¥"
-
-msgid "Off"
-msgstr "Av"
-
-msgid "Mute"
-msgstr "Tyst"
-
-msgid "Fast"
-msgstr "Snabb"
-
-#. TRANSLATORS: "Very Low" is a quality setting here
-msgid "Very Low"
-msgstr "Mycket låg"
-
-#. TRANSLATORS: "Low" is a quality setting here
-msgid "Low"
-msgstr "LÃ¥g"
-
-#. TRANSLATORS: "Medium" is a quality setting here
-msgid "Medium"
-msgstr "Medel"
-
-#. TRANSLATORS: "High" is a quality setting here
-msgid "High"
-msgstr "Hög"
-
-#. TRANSLATORS: "Very High" is a quality setting here
-msgid "Very High"
-msgstr "Mycket hög"
-
-#. TRANSLATORS: "Production" is a quality setting here
-msgid "Production"
-msgstr "Produktion"
-
-msgid "Front Panel Microphone"
-msgstr "Mikrofon på frontpanel"
-
-msgid "Front Panel Line In"
-msgstr "Linje-in frontpanel"
-
-msgid "Front Panel Headphones"
-msgstr "Hörlurar frontpanel"
-
-msgid "Front Panel Line Out"
-msgstr "Linje-ut frontpanel"
-
-msgid "Green Connector"
-msgstr "Grön kontakt"
-
-msgid "Pink Connector"
-msgstr "Rosa kontakt"
-
-msgid "Blue Connector"
-msgstr "Blå kontakt"
-
-msgid "White Connector"
-msgstr "Vit kontakt"
-
-msgid "Black Connector"
-msgstr "Svart kontakt"
-
-msgid "Gray Connector"
-msgstr "Grå kontakt"
-
-msgid "Orange Connector"
-msgstr "Orange kontakt"
-
-msgid "Red Connector"
-msgstr "Röd kontakt"
-
-msgid "Yellow Connector"
-msgstr "Gul kontakt"
-
-msgid "Green Front Panel Connector"
-msgstr "Grön kontakt frontpanel"
-
-msgid "Pink Front Panel Connector"
-msgstr "Rosa kontakt frontpanel"
-
-msgid "Blue Front Panel Connector"
-msgstr "Blå kontakt frontpanel"
-
-msgid "White Front Panel Connector"
-msgstr "Vit kontakt frontpanel"
-
-msgid "Black Front Panel Connector"
-msgstr "Svart kontakt frontpanel"
-
-msgid "Gray Front Panel Connector"
-msgstr "Grå kontakt frontpanel"
-
-msgid "Orange Front Panel Connector"
-msgstr "Orange kontakt frontpanel"
-
-msgid "Red Front Panel Connector"
-msgstr "Röd kontakt frontpanel"
-
-msgid "Yellow Front Panel Connector"
-msgstr "Gul kontakt frontpanel"
-
-msgid "Spread Output"
-msgstr "Spridd utgång"
-
-msgid "Downmix"
-msgstr "Nermixning"
-
-msgid "Virtual Mixer Input"
-msgstr "Virtuell mixer ingång"
-
-msgid "Virtual Mixer Output"
-msgstr "Virtuell mixer utgång"
-
-msgid "Virtual Mixer Channels"
-msgstr "Kanaler för virtuell mixer"
-
-#. TRANSLATORS: name + number of a volume mixer control
-#, c-format
-msgid "%s %d Function"
-msgstr "%s %d-funktion"
-
-#. TRANSLATORS: name of a volume mixer control
-#, c-format
-msgid "%s Function"
-msgstr "%s-funktion"
-
msgid ""
"Could not open audio device for playback. This version of the Open Sound "
"System is not supported by this element."
@@ -525,12 +144,33 @@ msgstr "Inspelning stöds inte av denna ljudenhet."
msgid "Error recording from audio device."
msgstr "Fel vid inspelning från ljudenheten."
+msgid "Volume"
+msgstr "Volym"
+
msgid "Gain"
msgstr "Förstärk"
+msgid "Monitor"
+msgstr "Monitor"
+
+msgid "Built-in Speaker"
+msgstr "Inbyggd högtalare"
+
msgid "Headphone"
msgstr "Hörlur"
+msgid "Line Out"
+msgstr "Linje ut"
+
+msgid "SPDIF Out"
+msgstr "SPDIF ut"
+
+msgid "AUX 1 Out"
+msgstr "AUX 1 ut"
+
+msgid "AUX 2 Out"
+msgstr "AUX 2 ut"
+
#, c-format
msgid "Error reading %d bytes from device '%s'."
msgstr "Fel vid läsning av %d byte från enheten \"%s\"."
@@ -715,6 +355,356 @@ msgstr "Ändring av upplösning vid körtid stöds inte än."
msgid "Cannot operate without a clock"
msgstr "Kan inte fungera utan en klocka"
+#~ msgid "Bass"
+#~ msgstr "Bass"
+
+#~ msgid "Treble"
+#~ msgstr "Diskant"
+
+#~ msgid "Synth"
+#~ msgstr "Synt"
+
+#~ msgid "PCM"
+#~ msgstr "PCM"
+
+#~ msgid "Speaker"
+#~ msgstr "Högtalare"
+
+#~ msgid "Line-in"
+#~ msgstr "Linje-in"
+
+#~ msgid "Microphone"
+#~ msgstr "Mikrofon"
+
+#~ msgid "CD"
+#~ msgstr "Cd"
+
+#~ msgid "Mixer"
+#~ msgstr "Mixer"
+
+#~ msgid "PCM-2"
+#~ msgstr "PCM-2"
+
+#~ msgid "Record"
+#~ msgstr "Spela in"
+
+#~ msgid "In-gain"
+#~ msgstr "Införstärkning"
+
+#~ msgid "Out-gain"
+#~ msgstr "Utförstärkning"
+
+#~ msgid "Line-1"
+#~ msgstr "Linje-1"
+
+#~ msgid "Line-2"
+#~ msgstr "Linje-2"
+
+#~ msgid "Line-3"
+#~ msgstr "Linje-3"
+
+#~ msgid "Digital-1"
+#~ msgstr "Digital-1"
+
+#~ msgid "Digital-2"
+#~ msgstr "Digital-2"
+
+#~ msgid "Digital-3"
+#~ msgstr "Digital-3"
+
+#~ msgid "Phone-in"
+#~ msgstr "Tele-in"
+
+#~ msgid "Phone-out"
+#~ msgstr "Tele-ut"
+
+#~ msgid "Video"
+#~ msgstr "Video"
+
+#~ msgid "Radio"
+#~ msgstr "Radio"
+
+#~ msgid "Could not open audio device for mixer control handling."
+#~ msgstr "Kunde inte öppna ljudenheten för hantering av mixerstyrning."
+
+#~ msgid ""
+#~ "Could not open audio device for mixer control handling. This version of "
+#~ "the Open Sound System is not supported by this element."
+#~ msgstr ""
+#~ "Kunde inte öppna ljudenheten för mixerhantering. Denna version av Open "
+#~ "Sound System saknar stöd för detta element."
+
+#~ msgid "Master"
+#~ msgstr "Övergripande"
+
+#~ msgid "Front"
+#~ msgstr "Fram"
+
+#~ msgid "Rear"
+#~ msgstr "Bak"
+
+#~ msgid "Headphones"
+#~ msgstr "Hörlurar"
+
+#~ msgid "Center"
+#~ msgstr "Center"
+
+#~ msgid "LFE"
+#~ msgstr "LFE"
+
+#~ msgid "Surround"
+#~ msgstr "Surround"
+
+#~ msgid "Side"
+#~ msgstr "Sida"
+
+#~ msgid "AUX Out"
+#~ msgstr "AUX ut"
+
+#~ msgid "3D Depth"
+#~ msgstr "3D-djup"
+
+#~ msgid "3D Center"
+#~ msgstr "3D-center"
+
+#~ msgid "3D Enhance"
+#~ msgstr "3D Enhance"
+
+#~ msgid "Telephone"
+#~ msgstr "Telefon"
+
+#~ msgid "Line In"
+#~ msgstr "Linje-in"
+
+#~ msgid "Internal CD"
+#~ msgstr "Intern cd-spelare"
+
+#~ msgid "Video In"
+#~ msgstr "Video-in"
+
+#~ msgid "AUX 1 In"
+#~ msgstr "AUX 1 in"
+
+#~ msgid "AUX 2 In"
+#~ msgstr "AUX 2 in"
+
+#~ msgid "AUX In"
+#~ msgstr "AUX in"
+
+#~ msgid "Record Gain"
+#~ msgstr "Inspelningsförstärkning"
+
+#~ msgid "Output Gain"
+#~ msgstr "Utförstärkning"
+
+#~ msgid "Microphone Boost"
+#~ msgstr "Mikrofonboost"
+
+#~ msgid "Loopback"
+#~ msgstr "Loopback"
+
+#~ msgid "Diagnostic"
+#~ msgstr "Diagnostik"
+
+#~ msgid "Bass Boost"
+#~ msgstr "Bass Boost"
+
+#~ msgid "Playback Ports"
+#~ msgstr "Uppspelningsportar"
+
+#~ msgid "Input"
+#~ msgstr "Ingång"
+
+#~ msgid "Record Source"
+#~ msgstr "Inspelningskälla"
+
+#~ msgid "Monitor Source"
+#~ msgstr "Monitorkälla"
+
+#~ msgid "Keyboard Beep"
+#~ msgstr "Tangentbordspip"
+
+#~ msgid "Simulate Stereo"
+#~ msgstr "Simulera stereo"
+
+#~ msgid "Stereo"
+#~ msgstr "Stereo"
+
+#~ msgid "Surround Sound"
+#~ msgstr "Surroundljud"
+
+#~ msgid "Microphone Gain"
+#~ msgstr "Mikrofonförstärkning"
+
+#~ msgid "Speaker Source"
+#~ msgstr "Högtalarkälla"
+
+#~ msgid "Microphone Source"
+#~ msgstr "Mikrofonkälla"
+
+#~ msgid "Jack"
+#~ msgstr "Jack"
+
+#~ msgid "Center / LFE"
+#~ msgstr "Center / LFE"
+
+#~ msgid "Stereo Mix"
+#~ msgstr "Stereomix"
+
+#~ msgid "Mono Mix"
+#~ msgstr "Monomix"
+
+#~ msgid "Input Mix"
+#~ msgstr "Ingångsmix"
+
+#~ msgid "SPDIF In"
+#~ msgstr "SPDIF in"
+
+#~ msgid "Microphone 1"
+#~ msgstr "Mikrofon 1"
+
+#~ msgid "Microphone 2"
+#~ msgstr "Mikrofon 2"
+
+#~ msgid "Digital Out"
+#~ msgstr "Digital-ut"
+
+#~ msgid "Digital In"
+#~ msgstr "Digital-in"
+
+#~ msgid "HDMI"
+#~ msgstr "HDMI"
+
+#~ msgid "Modem"
+#~ msgstr "Modem"
+
+# Telefon?
+#~ msgid "Handset"
+#~ msgstr "Handhållen"
+
+#~ msgid "Other"
+#~ msgstr "Annat"
+
+#~ msgid "None"
+#~ msgstr "Ingen"
+
+#~ msgid "On"
+#~ msgstr "PÃ¥"
+
+#~ msgid "Off"
+#~ msgstr "Av"
+
+#~ msgid "Mute"
+#~ msgstr "Tyst"
+
+#~ msgid "Fast"
+#~ msgstr "Snabb"
+
+#~ msgid "Very Low"
+#~ msgstr "Mycket låg"
+
+#~ msgid "Low"
+#~ msgstr "LÃ¥g"
+
+#~ msgid "Medium"
+#~ msgstr "Medel"
+
+#~ msgid "High"
+#~ msgstr "Hög"
+
+#~ msgid "Very High"
+#~ msgstr "Mycket hög"
+
+#~ msgid "Production"
+#~ msgstr "Produktion"
+
+#~ msgid "Front Panel Microphone"
+#~ msgstr "Mikrofon på frontpanel"
+
+#~ msgid "Front Panel Line In"
+#~ msgstr "Linje-in frontpanel"
+
+#~ msgid "Front Panel Headphones"
+#~ msgstr "Hörlurar frontpanel"
+
+#~ msgid "Front Panel Line Out"
+#~ msgstr "Linje-ut frontpanel"
+
+#~ msgid "Green Connector"
+#~ msgstr "Grön kontakt"
+
+#~ msgid "Pink Connector"
+#~ msgstr "Rosa kontakt"
+
+#~ msgid "Blue Connector"
+#~ msgstr "Blå kontakt"
+
+#~ msgid "White Connector"
+#~ msgstr "Vit kontakt"
+
+#~ msgid "Black Connector"
+#~ msgstr "Svart kontakt"
+
+#~ msgid "Gray Connector"
+#~ msgstr "Grå kontakt"
+
+#~ msgid "Orange Connector"
+#~ msgstr "Orange kontakt"
+
+#~ msgid "Red Connector"
+#~ msgstr "Röd kontakt"
+
+#~ msgid "Yellow Connector"
+#~ msgstr "Gul kontakt"
+
+#~ msgid "Green Front Panel Connector"
+#~ msgstr "Grön kontakt frontpanel"
+
+#~ msgid "Pink Front Panel Connector"
+#~ msgstr "Rosa kontakt frontpanel"
+
+#~ msgid "Blue Front Panel Connector"
+#~ msgstr "Blå kontakt frontpanel"
+
+#~ msgid "White Front Panel Connector"
+#~ msgstr "Vit kontakt frontpanel"
+
+#~ msgid "Black Front Panel Connector"
+#~ msgstr "Svart kontakt frontpanel"
+
+#~ msgid "Gray Front Panel Connector"
+#~ msgstr "Grå kontakt frontpanel"
+
+#~ msgid "Orange Front Panel Connector"
+#~ msgstr "Orange kontakt frontpanel"
+
+#~ msgid "Red Front Panel Connector"
+#~ msgstr "Röd kontakt frontpanel"
+
+#~ msgid "Yellow Front Panel Connector"
+#~ msgstr "Gul kontakt frontpanel"
+
+#~ msgid "Spread Output"
+#~ msgstr "Spridd utgång"
+
+#~ msgid "Downmix"
+#~ msgstr "Nermixning"
+
+#~ msgid "Virtual Mixer Input"
+#~ msgstr "Virtuell mixer ingång"
+
+#~ msgid "Virtual Mixer Output"
+#~ msgstr "Virtuell mixer utgång"
+
+#~ msgid "Virtual Mixer Channels"
+#~ msgstr "Kanaler för virtuell mixer"
+
+#~ msgid "%s %d Function"
+#~ msgstr "%s %d-funktion"
+
+#~ msgid "%s Function"
+#~ msgstr "%s-funktion"
+
#~ msgid "Error reading %d bytes on device '%s'."
#~ msgstr "Fel vid läsning av %d byte på enheten \"%s\"."
diff --git a/po/tr.gmo b/po/tr.gmo
index 0e7e9d8a5e2a3e36e9e0e93eb24b8b6423933462..338db3ff22c4bed8740e1e4a125b3cb1c8ff771f 100644
Binary files a/po/tr.gmo and b/po/tr.gmo differ
diff --git a/po/tr.po b/po/tr.po
index 8dffe6bd11cd3e8b654bcda252136eb87c474c9f..62f6c2abb1c63cc04192e56ebfb765221f8d3670 100644
--- a/po/tr.po
+++ b/po/tr.po
@@ -6,7 +6,7 @@ msgid ""
msgstr ""
"Project-Id-Version: gst-plugins-good 0.10.26.2\n"
"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/\n"
-"POT-Creation-Date: 2012-04-12 10:26+0200\n"
+"POT-Creation-Date: 2012-05-13 16:29+0200\n"
"PO-Revision-Date: 2011-01-08 00:03+0200\n"
"Last-Translator: Server Acim <serveracim@gmail.com>\n"
"Language-Team: Turkish <gnu-tr-u12a@lists.sourceforge.net>\n"
@@ -96,81 +96,6 @@ msgstr ""
msgid "Internal data flow error."
msgstr "İç veri akış hatası."
-msgid "Volume"
-msgstr "Ses GiriÅŸi"
-
-msgid "Bass"
-msgstr "Bas"
-
-msgid "Treble"
-msgstr "Tiz"
-
-msgid "Synth"
-msgstr "Synthisizer"
-
-msgid "PCM"
-msgstr "PCM"
-
-msgid "Speaker"
-msgstr "Hoparlör"
-
-msgid "Line-in"
-msgstr "Hat giriÅŸi"
-
-msgid "Microphone"
-msgstr "Mikrofon"
-
-msgid "CD"
-msgstr "CD"
-
-msgid "Mixer"
-msgstr "Karıştırıcı"
-
-msgid "PCM-2"
-msgstr "PCM-2"
-
-msgid "Record"
-msgstr "Kayıt"
-
-msgid "In-gain"
-msgstr "Kazanç-girişi"
-
-msgid "Out-gain"
-msgstr "Kazanç-çıkışı"
-
-msgid "Line-1"
-msgstr "Hat-1"
-
-msgid "Line-2"
-msgstr "Hat-2"
-
-msgid "Line-3"
-msgstr "Hat-3"
-
-msgid "Digital-1"
-msgstr "Sayısal-1"
-
-msgid "Digital-2"
-msgstr "Sayısal-2"
-
-msgid "Digital-3"
-msgstr "Sayısal-3"
-
-msgid "Phone-in"
-msgstr "Fono-giriÅŸ"
-
-msgid "Phone-out"
-msgstr "Fono-çıkış"
-
-msgid "Video"
-msgstr "Vidyo"
-
-msgid "Radio"
-msgstr "Radyo"
-
-msgid "Monitor"
-msgstr "Hoparlör"
-
msgid ""
"Could not open audio device for playback. Device is being used by another "
"application."
@@ -194,311 +119,6 @@ msgstr "Kayıt için aygıtı açamıyor. Aygıtı açmak için yetkiniz yok."
msgid "Could not open audio device for recording."
msgstr "Aygıtı kayıt için açamıyor."
-msgid "Could not open audio device for mixer control handling."
-msgstr "Mikser denetimi için ses aygıtı açılamıyor."
-
-msgid ""
-"Could not open audio device for mixer control handling. This version of the "
-"Open Sound System is not supported by this element."
-msgstr ""
-"Mikser denetimi için ses aygıtı açılamıyor. Açık Ses Sisteminin bu sürümü, "
-"bu öğeyi desteklemiyor."
-
-msgid "Master"
-msgstr "Master"
-
-msgid "Front"
-msgstr "Ön"
-
-msgid "Rear"
-msgstr "Arka"
-
-msgid "Headphones"
-msgstr "Kulaklıklar"
-
-msgid "Center"
-msgstr "Merkez"
-
-msgid "LFE"
-msgstr "LFE"
-
-msgid "Surround"
-msgstr "Surround"
-
-msgid "Side"
-msgstr "Yan"
-
-msgid "Built-in Speaker"
-msgstr "Varsayılan Hoparlör"
-
-msgid "AUX 1 Out"
-msgstr "AUX 1 Çıkış"
-
-msgid "AUX 2 Out"
-msgstr "AUX 2 Çıkış"
-
-msgid "AUX Out"
-msgstr "AUX Çıkış"
-
-msgid "3D Depth"
-msgstr "3D Derinlik"
-
-msgid "3D Center"
-msgstr "3D Merkez"
-
-msgid "3D Enhance"
-msgstr "3D GeniÅŸlik"
-
-msgid "Telephone"
-msgstr "Telefon"
-
-msgid "Line Out"
-msgstr "Hat Çıkışı"
-
-msgid "Line In"
-msgstr "Hat GiriÅŸi"
-
-msgid "Internal CD"
-msgstr "Dahili CD"
-
-msgid "Video In"
-msgstr "Vidyo GiriÅŸi"
-
-msgid "AUX 1 In"
-msgstr "AUX 1 GiriÅŸ"
-
-msgid "AUX 2 In"
-msgstr "AUX 2 GiriÅŸ"
-
-msgid "AUX In"
-msgstr "AUX GiriÅŸ"
-
-msgid "Record Gain"
-msgstr "Kayıt Kazancı"
-
-msgid "Output Gain"
-msgstr "Çıkış Kazancı"
-
-msgid "Microphone Boost"
-msgstr "Mikrofon Seviye Yükseltme"
-
-msgid "Loopback"
-msgstr "Geridönüm"
-
-msgid "Diagnostic"
-msgstr "Ayarlar"
-
-msgid "Bass Boost"
-msgstr "Bass Arttırım"
-
-msgid "Playback Ports"
-msgstr "Çalma Portları"
-
-msgid "Input"
-msgstr "GiriÅŸ"
-
-msgid "Record Source"
-msgstr "Kayıt Kaynağı"
-
-msgid "Monitor Source"
-msgstr "Hoparlör Kaynağı"
-
-msgid "Keyboard Beep"
-msgstr "Klavye Biplemesi"
-
-msgid "Simulate Stereo"
-msgstr "Stereo Simülasyonu"
-
-msgid "Stereo"
-msgstr "Stereo"
-
-msgid "Surround Sound"
-msgstr "Surround Sesi"
-
-msgid "Microphone Gain"
-msgstr "Mikrofon Kazancı"
-
-msgid "Speaker Source"
-msgstr "Hoparlör Kaynağı"
-
-msgid "Microphone Source"
-msgstr "Mikrofon Kaynağı"
-
-msgid "Jack"
-msgstr "Jack"
-
-msgid "Center / LFE"
-msgstr "Merkez / LFE"
-
-msgid "Stereo Mix"
-msgstr "Stereo Mix"
-
-msgid "Mono Mix"
-msgstr "Mono Mix"
-
-msgid "Input Mix"
-msgstr "GiriÅŸ Mix"
-
-msgid "SPDIF In"
-msgstr "SPDIF GiriÅŸi"
-
-msgid "SPDIF Out"
-msgstr "SPDIF Çıkış"
-
-msgid "Microphone 1"
-msgstr "Mikrofon 1"
-
-msgid "Microphone 2"
-msgstr "Mikrofon 2"
-
-msgid "Digital Out"
-msgstr "Sayısal Çıkış"
-
-msgid "Digital In"
-msgstr "Sayısal Giriş"
-
-msgid "HDMI"
-msgstr "HDMI"
-
-msgid "Modem"
-msgstr "Modem"
-
-msgid "Handset"
-msgstr "Ahize"
-
-msgid "Other"
-msgstr "DiÄŸer"
-
-msgid "None"
-msgstr "Hiçbiri"
-
-msgid "On"
-msgstr "Açık"
-
-msgid "Off"
-msgstr "Kapalı"
-
-msgid "Mute"
-msgstr "SustulurmuÅŸ"
-
-msgid "Fast"
-msgstr "Hızlı"
-
-#. TRANSLATORS: "Very Low" is a quality setting here
-msgid "Very Low"
-msgstr "Çok Kalın"
-
-#. TRANSLATORS: "Low" is a quality setting here
-msgid "Low"
-msgstr "D"
-
-#. TRANSLATORS: "Medium" is a quality setting here
-msgid "Medium"
-msgstr "Orta"
-
-#. TRANSLATORS: "High" is a quality setting here
-msgid "High"
-msgstr "Tiz"
-
-#. TRANSLATORS: "Very High" is a quality setting here
-msgid "Very High"
-msgstr "Çok Tiz"
-
-#. TRANSLATORS: "Production" is a quality setting here
-msgid "Production"
-msgstr "Yapım"
-
-msgid "Front Panel Microphone"
-msgstr "Ön Panel Mikrofonu"
-
-msgid "Front Panel Line In"
-msgstr "Ön Panel Hat Girişi"
-
-msgid "Front Panel Headphones"
-msgstr "Ön Panel Kulaklıklar"
-
-msgid "Front Panel Line Out"
-msgstr "Ön Panel Hat Çıkışı"
-
-msgid "Green Connector"
-msgstr "Yeşil Konnektör"
-
-msgid "Pink Connector"
-msgstr "Pembe Konnektör"
-
-msgid "Blue Connector"
-msgstr "Mavi Konnektör"
-
-msgid "White Connector"
-msgstr "Beyaz Konnektör"
-
-msgid "Black Connector"
-msgstr "Siyah Konnektör"
-
-msgid "Gray Connector"
-msgstr "Gri Konnektör"
-
-msgid "Orange Connector"
-msgstr "Portakal Konnektör"
-
-msgid "Red Connector"
-msgstr "Kırmızı Konnektör"
-
-msgid "Yellow Connector"
-msgstr "Sarı Konnektör"
-
-msgid "Green Front Panel Connector"
-msgstr "Yeşil Ön Panel Konnektör"
-
-msgid "Pink Front Panel Connector"
-msgstr "Pembe Ön Panel Konnektör"
-
-msgid "Blue Front Panel Connector"
-msgstr "Mavi Ön Panel Konnektör"
-
-msgid "White Front Panel Connector"
-msgstr "Beyaz Ön Panel Konnektör"
-
-msgid "Black Front Panel Connector"
-msgstr "Siyah Ön Panel Konnektör"
-
-msgid "Gray Front Panel Connector"
-msgstr "Gri Ön Panel Konnektör"
-
-msgid "Orange Front Panel Connector"
-msgstr "Portakal Ön Panel Konnektör"
-
-msgid "Red Front Panel Connector"
-msgstr "Kırmızı Ön Panel Konnektör"
-
-msgid "Yellow Front Panel Connector"
-msgstr "Sarı Ön Panel Konnektör"
-
-msgid "Spread Output"
-msgstr "Çıkışı Dağıt"
-
-msgid "Downmix"
-msgstr "Miks EdilmiÅŸ"
-
-msgid "Virtual Mixer Input"
-msgstr "Sanal Mikser GiriÅŸi"
-
-msgid "Virtual Mixer Output"
-msgstr "Sanal Mikser Çıkışı"
-
-msgid "Virtual Mixer Channels"
-msgstr "Sanal Mikser Kanalları"
-
-#. TRANSLATORS: name + number of a volume mixer control
-#, c-format
-msgid "%s %d Function"
-msgstr "%s %d Ä°ÅŸlev"
-
-#. TRANSLATORS: name of a volume mixer control
-#, c-format
-msgid "%s Function"
-msgstr "%s Ä°ÅŸlev"
-
msgid ""
"Could not open audio device for playback. This version of the Open Sound "
"System is not supported by this element."
@@ -518,12 +138,33 @@ msgstr "Bu ses aygıtı kaydetmeyi desteklemiyor."
msgid "Error recording from audio device."
msgstr "Ses aygıtından kaydetmekte hata."
+msgid "Volume"
+msgstr "Ses GiriÅŸi"
+
msgid "Gain"
msgstr "Kazanç"
+msgid "Monitor"
+msgstr "Hoparlör"
+
+msgid "Built-in Speaker"
+msgstr "Varsayılan Hoparlör"
+
msgid "Headphone"
msgstr "Kulaklık"
+msgid "Line Out"
+msgstr "Hat Çıkışı"
+
+msgid "SPDIF Out"
+msgstr "SPDIF Çıkış"
+
+msgid "AUX 1 Out"
+msgstr "AUX 1 Çıkış"
+
+msgid "AUX 2 Out"
+msgstr "AUX 2 Çıkış"
+
#, c-format
msgid "Error reading %d bytes from device '%s'."
msgstr "%d bayt bilgili '%s' aygıtından okumada hata."
@@ -700,6 +341,355 @@ msgstr "Çalışırken çözünürlüğü değiştirmek henüz desteklenmiyor."
msgid "Cannot operate without a clock"
msgstr "Saat olmadan çalışamaz"
+#~ msgid "Bass"
+#~ msgstr "Bas"
+
+#~ msgid "Treble"
+#~ msgstr "Tiz"
+
+#~ msgid "Synth"
+#~ msgstr "Synthisizer"
+
+#~ msgid "PCM"
+#~ msgstr "PCM"
+
+#~ msgid "Speaker"
+#~ msgstr "Hoparlör"
+
+#~ msgid "Line-in"
+#~ msgstr "Hat giriÅŸi"
+
+#~ msgid "Microphone"
+#~ msgstr "Mikrofon"
+
+#~ msgid "CD"
+#~ msgstr "CD"
+
+#~ msgid "Mixer"
+#~ msgstr "Karıştırıcı"
+
+#~ msgid "PCM-2"
+#~ msgstr "PCM-2"
+
+#~ msgid "Record"
+#~ msgstr "Kayıt"
+
+#~ msgid "In-gain"
+#~ msgstr "Kazanç-girişi"
+
+#~ msgid "Out-gain"
+#~ msgstr "Kazanç-çıkışı"
+
+#~ msgid "Line-1"
+#~ msgstr "Hat-1"
+
+#~ msgid "Line-2"
+#~ msgstr "Hat-2"
+
+#~ msgid "Line-3"
+#~ msgstr "Hat-3"
+
+#~ msgid "Digital-1"
+#~ msgstr "Sayısal-1"
+
+#~ msgid "Digital-2"
+#~ msgstr "Sayısal-2"
+
+#~ msgid "Digital-3"
+#~ msgstr "Sayısal-3"
+
+#~ msgid "Phone-in"
+#~ msgstr "Fono-giriÅŸ"
+
+#~ msgid "Phone-out"
+#~ msgstr "Fono-çıkış"
+
+#~ msgid "Video"
+#~ msgstr "Vidyo"
+
+#~ msgid "Radio"
+#~ msgstr "Radyo"
+
+#~ msgid "Could not open audio device for mixer control handling."
+#~ msgstr "Mikser denetimi için ses aygıtı açılamıyor."
+
+#~ msgid ""
+#~ "Could not open audio device for mixer control handling. This version of "
+#~ "the Open Sound System is not supported by this element."
+#~ msgstr ""
+#~ "Mikser denetimi için ses aygıtı açılamıyor. Açık Ses Sisteminin bu "
+#~ "sürümü, bu öğeyi desteklemiyor."
+
+#~ msgid "Master"
+#~ msgstr "Master"
+
+#~ msgid "Front"
+#~ msgstr "Ön"
+
+#~ msgid "Rear"
+#~ msgstr "Arka"
+
+#~ msgid "Headphones"
+#~ msgstr "Kulaklıklar"
+
+#~ msgid "Center"
+#~ msgstr "Merkez"
+
+#~ msgid "LFE"
+#~ msgstr "LFE"
+
+#~ msgid "Surround"
+#~ msgstr "Surround"
+
+#~ msgid "Side"
+#~ msgstr "Yan"
+
+#~ msgid "AUX Out"
+#~ msgstr "AUX Çıkış"
+
+#~ msgid "3D Depth"
+#~ msgstr "3D Derinlik"
+
+#~ msgid "3D Center"
+#~ msgstr "3D Merkez"
+
+#~ msgid "3D Enhance"
+#~ msgstr "3D GeniÅŸlik"
+
+#~ msgid "Telephone"
+#~ msgstr "Telefon"
+
+#~ msgid "Line In"
+#~ msgstr "Hat GiriÅŸi"
+
+#~ msgid "Internal CD"
+#~ msgstr "Dahili CD"
+
+#~ msgid "Video In"
+#~ msgstr "Vidyo GiriÅŸi"
+
+#~ msgid "AUX 1 In"
+#~ msgstr "AUX 1 GiriÅŸ"
+
+#~ msgid "AUX 2 In"
+#~ msgstr "AUX 2 GiriÅŸ"
+
+#~ msgid "AUX In"
+#~ msgstr "AUX GiriÅŸ"
+
+#~ msgid "Record Gain"
+#~ msgstr "Kayıt Kazancı"
+
+#~ msgid "Output Gain"
+#~ msgstr "Çıkış Kazancı"
+
+#~ msgid "Microphone Boost"
+#~ msgstr "Mikrofon Seviye Yükseltme"
+
+#~ msgid "Loopback"
+#~ msgstr "Geridönüm"
+
+#~ msgid "Diagnostic"
+#~ msgstr "Ayarlar"
+
+#~ msgid "Bass Boost"
+#~ msgstr "Bass Arttırım"
+
+#~ msgid "Playback Ports"
+#~ msgstr "Çalma Portları"
+
+#~ msgid "Input"
+#~ msgstr "GiriÅŸ"
+
+#~ msgid "Record Source"
+#~ msgstr "Kayıt Kaynağı"
+
+#~ msgid "Monitor Source"
+#~ msgstr "Hoparlör Kaynağı"
+
+#~ msgid "Keyboard Beep"
+#~ msgstr "Klavye Biplemesi"
+
+#~ msgid "Simulate Stereo"
+#~ msgstr "Stereo Simülasyonu"
+
+#~ msgid "Stereo"
+#~ msgstr "Stereo"
+
+#~ msgid "Surround Sound"
+#~ msgstr "Surround Sesi"
+
+#~ msgid "Microphone Gain"
+#~ msgstr "Mikrofon Kazancı"
+
+#~ msgid "Speaker Source"
+#~ msgstr "Hoparlör Kaynağı"
+
+#~ msgid "Microphone Source"
+#~ msgstr "Mikrofon Kaynağı"
+
+#~ msgid "Jack"
+#~ msgstr "Jack"
+
+#~ msgid "Center / LFE"
+#~ msgstr "Merkez / LFE"
+
+#~ msgid "Stereo Mix"
+#~ msgstr "Stereo Mix"
+
+#~ msgid "Mono Mix"
+#~ msgstr "Mono Mix"
+
+#~ msgid "Input Mix"
+#~ msgstr "GiriÅŸ Mix"
+
+#~ msgid "SPDIF In"
+#~ msgstr "SPDIF GiriÅŸi"
+
+#~ msgid "Microphone 1"
+#~ msgstr "Mikrofon 1"
+
+#~ msgid "Microphone 2"
+#~ msgstr "Mikrofon 2"
+
+#~ msgid "Digital Out"
+#~ msgstr "Sayısal Çıkış"
+
+#~ msgid "Digital In"
+#~ msgstr "Sayısal Giriş"
+
+#~ msgid "HDMI"
+#~ msgstr "HDMI"
+
+#~ msgid "Modem"
+#~ msgstr "Modem"
+
+#~ msgid "Handset"
+#~ msgstr "Ahize"
+
+#~ msgid "Other"
+#~ msgstr "DiÄŸer"
+
+#~ msgid "None"
+#~ msgstr "Hiçbiri"
+
+#~ msgid "On"
+#~ msgstr "Açık"
+
+#~ msgid "Off"
+#~ msgstr "Kapalı"
+
+#~ msgid "Mute"
+#~ msgstr "SustulurmuÅŸ"
+
+#~ msgid "Fast"
+#~ msgstr "Hızlı"
+
+#~ msgid "Very Low"
+#~ msgstr "Çok Kalın"
+
+#~ msgid "Low"
+#~ msgstr "D"
+
+#~ msgid "Medium"
+#~ msgstr "Orta"
+
+#~ msgid "High"
+#~ msgstr "Tiz"
+
+#~ msgid "Very High"
+#~ msgstr "Çok Tiz"
+
+#~ msgid "Production"
+#~ msgstr "Yapım"
+
+#~ msgid "Front Panel Microphone"
+#~ msgstr "Ön Panel Mikrofonu"
+
+#~ msgid "Front Panel Line In"
+#~ msgstr "Ön Panel Hat Girişi"
+
+#~ msgid "Front Panel Headphones"
+#~ msgstr "Ön Panel Kulaklıklar"
+
+#~ msgid "Front Panel Line Out"
+#~ msgstr "Ön Panel Hat Çıkışı"
+
+#~ msgid "Green Connector"
+#~ msgstr "Yeşil Konnektör"
+
+#~ msgid "Pink Connector"
+#~ msgstr "Pembe Konnektör"
+
+#~ msgid "Blue Connector"
+#~ msgstr "Mavi Konnektör"
+
+#~ msgid "White Connector"
+#~ msgstr "Beyaz Konnektör"
+
+#~ msgid "Black Connector"
+#~ msgstr "Siyah Konnektör"
+
+#~ msgid "Gray Connector"
+#~ msgstr "Gri Konnektör"
+
+#~ msgid "Orange Connector"
+#~ msgstr "Portakal Konnektör"
+
+#~ msgid "Red Connector"
+#~ msgstr "Kırmızı Konnektör"
+
+#~ msgid "Yellow Connector"
+#~ msgstr "Sarı Konnektör"
+
+#~ msgid "Green Front Panel Connector"
+#~ msgstr "Yeşil Ön Panel Konnektör"
+
+#~ msgid "Pink Front Panel Connector"
+#~ msgstr "Pembe Ön Panel Konnektör"
+
+#~ msgid "Blue Front Panel Connector"
+#~ msgstr "Mavi Ön Panel Konnektör"
+
+#~ msgid "White Front Panel Connector"
+#~ msgstr "Beyaz Ön Panel Konnektör"
+
+#~ msgid "Black Front Panel Connector"
+#~ msgstr "Siyah Ön Panel Konnektör"
+
+#~ msgid "Gray Front Panel Connector"
+#~ msgstr "Gri Ön Panel Konnektör"
+
+#~ msgid "Orange Front Panel Connector"
+#~ msgstr "Portakal Ön Panel Konnektör"
+
+#~ msgid "Red Front Panel Connector"
+#~ msgstr "Kırmızı Ön Panel Konnektör"
+
+#~ msgid "Yellow Front Panel Connector"
+#~ msgstr "Sarı Ön Panel Konnektör"
+
+#~ msgid "Spread Output"
+#~ msgstr "Çıkışı Dağıt"
+
+#~ msgid "Downmix"
+#~ msgstr "Miks EdilmiÅŸ"
+
+#~ msgid "Virtual Mixer Input"
+#~ msgstr "Sanal Mikser GiriÅŸi"
+
+#~ msgid "Virtual Mixer Output"
+#~ msgstr "Sanal Mikser Çıkışı"
+
+#~ msgid "Virtual Mixer Channels"
+#~ msgstr "Sanal Mikser Kanalları"
+
+#~ msgid "%s %d Function"
+#~ msgstr "%s %d Ä°ÅŸlev"
+
+#~ msgid "%s Function"
+#~ msgstr "%s Ä°ÅŸlev"
+
#~ msgid "Could not establish connection to sound server"
#~ msgstr "Ses sunucusuyla bağlantı kurulumayor"
diff --git a/po/uk.gmo b/po/uk.gmo
index 6ee3b99efda8899bb9a59d0704a6c907750cf226..d5a9a8db96f71214f2acce10afa155c7dc07bf87 100644
Binary files a/po/uk.gmo and b/po/uk.gmo differ
diff --git a/po/uk.po b/po/uk.po
index 7ba551efdfe1f7394addf9bb7fe34578d7f55840..cb76e430e8c1c136f0a4ef35b226dd36956f33cd 100644
--- a/po/uk.po
+++ b/po/uk.po
@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: gst-plugins-good 0.10.28.2\n"
"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/\n"
-"POT-Creation-Date: 2012-04-12 10:26+0200\n"
+"POT-Creation-Date: 2012-05-13 16:29+0200\n"
"PO-Revision-Date: 2011-05-01 11:55+0300\n"
"Last-Translator: Yuri Chornoivan <yurchor@ukr.net>\n"
"Language-Team: Ukrainian <translation-team-uk@lists.sourceforge.net>\n"
@@ -103,81 +103,6 @@ msgstr ""
msgid "Internal data flow error."
msgstr "Помилка внутрішнього перенеÑÐµÐ½Ð½Ñ Ð´Ð°Ð½Ð¸Ñ…."
-msgid "Volume"
-msgstr "ГучніÑÑ‚ÑŒ"
-
-msgid "Bass"
-msgstr "Ðизькі"
-
-msgid "Treble"
-msgstr "ВиÑокі"
-
-msgid "Synth"
-msgstr "Синтезатор"
-
-msgid "PCM"
-msgstr "КІМ"
-
-msgid "Speaker"
-msgstr "Динамік"
-
-msgid "Line-in"
-msgstr "Лінійний вхід"
-
-msgid "Microphone"
-msgstr "Мікрофон"
-
-msgid "CD"
-msgstr "КД"
-
-msgid "Mixer"
-msgstr "Мікшер"
-
-msgid "PCM-2"
-msgstr "КІМ-2"
-
-msgid "Record"
-msgstr "ЗапиÑ"
-
-msgid "In-gain"
-msgstr "Ð’Ñ….підÑиленнÑ"
-
-msgid "Out-gain"
-msgstr "Вих.підÑиленнÑ"
-
-msgid "Line-1"
-msgstr "Лінійний-1"
-
-msgid "Line-2"
-msgstr "Лінійний-2"
-
-msgid "Line-3"
-msgstr "Лінійний-3"
-
-msgid "Digital-1"
-msgstr "Цифровий-1"
-
-msgid "Digital-2"
-msgstr "Цифровий-2"
-
-msgid "Digital-3"
-msgstr "Цифровий-3"
-
-msgid "Phone-in"
-msgstr "Вх.телефон"
-
-msgid "Phone-out"
-msgstr "Вих.телефон"
-
-msgid "Video"
-msgstr "Відео"
-
-msgid "Radio"
-msgstr "Радіо"
-
-msgid "Monitor"
-msgstr "Монітор"
-
msgid ""
"Could not open audio device for playback. Device is being used by another "
"application."
@@ -205,311 +130,6 @@ msgstr ""
msgid "Could not open audio device for recording."
msgstr "Ðе вдалоÑÑ Ð²Ñ–Ð´ÐºÑ€Ð¸Ñ‚Ð¸ приÑтрій Ð´Ð»Ñ Ð·Ð°Ð¿Ð¸Ñу."
-msgid "Could not open audio device for mixer control handling."
-msgstr "Ðе вдалоÑÑ Ð²Ñ–Ð´ÐºÑ€Ð¸Ñ‚Ð¸ приÑтрій Ð´Ð»Ñ ÐºÐµÑ€ÑƒÐ²Ð°Ð½Ð½Ñ Ñ€ÐµÐ³ÑƒÐ»Ñторами мікшера."
-
-msgid ""
-"Could not open audio device for mixer control handling. This version of the "
-"Open Sound System is not supported by this element."
-msgstr ""
-"Ðе вдалоÑÑ Ð²Ñ–Ð´ÐºÑ€Ð¸Ñ‚Ð¸ приÑтрій Ð´Ð»Ñ ÐºÐµÑ€ÑƒÐ²Ð°Ð½Ð½Ñ Ñ€ÐµÐ³ÑƒÐ»Ñторами мікшера. Ð¦Ñ Ð²ÐµÑ€ÑÑ–Ñ "
-"Open Sound System не підтримуєтьÑÑ Ñ†Ð¸Ð¼ елементом."
-
-msgid "Master"
-msgstr "ОÑновний"
-
-msgid "Front"
-msgstr "Передній"
-
-msgid "Rear"
-msgstr "Задній"
-
-msgid "Headphones"
-msgstr "Ðавушники"
-
-msgid "Center"
-msgstr "Центральний"
-
-msgid "LFE"
-msgstr "LFE"
-
-msgid "Surround"
-msgstr "Об'ємний"
-
-msgid "Side"
-msgstr "Боковий"
-
-msgid "Built-in Speaker"
-msgstr "Вбудований динамік"
-
-msgid "AUX 1 Out"
-msgstr "Вихід AUX 1"
-
-msgid "AUX 2 Out"
-msgstr "Вихід AUX 2"
-
-msgid "AUX Out"
-msgstr "Вихід AUX"
-
-msgid "3D Depth"
-msgstr "ПроÑторова глибина"
-
-msgid "3D Center"
-msgstr "ПроÑторовий центр"
-
-msgid "3D Enhance"
-msgstr "ПроÑторове покращеннÑ"
-
-msgid "Telephone"
-msgstr "Телефон"
-
-msgid "Line Out"
-msgstr "Лінійний вихід"
-
-msgid "Line In"
-msgstr "Лінійний вхід"
-
-msgid "Internal CD"
-msgstr "Вбудований КД"
-
-msgid "Video In"
-msgstr "Відеовхід"
-
-msgid "AUX 1 In"
-msgstr "Вхід AUX 1"
-
-msgid "AUX 2 In"
-msgstr "Вхід AUX 2"
-
-msgid "AUX In"
-msgstr "Вхід AUX"
-
-msgid "Record Gain"
-msgstr "ПідÑÐ¸Ð»ÐµÐ½Ð½Ñ Ð·Ð°Ð¿Ð¸Ñу"
-
-msgid "Output Gain"
-msgstr "ПідÑÐ¸Ð»ÐµÐ½Ð½Ñ Ð²Ð¸Ñ…Ð¾Ð´Ñƒ"
-
-msgid "Microphone Boost"
-msgstr "ПідÑÐ¸Ð»ÐµÐ½Ð½Ñ Ð¼Ñ–ÐºÑ€Ð¾Ñ„Ð¾Ð½Ð°"
-
-msgid "Loopback"
-msgstr "Заглушка"
-
-msgid "Diagnostic"
-msgstr "ДіагноÑтика"
-
-msgid "Bass Boost"
-msgstr "ПідÑÐ¸Ð»ÐµÐ½Ð½Ñ Ð±Ð°Ñів"
-
-msgid "Playback Ports"
-msgstr "Порти відтвореннÑ"
-
-msgid "Input"
-msgstr "Вхід"
-
-msgid "Record Source"
-msgstr "Ð—Ð°Ð¿Ð¸Ñ Ð´Ð¶ÐµÑ€ÐµÐ»Ð°"
-
-msgid "Monitor Source"
-msgstr "СпоÑÑ‚ÐµÑ€ÐµÐ¶ÐµÐ½Ð½Ñ Ð·Ð° джерелом"
-
-msgid "Keyboard Beep"
-msgstr "Гудок клавіатури"
-
-msgid "Simulate Stereo"
-msgstr "Ð†Ð¼Ñ–Ñ‚Ð°Ñ†Ñ–Ñ Ñтерео"
-
-msgid "Stereo"
-msgstr "Стерео"
-
-msgid "Surround Sound"
-msgstr "Об'ємний звук"
-
-msgid "Microphone Gain"
-msgstr "ПідÑÐ¸Ð»ÐµÐ½Ð½Ñ Ð¼Ñ–ÐºÑ€Ð¾Ñ„Ð¾Ð½Ð°"
-
-msgid "Speaker Source"
-msgstr "ОÑновний динамік"
-
-msgid "Microphone Source"
-msgstr "ОÑновний мікрофон"
-
-msgid "Jack"
-msgstr "Jack"
-
-msgid "Center / LFE"
-msgstr "Центральний/LFE"
-
-msgid "Stereo Mix"
-msgstr "Стереомікшер"
-
-msgid "Mono Mix"
-msgstr "Мономікшер"
-
-msgid "Input Mix"
-msgstr "Мікшер вх. даних"
-
-msgid "SPDIF In"
-msgstr "Вхід SPDIF"
-
-msgid "SPDIF Out"
-msgstr "Вихід SPDIF"
-
-msgid "Microphone 1"
-msgstr "Мікрофон 1"
-
-msgid "Microphone 2"
-msgstr "Мікрофон 2"
-
-msgid "Digital Out"
-msgstr "Цифровий вихід"
-
-msgid "Digital In"
-msgstr "Цифровий вхід"
-
-msgid "HDMI"
-msgstr "HDMI"
-
-msgid "Modem"
-msgstr "Модем"
-
-msgid "Handset"
-msgstr "Гарнітура"
-
-msgid "Other"
-msgstr "Інше"
-
-msgid "None"
-msgstr "Ðемає"
-
-msgid "On"
-msgstr "Увімкн."
-
-msgid "Off"
-msgstr "Вимкн."
-
-msgid "Mute"
-msgstr "Вимкнути звук"
-
-msgid "Fast"
-msgstr "Швидко"
-
-#. TRANSLATORS: "Very Low" is a quality setting here
-msgid "Very Low"
-msgstr "Дуже низька"
-
-#. TRANSLATORS: "Low" is a quality setting here
-msgid "Low"
-msgstr "Ðизька"
-
-#. TRANSLATORS: "Medium" is a quality setting here
-msgid "Medium"
-msgstr "СереднÑ"
-
-#. TRANSLATORS: "High" is a quality setting here
-msgid "High"
-msgstr "ВиÑока"
-
-#. TRANSLATORS: "Very High" is a quality setting here
-msgid "Very High"
-msgstr "Дуже виÑока"
-
-#. TRANSLATORS: "Production" is a quality setting here
-msgid "Production"
-msgstr "ПромиÑлова"
-
-msgid "Front Panel Microphone"
-msgstr "Мікрофон передньої панелі"
-
-msgid "Front Panel Line In"
-msgstr "Лінійний вхід передньої панелі"
-
-msgid "Front Panel Headphones"
-msgstr "Вихід навушників передньої панелі"
-
-msgid "Front Panel Line Out"
-msgstr "Лінійний вихід передньої панелі"
-
-msgid "Green Connector"
-msgstr "Зелений рознім"
-
-msgid "Pink Connector"
-msgstr "Рожевий рознім"
-
-msgid "Blue Connector"
-msgstr "Синій рознім"
-
-msgid "White Connector"
-msgstr "Білий рознім"
-
-msgid "Black Connector"
-msgstr "Чорний рознім"
-
-msgid "Gray Connector"
-msgstr "Сірий рознім"
-
-msgid "Orange Connector"
-msgstr "Помаранчевий рознім"
-
-msgid "Red Connector"
-msgstr "Червоний рознім"
-
-msgid "Yellow Connector"
-msgstr "Жовтий рознім"
-
-msgid "Green Front Panel Connector"
-msgstr "Зелений рознім передньої панелі"
-
-msgid "Pink Front Panel Connector"
-msgstr "Рожевий рознім передньої панелі"
-
-msgid "Blue Front Panel Connector"
-msgstr "Синій рознім передньої панелі"
-
-msgid "White Front Panel Connector"
-msgstr "Білий рознім передньої панелі"
-
-msgid "Black Front Panel Connector"
-msgstr "Чорний рознім передньої панелі"
-
-msgid "Gray Front Panel Connector"
-msgstr "Сірий рознім передньої панелі"
-
-msgid "Orange Front Panel Connector"
-msgstr "Помаранчевий рознім передньої панелі"
-
-msgid "Red Front Panel Connector"
-msgstr "Червоний рознім передньої панелі"
-
-msgid "Yellow Front Panel Connector"
-msgstr "Жовтий рознім передньої панелі"
-
-msgid "Spread Output"
-msgstr "Розгорнути вихід"
-
-msgid "Downmix"
-msgstr "ÐžÐ±â€™Ñ”Ð´Ð½Ð°Ð½Ð½Ñ ÐºÐ°Ð½Ð°Ð»Ñ–Ð²"
-
-msgid "Virtual Mixer Input"
-msgstr "Вхід віртуального мікшера"
-
-msgid "Virtual Mixer Output"
-msgstr "Вихід віртуального мікшера"
-
-msgid "Virtual Mixer Channels"
-msgstr "Канали віртуального мікшера"
-
-#. TRANSLATORS: name + number of a volume mixer control
-#, c-format
-msgid "%s %d Function"
-msgstr "%s, Ñ„ÑƒÐ½ÐºÑ†Ñ–Ñ %d"
-
-#. TRANSLATORS: name of a volume mixer control
-#, c-format
-msgid "%s Function"
-msgstr "Ð¤ÑƒÐ½ÐºÑ†Ñ–Ñ %s"
-
msgid ""
"Could not open audio device for playback. This version of the Open Sound "
"System is not supported by this element."
@@ -529,12 +149,33 @@ msgstr "Ð—Ð°Ð¿Ð¸Ñ Ð½Ðµ підтримуєтьÑÑ Ñ†Ð¸Ð¼ звуковим пр
msgid "Error recording from audio device."
msgstr "Помилка запиÑÑƒÐ²Ð°Ð½Ð½Ñ Ð·Ñ– звукового приÑтрою."
+msgid "Volume"
+msgstr "ГучніÑÑ‚ÑŒ"
+
msgid "Gain"
msgstr "ПідÑиленнÑ"
+msgid "Monitor"
+msgstr "Монітор"
+
+msgid "Built-in Speaker"
+msgstr "Вбудований динамік"
+
msgid "Headphone"
msgstr "Ðавушники"
+msgid "Line Out"
+msgstr "Лінійний вихід"
+
+msgid "SPDIF Out"
+msgstr "Вихід SPDIF"
+
+msgid "AUX 1 Out"
+msgstr "Вихід AUX 1"
+
+msgid "AUX 2 Out"
+msgstr "Вихід AUX 2"
+
#, c-format
msgid "Error reading %d bytes from device '%s'."
msgstr "Помилка під Ñ‡Ð°Ñ Ñпроби Ñ‡Ð¸Ñ‚Ð°Ð½Ð½Ñ %d байтів з приÑтрою «%s»."
@@ -713,6 +354,355 @@ msgstr "Зміна роздільної здатноÑÑ‚Ñ– при відтвор
msgid "Cannot operate without a clock"
msgstr "Робота без годинника неможлива"
+#~ msgid "Bass"
+#~ msgstr "Ðизькі"
+
+#~ msgid "Treble"
+#~ msgstr "ВиÑокі"
+
+#~ msgid "Synth"
+#~ msgstr "Синтезатор"
+
+#~ msgid "PCM"
+#~ msgstr "КІМ"
+
+#~ msgid "Speaker"
+#~ msgstr "Динамік"
+
+#~ msgid "Line-in"
+#~ msgstr "Лінійний вхід"
+
+#~ msgid "Microphone"
+#~ msgstr "Мікрофон"
+
+#~ msgid "CD"
+#~ msgstr "КД"
+
+#~ msgid "Mixer"
+#~ msgstr "Мікшер"
+
+#~ msgid "PCM-2"
+#~ msgstr "КІМ-2"
+
+#~ msgid "Record"
+#~ msgstr "ЗапиÑ"
+
+#~ msgid "In-gain"
+#~ msgstr "Ð’Ñ….підÑиленнÑ"
+
+#~ msgid "Out-gain"
+#~ msgstr "Вих.підÑиленнÑ"
+
+#~ msgid "Line-1"
+#~ msgstr "Лінійний-1"
+
+#~ msgid "Line-2"
+#~ msgstr "Лінійний-2"
+
+#~ msgid "Line-3"
+#~ msgstr "Лінійний-3"
+
+#~ msgid "Digital-1"
+#~ msgstr "Цифровий-1"
+
+#~ msgid "Digital-2"
+#~ msgstr "Цифровий-2"
+
+#~ msgid "Digital-3"
+#~ msgstr "Цифровий-3"
+
+#~ msgid "Phone-in"
+#~ msgstr "Вх.телефон"
+
+#~ msgid "Phone-out"
+#~ msgstr "Вих.телефон"
+
+#~ msgid "Video"
+#~ msgstr "Відео"
+
+#~ msgid "Radio"
+#~ msgstr "Радіо"
+
+#~ msgid "Could not open audio device for mixer control handling."
+#~ msgstr "Ðе вдалоÑÑ Ð²Ñ–Ð´ÐºÑ€Ð¸Ñ‚Ð¸ приÑтрій Ð´Ð»Ñ ÐºÐµÑ€ÑƒÐ²Ð°Ð½Ð½Ñ Ñ€ÐµÐ³ÑƒÐ»Ñторами мікшера."
+
+#~ msgid ""
+#~ "Could not open audio device for mixer control handling. This version of "
+#~ "the Open Sound System is not supported by this element."
+#~ msgstr ""
+#~ "Ðе вдалоÑÑ Ð²Ñ–Ð´ÐºÑ€Ð¸Ñ‚Ð¸ приÑтрій Ð´Ð»Ñ ÐºÐµÑ€ÑƒÐ²Ð°Ð½Ð½Ñ Ñ€ÐµÐ³ÑƒÐ»Ñторами мікшера. Ð¦Ñ "
+#~ "верÑÑ–Ñ Open Sound System не підтримуєтьÑÑ Ñ†Ð¸Ð¼ елементом."
+
+#~ msgid "Master"
+#~ msgstr "ОÑновний"
+
+#~ msgid "Front"
+#~ msgstr "Передній"
+
+#~ msgid "Rear"
+#~ msgstr "Задній"
+
+#~ msgid "Headphones"
+#~ msgstr "Ðавушники"
+
+#~ msgid "Center"
+#~ msgstr "Центральний"
+
+#~ msgid "LFE"
+#~ msgstr "LFE"
+
+#~ msgid "Surround"
+#~ msgstr "Об'ємний"
+
+#~ msgid "Side"
+#~ msgstr "Боковий"
+
+#~ msgid "AUX Out"
+#~ msgstr "Вихід AUX"
+
+#~ msgid "3D Depth"
+#~ msgstr "ПроÑторова глибина"
+
+#~ msgid "3D Center"
+#~ msgstr "ПроÑторовий центр"
+
+#~ msgid "3D Enhance"
+#~ msgstr "ПроÑторове покращеннÑ"
+
+#~ msgid "Telephone"
+#~ msgstr "Телефон"
+
+#~ msgid "Line In"
+#~ msgstr "Лінійний вхід"
+
+#~ msgid "Internal CD"
+#~ msgstr "Вбудований КД"
+
+#~ msgid "Video In"
+#~ msgstr "Відеовхід"
+
+#~ msgid "AUX 1 In"
+#~ msgstr "Вхід AUX 1"
+
+#~ msgid "AUX 2 In"
+#~ msgstr "Вхід AUX 2"
+
+#~ msgid "AUX In"
+#~ msgstr "Вхід AUX"
+
+#~ msgid "Record Gain"
+#~ msgstr "ПідÑÐ¸Ð»ÐµÐ½Ð½Ñ Ð·Ð°Ð¿Ð¸Ñу"
+
+#~ msgid "Output Gain"
+#~ msgstr "ПідÑÐ¸Ð»ÐµÐ½Ð½Ñ Ð²Ð¸Ñ…Ð¾Ð´Ñƒ"
+
+#~ msgid "Microphone Boost"
+#~ msgstr "ПідÑÐ¸Ð»ÐµÐ½Ð½Ñ Ð¼Ñ–ÐºÑ€Ð¾Ñ„Ð¾Ð½Ð°"
+
+#~ msgid "Loopback"
+#~ msgstr "Заглушка"
+
+#~ msgid "Diagnostic"
+#~ msgstr "ДіагноÑтика"
+
+#~ msgid "Bass Boost"
+#~ msgstr "ПідÑÐ¸Ð»ÐµÐ½Ð½Ñ Ð±Ð°Ñів"
+
+#~ msgid "Playback Ports"
+#~ msgstr "Порти відтвореннÑ"
+
+#~ msgid "Input"
+#~ msgstr "Вхід"
+
+#~ msgid "Record Source"
+#~ msgstr "Ð—Ð°Ð¿Ð¸Ñ Ð´Ð¶ÐµÑ€ÐµÐ»Ð°"
+
+#~ msgid "Monitor Source"
+#~ msgstr "СпоÑÑ‚ÐµÑ€ÐµÐ¶ÐµÐ½Ð½Ñ Ð·Ð° джерелом"
+
+#~ msgid "Keyboard Beep"
+#~ msgstr "Гудок клавіатури"
+
+#~ msgid "Simulate Stereo"
+#~ msgstr "Ð†Ð¼Ñ–Ñ‚Ð°Ñ†Ñ–Ñ Ñтерео"
+
+#~ msgid "Stereo"
+#~ msgstr "Стерео"
+
+#~ msgid "Surround Sound"
+#~ msgstr "Об'ємний звук"
+
+#~ msgid "Microphone Gain"
+#~ msgstr "ПідÑÐ¸Ð»ÐµÐ½Ð½Ñ Ð¼Ñ–ÐºÑ€Ð¾Ñ„Ð¾Ð½Ð°"
+
+#~ msgid "Speaker Source"
+#~ msgstr "ОÑновний динамік"
+
+#~ msgid "Microphone Source"
+#~ msgstr "ОÑновний мікрофон"
+
+#~ msgid "Jack"
+#~ msgstr "Jack"
+
+#~ msgid "Center / LFE"
+#~ msgstr "Центральний/LFE"
+
+#~ msgid "Stereo Mix"
+#~ msgstr "Стереомікшер"
+
+#~ msgid "Mono Mix"
+#~ msgstr "Мономікшер"
+
+#~ msgid "Input Mix"
+#~ msgstr "Мікшер вх. даних"
+
+#~ msgid "SPDIF In"
+#~ msgstr "Вхід SPDIF"
+
+#~ msgid "Microphone 1"
+#~ msgstr "Мікрофон 1"
+
+#~ msgid "Microphone 2"
+#~ msgstr "Мікрофон 2"
+
+#~ msgid "Digital Out"
+#~ msgstr "Цифровий вихід"
+
+#~ msgid "Digital In"
+#~ msgstr "Цифровий вхід"
+
+#~ msgid "HDMI"
+#~ msgstr "HDMI"
+
+#~ msgid "Modem"
+#~ msgstr "Модем"
+
+#~ msgid "Handset"
+#~ msgstr "Гарнітура"
+
+#~ msgid "Other"
+#~ msgstr "Інше"
+
+#~ msgid "None"
+#~ msgstr "Ðемає"
+
+#~ msgid "On"
+#~ msgstr "Увімкн."
+
+#~ msgid "Off"
+#~ msgstr "Вимкн."
+
+#~ msgid "Mute"
+#~ msgstr "Вимкнути звук"
+
+#~ msgid "Fast"
+#~ msgstr "Швидко"
+
+#~ msgid "Very Low"
+#~ msgstr "Дуже низька"
+
+#~ msgid "Low"
+#~ msgstr "Ðизька"
+
+#~ msgid "Medium"
+#~ msgstr "СереднÑ"
+
+#~ msgid "High"
+#~ msgstr "ВиÑока"
+
+#~ msgid "Very High"
+#~ msgstr "Дуже виÑока"
+
+#~ msgid "Production"
+#~ msgstr "ПромиÑлова"
+
+#~ msgid "Front Panel Microphone"
+#~ msgstr "Мікрофон передньої панелі"
+
+#~ msgid "Front Panel Line In"
+#~ msgstr "Лінійний вхід передньої панелі"
+
+#~ msgid "Front Panel Headphones"
+#~ msgstr "Вихід навушників передньої панелі"
+
+#~ msgid "Front Panel Line Out"
+#~ msgstr "Лінійний вихід передньої панелі"
+
+#~ msgid "Green Connector"
+#~ msgstr "Зелений рознім"
+
+#~ msgid "Pink Connector"
+#~ msgstr "Рожевий рознім"
+
+#~ msgid "Blue Connector"
+#~ msgstr "Синій рознім"
+
+#~ msgid "White Connector"
+#~ msgstr "Білий рознім"
+
+#~ msgid "Black Connector"
+#~ msgstr "Чорний рознім"
+
+#~ msgid "Gray Connector"
+#~ msgstr "Сірий рознім"
+
+#~ msgid "Orange Connector"
+#~ msgstr "Помаранчевий рознім"
+
+#~ msgid "Red Connector"
+#~ msgstr "Червоний рознім"
+
+#~ msgid "Yellow Connector"
+#~ msgstr "Жовтий рознім"
+
+#~ msgid "Green Front Panel Connector"
+#~ msgstr "Зелений рознім передньої панелі"
+
+#~ msgid "Pink Front Panel Connector"
+#~ msgstr "Рожевий рознім передньої панелі"
+
+#~ msgid "Blue Front Panel Connector"
+#~ msgstr "Синій рознім передньої панелі"
+
+#~ msgid "White Front Panel Connector"
+#~ msgstr "Білий рознім передньої панелі"
+
+#~ msgid "Black Front Panel Connector"
+#~ msgstr "Чорний рознім передньої панелі"
+
+#~ msgid "Gray Front Panel Connector"
+#~ msgstr "Сірий рознім передньої панелі"
+
+#~ msgid "Orange Front Panel Connector"
+#~ msgstr "Помаранчевий рознім передньої панелі"
+
+#~ msgid "Red Front Panel Connector"
+#~ msgstr "Червоний рознім передньої панелі"
+
+#~ msgid "Yellow Front Panel Connector"
+#~ msgstr "Жовтий рознім передньої панелі"
+
+#~ msgid "Spread Output"
+#~ msgstr "Розгорнути вихід"
+
+#~ msgid "Downmix"
+#~ msgstr "ÐžÐ±â€™Ñ”Ð´Ð½Ð°Ð½Ð½Ñ ÐºÐ°Ð½Ð°Ð»Ñ–Ð²"
+
+#~ msgid "Virtual Mixer Input"
+#~ msgstr "Вхід віртуального мікшера"
+
+#~ msgid "Virtual Mixer Output"
+#~ msgstr "Вихід віртуального мікшера"
+
+#~ msgid "Virtual Mixer Channels"
+#~ msgstr "Канали віртуального мікшера"
+
+#~ msgid "%s %d Function"
+#~ msgstr "%s, Ñ„ÑƒÐ½ÐºÑ†Ñ–Ñ %d"
+
+#~ msgid "%s Function"
+#~ msgstr "Ð¤ÑƒÐ½ÐºÑ†Ñ–Ñ %s"
+
#~ msgid "Error reading %d bytes on device '%s'."
#~ msgstr "Помилка під Ñ‡Ð°Ñ Ñпроби Ñ‡Ð¸Ñ‚Ð°Ð½Ð½Ñ %d байтів на приÑтрої «%s»."
diff --git a/po/vi.gmo b/po/vi.gmo
index 85db1d84b56b1ecb751925679b061f000a977396..c9df6981a99295ab0d2b0f3ae2f2bb5546d7092c 100644
Binary files a/po/vi.gmo and b/po/vi.gmo differ
diff --git a/po/vi.po b/po/vi.po
index 4fc48772851d8934f822a651420bce85136bb34e..f7a0d313221ca9f9213908bc6f7a9068c7b08baf 100644
--- a/po/vi.po
+++ b/po/vi.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: gst-plugins-good 0.10.23.2\n"
"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/\n"
-"POT-Creation-Date: 2012-04-12 10:26+0200\n"
+"POT-Creation-Date: 2012-05-13 16:29+0200\n"
"PO-Revision-Date: 2010-10-03 18:48+1030\n"
"Last-Translator: Clytie Siddall <clytie@riverland.net.au>\n"
"Language-Team: Vietnamese <vi-VN@googlegroups.com>\n"
@@ -101,81 +101,6 @@ msgstr ""
msgid "Internal data flow error."
msgstr "Lỗi luồng dữ liệu nội bộ."
-msgid "Volume"
-msgstr "Âm lượng"
-
-msgid "Bass"
-msgstr "Trầm"
-
-msgid "Treble"
-msgstr "Cao"
-
-msgid "Synth"
-msgstr "Tổng hợp"
-
-msgid "PCM"
-msgstr "PCM"
-
-msgid "Speaker"
-msgstr "Loa"
-
-msgid "Line-in"
-msgstr "Dây-và o"
-
-msgid "Microphone"
-msgstr "Micrô"
-
-msgid "CD"
-msgstr "CD"
-
-msgid "Mixer"
-msgstr "Trá»™n"
-
-msgid "PCM-2"
-msgstr "PCM-2"
-
-msgid "Record"
-msgstr "Ghi"
-
-msgid "In-gain"
-msgstr "Và o-gia lượng"
-
-msgid "Out-gain"
-msgstr "Ra-gia lượng"
-
-msgid "Line-1"
-msgstr "Dây-1"
-
-msgid "Line-2"
-msgstr "Dây-2"
-
-msgid "Line-3"
-msgstr "Dây-3"
-
-msgid "Digital-1"
-msgstr "Äoạn biến-1"
-
-msgid "Digital-2"
-msgstr "Äoạn biến-2"
-
-msgid "Digital-3"
-msgstr "Äoạn biến-3"
-
-msgid "Phone-in"
-msgstr "Äiện thoại-và o"
-
-msgid "Phone-out"
-msgstr "Äiạn thoại-ra"
-
-msgid "Video"
-msgstr "Ảnh động"
-
-msgid "Radio"
-msgstr "Thu thanh"
-
-msgid "Monitor"
-msgstr "Mà n hình"
-
msgid ""
"Could not open audio device for playback. Device is being used by another "
"application."
@@ -202,311 +127,6 @@ msgstr ""
msgid "Could not open audio device for recording."
msgstr "Không thể mở thiết bị âm thanh để thu."
-msgid "Could not open audio device for mixer control handling."
-msgstr "Không thể mở thiết bị âm thanh để quản lý Ä‘iá»u khiển máy hoà tiếng."
-
-msgid ""
-"Could not open audio device for mixer control handling. This version of the "
-"Open Sound System is not supported by this element."
-msgstr ""
-"Không thể mở thiết bị âm thanh để quản lý Ä‘iá»u khiển máy hoà tiếng. Phiên "
-"bản Hệ thống Âm thanh Mở không phải được yếu tố nà y hỗ trợ."
-
-msgid "Master"
-msgstr "Chủ"
-
-msgid "Front"
-msgstr "TrÆ°á»›c"
-
-msgid "Rear"
-msgstr "Sau"
-
-msgid "Headphones"
-msgstr "Tai nghe"
-
-msgid "Center"
-msgstr "Tâm"
-
-msgid "LFE"
-msgstr "LFE"
-
-msgid "Surround"
-msgstr "Vòm"
-
-msgid "Side"
-msgstr "Bên"
-
-msgid "Built-in Speaker"
-msgstr "Loa dựng sẵn"
-
-msgid "AUX 1 Out"
-msgstr "AUX 1 Ra"
-
-msgid "AUX 2 Out"
-msgstr "AUX 2 Ra"
-
-msgid "AUX Out"
-msgstr "AUX Ra"
-
-msgid "3D Depth"
-msgstr "Sâu ba chiá»u"
-
-msgid "3D Center"
-msgstr "Tâm ba chiá»u"
-
-msgid "3D Enhance"
-msgstr "Tăng cÆ°á»ng ba chiá»u"
-
-msgid "Telephone"
-msgstr "Äiện thoại"
-
-msgid "Line Out"
-msgstr "Dây Ra"
-
-msgid "Line In"
-msgstr "Dây Và o"
-
-msgid "Internal CD"
-msgstr "CD ở trong"
-
-msgid "Video In"
-msgstr "Ảnh động Và o"
-
-msgid "AUX 1 In"
-msgstr "AUX 1 VÃ o"
-
-msgid "AUX 2 In"
-msgstr "AUX 2 VÃ o"
-
-msgid "AUX In"
-msgstr "AUX VÃ o"
-
-msgid "Record Gain"
-msgstr "Ghi lưu khuếch đại"
-
-msgid "Output Gain"
-msgstr "Khuếch đại Ra"
-
-msgid "Microphone Boost"
-msgstr "Tăng máy vi âm"
-
-msgid "Loopback"
-msgstr "Mạch nội bộ"
-
-msgid "Diagnostic"
-msgstr "Chẩn đoán"
-
-msgid "Bass Boost"
-msgstr "Tăng trầm"
-
-msgid "Playback Ports"
-msgstr "Cổng phát lại"
-
-msgid "Input"
-msgstr "VÃ o"
-
-msgid "Record Source"
-msgstr "Ghi lưu nguồn"
-
-msgid "Monitor Source"
-msgstr "Theo dõi nguồn"
-
-msgid "Keyboard Beep"
-msgstr "BÃp bà n phÃm"
-
-msgid "Simulate Stereo"
-msgstr "Mô phá»ng âm láºp thể"
-
-msgid "Stereo"
-msgstr "Âm láºp thể"
-
-msgid "Surround Sound"
-msgstr "Âm thanh vòm"
-
-msgid "Microphone Gain"
-msgstr "Khuếch đại máy vi âm"
-
-msgid "Speaker Source"
-msgstr "Nguồn loa"
-
-msgid "Microphone Source"
-msgstr "Nguồn máy vi âm"
-
-msgid "Jack"
-msgstr "Ổ cắm"
-
-msgid "Center / LFE"
-msgstr "Tâm / LFE"
-
-msgid "Stereo Mix"
-msgstr "Hoả tiếng âm láºp thể"
-
-msgid "Mono Mix"
-msgstr "Hoà tiếng đơn nguồn"
-
-msgid "Input Mix"
-msgstr "Hoà tiếng đầu và o"
-
-msgid "SPDIF In"
-msgstr "SPDIF VÃ o"
-
-msgid "SPDIF Out"
-msgstr "SPDIF Ra"
-
-msgid "Microphone 1"
-msgstr "Máy vi âm 1"
-
-msgid "Microphone 2"
-msgstr "Máy vi âm 2"
-
-msgid "Digital Out"
-msgstr "Äiện số Ra"
-
-msgid "Digital In"
-msgstr "Äiện số Và o"
-
-msgid "HDMI"
-msgstr "HDMI"
-
-msgid "Modem"
-msgstr "Bá»™ Ä‘iá»u giải"
-
-msgid "Handset"
-msgstr "Cầm tay"
-
-msgid "Other"
-msgstr "Khác"
-
-msgid "None"
-msgstr "Không có"
-
-msgid "On"
-msgstr "Báºt"
-
-msgid "Off"
-msgstr "Tắt"
-
-msgid "Mute"
-msgstr "Câm"
-
-msgid "Fast"
-msgstr "Nhanh"
-
-#. TRANSLATORS: "Very Low" is a quality setting here
-msgid "Very Low"
-msgstr "Rất thấp"
-
-#. TRANSLATORS: "Low" is a quality setting here
-msgid "Low"
-msgstr "Thấp"
-
-#. TRANSLATORS: "Medium" is a quality setting here
-msgid "Medium"
-msgstr "Vừa"
-
-#. TRANSLATORS: "High" is a quality setting here
-msgid "High"
-msgstr "Cao"
-
-#. TRANSLATORS: "Very High" is a quality setting here
-msgid "Very High"
-msgstr "Rất cao"
-
-#. TRANSLATORS: "Production" is a quality setting here
-msgid "Production"
-msgstr "Sản xuất"
-
-msgid "Front Panel Microphone"
-msgstr "Mặt trước: Máy vi âm"
-
-msgid "Front Panel Line In"
-msgstr "Mặt trước: Dây Và o"
-
-msgid "Front Panel Headphones"
-msgstr "Mặt trước: Tai nghe"
-
-msgid "Front Panel Line Out"
-msgstr "Mặt trước: Dây Ra"
-
-msgid "Green Connector"
-msgstr "Äầu nối mà u lục"
-
-msgid "Pink Connector"
-msgstr "Äầu nối mà u hồng"
-
-msgid "Blue Connector"
-msgstr "Äầu nối mà u xanh"
-
-msgid "White Connector"
-msgstr "Äầu nối mà u trắng"
-
-msgid "Black Connector"
-msgstr "Äầu nối mà u Ä‘en"
-
-msgid "Gray Connector"
-msgstr "Äầu nối mà u xám"
-
-msgid "Orange Connector"
-msgstr "Äầu nối mà u cam"
-
-msgid "Red Connector"
-msgstr "Äầu nối mà u Ä‘á»"
-
-msgid "Yellow Connector"
-msgstr "Äầu nối mà u và ng"
-
-msgid "Green Front Panel Connector"
-msgstr "Mặt trước: đầu nối mà u lục"
-
-msgid "Pink Front Panel Connector"
-msgstr "Mặt trước: đầu nối mà u hồng"
-
-msgid "Blue Front Panel Connector"
-msgstr "Mặt trước: đầu nối mà u xanh"
-
-msgid "White Front Panel Connector"
-msgstr "Mặt trước: đầu nối mà u trắng"
-
-msgid "Black Front Panel Connector"
-msgstr "Mặt trước: đầu nối mà u đen"
-
-msgid "Gray Front Panel Connector"
-msgstr "Mặt trước: đầu nối mà u xám"
-
-msgid "Orange Front Panel Connector"
-msgstr "Mặt trước: đầu nối mà u cam"
-
-msgid "Red Front Panel Connector"
-msgstr "Mặt trÆ°á»›c: đầu nối mà u Ä‘á»"
-
-msgid "Yellow Front Panel Connector"
-msgstr "Mặt trước: đầu nối mà u và ng"
-
-msgid "Spread Output"
-msgstr "Mở rộng kết xuất"
-
-msgid "Downmix"
-msgstr "Hạ hoà tiếng"
-
-msgid "Virtual Mixer Input"
-msgstr "Hoà tiếng ảo : Và o"
-
-msgid "Virtual Mixer Output"
-msgstr "Hoà tiếng ảo : Ra"
-
-msgid "Virtual Mixer Channels"
-msgstr "Hoà tiếng ảo : Kênh"
-
-#. TRANSLATORS: name + number of a volume mixer control
-#, c-format
-msgid "%s %d Function"
-msgstr "Chức năng %s %d"
-
-#. TRANSLATORS: name of a volume mixer control
-#, c-format
-msgid "%s Function"
-msgstr "Chức năng %s"
-
msgid ""
"Could not open audio device for playback. This version of the Open Sound "
"System is not supported by this element."
@@ -526,12 +146,33 @@ msgstr "Chức năng thu không phải được thiết bị âm thanh nà y hỗ
msgid "Error recording from audio device."
msgstr "Gặp lỗi khi thu từ thiết bị âm thanh."
+msgid "Volume"
+msgstr "Âm lượng"
+
msgid "Gain"
msgstr "Khuếch đại"
+msgid "Monitor"
+msgstr "Mà n hình"
+
+msgid "Built-in Speaker"
+msgstr "Loa dựng sẵn"
+
msgid "Headphone"
msgstr "Tai nghe"
+msgid "Line Out"
+msgstr "Dây Ra"
+
+msgid "SPDIF Out"
+msgstr "SPDIF Ra"
+
+msgid "AUX 1 Out"
+msgstr "AUX 1 Ra"
+
+msgid "AUX 2 Out"
+msgstr "AUX 2 Ra"
+
#, c-format
msgid "Error reading %d bytes from device '%s'."
msgstr "Gặp lá»—i khi Ä‘á»c %d byte từ thiết bị « %s »."
@@ -710,6 +351,355 @@ msgstr "Chưa hỗ trợ khả năng thay đổi độ phân giải trong khi ch
msgid "Cannot operate without a clock"
msgstr "Không thể thao tác khi không có đồng hồ."
+#~ msgid "Bass"
+#~ msgstr "Trầm"
+
+#~ msgid "Treble"
+#~ msgstr "Cao"
+
+#~ msgid "Synth"
+#~ msgstr "Tổng hợp"
+
+#~ msgid "PCM"
+#~ msgstr "PCM"
+
+#~ msgid "Speaker"
+#~ msgstr "Loa"
+
+#~ msgid "Line-in"
+#~ msgstr "Dây-và o"
+
+#~ msgid "Microphone"
+#~ msgstr "Micrô"
+
+#~ msgid "CD"
+#~ msgstr "CD"
+
+#~ msgid "Mixer"
+#~ msgstr "Trá»™n"
+
+#~ msgid "PCM-2"
+#~ msgstr "PCM-2"
+
+#~ msgid "Record"
+#~ msgstr "Ghi"
+
+#~ msgid "In-gain"
+#~ msgstr "Và o-gia lượng"
+
+#~ msgid "Out-gain"
+#~ msgstr "Ra-gia lượng"
+
+#~ msgid "Line-1"
+#~ msgstr "Dây-1"
+
+#~ msgid "Line-2"
+#~ msgstr "Dây-2"
+
+#~ msgid "Line-3"
+#~ msgstr "Dây-3"
+
+#~ msgid "Digital-1"
+#~ msgstr "Äoạn biến-1"
+
+#~ msgid "Digital-2"
+#~ msgstr "Äoạn biến-2"
+
+#~ msgid "Digital-3"
+#~ msgstr "Äoạn biến-3"
+
+#~ msgid "Phone-in"
+#~ msgstr "Äiện thoại-và o"
+
+#~ msgid "Phone-out"
+#~ msgstr "Äiạn thoại-ra"
+
+#~ msgid "Video"
+#~ msgstr "Ảnh động"
+
+#~ msgid "Radio"
+#~ msgstr "Thu thanh"
+
+#~ msgid "Could not open audio device for mixer control handling."
+#~ msgstr "Không thể mở thiết bị âm thanh để quản lý Ä‘iá»u khiển máy hoà tiếng."
+
+#~ msgid ""
+#~ "Could not open audio device for mixer control handling. This version of "
+#~ "the Open Sound System is not supported by this element."
+#~ msgstr ""
+#~ "Không thể mở thiết bị âm thanh để quản lý Ä‘iá»u khiển máy hoà tiếng. Phiên "
+#~ "bản Hệ thống Âm thanh Mở không phải được yếu tố nà y hỗ trợ."
+
+#~ msgid "Master"
+#~ msgstr "Chủ"
+
+#~ msgid "Front"
+#~ msgstr "TrÆ°á»›c"
+
+#~ msgid "Rear"
+#~ msgstr "Sau"
+
+#~ msgid "Headphones"
+#~ msgstr "Tai nghe"
+
+#~ msgid "Center"
+#~ msgstr "Tâm"
+
+#~ msgid "LFE"
+#~ msgstr "LFE"
+
+#~ msgid "Surround"
+#~ msgstr "Vòm"
+
+#~ msgid "Side"
+#~ msgstr "Bên"
+
+#~ msgid "AUX Out"
+#~ msgstr "AUX Ra"
+
+#~ msgid "3D Depth"
+#~ msgstr "Sâu ba chiá»u"
+
+#~ msgid "3D Center"
+#~ msgstr "Tâm ba chiá»u"
+
+#~ msgid "3D Enhance"
+#~ msgstr "Tăng cÆ°á»ng ba chiá»u"
+
+#~ msgid "Telephone"
+#~ msgstr "Äiện thoại"
+
+#~ msgid "Line In"
+#~ msgstr "Dây Và o"
+
+#~ msgid "Internal CD"
+#~ msgstr "CD ở trong"
+
+#~ msgid "Video In"
+#~ msgstr "Ảnh động Và o"
+
+#~ msgid "AUX 1 In"
+#~ msgstr "AUX 1 VÃ o"
+
+#~ msgid "AUX 2 In"
+#~ msgstr "AUX 2 VÃ o"
+
+#~ msgid "AUX In"
+#~ msgstr "AUX VÃ o"
+
+#~ msgid "Record Gain"
+#~ msgstr "Ghi lưu khuếch đại"
+
+#~ msgid "Output Gain"
+#~ msgstr "Khuếch đại Ra"
+
+#~ msgid "Microphone Boost"
+#~ msgstr "Tăng máy vi âm"
+
+#~ msgid "Loopback"
+#~ msgstr "Mạch nội bộ"
+
+#~ msgid "Diagnostic"
+#~ msgstr "Chẩn đoán"
+
+#~ msgid "Bass Boost"
+#~ msgstr "Tăng trầm"
+
+#~ msgid "Playback Ports"
+#~ msgstr "Cổng phát lại"
+
+#~ msgid "Input"
+#~ msgstr "VÃ o"
+
+#~ msgid "Record Source"
+#~ msgstr "Ghi lưu nguồn"
+
+#~ msgid "Monitor Source"
+#~ msgstr "Theo dõi nguồn"
+
+#~ msgid "Keyboard Beep"
+#~ msgstr "BÃp bà n phÃm"
+
+#~ msgid "Simulate Stereo"
+#~ msgstr "Mô phá»ng âm láºp thể"
+
+#~ msgid "Stereo"
+#~ msgstr "Âm láºp thể"
+
+#~ msgid "Surround Sound"
+#~ msgstr "Âm thanh vòm"
+
+#~ msgid "Microphone Gain"
+#~ msgstr "Khuếch đại máy vi âm"
+
+#~ msgid "Speaker Source"
+#~ msgstr "Nguồn loa"
+
+#~ msgid "Microphone Source"
+#~ msgstr "Nguồn máy vi âm"
+
+#~ msgid "Jack"
+#~ msgstr "Ổ cắm"
+
+#~ msgid "Center / LFE"
+#~ msgstr "Tâm / LFE"
+
+#~ msgid "Stereo Mix"
+#~ msgstr "Hoả tiếng âm láºp thể"
+
+#~ msgid "Mono Mix"
+#~ msgstr "Hoà tiếng đơn nguồn"
+
+#~ msgid "Input Mix"
+#~ msgstr "Hoà tiếng đầu và o"
+
+#~ msgid "SPDIF In"
+#~ msgstr "SPDIF VÃ o"
+
+#~ msgid "Microphone 1"
+#~ msgstr "Máy vi âm 1"
+
+#~ msgid "Microphone 2"
+#~ msgstr "Máy vi âm 2"
+
+#~ msgid "Digital Out"
+#~ msgstr "Äiện số Ra"
+
+#~ msgid "Digital In"
+#~ msgstr "Äiện số Và o"
+
+#~ msgid "HDMI"
+#~ msgstr "HDMI"
+
+#~ msgid "Modem"
+#~ msgstr "Bá»™ Ä‘iá»u giải"
+
+#~ msgid "Handset"
+#~ msgstr "Cầm tay"
+
+#~ msgid "Other"
+#~ msgstr "Khác"
+
+#~ msgid "None"
+#~ msgstr "Không có"
+
+#~ msgid "On"
+#~ msgstr "Báºt"
+
+#~ msgid "Off"
+#~ msgstr "Tắt"
+
+#~ msgid "Mute"
+#~ msgstr "Câm"
+
+#~ msgid "Fast"
+#~ msgstr "Nhanh"
+
+#~ msgid "Very Low"
+#~ msgstr "Rất thấp"
+
+#~ msgid "Low"
+#~ msgstr "Thấp"
+
+#~ msgid "Medium"
+#~ msgstr "Vừa"
+
+#~ msgid "High"
+#~ msgstr "Cao"
+
+#~ msgid "Very High"
+#~ msgstr "Rất cao"
+
+#~ msgid "Production"
+#~ msgstr "Sản xuất"
+
+#~ msgid "Front Panel Microphone"
+#~ msgstr "Mặt trước: Máy vi âm"
+
+#~ msgid "Front Panel Line In"
+#~ msgstr "Mặt trước: Dây Và o"
+
+#~ msgid "Front Panel Headphones"
+#~ msgstr "Mặt trước: Tai nghe"
+
+#~ msgid "Front Panel Line Out"
+#~ msgstr "Mặt trước: Dây Ra"
+
+#~ msgid "Green Connector"
+#~ msgstr "Äầu nối mà u lục"
+
+#~ msgid "Pink Connector"
+#~ msgstr "Äầu nối mà u hồng"
+
+#~ msgid "Blue Connector"
+#~ msgstr "Äầu nối mà u xanh"
+
+#~ msgid "White Connector"
+#~ msgstr "Äầu nối mà u trắng"
+
+#~ msgid "Black Connector"
+#~ msgstr "Äầu nối mà u Ä‘en"
+
+#~ msgid "Gray Connector"
+#~ msgstr "Äầu nối mà u xám"
+
+#~ msgid "Orange Connector"
+#~ msgstr "Äầu nối mà u cam"
+
+#~ msgid "Red Connector"
+#~ msgstr "Äầu nối mà u Ä‘á»"
+
+#~ msgid "Yellow Connector"
+#~ msgstr "Äầu nối mà u và ng"
+
+#~ msgid "Green Front Panel Connector"
+#~ msgstr "Mặt trước: đầu nối mà u lục"
+
+#~ msgid "Pink Front Panel Connector"
+#~ msgstr "Mặt trước: đầu nối mà u hồng"
+
+#~ msgid "Blue Front Panel Connector"
+#~ msgstr "Mặt trước: đầu nối mà u xanh"
+
+#~ msgid "White Front Panel Connector"
+#~ msgstr "Mặt trước: đầu nối mà u trắng"
+
+#~ msgid "Black Front Panel Connector"
+#~ msgstr "Mặt trước: đầu nối mà u đen"
+
+#~ msgid "Gray Front Panel Connector"
+#~ msgstr "Mặt trước: đầu nối mà u xám"
+
+#~ msgid "Orange Front Panel Connector"
+#~ msgstr "Mặt trước: đầu nối mà u cam"
+
+#~ msgid "Red Front Panel Connector"
+#~ msgstr "Mặt trÆ°á»›c: đầu nối mà u Ä‘á»"
+
+#~ msgid "Yellow Front Panel Connector"
+#~ msgstr "Mặt trước: đầu nối mà u và ng"
+
+#~ msgid "Spread Output"
+#~ msgstr "Mở rộng kết xuất"
+
+#~ msgid "Downmix"
+#~ msgstr "Hạ hoà tiếng"
+
+#~ msgid "Virtual Mixer Input"
+#~ msgstr "Hoà tiếng ảo : Và o"
+
+#~ msgid "Virtual Mixer Output"
+#~ msgstr "Hoà tiếng ảo : Ra"
+
+#~ msgid "Virtual Mixer Channels"
+#~ msgstr "Hoà tiếng ảo : Kênh"
+
+#~ msgid "%s %d Function"
+#~ msgstr "Chức năng %s %d"
+
+#~ msgid "%s Function"
+#~ msgstr "Chức năng %s"
+
#~ msgid "Error reading %d bytes on device '%s'."
#~ msgstr "Gặp lá»—i khi Ä‘á»c %d byte trên thiết bị « %s »."
diff --git a/po/zh_CN.gmo b/po/zh_CN.gmo
index bd9fd6b1c54cd249afaed9144499bd35db2e8b2c..cccedc031ce3f485e4944e412203a2555d9b4d0f 100644
Binary files a/po/zh_CN.gmo and b/po/zh_CN.gmo differ
diff --git a/po/zh_CN.po b/po/zh_CN.po
index 9036477ccbdeaf3196a976708e87b615fe6ea5e6..4c2d57f68bb8818f24dfed407c371514e175721f 100644
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: gst-plugins-good 0.10.16.2\n"
"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/\n"
-"POT-Creation-Date: 2012-04-12 10:26+0200\n"
+"POT-Creation-Date: 2012-05-13 16:29+0200\n"
"PO-Revision-Date: 2009-11-13 22:20+0800\n"
"Last-Translator: Ji ZhengYu <zhengyuji@gmail.com>\n"
"Language-Team: Chinese (simplified) <i18n-zh@googlegroups.com>\n"
@@ -98,81 +98,6 @@ msgstr ""
msgid "Internal data flow error."
msgstr "内部数æ®æµé”™è¯¯ã€‚"
-msgid "Volume"
-msgstr "音é‡"
-
-msgid "Bass"
-msgstr "低音(Bass)"
-
-msgid "Treble"
-msgstr "高音(Treble)"
-
-msgid "Synth"
-msgstr "åˆæˆå™¨"
-
-msgid "PCM"
-msgstr "波形(PCM)"
-
-msgid "Speaker"
-msgstr "扬声器(Speaker)"
-
-msgid "Line-in"
-msgstr "线路输入(Line-in)"
-
-msgid "Microphone"
-msgstr "è¯ç’"
-
-msgid "CD"
-msgstr "CD 音频"
-
-msgid "Mixer"
-msgstr "混音器"
-
-msgid "PCM-2"
-msgstr "PCM-2"
-
-msgid "Record"
-msgstr "录音"
-
-msgid "In-gain"
-msgstr "输入增益"
-
-msgid "Out-gain"
-msgstr "输出增益"
-
-msgid "Line-1"
-msgstr "线路1"
-
-msgid "Line-2"
-msgstr "线路2"
-
-msgid "Line-3"
-msgstr "线路3"
-
-msgid "Digital-1"
-msgstr "æ•°å—线路1"
-
-msgid "Digital-2"
-msgstr "æ•°å—线路2"
-
-msgid "Digital-3"
-msgstr "æ•°å—线路3"
-
-msgid "Phone-in"
-msgstr "è¯ç’输入"
-
-msgid "Phone-out"
-msgstr "è¯ç’输出"
-
-msgid "Video"
-msgstr "视频"
-
-msgid "Radio"
-msgstr "广æ’"
-
-msgid "Monitor"
-msgstr "监控器"
-
msgid ""
"Could not open audio device for playback. Device is being used by another "
"application."
@@ -194,355 +119,51 @@ msgstr "æ— æ³•æ‰“å¼€éŸ³é¢‘è®¾å¤‡å½•éŸ³ã€‚æ‚¨æ— æƒä½¿ç”¨è¿™ä¸€è®¾å¤‡ã€‚"
msgid "Could not open audio device for recording."
msgstr "æ— æ³•æ‰“å¼€éŸ³é¢‘è®¾å¤‡å½•éŸ³ã€‚"
-#, fuzzy
-msgid "Could not open audio device for mixer control handling."
-msgstr "æ— æ³•æ‰“å¼€éŸ³é¢‘è®¾å¤‡å½•éŸ³ã€‚"
-
#, fuzzy
msgid ""
-"Could not open audio device for mixer control handling. This version of the "
-"Open Sound System is not supported by this element."
-msgstr "æ— æ³•æ‰“å¼€éŸ³é¢‘è®¾å¤‡å½•éŸ³ã€‚æ‚¨æ— æƒä½¿ç”¨è¿™ä¸€è®¾å¤‡ã€‚"
+"Could not open audio device for playback. This version of the Open Sound "
+"System is not supported by this element."
+msgstr "æ— æ³•æ‰“å¼€éŸ³é¢‘è®¾å¤‡æ’æ”¾éŸ³é¢‘ã€‚æ‚¨æ— æƒä½¿ç”¨è¿™ä¸€è®¾å¤‡ã€‚"
-msgid "Master"
+msgid "Playback is not supported by this audio device."
msgstr ""
-msgid "Front"
+msgid "Audio playback error."
msgstr ""
-msgid "Rear"
+msgid "Recording is not supported by this audio device."
msgstr ""
#, fuzzy
-msgid "Headphones"
-msgstr "头戴å¼è€³æœº"
-
-msgid "Center"
-msgstr ""
+msgid "Error recording from audio device."
+msgstr "从设备‘%2$s’ä¸è¯»å– %1$d 个å—节时出错。"
-msgid "LFE"
-msgstr ""
+msgid "Volume"
+msgstr "音é‡"
-msgid "Surround"
-msgstr ""
+msgid "Gain"
+msgstr "增益"
-msgid "Side"
-msgstr ""
+msgid "Monitor"
+msgstr "监控器"
msgid "Built-in Speaker"
msgstr "内建扬声器"
-msgid "AUX 1 Out"
-msgstr "AUX 1 输出"
-
-msgid "AUX 2 Out"
-msgstr "AUX 2 输出"
-
-#, fuzzy
-msgid "AUX Out"
-msgstr "AUX 1 输出"
-
-msgid "3D Depth"
-msgstr ""
-
-msgid "3D Center"
-msgstr ""
-
-msgid "3D Enhance"
-msgstr ""
-
-#, fuzzy
-msgid "Telephone"
+msgid "Headphone"
msgstr "头戴å¼è€³æœº"
msgid "Line Out"
msgstr "线路输出"
-#, fuzzy
-msgid "Line In"
-msgstr "线路输入(Line-in)"
-
-msgid "Internal CD"
-msgstr ""
-
-#, fuzzy
-msgid "Video In"
-msgstr "视频"
-
-#, fuzzy
-msgid "AUX 1 In"
-msgstr "AUX 1 输出"
-
-#, fuzzy
-msgid "AUX 2 In"
-msgstr "AUX 2 输出"
-
-msgid "AUX In"
-msgstr ""
-
-#, fuzzy
-msgid "Record Gain"
-msgstr "录音"
-
-msgid "Output Gain"
-msgstr ""
-
-#, fuzzy
-msgid "Microphone Boost"
-msgstr "è¯ç’"
-
-msgid "Loopback"
-msgstr ""
-
-msgid "Diagnostic"
-msgstr ""
-
-msgid "Bass Boost"
-msgstr ""
-
-msgid "Playback Ports"
-msgstr ""
-
-msgid "Input"
-msgstr ""
-
-#, fuzzy
-msgid "Record Source"
-msgstr "录音"
-
-#, fuzzy
-msgid "Monitor Source"
-msgstr "监控器"
-
-msgid "Keyboard Beep"
-msgstr ""
-
-msgid "Simulate Stereo"
-msgstr ""
-
-msgid "Stereo"
-msgstr ""
-
-msgid "Surround Sound"
-msgstr ""
-
-#, fuzzy
-msgid "Microphone Gain"
-msgstr "è¯ç’"
-
-#, fuzzy
-msgid "Speaker Source"
-msgstr "扬声器(Speaker)"
-
-#, fuzzy
-msgid "Microphone Source"
-msgstr "è¯ç’"
-
-msgid "Jack"
-msgstr ""
-
-msgid "Center / LFE"
-msgstr ""
-
-msgid "Stereo Mix"
-msgstr ""
-
-msgid "Mono Mix"
-msgstr ""
-
-msgid "Input Mix"
-msgstr ""
-
-#, fuzzy
-msgid "SPDIF In"
-msgstr "SPDIF 输出"
-
msgid "SPDIF Out"
msgstr "SPDIF 输出"
-#, fuzzy
-msgid "Microphone 1"
-msgstr "è¯ç’"
-
-#, fuzzy
-msgid "Microphone 2"
-msgstr "è¯ç’"
-
-#, fuzzy
-msgid "Digital Out"
-msgstr "æ•°å—线路1"
-
-#, fuzzy
-msgid "Digital In"
-msgstr "æ•°å—线路1"
-
-msgid "HDMI"
-msgstr ""
-
-msgid "Modem"
-msgstr ""
-
-msgid "Handset"
-msgstr ""
-
-msgid "Other"
-msgstr ""
-
-msgid "None"
-msgstr ""
-
-msgid "On"
-msgstr ""
-
-msgid "Off"
-msgstr ""
-
-msgid "Mute"
-msgstr ""
-
-msgid "Fast"
-msgstr ""
-
-#. TRANSLATORS: "Very Low" is a quality setting here
-msgid "Very Low"
-msgstr ""
-
-#. TRANSLATORS: "Low" is a quality setting here
-msgid "Low"
-msgstr ""
-
-#. TRANSLATORS: "Medium" is a quality setting here
-msgid "Medium"
-msgstr ""
-
-#. TRANSLATORS: "High" is a quality setting here
-msgid "High"
-msgstr ""
-
-#. TRANSLATORS: "Very High" is a quality setting here
-msgid "Very High"
-msgstr ""
-
-#. TRANSLATORS: "Production" is a quality setting here
-msgid "Production"
-msgstr ""
-
-#, fuzzy
-msgid "Front Panel Microphone"
-msgstr "è¯ç’"
-
-msgid "Front Panel Line In"
-msgstr ""
-
-msgid "Front Panel Headphones"
-msgstr ""
-
-msgid "Front Panel Line Out"
-msgstr ""
-
-msgid "Green Connector"
-msgstr ""
-
-msgid "Pink Connector"
-msgstr ""
-
-msgid "Blue Connector"
-msgstr ""
-
-msgid "White Connector"
-msgstr ""
-
-msgid "Black Connector"
-msgstr ""
-
-msgid "Gray Connector"
-msgstr ""
-
-msgid "Orange Connector"
-msgstr ""
-
-msgid "Red Connector"
-msgstr ""
-
-msgid "Yellow Connector"
-msgstr ""
-
-msgid "Green Front Panel Connector"
-msgstr ""
-
-msgid "Pink Front Panel Connector"
-msgstr ""
-
-msgid "Blue Front Panel Connector"
-msgstr ""
-
-msgid "White Front Panel Connector"
-msgstr ""
-
-msgid "Black Front Panel Connector"
-msgstr ""
-
-msgid "Gray Front Panel Connector"
-msgstr ""
-
-msgid "Orange Front Panel Connector"
-msgstr ""
-
-msgid "Red Front Panel Connector"
-msgstr ""
-
-msgid "Yellow Front Panel Connector"
-msgstr ""
-
-msgid "Spread Output"
-msgstr ""
-
-msgid "Downmix"
-msgstr ""
-
-msgid "Virtual Mixer Input"
-msgstr ""
-
-msgid "Virtual Mixer Output"
-msgstr ""
-
-msgid "Virtual Mixer Channels"
-msgstr ""
-
-#. TRANSLATORS: name + number of a volume mixer control
-#, c-format
-msgid "%s %d Function"
-msgstr ""
-
-#. TRANSLATORS: name of a volume mixer control
-#, c-format
-msgid "%s Function"
-msgstr ""
-
-#, fuzzy
-msgid ""
-"Could not open audio device for playback. This version of the Open Sound "
-"System is not supported by this element."
-msgstr "æ— æ³•æ‰“å¼€éŸ³é¢‘è®¾å¤‡æ’æ”¾éŸ³é¢‘ã€‚æ‚¨æ— æƒä½¿ç”¨è¿™ä¸€è®¾å¤‡ã€‚"
-
-msgid "Playback is not supported by this audio device."
-msgstr ""
-
-msgid "Audio playback error."
-msgstr ""
-
-msgid "Recording is not supported by this audio device."
-msgstr ""
-
-#, fuzzy
-msgid "Error recording from audio device."
-msgstr "从设备‘%2$s’ä¸è¯»å– %1$d 个å—节时出错。"
-
-msgid "Gain"
-msgstr "增益"
+msgid "AUX 1 Out"
+msgstr "AUX 1 输出"
-msgid "Headphone"
-msgstr "头戴å¼è€³æœº"
+msgid "AUX 2 Out"
+msgstr "AUX 2 输出"
#, c-format
msgid "Error reading %d bytes from device '%s'."
@@ -712,6 +333,165 @@ msgstr "å°šä¸æ”¯æŒåœ¨è¿è¡Œæ—¶æ›´æ”¹åˆ†è¾¨çŽ‡ã€‚"
msgid "Cannot operate without a clock"
msgstr "没有时钟的è¯æ— 法æ“作"
+#~ msgid "Bass"
+#~ msgstr "低音(Bass)"
+
+#~ msgid "Treble"
+#~ msgstr "高音(Treble)"
+
+#~ msgid "Synth"
+#~ msgstr "åˆæˆå™¨"
+
+#~ msgid "PCM"
+#~ msgstr "波形(PCM)"
+
+#~ msgid "Speaker"
+#~ msgstr "扬声器(Speaker)"
+
+#~ msgid "Line-in"
+#~ msgstr "线路输入(Line-in)"
+
+#~ msgid "Microphone"
+#~ msgstr "è¯ç’"
+
+#~ msgid "CD"
+#~ msgstr "CD 音频"
+
+#~ msgid "Mixer"
+#~ msgstr "混音器"
+
+#~ msgid "PCM-2"
+#~ msgstr "PCM-2"
+
+#~ msgid "Record"
+#~ msgstr "录音"
+
+#~ msgid "In-gain"
+#~ msgstr "输入增益"
+
+#~ msgid "Out-gain"
+#~ msgstr "输出增益"
+
+#~ msgid "Line-1"
+#~ msgstr "线路1"
+
+#~ msgid "Line-2"
+#~ msgstr "线路2"
+
+#~ msgid "Line-3"
+#~ msgstr "线路3"
+
+#~ msgid "Digital-1"
+#~ msgstr "æ•°å—线路1"
+
+#~ msgid "Digital-2"
+#~ msgstr "æ•°å—线路2"
+
+#~ msgid "Digital-3"
+#~ msgstr "æ•°å—线路3"
+
+#~ msgid "Phone-in"
+#~ msgstr "è¯ç’输入"
+
+#~ msgid "Phone-out"
+#~ msgstr "è¯ç’输出"
+
+#~ msgid "Video"
+#~ msgstr "视频"
+
+#~ msgid "Radio"
+#~ msgstr "广æ’"
+
+#, fuzzy
+#~ msgid "Could not open audio device for mixer control handling."
+#~ msgstr "æ— æ³•æ‰“å¼€éŸ³é¢‘è®¾å¤‡å½•éŸ³ã€‚"
+
+#, fuzzy
+#~ msgid ""
+#~ "Could not open audio device for mixer control handling. This version of "
+#~ "the Open Sound System is not supported by this element."
+#~ msgstr "æ— æ³•æ‰“å¼€éŸ³é¢‘è®¾å¤‡å½•éŸ³ã€‚æ‚¨æ— æƒä½¿ç”¨è¿™ä¸€è®¾å¤‡ã€‚"
+
+#, fuzzy
+#~ msgid "Headphones"
+#~ msgstr "头戴å¼è€³æœº"
+
+#, fuzzy
+#~ msgid "AUX Out"
+#~ msgstr "AUX 1 输出"
+
+#, fuzzy
+#~ msgid "Telephone"
+#~ msgstr "头戴å¼è€³æœº"
+
+#, fuzzy
+#~ msgid "Line In"
+#~ msgstr "线路输入(Line-in)"
+
+#, fuzzy
+#~ msgid "Video In"
+#~ msgstr "视频"
+
+#, fuzzy
+#~ msgid "AUX 1 In"
+#~ msgstr "AUX 1 输出"
+
+#, fuzzy
+#~ msgid "AUX 2 In"
+#~ msgstr "AUX 2 输出"
+
+#, fuzzy
+#~ msgid "Record Gain"
+#~ msgstr "录音"
+
+#, fuzzy
+#~ msgid "Microphone Boost"
+#~ msgstr "è¯ç’"
+
+#, fuzzy
+#~ msgid "Record Source"
+#~ msgstr "录音"
+
+#, fuzzy
+#~ msgid "Monitor Source"
+#~ msgstr "监控器"
+
+#, fuzzy
+#~ msgid "Microphone Gain"
+#~ msgstr "è¯ç’"
+
+#, fuzzy
+#~ msgid "Speaker Source"
+#~ msgstr "扬声器(Speaker)"
+
+#, fuzzy
+#~ msgid "Microphone Source"
+#~ msgstr "è¯ç’"
+
+#, fuzzy
+#~ msgid "SPDIF In"
+#~ msgstr "SPDIF 输出"
+
+#, fuzzy
+#~ msgid "Microphone 1"
+#~ msgstr "è¯ç’"
+
+#, fuzzy
+#~ msgid "Microphone 2"
+#~ msgstr "è¯ç’"
+
+#, fuzzy
+#~ msgid "Digital Out"
+#~ msgstr "æ•°å—线路1"
+
+#, fuzzy
+#~ msgid "Digital In"
+#~ msgstr "æ•°å—线路1"
+
+#, fuzzy
+#~ msgid "Front Panel Microphone"
+#~ msgstr "è¯ç’"
+
#~ msgid "Failed to query sound server capabilities"
#~ msgstr "查寻音频æœåŠ¡å™¨çš„æœåŠ¡å¤±è´¥"
diff --git a/po/zh_HK.gmo b/po/zh_HK.gmo
index 67a5e3efcc6f6e3df2b1f4116ecb07c8d90728ba..ea89212284b76a4c69bc426e45cf8563ee8fd3a8 100644
Binary files a/po/zh_HK.gmo and b/po/zh_HK.gmo differ
diff --git a/po/zh_HK.po b/po/zh_HK.po
index 1526b630c98911be02ca4eacd5f07705d32d1458..402c2e2ddd6003109cc6de2a7921442a59703802 100644
--- a/po/zh_HK.po
+++ b/po/zh_HK.po
@@ -6,7 +6,7 @@ msgid ""
msgstr ""
"Project-Id-Version: gst-plugins-good-0.10.2 0.10.2\n"
"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/\n"
-"POT-Creation-Date: 2012-04-12 10:26+0200\n"
+"POT-Creation-Date: 2012-05-13 16:29+0200\n"
"PO-Revision-Date: 2006-08-29 01:08+0800\n"
"Last-Translator: Abel Cheung <abelcheung@gmail.com>\n"
"Language-Team: Chinese (Hong Kong) <community@linuxhall.org>\n"
@@ -91,81 +91,6 @@ msgstr ""
msgid "Internal data flow error."
msgstr "內部資料串æµç™¼ç”ŸéŒ¯èª¤ã€‚"
-msgid "Volume"
-msgstr ""
-
-msgid "Bass"
-msgstr ""
-
-msgid "Treble"
-msgstr ""
-
-msgid "Synth"
-msgstr ""
-
-msgid "PCM"
-msgstr ""
-
-msgid "Speaker"
-msgstr ""
-
-msgid "Line-in"
-msgstr ""
-
-msgid "Microphone"
-msgstr ""
-
-msgid "CD"
-msgstr ""
-
-msgid "Mixer"
-msgstr ""
-
-msgid "PCM-2"
-msgstr ""
-
-msgid "Record"
-msgstr ""
-
-msgid "In-gain"
-msgstr ""
-
-msgid "Out-gain"
-msgstr ""
-
-msgid "Line-1"
-msgstr ""
-
-msgid "Line-2"
-msgstr ""
-
-msgid "Line-3"
-msgstr ""
-
-msgid "Digital-1"
-msgstr ""
-
-msgid "Digital-2"
-msgstr ""
-
-msgid "Digital-3"
-msgstr ""
-
-msgid "Phone-in"
-msgstr ""
-
-msgid "Phone-out"
-msgstr ""
-
-msgid "Video"
-msgstr ""
-
-msgid "Radio"
-msgstr ""
-
-msgid "Monitor"
-msgstr ""
-
msgid ""
"Could not open audio device for playback. Device is being used by another "
"application."
@@ -187,351 +112,48 @@ msgstr ""
msgid "Could not open audio device for recording."
msgstr ""
-msgid "Could not open audio device for mixer control handling."
-msgstr "æ— æ³•æ‰“å¼€éŸ³é¢‘æ–‡ä»¶è¿›è¡Œæ··éŸ³æŽ§åˆ¶æ“作。"
-
msgid ""
-"Could not open audio device for mixer control handling. This version of the "
-"Open Sound System is not supported by this element."
-msgstr ""
-"æ— æ³•æ‰“å¼€éŸ³é¢‘è®¾å¤‡è¿›è¡ŒéŸ³é‡æŽ§åˆ¶æ“作。æ¤éƒ¨ä»¶ä¸æ”¯æŒå¼€æ”¾å£°éŸ³ç³»ç»Ÿ(OSS)的版本。"
-
-msgid "Master"
-msgstr "主声é“"
-
-msgid "Front"
-msgstr "å‰ç½®å£°é“"
-
-msgid "Rear"
-msgstr "åŽç½®å£°é“"
-
-msgid "Headphones"
-msgstr "头戴å¼è€³æœº"
+"Could not open audio device for playback. This version of the Open Sound "
+"System is not supported by this element."
+msgstr "æ— æ³•æ‰“å¼€éŸ³é¢‘è®¾å¤‡æ’放音频。æ¤ç»„件ä¸æ”¯æŒå¼€æ”¾å£°éŸ³ç³»ç»Ÿ(OSS)版本。"
-msgid "Center"
-msgstr "ä¸ç½®"
+msgid "Playback is not supported by this audio device."
+msgstr "æ¤éŸ³é¢‘设备ä¸æ”¯æŒéŸ³é¢‘æ’放。"
-msgid "LFE"
-msgstr "低音炮"
+msgid "Audio playback error."
+msgstr "音频æ’放错误。"
-msgid "Surround"
-msgstr "立体声环绕"
+msgid "Recording is not supported by this audio device."
+msgstr "æ¤éŸ³é¢‘设备ä¸æ”¯æŒå½•éŸ³ã€‚"
-msgid "Side"
-msgstr "å·¦å³å£°é“"
+msgid "Error recording from audio device."
+msgstr "从音频设备录音时å‘生错误。"
-msgid "Built-in Speaker"
+msgid "Volume"
msgstr ""
-msgid "AUX 1 Out"
+msgid "Gain"
msgstr ""
-msgid "AUX 2 Out"
+msgid "Monitor"
msgstr ""
-msgid "AUX Out"
-msgstr "AUX 输出"
-
-msgid "3D Depth"
-msgstr "3D Depth"
-
-msgid "3D Center"
-msgstr "3D Center"
-
-msgid "3D Enhance"
-msgstr "3D Enhance"
+msgid "Built-in Speaker"
+msgstr ""
-msgid "Telephone"
-msgstr "è¯ç’"
+msgid "Headphone"
+msgstr ""
msgid "Line Out"
msgstr ""
-msgid "Line In"
-msgstr "线路输入"
-
-msgid "Internal CD"
-msgstr "内部 CD 音频"
-
-msgid "Video In"
-msgstr "视频输入"
-
-msgid "AUX 1 In"
-msgstr "AUX 1 输入"
-
-msgid "AUX 2 In"
-msgstr "AUX 2 输入"
-
-msgid "AUX In"
-msgstr "AUX 输入"
-
-msgid "Record Gain"
-msgstr "录音增益"
-
-msgid "Output Gain"
-msgstr "输出增益"
-
-msgid "Microphone Boost"
-msgstr "麦克风增益"
-
-msgid "Loopback"
-msgstr "Loopback"
-
-#, fuzzy
-msgid "Diagnostic"
-msgstr "é‡‡æ ·åˆ†æž"
-
-msgid "Bass Boost"
-msgstr "Bass 增益"
-
-msgid "Playback Ports"
-msgstr "回放端å£"
-
-msgid "Input"
-msgstr "输入"
-
-msgid "Record Source"
-msgstr "录音æ¥æº"
-
-msgid "Monitor Source"
-msgstr "监视器æ¥æº"
-
-msgid "Keyboard Beep"
-msgstr "按键声音"
-
-msgid "Simulate Stereo"
-msgstr "模拟立体声"
-
-msgid "Stereo"
-msgstr "立体声"
-
-msgid "Surround Sound"
-msgstr "立体声环绕"
-
-msgid "Microphone Gain"
-msgstr "麦克风增益"
-
-msgid "Speaker Source"
-msgstr "扬声器音æº"
-
-msgid "Microphone Source"
-msgstr "麦克风音æº"
-
-msgid "Jack"
-msgstr "Jack"
-
-msgid "Center / LFE"
-msgstr "ä¸ç½®/低音炮"
-
-msgid "Stereo Mix"
-msgstr "立体声"
-
-msgid "Mono Mix"
-msgstr "å•å£°é“"
-
-msgid "Input Mix"
-msgstr "混音输入"
-
-msgid "SPDIF In"
-msgstr "SPDIF 输入"
-
msgid "SPDIF Out"
msgstr ""
-msgid "Microphone 1"
-msgstr "麦克风 1"
-
-msgid "Microphone 2"
-msgstr "麦克风 2"
-
-msgid "Digital Out"
-msgstr "æ•°å—输出"
-
-msgid "Digital In"
-msgstr "æ•°å—输入"
-
-msgid "HDMI"
-msgstr "HDMI(高清)"
-
-msgid "Modem"
-msgstr "Modem"
-
-msgid "Handset"
-msgstr "手æŒè®¾å¤‡"
-
-msgid "Other"
-msgstr "其它设备"
-
-msgid "None"
-msgstr "æ— "
-
-msgid "On"
-msgstr "å¼€"
-
-msgid "Off"
-msgstr "å…³"
-
-msgid "Mute"
-msgstr "é™éŸ³"
-
-msgid "Fast"
-msgstr "å¿«"
-
-#. TRANSLATORS: "Very Low" is a quality setting here
-msgid "Very Low"
-msgstr "很慢"
-
-#. TRANSLATORS: "Low" is a quality setting here
-msgid "Low"
-msgstr "æ…¢"
-
-#. TRANSLATORS: "Medium" is a quality setting here
-msgid "Medium"
-msgstr "ä¸ç‰"
-
-#. TRANSLATORS: "High" is a quality setting here
-msgid "High"
-msgstr "高"
-
-#. TRANSLATORS: "Very High" is a quality setting here
-msgid "Very High"
-msgstr "很高"
-
-#. TRANSLATORS: "Production" is a quality setting here
-msgid "Production"
-msgstr "生产商"
-
-msgid "Front Panel Microphone"
-msgstr "麦克风é¢æ¿"
-
-msgid "Front Panel Line In"
-msgstr "线路输入é¢æ¿"
-
-msgid "Front Panel Headphones"
-msgstr "头戴å¼è€³æœºé¢æ¿"
-
-msgid "Front Panel Line Out"
-msgstr "线路输出é¢æ¿"
-
-#, fuzzy
-msgid "Green Connector"
-msgstr "线路输出"
-
-#, fuzzy
-msgid "Pink Connector"
-msgstr "è¯ç’输出"
-
-#, fuzzy
-msgid "Blue Connector"
-msgstr "立体声输入"
-
-#, fuzzy
-msgid "White Connector"
-msgstr "å·¦/å•å£°é“"
-
-#, fuzzy
-msgid "Black Connector"
-msgstr "åŽç½®å£°é“输出"
-
-#, fuzzy
-msgid "Gray Connector"
-msgstr "ä¸ç½®å£°é“输出"
-
-#, fuzzy
-msgid "Orange Connector"
-msgstr "低音炮输出"
-
-#, fuzzy
-msgid "Red Connector"
-msgstr "å³å£°é“"
-
-#, fuzzy
-msgid "Yellow Connector"
-msgstr "Midi 输出/游æˆæ‘‡æ†"
-
-#, fuzzy
-msgid "Green Front Panel Connector"
-msgstr "线路输出é¢æ¿"
-
-#, fuzzy
-msgid "Pink Front Panel Connector"
-msgstr "è¯ç’输出é¢æ¿"
-
-#, fuzzy
-msgid "Blue Front Panel Connector"
-msgstr "立体声输入é¢æ¿"
-
-#, fuzzy
-msgid "White Front Panel Connector"
-msgstr "å·¦/å•å£°é“é¢æ¿"
-
-#, fuzzy
-msgid "Black Front Panel Connector"
-msgstr "åŽç½®å£°é“输出é¢æ¿"
-
-#, fuzzy
-msgid "Gray Front Panel Connector"
-msgstr "ä¸ç½®å£°é“输出é¢æ¿"
-
-#, fuzzy
-msgid "Orange Front Panel Connector"
-msgstr "低音炮输出é¢æ¿"
-
-#, fuzzy
-msgid "Red Front Panel Connector"
-msgstr "å³å£°é“é¢æ¿"
-
-#, fuzzy
-msgid "Yellow Front Panel Connector"
-msgstr "Midi 输出/游æˆæ‘‡æ†é¢æ¿"
-
-msgid "Spread Output"
-msgstr "Spread 输出"
-
-msgid "Downmix"
-msgstr "Downmix"
-
-msgid "Virtual Mixer Input"
-msgstr "模拟混音输入"
-
-#, fuzzy
-msgid "Virtual Mixer Output"
-msgstr "模拟混音输出"
-
-msgid "Virtual Mixer Channels"
-msgstr "模拟混音输入"
-
-#. TRANSLATORS: name + number of a volume mixer control
-#, fuzzy, c-format
-msgid "%s %d Function"
-msgstr "%s 功能"
-
-#. TRANSLATORS: name of a volume mixer control
-#, c-format
-msgid "%s Function"
-msgstr "%s 功能"
-
-msgid ""
-"Could not open audio device for playback. This version of the Open Sound "
-"System is not supported by this element."
-msgstr "æ— æ³•æ‰“å¼€éŸ³é¢‘è®¾å¤‡æ’放音频。æ¤ç»„件ä¸æ”¯æŒå¼€æ”¾å£°éŸ³ç³»ç»Ÿ(OSS)版本。"
-
-msgid "Playback is not supported by this audio device."
-msgstr "æ¤éŸ³é¢‘设备ä¸æ”¯æŒéŸ³é¢‘æ’放。"
-
-msgid "Audio playback error."
-msgstr "音频æ’放错误。"
-
-msgid "Recording is not supported by this audio device."
-msgstr "æ¤éŸ³é¢‘设备ä¸æ”¯æŒå½•éŸ³ã€‚"
-
-msgid "Error recording from audio device."
-msgstr "从音频设备录音时å‘生错误。"
-
-msgid "Gain"
+msgid "AUX 1 Out"
msgstr ""
-msgid "Headphone"
+msgid "AUX 2 Out"
msgstr ""
#, c-format
@@ -700,3 +322,303 @@ msgstr ""
msgid "Cannot operate without a clock"
msgstr ""
+
+#~ msgid "Could not open audio device for mixer control handling."
+#~ msgstr "æ— æ³•æ‰“å¼€éŸ³é¢‘æ–‡ä»¶è¿›è¡Œæ··éŸ³æŽ§åˆ¶æ“作。"
+
+#~ msgid ""
+#~ "Could not open audio device for mixer control handling. This version of "
+#~ "the Open Sound System is not supported by this element."
+#~ msgstr ""
+#~ "æ— æ³•æ‰“å¼€éŸ³é¢‘è®¾å¤‡è¿›è¡ŒéŸ³é‡æŽ§åˆ¶æ“作。æ¤éƒ¨ä»¶ä¸æ”¯æŒå¼€æ”¾å£°éŸ³ç³»ç»Ÿ(OSS)的版本。"
+
+#~ msgid "Master"
+#~ msgstr "主声é“"
+
+#~ msgid "Front"
+#~ msgstr "å‰ç½®å£°é“"
+
+#~ msgid "Rear"
+#~ msgstr "åŽç½®å£°é“"
+
+#~ msgid "Headphones"
+#~ msgstr "头戴å¼è€³æœº"
+
+#~ msgid "Center"
+#~ msgstr "ä¸ç½®"
+
+#~ msgid "LFE"
+#~ msgstr "低音炮"
+
+#~ msgid "Surround"
+#~ msgstr "立体声环绕"
+
+#~ msgid "Side"
+#~ msgstr "å·¦å³å£°é“"
+
+#~ msgid "AUX Out"
+#~ msgstr "AUX 输出"
+
+#~ msgid "3D Depth"
+#~ msgstr "3D Depth"
+
+#~ msgid "3D Center"
+#~ msgstr "3D Center"
+
+#~ msgid "3D Enhance"
+#~ msgstr "3D Enhance"
+
+#~ msgid "Telephone"
+#~ msgstr "è¯ç’"
+
+#~ msgid "Line In"
+#~ msgstr "线路输入"
+
+#~ msgid "Internal CD"
+#~ msgstr "内部 CD 音频"
+
+#~ msgid "Video In"
+#~ msgstr "视频输入"
+
+#~ msgid "AUX 1 In"
+#~ msgstr "AUX 1 输入"
+
+#~ msgid "AUX 2 In"
+#~ msgstr "AUX 2 输入"
+
+#~ msgid "AUX In"
+#~ msgstr "AUX 输入"
+
+#~ msgid "Record Gain"
+#~ msgstr "录音增益"
+
+#~ msgid "Output Gain"
+#~ msgstr "输出增益"
+
+#~ msgid "Microphone Boost"
+#~ msgstr "麦克风增益"
+
+#~ msgid "Loopback"
+#~ msgstr "Loopback"
+
+#, fuzzy
+#~ msgid "Diagnostic"
+#~ msgstr "é‡‡æ ·åˆ†æž"
+
+#~ msgid "Bass Boost"
+#~ msgstr "Bass 增益"
+
+#~ msgid "Playback Ports"
+#~ msgstr "回放端å£"
+
+#~ msgid "Input"
+#~ msgstr "输入"
+
+#~ msgid "Record Source"
+#~ msgstr "录音æ¥æº"
+
+#~ msgid "Monitor Source"
+#~ msgstr "监视器æ¥æº"
+
+#~ msgid "Keyboard Beep"
+#~ msgstr "按键声音"
+
+#~ msgid "Simulate Stereo"
+#~ msgstr "模拟立体声"
+
+#~ msgid "Stereo"
+#~ msgstr "立体声"
+
+#~ msgid "Surround Sound"
+#~ msgstr "立体声环绕"
+
+#~ msgid "Microphone Gain"
+#~ msgstr "麦克风增益"
+
+#~ msgid "Speaker Source"
+#~ msgstr "扬声器音æº"
+
+#~ msgid "Microphone Source"
+#~ msgstr "麦克风音æº"
+
+#~ msgid "Jack"
+#~ msgstr "Jack"
+
+#~ msgid "Center / LFE"
+#~ msgstr "ä¸ç½®/低音炮"
+
+#~ msgid "Stereo Mix"
+#~ msgstr "立体声"
+
+#~ msgid "Mono Mix"
+#~ msgstr "å•å£°é“"
+
+#~ msgid "Input Mix"
+#~ msgstr "混音输入"
+
+#~ msgid "SPDIF In"
+#~ msgstr "SPDIF 输入"
+
+#~ msgid "Microphone 1"
+#~ msgstr "麦克风 1"
+
+#~ msgid "Microphone 2"
+#~ msgstr "麦克风 2"
+
+#~ msgid "Digital Out"
+#~ msgstr "æ•°å—输出"
+
+#~ msgid "Digital In"
+#~ msgstr "æ•°å—输入"
+
+#~ msgid "HDMI"
+#~ msgstr "HDMI(高清)"
+
+#~ msgid "Modem"
+#~ msgstr "Modem"
+
+#~ msgid "Handset"
+#~ msgstr "手æŒè®¾å¤‡"
+
+#~ msgid "Other"
+#~ msgstr "其它设备"
+
+#~ msgid "None"
+#~ msgstr "æ— "
+
+#~ msgid "On"
+#~ msgstr "å¼€"
+
+#~ msgid "Off"
+#~ msgstr "å…³"
+
+#~ msgid "Mute"
+#~ msgstr "é™éŸ³"
+
+#~ msgid "Fast"
+#~ msgstr "å¿«"
+
+#~ msgid "Very Low"
+#~ msgstr "很慢"
+
+#~ msgid "Low"
+#~ msgstr "æ…¢"
+
+#~ msgid "Medium"
+#~ msgstr "ä¸ç‰"
+
+#~ msgid "High"
+#~ msgstr "高"
+
+#~ msgid "Very High"
+#~ msgstr "很高"
+
+#~ msgid "Production"
+#~ msgstr "生产商"
+
+#~ msgid "Front Panel Microphone"
+#~ msgstr "麦克风é¢æ¿"
+
+#~ msgid "Front Panel Line In"
+#~ msgstr "线路输入é¢æ¿"
+
+#~ msgid "Front Panel Headphones"
+#~ msgstr "头戴å¼è€³æœºé¢æ¿"
+
+#~ msgid "Front Panel Line Out"
+#~ msgstr "线路输出é¢æ¿"
+
+#, fuzzy
+#~ msgid "Green Connector"
+#~ msgstr "线路输出"
+
+#, fuzzy
+#~ msgid "Pink Connector"
+#~ msgstr "è¯ç’输出"
+
+#, fuzzy
+#~ msgid "Blue Connector"
+#~ msgstr "立体声输入"
+
+#, fuzzy
+#~ msgid "White Connector"
+#~ msgstr "å·¦/å•å£°é“"
+
+#, fuzzy
+#~ msgid "Black Connector"
+#~ msgstr "åŽç½®å£°é“输出"
+
+#, fuzzy
+#~ msgid "Gray Connector"
+#~ msgstr "ä¸ç½®å£°é“输出"
+
+#, fuzzy
+#~ msgid "Orange Connector"
+#~ msgstr "低音炮输出"
+
+#, fuzzy
+#~ msgid "Red Connector"
+#~ msgstr "å³å£°é“"
+
+#, fuzzy
+#~ msgid "Yellow Connector"
+#~ msgstr "Midi 输出/游æˆæ‘‡æ†"
+
+#, fuzzy
+#~ msgid "Green Front Panel Connector"
+#~ msgstr "线路输出é¢æ¿"
+
+#, fuzzy
+#~ msgid "Pink Front Panel Connector"
+#~ msgstr "è¯ç’输出é¢æ¿"
+
+#, fuzzy
+#~ msgid "Blue Front Panel Connector"
+#~ msgstr "立体声输入é¢æ¿"
+
+#, fuzzy
+#~ msgid "White Front Panel Connector"
+#~ msgstr "å·¦/å•å£°é“é¢æ¿"
+
+#, fuzzy
+#~ msgid "Black Front Panel Connector"
+#~ msgstr "åŽç½®å£°é“输出é¢æ¿"
+
+#, fuzzy
+#~ msgid "Gray Front Panel Connector"
+#~ msgstr "ä¸ç½®å£°é“输出é¢æ¿"
+
+#, fuzzy
+#~ msgid "Orange Front Panel Connector"
+#~ msgstr "低音炮输出é¢æ¿"
+
+#, fuzzy
+#~ msgid "Red Front Panel Connector"
+#~ msgstr "å³å£°é“é¢æ¿"
+
+#, fuzzy
+#~ msgid "Yellow Front Panel Connector"
+#~ msgstr "Midi 输出/游æˆæ‘‡æ†é¢æ¿"
+
+#~ msgid "Spread Output"
+#~ msgstr "Spread 输出"
+
+#~ msgid "Downmix"
+#~ msgstr "Downmix"
+
+#~ msgid "Virtual Mixer Input"
+#~ msgstr "模拟混音输入"
+
+#, fuzzy
+#~ msgid "Virtual Mixer Output"
+#~ msgstr "模拟混音输出"
+
+#~ msgid "Virtual Mixer Channels"
+#~ msgstr "模拟混音输入"
+
+#, fuzzy
+#~ msgid "%s %d Function"
+#~ msgstr "%s 功能"
+
+#~ msgid "%s Function"
+#~ msgstr "%s 功能"
diff --git a/po/zh_TW.gmo b/po/zh_TW.gmo
index ccfc2d10110cf239f99be275c608ca85aaeb67e5..8318b4bd8790e197b0a8b88431ab0d093b278d0c 100644
Binary files a/po/zh_TW.gmo and b/po/zh_TW.gmo differ
diff --git a/po/zh_TW.po b/po/zh_TW.po
index aa5a94ff5d944185cbf1b774b42bdafe50ac1f22..9ad9c184ea5c0927226a1cd15dd0d9b1bae0dc32 100644
--- a/po/zh_TW.po
+++ b/po/zh_TW.po
@@ -6,7 +6,7 @@ msgid ""
msgstr ""
"Project-Id-Version: gst-plugins-good-0.10.2 0.10.2\n"
"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/\n"
-"POT-Creation-Date: 2012-04-12 10:26+0200\n"
+"POT-Creation-Date: 2012-05-13 16:29+0200\n"
"PO-Revision-Date: 2006-08-29 01:08+0800\n"
"Last-Translator: Abel Cheung <abelcheung@gmail.com>\n"
"Language-Team: Chinese (traditional) <zh-l10n@linux.org.tw>\n"
@@ -91,81 +91,6 @@ msgstr ""
msgid "Internal data flow error."
msgstr "內部資料串æµç™¼ç”ŸéŒ¯èª¤ã€‚"
-msgid "Volume"
-msgstr ""
-
-msgid "Bass"
-msgstr ""
-
-msgid "Treble"
-msgstr ""
-
-msgid "Synth"
-msgstr ""
-
-msgid "PCM"
-msgstr ""
-
-msgid "Speaker"
-msgstr ""
-
-msgid "Line-in"
-msgstr ""
-
-msgid "Microphone"
-msgstr ""
-
-msgid "CD"
-msgstr ""
-
-msgid "Mixer"
-msgstr ""
-
-msgid "PCM-2"
-msgstr ""
-
-msgid "Record"
-msgstr ""
-
-msgid "In-gain"
-msgstr ""
-
-msgid "Out-gain"
-msgstr ""
-
-msgid "Line-1"
-msgstr ""
-
-msgid "Line-2"
-msgstr ""
-
-msgid "Line-3"
-msgstr ""
-
-msgid "Digital-1"
-msgstr ""
-
-msgid "Digital-2"
-msgstr ""
-
-msgid "Digital-3"
-msgstr ""
-
-msgid "Phone-in"
-msgstr ""
-
-msgid "Phone-out"
-msgstr ""
-
-msgid "Video"
-msgstr ""
-
-msgid "Radio"
-msgstr ""
-
-msgid "Monitor"
-msgstr ""
-
msgid ""
"Could not open audio device for playback. Device is being used by another "
"application."
@@ -187,351 +112,48 @@ msgstr ""
msgid "Could not open audio device for recording."
msgstr ""
-msgid "Could not open audio device for mixer control handling."
-msgstr "æ— æ³•æ‰“å¼€éŸ³é¢‘æ–‡ä»¶è¿›è¡Œæ··éŸ³æŽ§åˆ¶æ“作。"
-
msgid ""
-"Could not open audio device for mixer control handling. This version of the "
-"Open Sound System is not supported by this element."
-msgstr ""
-"æ— æ³•æ‰“å¼€éŸ³é¢‘è®¾å¤‡è¿›è¡ŒéŸ³é‡æŽ§åˆ¶æ“作。æ¤éƒ¨ä»¶ä¸æ”¯æŒå¼€æ”¾å£°éŸ³ç³»ç»Ÿ(OSS)的版本。"
-
-msgid "Master"
-msgstr "主声é“"
-
-msgid "Front"
-msgstr "å‰ç½®å£°é“"
-
-msgid "Rear"
-msgstr "åŽç½®å£°é“"
-
-msgid "Headphones"
-msgstr "头戴å¼è€³æœº"
+"Could not open audio device for playback. This version of the Open Sound "
+"System is not supported by this element."
+msgstr "æ— æ³•æ‰“å¼€éŸ³é¢‘è®¾å¤‡æ’放音频。æ¤ç»„件ä¸æ”¯æŒå¼€æ”¾å£°éŸ³ç³»ç»Ÿ(OSS)版本。"
-msgid "Center"
-msgstr "ä¸ç½®"
+msgid "Playback is not supported by this audio device."
+msgstr "æ¤éŸ³é¢‘设备ä¸æ”¯æŒéŸ³é¢‘æ’放。"
-msgid "LFE"
-msgstr "低音炮"
+msgid "Audio playback error."
+msgstr "音频æ’放错误。"
-msgid "Surround"
-msgstr "立体声环绕"
+msgid "Recording is not supported by this audio device."
+msgstr "æ¤éŸ³é¢‘设备ä¸æ”¯æŒå½•éŸ³ã€‚"
-msgid "Side"
-msgstr "å·¦å³å£°é“"
+msgid "Error recording from audio device."
+msgstr "从音频设备录音时å‘生错误。"
-msgid "Built-in Speaker"
+msgid "Volume"
msgstr ""
-msgid "AUX 1 Out"
+msgid "Gain"
msgstr ""
-msgid "AUX 2 Out"
+msgid "Monitor"
msgstr ""
-msgid "AUX Out"
-msgstr "AUX 输出"
-
-msgid "3D Depth"
-msgstr "3D Depth"
-
-msgid "3D Center"
-msgstr "3D Center"
-
-msgid "3D Enhance"
-msgstr "3D Enhance"
+msgid "Built-in Speaker"
+msgstr ""
-msgid "Telephone"
-msgstr "è¯ç’"
+msgid "Headphone"
+msgstr ""
msgid "Line Out"
msgstr ""
-msgid "Line In"
-msgstr "线路输入"
-
-msgid "Internal CD"
-msgstr "内部 CD 音频"
-
-msgid "Video In"
-msgstr "视频输入"
-
-msgid "AUX 1 In"
-msgstr "AUX 1 输入"
-
-msgid "AUX 2 In"
-msgstr "AUX 2 输入"
-
-msgid "AUX In"
-msgstr "AUX 输入"
-
-msgid "Record Gain"
-msgstr "录音增益"
-
-msgid "Output Gain"
-msgstr "输出增益"
-
-msgid "Microphone Boost"
-msgstr "麦克风增益"
-
-msgid "Loopback"
-msgstr "Loopback"
-
-#, fuzzy
-msgid "Diagnostic"
-msgstr "é‡‡æ ·åˆ†æž"
-
-msgid "Bass Boost"
-msgstr "Bass 增益"
-
-msgid "Playback Ports"
-msgstr "回放端å£"
-
-msgid "Input"
-msgstr "输入"
-
-msgid "Record Source"
-msgstr "录音æ¥æº"
-
-msgid "Monitor Source"
-msgstr "监视器æ¥æº"
-
-msgid "Keyboard Beep"
-msgstr "按键声音"
-
-msgid "Simulate Stereo"
-msgstr "模拟立体声"
-
-msgid "Stereo"
-msgstr "立体声"
-
-msgid "Surround Sound"
-msgstr "立体声环绕"
-
-msgid "Microphone Gain"
-msgstr "麦克风增益"
-
-msgid "Speaker Source"
-msgstr "扬声器音æº"
-
-msgid "Microphone Source"
-msgstr "麦克风音æº"
-
-msgid "Jack"
-msgstr "Jack"
-
-msgid "Center / LFE"
-msgstr "ä¸ç½®/低音炮"
-
-msgid "Stereo Mix"
-msgstr "立体声"
-
-msgid "Mono Mix"
-msgstr "å•å£°é“"
-
-msgid "Input Mix"
-msgstr "混音输入"
-
-msgid "SPDIF In"
-msgstr "SPDIF 输入"
-
msgid "SPDIF Out"
msgstr ""
-msgid "Microphone 1"
-msgstr "麦克风 1"
-
-msgid "Microphone 2"
-msgstr "麦克风 2"
-
-msgid "Digital Out"
-msgstr "æ•°å—输出"
-
-msgid "Digital In"
-msgstr "æ•°å—输入"
-
-msgid "HDMI"
-msgstr "HDMI(高清)"
-
-msgid "Modem"
-msgstr "Modem"
-
-msgid "Handset"
-msgstr "手æŒè®¾å¤‡"
-
-msgid "Other"
-msgstr "其它设备"
-
-msgid "None"
-msgstr "æ— "
-
-msgid "On"
-msgstr "å¼€"
-
-msgid "Off"
-msgstr "å…³"
-
-msgid "Mute"
-msgstr "é™éŸ³"
-
-msgid "Fast"
-msgstr "å¿«"
-
-#. TRANSLATORS: "Very Low" is a quality setting here
-msgid "Very Low"
-msgstr "很慢"
-
-#. TRANSLATORS: "Low" is a quality setting here
-msgid "Low"
-msgstr "æ…¢"
-
-#. TRANSLATORS: "Medium" is a quality setting here
-msgid "Medium"
-msgstr "ä¸ç‰"
-
-#. TRANSLATORS: "High" is a quality setting here
-msgid "High"
-msgstr "高"
-
-#. TRANSLATORS: "Very High" is a quality setting here
-msgid "Very High"
-msgstr "很高"
-
-#. TRANSLATORS: "Production" is a quality setting here
-msgid "Production"
-msgstr "生产商"
-
-msgid "Front Panel Microphone"
-msgstr "麦克风é¢æ¿"
-
-msgid "Front Panel Line In"
-msgstr "线路输入é¢æ¿"
-
-msgid "Front Panel Headphones"
-msgstr "头戴å¼è€³æœºé¢æ¿"
-
-msgid "Front Panel Line Out"
-msgstr "线路输出é¢æ¿"
-
-#, fuzzy
-msgid "Green Connector"
-msgstr "线路输出"
-
-#, fuzzy
-msgid "Pink Connector"
-msgstr "è¯ç’输出"
-
-#, fuzzy
-msgid "Blue Connector"
-msgstr "立体声输入"
-
-#, fuzzy
-msgid "White Connector"
-msgstr "å·¦/å•å£°é“"
-
-#, fuzzy
-msgid "Black Connector"
-msgstr "åŽç½®å£°é“输出"
-
-#, fuzzy
-msgid "Gray Connector"
-msgstr "ä¸ç½®å£°é“输出"
-
-#, fuzzy
-msgid "Orange Connector"
-msgstr "低音炮输出"
-
-#, fuzzy
-msgid "Red Connector"
-msgstr "å³å£°é“"
-
-#, fuzzy
-msgid "Yellow Connector"
-msgstr "Midi 输出/游æˆæ‘‡æ†"
-
-#, fuzzy
-msgid "Green Front Panel Connector"
-msgstr "线路输出é¢æ¿"
-
-#, fuzzy
-msgid "Pink Front Panel Connector"
-msgstr "è¯ç’输出é¢æ¿"
-
-#, fuzzy
-msgid "Blue Front Panel Connector"
-msgstr "立体声输入é¢æ¿"
-
-#, fuzzy
-msgid "White Front Panel Connector"
-msgstr "å·¦/å•å£°é“é¢æ¿"
-
-#, fuzzy
-msgid "Black Front Panel Connector"
-msgstr "åŽç½®å£°é“输出é¢æ¿"
-
-#, fuzzy
-msgid "Gray Front Panel Connector"
-msgstr "ä¸ç½®å£°é“输出é¢æ¿"
-
-#, fuzzy
-msgid "Orange Front Panel Connector"
-msgstr "低音炮输出é¢æ¿"
-
-#, fuzzy
-msgid "Red Front Panel Connector"
-msgstr "å³å£°é“é¢æ¿"
-
-#, fuzzy
-msgid "Yellow Front Panel Connector"
-msgstr "Midi 输出/游æˆæ‘‡æ†é¢æ¿"
-
-msgid "Spread Output"
-msgstr "Spread 输出"
-
-msgid "Downmix"
-msgstr "Downmix"
-
-msgid "Virtual Mixer Input"
-msgstr "模拟混音输入"
-
-#, fuzzy
-msgid "Virtual Mixer Output"
-msgstr "模拟混音输出"
-
-msgid "Virtual Mixer Channels"
-msgstr "模拟混音输入"
-
-#. TRANSLATORS: name + number of a volume mixer control
-#, fuzzy, c-format
-msgid "%s %d Function"
-msgstr "%s 功能"
-
-#. TRANSLATORS: name of a volume mixer control
-#, c-format
-msgid "%s Function"
-msgstr "%s 功能"
-
-msgid ""
-"Could not open audio device for playback. This version of the Open Sound "
-"System is not supported by this element."
-msgstr "æ— æ³•æ‰“å¼€éŸ³é¢‘è®¾å¤‡æ’放音频。æ¤ç»„件ä¸æ”¯æŒå¼€æ”¾å£°éŸ³ç³»ç»Ÿ(OSS)版本。"
-
-msgid "Playback is not supported by this audio device."
-msgstr "æ¤éŸ³é¢‘设备ä¸æ”¯æŒéŸ³é¢‘æ’放。"
-
-msgid "Audio playback error."
-msgstr "音频æ’放错误。"
-
-msgid "Recording is not supported by this audio device."
-msgstr "æ¤éŸ³é¢‘设备ä¸æ”¯æŒå½•éŸ³ã€‚"
-
-msgid "Error recording from audio device."
-msgstr "从音频设备录音时å‘生错误。"
-
-msgid "Gain"
+msgid "AUX 1 Out"
msgstr ""
-msgid "Headphone"
+msgid "AUX 2 Out"
msgstr ""
#, c-format
@@ -700,3 +322,303 @@ msgstr ""
msgid "Cannot operate without a clock"
msgstr ""
+
+#~ msgid "Could not open audio device for mixer control handling."
+#~ msgstr "æ— æ³•æ‰“å¼€éŸ³é¢‘æ–‡ä»¶è¿›è¡Œæ··éŸ³æŽ§åˆ¶æ“作。"
+
+#~ msgid ""
+#~ "Could not open audio device for mixer control handling. This version of "
+#~ "the Open Sound System is not supported by this element."
+#~ msgstr ""
+#~ "æ— æ³•æ‰“å¼€éŸ³é¢‘è®¾å¤‡è¿›è¡ŒéŸ³é‡æŽ§åˆ¶æ“作。æ¤éƒ¨ä»¶ä¸æ”¯æŒå¼€æ”¾å£°éŸ³ç³»ç»Ÿ(OSS)的版本。"
+
+#~ msgid "Master"
+#~ msgstr "主声é“"
+
+#~ msgid "Front"
+#~ msgstr "å‰ç½®å£°é“"
+
+#~ msgid "Rear"
+#~ msgstr "åŽç½®å£°é“"
+
+#~ msgid "Headphones"
+#~ msgstr "头戴å¼è€³æœº"
+
+#~ msgid "Center"
+#~ msgstr "ä¸ç½®"
+
+#~ msgid "LFE"
+#~ msgstr "低音炮"
+
+#~ msgid "Surround"
+#~ msgstr "立体声环绕"
+
+#~ msgid "Side"
+#~ msgstr "å·¦å³å£°é“"
+
+#~ msgid "AUX Out"
+#~ msgstr "AUX 输出"
+
+#~ msgid "3D Depth"
+#~ msgstr "3D Depth"
+
+#~ msgid "3D Center"
+#~ msgstr "3D Center"
+
+#~ msgid "3D Enhance"
+#~ msgstr "3D Enhance"
+
+#~ msgid "Telephone"
+#~ msgstr "è¯ç’"
+
+#~ msgid "Line In"
+#~ msgstr "线路输入"
+
+#~ msgid "Internal CD"
+#~ msgstr "内部 CD 音频"
+
+#~ msgid "Video In"
+#~ msgstr "视频输入"
+
+#~ msgid "AUX 1 In"
+#~ msgstr "AUX 1 输入"
+
+#~ msgid "AUX 2 In"
+#~ msgstr "AUX 2 输入"
+
+#~ msgid "AUX In"
+#~ msgstr "AUX 输入"
+
+#~ msgid "Record Gain"
+#~ msgstr "录音增益"
+
+#~ msgid "Output Gain"
+#~ msgstr "输出增益"
+
+#~ msgid "Microphone Boost"
+#~ msgstr "麦克风增益"
+
+#~ msgid "Loopback"
+#~ msgstr "Loopback"
+
+#, fuzzy
+#~ msgid "Diagnostic"
+#~ msgstr "é‡‡æ ·åˆ†æž"
+
+#~ msgid "Bass Boost"
+#~ msgstr "Bass 增益"
+
+#~ msgid "Playback Ports"
+#~ msgstr "回放端å£"
+
+#~ msgid "Input"
+#~ msgstr "输入"
+
+#~ msgid "Record Source"
+#~ msgstr "录音æ¥æº"
+
+#~ msgid "Monitor Source"
+#~ msgstr "监视器æ¥æº"
+
+#~ msgid "Keyboard Beep"
+#~ msgstr "按键声音"
+
+#~ msgid "Simulate Stereo"
+#~ msgstr "模拟立体声"
+
+#~ msgid "Stereo"
+#~ msgstr "立体声"
+
+#~ msgid "Surround Sound"
+#~ msgstr "立体声环绕"
+
+#~ msgid "Microphone Gain"
+#~ msgstr "麦克风增益"
+
+#~ msgid "Speaker Source"
+#~ msgstr "扬声器音æº"
+
+#~ msgid "Microphone Source"
+#~ msgstr "麦克风音æº"
+
+#~ msgid "Jack"
+#~ msgstr "Jack"
+
+#~ msgid "Center / LFE"
+#~ msgstr "ä¸ç½®/低音炮"
+
+#~ msgid "Stereo Mix"
+#~ msgstr "立体声"
+
+#~ msgid "Mono Mix"
+#~ msgstr "å•å£°é“"
+
+#~ msgid "Input Mix"
+#~ msgstr "混音输入"
+
+#~ msgid "SPDIF In"
+#~ msgstr "SPDIF 输入"
+
+#~ msgid "Microphone 1"
+#~ msgstr "麦克风 1"
+
+#~ msgid "Microphone 2"
+#~ msgstr "麦克风 2"
+
+#~ msgid "Digital Out"
+#~ msgstr "æ•°å—输出"
+
+#~ msgid "Digital In"
+#~ msgstr "æ•°å—输入"
+
+#~ msgid "HDMI"
+#~ msgstr "HDMI(高清)"
+
+#~ msgid "Modem"
+#~ msgstr "Modem"
+
+#~ msgid "Handset"
+#~ msgstr "手æŒè®¾å¤‡"
+
+#~ msgid "Other"
+#~ msgstr "其它设备"
+
+#~ msgid "None"
+#~ msgstr "æ— "
+
+#~ msgid "On"
+#~ msgstr "å¼€"
+
+#~ msgid "Off"
+#~ msgstr "å…³"
+
+#~ msgid "Mute"
+#~ msgstr "é™éŸ³"
+
+#~ msgid "Fast"
+#~ msgstr "å¿«"
+
+#~ msgid "Very Low"
+#~ msgstr "很慢"
+
+#~ msgid "Low"
+#~ msgstr "æ…¢"
+
+#~ msgid "Medium"
+#~ msgstr "ä¸ç‰"
+
+#~ msgid "High"
+#~ msgstr "高"
+
+#~ msgid "Very High"
+#~ msgstr "很高"
+
+#~ msgid "Production"
+#~ msgstr "生产商"
+
+#~ msgid "Front Panel Microphone"
+#~ msgstr "麦克风é¢æ¿"
+
+#~ msgid "Front Panel Line In"
+#~ msgstr "线路输入é¢æ¿"
+
+#~ msgid "Front Panel Headphones"
+#~ msgstr "头戴å¼è€³æœºé¢æ¿"
+
+#~ msgid "Front Panel Line Out"
+#~ msgstr "线路输出é¢æ¿"
+
+#, fuzzy
+#~ msgid "Green Connector"
+#~ msgstr "线路输出"
+
+#, fuzzy
+#~ msgid "Pink Connector"
+#~ msgstr "è¯ç’输出"
+
+#, fuzzy
+#~ msgid "Blue Connector"
+#~ msgstr "立体声输入"
+
+#, fuzzy
+#~ msgid "White Connector"
+#~ msgstr "å·¦/å•å£°é“"
+
+#, fuzzy
+#~ msgid "Black Connector"
+#~ msgstr "åŽç½®å£°é“输出"
+
+#, fuzzy
+#~ msgid "Gray Connector"
+#~ msgstr "ä¸ç½®å£°é“输出"
+
+#, fuzzy
+#~ msgid "Orange Connector"
+#~ msgstr "低音炮输出"
+
+#, fuzzy
+#~ msgid "Red Connector"
+#~ msgstr "å³å£°é“"
+
+#, fuzzy
+#~ msgid "Yellow Connector"
+#~ msgstr "Midi 输出/游æˆæ‘‡æ†"
+
+#, fuzzy
+#~ msgid "Green Front Panel Connector"
+#~ msgstr "线路输出é¢æ¿"
+
+#, fuzzy
+#~ msgid "Pink Front Panel Connector"
+#~ msgstr "è¯ç’输出é¢æ¿"
+
+#, fuzzy
+#~ msgid "Blue Front Panel Connector"
+#~ msgstr "立体声输入é¢æ¿"
+
+#, fuzzy
+#~ msgid "White Front Panel Connector"
+#~ msgstr "å·¦/å•å£°é“é¢æ¿"
+
+#, fuzzy
+#~ msgid "Black Front Panel Connector"
+#~ msgstr "åŽç½®å£°é“输出é¢æ¿"
+
+#, fuzzy
+#~ msgid "Gray Front Panel Connector"
+#~ msgstr "ä¸ç½®å£°é“输出é¢æ¿"
+
+#, fuzzy
+#~ msgid "Orange Front Panel Connector"
+#~ msgstr "低音炮输出é¢æ¿"
+
+#, fuzzy
+#~ msgid "Red Front Panel Connector"
+#~ msgstr "å³å£°é“é¢æ¿"
+
+#, fuzzy
+#~ msgid "Yellow Front Panel Connector"
+#~ msgstr "Midi 输出/游æˆæ‘‡æ†é¢æ¿"
+
+#~ msgid "Spread Output"
+#~ msgstr "Spread 输出"
+
+#~ msgid "Downmix"
+#~ msgstr "Downmix"
+
+#~ msgid "Virtual Mixer Input"
+#~ msgstr "模拟混音输入"
+
+#, fuzzy
+#~ msgid "Virtual Mixer Output"
+#~ msgstr "模拟混音输出"
+
+#~ msgid "Virtual Mixer Channels"
+#~ msgstr "模拟混音输入"
+
+#, fuzzy
+#~ msgid "%s %d Function"
+#~ msgstr "%s 功能"
+
+#~ msgid "%s Function"
+#~ msgstr "%s 功能"
diff --git a/sys/Makefile.in b/sys/Makefile.in
index 1ee650de733469b21f5186eba02bd5c3aae7b5b9..0d93b4ff197b51d350f018f49b4da345ee1bb143 100644
--- a/sys/Makefile.in
+++ b/sys/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.11.4 from Makefile.am.
+# Makefile.in generated by automake 1.11.5 from Makefile.am.
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -69,6 +69,7 @@ am__aclocal_m4_deps = $(top_srcdir)/common/m4/as-ac-expand.m4 \
$(top_srcdir)/common/m4/as-auto-alt.m4 \
$(top_srcdir)/common/m4/as-compiler-flag.m4 \
$(top_srcdir)/common/m4/as-gcc-inline-assembly.m4 \
+ $(top_srcdir)/common/m4/as-libtool.m4 \
$(top_srcdir)/common/m4/as-objc.m4 \
$(top_srcdir)/common/m4/as-python.m4 \
$(top_srcdir)/common/m4/as-scrub-include.m4 \
@@ -239,6 +240,7 @@ GMSGFMT_015 = @GMSGFMT_015@
GREP = @GREP@
GSTPB_PLUGINS_DIR = @GSTPB_PLUGINS_DIR@
GSTPB_PREFIX = @GSTPB_PREFIX@
+GST_AGE = @GST_AGE@
GST_ALL_LDFLAGS = @GST_ALL_LDFLAGS@
GST_API_VERSION = @GST_API_VERSION@
GST_BASE_CFLAGS = @GST_BASE_CFLAGS@
@@ -248,9 +250,11 @@ GST_CHECK_CFLAGS = @GST_CHECK_CFLAGS@
GST_CHECK_LIBS = @GST_CHECK_LIBS@
GST_CONTROLLER_CFLAGS = @GST_CONTROLLER_CFLAGS@
GST_CONTROLLER_LIBS = @GST_CONTROLLER_LIBS@
+GST_CURRENT = @GST_CURRENT@
GST_CXXFLAGS = @GST_CXXFLAGS@
GST_LEVEL_DEFAULT = @GST_LEVEL_DEFAULT@
GST_LIBS = @GST_LIBS@
+GST_LIBVERSION = @GST_LIBVERSION@
GST_LICENSE = @GST_LICENSE@
GST_LT_LDFLAGS = @GST_LT_LDFLAGS@
GST_NET_CFLAGS = @GST_NET_CFLAGS@
@@ -268,6 +272,7 @@ GST_PLUGINS_NONPORTED = @GST_PLUGINS_NONPORTED@
GST_PLUGINS_SELECTED = @GST_PLUGINS_SELECTED@
GST_PLUGIN_LDFLAGS = @GST_PLUGIN_LDFLAGS@
GST_PREFIX = @GST_PREFIX@
+GST_REVISION = @GST_REVISION@
GST_TOOLS_DIR = @GST_TOOLS_DIR@
GTKDOC_CHECK = @GTKDOC_CHECK@
GTK_CFLAGS = @GTK_CFLAGS@
diff --git a/sys/directsound/Makefile.am b/sys/directsound/Makefile.am
index ff02203aeed52be82c07d7b824bb50e69f10d632..e4211dcbe7fe29296f350ad3bc0a97da9cab0bf5 100644
--- a/sys/directsound/Makefile.am
+++ b/sys/directsound/Makefile.am
@@ -8,7 +8,7 @@ libgstdirectsoundsink_la_CFLAGS = \
$(DIRECTSOUND_CFLAGS)
libgstdirectsoundsink_la_LIBADD = \
$(GST_PLUGINS_BASE_LIBS) \
- -lgstaudio-$(GST_API_VERSION) -lgstinterfaces-$(GST_API_VERSION) \
+ -lgstaudio-$(GST_API_VERSION) \
$(GST_BASE_LIBS) \
$(GST_LIBS) \
$(DIRECTSOUND_LIBS)
diff --git a/sys/directsound/Makefile.in b/sys/directsound/Makefile.in
index 1c487bd5c7d81244954d3ed2be8e728a99860ef3..2548d8d8e7e48ebfd25ae8df3352a39b96480819 100644
--- a/sys/directsound/Makefile.in
+++ b/sys/directsound/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.11.4 from Makefile.am.
+# Makefile.in generated by automake 1.11.5 from Makefile.am.
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -60,6 +60,7 @@ am__aclocal_m4_deps = $(top_srcdir)/common/m4/as-ac-expand.m4 \
$(top_srcdir)/common/m4/as-auto-alt.m4 \
$(top_srcdir)/common/m4/as-compiler-flag.m4 \
$(top_srcdir)/common/m4/as-gcc-inline-assembly.m4 \
+ $(top_srcdir)/common/m4/as-libtool.m4 \
$(top_srcdir)/common/m4/as-objc.m4 \
$(top_srcdir)/common/m4/as-python.m4 \
$(top_srcdir)/common/m4/as-scrub-include.m4 \
@@ -259,6 +260,7 @@ GMSGFMT_015 = @GMSGFMT_015@
GREP = @GREP@
GSTPB_PLUGINS_DIR = @GSTPB_PLUGINS_DIR@
GSTPB_PREFIX = @GSTPB_PREFIX@
+GST_AGE = @GST_AGE@
GST_ALL_LDFLAGS = @GST_ALL_LDFLAGS@
GST_API_VERSION = @GST_API_VERSION@
GST_BASE_CFLAGS = @GST_BASE_CFLAGS@
@@ -268,9 +270,11 @@ GST_CHECK_CFLAGS = @GST_CHECK_CFLAGS@
GST_CHECK_LIBS = @GST_CHECK_LIBS@
GST_CONTROLLER_CFLAGS = @GST_CONTROLLER_CFLAGS@
GST_CONTROLLER_LIBS = @GST_CONTROLLER_LIBS@
+GST_CURRENT = @GST_CURRENT@
GST_CXXFLAGS = @GST_CXXFLAGS@
GST_LEVEL_DEFAULT = @GST_LEVEL_DEFAULT@
GST_LIBS = @GST_LIBS@
+GST_LIBVERSION = @GST_LIBVERSION@
GST_LICENSE = @GST_LICENSE@
GST_LT_LDFLAGS = @GST_LT_LDFLAGS@
GST_NET_CFLAGS = @GST_NET_CFLAGS@
@@ -288,6 +292,7 @@ GST_PLUGINS_NONPORTED = @GST_PLUGINS_NONPORTED@
GST_PLUGINS_SELECTED = @GST_PLUGINS_SELECTED@
GST_PLUGIN_LDFLAGS = @GST_PLUGIN_LDFLAGS@
GST_PREFIX = @GST_PREFIX@
+GST_REVISION = @GST_REVISION@
GST_TOOLS_DIR = @GST_TOOLS_DIR@
GTKDOC_CHECK = @GTKDOC_CHECK@
GTK_CFLAGS = @GTK_CFLAGS@
@@ -497,7 +502,7 @@ libgstdirectsoundsink_la_CFLAGS = \
libgstdirectsoundsink_la_LIBADD = \
$(GST_PLUGINS_BASE_LIBS) \
- -lgstaudio-$(GST_API_VERSION) -lgstinterfaces-$(GST_API_VERSION) \
+ -lgstaudio-$(GST_API_VERSION) \
$(GST_BASE_LIBS) \
$(GST_LIBS) \
$(DIRECTSOUND_LIBS)
@@ -549,7 +554,7 @@ install-pluginLTLIBRARIES: $(plugin_LTLIBRARIES)
done; \
test -z "$$list2" || { \
echo " $(MKDIR_P) '$(DESTDIR)$(plugindir)'"; \
- $(MKDIR_P) '$(DESTDIR)$(plugindir)' || exit 1; \
+ $(MKDIR_P) "$(DESTDIR)$(plugindir)" || exit 1; \
echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 '$(DESTDIR)$(plugindir)'"; \
$(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 "$(DESTDIR)$(plugindir)"; \
}
diff --git a/sys/oss/Makefile.am b/sys/oss/Makefile.am
index 30e615e1a5c9366b8761a6f234a2e5d734e36bed..057d300eb82473bcab352c284d8b781aae777ee0 100644
--- a/sys/oss/Makefile.am
+++ b/sys/oss/Makefile.am
@@ -2,16 +2,12 @@ plugin_LTLIBRARIES = libgstossaudio.la
libgstossaudio_la_SOURCES = gstossaudio.c \
gstosshelper.c \
- gstossmixer.c \
- gstossmixerelement.c \
- gstossmixertrack.c \
gstosssink.c \
gstosssrc.c
libgstossaudio_la_CFLAGS = $(GST_PLUGINS_BASE_CFLAGS) $(GST_BASE_CFLAGS) $(GST_CFLAGS)
libgstossaudio_la_LIBADD = \
$(GST_PLUGINS_BASE_LIBS) \
- -lgstinterfaces-$(GST_API_VERSION) \
-lgstaudio-$(GST_API_VERSION) \
$(GST_BASE_LIBS) \
$(GST_LIBS)
@@ -22,7 +18,4 @@ noinst_HEADERS = common.h \
gstosssink.h \
gstosssrc.h \
gstosshelper.h \
- gstossdmabuffer.h \
- gstossmixer.h \
- gstossmixerelement.h \
- gstossmixertrack.h
+ gstossdmabuffer.h
diff --git a/sys/oss/Makefile.in b/sys/oss/Makefile.in
index 74dd55e9b83ef9af780bd5b076c3263571f184a7..4688685b5df985c848ecd6d0337ba478aa9a26e2 100644
--- a/sys/oss/Makefile.in
+++ b/sys/oss/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.11.4 from Makefile.am.
+# Makefile.in generated by automake 1.11.5 from Makefile.am.
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -60,6 +60,7 @@ am__aclocal_m4_deps = $(top_srcdir)/common/m4/as-ac-expand.m4 \
$(top_srcdir)/common/m4/as-auto-alt.m4 \
$(top_srcdir)/common/m4/as-compiler-flag.m4 \
$(top_srcdir)/common/m4/as-gcc-inline-assembly.m4 \
+ $(top_srcdir)/common/m4/as-libtool.m4 \
$(top_srcdir)/common/m4/as-objc.m4 \
$(top_srcdir)/common/m4/as-python.m4 \
$(top_srcdir)/common/m4/as-scrub-include.m4 \
@@ -131,9 +132,6 @@ libgstossaudio_la_DEPENDENCIES = $(am__DEPENDENCIES_1) \
$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1)
am_libgstossaudio_la_OBJECTS = libgstossaudio_la-gstossaudio.lo \
libgstossaudio_la-gstosshelper.lo \
- libgstossaudio_la-gstossmixer.lo \
- libgstossaudio_la-gstossmixerelement.lo \
- libgstossaudio_la-gstossmixertrack.lo \
libgstossaudio_la-gstosssink.lo libgstossaudio_la-gstosssrc.lo
libgstossaudio_la_OBJECTS = $(am_libgstossaudio_la_OBJECTS)
AM_V_lt = $(am__v_lt_@AM_V@)
@@ -260,6 +258,7 @@ GMSGFMT_015 = @GMSGFMT_015@
GREP = @GREP@
GSTPB_PLUGINS_DIR = @GSTPB_PLUGINS_DIR@
GSTPB_PREFIX = @GSTPB_PREFIX@
+GST_AGE = @GST_AGE@
GST_ALL_LDFLAGS = @GST_ALL_LDFLAGS@
GST_API_VERSION = @GST_API_VERSION@
GST_BASE_CFLAGS = @GST_BASE_CFLAGS@
@@ -269,9 +268,11 @@ GST_CHECK_CFLAGS = @GST_CHECK_CFLAGS@
GST_CHECK_LIBS = @GST_CHECK_LIBS@
GST_CONTROLLER_CFLAGS = @GST_CONTROLLER_CFLAGS@
GST_CONTROLLER_LIBS = @GST_CONTROLLER_LIBS@
+GST_CURRENT = @GST_CURRENT@
GST_CXXFLAGS = @GST_CXXFLAGS@
GST_LEVEL_DEFAULT = @GST_LEVEL_DEFAULT@
GST_LIBS = @GST_LIBS@
+GST_LIBVERSION = @GST_LIBVERSION@
GST_LICENSE = @GST_LICENSE@
GST_LT_LDFLAGS = @GST_LT_LDFLAGS@
GST_NET_CFLAGS = @GST_NET_CFLAGS@
@@ -289,6 +290,7 @@ GST_PLUGINS_NONPORTED = @GST_PLUGINS_NONPORTED@
GST_PLUGINS_SELECTED = @GST_PLUGINS_SELECTED@
GST_PLUGIN_LDFLAGS = @GST_PLUGIN_LDFLAGS@
GST_PREFIX = @GST_PREFIX@
+GST_REVISION = @GST_REVISION@
GST_TOOLS_DIR = @GST_TOOLS_DIR@
GTKDOC_CHECK = @GTKDOC_CHECK@
GTK_CFLAGS = @GTK_CFLAGS@
@@ -491,16 +493,12 @@ top_srcdir = @top_srcdir@
plugin_LTLIBRARIES = libgstossaudio.la
libgstossaudio_la_SOURCES = gstossaudio.c \
gstosshelper.c \
- gstossmixer.c \
- gstossmixerelement.c \
- gstossmixertrack.c \
gstosssink.c \
gstosssrc.c
libgstossaudio_la_CFLAGS = $(GST_PLUGINS_BASE_CFLAGS) $(GST_BASE_CFLAGS) $(GST_CFLAGS)
libgstossaudio_la_LIBADD = \
$(GST_PLUGINS_BASE_LIBS) \
- -lgstinterfaces-$(GST_API_VERSION) \
-lgstaudio-$(GST_API_VERSION) \
$(GST_BASE_LIBS) \
$(GST_LIBS)
@@ -511,10 +509,7 @@ noinst_HEADERS = common.h \
gstosssink.h \
gstosssrc.h \
gstosshelper.h \
- gstossdmabuffer.h \
- gstossmixer.h \
- gstossmixerelement.h \
- gstossmixertrack.h
+ gstossdmabuffer.h
all: all-am
@@ -560,7 +555,7 @@ install-pluginLTLIBRARIES: $(plugin_LTLIBRARIES)
done; \
test -z "$$list2" || { \
echo " $(MKDIR_P) '$(DESTDIR)$(plugindir)'"; \
- $(MKDIR_P) '$(DESTDIR)$(plugindir)' || exit 1; \
+ $(MKDIR_P) "$(DESTDIR)$(plugindir)" || exit 1; \
echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 '$(DESTDIR)$(plugindir)'"; \
$(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 "$(DESTDIR)$(plugindir)"; \
}
@@ -593,9 +588,6 @@ distclean-compile:
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libgstossaudio_la-gstossaudio.Plo@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libgstossaudio_la-gstosshelper.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libgstossaudio_la-gstossmixer.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libgstossaudio_la-gstossmixerelement.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libgstossaudio_la-gstossmixertrack.Plo@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libgstossaudio_la-gstosssink.Plo@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libgstossaudio_la-gstosssrc.Plo@am__quote@
@@ -634,27 +626,6 @@ libgstossaudio_la-gstosshelper.lo: gstosshelper.c
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(libgstossaudio_la_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgstossaudio_la_CFLAGS) $(CFLAGS) -c -o libgstossaudio_la-gstosshelper.lo `test -f 'gstosshelper.c' || echo '$(srcdir)/'`gstosshelper.c
-libgstossaudio_la-gstossmixer.lo: gstossmixer.c
-@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(libgstossaudio_la_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgstossaudio_la_CFLAGS) $(CFLAGS) -MT libgstossaudio_la-gstossmixer.lo -MD -MP -MF $(DEPDIR)/libgstossaudio_la-gstossmixer.Tpo -c -o libgstossaudio_la-gstossmixer.lo `test -f 'gstossmixer.c' || echo '$(srcdir)/'`gstossmixer.c
-@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libgstossaudio_la-gstossmixer.Tpo $(DEPDIR)/libgstossaudio_la-gstossmixer.Plo
-@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='gstossmixer.c' object='libgstossaudio_la-gstossmixer.lo' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(libgstossaudio_la_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgstossaudio_la_CFLAGS) $(CFLAGS) -c -o libgstossaudio_la-gstossmixer.lo `test -f 'gstossmixer.c' || echo '$(srcdir)/'`gstossmixer.c
-
-libgstossaudio_la-gstossmixerelement.lo: gstossmixerelement.c
-@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(libgstossaudio_la_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgstossaudio_la_CFLAGS) $(CFLAGS) -MT libgstossaudio_la-gstossmixerelement.lo -MD -MP -MF $(DEPDIR)/libgstossaudio_la-gstossmixerelement.Tpo -c -o libgstossaudio_la-gstossmixerelement.lo `test -f 'gstossmixerelement.c' || echo '$(srcdir)/'`gstossmixerelement.c
-@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libgstossaudio_la-gstossmixerelement.Tpo $(DEPDIR)/libgstossaudio_la-gstossmixerelement.Plo
-@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='gstossmixerelement.c' object='libgstossaudio_la-gstossmixerelement.lo' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(libgstossaudio_la_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgstossaudio_la_CFLAGS) $(CFLAGS) -c -o libgstossaudio_la-gstossmixerelement.lo `test -f 'gstossmixerelement.c' || echo '$(srcdir)/'`gstossmixerelement.c
-
-libgstossaudio_la-gstossmixertrack.lo: gstossmixertrack.c
-@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(libgstossaudio_la_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgstossaudio_la_CFLAGS) $(CFLAGS) -MT libgstossaudio_la-gstossmixertrack.lo -MD -MP -MF $(DEPDIR)/libgstossaudio_la-gstossmixertrack.Tpo -c -o libgstossaudio_la-gstossmixertrack.lo `test -f 'gstossmixertrack.c' || echo '$(srcdir)/'`gstossmixertrack.c
-@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libgstossaudio_la-gstossmixertrack.Tpo $(DEPDIR)/libgstossaudio_la-gstossmixertrack.Plo
-@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='gstossmixertrack.c' object='libgstossaudio_la-gstossmixertrack.lo' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(libgstossaudio_la_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgstossaudio_la_CFLAGS) $(CFLAGS) -c -o libgstossaudio_la-gstossmixertrack.lo `test -f 'gstossmixertrack.c' || echo '$(srcdir)/'`gstossmixertrack.c
-
libgstossaudio_la-gstosssink.lo: gstosssink.c
@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(libgstossaudio_la_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgstossaudio_la_CFLAGS) $(CFLAGS) -MT libgstossaudio_la-gstosssink.lo -MD -MP -MF $(DEPDIR)/libgstossaudio_la-gstosssink.Tpo -c -o libgstossaudio_la-gstosssink.lo `test -f 'gstosssink.c' || echo '$(srcdir)/'`gstosssink.c
@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libgstossaudio_la-gstosssink.Tpo $(DEPDIR)/libgstossaudio_la-gstosssink.Plo
diff --git a/sys/oss/gstossaudio.c b/sys/oss/gstossaudio.c
index e43686d0f61eed982700d10b2ca1943e2da3118a..57fcf0aeac2daa535c90bb0b5d3611754b16ad06 100644
--- a/sys/oss/gstossaudio.c
+++ b/sys/oss/gstossaudio.c
@@ -23,7 +23,6 @@
#include "gst/gst-i18n-plugin.h"
-#include "gstossmixerelement.h"
#include "gstosssink.h"
#include "gstosssrc.h"
@@ -33,9 +32,7 @@ GST_DEBUG_CATEGORY (oss_debug);
static gboolean
plugin_init (GstPlugin * plugin)
{
- if (!gst_element_register (plugin, "ossmixer", GST_RANK_NONE,
- GST_TYPE_OSS_MIXER_ELEMENT) ||
- !gst_element_register (plugin, "osssrc", GST_RANK_SECONDARY,
+ if (!gst_element_register (plugin, "osssrc", GST_RANK_SECONDARY,
GST_TYPE_OSS_SRC) ||
!gst_element_register (plugin, "osssink", GST_RANK_SECONDARY,
GST_TYPE_OSSSINK)) {
diff --git a/sys/oss/gstosshelper.c b/sys/oss/gstosshelper.c
index 639ee9d8f4da7982aca1cfd3383db582b0e453b6..ad62990b18e6ca6d1081ae1bfa9748580cbd0572 100644
--- a/sys/oss/gstosshelper.c
+++ b/sys/oss/gstosshelper.c
@@ -47,10 +47,7 @@
# endif /* HAVE_OSS_INCLUDE_IN_ROOT */
#endif /* HAVE_OSS_INCLUDE_IN_SYS */
-#include <gst/interfaces/propertyprobe.h>
-
#include "gstosshelper.h"
-#include "gstossmixer.h"
GST_DEBUG_CATEGORY_EXTERN (oss_debug);
#define GST_CAT_DEFAULT oss_debug
@@ -176,19 +173,19 @@ gst_oss_helper_get_format_structure (unsigned int format_bit)
format = "U8";
break;
case AFMT_S16_LE:
- format = "S16_LE";
+ format = "S16LE";
break;
case AFMT_S16_BE:
- format = "S16_BE";
+ format = "S16BE";
break;
case AFMT_S8:
format = "S8";
break;
case AFMT_U16_LE:
- format = "U16_LE";
+ format = "U16LE";
break;
case AFMT_U16_BE:
- format = "U16_BE";
+ format = "U16BE";
break;
default:
g_assert_not_reached ();
@@ -196,7 +193,8 @@ gst_oss_helper_get_format_structure (unsigned int format_bit)
}
structure = gst_structure_new ("audio/x-raw",
- "format", G_TYPE_STRING, format, NULL);
+ "format", G_TYPE_STRING, format,
+ "layout", G_TYPE_STRING, "interleaved", NULL);
return structure;
}
@@ -386,3 +384,41 @@ gst_oss_helper_rate_int_compare (gconstpointer a, gconstpointer b)
return 1;
return 0;
}
+
+gchar *
+gst_oss_helper_get_card_name (const gchar * mixer_name)
+{
+#ifdef SOUND_MIXER_INFO
+ struct mixer_info minfo;
+#endif
+ gint fd;
+ gchar *name = NULL;
+
+ GST_INFO ("Opening mixer for device %s", mixer_name);
+ fd = open (mixer_name, O_RDWR);
+ if (fd == -1)
+ goto open_failed;
+
+ /* get name, not fatal */
+#ifdef SOUND_MIXER_INFO
+ if (ioctl (fd, SOUND_MIXER_INFO, &minfo) == 0) {
+ name = g_strdup (minfo.name);
+ GST_INFO ("Card name = %s", GST_STR_NULL (name));
+ } else
+#endif
+ {
+ name = g_strdup ("Unknown");
+ GST_INFO ("Unknown card name");
+ }
+
+ return name;
+
+ /* ERRORS */
+open_failed:
+ {
+ /* this is valid. OSS devices don't need to expose a mixer */
+ GST_DEBUG ("Failed to open mixer device %s, mixing disabled: %s",
+ mixer_name, strerror (errno));
+ return NULL;
+ }
+}
diff --git a/sys/oss/gstosshelper.h b/sys/oss/gstosshelper.h
index 1593fe392381fcb5882c198358c9ef1ceb217f8f..aa30b0c245c1e43966df2d2a7d1f767e959e0502 100644
--- a/sys/oss/gstosshelper.h
+++ b/sys/oss/gstosshelper.h
@@ -36,6 +36,9 @@ G_BEGIN_DECLS
GstCaps* gst_oss_helper_probe_caps (gint fd);
+gchar *gst_oss_helper_get_card_name (const gchar * mixer_name);
+
+
G_END_DECLS
diff --git a/sys/oss/gstossmixer.c b/sys/oss/gstossmixer.c
deleted file mode 100644
index e5630318f81629973b43984efe04af27e5a4ce69..0000000000000000000000000000000000000000
--- a/sys/oss/gstossmixer.c
+++ /dev/null
@@ -1,378 +0,0 @@
-/* GStreamer OSS Mixer implementation
- * Copyright (C) 2003 Ronald Bultje <rbultje@ronald.bitfreak.net>
- *
- * gstossmixer.c: mixer interface implementation for OSS
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Library General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Library General Public License for more details.
- *
- * You should have received a copy of the GNU Library General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- */
-
-#ifdef HAVE_CONFIG_H
-#include "config.h"
-#endif
-
-#include <stdio.h>
-#include <stdlib.h>
-#include <fcntl.h>
-#include <unistd.h>
-#include <string.h>
-#include <errno.h>
-#include <sys/ioctl.h>
-
-#ifdef HAVE_OSS_INCLUDE_IN_SYS
-# include <sys/soundcard.h>
-#else
-# ifdef HAVE_OSS_INCLUDE_IN_ROOT
-# include <soundcard.h>
-# else
-# ifdef HAVE_OSS_INCLUDE_IN_MACHINE
-# include <machine/soundcard.h>
-# else
-# error "What to include?"
-# endif /* HAVE_OSS_INCLUDE_IN_MACHINE */
-# endif /* HAVE_OSS_INCLUDE_IN_ROOT */
-#endif /* HAVE_OSS_INCLUDE_IN_SYS */
-
-#include <gst/gst-i18n-plugin.h>
-
-#include "gstossmixer.h"
-#include "gstossmixertrack.h"
-
-GST_DEBUG_CATEGORY_EXTERN (oss_debug);
-#define GST_CAT_DEFAULT oss_debug
-
-#define MASK_BIT_IS_SET(mask, bit) \
- (mask & (1 << bit))
-
-static gboolean
-gst_ossmixer_open (GstOssMixer * mixer)
-{
-#ifdef SOUND_MIXER_INFO
- struct mixer_info minfo;
-#endif
-
- g_return_val_if_fail (mixer->mixer_fd == -1, FALSE);
-
- mixer->mixer_fd = open (mixer->device, O_RDWR);
- if (mixer->mixer_fd == -1)
- goto open_failed;
-
- /* get masks */
- if (ioctl (mixer->mixer_fd, SOUND_MIXER_READ_RECMASK, &mixer->recmask) < 0
- || ioctl (mixer->mixer_fd, SOUND_MIXER_READ_RECSRC, &mixer->recdevs) < 0
- || ioctl (mixer->mixer_fd, SOUND_MIXER_READ_STEREODEVS,
- &mixer->stereomask) < 0
- || ioctl (mixer->mixer_fd, SOUND_MIXER_READ_DEVMASK, &mixer->devmask) < 0
- || ioctl (mixer->mixer_fd, SOUND_MIXER_READ_CAPS, &mixer->mixcaps) < 0)
- goto masks_failed;
-
- /* get name, not fatal */
- g_free (mixer->cardname);
-#ifdef SOUND_MIXER_INFO
- if (ioctl (mixer->mixer_fd, SOUND_MIXER_INFO, &minfo) == 0) {
- mixer->cardname = g_strdup (minfo.name);
- GST_INFO ("Card name = %s", GST_STR_NULL (mixer->cardname));
- } else
-#endif
- {
- mixer->cardname = g_strdup ("Unknown");
- GST_INFO ("Unknown card name");
- }
- GST_INFO ("Opened mixer for device %s", mixer->device);
-
- return TRUE;
-
- /* ERRORS */
-open_failed:
- {
- /* this is valid. OSS devices don't need to expose a mixer */
- GST_DEBUG ("Failed to open mixer device %s, mixing disabled: %s",
- mixer->device, strerror (errno));
- return FALSE;
- }
-masks_failed:
- {
- GST_DEBUG ("Failed to get device masks");
- close (mixer->mixer_fd);
- mixer->mixer_fd = -1;
- return FALSE;
- }
-}
-
-static void
-gst_ossmixer_ensure_track_list (GstOssMixer * mixer)
-{
- gint i, master = -1;
-
- g_return_if_fail (mixer->mixer_fd != -1);
-
- if (mixer->tracklist)
- return;
-
- /* find master volume */
- if (mixer->devmask & SOUND_MASK_VOLUME)
- master = SOUND_MIXER_VOLUME;
- else if (mixer->devmask & SOUND_MASK_PCM)
- master = SOUND_MIXER_PCM;
- else if (mixer->devmask & SOUND_MASK_SPEAKER)
- master = SOUND_MIXER_SPEAKER; /* doubtful... */
- /* else: no master, so we won't set any */
-
- /* build track list */
- for (i = 0; i < SOUND_MIXER_NRDEVICES; i++) {
- if (mixer->devmask & (1 << i)) {
- GstMixerTrack *track;
- gboolean input = FALSE, stereo = FALSE, record = FALSE;
-
- /* track exists, make up capabilities */
- if (MASK_BIT_IS_SET (mixer->stereomask, i))
- stereo = TRUE;
- if (MASK_BIT_IS_SET (mixer->recmask, i))
- input = TRUE;
- if (MASK_BIT_IS_SET (mixer->recdevs, i))
- record = TRUE;
-
- /* do we want this in our list? */
- if (!((mixer->dir & GST_OSS_MIXER_CAPTURE && input == TRUE) ||
- (mixer->dir & GST_OSS_MIXER_PLAYBACK && i != SOUND_MIXER_PCM)))
- /* the PLAYBACK case seems hacky, but that's how 0.8 had it */
- continue;
-
- /* add track to list */
- track = gst_ossmixer_track_new (mixer->mixer_fd, i, stereo ? 2 : 1,
- (record ? GST_MIXER_TRACK_RECORD : 0) |
- (input ? GST_MIXER_TRACK_INPUT :
- GST_MIXER_TRACK_OUTPUT) |
- ((master != i) ? 0 : GST_MIXER_TRACK_MASTER));
- mixer->tracklist = g_list_append (mixer->tracklist, track);
- }
- }
-}
-
-GstOssMixer *
-gst_ossmixer_new (const char *device, GstOssMixerDirection dir)
-{
- GstOssMixer *ret = NULL;
-
- g_return_val_if_fail (device != NULL, NULL);
-
- ret = g_new0 (GstOssMixer, 1);
-
- ret->device = g_strdup (device);
- ret->dir = dir;
- ret->mixer_fd = -1;
-
- if (!gst_ossmixer_open (ret))
- goto error;
-
- return ret;
-
- /* ERRORS */
-error:
- {
- gst_ossmixer_free (ret);
- return NULL;
- }
-}
-
-void
-gst_ossmixer_free (GstOssMixer * mixer)
-{
- g_return_if_fail (mixer != NULL);
-
- if (mixer->device) {
- g_free (mixer->device);
- mixer->device = NULL;
- }
-
- if (mixer->cardname) {
- g_free (mixer->cardname);
- mixer->cardname = NULL;
- }
-
- if (mixer->tracklist) {
- g_list_foreach (mixer->tracklist, (GFunc) g_object_unref, NULL);
- g_list_free (mixer->tracklist);
- mixer->tracklist = NULL;
- }
-
- if (mixer->mixer_fd != -1) {
- close (mixer->mixer_fd);
- mixer->mixer_fd = -1;
- }
-
- g_free (mixer);
-}
-
-/* unused with G_DISABLE_* */
-static G_GNUC_UNUSED gboolean
-gst_ossmixer_contains_track (GstOssMixer * mixer, GstOssMixerTrack * osstrack)
-{
- const GList *item;
-
- for (item = mixer->tracklist; item != NULL; item = item->next)
- if (item->data == osstrack)
- return TRUE;
-
- return FALSE;
-}
-
-const GList *
-gst_ossmixer_list_tracks (GstOssMixer * mixer)
-{
- gst_ossmixer_ensure_track_list (mixer);
-
- return (const GList *) mixer->tracklist;
-}
-
-void
-gst_ossmixer_get_volume (GstOssMixer * mixer,
- GstMixerTrack * track, gint * volumes)
-{
- gint volume;
- GstOssMixerTrack *osstrack = GST_OSSMIXER_TRACK (track);
-
- g_return_if_fail (mixer->mixer_fd != -1);
- g_return_if_fail (gst_ossmixer_contains_track (mixer, osstrack));
-
- if (track->flags & GST_MIXER_TRACK_MUTE) {
- volumes[0] = osstrack->lvol;
- if (track->num_channels == 2) {
- volumes[1] = osstrack->rvol;
- }
- } else {
- /* get */
- if (ioctl (mixer->mixer_fd, MIXER_READ (osstrack->track_num), &volume) < 0) {
- g_warning ("Error getting recording device (%d) volume: %s",
- osstrack->track_num, strerror (errno));
- volume = 0;
- }
-
- osstrack->lvol = volumes[0] = (volume & 0xff);
- if (track->num_channels == 2) {
- osstrack->rvol = volumes[1] = ((volume >> 8) & 0xff);
- }
- }
-}
-
-void
-gst_ossmixer_set_volume (GstOssMixer * mixer,
- GstMixerTrack * track, gint * volumes)
-{
- gint volume;
- GstOssMixerTrack *osstrack = GST_OSSMIXER_TRACK (track);
-
- g_return_if_fail (mixer->mixer_fd != -1);
- g_return_if_fail (gst_ossmixer_contains_track (mixer, osstrack));
-
- /* prepare the value for ioctl() */
- if (!(track->flags & GST_MIXER_TRACK_MUTE)) {
- volume = (volumes[0] & 0xff);
- if (track->num_channels == 2) {
- volume |= ((volumes[1] & 0xff) << 8);
- }
-
- /* set */
- if (ioctl (mixer->mixer_fd, MIXER_WRITE (osstrack->track_num), &volume) < 0) {
- g_warning ("Error setting recording device (%d) volume (0x%x): %s",
- osstrack->track_num, volume, strerror (errno));
- return;
- }
- }
-
- osstrack->lvol = volumes[0];
- if (track->num_channels == 2) {
- osstrack->rvol = volumes[1];
- }
-}
-
-void
-gst_ossmixer_set_mute (GstOssMixer * mixer, GstMixerTrack * track,
- gboolean mute)
-{
- int volume;
- GstOssMixerTrack *osstrack = GST_OSSMIXER_TRACK (track);
-
- g_return_if_fail (mixer->mixer_fd != -1);
- g_return_if_fail (gst_ossmixer_contains_track (mixer, osstrack));
-
- if (mute) {
- volume = 0;
- } else {
- volume = (osstrack->lvol & 0xff);
- if (MASK_BIT_IS_SET (mixer->stereomask, osstrack->track_num)) {
- volume |= ((osstrack->rvol & 0xff) << 8);
- }
- }
-
- if (ioctl (mixer->mixer_fd, MIXER_WRITE (osstrack->track_num), &volume) < 0) {
- g_warning ("Error setting mixer recording device volume (0x%x): %s",
- volume, strerror (errno));
- return;
- }
-
- if (mute) {
- track->flags |= GST_MIXER_TRACK_MUTE;
- } else {
- track->flags &= ~GST_MIXER_TRACK_MUTE;
- }
-}
-
-void
-gst_ossmixer_set_record (GstOssMixer * mixer,
- GstMixerTrack * track, gboolean record)
-{
- GstOssMixerTrack *osstrack = GST_OSSMIXER_TRACK (track);
-
- g_return_if_fail (mixer->mixer_fd != -1);
- g_return_if_fail (gst_ossmixer_contains_track (mixer, osstrack));
-
- /* if there's nothing to do... */
- if ((record && GST_MIXER_TRACK_HAS_FLAG (track, GST_MIXER_TRACK_RECORD)) ||
- (!record && !GST_MIXER_TRACK_HAS_FLAG (track, GST_MIXER_TRACK_RECORD)))
- return;
-
- /* if we're exclusive, then we need to unset the current one(s) */
- if (mixer->mixcaps & SOUND_CAP_EXCL_INPUT) {
- GList *track;
-
- for (track = mixer->tracklist; track != NULL; track = track->next) {
- GstMixerTrack *turn = (GstMixerTrack *) track->data;
-
- turn->flags &= ~GST_MIXER_TRACK_RECORD;
- }
- mixer->recdevs = 0;
- }
-
- /* set new record bit, if needed */
- if (record) {
- mixer->recdevs |= (1 << osstrack->track_num);
- } else {
- mixer->recdevs &= ~(1 << osstrack->track_num);
- }
-
- /* set it to the device */
- if (ioctl (mixer->mixer_fd, SOUND_MIXER_WRITE_RECSRC, &mixer->recdevs) < 0) {
- g_warning ("Error setting mixer recording devices (0x%x): %s",
- mixer->recdevs, strerror (errno));
- return;
- }
-
- if (record) {
- track->flags |= GST_MIXER_TRACK_RECORD;
- } else {
- track->flags &= ~GST_MIXER_TRACK_RECORD;
- }
-}
diff --git a/sys/oss/gstossmixer.h b/sys/oss/gstossmixer.h
deleted file mode 100644
index 4ae888aba77d1dece3cb1552093692609df6a731..0000000000000000000000000000000000000000
--- a/sys/oss/gstossmixer.h
+++ /dev/null
@@ -1,171 +0,0 @@
-/* GStreamer OSS Mixer implementation
- * Copyright (C) 2003 Ronald Bultje <rbultje@ronald.bitfreak.net>
- *
- * gstossmixer.h: mixer interface implementation for OSS
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Library General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Library General Public License for more details.
- *
- * You should have received a copy of the GNU Library General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- */
-
-
-#ifndef __GST_OSS_MIXER_H__
-#define __GST_OSS_MIXER_H__
-
-
-#include <gst/gst.h>
-#include <gst/interfaces/mixer.h>
-
-#include "gstosshelper.h"
-
-
-G_BEGIN_DECLS
-
-
-#define GST_OSS_MIXER(obj) ((GstOssMixer*)(obj))
-
-
-typedef enum {
- GST_OSS_MIXER_CAPTURE = 1<<0,
- GST_OSS_MIXER_PLAYBACK = 1<<1,
- GST_OSS_MIXER_ALL = GST_OSS_MIXER_CAPTURE | GST_OSS_MIXER_PLAYBACK
-} GstOssMixerDirection;
-
-
-typedef struct _GstOssMixer GstOssMixer;
-
-
-struct _GstOssMixer {
- GList * tracklist; /* list of available tracks */
-
- gint mixer_fd;
-
- gchar * device;
- gchar * cardname;
-
- gint recmask;
- gint recdevs;
- gint stereomask;
- gint devmask;
- gint mixcaps;
-
- GstOssMixerDirection dir;
-};
-
-
-GstOssMixer* gst_ossmixer_new (const gchar *device,
- GstOssMixerDirection dir);
-void gst_ossmixer_free (GstOssMixer *mixer);
-
-const GList* gst_ossmixer_list_tracks (GstOssMixer * mixer);
-void gst_ossmixer_set_volume (GstOssMixer * mixer,
- GstMixerTrack * track,
- gint * volumes);
-void gst_ossmixer_get_volume (GstOssMixer * mixer,
- GstMixerTrack * track,
- gint * volumes);
-void gst_ossmixer_set_record (GstOssMixer * mixer,
- GstMixerTrack * track,
- gboolean record);
-void gst_ossmixer_set_mute (GstOssMixer * mixer,
- GstMixerTrack * track,
- gboolean mute);
-
-
-#define GST_IMPLEMENT_OSS_MIXER_METHODS(Type, interface_as_function) \
-static gboolean \
-interface_as_function ## _supported (Type *this, GType iface_type) \
-{ \
- g_assert (iface_type == GST_TYPE_MIXER); \
- \
- return (this->mixer != NULL); \
-} \
- \
-static const GList* \
-interface_as_function ## _list_tracks (GstMixer * mixer) \
-{ \
- Type *this = (Type*) mixer; \
- \
- g_return_val_if_fail (this != NULL, NULL); \
- g_return_val_if_fail (this->mixer != NULL, NULL); \
- \
- return gst_ossmixer_list_tracks (this->mixer); \
-} \
- \
-static void \
-interface_as_function ## _set_volume (GstMixer * mixer, GstMixerTrack * track, \
- gint * volumes) \
-{ \
- Type *this = (Type*) mixer; \
- \
- g_return_if_fail (this != NULL); \
- g_return_if_fail (this->mixer != NULL); \
- \
- gst_ossmixer_set_volume (this->mixer, track, volumes); \
-} \
- \
-static void \
-interface_as_function ## _get_volume (GstMixer * mixer, GstMixerTrack * track, \
- gint * volumes) \
-{ \
- Type *this = (Type*) mixer; \
- \
- g_return_if_fail (this != NULL); \
- g_return_if_fail (this->mixer != NULL); \
- \
- gst_ossmixer_get_volume (this->mixer, track, volumes); \
-} \
- \
-static void \
-interface_as_function ## _set_record (GstMixer * mixer, GstMixerTrack * track, \
- gboolean record) \
-{ \
- Type *this = (Type*) mixer; \
- \
- g_return_if_fail (this != NULL); \
- g_return_if_fail (this->mixer != NULL); \
- \
- gst_ossmixer_set_record (this->mixer, track, record); \
-} \
- \
-static void \
-interface_as_function ## _set_mute (GstMixer * mixer, GstMixerTrack * track, \
- gboolean mute) \
-{ \
- Type *this = (Type*) mixer; \
- \
- g_return_if_fail (this != NULL); \
- g_return_if_fail (this->mixer != NULL); \
- \
- gst_ossmixer_set_mute (this->mixer, track, mute); \
-} \
- \
-static void \
-interface_as_function ## _interface_init (GstMixerInterface * iface) \
-{ \
- GST_MIXER_TYPE (iface) = GST_MIXER_HARDWARE; \
- \
- /* set up the interface hooks */ \
- iface->list_tracks = interface_as_function ## _list_tracks; \
- iface->set_volume = interface_as_function ## _set_volume; \
- iface->get_volume = interface_as_function ## _get_volume; \
- iface->set_mute = interface_as_function ## _set_mute; \
- iface->set_record = interface_as_function ## _set_record; \
-}
-
-
-G_END_DECLS
-
-
-#endif /* __GST_OSS_MIXER_H__ */
diff --git a/sys/oss/gstossmixerelement.c b/sys/oss/gstossmixerelement.c
deleted file mode 100644
index 5ff3e28096cacd09f2e5aae19567cf7cbb08f0d5..0000000000000000000000000000000000000000
--- a/sys/oss/gstossmixerelement.c
+++ /dev/null
@@ -1,218 +0,0 @@
-/* OSS mixer interface element.
- * Copyright (C) 2005 Andrew Vander Wingo <wingo@pobox.com>
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Library General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Library General Public License for more details.
- *
- * You should have received a copy of the GNU Library General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- */
-
-/**
- * SECTION:element-ossmixer
- *
- * This element lets you adjust sound input and output levels with the
- * Open Sound System (OSS). It supports the #GstMixer interface, which can be
- * used to obtain a list of available mixer tracks. Set the mixer element to
- * READY state before using the #GstMixer interface on it.
- *
- * <refsect2>
- * <title>Example pipelines</title>
- * <para>
- * ossmixer can't be used in a sensible way in gst-launch.
- * </para>
- * </refsect2>
- */
-
-#ifdef HAVE_CONFIG_H
-#include "config.h"
-#endif
-
-#include "gstossmixerelement.h"
-
-GST_DEBUG_CATEGORY_EXTERN (oss_debug);
-#define GST_CAT_DEFAULT oss_debug
-
-#define DEFAULT_DEVICE "/dev/mixer"
-#define DEFAULT_DEVICE_NAME NULL
-
-enum
-{
- PROP_0,
- PROP_DEVICE,
- PROP_DEVICE_NAME
-};
-
-GST_BOILERPLATE_WITH_INTERFACE (GstOssMixerElement, gst_oss_mixer_element,
- GstElement, GST_TYPE_ELEMENT, GstMixer, GST_TYPE_MIXER,
- gst_oss_mixer_element);
-
-GST_IMPLEMENT_OSS_MIXER_METHODS (GstOssMixerElement, gst_oss_mixer_element);
-
-static GstStateChangeReturn gst_oss_mixer_element_change_state (GstElement *
- element, GstStateChange transition);
-
-static void gst_oss_mixer_element_set_property (GObject * object,
- guint prop_id, const GValue * value, GParamSpec * pspec);
-static void gst_oss_mixer_element_get_property (GObject * object,
- guint prop_id, GValue * value, GParamSpec * pspec);
-static void gst_oss_mixer_element_finalize (GObject * object);
-
-static void
-gst_oss_mixer_element_base_init (gpointer klass)
-{
- gst_element_class_set_static_metadata (GST_ELEMENT_CLASS (klass), "OSS Mixer",
- "Generic/Audio",
- "Control sound input and output levels with OSS",
- "Andrew Vander Wingo <wingo@pobox.com>");
-}
-
-static void
-gst_oss_mixer_element_class_init (GstOssMixerElementClass * klass)
-{
- GstElementClass *element_class;
- GObjectClass *gobject_class;
-
- element_class = (GstElementClass *) klass;
- gobject_class = (GObjectClass *) klass;
-
- gobject_class->finalize = gst_oss_mixer_element_finalize;
- gobject_class->set_property = gst_oss_mixer_element_set_property;
- gobject_class->get_property = gst_oss_mixer_element_get_property;
-
- /**
- * GstOssMixerElement:device
- *
- * OSS mixer device (usually /dev/mixer)
- *
- * Since: 0.10.5
- **/
- g_object_class_install_property (gobject_class, PROP_DEVICE,
- g_param_spec_string ("device", "Device",
- "OSS mixer device (usually /dev/mixer)", DEFAULT_DEVICE,
- G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
-
- g_object_class_install_property (gobject_class, PROP_DEVICE_NAME,
- g_param_spec_string ("device-name", "Device name",
- "Human-readable name of the sound device", DEFAULT_DEVICE_NAME,
- G_PARAM_READABLE | G_PARAM_STATIC_STRINGS));
-
- element_class->change_state =
- GST_DEBUG_FUNCPTR (gst_oss_mixer_element_change_state);
-}
-
-static void
-gst_oss_mixer_element_finalize (GObject * obj)
-{
- GstOssMixerElement *this = GST_OSS_MIXER_ELEMENT (obj);
-
- g_free (this->device);
-
- G_OBJECT_CLASS (parent_class)->finalize (obj);
-}
-
-static void
-gst_oss_mixer_element_init (GstOssMixerElement * this,
- GstOssMixerElementClass * g_class)
-{
- this->mixer = NULL;
- this->device = g_strdup (DEFAULT_DEVICE);
-}
-
-static void
-gst_oss_mixer_element_set_property (GObject * object, guint prop_id,
- const GValue * value, GParamSpec * pspec)
-{
- GstOssMixerElement *this = GST_OSS_MIXER_ELEMENT (object);
-
- switch (prop_id) {
- case PROP_DEVICE:
- g_free (this->device);
- this->device = g_value_dup_string (value);
- /* make sure we never set NULL */
- if (this->device == NULL) {
- this->device = g_strdup (DEFAULT_DEVICE);
- }
- break;
- default:
- G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
- break;
- }
-}
-
-static void
-gst_oss_mixer_element_get_property (GObject * object, guint prop_id,
- GValue * value, GParamSpec * pspec)
-{
- GstOssMixerElement *this = GST_OSS_MIXER_ELEMENT (object);
-
- switch (prop_id) {
- case PROP_DEVICE:
- g_value_set_string (value, this->device);
- break;
- case PROP_DEVICE_NAME:
- if (this->mixer) {
- g_value_set_string (value, this->mixer->cardname);
- } else {
- g_value_set_string (value, NULL);
- }
- break;
- default:
- G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
- break;
- }
-}
-
-static GstStateChangeReturn
-gst_oss_mixer_element_change_state (GstElement * element,
- GstStateChange transition)
-{
- GstStateChangeReturn ret = GST_STATE_CHANGE_SUCCESS;
- GstOssMixerElement *this = GST_OSS_MIXER_ELEMENT (element);
-
- switch (transition) {
- case GST_STATE_CHANGE_NULL_TO_READY:
- if (!this->mixer) {
- this->mixer = gst_ossmixer_new (this->device, GST_OSS_MIXER_ALL);
- if (!this->mixer)
- goto open_failed;
- }
- break;
- break;
- default:
- break;
- }
-
- ret = GST_ELEMENT_CLASS (parent_class)->change_state (element, transition);
- if (ret == GST_STATE_CHANGE_FAILURE)
- return ret;
-
- switch (transition) {
- case GST_STATE_CHANGE_READY_TO_NULL:
- if (this->mixer) {
- gst_ossmixer_free (this->mixer);
- this->mixer = NULL;
- }
- break;
- default:
- break;
- }
- return ret;
-
- /* ERRORS */
-open_failed:
- {
- GST_ELEMENT_ERROR (element, RESOURCE, OPEN_READ_WRITE, (NULL),
- ("Failed to open oss mixer device '%s'", this->device));
- return GST_STATE_CHANGE_FAILURE;
- }
-}
diff --git a/sys/oss/gstossmixerelement.h b/sys/oss/gstossmixerelement.h
deleted file mode 100644
index 2d47e0ec30b43c11ed8352fdac1a41726a82fff9..0000000000000000000000000000000000000000
--- a/sys/oss/gstossmixerelement.h
+++ /dev/null
@@ -1,59 +0,0 @@
-/* OSS mixer interface element.
- * Copyright (C) 2005 Andrew Vander Wingo <wingo@pobox.com>
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Library General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Library General Public License for more details.
- *
- * You should have received a copy of the GNU Library General Public
- * License along with this library; if not, write to the Free
- * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
- */
-
-
-#ifndef __GST_OSS_MIXER_ELEMENT_H__
-#define __GST_OSS_MIXER_ELEMENT_H__
-
-
-#include "gstossmixer.h"
-
-
-G_BEGIN_DECLS
-
-
-#define GST_OSS_MIXER_ELEMENT(obj) (G_TYPE_CHECK_INSTANCE_CAST((obj),GST_TYPE_OSS_MIXER_ELEMENT,GstOssMixerElement))
-#define GST_OSS_MIXER_ELEMENT_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST((klass),GST_TYPE_OSS_MIXER_ELEMENT,GstOssMixerElementClass))
-#define GST_IS_OSS_MIXER_ELEMENT(obj) (G_TYPE_CHECK_INSTANCE_TYPE((obj),GST_TYPE_OSS_MIXER_ELEMENT))
-#define GST_IS_OSS_MIXER_ELEMENT_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE((klass),GST_TYPE_OSS_MIXER_ELEMENT))
-#define GST_TYPE_OSS_MIXER_ELEMENT (gst_oss_mixer_element_get_type())
-
-
-typedef struct _GstOssMixerElement GstOssMixerElement;
-typedef struct _GstOssMixerElementClass GstOssMixerElementClass;
-
-
-struct _GstOssMixerElement {
- GstElement parent;
-
- gchar *device;
- GstOssMixer *mixer;
-};
-
-struct _GstOssMixerElementClass {
- GstElementClass parent;
-};
-
-
-GType gst_oss_mixer_element_get_type (void);
-
-
-G_END_DECLS
-
-
-#endif /* __GST_OSS_MIXER_ELEMENT_H__ */
diff --git a/sys/oss/gstossmixertrack.c b/sys/oss/gstossmixertrack.c
deleted file mode 100644
index 3bc8cde374ca72d885fafb1e24cf2b89363706a1..0000000000000000000000000000000000000000
--- a/sys/oss/gstossmixertrack.c
+++ /dev/null
@@ -1,172 +0,0 @@
-/* GStreamer OSS Mixer implementation
- * Copyright (C) 2003 Ronald Bultje <rbultje@ronald.bitfreak.net>
- *
- * gstossmixer.c: mixer interface implementation for OSS
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Library General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Library General Public License for more details.
- *
- * You should have received a copy of the GNU Library General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- */
-
-#ifdef HAVE_CONFIG_H
-#include "config.h"
-#endif
-
-#include <stdio.h>
-#include <stdlib.h>
-#include <fcntl.h>
-#include <unistd.h>
-#include <string.h>
-#include <errno.h>
-#include <sys/ioctl.h>
-
-#ifdef HAVE_OSS_INCLUDE_IN_SYS
-# include <sys/soundcard.h>
-#else
-# ifdef HAVE_OSS_INCLUDE_IN_ROOT
-# include <soundcard.h>
-# else
-# ifdef HAVE_OSS_INCLUDE_IN_MACHINE
-# include <machine/soundcard.h>
-# else
-# error "What to include?"
-# endif /* HAVE_OSS_INCLUDE_IN_MACHINE */
-# endif /* HAVE_OSS_INCLUDE_IN_ROOT */
-#endif /* HAVE_OSS_INCLUDE_IN_SYS */
-
-#include <gst/gst-i18n-plugin.h>
-
-#include "gstossmixertrack.h"
-
-GST_DEBUG_CATEGORY_EXTERN (oss_debug);
-#define GST_CAT_DEFAULT oss_debug
-
-#define MASK_BIT_IS_SET(mask, bit) \
- (mask & (1 << bit))
-
-G_DEFINE_TYPE (GstOssMixerTrack, gst_ossmixer_track, GST_TYPE_MIXER_TRACK);
-
-static void
-gst_ossmixer_track_class_init (GstOssMixerTrackClass * klass)
-{
- /* nop */
-}
-
-static void
-gst_ossmixer_track_init (GstOssMixerTrack * track)
-{
- track->lvol = track->rvol = 0;
- track->track_num = 0;
-}
-
-static const gchar **labels = NULL;
-
-/* three functions: firstly, OSS has the nasty habit of inserting
- * spaces in the labels, we want to get rid of them. Secondly,
- * i18n is impossible with OSS' way of providing us with mixer
- * labels, so we make a 'given' list of i18n'ed labels. Thirdly, I
- * personally don't like the "1337" names that OSS gives to their
- * labels ("Vol", "Mic", "Rec"), I'd rather see full names. */
-
-static void
-fill_labels (void)
-{
- gint i, pos;
- const gchar *origs[SOUND_MIXER_NRDEVICES] = SOUND_DEVICE_LABELS;
- const struct
- {
- const gchar *given;
- const gchar *wanted;
- }
- cases[] = {
- /* Note: this list is simply ripped from soundcard.h. For
- * some people, some values might be missing (3D surround,
- * etc.) - feel free to add them. That's the reason why
- * I'm doing this in such a horribly complicated way. */
- {
- "Vol ", _("Volume")}, {
- "Bass ", _("Bass")}, {
- "Trebl", _("Treble")}, {
- "Synth", _("Synth")}, {
- "Pcm ", _("PCM")}, {
- "Spkr ", _("Speaker")}, {
- "Line ", _("Line-in")}, {
- "Mic ", _("Microphone")}, {
- "CD ", _("CD")}, {
- "Mix ", _("Mixer")}, {
- "Pcm2 ", _("PCM-2")}, {
- "Rec ", _("Record")}, {
- "IGain", _("In-gain")}, {
- "OGain", _("Out-gain")}, {
- "Line1", _("Line-1")}, {
- "Line2", _("Line-2")}, {
- "Line3", _("Line-3")}, {
- "Digital1", _("Digital-1")}, {
- "Digital2", _("Digital-2")}, {
- "Digital3", _("Digital-3")}, {
- "PhoneIn", _("Phone-in")}, {
- "PhoneOut", _("Phone-out")}, {
- "Video", _("Video")}, {
- "Radio", _("Radio")}, {
- "Monitor", _("Monitor")}, {
- NULL, NULL}
- };
-
- labels = g_malloc (sizeof (gchar *) * SOUND_MIXER_NRDEVICES);
-
- for (i = 0; i < SOUND_MIXER_NRDEVICES; i++) {
- for (pos = 0; cases[pos].given != NULL; pos++) {
- if (!strcmp (cases[pos].given, origs[i])) {
- labels[i] = g_strdup (cases[pos].wanted);
- break;
- }
- }
- if (cases[pos].given == NULL)
- labels[i] = g_strdup (origs[i]);
- }
-}
-
-GstMixerTrack *
-gst_ossmixer_track_new (gint mixer_fd,
- gint track_num, gint max_chans, gint flags)
-{
- GstOssMixerTrack *osstrack;
- GstMixerTrack *track;
- gint volume;
-
- if (!labels)
- fill_labels ();
-
- osstrack = g_object_new (GST_TYPE_OSSMIXER_TRACK, NULL);
- track = GST_MIXER_TRACK (osstrack);
- track->label = g_strdup (labels[track_num]);
- track->num_channels = max_chans;
- track->flags = flags;
- track->min_volume = 0;
- track->max_volume = 100;
- osstrack->track_num = track_num;
-
- /* volume */
- if (ioctl (mixer_fd, MIXER_READ (osstrack->track_num), &volume) < 0) {
- g_warning ("Error getting device (%d) volume: %s",
- osstrack->track_num, strerror (errno));
- volume = 0;
- }
- osstrack->lvol = (volume & 0xff);
- if (track->num_channels == 2) {
- osstrack->rvol = ((volume >> 8) & 0xff);
- }
-
- return track;
-}
diff --git a/sys/oss/gstossmixertrack.h b/sys/oss/gstossmixertrack.h
deleted file mode 100644
index 2e62ec85aa2315c48c7f0e28231d8feeefe84cf3..0000000000000000000000000000000000000000
--- a/sys/oss/gstossmixertrack.h
+++ /dev/null
@@ -1,62 +0,0 @@
-/* GStreamer OSS Mixer implementation
- * Copyright (C) 2003 Ronald Bultje <rbultje@ronald.bitfreak.net>
- *
- * gstossmixertrack.h: OSS mixer tracks
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Library General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Library General Public License for more details.
- *
- * You should have received a copy of the GNU Library General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- */
-
-#ifndef __GST_OSS_MIXER_TRACK_H__
-#define __GST_OSS_MIXER_TRACK_H__
-
-#include <gst/gst.h>
-#include <gst/interfaces/mixer.h>
-
-#include "gstosshelper.h"
-
-G_BEGIN_DECLS
-
-#define GST_TYPE_OSSMIXER_TRACK \
- (gst_ossmixer_track_get_type ())
-#define GST_OSSMIXER_TRACK(obj) \
- (G_TYPE_CHECK_INSTANCE_CAST ((obj), GST_TYPE_OSSMIXER_TRACK, \
- GstOssMixerTrack))
-#define GST_OSSMIXER_TRACK_CLASS(klass) \
- (G_TYPE_CHECK_CLASS_CAST ((klass), GST_TYPE_OSSMIXER_TRACK, \
- GstOssMixerTrackClass))
-#define GST_IS_OSSMIXER_TRACK(obj) \
- (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GST_TYPE_OSSMIXER_TRACK))
-#define GST_IS_OSSMIXER_TRACK_CLASS(klass) \
- (G_TYPE_CHECK_CLASS_TYPE ((klass), GST_TYPE_OSSMIXER_TRACK))
-
-typedef struct _GstOssMixerTrack {
- GstMixerTrack parent;
-
- gint lvol, rvol;
- gint track_num;
-} GstOssMixerTrack;
-
-typedef struct _GstOssMixerTrackClass {
- GstMixerTrackClass parent;
-} GstOssMixerTrackClass;
-
-GType gst_ossmixer_track_get_type (void);
-GstMixerTrack* gst_ossmixer_track_new (gint mixer_fd,
- gint track_num, gint max_chans, gint flags);
-
-G_END_DECLS
-
-#endif /* __GST_OSS_MIXER_TRACK_H__ */
diff --git a/sys/oss/gstosssink.c b/sys/oss/gstosssink.c
index 863e5a856f8624e7a08e25cbfbad0c6507112e27..d31051ae70974e0c4173ee7ac7708b3d61b72bf2 100644
--- a/sys/oss/gstosssink.c
+++ b/sys/oss/gstosssink.c
@@ -73,10 +73,6 @@
GST_DEBUG_CATEGORY_EXTERN (oss_debug);
#define GST_CAT_DEFAULT oss_debug
-static void gst_oss_sink_base_init (gpointer g_class);
-static void gst_oss_sink_class_init (GstOssSinkClass * klass);
-static void gst_oss_sink_init (GstOssSink * osssink);
-
static void gst_oss_sink_dispose (GObject * object);
static void gst_oss_sink_finalise (GObject * object);
@@ -85,14 +81,14 @@ static void gst_oss_sink_get_property (GObject * object, guint prop_id,
static void gst_oss_sink_set_property (GObject * object, guint prop_id,
const GValue * value, GParamSpec * pspec);
-static GstCaps *gst_oss_sink_getcaps (GstBaseSink * bsink);
+static GstCaps *gst_oss_sink_getcaps (GstBaseSink * bsink, GstCaps * filter);
static gboolean gst_oss_sink_open (GstAudioSink * asink);
static gboolean gst_oss_sink_close (GstAudioSink * asink);
static gboolean gst_oss_sink_prepare (GstAudioSink * asink,
- GstRingBufferSpec * spec);
+ GstAudioRingBufferSpec * spec);
static gboolean gst_oss_sink_unprepare (GstAudioSink * asink);
-static guint gst_oss_sink_write (GstAudioSink * asink, gpointer data,
+static gint gst_oss_sink_write (GstAudioSink * asink, gpointer data,
guint length);
static guint gst_oss_sink_delay (GstAudioSink * asink);
static void gst_oss_sink_reset (GstAudioSink * asink);
@@ -128,35 +124,10 @@ static GstStaticPadTemplate osssink_sink_factory =
"channels = (int) 2, " "channel-mask = (bitmask) 0x3")
);
-static GstElementClass *parent_class = NULL;
-
/* static guint gst_oss_sink_signals[LAST_SIGNAL] = { 0 }; */
-GType
-gst_oss_sink_get_type (void)
-{
- static GType osssink_type = 0;
-
- if (!osssink_type) {
- static const GTypeInfo osssink_info = {
- sizeof (GstOssSinkClass),
- gst_oss_sink_base_init,
- NULL,
- (GClassInitFunc) gst_oss_sink_class_init,
- NULL,
- NULL,
- sizeof (GstOssSink),
- 0,
- (GInstanceInitFunc) gst_oss_sink_init,
- };
-
- osssink_type =
- g_type_register_static (GST_TYPE_AUDIO_SINK, "GstOssSink",
- &osssink_info, 0);
- }
-
- return osssink_type;
-}
+#define gst_oss_sink_parent_class parent_class
+G_DEFINE_TYPE (GstOssSink, gst_oss_sink, GST_TYPE_AUDIO_SINK);
static void
gst_oss_sink_dispose (GObject * object)
@@ -171,29 +142,16 @@ gst_oss_sink_dispose (GObject * object)
G_OBJECT_CLASS (parent_class)->dispose (object);
}
-static void
-gst_oss_sink_base_init (gpointer g_class)
-{
- GstElementClass *element_class = GST_ELEMENT_CLASS (g_class);
-
- gst_element_class_set_static_metadata (element_class, "Audio Sink (OSS)",
- "Sink/Audio",
- "Output to a sound card via OSS",
- "Erik Walthinsen <omega@cse.ogi.edu>, "
- "Wim Taymans <wim.taymans@chello.be>");
-
- gst_element_class_add_pad_template (element_class,
- gst_static_pad_template_get (&osssink_sink_factory));
-}
-
static void
gst_oss_sink_class_init (GstOssSinkClass * klass)
{
GObjectClass *gobject_class;
+ GstElementClass *gstelement_class;
GstBaseSinkClass *gstbasesink_class;
GstAudioSinkClass *gstaudiosink_class;
gobject_class = (GObjectClass *) klass;
+ gstelement_class = (GstElementClass *) klass;
gstbasesink_class = (GstBaseSinkClass *) klass;
gstaudiosink_class = (GstAudioSinkClass *) klass;
@@ -218,6 +176,15 @@ gst_oss_sink_class_init (GstOssSinkClass * klass)
gstaudiosink_class->write = GST_DEBUG_FUNCPTR (gst_oss_sink_write);
gstaudiosink_class->delay = GST_DEBUG_FUNCPTR (gst_oss_sink_delay);
gstaudiosink_class->reset = GST_DEBUG_FUNCPTR (gst_oss_sink_reset);
+
+ gst_element_class_set_static_metadata (gstelement_class, "Audio Sink (OSS)",
+ "Sink/Audio",
+ "Output to a sound card via OSS",
+ "Erik Walthinsen <omega@cse.ogi.edu>, "
+ "Wim Taymans <wim.taymans@chello.be>");
+
+ gst_element_class_add_pad_template (gstelement_class,
+ gst_static_pad_template_get (&osssink_sink_factory));
}
static void
@@ -286,7 +253,7 @@ gst_oss_sink_get_property (GObject * object, guint prop_id,
}
static GstCaps *
-gst_oss_sink_getcaps (GstBaseSink * bsink)
+gst_oss_sink_getcaps (GstBaseSink * bsink, GstCaps * filter)
{
GstOssSink *osssink;
GstCaps *caps;
@@ -304,7 +271,16 @@ gst_oss_sink_getcaps (GstBaseSink * bsink)
}
}
- return caps;
+ if (filter && caps) {
+ GstCaps *intersection;
+
+ intersection =
+ gst_caps_intersect_full (filter, caps, GST_CAPS_INTERSECT_FIRST);
+ gst_caps_unref (caps);
+ return intersection;
+ } else {
+ return caps;
+ }
}
static gint
@@ -325,41 +301,50 @@ ilog2 (gint x)
}
static gint
-gst_oss_sink_get_format (GstBufferFormat fmt)
+gst_oss_sink_get_format (GstAudioRingBufferFormatType fmt, GstAudioFormat rfmt)
{
gint result;
switch (fmt) {
- case GST_MU_LAW:
+ case GST_AUDIO_RING_BUFFER_FORMAT_TYPE_MU_LAW:
result = AFMT_MU_LAW;
break;
- case GST_A_LAW:
+ case GST_AUDIO_RING_BUFFER_FORMAT_TYPE_A_LAW:
result = AFMT_A_LAW;
break;
- case GST_IMA_ADPCM:
+ case GST_AUDIO_RING_BUFFER_FORMAT_TYPE_IMA_ADPCM:
result = AFMT_IMA_ADPCM;
break;
- case GST_U8:
- result = AFMT_U8;
- break;
- case GST_S16_LE:
- result = AFMT_S16_LE;
- break;
- case GST_S16_BE:
- result = AFMT_S16_BE;
- break;
- case GST_S8:
- result = AFMT_S8;
- break;
- case GST_U16_LE:
- result = AFMT_U16_LE;
- break;
- case GST_U16_BE:
- result = AFMT_U16_BE;
- break;
- case GST_MPEG:
+ case GST_AUDIO_RING_BUFFER_FORMAT_TYPE_MPEG:
result = AFMT_MPEG;
break;
+ case GST_AUDIO_RING_BUFFER_FORMAT_TYPE_RAW:
+ {
+ switch (rfmt) {
+ case GST_AUDIO_FORMAT_U8:
+ result = AFMT_U8;
+ break;
+ case GST_AUDIO_FORMAT_S16LE:
+ result = AFMT_S16_LE;
+ break;
+ case GST_AUDIO_FORMAT_S16BE:
+ result = AFMT_S16_BE;
+ break;
+ case GST_AUDIO_FORMAT_S8:
+ result = AFMT_S8;
+ break;
+ case GST_AUDIO_FORMAT_U16LE:
+ result = AFMT_U16_LE;
+ break;
+ case GST_AUDIO_FORMAT_U16BE:
+ result = AFMT_U16_BE;
+ break;
+ default:
+ result = 0;
+ break;
+ }
+ break;
+ }
default:
result = 0;
break;
@@ -425,12 +410,13 @@ gst_oss_sink_close (GstAudioSink * asink)
}
static gboolean
-gst_oss_sink_prepare (GstAudioSink * asink, GstRingBufferSpec * spec)
+gst_oss_sink_prepare (GstAudioSink * asink, GstAudioRingBufferSpec * spec)
{
GstOssSink *oss;
struct audio_buf_info info;
int mode;
int tmp;
+ guint width, rate, channels;
oss = GST_OSSSINK (asink);
@@ -446,18 +432,23 @@ gst_oss_sink_prepare (GstAudioSink * asink, GstRingBufferSpec * spec)
goto non_block;
}
- tmp = gst_oss_sink_get_format (spec->format);
+ tmp = gst_oss_sink_get_format (spec->type,
+ GST_AUDIO_INFO_FORMAT (&spec->info));
if (tmp == 0)
goto wrong_format;
- if (spec->width != 16 && spec->width != 8)
+ width = GST_AUDIO_INFO_WIDTH (&spec->info);
+ rate = GST_AUDIO_INFO_RATE (&spec->info);
+ channels = GST_AUDIO_INFO_CHANNELS (&spec->info);
+
+ if (width != 16 && width != 8)
goto dodgy_width;
SET_PARAM (oss, SNDCTL_DSP_SETFMT, tmp, "SETFMT");
- if (spec->channels == 2)
+ if (channels == 2)
SET_PARAM (oss, SNDCTL_DSP_STEREO, 1, "STEREO");
- SET_PARAM (oss, SNDCTL_DSP_CHANNELS, spec->channels, "CHANNELS");
- SET_PARAM (oss, SNDCTL_DSP_SPEED, spec->rate, "SPEED");
+ SET_PARAM (oss, SNDCTL_DSP_CHANNELS, channels, "CHANNELS");
+ SET_PARAM (oss, SNDCTL_DSP_SPEED, rate, "SPEED");
tmp = ilog2 (spec->segsize);
tmp = ((spec->segtotal & 0x7fff) << 16) | tmp;
@@ -470,8 +461,7 @@ gst_oss_sink_prepare (GstAudioSink * asink, GstRingBufferSpec * spec)
spec->segsize = info.fragsize;
spec->segtotal = info.fragstotal;
- spec->bytes_per_sample = (spec->width / 8) * spec->channels;
- oss->bytes_per_sample = (spec->width / 8) * spec->channels;
+ oss->bytes_per_sample = GST_AUDIO_INFO_BPF (&spec->info);
GST_DEBUG_OBJECT (oss, "got segsize: %d, segtotal: %d, value: %08x",
spec->segsize, spec->segtotal, tmp);
@@ -489,13 +479,14 @@ non_block:
wrong_format:
{
GST_ELEMENT_ERROR (oss, RESOURCE, SETTINGS, (NULL),
- ("Unable to get format %d", spec->format));
+ ("Unable to get format (%d, %d)", spec->type,
+ GST_AUDIO_INFO_FORMAT (&spec->info)));
return FALSE;
}
dodgy_width:
{
GST_ELEMENT_ERROR (oss, RESOURCE, SETTINGS, (NULL),
- ("unexpected width %d", spec->width));
+ ("unexpected width %d", width));
return FALSE;
}
}
@@ -526,7 +517,7 @@ couldnt_reopen:
}
}
-static guint
+static gint
gst_oss_sink_write (GstAudioSink * asink, gpointer data, guint length)
{
return write (GST_OSSSINK (asink)->fd, data, length);
diff --git a/sys/oss/gstosssrc.c b/sys/oss/gstosssrc.c
index c457a30fa162029ba55db1a718335aff09a4b87b..2c3b0f1d231fdc1cff6aeacb6ac37842ffa84881 100644
--- a/sys/oss/gstosssrc.c
+++ b/sys/oss/gstosssrc.c
@@ -77,10 +77,8 @@ enum
PROP_DEVICE_NAME,
};
-GST_BOILERPLATE_WITH_INTERFACE (GstOssSrc, gst_oss_src, GstAudioSrc,
- GST_TYPE_AUDIO_SRC, GstMixer, GST_TYPE_MIXER, gst_oss_src_mixer);
-
-GST_IMPLEMENT_OSS_MIXER_METHODS (GstOssSrc, gst_oss_src_mixer);
+#define gst_oss_src_parent_class parent_class
+G_DEFINE_TYPE (GstOssSrc, gst_oss_src, GST_TYPE_AUDIO_SRC);
static void gst_oss_src_get_property (GObject * object, guint prop_id,
GValue * value, GParamSpec * pspec);
@@ -90,12 +88,12 @@ static void gst_oss_src_set_property (GObject * object, guint prop_id,
static void gst_oss_src_dispose (GObject * object);
static void gst_oss_src_finalize (GstOssSrc * osssrc);
-static GstCaps *gst_oss_src_getcaps (GstBaseSrc * bsrc);
+static GstCaps *gst_oss_src_getcaps (GstBaseSrc * bsrc, GstCaps * filter);
static gboolean gst_oss_src_open (GstAudioSrc * asrc);
static gboolean gst_oss_src_close (GstAudioSrc * asrc);
static gboolean gst_oss_src_prepare (GstAudioSrc * asrc,
- GstRingBufferSpec * spec);
+ GstAudioRingBufferSpec * spec);
static gboolean gst_oss_src_unprepare (GstAudioSrc * asrc);
static guint gst_oss_src_read (GstAudioSrc * asrc, gpointer data, guint length);
static guint gst_oss_src_delay (GstAudioSrc * asrc);
@@ -124,28 +122,16 @@ gst_oss_src_dispose (GObject * object)
G_OBJECT_CLASS (parent_class)->dispose (object);
}
-static void
-gst_oss_src_base_init (gpointer g_class)
-{
- GstElementClass *element_class = GST_ELEMENT_CLASS (g_class);
-
- gst_element_class_set_static_metadata (element_class, "Audio Source (OSS)",
- "Source/Audio",
- "Capture from a sound card via OSS",
- "Erik Walthinsen <omega@cse.ogi.edu>, " "Wim Taymans <wim@fluendo.com>");
-
- gst_element_class_add_pad_template (element_class,
- gst_static_pad_template_get (&osssrc_src_factory));
-}
-
static void
gst_oss_src_class_init (GstOssSrcClass * klass)
{
GObjectClass *gobject_class;
+ GstElementClass *gstelement_class;
GstBaseSrcClass *gstbasesrc_class;
GstAudioSrcClass *gstaudiosrc_class;
gobject_class = (GObjectClass *) klass;
+ gstelement_class = (GstElementClass *) klass;
gstbasesrc_class = (GstBaseSrcClass *) klass;
gstaudiosrc_class = (GstAudioSrcClass *) klass;
@@ -173,6 +159,15 @@ gst_oss_src_class_init (GstOssSrcClass * klass)
g_param_spec_string ("device-name", "Device name",
"Human-readable name of the sound device", DEFAULT_DEVICE_NAME,
G_PARAM_READABLE | G_PARAM_STATIC_STRINGS));
+
+
+ gst_element_class_set_static_metadata (gstelement_class, "Audio Source (OSS)",
+ "Source/Audio",
+ "Capture from a sound card via OSS",
+ "Erik Walthinsen <omega@cse.ogi.edu>, " "Wim Taymans <wim@fluendo.com>");
+
+ gst_element_class_add_pad_template (gstelement_class,
+ gst_static_pad_template_get (&osssrc_src_factory));
}
static void
@@ -217,7 +212,7 @@ gst_oss_src_get_property (GObject * object, guint prop_id,
}
static void
-gst_oss_src_init (GstOssSrc * osssrc, GstOssSrcClass * g_class)
+gst_oss_src_init (GstOssSrc * osssrc)
{
const gchar *device;
@@ -243,7 +238,7 @@ gst_oss_src_finalize (GstOssSrc * osssrc)
}
static GstCaps *
-gst_oss_src_getcaps (GstBaseSrc * bsrc)
+gst_oss_src_getcaps (GstBaseSrc * bsrc, GstCaps * filter)
{
GstOssSrc *osssrc;
GstCaps *caps;
@@ -268,7 +263,16 @@ gst_oss_src_getcaps (GstBaseSrc * bsrc)
GST_INFO_OBJECT (osssrc, "returning caps %" GST_PTR_FORMAT, caps);
- return caps;
+ if (filter && caps) {
+ GstCaps *intersection;
+
+ intersection =
+ gst_caps_intersect_full (filter, caps, GST_CAPS_INTERSECT_FIRST);
+ gst_caps_unref (caps);
+ return intersection;
+ } else {
+ return caps;
+ }
}
static gint
@@ -289,41 +293,50 @@ ilog2 (gint x)
}
static gint
-gst_oss_src_get_format (GstBufferFormat fmt)
+gst_oss_src_get_format (GstAudioRingBufferFormatType fmt, GstAudioFormat rfmt)
{
gint result;
switch (fmt) {
- case GST_MU_LAW:
+ case GST_AUDIO_RING_BUFFER_FORMAT_TYPE_MU_LAW:
result = AFMT_MU_LAW;
break;
- case GST_A_LAW:
+ case GST_AUDIO_RING_BUFFER_FORMAT_TYPE_A_LAW:
result = AFMT_A_LAW;
break;
- case GST_IMA_ADPCM:
+ case GST_AUDIO_RING_BUFFER_FORMAT_TYPE_IMA_ADPCM:
result = AFMT_IMA_ADPCM;
break;
- case GST_U8:
- result = AFMT_U8;
- break;
- case GST_S16_LE:
- result = AFMT_S16_LE;
- break;
- case GST_S16_BE:
- result = AFMT_S16_BE;
- break;
- case GST_S8:
- result = AFMT_S8;
- break;
- case GST_U16_LE:
- result = AFMT_U16_LE;
- break;
- case GST_U16_BE:
- result = AFMT_U16_BE;
- break;
- case GST_MPEG:
+ case GST_AUDIO_RING_BUFFER_FORMAT_TYPE_MPEG:
result = AFMT_MPEG;
break;
+ case GST_AUDIO_RING_BUFFER_FORMAT_TYPE_RAW:
+ {
+ switch (rfmt) {
+ case GST_AUDIO_FORMAT_U8:
+ result = AFMT_U8;
+ break;
+ case GST_AUDIO_FORMAT_S16LE:
+ result = AFMT_S16_LE;
+ break;
+ case GST_AUDIO_FORMAT_S16BE:
+ result = AFMT_S16_BE;
+ break;
+ case GST_AUDIO_FORMAT_S8:
+ result = AFMT_S8;
+ break;
+ case GST_AUDIO_FORMAT_U16LE:
+ result = AFMT_U16_LE;
+ break;
+ case GST_AUDIO_FORMAT_U16BE:
+ result = AFMT_U16_BE;
+ break;
+ default:
+ result = 0;
+ break;
+ }
+ break;
+ }
default:
result = 0;
break;
@@ -352,14 +365,9 @@ gst_oss_src_open (GstAudioSrc * asrc)
}
}
- if (!oss->mixer) {
- oss->mixer = gst_ossmixer_new ("/dev/mixer", GST_OSS_MIXER_CAPTURE);
+ g_free (oss->device_name);
+ oss->device_name = gst_oss_helper_get_card_name ("/dev/mixer");
- if (oss->mixer) {
- g_free (oss->device_name);
- oss->device_name = g_strdup (oss->mixer->cardname);
- }
- }
return TRUE;
no_permission:
@@ -389,23 +397,19 @@ gst_oss_src_close (GstAudioSrc * asrc)
close (oss->fd);
- if (oss->mixer) {
- gst_ossmixer_free (oss->mixer);
- oss->mixer = NULL;
- }
-
gst_caps_replace (&oss->probed_caps, NULL);
return TRUE;
}
static gboolean
-gst_oss_src_prepare (GstAudioSrc * asrc, GstRingBufferSpec * spec)
+gst_oss_src_prepare (GstAudioSrc * asrc, GstAudioRingBufferSpec * spec)
{
GstOssSrc *oss;
struct audio_buf_info info;
int mode;
int fmt, tmp;
+ guint width, rate, channels;
oss = GST_OSS_SRC (asrc);
@@ -414,10 +418,18 @@ gst_oss_src_prepare (GstAudioSrc * asrc, GstRingBufferSpec * spec)
if (fcntl (oss->fd, F_SETFL, mode) == -1)
goto non_block;
- fmt = gst_oss_src_get_format (spec->format);
+ fmt = gst_oss_src_get_format (spec->type,
+ GST_AUDIO_INFO_FORMAT (&spec->info));
if (fmt == 0)
goto wrong_format;
+ width = GST_AUDIO_INFO_WIDTH (&spec->info);
+ rate = GST_AUDIO_INFO_RATE (&spec->info);
+ channels = GST_AUDIO_INFO_CHANNELS (&spec->info);
+
+ if (width != 16 && width != 8)
+ goto dodgy_width;
+
tmp = ilog2 (spec->segsize);
tmp = ((spec->segtotal & 0x7fff) << 16) | tmp;
GST_DEBUG_OBJECT (oss, "set segsize: %d, segtotal: %d, value: %08x",
@@ -428,22 +440,17 @@ gst_oss_src_prepare (GstAudioSrc * asrc, GstRingBufferSpec * spec)
SET_PARAM (oss, SNDCTL_DSP_RESET, 0, "RESET");
SET_PARAM (oss, SNDCTL_DSP_SETFMT, fmt, "SETFMT");
- if (spec->channels == 2)
+ if (channels == 2)
SET_PARAM (oss, SNDCTL_DSP_STEREO, 1, "STEREO");
- SET_PARAM (oss, SNDCTL_DSP_CHANNELS, spec->channels, "CHANNELS");
- SET_PARAM (oss, SNDCTL_DSP_SPEED, spec->rate, "SPEED");
+ SET_PARAM (oss, SNDCTL_DSP_CHANNELS, channels, "CHANNELS");
+ SET_PARAM (oss, SNDCTL_DSP_SPEED, rate, "SPEED");
GET_PARAM (oss, SNDCTL_DSP_GETISPACE, &info, "GETISPACE");
spec->segsize = info.fragsize;
spec->segtotal = info.fragstotal;
- if (spec->width != 16 && spec->width != 8)
- goto dodgy_width;
-
- spec->bytes_per_sample = (spec->width / 8) * spec->channels;
- oss->bytes_per_sample = (spec->width / 8) * spec->channels;
- memset (spec->silence_sample, 0, spec->bytes_per_sample);
+ oss->bytes_per_sample = GST_AUDIO_INFO_BPF (&spec->info);
GST_DEBUG_OBJECT (oss, "got segsize: %d, segtotal: %d, value: %08x",
spec->segsize, spec->segtotal, tmp);
@@ -460,13 +467,14 @@ non_block:
wrong_format:
{
GST_ELEMENT_ERROR (oss, RESOURCE, OPEN_READ,
- ("Unable to get format %d", spec->format), (NULL));
+ ("Unable to get format (%d, %d)", spec->type,
+ GST_AUDIO_INFO_FORMAT (&spec->info)), (NULL));
return FALSE;
}
dodgy_width:
{
GST_ELEMENT_ERROR (oss, RESOURCE, OPEN_READ,
- ("Unexpected width %d", spec->width), (NULL));
+ ("Unexpected width %d", width), (NULL));
return FALSE;
}
}
diff --git a/sys/oss/gstosssrc.h b/sys/oss/gstosssrc.h
index 0d14613336668904e1813323c4174e005ed64e75..ec9af4cb097d73e41455cc2e03ed8f35dab65cc1 100644
--- a/sys/oss/gstosssrc.h
+++ b/sys/oss/gstosssrc.h
@@ -29,7 +29,6 @@
#include <gst/audio/gstaudiosrc.h>
#include "gstosshelper.h"
-#include "gstossmixer.h"
G_BEGIN_DECLS
@@ -52,8 +51,6 @@ struct _GstOssSrc {
gchar *device_name;
GstCaps *probed_caps;
-
- GstOssMixer *mixer;
};
struct _GstOssSrcClass {
diff --git a/sys/oss4/Makefile.am b/sys/oss4/Makefile.am
index 8f8793c5d42c2f8f6597322093180a2cbe7e9c28..8e7b4664c3547ffbba9006708e50437e16fb51db 100644
--- a/sys/oss4/Makefile.am
+++ b/sys/oss4/Makefile.am
@@ -2,10 +2,6 @@ plugin_LTLIBRARIES = libgstoss4audio.la
libgstoss4audio_la_SOURCES = \
oss4-audio.c \
- oss4-mixer.c \
- oss4-mixer-enum.c \
- oss4-mixer-slider.c \
- oss4-mixer-switch.c \
oss4-property-probe.c \
oss4-sink.c \
oss4-source.c
@@ -13,7 +9,6 @@ libgstoss4audio_la_SOURCES = \
libgstoss4audio_la_CFLAGS = $(GST_PLUGINS_BASE_CFLAGS) $(GST_CFLAGS)
libgstoss4audio_la_LIBADD = \
$(GST_PLUGINS_BASE_LIBS) \
- -lgstinterfaces-$(GST_API_VERSION) \
-lgstaudio-$(GST_API_VERSION) \
$(GST_LIBS)
libgstoss4audio_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS)
@@ -21,13 +16,8 @@ libgstoss4audio_la_LIBTOOLFLAGS = --tag=disable-static
noinst_HEADERS = \
oss4-audio.h \
- oss4-mixer.h \
- oss4-mixer-enum.h \
- oss4-mixer-slider.h \
- oss4-mixer-switch.h \
oss4-property-probe.h \
oss4-sink.h \
oss4-soundcard.h \
oss4-source.h
-
diff --git a/sys/oss4/Makefile.in b/sys/oss4/Makefile.in
index d3ede12bbbfc63acdd01ad7d7b99903416147383..6515f42760a4bbf59a564415c507bb286e80d2e0 100644
--- a/sys/oss4/Makefile.in
+++ b/sys/oss4/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.11.4 from Makefile.am.
+# Makefile.in generated by automake 1.11.5 from Makefile.am.
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -60,6 +60,7 @@ am__aclocal_m4_deps = $(top_srcdir)/common/m4/as-ac-expand.m4 \
$(top_srcdir)/common/m4/as-auto-alt.m4 \
$(top_srcdir)/common/m4/as-compiler-flag.m4 \
$(top_srcdir)/common/m4/as-gcc-inline-assembly.m4 \
+ $(top_srcdir)/common/m4/as-libtool.m4 \
$(top_srcdir)/common/m4/as-objc.m4 \
$(top_srcdir)/common/m4/as-python.m4 \
$(top_srcdir)/common/m4/as-scrub-include.m4 \
@@ -130,10 +131,6 @@ am__DEPENDENCIES_1 =
libgstoss4audio_la_DEPENDENCIES = $(am__DEPENDENCIES_1) \
$(am__DEPENDENCIES_1)
am_libgstoss4audio_la_OBJECTS = libgstoss4audio_la-oss4-audio.lo \
- libgstoss4audio_la-oss4-mixer.lo \
- libgstoss4audio_la-oss4-mixer-enum.lo \
- libgstoss4audio_la-oss4-mixer-slider.lo \
- libgstoss4audio_la-oss4-mixer-switch.lo \
libgstoss4audio_la-oss4-property-probe.lo \
libgstoss4audio_la-oss4-sink.lo \
libgstoss4audio_la-oss4-source.lo
@@ -262,6 +259,7 @@ GMSGFMT_015 = @GMSGFMT_015@
GREP = @GREP@
GSTPB_PLUGINS_DIR = @GSTPB_PLUGINS_DIR@
GSTPB_PREFIX = @GSTPB_PREFIX@
+GST_AGE = @GST_AGE@
GST_ALL_LDFLAGS = @GST_ALL_LDFLAGS@
GST_API_VERSION = @GST_API_VERSION@
GST_BASE_CFLAGS = @GST_BASE_CFLAGS@
@@ -271,9 +269,11 @@ GST_CHECK_CFLAGS = @GST_CHECK_CFLAGS@
GST_CHECK_LIBS = @GST_CHECK_LIBS@
GST_CONTROLLER_CFLAGS = @GST_CONTROLLER_CFLAGS@
GST_CONTROLLER_LIBS = @GST_CONTROLLER_LIBS@
+GST_CURRENT = @GST_CURRENT@
GST_CXXFLAGS = @GST_CXXFLAGS@
GST_LEVEL_DEFAULT = @GST_LEVEL_DEFAULT@
GST_LIBS = @GST_LIBS@
+GST_LIBVERSION = @GST_LIBVERSION@
GST_LICENSE = @GST_LICENSE@
GST_LT_LDFLAGS = @GST_LT_LDFLAGS@
GST_NET_CFLAGS = @GST_NET_CFLAGS@
@@ -291,6 +291,7 @@ GST_PLUGINS_NONPORTED = @GST_PLUGINS_NONPORTED@
GST_PLUGINS_SELECTED = @GST_PLUGINS_SELECTED@
GST_PLUGIN_LDFLAGS = @GST_PLUGIN_LDFLAGS@
GST_PREFIX = @GST_PREFIX@
+GST_REVISION = @GST_REVISION@
GST_TOOLS_DIR = @GST_TOOLS_DIR@
GTKDOC_CHECK = @GTKDOC_CHECK@
GTK_CFLAGS = @GTK_CFLAGS@
@@ -493,10 +494,6 @@ top_srcdir = @top_srcdir@
plugin_LTLIBRARIES = libgstoss4audio.la
libgstoss4audio_la_SOURCES = \
oss4-audio.c \
- oss4-mixer.c \
- oss4-mixer-enum.c \
- oss4-mixer-slider.c \
- oss4-mixer-switch.c \
oss4-property-probe.c \
oss4-sink.c \
oss4-source.c
@@ -504,7 +501,6 @@ libgstoss4audio_la_SOURCES = \
libgstoss4audio_la_CFLAGS = $(GST_PLUGINS_BASE_CFLAGS) $(GST_CFLAGS)
libgstoss4audio_la_LIBADD = \
$(GST_PLUGINS_BASE_LIBS) \
- -lgstinterfaces-$(GST_API_VERSION) \
-lgstaudio-$(GST_API_VERSION) \
$(GST_LIBS)
@@ -512,10 +508,6 @@ libgstoss4audio_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS)
libgstoss4audio_la_LIBTOOLFLAGS = --tag=disable-static
noinst_HEADERS = \
oss4-audio.h \
- oss4-mixer.h \
- oss4-mixer-enum.h \
- oss4-mixer-slider.h \
- oss4-mixer-switch.h \
oss4-property-probe.h \
oss4-sink.h \
oss4-soundcard.h \
@@ -565,7 +557,7 @@ install-pluginLTLIBRARIES: $(plugin_LTLIBRARIES)
done; \
test -z "$$list2" || { \
echo " $(MKDIR_P) '$(DESTDIR)$(plugindir)'"; \
- $(MKDIR_P) '$(DESTDIR)$(plugindir)' || exit 1; \
+ $(MKDIR_P) "$(DESTDIR)$(plugindir)" || exit 1; \
echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 '$(DESTDIR)$(plugindir)'"; \
$(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 "$(DESTDIR)$(plugindir)"; \
}
@@ -597,10 +589,6 @@ distclean-compile:
-rm -f *.tab.c
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libgstoss4audio_la-oss4-audio.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libgstoss4audio_la-oss4-mixer-enum.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libgstoss4audio_la-oss4-mixer-slider.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libgstoss4audio_la-oss4-mixer-switch.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libgstoss4audio_la-oss4-mixer.Plo@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libgstoss4audio_la-oss4-property-probe.Plo@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libgstoss4audio_la-oss4-sink.Plo@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libgstoss4audio_la-oss4-source.Plo@am__quote@
@@ -633,34 +621,6 @@ libgstoss4audio_la-oss4-audio.lo: oss4-audio.c
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(libgstoss4audio_la_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgstoss4audio_la_CFLAGS) $(CFLAGS) -c -o libgstoss4audio_la-oss4-audio.lo `test -f 'oss4-audio.c' || echo '$(srcdir)/'`oss4-audio.c
-libgstoss4audio_la-oss4-mixer.lo: oss4-mixer.c
-@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(libgstoss4audio_la_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgstoss4audio_la_CFLAGS) $(CFLAGS) -MT libgstoss4audio_la-oss4-mixer.lo -MD -MP -MF $(DEPDIR)/libgstoss4audio_la-oss4-mixer.Tpo -c -o libgstoss4audio_la-oss4-mixer.lo `test -f 'oss4-mixer.c' || echo '$(srcdir)/'`oss4-mixer.c
-@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libgstoss4audio_la-oss4-mixer.Tpo $(DEPDIR)/libgstoss4audio_la-oss4-mixer.Plo
-@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='oss4-mixer.c' object='libgstoss4audio_la-oss4-mixer.lo' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(libgstoss4audio_la_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgstoss4audio_la_CFLAGS) $(CFLAGS) -c -o libgstoss4audio_la-oss4-mixer.lo `test -f 'oss4-mixer.c' || echo '$(srcdir)/'`oss4-mixer.c
-
-libgstoss4audio_la-oss4-mixer-enum.lo: oss4-mixer-enum.c
-@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(libgstoss4audio_la_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgstoss4audio_la_CFLAGS) $(CFLAGS) -MT libgstoss4audio_la-oss4-mixer-enum.lo -MD -MP -MF $(DEPDIR)/libgstoss4audio_la-oss4-mixer-enum.Tpo -c -o libgstoss4audio_la-oss4-mixer-enum.lo `test -f 'oss4-mixer-enum.c' || echo '$(srcdir)/'`oss4-mixer-enum.c
-@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libgstoss4audio_la-oss4-mixer-enum.Tpo $(DEPDIR)/libgstoss4audio_la-oss4-mixer-enum.Plo
-@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='oss4-mixer-enum.c' object='libgstoss4audio_la-oss4-mixer-enum.lo' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(libgstoss4audio_la_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgstoss4audio_la_CFLAGS) $(CFLAGS) -c -o libgstoss4audio_la-oss4-mixer-enum.lo `test -f 'oss4-mixer-enum.c' || echo '$(srcdir)/'`oss4-mixer-enum.c
-
-libgstoss4audio_la-oss4-mixer-slider.lo: oss4-mixer-slider.c
-@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(libgstoss4audio_la_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgstoss4audio_la_CFLAGS) $(CFLAGS) -MT libgstoss4audio_la-oss4-mixer-slider.lo -MD -MP -MF $(DEPDIR)/libgstoss4audio_la-oss4-mixer-slider.Tpo -c -o libgstoss4audio_la-oss4-mixer-slider.lo `test -f 'oss4-mixer-slider.c' || echo '$(srcdir)/'`oss4-mixer-slider.c
-@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libgstoss4audio_la-oss4-mixer-slider.Tpo $(DEPDIR)/libgstoss4audio_la-oss4-mixer-slider.Plo
-@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='oss4-mixer-slider.c' object='libgstoss4audio_la-oss4-mixer-slider.lo' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(libgstoss4audio_la_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgstoss4audio_la_CFLAGS) $(CFLAGS) -c -o libgstoss4audio_la-oss4-mixer-slider.lo `test -f 'oss4-mixer-slider.c' || echo '$(srcdir)/'`oss4-mixer-slider.c
-
-libgstoss4audio_la-oss4-mixer-switch.lo: oss4-mixer-switch.c
-@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(libgstoss4audio_la_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgstoss4audio_la_CFLAGS) $(CFLAGS) -MT libgstoss4audio_la-oss4-mixer-switch.lo -MD -MP -MF $(DEPDIR)/libgstoss4audio_la-oss4-mixer-switch.Tpo -c -o libgstoss4audio_la-oss4-mixer-switch.lo `test -f 'oss4-mixer-switch.c' || echo '$(srcdir)/'`oss4-mixer-switch.c
-@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libgstoss4audio_la-oss4-mixer-switch.Tpo $(DEPDIR)/libgstoss4audio_la-oss4-mixer-switch.Plo
-@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='oss4-mixer-switch.c' object='libgstoss4audio_la-oss4-mixer-switch.lo' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(libgstoss4audio_la_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgstoss4audio_la_CFLAGS) $(CFLAGS) -c -o libgstoss4audio_la-oss4-mixer-switch.lo `test -f 'oss4-mixer-switch.c' || echo '$(srcdir)/'`oss4-mixer-switch.c
-
libgstoss4audio_la-oss4-property-probe.lo: oss4-property-probe.c
@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(libgstoss4audio_la_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgstoss4audio_la_CFLAGS) $(CFLAGS) -MT libgstoss4audio_la-oss4-property-probe.lo -MD -MP -MF $(DEPDIR)/libgstoss4audio_la-oss4-property-probe.Tpo -c -o libgstoss4audio_la-oss4-property-probe.lo `test -f 'oss4-property-probe.c' || echo '$(srcdir)/'`oss4-property-probe.c
@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libgstoss4audio_la-oss4-property-probe.Tpo $(DEPDIR)/libgstoss4audio_la-oss4-property-probe.Plo
diff --git a/sys/oss4/oss4-audio.c b/sys/oss4/oss4-audio.c
index 2661ffe94fd194730bf09cc5e0025f16b8dddb76..11f6e5e71f840837facb4864d16e65a2cd2e60a9 100644
--- a/sys/oss4/oss4-audio.c
+++ b/sys/oss4/oss4-audio.c
@@ -33,10 +33,9 @@
#include <string.h>
#include "gst/gst-i18n-plugin.h"
-#include <gst/audio/multichannel.h>
+#include <gst/audio/audio.h>
#include "oss4-audio.h"
-#include "oss4-mixer.h"
#include "oss4-property-probe.h"
#include "oss4-sink.h"
#include "oss4-source.h"
@@ -51,33 +50,42 @@ GST_DEBUG_CATEGORY (oss4_debug);
typedef struct
{
- const GstBufferFormat gst_fmt;
+ const GstAudioRingBufferFormatType gst_rbfmt;
+ const GstAudioFormat gst_rfmt;
const gint oss_fmt;
const gchar name[16];
- const gint depth;
- const gint width;
- const gint endianness;
- const gboolean signedness;
} GstOss4AudioFormat;
/* *INDENT-OFF* */
static const GstOss4AudioFormat fmt_map[] = {
/* note: keep sorted by preference, prefered formats first */
{
- GST_MU_LAW, AFMT_MU_LAW, "audio/x-mulaw", 0, 0, 0, FALSE}, {
- GST_A_LAW, AFMT_A_LAW, "audio/x-alaw", 0, 0, 0, FALSE}, {
- GST_S32_LE, AFMT_S32_LE, "audio/x-raw-int", 32, 32, G_LITTLE_ENDIAN, TRUE}, {
- GST_S32_BE, AFMT_S32_BE, "audio/x-raw-int", 32, 32, G_BIG_ENDIAN, TRUE}, {
- GST_S24_LE, AFMT_S24_LE, "audio/x-raw-int", 24, 32, G_LITTLE_ENDIAN, TRUE}, {
- GST_S24_BE, AFMT_S24_BE, "audio/x-raw-int", 24, 32, G_BIG_ENDIAN, TRUE}, {
- GST_S24_3LE, AFMT_S24_PACKED, "audio/x-raw-int", 24, 24, G_LITTLE_ENDIAN,
- TRUE}, {
- GST_S16_LE, AFMT_S16_LE, "audio/x-raw-int", 16, 16, G_LITTLE_ENDIAN, TRUE}, {
- GST_S16_BE, AFMT_S16_BE, "audio/x-raw-int", 16, 16, G_BIG_ENDIAN, TRUE}, {
- GST_U16_LE, AFMT_U16_LE, "audio/x-raw-int", 16, 16, G_LITTLE_ENDIAN, FALSE}, {
- GST_U16_BE, AFMT_U16_BE, "audio/x-raw-int", 16, 16, G_BIG_ENDIAN, FALSE}, {
- GST_S8, AFMT_S8, "audio/x-raw-int", 8, 8, 0, TRUE}, {
- GST_U8, AFMT_U8, "audio/x-raw-int", 8, 8, 0, FALSE}
+ GST_AUDIO_RING_BUFFER_FORMAT_TYPE_MU_LAW, 0,
+ AFMT_MU_LAW, "audio/x-mulaw"}, {
+ GST_AUDIO_RING_BUFFER_FORMAT_TYPE_A_LAW, 0,
+ AFMT_A_LAW, "audio/x-alaw"}, {
+ GST_AUDIO_RING_BUFFER_FORMAT_TYPE_RAW, GST_AUDIO_FORMAT_S32LE,
+ AFMT_S32_LE, "audio/x-raw"}, {
+ GST_AUDIO_RING_BUFFER_FORMAT_TYPE_RAW, GST_AUDIO_FORMAT_S32BE,
+ AFMT_S32_BE, "audio/x-raw"}, {
+ GST_AUDIO_RING_BUFFER_FORMAT_TYPE_RAW, GST_AUDIO_FORMAT_S24_32LE,
+ AFMT_S24_LE, "audio/x-raw"}, {
+ GST_AUDIO_RING_BUFFER_FORMAT_TYPE_RAW, GST_AUDIO_FORMAT_S24_32BE,
+ AFMT_S24_BE, "audio/x-raw"}, {
+ GST_AUDIO_RING_BUFFER_FORMAT_TYPE_RAW, GST_AUDIO_FORMAT_S24LE,
+ AFMT_S24_PACKED, "audio/x-raw"}, {
+ GST_AUDIO_RING_BUFFER_FORMAT_TYPE_RAW, GST_AUDIO_FORMAT_S16LE,
+ AFMT_S16_LE, "audio/x-raw"}, {
+ GST_AUDIO_RING_BUFFER_FORMAT_TYPE_RAW, GST_AUDIO_FORMAT_S16BE,
+ AFMT_S16_BE, "audio/x-raw"}, {
+ GST_AUDIO_RING_BUFFER_FORMAT_TYPE_RAW, GST_AUDIO_FORMAT_U16LE,
+ AFMT_U16_LE, "audio/x-raw"}, {
+ GST_AUDIO_RING_BUFFER_FORMAT_TYPE_RAW, GST_AUDIO_FORMAT_U16BE,
+ AFMT_U16_BE, "audio/x-raw"}, {
+ GST_AUDIO_RING_BUFFER_FORMAT_TYPE_RAW, GST_AUDIO_FORMAT_S8,
+ AFMT_S8, "audio/x-raw"}, {
+ GST_AUDIO_RING_BUFFER_FORMAT_TYPE_RAW, GST_AUDIO_FORMAT_U8,
+ AFMT_U8, "audio/x-raw"}
};
/* *INDENT-ON* */
@@ -96,24 +104,23 @@ gst_oss4_append_format_to_caps (const GstOss4AudioFormat * fmt, GstCaps * caps)
{
GstStructure *s;
- s = gst_structure_empty_new (fmt->name);
- if (fmt->width != 0 && fmt->depth != 0) {
- gst_structure_set (s, "width", G_TYPE_INT, fmt->width, "depth", G_TYPE_INT,
- fmt->depth, "signed", G_TYPE_BOOLEAN, fmt->signedness, NULL);
- }
- if (fmt->endianness != 0) {
- gst_structure_set (s, "endianness", G_TYPE_INT, fmt->endianness, NULL);
+ s = gst_structure_new_empty (fmt->name);
+ if (fmt->gst_rbfmt == GST_AUDIO_RING_BUFFER_FORMAT_TYPE_RAW) {
+ gst_structure_set (s, "format", G_TYPE_STRING,
+ gst_audio_format_to_string (fmt->gst_rfmt),
+ "layout", G_TYPE_STRING, "interleaved", NULL);
}
gst_caps_append_structure (caps, s);
}
static gint
-gst_oss4_audio_get_oss_format (GstBufferFormat fmt)
+gst_oss4_audio_get_oss_format (GstAudioRingBufferFormatType fmt,
+ GstAudioFormat rfmt)
{
guint i;
for (i = 0; i < G_N_ELEMENTS (fmt_map); ++i) {
- if (fmt_map[i].gst_fmt == fmt)
+ if (fmt_map[i].gst_rbfmt == fmt && fmt_map[i].gst_rfmt == rfmt)
return fmt_map[i].oss_fmt;
}
return 0;
@@ -200,15 +207,15 @@ gst_oss4_audio_detect_rates (GstObject * obj, oss_audioinfo * ai,
}
static void
-gst_oss4_audio_add_channel_layout (GstObject * obj, guint64 layout,
- guint num_channels, GstStructure * s)
+gst_oss4_audio_get_channel_layout (GstObject * obj, guint64 layout,
+ guint num_channels, GstAudioChannelPosition * ch_layout)
{
const GstAudioChannelPosition pos_map[16] = {
GST_AUDIO_CHANNEL_POSITION_NONE, /* 0 = dunno */
GST_AUDIO_CHANNEL_POSITION_FRONT_LEFT, /* 1 = left */
GST_AUDIO_CHANNEL_POSITION_FRONT_RIGHT, /* 2 = right */
GST_AUDIO_CHANNEL_POSITION_FRONT_CENTER, /* 3 = center */
- GST_AUDIO_CHANNEL_POSITION_LFE, /* 4 = lfe */
+ GST_AUDIO_CHANNEL_POSITION_LFE1, /* 4 = lfe */
GST_AUDIO_CHANNEL_POSITION_SIDE_LEFT, /* 5 = left surround */
GST_AUDIO_CHANNEL_POSITION_SIDE_RIGHT, /* 6 = right surround */
GST_AUDIO_CHANNEL_POSITION_REAR_LEFT, /* 7 = left rear */
@@ -221,12 +228,9 @@ gst_oss4_audio_add_channel_layout (GstObject * obj, guint64 layout,
GST_AUDIO_CHANNEL_POSITION_NONE,
GST_AUDIO_CHANNEL_POSITION_NONE
};
- GstAudioChannelPosition ch_layout[8] = { 0, };
guint speaker_pos; /* speaker position as defined by OSS */
guint i;
- g_return_if_fail (num_channels <= G_N_ELEMENTS (ch_layout));
-
for (i = 0; i < num_channels; ++i) {
/* layout contains up to 16 speaker positions, with each taking up 4 bits */
speaker_pos = (guint) ((layout >> (i * 4)) & 0x0f);
@@ -238,7 +242,7 @@ gst_oss4_audio_add_channel_layout (GstObject * obj, guint64 layout,
ch_layout[i] = pos_map[speaker_pos];
}
- gst_audio_set_channel_positions (s, ch_layout);
+
return;
no_layout:
@@ -253,11 +257,64 @@ no_layout:
for (i = 0; i < num_channels; ++i) {
ch_layout[i] = GST_AUDIO_CHANNEL_POSITION_NONE;
}
- gst_audio_set_channel_positions (s, ch_layout);
return;
}
}
+static void
+gst_oss4_audio_set_ringbuffer_channel_layout (GstObject * obj, gint fd,
+ GstAudioRingBufferSpec * spec)
+{
+ guint num_channels;
+ guint64 layout = 0;
+ GstAudioRingBuffer *rb;
+ GstAudioChannelPosition ch_layout[8] = { 0, };
+
+ num_channels = GST_AUDIO_INFO_CHANNELS (&spec->info);
+ if (num_channels < 3 || num_channels > 9)
+ return;
+
+ if (spec->type != GST_AUDIO_RING_BUFFER_FORMAT_TYPE_RAW)
+ return;
+
+ if (GST_IS_OSS4_SINK (obj)) {
+ rb = GST_AUDIO_BASE_SINK (obj)->ringbuffer;
+ } else if (GST_IS_OSS4_SOURCE (obj)) {
+ rb = GST_AUDIO_BASE_SRC (obj)->ringbuffer;
+ } else
+ g_assert_not_reached ();
+
+ /* -1 = get info for currently open device (fd). This will fail with
+ * OSS build <= 1013 because of a bug in OSS */
+ if (ioctl (fd, SNDCTL_DSP_GET_CHNORDER, &layout) == -1) {
+ GST_WARNING_OBJECT (obj, "couldn't query channel layout, assuming default");
+ layout = CHNORDER_NORMAL;
+ }
+ GST_DEBUG_OBJECT (obj, "channel layout: %08" G_GINT64_MODIFIER "x", layout);
+
+
+ gst_oss4_audio_get_channel_layout (obj, layout, num_channels, ch_layout);
+ gst_audio_ring_buffer_set_channel_positions (rb, ch_layout);
+
+ return;
+}
+
+static void
+gst_oss4_audio_add_channel_layout (GstObject * obj, guint64 layout,
+ guint num_channels, GstStructure * s)
+{
+ GstAudioChannelPosition ch_layout[8] = { 0, };
+ guint64 mask;
+
+ g_return_if_fail (num_channels <= G_N_ELEMENTS (ch_layout));
+
+ gst_oss4_audio_get_channel_layout (obj, layout, num_channels, ch_layout);
+ if (gst_audio_channel_positions_to_mask (ch_layout, num_channels, &mask))
+ gst_structure_set (s, "channel-mask", GST_TYPE_BITMASK, mask, NULL);
+
+ return;
+}
+
/* arbitrary max. limit */
#define GST_OSS4_MIN_CHANNELS 1
#define GST_OSS4_MAX_CHANNELS 4096
@@ -403,8 +460,8 @@ done:
chan_s = gst_caps_get_structure (chan_caps, j);
if ((val = gst_structure_get_value (chan_s, "channels")))
gst_structure_set_value (s, "channels", val);
- if ((val = gst_structure_get_value (chan_s, "channel-positions")))
- gst_structure_set_value (s, "channel-positions", val);
+ if ((val = gst_structure_get_value (chan_s, "channel-mask")))
+ gst_structure_set_value (s, "channel-mask", val);
gst_caps_append_structure (out_caps, s);
s = NULL;
@@ -458,7 +515,7 @@ gst_oss4_audio_probe_caps (GstObject * obj, int fd)
}
}
- caps = gst_caps_do_simplify (caps);
+ caps = gst_caps_simplify (caps);
GST_LOG_OBJECT (obj, "formats: %" GST_PTR_FORMAT, caps);
if (!gst_oss4_audio_detect_rates (obj, &ai, caps))
@@ -505,7 +562,7 @@ gst_oss4_audio_get_template_caps (void)
gst_oss4_append_format_to_caps (&fmt_map[i], caps);
}
- caps = gst_caps_do_simplify (caps);
+ caps = gst_caps_simplify (caps);
for (i = 0; i < gst_caps_get_size (caps); ++i) {
GstStructure *s;
@@ -521,17 +578,25 @@ gst_oss4_audio_get_template_caps (void)
/* called by gst_oss4_sink_prepare() and gst_oss4_source_prepare() */
gboolean
-gst_oss4_audio_set_format (GstObject * obj, int fd, GstRingBufferSpec * spec)
+gst_oss4_audio_set_format (GstObject * obj, int fd,
+ GstAudioRingBufferSpec * spec)
{
struct audio_buf_info info = { 0, };
- int fmt, chans, rate;
+ int ofmt, fmt, chans, rate, width;
+
+ fmt = gst_oss4_audio_get_oss_format (spec->type,
+ GST_AUDIO_INFO_FORMAT (&spec->info));
- fmt = gst_oss4_audio_get_oss_format (spec->format);
if (fmt == 0)
goto wrong_format;
- if (spec->type == GST_BUFTYPE_LINEAR && spec->width != 32 &&
- spec->width != 24 && spec->width != 16 && spec->width != 8) {
+ ofmt = fmt;
+ chans = GST_AUDIO_INFO_CHANNELS (&spec->info);
+ rate = GST_AUDIO_INFO_RATE (&spec->info);
+ width = GST_AUDIO_INFO_WIDTH (&spec->info);
+
+ if (spec->type == GST_AUDIO_RING_BUFFER_FORMAT_TYPE_RAW &&
+ width != 32 && width != 24 && width != 16 && width != 8) {
goto dodgy_width;
}
@@ -541,14 +606,12 @@ gst_oss4_audio_set_format (GstObject * obj, int fd, GstRingBufferSpec * spec)
goto set_format_failed;
/* channels */
- GST_LOG_OBJECT (obj, "setting channels: %d", spec->channels);
- chans = spec->channels;
+ GST_LOG_OBJECT (obj, "setting channels: %d", chans);
if (ioctl (fd, SNDCTL_DSP_CHANNELS, &chans) == -1)
goto set_channels_failed;
/* rate */
- GST_LOG_OBJECT (obj, "setting rate: %d", spec->rate);
- rate = spec->rate;
+ GST_LOG_OBJECT (obj, "setting rate: %d", rate);
if (ioctl (fd, SNDCTL_DSP_SPEED, &rate) == -1)
goto set_rate_failed;
@@ -557,8 +620,8 @@ gst_oss4_audio_set_format (GstObject * obj, int fd, GstRingBufferSpec * spec)
GST_DEBUG_OBJECT (obj, "effective rate : %d", rate);
/* make sure format, channels, and rate are the ones we requested */
- if (fmt != gst_oss4_audio_get_oss_format (spec->format) ||
- chans != spec->channels || rate != spec->rate) {
+ if (fmt != ofmt || chans != GST_AUDIO_INFO_CHANNELS (&spec->info) ||
+ rate != GST_AUDIO_INFO_RATE (&spec->info)) {
/* This shouldn't happen, but hey */
goto format_not_what_was_requested;
}
@@ -579,24 +642,25 @@ gst_oss4_audio_set_format (GstObject * obj, int fd, GstRingBufferSpec * spec)
* being too large, and the buffer will wrap. */
spec->segtotal = info.fragstotal + 4;
- spec->bytes_per_sample = (spec->width / 8) * spec->channels;
-
GST_DEBUG_OBJECT (obj, "got segsize: %d, segtotal: %d, value: %08x",
spec->segsize, spec->segtotal, info.fragsize);
+ gst_oss4_audio_set_ringbuffer_channel_layout (obj, fd, spec);
+
return TRUE;
/* ERRORS */
wrong_format:
{
GST_ELEMENT_ERROR (obj, RESOURCE, SETTINGS, (NULL),
- ("Unable to get format %d", spec->format));
+ ("Unable to get format (%d, %d)", spec->type,
+ GST_AUDIO_INFO_FORMAT (&spec->info)));
return FALSE;
}
dodgy_width:
{
GST_ELEMENT_ERROR (obj, RESOURCE, SETTINGS, (NULL),
- ("unexpected width %d", spec->width));
+ ("unexpected width %d", width));
return FALSE;
}
set_format_failed:
@@ -664,8 +728,7 @@ gst_oss4_audio_find_device (GstObject * oss)
GValueArray *arr;
gchar *ret = NULL;
- arr = gst_property_probe_probe_and_get_values_name (GST_PROPERTY_PROBE (oss),
- "device");
+ arr = gst_oss4_property_probe_get_values (GST_OBJECT (oss), "device");
if (arr != NULL) {
if (arr->n_values > 0) {
@@ -703,8 +766,7 @@ plugin_init (GstPlugin * plugin)
rank = GST_RANK_SECONDARY + 1;
if (!gst_element_register (plugin, "oss4sink", rank, GST_TYPE_OSS4_SINK) ||
- !gst_element_register (plugin, "oss4src", rank, GST_TYPE_OSS4_SOURCE) ||
- !gst_element_register (plugin, "oss4mixer", rank, GST_TYPE_OSS4_MIXER)) {
+ !gst_element_register (plugin, "oss4src", rank, GST_TYPE_OSS4_SOURCE)) {
return FALSE;
}
diff --git a/sys/oss4/oss4-audio.h b/sys/oss4/oss4-audio.h
index d22036417335cb1477d7a381d010055a3d4fbdae..fcfbb8e8cc498c957713be52a93351dc381ff087 100644
--- a/sys/oss4/oss4-audio.h
+++ b/sys/oss4/oss4-audio.h
@@ -21,7 +21,7 @@
#define GST_OSS4_AUDIO_H_
#include <gst/gst.h>
-#include <gst/audio/gstringbuffer.h>
+#include <gst/audio/gstaudioringbuffer.h>
/* This is the minimum version we require */
#define GST_MIN_OSS4_VERSION 0x040003
@@ -32,7 +32,7 @@ gboolean gst_oss4_audio_check_version (GstObject * obj, int fd);
GstCaps * gst_oss4_audio_probe_caps (GstObject * obj, int fd);
-gboolean gst_oss4_audio_set_format (GstObject * obj, int fd, GstRingBufferSpec * spec);
+gboolean gst_oss4_audio_set_format (GstObject * obj, int fd, GstAudioRingBufferSpec * spec);
GstCaps * gst_oss4_audio_get_template_caps (void);
diff --git a/sys/oss4/oss4-mixer-enum.c b/sys/oss4/oss4-mixer-enum.c
deleted file mode 100644
index 4b64bb1fc47e1f52542b9dc6259ac7ab5f1e9d8d..0000000000000000000000000000000000000000
--- a/sys/oss4/oss4-mixer-enum.c
+++ /dev/null
@@ -1,269 +0,0 @@
-/* GStreamer OSS4 mixer enumeration control
- * Copyright (C) 2007-2008 Tim-Philipp Müller <tim centricular net>
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Library General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Library General Public License for more details.
- *
- * You should have received a copy of the GNU Library General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- */
-
-/* An 'enum' in gnome-volume-control / GstMixer is represented by a
- * GstMixerOptions object
- */
-
-#ifdef HAVE_CONFIG_H
-#include "config.h"
-#endif
-
-#include <gst/gst-i18n-plugin.h>
-
-#define NO_LEGACY_MIXER
-#include "oss4-mixer.h"
-#include "oss4-mixer-enum.h"
-#include "oss4-soundcard.h"
-
-GST_DEBUG_CATEGORY_EXTERN (oss4mixer_debug);
-#define GST_CAT_DEFAULT oss4mixer_debug
-
-static GList *gst_oss4_mixer_enum_get_values (GstMixerOptions * options);
-
-/* GstMixerTrack is a plain GObject, so let's just use the GLib macro here */
-G_DEFINE_TYPE (GstOss4MixerEnum, gst_oss4_mixer_enum, GST_TYPE_MIXER_OPTIONS);
-
-static void
-gst_oss4_mixer_enum_init (GstOss4MixerEnum * e)
-{
- e->need_update = TRUE;
-}
-
-static void
-gst_oss4_mixer_enum_dispose (GObject * obj)
-{
- GstMixerOptions *options = GST_MIXER_OPTIONS (obj);
-
- /* our list is a flat list with constant strings, but the GstMixerOptions
- * dispose will try to g_free the contained strings, so clean up the list
- * before chaining up to GstMixerOptions */
- g_list_free (options->values);
- options->values = NULL;
-
- G_OBJECT_CLASS (gst_oss4_mixer_enum_parent_class)->dispose (obj);
-}
-
-static void
-gst_oss4_mixer_enum_class_init (GstOss4MixerEnumClass * klass)
-{
- GObjectClass *gobject_class = (GObjectClass *) klass;
- GstMixerOptionsClass *mixeroptions_class = (GstMixerOptionsClass *) klass;
-
- gobject_class->dispose = gst_oss4_mixer_enum_dispose;
- mixeroptions_class->get_values = gst_oss4_mixer_enum_get_values;
-}
-
-static GList *
-gst_oss4_mixer_enum_get_values_locked (GstMixerOptions * options)
-{
- GstOss4MixerEnum *e = GST_OSS4_MIXER_ENUM_CAST (options);
- GList *oldlist, *list = NULL;
- int i;
-
- /* if current list of values is empty, update/re-check in any case */
- if (!e->need_update && options->values != NULL)
- return options->values;
-
- GST_LOG_OBJECT (e, "updating available values for %s", e->mc->mixext.extname);
-
- for (i = 0; i < e->mc->mixext.maxvalue; ++i) {
- const gchar *s;
-
- s = g_quark_to_string (e->mc->enum_vals[i]);
- if (MIXEXT_ENUM_IS_AVAILABLE (e->mc->mixext, i)) {
- GST_LOG_OBJECT (e, "option '%s' is available", s);
- list = g_list_prepend (list, (gpointer) s);
- } else {
- GST_LOG_OBJECT (e, "option '%s' is currently not available", s);
- }
- }
-
- list = g_list_reverse (list);
-
- /* this is not thread-safe, but then the entire GstMixer API isn't really,
- * since we return foo->list and not a copy and don't take any locks, so
- * not much we can do here but pray; we're usually either called from _new()
- * or from within _get_values() though, so it should be okay. We could use
- * atomic ops here, but I'm not sure how much more that really buys us.*/
- oldlist = options->values; /* keep window small */
- options->values = list;
- g_list_free (oldlist);
-
- e->need_update = FALSE;
-
- return options->values;
-}
-
-static GList *
-gst_oss4_mixer_enum_get_values (GstMixerOptions * options)
-{
- GstOss4MixerEnum *e = GST_OSS4_MIXER_ENUM (options);
- GList *list;
-
- /* we take the lock here mostly to serialise ioctls with the watch thread */
- GST_OBJECT_LOCK (e->mixer);
-
- list = gst_oss4_mixer_enum_get_values_locked (options);
-
- GST_OBJECT_UNLOCK (e->mixer);
-
- return list;
-}
-
-static const gchar *
-gst_oss4_mixer_enum_get_current_value (GstOss4MixerEnum * e)
-{
- const gchar *cur_val = NULL;
-
- if (e->mc->enum_vals != NULL && e->mc->last_val < e->mc->mixext.maxvalue) {
- cur_val = g_quark_to_string (e->mc->enum_vals[e->mc->last_val]);
- }
-
- return cur_val;
-}
-
-static gboolean
-gst_oss4_mixer_enum_update_current (GstOss4MixerEnum * e)
-{
- int cur = -1;
-
- if (!gst_oss4_mixer_get_control_val (e->mixer, e->mc, &cur))
- return FALSE;
-
- if (cur < 0 || cur >= e->mc->mixext.maxvalue) {
- GST_WARNING_OBJECT (e, "read value %d out of bounds [0-%d]", cur,
- e->mc->mixext.maxvalue - 1);
- e->mc->last_val = 0;
- return FALSE;
- }
-
- return TRUE;
-}
-
-gboolean
-gst_oss4_mixer_enum_set_option (GstOss4MixerEnum * e, const gchar * value)
-{
- GQuark q;
- int i;
-
- q = g_quark_try_string (value);
- if (q == 0) {
- GST_WARNING_OBJECT (e, "unknown option '%s'", value);
- return FALSE;
- }
-
- for (i = 0; i < e->mc->mixext.maxvalue; ++i) {
- if (q == e->mc->enum_vals[i])
- break;
- }
-
- if (i >= e->mc->mixext.maxvalue) {
- GST_WARNING_OBJECT (e, "option '%s' is not valid for this control", value);
- return FALSE;
- }
-
- GST_LOG_OBJECT (e, "option '%s' = %d", value, i);
-
- if (!MIXEXT_ENUM_IS_AVAILABLE (e->mc->mixext, i)) {
- GST_WARNING_OBJECT (e, "option '%s' is not selectable currently", value);
- return FALSE;
- }
-
- if (!gst_oss4_mixer_set_control_val (e->mixer, e->mc, i)) {
- GST_WARNING_OBJECT (e, "could not set option '%s' (%d)", value, i);
- return FALSE;
- }
-
- /* and re-read current value with sanity checks (or could just assign here) */
- gst_oss4_mixer_enum_update_current (e);
-
- return TRUE;
-}
-
-const gchar *
-gst_oss4_mixer_enum_get_option (GstOss4MixerEnum * e)
-{
- const gchar *cur_str = NULL;
-
- if (!gst_oss4_mixer_enum_update_current (e)) {
- GST_WARNING_OBJECT (e, "failed to read current value");
- return NULL;
- }
-
- cur_str = gst_oss4_mixer_enum_get_current_value (e);
- GST_LOG_OBJECT (e, "%s (%d)", GST_STR_NULL (cur_str), e->mc->last_val);
- return cur_str;
-}
-
-GstMixerTrack *
-gst_oss4_mixer_enum_new (GstOss4Mixer * mixer, GstOss4MixerControl * mc)
-{
- GstOss4MixerEnum *e;
- GstMixerTrack *track;
-
- e = g_object_new (GST_TYPE_OSS4_MIXER_ENUM, "untranslated-label",
- mc->mixext.extname, NULL);
- e->mixer = mixer;
- e->mc = mc;
-
- track = GST_MIXER_TRACK (e);
-
- /* caller will set track->label and track->flags */
-
- track->num_channels = 0;
- track->min_volume = 0;
- track->max_volume = 0;
-
- (void) gst_oss4_mixer_enum_get_values_locked (GST_MIXER_OPTIONS (track));
-
- if (!gst_oss4_mixer_enum_update_current (e)) {
- GST_WARNING_OBJECT (track, "failed to read current value, returning NULL");
- g_object_unref (track);
- track = NULL;
- }
-
- GST_LOG_OBJECT (e, "current value: %d (%s)", e->mc->last_val,
- gst_oss4_mixer_enum_get_current_value (e));
-
- return track;
-}
-
-/* This is called from the watch thread */
-void
-gst_oss4_mixer_enum_process_change_unlocked (GstMixerTrack * track)
-{
- GstOss4MixerEnum *e = GST_OSS4_MIXER_ENUM_CAST (track);
-
- gchar *cur;
-
- if (!e->mc->changed && !e->mc->list_changed)
- return;
-
- if (e->mc->list_changed) {
- gst_mixer_options_list_changed (GST_MIXER (e->mixer),
- GST_MIXER_OPTIONS (e));
- }
-
- GST_OBJECT_LOCK (e->mixer);
- cur = (gchar *) gst_oss4_mixer_enum_get_current_value (e);
- GST_OBJECT_UNLOCK (e->mixer);
-
- gst_mixer_option_changed (GST_MIXER (e->mixer), GST_MIXER_OPTIONS (e), cur);
-}
diff --git a/sys/oss4/oss4-mixer-enum.h b/sys/oss4/oss4-mixer-enum.h
deleted file mode 100644
index 9fd81669078bb225c8e0d2d6bf0d2624da452a02..0000000000000000000000000000000000000000
--- a/sys/oss4/oss4-mixer-enum.h
+++ /dev/null
@@ -1,67 +0,0 @@
-/* GStreamer OSS4 mixer on/off enum control
- * Copyright (C) 2007-2008 Tim-Philipp Müller <tim centricular net>
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Library General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Library General Public License for more details.
- *
- * You should have received a copy of the GNU Library General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- */
-
-#ifndef GST_OSS4_MIXER_ENUM_H
-#define GST_OSS4_MIXER_ENUM_H
-
-#include <gst/gst.h>
-#include <gst/interfaces/mixer.h>
-
-#include "oss4-mixer.h"
-
-G_BEGIN_DECLS
-
-#define GST_TYPE_OSS4_MIXER_ENUM (gst_oss4_mixer_enum_get_type())
-#define GST_OSS4_MIXER_ENUM(obj) (G_TYPE_CHECK_INSTANCE_CAST((obj),GST_TYPE_OSS4_MIXER_ENUM,GstOss4MixerEnum))
-#define GST_OSS4_MIXER_ENUM_CAST(obj) ((GstOss4MixerEnum *)(obj))
-#define GST_OSS4_MIXER_ENUM_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST((klass),GST_TYPE_OSS4_MIXER_ENUM,GstOss4MixerEnumClass))
-#define GST_IS_OSS4_MIXER_ENUM(obj) (G_TYPE_CHECK_INSTANCE_TYPE((obj),GST_TYPE_OSS4_MIXER_ENUM))
-#define GST_IS_OSS4_MIXER_ENUM_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE((klass),GST_TYPE_OSS4_MIXER_ENUM))
-
-typedef struct _GstOss4MixerEnum GstOss4MixerEnum;
-typedef struct _GstOss4MixerEnumClass GstOss4MixerEnumClass;
-
-struct _GstOss4MixerEnum {
- GstMixerOptions mixer_option;
-
- GstOss4MixerControl * mc;
- GstOss4Mixer * mixer; /* the mixer we belong to (no ref taken) */
-
- gboolean need_update;
-};
-
-struct _GstOss4MixerEnumClass {
- GstMixerOptionsClass mixer_option_class;
-};
-
-GType gst_oss4_mixer_enum_get_type (void);
-
-gboolean gst_oss4_mixer_enum_set_option (GstOss4MixerEnum * e, const gchar * value);
-
-const gchar * gst_oss4_mixer_enum_get_option (GstOss4MixerEnum * e);
-
-GstMixerTrack * gst_oss4_mixer_enum_new (GstOss4Mixer * mixer, GstOss4MixerControl * mc);
-
-void gst_oss4_mixer_enum_process_change_unlocked (GstMixerTrack * track);
-
-G_END_DECLS
-
-#endif /* GST_OSS4_MIXER_ENUM_H */
-
-
diff --git a/sys/oss4/oss4-mixer-slider.c b/sys/oss4/oss4-mixer-slider.c
deleted file mode 100644
index e71d1348fe2c334fa1866583d2e22d48f1ec0d8a..0000000000000000000000000000000000000000
--- a/sys/oss4/oss4-mixer-slider.c
+++ /dev/null
@@ -1,311 +0,0 @@
-/* GStreamer OSS4 mixer slider control
- * Copyright (C) 2007-2008 Tim-Philipp Müller <tim centricular net>
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Library General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Library General Public License for more details.
- *
- * You should have received a copy of the GNU Library General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- */
-
-/* A 'slider' in gnome-volume-control / GstMixer is represented by a
- * GstMixerTrack with one or more channels.
- *
- * A slider should be either flagged as INPUT or OUTPUT (mostly because of
- * gnome-volume-control being littered with g_asserts for everything it doesn't
- * expect).
- *
- * From mixertrack.h:
- * "Input tracks can have 'recording' enabled, which means that any input will
- * be hearable into the speakers that are attached to the output. Mute is
- * obvious."
- */
-
-#ifdef HAVE_CONFIG_H
-#include "config.h"
-#endif
-
-#include <stdio.h>
-#include <stdlib.h>
-#include <fcntl.h>
-#include <unistd.h>
-#include <string.h>
-#include <errno.h>
-#include <sys/ioctl.h>
-
-#include <gst/gst-i18n-plugin.h>
-
-#define NO_LEGACY_MIXER
-#include "oss4-mixer-slider.h"
-
-GST_DEBUG_CATEGORY_EXTERN (oss4mixer_debug);
-#define GST_CAT_DEFAULT oss4mixer_debug
-
-/* GstMixerTrack is a plain GObject, so let's just use the GLib macro here */
-G_DEFINE_TYPE (GstOss4MixerSlider, gst_oss4_mixer_slider, GST_TYPE_MIXER_TRACK);
-
-static void
-gst_oss4_mixer_slider_class_init (GstOss4MixerSliderClass * klass)
-{
- /* nothing to do here */
-}
-
-static void
-gst_oss4_mixer_slider_init (GstOss4MixerSlider * s)
-{
- /* nothing to do here */
-}
-
-static int
-gst_oss4_mixer_slider_pack_volume (GstOss4MixerSlider * s, const gint * volumes)
-{
- int val = 0;
-
- switch (s->mc->mixext.type) {
- case MIXT_MONOSLIDER:
- case MIXT_MONOSLIDER16:
- case MIXT_SLIDER:
- val = volumes[0];
- break;
- case MIXT_STEREOSLIDER:
- val = ((volumes[1] & 0xff) << 8) | (volumes[0] & 0xff);
- break;
- case MIXT_STEREOSLIDER16:
- val = ((volumes[1] & 0xffff) << 16) | (volumes[0] & 0xffff);
- break;
- default:
- g_return_val_if_reached (0);
- }
- return val;
-}
-
-static void
-gst_oss4_mixer_slider_unpack_volume (GstOss4MixerSlider * s, int v,
- gint * volumes)
-{
- guint32 val; /* use uint so bitshifting the highest bit works right */
-
- val = (guint32) v;
- switch (s->mc->mixext.type) {
- case MIXT_SLIDER:
- volumes[0] = val;
- break;
- case MIXT_MONOSLIDER:
- /* oss repeats the value in the upper bits, as if it was stereo */
- volumes[0] = val & 0x00ff;
- break;
- case MIXT_MONOSLIDER16:
- /* oss repeats the value in the upper bits, as if it was stereo */
- volumes[0] = val & 0x0000ffff;
- break;
- case MIXT_STEREOSLIDER:
- volumes[0] = (val & 0x00ff);
- volumes[1] = (val & 0xff00) >> 8;
- break;
- case MIXT_STEREOSLIDER16:
- volumes[0] = (val & 0x0000ffff);
- volumes[1] = (val & 0xffff0000) >> 16;
- break;
- default:
- g_return_if_reached ();
- }
-}
-
-gboolean
-gst_oss4_mixer_slider_get_volume (GstOss4MixerSlider * s, gint * volumes)
-{
- GstMixerTrack *track = GST_MIXER_TRACK (s);
- int v = 0;
-
- /* if we're supposed to be muted, and don't have an actual mute control
- * (ie. 'simulate' the mute), then just return the volume as saved, not
- * the actually set volume which is most likely 0 */
- if (GST_MIXER_TRACK_HAS_FLAG (track, GST_MIXER_TRACK_MUTE) && !s->mc->mute) {
- volumes[0] = s->volumes[0];
- if (track->num_channels == 2)
- volumes[1] = s->volumes[1];
- return TRUE;
- }
-
- if (!gst_oss4_mixer_get_control_val (s->mixer, s->mc, &v))
- return FALSE;
-
- gst_oss4_mixer_slider_unpack_volume (s, v, volumes);
-
- if (track->num_channels > 1) {
- GST_LOG_OBJECT (s, "volume: left=%d, right=%d", volumes[0], volumes[1]);
- } else {
- GST_LOG_OBJECT (s, "volume: mono=%d", volumes[0]);
- }
-
- return TRUE;
-}
-
-gboolean
-gst_oss4_mixer_slider_set_volume (GstOss4MixerSlider * s, const gint * volumes)
-{
- GstMixerTrack *track = GST_MIXER_TRACK (s);
- int val = 0;
-
- /* if we're supposed to be muted, and are 'simulating' the mute because
- * we don't have a mute control, don't actually change the volume, just
- * save it as the new desired volume for later when we get unmuted again */
- if (!GST_MIXER_TRACK_HAS_FLAG (track, GST_MIXER_TRACK_NO_MUTE)) {
- if (GST_MIXER_TRACK_HAS_FLAG (track, GST_MIXER_TRACK_MUTE) && !s->mc->mute)
- goto done;
- }
-
- val = gst_oss4_mixer_slider_pack_volume (s, volumes);
-
- if (track->num_channels > 1) {
- GST_LOG_OBJECT (s, "left=%d, right=%d", volumes[0], volumes[1]);
- } else {
- GST_LOG_OBJECT (s, "mono=%d", volumes[0]);
- }
-
- if (!gst_oss4_mixer_set_control_val (s->mixer, s->mc, val))
- return FALSE;
-
-done:
-
- s->volumes[0] = volumes[0];
- if (track->num_channels == 2)
- s->volumes[1] = volumes[1];
-
- return TRUE;
-}
-
-gboolean
-gst_oss4_mixer_slider_set_record (GstOss4MixerSlider * s, gboolean record)
-{
- /* There doesn't seem to be a way to do this using the OSS4 mixer API, so
- * just do nothing here for now. */
- return FALSE;
-}
-
-gboolean
-gst_oss4_mixer_slider_set_mute (GstOss4MixerSlider * s, gboolean mute)
-{
- GstMixerTrack *track = GST_MIXER_TRACK (s);
- gboolean ret;
-
- /* if the control does not support muting, then do not do anything */
- if (GST_MIXER_TRACK_HAS_FLAG (track, GST_MIXER_TRACK_NO_MUTE)) {
- return TRUE;
- }
-
- /* If we do not have a mute control, simulate mute (which is a bit broken,
- * since we can not differentiate between capture/playback volume etc., so
- * we just assume that setting the volume to 0 would be the same as muting
- * this control) */
- if (s->mc->mute == NULL) {
- int volume;
-
- if (mute) {
- /* make sure the current volume values get saved. */
- gst_oss4_mixer_slider_get_volume (s, s->volumes);
- volume = 0;
- } else {
- volume = gst_oss4_mixer_slider_pack_volume (s, s->volumes);
- }
- ret = gst_oss4_mixer_set_control_val (s->mixer, s->mc, volume);
- } else {
- ret = gst_oss4_mixer_set_control_val (s->mixer, s->mc->mute, !!mute);
- }
-
- if (mute) {
- track->flags |= GST_MIXER_TRACK_MUTE;
- } else {
- track->flags &= ~GST_MIXER_TRACK_MUTE;
- }
-
- return ret;
-}
-
-GstMixerTrack *
-gst_oss4_mixer_slider_new (GstOss4Mixer * mixer, GstOss4MixerControl * mc)
-{
- GstOss4MixerSlider *s;
- GstMixerTrack *track;
- gint volumes[2] = { 0, };
-
- s = g_object_new (GST_TYPE_OSS4_MIXER_SLIDER, "untranslated-label",
- mc->mixext.extname, NULL);
-
- track = GST_MIXER_TRACK (s);
-
- /* caller will set track->label and track->flags */
-
- s->mc = mc;
- s->mixer = mixer;
-
- /* we don't do value scaling but just present a scale of 0-maxvalue */
- track->min_volume = 0;
- track->max_volume = mc->mixext.maxvalue;
-
- switch (mc->mixext.type) {
- case MIXT_MONOSLIDER:
- case MIXT_MONOSLIDER16:
- case MIXT_SLIDER:
- track->num_channels = 1;
- break;
- case MIXT_STEREOSLIDER:
- case MIXT_STEREOSLIDER16:
- track->num_channels = 2;
- break;
- default:
- g_return_val_if_reached (NULL);
- }
-
- GST_LOG_OBJECT (track, "min=%d, max=%d, channels=%d", track->min_volume,
- track->max_volume, track->num_channels);
-
- if (!gst_oss4_mixer_slider_get_volume (s, volumes)) {
- GST_WARNING_OBJECT (track, "failed to read volume, returning NULL");
- g_object_unref (track);
- track = NULL;
- }
-
- return track;
-}
-
-/* This is called from the watch thread */
-void
-gst_oss4_mixer_slider_process_change_unlocked (GstMixerTrack * track)
-{
- GstOss4MixerSlider *s = GST_OSS4_MIXER_SLIDER_CAST (track);
-
- if (s->mc->mute != NULL && s->mc->mute->changed) {
- gst_mixer_mute_toggled (GST_MIXER (s->mixer), track,
- !!s->mc->mute->last_val);
- } else {
- /* nothing to do here, since we don't/can't easily implement the record
- * flag */
- }
-
- if (s->mc->changed) {
- gint volumes[2] = { 0, 0 };
-
- gst_oss4_mixer_slider_unpack_volume (s, s->mc->last_val, volumes);
-
- /* if we 'simulate' the mute, update flag when the volume changes */
- if (s->mc->mute == NULL) {
- if (volumes[0] == 0 && volumes[1] == 0) {
- track->flags |= GST_MIXER_TRACK_MUTE;
- } else {
- track->flags &= ~GST_MIXER_TRACK_MUTE;
- }
- }
-
- gst_mixer_volume_changed (GST_MIXER (s->mixer), track, volumes);
- }
-}
diff --git a/sys/oss4/oss4-mixer-slider.h b/sys/oss4/oss4-mixer-slider.h
deleted file mode 100644
index 3bee33f806273be2434c103317aaf812f65af4c6..0000000000000000000000000000000000000000
--- a/sys/oss4/oss4-mixer-slider.h
+++ /dev/null
@@ -1,70 +0,0 @@
-/* GStreamer OSS4 mixer slider control
- * Copyright (C) 2007-2008 Tim-Philipp Müller <tim centricular net>
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Library General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Library General Public License for more details.
- *
- * You should have received a copy of the GNU Library General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- */
-
-#ifndef GST_OSS4_MIXER_SLIDER_H
-#define GST_OSS4_MIXER_SLIDER_H
-
-#include <gst/gst.h>
-#include <gst/interfaces/mixer.h>
-
-#include "oss4-mixer.h"
-
-G_BEGIN_DECLS
-
-#define GST_TYPE_OSS4_MIXER_SLIDER (gst_oss4_mixer_slider_get_type())
-#define GST_OSS4_MIXER_SLIDER(obj) (G_TYPE_CHECK_INSTANCE_CAST((obj),GST_TYPE_OSS4_MIXER_SLIDER,GstOss4MixerSlider))
-#define GST_OSS4_MIXER_SLIDER_CAST(obj) ((GstOss4MixerSlider *)(obj))
-#define GST_OSS4_MIXER_SLIDER_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST((klass),GST_TYPE_OSS4_MIXER_SLIDER,GstOss4MixerSliderClass))
-#define GST_IS_OSS4_MIXER_SLIDER(obj) (G_TYPE_CHECK_INSTANCE_TYPE((obj),GST_TYPE_OSS4_MIXER_SLIDER))
-#define GST_IS_OSS4_MIXER_SLIDER_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE((klass),GST_TYPE_OSS4_MIXER_SLIDER))
-
-typedef struct _GstOss4MixerSlider GstOss4MixerSlider;
-typedef struct _GstOss4MixerSliderClass GstOss4MixerSliderClass;
-
-struct _GstOss4MixerSlider {
- GstMixerTrack mixer_track;
-
- GstOss4MixerControl * mc;
- GstOss4Mixer * mixer; /* the mixer we belong to (no ref taken) */
- gint volumes[2]; /* left/mono, right */
-};
-
-struct _GstOss4MixerSliderClass {
- GstMixerTrackClass mixer_track_class;
-};
-
-GType gst_oss4_mixer_slider_get_type (void);
-
-GstMixerTrack * gst_oss4_mixer_slider_new (GstOss4Mixer * mixer, GstOss4MixerControl * mc);
-
-gboolean gst_oss4_mixer_slider_get_volume (GstOss4MixerSlider * s, gint * volumes);
-
-gboolean gst_oss4_mixer_slider_set_volume (GstOss4MixerSlider * s, const gint * volumes);
-
-gboolean gst_oss4_mixer_slider_set_record (GstOss4MixerSlider * s, gboolean record);
-
-gboolean gst_oss4_mixer_slider_set_mute (GstOss4MixerSlider * s, gboolean mute);
-
-void gst_oss4_mixer_slider_process_change_unlocked (GstMixerTrack * track);
-
-G_END_DECLS
-
-#endif /* GST_OSS4_MIXER_SLIDER_H */
-
-
diff --git a/sys/oss4/oss4-mixer-switch.c b/sys/oss4/oss4-mixer-switch.c
deleted file mode 100644
index 0a6ce5b93d4cf3b1145296a9621ca6fd4777387d..0000000000000000000000000000000000000000
--- a/sys/oss4/oss4-mixer-switch.c
+++ /dev/null
@@ -1,150 +0,0 @@
-/* GStreamer OSS4 mixer on/off switch control
- * Copyright (C) 2007-2008 Tim-Philipp Müller <tim centricular net>
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Library General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Library General Public License for more details.
- *
- * You should have received a copy of the GNU Library General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- */
-
-/* A simple ON/OFF 'switch' in gnome-volume-control / GstMixer is represented
- * by a GstMixerTrack with no channels.
- */
-
-#ifdef HAVE_CONFIG_H
-#include "config.h"
-#endif
-
-#include <gst/gst-i18n-plugin.h>
-
-#define NO_LEGACY_MIXER
-#include "oss4-mixer-switch.h"
-#include "oss4-soundcard.h"
-
-GST_DEBUG_CATEGORY_EXTERN (oss4mixer_debug);
-#define GST_CAT_DEFAULT oss4mixer_debug
-
-/* GstMixerTrack is a plain GObject, so let's just use the GLib macro here */
-G_DEFINE_TYPE (GstOss4MixerSwitch, gst_oss4_mixer_switch, GST_TYPE_MIXER_TRACK);
-
-static void
-gst_oss4_mixer_switch_class_init (GstOss4MixerSwitchClass * klass)
-{
- /* nothing to do here */
-}
-
-static void
-gst_oss4_mixer_switch_init (GstOss4MixerSwitch * s)
-{
- /* nothing to do here */
-}
-
-gboolean
-gst_oss4_mixer_switch_set (GstOss4MixerSwitch * s, gboolean disabled)
-{
- GstMixerTrack *track;
- int newval;
-
- track = GST_MIXER_TRACK (s);
-
- newval = disabled ? GST_MIXER_TRACK_MUTE : 0;
-
- if (newval == (track->flags & GST_MIXER_TRACK_MUTE)) {
- GST_LOG_OBJECT (s, "switch is already %d, doing nothing", newval);
- return TRUE;
- }
-
- if (!gst_oss4_mixer_set_control_val (s->mixer, s->mc, !disabled)) {
- GST_WARNING_OBJECT (s, "could not set switch to %d", !disabled);
- return FALSE;
- }
-
- if (disabled) {
- track->flags |= GST_MIXER_TRACK_MUTE;
- } else {
- track->flags &= ~GST_MIXER_TRACK_MUTE;
- }
-
- GST_LOG_OBJECT (s, "set switch to %d", newval);
-
- return TRUE;
-}
-
-gboolean
-gst_oss4_mixer_switch_get (GstOss4MixerSwitch * s, gboolean * disabled)
-{
- GstMixerTrack *track;
- int enabled = -1;
-
- track = GST_MIXER_TRACK (s);
-
- if (!gst_oss4_mixer_get_control_val (s->mixer, s->mc, &enabled)
- || (enabled < 0)) {
- GST_WARNING_OBJECT (s, "could not get switch state");
- return FALSE;
- }
-
- if (enabled) {
- track->flags &= ~GST_MIXER_TRACK_MUTE;
- } else {
- track->flags |= GST_MIXER_TRACK_MUTE;
- }
- *disabled = (enabled == 0);
-
- return TRUE;
-}
-
-GstMixerTrack *
-gst_oss4_mixer_switch_new (GstOss4Mixer * mixer, GstOss4MixerControl * mc)
-{
- GstOss4MixerSwitch *s;
- GstMixerTrack *track;
- int cur = -1;
-
- s = g_object_new (GST_TYPE_OSS4_MIXER_SWITCH, "untranslated-label",
- mc->mixext.extname, NULL);
-
- s->mixer = mixer;
- s->mc = mc;
-
- track = GST_MIXER_TRACK (s);
-
- /* caller will set track->label and track->flags */
-
- track->num_channels = 0;
- track->min_volume = 0;
- track->max_volume = 0;
-
- if (!gst_oss4_mixer_get_control_val (s->mixer, s->mc, &cur) || cur < 0)
- return NULL;
-
- if (cur) {
- track->flags &= ~GST_MIXER_TRACK_MUTE;
- } else {
- track->flags |= GST_MIXER_TRACK_MUTE;
- }
-
- return track;
-}
-
-/* This is called from the watch thread */
-void
-gst_oss4_mixer_switch_process_change_unlocked (GstMixerTrack * track)
-{
- GstOss4MixerSwitch *s = GST_OSS4_MIXER_SWITCH_CAST (track);
-
- if (!s->mc->changed)
- return;
-
- gst_mixer_mute_toggled (GST_MIXER (s->mixer), track, !s->mc->last_val);
-}
diff --git a/sys/oss4/oss4-mixer-switch.h b/sys/oss4/oss4-mixer-switch.h
deleted file mode 100644
index a8ab83ffab47e15551c55db87efb776ce6258ef2..0000000000000000000000000000000000000000
--- a/sys/oss4/oss4-mixer-switch.h
+++ /dev/null
@@ -1,65 +0,0 @@
-/* GStreamer OSS4 mixer on/off switch control
- * Copyright (C) 2007-2008 Tim-Philipp Müller <tim centricular net>
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Library General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Library General Public License for more details.
- *
- * You should have received a copy of the GNU Library General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- */
-
-#ifndef GST_OSS4_MIXER_SWITCH_H
-#define GST_OSS4_MIXER_SWITCH_H
-
-#include <gst/gst.h>
-#include <gst/interfaces/mixer.h>
-
-#include "oss4-mixer.h"
-
-G_BEGIN_DECLS
-
-#define GST_TYPE_OSS4_MIXER_SWITCH (gst_oss4_mixer_switch_get_type())
-#define GST_OSS4_MIXER_SWITCH(obj) (G_TYPE_CHECK_INSTANCE_CAST((obj),GST_TYPE_OSS4_MIXER_SWITCH,GstOss4MixerSwitch))
-#define GST_OSS4_MIXER_SWITCH_CAST(obj) ((GstOss4MixerSwitch *)(obj))
-#define GST_OSS4_MIXER_SWITCH_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST((klass),GST_TYPE_OSS4_MIXER_SWITCH,GstOss4MixerSwitchClass))
-#define GST_IS_OSS4_MIXER_SWITCH(obj) (G_TYPE_CHECK_INSTANCE_TYPE((obj),GST_TYPE_OSS4_MIXER_SWITCH))
-#define GST_IS_OSS4_MIXER_SWITCH_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE((klass),GST_TYPE_OSS4_MIXER_SWITCH))
-
-typedef struct _GstOss4MixerSwitch GstOss4MixerSwitch;
-typedef struct _GstOss4MixerSwitchClass GstOss4MixerSwitchClass;
-
-struct _GstOss4MixerSwitch {
- GstMixerTrack mixer_track;
-
- GstOss4MixerControl * mc;
- GstOss4Mixer * mixer; /* the mixer we belong to (no ref taken) */
-};
-
-struct _GstOss4MixerSwitchClass {
- GstMixerTrackClass mixer_track_class;
-};
-
-GType gst_oss4_mixer_switch_get_type (void);
-
-gboolean gst_oss4_mixer_switch_set (GstOss4MixerSwitch * s, gboolean enabled);
-
-gboolean gst_oss4_mixer_switch_get (GstOss4MixerSwitch * s, gboolean * enabled);
-
-GstMixerTrack * gst_oss4_mixer_switch_new (GstOss4Mixer * mixer, GstOss4MixerControl * mc);
-
-void gst_oss4_mixer_switch_process_change_unlocked (GstMixerTrack * track);
-
-G_END_DECLS
-
-#endif /* GST_OSS4_MIXER_SWITCH_H */
-
-
diff --git a/sys/oss4/oss4-mixer.c b/sys/oss4/oss4-mixer.c
deleted file mode 100644
index b1e652bc374004a007d468ba9c186f179a6ae98b..0000000000000000000000000000000000000000
--- a/sys/oss4/oss4-mixer.c
+++ /dev/null
@@ -1,1857 +0,0 @@
-/* GStreamer OSS4 mixer implementation
- * Copyright (C) 2007-2008 Tim-Philipp Müller <tim centricular net>
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Library General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Library General Public License for more details.
- *
- * You should have received a copy of the GNU Library General Public
- * License along with mixer library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- */
-
-/**
- * SECTION:element-oss4mixer
- *
- * This element lets you adjust sound input and output levels with the
- * Open Sound System (OSS) version 4. It supports the GstMixer interface, which
- * can be used to obtain a list of available mixer tracks. Set the mixer
- * element to READY state before using the GstMixer interface on it.
- *
- * <refsect2>
- * <title>Example pipelines</title>
- * <para>
- * oss4mixer can't be used in a sensible way in gst-launch.
- * </para>
- * </refsect2>
- *
- * Since: 0.10.7
- */
-
-/* Note: ioctl calls on the same open mixer device are serialised via
- * the object lock to make sure we don't do concurrent ioctls from two
- * different threads (e.g. app thread and mixer watch thread), since that
- * will probably confuse OSS. */
-
-#ifdef HAVE_CONFIG_H
-#include "config.h"
-#endif
-
-#include <stdio.h>
-#include <stdlib.h>
-#include <fcntl.h>
-#include <unistd.h>
-#include <string.h>
-#include <errno.h>
-#include <sys/ioctl.h>
-
-#include <gst/interfaces/mixer.h>
-#include <gst/gst-i18n-plugin.h>
-#include "gst/glib-compat-private.h"
-
-#include <glib/gprintf.h>
-
-#define NO_LEGACY_MIXER
-
-#include "oss4-audio.h"
-#include "oss4-mixer.h"
-#include "oss4-mixer-enum.h"
-#include "oss4-mixer-slider.h"
-#include "oss4-mixer-switch.h"
-#include "oss4-property-probe.h"
-#include "oss4-soundcard.h"
-
-#define GST_OSS4_MIXER_WATCH_INTERVAL 500 /* in millisecs, ie. 0.5s */
-
-GST_DEBUG_CATEGORY_EXTERN (oss4mixer_debug);
-#define GST_CAT_DEFAULT oss4mixer_debug
-
-#define DEFAULT_DEVICE NULL
-#define DEFAULT_DEVICE_NAME NULL
-
-enum
-{
- PROP_0,
- PROP_DEVICE,
- PROP_DEVICE_NAME
-};
-
-static void gst_oss4_mixer_init_interfaces (GType type);
-
-GST_BOILERPLATE_FULL (GstOss4Mixer, gst_oss4_mixer, GstElement,
- GST_TYPE_ELEMENT, gst_oss4_mixer_init_interfaces);
-
-static GstStateChangeReturn gst_oss4_mixer_change_state (GstElement *
- element, GstStateChange transition);
-
-static void gst_oss4_mixer_set_property (GObject * object, guint prop_id,
- const GValue * value, GParamSpec * pspec);
-static void gst_oss4_mixer_get_property (GObject * object, guint prop_id,
- GValue * value, GParamSpec * pspec);
-static void gst_oss4_mixer_finalize (GObject * object);
-
-static gboolean gst_oss4_mixer_open (GstOss4Mixer * mixer,
- gboolean silent_errors);
-static void gst_oss4_mixer_close (GstOss4Mixer * mixer);
-
-static gboolean gst_oss4_mixer_enum_control_update_enum_list (GstOss4Mixer * m,
- GstOss4MixerControl * mc);
-
-#ifndef GST_DISABLE_GST_DEBUG
-static const gchar *mixer_ext_type_get_name (gint type);
-static const gchar *mixer_ext_flags_get_string (gint flags);
-#endif
-
-static void
-gst_oss4_mixer_base_init (gpointer klass)
-{
- gst_element_class_set_static_metadata (GST_ELEMENT_CLASS (klass),
- "OSS v4 Audio Mixer", "Generic/Audio",
- "Control sound input and output levels with OSS4",
- "Tim-Philipp Müller <tim centricular net>");
-}
-
-static void
-gst_oss4_mixer_class_init (GstOss4MixerClass * klass)
-{
- GstElementClass *element_class;
- GObjectClass *gobject_class;
-
- element_class = (GstElementClass *) klass;
- gobject_class = (GObjectClass *) klass;
-
- gobject_class->finalize = gst_oss4_mixer_finalize;
- gobject_class->set_property = gst_oss4_mixer_set_property;
- gobject_class->get_property = gst_oss4_mixer_get_property;
-
- /**
- * GstOss4Mixer:device
- *
- * OSS4 mixer device (e.g. /dev/oss/hdaudio0/mix0 or /dev/mixerN)
- *
- **/
- g_object_class_install_property (gobject_class, PROP_DEVICE,
- g_param_spec_string ("device", "Device",
- "OSS mixer device (e.g. /dev/oss/hdaudio0/mix0 or /dev/mixerN) "
- "(NULL = use first mixer device found)", DEFAULT_DEVICE,
- G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
-
- /**
- * GstOss4Mixer:device-name
- *
- * Human-readable name of the sound device. May be NULL if the device is
- * not open (ie. when the mixer is in NULL state)
- *
- **/
- g_object_class_install_property (gobject_class, PROP_DEVICE_NAME,
- g_param_spec_string ("device-name", "Device name",
- "Human-readable name of the sound device", DEFAULT_DEVICE_NAME,
- G_PARAM_READABLE | G_PARAM_STATIC_STRINGS));
-
- element_class->change_state = GST_DEBUG_FUNCPTR (gst_oss4_mixer_change_state);
-}
-
-static void
-gst_oss4_mixer_finalize (GObject * obj)
-{
- GstOss4Mixer *mixer = GST_OSS4_MIXER (obj);
-
- g_free (mixer->device);
-
- G_OBJECT_CLASS (parent_class)->finalize (obj);
-}
-
-static void
-gst_oss4_mixer_reset (GstOss4Mixer * mixer)
-{
- mixer->fd = -1;
- mixer->need_update = TRUE;
- memset (&mixer->last_mixext, 0, sizeof (oss_mixext));
-}
-
-static void
-gst_oss4_mixer_init (GstOss4Mixer * mixer, GstOss4MixerClass * g_class)
-{
- mixer->device = g_strdup (DEFAULT_DEVICE);
- mixer->device_name = NULL;
-
- gst_oss4_mixer_reset (mixer);
-}
-
-static void
-gst_oss4_mixer_set_property (GObject * object, guint prop_id,
- const GValue * value, GParamSpec * pspec)
-{
- GstOss4Mixer *mixer = GST_OSS4_MIXER (object);
-
- switch (prop_id) {
- case PROP_DEVICE:
- GST_OBJECT_LOCK (mixer);
- if (!GST_OSS4_MIXER_IS_OPEN (mixer)) {
- g_free (mixer->device);
- mixer->device = g_value_dup_string (value);
- /* unset any cached device-name */
- g_free (mixer->device_name);
- mixer->device_name = NULL;
- } else {
- g_warning ("%s: can't change \"device\" property while mixer is open",
- GST_OBJECT_NAME (mixer));
- }
- GST_OBJECT_UNLOCK (mixer);
- break;
- default:
- G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
- break;
- }
-}
-
-static void
-gst_oss4_mixer_get_property (GObject * object, guint prop_id,
- GValue * value, GParamSpec * pspec)
-{
- GstOss4Mixer *mixer = GST_OSS4_MIXER (object);
-
- switch (prop_id) {
- case PROP_DEVICE:
- GST_OBJECT_LOCK (mixer);
- g_value_set_string (value, mixer->device);
- GST_OBJECT_UNLOCK (mixer);
- break;
- case PROP_DEVICE_NAME:
- GST_OBJECT_LOCK (mixer);
- /* If device is set, try to retrieve the name even if we're not open */
- if (mixer->fd == -1 && mixer->device != NULL) {
- if (gst_oss4_mixer_open (mixer, TRUE)) {
- g_value_set_string (value, mixer->device_name);
- gst_oss4_mixer_close (mixer);
- } else {
- g_value_set_string (value, mixer->device_name);
- }
- } else {
- g_value_set_string (value, mixer->device_name);
- }
- GST_OBJECT_UNLOCK (mixer);
- break;
- default:
- G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
- break;
- }
-}
-
-static gboolean
-gst_oss4_mixer_open (GstOss4Mixer * mixer, gboolean silent_errors)
-{
- struct oss_mixerinfo mi = { 0, };
- gchar *device;
-
- g_return_val_if_fail (!GST_OSS4_MIXER_IS_OPEN (mixer), FALSE);
-
- if (mixer->device)
- device = g_strdup (mixer->device);
- else
- device = gst_oss4_audio_find_device (GST_OBJECT_CAST (mixer));
-
- /* desperate times, desperate measures */
- if (device == NULL)
- device = g_strdup ("/dev/mixer");
-
- GST_INFO_OBJECT (mixer, "Trying to open OSS4 mixer device '%s'", device);
-
- mixer->fd = open (device, O_RDWR, 0);
- if (mixer->fd < 0)
- goto open_failed;
-
- /* Make sure it's OSS4. If it's old OSS, let the old ossmixer handle it */
- if (!gst_oss4_audio_check_version (GST_OBJECT (mixer), mixer->fd))
- goto legacy_oss;
-
- GST_INFO_OBJECT (mixer, "Opened mixer device '%s', which is mixer %d",
- device, mi.dev);
-
- /* Get device name for currently open fd */
- mi.dev = -1;
- if (ioctl (mixer->fd, SNDCTL_MIXERINFO, &mi) == 0) {
- mixer->modify_counter = mi.modify_counter;
- if (mi.name[0] != '\0') {
- mixer->device_name = g_strdup (mi.name);
- }
- } else {
- mixer->modify_counter = 0;
- }
-
- if (mixer->device_name == NULL) {
- mixer->device_name = g_strdup ("Unknown");
- }
- GST_INFO_OBJECT (mixer, "device name = '%s'", mixer->device_name);
-
- mixer->open_device = device;
-
- return TRUE;
-
- /* ERRORS */
-open_failed:
- {
- if (!silent_errors) {
- GST_ELEMENT_ERROR (mixer, RESOURCE, OPEN_READ_WRITE,
- (_("Could not open audio device for mixer control handling.")),
- GST_ERROR_SYSTEM);
- } else {
- GST_DEBUG_OBJECT (mixer, "open failed: %s (ignoring errors)",
- g_strerror (errno));
- }
- g_free (device);
- return FALSE;
- }
-legacy_oss:
- {
- gst_oss4_mixer_close (mixer);
- if (!silent_errors) {
- GST_ELEMENT_ERROR (mixer, RESOURCE, OPEN_READ_WRITE,
- (_("Could not open audio device for mixer control handling. "
- "This version of the Open Sound System is not supported by this "
- "element.")), ("Try the 'ossmixer' element instead"));
- } else {
- GST_DEBUG_OBJECT (mixer, "open failed: legacy oss (ignoring errors)");
- }
- g_free (device);
- return FALSE;
- }
-}
-
-static void
-gst_oss4_mixer_control_free (GstOss4MixerControl * mc)
-{
- g_list_free (mc->children);
- g_list_free (mc->mute_group);
- g_free (mc->enum_vals);
- memset (mc, 0, sizeof (GstOss4MixerControl));
- g_free (mc);
-}
-
-static void
-gst_oss4_mixer_free_tracks (GstOss4Mixer * mixer)
-{
- g_list_foreach (mixer->tracks, (GFunc) g_object_unref, NULL);
- g_list_free (mixer->tracks);
- mixer->tracks = NULL;
-
- g_list_foreach (mixer->controls, (GFunc) gst_oss4_mixer_control_free, NULL);
- g_list_free (mixer->controls);
- mixer->controls = NULL;
-}
-
-static void
-gst_oss4_mixer_close (GstOss4Mixer * mixer)
-{
- g_free (mixer->device_name);
- mixer->device_name = NULL;
-
- g_free (mixer->open_device);
- mixer->open_device = NULL;
-
- gst_oss4_mixer_free_tracks (mixer);
-
- if (mixer->fd != -1) {
- close (mixer->fd);
- mixer->fd = -1;
- }
-
- gst_oss4_mixer_reset (mixer);
-}
-
-static void
-gst_oss4_mixer_watch_process_changes (GstOss4Mixer * mixer)
-{
- GList *c, *t, *tracks = NULL;
-
- GST_INFO_OBJECT (mixer, "mixer interface or control changed");
-
- /* this is all with the mixer object lock held */
-
- /* we go through the list backwards so we can bail out faster when the entire
- * interface needs to be rebuilt */
- for (c = g_list_last (mixer->controls); c != NULL; c = c->prev) {
- GstOss4MixerControl *mc = c->data;
- oss_mixer_value ossval = { 0, };
-
- mc->changed = FALSE;
- mc->list_changed = FALSE;
-
- /* not interested in controls we don't expose in the mixer interface */
- if (!mc->used)
- continue;
-
- /* don't try to read a value from controls that don't have one */
- if (mc->mixext.type == MIXT_DEVROOT || mc->mixext.type == MIXT_GROUP)
- continue;
-
- /* is this an enum control whose list may change? */
- if (mc->mixext.type == MIXT_ENUM && mc->enum_version != 0) {
- if (gst_oss4_mixer_enum_control_update_enum_list (mixer, mc))
- mc->list_changed = TRUE;
- }
-
- ossval.dev = mc->mixext.dev;
- ossval.ctrl = mc->mixext.ctrl;
- ossval.timestamp = mc->mixext.timestamp;
-
- if (ioctl (mixer->fd, SNDCTL_MIX_READ, &ossval) == -1) {
- if (errno == EIDRM || errno == EFAULT) {
- GST_DEBUG ("%s has disappeared", mc->mixext.extname);
- goto mixer_changed;
- }
- GST_WARNING_OBJECT (mixer, "MIX_READ failed: %s", g_strerror (errno));
- /* just ignore, move on to next one */
- continue;
- }
-
- if (ossval.value == mc->last_val) { /* no change */
- /* GST_LOG_OBJECT (mixer, "%s hasn't changed", mc->mixext.extname); */
- continue;
- }
-
- mc->last_val = ossval.value;
- GST_LOG_OBJECT (mixer, "%s changed value to %u 0x%08x",
- mc->mixext.extname, ossval.value, ossval.value);
- mc->changed = TRUE;
- }
-
- /* copy list and take track refs, so we can safely drop the object lock,
- * which we need to do to be able to post messages on the bus */
- tracks = g_list_copy (mixer->tracks);
- g_list_foreach (tracks, (GFunc) g_object_ref, NULL);
-
- GST_OBJECT_UNLOCK (mixer);
-
- /* since we don't know (or want to know exactly) which controls belong to
- * which track, we just go through the tracks one-by-one now and make them
- * check themselves if any of their controls have changed and which messages
- * to post on the bus as a result */
- for (t = tracks; t != NULL; t = t->next) {
- GstMixerTrack *track = t->data;
-
- if (GST_IS_OSS4_MIXER_SLIDER (track)) {
- gst_oss4_mixer_slider_process_change_unlocked (track);
- } else if (GST_IS_OSS4_MIXER_SWITCH (track)) {
- gst_oss4_mixer_switch_process_change_unlocked (track);
- } else if (GST_IS_OSS4_MIXER_ENUM (track)) {
- gst_oss4_mixer_enum_process_change_unlocked (track);
- }
-
- g_object_unref (track);
- }
- g_list_free (tracks);
-
- GST_OBJECT_LOCK (mixer);
- return;
-
-mixer_changed:
- {
- GST_OBJECT_UNLOCK (mixer);
- gst_mixer_mixer_changed (GST_MIXER (mixer));
- GST_OBJECT_LOCK (mixer);
- return;
- }
-}
-
-/* This thread watches the mixer for changes in a somewhat inefficient way
- * (running an ioctl every half second or so). This is still better and
- * cheaper than apps polling all tracks for changes a few times a second
- * though. Needs more thought. There's probably (hopefully) a way to get
- * notifications via the fd directly somehow. */
-static gpointer
-gst_oss4_mixer_watch_thread (gpointer thread_data)
-{
- GstOss4Mixer *mixer = GST_OSS4_MIXER_CAST (thread_data);
-
- GST_DEBUG_OBJECT (mixer, "watch thread running");
-
- GST_OBJECT_LOCK (mixer);
- while (!mixer->watch_shutdown) {
- oss_mixerinfo mi = { 0, };
- GTimeVal tv;
-
- mi.dev = -1;
- if (ioctl (mixer->fd, SNDCTL_MIXERINFO, &mi) == 0) {
- if (mixer->modify_counter != mi.modify_counter) {
- /* GST_LOG ("processing changes"); */
- gst_oss4_mixer_watch_process_changes (mixer);
- mixer->modify_counter = mi.modify_counter;
- } else {
- /* GST_LOG ("no changes"); */
- }
- } else {
- GST_WARNING_OBJECT (mixer, "MIXERINFO failed: %s", g_strerror (errno));
- }
-
- /* we could move the _get_current_time out of the loop and just do the
- * add in ever iteration, which would be less exact, but who cares */
- g_get_current_time (&tv);
- g_time_val_add (&tv, GST_OSS4_MIXER_WATCH_INTERVAL * 1000);
- (void) g_cond_timed_wait (mixer->watch_cond, GST_OBJECT_GET_LOCK (mixer),
- &tv);
- }
- GST_OBJECT_UNLOCK (mixer);
-
- GST_DEBUG_OBJECT (mixer, "watch thread done");
- gst_object_unref (mixer);
- return NULL;
-}
-
-/* call with object lock held */
-static void
-gst_oss4_mixer_wake_up_watch_task (GstOss4Mixer * mixer)
-{
- GST_LOG_OBJECT (mixer, "signalling watch thread to wake up");
- g_cond_signal (mixer->watch_cond);
-}
-
-static void
-gst_oss4_mixer_stop_watch_task (GstOss4Mixer * mixer)
-{
- if (mixer->watch_thread) {
- GST_OBJECT_LOCK (mixer);
- mixer->watch_shutdown = TRUE;
- GST_LOG_OBJECT (mixer, "signalling watch thread to stop");
- g_cond_signal (mixer->watch_cond);
- GST_OBJECT_UNLOCK (mixer);
- GST_LOG_OBJECT (mixer, "waiting for watch thread to join");
- g_thread_join (mixer->watch_thread);
- GST_DEBUG_OBJECT (mixer, "watch thread stopped");
- mixer->watch_thread = NULL;
- }
-
- if (mixer->watch_cond) {
- g_cond_free (mixer->watch_cond);
- mixer->watch_cond = NULL;
- }
-}
-
-static void
-gst_oss4_mixer_start_watch_task (GstOss4Mixer * mixer)
-{
- GError *err = NULL;
-
- mixer->watch_cond = g_cond_new ();
- mixer->watch_shutdown = FALSE;
-
- mixer->watch_thread = g_thread_try_new ("oss4-mixer-thread",
- gst_oss4_mixer_watch_thread, gst_object_ref (mixer), &err);
-
- if (mixer->watch_thread == NULL) {
- GST_ERROR_OBJECT (mixer, "Could not create watch thread: %s", err->message);
- g_cond_free (mixer->watch_cond);
- mixer->watch_cond = NULL;
- g_error_free (err);
- }
-}
-
-static GstStateChangeReturn
-gst_oss4_mixer_change_state (GstElement * element, GstStateChange transition)
-{
- GstStateChangeReturn ret = GST_STATE_CHANGE_SUCCESS;
- GstOss4Mixer *mixer = GST_OSS4_MIXER (element);
-
- switch (transition) {
- case GST_STATE_CHANGE_NULL_TO_READY:
- if (!gst_oss4_mixer_open (mixer, FALSE))
- return GST_STATE_CHANGE_FAILURE;
- gst_oss4_mixer_start_watch_task (mixer);
- break;
- default:
- break;
- }
-
- ret = GST_ELEMENT_CLASS (parent_class)->change_state (element, transition);
- if (ret == GST_STATE_CHANGE_FAILURE)
- return ret;
-
- switch (transition) {
- case GST_STATE_CHANGE_READY_TO_NULL:
- gst_oss4_mixer_stop_watch_task (mixer);
- gst_oss4_mixer_close (mixer);
- break;
- default:
- break;
- }
-
- return ret;
-}
-
-/* === GstMixer interface === */
-
-static inline gboolean
-gst_oss4_mixer_contains_track (GstMixer * mixer, GstMixerTrack * track)
-{
- return (g_list_find (GST_OSS4_MIXER (mixer)->tracks, track) != NULL);
-}
-
-static inline gboolean
-gst_oss4_mixer_contains_options (GstMixer * mixer, GstMixerOptions * options)
-{
- return (g_list_find (GST_OSS4_MIXER (mixer)->tracks, options) != NULL);
-}
-
-static void
-gst_oss4_mixer_post_mixer_changed_msg (GstOss4Mixer * mixer)
-{
- /* only post mixer-changed message once */
- if (!mixer->need_update) {
- gst_mixer_mixer_changed (GST_MIXER (mixer));
- mixer->need_update = TRUE;
- }
-}
-
-/* call with mixer object lock held to serialise ioctl */
-gboolean
-gst_oss4_mixer_get_control_val (GstOss4Mixer * mixer, GstOss4MixerControl * mc,
- int *val)
-{
- oss_mixer_value ossval = { 0, };
-
- if (GST_OBJECT_TRYLOCK (mixer)) {
- GST_ERROR ("must be called with mixer lock held");
- GST_OBJECT_UNLOCK (mixer);
- }
-
- ossval.dev = mc->mixext.dev;
- ossval.ctrl = mc->mixext.ctrl;
- ossval.timestamp = mc->mixext.timestamp;
-
- if (ioctl (mixer->fd, SNDCTL_MIX_READ, &ossval) == -1) {
- if (errno == EIDRM) {
- GST_DEBUG_OBJECT (mixer, "MIX_READ failed: mixer interface has changed");
- gst_oss4_mixer_post_mixer_changed_msg (mixer);
- } else {
- GST_WARNING_OBJECT (mixer, "MIX_READ failed: %s", g_strerror (errno));
- }
- *val = 0;
- mc->last_val = 0;
- return FALSE;
- }
-
- *val = ossval.value;
- mc->last_val = ossval.value;
- GST_LOG_OBJECT (mixer, "got value 0x%08x from %s)", *val, mc->mixext.extname);
- return TRUE;
-}
-
-/* call with mixer object lock held to serialise ioctl */
-gboolean
-gst_oss4_mixer_set_control_val (GstOss4Mixer * mixer, GstOss4MixerControl * mc,
- int val)
-{
- oss_mixer_value ossval = { 0, };
-
- ossval.dev = mc->mixext.dev;
- ossval.ctrl = mc->mixext.ctrl;
- ossval.timestamp = mc->mixext.timestamp;
- ossval.value = val;
-
- if (GST_OBJECT_TRYLOCK (mixer)) {
- GST_ERROR ("must be called with mixer lock held");
- GST_OBJECT_UNLOCK (mixer);
- }
-
- if (ioctl (mixer->fd, SNDCTL_MIX_WRITE, &ossval) == -1) {
- if (errno == EIDRM) {
- GST_LOG_OBJECT (mixer, "MIX_WRITE failed: mixer interface has changed");
- gst_oss4_mixer_post_mixer_changed_msg (mixer);
- } else {
- GST_WARNING_OBJECT (mixer, "MIX_WRITE failed: %s", g_strerror (errno));
- }
- return FALSE;
- }
-
- mc->last_val = val;
- GST_LOG_OBJECT (mixer, "set value 0x%08x on %s", val, mc->mixext.extname);
- return TRUE;
-}
-
-#if 0
-static gchar *
-gst_oss4_mixer_control_get_pretty_name (GstOss4MixerControl * mc)
-{
- gchar *name;
-
- const gchar *name, *u;
-
- /* "The id field is the original name given by the driver when it called
- * mixer_ext_create_control. This name can be used by fully featured GUI
- * mixers. However this name should be downshifted and cut before the last
- * underscore ("_") to get the proper name. For example mixer control name
- * created as "MYDRV_MAINVOL" will become just "mainvol" after this
- * transformation." */
- name = mc->mixext.extname;
- u = MAX (strrchr (name, '_'), strrchr (name, '.'));
- if (u != NULL)
- name = u + 1;
-
- /* maybe capitalize the first letter? */
- return g_ascii_strdown (name, -1);
- /* the .id thing doesn't really seem to work right, ie. for some sliders
- * it's just '-' so you have to use the name of the parent control etc.
- * let's not use it for now, much too painful. */
- if (g_str_has_prefix (mc->mixext.extname, "misc."))
- name = g_strdup (mc->mixext.extname + 5);
- else
- name = g_strdup (mc->mixext.extname);
- /* chop off trailing digit (only one for now) */
- if (strlen (name) > 0 && g_ascii_isdigit (name[strlen (name) - 1]))
- name[strlen (name) - 1] = '\0';
- g_strdelimit (name, ".", ' ');
- return name;
-}
-#endif
-
-/* these translations are a bit ad-hoc and horribly incomplete; it is not
- * really going to work this way with all the different chipsets and drivers.
- * We also use these for translating option values. */
-static struct
-{
- const gchar oss_name[32];
- const gchar *label;
-} labels[] = {
- {
- "volume", N_("Volume")}, {
- "master", N_("Master")}, {
- "front", N_("Front")}, {
- "rear", N_("Rear")}, {
- "headphones", N_("Headphones")}, {
- "center", N_("Center")}, {
- "lfe", N_("LFE")}, {
- "surround", N_("Surround")}, {
- "side", N_("Side")}, {
- "speaker", N_("Built-in Speaker")}, {
- "aux1-out", N_("AUX 1 Out")}, {
- "aux2-out", N_("AUX 2 Out")}, {
- "aux-out", N_("AUX Out")}, {
- "bass", N_("Bass")}, {
- "treble", N_("Treble")}, {
- "3d-depth", N_("3D Depth")}, {
- "3d-center", N_("3D Center")}, {
- "3d-enhance", N_("3D Enhance")}, {
- "phone", N_("Telephone")}, {
- "mic", N_("Microphone")}, {
- "line-out", N_("Line Out")}, {
- "line-in", N_("Line In")}, {
- "linein", N_("Line In")}, {
- "cd", N_("Internal CD")}, {
- "video", N_("Video In")}, {
- "aux1-in", N_("AUX 1 In")}, {
- "aux2-in", N_("AUX 2 In")}, {
- "aux-in", N_("AUX In")}, {
- "pcm", N_("PCM")}, {
- "record-gain", N_("Record Gain")}, {
- "igain", N_("Record Gain")}, {
- "ogain", N_("Output Gain")}, {
- "micboost", N_("Microphone Boost")}, {
- "loopback", N_("Loopback")}, {
- "diag", N_("Diagnostic")}, {
- "loudness", N_("Bass Boost")}, {
- "outputs", N_("Playback Ports")}, {
- "input", N_("Input")}, {
- "inputs", N_("Record Source")}, {
- "record-source", N_("Record Source")}, {
- "monitor-source", N_("Monitor Source")}, {
- "beep", N_("Keyboard Beep")}, {
- "monitor-gain", N_("Monitor")}, {
- "stereo-simulate", N_("Simulate Stereo")}, {
- "stereo", N_("Stereo")}, {
- "multich", N_("Surround Sound")}, {
- "mic-gain", N_("Microphone Gain")}, {
- "speaker-source", N_("Speaker Source")}, {
- "mic-source", N_("Microphone Source")}, {
- "jack", N_("Jack")}, {
- "center/lfe", N_("Center / LFE")}, {
- "stereo-mix", N_("Stereo Mix")}, {
- "mono-mix", N_("Mono Mix")}, {
- "input-mix", N_("Input Mix")}, {
- "spdif-in", N_("SPDIF In")}, {
- "spdif-out", N_("SPDIF Out")}, {
- "mic1", N_("Microphone 1")}, {
- "mic2", N_("Microphone 2")}, {
- "digital-out", N_("Digital Out")}, {
- "digital-in", N_("Digital In")}, {
- "hdmi", N_("HDMI")}, {
- "modem", N_("Modem")}, {
- "handset", N_("Handset")}, {
- "other", N_("Other")}, {
- "stereo", N_("Stereo")}, {
- "none", N_("None")}, {
- "on", N_("On")}, {
- "off", N_("Off")}, {
- "mute", N_("Mute")}, {
- "fast", N_("Fast")}, {
- /* TRANSLATORS: "Very Low" is a quality setting here */
- "very-low", N_("Very Low")}, {
- /* TRANSLATORS: "Low" is a quality setting here */
- "low", N_("Low")}, {
- /* TRANSLATORS: "Medium" is a quality setting here */
- "medium", N_("Medium")}, {
- /* TRANSLATORS: "High" is a quality setting here */
- "high", N_("High")}, {
- /* TRANSLATORS: "Very High" is a quality setting here */
- "very-high", N_("Very High")}, {
- "high+", N_("Very High")}, {
- /* TRANSLATORS: "Production" is a quality setting here */
- "production", N_("Production")}, {
- "fp-mic", N_("Front Panel Microphone")}, {
- "fp-linein", N_("Front Panel Line In")}, {
- "fp-headphones", N_("Front Panel Headphones")}, {
- "fp-lineout", N_("Front Panel Line Out")}, {
- "green", N_("Green Connector")}, {
- "pink", N_("Pink Connector")}, {
- "blue", N_("Blue Connector")}, {
- "white", N_("White Connector")}, {
- "black", N_("Black Connector")}, {
- "gray", N_("Gray Connector")}, {
- "orange", N_("Orange Connector")}, {
- "red", N_("Red Connector")}, {
- "yellow", N_("Yellow Connector")}, {
- "fp-green", N_("Green Front Panel Connector")}, {
- "fp-pink", N_("Pink Front Panel Connector")}, {
- "fp-blue", N_("Blue Front Panel Connector")}, {
- "fp-white", N_("White Front Panel Connector")}, {
- "fp-black", N_("Black Front Panel Connector")}, {
- "fp-gray", N_("Gray Front Panel Connector")}, {
- "fp-orange", N_("Orange Front Panel Connector")}, {
- "fp-red", N_("Red Front Panel Connector")}, {
- "fp-yellow", N_("Yellow Front Panel Connector")}, {
- "spread", N_("Spread Output")}, {
- "downmix", N_("Downmix")},
- /* FIXME translate Audigy NX USB labels) */
-/*
- { "rec.src", N_("Record Source") },
- { "output.mute", N_("Mute output") }
- headph (Controller group)
- headph.src (Enumeration control)
- headph.mute (On/Off switch)
- digital2 (Controller group)
- digital2.src (Enumeration control)
- digital2.mute (On/Off switch)
- digital (Controller group)
- digital.mute1 (On/Off switch)
- digital.vol (Controller group)
- digital.vol.front (Stereo slider (0-255))
- digital.vol.surr (Stereo slider (0-255))
- digital.vol.c/l (Stereo slider (0-255))
- digital.vol.center (Stereo slider (0-255))
- digital.mute2 (On/Off switch)
- digital.vol (Stereo slider (0-255))
- line (Controller group)
- line.mute (On/Off switch)
- line.vol (Stereo slider (0-255))
- play-altset (Enumeration control)
- rec-altset (Enumeration control)
-*/
-};
-
-/* Decent i18n is pretty much impossible with OSS's way of providing us with
- * mixer labels (and the fact that they are pretty much random), but that
- * doesn't mean we shouldn't at least try. */
-static gchar *
-gst_oss4_mixer_control_get_translated_name (GstOss4MixerControl * mc)
-{
- gchar name[128] = { 0, };
- gchar vmix_str[32] = { '\0', };
- gchar *ptr;
- int dummy, i;
- int num = -1;
- gboolean function_suffix = FALSE;
-
- /* main virtual mixer controls (we hide the stream volumes) */
- if (sscanf (mc->mixext.extname, "vmix%d-%32c", &dummy, vmix_str) == 2) {
- if (strcmp (vmix_str, "src") == 0)
- return g_strdup (_("Virtual Mixer Input"));
- else if (strcmp (vmix_str, "vol") == 0)
- return g_strdup (_("Virtual Mixer Output"));
- else if (strcmp (vmix_str, "channels") == 0)
- return g_strdup (_("Virtual Mixer Channels"));
- }
-
- g_strlcpy (name, mc->mixext.extname, sizeof (name));
-
- /* we deal with either "connector." or "jack." */
- if ((g_str_has_prefix (name, "connector.")) ||
- (g_str_has_prefix (name, "jack."))) {
- ptr = strchr (mc->mixext.extname, '.');
- ptr++;
- g_strlcpy (name, ptr, sizeof (name));
- }
-
- /* special handling for jack retasking suffixes */
- if (g_str_has_suffix (name, ".function") || g_str_has_suffix (name, ".mode")) {
- function_suffix = TRUE;
- ptr = strrchr (name, '.');
- *ptr = 0;
- }
-
- /* parse off trailing numbers */
- i = strlen (name);
- while ((i > 0) && (g_ascii_isdigit (name[i - 1]))) {
- i--;
- }
- /* the check catches the case where the control name is just a number */
- if ((i > 0) && (name[i] != '\0')) {
- num = atoi (name + i);
- name[i] = '\0';
- }
-
- /* look for a match, progressively skipping '.' delimited prefixes as we go */
- ptr = name;
- do {
- if (*ptr == '.')
- ptr++;
- for (i = 0; i < G_N_ELEMENTS (labels); ++i) {
- if (g_ascii_strcasecmp (ptr, labels[i].oss_name) == 0) {
- g_strlcpy (name, _(labels[i].label), sizeof (name));
- goto append_suffixes;
- }
- }
- } while ((ptr = strchr (ptr, '.')) != NULL);
-
- /* failing that, just replace periods with spaces */
- g_strdelimit (name, ".", ' ');
-
-append_suffixes:
- if (num > -1) {
- if (function_suffix) {
- /* TRANSLATORS: name + number of a volume mixer control */
- return g_strdup_printf (_("%s %d Function"), name, num);
- } else {
- return g_strdup_printf ("%s %d", name, num);
- }
- } else {
- if (function_suffix) {
- /* TRANSLATORS: name of a volume mixer control */
- return g_strdup_printf (_("%s Function"), name);
- } else {
- return g_strdup (name);
- }
- }
-}
-
-static const gchar *
-gst_oss4_mixer_control_get_translated_option (const gchar * name)
-{
- int i;
- for (i = 0; i < G_N_ELEMENTS (labels); ++i) {
- if (g_ascii_strcasecmp (name, labels[i].oss_name) == 0) {
- return _(labels[i].label);
- }
- }
- return (name);
-}
-
-#ifndef GST_DISABLE_GST_DEBUG
-static const gchar *
-mixer_ext_type_get_name (gint type)
-{
- switch (type) {
- case MIXT_DEVROOT:
- return "Device root entry";
- case MIXT_GROUP:
- return "Controller group";
- case MIXT_ONOFF:
- return "On/Off switch";
- case MIXT_ENUM:
- return "Enumeration control";
- case MIXT_MONOSLIDER:
- return "Mono slider (0-255)";
- case MIXT_STEREOSLIDER:
- return "Stereo slider (0-255)";
- case MIXT_MESSAGE:
- return "Textual message"; /* whatever this is */
- case MIXT_MONOVU:
- return "Mono VU meter value";
- case MIXT_STEREOVU:
- return "Stereo VU meter value";
- case MIXT_MONOPEAK:
- return "Mono VU meter peak value";
- case MIXT_STEREOPEAK:
- return "Stereo VU meter peak value";
- case MIXT_RADIOGROUP:
- return "Radio button group";
- case MIXT_MARKER: /* Separator between normal and extension entries */
- return "Separator";
- case MIXT_VALUE:
- return "Decimal value entry";
- case MIXT_HEXVALUE:
- return "Hex value entry";
- case MIXT_SLIDER:
- return "Mono slider (31-bit value range)";
- case MIXT_3D:
- return "3D"; /* what's this? */
- case MIXT_MONOSLIDER16:
- return "Mono slider (0-32767)";
- case MIXT_STEREOSLIDER16:
- return "Stereo slider (0-32767)";
- case MIXT_MUTE:
- return "Mute switch";
- default:
- break;
- }
- return "unknown";
-}
-#endif /* GST_DISABLE_GST_DEBUG */
-
-#ifndef GST_DISABLE_GST_DEBUG
-static const gchar *
-mixer_ext_flags_get_string (gint flags)
-{
- struct
- {
- gint flag;
- gchar nick[16];
- } all_flags[] = {
- /* first the important ones */
- {
- MIXF_MAINVOL, "MAINVOL"}, {
- MIXF_PCMVOL, "PCMVOL"}, {
- MIXF_RECVOL, "RECVOL"}, {
- MIXF_MONVOL, "MONVOL"}, {
- MIXF_DESCR, "DESCR"},
- /* now the rest in the right order */
- {
- MIXF_READABLE, "READABLE"}, {
- MIXF_WRITEABLE, "WRITABLE"}, {
- MIXF_POLL, "POLL"}, {
- MIXF_HZ, "HZ"}, {
- MIXF_STRING, "STRING"}, {
- MIXF_DYNAMIC, "DYNAMIC"}, {
- MIXF_OKFAIL, "OKFAIL"}, {
- MIXF_FLAT, "FLAT"}, {
- MIXF_LEGACY, "LEGACY"}, {
- MIXF_CENTIBEL, "CENTIBEL"}, {
- MIXF_DECIBEL, "DECIBEL"}, {
- MIXF_WIDE, "WIDE"}
- };
- GString *s;
- GQuark q;
- gint i;
-
- if (flags == 0)
- return "None";
-
- s = g_string_new ("");
- for (i = 0; i < G_N_ELEMENTS (all_flags); ++i) {
- if ((flags & all_flags[i].flag)) {
- if (s->len > 0)
- g_string_append (s, " | ");
- g_string_append (s, all_flags[i].nick);
- flags &= ~all_flags[i].flag; /* unset */
- }
- }
-
- /* unknown flags? */
- if (flags != 0) {
- if (s->len > 0)
- g_string_append (s, " | ");
- g_string_append (s, "???");
- }
-
- /* we'll just put it into the global quark table (cheeky, eh?) */
- q = g_quark_from_string (s->str);
- g_string_free (s, TRUE);
-
- return g_quark_to_string (q);
-}
-#endif /* GST_DISABLE_GST_DEBUG */
-
-#ifndef GST_DISABLE_GST_DEBUG
-static void
-gst_oss4_mixer_control_dump_tree (GstOss4MixerControl * mc, gint depth)
-{
- GList *c;
- gchar spaces[64];
- gint i;
-
- depth = MIN (sizeof (spaces) - 1, depth);
- for (i = 0; i < depth; ++i)
- spaces[i] = ' ';
- spaces[i] = '\0';
-
- GST_LOG ("%s%s (%s)", spaces, mc->mixext.extname,
- mixer_ext_type_get_name (mc->mixext.type));
- for (c = mc->children; c != NULL; c = c->next) {
- GstOss4MixerControl *child_mc = (GstOss4MixerControl *) c->data;
-
- gst_oss4_mixer_control_dump_tree (child_mc, depth + 2);
- }
-}
-#endif /* GST_DISABLE_GST_DEBUG */
-
-static GList *
-gst_oss4_mixer_get_controls (GstOss4Mixer * mixer)
-{
- GstOss4MixerControl *root_mc = NULL;
- oss_mixerinfo mi = { 0, };
- GList *controls = NULL;
- GList *l;
- guint i;
-
- /* Get info for currently open fd */
- mi.dev = -1;
- if (ioctl (mixer->fd, SNDCTL_MIXERINFO, &mi) == -1)
- goto no_mixerinfo;
-
- if (mi.nrext <= 0) {
- GST_DEBUG ("mixer %s has no controls", mi.id);
- return NULL;
- }
-
- GST_INFO ("Reading controls for mixer %s", mi.id);
-
- for (i = 0; i < mi.nrext; ++i) {
- GstOss4MixerControl *mc;
- oss_mixext mix_ext = { 0, };
-
- mix_ext.dev = mi.dev;
- mix_ext.ctrl = i;
-
- if (ioctl (mixer->fd, SNDCTL_MIX_EXTINFO, &mix_ext) == -1) {
- GST_DEBUG ("SNDCTL_MIX_EXTINFO failed on mixer %s, control %d: %s",
- mi.id, i, g_strerror (errno));
- continue;
- }
-
- /* if this is the last one, save it for is-interface-up-to-date checking */
- if (i == mi.nrext)
- mixer->last_mixext = mix_ext;
-
- mc = g_new0 (GstOss4MixerControl, 1);
- mc->mixext = mix_ext;
-
- /* both control_no and desc fields are pretty useless, ie. not always set,
- * if ever, so not listed here */
- GST_INFO ("Control %d", mix_ext.ctrl);
- GST_INFO (" name : %s", mix_ext.extname);
- GST_INFO (" type : %s (%d)", mixer_ext_type_get_name (mix_ext.type),
- mix_ext.type);
- GST_INFO (" flags : %s (0x%04x)",
- mixer_ext_flags_get_string (mix_ext.flags), mix_ext.flags);
- GST_INFO (" parent : %d", mix_ext.parent);
-
- if (!MIXEXT_IS_ROOT (mix_ext)) {
- /* find parent (we assume it comes in the list before the child) */
- for (l = controls; l != NULL; l = l->next) {
- GstOss4MixerControl *parent_mc = (GstOss4MixerControl *) l->data;
-
- if (parent_mc->mixext.ctrl == mix_ext.parent) {
- mc->parent = parent_mc;
- parent_mc->children = g_list_append (parent_mc->children, mc);
- break;
- }
- }
- if (mc->parent == NULL) {
- GST_ERROR_OBJECT (mixer, "couldn't find parent for control %d", i);
- g_free (mc);
- continue;
- }
- } else if (root_mc == NULL) {
- root_mc = mc;
- } else {
- GST_WARNING_OBJECT (mixer, "two root controls?!");
- }
-
- controls = g_list_prepend (controls, mc);
- }
-
-#ifndef GST_DISABLE_GST_DEBUG
- gst_oss4_mixer_control_dump_tree (root_mc, 0);
-#endif
-
- return g_list_reverse (controls);
-
-/* ERRORS */
-no_mixerinfo:
- {
- GST_WARNING ("SNDCTL_MIXERINFO failed on mixer device %s: %s", mi.id,
- g_strerror (errno));
- return NULL;
- }
-}
-
-static void
-gst_oss4_mixer_controls_guess_master (GstOss4Mixer * mixer,
- const GList * controls)
-{
- GstOss4MixerControl *master_mc = NULL;
- const GList *l;
-
- for (l = controls; l != NULL; l = l->next) {
- GstOss4MixerControl *mc = (GstOss4MixerControl *) l->data;
-
- /* do we need to check if it's a slider type here? */
- if ((mc->mixext.flags & MIXF_PCMVOL)) {
- GST_INFO_OBJECT (mixer, "First PCM control: %s", mc->mixext.extname);
- master_mc = mc;
- break;
- }
-
- if (((mc->mixext.flags & MIXF_MAINVOL)) && master_mc == NULL) {
- GST_INFO_OBJECT (mixer, "First main volume control: %s",
- mc->mixext.extname);
- master_mc = mc;
- }
- }
-
- if (master_mc != NULL)
- master_mc->is_master = TRUE;
-}
-
-/* type: -1 for all types, otherwise just return siblings with requested type */
-static GList *
-gst_oss4_mixer_control_get_siblings (GstOss4MixerControl * mc, gint type)
-{
- GList *s, *siblings = NULL;
-
- if (mc->parent == NULL)
- return NULL;
-
- for (s = mc->parent->children; s != NULL; s = s->next) {
- GstOss4MixerControl *sibling = (GstOss4MixerControl *) s->data;
-
- if (mc != sibling && (type < 0 || sibling->mixext.type == type))
- siblings = g_list_append (siblings, sibling);
- }
-
- return siblings;
-}
-
-static void
-gst_oss4_mixer_controls_find_sliders (GstOss4Mixer * mixer,
- const GList * controls)
-{
- const GList *l;
-
- for (l = controls; l != NULL; l = l->next) {
- GstOss4MixerControl *mc = (GstOss4MixerControl *) l->data;
- GList *s, *siblings;
-
- if (!MIXEXT_IS_SLIDER (mc->mixext) || mc->parent == NULL || mc->used)
- continue;
-
- mc->is_slider = TRUE;
- mc->used = TRUE;
-
- siblings = gst_oss4_mixer_control_get_siblings (mc, -1);
-
- /* Note: the names can be misleading and may not reflect the actual
- * hierarchy of the controls, e.g. it's possible that a slider is called
- * connector.green and the mute control then connector.green.mute, but
- * both controls are in fact siblings and both children of the group
- * 'green' instead of mute being a child of connector.green as the naming
- * would seem to suggest */
- GST_LOG ("Slider: %s, parent=%s, %d siblings", mc->mixext.extname,
- mc->parent->mixext.extname, g_list_length (siblings));
-
- for (s = siblings; s != NULL; s = s->next) {
- GstOss4MixerControl *sibling = (GstOss4MixerControl *) s->data;
-
- GST_LOG (" %s (%s)", sibling->mixext.extname,
- mixer_ext_type_get_name (sibling->mixext.type));
-
- if (sibling->mixext.type == MIXT_MUTE ||
- g_str_has_suffix (sibling->mixext.extname, ".mute")) {
- /* simple case: slider with single mute sibling. We assume the .mute
- * suffix in the name won't change - can't really do much else anyway */
- if (sibling->mixext.type == MIXT_ONOFF ||
- sibling->mixext.type == MIXT_MUTE) {
- GST_LOG (" mute control for %s is %s", mc->mixext.extname,
- sibling->mixext.extname);
- mc->mute = sibling;
- sibling->used = TRUE;
- }
- /* a group of .mute controls. We assume they are all switches here */
- if (sibling->mixext.type == MIXT_GROUP) {
- GList *m;
-
- for (m = sibling->children; m != NULL; m = m->next) {
- GstOss4MixerControl *grouped_sibling = m->data;
-
- if (grouped_sibling->mixext.type == MIXT_ONOFF ||
- grouped_sibling->mixext.type == MIXT_MUTE) {
- GST_LOG (" %s is grouped mute control for %s",
- grouped_sibling->mixext.extname, mc->mixext.extname);
- mc->mute_group = g_list_append (mc->mute_group, grouped_sibling);
- }
- }
-
- GST_LOG (" %s has a group of %d mute controls",
- mc->mixext.extname, g_list_length (mc->mute_group));
-
- /* we don't mark the individual mute controls as used, only the
- * group control, as we still want individual switches for the
- * individual controls */
- sibling->used = TRUE;
- }
- }
- }
- g_list_free (siblings);
- }
-}
-
-/* should be called with the mixer object lock held because of the ioctl;
- * returns TRUE if the list was read the first time or modified */
-static gboolean
-gst_oss4_mixer_enum_control_update_enum_list (GstOss4Mixer * mixer,
- GstOss4MixerControl * mc)
-{
- oss_mixer_enuminfo ei = { 0, };
- guint num_existing = 0;
- int i;
-
- /* count and existing values */
- while (mc->enum_vals != NULL && mc->enum_vals[num_existing] != 0)
- ++num_existing;
-
- ei.dev = mc->mixext.dev;
- ei.ctrl = mc->mixext.ctrl;
-
- /* if we have create a generic list with numeric IDs already and the
- * number of values hasn't changed, then there's not much to do here */
- if (mc->no_list && mc->enum_vals != NULL &&
- num_existing == mc->mixext.maxvalue) {
- return FALSE;
- }
-
- /* if we have a list and it doesn't change, there's nothing to do either */
- if (mc->enum_vals != NULL && mc->enum_version == 0)
- return FALSE;
-
- if (ioctl (mixer->fd, SNDCTL_MIX_ENUMINFO, &ei) == -1) {
- g_free (mc->enum_vals);
- mc->enum_vals = g_new0 (GQuark, mc->mixext.maxvalue + 1);
-
- GST_DEBUG ("no enum info available, creating numeric values from 0-%d",
- mc->mixext.maxvalue - 1);
-
- /* "It is possible that some enum controls don't have any name list
- * available. In this case the application should automatically generate
- * list of numbers (0 to N-1)" */
- for (i = 0; i < mc->mixext.maxvalue; ++i) {
- gchar num_str[8];
-
- g_snprintf (num_str, sizeof (num_str), "%d", i);
- mc->enum_vals[i] = g_quark_from_string (num_str);
- }
- mc->enum_version = 0; /* the only way to change is via maxvalue */
- } else {
- /* old list same as current list? */
- if (mc->enum_vals != NULL && mc->enum_version == ei.version)
- return FALSE;
-
- /* no list yet, or the list has changed */
- GST_LOG ("%s", (mc->enum_vals) ? "enum list has changed" : "reading list");
- if (ei.nvalues != mc->mixext.maxvalue) {
- GST_WARNING_OBJECT (mixer, "Enum: %s, nvalues %d != maxvalue %d",
- mc->mixext.extname, ei.nvalues, mc->mixext.maxvalue);
- mc->mixext.maxvalue = MIN (ei.nvalues, mc->mixext.maxvalue);
- }
-
- mc->mixext.maxvalue = MIN (mc->mixext.maxvalue, OSS_ENUM_MAXVALUE);
-
- g_free (mc->enum_vals);
- mc->enum_vals = g_new0 (GQuark, mc->mixext.maxvalue + 1);
- for (i = 0; i < mc->mixext.maxvalue; ++i) {
- GST_LOG (" %s", ei.strings + ei.strindex[i]);
- mc->enum_vals[i] =
- g_quark_from_string (gst_oss4_mixer_control_get_translated_option
- (ei.strings + ei.strindex[i]));
- }
- }
-
- return TRUE;
-}
-
-static void
-gst_oss4_mixer_controls_find_enums (GstOss4Mixer * mixer,
- const GList * controls)
-{
- const GList *l;
-
- for (l = controls; l != NULL; l = l->next) {
- GstOss4MixerControl *mc = (GstOss4MixerControl *) l->data;
-
- if (mc->mixext.type != MIXT_ENUM || mc->used)
- continue;
-
- mc->is_enum = TRUE;
- mc->used = TRUE;
-
- /* Note: enums are special: for most controls, the maxvalue is inclusive,
- * but for enum controls it's actually exclusive (boggle), so that
- * mixext.maxvalue = num_values */
-
- GST_LOG ("Enum: %s, parent=%s, num_enums=%d", mc->mixext.extname,
- mc->parent->mixext.extname, mc->mixext.maxvalue);
-
- gst_oss4_mixer_enum_control_update_enum_list (mixer, mc);
- }
-}
-
-static void
-gst_oss4_mixer_controls_find_switches (GstOss4Mixer * mixer,
- const GList * controls)
-{
- const GList *l;
-
- for (l = controls; l != NULL; l = l->next) {
- GstOss4MixerControl *mc = (GstOss4MixerControl *) l->data;
-
- if (mc->used)
- continue;
-
- if (mc->mixext.type != MIXT_ONOFF && mc->mixext.type != MIXT_MUTE)
- continue;
-
- mc->is_switch = TRUE;
- mc->used = TRUE;
-
- GST_LOG ("Switch: %s, parent=%s", mc->mixext.extname,
- mc->parent->mixext.extname);
- }
-}
-
-static void
-gst_oss4_mixer_controls_find_virtual (GstOss4Mixer * mixer,
- const GList * controls)
-{
- const GList *l;
-
- for (l = controls; l != NULL; l = l->next) {
- GstOss4MixerControl *mc = (GstOss4MixerControl *) l->data;
-
- /* or sscanf (mc->mixext.extname, "vmix%d-out.", &n) == 1 ? */
- /* for now we just flag all virtual controls with managed labels, those
- * are really more appropriate for a pavucontrol-type control thing than
- * the (more hardware-oriented) mixer interface */
- if (mc->mixext.id[0] == '@') {
- mc->is_virtual = TRUE;
- GST_LOG ("%s is virtual control with managed label", mc->mixext.extname);
- }
- }
-}
-
-static void
-gst_oss4_mixer_controls_dump_unused (GstOss4Mixer * mixer,
- const GList * controls)
-{
- const GList *l;
-
- for (l = controls; l != NULL; l = l->next) {
- GstOss4MixerControl *mc = (GstOss4MixerControl *) l->data;
-
- if (mc->used)
- continue;
-
- switch (mc->mixext.type) {
- case MIXT_DEVROOT:
- case MIXT_GROUP:
- case MIXT_MESSAGE:
- case MIXT_MONOVU:
- case MIXT_STEREOVU:
- case MIXT_MONOPEAK:
- case MIXT_STEREOPEAK:
- case MIXT_MARKER:
- continue; /* not interested in these types of controls */
- case MIXT_MONODB:
- case MIXT_STEREODB:
- GST_DEBUG ("obsolete control type %d", mc->mixext.type);
- continue;
- case MIXT_MONOSLIDER:
- case MIXT_STEREOSLIDER:
- case MIXT_SLIDER:
- case MIXT_MONOSLIDER16:
- case MIXT_STEREOSLIDER16:
- /* this shouldn't happen */
- GST_ERROR ("unused slider control?!");
- continue;
- case MIXT_VALUE:
- case MIXT_HEXVALUE:
- /* value entry, not sure what to do with that, skip for now */
- continue;
- case MIXT_ONOFF:
- case MIXT_MUTE:
- case MIXT_ENUM:
- case MIXT_3D:
- case MIXT_RADIOGROUP:
- GST_DEBUG ("FIXME: handle %s %s",
- mixer_ext_type_get_name (mc->mixext.type), mc->mixext.extname);
- break;
- default:
- GST_WARNING ("unknown control type %d", mc->mixext.type);
- continue;
- }
- }
-}
-
-static GList *
-gst_oss4_mixer_create_tracks (GstOss4Mixer * mixer, const GList * controls)
-{
- const GList *c;
- GList *tracks = NULL;
-
- for (c = controls; c != NULL; c = c->next) {
- GstOss4MixerControl *mc = (GstOss4MixerControl *) c->data;
- GstMixerTrack *track = NULL;
-
- if (mc->is_virtual)
- continue;
-
- if (mc->is_slider) {
- track = gst_oss4_mixer_slider_new (mixer, mc);
- } else if (mc->is_enum) {
- track = gst_oss4_mixer_enum_new (mixer, mc);
- } else if (mc->is_switch) {
- track = gst_oss4_mixer_switch_new (mixer, mc);
- }
-
- if (track == NULL)
- continue;
-
- track->label = gst_oss4_mixer_control_get_translated_name (mc);
- track->flags = 0;
-
- GST_LOG ("translated label: %s [%s] = %s", track->label, mc->mixext.id,
- track->label);
-
- /* This whole 'a track is either INPUT or OUTPUT' model is just flawed,
- * esp. if a slider's role can be changed on the fly, like when you change
- * function of a connector. What should we do in that case? Change the flag
- * and make the app rebuild the interface? Ignore it? */
- if (mc->mixext.flags & (MIXF_MAINVOL | MIXF_PCMVOL)) {
- track->flags = GST_MIXER_TRACK_OUTPUT | GST_MIXER_TRACK_WHITELIST;
-
- } else if (mc->mixext.flags & MIXF_RECVOL) {
- /* record gain whitelisted by default */
- track->flags = GST_MIXER_TRACK_INPUT | GST_MIXER_TRACK_NO_RECORD |
- GST_MIXER_TRACK_WHITELIST;
-
- } else if (mc->mixext.flags & MIXF_MONVOL) {
- /* monitor sources not whitelisted by default */
- track->flags = GST_MIXER_TRACK_INPUT | GST_MIXER_TRACK_NO_RECORD;
- }
-
- /*
- * The kernel may give us better clues about the scope of a control.
- * If so, try to honor it.
- */
- switch (mc->mixext.desc & MIXEXT_SCOPE_MASK) {
- case MIXEXT_SCOPE_INPUT:
- case MIXEXT_SCOPE_RECSWITCH:
- track->flags |= GST_MIXER_TRACK_INPUT | GST_MIXER_TRACK_NO_RECORD |
- GST_MIXER_TRACK_WHITELIST;
- break;
- case MIXEXT_SCOPE_MONITOR:
- /* don't whitelist monitor tracks by default */
- track->flags |= GST_MIXER_TRACK_INPUT | GST_MIXER_TRACK_NO_RECORD;
- break;
- case MIXEXT_SCOPE_OUTPUT:
- track->flags = GST_MIXER_TRACK_OUTPUT | GST_MIXER_TRACK_WHITELIST;
- break;
- }
-
- if (mc->is_master) {
- track->flags |= GST_MIXER_TRACK_OUTPUT;
- }
-
- if (mc->is_master)
- track->flags |= GST_MIXER_TRACK_MASTER;
-
- tracks = g_list_append (tracks, track);
- }
-
- return tracks;
-}
-
-static void
-gst_oss4_mixer_update_tracks (GstOss4Mixer * mixer)
-{
- GList *controls, *tracks;
-
- /* read and process controls */
- controls = gst_oss4_mixer_get_controls (mixer);
-
- gst_oss4_mixer_controls_guess_master (mixer, controls);
-
- gst_oss4_mixer_controls_find_sliders (mixer, controls);
-
- gst_oss4_mixer_controls_find_enums (mixer, controls);
-
- gst_oss4_mixer_controls_find_switches (mixer, controls);
-
- gst_oss4_mixer_controls_find_virtual (mixer, controls);
-
- gst_oss4_mixer_controls_dump_unused (mixer, controls);
-
- tracks = gst_oss4_mixer_create_tracks (mixer, controls);
-
- /* free old tracks and controls */
- gst_oss4_mixer_free_tracks (mixer);
-
- /* replace old with new */
- mixer->tracks = tracks;
- mixer->controls = controls;
-}
-
-static const GList *
-gst_oss4_mixer_list_tracks (GstMixer * mixer_iface)
-{
- GstOss4Mixer *mixer = GST_OSS4_MIXER (mixer_iface);
-
- g_return_val_if_fail (mixer != NULL, NULL);
- g_return_val_if_fail (GST_OSS4_MIXER_IS_OPEN (mixer), NULL);
-
- GST_OBJECT_LOCK (mixer);
-
- /* Do a read on the last control to check if the interface has changed */
- if (!mixer->need_update && mixer->last_mixext.ctrl > 0) {
- GstOss4MixerControl mc = { {0,}
- ,
- };
- int val;
-
- mc.mixext = mixer->last_mixext;
- gst_oss4_mixer_get_control_val (mixer, &mc, &val);
- }
-
- if (mixer->need_update || mixer->tracks == NULL) {
- gst_oss4_mixer_update_tracks (mixer);
- mixer->need_update = FALSE;
- }
-
- GST_OBJECT_UNLOCK (mixer);
-
- return (const GList *) mixer->tracks;
-}
-
-static void
-gst_oss4_mixer_set_volume (GstMixer * mixer, GstMixerTrack * track,
- gint * volumes)
-{
- GstOss4Mixer *oss;
-
- g_return_if_fail (mixer != NULL);
- g_return_if_fail (GST_IS_OSS4_MIXER (mixer));
- g_return_if_fail (GST_OSS4_MIXER_IS_OPEN (mixer));
- g_return_if_fail (gst_oss4_mixer_contains_track (mixer, track));
- g_return_if_fail (volumes != NULL);
-
- oss = GST_OSS4_MIXER (mixer);
-
- GST_OBJECT_LOCK (oss);
-
- if (GST_IS_OSS4_MIXER_SLIDER (track)) {
- gst_oss4_mixer_slider_set_volume (GST_OSS4_MIXER_SLIDER (track), volumes);
- }
-
- GST_OBJECT_UNLOCK (oss);
-}
-
-static void
-gst_oss4_mixer_get_volume (GstMixer * mixer, GstMixerTrack * track,
- gint * volumes)
-{
- GstOss4Mixer *oss;
-
- g_return_if_fail (mixer != NULL);
- g_return_if_fail (GST_IS_OSS4_MIXER (mixer));
- g_return_if_fail (GST_OSS4_MIXER_IS_OPEN (mixer));
- g_return_if_fail (gst_oss4_mixer_contains_track (mixer, track));
- g_return_if_fail (volumes != NULL);
-
- oss = GST_OSS4_MIXER (mixer);
-
- GST_OBJECT_LOCK (oss);
-
- memset (volumes, 0, track->num_channels * sizeof (gint));
-
- if (GST_IS_OSS4_MIXER_SWITCH (track)) {
- gboolean enabled = FALSE;
- gst_oss4_mixer_switch_get (GST_OSS4_MIXER_SWITCH (track), &enabled);
- }
- if (GST_IS_OSS4_MIXER_SLIDER (track)) {
- gst_oss4_mixer_slider_get_volume (GST_OSS4_MIXER_SLIDER (track), volumes);
- }
-
- GST_OBJECT_UNLOCK (oss);
-}
-
-static void
-gst_oss4_mixer_set_record (GstMixer * mixer, GstMixerTrack * track,
- gboolean record)
-{
- GstOss4Mixer *oss;
-
- g_return_if_fail (mixer != NULL);
- g_return_if_fail (GST_IS_OSS4_MIXER (mixer));
- g_return_if_fail (GST_OSS4_MIXER_IS_OPEN (mixer));
- g_return_if_fail (gst_oss4_mixer_contains_track (mixer, track));
-
- oss = GST_OSS4_MIXER (mixer);
-
- GST_OBJECT_LOCK (oss);
-
- if (GST_IS_OSS4_MIXER_SLIDER (track)) {
- gst_oss4_mixer_slider_set_record (GST_OSS4_MIXER_SLIDER (track), record);
- } else if (GST_IS_OSS4_MIXER_SWITCH (track)) {
- if ((track->flags & GST_MIXER_TRACK_INPUT)) {
- gst_oss4_mixer_switch_set (GST_OSS4_MIXER_SWITCH (track), record);
- } else {
- GST_WARNING_OBJECT (track, "set_record called on non-INPUT track");
- }
- }
-
- GST_OBJECT_UNLOCK (oss);
-}
-
-static void
-gst_oss4_mixer_set_mute (GstMixer * mixer, GstMixerTrack * track, gboolean mute)
-{
- GstOss4Mixer *oss;
-
- g_return_if_fail (mixer != NULL);
- g_return_if_fail (GST_IS_OSS4_MIXER (mixer));
- g_return_if_fail (GST_OSS4_MIXER_IS_OPEN (mixer));
- g_return_if_fail (gst_oss4_mixer_contains_track (mixer, track));
-
- oss = GST_OSS4_MIXER (mixer);
-
- GST_OBJECT_LOCK (oss);
-
- if (GST_IS_OSS4_MIXER_SLIDER (track)) {
- gst_oss4_mixer_slider_set_mute (GST_OSS4_MIXER_SLIDER (track), mute);
- } else if (GST_IS_OSS4_MIXER_SWITCH (track)) {
- gst_oss4_mixer_switch_set (GST_OSS4_MIXER_SWITCH (track), mute);
- }
-
- GST_OBJECT_UNLOCK (oss);
-}
-
-static void
-gst_oss4_mixer_set_option (GstMixer * mixer, GstMixerOptions * options,
- gchar * value)
-{
- GstOss4Mixer *oss;
-
- g_return_if_fail (mixer != NULL);
- g_return_if_fail (value != NULL);
- g_return_if_fail (GST_IS_OSS4_MIXER (mixer));
- g_return_if_fail (GST_OSS4_MIXER_IS_OPEN (mixer));
- g_return_if_fail (GST_IS_OSS4_MIXER_ENUM (options));
- g_return_if_fail (gst_oss4_mixer_contains_options (mixer, options));
-
- oss = GST_OSS4_MIXER (mixer);
-
- GST_OBJECT_LOCK (oss);
-
- if (!gst_oss4_mixer_enum_set_option (GST_OSS4_MIXER_ENUM (options), value)) {
- /* not much we can do here but wake up the watch thread early, so it
- * can do its thing and post messages if anything has changed */
- gst_oss4_mixer_wake_up_watch_task (oss);
- }
-
- GST_OBJECT_UNLOCK (oss);
-}
-
-static const gchar *
-gst_oss4_mixer_get_option (GstMixer * mixer, GstMixerOptions * options)
-{
- GstOss4Mixer *oss;
- const gchar *current_val;
-
- g_return_val_if_fail (mixer != NULL, NULL);
- g_return_val_if_fail (GST_IS_OSS4_MIXER (mixer), NULL);
- g_return_val_if_fail (GST_OSS4_MIXER_IS_OPEN (mixer), NULL);
- g_return_val_if_fail (GST_IS_OSS4_MIXER_ENUM (options), NULL);
- g_return_val_if_fail (gst_oss4_mixer_contains_options (mixer, options), NULL);
-
- oss = GST_OSS4_MIXER (mixer);
-
- GST_OBJECT_LOCK (oss);
-
- current_val = gst_oss4_mixer_enum_get_option (GST_OSS4_MIXER_ENUM (options));
-
- if (current_val == NULL) {
- /* not much we can do here but wake up the watch thread early, so it
- * can do its thing and post messages if anything has changed */
- gst_oss4_mixer_wake_up_watch_task (oss);
- }
-
- GST_OBJECT_UNLOCK (oss);
-
- return current_val;
-}
-
-static GstMixerFlags
-gst_oss4_mixer_get_mixer_flags (GstMixer * mixer)
-{
- return GST_MIXER_FLAG_AUTO_NOTIFICATIONS | GST_MIXER_FLAG_HAS_WHITELIST |
- GST_MIXER_FLAG_GROUPING;
-}
-
-static void
-gst_oss4_mixer_interface_init (GstMixerInterface * iface)
-{
- GST_MIXER_TYPE (iface) = GST_MIXER_HARDWARE;
-
- iface->list_tracks = gst_oss4_mixer_list_tracks;
- iface->set_volume = gst_oss4_mixer_set_volume;
- iface->get_volume = gst_oss4_mixer_get_volume;
- iface->set_mute = gst_oss4_mixer_set_mute;
- iface->set_record = gst_oss4_mixer_set_record;
- iface->set_option = gst_oss4_mixer_set_option;
- iface->get_option = gst_oss4_mixer_get_option;
- iface->get_mixer_flags = gst_oss4_mixer_get_mixer_flags;
-}
-
-/* Implement the horror that is GstImplementsInterface */
-
-static gboolean
-gst_oss4_mixer_supported (GstImplementsInterface * iface, GType iface_type)
-{
- GstOss4Mixer *mixer;
-
- g_return_val_if_fail (iface_type == GST_TYPE_MIXER, FALSE);
-
- mixer = GST_OSS4_MIXER (iface);
-
- return GST_OSS4_MIXER_IS_OPEN (mixer);
-}
-
-static void
-gst_oss4_mixer_implements_interface_init (GstImplementsInterfaceClass * klass)
-{
- klass->supported = gst_oss4_mixer_supported;
-}
-
-static void
-gst_oss4_mixer_init_interfaces (GType type)
-{
- static const GInterfaceInfo implements_iface_info = {
- (GInterfaceInitFunc) gst_oss4_mixer_implements_interface_init,
- NULL,
- NULL,
- };
- static const GInterfaceInfo mixer_iface_info = {
- (GInterfaceInitFunc) gst_oss4_mixer_interface_init,
- NULL,
- NULL,
- };
-
- g_type_add_interface_static (type, GST_TYPE_IMPLEMENTS_INTERFACE,
- &implements_iface_info);
- g_type_add_interface_static (type, GST_TYPE_MIXER, &mixer_iface_info);
-
- gst_oss4_add_property_probe_interface (type);
-}
diff --git a/sys/oss4/oss4-mixer.h b/sys/oss4/oss4-mixer.h
deleted file mode 100644
index 4eaff50c5c5cc1218e30afc669ce94e5310b17ad..0000000000000000000000000000000000000000
--- a/sys/oss4/oss4-mixer.h
+++ /dev/null
@@ -1,128 +0,0 @@
-/* GStreamer OSS4 mixer implementation
- * Copyright (C) 2007-2008 Tim-Philipp Müller <tim centricular net>
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Library General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Library General Public License for more details.
- *
- * You should have received a copy of the GNU Library General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- */
-
-#ifndef OSS4_MIXER_H
-#define OSS4_MIXER_H
-
-#include <gst/gst.h>
-
-#include "oss4-soundcard.h"
-
-#define GST_OSS4_MIXER(obj) (G_TYPE_CHECK_INSTANCE_CAST((obj),GST_TYPE_OSS4_MIXER,GstOss4Mixer))
-#define GST_OSS4_MIXER_CAST(obj) ((GstOss4Mixer *)(obj))
-#define GST_OSS4_MIXER_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST((klass),GST_TYPE_OSS4_MIXER,GstOss4MixerClass))
-#define GST_IS_OSS4_MIXER(obj) (G_TYPE_CHECK_INSTANCE_TYPE((obj),GST_TYPE_OSS4_MIXER))
-#define GST_IS_OSS4_MIXER_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE((klass),GST_TYPE_OSS4_MIXER))
-#define GST_TYPE_OSS4_MIXER (gst_oss4_mixer_get_type())
-
-#define GST_OSS4_MIXER_IS_OPEN(obj) (GST_OSS4_MIXER(obj)->fd != -1)
-
-typedef struct _GstOss4Mixer GstOss4Mixer;
-typedef struct _GstOss4MixerClass GstOss4MixerClass;
-
-struct _GstOss4Mixer {
- GstElement element;
-
- /*< private >*/
-
- /* element bits'n'bops */
- gchar * device;
-
- /* mixer details */
- gint fd; /* file descriptor if open, or -1 */
- gchar * device_name; /* device description, or NULL */
- gchar * open_device; /* the device we opened */
-
- GList * tracks; /* list of available tracks */
- GList * controls; /* list of available controls */
- gboolean need_update; /* re-read list of available tracks? */
-
- oss_mixext last_mixext; /* we keep this around so we can
- * easily check if the mixer
- * interface has changed */
-
- GThread * watch_thread; /* thread watching for value changes */
- GCond * watch_cond;
- gint watch_shutdown;
- gint modify_counter; /* from MIXERINFO */
-
- /* for property probe interface */
- GList * property_probe_list;
-};
-
-struct _GstOss4MixerClass {
- GstElementClass element_class;
-};
-
-/* helper struct holding info about one control */
-typedef struct _GstOss4MixerControl GstOss4MixerControl;
-
-struct _GstOss4MixerControl {
- oss_mixext mixext;
- GstOss4MixerControl *parent; /* NULL if root */
- GstOss4MixerControl *mute; /* sibling with mute function, or NULL */
- GList *mute_group; /* group of mute controls, or NULL */
- GList *children; /* GstOss4MixerControls (no ownership) */
-
- GQuark *enum_vals; /* 0-terminated array of values or NULL */
- int enum_version; /* 0 = list won't change */
-
- int last_val; /* last value seen */
-
- gboolean is_virtual : 1; /* is a vmix control with dynamic label */
- gboolean is_master : 1;
- gboolean is_slider : 1; /* represent as slider */
- gboolean is_switch : 1; /* represent as switch */
- gboolean is_enum : 1; /* represent as combo/enumeration */
- gboolean no_list : 1; /* enumeration with no list available */
- gboolean is_input : 1; /* is an input-related control */
- gboolean is_output : 1; /* is an output-related control */
- gboolean used : 1; /* whether we know what to do with this */
-
- gboolean changed : 1; /* transient flag used by watch thread */
- gboolean list_changed : 1; /* transient flag used by watch thread */
-};
-
-/* header says parent=-1 means root, but it can also be parent=ctrl */
-#define MIXEXT_IS_ROOT(me) ((me).parent == -1 || (me).parent == (me).ctrl)
-
-#define MIXEXT_IS_SLIDER(me) ((me).type == MIXT_MONOSLIDER || \
- (me).type == MIXT_STEREOSLIDER || (me).type == MIXT_MONOSLIDER16 || \
- (me).type == MIXT_STEREOSLIDER16 || (me).type == MIXT_SLIDER)
-
-#define MIXEXT_HAS_DESCRIPTION(me) (((me).flags & MIXF_DESCR) != 0)
-
-#define MIXEXT_ENUM_IS_AVAILABLE(me,num) \
- (((me).enum_present[num/8]) & (1 << (num % 8)))
-
-
-GType gst_oss4_mixer_get_type (void);
-
-gboolean gst_oss4_mixer_get_control_val (GstOss4Mixer * mixer,
- GstOss4MixerControl * mc,
- int * val);
-
-gboolean gst_oss4_mixer_set_control_val (GstOss4Mixer * mixer,
- GstOss4MixerControl * mc,
- int val);
-
-G_END_DECLS
-
-#endif /* OSS4_MIXER_H */
-
diff --git a/sys/oss4/oss4-property-probe.c b/sys/oss4/oss4-property-probe.c
index 5674da50a46a72561349c8988e81580722c56a26..c628af81a4b929133340634d8e59e6fa6d457bc3 100644
--- a/sys/oss4/oss4-property-probe.c
+++ b/sys/oss4/oss4-property-probe.c
@@ -27,9 +27,9 @@
#include <gst/gst.h>
+
#define NO_LEGACY_MIXER
#include "oss4-audio.h"
-#include "oss4-mixer.h"
#include "oss4-sink.h"
#include "oss4-source.h"
#include "oss4-soundcard.h"
@@ -43,6 +43,8 @@
#include <errno.h>
#include <string.h>
+#if 0
+
GST_DEBUG_CATEGORY_EXTERN (oss4_debug);
#define GST_CAT_DEFAULT oss4_debug
@@ -110,6 +112,8 @@ gst_oss4_property_probe_needs_probe (GstPropertyProbe * probe,
return TRUE;
}
+#endif
+
static gint
oss4_mixerinfo_priority_cmp (struct oss_mixerinfo *mi1,
struct oss_mixerinfo *mi2)
@@ -282,9 +286,8 @@ gst_oss4_property_probe_get_audio_devices (GstObject * obj, int fd,
return g_list_reverse (devices);
}
-static GValueArray *
-gst_oss4_property_probe_get_values (GstPropertyProbe * probe,
- guint prop_id, const GParamSpec * pspec)
+GValueArray *
+gst_oss4_property_probe_get_values (GstObject * probe, const gchar * pname)
{
struct oss_sysinfo si = { {0,}, };
GValueArray *array = NULL;
@@ -292,8 +295,8 @@ gst_oss4_property_probe_get_values (GstPropertyProbe * probe,
GList *devices, *l;
int cap_mask, fd = -1;
- if (!g_str_equal (pspec->name, "device")) {
- G_OBJECT_WARN_INVALID_PROPERTY_ID (probe, prop_id, pspec);
+ if (!g_str_equal (pname, "device")) {
+ GST_WARNING_OBJECT (probe, "invalid property");
return NULL;
}
@@ -310,9 +313,6 @@ gst_oss4_property_probe_get_values (GstPropertyProbe * probe,
GST_DEBUG_OBJECT (probe, "probing available input devices");
cap_mask = PCM_CAP_INPUT;
fd = GST_OSS4_SOURCE (probe)->fd;
- } else if (GST_IS_OSS4_MIXER (probe)) {
- fd = GST_OSS4_MIXER (probe)->fd;
- cap_mask = 0;
} else {
GST_OBJECT_UNLOCK (obj);
g_return_val_if_reached (NULL);
@@ -393,6 +393,7 @@ no_sysinfo:
}
}
+#if 0
static void
gst_oss4_property_probe_interface_init (GstPropertyProbeInterface * iface)
{
@@ -414,3 +415,4 @@ gst_oss4_add_property_probe_interface (GType type)
g_type_add_interface_static (type, GST_TYPE_PROPERTY_PROBE,
&probe_iface_info);
}
+#endif
diff --git a/sys/oss4/oss4-property-probe.h b/sys/oss4/oss4-property-probe.h
index 707af024c91efbc45ddc0a86998a6d4ae41ea90a..8426bb60478e66f55b89af2fb2ab99a69cb9d61f 100644
--- a/sys/oss4/oss4-property-probe.h
+++ b/sys/oss4/oss4-property-probe.h
@@ -20,10 +20,14 @@
#ifndef GST_OSS4_PROPERTY_PROBE_H
#define GST_OSS4_PROPERTY_PROBE_H
+#if 0
+
#include <gst/interfaces/propertyprobe.h>
void gst_oss4_add_property_probe_interface (GType type);
+#endif
+
gboolean gst_oss4_property_probe_find_device_name (GstObject * obj,
int fd,
const gchar * device_handle,
@@ -33,6 +37,9 @@ gboolean gst_oss4_property_probe_find_device_name_nofd (GstObject * obj,
const gchar * device_handle,
gchar ** device_name);
+GValueArray *gst_oss4_property_probe_get_values (GstObject * obj, const gchar * pname);
+
+
#endif /* GST_OSS4_PROPERTY_PROBE_H */
diff --git a/sys/oss4/oss4-sink.c b/sys/oss4/oss4-sink.c
index fe1b2bb7e1db0de23d5b82445b4d00314878ef25..ababa0eb143f9d6e45bf365005b3f1290ae4decc 100644
--- a/sys/oss4/oss4-sink.c
+++ b/sys/oss4/oss4-sink.c
@@ -55,7 +55,7 @@
#include <string.h>
#include <gst/gst-i18n-plugin.h>
-#include <gst/interfaces/streamvolume.h>
+#include <gst/audio/streamvolume.h>
#define NO_LEGACY_MIXER
#include "oss4-audio.h"
@@ -66,7 +66,6 @@
GST_DEBUG_CATEGORY_EXTERN (oss4sink_debug);
#define GST_CAT_DEFAULT oss4sink_debug
-static void gst_oss4_sink_init_interfaces (GType type);
static void gst_oss4_sink_dispose (GObject * object);
static void gst_oss4_sink_finalize (GObject * object);
@@ -75,15 +74,15 @@ static void gst_oss4_sink_get_property (GObject * object, guint prop_id,
static void gst_oss4_sink_set_property (GObject * object, guint prop_id,
const GValue * value, GParamSpec * pspec);
-static GstCaps *gst_oss4_sink_getcaps (GstBaseSink * bsink);
+static GstCaps *gst_oss4_sink_getcaps (GstBaseSink * bsink, GstCaps * filter);
static gboolean gst_oss4_sink_open (GstAudioSink * asink,
gboolean silent_errors);
static gboolean gst_oss4_sink_open_func (GstAudioSink * asink);
static gboolean gst_oss4_sink_close (GstAudioSink * asink);
static gboolean gst_oss4_sink_prepare (GstAudioSink * asink,
- GstRingBufferSpec * spec);
+ GstAudioRingBufferSpec * spec);
static gboolean gst_oss4_sink_unprepare (GstAudioSink * asink);
-static guint gst_oss4_sink_write (GstAudioSink * asink, gpointer data,
+static gint gst_oss4_sink_write (GstAudioSink * asink, gpointer data,
guint length);
static guint gst_oss4_sink_delay (GstAudioSink * asink);
static void gst_oss4_sink_reset (GstAudioSink * asink);
@@ -104,8 +103,9 @@ enum
PROP_LAST
};
-GST_BOILERPLATE_FULL (GstOss4Sink, gst_oss4_sink, GstAudioSink,
- GST_TYPE_AUDIO_SINK, gst_oss4_sink_init_interfaces);
+#define gst_oss4_sink_parent_class parent_class
+G_DEFINE_TYPE_WITH_CODE (GstOss4Sink, gst_oss4_sink,
+ GST_TYPE_AUDIO_SINK, G_IMPLEMENT_INTERFACE (GST_TYPE_STREAM_VOLUME, NULL));
static void
gst_oss4_sink_dispose (GObject * object)
@@ -120,28 +120,14 @@ gst_oss4_sink_dispose (GObject * object)
G_OBJECT_CLASS (parent_class)->dispose (object);
}
-static void
-gst_oss4_sink_base_init (gpointer g_class)
-{
- GstElementClass *element_class = GST_ELEMENT_CLASS (g_class);
- GstPadTemplate *templ;
-
- gst_element_class_set_static_metadata (element_class,
- "OSS v4 Audio Sink", "Sink/Audio",
- "Output to a sound card via OSS version 4",
- "Tim-Philipp Müller <tim centricular net>");
-
- templ = gst_pad_template_new ("sink", GST_PAD_SINK, GST_PAD_ALWAYS,
- gst_oss4_audio_get_template_caps ());
- gst_element_class_add_pad_template (element_class, templ);
-}
-
static void
gst_oss4_sink_class_init (GstOss4SinkClass * klass)
{
GstAudioSinkClass *audiosink_class = (GstAudioSinkClass *) klass;
GstBaseSinkClass *basesink_class = (GstBaseSinkClass *) klass;
+ GstElementClass *gstelement_class = (GstElementClass *) klass;
GObjectClass *gobject_class = (GObjectClass *) klass;
+ GstPadTemplate *templ;
gobject_class->dispose = gst_oss4_sink_dispose;
gobject_class->finalize = gst_oss4_sink_finalize;
@@ -180,10 +166,19 @@ gst_oss4_sink_class_init (GstOss4SinkClass * klass)
audiosink_class->write = GST_DEBUG_FUNCPTR (gst_oss4_sink_write);
audiosink_class->delay = GST_DEBUG_FUNCPTR (gst_oss4_sink_delay);
audiosink_class->reset = GST_DEBUG_FUNCPTR (gst_oss4_sink_reset);
+
+ gst_element_class_set_static_metadata (gstelement_class,
+ "OSS v4 Audio Sink", "Sink/Audio",
+ "Output to a sound card via OSS version 4",
+ "Tim-Philipp Müller <tim centricular net>");
+
+ templ = gst_pad_template_new ("sink", GST_PAD_SINK, GST_PAD_ALWAYS,
+ gst_oss4_audio_get_template_caps ());
+ gst_element_class_add_pad_template (gstelement_class, templ);
}
static void
-gst_oss4_sink_init (GstOss4Sink * osssink, GstOss4SinkClass * klass)
+gst_oss4_sink_init (GstOss4Sink * osssink)
{
const gchar *device;
@@ -206,9 +201,6 @@ gst_oss4_sink_finalize (GObject * object)
g_free (osssink->device);
osssink->device = NULL;
- g_list_free (osssink->property_probe_list);
- osssink->property_probe_list = NULL;
-
G_OBJECT_CLASS (parent_class)->finalize (object);
}
@@ -383,7 +375,7 @@ gst_oss4_sink_get_property (GObject * object, guint prop_id,
}
static GstCaps *
-gst_oss4_sink_getcaps (GstBaseSink * bsink)
+gst_oss4_sink_getcaps (GstBaseSink * bsink, GstCaps * filter)
{
GstOss4Sink *oss;
GstCaps *caps;
@@ -401,7 +393,16 @@ gst_oss4_sink_getcaps (GstBaseSink * bsink)
}
}
- return caps;
+ if (filter && caps) {
+ GstCaps *intersection;
+
+ intersection =
+ gst_caps_intersect_full (filter, caps, GST_CAPS_INTERSECT_FIRST);
+ gst_caps_unref (caps);
+ return intersection;
+ } else {
+ return caps;
+ }
}
/* note: we must not take the object lock here unless we fix up get_property */
@@ -576,7 +577,7 @@ gst_oss4_sink_close (GstAudioSink * asink)
}
static gboolean
-gst_oss4_sink_prepare (GstAudioSink * asink, GstRingBufferSpec * spec)
+gst_oss4_sink_prepare (GstAudioSink * asink, GstAudioRingBufferSpec * spec)
{
GstOss4Sink *oss;
@@ -588,7 +589,8 @@ gst_oss4_sink_prepare (GstAudioSink * asink, GstRingBufferSpec * spec)
return FALSE;
}
- oss->bytes_per_sample = spec->bytes_per_sample;
+ oss->bytes_per_sample = GST_AUDIO_INFO_BPF (&spec->info);
+
return TRUE;
}
@@ -619,7 +621,7 @@ couldnt_reopen:
}
}
-static guint
+static gint
gst_oss4_sink_write (GstAudioSink * asink, gpointer data, guint length)
{
GstOss4Sink *oss;
@@ -681,15 +683,3 @@ gst_oss4_sink_reset (GstAudioSink * asink)
* same device/fd from multiple threads and might deadlock or blow up in
* other ways if we try an ioctl SNDCTL_DSP_HALT or similar */
}
-
-static void
-gst_oss4_sink_init_interfaces (GType type)
-{
- static const GInterfaceInfo svol_iface_info = {
- NULL, NULL, NULL
- };
-
- g_type_add_interface_static (type, GST_TYPE_STREAM_VOLUME, &svol_iface_info);
-
- gst_oss4_add_property_probe_interface (type);
-}
diff --git a/sys/oss4/oss4-sink.h b/sys/oss4/oss4-sink.h
index b1489a7d80617a5f2bf900b518c914b0312123ef..47221955d8152a0ff3bdae0bc5ad73a28ddaec59 100644
--- a/sys/oss4/oss4-sink.h
+++ b/sys/oss4/oss4-sink.h
@@ -47,8 +47,6 @@ struct _GstOss4Sink {
gint mute_volume;
GstCaps * probed_caps;
-
- GList * property_probe_list;
};
struct _GstOss4SinkClass {
diff --git a/sys/oss4/oss4-source.c b/sys/oss4/oss4-source.c
index 5e4d447a04c6ae3df47da9392aa078462e688f1e..4b39ce4ed99c648b2a78ff1fd376ef953832e0ab 100644
--- a/sys/oss4/oss4-source.c
+++ b/sys/oss4/oss4-source.c
@@ -50,7 +50,6 @@
#include <unistd.h>
#include <string.h>
-#include <gst/interfaces/mixer.h>
#include <gst/gst-i18n-plugin.h>
#define NO_LEGACY_MIXER
@@ -74,10 +73,8 @@ enum
PROP_DEVICE_NAME
};
-static void gst_oss4_source_init_interfaces (GType type);
-
-GST_BOILERPLATE_FULL (GstOss4Source, gst_oss4_source, GstAudioSrc,
- GST_TYPE_AUDIO_SRC, gst_oss4_source_init_interfaces);
+#define gst_oss4_source_parent_class parent_class
+G_DEFINE_TYPE (GstOss4Source, gst_oss4_source, GST_TYPE_AUDIO_SRC);
static void gst_oss4_source_get_property (GObject * object, guint prop_id,
GValue * value, GParamSpec * pspec);
@@ -87,44 +84,31 @@ static void gst_oss4_source_set_property (GObject * object, guint prop_id,
static void gst_oss4_source_dispose (GObject * object);
static void gst_oss4_source_finalize (GstOss4Source * osssrc);
-static GstCaps *gst_oss4_source_getcaps (GstBaseSrc * bsrc);
+static GstCaps *gst_oss4_source_getcaps (GstBaseSrc * bsrc, GstCaps * filter);
static gboolean gst_oss4_source_open (GstAudioSrc * asrc,
gboolean silent_errors);
static gboolean gst_oss4_source_open_func (GstAudioSrc * asrc);
static gboolean gst_oss4_source_close (GstAudioSrc * asrc);
static gboolean gst_oss4_source_prepare (GstAudioSrc * asrc,
- GstRingBufferSpec * spec);
+ GstAudioRingBufferSpec * spec);
static gboolean gst_oss4_source_unprepare (GstAudioSrc * asrc);
static guint gst_oss4_source_read (GstAudioSrc * asrc, gpointer data,
guint length);
static guint gst_oss4_source_delay (GstAudioSrc * asrc);
static void gst_oss4_source_reset (GstAudioSrc * asrc);
-static void
-gst_oss4_source_base_init (gpointer g_class)
-{
- GstElementClass *element_class = GST_ELEMENT_CLASS (g_class);
- GstPadTemplate *templ;
-
- gst_element_class_set_static_metadata (element_class,
- "OSS v4 Audio Source", "Source/Audio",
- "Capture from a sound card via OSS version 4",
- "Tim-Philipp Müller <tim centricular net>");
-
- templ = gst_pad_template_new ("src", GST_PAD_SRC, GST_PAD_ALWAYS,
- gst_oss4_audio_get_template_caps ());
- gst_element_class_add_pad_template (element_class, templ);
-}
-
static void
gst_oss4_source_class_init (GstOss4SourceClass * klass)
{
GObjectClass *gobject_class;
+ GstElementClass *gstelement_class;
GstBaseSrcClass *gstbasesrc_class;
GstAudioSrcClass *gstaudiosrc_class;
+ GstPadTemplate *templ;
gobject_class = (GObjectClass *) klass;
+ gstelement_class = (GstElementClass *) klass;
gstbasesrc_class = (GstBaseSrcClass *) klass;
gstaudiosrc_class = (GstAudioSrcClass *) klass;
@@ -153,10 +137,19 @@ gst_oss4_source_class_init (GstOss4SourceClass * klass)
g_param_spec_string ("device-name", "Device name",
"Human-readable name of the sound device", DEFAULT_DEVICE_NAME,
G_PARAM_READABLE | G_PARAM_STATIC_STRINGS));
+
+ gst_element_class_set_static_metadata (gstelement_class,
+ "OSS v4 Audio Source", "Source/Audio",
+ "Capture from a sound card via OSS version 4",
+ "Tim-Philipp Müller <tim centricular net>");
+
+ templ = gst_pad_template_new ("src", GST_PAD_SRC, GST_PAD_ALWAYS,
+ gst_oss4_audio_get_template_caps ());
+ gst_element_class_add_pad_template (gstelement_class, templ);
}
static void
-gst_oss4_source_init (GstOss4Source * osssrc, GstOss4SourceClass * g_class)
+gst_oss4_source_init (GstOss4Source * osssrc)
{
const gchar *device;
@@ -176,9 +169,6 @@ gst_oss4_source_finalize (GstOss4Source * oss)
g_free (oss->device);
oss->device = NULL;
- g_list_free (oss->property_probe_list);
- oss->property_probe_list = NULL;
-
G_OBJECT_CLASS (parent_class)->finalize ((GObject *) (oss));
}
@@ -265,7 +255,7 @@ gst_oss4_source_get_property (GObject * object, guint prop_id,
}
static GstCaps *
-gst_oss4_source_getcaps (GstBaseSrc * bsrc)
+gst_oss4_source_getcaps (GstBaseSrc * bsrc, GstCaps * filter)
{
GstOss4Source *oss;
GstCaps *caps;
@@ -283,7 +273,16 @@ gst_oss4_source_getcaps (GstBaseSrc * bsrc)
}
}
- return caps;
+ if (filter && caps) {
+ GstCaps *intersection;
+
+ intersection =
+ gst_caps_intersect_full (filter, caps, GST_CAPS_INTERSECT_FIRST);
+ gst_caps_unref (caps);
+ return intersection;
+ } else {
+ return caps;
+ }
}
/* note: we must not take the object lock here unless we fix up get_property */
@@ -414,14 +413,6 @@ gst_oss4_source_open_func (GstAudioSrc * asrc)
return gst_oss4_source_open (asrc, FALSE);
}
-static void
-gst_oss4_source_free_mixer_tracks (GstOss4Source * oss)
-{
- g_list_foreach (oss->tracks, (GFunc) g_object_unref, NULL);
- g_list_free (oss->tracks);
- oss->tracks = NULL;
-}
-
static gboolean
gst_oss4_source_close (GstAudioSrc * asrc)
{
@@ -445,13 +436,11 @@ gst_oss4_source_close (GstAudioSrc * asrc)
g_free (oss->device_name);
oss->device_name = NULL;
- gst_oss4_source_free_mixer_tracks (oss);
-
return TRUE;
}
static gboolean
-gst_oss4_source_prepare (GstAudioSrc * asrc, GstRingBufferSpec * spec)
+gst_oss4_source_prepare (GstAudioSrc * asrc, GstAudioRingBufferSpec * spec)
{
GstOss4Source *oss;
@@ -463,7 +452,8 @@ gst_oss4_source_prepare (GstAudioSrc * asrc, GstRingBufferSpec * spec)
return FALSE;
}
- oss->bytes_per_sample = spec->bytes_per_sample;
+ oss->bytes_per_sample = GST_AUDIO_INFO_BPF (&spec->info);
+
return TRUE;
}
@@ -555,442 +545,3 @@ gst_oss4_source_reset (GstAudioSrc * asrc)
* same device/fd from multiple threads and might deadlock or blow up in
* other ways if we try an ioctl SNDCTL_DSP_HALT or similar */
}
-
-/* GstMixer interface, which we abuse here for input selection, because we
- * don't have a proper interface for that and because that's what
- * gnome-sound-recorder does. */
-
-/* GstMixerTrack is a plain GObject, so let's just use the GLib macro here */
-G_DEFINE_TYPE (GstOss4SourceInput, gst_oss4_source_input, GST_TYPE_MIXER_TRACK);
-
-static void
-gst_oss4_source_input_class_init (GstOss4SourceInputClass * klass)
-{
- /* nothing to do here */
-}
-
-static void
-gst_oss4_source_input_init (GstOss4SourceInput * i)
-{
- /* nothing to do here */
-}
-
-#if 0
-
-static void
-gst_ossmixer_ensure_track_list (GstOssMixer * mixer)
-{
- gint i, master = -1;
-
- g_return_if_fail (mixer->fd != -1);
-
- if (mixer->tracklist)
- return;
-
- /* find master volume */
- if (mixer->devmask & SOUND_MASK_VOLUME)
- master = SOUND_MIXER_VOLUME;
- else if (mixer->devmask & SOUND_MASK_PCM)
- master = SOUND_MIXER_PCM;
- else if (mixer->devmask & SOUND_MASK_SPEAKER)
- master = SOUND_MIXER_SPEAKER; /* doubtful... */
- /* else: no master, so we won't set any */
-
- /* build track list */
- for (i = 0; i < SOUND_MIXER_NRDEVICES; i++) {
- if (mixer->devmask & (1 << i)) {
- GstMixerTrack *track;
- gboolean input = FALSE, stereo = FALSE, record = FALSE;
-
- /* track exists, make up capabilities */
- if (MASK_BIT_IS_SET (mixer->stereomask, i))
- stereo = TRUE;
- if (MASK_BIT_IS_SET (mixer->recmask, i))
- input = TRUE;
- if (MASK_BIT_IS_SET (mixer->recdevs, i))
- record = TRUE;
-
- /* do we want mixer in our list? */
- if (!((mixer->dir & GST_OSS_MIXER_CAPTURE && input == TRUE) ||
- (mixer->dir & GST_OSS_MIXER_PLAYBACK && i != SOUND_MIXER_PCM)))
- /* the PLAYBACK case seems hacky, but that's how 0.8 had it */
- continue;
-
- /* add track to list */
- track = gst_ossmixer_track_new (mixer->fd, i, stereo ? 2 : 1,
- (record ? GST_MIXER_TRACK_RECORD : 0) |
- (input ? GST_MIXER_TRACK_INPUT :
- GST_MIXER_TRACK_OUTPUT) |
- ((master != i) ? 0 : GST_MIXER_TRACK_MASTER));
- mixer->tracklist = g_list_append (mixer->tracklist, track);
- }
- }
-}
-
-/* unused with G_DISABLE_* */
-static G_GNUC_UNUSED gboolean
-gst_ossmixer_contains_track (GstOssMixer * mixer, GstOssMixerTrack * osstrack)
-{
- const GList *item;
-
- for (item = mixer->tracklist; item != NULL; item = item->next)
- if (item->data == osstrack)
- return TRUE;
-
- return FALSE;
-}
-
-const GList *
-gst_ossmixer_list_tracks (GstOssMixer * mixer)
-{
- gst_ossmixer_ensure_track_list (mixer);
-
- return (const GList *) mixer->tracklist;
-}
-
-void
-gst_ossmixer_get_volume (GstOssMixer * mixer,
- GstMixerTrack * track, gint * volumes)
-{
- gint volume;
- GstOssMixerTrack *osstrack = GST_OSSMIXER_TRACK (track);
-
- g_return_if_fail (mixer->fd != -1);
- g_return_if_fail (gst_ossmixer_contains_track (mixer, osstrack));
-
- if (track->flags & GST_MIXER_TRACK_MUTE) {
- volumes[0] = osstrack->lvol;
- if (track->num_channels == 2) {
- volumes[1] = osstrack->rvol;
- }
- } else {
- /* get */
- if (ioctl (mixer->fd, MIXER_READ (osstrack->track_num), &volume) < 0) {
- g_warning ("Error getting recording device (%d) volume: %s",
- osstrack->track_num, g_strerror (errno));
- volume = 0;
- }
-
- osstrack->lvol = volumes[0] = (volume & 0xff);
- if (track->num_channels == 2) {
- osstrack->rvol = volumes[1] = ((volume >> 8) & 0xff);
- }
- }
-}
-
-void
-gst_ossmixer_set_mute (GstOssMixer * mixer, GstMixerTrack * track,
- gboolean mute)
-{
- int volume;
- GstOssMixerTrack *osstrack = GST_OSSMIXER_TRACK (track);
-
- g_return_if_fail (mixer->fd != -1);
- g_return_if_fail (gst_ossmixer_contains_track (mixer, osstrack));
-
- if (mute) {
- volume = 0;
- } else {
- volume = (osstrack->lvol & 0xff);
- if (MASK_BIT_IS_SET (mixer->stereomask, osstrack->track_num)) {
- volume |= ((osstrack->rvol & 0xff) << 8);
- }
- }
-
- if (ioctl (mixer->fd, MIXER_WRITE (osstrack->track_num), &volume) < 0) {
- g_warning ("Error setting mixer recording device volume (0x%x): %s",
- volume, g_strerror (errno));
- return;
- }
-
- if (mute) {
- track->flags |= GST_MIXER_TRACK_MUTE;
- } else {
- track->flags &= ~GST_MIXER_TRACK_MUTE;
- }
-}
-#endif
-
-static gint
-gst_oss4_source_mixer_get_current_input (GstOss4Source * oss)
-{
- int cur = -1;
-
- if (ioctl (oss->fd, SNDCTL_DSP_GET_RECSRC, &cur) == -1 || cur < 0)
- return -1;
-
- return cur;
-}
-
-static const gchar *
-gst_oss4_source_mixer_update_record_flags (GstOss4Source * oss, gint cur_route)
-{
- const gchar *cur_name = "";
- GList *t;
-
- for (t = oss->tracks; t != NULL; t = t->next) {
- GstMixerTrack *track = t->data;
-
- if (GST_OSS4_SOURCE_INPUT (track)->route == cur_route) {
- if (!GST_MIXER_TRACK_HAS_FLAG (track, GST_MIXER_TRACK_RECORD)) {
- track->flags |= GST_MIXER_TRACK_RECORD;
- /* no point in sending a mixer-record-changes message here */
- }
- cur_name = track->label;
- } else {
- if (GST_MIXER_TRACK_HAS_FLAG (track, GST_MIXER_TRACK_RECORD)) {
- track->flags &= ~GST_MIXER_TRACK_RECORD;
- /* no point in sending a mixer-record-changes message here */
- }
- }
- }
-
- return cur_name;
-}
-
-static const GList *
-gst_oss4_source_mixer_list_tracks (GstMixer * mixer)
-{
- oss_mixer_enuminfo names = { 0, };
- GstOss4Source *oss;
- const gchar *cur_name;
- GList *tracks = NULL;
- gint i, cur;
-
- g_return_val_if_fail (mixer != NULL, NULL);
- g_return_val_if_fail (GST_IS_OSS4_SOURCE (mixer), NULL);
- g_return_val_if_fail (GST_OSS4_SOURCE_IS_OPEN (mixer), NULL);
-
- oss = GST_OSS4_SOURCE (mixer);
-
- if (oss->tracks != NULL && oss->tracks_static)
- goto done;
-
- if (ioctl (oss->fd, SNDCTL_DSP_GET_RECSRC_NAMES, &names) == -1)
- goto get_recsrc_names_error;
-
- oss->tracks_static = (names.version == 0);
-
- GST_INFO_OBJECT (oss, "%d inputs (list is static: %s):", names.nvalues,
- (oss->tracks_static) ? "yes" : "no");
-
- for (i = 0; i < MIN (names.nvalues, OSS_ENUM_MAXVALUE + 1); ++i) {
- GstMixerTrack *track;
-
- track = g_object_new (GST_TYPE_OSS4_SOURCE_INPUT, NULL);
- track->label = g_strdup (&names.strings[names.strindex[i]]);
- track->flags = GST_MIXER_TRACK_INPUT;
- track->num_channels = 2;
- track->min_volume = 0;
- track->max_volume = 100;
- GST_OSS4_SOURCE_INPUT (track)->route = i;
-
- GST_INFO_OBJECT (oss, " [%d] %s", i, track->label);
- tracks = g_list_append (tracks, track);
- }
-
- gst_oss4_source_free_mixer_tracks (oss);
- oss->tracks = tracks;
-
-done:
-
- /* update RECORD flags */
- cur = gst_oss4_source_mixer_get_current_input (oss);
- cur_name = gst_oss4_source_mixer_update_record_flags (oss, cur);
- GST_DEBUG_OBJECT (oss, "current input route: %d (%s)", cur, cur_name);
-
- return (const GList *) oss->tracks;
-
-/* ERRORS */
-get_recsrc_names_error:
- {
- GST_WARNING_OBJECT (oss, "GET_RECSRC_NAMES failed: %s", g_strerror (errno));
- return NULL;
- }
-}
-
-static void
-gst_oss4_source_mixer_set_volume (GstMixer * mixer, GstMixerTrack * track,
- gint * volumes)
-{
- GstOss4Source *oss;
- int new_vol, cur;
-
- g_return_if_fail (mixer != NULL);
- g_return_if_fail (track != NULL);
- g_return_if_fail (GST_IS_MIXER_TRACK (track));
- g_return_if_fail (GST_IS_OSS4_SOURCE (mixer));
- g_return_if_fail (GST_OSS4_SOURCE_IS_OPEN (mixer));
-
- oss = GST_OSS4_SOURCE (mixer);
-
- cur = gst_oss4_source_mixer_get_current_input (oss);
- if (cur != GST_OSS4_SOURCE_INPUT (track)->route) {
- GST_DEBUG_OBJECT (oss, "track not selected input route, ignoring request");
- return;
- }
-
- new_vol = (volumes[1] << 8) | volumes[0];
- if (ioctl (oss->fd, SNDCTL_DSP_SETRECVOL, &new_vol) == -1) {
- GST_WARNING_OBJECT (oss, "SETRECVOL failed: %s", g_strerror (errno));
- }
-}
-
-static void
-gst_oss4_source_mixer_get_volume (GstMixer * mixer, GstMixerTrack * track,
- gint * volumes)
-{
- GstOss4Source *oss;
- int cur;
-
- g_return_if_fail (mixer != NULL);
- g_return_if_fail (GST_IS_OSS4_SOURCE (mixer));
- g_return_if_fail (GST_OSS4_SOURCE_IS_OPEN (mixer));
-
- oss = GST_OSS4_SOURCE (mixer);
-
- cur = gst_oss4_source_mixer_get_current_input (oss);
- if (cur != GST_OSS4_SOURCE_INPUT (track)->route) {
- volumes[0] = 0;
- volumes[1] = 0;
- } else {
- int vol = -1;
-
- if (ioctl (oss->fd, SNDCTL_DSP_GETRECVOL, &vol) == -1 || vol < 0) {
- GST_WARNING_OBJECT (oss, "GETRECVOL failed: %s", g_strerror (errno));
- volumes[0] = 100;
- volumes[1] = 100;
- } else {
- volumes[0] = MIN (100, vol & 0xff);
- volumes[1] = MIN (100, (vol >> 8) & 0xff);
- }
- }
-}
-
-static void
-gst_oss4_source_mixer_set_record (GstMixer * mixer, GstMixerTrack * track,
- gboolean record)
-{
- GstOss4Source *oss;
- const gchar *cur_name;
- gint cur;
-
- g_return_if_fail (mixer != NULL);
- g_return_if_fail (track != NULL);
- g_return_if_fail (GST_IS_MIXER_TRACK (track));
- g_return_if_fail (GST_IS_OSS4_SOURCE (mixer));
- g_return_if_fail (GST_OSS4_SOURCE_IS_OPEN (mixer));
-
- oss = GST_OSS4_SOURCE (mixer);
-
- cur = gst_oss4_source_mixer_get_current_input (oss);
-
- /* stop recording for an input that's not selected anyway => nothing to do */
- if (!record && cur != GST_OSS4_SOURCE_INPUT (track)->route)
- goto done;
-
- /* select recording for an input that's already selected => nothing to do
- * (or should we mess with the recording volume in this case maybe?) */
- if (record && cur == GST_OSS4_SOURCE_INPUT (track)->route)
- goto done;
-
- /* make current input stop recording: we can't really make an input stop
- * recording, we can only select an input FOR recording, so we'll just ignore
- * all requests to stop for now */
- if (!record) {
- GST_WARNING_OBJECT (oss, "Can't un-select an input as such, only switch "
- "to a different input source");
- /* FIXME: set recording volume to 0 maybe? */
- } else {
- int new_route = GST_OSS4_SOURCE_INPUT (track)->route;
-
- /* select this input for recording */
-
- if (ioctl (oss->fd, SNDCTL_DSP_SET_RECSRC, &new_route) == -1) {
- GST_WARNING_OBJECT (oss, "Could not select input %d for recording: %s",
- new_route, g_strerror (errno));
- } else {
- cur = new_route;
- }
- }
-
-done:
-
- cur_name = gst_oss4_source_mixer_update_record_flags (oss, cur);
- GST_DEBUG_OBJECT (oss, "active input route: %d (%s)", cur, cur_name);
-}
-
-static void
-gst_oss4_source_mixer_set_mute (GstMixer * mixer, GstMixerTrack * track,
- gboolean mute)
-{
- g_return_if_fail (mixer != NULL);
- g_return_if_fail (track != NULL);
- g_return_if_fail (GST_IS_MIXER_TRACK (track));
- g_return_if_fail (GST_IS_OSS4_SOURCE (mixer));
- g_return_if_fail (GST_OSS4_SOURCE_IS_OPEN (mixer));
-
- /* FIXME: implement gst_oss4_source_mixer_set_mute() - what to do here? */
- /* oss4_mixer_set_mute (mixer->mixer, track, mute); */
-}
-
-static void
-gst_oss4_source_mixer_interface_init (GstMixerInterface * iface)
-{
- GST_MIXER_TYPE (iface) = GST_MIXER_HARDWARE;
-
- iface->list_tracks = gst_oss4_source_mixer_list_tracks;
- iface->set_volume = gst_oss4_source_mixer_set_volume;
- iface->get_volume = gst_oss4_source_mixer_get_volume;
- iface->set_mute = gst_oss4_source_mixer_set_mute;
- iface->set_record = gst_oss4_source_mixer_set_record;
-}
-
-/* Implement the horror that is GstImplementsInterface */
-
-static gboolean
-gst_oss4_source_mixer_supported (GstImplementsInterface * iface,
- GType iface_type)
-{
- GstOss4Source *oss;
- gboolean is_open;
-
- g_return_val_if_fail (GST_IS_OSS4_SOURCE (iface), FALSE);
- g_return_val_if_fail (iface_type == GST_TYPE_MIXER, FALSE);
-
- oss = GST_OSS4_SOURCE (iface);
-
- GST_OBJECT_LOCK (oss);
- is_open = GST_OSS4_SOURCE_IS_OPEN (iface);
- GST_OBJECT_UNLOCK (oss);
-
- return is_open;
-}
-
-static void
-gst_oss4_source_mixer_implements_interface_init (GstImplementsInterfaceClass *
- klass)
-{
- klass->supported = gst_oss4_source_mixer_supported;
-}
-
-static void
-gst_oss4_source_init_interfaces (GType type)
-{
- static const GInterfaceInfo implements_iface_info = {
- (GInterfaceInitFunc) gst_oss4_source_mixer_implements_interface_init,
- NULL,
- NULL,
- };
- static const GInterfaceInfo mixer_iface_info = {
- (GInterfaceInitFunc) gst_oss4_source_mixer_interface_init,
- NULL,
- NULL,
- };
-
- g_type_add_interface_static (type, GST_TYPE_IMPLEMENTS_INTERFACE,
- &implements_iface_info);
- g_type_add_interface_static (type, GST_TYPE_MIXER, &mixer_iface_info);
-
- gst_oss4_add_property_probe_interface (type);
-}
diff --git a/sys/oss4/oss4-source.h b/sys/oss4/oss4-source.h
index 3a86b43ad13f3404d57b7e35d48b642434bbf7a9..f30021ee37372d9ae636faaac4e82a2c471d4c2f 100644
--- a/sys/oss4/oss4-source.h
+++ b/sys/oss4/oss4-source.h
@@ -22,7 +22,6 @@
#include <gst/gst.h>
#include <gst/audio/gstaudiosrc.h>
-#include <gst/interfaces/mixertrack.h>
G_BEGIN_DECLS
@@ -46,13 +45,6 @@ struct _GstOss4Source {
gint bytes_per_sample;
GstCaps * probed_caps;
-
- /* property probe interface */
- GList * property_probe_list;
-
- /* mixer interface */
- GList * tracks;
- gboolean tracks_static; /* FALSE if the list of inputs may change */
};
struct _GstOss4SourceClass {
@@ -61,28 +53,6 @@ struct _GstOss4SourceClass {
GType gst_oss4_source_get_type (void);
-/* our mixer track for input selection */
-#define GST_TYPE_OSS4_SOURCE_INPUT (gst_oss4_source_input_get_type())
-#define GST_OSS4_SOURCE_INPUT(obj) (G_TYPE_CHECK_INSTANCE_CAST((obj),GST_TYPE_OSS4_SOURCE_INPUT,GstOss4SourceInput))
-#define GST_OSS4_SOURCE_INPUT_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST((klass),GST_TYPE_OSS4_SOURCE_INPUT,GstOss4SourceInputClass))
-#define GST_IS_OSS4_SOURCE_INPUT(obj) (G_TYPE_CHECK_INSTANCE_TYPE((obj),GST_TYPE_OSS4_SOURCE_INPUT))
-#define GST_IS_OSS4_SOURCE_INPUT_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE((klass),GST_TYPE_OSS4_SOURCE_INPUT))
-
-typedef struct _GstOss4SourceInput GstOss4SourceInput;
-typedef struct _GstOss4SourceInputClass GstOss4SourceInputClass;
-
-struct _GstOss4SourceInput {
- GstMixerTrack mixer_track;
-
- int route; /* number for SNDCTL_DSP_SET_RECSRC etc. */
-};
-
-struct _GstOss4SourceInputClass {
- GstMixerTrackClass mixer_track_class;
-};
-
-GType gst_oss4_source_input_get_type (void);
-
G_END_DECLS
#endif /* GST_OSS4_SOURCE_H */
diff --git a/sys/osxaudio/Makefile.in b/sys/osxaudio/Makefile.in
index 31747de6cbc4b3fef47797fe3fe3d5258b2c58a8..cd1aa37d7c840100ed1d2a7f74429bc7b42876ae 100644
--- a/sys/osxaudio/Makefile.in
+++ b/sys/osxaudio/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.11.4 from Makefile.am.
+# Makefile.in generated by automake 1.11.5 from Makefile.am.
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -60,6 +60,7 @@ am__aclocal_m4_deps = $(top_srcdir)/common/m4/as-ac-expand.m4 \
$(top_srcdir)/common/m4/as-auto-alt.m4 \
$(top_srcdir)/common/m4/as-compiler-flag.m4 \
$(top_srcdir)/common/m4/as-gcc-inline-assembly.m4 \
+ $(top_srcdir)/common/m4/as-libtool.m4 \
$(top_srcdir)/common/m4/as-objc.m4 \
$(top_srcdir)/common/m4/as-python.m4 \
$(top_srcdir)/common/m4/as-scrub-include.m4 \
@@ -259,6 +260,7 @@ GMSGFMT_015 = @GMSGFMT_015@
GREP = @GREP@
GSTPB_PLUGINS_DIR = @GSTPB_PLUGINS_DIR@
GSTPB_PREFIX = @GSTPB_PREFIX@
+GST_AGE = @GST_AGE@
GST_ALL_LDFLAGS = @GST_ALL_LDFLAGS@
GST_API_VERSION = @GST_API_VERSION@
GST_BASE_CFLAGS = @GST_BASE_CFLAGS@
@@ -268,9 +270,11 @@ GST_CHECK_CFLAGS = @GST_CHECK_CFLAGS@
GST_CHECK_LIBS = @GST_CHECK_LIBS@
GST_CONTROLLER_CFLAGS = @GST_CONTROLLER_CFLAGS@
GST_CONTROLLER_LIBS = @GST_CONTROLLER_LIBS@
+GST_CURRENT = @GST_CURRENT@
GST_CXXFLAGS = @GST_CXXFLAGS@
GST_LEVEL_DEFAULT = @GST_LEVEL_DEFAULT@
GST_LIBS = @GST_LIBS@
+GST_LIBVERSION = @GST_LIBVERSION@
GST_LICENSE = @GST_LICENSE@
GST_LT_LDFLAGS = @GST_LT_LDFLAGS@
GST_NET_CFLAGS = @GST_NET_CFLAGS@
@@ -288,6 +292,7 @@ GST_PLUGINS_NONPORTED = @GST_PLUGINS_NONPORTED@
GST_PLUGINS_SELECTED = @GST_PLUGINS_SELECTED@
GST_PLUGIN_LDFLAGS = @GST_PLUGIN_LDFLAGS@
GST_PREFIX = @GST_PREFIX@
+GST_REVISION = @GST_REVISION@
GST_TOOLS_DIR = @GST_TOOLS_DIR@
GTKDOC_CHECK = @GTKDOC_CHECK@
GTK_CFLAGS = @GTK_CFLAGS@
@@ -555,7 +560,7 @@ install-pluginLTLIBRARIES: $(plugin_LTLIBRARIES)
done; \
test -z "$$list2" || { \
echo " $(MKDIR_P) '$(DESTDIR)$(plugindir)'"; \
- $(MKDIR_P) '$(DESTDIR)$(plugindir)' || exit 1; \
+ $(MKDIR_P) "$(DESTDIR)$(plugindir)" || exit 1; \
echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 '$(DESTDIR)$(plugindir)'"; \
$(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 "$(DESTDIR)$(plugindir)"; \
}
diff --git a/sys/osxvideo/Makefile.in b/sys/osxvideo/Makefile.in
index fabc00669ecf97e7eb18ee17139da1e3c4907ec3..c3f8303f3bbdd15c840f8c855220ac554a0e0474 100644
--- a/sys/osxvideo/Makefile.in
+++ b/sys/osxvideo/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.11.4 from Makefile.am.
+# Makefile.in generated by automake 1.11.5 from Makefile.am.
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -60,6 +60,7 @@ am__aclocal_m4_deps = $(top_srcdir)/common/m4/as-ac-expand.m4 \
$(top_srcdir)/common/m4/as-auto-alt.m4 \
$(top_srcdir)/common/m4/as-compiler-flag.m4 \
$(top_srcdir)/common/m4/as-gcc-inline-assembly.m4 \
+ $(top_srcdir)/common/m4/as-libtool.m4 \
$(top_srcdir)/common/m4/as-objc.m4 \
$(top_srcdir)/common/m4/as-python.m4 \
$(top_srcdir)/common/m4/as-scrub-include.m4 \
@@ -257,6 +258,7 @@ GMSGFMT_015 = @GMSGFMT_015@
GREP = @GREP@
GSTPB_PLUGINS_DIR = @GSTPB_PLUGINS_DIR@
GSTPB_PREFIX = @GSTPB_PREFIX@
+GST_AGE = @GST_AGE@
GST_ALL_LDFLAGS = @GST_ALL_LDFLAGS@
GST_API_VERSION = @GST_API_VERSION@
GST_BASE_CFLAGS = @GST_BASE_CFLAGS@
@@ -266,9 +268,11 @@ GST_CHECK_CFLAGS = @GST_CHECK_CFLAGS@
GST_CHECK_LIBS = @GST_CHECK_LIBS@
GST_CONTROLLER_CFLAGS = @GST_CONTROLLER_CFLAGS@
GST_CONTROLLER_LIBS = @GST_CONTROLLER_LIBS@
+GST_CURRENT = @GST_CURRENT@
GST_CXXFLAGS = @GST_CXXFLAGS@
GST_LEVEL_DEFAULT = @GST_LEVEL_DEFAULT@
GST_LIBS = @GST_LIBS@
+GST_LIBVERSION = @GST_LIBVERSION@
GST_LICENSE = @GST_LICENSE@
GST_LT_LDFLAGS = @GST_LT_LDFLAGS@
GST_NET_CFLAGS = @GST_NET_CFLAGS@
@@ -286,6 +290,7 @@ GST_PLUGINS_NONPORTED = @GST_PLUGINS_NONPORTED@
GST_PLUGINS_SELECTED = @GST_PLUGINS_SELECTED@
GST_PLUGIN_LDFLAGS = @GST_PLUGIN_LDFLAGS@
GST_PREFIX = @GST_PREFIX@
+GST_REVISION = @GST_REVISION@
GST_TOOLS_DIR = @GST_TOOLS_DIR@
GTKDOC_CHECK = @GTKDOC_CHECK@
GTK_CFLAGS = @GTK_CFLAGS@
@@ -545,7 +550,7 @@ install-pluginLTLIBRARIES: $(plugin_LTLIBRARIES)
done; \
test -z "$$list2" || { \
echo " $(MKDIR_P) '$(DESTDIR)$(plugindir)'"; \
- $(MKDIR_P) '$(DESTDIR)$(plugindir)' || exit 1; \
+ $(MKDIR_P) "$(DESTDIR)$(plugindir)" || exit 1; \
echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 '$(DESTDIR)$(plugindir)'"; \
$(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 "$(DESTDIR)$(plugindir)"; \
}
diff --git a/sys/sunaudio/Makefile.in b/sys/sunaudio/Makefile.in
index a9c3630a99b3e94e15f78969b6aca3bdc6bb5364..1a1623cfb819d1466bf56513898b080e6ae72248 100644
--- a/sys/sunaudio/Makefile.in
+++ b/sys/sunaudio/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.11.4 from Makefile.am.
+# Makefile.in generated by automake 1.11.5 from Makefile.am.
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -60,6 +60,7 @@ am__aclocal_m4_deps = $(top_srcdir)/common/m4/as-ac-expand.m4 \
$(top_srcdir)/common/m4/as-auto-alt.m4 \
$(top_srcdir)/common/m4/as-compiler-flag.m4 \
$(top_srcdir)/common/m4/as-gcc-inline-assembly.m4 \
+ $(top_srcdir)/common/m4/as-libtool.m4 \
$(top_srcdir)/common/m4/as-objc.m4 \
$(top_srcdir)/common/m4/as-python.m4 \
$(top_srcdir)/common/m4/as-scrub-include.m4 \
@@ -261,6 +262,7 @@ GMSGFMT_015 = @GMSGFMT_015@
GREP = @GREP@
GSTPB_PLUGINS_DIR = @GSTPB_PLUGINS_DIR@
GSTPB_PREFIX = @GSTPB_PREFIX@
+GST_AGE = @GST_AGE@
GST_ALL_LDFLAGS = @GST_ALL_LDFLAGS@
GST_API_VERSION = @GST_API_VERSION@
GST_BASE_CFLAGS = @GST_BASE_CFLAGS@
@@ -270,9 +272,11 @@ GST_CHECK_CFLAGS = @GST_CHECK_CFLAGS@
GST_CHECK_LIBS = @GST_CHECK_LIBS@
GST_CONTROLLER_CFLAGS = @GST_CONTROLLER_CFLAGS@
GST_CONTROLLER_LIBS = @GST_CONTROLLER_LIBS@
+GST_CURRENT = @GST_CURRENT@
GST_CXXFLAGS = @GST_CXXFLAGS@
GST_LEVEL_DEFAULT = @GST_LEVEL_DEFAULT@
GST_LIBS = @GST_LIBS@
+GST_LIBVERSION = @GST_LIBVERSION@
GST_LICENSE = @GST_LICENSE@
GST_LT_LDFLAGS = @GST_LT_LDFLAGS@
GST_NET_CFLAGS = @GST_NET_CFLAGS@
@@ -290,6 +294,7 @@ GST_PLUGINS_NONPORTED = @GST_PLUGINS_NONPORTED@
GST_PLUGINS_SELECTED = @GST_PLUGINS_SELECTED@
GST_PLUGIN_LDFLAGS = @GST_PLUGIN_LDFLAGS@
GST_PREFIX = @GST_PREFIX@
+GST_REVISION = @GST_REVISION@
GST_TOOLS_DIR = @GST_TOOLS_DIR@
GTKDOC_CHECK = @GTKDOC_CHECK@
GTK_CFLAGS = @GTK_CFLAGS@
@@ -558,7 +563,7 @@ install-pluginLTLIBRARIES: $(plugin_LTLIBRARIES)
done; \
test -z "$$list2" || { \
echo " $(MKDIR_P) '$(DESTDIR)$(plugindir)'"; \
- $(MKDIR_P) '$(DESTDIR)$(plugindir)' || exit 1; \
+ $(MKDIR_P) "$(DESTDIR)$(plugindir)" || exit 1; \
echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 '$(DESTDIR)$(plugindir)'"; \
$(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 "$(DESTDIR)$(plugindir)"; \
}
diff --git a/sys/v4l2/Makefile.am b/sys/v4l2/Makefile.am
index 89b6fe1bb5f151db3481615756f17583f994ca25..29a32ba674844ea3adc7c5424087efc5fa6dd2c3 100644
--- a/sys/v4l2/Makefile.am
+++ b/sys/v4l2/Makefile.am
@@ -8,17 +8,44 @@ xv_source =
xv_libs =
endif
+
+# variables used for enum/marshal generation
+glib_enum_headers = tuner.h tunernorm.h tunerchannel.h
+glib_enum_define = GST_INTERFACES
+glib_gen_prefix = gst_interfaces
+glib_gen_basename = tuner
+
+built_sources = \
+ tuner-marshal.c \
+ tuner-enumtypes.c
+
+built_headers = \
+ tuner-marshal.h \
+ tuner-enumtypes.h
+
+EXTRA_DIST = tuner-marshal.list
+
+CLEANFILES = $(built_sources) $(built_headers)
+
+BUILT_SOURCES = $(built_sources) $(built_headers)
+
+include $(top_srcdir)/common/gst-glib-gen.mak
+
libgstvideo4linux2_la_SOURCES = gstv4l2.c \
gstv4l2colorbalance.c \
gstv4l2object.c \
gstv4l2bufferpool.c \
+ gstv4l2sink.c \
gstv4l2src.c \
gstv4l2radio.c \
gstv4l2tuner.c \
gstv4l2vidorient.c \
v4l2_calls.c \
+ tuner.c \
+ tunerchannel.c \
+ tunernorm.c \
$(xv_source)
-libgstvideo4linux2_la_SOURCES += gstv4l2sink.c
+nodist_libgstvideo4linux2_la_SOURCES = $(built_sources) $(built_headers)
libgstvideo4linux2_la_CFLAGS = $(GST_PLUGINS_BASE_CFLAGS) \
$(GST_BASE_CFLAGS) \
@@ -34,7 +61,6 @@ libgstvideo4linux2_la_LIBADD = $(GST_PLUGINS_BASE_LIBS) \
$(GST_BASE_LIBS) \
$(GST_PLUGINS_BASE_LIBS) \
-lgstvideo-$(GST_API_VERSION) \
- -lgstinterfaces-$(GST_API_VERSION) \
$(GST_LIBS) \
$(xv_libs) \
$(LIBV4L2_LIBS) \
@@ -50,4 +76,8 @@ noinst_HEADERS = \
gstv4l2tuner.h \
gstv4l2vidorient.h \
gstv4l2videooverlay.h \
- v4l2_calls.h
+ v4l2_calls.h \
+ tuner.h \
+ tunerchannel.h \
+ tunernorm.h
+
diff --git a/sys/v4l2/Makefile.in b/sys/v4l2/Makefile.in
index b8eda11c4b826f2bf15fc63ed88bfe9cf7bfb4b7..13d1ce14a385c1139762030bb674f804ede84540 100644
--- a/sys/v4l2/Makefile.in
+++ b/sys/v4l2/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.11.4 from Makefile.am.
+# Makefile.in generated by automake 1.11.5 from Makefile.am.
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -15,6 +15,14 @@
@SET_MAKE@
+# these are the variables your Makefile.am should set
+# the example is based on the colorbalance interface
+
+#glib_enum_headers=$(colorbalance_headers)
+#glib_enum_define=GST_COLOR_BALANCE
+#glib_gen_prefix=gst_color_balance
+#glib_gen_basename=colorbalance
+
VPATH = @srcdir@
am__make_dryrun = \
@@ -52,14 +60,15 @@ PRE_UNINSTALL = :
POST_UNINSTALL = :
build_triplet = @build@
host_triplet = @host@
-subdir = sys/v4l2
DIST_COMMON = README $(noinst_HEADERS) $(srcdir)/Makefile.am \
- $(srcdir)/Makefile.in
+ $(srcdir)/Makefile.in $(top_srcdir)/common/gst-glib-gen.mak
+subdir = sys/v4l2
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
am__aclocal_m4_deps = $(top_srcdir)/common/m4/as-ac-expand.m4 \
$(top_srcdir)/common/m4/as-auto-alt.m4 \
$(top_srcdir)/common/m4/as-compiler-flag.m4 \
$(top_srcdir)/common/m4/as-gcc-inline-assembly.m4 \
+ $(top_srcdir)/common/m4/as-libtool.m4 \
$(top_srcdir)/common/m4/as-objc.m4 \
$(top_srcdir)/common/m4/as-python.m4 \
$(top_srcdir)/common/m4/as-scrub-include.m4 \
@@ -135,21 +144,31 @@ libgstvideo4linux2_la_DEPENDENCIES = $(am__DEPENDENCIES_1) \
$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1)
am__libgstvideo4linux2_la_SOURCES_DIST = gstv4l2.c \
gstv4l2colorbalance.c gstv4l2object.c gstv4l2bufferpool.c \
- gstv4l2src.c gstv4l2radio.c gstv4l2tuner.c gstv4l2vidorient.c \
- v4l2_calls.c gstv4l2videooverlay.c gstv4l2sink.c
+ gstv4l2sink.c gstv4l2src.c gstv4l2radio.c gstv4l2tuner.c \
+ gstv4l2vidorient.c v4l2_calls.c tuner.c tunerchannel.c \
+ tunernorm.c gstv4l2videooverlay.c
@USE_XVIDEO_TRUE@am__objects_1 = \
@USE_XVIDEO_TRUE@ libgstvideo4linux2_la-gstv4l2videooverlay.lo
am_libgstvideo4linux2_la_OBJECTS = libgstvideo4linux2_la-gstv4l2.lo \
libgstvideo4linux2_la-gstv4l2colorbalance.lo \
libgstvideo4linux2_la-gstv4l2object.lo \
libgstvideo4linux2_la-gstv4l2bufferpool.lo \
+ libgstvideo4linux2_la-gstv4l2sink.lo \
libgstvideo4linux2_la-gstv4l2src.lo \
libgstvideo4linux2_la-gstv4l2radio.lo \
libgstvideo4linux2_la-gstv4l2tuner.lo \
libgstvideo4linux2_la-gstv4l2vidorient.lo \
- libgstvideo4linux2_la-v4l2_calls.lo $(am__objects_1) \
- libgstvideo4linux2_la-gstv4l2sink.lo
-libgstvideo4linux2_la_OBJECTS = $(am_libgstvideo4linux2_la_OBJECTS)
+ libgstvideo4linux2_la-v4l2_calls.lo \
+ libgstvideo4linux2_la-tuner.lo \
+ libgstvideo4linux2_la-tunerchannel.lo \
+ libgstvideo4linux2_la-tunernorm.lo $(am__objects_1)
+am__objects_2 = libgstvideo4linux2_la-tuner-marshal.lo \
+ libgstvideo4linux2_la-tuner-enumtypes.lo
+am__objects_3 =
+nodist_libgstvideo4linux2_la_OBJECTS = $(am__objects_2) \
+ $(am__objects_3)
+libgstvideo4linux2_la_OBJECTS = $(am_libgstvideo4linux2_la_OBJECTS) \
+ $(nodist_libgstvideo4linux2_la_OBJECTS)
AM_V_lt = $(am__v_lt_@AM_V@)
am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@)
am__v_lt_0 = --silent
@@ -183,7 +202,8 @@ am__v_CCLD_0 = @echo " CCLD " $@;
AM_V_GEN = $(am__v_GEN_@AM_V@)
am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@)
am__v_GEN_0 = @echo " GEN " $@;
-SOURCES = $(libgstvideo4linux2_la_SOURCES)
+SOURCES = $(libgstvideo4linux2_la_SOURCES) \
+ $(nodist_libgstvideo4linux2_la_SOURCES)
DIST_SOURCES = $(am__libgstvideo4linux2_la_SOURCES_DIST)
am__can_run_installinfo = \
case $$AM_UPDATE_INFO_DIR in \
@@ -274,6 +294,7 @@ GMSGFMT_015 = @GMSGFMT_015@
GREP = @GREP@
GSTPB_PLUGINS_DIR = @GSTPB_PLUGINS_DIR@
GSTPB_PREFIX = @GSTPB_PREFIX@
+GST_AGE = @GST_AGE@
GST_ALL_LDFLAGS = @GST_ALL_LDFLAGS@
GST_API_VERSION = @GST_API_VERSION@
GST_BASE_CFLAGS = @GST_BASE_CFLAGS@
@@ -283,9 +304,11 @@ GST_CHECK_CFLAGS = @GST_CHECK_CFLAGS@
GST_CHECK_LIBS = @GST_CHECK_LIBS@
GST_CONTROLLER_CFLAGS = @GST_CONTROLLER_CFLAGS@
GST_CONTROLLER_LIBS = @GST_CONTROLLER_LIBS@
+GST_CURRENT = @GST_CURRENT@
GST_CXXFLAGS = @GST_CXXFLAGS@
GST_LEVEL_DEFAULT = @GST_LEVEL_DEFAULT@
GST_LIBS = @GST_LIBS@
+GST_LIBVERSION = @GST_LIBVERSION@
GST_LICENSE = @GST_LICENSE@
GST_LT_LDFLAGS = @GST_LT_LDFLAGS@
GST_NET_CFLAGS = @GST_NET_CFLAGS@
@@ -303,6 +326,7 @@ GST_PLUGINS_NONPORTED = @GST_PLUGINS_NONPORTED@
GST_PLUGINS_SELECTED = @GST_PLUGINS_SELECTED@
GST_PLUGIN_LDFLAGS = @GST_PLUGIN_LDFLAGS@
GST_PREFIX = @GST_PREFIX@
+GST_REVISION = @GST_REVISION@
GST_TOOLS_DIR = @GST_TOOLS_DIR@
GTKDOC_CHECK = @GTKDOC_CHECK@
GTK_CFLAGS = @GTK_CFLAGS@
@@ -507,10 +531,40 @@ plugin_LTLIBRARIES = libgstvideo4linux2.la
@USE_XVIDEO_TRUE@xv_source = gstv4l2videooverlay.c
@USE_XVIDEO_FALSE@xv_libs =
@USE_XVIDEO_TRUE@xv_libs = $(X_LIBS) $(XVIDEO_LIBS)
-libgstvideo4linux2_la_SOURCES = gstv4l2.c gstv4l2colorbalance.c \
- gstv4l2object.c gstv4l2bufferpool.c gstv4l2src.c \
- gstv4l2radio.c gstv4l2tuner.c gstv4l2vidorient.c v4l2_calls.c \
- $(xv_source) gstv4l2sink.c
+
+# variables used for enum/marshal generation
+glib_enum_headers = tuner.h tunernorm.h tunerchannel.h
+glib_enum_define = GST_INTERFACES
+glib_gen_prefix = gst_interfaces
+glib_gen_basename = tuner
+built_sources = \
+ tuner-marshal.c \
+ tuner-enumtypes.c
+
+built_headers = \
+ tuner-marshal.h \
+ tuner-enumtypes.h
+
+EXTRA_DIST = tuner-marshal.list
+CLEANFILES = $(built_sources) $(built_headers)
+BUILT_SOURCES = $(built_sources) $(built_headers)
+enum_headers = $(foreach h,$(glib_enum_headers),\n\#include \"$(h)\")
+libgstvideo4linux2_la_SOURCES = gstv4l2.c \
+ gstv4l2colorbalance.c \
+ gstv4l2object.c \
+ gstv4l2bufferpool.c \
+ gstv4l2sink.c \
+ gstv4l2src.c \
+ gstv4l2radio.c \
+ gstv4l2tuner.c \
+ gstv4l2vidorient.c \
+ v4l2_calls.c \
+ tuner.c \
+ tunerchannel.c \
+ tunernorm.c \
+ $(xv_source)
+
+nodist_libgstvideo4linux2_la_SOURCES = $(built_sources) $(built_headers)
libgstvideo4linux2_la_CFLAGS = $(GST_PLUGINS_BASE_CFLAGS) \
$(GST_BASE_CFLAGS) \
$(GST_CFLAGS) \
@@ -524,7 +578,6 @@ libgstvideo4linux2_la_LIBADD = $(GST_PLUGINS_BASE_LIBS) \
$(GST_BASE_LIBS) \
$(GST_PLUGINS_BASE_LIBS) \
-lgstvideo-$(GST_API_VERSION) \
- -lgstinterfaces-$(GST_API_VERSION) \
$(GST_LIBS) \
$(xv_libs) \
$(LIBV4L2_LIBS) \
@@ -540,13 +593,17 @@ noinst_HEADERS = \
gstv4l2tuner.h \
gstv4l2vidorient.h \
gstv4l2videooverlay.h \
- v4l2_calls.h
+ v4l2_calls.h \
+ tuner.h \
+ tunerchannel.h \
+ tunernorm.h
-all: all-am
+all: $(BUILT_SOURCES)
+ $(MAKE) $(AM_MAKEFLAGS) all-am
.SUFFIXES:
.SUFFIXES: .c .lo .o .obj
-$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps)
+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(top_srcdir)/common/gst-glib-gen.mak $(am__configure_deps)
@for dep in $?; do \
case '$(am__configure_deps)' in \
*$$dep*) \
@@ -567,6 +624,7 @@ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
esac;
+$(top_srcdir)/common/gst-glib-gen.mak:
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -586,7 +644,7 @@ install-pluginLTLIBRARIES: $(plugin_LTLIBRARIES)
done; \
test -z "$$list2" || { \
echo " $(MKDIR_P) '$(DESTDIR)$(plugindir)'"; \
- $(MKDIR_P) '$(DESTDIR)$(plugindir)' || exit 1; \
+ $(MKDIR_P) "$(DESTDIR)$(plugindir)" || exit 1; \
echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 '$(DESTDIR)$(plugindir)'"; \
$(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 "$(DESTDIR)$(plugindir)"; \
}
@@ -627,6 +685,11 @@ distclean-compile:
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libgstvideo4linux2_la-gstv4l2tuner.Plo@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libgstvideo4linux2_la-gstv4l2videooverlay.Plo@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libgstvideo4linux2_la-gstv4l2vidorient.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libgstvideo4linux2_la-tuner-enumtypes.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libgstvideo4linux2_la-tuner-marshal.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libgstvideo4linux2_la-tuner.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libgstvideo4linux2_la-tunerchannel.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libgstvideo4linux2_la-tunernorm.Plo@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libgstvideo4linux2_la-v4l2_calls.Plo@am__quote@
.c.o:
@@ -678,6 +741,13 @@ libgstvideo4linux2_la-gstv4l2bufferpool.lo: gstv4l2bufferpool.c
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(libgstvideo4linux2_la_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgstvideo4linux2_la_CFLAGS) $(CFLAGS) -c -o libgstvideo4linux2_la-gstv4l2bufferpool.lo `test -f 'gstv4l2bufferpool.c' || echo '$(srcdir)/'`gstv4l2bufferpool.c
+libgstvideo4linux2_la-gstv4l2sink.lo: gstv4l2sink.c
+@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(libgstvideo4linux2_la_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgstvideo4linux2_la_CFLAGS) $(CFLAGS) -MT libgstvideo4linux2_la-gstv4l2sink.lo -MD -MP -MF $(DEPDIR)/libgstvideo4linux2_la-gstv4l2sink.Tpo -c -o libgstvideo4linux2_la-gstv4l2sink.lo `test -f 'gstv4l2sink.c' || echo '$(srcdir)/'`gstv4l2sink.c
+@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libgstvideo4linux2_la-gstv4l2sink.Tpo $(DEPDIR)/libgstvideo4linux2_la-gstv4l2sink.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='gstv4l2sink.c' object='libgstvideo4linux2_la-gstv4l2sink.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(libgstvideo4linux2_la_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgstvideo4linux2_la_CFLAGS) $(CFLAGS) -c -o libgstvideo4linux2_la-gstv4l2sink.lo `test -f 'gstv4l2sink.c' || echo '$(srcdir)/'`gstv4l2sink.c
+
libgstvideo4linux2_la-gstv4l2src.lo: gstv4l2src.c
@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(libgstvideo4linux2_la_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgstvideo4linux2_la_CFLAGS) $(CFLAGS) -MT libgstvideo4linux2_la-gstv4l2src.lo -MD -MP -MF $(DEPDIR)/libgstvideo4linux2_la-gstv4l2src.Tpo -c -o libgstvideo4linux2_la-gstv4l2src.lo `test -f 'gstv4l2src.c' || echo '$(srcdir)/'`gstv4l2src.c
@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libgstvideo4linux2_la-gstv4l2src.Tpo $(DEPDIR)/libgstvideo4linux2_la-gstv4l2src.Plo
@@ -713,6 +783,27 @@ libgstvideo4linux2_la-v4l2_calls.lo: v4l2_calls.c
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(libgstvideo4linux2_la_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgstvideo4linux2_la_CFLAGS) $(CFLAGS) -c -o libgstvideo4linux2_la-v4l2_calls.lo `test -f 'v4l2_calls.c' || echo '$(srcdir)/'`v4l2_calls.c
+libgstvideo4linux2_la-tuner.lo: tuner.c
+@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(libgstvideo4linux2_la_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgstvideo4linux2_la_CFLAGS) $(CFLAGS) -MT libgstvideo4linux2_la-tuner.lo -MD -MP -MF $(DEPDIR)/libgstvideo4linux2_la-tuner.Tpo -c -o libgstvideo4linux2_la-tuner.lo `test -f 'tuner.c' || echo '$(srcdir)/'`tuner.c
+@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libgstvideo4linux2_la-tuner.Tpo $(DEPDIR)/libgstvideo4linux2_la-tuner.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='tuner.c' object='libgstvideo4linux2_la-tuner.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(libgstvideo4linux2_la_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgstvideo4linux2_la_CFLAGS) $(CFLAGS) -c -o libgstvideo4linux2_la-tuner.lo `test -f 'tuner.c' || echo '$(srcdir)/'`tuner.c
+
+libgstvideo4linux2_la-tunerchannel.lo: tunerchannel.c
+@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(libgstvideo4linux2_la_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgstvideo4linux2_la_CFLAGS) $(CFLAGS) -MT libgstvideo4linux2_la-tunerchannel.lo -MD -MP -MF $(DEPDIR)/libgstvideo4linux2_la-tunerchannel.Tpo -c -o libgstvideo4linux2_la-tunerchannel.lo `test -f 'tunerchannel.c' || echo '$(srcdir)/'`tunerchannel.c
+@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libgstvideo4linux2_la-tunerchannel.Tpo $(DEPDIR)/libgstvideo4linux2_la-tunerchannel.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='tunerchannel.c' object='libgstvideo4linux2_la-tunerchannel.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(libgstvideo4linux2_la_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgstvideo4linux2_la_CFLAGS) $(CFLAGS) -c -o libgstvideo4linux2_la-tunerchannel.lo `test -f 'tunerchannel.c' || echo '$(srcdir)/'`tunerchannel.c
+
+libgstvideo4linux2_la-tunernorm.lo: tunernorm.c
+@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(libgstvideo4linux2_la_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgstvideo4linux2_la_CFLAGS) $(CFLAGS) -MT libgstvideo4linux2_la-tunernorm.lo -MD -MP -MF $(DEPDIR)/libgstvideo4linux2_la-tunernorm.Tpo -c -o libgstvideo4linux2_la-tunernorm.lo `test -f 'tunernorm.c' || echo '$(srcdir)/'`tunernorm.c
+@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libgstvideo4linux2_la-tunernorm.Tpo $(DEPDIR)/libgstvideo4linux2_la-tunernorm.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='tunernorm.c' object='libgstvideo4linux2_la-tunernorm.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(libgstvideo4linux2_la_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgstvideo4linux2_la_CFLAGS) $(CFLAGS) -c -o libgstvideo4linux2_la-tunernorm.lo `test -f 'tunernorm.c' || echo '$(srcdir)/'`tunernorm.c
+
libgstvideo4linux2_la-gstv4l2videooverlay.lo: gstv4l2videooverlay.c
@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(libgstvideo4linux2_la_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgstvideo4linux2_la_CFLAGS) $(CFLAGS) -MT libgstvideo4linux2_la-gstv4l2videooverlay.lo -MD -MP -MF $(DEPDIR)/libgstvideo4linux2_la-gstv4l2videooverlay.Tpo -c -o libgstvideo4linux2_la-gstv4l2videooverlay.lo `test -f 'gstv4l2videooverlay.c' || echo '$(srcdir)/'`gstv4l2videooverlay.c
@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libgstvideo4linux2_la-gstv4l2videooverlay.Tpo $(DEPDIR)/libgstvideo4linux2_la-gstv4l2videooverlay.Plo
@@ -720,12 +811,19 @@ libgstvideo4linux2_la-gstv4l2videooverlay.lo: gstv4l2videooverlay.c
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(libgstvideo4linux2_la_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgstvideo4linux2_la_CFLAGS) $(CFLAGS) -c -o libgstvideo4linux2_la-gstv4l2videooverlay.lo `test -f 'gstv4l2videooverlay.c' || echo '$(srcdir)/'`gstv4l2videooverlay.c
-libgstvideo4linux2_la-gstv4l2sink.lo: gstv4l2sink.c
-@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(libgstvideo4linux2_la_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgstvideo4linux2_la_CFLAGS) $(CFLAGS) -MT libgstvideo4linux2_la-gstv4l2sink.lo -MD -MP -MF $(DEPDIR)/libgstvideo4linux2_la-gstv4l2sink.Tpo -c -o libgstvideo4linux2_la-gstv4l2sink.lo `test -f 'gstv4l2sink.c' || echo '$(srcdir)/'`gstv4l2sink.c
-@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libgstvideo4linux2_la-gstv4l2sink.Tpo $(DEPDIR)/libgstvideo4linux2_la-gstv4l2sink.Plo
-@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='gstv4l2sink.c' object='libgstvideo4linux2_la-gstv4l2sink.lo' libtool=yes @AMDEPBACKSLASH@
+libgstvideo4linux2_la-tuner-marshal.lo: tuner-marshal.c
+@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(libgstvideo4linux2_la_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgstvideo4linux2_la_CFLAGS) $(CFLAGS) -MT libgstvideo4linux2_la-tuner-marshal.lo -MD -MP -MF $(DEPDIR)/libgstvideo4linux2_la-tuner-marshal.Tpo -c -o libgstvideo4linux2_la-tuner-marshal.lo `test -f 'tuner-marshal.c' || echo '$(srcdir)/'`tuner-marshal.c
+@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libgstvideo4linux2_la-tuner-marshal.Tpo $(DEPDIR)/libgstvideo4linux2_la-tuner-marshal.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='tuner-marshal.c' object='libgstvideo4linux2_la-tuner-marshal.lo' libtool=yes @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(libgstvideo4linux2_la_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgstvideo4linux2_la_CFLAGS) $(CFLAGS) -c -o libgstvideo4linux2_la-gstv4l2sink.lo `test -f 'gstv4l2sink.c' || echo '$(srcdir)/'`gstv4l2sink.c
+@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(libgstvideo4linux2_la_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgstvideo4linux2_la_CFLAGS) $(CFLAGS) -c -o libgstvideo4linux2_la-tuner-marshal.lo `test -f 'tuner-marshal.c' || echo '$(srcdir)/'`tuner-marshal.c
+
+libgstvideo4linux2_la-tuner-enumtypes.lo: tuner-enumtypes.c
+@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(libgstvideo4linux2_la_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgstvideo4linux2_la_CFLAGS) $(CFLAGS) -MT libgstvideo4linux2_la-tuner-enumtypes.lo -MD -MP -MF $(DEPDIR)/libgstvideo4linux2_la-tuner-enumtypes.Tpo -c -o libgstvideo4linux2_la-tuner-enumtypes.lo `test -f 'tuner-enumtypes.c' || echo '$(srcdir)/'`tuner-enumtypes.c
+@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libgstvideo4linux2_la-tuner-enumtypes.Tpo $(DEPDIR)/libgstvideo4linux2_la-tuner-enumtypes.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='tuner-enumtypes.c' object='libgstvideo4linux2_la-tuner-enumtypes.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(libgstvideo4linux2_la_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgstvideo4linux2_la_CFLAGS) $(CFLAGS) -c -o libgstvideo4linux2_la-tuner-enumtypes.lo `test -f 'tuner-enumtypes.c' || echo '$(srcdir)/'`tuner-enumtypes.c
mostlyclean-libtool:
-rm -f *.lo
@@ -816,13 +914,15 @@ distdir: $(DISTFILES)
fi; \
done
check-am: all-am
-check: check-am
+check: $(BUILT_SOURCES)
+ $(MAKE) $(AM_MAKEFLAGS) check-am
all-am: Makefile $(LTLIBRARIES) $(HEADERS)
installdirs:
for dir in "$(DESTDIR)$(plugindir)"; do \
test -z "$$dir" || $(MKDIR_P) "$$dir"; \
done
-install: install-am
+install: $(BUILT_SOURCES)
+ $(MAKE) $(AM_MAKEFLAGS) install-am
install-exec: install-exec-am
install-data: install-data-am
uninstall: uninstall-am
@@ -844,6 +944,7 @@ install-strip:
mostlyclean-generic:
clean-generic:
+ -test -z "$(CLEANFILES)" || rm -f $(CLEANFILES)
distclean-generic:
-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
@@ -852,6 +953,7 @@ distclean-generic:
maintainer-clean-generic:
@echo "This command is intended for maintainers to use"
@echo "it deletes files that may require special tools to rebuild."
+ -test -z "$(BUILT_SOURCES)" || rm -f $(BUILT_SOURCES)
clean: clean-am
clean-am: clean-generic clean-libtool clean-pluginLTLIBRARIES \
@@ -923,7 +1025,7 @@ ps-am:
uninstall-am: uninstall-pluginLTLIBRARIES
-.MAKE: install-am install-strip
+.MAKE: all check install install-am install-strip
.PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \
clean-libtool clean-pluginLTLIBRARIES ctags distclean \
@@ -940,6 +1042,42 @@ uninstall-am: uninstall-pluginLTLIBRARIES
tags uninstall uninstall-am uninstall-pluginLTLIBRARIES
+# these are all the rules generating the relevant files
+$(glib_gen_basename)-marshal.h: $(glib_gen_basename)-marshal.list
+ $(AM_V_GEN)glib-genmarshal --header --prefix=$(glib_gen_prefix)_marshal $^ > $(glib_gen_basename)-marshal.h.tmp && \
+ mv $(glib_gen_basename)-marshal.h.tmp $(glib_gen_basename)-marshal.h
+
+$(glib_gen_basename)-marshal.c: $(glib_gen_basename)-marshal.list
+ $(AM_V_GEN)echo "#include \"$(glib_gen_basename)-marshal.h\"" >> $(glib_gen_basename)-marshal.c.tmp && \
+ glib-genmarshal --body --prefix=$(glib_gen_prefix)_marshal $^ >> $(glib_gen_basename)-marshal.c.tmp && \
+ mv $(glib_gen_basename)-marshal.c.tmp $(glib_gen_basename)-marshal.c
+
+$(glib_gen_basename)-enumtypes.h: $(glib_enum_headers)
+ $(AM_V_GEN)glib-mkenums \
+ --fhead "#ifndef __$(glib_enum_define)_ENUM_TYPES_H__\n#define __$(glib_enum_define)_ENUM_TYPES_H__\n\n#include <glib-object.h>\n\nG_BEGIN_DECLS\n" \
+ --fprod "\n/* enumerations from \"@filename@\" */\n" \
+ --vhead "GType @enum_name@_get_type (void);\n#define GST_TYPE_@ENUMSHORT@ (@enum_name@_get_type())\n" \
+ --ftail "G_END_DECLS\n\n#endif /* __$(glib_enum_define)_ENUM_TYPES_H__ */" \
+ $^ > $@
+
+$(glib_gen_basename)-enumtypes.c: $(glib_enum_headers)
+ @if test "x$(glib_enum_headers)" = "x"; then echo "ERROR: glib_enum_headers is empty, please fix Makefile"; exit 1; fi
+ $(AM_V_GEN)glib-mkenums \
+ --fhead "#include \"$(glib_gen_basename)-enumtypes.h\"\n$(enum_headers)" \
+ --fprod "\n/* enumerations from \"@filename@\" */" \
+ --vhead "GType\n@enum_name@_get_type (void)\n{\n static volatile gsize g_define_type_id__volatile = 0;\n if (g_once_init_enter (&g_define_type_id__volatile)) {\n static const G@Type@Value values[] = {" \
+ --vprod " { @VALUENAME@, \"@VALUENAME@\", \"@valuenick@\" }," \
+ --vtail " { 0, NULL, NULL }\n };\n GType g_define_type_id = g_@type@_register_static (\"@EnumName@\", values);\n g_once_init_leave (&g_define_type_id__volatile, g_define_type_id);\n }\n return g_define_type_id__volatile;\n}\n" \
+ $^ > $@
+
+# a hack rule to make sure .Plo files exist because they get include'd
+# from Makefile's
+.deps/%-marshal.Plo:
+ @touch $@
+
+.deps/%-enumtypes.Plo:
+ @touch $@
+
# Tell versions [3.59,3.63) of GNU make to not export all variables.
# Otherwise a system limit (for SysV at least) may be exceeded.
.NOEXPORT:
diff --git a/sys/v4l2/gstv4l2bufferpool.c b/sys/v4l2/gstv4l2bufferpool.c
index 36e6d2bab811b1ff4faf830f0a300494f66645b6..979877028d65bc0ee37fb28b50285f83ed365cb7 100644
--- a/sys/v4l2/gstv4l2bufferpool.c
+++ b/sys/v4l2/gstv4l2bufferpool.c
@@ -184,7 +184,7 @@ gst_v4l2_buffer_pool_alloc_buffer (GstBufferPool * bpool, GstBuffer ** buffer,
goto mmap_failed;
gst_buffer_append_memory (newbuf,
- gst_memory_new_wrapped (0,
+ gst_memory_new_wrapped (GST_MEMORY_FLAG_NO_SHARE,
meta->mem, meta->vbuffer.length, 0, meta->vbuffer.length, NULL,
NULL));
@@ -197,7 +197,7 @@ gst_v4l2_buffer_pool_alloc_buffer (GstBufferPool * bpool, GstBuffer ** buffer,
stride[0] = obj->bytesperline;
GST_DEBUG_OBJECT (pool, "adding video meta, stride %d", stride[0]);
- gst_buffer_add_video_meta_full (newbuf, info->flags,
+ gst_buffer_add_video_meta_full (newbuf, GST_VIDEO_FRAME_FLAG_NONE,
GST_VIDEO_INFO_FORMAT (info), GST_VIDEO_INFO_WIDTH (info),
GST_VIDEO_INFO_HEIGHT (info), GST_VIDEO_INFO_N_PLANES (info),
offset, stride);
@@ -243,9 +243,10 @@ gst_v4l2_buffer_pool_set_config (GstBufferPool * bpool, GstStructure * config)
GstV4l2BufferPool *pool = GST_V4L2_BUFFER_POOL (bpool);
GstV4l2Object *obj = pool->obj;
GstCaps *caps;
- guint size, min_buffers, max_buffers;
+ guint size, min_buffers, max_buffers, num_buffers, copy_threshold;
GstAllocator *allocator;
GstAllocationParams params;
+ struct v4l2_requestbuffers breq;
GST_DEBUG_OBJECT (pool, "set config");
@@ -276,8 +277,76 @@ gst_v4l2_buffer_pool_set_config (GstBufferPool * bpool, GstStructure * config)
GST_DEBUG_OBJECT (pool, "config %" GST_PTR_FORMAT, config);
+ switch (obj->mode) {
+ case GST_V4L2_IO_RW:
+ /* we preallocate 1 buffer, this value also instructs the latency
+ * calculation to have 1 frame latency max */
+ num_buffers = 1;
+ copy_threshold = 0;
+ break;
+ case GST_V4L2_IO_MMAP:
+ {
+ /* request a reasonable number of buffers when no max specified. We will
+ * copy when we run out of buffers */
+ if (max_buffers == 0)
+ num_buffers = 4;
+ else
+ num_buffers = max_buffers;
+
+ /* first, lets request buffers, and see how many we can get: */
+ GST_DEBUG_OBJECT (pool, "starting, requesting %d MMAP buffers",
+ num_buffers);
+
+ memset (&breq, 0, sizeof (struct v4l2_requestbuffers));
+ breq.type = obj->type;
+ breq.count = num_buffers;
+ breq.memory = V4L2_MEMORY_MMAP;
+
+ if (v4l2_ioctl (pool->video_fd, VIDIOC_REQBUFS, &breq) < 0)
+ goto reqbufs_failed;
+
+ GST_LOG_OBJECT (pool, " count: %u", breq.count);
+ GST_LOG_OBJECT (pool, " type: %d", breq.type);
+ GST_LOG_OBJECT (pool, " memory: %d", breq.memory);
+
+ if (breq.count < GST_V4L2_MIN_BUFFERS)
+ goto no_buffers;
+
+ if (num_buffers != breq.count) {
+ GST_WARNING_OBJECT (pool, "using %u buffers instead", breq.count);
+ num_buffers = breq.count;
+ }
+ /* update min buffers with the amount of buffers we just reserved. We need
+ * to configure this value in the bufferpool so that the default start
+ * implementation calls our allocate function */
+ min_buffers = breq.count;
+
+ if (max_buffers == 0 || num_buffers < max_buffers) {
+ /* if we are asked to provide more buffers than we have allocated, start
+ * copying buffers when we only have 2 buffers left in the pool */
+ copy_threshold = 2;
+ } else {
+ /* we are certain that we have enough buffers so we don't need to
+ * copy */
+ copy_threshold = 0;
+ }
+ break;
+ }
+ case GST_V4L2_IO_USERPTR:
+ default:
+ num_buffers = 0;
+ copy_threshold = 0;
+ g_assert_not_reached ();
+ break;
+ }
+
pool->size = size;
- pool->max_buffers = max_buffers;
+ pool->num_buffers = num_buffers;
+ pool->copy_threshold = copy_threshold;
+ if (pool->allocator)
+ gst_allocator_unref (pool->allocator);
+ if ((pool->allocator = allocator))
+ gst_allocator_ref (allocator);
pool->params = params;
gst_buffer_pool_config_set_params (config, caps, size, min_buffers,
@@ -298,6 +367,19 @@ wrong_config:
GST_ERROR_OBJECT (pool, "invalid config %" GST_PTR_FORMAT, config);
return FALSE;
}
+reqbufs_failed:
+ {
+ GST_ERROR_OBJECT (pool,
+ "error requesting %d buffers: %s", num_buffers, g_strerror (errno));
+ return FALSE;
+ }
+no_buffers:
+ {
+ GST_ERROR_OBJECT (pool,
+ "we received %d from device '%s', we want at least %d",
+ breq.count, obj->videodev, GST_V4L2_MIN_BUFFERS);
+ return FALSE;
+ }
}
static gboolean
@@ -337,55 +419,9 @@ gst_v4l2_buffer_pool_start (GstBufferPool * bpool)
{
GstV4l2BufferPool *pool = GST_V4L2_BUFFER_POOL (bpool);
GstV4l2Object *obj = pool->obj;
- struct v4l2_requestbuffers breq;
- gint max_buffers;
-
- max_buffers = pool->max_buffers;
-
- switch (obj->mode) {
- case GST_V4L2_IO_RW:
- {
- break;
- }
- case GST_V4L2_IO_MMAP:
- {
- /* first, lets request buffers, and see how many we can get: */
- GST_DEBUG_OBJECT (pool, "starting, requesting %d MMAP buffers",
- max_buffers);
-
- if (max_buffers == 0)
- max_buffers = 4;
-
- memset (&breq, 0, sizeof (struct v4l2_requestbuffers));
- breq.type = obj->type;
- breq.count = max_buffers;
- breq.memory = V4L2_MEMORY_MMAP;
-
- if (v4l2_ioctl (pool->video_fd, VIDIOC_REQBUFS, &breq) < 0)
- goto reqbufs_failed;
-
- GST_LOG_OBJECT (pool, " count: %u", breq.count);
- GST_LOG_OBJECT (pool, " type: %d", breq.type);
- GST_LOG_OBJECT (pool, " memory: %d", breq.memory);
-
- if (breq.count < GST_V4L2_MIN_BUFFERS)
- goto no_buffers;
-
- if (max_buffers != breq.count) {
- GST_WARNING_OBJECT (pool, "using %u buffers instead", breq.count);
- max_buffers = breq.count;
- }
- break;
- }
- case GST_V4L2_IO_USERPTR:
- default:
- g_assert_not_reached ();
- break;
- }
pool->obj = obj;
- pool->max_buffers = max_buffers;
- pool->buffers = g_new0 (GstBuffer *, max_buffers);
+ pool->buffers = g_new0 (GstBuffer *, pool->num_buffers);
pool->num_allocated = 0;
/* now, allocate the buffers: */
@@ -403,19 +439,6 @@ gst_v4l2_buffer_pool_start (GstBufferPool * bpool)
return TRUE;
/* ERRORS */
-reqbufs_failed:
- {
- GST_ERROR_OBJECT (pool,
- "error requesting %d buffers: %s", max_buffers, g_strerror (errno));
- return FALSE;
- }
-no_buffers:
- {
- GST_ERROR_OBJECT (pool,
- "we received %d from device '%s', we want at least %d",
- breq.count, obj->videodev, GST_V4L2_MIN_BUFFERS);
- return FALSE;
- }
start_failed:
{
GST_ERROR_OBJECT (pool, "failed to start streaming");
@@ -458,9 +481,8 @@ gst_v4l2_buffer_pool_stop (GstBufferPool * bpool)
ret = GST_BUFFER_POOL_CLASS (parent_class)->stop (bpool);
/* then free the remaining buffers */
- for (n = 0; n < pool->num_allocated; n++) {
- if (pool->buffers[n])
- gst_v4l2_buffer_pool_free_buffer (bpool, pool->buffers[n]);
+ for (n = 0; n < pool->num_queued; n++) {
+ gst_v4l2_buffer_pool_free_buffer (bpool, pool->buffers[n]);
}
g_free (pool->buffers);
pool->buffers = NULL;
@@ -520,16 +542,22 @@ gst_v4l2_buffer_pool_qbuf (GstV4l2BufferPool * pool, GstBuffer * buf)
gint index;
meta = GST_V4L2_META_GET (buf);
- g_assert (meta != NULL);
+ if (meta == NULL) {
+ GST_LOG_OBJECT (pool, "unref copied buffer %p", buf);
+ /* no meta, it was a copied buffer that we can unref */
+ gst_buffer_unref (buf);
+ return GST_FLOW_OK;
+ }
index = meta->vbuffer.index;
- GST_LOG_OBJECT (pool, "enqueue buffer %p, index:%d, queued:%d", buf,
- index, pool->num_queued);
+ GST_LOG_OBJECT (pool, "enqueue buffer %p, index:%d, queued:%d, flags:%08x",
+ buf, index, pool->num_queued, meta->vbuffer.flags);
if (pool->buffers[index] != NULL)
goto already_queued;
+ GST_LOG_OBJECT (pool, "doing QBUF");
if (v4l2_ioctl (pool->video_fd, VIDIOC_QBUF, &meta->vbuffer) < 0)
goto queue_failed;
@@ -559,6 +587,7 @@ gst_v4l2_buffer_pool_dqbuf (GstV4l2BufferPool * pool, GstBuffer ** buffer)
GstBuffer *outbuf;
struct v4l2_buffer vbuffer;
GstV4l2Object *obj = pool->obj;
+ GstClockTime timestamp;
if (obj->type == V4L2_BUF_TYPE_VIDEO_CAPTURE) {
/* select works for input devices when data is available. According to the
@@ -587,19 +616,20 @@ gst_v4l2_buffer_pool_dqbuf (GstV4l2BufferPool * pool, GstBuffer ** buffer)
pool->buffers[vbuffer.index] = NULL;
pool->num_queued--;
+ timestamp = GST_TIMEVAL_TO_TIME (vbuffer.timestamp);
+
GST_LOG_OBJECT (pool,
- "dequeued buffer %p seq:%d (ix=%d), used %d, flags %08x, pool-queued=%d, buffer=%p",
- outbuf, vbuffer.sequence, vbuffer.index, vbuffer.bytesused, vbuffer.flags,
- pool->num_queued, outbuf);
+ "dequeued buffer %p seq:%d (ix=%d), used %d, flags %08x, ts %"
+ GST_TIME_FORMAT ", pool-queued=%d, buffer=%p", outbuf, vbuffer.sequence,
+ vbuffer.index, vbuffer.bytesused, vbuffer.flags,
+ GST_TIME_ARGS (timestamp), pool->num_queued, outbuf);
/* set top/bottom field first if v4l2_buffer has the information */
if (vbuffer.field == V4L2_FIELD_INTERLACED_TB) {
GST_BUFFER_FLAG_SET (outbuf, GST_VIDEO_BUFFER_FLAG_TFF);
- GST_BUFFER_FLAG_SET (outbuf, GST_VIDEO_BUFFER_FLAG_INTERLACED);
}
if (vbuffer.field == V4L2_FIELD_INTERLACED_BT) {
GST_BUFFER_FLAG_UNSET (outbuf, GST_VIDEO_BUFFER_FLAG_TFF);
- GST_BUFFER_FLAG_SET (outbuf, GST_VIDEO_BUFFER_FLAG_INTERLACED);
}
/* this can change at every frame, esp. with jpeg */
@@ -608,6 +638,8 @@ gst_v4l2_buffer_pool_dqbuf (GstV4l2BufferPool * pool, GstBuffer ** buffer)
else
gst_buffer_resize (outbuf, 0, vbuffer.length);
+ GST_BUFFER_TIMESTAMP (outbuf) = timestamp;
+
*buffer = outbuf;
return GST_FLOW_OK;
@@ -702,6 +734,21 @@ gst_v4l2_buffer_pool_acquire_buffer (GstBufferPool * bpool, GstBuffer ** buffer,
* storage for our buffers. This function does poll first so we can
* interrupt it fine. */
ret = gst_v4l2_buffer_pool_dqbuf (pool, buffer);
+ if (G_UNLIKELY (ret != GST_FLOW_OK))
+ goto done;
+
+ /* start copying buffers when we are running low on buffers */
+ if (pool->num_queued < pool->copy_threshold) {
+ GstBuffer *copy;
+
+ /* copy the memory */
+ copy = gst_buffer_copy (*buffer);
+ GST_LOG_OBJECT (pool, "copy buffer %p->%p", *buffer, copy);
+
+ /* and requeue so that we can continue capturing */
+ ret = gst_v4l2_buffer_pool_qbuf (pool, *buffer);
+ *buffer = copy;
+ }
break;
case GST_V4L2_IO_USERPTR:
@@ -737,6 +784,7 @@ gst_v4l2_buffer_pool_acquire_buffer (GstBufferPool * bpool, GstBuffer ** buffer,
g_assert_not_reached ();
break;
}
+done:
return ret;
/* ERRORS */
@@ -825,7 +873,8 @@ gst_v4l2_buffer_pool_finalize (GObject * object)
if (pool->video_fd >= 0)
v4l2_close (pool->video_fd);
-
+ if (pool->allocator)
+ gst_allocator_unref (pool->allocator);
g_free (pool->buffers);
G_OBJECT_CLASS (parent_class)->finalize (object);
diff --git a/sys/v4l2/gstv4l2bufferpool.h b/sys/v4l2/gstv4l2bufferpool.h
index 6a0d19ad34a9917d0f6485b999a1f951c51b66f9..a9b022e9aa872fd421fa4355b049c0ae0d84256c 100644
--- a/sys/v4l2/gstv4l2bufferpool.h
+++ b/sys/v4l2/gstv4l2bufferpool.h
@@ -54,11 +54,12 @@ struct _GstV4l2BufferPool
GstAllocator *allocator;
GstAllocationParams params;
guint size;
- guint max_buffers;
gboolean add_videometa;
+ guint num_buffers; /* number of buffers we use */
guint num_allocated; /* number of buffers allocated by the driver */
guint num_queued; /* number of buffers queued in the driver */
+ guint copy_threshold; /* when our pool runs lower, start handing out copies */
gboolean streaming;
diff --git a/sys/v4l2/gstv4l2object.c b/sys/v4l2/gstv4l2object.c
index 6bcbf16b89ea1f888a83124d40b707aa90881960..1e1f9c9fedd0b2eca7619cb54b40fa802411046e 100644
--- a/sys/v4l2/gstv4l2object.c
+++ b/sys/v4l2/gstv4l2object.c
@@ -880,6 +880,10 @@ static const GstV4L2FormatDesc gst_v4l2_formats[] = {
{V4L2_PIX_FMT_DV, TRUE},
{V4L2_PIX_FMT_MPEG, FALSE},
+#ifdef V4L2_PIX_FMT_H264
+ {V4L2_PIX_FMT_H264, TRUE},
+#endif
+
/* Vendor-specific formats */
{V4L2_PIX_FMT_WNVA, TRUE},
@@ -1199,6 +1203,11 @@ gst_v4l2_object_v4l2fourcc_to_structure (guint32 fourcc)
case V4L2_PIX_FMT_HI240: /* 8 8-bit color */
/* FIXME: get correct fourccs here */
break;
+#ifdef V4L2_PIX_FMT_H264
+ case V4L2_PIX_FMT_H264: /* H.264 */
+ structure = gst_structure_new_empty ("video/x-h264");
+ break;
+#endif
case V4L2_PIX_FMT_RGB332:
case V4L2_PIX_FMT_RGB555X:
case V4L2_PIX_FMT_RGB565X:
@@ -1471,6 +1480,10 @@ gst_v4l2_object_get_caps_info (GstV4l2Object * v4l2object, GstCaps * caps,
fourcc = V4L2_PIX_FMT_DV;
} else if (g_str_equal (mimetype, "image/jpeg")) {
fourcc = V4L2_PIX_FMT_JPEG;
+#ifdef V4L2_PIX_FMT_H264
+ } else if (g_str_equal (mimetype, "video/x-h264")) {
+ fourcc = V4L2_PIX_FMT_H264;
+#endif
#ifdef V4L2_PIX_FMT_SBGGR8
} else if (g_str_equal (mimetype, "video/x-bayer")) {
fourcc = V4L2_PIX_FMT_SBGGR8;
@@ -2210,7 +2223,7 @@ gst_v4l2_object_set_format (GstV4l2Object * v4l2object, GstCaps * caps)
fps_d = GST_VIDEO_INFO_FPS_D (&info);
stride = GST_VIDEO_INFO_PLANE_STRIDE (&info, 0);
- if (info.flags & GST_VIDEO_FLAG_INTERLACED) {
+ if (GST_VIDEO_INFO_IS_INTERLACED (&info)) {
GST_DEBUG_OBJECT (v4l2object->element, "interlaced video");
/* ideally we would differentiate between types of interlaced video
* but there is not sufficient information in the caps..
@@ -2228,10 +2241,16 @@ gst_v4l2_object_set_format (GstV4l2Object * v4l2object, GstCaps * caps)
GST_V4L2_CHECK_OPEN (v4l2object);
GST_V4L2_CHECK_NOT_ACTIVE (v4l2object);
+ /* MPEG-TS source cameras don't get their format set for some reason.
+ * It looks wrong and we weren't able to track down the reason for that code
+ * so it is disabled until someone who has an mpeg-ts camera complains...
+ */
+#if 0
/* Only unconditionally accept mpegts for sources */
if ((v4l2object->type == V4L2_BUF_TYPE_VIDEO_CAPTURE) &&
(pixelformat == GST_MAKE_FOURCC ('M', 'P', 'E', 'G')))
goto done;
+#endif
memset (&format, 0x00, sizeof (struct v4l2_format));
format.type = v4l2object->type;
diff --git a/sys/v4l2/gstv4l2src.c b/sys/v4l2/gstv4l2src.c
index bd79d38da7b5cdd97cb81c1b2c01476369257860..6c5603154a670ae47019d1bfceb73064526fbdfc 100644
--- a/sys/v4l2/gstv4l2src.c
+++ b/sys/v4l2/gstv4l2src.c
@@ -50,8 +50,8 @@
#include <sys/time.h>
#include <unistd.h>
-#include "gst/video/gstvideometa.h"
-#include "gst/video/gstvideopool.h"
+#include <gst/video/gstvideometa.h>
+#include <gst/video/gstvideopool.h>
#include "gstv4l2src.h"
@@ -80,6 +80,15 @@ enum
PROP_DECIMATE
};
+/* signals and args */
+enum
+{
+ SIGNAL_PRE_SET_FORMAT,
+ LAST_SIGNAL
+};
+
+static guint gst_v4l2_signals[LAST_SIGNAL] = { 0 };
+
GST_IMPLEMENT_V4L2_COLOR_BALANCE_METHODS (GstV4l2Src, gst_v4l2src);
GST_IMPLEMENT_V4L2_TUNER_METHODS (GstV4l2Src, gst_v4l2src);
#ifdef HAVE_XVIDEO
@@ -168,6 +177,29 @@ gst_v4l2src_class_init (GstV4l2SrcClass * klass)
"Only use every nth frame", 1, G_MAXINT,
PROP_DEF_DECIMATE, G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
+ /**
+ * GstV4l2Src::prepare-format:
+ * @v4l2src: the v4l2src instance
+ * @fd: the file descriptor of the current device
+ * @fourcc: the fourcc of the format being set
+ * @width: The width of the video
+ * @height: The height of the video
+ *
+ * This signal gets emitted before calling the v4l2 VIDIOC_S_FMT ioctl
+ * (set format). This allows for any custom configuration of the device to
+ * happen prior to the format being set.
+ * This is mostly useful for UVC H264 encoding cameras which need the H264
+ * Probe & Commit to happen prior to the normal Probe & Commit.
+ *
+ * Since: 0.10.32
+ */
+ gst_v4l2_signals[SIGNAL_PRE_SET_FORMAT] = g_signal_new ("prepare-format",
+ G_TYPE_FROM_CLASS (klass),
+ G_SIGNAL_RUN_LAST,
+ 0,
+ NULL, NULL,
+ NULL, G_TYPE_NONE, 4, G_TYPE_INT, G_TYPE_UINT, G_TYPE_UINT, G_TYPE_UINT);
+
gst_element_class_set_static_metadata (element_class,
"Video (video4linux2) Source", "Source/Video",
"Reads frames from a Video4Linux2 device",
@@ -589,7 +621,7 @@ gst_v4l2src_decide_allocation (GstBaseSrc * bsrc, GstQuery * query)
else
gst_query_add_allocation_pool (query, pool, size, min, max);
- return TRUE;
+ return GST_BASE_SRC_CLASS (parent_class)->decide_allocation (bsrc, query);
}
static gboolean
@@ -606,7 +638,7 @@ gst_v4l2src_query (GstBaseSrc * bsrc, GstQuery * query)
case GST_QUERY_LATENCY:{
GstClockTime min_latency, max_latency;
guint32 fps_n, fps_d;
- guint max_buffers;
+ guint num_buffers;
/* device must be open */
if (!GST_V4L2_IS_OPEN (obj)) {
@@ -629,12 +661,12 @@ gst_v4l2src_query (GstBaseSrc * bsrc, GstQuery * query)
min_latency = gst_util_uint64_scale_int (GST_SECOND, fps_d, fps_n);
/* max latency is total duration of the frame buffer */
- max_buffers = GST_V4L2_BUFFER_POOL_CAST (obj->pool)->max_buffers;
+ num_buffers = GST_V4L2_BUFFER_POOL_CAST (obj->pool)->num_buffers;
- if (max_buffers == 0)
+ if (num_buffers == 0)
max_latency = -1;
else
- max_latency = max_buffers * min_latency;
+ max_latency = num_buffers * min_latency;
GST_DEBUG_OBJECT (bsrc,
"report latency min %" GST_TIME_FORMAT " max %" GST_TIME_FORMAT,
@@ -746,7 +778,8 @@ gst_v4l2src_fill (GstPushSrc * src, GstBuffer * buf)
GstV4l2Object *obj = v4l2src->v4l2object;
GstFlowReturn ret;
GstClock *clock;
- GstClockTime timestamp, duration;
+ GstClockTime abs_time, base_time, timestamp, duration;
+ GstClockTime delay;
#if 0
int i;
@@ -766,37 +799,81 @@ gst_v4l2src_fill (GstPushSrc * src, GstBuffer * buf)
if (G_UNLIKELY (ret != GST_FLOW_OK))
goto error;
- /* set buffer metadata */
- GST_BUFFER_OFFSET (buf) = v4l2src->offset++;
- GST_BUFFER_OFFSET_END (buf) = v4l2src->offset;
+
+ timestamp = GST_BUFFER_TIMESTAMP (buf);
+ duration = obj->duration;
/* timestamps, LOCK to get clock and base time. */
/* FIXME: element clock and base_time is rarely changing */
GST_OBJECT_LOCK (v4l2src);
if ((clock = GST_ELEMENT_CLOCK (v4l2src))) {
/* we have a clock, get base time and ref clock */
- timestamp = GST_ELEMENT (v4l2src)->base_time;
+ base_time = GST_ELEMENT (v4l2src)->base_time;
gst_object_ref (clock);
} else {
/* no clock, can't set timestamps */
- timestamp = GST_CLOCK_TIME_NONE;
+ base_time = GST_CLOCK_TIME_NONE;
}
GST_OBJECT_UNLOCK (v4l2src);
- duration = obj->duration;
-
- if (G_LIKELY (clock)) {
- /* the time now is the time of the clock minus the base time */
- timestamp = gst_clock_get_time (clock) - timestamp;
+ /* sample pipeline clock */
+ if (clock) {
+ abs_time = gst_clock_get_time (clock);
gst_object_unref (clock);
+ } else {
+ abs_time = GST_CLOCK_TIME_NONE;
+ }
- /* if we have a framerate adjust timestamp for frame latency */
- if (GST_CLOCK_TIME_IS_VALID (duration)) {
- if (timestamp > duration)
- timestamp -= duration;
- else
- timestamp = 0;
+ if (timestamp != GST_CLOCK_TIME_NONE) {
+ struct timespec now;
+ GstClockTime gstnow;
+
+ /* v4l2 specs say to use the system time although many drivers switched to
+ * the more desirable monotonic time. We first try to use the monotonic time
+ * and see how that goes */
+ clock_gettime (CLOCK_MONOTONIC, &now);
+ gstnow = GST_TIMESPEC_TO_TIME (now);
+
+ if (gstnow < timestamp && (timestamp - gstnow) > (10 * GST_SECOND)) {
+ GTimeVal now;
+
+ /* very large diff, fall back to system time */
+ g_get_current_time (&now);
+ gstnow = GST_TIMEVAL_TO_TIME (now);
}
+
+ if (gstnow > timestamp) {
+ delay = gstnow - timestamp;
+ } else {
+ delay = 0;
+ }
+
+ GST_DEBUG_OBJECT (v4l2src, "ts: %" GST_TIME_FORMAT " now %" GST_TIME_FORMAT
+ " delay %" GST_TIME_FORMAT, GST_TIME_ARGS (timestamp),
+ GST_TIME_ARGS (gstnow), GST_TIME_ARGS (delay));
+ } else {
+ /* we assume 1 frame latency otherwise */
+ if (GST_CLOCK_TIME_IS_VALID (duration))
+ delay = duration;
+ else
+ delay = 0;
+ }
+
+ /* set buffer metadata */
+ GST_BUFFER_OFFSET (buf) = v4l2src->offset++;
+ GST_BUFFER_OFFSET_END (buf) = v4l2src->offset;
+
+ if (G_LIKELY (abs_time != GST_CLOCK_TIME_NONE)) {
+ /* the time now is the time of the clock minus the base time */
+ timestamp = abs_time - base_time;
+
+ /* adjust for delay in the device */
+ if (timestamp > delay)
+ timestamp -= delay;
+ else
+ timestamp = 0;
+ } else {
+ timestamp = GST_CLOCK_TIME_NONE;
}
/* activate settings for next frame */
@@ -809,10 +886,10 @@ gst_v4l2src_fill (GstPushSrc * src, GstBuffer * buf)
v4l2src->ctrl_time = timestamp;
}
gst_object_sync_values (GST_OBJECT (src), v4l2src->ctrl_time);
- GST_INFO_OBJECT (src, "sync to %" GST_TIME_FORMAT,
- GST_TIME_ARGS (v4l2src->ctrl_time));
- /* FIXME: use the timestamp from the buffer itself! */
+ GST_INFO_OBJECT (src, "sync to %" GST_TIME_FORMAT " out ts %" GST_TIME_FORMAT,
+ GST_TIME_ARGS (v4l2src->ctrl_time), GST_TIME_ARGS (timestamp));
+
GST_BUFFER_TIMESTAMP (buf) = timestamp;
GST_BUFFER_DURATION (buf) = duration;
diff --git a/sys/v4l2/gstv4l2tuner.h b/sys/v4l2/gstv4l2tuner.h
index 75d4559e04ba17e895cc678b668b6a423c788074..5a6e2f54dca7ef2d78e7079e6681826ec4e93007 100644
--- a/sys/v4l2/gstv4l2tuner.h
+++ b/sys/v4l2/gstv4l2tuner.h
@@ -25,8 +25,8 @@
#define __GST_V4L2_TUNER_H__
#include <gst/gst.h>
-#include <gst/interfaces/tuner.h>
+#include "tuner.h"
#include "gstv4l2object.h"
G_BEGIN_DECLS
diff --git a/sys/v4l2/gstv4l2videooverlay.c b/sys/v4l2/gstv4l2videooverlay.c
index ae9a3179183745b520b7a1b8b599d864afee6118..88ccf5cdfcd337daae0dad1ac219a58f9ec75298 100644
--- a/sys/v4l2/gstv4l2videooverlay.c
+++ b/sys/v4l2/gstv4l2videooverlay.c
@@ -34,7 +34,7 @@
/* for XkbKeycodeToKeysym */
#include <X11/XKBlib.h>
-#include <gst/interfaces/navigation.h>
+#include <gst/video/navigation.h>
#include "gstv4l2videooverlay.h"
#include "gstv4l2object.h"
diff --git a/sys/v4l2/gstv4l2videooverlay.h b/sys/v4l2/gstv4l2videooverlay.h
index 7c044e71d8a88baa23a5a7f57dbc3df553750218..0f602e75ca758dc677d1ab23aaa5d966923d6f69 100644
--- a/sys/v4l2/gstv4l2videooverlay.h
+++ b/sys/v4l2/gstv4l2videooverlay.h
@@ -26,7 +26,7 @@
#include <X11/X.h>
#include <gst/gst.h>
-#include <gst/interfaces/navigation.h>
+#include <gst/video/navigation.h>
#include <gst/video/gstvideosink.h> /* for GstVideoRectange */
#include <gst/video/videooverlay.h>
diff --git a/sys/v4l2/tuner-marshal.list b/sys/v4l2/tuner-marshal.list
new file mode 100644
index 0000000000000000000000000000000000000000..c99ddc7d2b9c15a35131b8fbf94f3c16b3ea33ae
--- /dev/null
+++ b/sys/v4l2/tuner-marshal.list
@@ -0,0 +1,2 @@
+VOID:OBJECT,ULONG
+VOID:OBJECT,INT
diff --git a/sys/v4l2/tuner.c b/sys/v4l2/tuner.c
new file mode 100644
index 0000000000000000000000000000000000000000..59cea711d49772a6c1a27068a8b70294165fb1e6
--- /dev/null
+++ b/sys/v4l2/tuner.c
@@ -0,0 +1,577 @@
+/* GStreamer Tuner
+ * Copyright (C) 2003 Ronald Bultje <rbultje@ronald.bitfreak.net>
+ *
+ * tuner.c: tuner design virtual class function wrappers
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Library General Public
+ * License as published by the Free Software Foundation; either
+ * version 2 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Library General Public License for more details.
+ *
+ * You should have received a copy of the GNU Library General Public
+ * License along with this library; if not, write to the
+ * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+ * Boston, MA 02111-1307, USA.
+ */
+
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
+#include "tuner.h"
+#include "tuner-marshal.h"
+
+#include <string.h>
+
+/**
+ * SECTION:gsttuner
+ * @short_description: Interface for elements providing tuner operations
+ *
+ * <refsect2>
+ * <para>
+ * The GstTuner interface is provided by elements that have the ability to
+ * tune into multiple input signals, for example TV or radio capture cards.
+ * </para><para>
+ * The interpretation of 'tuning into' an input stream depends on the element
+ * implementing the interface. For v4lsrc, it might imply selection of an
+ * input source and/or frequency to be configured on a TV card. Another
+ * GstTuner implementation might be to allow selection of an active input pad
+ * from multiple input pads.
+ * </para><para>
+ * That said, the GstTuner interface functions are biased toward the
+ * TV capture scenario.
+ * </para><para>
+ * The general parameters provided are for configuration are:
+ * <itemizedlist>
+ * <listitem>Selection of a current #GstTunerChannel. The current channel
+ * represents the input source (e.g. Composite, S-Video etc for TV capture).
+ * </listitem>
+ * <listitem>The #GstTunerNorm for the channel. The norm chooses the
+ * interpretation of the incoming signal for the current channel. For example,
+ * PAL or NTSC, or more specific variants there-of.
+ * </listitem>
+ * <listitem>Channel frequency. If the current channel has the ability to tune
+ * between multiple frequencies (if it has the GST_TUNER_CHANNEL_FREQUENCY flag)
+ * then the frequency can be changed/retrieved via the
+ * gst_tuner_set_frequency() and gst_tuner_get_frequency() methods.
+ * </listitem>
+ * </itemizedlist>
+ * </para>
+ * <para>
+ * Where applicable, the signal strength can be retrieved and/or monitored
+ * via a signal.
+ * </para>
+ * </refsect2>
+ */
+
+/* FIXME 0.11: check if we need to add API for sometimes-supportedness
+ * (aka making up for GstImplementsInterface removal) */
+
+/* FIXME 0.11: replace signals with messages (+ make API thread-safe) */
+
+enum
+{
+ NORM_CHANGED,
+ CHANNEL_CHANGED,
+ FREQUENCY_CHANGED,
+ SIGNAL_CHANGED,
+ LAST_SIGNAL
+};
+
+static void gst_tuner_class_init (GstTunerInterface * iface);
+
+static guint gst_tuner_signals[LAST_SIGNAL] = { 0 };
+
+GType
+gst_tuner_get_type (void)
+{
+ static GType gst_tuner_type = 0;
+
+ if (!gst_tuner_type) {
+ static const GTypeInfo gst_tuner_info = {
+ sizeof (GstTunerInterface),
+ (GBaseInitFunc) gst_tuner_class_init,
+ NULL,
+ NULL,
+ NULL,
+ NULL,
+ 0,
+ 0,
+ NULL,
+ };
+
+ gst_tuner_type = g_type_register_static (G_TYPE_INTERFACE,
+ "GstTuner", &gst_tuner_info, 0);
+ }
+
+ return gst_tuner_type;
+}
+
+static void
+gst_tuner_class_init (GstTunerInterface * iface)
+{
+ static gboolean initialized = FALSE;
+
+ if (!initialized) {
+ /**
+ * GstTuner::norm-changed:
+ * @tuner: The element providing the GstTuner interface
+ * @norm: The new configured norm.
+ *
+ * Reports that the current #GstTunerNorm has changed.
+ */
+ gst_tuner_signals[NORM_CHANGED] =
+ g_signal_new ("norm-changed",
+ GST_TYPE_TUNER, G_SIGNAL_RUN_LAST,
+ G_STRUCT_OFFSET (GstTunerInterface, norm_changed),
+ NULL, NULL,
+ g_cclosure_marshal_VOID__OBJECT, G_TYPE_NONE, 1, GST_TYPE_TUNER_NORM);
+ /**
+ * GstTuner::channel-changed:
+ * @tuner: The element providing the GstTuner interface
+ * @channel: The new configured channel.
+ *
+ * Reports that the current #GstTunerChannel has changed.
+ */
+ gst_tuner_signals[CHANNEL_CHANGED] =
+ g_signal_new ("channel-changed",
+ GST_TYPE_TUNER, G_SIGNAL_RUN_LAST,
+ G_STRUCT_OFFSET (GstTunerInterface, channel_changed),
+ NULL, NULL,
+ g_cclosure_marshal_VOID__OBJECT, G_TYPE_NONE, 1,
+ GST_TYPE_TUNER_CHANNEL);
+ /**
+ * GstTuner::frequency-changed:
+ * @tuner: The element providing the GstTuner interface
+ * @frequency: The new frequency (an unsigned long)
+ *
+ * Reports that the current frequency has changed.
+ */
+ gst_tuner_signals[FREQUENCY_CHANGED] =
+ g_signal_new ("frequency-changed",
+ GST_TYPE_TUNER, G_SIGNAL_RUN_LAST,
+ G_STRUCT_OFFSET (GstTunerInterface, frequency_changed),
+ NULL, NULL,
+ gst_interfaces_marshal_VOID__OBJECT_ULONG, G_TYPE_NONE, 2,
+ GST_TYPE_TUNER_CHANNEL, G_TYPE_ULONG);
+ /**
+ * GstTuner::signal-changed:
+ * @tuner: The element providing the GstTuner interface
+ * @channel: The current #GstTunerChannel
+ * @signal: The new signal strength (an integer)
+ *
+ * Reports that the signal strength has changed.
+ *
+ * See Also: gst_tuner_signal_strength()
+ */
+ gst_tuner_signals[SIGNAL_CHANGED] =
+ g_signal_new ("signal-changed",
+ GST_TYPE_TUNER, G_SIGNAL_RUN_LAST,
+ G_STRUCT_OFFSET (GstTunerInterface, signal_changed),
+ NULL, NULL,
+ gst_interfaces_marshal_VOID__OBJECT_INT, G_TYPE_NONE, 2,
+ GST_TYPE_TUNER_CHANNEL, G_TYPE_INT);
+
+ initialized = TRUE;
+ }
+
+ /* default virtual functions */
+ iface->list_channels = NULL;
+ iface->set_channel = NULL;
+ iface->get_channel = NULL;
+
+ iface->list_norms = NULL;
+ iface->set_norm = NULL;
+ iface->get_norm = NULL;
+
+ iface->set_frequency = NULL;
+ iface->get_frequency = NULL;
+ iface->signal_strength = NULL;
+}
+
+/**
+ * gst_tuner_list_channels:
+ * @tuner: the #GstTuner (a #GstElement) to get the channels from.
+ *
+ * Retrieve a #GList of #GstTunerChannels available
+ * (e.g. 'composite', 's-video', ...) from the given tuner object.
+ *
+ * Returns: A list of channels available on this tuner. The list is
+ * owned by the GstTuner and must not be freed.
+ */
+const GList *
+gst_tuner_list_channels (GstTuner * tuner)
+{
+ GstTunerInterface *iface;
+
+ g_return_val_if_fail (GST_IS_TUNER (tuner), NULL);
+
+ iface = GST_TUNER_GET_INTERFACE (tuner);
+ if (iface->list_channels) {
+ return iface->list_channels (tuner);
+ }
+
+ return NULL;
+}
+
+/**
+ * gst_tuner_set_channel:
+ * @tuner: the #GstTuner (a #GstElement) that owns the channel.
+ * @channel: the channel to tune to.
+ *
+ * Tunes the object to the given channel, which should be one of the
+ * channels returned by gst_tuner_list_channels().
+ */
+
+void
+gst_tuner_set_channel (GstTuner * tuner, GstTunerChannel * channel)
+{
+ GstTunerInterface *iface;
+
+ g_return_if_fail (GST_IS_TUNER (tuner));
+
+ iface = GST_TUNER_GET_INTERFACE (tuner);
+ if (iface->set_channel) {
+ iface->set_channel (tuner, channel);
+ }
+}
+
+/**
+ * gst_tuner_get_channel:
+ * @tuner: the #GstTuner (a #GstElement) to get the current channel from.
+ *
+ * Retrieve the current channel from the tuner.
+ *
+ * Returns: the current channel of the tuner object.
+ */
+
+GstTunerChannel *
+gst_tuner_get_channel (GstTuner * tuner)
+{
+ GstTunerInterface *iface;
+
+ g_return_val_if_fail (GST_IS_TUNER (tuner), NULL);
+
+ iface = GST_TUNER_GET_INTERFACE (tuner);
+ if (iface->get_channel) {
+ return iface->get_channel (tuner);
+ }
+
+ return NULL;
+}
+
+/**
+ * gst_tuner_list_norms:
+ * @tuner: the #GstTuner (*a #GstElement) to get the list of norms from.
+ *
+ * Retrieve a GList of available #GstTunerNorm settings for the currently
+ * tuned channel on the given tuner object.
+ *
+ * Returns: A list of norms available on the current channel for this
+ * tuner object. The list is owned by the GstTuner and must not
+ * be freed.
+ */
+
+const GList *
+gst_tuner_list_norms (GstTuner * tuner)
+{
+ GstTunerInterface *iface;
+
+ g_return_val_if_fail (GST_IS_TUNER (tuner), NULL);
+
+ iface = GST_TUNER_GET_INTERFACE (tuner);
+ if (iface->list_norms) {
+ return iface->list_norms (tuner);
+ }
+
+ return NULL;
+}
+
+/**
+ * gst_tuner_set_norm:
+ * @tuner: the #GstTuner (a #GstElement) to set the norm on.
+ * @norm: the norm to use for the current channel.
+ *
+ * Changes the video norm on this tuner to the given norm, which should be
+ * one of the norms returned by gst_tuner_list_norms().
+ */
+
+void
+gst_tuner_set_norm (GstTuner * tuner, GstTunerNorm * norm)
+{
+ GstTunerInterface *iface;
+
+ g_return_if_fail (GST_IS_TUNER (tuner));
+
+ iface = GST_TUNER_GET_INTERFACE (tuner);
+ if (iface->set_norm) {
+ iface->set_norm (tuner, norm);
+ }
+}
+
+/**
+ * gst_tuner_get_norm:
+ * @tuner: the #GstTuner (a #GstElement) to get the current norm from.
+ *
+ * Get the current video norm from the given tuner object for the
+ * currently selected channel.
+ *
+ * Returns: the current norm.
+ */
+
+GstTunerNorm *
+gst_tuner_get_norm (GstTuner * tuner)
+{
+ GstTunerInterface *iface;
+
+ g_return_val_if_fail (GST_IS_TUNER (tuner), NULL);
+
+ iface = GST_TUNER_GET_INTERFACE (tuner);
+ if (iface->get_norm) {
+ return iface->get_norm (tuner);
+ }
+
+ return NULL;
+}
+
+/**
+ * gst_tuner_set_frequency:
+ * @tuner: The #GstTuner (a #GstElement) that owns the given channel.
+ * @channel: The #GstTunerChannel to set the frequency on.
+ * @frequency: The frequency to tune in to.
+ *
+ * Sets a tuning frequency on the given tuner/channel. Note that this
+ * requires the given channel to be a "tuning" channel, which can be
+ * checked using GST_TUNER_CHANNEL_HAS_FLAG (), with the proper flag
+ * being GST_TUNER_CHANNEL_FREQUENCY.
+ *
+ * The frequency is in Hz, with minimum steps indicated by the
+ * frequency_multiplicator provided in the #GstTunerChannel. The
+ * valid range is provided in the min_frequency and max_frequency properties
+ * of the #GstTunerChannel.
+ */
+
+void
+gst_tuner_set_frequency (GstTuner * tuner,
+ GstTunerChannel * channel, gulong frequency)
+{
+ GstTunerInterface *iface;
+
+ g_return_if_fail (GST_IS_TUNER (tuner));
+ g_return_if_fail (GST_IS_TUNER_CHANNEL (channel));
+ g_return_if_fail (GST_TUNER_CHANNEL_HAS_FLAG (channel,
+ GST_TUNER_CHANNEL_FREQUENCY));
+
+ iface = GST_TUNER_GET_INTERFACE (tuner);
+ if (iface->set_frequency) {
+ iface->set_frequency (tuner, channel, frequency);
+ }
+}
+
+/**
+ * gst_tuner_get_frequency:
+ * @tuner: The #GstTuner (a #GstElement) that owns the given channel.
+ * @channel: The #GstTunerChannel to retrieve the frequency from.
+ *
+ * Retrieve the current frequency from the given channel. As for
+ * gst_tuner_set_frequency(), the #GstTunerChannel must support frequency
+ * operations, as indicated by the GST_TUNER_CHANNEL_FREQUENCY flag.
+ *
+ * Returns: The current frequency, or 0 on error.
+ */
+
+gulong
+gst_tuner_get_frequency (GstTuner * tuner, GstTunerChannel * channel)
+{
+ GstTunerInterface *iface;
+
+ g_return_val_if_fail (GST_IS_TUNER (tuner), 0);
+ g_return_val_if_fail (GST_IS_TUNER_CHANNEL (channel), 0);
+ g_return_val_if_fail (GST_TUNER_CHANNEL_HAS_FLAG (channel,
+ GST_TUNER_CHANNEL_FREQUENCY), 0);
+
+ iface = GST_TUNER_GET_INTERFACE (tuner);
+
+ if (iface->get_frequency) {
+ return iface->get_frequency (tuner, channel);
+ }
+
+ return 0;
+}
+
+/**
+ * gst_tuner_signal_strength:
+ * @tuner: the #GstTuner (a #GstElement) that owns the given channel.
+ * @channel: the #GstTunerChannel to get the signal strength from.
+ *
+ * Get the strength of the signal on this channel. Note that this
+ * requires the current channel to be a "tuning" channel, i.e. a
+ * channel on which frequency can be set. This can be checked using
+ * GST_TUNER_CHANNEL_HAS_FLAG (), and the appropriate flag to check
+ * for is GST_TUNER_CHANNEL_FREQUENCY.
+ *
+ * The valid range of the signal strength is indicated in the
+ * min_signal and max_signal properties of the #GstTunerChannel.
+ *
+ * Returns: Signal strength, or 0 on error.
+ */
+gint
+gst_tuner_signal_strength (GstTuner * tuner, GstTunerChannel * channel)
+{
+ GstTunerInterface *iface;
+
+ g_return_val_if_fail (GST_IS_TUNER (tuner), 0);
+ g_return_val_if_fail (GST_IS_TUNER_CHANNEL (channel), 0);
+ g_return_val_if_fail (GST_TUNER_CHANNEL_HAS_FLAG (channel,
+ GST_TUNER_CHANNEL_FREQUENCY), 0);
+
+ iface = GST_TUNER_GET_INTERFACE (tuner);
+ if (iface->signal_strength) {
+ return iface->signal_strength (tuner, channel);
+ }
+
+ return 0;
+}
+
+/**
+ * gst_tuner_find_norm_by_name:
+ * @tuner: A #GstTuner instance
+ * @norm: A string containing the name of a #GstTunerNorm
+ *
+ * Look up a #GstTunerNorm by name.
+ *
+ * Returns: A #GstTunerNorm, or NULL if no norm with the provided name
+ * is available.
+ */
+GstTunerNorm *
+gst_tuner_find_norm_by_name (GstTuner * tuner, gchar * norm)
+{
+ GList *walk;
+
+ g_return_val_if_fail (GST_IS_TUNER (tuner), NULL);
+ g_return_val_if_fail (norm != NULL, NULL);
+
+ walk = (GList *) gst_tuner_list_norms (tuner);
+ while (walk) {
+ if (strcmp (GST_TUNER_NORM (walk->data)->label, norm) == 0)
+ return GST_TUNER_NORM (walk->data);
+ walk = g_list_next (walk);
+ }
+ return NULL;
+}
+
+/**
+ * gst_tuner_find_channel_by_name:
+ * @tuner: A #GstTuner instance
+ * @channel: A string containing the name of a #GstTunerChannel
+ *
+ * Look up a #GstTunerChannel by name.
+ *
+ * Returns: A #GstTunerChannel, or NULL if no channel with the provided name
+ * is available.
+ */
+GstTunerChannel *
+gst_tuner_find_channel_by_name (GstTuner * tuner, gchar * channel)
+{
+ GList *walk;
+
+ g_return_val_if_fail (GST_IS_TUNER (tuner), NULL);
+ g_return_val_if_fail (channel != NULL, NULL);
+
+ walk = (GList *) gst_tuner_list_channels (tuner);
+ while (walk) {
+ if (strcmp (GST_TUNER_CHANNEL (walk->data)->label, channel) == 0)
+ return GST_TUNER_CHANNEL (walk->data);
+ walk = g_list_next (walk);
+ }
+ return NULL;
+}
+
+/**
+ * gst_tuner_channel_changed:
+ * @tuner: A #GstTuner instance
+ * @channel: A #GstTunerChannel instance
+ *
+ * Called by elements implementing the #GstTuner interface when the
+ * current channel changes. Fires the #GstTuner::channel-changed signal.
+ */
+void
+gst_tuner_channel_changed (GstTuner * tuner, GstTunerChannel * channel)
+{
+ g_return_if_fail (GST_IS_TUNER (tuner));
+ g_return_if_fail (GST_IS_TUNER_CHANNEL (channel));
+
+ g_signal_emit (G_OBJECT (tuner),
+ gst_tuner_signals[CHANNEL_CHANGED], 0, channel);
+}
+
+/**
+ * gst_tuner_norm_changed:
+ * @tuner: A #GstTuner instance
+ * @norm: A #GstTunerNorm instance
+ *
+ * Called by elements implementing the #GstTuner interface when the
+ * current norm changes. Fires the #GstTuner::norm-changed signal.
+ *
+ */
+void
+gst_tuner_norm_changed (GstTuner * tuner, GstTunerNorm * norm)
+{
+ g_return_if_fail (GST_IS_TUNER (tuner));
+ g_return_if_fail (GST_IS_TUNER_NORM (norm));
+
+ g_signal_emit (G_OBJECT (tuner), gst_tuner_signals[NORM_CHANGED], 0, norm);
+}
+
+/**
+ * gst_tuner_frequency_changed:
+ * @tuner: A #GstTuner instance
+ * @channel: The current #GstTunerChannel
+ * @frequency: The new frequency setting
+ *
+ * Called by elements implementing the #GstTuner interface when the
+ * configured frequency changes. Fires the #GstTuner::frequency-changed
+ * signal on the tuner, and the #GstTunerChannel::frequency-changed signal
+ * on the channel.
+ */
+void
+gst_tuner_frequency_changed (GstTuner * tuner,
+ GstTunerChannel * channel, gulong frequency)
+{
+ g_return_if_fail (GST_IS_TUNER (tuner));
+ g_return_if_fail (GST_IS_TUNER_CHANNEL (channel));
+
+ g_signal_emit (G_OBJECT (tuner),
+ gst_tuner_signals[FREQUENCY_CHANGED], 0, channel, frequency);
+
+ g_signal_emit_by_name (G_OBJECT (channel), "frequency_changed", frequency);
+}
+
+/**
+ * gst_tuner_signal_changed:
+ * @tuner: A #GstTuner instance
+ * @channel: The current #GstTunerChannel
+ * @signal: The new signal strength
+ *
+ * Called by elements implementing the #GstTuner interface when the
+ * incoming signal strength changes. Fires the #GstTuner::signal-changed
+ * signal on the tuner and the #GstTunerChannel::signal-changed signal on
+ * the channel.
+ */
+void
+gst_tuner_signal_changed (GstTuner * tuner,
+ GstTunerChannel * channel, gint signal)
+{
+ g_return_if_fail (GST_IS_TUNER (tuner));
+ g_return_if_fail (GST_IS_TUNER_CHANNEL (channel));
+
+ g_signal_emit (G_OBJECT (tuner),
+ gst_tuner_signals[SIGNAL_CHANGED], 0, channel, signal);
+
+ g_signal_emit_by_name (G_OBJECT (channel), "signal_changed", signal);
+}
diff --git a/sys/v4l2/tuner.h b/sys/v4l2/tuner.h
new file mode 100644
index 0000000000000000000000000000000000000000..c7cffe509c416ff5b53a93aca9219d32e55cc3b6
--- /dev/null
+++ b/sys/v4l2/tuner.h
@@ -0,0 +1,142 @@
+/* GStreamer Tuner
+ * Copyright (C) 2003 Ronald Bultje <rbultje@ronald.bitfreak.net>
+ *
+ * tuner.h: tuner interface design
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Library General Public
+ * License as published by the Free Software Foundation; either
+ * version 2 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Library General Public License for more details.
+ *
+ * You should have received a copy of the GNU Library General Public
+ * License along with this library; if not, write to the
+ * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+ * Boston, MA 02111-1307, USA.
+ */
+
+#ifndef __GST_TUNER_H__
+#define __GST_TUNER_H__
+
+#include <gst/gst.h>
+
+#include "tunernorm.h"
+#include "tunerchannel.h"
+#include "tuner-enumtypes.h"
+
+G_BEGIN_DECLS
+
+#define GST_TYPE_TUNER \
+ (gst_tuner_get_type ())
+#define GST_TUNER(obj) \
+ (G_TYPE_CHECK_INSTANCE_CAST ((obj), GST_TYPE_TUNER, GstTuner))
+#define GST_IS_TUNER(obj) \
+ (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GST_TYPE_TUNER))
+#define GST_TUNER_GET_INTERFACE(inst) \
+ (G_TYPE_INSTANCE_GET_INTERFACE ((inst), GST_TYPE_TUNER, GstTunerInterface))
+
+typedef struct _GstTuner GstTuner;
+typedef struct _GstTunerInterface GstTunerInterface;
+
+/**
+ * GstTunerInterface:
+ * @iface: the parent interface
+ * @list_channels: list available channels
+ * @set_channel: set to a channel
+ * @get_channel: return the current channel
+ * @list_norms: list available norms
+ * @set_norm: set a norm
+ * @get_norm: return the current norm
+ * @set_frequency: set the frequency
+ * @get_frequency: return the current frequency
+ * @signal_strength: get the signal strength
+ * @channel_changed: default handler for channel changed notification
+ * @norm_changed: default handler for norm changed notification
+ * @frequency_changed: default handler for frequency changed notification
+ * @signal_changed: default handler for signal-strength changed notification
+ *
+ * Tuner interface.
+ */
+struct _GstTunerInterface {
+ GTypeInterface iface;
+
+ /* virtual functions */
+ const GList * (* list_channels) (GstTuner *tuner);
+ void (* set_channel) (GstTuner *tuner,
+ GstTunerChannel *channel);
+ GstTunerChannel *
+ (* get_channel) (GstTuner *tuner);
+
+ const GList * (* list_norms) (GstTuner *tuner);
+ void (* set_norm) (GstTuner *tuner,
+ GstTunerNorm *norm);
+ GstTunerNorm *(* get_norm) (GstTuner *tuner);
+
+ void (* set_frequency) (GstTuner *tuner,
+ GstTunerChannel *channel,
+ gulong frequency);
+ gulong (* get_frequency) (GstTuner *tuner,
+ GstTunerChannel *channel);
+ gint (* signal_strength) (GstTuner *tuner,
+ GstTunerChannel *channel);
+
+ /* signals */
+ void (*channel_changed) (GstTuner *tuner,
+ GstTunerChannel *channel);
+ void (*norm_changed) (GstTuner *tuner,
+ GstTunerNorm *norm);
+ void (*frequency_changed) (GstTuner *tuner,
+ GstTunerChannel *channel,
+ gulong frequency);
+ void (*signal_changed) (GstTuner *tuner,
+ GstTunerChannel *channel,
+ gint signal);
+};
+
+GType gst_tuner_get_type (void);
+
+/* virtual class function wrappers */
+const GList * gst_tuner_list_channels (GstTuner *tuner);
+void gst_tuner_set_channel (GstTuner *tuner,
+ GstTunerChannel *channel);
+GstTunerChannel *
+ gst_tuner_get_channel (GstTuner *tuner);
+
+const GList * gst_tuner_list_norms (GstTuner *tuner);
+void gst_tuner_set_norm (GstTuner *tuner,
+ GstTunerNorm *norm);
+GstTunerNorm * gst_tuner_get_norm (GstTuner *tuner);
+
+void gst_tuner_set_frequency (GstTuner *tuner,
+ GstTunerChannel *channel,
+ gulong frequency);
+gulong gst_tuner_get_frequency (GstTuner *tuner,
+ GstTunerChannel *channel);
+gint gst_tuner_signal_strength (GstTuner *tuner,
+ GstTunerChannel *channel);
+
+/* helper functions */
+GstTunerNorm * gst_tuner_find_norm_by_name (GstTuner *tuner,
+ gchar *norm);
+GstTunerChannel *gst_tuner_find_channel_by_name (GstTuner *tuner,
+ gchar *channel);
+
+/* trigger signals */
+void gst_tuner_channel_changed (GstTuner *tuner,
+ GstTunerChannel *channel);
+void gst_tuner_norm_changed (GstTuner *tuner,
+ GstTunerNorm *norm);
+void gst_tuner_frequency_changed (GstTuner *tuner,
+ GstTunerChannel *channel,
+ gulong frequency);
+void gst_tuner_signal_changed (GstTuner *tuner,
+ GstTunerChannel *channel,
+ gint signal);
+
+G_END_DECLS
+
+#endif /* __GST_TUNER_H__ */
diff --git a/sys/v4l2/tunerchannel.c b/sys/v4l2/tunerchannel.c
new file mode 100644
index 0000000000000000000000000000000000000000..ac2b74e8199d64b428e6f8d250e7c8776e415c30
--- /dev/null
+++ b/sys/v4l2/tunerchannel.c
@@ -0,0 +1,148 @@
+/* GStreamer Tuner
+ * Copyright (C) 2003 Ronald Bultje <rbultje@ronald.bitfreak.net>
+ *
+ * tunerchannel.c: tuner channel object design
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Library General Public
+ * License as published by the Free Software Foundation; either
+ * version 2 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Library General Public License for more details.
+ *
+ * You should have received a copy of the GNU Library General Public
+ * License along with this library; if not, write to the
+ * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+ * Boston, MA 02111-1307, USA.
+ */
+
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
+#include "tunerchannel.h"
+
+/**
+ * SECTION:gsttunerchannel
+ * @short_description: A channel from an element implementing the #GstTuner
+ * interface.
+ *
+ * <refsect2>
+ * <para>The #GstTunerChannel object is provided by an element implementing
+ * the #GstTuner interface.
+ * </para>
+ * <para>
+ * GstTunerChannel provides a name and flags to determine the type and
+ * capabilities of the channel. If the GST_TUNER_CHANNEL_FREQUENCY flag is
+ * set, then the channel also information about the minimum and maximum
+ * frequency, and range of the reported signal strength.
+ * </para>
+ * </refsect2>
+ */
+
+enum
+{
+ /* FILL ME */
+ SIGNAL_FREQUENCY_CHANGED,
+ SIGNAL_SIGNAL_CHANGED,
+ LAST_SIGNAL
+};
+
+static void gst_tuner_channel_class_init (GstTunerChannelClass * klass);
+static void gst_tuner_channel_init (GstTunerChannel * channel);
+static void gst_tuner_channel_dispose (GObject * object);
+
+static GObjectClass *parent_class = NULL;
+static guint signals[LAST_SIGNAL] = { 0 };
+
+GType
+gst_tuner_channel_get_type (void)
+{
+ static GType gst_tuner_channel_type = 0;
+
+ if (!gst_tuner_channel_type) {
+ static const GTypeInfo tuner_channel_info = {
+ sizeof (GstTunerChannelClass),
+ NULL,
+ NULL,
+ (GClassInitFunc) gst_tuner_channel_class_init,
+ NULL,
+ NULL,
+ sizeof (GstTunerChannel),
+ 0,
+ (GInstanceInitFunc) gst_tuner_channel_init,
+ NULL
+ };
+
+ gst_tuner_channel_type =
+ g_type_register_static (G_TYPE_OBJECT,
+ "GstTunerChannel", &tuner_channel_info, 0);
+ }
+
+ return gst_tuner_channel_type;
+}
+
+static void
+gst_tuner_channel_class_init (GstTunerChannelClass * klass)
+{
+ GObjectClass *object_klass = (GObjectClass *) klass;
+
+ parent_class = g_type_class_peek_parent (klass);
+
+ /**
+ * GstTunerChannel::frequency-changed:
+ * @tunerchannel: The #GstTunerChannel
+ * @frequency: The new frequency (an unsigned long)
+ *
+ * Reports that the current frequency has changed.
+ */
+ signals[SIGNAL_FREQUENCY_CHANGED] =
+ g_signal_new ("frequency-changed", G_TYPE_FROM_CLASS (klass),
+ G_SIGNAL_RUN_LAST,
+ G_STRUCT_OFFSET (GstTunerChannelClass,
+ frequency_changed),
+ NULL, NULL, g_cclosure_marshal_VOID__ULONG, G_TYPE_NONE, 1, G_TYPE_ULONG);
+ /**
+ * GstTunerChannel::signal-changed:
+ * @tunerchannel: The #GstTunerChannel
+ * @signal: The new signal strength (an integer)
+ *
+ * Reports that the signal strength has changed.
+ *
+ * See Also: gst_tuner_signal_strength()
+ */
+ signals[SIGNAL_SIGNAL_CHANGED] =
+ g_signal_new ("signal-changed", G_TYPE_FROM_CLASS (klass),
+ G_SIGNAL_RUN_LAST,
+ G_STRUCT_OFFSET (GstTunerChannelClass,
+ signal_changed),
+ NULL, NULL, g_cclosure_marshal_VOID__INT, G_TYPE_NONE, 1, G_TYPE_INT);
+
+ object_klass->dispose = gst_tuner_channel_dispose;
+}
+
+static void
+gst_tuner_channel_init (GstTunerChannel * channel)
+{
+ channel->label = NULL;
+ channel->flags = 0;
+ channel->min_frequency = channel->max_frequency = 0;
+ channel->min_signal = channel->max_signal = 0;
+}
+
+static void
+gst_tuner_channel_dispose (GObject * object)
+{
+ GstTunerChannel *channel = GST_TUNER_CHANNEL (object);
+
+ if (channel->label) {
+ g_free (channel->label);
+ channel->label = NULL;
+ }
+
+ if (parent_class->dispose)
+ parent_class->dispose (object);
+}
diff --git a/sys/v4l2/tunerchannel.h b/sys/v4l2/tunerchannel.h
new file mode 100644
index 0000000000000000000000000000000000000000..1bbb6cfaae2bcc931d5c0adee85ca4b6b797841b
--- /dev/null
+++ b/sys/v4l2/tunerchannel.h
@@ -0,0 +1,116 @@
+/* GStreamer Tuner
+ * Copyright (C) 2003 Ronald Bultje <rbultje@ronald.bitfreak.net>
+ *
+ * tunerchannel.h: tuner channel object design
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Library General Public
+ * License as published by the Free Software Foundation; either
+ * version 2 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Library General Public License for more details.
+ *
+ * You should have received a copy of the GNU Library General Public
+ * License along with this library; if not, write to the
+ * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+ * Boston, MA 02111-1307, USA.
+ */
+
+#ifndef __GST_TUNER_CHANNEL_H__
+#define __GST_TUNER_CHANNEL_H__
+
+#include <gst/gst.h>
+
+G_BEGIN_DECLS
+
+#define GST_TYPE_TUNER_CHANNEL \
+ (gst_tuner_channel_get_type ())
+#define GST_TUNER_CHANNEL(obj) \
+ (G_TYPE_CHECK_INSTANCE_CAST ((obj), GST_TYPE_TUNER_CHANNEL, \
+ GstTunerChannel))
+#define GST_TUNER_CHANNEL_CLASS(klass) \
+ (G_TYPE_CHECK_CLASS_CAST ((klass), GST_TYPE_TUNER_CHANNEL, \
+ GstTunerChannelClass))
+#define GST_IS_TUNER_CHANNEL(obj) \
+ (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GST_TYPE_TUNER_CHANNEL))
+#define GST_IS_TUNER_CHANNEL_CLASS(klass) \
+ (G_TYPE_CHECK_CLASS_TYPE ((klass), GST_TYPE_TUNER_CHANNEL))
+
+typedef struct _GstTunerChannel GstTunerChannel;
+typedef struct _GstTunerChannelClass GstTunerChannelClass;
+
+/**
+ * GstTunerChannelFlags:
+ * @GST_TUNER_CHANNEL_INPUT: The channel is for input
+ * @GST_TUNER_CHANNEL_OUTPUT: The channel is for output
+ * @GST_TUNER_CHANNEL_FREQUENCY: The channel has a frequency setting
+ * and signal strength.
+ * @GST_TUNER_CHANNEL_AUDIO: The channel carries audio.
+ *
+ * An enumeration for flags indicating the available capabilities
+ * of a #GstTunerChannel.
+ */
+typedef enum {
+ GST_TUNER_CHANNEL_INPUT = (1<<0),
+ GST_TUNER_CHANNEL_OUTPUT = (1<<1),
+ GST_TUNER_CHANNEL_FREQUENCY = (1<<2),
+ GST_TUNER_CHANNEL_AUDIO = (1<<3)
+} GstTunerChannelFlags;
+
+/**
+ * GST_TUNER_CHANNEL_HAS_FLAG:
+ * @channel: A #GstTunerChannel
+ * @flag: The flag to check for
+ *
+ * Macro to check if the given flag is set on a channel
+ */
+#define GST_TUNER_CHANNEL_HAS_FLAG(channel, flag) \
+ ((channel)->flags & flag)
+
+/**
+ * GstTunerChannel:
+ * @label: A string containing a descriptive name for this channel
+ * @flags: A set of #GstTunerChannelFlags for this channel
+ * @freq_multiplicator: The step size (in Hz) for the frequency setting.
+ * @min_frequency: Minimum valid frequency setting (in Hz).
+ * @max_frequency: Maximum valid frequency setting (in Hz).
+ * @min_signal: Minimum reported signal strength value.
+ * @max_signal: Maximum reported signal strength value.
+ */
+struct _GstTunerChannel {
+ GObject parent;
+
+ /*< public >*/
+ gchar *label;
+ GstTunerChannelFlags flags;
+ gfloat freq_multiplicator;
+ gulong min_frequency;
+ gulong max_frequency;
+ gint min_signal;
+ gint max_signal;
+
+ /*< private >*/
+ gpointer _gst_reserved[GST_PADDING];
+};
+
+struct _GstTunerChannelClass {
+ GObjectClass parent;
+
+ /*< private >*/
+ /* signals */
+ void (*frequency_changed) (GstTunerChannel *channel,
+ gulong frequency);
+ void (*signal_changed) (GstTunerChannel *channel,
+ gint signal);
+
+ gpointer _gst_reserved[GST_PADDING];
+};
+
+GType gst_tuner_channel_get_type (void);
+
+G_END_DECLS
+
+#endif /* __GST_TUNER_CHANNEL_H__ */
diff --git a/sys/v4l2/tunernorm.c b/sys/v4l2/tunernorm.c
new file mode 100644
index 0000000000000000000000000000000000000000..47260b0ed1d652c22f9b29d1e8f70a7efd0c69dd
--- /dev/null
+++ b/sys/v4l2/tunernorm.c
@@ -0,0 +1,111 @@
+/* GStreamer Tuner
+ * Copyright (C) 2003 Ronald Bultje <rbultje@ronald.bitfreak.net>
+ *
+ * tunernorm.c: tuner norm object design
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Library General Public
+ * License as published by the Free Software Foundation; either
+ * version 2 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Library General Public License for more details.
+ *
+ * You should have received a copy of the GNU Library General Public
+ * License along with this library; if not, write to the
+ * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+ * Boston, MA 02111-1307, USA.
+ */
+
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
+#include "tunernorm.h"
+
+/**
+ * SECTION:gsttunernorm
+ * @short_description: Encapsulates information about the data format(s)
+ * for a #GstTunerChannel.
+ *
+ * <refsect2>
+ * <para>The #GstTunerNorm object is created by an element implementing the
+ * #GstTuner interface and encapsulates the selection of a capture/output format
+ * for a selected #GstTunerChannel.
+ * </para>
+ * </refsect2>
+ */
+
+enum
+{
+ /* FILL ME */
+ LAST_SIGNAL
+};
+
+static void gst_tuner_norm_class_init (GstTunerNormClass * klass);
+static void gst_tuner_norm_init (GstTunerNorm * norm);
+static void gst_tuner_norm_dispose (GObject * object);
+
+static GObjectClass *parent_class = NULL;
+
+/*static guint signals[LAST_SIGNAL] = { 0 };*/
+
+GType
+gst_tuner_norm_get_type (void)
+{
+ static GType gst_tuner_norm_type = 0;
+
+ if (!gst_tuner_norm_type) {
+ static const GTypeInfo tuner_norm_info = {
+ sizeof (GstTunerNormClass),
+ NULL,
+ NULL,
+ (GClassInitFunc) gst_tuner_norm_class_init,
+ NULL,
+ NULL,
+ sizeof (GstTunerNorm),
+ 0,
+ (GInstanceInitFunc) gst_tuner_norm_init,
+ NULL
+ };
+
+ gst_tuner_norm_type =
+ g_type_register_static (G_TYPE_OBJECT,
+ "GstTunerNorm", &tuner_norm_info, 0);
+ }
+
+ return gst_tuner_norm_type;
+}
+
+static void
+gst_tuner_norm_class_init (GstTunerNormClass * klass)
+{
+ GObjectClass *object_klass = (GObjectClass *) klass;
+
+ parent_class = g_type_class_peek_parent (klass);
+
+ object_klass->dispose = gst_tuner_norm_dispose;
+}
+
+static void
+gst_tuner_norm_init (GstTunerNorm * norm)
+{
+ norm->label = NULL;
+ g_value_init (&norm->framerate, GST_TYPE_FRACTION);
+}
+
+static void
+gst_tuner_norm_dispose (GObject * object)
+{
+ GstTunerNorm *norm = GST_TUNER_NORM (object);
+
+ if (norm->label) {
+ g_free (norm->label);
+ norm->label = NULL;
+ }
+
+ if (parent_class->dispose)
+ parent_class->dispose (object);
+}
diff --git a/sys/v4l2/tunernorm.h b/sys/v4l2/tunernorm.h
new file mode 100644
index 0000000000000000000000000000000000000000..988f4cb5d725212ab89f4354cc063369b9b443fa
--- /dev/null
+++ b/sys/v4l2/tunernorm.h
@@ -0,0 +1,70 @@
+/* GStreamer Tuner
+ * Copyright (C) 2003 Ronald Bultje <rbultje@ronald.bitfreak.net>
+ *
+ * tunernorm.h: tuner norm object design
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Library General Public
+ * License as published by the Free Software Foundation; either
+ * version 2 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Library General Public License for more details.
+ *
+ * You should have received a copy of the GNU Library General Public
+ * License along with this library; if not, write to the
+ * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+ * Boston, MA 02111-1307, USA.
+ */
+
+#ifndef __GST_TUNER_NORM_H__
+#define __GST_TUNER_NORM_H__
+
+#include <gst/gst.h>
+
+G_BEGIN_DECLS
+
+#define GST_TYPE_TUNER_NORM \
+ (gst_tuner_norm_get_type ())
+#define GST_TUNER_NORM(obj) \
+ (G_TYPE_CHECK_INSTANCE_CAST ((obj), GST_TYPE_TUNER_NORM, GstTunerNorm))
+#define GST_TUNER_NORM_CLASS(klass) \
+ (G_TYPE_CHECK_CLASS_CAST ((klass), GST_TYPE_TUNER_NORM, GstTunerNormClass))
+#define GST_IS_TUNER_NORM(obj) \
+ (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GST_TYPE_TUNER_NORM))
+#define GST_IS_TUNER_NORM_CLASS(klass) \
+ (G_TYPE_CHECK_CLASS_TYPE ((klass), GST_TYPE_TUNER_NORM))
+
+typedef struct _GstTunerNorm GstTunerNorm;
+typedef struct _GstTunerNormClass GstTunerNormClass;
+
+/**
+ * GstTunerNorm:
+ * @label: A string containing a descriptive name for the norm
+ * @framerate: A GValue containing the framerate associated with this norm,
+ * if any. (May be unset).
+ */
+struct _GstTunerNorm {
+ GObject parent;
+
+ /*< public >*/
+ gchar *label;
+ GValue framerate;
+
+ /*< private >*/
+ gpointer _gst_reserved[GST_PADDING];
+};
+
+struct _GstTunerNormClass {
+ GObjectClass parent;
+
+ gpointer _gst_reserved[GST_PADDING];
+};
+
+GType gst_tuner_norm_get_type (void);
+
+G_END_DECLS
+
+#endif /* __GST_TUNER_NORM_H__ */
diff --git a/sys/v4l2/v4l2_calls.c b/sys/v4l2/v4l2_calls.c
index 62c03ee0516c9594549b0ea810a64cc17082ca54..ace78dfb06a3df72bd499ee4ca4c67047287c1a8 100644
--- a/sys/v4l2/v4l2_calls.c
+++ b/sys/v4l2/v4l2_calls.c
@@ -145,7 +145,7 @@ gst_v4l2_fill_lists (GstV4l2Object * v4l2object)
GST_LOG_OBJECT (e, " name: '%s'", input.name);
GST_LOG_OBJECT (e, " type: %08x", input.type);
GST_LOG_OBJECT (e, " audioset: %08x", input.audioset);
- GST_LOG_OBJECT (e, " std: %016x", (guint) input.std);
+ GST_LOG_OBJECT (e, " std: %016" G_GINT64_MODIFIER "x", input.std);
GST_LOG_OBJECT (e, " status: %08x", input.status);
v4l2channel = g_object_new (GST_TYPE_V4L2_TUNER_CHANNEL, NULL);
diff --git a/sys/waveform/Makefile.am b/sys/waveform/Makefile.am
index 9196dfae3eb5d86587b945f36ef069925215c49c..338c805c71ad2d9cc5b7c85799ec7022d31ed199 100644
--- a/sys/waveform/Makefile.am
+++ b/sys/waveform/Makefile.am
@@ -5,7 +5,7 @@ libgstwaveformsink_la_CFLAGS = $(GST_CFLAGS) $(GST_BASE_CFLAGS) \
$(GST_PLUGINS_BASE_CFLAGS)
libgstwaveformsink_la_LIBADD = \
$(GST_PLUGINS_BASE_LIBS) \
- -lgstaudio-$(GST_API_VERSION) -lgstinterfaces-$(GST_API_VERSION) \
+ -lgstaudio-$(GST_API_VERSION) \
$(GST_BASE_LIBS) \
$(GST_LIBS) \
-lwinmm
diff --git a/sys/waveform/Makefile.in b/sys/waveform/Makefile.in
index 8e786f1b0bd72da7ff29cc501b7b8767fe2e5734..c33716279242cbbec3e8fdf9270488302f470241 100644
--- a/sys/waveform/Makefile.in
+++ b/sys/waveform/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.11.4 from Makefile.am.
+# Makefile.in generated by automake 1.11.5 from Makefile.am.
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -60,6 +60,7 @@ am__aclocal_m4_deps = $(top_srcdir)/common/m4/as-ac-expand.m4 \
$(top_srcdir)/common/m4/as-auto-alt.m4 \
$(top_srcdir)/common/m4/as-compiler-flag.m4 \
$(top_srcdir)/common/m4/as-gcc-inline-assembly.m4 \
+ $(top_srcdir)/common/m4/as-libtool.m4 \
$(top_srcdir)/common/m4/as-objc.m4 \
$(top_srcdir)/common/m4/as-python.m4 \
$(top_srcdir)/common/m4/as-scrub-include.m4 \
@@ -257,6 +258,7 @@ GMSGFMT_015 = @GMSGFMT_015@
GREP = @GREP@
GSTPB_PLUGINS_DIR = @GSTPB_PLUGINS_DIR@
GSTPB_PREFIX = @GSTPB_PREFIX@
+GST_AGE = @GST_AGE@
GST_ALL_LDFLAGS = @GST_ALL_LDFLAGS@
GST_API_VERSION = @GST_API_VERSION@
GST_BASE_CFLAGS = @GST_BASE_CFLAGS@
@@ -266,9 +268,11 @@ GST_CHECK_CFLAGS = @GST_CHECK_CFLAGS@
GST_CHECK_LIBS = @GST_CHECK_LIBS@
GST_CONTROLLER_CFLAGS = @GST_CONTROLLER_CFLAGS@
GST_CONTROLLER_LIBS = @GST_CONTROLLER_LIBS@
+GST_CURRENT = @GST_CURRENT@
GST_CXXFLAGS = @GST_CXXFLAGS@
GST_LEVEL_DEFAULT = @GST_LEVEL_DEFAULT@
GST_LIBS = @GST_LIBS@
+GST_LIBVERSION = @GST_LIBVERSION@
GST_LICENSE = @GST_LICENSE@
GST_LT_LDFLAGS = @GST_LT_LDFLAGS@
GST_NET_CFLAGS = @GST_NET_CFLAGS@
@@ -286,6 +290,7 @@ GST_PLUGINS_NONPORTED = @GST_PLUGINS_NONPORTED@
GST_PLUGINS_SELECTED = @GST_PLUGINS_SELECTED@
GST_PLUGIN_LDFLAGS = @GST_PLUGIN_LDFLAGS@
GST_PREFIX = @GST_PREFIX@
+GST_REVISION = @GST_REVISION@
GST_TOOLS_DIR = @GST_TOOLS_DIR@
GTKDOC_CHECK = @GTKDOC_CHECK@
GTK_CFLAGS = @GTK_CFLAGS@
@@ -492,7 +497,7 @@ libgstwaveformsink_la_CFLAGS = $(GST_CFLAGS) $(GST_BASE_CFLAGS) \
libgstwaveformsink_la_LIBADD = \
$(GST_PLUGINS_BASE_LIBS) \
- -lgstaudio-$(GST_API_VERSION) -lgstinterfaces-$(GST_API_VERSION) \
+ -lgstaudio-$(GST_API_VERSION) \
$(GST_BASE_LIBS) \
$(GST_LIBS) \
-lwinmm
@@ -544,7 +549,7 @@ install-pluginLTLIBRARIES: $(plugin_LTLIBRARIES)
done; \
test -z "$$list2" || { \
echo " $(MKDIR_P) '$(DESTDIR)$(plugindir)'"; \
- $(MKDIR_P) '$(DESTDIR)$(plugindir)' || exit 1; \
+ $(MKDIR_P) "$(DESTDIR)$(plugindir)" || exit 1; \
echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 '$(DESTDIR)$(plugindir)'"; \
$(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 "$(DESTDIR)$(plugindir)"; \
}
diff --git a/sys/ximage/Makefile.in b/sys/ximage/Makefile.in
index cda8e9cfcc0bfd163ccb0f7c20a2ffeaf2aece86..6c891f7e5a32b2458015e19b36c6ce3898f9564c 100644
--- a/sys/ximage/Makefile.in
+++ b/sys/ximage/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.11.4 from Makefile.am.
+# Makefile.in generated by automake 1.11.5 from Makefile.am.
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -60,6 +60,7 @@ am__aclocal_m4_deps = $(top_srcdir)/common/m4/as-ac-expand.m4 \
$(top_srcdir)/common/m4/as-auto-alt.m4 \
$(top_srcdir)/common/m4/as-compiler-flag.m4 \
$(top_srcdir)/common/m4/as-gcc-inline-assembly.m4 \
+ $(top_srcdir)/common/m4/as-libtool.m4 \
$(top_srcdir)/common/m4/as-objc.m4 \
$(top_srcdir)/common/m4/as-python.m4 \
$(top_srcdir)/common/m4/as-scrub-include.m4 \
@@ -258,6 +259,7 @@ GMSGFMT_015 = @GMSGFMT_015@
GREP = @GREP@
GSTPB_PLUGINS_DIR = @GSTPB_PLUGINS_DIR@
GSTPB_PREFIX = @GSTPB_PREFIX@
+GST_AGE = @GST_AGE@
GST_ALL_LDFLAGS = @GST_ALL_LDFLAGS@
GST_API_VERSION = @GST_API_VERSION@
GST_BASE_CFLAGS = @GST_BASE_CFLAGS@
@@ -267,9 +269,11 @@ GST_CHECK_CFLAGS = @GST_CHECK_CFLAGS@
GST_CHECK_LIBS = @GST_CHECK_LIBS@
GST_CONTROLLER_CFLAGS = @GST_CONTROLLER_CFLAGS@
GST_CONTROLLER_LIBS = @GST_CONTROLLER_LIBS@
+GST_CURRENT = @GST_CURRENT@
GST_CXXFLAGS = @GST_CXXFLAGS@
GST_LEVEL_DEFAULT = @GST_LEVEL_DEFAULT@
GST_LIBS = @GST_LIBS@
+GST_LIBVERSION = @GST_LIBVERSION@
GST_LICENSE = @GST_LICENSE@
GST_LT_LDFLAGS = @GST_LT_LDFLAGS@
GST_NET_CFLAGS = @GST_NET_CFLAGS@
@@ -287,6 +291,7 @@ GST_PLUGINS_NONPORTED = @GST_PLUGINS_NONPORTED@
GST_PLUGINS_SELECTED = @GST_PLUGINS_SELECTED@
GST_PLUGIN_LDFLAGS = @GST_PLUGIN_LDFLAGS@
GST_PREFIX = @GST_PREFIX@
+GST_REVISION = @GST_REVISION@
GST_TOOLS_DIR = @GST_TOOLS_DIR@
GTKDOC_CHECK = @GTKDOC_CHECK@
GTK_CFLAGS = @GTK_CFLAGS@
@@ -546,7 +551,7 @@ install-pluginLTLIBRARIES: $(plugin_LTLIBRARIES)
done; \
test -z "$$list2" || { \
echo " $(MKDIR_P) '$(DESTDIR)$(plugindir)'"; \
- $(MKDIR_P) '$(DESTDIR)$(plugindir)' || exit 1; \
+ $(MKDIR_P) "$(DESTDIR)$(plugindir)" || exit 1; \
echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 '$(DESTDIR)$(plugindir)'"; \
$(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 "$(DESTDIR)$(plugindir)"; \
}
diff --git a/tests/Makefile.in b/tests/Makefile.in
index ae7b70126f16761b68cd1d413dc7807b8720995c..550205616b317f97c9c47c9ead3481048491c553 100644
--- a/tests/Makefile.in
+++ b/tests/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.11.4 from Makefile.am.
+# Makefile.in generated by automake 1.11.5 from Makefile.am.
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -57,6 +57,7 @@ am__aclocal_m4_deps = $(top_srcdir)/common/m4/as-ac-expand.m4 \
$(top_srcdir)/common/m4/as-auto-alt.m4 \
$(top_srcdir)/common/m4/as-compiler-flag.m4 \
$(top_srcdir)/common/m4/as-gcc-inline-assembly.m4 \
+ $(top_srcdir)/common/m4/as-libtool.m4 \
$(top_srcdir)/common/m4/as-objc.m4 \
$(top_srcdir)/common/m4/as-python.m4 \
$(top_srcdir)/common/m4/as-scrub-include.m4 \
@@ -227,6 +228,7 @@ GMSGFMT_015 = @GMSGFMT_015@
GREP = @GREP@
GSTPB_PLUGINS_DIR = @GSTPB_PLUGINS_DIR@
GSTPB_PREFIX = @GSTPB_PREFIX@
+GST_AGE = @GST_AGE@
GST_ALL_LDFLAGS = @GST_ALL_LDFLAGS@
GST_API_VERSION = @GST_API_VERSION@
GST_BASE_CFLAGS = @GST_BASE_CFLAGS@
@@ -236,9 +238,11 @@ GST_CHECK_CFLAGS = @GST_CHECK_CFLAGS@
GST_CHECK_LIBS = @GST_CHECK_LIBS@
GST_CONTROLLER_CFLAGS = @GST_CONTROLLER_CFLAGS@
GST_CONTROLLER_LIBS = @GST_CONTROLLER_LIBS@
+GST_CURRENT = @GST_CURRENT@
GST_CXXFLAGS = @GST_CXXFLAGS@
GST_LEVEL_DEFAULT = @GST_LEVEL_DEFAULT@
GST_LIBS = @GST_LIBS@
+GST_LIBVERSION = @GST_LIBVERSION@
GST_LICENSE = @GST_LICENSE@
GST_LT_LDFLAGS = @GST_LT_LDFLAGS@
GST_NET_CFLAGS = @GST_NET_CFLAGS@
@@ -256,6 +260,7 @@ GST_PLUGINS_NONPORTED = @GST_PLUGINS_NONPORTED@
GST_PLUGINS_SELECTED = @GST_PLUGINS_SELECTED@
GST_PLUGIN_LDFLAGS = @GST_PLUGIN_LDFLAGS@
GST_PREFIX = @GST_PREFIX@
+GST_REVISION = @GST_REVISION@
GST_TOOLS_DIR = @GST_TOOLS_DIR@
GTKDOC_CHECK = @GTKDOC_CHECK@
GTK_CFLAGS = @GTK_CFLAGS@
diff --git a/tests/check/Makefile.am b/tests/check/Makefile.am
index a22d8abd1c95df9898fe136a9418f8d29810d82e..7773f1a1b014b072cd3f01e79fd1c9209a531905 100644
--- a/tests/check/Makefile.am
+++ b/tests/check/Makefile.am
@@ -294,7 +294,7 @@ elements_sunaudio_CFLAGS = \
$(GST_PLUGINS_BASE_CFLAGS) $(CFLAGS) \
$(AM_CFLAGS)
elements_sunaudio_LDADD = \
- $(GST_PLUGINS_BASE_LIBS) -lgstinterfaces-@GST_API_VERSION@ \
+ $(GST_PLUGINS_BASE_LIBS) \
$(LDADD)
elements_udpsrc_CFLAGS = $(AM_CFLAGS) $(GIO_CFLAGS)
diff --git a/tests/check/Makefile.in b/tests/check/Makefile.in
index aa730833ea4125edc83476c2abd0182f373364b5..681cffd509a9baacf906757bef9cfb5930ba5045 100644
--- a/tests/check/Makefile.in
+++ b/tests/check/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.11.4 from Makefile.am.
+# Makefile.in generated by automake 1.11.5 from Makefile.am.
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -94,6 +94,7 @@ am__aclocal_m4_deps = $(top_srcdir)/common/m4/as-ac-expand.m4 \
$(top_srcdir)/common/m4/as-auto-alt.m4 \
$(top_srcdir)/common/m4/as-compiler-flag.m4 \
$(top_srcdir)/common/m4/as-gcc-inline-assembly.m4 \
+ $(top_srcdir)/common/m4/as-libtool.m4 \
$(top_srcdir)/common/m4/as-objc.m4 \
$(top_srcdir)/common/m4/as-python.m4 \
$(top_srcdir)/common/m4/as-scrub-include.m4 \
@@ -794,6 +795,7 @@ GMSGFMT_015 = @GMSGFMT_015@
GREP = @GREP@
GSTPB_PLUGINS_DIR = @GSTPB_PLUGINS_DIR@
GSTPB_PREFIX = @GSTPB_PREFIX@
+GST_AGE = @GST_AGE@
GST_ALL_LDFLAGS = @GST_ALL_LDFLAGS@
GST_API_VERSION = @GST_API_VERSION@
GST_BASE_CFLAGS = @GST_BASE_CFLAGS@
@@ -803,9 +805,11 @@ GST_CHECK_CFLAGS = @GST_CHECK_CFLAGS@
GST_CHECK_LIBS = @GST_CHECK_LIBS@
GST_CONTROLLER_CFLAGS = @GST_CONTROLLER_CFLAGS@
GST_CONTROLLER_LIBS = @GST_CONTROLLER_LIBS@
+GST_CURRENT = @GST_CURRENT@
GST_CXXFLAGS = @GST_CXXFLAGS@
GST_LEVEL_DEFAULT = @GST_LEVEL_DEFAULT@
GST_LIBS = @GST_LIBS@
+GST_LIBVERSION = @GST_LIBVERSION@
GST_LICENSE = @GST_LICENSE@
GST_LT_LDFLAGS = @GST_LT_LDFLAGS@
GST_NET_CFLAGS = @GST_NET_CFLAGS@
@@ -823,6 +827,7 @@ GST_PLUGINS_NONPORTED = @GST_PLUGINS_NONPORTED@
GST_PLUGINS_SELECTED = @GST_PLUGINS_SELECTED@
GST_PLUGIN_LDFLAGS = @GST_PLUGIN_LDFLAGS@
GST_PREFIX = @GST_PREFIX@
+GST_REVISION = @GST_REVISION@
GST_TOOLS_DIR = @GST_TOOLS_DIR@
GTKDOC_CHECK = @GTKDOC_CHECK@
GTK_CFLAGS = @GTK_CFLAGS@
@@ -1189,7 +1194,7 @@ elements_sunaudio_CFLAGS = \
$(AM_CFLAGS)
elements_sunaudio_LDADD = \
- $(GST_PLUGINS_BASE_LIBS) -lgstinterfaces-@GST_API_VERSION@ \
+ $(GST_PLUGINS_BASE_LIBS) \
$(LDADD)
elements_udpsrc_CFLAGS = $(AM_CFLAGS) $(GIO_CFLAGS)
diff --git a/tests/check/elements/matroskamux.c b/tests/check/elements/matroskamux.c
index 887f91f5816d040a5a2c8a377b2dd37e12a6af3e..8f27857ee2d2fdb68f695e028072a4ef89ef7c9a 100644
--- a/tests/check/elements/matroskamux.c
+++ b/tests/check/elements/matroskamux.c
@@ -41,7 +41,7 @@ GstPad *mysrcpad, *mysinkpad;
static GstStaticPadTemplate sinktemplate = GST_STATIC_PAD_TEMPLATE ("sink",
GST_PAD_SINK,
GST_PAD_ALWAYS,
- GST_STATIC_CAPS ("video/x-matroska"));
+ GST_STATIC_CAPS ("video/x-matroska; audio/x-matroska"));
static GstStaticPadTemplate srcvorbistemplate = GST_STATIC_PAD_TEMPLATE ("src",
GST_PAD_SRC,
GST_PAD_ALWAYS,
diff --git a/tests/examples/Makefile.in b/tests/examples/Makefile.in
index 913b3575a262d4fbc19e3609479da7327d48b8f7..c3d16997ac0b21c5a5a59c4db6787b1517644605 100644
--- a/tests/examples/Makefile.in
+++ b/tests/examples/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.11.4 from Makefile.am.
+# Makefile.in generated by automake 1.11.5 from Makefile.am.
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -63,6 +63,7 @@ am__aclocal_m4_deps = $(top_srcdir)/common/m4/as-ac-expand.m4 \
$(top_srcdir)/common/m4/as-auto-alt.m4 \
$(top_srcdir)/common/m4/as-compiler-flag.m4 \
$(top_srcdir)/common/m4/as-gcc-inline-assembly.m4 \
+ $(top_srcdir)/common/m4/as-libtool.m4 \
$(top_srcdir)/common/m4/as-objc.m4 \
$(top_srcdir)/common/m4/as-python.m4 \
$(top_srcdir)/common/m4/as-scrub-include.m4 \
@@ -233,6 +234,7 @@ GMSGFMT_015 = @GMSGFMT_015@
GREP = @GREP@
GSTPB_PLUGINS_DIR = @GSTPB_PLUGINS_DIR@
GSTPB_PREFIX = @GSTPB_PREFIX@
+GST_AGE = @GST_AGE@
GST_ALL_LDFLAGS = @GST_ALL_LDFLAGS@
GST_API_VERSION = @GST_API_VERSION@
GST_BASE_CFLAGS = @GST_BASE_CFLAGS@
@@ -242,9 +244,11 @@ GST_CHECK_CFLAGS = @GST_CHECK_CFLAGS@
GST_CHECK_LIBS = @GST_CHECK_LIBS@
GST_CONTROLLER_CFLAGS = @GST_CONTROLLER_CFLAGS@
GST_CONTROLLER_LIBS = @GST_CONTROLLER_LIBS@
+GST_CURRENT = @GST_CURRENT@
GST_CXXFLAGS = @GST_CXXFLAGS@
GST_LEVEL_DEFAULT = @GST_LEVEL_DEFAULT@
GST_LIBS = @GST_LIBS@
+GST_LIBVERSION = @GST_LIBVERSION@
GST_LICENSE = @GST_LICENSE@
GST_LT_LDFLAGS = @GST_LT_LDFLAGS@
GST_NET_CFLAGS = @GST_NET_CFLAGS@
@@ -262,6 +266,7 @@ GST_PLUGINS_NONPORTED = @GST_PLUGINS_NONPORTED@
GST_PLUGINS_SELECTED = @GST_PLUGINS_SELECTED@
GST_PLUGIN_LDFLAGS = @GST_PLUGIN_LDFLAGS@
GST_PREFIX = @GST_PREFIX@
+GST_REVISION = @GST_REVISION@
GST_TOOLS_DIR = @GST_TOOLS_DIR@
GTKDOC_CHECK = @GTKDOC_CHECK@
GTK_CFLAGS = @GTK_CFLAGS@
diff --git a/tests/examples/audiofx/Makefile.in b/tests/examples/audiofx/Makefile.in
index 940f6654a4a688fdd0fd2130c0dfe08000b7b925..679903185cf5eb1b43e9b815a99606887a72ebeb 100644
--- a/tests/examples/audiofx/Makefile.in
+++ b/tests/examples/audiofx/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.11.4 from Makefile.am.
+# Makefile.in generated by automake 1.11.5 from Makefile.am.
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -60,6 +60,7 @@ am__aclocal_m4_deps = $(top_srcdir)/common/m4/as-ac-expand.m4 \
$(top_srcdir)/common/m4/as-auto-alt.m4 \
$(top_srcdir)/common/m4/as-compiler-flag.m4 \
$(top_srcdir)/common/m4/as-gcc-inline-assembly.m4 \
+ $(top_srcdir)/common/m4/as-libtool.m4 \
$(top_srcdir)/common/m4/as-objc.m4 \
$(top_srcdir)/common/m4/as-python.m4 \
$(top_srcdir)/common/m4/as-scrub-include.m4 \
@@ -238,6 +239,7 @@ GMSGFMT_015 = @GMSGFMT_015@
GREP = @GREP@
GSTPB_PLUGINS_DIR = @GSTPB_PLUGINS_DIR@
GSTPB_PREFIX = @GSTPB_PREFIX@
+GST_AGE = @GST_AGE@
GST_ALL_LDFLAGS = @GST_ALL_LDFLAGS@
GST_API_VERSION = @GST_API_VERSION@
GST_BASE_CFLAGS = @GST_BASE_CFLAGS@
@@ -247,9 +249,11 @@ GST_CHECK_CFLAGS = @GST_CHECK_CFLAGS@
GST_CHECK_LIBS = @GST_CHECK_LIBS@
GST_CONTROLLER_CFLAGS = @GST_CONTROLLER_CFLAGS@
GST_CONTROLLER_LIBS = @GST_CONTROLLER_LIBS@
+GST_CURRENT = @GST_CURRENT@
GST_CXXFLAGS = @GST_CXXFLAGS@
GST_LEVEL_DEFAULT = @GST_LEVEL_DEFAULT@
GST_LIBS = @GST_LIBS@
+GST_LIBVERSION = @GST_LIBVERSION@
GST_LICENSE = @GST_LICENSE@
GST_LT_LDFLAGS = @GST_LT_LDFLAGS@
GST_NET_CFLAGS = @GST_NET_CFLAGS@
@@ -267,6 +271,7 @@ GST_PLUGINS_NONPORTED = @GST_PLUGINS_NONPORTED@
GST_PLUGINS_SELECTED = @GST_PLUGINS_SELECTED@
GST_PLUGIN_LDFLAGS = @GST_PLUGIN_LDFLAGS@
GST_PREFIX = @GST_PREFIX@
+GST_REVISION = @GST_REVISION@
GST_TOOLS_DIR = @GST_TOOLS_DIR@
GTKDOC_CHECK = @GTKDOC_CHECK@
GTK_CFLAGS = @GTK_CFLAGS@
diff --git a/tests/examples/cairo/Makefile.in b/tests/examples/cairo/Makefile.in
index 43ee660ed30ed4c302fa82ae238165015d13f284..a6905dad676b7dd2dc3116c4fdced45b1a6a5d21 100644
--- a/tests/examples/cairo/Makefile.in
+++ b/tests/examples/cairo/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.11.4 from Makefile.am.
+# Makefile.in generated by automake 1.11.5 from Makefile.am.
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -59,6 +59,7 @@ am__aclocal_m4_deps = $(top_srcdir)/common/m4/as-ac-expand.m4 \
$(top_srcdir)/common/m4/as-auto-alt.m4 \
$(top_srcdir)/common/m4/as-compiler-flag.m4 \
$(top_srcdir)/common/m4/as-gcc-inline-assembly.m4 \
+ $(top_srcdir)/common/m4/as-libtool.m4 \
$(top_srcdir)/common/m4/as-objc.m4 \
$(top_srcdir)/common/m4/as-python.m4 \
$(top_srcdir)/common/m4/as-scrub-include.m4 \
@@ -224,6 +225,7 @@ GMSGFMT_015 = @GMSGFMT_015@
GREP = @GREP@
GSTPB_PLUGINS_DIR = @GSTPB_PLUGINS_DIR@
GSTPB_PREFIX = @GSTPB_PREFIX@
+GST_AGE = @GST_AGE@
GST_ALL_LDFLAGS = @GST_ALL_LDFLAGS@
GST_API_VERSION = @GST_API_VERSION@
GST_BASE_CFLAGS = @GST_BASE_CFLAGS@
@@ -233,9 +235,11 @@ GST_CHECK_CFLAGS = @GST_CHECK_CFLAGS@
GST_CHECK_LIBS = @GST_CHECK_LIBS@
GST_CONTROLLER_CFLAGS = @GST_CONTROLLER_CFLAGS@
GST_CONTROLLER_LIBS = @GST_CONTROLLER_LIBS@
+GST_CURRENT = @GST_CURRENT@
GST_CXXFLAGS = @GST_CXXFLAGS@
GST_LEVEL_DEFAULT = @GST_LEVEL_DEFAULT@
GST_LIBS = @GST_LIBS@
+GST_LIBVERSION = @GST_LIBVERSION@
GST_LICENSE = @GST_LICENSE@
GST_LT_LDFLAGS = @GST_LT_LDFLAGS@
GST_NET_CFLAGS = @GST_NET_CFLAGS@
@@ -253,6 +257,7 @@ GST_PLUGINS_NONPORTED = @GST_PLUGINS_NONPORTED@
GST_PLUGINS_SELECTED = @GST_PLUGINS_SELECTED@
GST_PLUGIN_LDFLAGS = @GST_PLUGIN_LDFLAGS@
GST_PREFIX = @GST_PREFIX@
+GST_REVISION = @GST_REVISION@
GST_TOOLS_DIR = @GST_TOOLS_DIR@
GTKDOC_CHECK = @GTKDOC_CHECK@
GTK_CFLAGS = @GTK_CFLAGS@
diff --git a/tests/examples/equalizer/Makefile.in b/tests/examples/equalizer/Makefile.in
index 4db02ac31a81ec4ed08e1cf7892d48879f88e561..98c51223ebcfe53236d26d61acce65f61a7fcfae 100644
--- a/tests/examples/equalizer/Makefile.in
+++ b/tests/examples/equalizer/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.11.4 from Makefile.am.
+# Makefile.in generated by automake 1.11.5 from Makefile.am.
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -59,6 +59,7 @@ am__aclocal_m4_deps = $(top_srcdir)/common/m4/as-ac-expand.m4 \
$(top_srcdir)/common/m4/as-auto-alt.m4 \
$(top_srcdir)/common/m4/as-compiler-flag.m4 \
$(top_srcdir)/common/m4/as-gcc-inline-assembly.m4 \
+ $(top_srcdir)/common/m4/as-libtool.m4 \
$(top_srcdir)/common/m4/as-objc.m4 \
$(top_srcdir)/common/m4/as-python.m4 \
$(top_srcdir)/common/m4/as-scrub-include.m4 \
@@ -224,6 +225,7 @@ GMSGFMT_015 = @GMSGFMT_015@
GREP = @GREP@
GSTPB_PLUGINS_DIR = @GSTPB_PLUGINS_DIR@
GSTPB_PREFIX = @GSTPB_PREFIX@
+GST_AGE = @GST_AGE@
GST_ALL_LDFLAGS = @GST_ALL_LDFLAGS@
GST_API_VERSION = @GST_API_VERSION@
GST_BASE_CFLAGS = @GST_BASE_CFLAGS@
@@ -233,9 +235,11 @@ GST_CHECK_CFLAGS = @GST_CHECK_CFLAGS@
GST_CHECK_LIBS = @GST_CHECK_LIBS@
GST_CONTROLLER_CFLAGS = @GST_CONTROLLER_CFLAGS@
GST_CONTROLLER_LIBS = @GST_CONTROLLER_LIBS@
+GST_CURRENT = @GST_CURRENT@
GST_CXXFLAGS = @GST_CXXFLAGS@
GST_LEVEL_DEFAULT = @GST_LEVEL_DEFAULT@
GST_LIBS = @GST_LIBS@
+GST_LIBVERSION = @GST_LIBVERSION@
GST_LICENSE = @GST_LICENSE@
GST_LT_LDFLAGS = @GST_LT_LDFLAGS@
GST_NET_CFLAGS = @GST_NET_CFLAGS@
@@ -253,6 +257,7 @@ GST_PLUGINS_NONPORTED = @GST_PLUGINS_NONPORTED@
GST_PLUGINS_SELECTED = @GST_PLUGINS_SELECTED@
GST_PLUGIN_LDFLAGS = @GST_PLUGIN_LDFLAGS@
GST_PREFIX = @GST_PREFIX@
+GST_REVISION = @GST_REVISION@
GST_TOOLS_DIR = @GST_TOOLS_DIR@
GTKDOC_CHECK = @GTKDOC_CHECK@
GTK_CFLAGS = @GTK_CFLAGS@
diff --git a/tests/examples/jack/Makefile.in b/tests/examples/jack/Makefile.in
index b88bc449a97285de02d58c32b3a0de0a031b1ca0..ad8179c6792b9b681b127357a87cecd5616185c9 100644
--- a/tests/examples/jack/Makefile.in
+++ b/tests/examples/jack/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.11.4 from Makefile.am.
+# Makefile.in generated by automake 1.11.5 from Makefile.am.
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -59,6 +59,7 @@ am__aclocal_m4_deps = $(top_srcdir)/common/m4/as-ac-expand.m4 \
$(top_srcdir)/common/m4/as-auto-alt.m4 \
$(top_srcdir)/common/m4/as-compiler-flag.m4 \
$(top_srcdir)/common/m4/as-gcc-inline-assembly.m4 \
+ $(top_srcdir)/common/m4/as-libtool.m4 \
$(top_srcdir)/common/m4/as-objc.m4 \
$(top_srcdir)/common/m4/as-python.m4 \
$(top_srcdir)/common/m4/as-scrub-include.m4 \
@@ -223,6 +224,7 @@ GMSGFMT_015 = @GMSGFMT_015@
GREP = @GREP@
GSTPB_PLUGINS_DIR = @GSTPB_PLUGINS_DIR@
GSTPB_PREFIX = @GSTPB_PREFIX@
+GST_AGE = @GST_AGE@
GST_ALL_LDFLAGS = @GST_ALL_LDFLAGS@
GST_API_VERSION = @GST_API_VERSION@
GST_BASE_CFLAGS = @GST_BASE_CFLAGS@
@@ -232,9 +234,11 @@ GST_CHECK_CFLAGS = @GST_CHECK_CFLAGS@
GST_CHECK_LIBS = @GST_CHECK_LIBS@
GST_CONTROLLER_CFLAGS = @GST_CONTROLLER_CFLAGS@
GST_CONTROLLER_LIBS = @GST_CONTROLLER_LIBS@
+GST_CURRENT = @GST_CURRENT@
GST_CXXFLAGS = @GST_CXXFLAGS@
GST_LEVEL_DEFAULT = @GST_LEVEL_DEFAULT@
GST_LIBS = @GST_LIBS@
+GST_LIBVERSION = @GST_LIBVERSION@
GST_LICENSE = @GST_LICENSE@
GST_LT_LDFLAGS = @GST_LT_LDFLAGS@
GST_NET_CFLAGS = @GST_NET_CFLAGS@
@@ -252,6 +256,7 @@ GST_PLUGINS_NONPORTED = @GST_PLUGINS_NONPORTED@
GST_PLUGINS_SELECTED = @GST_PLUGINS_SELECTED@
GST_PLUGIN_LDFLAGS = @GST_PLUGIN_LDFLAGS@
GST_PREFIX = @GST_PREFIX@
+GST_REVISION = @GST_REVISION@
GST_TOOLS_DIR = @GST_TOOLS_DIR@
GTKDOC_CHECK = @GTKDOC_CHECK@
GTK_CFLAGS = @GTK_CFLAGS@
diff --git a/tests/examples/level/Makefile.in b/tests/examples/level/Makefile.in
index 18199a56c7eeb8be26ea1a5e95036dc5212f85c4..cbf939d48efa4495f6ad5cab5d5a7454762a3529 100644
--- a/tests/examples/level/Makefile.in
+++ b/tests/examples/level/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.11.4 from Makefile.am.
+# Makefile.in generated by automake 1.11.5 from Makefile.am.
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -59,6 +59,7 @@ am__aclocal_m4_deps = $(top_srcdir)/common/m4/as-ac-expand.m4 \
$(top_srcdir)/common/m4/as-auto-alt.m4 \
$(top_srcdir)/common/m4/as-compiler-flag.m4 \
$(top_srcdir)/common/m4/as-gcc-inline-assembly.m4 \
+ $(top_srcdir)/common/m4/as-libtool.m4 \
$(top_srcdir)/common/m4/as-objc.m4 \
$(top_srcdir)/common/m4/as-python.m4 \
$(top_srcdir)/common/m4/as-scrub-include.m4 \
@@ -224,6 +225,7 @@ GMSGFMT_015 = @GMSGFMT_015@
GREP = @GREP@
GSTPB_PLUGINS_DIR = @GSTPB_PLUGINS_DIR@
GSTPB_PREFIX = @GSTPB_PREFIX@
+GST_AGE = @GST_AGE@
GST_ALL_LDFLAGS = @GST_ALL_LDFLAGS@
GST_API_VERSION = @GST_API_VERSION@
GST_BASE_CFLAGS = @GST_BASE_CFLAGS@
@@ -233,9 +235,11 @@ GST_CHECK_CFLAGS = @GST_CHECK_CFLAGS@
GST_CHECK_LIBS = @GST_CHECK_LIBS@
GST_CONTROLLER_CFLAGS = @GST_CONTROLLER_CFLAGS@
GST_CONTROLLER_LIBS = @GST_CONTROLLER_LIBS@
+GST_CURRENT = @GST_CURRENT@
GST_CXXFLAGS = @GST_CXXFLAGS@
GST_LEVEL_DEFAULT = @GST_LEVEL_DEFAULT@
GST_LIBS = @GST_LIBS@
+GST_LIBVERSION = @GST_LIBVERSION@
GST_LICENSE = @GST_LICENSE@
GST_LT_LDFLAGS = @GST_LT_LDFLAGS@
GST_NET_CFLAGS = @GST_NET_CFLAGS@
@@ -253,6 +257,7 @@ GST_PLUGINS_NONPORTED = @GST_PLUGINS_NONPORTED@
GST_PLUGINS_SELECTED = @GST_PLUGINS_SELECTED@
GST_PLUGIN_LDFLAGS = @GST_PLUGIN_LDFLAGS@
GST_PREFIX = @GST_PREFIX@
+GST_REVISION = @GST_REVISION@
GST_TOOLS_DIR = @GST_TOOLS_DIR@
GTKDOC_CHECK = @GTKDOC_CHECK@
GTK_CFLAGS = @GTK_CFLAGS@
diff --git a/tests/examples/pulse/Makefile.am b/tests/examples/pulse/Makefile.am
index e02a877ae7f0e7cd434e1ccb5627f5930934620c..48968cb45ebf20e862304e76c0183a286261751d 100644
--- a/tests/examples/pulse/Makefile.am
+++ b/tests/examples/pulse/Makefile.am
@@ -1,5 +1,5 @@
noinst_PROGRAMS = pulse
pulse_CFLAGS = $(GST_PLUGINS_BASE_CFLAGS) $(GST_BASE_CFLAGS) $(GST_CFLAGS)
-pulse_LDADD = $(GST_PLUGINS_BASE_LIBS) -lgstinterfaces-$(GST_API_VERSION) $(GST_BASE_LIBS) $(GST_LIBS)
+pulse_LDADD = $(GST_PLUGINS_BASE_LIBS) $(GST_BASE_LIBS) $(GST_LIBS)
diff --git a/tests/examples/pulse/Makefile.in b/tests/examples/pulse/Makefile.in
index b3242e2800ef470570277049a959c0dfee3be287..f6661b3aeb373b5eb34531317c0cc87ec1954d14 100644
--- a/tests/examples/pulse/Makefile.in
+++ b/tests/examples/pulse/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.11.4 from Makefile.am.
+# Makefile.in generated by automake 1.11.5 from Makefile.am.
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -59,6 +59,7 @@ am__aclocal_m4_deps = $(top_srcdir)/common/m4/as-ac-expand.m4 \
$(top_srcdir)/common/m4/as-auto-alt.m4 \
$(top_srcdir)/common/m4/as-compiler-flag.m4 \
$(top_srcdir)/common/m4/as-gcc-inline-assembly.m4 \
+ $(top_srcdir)/common/m4/as-libtool.m4 \
$(top_srcdir)/common/m4/as-objc.m4 \
$(top_srcdir)/common/m4/as-python.m4 \
$(top_srcdir)/common/m4/as-scrub-include.m4 \
@@ -224,6 +225,7 @@ GMSGFMT_015 = @GMSGFMT_015@
GREP = @GREP@
GSTPB_PLUGINS_DIR = @GSTPB_PLUGINS_DIR@
GSTPB_PREFIX = @GSTPB_PREFIX@
+GST_AGE = @GST_AGE@
GST_ALL_LDFLAGS = @GST_ALL_LDFLAGS@
GST_API_VERSION = @GST_API_VERSION@
GST_BASE_CFLAGS = @GST_BASE_CFLAGS@
@@ -233,9 +235,11 @@ GST_CHECK_CFLAGS = @GST_CHECK_CFLAGS@
GST_CHECK_LIBS = @GST_CHECK_LIBS@
GST_CONTROLLER_CFLAGS = @GST_CONTROLLER_CFLAGS@
GST_CONTROLLER_LIBS = @GST_CONTROLLER_LIBS@
+GST_CURRENT = @GST_CURRENT@
GST_CXXFLAGS = @GST_CXXFLAGS@
GST_LEVEL_DEFAULT = @GST_LEVEL_DEFAULT@
GST_LIBS = @GST_LIBS@
+GST_LIBVERSION = @GST_LIBVERSION@
GST_LICENSE = @GST_LICENSE@
GST_LT_LDFLAGS = @GST_LT_LDFLAGS@
GST_NET_CFLAGS = @GST_NET_CFLAGS@
@@ -253,6 +257,7 @@ GST_PLUGINS_NONPORTED = @GST_PLUGINS_NONPORTED@
GST_PLUGINS_SELECTED = @GST_PLUGINS_SELECTED@
GST_PLUGIN_LDFLAGS = @GST_PLUGIN_LDFLAGS@
GST_PREFIX = @GST_PREFIX@
+GST_REVISION = @GST_REVISION@
GST_TOOLS_DIR = @GST_TOOLS_DIR@
GTKDOC_CHECK = @GTKDOC_CHECK@
GTK_CFLAGS = @GTK_CFLAGS@
@@ -453,7 +458,7 @@ top_build_prefix = @top_build_prefix@
top_builddir = @top_builddir@
top_srcdir = @top_srcdir@
pulse_CFLAGS = $(GST_PLUGINS_BASE_CFLAGS) $(GST_BASE_CFLAGS) $(GST_CFLAGS)
-pulse_LDADD = $(GST_PLUGINS_BASE_LIBS) -lgstinterfaces-$(GST_API_VERSION) $(GST_BASE_LIBS) $(GST_LIBS)
+pulse_LDADD = $(GST_PLUGINS_BASE_LIBS) $(GST_BASE_LIBS) $(GST_LIBS)
all: all-am
.SUFFIXES:
diff --git a/tests/examples/rtp/Makefile.in b/tests/examples/rtp/Makefile.in
index cb54664b56b649bd8a959d2e571e01c83962248a..0b31e53f9c2c9384cb501701a43685fba791f496 100644
--- a/tests/examples/rtp/Makefile.in
+++ b/tests/examples/rtp/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.11.4 from Makefile.am.
+# Makefile.in generated by automake 1.11.5 from Makefile.am.
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -60,6 +60,7 @@ am__aclocal_m4_deps = $(top_srcdir)/common/m4/as-ac-expand.m4 \
$(top_srcdir)/common/m4/as-auto-alt.m4 \
$(top_srcdir)/common/m4/as-compiler-flag.m4 \
$(top_srcdir)/common/m4/as-gcc-inline-assembly.m4 \
+ $(top_srcdir)/common/m4/as-libtool.m4 \
$(top_srcdir)/common/m4/as-objc.m4 \
$(top_srcdir)/common/m4/as-python.m4 \
$(top_srcdir)/common/m4/as-scrub-include.m4 \
@@ -236,6 +237,7 @@ GMSGFMT_015 = @GMSGFMT_015@
GREP = @GREP@
GSTPB_PLUGINS_DIR = @GSTPB_PLUGINS_DIR@
GSTPB_PREFIX = @GSTPB_PREFIX@
+GST_AGE = @GST_AGE@
GST_ALL_LDFLAGS = @GST_ALL_LDFLAGS@
GST_API_VERSION = @GST_API_VERSION@
GST_BASE_CFLAGS = @GST_BASE_CFLAGS@
@@ -245,9 +247,11 @@ GST_CHECK_CFLAGS = @GST_CHECK_CFLAGS@
GST_CHECK_LIBS = @GST_CHECK_LIBS@
GST_CONTROLLER_CFLAGS = @GST_CONTROLLER_CFLAGS@
GST_CONTROLLER_LIBS = @GST_CONTROLLER_LIBS@
+GST_CURRENT = @GST_CURRENT@
GST_CXXFLAGS = @GST_CXXFLAGS@
GST_LEVEL_DEFAULT = @GST_LEVEL_DEFAULT@
GST_LIBS = @GST_LIBS@
+GST_LIBVERSION = @GST_LIBVERSION@
GST_LICENSE = @GST_LICENSE@
GST_LT_LDFLAGS = @GST_LT_LDFLAGS@
GST_NET_CFLAGS = @GST_NET_CFLAGS@
@@ -265,6 +269,7 @@ GST_PLUGINS_NONPORTED = @GST_PLUGINS_NONPORTED@
GST_PLUGINS_SELECTED = @GST_PLUGINS_SELECTED@
GST_PLUGIN_LDFLAGS = @GST_PLUGIN_LDFLAGS@
GST_PREFIX = @GST_PREFIX@
+GST_REVISION = @GST_REVISION@
GST_TOOLS_DIR = @GST_TOOLS_DIR@
GTKDOC_CHECK = @GTKDOC_CHECK@
GTK_CFLAGS = @GTK_CFLAGS@
diff --git a/tests/examples/shapewipe/Makefile.in b/tests/examples/shapewipe/Makefile.in
index 2a95aa0c580925f52188156db7478cf8db9bb9c6..cb40ab2a7503e502d94d0737b5c065b51c04d68c 100644
--- a/tests/examples/shapewipe/Makefile.in
+++ b/tests/examples/shapewipe/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.11.4 from Makefile.am.
+# Makefile.in generated by automake 1.11.5 from Makefile.am.
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -61,6 +61,7 @@ am__aclocal_m4_deps = $(top_srcdir)/common/m4/as-ac-expand.m4 \
$(top_srcdir)/common/m4/as-auto-alt.m4 \
$(top_srcdir)/common/m4/as-compiler-flag.m4 \
$(top_srcdir)/common/m4/as-gcc-inline-assembly.m4 \
+ $(top_srcdir)/common/m4/as-libtool.m4 \
$(top_srcdir)/common/m4/as-objc.m4 \
$(top_srcdir)/common/m4/as-python.m4 \
$(top_srcdir)/common/m4/as-scrub-include.m4 \
@@ -229,6 +230,7 @@ GMSGFMT_015 = @GMSGFMT_015@
GREP = @GREP@
GSTPB_PLUGINS_DIR = @GSTPB_PLUGINS_DIR@
GSTPB_PREFIX = @GSTPB_PREFIX@
+GST_AGE = @GST_AGE@
GST_ALL_LDFLAGS = @GST_ALL_LDFLAGS@
GST_API_VERSION = @GST_API_VERSION@
GST_BASE_CFLAGS = @GST_BASE_CFLAGS@
@@ -238,9 +240,11 @@ GST_CHECK_CFLAGS = @GST_CHECK_CFLAGS@
GST_CHECK_LIBS = @GST_CHECK_LIBS@
GST_CONTROLLER_CFLAGS = @GST_CONTROLLER_CFLAGS@
GST_CONTROLLER_LIBS = @GST_CONTROLLER_LIBS@
+GST_CURRENT = @GST_CURRENT@
GST_CXXFLAGS = @GST_CXXFLAGS@
GST_LEVEL_DEFAULT = @GST_LEVEL_DEFAULT@
GST_LIBS = @GST_LIBS@
+GST_LIBVERSION = @GST_LIBVERSION@
GST_LICENSE = @GST_LICENSE@
GST_LT_LDFLAGS = @GST_LT_LDFLAGS@
GST_NET_CFLAGS = @GST_NET_CFLAGS@
@@ -258,6 +262,7 @@ GST_PLUGINS_NONPORTED = @GST_PLUGINS_NONPORTED@
GST_PLUGINS_SELECTED = @GST_PLUGINS_SELECTED@
GST_PLUGIN_LDFLAGS = @GST_PLUGIN_LDFLAGS@
GST_PREFIX = @GST_PREFIX@
+GST_REVISION = @GST_REVISION@
GST_TOOLS_DIR = @GST_TOOLS_DIR@
GTKDOC_CHECK = @GTKDOC_CHECK@
GTK_CFLAGS = @GTK_CFLAGS@
diff --git a/tests/examples/spectrum/Makefile.in b/tests/examples/spectrum/Makefile.in
index bd9e8c8a233c42692317390d08b1aba383166cc8..b961c16ddc878e5effe9412fe003509cba62226b 100644
--- a/tests/examples/spectrum/Makefile.in
+++ b/tests/examples/spectrum/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.11.4 from Makefile.am.
+# Makefile.in generated by automake 1.11.5 from Makefile.am.
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -61,6 +61,7 @@ am__aclocal_m4_deps = $(top_srcdir)/common/m4/as-ac-expand.m4 \
$(top_srcdir)/common/m4/as-auto-alt.m4 \
$(top_srcdir)/common/m4/as-compiler-flag.m4 \
$(top_srcdir)/common/m4/as-gcc-inline-assembly.m4 \
+ $(top_srcdir)/common/m4/as-libtool.m4 \
$(top_srcdir)/common/m4/as-objc.m4 \
$(top_srcdir)/common/m4/as-python.m4 \
$(top_srcdir)/common/m4/as-scrub-include.m4 \
@@ -246,6 +247,7 @@ GMSGFMT_015 = @GMSGFMT_015@
GREP = @GREP@
GSTPB_PLUGINS_DIR = @GSTPB_PLUGINS_DIR@
GSTPB_PREFIX = @GSTPB_PREFIX@
+GST_AGE = @GST_AGE@
GST_ALL_LDFLAGS = @GST_ALL_LDFLAGS@
GST_API_VERSION = @GST_API_VERSION@
GST_BASE_CFLAGS = @GST_BASE_CFLAGS@
@@ -255,9 +257,11 @@ GST_CHECK_CFLAGS = @GST_CHECK_CFLAGS@
GST_CHECK_LIBS = @GST_CHECK_LIBS@
GST_CONTROLLER_CFLAGS = @GST_CONTROLLER_CFLAGS@
GST_CONTROLLER_LIBS = @GST_CONTROLLER_LIBS@
+GST_CURRENT = @GST_CURRENT@
GST_CXXFLAGS = @GST_CXXFLAGS@
GST_LEVEL_DEFAULT = @GST_LEVEL_DEFAULT@
GST_LIBS = @GST_LIBS@
+GST_LIBVERSION = @GST_LIBVERSION@
GST_LICENSE = @GST_LICENSE@
GST_LT_LDFLAGS = @GST_LT_LDFLAGS@
GST_NET_CFLAGS = @GST_NET_CFLAGS@
@@ -275,6 +279,7 @@ GST_PLUGINS_NONPORTED = @GST_PLUGINS_NONPORTED@
GST_PLUGINS_SELECTED = @GST_PLUGINS_SELECTED@
GST_PLUGIN_LDFLAGS = @GST_PLUGIN_LDFLAGS@
GST_PREFIX = @GST_PREFIX@
+GST_REVISION = @GST_REVISION@
GST_TOOLS_DIR = @GST_TOOLS_DIR@
GTKDOC_CHECK = @GTKDOC_CHECK@
GTK_CFLAGS = @GTK_CFLAGS@
diff --git a/tests/examples/v4l2/Makefile.in b/tests/examples/v4l2/Makefile.in
index a3ecd5260d33a3eb8999bb3dfa54d47a8c32d9f2..5530a06b15a0d7f8208fa76985b518aaf4949709 100644
--- a/tests/examples/v4l2/Makefile.in
+++ b/tests/examples/v4l2/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.11.4 from Makefile.am.
+# Makefile.in generated by automake 1.11.5 from Makefile.am.
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -59,6 +59,7 @@ am__aclocal_m4_deps = $(top_srcdir)/common/m4/as-ac-expand.m4 \
$(top_srcdir)/common/m4/as-auto-alt.m4 \
$(top_srcdir)/common/m4/as-compiler-flag.m4 \
$(top_srcdir)/common/m4/as-gcc-inline-assembly.m4 \
+ $(top_srcdir)/common/m4/as-libtool.m4 \
$(top_srcdir)/common/m4/as-objc.m4 \
$(top_srcdir)/common/m4/as-python.m4 \
$(top_srcdir)/common/m4/as-scrub-include.m4 \
@@ -224,6 +225,7 @@ GMSGFMT_015 = @GMSGFMT_015@
GREP = @GREP@
GSTPB_PLUGINS_DIR = @GSTPB_PLUGINS_DIR@
GSTPB_PREFIX = @GSTPB_PREFIX@
+GST_AGE = @GST_AGE@
GST_ALL_LDFLAGS = @GST_ALL_LDFLAGS@
GST_API_VERSION = @GST_API_VERSION@
GST_BASE_CFLAGS = @GST_BASE_CFLAGS@
@@ -233,9 +235,11 @@ GST_CHECK_CFLAGS = @GST_CHECK_CFLAGS@
GST_CHECK_LIBS = @GST_CHECK_LIBS@
GST_CONTROLLER_CFLAGS = @GST_CONTROLLER_CFLAGS@
GST_CONTROLLER_LIBS = @GST_CONTROLLER_LIBS@
+GST_CURRENT = @GST_CURRENT@
GST_CXXFLAGS = @GST_CXXFLAGS@
GST_LEVEL_DEFAULT = @GST_LEVEL_DEFAULT@
GST_LIBS = @GST_LIBS@
+GST_LIBVERSION = @GST_LIBVERSION@
GST_LICENSE = @GST_LICENSE@
GST_LT_LDFLAGS = @GST_LT_LDFLAGS@
GST_NET_CFLAGS = @GST_NET_CFLAGS@
@@ -253,6 +257,7 @@ GST_PLUGINS_NONPORTED = @GST_PLUGINS_NONPORTED@
GST_PLUGINS_SELECTED = @GST_PLUGINS_SELECTED@
GST_PLUGIN_LDFLAGS = @GST_PLUGIN_LDFLAGS@
GST_PREFIX = @GST_PREFIX@
+GST_REVISION = @GST_REVISION@
GST_TOOLS_DIR = @GST_TOOLS_DIR@
GTKDOC_CHECK = @GTKDOC_CHECK@
GTK_CFLAGS = @GTK_CFLAGS@
diff --git a/tests/files/Makefile.in b/tests/files/Makefile.in
index 32d25c825763cc81b17aa8d09ff745ae66669477..de557154b6171fe701bba76e963488dddc938034 100644
--- a/tests/files/Makefile.in
+++ b/tests/files/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.11.4 from Makefile.am.
+# Makefile.in generated by automake 1.11.5 from Makefile.am.
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -57,6 +57,7 @@ am__aclocal_m4_deps = $(top_srcdir)/common/m4/as-ac-expand.m4 \
$(top_srcdir)/common/m4/as-auto-alt.m4 \
$(top_srcdir)/common/m4/as-compiler-flag.m4 \
$(top_srcdir)/common/m4/as-gcc-inline-assembly.m4 \
+ $(top_srcdir)/common/m4/as-libtool.m4 \
$(top_srcdir)/common/m4/as-objc.m4 \
$(top_srcdir)/common/m4/as-python.m4 \
$(top_srcdir)/common/m4/as-scrub-include.m4 \
@@ -188,6 +189,7 @@ GMSGFMT_015 = @GMSGFMT_015@
GREP = @GREP@
GSTPB_PLUGINS_DIR = @GSTPB_PLUGINS_DIR@
GSTPB_PREFIX = @GSTPB_PREFIX@
+GST_AGE = @GST_AGE@
GST_ALL_LDFLAGS = @GST_ALL_LDFLAGS@
GST_API_VERSION = @GST_API_VERSION@
GST_BASE_CFLAGS = @GST_BASE_CFLAGS@
@@ -197,9 +199,11 @@ GST_CHECK_CFLAGS = @GST_CHECK_CFLAGS@
GST_CHECK_LIBS = @GST_CHECK_LIBS@
GST_CONTROLLER_CFLAGS = @GST_CONTROLLER_CFLAGS@
GST_CONTROLLER_LIBS = @GST_CONTROLLER_LIBS@
+GST_CURRENT = @GST_CURRENT@
GST_CXXFLAGS = @GST_CXXFLAGS@
GST_LEVEL_DEFAULT = @GST_LEVEL_DEFAULT@
GST_LIBS = @GST_LIBS@
+GST_LIBVERSION = @GST_LIBVERSION@
GST_LICENSE = @GST_LICENSE@
GST_LT_LDFLAGS = @GST_LT_LDFLAGS@
GST_NET_CFLAGS = @GST_NET_CFLAGS@
@@ -217,6 +221,7 @@ GST_PLUGINS_NONPORTED = @GST_PLUGINS_NONPORTED@
GST_PLUGINS_SELECTED = @GST_PLUGINS_SELECTED@
GST_PLUGIN_LDFLAGS = @GST_PLUGIN_LDFLAGS@
GST_PREFIX = @GST_PREFIX@
+GST_REVISION = @GST_REVISION@
GST_TOOLS_DIR = @GST_TOOLS_DIR@
GTKDOC_CHECK = @GTKDOC_CHECK@
GTK_CFLAGS = @GTK_CFLAGS@
diff --git a/tests/icles/Makefile.am b/tests/icles/Makefile.am
index 86b85f4a273f9b251acd5f6ddcc69d4043e3400a..706a5bd0d9fc14889608ddd7216241dee16b5c23 100644
--- a/tests/icles/Makefile.am
+++ b/tests/icles/Makefile.am
@@ -13,8 +13,7 @@ V4L2_TESTS = v4l2src-test
v4l2src_test_SOURCES = v4l2src-test.c
v4l2src_test_CFLAGS = $(GST_PLUGINS_BASE_CFLAGS) $(GST_CFLAGS)
v4l2src_test_LDADD = $(GST_PLUGINS_BASE_LIBS) \
- -lgstvideo-$(GST_API_VERSION) \
- -lgstinterfaces-$(GST_API_VERSION) $(GST_LIBS)
+ -lgstvideo-$(GST_API_VERSION)
else
V4L2_TESTS =
@@ -25,7 +24,7 @@ OSS4_TESTS=test-oss4
test_oss4_SOURCES = test-oss4.c
test_oss4_CFLAGS = $(GST_PLUGINS_BASE_CFLAGS) $(GST_CFLAGS)
-test_oss4_LDADD = $(GST_PLUGINS_BASE_LIBS) -lgstinterfaces-$(GST_API_VERSION) $(GST_LIBS)
+test_oss4_LDADD = $(GST_PLUGINS_BASE_LIBS) $(GST_LIBS)
test_oss4_LDFLAGS = $(GST_PLUGIN_LDFLAGS)
else
OSS4_TESTS=
diff --git a/tests/icles/Makefile.in b/tests/icles/Makefile.in
index 6c7dbae1e491eced0c5669ca0f85296878db3629..ac5ead2822c9e81f80665491ccb8581009c9e036 100644
--- a/tests/icles/Makefile.in
+++ b/tests/icles/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.11.4 from Makefile.am.
+# Makefile.in generated by automake 1.11.5 from Makefile.am.
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -62,6 +62,7 @@ am__aclocal_m4_deps = $(top_srcdir)/common/m4/as-ac-expand.m4 \
$(top_srcdir)/common/m4/as-auto-alt.m4 \
$(top_srcdir)/common/m4/as-compiler-flag.m4 \
$(top_srcdir)/common/m4/as-gcc-inline-assembly.m4 \
+ $(top_srcdir)/common/m4/as-libtool.m4 \
$(top_srcdir)/common/m4/as-objc.m4 \
$(top_srcdir)/common/m4/as-python.m4 \
$(top_srcdir)/common/m4/as-scrub-include.m4 \
@@ -136,8 +137,7 @@ am__v4l2src_test_SOURCES_DIST = v4l2src-test.c
@USE_GST_V4L2_TRUE@am_v4l2src_test_OBJECTS = \
@USE_GST_V4L2_TRUE@ v4l2src_test-v4l2src-test.$(OBJEXT)
v4l2src_test_OBJECTS = $(am_v4l2src_test_OBJECTS)
-@USE_GST_V4L2_TRUE@v4l2src_test_DEPENDENCIES = $(am__DEPENDENCIES_1) \
-@USE_GST_V4L2_TRUE@ $(am__DEPENDENCIES_1)
+@USE_GST_V4L2_TRUE@v4l2src_test_DEPENDENCIES = $(am__DEPENDENCIES_1)
v4l2src_test_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
$(LIBTOOLFLAGS) --mode=link $(CCLD) $(v4l2src_test_CFLAGS) \
$(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
@@ -294,6 +294,7 @@ GMSGFMT_015 = @GMSGFMT_015@
GREP = @GREP@
GSTPB_PLUGINS_DIR = @GSTPB_PLUGINS_DIR@
GSTPB_PREFIX = @GSTPB_PREFIX@
+GST_AGE = @GST_AGE@
GST_ALL_LDFLAGS = @GST_ALL_LDFLAGS@
GST_API_VERSION = @GST_API_VERSION@
GST_BASE_CFLAGS = @GST_BASE_CFLAGS@
@@ -303,9 +304,11 @@ GST_CHECK_CFLAGS = @GST_CHECK_CFLAGS@
GST_CHECK_LIBS = @GST_CHECK_LIBS@
GST_CONTROLLER_CFLAGS = @GST_CONTROLLER_CFLAGS@
GST_CONTROLLER_LIBS = @GST_CONTROLLER_LIBS@
+GST_CURRENT = @GST_CURRENT@
GST_CXXFLAGS = @GST_CXXFLAGS@
GST_LEVEL_DEFAULT = @GST_LEVEL_DEFAULT@
GST_LIBS = @GST_LIBS@
+GST_LIBVERSION = @GST_LIBVERSION@
GST_LICENSE = @GST_LICENSE@
GST_LT_LDFLAGS = @GST_LT_LDFLAGS@
GST_NET_CFLAGS = @GST_NET_CFLAGS@
@@ -323,6 +326,7 @@ GST_PLUGINS_NONPORTED = @GST_PLUGINS_NONPORTED@
GST_PLUGINS_SELECTED = @GST_PLUGINS_SELECTED@
GST_PLUGIN_LDFLAGS = @GST_PLUGIN_LDFLAGS@
GST_PREFIX = @GST_PREFIX@
+GST_REVISION = @GST_REVISION@
GST_TOOLS_DIR = @GST_TOOLS_DIR@
GTKDOC_CHECK = @GTKDOC_CHECK@
GTK_CFLAGS = @GTK_CFLAGS@
@@ -532,14 +536,13 @@ top_srcdir = @top_srcdir@
@USE_GST_V4L2_TRUE@v4l2src_test_SOURCES = v4l2src-test.c
@USE_GST_V4L2_TRUE@v4l2src_test_CFLAGS = $(GST_PLUGINS_BASE_CFLAGS) $(GST_CFLAGS)
@USE_GST_V4L2_TRUE@v4l2src_test_LDADD = $(GST_PLUGINS_BASE_LIBS) \
-@USE_GST_V4L2_TRUE@ -lgstvideo-$(GST_API_VERSION) \
-@USE_GST_V4L2_TRUE@ -lgstinterfaces-$(GST_API_VERSION) $(GST_LIBS)
+@USE_GST_V4L2_TRUE@ -lgstvideo-$(GST_API_VERSION)
@USE_OSS4_FALSE@OSS4_TESTS =
@USE_OSS4_TRUE@OSS4_TESTS = test-oss4
@USE_OSS4_TRUE@test_oss4_SOURCES = test-oss4.c
@USE_OSS4_TRUE@test_oss4_CFLAGS = $(GST_PLUGINS_BASE_CFLAGS) $(GST_CFLAGS)
-@USE_OSS4_TRUE@test_oss4_LDADD = $(GST_PLUGINS_BASE_LIBS) -lgstinterfaces-$(GST_API_VERSION) $(GST_LIBS)
+@USE_OSS4_TRUE@test_oss4_LDADD = $(GST_PLUGINS_BASE_LIBS) $(GST_LIBS)
@USE_OSS4_TRUE@test_oss4_LDFLAGS = $(GST_PLUGIN_LDFLAGS)
@USE_X_FALSE@X_TESTS =
@USE_X_TRUE@X_TESTS = ximagesrc-test
diff --git a/tests/icles/test-oss4.c b/tests/icles/test-oss4.c
index 67e08e914ee710cbe52a8948294f58aed3bd2c2d..1715c663ee72d4aaeaac71763247673d470e92b9 100644
--- a/tests/icles/test-oss4.c
+++ b/tests/icles/test-oss4.c
@@ -29,105 +29,11 @@
#include <stdlib.h>
#include <gst/gst.h>
-#include <gst/interfaces/propertyprobe.h>
-#include <gst/interfaces/mixer.h>
static gboolean opt_show_mixer_messages = FALSE;
#define WAIT_TIME 60.0 /* in seconds */
-static void
-show_mixer_messages (GstElement * element)
-{
- GstMessage *msg;
- GstBus *bus;
- GTimer *t;
-
- t = g_timer_new ();
-
- bus = gst_bus_new ();
- gst_element_set_bus (element, bus);
-
- g_print ("\nShowing mixer messages for %u seconds ...\n", (guint) WAIT_TIME);
-
- while (g_timer_elapsed (t, NULL) < WAIT_TIME) {
- gdouble remaining = WAIT_TIME - g_timer_elapsed (t, NULL);
- gint64 maxwait =
- GST_SECOND * gst_util_gdouble_to_guint64 (MAX (0.0, remaining));
- gchar *s = NULL;
-
- msg = gst_bus_timed_pop (bus, maxwait);
- if (!msg)
- break;
-
- if (msg->structure)
- s = gst_structure_to_string (msg->structure);
- g_print ("%s message: %s\n", GST_MESSAGE_TYPE_NAME (msg), s);
- gst_message_unref (msg);
- g_free (s);
- }
-
- gst_element_set_bus (element, NULL);
- gst_object_unref (bus);
- g_timer_destroy (t);
-}
-
-static void
-probe_mixer_tracks (GstElement * element)
-{
- const GList *tracks, *t;
- GstMixer *mixer;
- guint count;
-
- if (!GST_IS_MIXER (element))
- return;
-
- mixer = GST_MIXER (element);
- tracks = gst_mixer_list_tracks (mixer);
- count = g_list_length ((GList *) tracks);
- g_print (" %d mixer tracks%c\n", count, (count == 0) ? '.' : ':');
-
- for (t = tracks; t != NULL; t = t->next) {
- GstMixerTrack *track;
- gchar *label = NULL;
- guint flags = 0;
-
- track = GST_MIXER_TRACK (t->data);
- g_object_get (track, "label", &label, "flags", &flags, NULL);
-
- if (GST_IS_MIXER_OPTIONS (track)) {
- GString *s;
- GList *vals, *v;
-
- vals = gst_mixer_options_get_values (GST_MIXER_OPTIONS (track));
- s = g_string_new ("options: ");
- for (v = vals; v != NULL; v = v->next) {
- if (v->prev != NULL)
- g_string_append (s, ", ");
- g_string_append (s, (const gchar *) v->data);
- }
-
- g_print (" [%s] flags=0x%08x, %s\n", label, flags, s->str);
- g_string_free (s, TRUE);
- } else if (track->num_channels == 0) {
- g_print (" [%s] flags=0x%08x, switch\n", label, flags);
- } else if (track->num_channels > 0) {
- g_print (" [%s] flags=0x%08x, slider (%d channels)\n", label, flags,
- track->num_channels);
- } else {
- g_print (" [%s] flags=0x%08x, UNKNOWN TYPE\n", label, flags);
- }
-
- g_free (label);
- }
-
- /* for testing the mixer watch thread / auto-notifications */
- if (strstr (GST_ELEMENT_NAME (element), "mixer") != NULL &&
- opt_show_mixer_messages) {
- show_mixer_messages (element);
- }
-}
-
static void
probe_pad (GstElement * element, const gchar * pad_name)
{
@@ -139,7 +45,7 @@ probe_pad (GstElement * element, const gchar * pad_name)
if (pad == NULL)
return;
- caps = gst_pad_get_caps (pad);
+ caps = gst_pad_query_caps (pad, NULL);
g_return_if_fail (caps != NULL);
for (i = 0; i < gst_caps_get_size (caps); ++i) {
@@ -167,19 +73,14 @@ probe_details (GstElement * element)
probe_pad (element, "sink");
probe_pad (element, "src");
- probe_mixer_tracks (element);
-
gst_element_set_state (element, GST_STATE_NULL);
}
static void
probe_element (const gchar * name)
{
- GstPropertyProbe *probe;
- GValueArray *arr;
GstElement *element;
gchar *devname = NULL;
- gint i;
element = gst_element_factory_make (name, name);
@@ -192,35 +93,7 @@ probe_element (const gchar * name)
/* and now for real */
- probe = GST_PROPERTY_PROBE (element);
- arr = gst_property_probe_probe_and_get_values_name (probe, "device");
-
- for (i = 0; arr != NULL && i < arr->n_values; ++i) {
- GValue *val;
- gchar *dev_name = NULL;
-
- g_print ("\n");
- /* we assume the element supports getting the device-name in NULL state */
- val = g_value_array_get_nth (arr, i);
- g_object_set (element, "device", g_value_get_string (val), NULL);
- g_object_get (element, "device-name", &dev_name, NULL);
- g_print ("%-10s device[%d] = %s (%s)\n", GST_OBJECT_NAME (element),
- i, g_value_get_string (val), dev_name);
- if (strstr (dev_name, "/usb")) {
- g_print ("\n\nWARNING: going to probe USB audio device. OSS4 USB support"
- " is still\npretty shaky, so bad things may happen (e.g. kernel "
- "lockup).\nPress Control-C NOW if you don't want to continue. "
- "(waiting 5secs)\n\n");
- g_usleep (5 * G_USEC_PER_SEC);
- }
- g_free (dev_name);
-
- probe_details (element);
- }
-
- if (arr) {
- g_value_array_free (arr);
- }
+ probe_details (element);
gst_object_unref (element);
}
@@ -248,7 +121,6 @@ main (int argc, char **argv)
probe_element ("oss4sink");
probe_element ("oss4src");
- probe_element ("oss4mixer");
return 0;
}
diff --git a/tests/icles/v4l2src-test.c b/tests/icles/v4l2src-test.c
index 6742677984c37b3c8d50aead13b2466a27680158..8b9dfe3714163ba3109dc92d9389130da1a8b4e4 100644
--- a/tests/icles/v4l2src-test.c
+++ b/tests/icles/v4l2src-test.c
@@ -24,7 +24,6 @@
#include <getopt.h>
#include <gst/gst.h>
-#include <gst/interfaces/tuner.h>
#include <gst/video/colorbalance.h>
#include <gst/video/videoorientation.h>
@@ -49,6 +48,7 @@ run_options (char opt)
int res;
switch (opt) {
+#if 0
case 'f':
{
GstTuner *tuner = GST_TUNER (source);
@@ -143,6 +143,7 @@ run_options (char opt)
gst_tuner_set_channel (tuner, channel);
}
break;
+#endif
case 'e':
gst_element_set_state (pipeline, GST_STATE_NULL);
g_main_loop_quit (loop);
diff --git a/win32/common/config.h b/win32/common/config.h
index f5d000b11bf17e91458487171bea0cb36ea2cb6d..e3b2d293897f695faafbc731d78c83c186889896 100644
--- a/win32/common/config.h
+++ b/win32/common/config.h
@@ -58,7 +58,7 @@
#define GST_PACKAGE_ORIGIN "Unknown package origin"
/* GStreamer package release date/time for plugins as YYYY-MM-DD */
-#define GST_PACKAGE_RELEASE_DATETIME "2012-04-12"
+#define GST_PACKAGE_RELEASE_DATETIME "2012-05-13"
/* struct v4l2_buffer missing */
#undef GST_V4L2_MISSING_BUFDECL
@@ -369,7 +369,7 @@
#define PACKAGE_NAME "GStreamer Good Plug-ins"
/* Define to the full name and version of this package. */
-#define PACKAGE_STRING "GStreamer Good Plug-ins 0.11.90"
+#define PACKAGE_STRING "GStreamer Good Plug-ins 0.11.91"
/* Define to the one symbol short name of this package. */
#define PACKAGE_TARNAME "gst-plugins-good"
@@ -378,7 +378,7 @@
#undef PACKAGE_URL
/* Define to the version of this package. */
-#define PACKAGE_VERSION "0.11.90"
+#define PACKAGE_VERSION "0.11.91"
/* directory where plugins are located */
#ifdef _DEBUG
@@ -409,7 +409,7 @@
#undef STDC_HEADERS
/* Version number of package */
-#define VERSION "0.11.90"
+#define VERSION "0.11.91"
/* old wavpack API */
#undef WAVPACK_OLD_API