Commit graph

452 commits

Author SHA1 Message Date
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
d3f210fe6d tests: Add a testsuite for the new timeline edition API 2012-04-23 22:03:11 -04:00
Thibault Saunier
2fd5364927 ges: Add a timeline edition mode API
+ timeline: Add a snapping-distance property
        + Bump the GLib dependency to 2.28 in the mean time as we need some functions from GSequence that only landed
	+ Update the testsuite accordingly

    API: GESTimeline:snapping-distance property
    API: ges_timeline_object_edit
    API: ges_timeline_object_ripple
    API: ges_timeline_object_ripple_end
    API: ges_timeline_object_roll_start
    API: ges_timeline_object_roll_end
    API: ges_timeline_object_trim_start
    API: ges_track_object_edit
    API: GESEdge enum
    API: GESEditMode enum
2012-04-23 22:03:11 -04:00
Thibault Saunier
7cced397b6 tests: Add a basic test for the timeline_object_split method 2012-04-23 20:33:58 -04:00
Thibault Saunier
672a162062 Merge branch '0.10'
Conflicts:
	bindings/python/ges.defs
2012-04-07 22:31:23 -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
e2e2f1261e ges: Update versioning 2012-04-04 14:50:23 +02: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
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
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
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
Edward Hervey
ee237ec523 ges: Various doc fixups and cleanups 2012-01-12 16:34:57 +01:00
Thibault Saunier
826d4f9a71 ges: Bump layer height from 10 to 1000 2012-01-11 11:56:16 -03:00
Thibault Saunier
0c872c4340 ges: Do not add any audio source when still image
We now have a backgroud so no problem with that.

Fix the testsuite accordingly

Fix #657514
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
Mathieu Duponchelle
32ce69684c ges: add track objects to the track before the track-object-added is emitted
NOTE: The caller of ges_timeline_object_create_track_object now needs to add it to
the timeline_object after calling the function.

Fix the testsuite to support that accordingly
2012-01-11 11:56:14 -03:00
Mathieu Duponchelle
4eae7e542d examples: Add a load project option to ges-ui 2012-01-11 11:56:14 -03:00
Mathieu Duponchelle
c210650256 test: Add a pitivi formatter test
For now we requiere a project files and media files to be on the host system,
this is not optimal and we should rework that in the future.
2012-01-11 11:56:14 -03:00
Thibault Saunier
6386247cc4 ges: Move supported formats from filesource to timelineobject
This is usefull by any subclass of GESTimelineObject
 + Bind it in python
 + Fix the keyfile formatter tests

API: ges_timeline_object_set_supported_formats
API: ges_timeline_object_get_supported_formats
2012-01-11 11:56:14 -03:00
Thibault Saunier
09e0d1bbe2 test: Better layer priority handling testing
We use the ges_timeline_object_move_to_layer new function to make sure it works,
and that everything goes well on priority handling with this new method
2012-01-11 11:56:14 -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
Edward Hervey
737acd803e tools: Add proper include for g_printf 2011-12-30 17:20:23 +01:00
Edward Hervey
0fe25be4cb tests/thumbnails: Updates 2011-12-30 17:18:40 +01:00
Edward Hervey
bcb4496b35 tools: Add proper include for g_printf 2011-12-30 17:18:18 +01:00
Edward Hervey
afc400b31a tests/save_and_load: Cleanups and leak fixing 2011-12-30 17:17:11 +01:00
Edward Hervey
ee0cf0b8aa tests/effects: Update for new 'parent' property in objects 2011-12-30 17:16:29 +01:00
Andoni Morales Alastruey
e266d52acf Don't build the examples if it's disabled in configure
Fixes: #657707.
2011-08-31 11:05:02 -07:00
Luis de Bethencourt
237f19d63a GESTimelineTitleSource/TrackTitleSource: add xpos/ypos setting
Vertical and horizontal position properties of the title source
can be set and get.
2011-08-09 19:15:18 +02:00
Luis de Bethencourt
8704011597 GESTimelineTitleSource/TrackTitleSource: add color setting
Color property of the text overlay can be set and get.
2011-08-09 19:13:37 +02:00
Luis de Bethencourt
18d588ff1e examples: add file inpoints and summary to overlay example 2011-08-09 17:39:02 +02:00
Luis de Bethencourt
be381792aa examples: add xpos and ypos options to overlay example 2011-08-08 18:57:37 +02:00
Luis de Bethencourt
63a82c5274 GESTimelineTextOverlay/TrackTextOverlay: add xpos/ypos setting
Vertical and horizontal position properties of the text overlay
can be set and get.
2011-08-08 18:44:57 +02:00
Luis de Bethencourt
0292e86b9b examples: add color option to overlay example 2011-08-03 12:37:14 +02:00
Luis de Bethencourt
ba5babd474 GESTimelineTextOverlay/TrackTextOverlay: add color setting
Color property of the text overlay can be set and get.
2011-08-03 12:20:27 +02:00
Luis de Bethencourt
db58dc1569 tests: selectable audio format/container in test4
now users can select the desired rendering audio format and
container through --aformat and --format, like in ges-launch.
2011-07-01 19:30:01 +02:00
Luis de Bethencourt
882342906f tests: fix TEST_URI for filesource tests 2011-07-01 18:13:08 +02:00
Luis de Bethencourt
f166c47ed5 examples: fix output_uri in test4
clean the make_ogg_vorbis_profile () code.
remove extra second of execution time.
clean some comment typos.
2011-06-29 16:17:00 +02:00
Luis de Bethencourt
6694b28188 examples: remove extra second in test2 and test3
remove unnecessary sources GList.
and fix comment typos as well.
2011-06-27 21:25:40 +02:00
Thibault Saunier
3195bd1303 GESTrackkEffect: Fix Leaks 2011-05-07 12:33:33 +02:00
Edward Hervey
de42c1c7f2 tests: Add effects to ignored files 2011-05-06 11:58:02 +02:00
Thibault Saunier
3b13d0fee0 ges-ui: add effects 2011-05-06 10:39:05 +02:00
Thibault Saunier
54ed9b1709 GESTrackObject: add a ges_track_object_list_children_properties method
test: Test the new method, and also set/get_child_property_by_spec
2011-05-06 10:39:05 +02:00
Thibault Saunier
0e9658812e GESTrackObject: Implement a get/set_child_property_by_spec and get/set_child_property_valist methods
Reimplement the get/set_property accordingly
2011-05-06 10:39:05 +02:00
Thibault Saunier
7f3e64bd82 GESTimelineObject: Change the get_effects method to get_top_effects. 2011-05-06 10:39:04 +02:00
Thibault Saunier
9dccf8d475 GESTimelineObject: use GESTrackEffect as base classe for effects and not GESTrackOperation. 2011-05-06 10:39:04 +02:00
Thibault Saunier
ecb280c85e TrackParseLaunchEffect: rename ges_track_parse_launch_effect_new_from_bin_desc method to ges_track_parse_launch_effect_new 2011-05-06 10:39:03 +02:00
Thibault Saunier
4b4439ad8a Make GESTimelineEffect abstract and move its implementation to GESTimelineParseLaunchEffect
test: Adapte the test suite to suite the new API
2011-05-06 10:39:03 +02:00
Thibault Saunier
ea3625f4b9 Make GESTrackEffect abstract and move its implementation to GESTrackParseLaunchEffect
test: update the effect test suite
2011-05-06 10:39:03 +02:00
Thibault Saunier
da717d6b25 GESTrackObject: add the deep-notify signal
tests: test the new signal
2011-05-06 10:39:03 +02:00
Thibault Saunier
68c1ade22d GESTimelineObject: Emit signal when adding and removing effects
tests: test that those signals are actually well sent
2011-05-06 10:39:03 +02:00
Thibault Saunier
3f4a4a7134 GesTrackObject: add the ges_track_object_get_child_property method
test: Test this new method

design: change the design file to fit the implementation
2011-05-06 10:39:02 +02:00
Thibault Saunier
d9c07a4ed4 GESTrackObject: add a ges_track_object_set_child_property_method
test: Test the new method
2011-05-06 10:39:02 +02:00
Thibault Saunier
28ea2cf7a1 tests: use the AgingTv as testing effects instead of identity
Lets us try the new property handling implementation in TrackObject
2011-05-06 10:39:02 +02:00
Thibault Saunier
d18c9fe8fb GESTimelineObject: add a ges_timeline_object_set_top_effect_priority method
Lets the user have a minimum of control over effects priorities
2011-05-06 10:39:02 +02:00
Thibault Saunier
1a7081ade3 test: Better priorities height setting testing 2011-05-06 10:39:02 +02:00
Thibault Saunier
861b724cd6 TimelineEffect: implement the create_track_object vmethod
tests: test the new vmethod
2011-05-06 10:39:01 +02:00
Thibault Saunier
72873aed92 test: check the height of a TimelineObject when adding effects to it 2011-05-06 10:39:01 +02:00
Thibault Saunier
ca2d5bca2b TimelineObject: add the ges_timeline_object_get_top_effect_position method
tests: adapt the effect testsuite to use this function

docs: add the method to the documentation
2011-05-06 10:39:00 +02:00
Thibault Saunier
5e84bf8fe3 TimelineObject: add ges_timeline_object_get_effects API
tests: Test the new TimelineObject API

docs: add the corresponding fonction
2011-05-06 10:39:00 +02:00
Thibault Saunier
647f7c34d9 effects: Make TrackEffect implementation corresponding to the new effect API description
Make the effects testsuite correspond to the new API

Fixe a few compilation issues due to TrackEffect
2011-05-06 10:38:59 +02:00
Thibault Saunier
6e5d16ac6d GESTrackEffect: add private struct 2011-05-06 10:38:58 +02:00
Thibault Saunier
63e901ed12 GESTrackEffect: implementation of this new class 2011-05-06 10:38:58 +02:00
Edward Hervey
027b454926 examples: Make sure we don't end up using NULL values 2011-03-15 14:05:07 +01:00
Edward Hervey
c8d77f2360 examples: Remove unused code 2011-03-15 14:04:49 +01:00
Sebastian Dröge
94d448cace examples: Fix uninitialized variable compiler warning with gcc 4.6 2011-01-27 17:47:17 +01:00
Edward Hervey
6b8f736e21 tests: Unref the GList returned by ges_timeline_get_layers...
... in addition to the content themselves
2011-01-10 11:18:27 +01:00
Thibault Saunier
98b51d8cd1 TimelineFileSource: Create instance private and move private variables to it
Fixe/Add getter and setters methods for those variables

Fixup documentation
2011-01-08 22:45:44 +01:00
Thibault Saunier
3d6764d6e9 Timeline: Add instance private and Move private variables to it
Fixe/Add getter methods to get those variables

Fixup documentation
2011-01-08 22:45:44 +01:00
Thibault Saunier
e793cb6f9c TimelineTestSource: Move private variables to instance private
Fixe/Add getter and setter methods for those variables

Fixup documentation
2011-01-08 22:45:44 +01:00
Thibault Saunier
595e6434cb TimelineTitleSource: Move private variables to instance private
Fixe/Add getter and setters methods for those variables

Fixup documentation
2011-01-08 22:37:52 +01:00
Thibault Saunier
b8493f8896 TrackAudioTestSource: Move private variables to instance private
Add getter methods to get those variables

Fixup documentation
2011-01-08 22:32:53 +01:00
Thibault Saunier
e042aa30e4 TrackTextOverlay: Move private variables to instance private
Add getter methods to get those variables

Add/Fixup documentation
2011-01-08 22:32:53 +01:00
Tim-Philipp Müller
84a17a3d12 test: make unit tests compile and work in uninstalled setup 2011-01-08 01:40:18 +00:00
Edward Hervey
7c255ff247 TrackTitleSource: Move private variables to instance private
Add getter methods to get those variables

Add/Fixup documentation
2011-01-06 12:04:53 +01:00
Edward Hervey
2d9f03fde0 TrackVideoTestSource: Move private data to instance private
Add a getter for the pattern

Document methods
2011-01-06 11:29:44 +01:00
Edward Hervey
58afc44fd7 TrackVideoTransition: Move private variable to instance private
Also add/fixup methods to get/set the transition type and document them.
2011-01-06 11:21:51 +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
c90f399bfb TimelineObject: Hold a reference to the controlled TrackObject 2010-12-20 12:03:48 +01:00
Edward Hervey
648f8802db tests: Put clearer names on tests
Makes it easier to figure out which test failed :)
2010-12-20 12:03:48 +01:00
Brandon Lewis
42f4253ee2 GESSimpleTimelineLayer: add test for _index() method 2010-12-16 19:37:06 +01:00
Edward Hervey
e970c86753 GESTimelineObject: Add mapping/offset support [start/priority properties]
Allows moving independently (or not) timelineobjects and trackobjects and
have them synchronized with the offsets taken into account.

Right now only the start and priority properties are synchronized. The duration
and in-point properties will require more thoughts.
2010-12-16 19:29:14 +01:00
Edward Hervey
e6aeb97040 GESTrackObject: Add a 'locked' property for position synchronization
And update all code using it
2010-12-16 16:27:26 +01:00
Edward Hervey
8ca6f66f4c GESTrackObject: Hide more variables and provide accessors for them 2010-12-16 15:00:46 +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
7ef6f365d9 GESSimpleTimelineLayer: _nth() returns a const
The refcount isn't incremented.
2010-12-15 19:18:16 +01:00
Edward Hervey
ed6b2ce4c4 GESTrack: Make more properties private
And ensure exported symbols are properly documented and have
argument checking.
2010-12-15 19:05:48 +01:00
Brandon Lewis
4dae5c83f4 GESSimpleTimelineLayer: add test for _nth() method 2010-12-15 18:01:33 +01:00
Edward Hervey
0486623e30 test: Disable the text_properties_in_layer test until it's properly implemented 2010-12-15 15:56:38 +01:00
Edward Hervey
4c63aa21f2 ges: Switch to encoding-profile API from base
Remove dependency on gst-convenience.
2010-12-15 12:38:03 +01:00
Edward Hervey
7a098a423d GESTimelineSource: Remove textoverlay properties
This will be made more generic by allowing any overlay/effect to
be put on any source object.
2010-12-09 19:36:44 +01:00
Edward Hervey
a5261d23d2 tests: Make sure gst_bin_add succeeds
And detect when we're trying to add contents to a gnlsource which
already has something
2010-12-09 17:43:08 +01:00
Edward Hervey
ef7eb9efdd GESTransition: Make it a base class and add GESTimelineStandardTransition
This is to ensure people can create their own Layer Transition subclass.

API : GESTimelineTransition is now GESTimelineStandardTransition
2010-12-09 17:09:11 +01:00
Thibault Saunier
dfeb7afe85 GESTimelineObject: add private structure 2010-12-08 13:00:21 +01:00
Thibault Saunier
7fc3be7d44 GESSimpleTimelineLayer: add private structure 2010-12-08 13:00:15 +01:00
Brandon Lewis
2b63a52a6a Tests: fix CMP_FAIL on 32-bit machines 2010-12-03 12:39:42 +01:00
Edward Hervey
9e1877a083 tests: Make sure we specify guint64 with g_object_set arguments
Yup, had missed those because of weird macros :(
2010-12-02 12:28:15 +01:00
Thibault Saunier
4add2937de SimpleTimelineLayer: Remove bogus check and extend unit test to validate it 2010-12-02 11:55:44 +01:00
Edward Hervey
098a2294f3 tests: Make sure we specify guint64 with g_object_set arguments
Avoids crashers on 32bit machines
2010-12-02 11:54:03 +01:00
Brandon Lewis
107b5fcf5e ges-ui: allow enabling/disabling audio/video tracks 2010-11-27 18:14:06 +01:00
Brandon Lewis
c91d1dd32d ges-ui: implement save as command in gtk demo 2010-11-27 18:12:50 +01:00
Brandon Lewis
ae098803fc ges-ui: implement load command 2010-11-27 18:12:50 +01:00
Brandon Lewis
02da3a8cba ges-ui: don't assume we always have 1 layer and two tracks 2010-11-27 18:12:49 +01:00
Brandon Lewis
a4f315274c ges-ui: add new command, remove quit command (closing last window quits app) 2010-11-27 18:12:49 +01:00
Edward Hervey
e557592074 test: Fix typo in simplelayer test 2010-11-27 18:12:49 +01:00
Edward Hervey
f3904653b7 check: Small cleanup of the save/load test 2010-11-27 18:12:49 +01:00
Brandon Lewis
d1bdd2ddf2 tests: add save->load test case 2010-11-27 18:08:20 +01:00
Brandon Lewis
a2dcf03f86 tests: use ges_formatter_{get,set}_data accessors in unit tests 2010-11-27 18:08:20 +01:00
Brandon Lewis
cc57dcf681 tests: update unit tests 2010-11-27 18:08:20 +01:00
Brandon Lewis
4f0136c5ac tests: Add save/load tests 2010-11-27 18:08:19 +01:00
Brandon Lewis
9f2f21d8df tests: test for track removal while timeline contains timeline objects 2010-11-27 17:23:30 +01:00
Brandon Lewis
d7af7f630a tests: test that adding tracks after adding layers works 2010-11-27 17:23:30 +01:00
Brandon Lewis
8cee3b95ba tests: unit test to check that objects in layers are properly added to the timeline 2010-11-27 17:23:29 +01:00
Edward Hervey
d4b5e6d6ab tests: Ignore more files 2010-11-23 17:33:32 +01:00
Edward Hervey
99e7180e0c examples: Fix for latest GstDiscoverer API changes 2010-11-09 16:27:06 +01:00
Edward Hervey
6364e8ec2c all: Changes for discoverer being merged upstream
Along with a whole bunch of Makefile fixups
2010-09-23 18:42:48 +02:00
Edward Hervey
a02a5c2320 Update for factorylist/convertframe being merged to gst core/base 2010-09-16 08:39:46 +02:00
Edward Hervey
d76535bc59 Update to moved gst-convenience 2010-09-16 08:39:01 +02:00
Brandon Lewis
e56ed70a68 relax restrictions on adding transitions
We don't need these any more: the valid property tells us whether it is safe
to go to GST_STATE_PLAYING or not.
2010-09-02 18:08:44 +02:00
Brandon Lewis
dad81a6f32 move a callback into the proper section of the file 2010-09-02 18:08:44 +02:00
Brandon Lewis
6533e038c9 fix bug in time format regex 2010-09-02 18:08:44 +02:00
Brandon Lewis
c8d243b931 show duration text entry for all object types 2010-09-02 18:08:43 +02:00
Brandon Lewis
e98e10bad8 connect to delete event instead of destroy 2010-09-02 18:08:43 +02:00
Brandon Lewis
e0dbbcce6f hide empty menus 2010-09-02 18:08:43 +02:00
Brandon Lewis
6103645f38 ignore some UI signals when selection changes 2010-09-02 18:08:43 +02:00
Brandon Lewis
92e1ae637e disable playback when layer is in invalid state 2010-09-02 18:08:43 +02:00
Brandon Lewis
6e844f877f layer is also invalid when there are transitoins at the beginning/end 2010-09-02 18:08:43 +02:00
Brandon Lewis
03e488ac74 add vaid property and unit tests 2010-09-02 18:08:43 +02:00
Brandon Lewis
11bb201e9d update list store layer emits object-moved 2010-09-02 18:08:43 +02:00
Brandon Lewis
4fd305cbec add unit tests for 'object-moved' signal 2010-09-02 18:08:43 +02:00
Brandon Lewis
98e070d412 implement move up/down commands 2010-09-02 18:04:30 +02:00
Brandon Lewis
848b15eb8c connect to move_{up,down actions 2010-09-02 18:04:30 +02:00
Brandon Lewis
d14f1f11c5 also disallow moving past the start or end of timeline 2010-09-02 18:04:30 +02:00
Brandon Lewis
9e2352332a can move only when exactly one clip is selected (and not in playback/paused) 2010-09-02 18:04:30 +02:00
Brandon Lewis
a6968fc33a add move up/down actions 2010-09-02 18:04:29 +02:00
Brandon Lewis
d799e7720a re-arrange tool-bar buttons 2010-09-02 18:04:29 +02:00
Brandon Lewis
8975053255 don't allow changes to timeline if we're paused 2010-09-02 18:04:29 +02:00
Brandon Lewis
081dc24869 implement the stop button 2010-09-02 18:04:29 +02:00
Brandon Lewis
c94b446766 add stop button 2010-09-02 18:04:29 +02:00
Brandon Lewis
6377906e12 code clean-up and comments 2010-09-02 18:04:29 +02:00
Brandon Lewis
5f67510bf6 eliminate unecessary function prototypes 2010-09-02 18:04:29 +02:00
Brandon Lewis
de28ea361e move UI callbacks to end of file 2010-09-02 18:04:29 +02:00
Brandon Lewis
9b1fa9c8cc clean up application struct 2010-09-02 18:04:29 +02:00
Brandon Lewis
029f6b8228 more xml tweaks 2010-09-02 18:04:29 +02:00
Brandon Lewis
678d5fd710 don't connect to selected objects unless selection is homogenous 2010-09-02 18:04:29 +02:00
Brandon Lewis
634babbeb7 UI layout tweaks 2010-09-02 18:04:29 +02:00
Brandon Lewis
004e30a72c only allow transitions to be added when the last object isn't a transition 2010-09-02 18:04:29 +02:00
Brandon Lewis
6da49412d3 use a private struct with get_selection_foreach 2010-09-02 18:04:28 +02:00