From 994c3ebf12fccab333f32fbf52bbece5137a7096 Mon Sep 17 00:00:00 2001 From: Dan Dennedy Date: Thu, 7 Jul 2011 23:52:57 -0700 Subject: [PATCH] Fixup some YAML in last commit. --- src/modules/core/filter_greyscale.yml | 2 +- src/modules/core/filter_luma.yml | 14 +++++--- src/modules/core/filter_watermark.yml | 47 ++++++++++++++++---------- src/modules/core/producer_colour.yml | 10 +++--- src/modules/core/producer_noise.yml | 6 ---- src/modules/dv/producer_libdv.yml | 12 ++----- src/modules/gtk2/producer_pango.yml | 32 +++++++++--------- src/modules/gtk2/producer_pixbuf.yml | 45 ++++++++++++++++-------- src/modules/vorbis/producer_vorbis.yml | 7 ---- src/modules/xml/producer_xml.yml | 15 ++------ 10 files changed, 95 insertions(+), 95 deletions(-) diff --git a/src/modules/core/filter_greyscale.yml b/src/modules/core/filter_greyscale.yml index 86e146fd..eeb66f76 100644 --- a/src/modules/core/filter_greyscale.yml +++ b/src/modules/core/filter_greyscale.yml @@ -9,4 +9,4 @@ license: LGPLv2.1 language: en tags: - Video -description: Convert colour image to greyscale \ No newline at end of file +description: Convert colour image to greyscale diff --git a/src/modules/core/filter_luma.yml b/src/modules/core/filter_luma.yml index 49df1914..faafde5f 100644 --- a/src/modules/core/filter_luma.yml +++ b/src/modules/core/filter_luma.yml @@ -9,7 +9,7 @@ license: LGPLv2.1 language: en tags: - Video -description: | +description: > Applies a luma transition between the current and next frames. Useful for transitions from a slideshow created using producer pixbuf. parameters: @@ -17,14 +17,20 @@ parameters: title: File type: string description: The luma map file to be used for the transition - - identifier: period + - identifier: cycle title: Period type: integer description: > - How long to wait between success iterations of the transition. For best + The duration between iterations of the transition. For best results set this to a multiple of ttl used in pixbuf. mutable: yes - default: 24 + default: 25 + - identifer: duration + title: Duration + type: integer + description: The length of the transition. + mutable: yes + default: 25 - identifier: luma.* title: Luma Properties description: > diff --git a/src/modules/core/filter_watermark.yml b/src/modules/core/filter_watermark.yml index 0da36d16..bb8cda65 100644 --- a/src/modules/core/filter_watermark.yml +++ b/src/modules/core/filter_watermark.yml @@ -10,7 +10,7 @@ language: en tags: - Video description: Overlay text or images onto the video -notes: | +notes: > The watermark filter combines a frame producer and a composite transition to overlay the specified text or image onto the video. @@ -30,22 +30,22 @@ notes: | parameters: - identifier: argument - title: File or Text + title: File/URL type: string - description: A pango or pixbuf producer file name. + description: The file to overlay. required: no readonly: no default: unset widget: fileopen - identifier: resource - title: File or Text + title: File/URL type: string - description: see argument + description: The file to overlay. required: no readonly: no default: unset - widget: fileopen or text + widget: fileopen - identifier: distort title: Allow distorted scaling @@ -55,23 +55,36 @@ parameters: maximum: 1 widget: checkbox - - identifier: producer - title: Pango or Pixbuf producer - type: producer + - identifier: producer.* + title: Producer description: | - A pango or pixbuf producer (as appropriate for the file name). - Properties may be set on the producer to control its behavior. + Properties may be set on the encapsulated producer. e.g.: producer.align=centre See "pango" and "pixbuf" producers for details. readonly: no - - identifier: composite - title: Composite Transition - type: transition + - identifier: composite.* + title: Composite description: | - The transition that combines the images from the pango or pixbuf producer - with the images from the track. - Properties may be set on the composite to control its behavior. + Properties may be set on the encapsulated composite. e.g.: composite.valign=c See "composite" transition for details. readonly: no + + - identifier: reverse + title: Reverse + type: integer + description: Overlay the video to which the filter is applied atop the supplied file. + minimum: 0 + maximum: 1 + mutable: yes + widget: checkbox + + - identifier: deinterlace + description: Force the supplied file to be be deinterlaced if it is interlaced. + type: integer + description: + minimum: 0 + maximum: 1 + mutable: yes + widget: checkbox diff --git a/src/modules/core/producer_colour.yml b/src/modules/core/producer_colour.yml index 5c2ead9d..341b0bc5 100644 --- a/src/modules/core/producer_colour.yml +++ b/src/modules/core/producer_colour.yml @@ -12,15 +12,13 @@ tags: description: A simple color generator. parameters: - identifier: argument - title: Color value - description: | + title: Color + description: > A color value is a hexadecimal representation of RGB plus alpha channel as 0xrrggbbaa. Colors can also be the words: white, black, red, green, - or blue. + or blue. You can also use a HTML-style color values #rrggbb or #aarrggbb. type: string required: no readonly: no default: black - widget: textbox - - + widget: color diff --git a/src/modules/core/producer_noise.yml b/src/modules/core/producer_noise.yml index 1e848961..cd3e6076 100644 --- a/src/modules/core/producer_noise.yml +++ b/src/modules/core/producer_noise.yml @@ -31,12 +31,6 @@ parameters: mutable: no widget: timecode - - identifier: fps - title: Frame Rate - type: double - description: The output frame rate of the producer - readonly: yes - - identifier: aspect_ratio title: Aspect Ratio type: double diff --git a/src/modules/dv/producer_libdv.yml b/src/modules/dv/producer_libdv.yml index 416a71cc..3b313861 100644 --- a/src/modules/dv/producer_libdv.yml +++ b/src/modules/dv/producer_libdv.yml @@ -13,12 +13,10 @@ tags: description: A libdv based decoder for video and audio. parameters: - identifier: argument - title: Filename - description: The name of a .dv file. + title: File type: string required: yes readonly: no - default: widget: fileopen - identifier: in @@ -43,15 +41,8 @@ parameters: - identifier: resource title: Resource type: string - description: The location of the file readonly: yes - - identifier: fps - title: Frame Rate - type: double - description: The output frame rate of the producer - readonly: yes - - identifier: length title: Length type: time @@ -66,3 +57,4 @@ parameters: readonly: no mutable: yes widget: combobox + default: best diff --git a/src/modules/gtk2/producer_pango.yml b/src/modules/gtk2/producer_pango.yml index cd03f8d0..43d74789 100644 --- a/src/modules/gtk2/producer_pango.yml +++ b/src/modules/gtk2/producer_pango.yml @@ -9,17 +9,17 @@ license: LGPLv2.1 language: en tags: - Video -description: | +description: > A title generator that uses the Pango international text layout and Freetype2 font renderer. -notes: | +notes: > Supplying a filename with extension ".txt" causes the loader producer to load with pango. If the filename begins with "+" the pango producer interprets the filename as pango text. This is a shortcut to embed titles in melt commands. For MLT XML, it is recommended that you embed the title text in the property value. - Pango has builtin scaling. It will rescale the originally rendered title to + Pango has builtin scaling. It will rescale the originally rendered title to whatever the consumer requests. Therefore, it will lose its aspect ratio if so requested, and it is up to the consumer to request a proper width and height that maintains the image aspect. @@ -36,7 +36,7 @@ parameters: readonly: no required: yes mutable: no - widget: fileopen # could provide a button to use a file-open dialog + widget: fileopen - identifier: in title: In point @@ -70,25 +70,25 @@ parameters: widget: textbox - identifier: fgcolour - title: Foreground Colour + title: Foreground color type: string description: an RGBA colour specification of the text (i.e. 0xrrggbbaa) readonly: no mutable: yes - widget: colorpicker + widget: color - identifier: bgcolour - title: Background Colour + title: Background color type: string description: an RGBA colour of the background rectangle (i.e. 0xrrggbbaa) readonly: no mutable: yes - widget: colorpicker + widget: color - identifier: align - title: Paragraph Alignment + title: Paragraph alignment type: string - description: | + description: > left, centre, right (also, numbers 0, 1 and 2 can be used respectively) readonly: no mutable: yes @@ -97,7 +97,7 @@ parameters: - identifier: pad title: Padding type: integer - description: | + description: > The number of pixels to pad the background rectangle beyond edges of text. readonly: no default: 0 @@ -124,7 +124,7 @@ parameters: widget: combobox - identifier: weight - title: Font Weight + title: Font weight type: integer description: The weight of the font. default: 400 @@ -135,7 +135,7 @@ parameters: - identifier: encoding title: Encoding type: string - description: | + description: > The text encoding type of the input if not UTF-8. See 'iconv --list' for a list of possible inputs. default: UTF-8 @@ -150,13 +150,13 @@ parameters: readonly: yes - identifier: real_width - title: Real Width + title: Real width type: integer description: The original, unscaled width of the rendered title. readonly: yes - identifier: real_height - title: Real Height + title: Real height type: integer description: The original, unscaled height of the rendered title. readonly: yes @@ -171,4 +171,4 @@ parameters: title: Height type: integer description: The last requested scaled image height. - readonly: yes \ No newline at end of file + readonly: yes diff --git a/src/modules/gtk2/producer_pixbuf.yml b/src/modules/gtk2/producer_pixbuf.yml index 4156e745..382ff010 100644 --- a/src/modules/gtk2/producer_pixbuf.yml +++ b/src/modules/gtk2/producer_pixbuf.yml @@ -9,9 +9,9 @@ license: LGPLv2.1 language: en tags: - Video -description: | +description: > A still graphics to video generator using gdk-pixbuf -notes: | +notes: > Pixbuf has builtin scaling. It will rescale the originally rendered title to whatever the consumer requests. Therefore, it will lose its aspect ratio if so requested, and it is up to the consumer to request a proper width and @@ -21,25 +21,24 @@ parameters: - identifier: argument title: File type: string - description: - - > + description: > The name of a graphics file loadable by a gdk-pixbuf loader. - See /usr/lib/gdk-pixbuf/loaders - definitely png, jpeg, tiff, pnm, and xpm - - > + See /usr/lib/gdk-pixbuf/loaders. + Definitely png, jpeg, tiff, pnm, and xpm will work. + If "%" in filename, the filename is used with sprintf generate a filename from a counter for multi-file/flipbook animation. The file sequence ends when numeric discontinuity >100. - - > + If filename contains "/.all.", suffix with an extension to load all pictures with matching extension from a directory. - - > + If filename contains the string " + Reload the file instead of using its cached image. This property + automatically resets itself once it has been set 1 and processed. + minimum: 0 + maximum: 1 + mutable: yes + + - identifier: disable_exif + title: Disable auto-rotation + type: integer + minimum: 0 + maximum: 1 + widget: checkbox diff --git a/src/modules/vorbis/producer_vorbis.yml b/src/modules/vorbis/producer_vorbis.yml index 8e833592..c5e87e24 100644 --- a/src/modules/vorbis/producer_vorbis.yml +++ b/src/modules/vorbis/producer_vorbis.yml @@ -24,7 +24,6 @@ parameters: - identifier: resource title: Resource type: string - description: File location. See "argument" above. readonly: yes - identifier: in @@ -45,9 +44,3 @@ parameters: minimum: 0 mutable: no widget: timecode - - - identifier: fps - title: Frame Rate - type: double - description: The output frame rate of the producer - readonly: yes \ No newline at end of file diff --git a/src/modules/xml/producer_xml.yml b/src/modules/xml/producer_xml.yml index 1aaebdfb..20ba3aba 100644 --- a/src/modules/xml/producer_xml.yml +++ b/src/modules/xml/producer_xml.yml @@ -14,19 +14,9 @@ description: | Construct a service network from an XML description. See docs/mlt-xml.txt. parameters: - identifier: argument - title: URL + title: File type: string - description: | - An XML text file containing MLT XML - Since MLT XML files can be parameterised, the URL syntax is: - {file-name}[?{param-name}{'='|':'}{param-value}[&{param-name}{'='|':'}{param-value}...]] - A colon is allowed instead of an equal sign to pacify melt, who tokenises - anything with an equal sign as a property setting. Also, when running - melt from the shell, beware of the '?' and shell filename expansion. You - can surround the URL with single quotations to prevent expansion. - Finally, the loader will fail to match the filename when you use - parameters, so preface the url with 'xml:' to force the loader to load - with the xml service. + description: An XML text file containing MLT XML. readonly: no required: yes mutable: no @@ -35,5 +25,4 @@ parameters: - identifier: resource title: Resource type: string - description: File location. See "argument" above. readonly: yes -- 2.39.2