Commit graph

1153 commits

Author SHA1 Message Date
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
Tim-Philipp Müller
1a48407337 track: add g-i annotation that ges_track_new() takes ownership of caps passed 2012-02-10 19:36:49 +00:00
Tim-Philipp Müller
7b7bf95268 ges: port to new raw audio/video caps
Completely untested, but more likely to work than the
existing code.
2012-02-10 19:35:28 +00:00
Tim-Philipp Müller
91af8e1353 examples, ges-launch: remove deprecated g_thread_init()
Not needed any more with recent glib versions
2012-02-10 19:17:38 +00:00
Tim-Philipp Müller
b1361c556f g-i: need to call gst_init() before ges_init() so GST_TYPE_CAPS is set
Fixes "g_param_spec_boxed: assertion `G_TYPE_IS_BOXED (boxed_type)' failed"
warnings when running g-ir-scanner.
2012-02-10 19:14:24 +00:00
Tim-Philipp Müller
1e1012602e track-{audio,video}-transition: update for controller API changes 2012-02-10 19:01:03 +00:00
Tim-Philipp Müller
1b2bb14aab timeline-pipeline: use standard GLib API to save thumbnail data to file 2012-02-10 18:43:51 +00:00
Tim-Philipp Müller
c69ea5652d timeline-pipeline: update for new gst_buffer_map() API 2012-02-10 18:35:07 +00:00
Mark Nauwelaerts
2162c635e2 ges: support and handle no-more-pads in GESTimeline(Pipeline)
... to arrange for a clean READY to PAUSED state change transition.
Not doing so might have playsink reaching PAUSED prematurely
as one track prerolls, only to lose this state again (temporarily)
when the other track needs to preroll.

This is generally not nice or convenient, and particularly nasty
when trying to perform seek in PAUSED.
2012-01-30 11:35:13 +01:00
Thomas Vander Stichele
8bf47d9112 Automatic update of common submodule
From c463bc0 to 7fda524
2012-01-25 14:13:02 +01:00
Sebastian Dröge
35ecbf6ace Automatic update of common submodule
From 2a59016 to c463bc0
2012-01-25 11:41:15 +01:00
Sebastian Dröge
84d119bb5f Automatic update of common submodule
From 0807187 to 2a59016
2012-01-18 16:48:52 +01: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
Mark Nauwelaerts
dbedd4f98d pkgconfig: fix uninstalled pkgconfig to handle out-of-source build case 2012-01-12 15:11:10 +01:00
Thibault Saunier
3df2f0ae0a pitivi-formatter: Use the new Formatter->project_loaded vmethod 2012-01-11 11:56:18 -03:00
Thibault Saunier
f5c861ddc3 formatter: Add a "loaded" signal
API: GESFormatter::loaded signal
API: GESFormatter->project_loaded VMethod
2012-01-11 11:56:18 -03:00
Thibault Saunier
5672ac8159 docs: Add a pitivi-formatter documentation
Move the API to the API section of the pitivi-formatter file
2012-01-11 11:56:18 -03:00
Thibault Saunier
c2d5992af0 formatter: Enhance some debug logging 2012-01-11 11:56:18 -03:00
Thibault Saunier
10803b553d ges: Rework the ges_pitivi_get_sources method
+ Remove the URI parameter of ges_pitivi_get_sources

    + Rework how we handle the PitiviFormatterPrivate.source_table HashTable
      rename it to sources_table to make a difference between it and the
      source_table(s) it containes
2012-01-11 11:56:17 -03:00
Thibault Saunier
31430b1e0a ges: Let user set a source list on the PitiviFormatter
API: ges_pitivi_formatter_set_sources

Bind it in python
2012-01-11 11:56:17 -03:00
Thibault Saunier
a904904b77 ges: Handle the new SourceMoved API in PitiviFormatter 2012-01-11 11:56:17 -03:00
Thibault Saunier
94a9806893 bindings: Bind the new formatter API 2012-01-11 11:56:17 -03:00
Thibault Saunier
7c0ba83b26 ges: Add an API to Formatter to be able to handle moved sources
API: GESFormatter::source-moved signal
API: GESFormatter::update_source_uri virtual method

Conflicts:

	ges/ges-formatter.h
2012-01-11 11:56:17 -03:00
Thibault Saunier
b844ff04de ges: Add a "discovery-error" signal to GESTimeline
API: GESTimeline::discovery-error signal
2012-01-11 11:56:17 -03:00