diff --git a/gir-files/GES-1.0.gir b/gir-files/GES-1.0.gir index e2ded350a..0ff9aabe1 100644 --- a/gir-files/GES-1.0.gir +++ b/gir-files/GES-1.0.gir @@ -6,7 +6,6 @@ and/or use gtk-doc annotations. --> xmlns="http://www.gtk.org/introspection/core/1.0" xmlns:c="http://www.gtk.org/introspection/c/1.0" xmlns:glib="http://www.gtk.org/introspection/glib/1.0"> - @@ -138,7 +137,15 @@ it will not work with this method, but you can instead use the specific - Request a new #GESAsset asyncronously, @callback will be called when the materail is + The @callback will be called from a running #GMainLoop which is iterating a #GMainContext. +Note that, users should ensure the #GMainContext, since this method will notify +@callback from the thread which was associated with a thread default +#GMainContext at calling ges_init(). +For example, if a user wants non-default #GMainContext to be associated +with @callback, ges_init() must be called after g_main_context_push_thread_default () +with custom #GMainContext. + +Request a new #GESAsset asyncronously, @callback will be called when the materail is ready to be used or if an error occured. Example of request of a GESAsset async: @@ -1897,7 +1904,7 @@ get stopped internally. - + Will be emitted after a child was removed from @container. @@ -2163,6 +2170,16 @@ return more than one #GESTrackElement(s) for a given #GESTrack. Represent the fact we are not workin with any edge of an object. + + + + + + + + + + Virtual method for loading a timeline from a given URI. Every #GESFormatter subclass needs to implement this method. + Use @ges_timeline_load_from_uri TRUE if the timeline data was successfully loaded from the URI, else FALSE. @@ -3004,10 +3024,13 @@ else FALSE. Virtual method for saving a timeline to a uri. Every #GESFormatter subclass needs to implement this method. + Use @ges_timeline_save_to_uri TRUE if the timeline data was successfully saved to the URI else FALSE. @@ -3738,6 +3761,8 @@ that if there is no metadata, the function won't be called at all. + Gets the value of a given meta item, returns NULL if @meta_item +can not be found. @@ -3754,14 +3779,14 @@ that if there is no metadata, the function won't be called at all. direction="out" caller-allocates="0" transfer-ownership="full"> - Destination to which value of meta item will be copied -Gets the value of a given meta item, returns NULL if @meta_item -can not be found. + Destination to which value of meta item will be copied + Gets the value of a given meta item, returns NULL if @meta_item +can not be found. @@ -3778,15 +3803,15 @@ can not be found. direction="out" caller-allocates="0" transfer-ownership="full"> - Destination to which value of meta item will be copied -Gets the value of a given meta item, returns NULL if @meta_item -can not be found. + Destination to which value of meta item will be copied + Gets the value of a given meta item, returns NULL if @meta_item +can not be found. @@ -3803,14 +3828,14 @@ can not be found. direction="out" caller-allocates="0" transfer-ownership="full"> - Destination to which value of meta item will be copied -Gets the value of a given meta item, returns NULL if @meta_item -can not be found. + Destination to which value of meta item will be copied + Gets the value of a given meta item, returns NULL if @meta_item +can not be found. @@ -3827,14 +3852,14 @@ can not be found. direction="out" caller-allocates="0" transfer-ownership="full"> - Destination to which value of meta item will be copied -Gets the value of a given meta item, returns NULL if @meta_item -can not be found. + Destination to which value of meta item will be copied + Gets the value of a given meta item, returns %FALSE if @meta_item +can not be found. @@ -3851,14 +3876,14 @@ can not be found. direction="out" caller-allocates="0" transfer-ownership="full"> - Destination to which value of meta item will be copied -Gets the value of a given meta item, returns FALSE if @meta_item -can not be found. + Destination to which value of meta item will be copied + Gets the value of a given meta item, returns NULL if @meta_item +can not be found. @@ -3875,14 +3900,14 @@ can not be found. direction="out" caller-allocates="0" transfer-ownership="full"> - Destination to which value of meta item will be copied -Gets the value of a given meta item, returns NULL if @meta_item -can not be found. + Destination to which value of meta item will be copied + Gets the value of a given meta item, returns %FALSE if @meta_item +can not be found. @@ -3899,9 +3924,7 @@ can not be found. direction="out" caller-allocates="0" transfer-ownership="full"> - Destination to which value of meta item will be copied -Gets the value of a given meta item, returns %FALSE if @meta_item -can not be found. + Destination to which value of meta item will be copied @@ -3925,6 +3948,8 @@ can not be found. + Gets the value of a given meta item, returns NULL if @meta_item +can not be found. @@ -3934,14 +3959,14 @@ can not be found. - Name of the meta item to get -Gets the value of a given meta item, returns NULL if @meta_item -can not be found. + Name of the meta item to get + Gets the value of a given meta item, returns NULL if @meta_item +can not be found. @@ -3958,14 +3983,14 @@ can not be found. direction="out" caller-allocates="0" transfer-ownership="full"> - Destination to which value of meta item will be copied -Gets the value of a given meta item, returns NULL if @meta_item -can not be found. + Destination to which value of meta item will be copied + Gets the value of a given meta item, returns %FALSE if @meta_item +can not be found. @@ -3982,9 +4007,7 @@ can not be found. direction="out" caller-allocates="0" transfer-ownership="full"> - Destination to which value of meta item will be copied -Gets the value of a given meta item, returns NULL if @meta_item -can not be found. + Destination to which value of meta item will be copied @@ -4010,7 +4033,7 @@ The string must be freed with g_free() when no longer needed. metadatas, which means that the type of the registered will be the only type accepted for this meta on that particular @container. - %TRUE if the static meta could be added, %FALSE otherwize + %TRUE if the static meta could be added, %FALSE otherwise @@ -4034,20 +4057,28 @@ type accepted for this meta on that particular @container. + Sets a static meta on @container. This method lets you define static +metadatas, which means that the type of the registered will be the only +type accepted for this meta on that particular @container. + %TRUE if the meta could be registered, %FALSE otherwise + Target container + The #GESMetaFlag to be used + Name of the meta item to set + Value to set @@ -4058,7 +4089,7 @@ type accepted for this meta on that particular @container. metadatas, which means that the type of the registered will be the only type accepted for this meta on that particular @container. - %TRUE if the meta could be register, %FALSE otherwize + %TRUE if the meta could be registered, %FALSE otherwise @@ -4089,7 +4120,7 @@ type accepted for this meta on that particular @container. metadatas, which means that the type of the registered will be the only type accepted for this meta on that particular @container. - %TRUE if the meta could be register, %FALSE otherwize + %TRUE if the meta could be registered, %FALSE otherwise @@ -4120,7 +4151,7 @@ type accepted for this meta on that particular @container. metadatas, which means that the type of the registered will be the only type accepted for this meta on that particular @container. - %TRUE if the meta could be register, %FALSE otherwize + %TRUE if the meta could be registered, %FALSE otherwise @@ -4148,7 +4179,7 @@ type accepted for this meta on that particular @container. metadatas, which means that the type of the registered will be the only type accepted for this meta on that particular @container. - %TRUE if the meta could be register, %FALSE otherwize + %TRUE if the meta could be registered, %FALSE otherwise @@ -4176,7 +4207,7 @@ type accepted for this meta on that particular @container. metadatas, which means that the type of the registered will be the only type accepted for this meta on that particular @container. - %TRUE if the meta could be register, %FALSE otherwize + %TRUE if the meta could be registered, %FALSE otherwise @@ -4204,7 +4235,7 @@ type accepted for this meta on that particular @container. metadatas, which means that the type of the registered will be the only type accepted for this meta on that particular @container. - %TRUE if the meta could be register, %FALSE otherwize + %TRUE if the meta could be registered, %FALSE otherwise @@ -4232,7 +4263,7 @@ type accepted for this meta on that particular @container. metadatas, which means that the type of the registered will be the only type accepted for this meta on that particular @container. - %TRUE if the meta could be register, %FALSE otherwize + %TRUE if the meta could be registered, %FALSE otherwise @@ -4263,7 +4294,7 @@ type accepted for this meta on that particular @container. metadatas, which means that the type of the registered will be the only type accepted for this meta on that particular @container. - %TRUE if the meta could be register, %FALSE otherwize + %TRUE if the meta could be registered, %FALSE otherwise @@ -4291,7 +4322,7 @@ type accepted for this meta on that particular @container. metadatas, which means that the type of the registered will be the only type accepted for this meta on that particular @container. - %TRUE if the meta could be register, %FALSE otherwize + %TRUE if the meta could be registered, %FALSE otherwise @@ -4316,7 +4347,7 @@ type accepted for this meta on that particular @container. Sets the value of a given meta item - %TRUE if the meta could be added, %FALSE otherwize + %TRUE if the meta could be added, %FALSE otherwise @@ -4337,7 +4368,7 @@ type accepted for this meta on that particular @container. Sets the value of a given meta item - %TRUE if the meta could be added, %FALSE otherwize + %TRUE if the meta could be added, %FALSE otherwise @@ -4359,7 +4390,7 @@ type accepted for this meta on that particular @container. c:identifier="ges_meta_container_set_date_time"> Sets the value of a given meta item - %TRUE if the meta could be added, %FALSE otherwize + %TRUE if the meta could be added, %FALSE otherwise @@ -4380,7 +4411,7 @@ type accepted for this meta on that particular @container. Sets the value of a given meta item - %TRUE if the meta could be added, %FALSE otherwize + %TRUE if the meta could be added, %FALSE otherwise @@ -4401,7 +4432,7 @@ type accepted for this meta on that particular @container. Sets the value of a given meta item - %TRUE if the meta could be added, %FALSE otherwize + %TRUE if the meta could be added, %FALSE otherwise @@ -4422,7 +4453,7 @@ type accepted for this meta on that particular @container. Sets the value of a given meta item - %TRUE if the meta could be added, %FALSE otherwize + %TRUE if the meta could be added, %FALSE otherwise @@ -4443,7 +4474,7 @@ type accepted for this meta on that particular @container. Sets the value of a given meta item - %TRUE if the meta could be added, %FALSE otherwize + %TRUE if the meta could be added, %FALSE otherwise @@ -4462,8 +4493,9 @@ type accepted for this meta on that particular @container. + Sets the value of a given meta item - %TRUE if the meta could be added, %FALSE otherwize + %TRUE if the meta could be added, %FALSE otherwise @@ -4479,8 +4511,7 @@ type accepted for this meta on that particular @container. transfer-ownership="none" nullable="1" allow-none="1"> - Value to set -Sets the value of a given meta item + Value to set @@ -4488,7 +4519,7 @@ Sets the value of a given meta item Sets the value of a given meta item - %TRUE if the meta could be added, %FALSE otherwize + %TRUE if the meta could be added, %FALSE otherwise @@ -4509,7 +4540,7 @@ Sets the value of a given meta item Sets the value of a given meta item - %TRUE if the meta could be added, %FALSE otherwize + %TRUE if the meta could be added, %FALSE otherwise @@ -4530,7 +4561,7 @@ Sets the value of a given meta item Sets the value of a given meta item - %TRUE if the meta could be added, %FALSE otherwize + %TRUE if the meta could be added, %FALSE otherwise @@ -5668,7 +5699,7 @@ missing GStreamer plugins, the error will be set to #GST_CORE_ERROR - The #GError defining the error that accured, might be %NULL + The #GError defining the error that occured, might be %NULL @@ -5915,6 +5946,12 @@ only to find out what the new location is. + + Layer priority when the element is not in a layer + + + Will be emitted when the 2 #GESTrackElement ended to snap - + + the first #GESTrackElement that was snapping. - + + the second #GESTrackElement that was snapping. - + + the position where the two objects finally snapping. + Will be emitted when the 2 #GESTrackElement first snapped - + + the first #GESTrackElement that was snapping. - + + the second #GESTrackElement that was snapping. - + + the position where the two objects finally snapping. @@ -7681,6 +7726,20 @@ responsible for controlling its timing properties. + + + The priority of the first layer the element is in (note that only +groups can span over several layers). %GES_TIMELINE_ELEMENT_NO_LAYER_PRIORITY +means that the element is not in a layer. + + + + + A #GESTimelineElement + + + + @@ -7872,41 +7931,57 @@ the in-point of @self according - + + Set the duration of the object + +Note that if the timeline snap-distance property of the timeline containing +@self is set, @self will properly snap to its neighboors. + %TRUE if @duration could be set. + a #GESTimelineElement + the duration in #GstClockTime - + + Set the in-point, that is the moment at which the @self will start +outputting data from its contents. + %TRUE if @inpoint could be set. + a #GESTimelineElement + the in-point in #GstClockTime - + + Set the maximun duration of the object + %TRUE if @maxduration could be set. + a #GESTimelineElement + the maximum duration in #GstClockTime @@ -7930,28 +8005,44 @@ already had a parent or @self and @parent are the same. - + + Sets the priority of the object within the containing layer + All priority management is done by GES itself now. +To set #GESEffect priorities #ges_clip_set_top_effect_index should +be used. + %TRUE if @priority could be set. + a #GESTimelineElement + the priority - + + Set the position of the object in its containing layer. + +Note that if the snapping-distance property of the timeline containing +@self is set, @self will properly snap to the edges around @start. + %TRUE if @start could be set. + a #GESTimelineElement + the position in #GstClockTime @@ -8148,6 +8239,21 @@ name/return location pairs, followed by NULL + + + The priority of the first layer the element is in (note that only +groups can span over several layers). %GES_TIMELINE_ELEMENT_NO_LAYER_PRIORITY +means that the element is not in a layer. + + + + + A #GESTimelineElement + + + + @@ -8556,7 +8662,8 @@ name/return location pairs, followed by NULL Note that if the timeline snap-distance property of the timeline containing @self is set, @self will properly snap to its neighboors. - + %TRUE if @duration could be set. + @@ -8574,7 +8681,8 @@ Note that if the timeline snap-distance property of the timeline containing Set the in-point, that is the moment at which the @self will start outputting data from its contents. - + %TRUE if @inpoint could be set. + @@ -8591,7 +8699,8 @@ outputting data from its contents. c:identifier="ges_timeline_element_set_max_duration"> Set the maximun duration of the object - + %TRUE if @maxduration could be set. + @@ -8652,7 +8761,8 @@ already had a parent or @self and @parent are the same. To set #GESEffect priorities #ges_clip_set_top_effect_index should be used. - + %TRUE if @priority could be set. + @@ -8671,7 +8781,8 @@ be used. Note that if the snapping-distance property of the timeline containing @self is set, @self will properly snap to the edges around @start. - + %TRUE if @start could be set. + @@ -8881,13 +8992,16 @@ already had a parent or @self and @parent are the same. + %TRUE if @start could be set. + a #GESTimelineElement + the position in #GstClockTime @@ -8896,13 +9010,16 @@ already had a parent or @self and @parent are the same. + %TRUE if @inpoint could be set. + a #GESTimelineElement + the in-point in #GstClockTime @@ -8911,13 +9028,16 @@ already had a parent or @self and @parent are the same. + %TRUE if @duration could be set. + a #GESTimelineElement + the duration in #GstClockTime @@ -8926,13 +9046,16 @@ already had a parent or @self and @parent are the same. + %TRUE if @maxduration could be set. + a #GESTimelineElement + the maximum duration in #GstClockTime @@ -8941,13 +9064,16 @@ already had a parent or @self and @parent are the same. + %TRUE if @priority could be set. + a #GESTimelineElement + the priority @@ -9177,8 +9303,24 @@ usage. + + + + The priority of the first layer the element is in (note that only +groups can span over several layers). %GES_TIMELINE_ELEMENT_NO_LAYER_PRIORITY +means that the element is not in a layer. + + + + + A #GESTimelineElement + + + + + - + @@ -9698,9 +9840,13 @@ You can use the following children properties through the + c:identifier="ges_title_source_get_font_desc" + deprecated="1" + deprecated-version="1.16"> Get the pango font description used by @source. - + Use ges_timeline_element_get_child_property instead +(this actually returns a newly allocated string) + The pango font description used by this @source. @@ -9726,9 +9872,14 @@ You can use the following children properties through the - + Get the text currently set on the @source. - + Use ges_timeline_element_get_child_property instead +(this actually returns a newly allocated string) + The text currently set on the @source. @@ -10469,7 +10620,7 @@ To be used by subclasses only An array of categories of GstElement to take into account (as defined in the factory meta "klass" field) - + @@ -10479,7 +10630,7 @@ take into account (as defined in the factory meta "klass" field) allow-none="1"> A blacklist of elements factory names to not take into account - + @@ -10489,7 +10640,7 @@ blacklist of elements factory names to not take into account allow-none="1"> A list of propery names to add as children properties - + @@ -11014,7 +11165,9 @@ occured - The type of binding to create. Only "direct" is available for now. + The type of binding to create. Currently the following values are valid: + - "direct": See #gst_direct_control_binding_new + - "direct-absolute": See #gst_direct_control_binding_new_absolute @@ -11632,10 +11785,25 @@ before create_track_elements is called. The #GESUriClipAsset is a special #GESAsset that lets you handle the media file to use inside the GStreamer Editing Services. It has APIs that let you get information about the medias. Also, the tags found in the media file are -set as Metadatas of the Asser. +set as Metadata of the Asset. + + Finalize the request of an async #GESUriClipAsset + + The #GESUriClipAsset previously requested + + + + + The #GAsyncResult from which to get the newly created #GESUriClipAsset + + + + Creates a #GESUriClipAsset for @uri @@ -11648,7 +11816,7 @@ filesource_asset_loaded_cb (GESAsset * source, GAsyncResult * res, gpointer user GError *error = NULL; GESUriClipAsset *filesource_asset; - filesource_asset = GES_URI_CLIP_ASSET (ges_asset_request_finish (res, &error)); + filesource_asset = ges_uri_clip_asset_finish (res, &error); if (filesource_asset) { g_print ("The file: %s is usable as a FileSource, it is%s an image and lasts %" GST_TIME_FORMAT, ges_asset_get_id (GES_ASSET (filesource_asset)) @@ -11703,9 +11871,9 @@ ges_uri_clip_asset_new (uri, (GAsyncReadyCallback) filesource_asset_loaded_cb, u throws="1"> Creates a #GESUriClipAsset for @uri syncronously. You should avoid to use it in application, and rather create #GESUriClipAsset asynchronously - - A reference to the requested asset or -%NULL if an error happened + + A reference to the requested asset or %NULL if +an error happened @@ -11802,8 +11970,34 @@ GESUriClipAsset + + + + + + + + + + + + + + + + + + + + + - + @@ -11924,6 +12118,18 @@ by #GESUriClipAsset-s. c:type="GESUriSourceAssetPrivate" disguised="1"> + + + + + + + + + + + + @@ -12963,16 +13174,34 @@ for later use. It is normally not needed to call this function in a normal application as the resources will automatically be freed when the program terminates. This function is therefore mostly used by testsuites and other memory profiling tools. +This function should be called from the thread where ges_init() was called. -After this call GES (including this method) should not be used anymore. +After this call GES should not be used until another ges_init() call. + + + + + + + + + + Initialize the GStreamer Editing Service. Call this before any usage of GES. You should take care of initilizing GStreamer before calling this -function. +function. + +MT safety. +GStreamer Editing Services do not guarantee MT safety. +An application is required to use GES APIs (including ges_deinit()) +in the thread where ges_init() was called. @@ -13004,8 +13233,8 @@ for some reason. nullable="1" allow-none="1"> pointer to application's argv - - + + @@ -13030,6 +13259,14 @@ using the ges_init_get_option_group() result. + + Use this function to check if GES has been initialized with ges_init() +or ges_init_check(). + + %TRUE if initialization has been done, %FALSE otherwise. + + + List all @asset filtering per filter as defined by @filter. It copies the asset and thus will not be updated in time. diff --git a/gstreamer-editing-services/src/auto/timeline.rs b/gstreamer-editing-services/src/auto/timeline.rs index d7af97d08..4d364fd6a 100644 --- a/gstreamer-editing-services/src/auto/timeline.rs +++ b/gstreamer-editing-services/src/auto/timeline.rs @@ -410,16 +410,16 @@ where P: IsA { f(&Timeline::from_glib_borrow(this).unsafe_cast(), &from_glib_borrow(layer)) } -unsafe extern "C" fn snapping_ended_trampoline(this: *mut ges_sys::GESTimeline, object: *mut ges_sys::GESTrackElement, p0: *mut ges_sys::GESTrackElement, p1: u64, f: glib_sys::gpointer) +unsafe extern "C" fn snapping_ended_trampoline(this: *mut ges_sys::GESTimeline, obj1: *mut ges_sys::GESTrackElement, obj2: *mut ges_sys::GESTrackElement, position: u64, f: glib_sys::gpointer) where P: IsA { let f: &F = &*(f as *const F); - f(&Timeline::from_glib_borrow(this).unsafe_cast(), &from_glib_borrow(object), &from_glib_borrow(p0), p1) + f(&Timeline::from_glib_borrow(this).unsafe_cast(), &from_glib_borrow(obj1), &from_glib_borrow(obj2), position) } -unsafe extern "C" fn snapping_started_trampoline(this: *mut ges_sys::GESTimeline, object: *mut ges_sys::GESTrackElement, p0: *mut ges_sys::GESTrackElement, p1: u64, f: glib_sys::gpointer) +unsafe extern "C" fn snapping_started_trampoline(this: *mut ges_sys::GESTimeline, obj1: *mut ges_sys::GESTrackElement, obj2: *mut ges_sys::GESTrackElement, position: u64, f: glib_sys::gpointer) where P: IsA { let f: &F = &*(f as *const F); - f(&Timeline::from_glib_borrow(this).unsafe_cast(), &from_glib_borrow(object), &from_glib_borrow(p0), p1) + f(&Timeline::from_glib_borrow(this).unsafe_cast(), &from_glib_borrow(obj1), &from_glib_borrow(obj2), position) } unsafe extern "C" fn track_added_trampoline(this: *mut ges_sys::GESTimeline, track: *mut ges_sys::GESTrack, f: glib_sys::gpointer) diff --git a/gstreamer-editing-services/src/auto/timeline_element.rs b/gstreamer-editing-services/src/auto/timeline_element.rs index 4205240f1..8cce1a80e 100644 --- a/gstreamer-editing-services/src/auto/timeline_element.rs +++ b/gstreamer-editing-services/src/auto/timeline_element.rs @@ -48,6 +48,8 @@ pub trait TimelineElementExt: 'static { fn get_inpoint(&self) -> gst::ClockTime; + fn get_layer_priority(&self) -> u32; + fn get_max_duration(&self) -> gst::ClockTime; fn get_name(&self) -> Option; @@ -88,19 +90,19 @@ pub trait TimelineElementExt: 'static { //fn set_child_property_valist(&self, first_property_name: &str, var_args: /*Unknown conversion*//*Unimplemented*/Unsupported); - fn set_duration(&self, duration: gst::ClockTime); + fn set_duration(&self, duration: gst::ClockTime) -> bool; - fn set_inpoint(&self, inpoint: gst::ClockTime); + fn set_inpoint(&self, inpoint: gst::ClockTime) -> bool; - fn set_max_duration(&self, maxduration: gst::ClockTime); + fn set_max_duration(&self, maxduration: gst::ClockTime) -> bool; fn set_name(&self, name: Option<&str>) -> Result<(), glib::error::BoolError>; fn set_parent>(&self, parent: &P) -> Result<(), glib::error::BoolError>; - fn set_priority(&self, priority: u32); + fn set_priority(&self, priority: u32) -> bool; - fn set_start(&self, start: gst::ClockTime); + fn set_start(&self, start: gst::ClockTime) -> bool; fn set_timeline>(&self, timeline: &P) -> Result<(), glib::error::BoolError>; @@ -174,6 +176,12 @@ impl> TimelineElementExt for O { } } + fn get_layer_priority(&self) -> u32 { + unsafe { + ges_sys::ges_timeline_element_get_layer_priority(self.as_ref().to_glib_none().0) + } + } + fn get_max_duration(&self) -> gst::ClockTime { unsafe { from_glib(ges_sys::ges_timeline_element_get_max_duration(self.as_ref().to_glib_none().0)) @@ -280,21 +288,21 @@ impl> TimelineElementExt for O { // unsafe { TODO: call ges_sys:ges_timeline_element_set_child_property_valist() } //} - fn set_duration(&self, duration: gst::ClockTime) { + fn set_duration(&self, duration: gst::ClockTime) -> bool { unsafe { - ges_sys::ges_timeline_element_set_duration(self.as_ref().to_glib_none().0, duration.to_glib()); + from_glib(ges_sys::ges_timeline_element_set_duration(self.as_ref().to_glib_none().0, duration.to_glib())) } } - fn set_inpoint(&self, inpoint: gst::ClockTime) { + fn set_inpoint(&self, inpoint: gst::ClockTime) -> bool { unsafe { - ges_sys::ges_timeline_element_set_inpoint(self.as_ref().to_glib_none().0, inpoint.to_glib()); + from_glib(ges_sys::ges_timeline_element_set_inpoint(self.as_ref().to_glib_none().0, inpoint.to_glib())) } } - fn set_max_duration(&self, maxduration: gst::ClockTime) { + fn set_max_duration(&self, maxduration: gst::ClockTime) -> bool { unsafe { - ges_sys::ges_timeline_element_set_max_duration(self.as_ref().to_glib_none().0, maxduration.to_glib()); + from_glib(ges_sys::ges_timeline_element_set_max_duration(self.as_ref().to_glib_none().0, maxduration.to_glib())) } } @@ -310,15 +318,15 @@ impl> TimelineElementExt for O { } } - fn set_priority(&self, priority: u32) { + fn set_priority(&self, priority: u32) -> bool { unsafe { - ges_sys::ges_timeline_element_set_priority(self.as_ref().to_glib_none().0, priority); + from_glib(ges_sys::ges_timeline_element_set_priority(self.as_ref().to_glib_none().0, priority)) } } - fn set_start(&self, start: gst::ClockTime) { + fn set_start(&self, start: gst::ClockTime) -> bool { unsafe { - ges_sys::ges_timeline_element_set_start(self.as_ref().to_glib_none().0, start.to_glib()); + from_glib(ges_sys::ges_timeline_element_set_start(self.as_ref().to_glib_none().0, start.to_glib())) } } diff --git a/gstreamer-editing-services/src/auto/uri_clip_asset.rs b/gstreamer-editing-services/src/auto/uri_clip_asset.rs index dff695608..b42c635c8 100644 --- a/gstreamer-editing-services/src/auto/uri_clip_asset.rs +++ b/gstreamer-editing-services/src/auto/uri_clip_asset.rs @@ -29,16 +29,20 @@ glib_wrapper! { } impl UriClipAsset { + //pub fn finish(res: /*Ignored*/&gio::AsyncResult) -> Result { + // unsafe { TODO: call ges_sys:ges_uri_clip_asset_finish() } + //} + //pub fn new, Q: FnOnce(Result<(), Error>) + 'static>(uri: &str, cancellable: Option<&P>, callback: Q) { // unsafe { TODO: call ges_sys:ges_uri_clip_asset_new() } //} - pub fn request_sync(uri: &str) -> Result, Error> { + pub fn request_sync(uri: &str) -> Result { assert_initialized_main_thread!(); unsafe { let mut error = ptr::null_mut(); let ret = ges_sys::ges_uri_clip_asset_request_sync(uri.to_glib_none().0, &mut error); - if error.is_null() { Ok(from_glib_none(ret)) } else { Err(from_glib_full(error)) } + if error.is_null() { Ok(from_glib_full(ret)) } else { Err(from_glib_full(error)) } } } } diff --git a/gstreamer-editing-services/src/auto/versions.txt b/gstreamer-editing-services/src/auto/versions.txt index a9e0ccc5d..81fb66a67 100644 --- a/gstreamer-editing-services/src/auto/versions.txt +++ b/gstreamer-editing-services/src/auto/versions.txt @@ -1,2 +1,2 @@ -Generated by gir (https://github.com/gtk-rs/gir @ 58cffd4) +Generated by gir (https://github.com/gtk-rs/gir @ 7cf0b0e) from gir-files (https://github.com/gtk-rs/gir-files @ ???)