diff options
Diffstat (limited to 'src/slideshow')
| -rw-r--r-- | src/slideshow/Slideshow.c | 125 | ||||
| -rw-r--r-- | src/slideshow/TransitionEffects.c | 787 |
2 files changed, 451 insertions, 461 deletions
diff --git a/src/slideshow/Slideshow.c b/src/slideshow/Slideshow.c index 4955bbd..df6975c 100644 --- a/src/slideshow/Slideshow.c +++ b/src/slideshow/Slideshow.c @@ -1,4 +1,4 @@ -/* Slideshow.c generated by valac 0.34.7, the Vala compiler +/* Slideshow.c generated by valac 0.36.6, the Vala compiler * generated from Slideshow.vala, do not modify */ /* Copyright 2016 Software Freedom Conservancy Inc. @@ -18,16 +18,16 @@ void slideshow_init (GError** error); -static void _vala_array_add33 (gchar*** array, int* length, int* size, gchar* value); -static void _vala_array_add34 (gchar*** array, int* length, int* size, gchar* value); -static void _vala_array_add35 (gchar*** array, int* length, int* size, gchar* value); -static void _vala_array_add36 (gchar*** array, int* length, int* size, gchar* value); -static void _vala_array_add37 (gchar*** array, int* length, int* size, gchar* value); -static void _vala_array_add38 (gchar*** array, int* length, int* size, gchar* value); -static void _vala_array_add39 (gchar*** array, int* length, int* size, gchar* value); -static void _vala_array_add40 (gchar*** array, int* length, int* size, gchar* value); -static void _vala_array_add41 (gchar*** array, int* length, int* size, gchar* value); -static void _vala_array_add42 (gchar*** array, int* length, int* size, gchar* value); +static void _vala_array_add33 (gchar** * array, int* length, int* size, gchar* value); +static void _vala_array_add34 (gchar** * array, int* length, int* size, gchar* value); +static void _vala_array_add35 (gchar** * array, int* length, int* size, gchar* value); +static void _vala_array_add36 (gchar** * array, int* length, int* size, gchar* value); +static void _vala_array_add37 (gchar** * array, int* length, int* size, gchar* value); +static void _vala_array_add38 (gchar** * array, int* length, int* size, gchar* value); +static void _vala_array_add39 (gchar** * array, int* length, int* size, gchar* value); +static void _vala_array_add40 (gchar** * array, int* length, int* size, gchar* value); +static void _vala_array_add41 (gchar** * array, int* length, int* size, gchar* value); +static void _vala_array_add42 (gchar** * array, int* length, int* size, gchar* value); void plugins_register_extension_point (GType type, const gchar* name, const gchar* icon_name, gchar** core_ids, int core_ids_length1); #define RESOURCES_ICON_SLIDESHOW_EXTENSION_POINT "slideshow-extension-point" void transition_effects_manager_init (void); @@ -37,7 +37,7 @@ static void _vala_array_destroy (gpointer array, gint array_length, GDestroyNoti static void _vala_array_free (gpointer array, gint array_length, GDestroyNotify destroy_func); -static void _vala_array_add33 (gchar*** array, int* length, int* size, gchar* value) { +static void _vala_array_add33 (gchar** * array, int* length, int* size, gchar* value) { #line 11 "/home/jens/Source/shotwell/src/slideshow/Slideshow.vala" if ((*length) == (*size)) { #line 11 "/home/jens/Source/shotwell/src/slideshow/Slideshow.vala" @@ -54,7 +54,7 @@ static void _vala_array_add33 (gchar*** array, int* length, int* size, gchar* va } -static void _vala_array_add34 (gchar*** array, int* length, int* size, gchar* value) { +static void _vala_array_add34 (gchar** * array, int* length, int* size, gchar* value) { #line 12 "/home/jens/Source/shotwell/src/slideshow/Slideshow.vala" if ((*length) == (*size)) { #line 12 "/home/jens/Source/shotwell/src/slideshow/Slideshow.vala" @@ -71,7 +71,7 @@ static void _vala_array_add34 (gchar*** array, int* length, int* size, gchar* va } -static void _vala_array_add35 (gchar*** array, int* length, int* size, gchar* value) { +static void _vala_array_add35 (gchar** * array, int* length, int* size, gchar* value) { #line 13 "/home/jens/Source/shotwell/src/slideshow/Slideshow.vala" if ((*length) == (*size)) { #line 13 "/home/jens/Source/shotwell/src/slideshow/Slideshow.vala" @@ -88,7 +88,7 @@ static void _vala_array_add35 (gchar*** array, int* length, int* size, gchar* va } -static void _vala_array_add36 (gchar*** array, int* length, int* size, gchar* value) { +static void _vala_array_add36 (gchar** * array, int* length, int* size, gchar* value) { #line 14 "/home/jens/Source/shotwell/src/slideshow/Slideshow.vala" if ((*length) == (*size)) { #line 14 "/home/jens/Source/shotwell/src/slideshow/Slideshow.vala" @@ -105,7 +105,7 @@ static void _vala_array_add36 (gchar*** array, int* length, int* size, gchar* va } -static void _vala_array_add37 (gchar*** array, int* length, int* size, gchar* value) { +static void _vala_array_add37 (gchar** * array, int* length, int* size, gchar* value) { #line 15 "/home/jens/Source/shotwell/src/slideshow/Slideshow.vala" if ((*length) == (*size)) { #line 15 "/home/jens/Source/shotwell/src/slideshow/Slideshow.vala" @@ -122,7 +122,7 @@ static void _vala_array_add37 (gchar*** array, int* length, int* size, gchar* va } -static void _vala_array_add38 (gchar*** array, int* length, int* size, gchar* value) { +static void _vala_array_add38 (gchar** * array, int* length, int* size, gchar* value) { #line 16 "/home/jens/Source/shotwell/src/slideshow/Slideshow.vala" if ((*length) == (*size)) { #line 16 "/home/jens/Source/shotwell/src/slideshow/Slideshow.vala" @@ -139,7 +139,7 @@ static void _vala_array_add38 (gchar*** array, int* length, int* size, gchar* va } -static void _vala_array_add39 (gchar*** array, int* length, int* size, gchar* value) { +static void _vala_array_add39 (gchar** * array, int* length, int* size, gchar* value) { #line 17 "/home/jens/Source/shotwell/src/slideshow/Slideshow.vala" if ((*length) == (*size)) { #line 17 "/home/jens/Source/shotwell/src/slideshow/Slideshow.vala" @@ -156,7 +156,7 @@ static void _vala_array_add39 (gchar*** array, int* length, int* size, gchar* va } -static void _vala_array_add40 (gchar*** array, int* length, int* size, gchar* value) { +static void _vala_array_add40 (gchar** * array, int* length, int* size, gchar* value) { #line 18 "/home/jens/Source/shotwell/src/slideshow/Slideshow.vala" if ((*length) == (*size)) { #line 18 "/home/jens/Source/shotwell/src/slideshow/Slideshow.vala" @@ -173,7 +173,7 @@ static void _vala_array_add40 (gchar*** array, int* length, int* size, gchar* va } -static void _vala_array_add41 (gchar*** array, int* length, int* size, gchar* value) { +static void _vala_array_add41 (gchar** * array, int* length, int* size, gchar* value) { #line 19 "/home/jens/Source/shotwell/src/slideshow/Slideshow.vala" if ((*length) == (*size)) { #line 19 "/home/jens/Source/shotwell/src/slideshow/Slideshow.vala" @@ -190,7 +190,7 @@ static void _vala_array_add41 (gchar*** array, int* length, int* size, gchar* va } -static void _vala_array_add42 (gchar*** array, int* length, int* size, gchar* value) { +static void _vala_array_add42 (gchar** * array, int* length, int* size, gchar* value) { #line 20 "/home/jens/Source/shotwell/src/slideshow/Slideshow.vala" if ((*length) == (*size)) { #line 20 "/home/jens/Source/shotwell/src/slideshow/Slideshow.vala" @@ -209,42 +209,41 @@ static void _vala_array_add42 (gchar*** array, int* length, int* size, gchar* va void slideshow_init (GError** error) { gchar** core_ids = NULL; - gchar** _tmp0_ = NULL; - gint core_ids_length1 = 0; - gint _core_ids_size_ = 0; - gchar** _tmp1_ = NULL; - gint _tmp1__length1 = 0; - gchar* _tmp2_ = NULL; - gchar** _tmp3_ = NULL; - gint _tmp3__length1 = 0; - gchar* _tmp4_ = NULL; - gchar** _tmp5_ = NULL; - gint _tmp5__length1 = 0; - gchar* _tmp6_ = NULL; - gchar** _tmp7_ = NULL; - gint _tmp7__length1 = 0; - gchar* _tmp8_ = NULL; - gchar** _tmp9_ = NULL; - gint _tmp9__length1 = 0; - gchar* _tmp10_ = NULL; - gchar** _tmp11_ = NULL; - gint _tmp11__length1 = 0; - gchar* _tmp12_ = NULL; - gchar** _tmp13_ = NULL; - gint _tmp13__length1 = 0; - gchar* _tmp14_ = NULL; - gchar** _tmp15_ = NULL; - gint _tmp15__length1 = 0; - gchar* _tmp16_ = NULL; - gchar** _tmp17_ = NULL; - gint _tmp17__length1 = 0; - gchar* _tmp18_ = NULL; - gchar** _tmp19_ = NULL; - gint _tmp19__length1 = 0; - gchar* _tmp20_ = NULL; - const gchar* _tmp21_ = NULL; - gchar** _tmp22_ = NULL; - gint _tmp22__length1 = 0; + gchar** _tmp0_; + gint core_ids_length1; + gint _core_ids_size_; + gchar** _tmp1_; + gint _tmp1__length1; + gchar* _tmp2_; + gchar** _tmp3_; + gint _tmp3__length1; + gchar* _tmp4_; + gchar** _tmp5_; + gint _tmp5__length1; + gchar* _tmp6_; + gchar** _tmp7_; + gint _tmp7__length1; + gchar* _tmp8_; + gchar** _tmp9_; + gint _tmp9__length1; + gchar* _tmp10_; + gchar** _tmp11_; + gint _tmp11__length1; + gchar* _tmp12_; + gchar** _tmp13_; + gint _tmp13__length1; + gchar* _tmp14_; + gchar** _tmp15_; + gint _tmp15__length1; + gchar* _tmp16_; + gchar** _tmp17_; + gint _tmp17__length1; + gchar* _tmp18_; + gchar** _tmp19_; + gint _tmp19__length1; + gchar* _tmp20_; + gchar** _tmp21_; + gint _tmp21__length1; #line 10 "/home/jens/Source/shotwell/src/slideshow/Slideshow.vala" _tmp0_ = g_new0 (gchar*, 0 + 1); #line 10 "/home/jens/Source/shotwell/src/slideshow/Slideshow.vala" @@ -334,25 +333,23 @@ void slideshow_init (GError** error) { #line 20 "/home/jens/Source/shotwell/src/slideshow/Slideshow.vala" _vala_array_add42 (&core_ids, &core_ids_length1, &_core_ids_size_, _tmp20_); #line 22 "/home/jens/Source/shotwell/src/slideshow/Slideshow.vala" - _tmp21_ = _ ("Slideshow Transitions"); + _tmp21_ = core_ids; #line 22 "/home/jens/Source/shotwell/src/slideshow/Slideshow.vala" - _tmp22_ = core_ids; + _tmp21__length1 = core_ids_length1; #line 22 "/home/jens/Source/shotwell/src/slideshow/Slideshow.vala" - _tmp22__length1 = core_ids_length1; -#line 22 "/home/jens/Source/shotwell/src/slideshow/Slideshow.vala" - plugins_register_extension_point (SPIT_TRANSITIONS_TYPE_DESCRIPTOR, _tmp21_, RESOURCES_ICON_SLIDESHOW_EXTENSION_POINT, _tmp22_, _tmp22__length1); + plugins_register_extension_point (SPIT_TRANSITIONS_TYPE_DESCRIPTOR, _ ("Slideshow Transitions"), RESOURCES_ICON_SLIDESHOW_EXTENSION_POINT, _tmp21_, _tmp21__length1); #line 24 "/home/jens/Source/shotwell/src/slideshow/Slideshow.vala" transition_effects_manager_init (); #line 9 "/home/jens/Source/shotwell/src/slideshow/Slideshow.vala" core_ids = (_vala_array_free (core_ids, core_ids_length1, (GDestroyNotify) g_free), NULL); -#line 349 "Slideshow.c" +#line 346 "Slideshow.c" } void slideshow_terminate (void) { #line 28 "/home/jens/Source/shotwell/src/slideshow/Slideshow.vala" transition_effects_manager_terminate (); -#line 356 "Slideshow.c" +#line 353 "Slideshow.c" } diff --git a/src/slideshow/TransitionEffects.c b/src/slideshow/TransitionEffects.c index 0e05963..fc72cc9 100644 --- a/src/slideshow/TransitionEffects.c +++ b/src/slideshow/TransitionEffects.c @@ -1,4 +1,4 @@ -/* TransitionEffects.c generated by valac 0.34.7, the Vala compiler +/* TransitionEffects.c generated by valac 0.36.6, the Vala compiler * generated from TransitionEffects.vala, do not modify */ /* Copyright 2010 Maxim Kartashev @@ -205,13 +205,13 @@ static TransitionEffectsManager* transition_effects_manager_instance; static TransitionEffectsManager* transition_effects_manager_instance = NULL; static gpointer transition_clock_parent_class = NULL; static gpointer null_transition_descriptor_parent_class = NULL; -static SpitPluggableIface* null_transition_descriptor_spit_pluggable_parent_iface = NULL; -static SpitTransitionsDescriptorIface* null_transition_descriptor_spit_transitions_descriptor_parent_iface = NULL; +static SpitPluggableIface * null_transition_descriptor_spit_pluggable_parent_iface = NULL; +static SpitTransitionsDescriptorIface * null_transition_descriptor_spit_transitions_descriptor_parent_iface = NULL; static gpointer null_effect_parent_class = NULL; -static SpitTransitionsEffectIface* null_effect_spit_transitions_effect_parent_iface = NULL; +static SpitTransitionsEffectIface * null_effect_spit_transitions_effect_parent_iface = NULL; static gpointer random_effect_descriptor_parent_class = NULL; -static SpitPluggableIface* random_effect_descriptor_spit_pluggable_parent_iface = NULL; -static SpitTransitionsDescriptorIface* random_effect_descriptor_spit_transitions_descriptor_parent_iface = NULL; +static SpitPluggableIface * random_effect_descriptor_spit_pluggable_parent_iface = NULL; +static SpitTransitionsDescriptorIface * random_effect_descriptor_spit_transitions_descriptor_parent_iface = NULL; gpointer transition_effects_manager_ref (gpointer instance); void transition_effects_manager_unref (gpointer instance); @@ -268,7 +268,7 @@ TransitionClock* transition_effects_manager_create_transition_clock (TransitionE TransitionClock* transition_clock_new (SpitTransitionsDescriptor* desc); TransitionClock* transition_clock_construct (GType object_type, SpitTransitionsDescriptor* desc); TransitionClock* transition_effects_manager_create_null_transition_clock (TransitionEffectsManager* self); -static void transition_effects_manager_finalize (TransitionEffectsManager* obj); +static void transition_effects_manager_finalize (TransitionEffectsManager * obj); gpointer op_timer_ref (gpointer instance); void op_timer_unref (gpointer instance); GParamSpec* param_spec_op_timer (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags); @@ -298,7 +298,7 @@ void transition_clock_cancel (TransitionClock* self); gboolean transition_clock_paint (TransitionClock* self, cairo_t* ctx, gint width, gint height); void op_timer_start (OpTimer* self); void op_timer_stop (OpTimer* self); -static void transition_clock_finalize (TransitionClock* obj); +static void transition_clock_finalize (TransitionClock * obj); enum { NULL_TRANSITION_DESCRIPTOR_DUMMY_PROPERTY }; @@ -340,8 +340,8 @@ static void _transition_effects_manager_load_transitions_plugins_notifier_plugga static TransitionEffectsManager* transition_effects_manager_construct (GType object_type) { TransitionEffectsManager* self = NULL; - PluginsNotifier* _tmp0_ = NULL; - PluginsNotifier* _tmp1_ = NULL; + PluginsNotifier* _tmp0_; + PluginsNotifier* _tmp1_; #line 19 "/home/jens/Source/shotwell/src/slideshow/TransitionEffects.vala" self = (TransitionEffectsManager*) g_type_create_instance (object_type); #line 20 "/home/jens/Source/shotwell/src/slideshow/TransitionEffects.vala" @@ -375,17 +375,17 @@ static gpointer _g_object_ref0 (gpointer self) { static void transition_effects_manager_load_transitions (TransitionEffectsManager* self) { - GeeMap* _tmp0_ = NULL; - GeeMap* _tmp1_ = NULL; - SpitTransitionsDescriptor* _tmp2_ = NULL; - const gchar* _tmp3_ = NULL; - SpitTransitionsDescriptor* _tmp4_ = NULL; - GeeMap* _tmp5_ = NULL; - SpitTransitionsDescriptor* _tmp6_ = NULL; - const gchar* _tmp7_ = NULL; - SpitTransitionsDescriptor* _tmp8_ = NULL; + GeeMap* _tmp0_; + GeeMap* _tmp1_; + SpitTransitionsDescriptor* _tmp2_; + const gchar* _tmp3_; + SpitTransitionsDescriptor* _tmp4_; + GeeMap* _tmp5_; + SpitTransitionsDescriptor* _tmp6_; + const gchar* _tmp7_; + SpitTransitionsDescriptor* _tmp8_; GeeCollection* pluggables = NULL; - GeeCollection* _tmp9_ = NULL; + GeeCollection* _tmp9_; #line 28 "/home/jens/Source/shotwell/src/slideshow/TransitionEffects.vala" g_return_if_fail (IS_TRANSITION_EFFECTS_MANAGER (self)); #line 29 "/home/jens/Source/shotwell/src/slideshow/TransitionEffects.vala" @@ -419,8 +419,8 @@ static void transition_effects_manager_load_transitions (TransitionEffectsManage #line 420 "TransitionEffects.c" { GeeIterator* _pluggable_it = NULL; - GeeCollection* _tmp10_ = NULL; - GeeIterator* _tmp11_ = NULL; + GeeCollection* _tmp10_; + GeeIterator* _tmp11_; #line 38 "/home/jens/Source/shotwell/src/slideshow/TransitionEffects.vala" _tmp10_ = pluggables; #line 38 "/home/jens/Source/shotwell/src/slideshow/TransitionEffects.vala" @@ -430,22 +430,22 @@ static void transition_effects_manager_load_transitions (TransitionEffectsManage #line 38 "/home/jens/Source/shotwell/src/slideshow/TransitionEffects.vala" while (TRUE) { #line 433 "TransitionEffects.c" - GeeIterator* _tmp12_ = NULL; - gboolean _tmp13_ = FALSE; + GeeIterator* _tmp12_; + gboolean _tmp13_; SpitPluggable* pluggable = NULL; - GeeIterator* _tmp14_ = NULL; - gpointer _tmp15_ = NULL; + GeeIterator* _tmp14_; + gpointer _tmp15_; gint pluggable_interface = 0; - SpitPluggable* _tmp16_ = NULL; - gint _tmp17_ = 0; - gint _tmp18_ = 0; + SpitPluggable* _tmp16_; + gint _tmp17_; + gint _tmp18_; SpitTransitionsDescriptor* desc = NULL; - SpitPluggable* _tmp23_ = NULL; - SpitTransitionsDescriptor* _tmp24_ = NULL; - GeeMap* _tmp25_ = NULL; - SpitTransitionsDescriptor* _tmp26_ = NULL; - const gchar* _tmp27_ = NULL; - gboolean _tmp28_ = FALSE; + SpitPluggable* _tmp23_; + SpitTransitionsDescriptor* _tmp24_; + GeeMap* _tmp25_; + SpitTransitionsDescriptor* _tmp26_; + const gchar* _tmp27_; + gboolean _tmp28_; #line 38 "/home/jens/Source/shotwell/src/slideshow/TransitionEffects.vala" _tmp12_ = _pluggable_it; #line 38 "/home/jens/Source/shotwell/src/slideshow/TransitionEffects.vala" @@ -473,10 +473,10 @@ static void transition_effects_manager_load_transitions (TransitionEffectsManage #line 41 "/home/jens/Source/shotwell/src/slideshow/TransitionEffects.vala" if (_tmp18_ != SPIT_TRANSITIONS_CURRENT_INTERFACE) { #line 476 "TransitionEffects.c" - SpitPluggable* _tmp19_ = NULL; - gchar* _tmp20_ = NULL; - gchar* _tmp21_ = NULL; - gint _tmp22_ = 0; + SpitPluggable* _tmp19_; + gchar* _tmp20_; + gchar* _tmp21_; + gint _tmp22_; #line 42 "/home/jens/Source/shotwell/src/slideshow/TransitionEffects.vala" _tmp19_ = pluggable; #line 42 "/home/jens/Source/shotwell/src/slideshow/TransitionEffects.vala" @@ -513,8 +513,8 @@ static void transition_effects_manager_load_transitions (TransitionEffectsManage #line 49 "/home/jens/Source/shotwell/src/slideshow/TransitionEffects.vala" if (_tmp28_) { #line 515 "TransitionEffects.c" - SpitTransitionsDescriptor* _tmp29_ = NULL; - const gchar* _tmp30_ = NULL; + SpitTransitionsDescriptor* _tmp29_; + const gchar* _tmp30_; #line 50 "/home/jens/Source/shotwell/src/slideshow/TransitionEffects.vala" _tmp29_ = desc; #line 50 "/home/jens/Source/shotwell/src/slideshow/TransitionEffects.vala" @@ -524,10 +524,10 @@ static void transition_effects_manager_load_transitions (TransitionEffectsManage "t ID %s", _tmp30_); #line 524 "TransitionEffects.c" } else { - GeeMap* _tmp31_ = NULL; - SpitTransitionsDescriptor* _tmp32_ = NULL; - const gchar* _tmp33_ = NULL; - SpitTransitionsDescriptor* _tmp34_ = NULL; + GeeMap* _tmp31_; + SpitTransitionsDescriptor* _tmp32_; + const gchar* _tmp33_; + SpitTransitionsDescriptor* _tmp34_; #line 52 "/home/jens/Source/shotwell/src/slideshow/TransitionEffects.vala" _tmp31_ = self->priv->effects; #line 52 "/home/jens/Source/shotwell/src/slideshow/TransitionEffects.vala" @@ -557,7 +557,7 @@ static void transition_effects_manager_load_transitions (TransitionEffectsManage void transition_effects_manager_init (void) { - TransitionEffectsManager* _tmp0_ = NULL; + TransitionEffectsManager* _tmp0_; #line 57 "/home/jens/Source/shotwell/src/slideshow/TransitionEffects.vala" _tmp0_ = transition_effects_manager_new (); #line 57 "/home/jens/Source/shotwell/src/slideshow/TransitionEffects.vala" @@ -586,9 +586,9 @@ static gpointer _transition_effects_manager_ref0 (gpointer self) { TransitionEffectsManager* transition_effects_manager_get_instance (void) { TransitionEffectsManager* result = NULL; - TransitionEffectsManager* _tmp0_ = NULL; - TransitionEffectsManager* _tmp1_ = NULL; - TransitionEffectsManager* _tmp2_ = NULL; + TransitionEffectsManager* _tmp0_; + TransitionEffectsManager* _tmp1_; + TransitionEffectsManager* _tmp2_; #line 65 "/home/jens/Source/shotwell/src/slideshow/TransitionEffects.vala" _tmp0_ = transition_effects_manager_instance; #line 65 "/home/jens/Source/shotwell/src/slideshow/TransitionEffects.vala" @@ -607,9 +607,9 @@ TransitionEffectsManager* transition_effects_manager_get_instance (void) { GeeCollection* transition_effects_manager_get_effect_ids (TransitionEffectsManager* self) { GeeCollection* result = NULL; - GeeMap* _tmp0_ = NULL; - GeeSet* _tmp1_ = NULL; - GeeSet* _tmp2_ = NULL; + GeeMap* _tmp0_; + GeeSet* _tmp1_; + GeeSet* _tmp2_; #line 70 "/home/jens/Source/shotwell/src/slideshow/TransitionEffects.vala" g_return_val_if_fail (IS_TRANSITION_EFFECTS_MANAGER (self), NULL); #line 71 "/home/jens/Source/shotwell/src/slideshow/TransitionEffects.vala" @@ -629,10 +629,10 @@ GeeCollection* transition_effects_manager_get_effect_ids (TransitionEffectsManag GeeCollection* transition_effects_manager_get_effect_names (TransitionEffectsManager* self, GCompareDataFunc comparator, void* comparator_target, GDestroyNotify comparator_target_destroy_notify) { GeeCollection* result = NULL; GeeCollection* effect_names = NULL; - GCompareDataFunc _tmp0_ = NULL; - void* _tmp0__target = NULL; - GDestroyNotify _tmp0__target_destroy_notify = NULL; - GeeTreeSet* _tmp1_ = NULL; + GCompareDataFunc _tmp0_; + void* _tmp0__target; + GDestroyNotify _tmp0__target_destroy_notify; + GeeTreeSet* _tmp1_; #line 74 "/home/jens/Source/shotwell/src/slideshow/TransitionEffects.vala" g_return_val_if_fail (IS_TRANSITION_EFFECTS_MANAGER (self), NULL); #line 75 "/home/jens/Source/shotwell/src/slideshow/TransitionEffects.vala" @@ -654,12 +654,12 @@ GeeCollection* transition_effects_manager_get_effect_names (TransitionEffectsMan #line 653 "TransitionEffects.c" { GeeIterator* _desc_it = NULL; - GeeMap* _tmp2_ = NULL; - GeeCollection* _tmp3_ = NULL; - GeeCollection* _tmp4_ = NULL; - GeeCollection* _tmp5_ = NULL; - GeeIterator* _tmp6_ = NULL; - GeeIterator* _tmp7_ = NULL; + GeeMap* _tmp2_; + GeeCollection* _tmp3_; + GeeCollection* _tmp4_; + GeeCollection* _tmp5_; + GeeIterator* _tmp6_; + GeeIterator* _tmp7_; #line 76 "/home/jens/Source/shotwell/src/slideshow/TransitionEffects.vala" _tmp2_ = self->priv->effects; #line 76 "/home/jens/Source/shotwell/src/slideshow/TransitionEffects.vala" @@ -679,14 +679,14 @@ GeeCollection* transition_effects_manager_get_effect_names (TransitionEffectsMan #line 76 "/home/jens/Source/shotwell/src/slideshow/TransitionEffects.vala" while (TRUE) { #line 680 "TransitionEffects.c" - GeeIterator* _tmp8_ = NULL; - gboolean _tmp9_ = FALSE; + GeeIterator* _tmp8_; + gboolean _tmp9_; SpitTransitionsDescriptor* desc = NULL; - GeeIterator* _tmp10_ = NULL; - gpointer _tmp11_ = NULL; - GeeCollection* _tmp12_ = NULL; - SpitTransitionsDescriptor* _tmp13_ = NULL; - const gchar* _tmp14_ = NULL; + GeeIterator* _tmp10_; + gpointer _tmp11_; + GeeCollection* _tmp12_; + SpitTransitionsDescriptor* _tmp13_; + const gchar* _tmp14_; #line 76 "/home/jens/Source/shotwell/src/slideshow/TransitionEffects.vala" _tmp8_ = _desc_it; #line 76 "/home/jens/Source/shotwell/src/slideshow/TransitionEffects.vala" @@ -744,12 +744,12 @@ gchar* transition_effects_manager_get_id_for_effect_name (TransitionEffectsManag #line 743 "TransitionEffects.c" { GeeIterator* _desc_it = NULL; - GeeMap* _tmp0_ = NULL; - GeeCollection* _tmp1_ = NULL; - GeeCollection* _tmp2_ = NULL; - GeeCollection* _tmp3_ = NULL; - GeeIterator* _tmp4_ = NULL; - GeeIterator* _tmp5_ = NULL; + GeeMap* _tmp0_; + GeeCollection* _tmp1_; + GeeCollection* _tmp2_; + GeeCollection* _tmp3_; + GeeIterator* _tmp4_; + GeeIterator* _tmp5_; #line 83 "/home/jens/Source/shotwell/src/slideshow/TransitionEffects.vala" _tmp0_ = self->priv->effects; #line 83 "/home/jens/Source/shotwell/src/slideshow/TransitionEffects.vala" @@ -769,14 +769,14 @@ gchar* transition_effects_manager_get_id_for_effect_name (TransitionEffectsManag #line 83 "/home/jens/Source/shotwell/src/slideshow/TransitionEffects.vala" while (TRUE) { #line 770 "TransitionEffects.c" - GeeIterator* _tmp6_ = NULL; - gboolean _tmp7_ = FALSE; + GeeIterator* _tmp6_; + gboolean _tmp7_; SpitTransitionsDescriptor* desc = NULL; - GeeIterator* _tmp8_ = NULL; - gpointer _tmp9_ = NULL; - SpitTransitionsDescriptor* _tmp10_ = NULL; - const gchar* _tmp11_ = NULL; - const gchar* _tmp12_ = NULL; + GeeIterator* _tmp8_; + gpointer _tmp9_; + SpitTransitionsDescriptor* _tmp10_; + const gchar* _tmp11_; + const gchar* _tmp12_; #line 83 "/home/jens/Source/shotwell/src/slideshow/TransitionEffects.vala" _tmp6_ = _desc_it; #line 83 "/home/jens/Source/shotwell/src/slideshow/TransitionEffects.vala" @@ -802,9 +802,9 @@ gchar* transition_effects_manager_get_id_for_effect_name (TransitionEffectsManag #line 84 "/home/jens/Source/shotwell/src/slideshow/TransitionEffects.vala" if (g_strcmp0 (_tmp11_, _tmp12_) == 0) { #line 803 "TransitionEffects.c" - SpitTransitionsDescriptor* _tmp13_ = NULL; - const gchar* _tmp14_ = NULL; - gchar* _tmp15_ = NULL; + SpitTransitionsDescriptor* _tmp13_; + const gchar* _tmp14_; + gchar* _tmp15_; #line 85 "/home/jens/Source/shotwell/src/slideshow/TransitionEffects.vala" _tmp13_ = desc; #line 85 "/home/jens/Source/shotwell/src/slideshow/TransitionEffects.vala" @@ -839,9 +839,9 @@ gchar* transition_effects_manager_get_id_for_effect_name (TransitionEffectsManag SpitTransitionsDescriptor* transition_effects_manager_get_effect_descriptor (TransitionEffectsManager* self, const gchar* effect_id) { SpitTransitionsDescriptor* result = NULL; - GeeMap* _tmp0_ = NULL; - const gchar* _tmp1_ = NULL; - gpointer _tmp2_ = NULL; + GeeMap* _tmp0_; + const gchar* _tmp1_; + gpointer _tmp2_; #line 91 "/home/jens/Source/shotwell/src/slideshow/TransitionEffects.vala" g_return_val_if_fail (IS_TRANSITION_EFFECTS_MANAGER (self), NULL); #line 91 "/home/jens/Source/shotwell/src/slideshow/TransitionEffects.vala" @@ -863,11 +863,11 @@ SpitTransitionsDescriptor* transition_effects_manager_get_effect_descriptor (Tra gchar* transition_effects_manager_get_effect_name (TransitionEffectsManager* self, const gchar* effect_id) { gchar* result = NULL; SpitTransitionsDescriptor* desc = NULL; - const gchar* _tmp0_ = NULL; - SpitTransitionsDescriptor* _tmp1_ = NULL; + const gchar* _tmp0_; + SpitTransitionsDescriptor* _tmp1_; const gchar* _tmp2_ = NULL; - SpitTransitionsDescriptor* _tmp3_ = NULL; - gchar* _tmp7_ = NULL; + SpitTransitionsDescriptor* _tmp3_; + gchar* _tmp6_; #line 95 "/home/jens/Source/shotwell/src/slideshow/TransitionEffects.vala" g_return_val_if_fail (IS_TRANSITION_EFFECTS_MANAGER (self), NULL); #line 95 "/home/jens/Source/shotwell/src/slideshow/TransitionEffects.vala" @@ -883,8 +883,8 @@ gchar* transition_effects_manager_get_effect_name (TransitionEffectsManager* sel #line 98 "/home/jens/Source/shotwell/src/slideshow/TransitionEffects.vala" if (_tmp3_ != NULL) { #line 884 "TransitionEffects.c" - SpitTransitionsDescriptor* _tmp4_ = NULL; - const gchar* _tmp5_ = NULL; + SpitTransitionsDescriptor* _tmp4_; + const gchar* _tmp5_; #line 98 "/home/jens/Source/shotwell/src/slideshow/TransitionEffects.vala" _tmp4_ = desc; #line 98 "/home/jens/Source/shotwell/src/slideshow/TransitionEffects.vala" @@ -893,29 +893,26 @@ gchar* transition_effects_manager_get_effect_name (TransitionEffectsManager* sel _tmp2_ = _tmp5_; #line 893 "TransitionEffects.c" } else { - const gchar* _tmp6_ = NULL; #line 98 "/home/jens/Source/shotwell/src/slideshow/TransitionEffects.vala" - _tmp6_ = _ ("(None)"); -#line 98 "/home/jens/Source/shotwell/src/slideshow/TransitionEffects.vala" - _tmp2_ = _tmp6_; -#line 900 "TransitionEffects.c" + _tmp2_ = _ ("(None)"); +#line 897 "TransitionEffects.c" } #line 98 "/home/jens/Source/shotwell/src/slideshow/TransitionEffects.vala" - _tmp7_ = g_strdup (_tmp2_); + _tmp6_ = g_strdup (_tmp2_); #line 98 "/home/jens/Source/shotwell/src/slideshow/TransitionEffects.vala" - result = _tmp7_; + result = _tmp6_; #line 98 "/home/jens/Source/shotwell/src/slideshow/TransitionEffects.vala" _g_object_unref0 (desc); #line 98 "/home/jens/Source/shotwell/src/slideshow/TransitionEffects.vala" return result; -#line 910 "TransitionEffects.c" +#line 907 "TransitionEffects.c" } SpitTransitionsDescriptor* transition_effects_manager_get_null_descriptor (TransitionEffectsManager* self) { SpitTransitionsDescriptor* result = NULL; - SpitTransitionsDescriptor* _tmp0_ = NULL; - SpitTransitionsDescriptor* _tmp1_ = NULL; + SpitTransitionsDescriptor* _tmp0_; + SpitTransitionsDescriptor* _tmp1_; #line 101 "/home/jens/Source/shotwell/src/slideshow/TransitionEffects.vala" g_return_val_if_fail (IS_TRANSITION_EFFECTS_MANAGER (self), NULL); #line 102 "/home/jens/Source/shotwell/src/slideshow/TransitionEffects.vala" @@ -926,17 +923,17 @@ SpitTransitionsDescriptor* transition_effects_manager_get_null_descriptor (Trans result = _tmp1_; #line 102 "/home/jens/Source/shotwell/src/slideshow/TransitionEffects.vala" return result; -#line 928 "TransitionEffects.c" +#line 925 "TransitionEffects.c" } TransitionClock* transition_effects_manager_create_transition_clock (TransitionEffectsManager* self, const gchar* effect_id) { TransitionClock* result = NULL; SpitTransitionsDescriptor* desc = NULL; - const gchar* _tmp0_ = NULL; - SpitTransitionsDescriptor* _tmp1_ = NULL; + const gchar* _tmp0_; + SpitTransitionsDescriptor* _tmp1_; TransitionClock* _tmp2_ = NULL; - SpitTransitionsDescriptor* _tmp3_ = NULL; + SpitTransitionsDescriptor* _tmp3_; #line 105 "/home/jens/Source/shotwell/src/slideshow/TransitionEffects.vala" g_return_val_if_fail (IS_TRANSITION_EFFECTS_MANAGER (self), NULL); #line 105 "/home/jens/Source/shotwell/src/slideshow/TransitionEffects.vala" @@ -951,9 +948,9 @@ TransitionClock* transition_effects_manager_create_transition_clock (TransitionE _tmp3_ = desc; #line 108 "/home/jens/Source/shotwell/src/slideshow/TransitionEffects.vala" if (_tmp3_ != NULL) { -#line 953 "TransitionEffects.c" - SpitTransitionsDescriptor* _tmp4_ = NULL; - TransitionClock* _tmp5_ = NULL; +#line 950 "TransitionEffects.c" + SpitTransitionsDescriptor* _tmp4_; + TransitionClock* _tmp5_; #line 108 "/home/jens/Source/shotwell/src/slideshow/TransitionEffects.vala" _tmp4_ = desc; #line 108 "/home/jens/Source/shotwell/src/slideshow/TransitionEffects.vala" @@ -962,13 +959,13 @@ TransitionClock* transition_effects_manager_create_transition_clock (TransitionE _transition_clock_unref0 (_tmp2_); #line 108 "/home/jens/Source/shotwell/src/slideshow/TransitionEffects.vala" _tmp2_ = _tmp5_; -#line 964 "TransitionEffects.c" +#line 961 "TransitionEffects.c" } else { #line 108 "/home/jens/Source/shotwell/src/slideshow/TransitionEffects.vala" _transition_clock_unref0 (_tmp2_); #line 108 "/home/jens/Source/shotwell/src/slideshow/TransitionEffects.vala" _tmp2_ = NULL; -#line 970 "TransitionEffects.c" +#line 967 "TransitionEffects.c" } #line 108 "/home/jens/Source/shotwell/src/slideshow/TransitionEffects.vala" result = _tmp2_; @@ -976,14 +973,14 @@ TransitionClock* transition_effects_manager_create_transition_clock (TransitionE _g_object_unref0 (desc); #line 108 "/home/jens/Source/shotwell/src/slideshow/TransitionEffects.vala" return result; -#line 978 "TransitionEffects.c" +#line 975 "TransitionEffects.c" } TransitionClock* transition_effects_manager_create_null_transition_clock (TransitionEffectsManager* self) { TransitionClock* result = NULL; - SpitTransitionsDescriptor* _tmp0_ = NULL; - TransitionClock* _tmp1_ = NULL; + SpitTransitionsDescriptor* _tmp0_; + TransitionClock* _tmp1_; #line 111 "/home/jens/Source/shotwell/src/slideshow/TransitionEffects.vala" g_return_val_if_fail (IS_TRANSITION_EFFECTS_MANAGER (self), NULL); #line 112 "/home/jens/Source/shotwell/src/slideshow/TransitionEffects.vala" @@ -994,14 +991,14 @@ TransitionClock* transition_effects_manager_create_null_transition_clock (Transi result = _tmp1_; #line 112 "/home/jens/Source/shotwell/src/slideshow/TransitionEffects.vala" return result; -#line 996 "TransitionEffects.c" +#line 993 "TransitionEffects.c" } static void value_transition_effects_manager_init (GValue* value) { #line 8 "/home/jens/Source/shotwell/src/slideshow/TransitionEffects.vala" value->data[0].v_pointer = NULL; -#line 1003 "TransitionEffects.c" +#line 1000 "TransitionEffects.c" } @@ -1010,7 +1007,7 @@ static void value_transition_effects_manager_free_value (GValue* value) { if (value->data[0].v_pointer) { #line 8 "/home/jens/Source/shotwell/src/slideshow/TransitionEffects.vala" transition_effects_manager_unref (value->data[0].v_pointer); -#line 1012 "TransitionEffects.c" +#line 1009 "TransitionEffects.c" } } @@ -1020,11 +1017,11 @@ static void value_transition_effects_manager_copy_value (const GValue* src_value if (src_value->data[0].v_pointer) { #line 8 "/home/jens/Source/shotwell/src/slideshow/TransitionEffects.vala" dest_value->data[0].v_pointer = transition_effects_manager_ref (src_value->data[0].v_pointer); -#line 1022 "TransitionEffects.c" +#line 1019 "TransitionEffects.c" } else { #line 8 "/home/jens/Source/shotwell/src/slideshow/TransitionEffects.vala" dest_value->data[0].v_pointer = NULL; -#line 1026 "TransitionEffects.c" +#line 1023 "TransitionEffects.c" } } @@ -1032,66 +1029,66 @@ static void value_transition_effects_manager_copy_value (const GValue* src_value static gpointer value_transition_effects_manager_peek_pointer (const GValue* value) { #line 8 "/home/jens/Source/shotwell/src/slideshow/TransitionEffects.vala" return value->data[0].v_pointer; -#line 1034 "TransitionEffects.c" +#line 1031 "TransitionEffects.c" } static gchar* value_transition_effects_manager_collect_value (GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) { #line 8 "/home/jens/Source/shotwell/src/slideshow/TransitionEffects.vala" if (collect_values[0].v_pointer) { -#line 1041 "TransitionEffects.c" - TransitionEffectsManager* object; +#line 1038 "TransitionEffects.c" + TransitionEffectsManager * object; object = collect_values[0].v_pointer; #line 8 "/home/jens/Source/shotwell/src/slideshow/TransitionEffects.vala" if (object->parent_instance.g_class == NULL) { #line 8 "/home/jens/Source/shotwell/src/slideshow/TransitionEffects.vala" return g_strconcat ("invalid unclassed object pointer for value type `", G_VALUE_TYPE_NAME (value), "'", NULL); -#line 1048 "TransitionEffects.c" +#line 1045 "TransitionEffects.c" } else if (!g_value_type_compatible (G_TYPE_FROM_INSTANCE (object), G_VALUE_TYPE (value))) { #line 8 "/home/jens/Source/shotwell/src/slideshow/TransitionEffects.vala" return g_strconcat ("invalid object type `", g_type_name (G_TYPE_FROM_INSTANCE (object)), "' for value type `", G_VALUE_TYPE_NAME (value), "'", NULL); -#line 1052 "TransitionEffects.c" +#line 1049 "TransitionEffects.c" } #line 8 "/home/jens/Source/shotwell/src/slideshow/TransitionEffects.vala" value->data[0].v_pointer = transition_effects_manager_ref (object); -#line 1056 "TransitionEffects.c" +#line 1053 "TransitionEffects.c" } else { #line 8 "/home/jens/Source/shotwell/src/slideshow/TransitionEffects.vala" value->data[0].v_pointer = NULL; -#line 1060 "TransitionEffects.c" +#line 1057 "TransitionEffects.c" } #line 8 "/home/jens/Source/shotwell/src/slideshow/TransitionEffects.vala" return NULL; -#line 1064 "TransitionEffects.c" +#line 1061 "TransitionEffects.c" } static gchar* value_transition_effects_manager_lcopy_value (const GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) { - TransitionEffectsManager** object_p; + TransitionEffectsManager ** object_p; object_p = collect_values[0].v_pointer; #line 8 "/home/jens/Source/shotwell/src/slideshow/TransitionEffects.vala" if (!object_p) { #line 8 "/home/jens/Source/shotwell/src/slideshow/TransitionEffects.vala" return g_strdup_printf ("value location for `%s' passed as NULL", G_VALUE_TYPE_NAME (value)); -#line 1075 "TransitionEffects.c" +#line 1072 "TransitionEffects.c" } #line 8 "/home/jens/Source/shotwell/src/slideshow/TransitionEffects.vala" if (!value->data[0].v_pointer) { #line 8 "/home/jens/Source/shotwell/src/slideshow/TransitionEffects.vala" *object_p = NULL; -#line 1081 "TransitionEffects.c" +#line 1078 "TransitionEffects.c" } else if (collect_flags & G_VALUE_NOCOPY_CONTENTS) { #line 8 "/home/jens/Source/shotwell/src/slideshow/TransitionEffects.vala" *object_p = value->data[0].v_pointer; -#line 1085 "TransitionEffects.c" +#line 1082 "TransitionEffects.c" } else { #line 8 "/home/jens/Source/shotwell/src/slideshow/TransitionEffects.vala" *object_p = transition_effects_manager_ref (value->data[0].v_pointer); -#line 1089 "TransitionEffects.c" +#line 1086 "TransitionEffects.c" } #line 8 "/home/jens/Source/shotwell/src/slideshow/TransitionEffects.vala" return NULL; -#line 1093 "TransitionEffects.c" +#line 1090 "TransitionEffects.c" } @@ -1105,7 +1102,7 @@ GParamSpec* param_spec_transition_effects_manager (const gchar* name, const gcha G_PARAM_SPEC (spec)->value_type = object_type; #line 8 "/home/jens/Source/shotwell/src/slideshow/TransitionEffects.vala" return G_PARAM_SPEC (spec); -#line 1107 "TransitionEffects.c" +#line 1104 "TransitionEffects.c" } @@ -1114,12 +1111,12 @@ gpointer value_get_transition_effects_manager (const GValue* value) { g_return_val_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, TYPE_TRANSITION_EFFECTS_MANAGER), NULL); #line 8 "/home/jens/Source/shotwell/src/slideshow/TransitionEffects.vala" return value->data[0].v_pointer; -#line 1116 "TransitionEffects.c" +#line 1113 "TransitionEffects.c" } void value_set_transition_effects_manager (GValue* value, gpointer v_object) { - TransitionEffectsManager* old; + TransitionEffectsManager * old; #line 8 "/home/jens/Source/shotwell/src/slideshow/TransitionEffects.vala" g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, TYPE_TRANSITION_EFFECTS_MANAGER)); #line 8 "/home/jens/Source/shotwell/src/slideshow/TransitionEffects.vala" @@ -1134,23 +1131,23 @@ void value_set_transition_effects_manager (GValue* value, gpointer v_object) { value->data[0].v_pointer = v_object; #line 8 "/home/jens/Source/shotwell/src/slideshow/TransitionEffects.vala" transition_effects_manager_ref (value->data[0].v_pointer); -#line 1136 "TransitionEffects.c" +#line 1133 "TransitionEffects.c" } else { #line 8 "/home/jens/Source/shotwell/src/slideshow/TransitionEffects.vala" value->data[0].v_pointer = NULL; -#line 1140 "TransitionEffects.c" +#line 1137 "TransitionEffects.c" } #line 8 "/home/jens/Source/shotwell/src/slideshow/TransitionEffects.vala" if (old) { #line 8 "/home/jens/Source/shotwell/src/slideshow/TransitionEffects.vala" transition_effects_manager_unref (old); -#line 1146 "TransitionEffects.c" +#line 1143 "TransitionEffects.c" } } void value_take_transition_effects_manager (GValue* value, gpointer v_object) { - TransitionEffectsManager* old; + TransitionEffectsManager * old; #line 8 "/home/jens/Source/shotwell/src/slideshow/TransitionEffects.vala" g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, TYPE_TRANSITION_EFFECTS_MANAGER)); #line 8 "/home/jens/Source/shotwell/src/slideshow/TransitionEffects.vala" @@ -1163,17 +1160,17 @@ void value_take_transition_effects_manager (GValue* value, gpointer v_object) { g_return_if_fail (g_value_type_compatible (G_TYPE_FROM_INSTANCE (v_object), G_VALUE_TYPE (value))); #line 8 "/home/jens/Source/shotwell/src/slideshow/TransitionEffects.vala" value->data[0].v_pointer = v_object; -#line 1165 "TransitionEffects.c" +#line 1162 "TransitionEffects.c" } else { #line 8 "/home/jens/Source/shotwell/src/slideshow/TransitionEffects.vala" value->data[0].v_pointer = NULL; -#line 1169 "TransitionEffects.c" +#line 1166 "TransitionEffects.c" } #line 8 "/home/jens/Source/shotwell/src/slideshow/TransitionEffects.vala" if (old) { #line 8 "/home/jens/Source/shotwell/src/slideshow/TransitionEffects.vala" transition_effects_manager_unref (old); -#line 1175 "TransitionEffects.c" +#line 1172 "TransitionEffects.c" } } @@ -1185,14 +1182,14 @@ static void transition_effects_manager_class_init (TransitionEffectsManagerClass ((TransitionEffectsManagerClass *) klass)->finalize = transition_effects_manager_finalize; #line 8 "/home/jens/Source/shotwell/src/slideshow/TransitionEffects.vala" g_type_class_add_private (klass, sizeof (TransitionEffectsManagerPrivate)); -#line 1187 "TransitionEffects.c" +#line 1184 "TransitionEffects.c" } static void transition_effects_manager_instance_init (TransitionEffectsManager * self) { - GeeHashMap* _tmp0_ = NULL; - NullTransitionDescriptor* _tmp1_ = NULL; - RandomEffectDescriptor* _tmp2_ = NULL; + GeeHashMap* _tmp0_; + NullTransitionDescriptor* _tmp1_; + RandomEffectDescriptor* _tmp2_; #line 8 "/home/jens/Source/shotwell/src/slideshow/TransitionEffects.vala" self->priv = TRANSITION_EFFECTS_MANAGER_GET_PRIVATE (self); #line 14 "/home/jens/Source/shotwell/src/slideshow/TransitionEffects.vala" @@ -1209,15 +1206,15 @@ static void transition_effects_manager_instance_init (TransitionEffectsManager * self->priv->random_descriptor = G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, SPIT_TRANSITIONS_TYPE_DESCRIPTOR, SpitTransitionsDescriptor); #line 8 "/home/jens/Source/shotwell/src/slideshow/TransitionEffects.vala" self->ref_count = 1; -#line 1211 "TransitionEffects.c" +#line 1208 "TransitionEffects.c" } -static void transition_effects_manager_finalize (TransitionEffectsManager* obj) { +static void transition_effects_manager_finalize (TransitionEffectsManager * obj) { TransitionEffectsManager * self; - PluginsNotifier* _tmp0_ = NULL; - PluginsNotifier* _tmp1_ = NULL; - guint _tmp2_ = 0U; + PluginsNotifier* _tmp0_; + PluginsNotifier* _tmp1_; + guint _tmp2_; #line 8 "/home/jens/Source/shotwell/src/slideshow/TransitionEffects.vala" self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_TRANSITION_EFFECTS_MANAGER, TransitionEffectsManager); #line 8 "/home/jens/Source/shotwell/src/slideshow/TransitionEffects.vala" @@ -1238,7 +1235,7 @@ static void transition_effects_manager_finalize (TransitionEffectsManager* obj) _g_object_unref0 (self->priv->null_descriptor); #line 17 "/home/jens/Source/shotwell/src/slideshow/TransitionEffects.vala" _g_object_unref0 (self->priv->random_descriptor); -#line 1240 "TransitionEffects.c" +#line 1237 "TransitionEffects.c" } @@ -1257,18 +1254,18 @@ GType transition_effects_manager_get_type (void) { gpointer transition_effects_manager_ref (gpointer instance) { - TransitionEffectsManager* self; + TransitionEffectsManager * self; self = instance; #line 8 "/home/jens/Source/shotwell/src/slideshow/TransitionEffects.vala" g_atomic_int_inc (&self->ref_count); #line 8 "/home/jens/Source/shotwell/src/slideshow/TransitionEffects.vala" return instance; -#line 1265 "TransitionEffects.c" +#line 1262 "TransitionEffects.c" } void transition_effects_manager_unref (gpointer instance) { - TransitionEffectsManager* self; + TransitionEffectsManager * self; self = instance; #line 8 "/home/jens/Source/shotwell/src/slideshow/TransitionEffects.vala" if (g_atomic_int_dec_and_test (&self->ref_count)) { @@ -1276,26 +1273,26 @@ void transition_effects_manager_unref (gpointer instance) { TRANSITION_EFFECTS_MANAGER_GET_CLASS (self)->finalize (self); #line 8 "/home/jens/Source/shotwell/src/slideshow/TransitionEffects.vala" g_type_free_instance ((GTypeInstance *) self); -#line 1278 "TransitionEffects.c" +#line 1275 "TransitionEffects.c" } } TransitionClock* transition_clock_construct (GType object_type, SpitTransitionsDescriptor* desc) { TransitionClock* self = NULL; - SpitTransitionsDescriptor* _tmp0_ = NULL; - SpitTransitionsDescriptor* _tmp1_ = NULL; - SpitTransitionsDescriptor* _tmp2_ = NULL; - SpitTransitionsDescriptor* _tmp3_ = NULL; - PluginsStandardHostInterface* _tmp4_ = NULL; - PluginsStandardHostInterface* _tmp5_ = NULL; - SpitTransitionsEffect* _tmp6_ = NULL; - SpitTransitionsEffect* _tmp7_ = NULL; + SpitTransitionsDescriptor* _tmp0_; + SpitTransitionsDescriptor* _tmp1_; + SpitTransitionsDescriptor* _tmp2_; + SpitTransitionsDescriptor* _tmp3_; + PluginsStandardHostInterface* _tmp4_; + PluginsStandardHostInterface* _tmp5_; + SpitTransitionsEffect* _tmp6_; + SpitTransitionsEffect* _tmp7_; gint _tmp8_ = 0; gint _tmp9_ = 0; - SpitTransitionsDescriptor* _tmp10_ = NULL; - const gchar* _tmp11_ = NULL; - OpTimer* _tmp12_ = NULL; + SpitTransitionsDescriptor* _tmp10_; + const gchar* _tmp11_; + OpTimer* _tmp12_; #line 136 "/home/jens/Source/shotwell/src/slideshow/TransitionEffects.vala" g_return_val_if_fail (SPIT_TRANSITIONS_IS_DESCRIPTOR (desc), NULL); #line 136 "/home/jens/Source/shotwell/src/slideshow/TransitionEffects.vala" @@ -1344,14 +1341,14 @@ TransitionClock* transition_clock_construct (GType object_type, SpitTransitionsD self->priv->paint_timer = _tmp12_; #line 136 "/home/jens/Source/shotwell/src/slideshow/TransitionEffects.vala" return self; -#line 1346 "TransitionEffects.c" +#line 1343 "TransitionEffects.c" } TransitionClock* transition_clock_new (SpitTransitionsDescriptor* desc) { #line 136 "/home/jens/Source/shotwell/src/slideshow/TransitionEffects.vala" return transition_clock_construct (TYPE_TRANSITION_CLOCK, desc); -#line 1353 "TransitionEffects.c" +#line 1350 "TransitionEffects.c" } @@ -1359,32 +1356,32 @@ gboolean transition_clock_is_in_progress (TransitionClock* self) { gboolean result = FALSE; gboolean _tmp0_ = FALSE; gboolean _tmp1_ = FALSE; - gboolean _tmp2_ = FALSE; + gboolean _tmp2_; #line 151 "/home/jens/Source/shotwell/src/slideshow/TransitionEffects.vala" g_return_val_if_fail (IS_TRANSITION_CLOCK (self), FALSE); #line 152 "/home/jens/Source/shotwell/src/slideshow/TransitionEffects.vala" _tmp2_ = self->priv->cancelled; #line 152 "/home/jens/Source/shotwell/src/slideshow/TransitionEffects.vala" if (!_tmp2_) { -#line 1368 "TransitionEffects.c" - SpitTransitionsMotion* _tmp3_ = NULL; +#line 1365 "TransitionEffects.c" + SpitTransitionsMotion* _tmp3_; #line 152 "/home/jens/Source/shotwell/src/slideshow/TransitionEffects.vala" _tmp3_ = self->priv->motion; #line 152 "/home/jens/Source/shotwell/src/slideshow/TransitionEffects.vala" _tmp1_ = _tmp3_ != NULL; -#line 1374 "TransitionEffects.c" +#line 1371 "TransitionEffects.c" } else { #line 152 "/home/jens/Source/shotwell/src/slideshow/TransitionEffects.vala" _tmp1_ = FALSE; -#line 1378 "TransitionEffects.c" +#line 1375 "TransitionEffects.c" } #line 152 "/home/jens/Source/shotwell/src/slideshow/TransitionEffects.vala" if (_tmp1_) { -#line 1382 "TransitionEffects.c" - gint _tmp4_ = 0; - SpitTransitionsMotion* _tmp5_ = NULL; - gint _tmp6_ = 0; - gint _tmp7_ = 0; +#line 1379 "TransitionEffects.c" + gint _tmp4_; + SpitTransitionsMotion* _tmp5_; + gint _tmp6_; + gint _tmp7_; #line 152 "/home/jens/Source/shotwell/src/slideshow/TransitionEffects.vala" _tmp4_ = self->priv->frame_number; #line 152 "/home/jens/Source/shotwell/src/slideshow/TransitionEffects.vala" @@ -1395,17 +1392,17 @@ gboolean transition_clock_is_in_progress (TransitionClock* self) { _tmp7_ = _tmp6_; #line 152 "/home/jens/Source/shotwell/src/slideshow/TransitionEffects.vala" _tmp0_ = _tmp4_ < _tmp7_; -#line 1397 "TransitionEffects.c" +#line 1394 "TransitionEffects.c" } else { #line 152 "/home/jens/Source/shotwell/src/slideshow/TransitionEffects.vala" _tmp0_ = FALSE; -#line 1401 "TransitionEffects.c" +#line 1398 "TransitionEffects.c" } #line 152 "/home/jens/Source/shotwell/src/slideshow/TransitionEffects.vala" result = _tmp0_; #line 152 "/home/jens/Source/shotwell/src/slideshow/TransitionEffects.vala" return result; -#line 1407 "TransitionEffects.c" +#line 1404 "TransitionEffects.c" } @@ -1414,28 +1411,28 @@ static gboolean _transition_clock_tick_gsource_func (gpointer self) { result = transition_clock_tick ((TransitionClock*) self); #line 173 "/home/jens/Source/shotwell/src/slideshow/TransitionEffects.vala" return result; -#line 1416 "TransitionEffects.c" +#line 1413 "TransitionEffects.c" } void transition_clock_start (TransitionClock* self, SpitTransitionsVisuals* visuals, SpitTransitionsDirection direction, gint duration_msec, TransitionClockRepaintCallback repaint, void* repaint_target) { - gint _tmp0_ = 0; - SpitTransitionsVisuals* _tmp1_ = NULL; - SpitTransitionsVisuals* _tmp2_ = NULL; - TransitionClockRepaintCallback _tmp3_ = NULL; - void* _tmp3__target = NULL; - SpitTransitionsDirection _tmp4_ = 0; - gint _tmp5_ = 0; - gint _tmp6_ = 0; - SpitTransitionsMotion* _tmp7_ = NULL; - SpitTransitionsEffect* _tmp8_ = NULL; - SpitTransitionsVisuals* _tmp9_ = NULL; - SpitTransitionsMotion* _tmp10_ = NULL; - gulong _tmp11_ = 0UL; - SpitTransitionsMotion* _tmp12_ = NULL; - gint _tmp13_ = 0; - gint _tmp14_ = 0; - guint _tmp15_ = 0U; + gint _tmp0_; + SpitTransitionsVisuals* _tmp1_; + SpitTransitionsVisuals* _tmp2_; + TransitionClockRepaintCallback _tmp3_; + void* _tmp3__target; + SpitTransitionsDirection _tmp4_; + gint _tmp5_; + gint _tmp6_; + SpitTransitionsMotion* _tmp7_; + SpitTransitionsEffect* _tmp8_; + SpitTransitionsVisuals* _tmp9_; + SpitTransitionsMotion* _tmp10_; + gulong _tmp11_; + SpitTransitionsMotion* _tmp12_; + gint _tmp13_; + gint _tmp14_; + guint _tmp15_; #line 155 "/home/jens/Source/shotwell/src/slideshow/TransitionEffects.vala" g_return_if_fail (IS_TRANSITION_CLOCK (self)); #line 155 "/home/jens/Source/shotwell/src/slideshow/TransitionEffects.vala" @@ -1448,7 +1445,7 @@ void transition_clock_start (TransitionClock* self, SpitTransitionsVisuals* visu if (_tmp0_ == 0) { #line 161 "/home/jens/Source/shotwell/src/slideshow/TransitionEffects.vala" return; -#line 1450 "TransitionEffects.c" +#line 1447 "TransitionEffects.c" } #line 163 "/home/jens/Source/shotwell/src/slideshow/TransitionEffects.vala" _tmp1_ = visuals; @@ -1500,7 +1497,7 @@ void transition_clock_start (TransitionClock* self, SpitTransitionsVisuals* visu _tmp15_ = g_timeout_add_full (G_PRIORITY_HIGH, (guint) _tmp14_, _transition_clock_tick_gsource_func, transition_clock_ref (self), transition_clock_unref); #line 173 "/home/jens/Source/shotwell/src/slideshow/TransitionEffects.vala" self->priv->timer_id = _tmp15_; -#line 1502 "TransitionEffects.c" +#line 1499 "TransitionEffects.c" } @@ -1529,45 +1526,45 @@ static void transition_clock_reset (TransitionClock* self) { self->priv->current_fps = 0; #line 185 "/home/jens/Source/shotwell/src/slideshow/TransitionEffects.vala" self->priv->cancelled = FALSE; -#line 1531 "TransitionEffects.c" +#line 1528 "TransitionEffects.c" } static void transition_clock_cancel_timer (TransitionClock* self) { - guint _tmp0_ = 0U; + guint _tmp0_; #line 188 "/home/jens/Source/shotwell/src/slideshow/TransitionEffects.vala" g_return_if_fail (IS_TRANSITION_CLOCK (self)); #line 189 "/home/jens/Source/shotwell/src/slideshow/TransitionEffects.vala" _tmp0_ = self->priv->timer_id; #line 189 "/home/jens/Source/shotwell/src/slideshow/TransitionEffects.vala" if (_tmp0_ != ((guint) 0)) { -#line 1543 "TransitionEffects.c" - guint _tmp1_ = 0U; +#line 1540 "TransitionEffects.c" + guint _tmp1_; #line 190 "/home/jens/Source/shotwell/src/slideshow/TransitionEffects.vala" _tmp1_ = self->priv->timer_id; #line 190 "/home/jens/Source/shotwell/src/slideshow/TransitionEffects.vala" g_source_remove (_tmp1_); #line 191 "/home/jens/Source/shotwell/src/slideshow/TransitionEffects.vala" self->priv->timer_id = (guint) 0; -#line 1551 "TransitionEffects.c" +#line 1548 "TransitionEffects.c" } } static gboolean transition_clock_is_fps_ok (TransitionClock* self) { gboolean result = FALSE; - gulong _tmp0_ = 0UL; - gint _tmp1_ = 0; + gulong _tmp0_; + gint _tmp1_; gdouble elapsed_msec = 0.0; - gulong _tmp2_ = 0UL; - gulong _tmp3_ = 0UL; - gdouble _tmp4_ = 0.0; - gint _tmp5_ = 0; - gdouble _tmp6_ = 0.0; - gint _tmp7_ = 0; - gint _tmp8_ = 0; - gint _tmp13_ = 0; - gint _tmp14_ = 0; + gulong _tmp2_; + gulong _tmp3_; + gdouble _tmp4_; + gint _tmp5_; + gdouble _tmp6_; + gint _tmp7_; + gint _tmp8_; + gint _tmp13_; + gint _tmp14_; #line 196 "/home/jens/Source/shotwell/src/slideshow/TransitionEffects.vala" g_return_val_if_fail (IS_TRANSITION_CLOCK (self), FALSE); #line 197 "/home/jens/Source/shotwell/src/slideshow/TransitionEffects.vala" @@ -1582,7 +1579,7 @@ static gboolean transition_clock_is_fps_ok (TransitionClock* self) { result = TRUE; #line 200 "/home/jens/Source/shotwell/src/slideshow/TransitionEffects.vala" return result; -#line 1584 "TransitionEffects.c" +#line 1581 "TransitionEffects.c" } #line 202 "/home/jens/Source/shotwell/src/slideshow/TransitionEffects.vala" _tmp2_ = now_ms (); @@ -1598,7 +1595,7 @@ static gboolean transition_clock_is_fps_ok (TransitionClock* self) { result = TRUE; #line 204 "/home/jens/Source/shotwell/src/slideshow/TransitionEffects.vala" return result; -#line 1600 "TransitionEffects.c" +#line 1597 "TransitionEffects.c" } #line 206 "/home/jens/Source/shotwell/src/slideshow/TransitionEffects.vala" _tmp5_ = self->priv->frame_number; @@ -1612,11 +1609,11 @@ static gboolean transition_clock_is_fps_ok (TransitionClock* self) { _tmp8_ = self->priv->min_fps; #line 207 "/home/jens/Source/shotwell/src/slideshow/TransitionEffects.vala" if (_tmp7_ < _tmp8_) { -#line 1614 "TransitionEffects.c" - gint _tmp9_ = 0; - gint _tmp10_ = 0; - gdouble _tmp11_ = 0.0; - gint _tmp12_ = 0; +#line 1611 "TransitionEffects.c" + gint _tmp9_; + gint _tmp10_; + gdouble _tmp11_; + gint _tmp12_; #line 208 "/home/jens/Source/shotwell/src/slideshow/TransitionEffects.vala" _tmp9_ = self->priv->current_fps; #line 208 "/home/jens/Source/shotwell/src/slideshow/TransitionEffects.vala" @@ -1628,7 +1625,7 @@ static gboolean transition_clock_is_fps_ok (TransitionClock* self) { #line 208 "/home/jens/Source/shotwell/src/slideshow/TransitionEffects.vala" g_debug ("TransitionEffects.vala:208: Transition rate of %dfps below minimum of " \ "%dfps (elapsed=%lf frames=%d)", _tmp9_, _tmp10_, _tmp11_, _tmp12_); -#line 1629 "TransitionEffects.c" +#line 1626 "TransitionEffects.c" } #line 212 "/home/jens/Source/shotwell/src/slideshow/TransitionEffects.vala" _tmp13_ = self->priv->current_fps; @@ -1638,14 +1635,14 @@ static gboolean transition_clock_is_fps_ok (TransitionClock* self) { result = _tmp13_ >= _tmp14_; #line 212 "/home/jens/Source/shotwell/src/slideshow/TransitionEffects.vala" return result; -#line 1639 "TransitionEffects.c" +#line 1636 "TransitionEffects.c" } void transition_clock_cancel (TransitionClock* self) { - SpitTransitionsEffect* _tmp0_ = NULL; - TransitionClockRepaintCallback _tmp1_ = NULL; - void* _tmp1__target = NULL; + SpitTransitionsEffect* _tmp0_; + TransitionClockRepaintCallback _tmp1_; + void* _tmp1__target; #line 216 "/home/jens/Source/shotwell/src/slideshow/TransitionEffects.vala" g_return_if_fail (IS_TRANSITION_CLOCK (self)); #line 217 "/home/jens/Source/shotwell/src/slideshow/TransitionEffects.vala" @@ -1662,26 +1659,26 @@ void transition_clock_cancel (TransitionClock* self) { _tmp1__target = self->priv->repaint_target; #line 222 "/home/jens/Source/shotwell/src/slideshow/TransitionEffects.vala" _tmp1_ (_tmp1__target); -#line 1663 "TransitionEffects.c" +#line 1660 "TransitionEffects.c" } gboolean transition_clock_paint (TransitionClock* self, cairo_t* ctx, gint width, gint height) { gboolean result = FALSE; - gboolean _tmp0_ = FALSE; - OpTimer* _tmp1_ = NULL; - cairo_t* _tmp2_ = NULL; - SpitTransitionsEffect* _tmp3_ = NULL; - gboolean _tmp4_ = FALSE; - SpitTransitionsEffect* _tmp26_ = NULL; - SpitTransitionsVisuals* _tmp27_ = NULL; - SpitTransitionsMotion* _tmp28_ = NULL; - cairo_t* _tmp29_ = NULL; - gint _tmp30_ = 0; - gint _tmp31_ = 0; - gint _tmp32_ = 0; - cairo_t* _tmp33_ = NULL; - OpTimer* _tmp34_ = NULL; + gboolean _tmp0_; + OpTimer* _tmp1_; + cairo_t* _tmp2_; + SpitTransitionsEffect* _tmp3_; + gboolean _tmp4_; + SpitTransitionsEffect* _tmp26_; + SpitTransitionsVisuals* _tmp27_; + SpitTransitionsMotion* _tmp28_; + cairo_t* _tmp29_; + gint _tmp30_; + gint _tmp31_; + gint _tmp32_; + cairo_t* _tmp33_; + OpTimer* _tmp34_; #line 227 "/home/jens/Source/shotwell/src/slideshow/TransitionEffects.vala" g_return_val_if_fail (IS_TRANSITION_CLOCK (self), FALSE); #line 227 "/home/jens/Source/shotwell/src/slideshow/TransitionEffects.vala" @@ -1694,7 +1691,7 @@ gboolean transition_clock_paint (TransitionClock* self, cairo_t* ctx, gint width result = FALSE; #line 229 "/home/jens/Source/shotwell/src/slideshow/TransitionEffects.vala" return result; -#line 1695 "TransitionEffects.c" +#line 1692 "TransitionEffects.c" } #line 231 "/home/jens/Source/shotwell/src/slideshow/TransitionEffects.vala" _tmp1_ = self->priv->paint_timer; @@ -1710,28 +1707,28 @@ gboolean transition_clock_paint (TransitionClock* self, cairo_t* ctx, gint width _tmp4_ = spit_transitions_effect_needs_clear_background (_tmp3_); #line 235 "/home/jens/Source/shotwell/src/slideshow/TransitionEffects.vala" if (_tmp4_) { -#line 1711 "TransitionEffects.c" - cairo_t* _tmp5_ = NULL; - SpitTransitionsVisuals* _tmp6_ = NULL; +#line 1708 "TransitionEffects.c" + cairo_t* _tmp5_; + SpitTransitionsVisuals* _tmp6_; GdkRGBA _tmp7_ = {0}; - GdkRGBA _tmp8_ = {0}; - gdouble _tmp9_ = 0.0; - SpitTransitionsVisuals* _tmp10_ = NULL; + GdkRGBA _tmp8_; + gdouble _tmp9_; + SpitTransitionsVisuals* _tmp10_; GdkRGBA _tmp11_ = {0}; - GdkRGBA _tmp12_ = {0}; - gdouble _tmp13_ = 0.0; - SpitTransitionsVisuals* _tmp14_ = NULL; + GdkRGBA _tmp12_; + gdouble _tmp13_; + SpitTransitionsVisuals* _tmp14_; GdkRGBA _tmp15_ = {0}; - GdkRGBA _tmp16_ = {0}; - gdouble _tmp17_ = 0.0; - SpitTransitionsVisuals* _tmp18_ = NULL; + GdkRGBA _tmp16_; + gdouble _tmp17_; + SpitTransitionsVisuals* _tmp18_; GdkRGBA _tmp19_ = {0}; - GdkRGBA _tmp20_ = {0}; - gdouble _tmp21_ = 0.0; - cairo_t* _tmp22_ = NULL; - gint _tmp23_ = 0; - gint _tmp24_ = 0; - cairo_t* _tmp25_ = NULL; + GdkRGBA _tmp20_; + gdouble _tmp21_; + cairo_t* _tmp22_; + gint _tmp23_; + gint _tmp24_; + cairo_t* _tmp25_; #line 236 "/home/jens/Source/shotwell/src/slideshow/TransitionEffects.vala" _tmp5_ = ctx; #line 236 "/home/jens/Source/shotwell/src/slideshow/TransitionEffects.vala" @@ -1780,7 +1777,7 @@ gboolean transition_clock_paint (TransitionClock* self, cairo_t* ctx, gint width _tmp25_ = ctx; #line 239 "/home/jens/Source/shotwell/src/slideshow/TransitionEffects.vala" cairo_fill (_tmp25_); -#line 1781 "TransitionEffects.c" +#line 1778 "TransitionEffects.c" } #line 242 "/home/jens/Source/shotwell/src/slideshow/TransitionEffects.vala" _tmp26_ = self->priv->effect; @@ -1810,20 +1807,20 @@ gboolean transition_clock_paint (TransitionClock* self, cairo_t* ctx, gint width result = TRUE; #line 248 "/home/jens/Source/shotwell/src/slideshow/TransitionEffects.vala" return result; -#line 1811 "TransitionEffects.c" +#line 1808 "TransitionEffects.c" } static gboolean transition_clock_tick (TransitionClock* self) { gboolean result = FALSE; - gboolean _tmp0_ = FALSE; - TransitionClockRepaintCallback _tmp1_ = NULL; - void* _tmp1__target = NULL; - gboolean _tmp2_ = FALSE; - gint _tmp3_ = 0; - SpitTransitionsMotion* _tmp4_ = NULL; - gint _tmp5_ = 0; - gint _tmp6_ = 0; + gboolean _tmp0_; + TransitionClockRepaintCallback _tmp1_; + void* _tmp1__target; + gboolean _tmp2_; + gint _tmp3_; + SpitTransitionsMotion* _tmp4_; + gint _tmp5_; + gint _tmp6_; #line 251 "/home/jens/Source/shotwell/src/slideshow/TransitionEffects.vala" g_return_val_if_fail (IS_TRANSITION_CLOCK (self), FALSE); #line 252 "/home/jens/Source/shotwell/src/slideshow/TransitionEffects.vala" @@ -1834,7 +1831,7 @@ static gboolean transition_clock_tick (TransitionClock* self) { g_debug ("TransitionEffects.vala:253: Cancelling transition: below minimum fps"); #line 254 "/home/jens/Source/shotwell/src/slideshow/TransitionEffects.vala" transition_clock_cancel (self); -#line 1835 "TransitionEffects.c" +#line 1832 "TransitionEffects.c" } #line 259 "/home/jens/Source/shotwell/src/slideshow/TransitionEffects.vala" _tmp1_ = self->priv->repaint; @@ -1852,7 +1849,7 @@ static gboolean transition_clock_tick (TransitionClock* self) { result = FALSE; #line 264 "/home/jens/Source/shotwell/src/slideshow/TransitionEffects.vala" return result; -#line 1853 "TransitionEffects.c" +#line 1850 "TransitionEffects.c" } #line 268 "/home/jens/Source/shotwell/src/slideshow/TransitionEffects.vala" _tmp3_ = self->priv->frame_number; @@ -1864,12 +1861,12 @@ static gboolean transition_clock_tick (TransitionClock* self) { _tmp6_ = _tmp5_; #line 268 "/home/jens/Source/shotwell/src/slideshow/TransitionEffects.vala" if (_tmp3_ < _tmp6_) { -#line 1865 "TransitionEffects.c" - SpitTransitionsEffect* _tmp7_ = NULL; - SpitTransitionsVisuals* _tmp8_ = NULL; - SpitTransitionsMotion* _tmp9_ = NULL; - gint _tmp10_ = 0; - gint _tmp11_ = 0; +#line 1862 "TransitionEffects.c" + SpitTransitionsEffect* _tmp7_; + SpitTransitionsVisuals* _tmp8_; + SpitTransitionsMotion* _tmp9_; + gint _tmp10_; + gint _tmp11_; #line 269 "/home/jens/Source/shotwell/src/slideshow/TransitionEffects.vala" _tmp7_ = self->priv->effect; #line 269 "/home/jens/Source/shotwell/src/slideshow/TransitionEffects.vala" @@ -1884,20 +1881,20 @@ static gboolean transition_clock_tick (TransitionClock* self) { _tmp11_ = self->priv->frame_number; #line 269 "/home/jens/Source/shotwell/src/slideshow/TransitionEffects.vala" spit_transitions_effect_advance (_tmp7_, _tmp8_, _tmp9_, _tmp11_); -#line 1885 "TransitionEffects.c" +#line 1882 "TransitionEffects.c" } #line 271 "/home/jens/Source/shotwell/src/slideshow/TransitionEffects.vala" result = TRUE; #line 271 "/home/jens/Source/shotwell/src/slideshow/TransitionEffects.vala" return result; -#line 1891 "TransitionEffects.c" +#line 1888 "TransitionEffects.c" } static void value_transition_clock_init (GValue* value) { #line 116 "/home/jens/Source/shotwell/src/slideshow/TransitionEffects.vala" value->data[0].v_pointer = NULL; -#line 1898 "TransitionEffects.c" +#line 1895 "TransitionEffects.c" } @@ -1906,7 +1903,7 @@ static void value_transition_clock_free_value (GValue* value) { if (value->data[0].v_pointer) { #line 116 "/home/jens/Source/shotwell/src/slideshow/TransitionEffects.vala" transition_clock_unref (value->data[0].v_pointer); -#line 1907 "TransitionEffects.c" +#line 1904 "TransitionEffects.c" } } @@ -1916,11 +1913,11 @@ static void value_transition_clock_copy_value (const GValue* src_value, GValue* if (src_value->data[0].v_pointer) { #line 116 "/home/jens/Source/shotwell/src/slideshow/TransitionEffects.vala" dest_value->data[0].v_pointer = transition_clock_ref (src_value->data[0].v_pointer); -#line 1917 "TransitionEffects.c" +#line 1914 "TransitionEffects.c" } else { #line 116 "/home/jens/Source/shotwell/src/slideshow/TransitionEffects.vala" dest_value->data[0].v_pointer = NULL; -#line 1921 "TransitionEffects.c" +#line 1918 "TransitionEffects.c" } } @@ -1928,66 +1925,66 @@ static void value_transition_clock_copy_value (const GValue* src_value, GValue* static gpointer value_transition_clock_peek_pointer (const GValue* value) { #line 116 "/home/jens/Source/shotwell/src/slideshow/TransitionEffects.vala" return value->data[0].v_pointer; -#line 1929 "TransitionEffects.c" +#line 1926 "TransitionEffects.c" } static gchar* value_transition_clock_collect_value (GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) { #line 116 "/home/jens/Source/shotwell/src/slideshow/TransitionEffects.vala" if (collect_values[0].v_pointer) { -#line 1936 "TransitionEffects.c" - TransitionClock* object; +#line 1933 "TransitionEffects.c" + TransitionClock * object; object = collect_values[0].v_pointer; #line 116 "/home/jens/Source/shotwell/src/slideshow/TransitionEffects.vala" if (object->parent_instance.g_class == NULL) { #line 116 "/home/jens/Source/shotwell/src/slideshow/TransitionEffects.vala" return g_strconcat ("invalid unclassed object pointer for value type `", G_VALUE_TYPE_NAME (value), "'", NULL); -#line 1943 "TransitionEffects.c" +#line 1940 "TransitionEffects.c" } else if (!g_value_type_compatible (G_TYPE_FROM_INSTANCE (object), G_VALUE_TYPE (value))) { #line 116 "/home/jens/Source/shotwell/src/slideshow/TransitionEffects.vala" return g_strconcat ("invalid object type `", g_type_name (G_TYPE_FROM_INSTANCE (object)), "' for value type `", G_VALUE_TYPE_NAME (value), "'", NULL); -#line 1947 "TransitionEffects.c" +#line 1944 "TransitionEffects.c" } #line 116 "/home/jens/Source/shotwell/src/slideshow/TransitionEffects.vala" value->data[0].v_pointer = transition_clock_ref (object); -#line 1951 "TransitionEffects.c" +#line 1948 "TransitionEffects.c" } else { #line 116 "/home/jens/Source/shotwell/src/slideshow/TransitionEffects.vala" value->data[0].v_pointer = NULL; -#line 1955 "TransitionEffects.c" +#line 1952 "TransitionEffects.c" } #line 116 "/home/jens/Source/shotwell/src/slideshow/TransitionEffects.vala" return NULL; -#line 1959 "TransitionEffects.c" +#line 1956 "TransitionEffects.c" } static gchar* value_transition_clock_lcopy_value (const GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) { - TransitionClock** object_p; + TransitionClock ** object_p; object_p = collect_values[0].v_pointer; #line 116 "/home/jens/Source/shotwell/src/slideshow/TransitionEffects.vala" if (!object_p) { #line 116 "/home/jens/Source/shotwell/src/slideshow/TransitionEffects.vala" return g_strdup_printf ("value location for `%s' passed as NULL", G_VALUE_TYPE_NAME (value)); -#line 1970 "TransitionEffects.c" +#line 1967 "TransitionEffects.c" } #line 116 "/home/jens/Source/shotwell/src/slideshow/TransitionEffects.vala" if (!value->data[0].v_pointer) { #line 116 "/home/jens/Source/shotwell/src/slideshow/TransitionEffects.vala" *object_p = NULL; -#line 1976 "TransitionEffects.c" +#line 1973 "TransitionEffects.c" } else if (collect_flags & G_VALUE_NOCOPY_CONTENTS) { #line 116 "/home/jens/Source/shotwell/src/slideshow/TransitionEffects.vala" *object_p = value->data[0].v_pointer; -#line 1980 "TransitionEffects.c" +#line 1977 "TransitionEffects.c" } else { #line 116 "/home/jens/Source/shotwell/src/slideshow/TransitionEffects.vala" *object_p = transition_clock_ref (value->data[0].v_pointer); -#line 1984 "TransitionEffects.c" +#line 1981 "TransitionEffects.c" } #line 116 "/home/jens/Source/shotwell/src/slideshow/TransitionEffects.vala" return NULL; -#line 1988 "TransitionEffects.c" +#line 1985 "TransitionEffects.c" } @@ -2001,7 +1998,7 @@ GParamSpec* param_spec_transition_clock (const gchar* name, const gchar* nick, c G_PARAM_SPEC (spec)->value_type = object_type; #line 116 "/home/jens/Source/shotwell/src/slideshow/TransitionEffects.vala" return G_PARAM_SPEC (spec); -#line 2002 "TransitionEffects.c" +#line 1999 "TransitionEffects.c" } @@ -2010,12 +2007,12 @@ gpointer value_get_transition_clock (const GValue* value) { g_return_val_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, TYPE_TRANSITION_CLOCK), NULL); #line 116 "/home/jens/Source/shotwell/src/slideshow/TransitionEffects.vala" return value->data[0].v_pointer; -#line 2011 "TransitionEffects.c" +#line 2008 "TransitionEffects.c" } void value_set_transition_clock (GValue* value, gpointer v_object) { - TransitionClock* old; + TransitionClock * old; #line 116 "/home/jens/Source/shotwell/src/slideshow/TransitionEffects.vala" g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, TYPE_TRANSITION_CLOCK)); #line 116 "/home/jens/Source/shotwell/src/slideshow/TransitionEffects.vala" @@ -2030,23 +2027,23 @@ void value_set_transition_clock (GValue* value, gpointer v_object) { value->data[0].v_pointer = v_object; #line 116 "/home/jens/Source/shotwell/src/slideshow/TransitionEffects.vala" transition_clock_ref (value->data[0].v_pointer); -#line 2031 "TransitionEffects.c" +#line 2028 "TransitionEffects.c" } else { #line 116 "/home/jens/Source/shotwell/src/slideshow/TransitionEffects.vala" value->data[0].v_pointer = NULL; -#line 2035 "TransitionEffects.c" +#line 2032 "TransitionEffects.c" } #line 116 "/home/jens/Source/shotwell/src/slideshow/TransitionEffects.vala" if (old) { #line 116 "/home/jens/Source/shotwell/src/slideshow/TransitionEffects.vala" transition_clock_unref (old); -#line 2041 "TransitionEffects.c" +#line 2038 "TransitionEffects.c" } } void value_take_transition_clock (GValue* value, gpointer v_object) { - TransitionClock* old; + TransitionClock * old; #line 116 "/home/jens/Source/shotwell/src/slideshow/TransitionEffects.vala" g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, TYPE_TRANSITION_CLOCK)); #line 116 "/home/jens/Source/shotwell/src/slideshow/TransitionEffects.vala" @@ -2059,17 +2056,17 @@ void value_take_transition_clock (GValue* value, gpointer v_object) { g_return_if_fail (g_value_type_compatible (G_TYPE_FROM_INSTANCE (v_object), G_VALUE_TYPE (value))); #line 116 "/home/jens/Source/shotwell/src/slideshow/TransitionEffects.vala" value->data[0].v_pointer = v_object; -#line 2060 "TransitionEffects.c" +#line 2057 "TransitionEffects.c" } else { #line 116 "/home/jens/Source/shotwell/src/slideshow/TransitionEffects.vala" value->data[0].v_pointer = NULL; -#line 2064 "TransitionEffects.c" +#line 2061 "TransitionEffects.c" } #line 116 "/home/jens/Source/shotwell/src/slideshow/TransitionEffects.vala" if (old) { #line 116 "/home/jens/Source/shotwell/src/slideshow/TransitionEffects.vala" transition_clock_unref (old); -#line 2070 "TransitionEffects.c" +#line 2067 "TransitionEffects.c" } } @@ -2081,7 +2078,7 @@ static void transition_clock_class_init (TransitionClockClass * klass) { ((TransitionClockClass *) klass)->finalize = transition_clock_finalize; #line 116 "/home/jens/Source/shotwell/src/slideshow/TransitionEffects.vala" g_type_class_add_private (klass, sizeof (TransitionClockPrivate)); -#line 2082 "TransitionEffects.c" +#line 2079 "TransitionEffects.c" } @@ -2096,6 +2093,8 @@ static void transition_clock_instance_init (TransitionClock * self) { self->priv->motion = NULL; #line 130 "/home/jens/Source/shotwell/src/slideshow/TransitionEffects.vala" self->priv->repaint = NULL; +#line 130 "/home/jens/Source/shotwell/src/slideshow/TransitionEffects.vala" + self->priv->repaint_target = self; #line 131 "/home/jens/Source/shotwell/src/slideshow/TransitionEffects.vala" self->priv->timer_id = (guint) 0; #line 132 "/home/jens/Source/shotwell/src/slideshow/TransitionEffects.vala" @@ -2106,20 +2105,20 @@ static void transition_clock_instance_init (TransitionClock * self) { self->priv->cancelled = FALSE; #line 116 "/home/jens/Source/shotwell/src/slideshow/TransitionEffects.vala" self->ref_count = 1; -#line 2107 "TransitionEffects.c" +#line 2106 "TransitionEffects.c" } -static void transition_clock_finalize (TransitionClock* obj) { +static void transition_clock_finalize (TransitionClock * obj) { TransitionClock * self; gint _tmp0_ = 0; - SpitTransitionsMotion* _tmp1_ = NULL; - OpTimer* _tmp5_ = NULL; - gchar* _tmp6_ = NULL; - gchar* _tmp7_ = NULL; - gint _tmp8_ = 0; - gint _tmp9_ = 0; - gint _tmp10_ = 0; + SpitTransitionsMotion* _tmp1_; + OpTimer* _tmp5_; + gchar* _tmp6_; + gchar* _tmp7_; + gint _tmp8_; + gint _tmp9_; + gint _tmp10_; #line 116 "/home/jens/Source/shotwell/src/slideshow/TransitionEffects.vala" self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_TRANSITION_CLOCK, TransitionClock); #line 116 "/home/jens/Source/shotwell/src/slideshow/TransitionEffects.vala" @@ -2130,10 +2129,10 @@ static void transition_clock_finalize (TransitionClock* obj) { _tmp1_ = self->priv->motion; #line 148 "/home/jens/Source/shotwell/src/slideshow/TransitionEffects.vala" if (_tmp1_ != NULL) { -#line 2131 "TransitionEffects.c" - SpitTransitionsMotion* _tmp2_ = NULL; - gint _tmp3_ = 0; - gint _tmp4_ = 0; +#line 2130 "TransitionEffects.c" + SpitTransitionsMotion* _tmp2_; + gint _tmp3_; + gint _tmp4_; #line 148 "/home/jens/Source/shotwell/src/slideshow/TransitionEffects.vala" _tmp2_ = self->priv->motion; #line 148 "/home/jens/Source/shotwell/src/slideshow/TransitionEffects.vala" @@ -2142,11 +2141,11 @@ static void transition_clock_finalize (TransitionClock* obj) { _tmp4_ = _tmp3_; #line 148 "/home/jens/Source/shotwell/src/slideshow/TransitionEffects.vala" _tmp0_ = _tmp4_; -#line 2143 "TransitionEffects.c" +#line 2142 "TransitionEffects.c" } else { #line 148 "/home/jens/Source/shotwell/src/slideshow/TransitionEffects.vala" _tmp0_ = 0; -#line 2147 "TransitionEffects.c" +#line 2146 "TransitionEffects.c" } #line 147 "/home/jens/Source/shotwell/src/slideshow/TransitionEffects.vala" _tmp5_ = self->priv->paint_timer; @@ -2175,7 +2174,7 @@ static void transition_clock_finalize (TransitionClock* obj) { _g_object_unref0 (self->priv->visuals); #line 129 "/home/jens/Source/shotwell/src/slideshow/TransitionEffects.vala" _g_object_unref0 (self->priv->motion); -#line 2175 "TransitionEffects.c" +#line 2174 "TransitionEffects.c" } @@ -2194,18 +2193,18 @@ GType transition_clock_get_type (void) { gpointer transition_clock_ref (gpointer instance) { - TransitionClock* self; + TransitionClock * self; self = instance; #line 116 "/home/jens/Source/shotwell/src/slideshow/TransitionEffects.vala" g_atomic_int_inc (&self->ref_count); #line 116 "/home/jens/Source/shotwell/src/slideshow/TransitionEffects.vala" return instance; -#line 2200 "TransitionEffects.c" +#line 2199 "TransitionEffects.c" } void transition_clock_unref (gpointer instance) { - TransitionClock* self; + TransitionClock * self; self = instance; #line 116 "/home/jens/Source/shotwell/src/slideshow/TransitionEffects.vala" if (g_atomic_int_dec_and_test (&self->ref_count)) { @@ -2213,7 +2212,7 @@ void transition_clock_unref (gpointer instance) { TRANSITION_CLOCK_GET_CLASS (self)->finalize (self); #line 116 "/home/jens/Source/shotwell/src/slideshow/TransitionEffects.vala" g_type_free_instance ((GTypeInstance *) self); -#line 2213 "TransitionEffects.c" +#line 2212 "TransitionEffects.c" } } @@ -2227,7 +2226,7 @@ static gint null_transition_descriptor_real_get_pluggable_interface (SpitPluggab result = SPIT_TRANSITIONS_CURRENT_INTERFACE; #line 279 "/home/jens/Source/shotwell/src/slideshow/TransitionEffects.vala" return result; -#line 2227 "TransitionEffects.c" +#line 2226 "TransitionEffects.c" } @@ -2240,23 +2239,20 @@ static const gchar* null_transition_descriptor_real_get_id (SpitPluggable* base) result = NULL_TRANSITION_DESCRIPTOR_EFFECT_ID; #line 283 "/home/jens/Source/shotwell/src/slideshow/TransitionEffects.vala" return result; -#line 2240 "TransitionEffects.c" +#line 2239 "TransitionEffects.c" } static const gchar* null_transition_descriptor_real_get_pluggable_name (SpitPluggable* base) { NullTransitionDescriptor * self; const gchar* result = NULL; - const gchar* _tmp0_ = NULL; #line 286 "/home/jens/Source/shotwell/src/slideshow/TransitionEffects.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_NULL_TRANSITION_DESCRIPTOR, NullTransitionDescriptor); #line 287 "/home/jens/Source/shotwell/src/slideshow/TransitionEffects.vala" - _tmp0_ = _ ("None"); -#line 287 "/home/jens/Source/shotwell/src/slideshow/TransitionEffects.vala" - result = _tmp0_; + result = _ ("None"); #line 287 "/home/jens/Source/shotwell/src/slideshow/TransitionEffects.vala" return result; -#line 2256 "TransitionEffects.c" +#line 2252 "TransitionEffects.c" } @@ -2266,7 +2262,7 @@ static void null_transition_descriptor_real_get_info (SpitPluggable* base, SpitP self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_NULL_TRANSITION_DESCRIPTOR, NullTransitionDescriptor); #line 290 "/home/jens/Source/shotwell/src/slideshow/TransitionEffects.vala" g_return_if_fail (info != NULL); -#line 2266 "TransitionEffects.c" +#line 2262 "TransitionEffects.c" } @@ -2274,14 +2270,14 @@ static void null_transition_descriptor_real_activation (SpitPluggable* base, gbo NullTransitionDescriptor * self; #line 293 "/home/jens/Source/shotwell/src/slideshow/TransitionEffects.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_NULL_TRANSITION_DESCRIPTOR, NullTransitionDescriptor); -#line 2274 "TransitionEffects.c" +#line 2270 "TransitionEffects.c" } static SpitTransitionsEffect* null_transition_descriptor_real_create (SpitTransitionsDescriptor* base, SpitHostInterface* host) { NullTransitionDescriptor * self; SpitTransitionsEffect* result = NULL; - NullEffect* _tmp0_ = NULL; + NullEffect* _tmp0_; #line 296 "/home/jens/Source/shotwell/src/slideshow/TransitionEffects.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_NULL_TRANSITION_DESCRIPTOR, NullTransitionDescriptor); #line 296 "/home/jens/Source/shotwell/src/slideshow/TransitionEffects.vala" @@ -2292,7 +2288,7 @@ static SpitTransitionsEffect* null_transition_descriptor_real_create (SpitTransi result = G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, SPIT_TRANSITIONS_TYPE_EFFECT, SpitTransitionsEffect); #line 297 "/home/jens/Source/shotwell/src/slideshow/TransitionEffects.vala" return result; -#line 2292 "TransitionEffects.c" +#line 2288 "TransitionEffects.c" } @@ -2302,21 +2298,21 @@ NullTransitionDescriptor* null_transition_descriptor_construct (GType object_typ self = (NullTransitionDescriptor*) g_object_new (object_type, NULL); #line 275 "/home/jens/Source/shotwell/src/slideshow/TransitionEffects.vala" return self; -#line 2302 "TransitionEffects.c" +#line 2298 "TransitionEffects.c" } NullTransitionDescriptor* null_transition_descriptor_new (void) { #line 275 "/home/jens/Source/shotwell/src/slideshow/TransitionEffects.vala" return null_transition_descriptor_construct (TYPE_NULL_TRANSITION_DESCRIPTOR); -#line 2309 "TransitionEffects.c" +#line 2305 "TransitionEffects.c" } static void null_transition_descriptor_class_init (NullTransitionDescriptorClass * klass) { #line 275 "/home/jens/Source/shotwell/src/slideshow/TransitionEffects.vala" null_transition_descriptor_parent_class = g_type_class_peek_parent (klass); -#line 2316 "TransitionEffects.c" +#line 2312 "TransitionEffects.c" } @@ -2324,16 +2320,16 @@ static void null_transition_descriptor_spit_pluggable_interface_init (SpitPlugga #line 275 "/home/jens/Source/shotwell/src/slideshow/TransitionEffects.vala" null_transition_descriptor_spit_pluggable_parent_iface = g_type_interface_peek_parent (iface); #line 275 "/home/jens/Source/shotwell/src/slideshow/TransitionEffects.vala" - iface->get_pluggable_interface = (gint (*)(SpitPluggable*, gint, gint)) null_transition_descriptor_real_get_pluggable_interface; + iface->get_pluggable_interface = (gint (*) (SpitPluggable *, gint, gint)) null_transition_descriptor_real_get_pluggable_interface; #line 275 "/home/jens/Source/shotwell/src/slideshow/TransitionEffects.vala" - iface->get_id = (const gchar* (*)(SpitPluggable*)) null_transition_descriptor_real_get_id; + iface->get_id = (const gchar* (*) (SpitPluggable *)) null_transition_descriptor_real_get_id; #line 275 "/home/jens/Source/shotwell/src/slideshow/TransitionEffects.vala" - iface->get_pluggable_name = (const gchar* (*)(SpitPluggable*)) null_transition_descriptor_real_get_pluggable_name; + iface->get_pluggable_name = (const gchar* (*) (SpitPluggable *)) null_transition_descriptor_real_get_pluggable_name; #line 275 "/home/jens/Source/shotwell/src/slideshow/TransitionEffects.vala" - iface->get_info = (void (*)(SpitPluggable*, SpitPluggableInfo*)) null_transition_descriptor_real_get_info; + iface->get_info = (void (*) (SpitPluggable *, SpitPluggableInfo*)) null_transition_descriptor_real_get_info; #line 275 "/home/jens/Source/shotwell/src/slideshow/TransitionEffects.vala" - iface->activation = (void (*)(SpitPluggable*, gboolean)) null_transition_descriptor_real_activation; -#line 2333 "TransitionEffects.c" + iface->activation = (void (*) (SpitPluggable *, gboolean)) null_transition_descriptor_real_activation; +#line 2329 "TransitionEffects.c" } @@ -2341,8 +2337,8 @@ static void null_transition_descriptor_spit_transitions_descriptor_interface_ini #line 275 "/home/jens/Source/shotwell/src/slideshow/TransitionEffects.vala" null_transition_descriptor_spit_transitions_descriptor_parent_iface = g_type_interface_peek_parent (iface); #line 275 "/home/jens/Source/shotwell/src/slideshow/TransitionEffects.vala" - iface->create = (SpitTransitionsEffect* (*)(SpitTransitionsDescriptor*, SpitHostInterface*)) null_transition_descriptor_real_create; -#line 2342 "TransitionEffects.c" + iface->create = (SpitTransitionsEffect* (*) (SpitTransitionsDescriptor *, SpitHostInterface*)) null_transition_descriptor_real_create; +#line 2338 "TransitionEffects.c" } @@ -2372,14 +2368,14 @@ NullEffect* null_effect_construct (GType object_type) { self = (NullEffect*) g_object_new (object_type, NULL); #line 302 "/home/jens/Source/shotwell/src/slideshow/TransitionEffects.vala" return self; -#line 2372 "TransitionEffects.c" +#line 2368 "TransitionEffects.c" } NullEffect* null_effect_new (void) { #line 302 "/home/jens/Source/shotwell/src/slideshow/TransitionEffects.vala" return null_effect_construct (TYPE_NULL_EFFECT); -#line 2379 "TransitionEffects.c" +#line 2375 "TransitionEffects.c" } @@ -2397,13 +2393,13 @@ static void null_effect_real_get_fps (SpitTransitionsEffect* base, gint* desired if (desired_fps) { #line 305 "/home/jens/Source/shotwell/src/slideshow/TransitionEffects.vala" *desired_fps = _vala_desired_fps; -#line 2397 "TransitionEffects.c" +#line 2393 "TransitionEffects.c" } #line 305 "/home/jens/Source/shotwell/src/slideshow/TransitionEffects.vala" if (min_fps) { #line 305 "/home/jens/Source/shotwell/src/slideshow/TransitionEffects.vala" *min_fps = _vala_min_fps; -#line 2403 "TransitionEffects.c" +#line 2399 "TransitionEffects.c" } } @@ -2416,7 +2412,7 @@ static void null_effect_real_start (SpitTransitionsEffect* base, SpitTransitions g_return_if_fail (SPIT_TRANSITIONS_IS_VISUALS (visuals)); #line 310 "/home/jens/Source/shotwell/src/slideshow/TransitionEffects.vala" g_return_if_fail (SPIT_TRANSITIONS_IS_MOTION (motion)); -#line 2416 "TransitionEffects.c" +#line 2412 "TransitionEffects.c" } @@ -2429,7 +2425,7 @@ static gboolean null_effect_real_needs_clear_background (SpitTransitionsEffect* result = FALSE; #line 314 "/home/jens/Source/shotwell/src/slideshow/TransitionEffects.vala" return result; -#line 2429 "TransitionEffects.c" +#line 2425 "TransitionEffects.c" } @@ -2443,7 +2439,7 @@ static void null_effect_real_paint (SpitTransitionsEffect* base, SpitTransitions g_return_if_fail (SPIT_TRANSITIONS_IS_MOTION (motion)); #line 317 "/home/jens/Source/shotwell/src/slideshow/TransitionEffects.vala" g_return_if_fail (ctx != NULL); -#line 2443 "TransitionEffects.c" +#line 2439 "TransitionEffects.c" } @@ -2455,7 +2451,7 @@ static void null_effect_real_advance (SpitTransitionsEffect* base, SpitTransitio g_return_if_fail (SPIT_TRANSITIONS_IS_VISUALS (visuals)); #line 321 "/home/jens/Source/shotwell/src/slideshow/TransitionEffects.vala" g_return_if_fail (SPIT_TRANSITIONS_IS_MOTION (motion)); -#line 2455 "TransitionEffects.c" +#line 2451 "TransitionEffects.c" } @@ -2463,14 +2459,14 @@ static void null_effect_real_cancel (SpitTransitionsEffect* base) { NullEffect * self; #line 324 "/home/jens/Source/shotwell/src/slideshow/TransitionEffects.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_NULL_EFFECT, NullEffect); -#line 2463 "TransitionEffects.c" +#line 2459 "TransitionEffects.c" } static void null_effect_class_init (NullEffectClass * klass) { #line 301 "/home/jens/Source/shotwell/src/slideshow/TransitionEffects.vala" null_effect_parent_class = g_type_class_peek_parent (klass); -#line 2470 "TransitionEffects.c" +#line 2466 "TransitionEffects.c" } @@ -2478,18 +2474,18 @@ static void null_effect_spit_transitions_effect_interface_init (SpitTransitionsE #line 301 "/home/jens/Source/shotwell/src/slideshow/TransitionEffects.vala" null_effect_spit_transitions_effect_parent_iface = g_type_interface_peek_parent (iface); #line 301 "/home/jens/Source/shotwell/src/slideshow/TransitionEffects.vala" - iface->get_fps = (void (*)(SpitTransitionsEffect*, gint*, gint*)) null_effect_real_get_fps; + iface->get_fps = (void (*) (SpitTransitionsEffect *, gint*, gint*)) null_effect_real_get_fps; #line 301 "/home/jens/Source/shotwell/src/slideshow/TransitionEffects.vala" - iface->start = (void (*)(SpitTransitionsEffect*, SpitTransitionsVisuals*, SpitTransitionsMotion*)) null_effect_real_start; + iface->start = (void (*) (SpitTransitionsEffect *, SpitTransitionsVisuals*, SpitTransitionsMotion*)) null_effect_real_start; #line 301 "/home/jens/Source/shotwell/src/slideshow/TransitionEffects.vala" - iface->needs_clear_background = (gboolean (*)(SpitTransitionsEffect*)) null_effect_real_needs_clear_background; + iface->needs_clear_background = (gboolean (*) (SpitTransitionsEffect *)) null_effect_real_needs_clear_background; #line 301 "/home/jens/Source/shotwell/src/slideshow/TransitionEffects.vala" - iface->paint = (void (*)(SpitTransitionsEffect*, SpitTransitionsVisuals*, SpitTransitionsMotion*, cairo_t*, gint, gint, gint)) null_effect_real_paint; + iface->paint = (void (*) (SpitTransitionsEffect *, SpitTransitionsVisuals*, SpitTransitionsMotion*, cairo_t*, gint, gint, gint)) null_effect_real_paint; #line 301 "/home/jens/Source/shotwell/src/slideshow/TransitionEffects.vala" - iface->advance = (void (*)(SpitTransitionsEffect*, SpitTransitionsVisuals*, SpitTransitionsMotion*, gint)) null_effect_real_advance; + iface->advance = (void (*) (SpitTransitionsEffect *, SpitTransitionsVisuals*, SpitTransitionsMotion*, gint)) null_effect_real_advance; #line 301 "/home/jens/Source/shotwell/src/slideshow/TransitionEffects.vala" - iface->cancel = (void (*)(SpitTransitionsEffect*)) null_effect_real_cancel; -#line 2489 "TransitionEffects.c" + iface->cancel = (void (*) (SpitTransitionsEffect *)) null_effect_real_cancel; +#line 2485 "TransitionEffects.c" } @@ -2520,7 +2516,7 @@ static gint random_effect_descriptor_real_get_pluggable_interface (SpitPluggable result = SPIT_TRANSITIONS_CURRENT_INTERFACE; #line 331 "/home/jens/Source/shotwell/src/slideshow/TransitionEffects.vala" return result; -#line 2520 "TransitionEffects.c" +#line 2516 "TransitionEffects.c" } @@ -2533,23 +2529,20 @@ static const gchar* random_effect_descriptor_real_get_id (SpitPluggable* base) { result = RANDOM_EFFECT_DESCRIPTOR_EFFECT_ID; #line 335 "/home/jens/Source/shotwell/src/slideshow/TransitionEffects.vala" return result; -#line 2533 "TransitionEffects.c" +#line 2529 "TransitionEffects.c" } static const gchar* random_effect_descriptor_real_get_pluggable_name (SpitPluggable* base) { RandomEffectDescriptor * self; const gchar* result = NULL; - const gchar* _tmp0_ = NULL; #line 338 "/home/jens/Source/shotwell/src/slideshow/TransitionEffects.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_RANDOM_EFFECT_DESCRIPTOR, RandomEffectDescriptor); #line 339 "/home/jens/Source/shotwell/src/slideshow/TransitionEffects.vala" - _tmp0_ = _ ("Random"); -#line 339 "/home/jens/Source/shotwell/src/slideshow/TransitionEffects.vala" - result = _tmp0_; + result = _ ("Random"); #line 339 "/home/jens/Source/shotwell/src/slideshow/TransitionEffects.vala" return result; -#line 2549 "TransitionEffects.c" +#line 2542 "TransitionEffects.c" } @@ -2559,7 +2552,7 @@ static void random_effect_descriptor_real_get_info (SpitPluggable* base, SpitPlu self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_RANDOM_EFFECT_DESCRIPTOR, RandomEffectDescriptor); #line 342 "/home/jens/Source/shotwell/src/slideshow/TransitionEffects.vala" g_return_if_fail (info != NULL); -#line 2559 "TransitionEffects.c" +#line 2552 "TransitionEffects.c" } @@ -2567,14 +2560,14 @@ static void random_effect_descriptor_real_activation (SpitPluggable* base, gbool RandomEffectDescriptor * self; #line 345 "/home/jens/Source/shotwell/src/slideshow/TransitionEffects.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_RANDOM_EFFECT_DESCRIPTOR, RandomEffectDescriptor); -#line 2567 "TransitionEffects.c" +#line 2560 "TransitionEffects.c" } static SpitTransitionsEffect* random_effect_descriptor_real_create (SpitTransitionsDescriptor* base, SpitHostInterface* host) { RandomEffectDescriptor * self; SpitTransitionsEffect* result = NULL; - NullEffect* _tmp0_ = NULL; + NullEffect* _tmp0_; #line 348 "/home/jens/Source/shotwell/src/slideshow/TransitionEffects.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_RANDOM_EFFECT_DESCRIPTOR, RandomEffectDescriptor); #line 348 "/home/jens/Source/shotwell/src/slideshow/TransitionEffects.vala" @@ -2585,7 +2578,7 @@ static SpitTransitionsEffect* random_effect_descriptor_real_create (SpitTransiti result = G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, SPIT_TRANSITIONS_TYPE_EFFECT, SpitTransitionsEffect); #line 349 "/home/jens/Source/shotwell/src/slideshow/TransitionEffects.vala" return result; -#line 2585 "TransitionEffects.c" +#line 2578 "TransitionEffects.c" } @@ -2595,21 +2588,21 @@ RandomEffectDescriptor* random_effect_descriptor_construct (GType object_type) { self = (RandomEffectDescriptor*) g_object_new (object_type, NULL); #line 327 "/home/jens/Source/shotwell/src/slideshow/TransitionEffects.vala" return self; -#line 2595 "TransitionEffects.c" +#line 2588 "TransitionEffects.c" } RandomEffectDescriptor* random_effect_descriptor_new (void) { #line 327 "/home/jens/Source/shotwell/src/slideshow/TransitionEffects.vala" return random_effect_descriptor_construct (TYPE_RANDOM_EFFECT_DESCRIPTOR); -#line 2602 "TransitionEffects.c" +#line 2595 "TransitionEffects.c" } static void random_effect_descriptor_class_init (RandomEffectDescriptorClass * klass) { #line 327 "/home/jens/Source/shotwell/src/slideshow/TransitionEffects.vala" random_effect_descriptor_parent_class = g_type_class_peek_parent (klass); -#line 2609 "TransitionEffects.c" +#line 2602 "TransitionEffects.c" } @@ -2617,16 +2610,16 @@ static void random_effect_descriptor_spit_pluggable_interface_init (SpitPluggabl #line 327 "/home/jens/Source/shotwell/src/slideshow/TransitionEffects.vala" random_effect_descriptor_spit_pluggable_parent_iface = g_type_interface_peek_parent (iface); #line 327 "/home/jens/Source/shotwell/src/slideshow/TransitionEffects.vala" - iface->get_pluggable_interface = (gint (*)(SpitPluggable*, gint, gint)) random_effect_descriptor_real_get_pluggable_interface; + iface->get_pluggable_interface = (gint (*) (SpitPluggable *, gint, gint)) random_effect_descriptor_real_get_pluggable_interface; #line 327 "/home/jens/Source/shotwell/src/slideshow/TransitionEffects.vala" - iface->get_id = (const gchar* (*)(SpitPluggable*)) random_effect_descriptor_real_get_id; + iface->get_id = (const gchar* (*) (SpitPluggable *)) random_effect_descriptor_real_get_id; #line 327 "/home/jens/Source/shotwell/src/slideshow/TransitionEffects.vala" - iface->get_pluggable_name = (const gchar* (*)(SpitPluggable*)) random_effect_descriptor_real_get_pluggable_name; + iface->get_pluggable_name = (const gchar* (*) (SpitPluggable *)) random_effect_descriptor_real_get_pluggable_name; #line 327 "/home/jens/Source/shotwell/src/slideshow/TransitionEffects.vala" - iface->get_info = (void (*)(SpitPluggable*, SpitPluggableInfo*)) random_effect_descriptor_real_get_info; + iface->get_info = (void (*) (SpitPluggable *, SpitPluggableInfo*)) random_effect_descriptor_real_get_info; #line 327 "/home/jens/Source/shotwell/src/slideshow/TransitionEffects.vala" - iface->activation = (void (*)(SpitPluggable*, gboolean)) random_effect_descriptor_real_activation; -#line 2626 "TransitionEffects.c" + iface->activation = (void (*) (SpitPluggable *, gboolean)) random_effect_descriptor_real_activation; +#line 2619 "TransitionEffects.c" } @@ -2634,8 +2627,8 @@ static void random_effect_descriptor_spit_transitions_descriptor_interface_init #line 327 "/home/jens/Source/shotwell/src/slideshow/TransitionEffects.vala" random_effect_descriptor_spit_transitions_descriptor_parent_iface = g_type_interface_peek_parent (iface); #line 327 "/home/jens/Source/shotwell/src/slideshow/TransitionEffects.vala" - iface->create = (SpitTransitionsEffect* (*)(SpitTransitionsDescriptor*, SpitHostInterface*)) random_effect_descriptor_real_create; -#line 2635 "TransitionEffects.c" + iface->create = (SpitTransitionsEffect* (*) (SpitTransitionsDescriptor *, SpitHostInterface*)) random_effect_descriptor_real_create; +#line 2628 "TransitionEffects.c" } |