diff --git a/gir-files/GES-1.0.gir b/gir-files/GES-1.0.gir index a3c367914..2e7dd2846 100644 --- a/gir-files/GES-1.0.gir +++ b/gir-files/GES-1.0.gir @@ -2536,22 +2536,15 @@ if no track elements are created or an error occurred. The edges of an object contain in a #GESTimeline or #GESTrack - - Represents the start of an object. - + Represents the start of an object. - - Represents the end of an object. - + Represents the end of an object. - - Represent the fact we are not working with any edge of an - object. - + Represent the fact we are not working with any edge of an object. @@ -2593,13 +2586,7 @@ the "edit position" is the timeline time used as part of the edit. You can also find more explanation about the behaviour of those modes at: [trim, ripple and roll](http://pitivi.org/manual/trimming.html) and [clip management](http://pitivi.org/manual/usingclips.html). - - The element is edited the normal way (default). - This only moves a single element. If acting on the start edge of the - element, the element's start time is set to the edit position. - If acting on end edge of the element, the element's duration time - is set such that its end time matches the edit position. - + The element is edited the normal way (default). This only moves a single element. If acting on the start edge of the @@ -2607,17 +2594,7 @@ and [clip management](http://pitivi.org/manual/usingclips.html). If acting on end edge of the element, the element's duration time is set such that its end time matches the edit position. - - The element is edited in ripple mode. This - shifts the element and all later elements (those with equal or later - start times) in the timeline by the same amount. If acting on the - element as a whole, the element's start time is shifted to the edit - position, and later elements are also shifted by the same amount. If - acting on the end edge of the element, the element's **duration time** - is shifted so that the element's end time matches the edit position, - and later elements have their **start time** shifted by the same - amount. - + The element is edited in ripple mode. This shifts the element and all later elements (those with equal or later @@ -2629,20 +2606,7 @@ and [clip management](http://pitivi.org/manual/usingclips.html). and later elements have their **start time** shifted by the same amount. - - The element is edited in roll mode. This trims - the edge of an element and neighbouring edges (opposite edges of other - elements in the timeline with the same corresponding time value), such - that the edges remain in contact. If acting on the start edge of the - element, the start edge is trimmed to the edit position (see - #GES_EDIT_MODE_TRIM), and any other elements in the timeline whose end - time matches the edited element's start time (evaluated before the - edit) will have their **end** edge trimmed to the same edit position. - Similarly, if acting on the end edge of the element, the end edge is - trimmed to the edit position, and any other elements in the timeline - whose start time matches the edited element's end time will have - their start edge trimmed to the same edit position. - + The element is edited in roll mode. This trims the edge of an element and neighbouring edges (opposite edges of other @@ -2657,19 +2621,7 @@ and [clip management](http://pitivi.org/manual/usingclips.html). whose start time matches the edited element's end time will have their start edge trimmed to the same edit position. - - The element is edited in trim mode. This shifts - the edge of a single element while maintaining the timing of - its internal content in the timeline, so the samples/frames/etc of a - source would still appear at the same timeline time when it is played. - If acting on the start edge of the element, the element's start time - will be shifted to the edit position and the element's in-point time - will be shifted by the same amount. Additionally, the element's - duration time will be shifted the other way such that the element's - end time remains the same. If acting on end edge of the element, the - element's duration time is set such that its end time matches the edit - position. - + The element is edited in trim mode. This shifts the edge of a single element while maintaining the timing of @@ -2683,18 +2635,7 @@ and [clip management](http://pitivi.org/manual/usingclips.html). element's duration time is set such that its end time matches the edit position. - - The element is edited in slide mode (not yet - implemented). This shifts the element and will trim the edges of - neighbouring edges on either side accordingly. If acting on the - element as a whole, the element's start time is shifted to the edit - position. Any other elements in the timeline whose end time matches - the edited element's start time (evaluated before the edit) will have - their end edge trimmed to the same edit position. Additionally, any - other elements in the timeline whose start time matches the edited - element's end time will have their start edge trimmed to match the - edited element's **new** end time. - + The element is edited in slide mode (not yet implemented). This shifts the element and will trim the edges of diff --git a/gir-files/fix.sh b/gir-files/fix.sh index 81fa34bb8..5b5db6c2e 100755 --- a/gir-files/fix.sh +++ b/gir-files/fix.sh @@ -89,3 +89,9 @@ xmlstarlet ed --pf --inplace \ --type attr --name 'c:type' --value 'guint8' \ GstSdp-1.0.gir +# Remove duplicated enums +xmlstarlet ed --pf --inplace \ + --delete '//_:enumeration[@name="EditMode"]/_:member[starts-with(@name, "edit_")]' \ + --delete '//_:enumeration[@name="Edge"]/_:member[starts-with(@name, "edge_")]' \ + GES-1.0.gir +