Skip to content

Commit

Permalink
Fix rect format and defaults in metadata.
Browse files Browse the repository at this point in the history
It is bad to suggest using comma as a separator for rect values because
that is the decimal separator for many locales. The canonical format (as
set in the mlt_property serializer) is to use spaces as separator.
  • Loading branch information
ddennedy committed Apr 19, 2016
1 parent b286c20 commit fa5be34
Show file tree
Hide file tree
Showing 5 changed files with 9 additions and 11 deletions.
2 changes: 1 addition & 1 deletion src/framework/metaschema.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -76,7 +76,7 @@ mapping:
- properties # for passing options to encapsulated services
- string
- time # time string values (clock, SMPTE) can be accepted in addition to frames
- rect # X,Y,W,H
- rect # "X Y W H" or "X/Y:WxH"
- color # 0xrrggbbaa | #rrggbb | #aarrggbb
"service-name": # for type: properties, a reference to another service
type: str # format: type.service, e.g. transition.composite
Expand Down
5 changes: 2 additions & 3 deletions src/modules/qt/filter_audiospectrum.yml
Original file line number Diff line number Diff line change
Expand Up @@ -97,11 +97,11 @@ parameters:
description: >
Defines the rectangle that the waveform(s) should be drawn in.
Format is: "X,Y,W,H".
Format is: "X Y W H".
X, Y, W, H are assumed to be pixel units unless they have the suffix '%'.
type: rect
default: "0,0,100%,100%"
default: "0 0 100% 100%"
readonly: no
mutable: yes

Expand Down Expand Up @@ -220,4 +220,3 @@ parameters:
mutable: no
readonly: no
default: 2048

4 changes: 2 additions & 2 deletions src/modules/qt/filter_audiowaveform.cpp
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
/*
* filter_audiowaveform.cpp -- audio waveform visualization filter
* Copyright (c) 2015 Meltytech, LLC
* Copyright (c) 2015-2016 Meltytech, LLC
* Author: Brian Matherly <[email protected]>
*
* This library is free software; you can redistribute it and/or
Expand Down Expand Up @@ -270,7 +270,7 @@ mlt_filter filter_audiowaveform_init( mlt_profile profile, mlt_service_type type
mlt_properties_set( filter_properties, "thickness", "0" );
mlt_properties_set( filter_properties, "show_channel", "0" );
mlt_properties_set( filter_properties, "angle", "0" );
mlt_properties_set( filter_properties, "rect", "0,0,100%,100%" );
mlt_properties_set( filter_properties, "rect", "0 0 100% 100%" );
mlt_properties_set( filter_properties, "fill", "0" );
mlt_properties_set( filter_properties, "gorient", "v" );

Expand Down
5 changes: 2 additions & 3 deletions src/modules/qt/filter_audiowaveform.yml
Original file line number Diff line number Diff line change
Expand Up @@ -98,11 +98,11 @@ parameters:
description: >
Defines the rectangle that the waveform(s) should be drawn in.
Format is: "X,Y,W,H".
Format is: "X Y W H".
X, Y, W, H are assumed to be pixel units unless they have the suffix '%'.
type: rect
default: "0,0,100%,100%"
default: "0 0 100% 100%"
readonly: no
mutable: yes

Expand All @@ -126,4 +126,3 @@ parameters:
readonly: no
mutable: yes
widget: combo

4 changes: 2 additions & 2 deletions src/modules/qt/filter_lightshow.yml
Original file line number Diff line number Diff line change
Expand Up @@ -95,11 +95,11 @@ parameters:
description: >
Defines the rectangle that the color should be drawn in.
Format is: "X,Y,W,H".
Format is: "X Y W H".
X, Y, W, H are assumed to be pixel units unless they have the suffix '%'.
type: rect
default: "0,0,100%,100%"
default: "0 0 100% 100%"
readonly: no
mutable: yes

Expand Down

0 comments on commit fa5be34

Please sign in to comment.