summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--ChangeLog14
-rw-r--r--docs/plugins/gst-plugins-base-plugins-docs.sgml3
-rw-r--r--docs/plugins/gst-plugins-base-plugins.args38
-rw-r--r--docs/plugins/gst-plugins-base-plugins.hierarchy123
-rw-r--r--docs/plugins/gst-plugins-base-plugins.interfaces16
-rw-r--r--docs/plugins/gst-plugins-base-plugins.signals14
-rw-r--r--gst/ffmpegcolorspace/gstffmpegcolorspace.c2
-rw-r--r--gst/ffmpegcolorspace/gstffmpegcolorspace.h18
8 files changed, 130 insertions, 98 deletions
diff --git a/ChangeLog b/ChangeLog
index a6c9fb8d0..24f5945cc 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,17 @@
+2006-03-02 Wim Taymans <wim@fluendo.com>
+
+ * docs/plugins/gst-plugins-base-plugins-docs.sgml:
+ * docs/plugins/gst-plugins-base-plugins.args:
+ * docs/plugins/gst-plugins-base-plugins.hierarchy:
+ * docs/plugins/gst-plugins-base-plugins.interfaces:
+ * docs/plugins/gst-plugins-base-plugins.signals:
+ Fix hierarchy, added some more elements to the docs.
+
+ * gst/ffmpegcolorspace/gstffmpegcolorspace.c:
+ (gst_ffmpegcsp_get_type):
+ * gst/ffmpegcolorspace/gstffmpegcolorspace.h:
+ Fix docs for ffmpegcolorspace.
+
2006-03-01 Tim-Philipp Müller <tim at centricular dot net>
* gst/typefind/gsttypefindfunctions.c: (id3_type_find),
diff --git a/docs/plugins/gst-plugins-base-plugins-docs.sgml b/docs/plugins/gst-plugins-base-plugins-docs.sgml
index 86bd8f264..88bf4ff3d 100644
--- a/docs/plugins/gst-plugins-base-plugins-docs.sgml
+++ b/docs/plugins/gst-plugins-base-plugins-docs.sgml
@@ -43,8 +43,11 @@
<xi:include href="xml/plugin-alsa.xml" />
<xi:include href="xml/plugin-audioconvert.xml" />
<xi:include href="xml/plugin-audiorate.xml" />
+ <xi:include href="xml/plugin-audioresample.xml" />
<xi:include href="xml/plugin-audiotestsrc.xml" />
+ <xi:include href="xml/plugin-cdparanoia.xml" />
<xi:include href="xml/plugin-decodebin.xml" />
+ <xi:include href="xml/plugin-ffmpegcolorspace.xml" />
<xi:include href="xml/plugin-gnomevfs.xml" />
<xi:include href="xml/plugin-libvisual.xml" />
<xi:include href="xml/plugin-ogg.xml" />
diff --git a/docs/plugins/gst-plugins-base-plugins.args b/docs/plugins/gst-plugins-base-plugins.args
index fc4ae10e9..27692d134 100644
--- a/docs/plugins/gst-plugins-base-plugins.args
+++ b/docs/plugins/gst-plugins-base-plugins.args
@@ -225,7 +225,7 @@
<FLAGS>rw</FLAGS>
<NICK>method</NICK>
<BLURB>method.</BLURB>
-<DEFAULT>Point Sample (not implemented)</DEFAULT>
+<DEFAULT>Nearest Neighbour</DEFAULT>
</ARG>
<ARG>
@@ -1142,7 +1142,7 @@
<NAME>GstTextOverlay::deltax</NAME>
<TYPE>gint</TYPE>
<RANGE></RANGE>
-<FLAGS>w</FLAGS>
+<FLAGS>rw</FLAGS>
<NICK>X position modifier</NICK>
<BLURB>Shift X position to the left or to the right. Unit is pixels.</BLURB>
<DEFAULT>0</DEFAULT>
@@ -1152,7 +1152,7 @@
<NAME>GstTextOverlay::deltay</NAME>
<TYPE>gint</TYPE>
<RANGE></RANGE>
-<FLAGS>w</FLAGS>
+<FLAGS>rw</FLAGS>
<NICK>Y position modifier</NICK>
<BLURB>Shift Y position up or down. Unit is pixels.</BLURB>
<DEFAULT>0</DEFAULT>
@@ -1170,19 +1170,19 @@
<ARG>
<NAME>GstTextOverlay::halign</NAME>
-<TYPE>gchararray</TYPE>
+<TYPE>GstTextOverlayHAlign</TYPE>
<RANGE></RANGE>
-<FLAGS>w</FLAGS>
+<FLAGS>rw</FLAGS>
<NICK>horizontal alignment</NICK>
-<BLURB>Horizontal alignment of the text. Can be either 'left', 'right', or 'center'.</BLURB>
-<DEFAULT>"center"</DEFAULT>
+<BLURB>Horizontal alignment of the text. .</BLURB>
+<DEFAULT>center</DEFAULT>
</ARG>
<ARG>
<NAME>GstTextOverlay::shaded-background</NAME>
<TYPE>gboolean</TYPE>
<RANGE></RANGE>
-<FLAGS>w</FLAGS>
+<FLAGS>rw</FLAGS>
<NICK>shaded background</NICK>
<BLURB>Whether to shade the background under the text area.</BLURB>
<DEFAULT>FALSE</DEFAULT>
@@ -1192,7 +1192,7 @@
<NAME>GstTextOverlay::text</NAME>
<TYPE>gchararray</TYPE>
<RANGE></RANGE>
-<FLAGS>w</FLAGS>
+<FLAGS>rw</FLAGS>
<NICK>text</NICK>
<BLURB>Text to be display.</BLURB>
<DEFAULT>""</DEFAULT>
@@ -1200,29 +1200,29 @@
<ARG>
<NAME>GstTextOverlay::valign</NAME>
-<TYPE>gchararray</TYPE>
+<TYPE>GstTextOverlayVAlign</TYPE>
<RANGE></RANGE>
-<FLAGS>w</FLAGS>
+<FLAGS>rw</FLAGS>
<NICK>vertical alignment</NICK>
-<BLURB>Vertical alignment of the text. Can be either 'baseline', 'bottom', or 'top'.</BLURB>
-<DEFAULT>"baseline"</DEFAULT>
+<BLURB>Vertical alignment of the text. .</BLURB>
+<DEFAULT>baseline</DEFAULT>
</ARG>
<ARG>
<NAME>GstTextOverlay::wrap-mode</NAME>
-<TYPE>gchararray</TYPE>
+<TYPE>GstTextOverlayWrapMode</TYPE>
<RANGE></RANGE>
-<FLAGS>w</FLAGS>
+<FLAGS>rw</FLAGS>
<NICK>wrap mode</NICK>
-<BLURB>Whether to wrap the text and if so how.Can be either 'none', 'word', 'char' or 'wordchar'.</BLURB>
-<DEFAULT>"wordchar"</DEFAULT>
+<BLURB>Whether to wrap the text and if so how.</BLURB>
+<DEFAULT>wordchar</DEFAULT>
</ARG>
<ARG>
<NAME>GstTextOverlay::xpad</NAME>
<TYPE>gint</TYPE>
<RANGE>>= 0</RANGE>
-<FLAGS>w</FLAGS>
+<FLAGS>rw</FLAGS>
<NICK>horizontal paddding</NICK>
<BLURB>Horizontal paddding when using left/right alignment.</BLURB>
<DEFAULT>25</DEFAULT>
@@ -1232,7 +1232,7 @@
<NAME>GstTextOverlay::ypad</NAME>
<TYPE>gint</TYPE>
<RANGE>>= 0</RANGE>
-<FLAGS>w</FLAGS>
+<FLAGS>rw</FLAGS>
<NICK>vertical padding</NICK>
<BLURB>Vertical padding when using top/bottom alignment.</BLURB>
<DEFAULT>25</DEFAULT>
diff --git a/docs/plugins/gst-plugins-base-plugins.hierarchy b/docs/plugins/gst-plugins-base-plugins.hierarchy
index d11d6df10..b831a756f 100644
--- a/docs/plugins/gst-plugins-base-plugins.hierarchy
+++ b/docs/plugins/gst-plugins-base-plugins.hierarchy
@@ -1,88 +1,89 @@
GObject
- GstRegistry
- GstXMLRegistry
GstObject
GstPad
+ GstPluginFeature
+ GstElementFactory
+ GstTypeFindFactory
+ GstIndexFactory
GstElement
GstBin
GstPipeline
GstPlayBaseBin
GstPlayBin
GstDecodeBin
- GstQueue
- GstBaseSink
- GstVideoSink
- GstXvImageSink
- GstXImageSink
- GstGnomeVFSSink
- GstMultiFdSink
- GstTCPServerSink
- GstBaseAudioSink
- GstAudioSink
- GstAlsaSink
+ GstAdder
+ GstBaseTransform
+ GstAudioConvert
+ GstAudioresample
+ GstFFMpegCsp
+ GstVideoScale
+ GstVolume
+ GstAudioRate
GstBaseSrc
+ GstAudioTestSrc
GstPushSrc
- GstV4lElement
- GstV4lSrc
- GstVideoTestSrc
GstTCPClientSrc
GstTCPServerSrc
+ GstVideoTestSrc
+ GstV4lElement
+ GstV4lSrc
GstBaseAudioSrc
GstAudioSrc
GstAlsaSrc
- GstSineSrc
+ GstCddaBaseSrc
+ GstCdParanoiaSrc
GstGnomeVFSSrc
- GstVorbisTag
- GstBaseTransform
- GstAudioresample
- GstVolume
- GstVideoscale
- GstFFMpegColorspace
- GstAudioConvert
- GstVideorate
- GstTCPClientSink
- GstSubparse
- GstAudiorate
- GstBufferFramesConvert
- GstAdder
- GstVorbisEnc
- GstVorbisDec
- GstVorbisParse
- GstTextOverlay
- GstTimeOverlay
- GstClockOverlay
- GstTextRender
- GstTheoraDec
- GstTheoraEnc
+ GstSubParse
+ GstSsaParse
+ GstBaseSink
+ GstTCPClientSink
+ GstMultiFdSink
+ GstTCPServerSink
+ GstVideoSink
+ GstXImageSink
+ GstXvImageSink
+ GstBaseAudioSink
+ GstAudioSink
+ GstAlsaSink
+ GstGnomeVFSSink
+ GstVideoRate
+ GstAlsaMixerElement
+ GstOggDemux
+ GstOggMux
+ GstOgmParse
+ GstOgmAudioParse
+ GstOgmVideoParse
+ GstOgmTextParse
+ GstOggParse
GstVisual
+ GstVisualjess
GstVisualbumpscope
GstVisualcorona
- GstVisualG-Force
+ GstVisualgdkpixbuf
+ GstVisualinfinite
GstVisualjakdaw
- GstVisualjess
GstVisuallv_analyzer
GstVisuallv_scope
GstVisualoinksie
GstVisualplazma
- GstOggDemux
- GstOggMux
- GstOgmParse
- GstOgmAudioParse
- GstOgmVideoParse
- GstOgmTextParse
- GstOggParse
- GstAlsaMixerElement
+ GstTheoraDec
+ GstTheoraEnc
+ GstVorbisEnc
+ GstVorbisDec
+ GstVorbisParse
+ GstTextOverlay
+ GstTimeOverlay
+ GstClockOverlay
+ GstTextRender
+ GstPlugin
+ GstRegistry
GstPadTemplate
- GstPluginFeature
- GstElementFactory
- GstTypeFindFactory
- GstIndexFactory
GstSignalObject
- GstColorBalanceChannel
- GstTunerNorm
- GstTunerChannel
GstMixerTrack
GstMixerOptions
+ GstTunerNorm
+ GstTunerChannel
+ GstColorBalanceChannel
BonoboObject
BonoboMonikerContext
BonoboForeignObject
@@ -93,14 +94,18 @@ GObject
LinkServer
GIOPServer
GConfClient
+ PangoFontMap
+ PangoFcFontMap
+ PangoFT2FontMap
+ PangoContext
GInterface
GstChildProxy
GstURIHandler
GstImplementsInterface
- GstNavigation
+ GstMixer
+ GstTuner
GstXOverlay
GstColorBalance
- GstTuner
GstPropertyProbe
+ GstNavigation
GstTagSetter
- GstMixer
diff --git a/docs/plugins/gst-plugins-base-plugins.interfaces b/docs/plugins/gst-plugins-base-plugins.interfaces
index 4482c863c..32e44fa11 100644
--- a/docs/plugins/gst-plugins-base-plugins.interfaces
+++ b/docs/plugins/gst-plugins-base-plugins.interfaces
@@ -3,13 +3,15 @@ GstPipeline GstChildProxy
GstPlayBaseBin GstChildProxy
GstPlayBin GstChildProxy
GstDecodeBin GstChildProxy
-GstXvImageSink GstColorBalance GstImplementsInterface GstNavigation GstXOverlay
-GstXImageSink GstImplementsInterface GstNavigation GstXOverlay
-GstV4lElement GstColorBalance GstImplementsInterface GstXOverlay GstTuner GstPropertyProbe
-GstV4lSrc GstColorBalance GstImplementsInterface GstXOverlay GstTuner GstPropertyProbe
+GstVolume GstImplementsInterface GstMixer
+GstV4lElement GstImplementsInterface GstTuner GstXOverlay GstColorBalance GstPropertyProbe
+GstV4lSrc GstImplementsInterface GstTuner GstXOverlay GstColorBalance GstPropertyProbe
GstAlsaSrc GstImplementsInterface GstMixer
+GstCddaBaseSrc GstURIHandler
+GstCdParanoiaSrc GstURIHandler
GstGnomeVFSSrc GstURIHandler
-GstVorbisTag GstTagSetter
-GstVolume GstImplementsInterface GstMixer
+GstXImageSink GstImplementsInterface GstXOverlay GstNavigation
+GstXvImageSink GstImplementsInterface GstXOverlay GstColorBalance GstNavigation
+GstGnomeVFSSink GstURIHandler
+GstAlsaMixerElement GstImplementsInterface GstMixer GstPropertyProbe
GstVorbisEnc GstTagSetter
-GstAlsaMixerElement GstImplementsInterface GstMixer
diff --git a/docs/plugins/gst-plugins-base-plugins.signals b/docs/plugins/gst-plugins-base-plugins.signals
index 84deaa0d6..5dd945c66 100644
--- a/docs/plugins/gst-plugins-base-plugins.signals
+++ b/docs/plugins/gst-plugins-base-plugins.signals
@@ -91,3 +91,17 @@ GstGnomeVFSSink *gstgnomevfssink
GnomeVFSURI *arg1
</SIGNAL>
+<SIGNAL>
+<NAME>GstCdParanoiaSrc::transport-error</NAME>
+<RETURNS>void</RETURNS>
+GstCdParanoiaSrc *gstcdparanoiasrc
+gint arg1
+</SIGNAL>
+
+<SIGNAL>
+<NAME>GstCdParanoiaSrc::uncorrected-error</NAME>
+<RETURNS>void</RETURNS>
+GstCdParanoiaSrc *gstcdparanoiasrc
+gint arg1
+</SIGNAL>
+
diff --git a/gst/ffmpegcolorspace/gstffmpegcolorspace.c b/gst/ffmpegcolorspace/gstffmpegcolorspace.c
index f46b2c653..8d4b5ba9c 100644
--- a/gst/ffmpegcolorspace/gstffmpegcolorspace.c
+++ b/gst/ffmpegcolorspace/gstffmpegcolorspace.c
@@ -307,7 +307,7 @@ gst_ffmpegcsp_get_type (void)
};
ffmpegcsp_type = g_type_register_static (GST_TYPE_BASE_TRANSFORM,
- "GstFFMpegColorspace", &ffmpegcsp_info, 0);
+ "GstFFMpegCsp", &ffmpegcsp_info, 0);
}
return ffmpegcsp_type;
diff --git a/gst/ffmpegcolorspace/gstffmpegcolorspace.h b/gst/ffmpegcolorspace/gstffmpegcolorspace.h
index 33982b71a..8d1e2028a 100644
--- a/gst/ffmpegcolorspace/gstffmpegcolorspace.h
+++ b/gst/ffmpegcolorspace/gstffmpegcolorspace.h
@@ -28,16 +28,11 @@
G_BEGIN_DECLS
-#define GST_TYPE_FFMPEGCSP \
- (gst_ffmpegcsp_get_type())
-#define GST_FFMPEGCSP(obj) \
- (G_TYPE_CHECK_INSTANCE_CAST((obj),GST_TYPE_FFMPEGCSP,GstFFMpegCsp))
-#define GST_FFMPEGCSP_CLASS(klass) \
- (G_TYPE_CHECK_CLASS_CAST((klass),GST_TYPE_FFMPEGCSP,GstFFMpegCsp))
-#define GST_IS_FFMPEGCSP(obj) \
- (G_TYPE_CHECK_INSTANCE_TYPE((obj),GST_TYPE_FFMPEGCSP))
-#define GST_IS_FFMPEGCSP_CLASS(obj) \
- (G_TYPE_CHECK_CLASS_TYPE((klass),GST_TYPE_FFMPEGCSP))
+#define GST_TYPE_FFMPEGCSP (gst_ffmpegcsp_get_type())
+#define GST_FFMPEGCSP(obj) (G_TYPE_CHECK_INSTANCE_CAST((obj),GST_TYPE_FFMPEGCSP,GstFFMpegCsp))
+#define GST_FFMPEGCSP_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST((klass),GST_TYPE_FFMPEGCSP,GstFFMpegCspClass))
+#define GST_IS_FFMPEGCSP(obj) (G_TYPE_CHECK_INSTANCE_TYPE((obj),GST_TYPE_FFMPEGCSP))
+#define GST_IS_FFMPEGCSP_CLASS(obj)(G_TYPE_CHECK_CLASS_TYPE((klass),GST_TYPE_FFMPEGCSP))
typedef struct _GstFFMpegCsp GstFFMpegCsp;
typedef struct _GstFFMpegCspClass GstFFMpegCspClass;
@@ -47,8 +42,7 @@ typedef struct _GstFFMpegCspClass GstFFMpegCspClass;
*
* Opaque object data structure.
*/
-struct _GstFFMpegCsp
-{
+struct _GstFFMpegCsp {
GstBaseTransform element;
gint width, height;
View Lorry Controller Status