Fix asm compilation on some versions of gcc.

[mlt] / src / modules / gtk2 / producer_pango.yml

diff --git a/src/modules/gtk2/producer_pango.yml b/src/modules/gtk2/producer_pango.yml
index 43d7478999aa1bb3693a123d0856926131ab1952..bcf1531f330748f794e9f6afe592d4c04c04a024 100644 (file)
--- a/src/modules/gtk2/producer_pango.yml
+++ b/src/modules/gtk2/producer_pango.yml
@@ -2,7 +2,7 @@ schema_version: 0.1
 type: producer
 identifier: pango
 title: Pango
-version: 1
+version: 2
 copyright: Ushodaya Enterprises Limited
 creator: Dan Dennedy
 license: LGPLv2.1
@@ -38,25 +38,6 @@ parameters:
     mutable: no
     widget: fileopen
     
-  - identifier: in
-    title: In point
-    type: time
-    description: Set the start time offset to use within the clip
-    readonly: no
-    mutable: no
-    minimum: 0
-    default: 0
-    widget: timecode
-
-  - identifier: out
-    title: Out point
-    type: time
-    description: Set the ending time offset to use within the clip
-    readonly: no
-    minimum: 0
-    mutable: no
-    widget: timecode
-    
   - identifier: markup
     title: Markup
     type: string
@@ -72,7 +53,10 @@ parameters:
   - identifier: fgcolour
     title: Foreground color
     type: string
-    description: an RGBA colour specification of the text (i.e. 0xrrggbbaa)
+    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. You can also use a HTML-style color values #rrggbb or #aarrggbb.
     readonly: no
     mutable: yes
     widget: color
@@ -80,19 +64,46 @@ parameters:
   - identifier: bgcolour
     title: Background color
     type: string
-    description: an RGBA colour of the background rectangle (i.e. 0xrrggbbaa)
+    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. You can also use a HTML-style color values #rrggbb or #aarrggbb.
+    readonly: no
+    mutable: yes
+    widget: color
+    
+  - identifier: olcolour
+    title: Outline color
+    type: string
+    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. You can also use a HTML-style color values #rrggbb or #aarrggbb.
     readonly: no
     mutable: yes
     widget: color
     
+  - identifier: outline
+    title: Outline Width
+    type: string
+    description: >
+      The width of the outline in pixels.
+    readonly: no
+    default: 0
+    minimum: 0
+    maximum: 3
+    mutable: yes
+    widget: spinner
+    
   - identifier: align
     title: Paragraph alignment
     type: string
     description: >
       left, centre, right (also, numbers 0, 1 and 2 can be used respectively)
     readonly: no
+    default: left
     mutable: yes
-    widget: combobox
+    widget: combo
 
   - identifier: pad
     title: Padding
@@ -117,16 +128,53 @@ parameters:
   - identifier: font
     title: Font
     type: string
-    description: The default typeface to use when not using markup.
-    default: "Sans 48". FreeType2 renders at 72 dpi.
+    description: >
+      The default typeface to use when not using markup. 
+      FreeType2 renders at 72 dpi.
+      This property is deprecated. Use family, size and style instead.
+    readonly: no
+    mutable: yes
+    widget: combo
+    
+  - identifier: family
+    title: Font family
+    type: string
+    description: >
+      The default typeface to use when not using markup. 
+    default: Sans
     readonly: no
     mutable: yes
-    widget: combobox
+    widget: combo
+    
+  - identifier: size
+    title: Font size
+    type: integer
+    description: >
+      The size in pixels of the font to use when not using markup. 
+    default: 48
+    readonly: no
+    mutable: yes
+    widget: spinner
+    
+  - identifier: style
+    title: Font style
+    type: string
+    description: >
+      The style of the font to use when not using markup.
+    values:
+      - normal
+      - italic
+    default: normal
+    readonly: no
+    mutable: yes
+    widget: combo
     
   - identifier: weight
     title: Font weight
     type: integer
     description: The weight of the font.
+    minimum: 100
+    maximum: 1000
     default: 400
     readonly: no
     mutable: yes
@@ -141,13 +189,7 @@ parameters:
     default: UTF-8
     readonly: no
     mutable: yes
-    widget: combobox
-    
-  - identifier: resource
-    title: Resource
-    type: string
-    description: The text/markup file or "pango" if no file.
-    readonly: yes
+    widget: combo
 
   - identifier: real_width
     title: Real width
@@ -172,3 +214,9 @@ parameters:
     type: integer
     description: The last requested scaled image height.
     readonly: yes
+    
+  - identifier: force_aspect_ratio
+    title: Sample aspect ratio
+    type: float
+    description: Optionally override a (mis)detected aspect ratio
+    mutable: yes