Commit graph

57 commits

Author SHA1 Message Date
Thibault Saunier
f32fdf13b7 Merge remote-tracking branch 'origin/0.10'
Conflicts:
	bindings/python/ges.defs
	ges/ges-screenshot.c
	ges/ges-track-video-transition.c
2012-05-26 17:00:50 -04:00
Thibault Saunier
f19a8af81f timeline-layer: Rework the way we calculate in which layer a TrackObject is 2012-05-19 13:57:35 -04:00
Thibault Saunier
b1a8596256 Merge remote-tracking branch 'origin/0.10'
Conflicts:
	bindings/python/ges-types.defs
	bindings/python/ges.defs
	bindings/python/ges.override
	configure.ac
	ges/ges-timeline.c
2012-04-25 17:54:36 -04:00
Thibault Saunier
f06ca66012 timelineobject: Fix wrong naming when connection to in-point notify
inpoint -> in-point
2012-04-23 22:03:11 -04:00
Thibault Saunier
672a162062 Merge branch '0.10'
Conflicts:
	bindings/python/ges.defs
2012-04-07 22:31:23 -04:00
Thibault Saunier
2e43caf911 timeline-layer: Factor out a method to start observing timeline for auto-transitions 2012-04-07 22:26:08 -04:00
Thibault Saunier
e172c294fe timeline-layer: Reorganize file 2012-04-07 22:26:08 -04:00
Thibault Saunier
64b4a38494 timeline-layer: Rework auto transition callbacks management
We now have a GESTrack::track-object-added signal so we now depend on it rather than on each GESTimelineObject::track-object-added signal.
2012-04-07 22:24:55 -04:00
Thibault Saunier
83dc13c63d docs: Tell users that adding an object to a timeline layer creates media related objects 2012-04-07 22:24:55 -04:00
Thibault Saunier
a1aa78cd28 ges: Misc debug loggin cleanup 2012-04-07 22:24:55 -04:00
Thibault Saunier
4a881a43d9 layer: Add a method to check if a layer is empty or not
API: ges_timeline_layer_is_empty
2012-04-07 22:24:55 -04:00
Thibault Saunier
13a2857db7 timeline-layer: Do not call track_get_by_layer when track == NULL 2012-04-04 20:15:19 -04:00
Thibault Saunier
1728704d09 Merge branch '0.10'
Conflicts:
	bindings/python/ges.defs
2012-03-29 12:55:44 -04:00
Thibault Saunier
149ceeab2e timeline-layer: Add a method to get the timeline it is currently in
API: ges_timeline_layer_get_timeline

Bind it in python
2012-03-27 22:33:57 -04:00
Tim-Philipp Müller
1f37aefdcd Remove ges-marshal.[ch] and use the generic marshaller 2012-03-12 15:46:42 +00:00
Edward Hervey
ee237ec523 ges: Various doc fixups and cleanups 2012-01-12 16:34:57 +01:00
Mark Nauwelaerts
282c3c4b49 ges: only use glib constructs as required in configure.ac 2012-01-12 15:12:14 +01:00
mathieu duponchelle
2376c313a1 Disconnect handlers when object is removed from layer 2012-01-11 11:56:17 -03:00
mathieu duponchelle
1bd6e9b758 Edit : typos 2012-01-11 11:56:17 -03:00
Mathieu Duponchelle
93046aad6b GES : remove transitions when needed
Conflicts:

	ges/ges-timeline.c
2012-01-11 11:56:17 -03:00
mathieu duponchelle
cc031a5f6a Fixes auto transitions on layers + n. 2012-01-11 11:56:17 -03:00
Thibault Saunier
826d4f9a71 ges: Bump layer height from 10 to 1000 2012-01-11 11:56:16 -03:00
Thibault Saunier
5d35024cd3 docs: Update documentation 2012-01-11 11:56:16 -03:00
Thibault Saunier
97846d698c ges: Remove transitions properly 2012-01-11 11:56:16 -03:00
Thibault Saunier
82974d9a9d ges: Misc fixes in ges-timeline-layer
Put the comment where they are meant to be
Make static functions static
Use LAYER_HEIGHT where needed
2012-01-11 11:56:16 -03:00
Thibault Saunier
5021017904 ges: Auto transition cleanup 2012-01-11 11:56:15 -03:00
Mathieu Duponchelle
7212307db5 ges: makes "pass over" accurate and reset priority when transition is removed 2012-01-11 11:56:15 -03:00
Mathieu Duponchelle
0e11ec4137 ges: add an auto-transition to the layer
API: GESTimelineLayer.auto_transition property
2012-01-11 11:56:15 -03:00
Thibault Saunier
ee5c67de2f ges: Add some debugging symbols 2012-01-11 11:56:13 -03:00
Thibault Saunier
15c816569b ges: Handle TimelineLayer and its contained TimelineObject priorities properly
GESTimelineObject.priority is now actually relative to its containing layer
priority.

Test it in the layer test-suite.
2012-01-11 11:56:13 -03:00
Thibault Saunier
acf8c258ef ges: Define a LAYER_HEIGHT constant in the normal layer 2012-01-11 11:56:13 -03:00
Tim-Philipp Müller
2a98347461 ges: fix a couple of printf format warnings 2011-01-31 19:00:49 +00:00
Thibault Saunier
dc6290a5e2 docs: Document all the undocumented public functions 2011-01-10 15:14:45 +01:00
Edward Hervey
1450d539d4 GESTimelineObject: Subclass from GInitiallyUnowned
The floating reference will be owned by the Layer
2010-12-20 12:03:48 +01:00
Edward Hervey
11887e0058 GESTimelineLayer: Subclass from GInitiallyUnowned
The floating reference will be owned by the Timeline
2010-12-20 12:03:48 +01:00
Edward Hervey
5a170091e6 GESTimelineLayer: Hide the object list and priority
Add needed setters/getters
2010-12-16 12:41:26 +01:00
Edward Hervey
3eadc4aa31 ges: Add more documentation and annotations
This should make GES gobject-introspection compliant now.
2010-12-15 19:40:11 +01:00
Edward Hervey
237ea89aa7 ges: Remove unused GObject vmethods 2010-12-09 15:12:34 +01:00
Thibault Saunier
dfeb7afe85 GESTimelineObject: add private structure 2010-12-08 13:00:21 +01:00
Thibault Saunier
4c91a36f9a ges: Add instance private structures 2010-12-08 12:54:02 +01:00
Edward Hervey
7176c26810 TimelineLayer: Add debug statement regarding priorities 2010-11-27 18:12:49 +01:00
Brandon Lewis
06695545e0 GESTimelineLayer: add get_objects virtual method 2010-11-27 17:23:29 +01:00
Edward Hervey
d8d1e95952 TimelineLayer: Document _set_priority 2010-07-09 13:21:17 +02:00
Brandon Lewis
1ec9238358 ges/ges-timeline-layer.c: C90 fixes 2010-06-09 16:29:26 +02:00
Edward Hervey
b6277bd8bb GESTimelineLayer: Release all layer/tracks when being disposed 2010-06-09 13:52:08 +02:00
Brandon Lewis
93534c0500 Add missing documentation 2010-06-09 11:28:09 +02:00
Brandon Lewis
c9a2f73579 hacking 2010-06-09 11:28:07 +02:00
Edward Hervey
9b1a434e95 GESTimelineLayer: Add a 'priority' property 2010-03-13 15:56:57 +01:00
Edward Hervey
dd9d3e420c ges/: Fix copyright in headers 2009-11-30 15:14:25 +01:00
Edward Hervey
b54487fe11 Finish public API documentation 2009-09-16 12:37:45 +02:00