diff --git a/ChangeLog b/ChangeLog index a6c9fb8d0e..24f5945cc4 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,17 @@ +2006-03-02 Wim Taymans + + * 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 * 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 86bd8f2643..88bf4ff3d3 100644 --- a/docs/plugins/gst-plugins-base-plugins-docs.sgml +++ b/docs/plugins/gst-plugins-base-plugins-docs.sgml @@ -43,8 +43,11 @@ + + + diff --git a/docs/plugins/gst-plugins-base-plugins.args b/docs/plugins/gst-plugins-base-plugins.args index fc4ae10e98..27692d1346 100644 --- a/docs/plugins/gst-plugins-base-plugins.args +++ b/docs/plugins/gst-plugins-base-plugins.args @@ -225,7 +225,7 @@ rw method method. -Point Sample (not implemented) +Nearest Neighbour @@ -1142,7 +1142,7 @@ GstTextOverlay::deltax gint -w +rw X position modifier Shift X position to the left or to the right. Unit is pixels. 0 @@ -1152,7 +1152,7 @@ GstTextOverlay::deltay gint -w +rw Y position modifier Shift Y position up or down. Unit is pixels. 0 @@ -1170,19 +1170,19 @@ GstTextOverlay::halign -gchararray +GstTextOverlayHAlign -w +rw horizontal alignment -Horizontal alignment of the text. Can be either 'left', 'right', or 'center'. -"center" +Horizontal alignment of the text. . +center GstTextOverlay::shaded-background gboolean -w +rw shaded background Whether to shade the background under the text area. FALSE @@ -1192,7 +1192,7 @@ GstTextOverlay::text gchararray -w +rw text Text to be display. "" @@ -1200,29 +1200,29 @@ GstTextOverlay::valign -gchararray +GstTextOverlayVAlign -w +rw vertical alignment -Vertical alignment of the text. Can be either 'baseline', 'bottom', or 'top'. -"baseline" +Vertical alignment of the text. . +baseline GstTextOverlay::wrap-mode -gchararray +GstTextOverlayWrapMode -w +rw wrap mode -Whether to wrap the text and if so how.Can be either 'none', 'word', 'char' or 'wordchar'. -"wordchar" +Whether to wrap the text and if so how. +wordchar GstTextOverlay::xpad gint >= 0 -w +rw horizontal paddding Horizontal paddding when using left/right alignment. 25 @@ -1232,7 +1232,7 @@ GstTextOverlay::ypad gint >= 0 -w +rw vertical padding Vertical padding when using top/bottom alignment. 25 diff --git a/docs/plugins/gst-plugins-base-plugins.hierarchy b/docs/plugins/gst-plugins-base-plugins.hierarchy index d11d6df10a..b831a756f8 100644 --- a/docs/plugins/gst-plugins-base-plugins.hierarchy +++ b/docs/plugins/gst-plugins-base-plugins.hierarchy @@ -1,69 +1,53 @@ 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 - GstVisual - GstVisualbumpscope - GstVisualcorona - GstVisualG-Force - GstVisualjakdaw - GstVisualjess - GstVisuallv_analyzer - GstVisuallv_scope - GstVisualoinksie - GstVisualplazma + GstSubParse + GstSsaParse + GstBaseSink + GstTCPClientSink + GstMultiFdSink + GstTCPServerSink + GstVideoSink + GstXImageSink + GstXvImageSink + GstBaseAudioSink + GstAudioSink + GstAlsaSink + GstGnomeVFSSink + GstVideoRate + GstAlsaMixerElement GstOggDemux GstOggMux GstOgmParse @@ -71,18 +55,35 @@ GObject GstOgmVideoParse GstOgmTextParse GstOggParse - GstAlsaMixerElement + GstVisual + GstVisualjess + GstVisualbumpscope + GstVisualcorona + GstVisualgdkpixbuf + GstVisualinfinite + GstVisualjakdaw + GstVisuallv_analyzer + GstVisuallv_scope + GstVisualoinksie + GstVisualplazma + 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 4482c863cd..32e44fa119 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 -GstAlsaSrc GstImplementsInterface GstMixer -GstGnomeVFSSrc GstURIHandler -GstVorbisTag GstTagSetter GstVolume GstImplementsInterface GstMixer +GstV4lElement GstImplementsInterface GstTuner GstXOverlay GstColorBalance GstPropertyProbe +GstV4lSrc GstImplementsInterface GstTuner GstXOverlay GstColorBalance GstPropertyProbe +GstAlsaSrc GstImplementsInterface GstMixer +GstCddaBaseSrc GstURIHandler +GstCdParanoiaSrc GstURIHandler +GstGnomeVFSSrc GstURIHandler +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 84deaa0d69..5dd945c661 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 + +GstCdParanoiaSrc::transport-error +void +GstCdParanoiaSrc *gstcdparanoiasrc +gint arg1 + + + +GstCdParanoiaSrc::uncorrected-error +void +GstCdParanoiaSrc *gstcdparanoiasrc +gint arg1 + + diff --git a/gst/ffmpegcolorspace/gstffmpegcolorspace.c b/gst/ffmpegcolorspace/gstffmpegcolorspace.c index f46b2c6538..8d4b5ba9ca 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 33982b71a8..8d1e2028a3 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;