Sebastian Dröge
9db6d45dbb
Automatic update of common submodule
...
From 464fe15 to 6db25be
2012-04-13 13:39:50 +02:00
Thibault Saunier
672a162062
Merge branch '0.10'
...
Conflicts:
bindings/python/ges.defs
2012-04-07 22:31:23 -04:00
Thibault Saunier
2741a8fb38
timeline-object: Add TrackObject to the Track after the TimelineObject
...
This way, the Track::track-object-added is emited after the TrackObject is ready to be used, and it make the API easier to use.
2012-04-07 22:26:08 -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
259af361bc
timeline-object: Properly reflect contained TrackObject duration and inpoint properties changes
2012-04-07 22:24:55 -04:00
Thibault Saunier
c783f4140a
trackobject: Some documentation fixing
2012-04-07 22:24:55 -04:00
Thibault Saunier
97ac4c4910
docs: Add ges_timeline_object_release_track_object
...
We need it especially in the case of effects
2012-04-07 22:24:55 -04:00
Thibault Saunier
8ae1cddae2
trackobject: Add API documentation
2012-04-07 22:24:55 -04:00
Thibault Saunier
ad5bc85516
ges: Calm logging when not created TrackObject on purpose
2012-04-07 22:24:55 -04:00
Thibault Saunier
979b9ac0b6
timeline: Restructurate the file separting methods/callbacks/API
2012-04-07 22:24:55 -04:00
Thibault Saunier
1c04feace0
timelineobject: Emit effect-added when adding any kind of TrackEffect
...
We were only emitting it when working with TrackParseLaunch effects
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
4b34d2bbb3
timeline: Plug a leak when calling enable_update
2012-04-07 22:24:55 -04:00
Thibault Saunier
7e7059d37d
timeline: Rework the append_layer method
...
ges_timeline_append_layer now creates a new layer, adds it to the timeline
and returns it
This code has not been released yet so we can break this API.
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
4c26b89e3c
ges: Move the max-duration property from TrackFileSource to TrackObject
...
This property was firstly added to TrackFileSource, but in the end, it makes
more sense for it to be directly in TrackOject as it can be usefull in other cases.
2012-04-07 22:24:55 -04:00
Sebastian Dröge
35e2f8f111
Automatic update of common submodule
...
From 7fda524 to 464fe15
2012-04-05 18:45:53 +02:00
Thibault Saunier
13a2857db7
timeline-layer: Do not call track_get_by_layer when track == NULL
2012-04-04 20:15:19 -04:00
Thiago Santos
8a3fc66e70
Merge branch '0.10'
2012-04-04 14:02:43 -03:00
Thiago Santos
54aac450da
ges: timeline-pipeline: Remove playsink send_event hack
...
This is fixed now in upstream playsink, remove the hack
https://bugzilla.gnome.org/show_bug.cgi?id=673211
2012-04-04 11:44:27 -03:00
Sebastian Dröge
e2e2f1261e
ges: Update versioning
2012-04-04 14:50:23 +02:00
Sebastian Dröge
8429fd526c
Merge remote-tracking branch 'origin/0.10'
...
Conflicts:
bindings/python/Makefile.am
ges/Makefile.am
2012-04-04 12:08:06 +02:00
Thibault Saunier
7282ee2ff4
formatter: Try to figure out new paths when media files have moved
...
Introduces a dependency to GIO
2012-04-03 20:41:27 -04:00
Thibault Saunier
1728704d09
Merge branch '0.10'
...
Conflicts:
bindings/python/ges.defs
2012-03-29 12:55:44 -04:00
Sebastian Dröge
fa44d050f5
Merge remote-tracking branch 'origin/0.10'
2012-03-29 15:10:09 +02:00
Thibault Saunier
148e7ef411
timelineobject: Set TrackObject's TimelineObject only when calling the add function
...
ges_timeline_object_add_track_object actually calls
ges_track_object_set_timeline_object so do not do it once more ourself.
Especially since it results in having a TrackObject.timeline_object refering
to a TimelineObject it is not actually in yet.
2012-03-28 13:10:27 -04:00
Volodymyr Rudyi
1dcb142307
ges-track: Set gnlobject state to NULL before disposing it
...
Work around a deadlock if setting state to NULL right before removing the
gnlobject from the composition.
https://bugzilla.gnome.org/show_bug.cgi?id=672751
2012-03-27 22:35:26 -04:00
Thibault Saunier
6447a50001
timelineobject: Update the nb_effect when releasing a TrackEffect
2012-03-27 22:33:57 -04:00
Thibault Saunier
d5b4fa215e
ges: Add a way to know whether a timeline is updating on each changes
...
+ Bind the new API in python
API: ges_timeline_is_updating
API: ges_track_is_updating
2012-03-27 22:33:57 -04:00
Thibault Saunier
a762e72c13
trackobject: Enable adding a TrackObject in a Track before a TimelineObject
...
We were requiring it only for GESCustomTimelineSource, but it is not actually
necessary so, we can just check if the TrackObject is in a TimelineObject or
not, and react accordingly.
2012-03-27 22:33:57 -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
Volodymyr Rudyi
4148d605ad
ges-track: Set gnlobject state to NULL before disposing it
...
Work around a deadlock if setting state to NULL right before removing the
gnlobject from the composition.
https://bugzilla.gnome.org/show_bug.cgi?id=672751
2012-03-27 22:33:00 -04:00
Wim Taymans
9f6bbb8bab
Replace master with 0.11
2012-03-26 12:43:30 +02:00
Tim-Philipp Müller
70c023626a
ges-pitivi-formatter: add copyright/license headers
...
https://bugzilla.gnome.org/show_bug.cgi?id=644943
2012-03-19 10:57:14 +00:00
Tim-Philipp Müller
3ecd02cc24
Merge remote-tracking branch 'origin/master' into 0.11
2012-03-13 13:52:32 +00:00
Tim-Philipp Müller
c3d9cb2b22
tests: fix weird windowsy code in save_and_load unit test
...
Fixes compiler error about FILENAME_MAX in 0.11
2012-03-13 13:51:30 +00:00
Tim-Philipp Müller
f043f05698
ges-timeline-pipeline: port to 0.11
2012-03-12 16:22:22 +00:00
Tim-Philipp Müller
1f37aefdcd
Remove ges-marshal.[ch] and use the generic marshaller
2012-03-12 15:46:42 +00:00
Tim-Philipp Müller
7504f0f097
configure: bump GLib requirement in line with core and other libs
2012-03-12 15:37:33 +00:00
Tim-Philipp Müller
5d02075d9b
Merge remote-tracking branch 'origin/master' into 0.11
...
Conflicts:
bindings/python/Makefile.am
bindings/python/ges-types.defs
bindings/python/ges.defs
bindings/python/ges.override
bindings/python/gesmodule.c
bindings/python/testsuite/test_textoverlay.py
2012-03-12 15:25:49 +00:00
Tim-Philipp Müller
e121368e37
configure: check for libxml2 explicitly
...
GStreamer may be built without the libxml2 dependency.
2012-03-12 15:15:22 +00:00
Tim-Philipp Müller
6a3391eae8
ges-pitivi-formatter: move libxml includes into .c file
...
There's no need to have them in the header file.
2012-03-12 15:09:39 +00:00
Sebastian Dröge
2fc0a0c619
ges: Fix 'implicit conversion from enumeration type 'GESTextHAlign' to different enumeration type 'GESTextVAlign'' and similar compiler warnings
2012-03-06 15:37:18 +01:00
Sebastian Dröge
70fda7d45d
ges: Fix 'comparison of unsigned expression < 0 is always false'
2012-03-06 15:35:51 +01:00
Tim-Philipp Müller
7c80521e0b
bindings: don't link to libges four times
...
And even less different versions of it.
2012-02-17 13:49:25 +00:00
Tim-Philipp Müller
1da4d71431
tests: ges_track_new() takes ownership of caps, so can't use GST_CAPS_ANY
2012-02-10 19:44:49 +00:00
Tim-Philipp Müller
404fcc8bed
tests: port tests to new raw caps
2012-02-10 19:42:16 +00:00