From 2492891f112caac6076ce49721d9d5d78a152c3a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Frings-F=C3=BCrst?= Date: Sun, 12 Nov 2017 15:53:58 +0100 Subject: New upstream version 0.26.4 --- plugins/shotwell-transitions/SlideEffect.c | 199 ++++++++++++++--------------- 1 file changed, 98 insertions(+), 101 deletions(-) (limited to 'plugins/shotwell-transitions/SlideEffect.c') diff --git a/plugins/shotwell-transitions/SlideEffect.c b/plugins/shotwell-transitions/SlideEffect.c index 678cc11..7cc87e7 100644 --- a/plugins/shotwell-transitions/SlideEffect.c +++ b/plugins/shotwell-transitions/SlideEffect.c @@ -1,4 +1,4 @@ -/* SlideEffect.c generated by valac 0.34.7, the Vala compiler +/* SlideEffect.c generated by valac 0.36.6, the Vala compiler * generated from SlideEffect.vala, do not modify */ /* Copyright 2010 Maxim Kartashev @@ -88,7 +88,7 @@ struct _SlideEffectClass { static gpointer slide_effect_descriptor_parent_class = NULL; static gpointer slide_effect_parent_class = NULL; -static SpitTransitionsEffectIface* slide_effect_spit_transitions_effect_parent_iface = NULL; +static SpitTransitionsEffectIface * slide_effect_spit_transitions_effect_parent_iface = NULL; GType shotwell_transition_descriptor_get_type (void) G_GNUC_CONST; GType slide_effect_descriptor_get_type (void) G_GNUC_CONST; @@ -119,7 +119,7 @@ static void slide_effect_real_cancel (SpitTransitionsEffect* base); SlideEffectDescriptor* slide_effect_descriptor_construct (GType object_type, GFile* resource_directory) { SlideEffectDescriptor * self = NULL; - GFile* _tmp0_ = NULL; + GFile* _tmp0_; #line 11 "/home/jens/Source/shotwell/plugins/shotwell-transitions/SlideEffect.vala" g_return_val_if_fail (G_IS_FILE (resource_directory), NULL); #line 12 "/home/jens/Source/shotwell/plugins/shotwell-transitions/SlideEffect.vala" @@ -155,23 +155,20 @@ static const gchar* slide_effect_descriptor_real_get_id (ShotwellTransitionDescr static const gchar* slide_effect_descriptor_real_get_pluggable_name (ShotwellTransitionDescriptor* base) { SlideEffectDescriptor * self; const gchar* result = NULL; - const gchar* _tmp0_ = NULL; #line 19 "/home/jens/Source/shotwell/plugins/shotwell-transitions/SlideEffect.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_SLIDE_EFFECT_DESCRIPTOR, SlideEffectDescriptor); #line 20 "/home/jens/Source/shotwell/plugins/shotwell-transitions/SlideEffect.vala" - _tmp0_ = _ ("Slide"); -#line 20 "/home/jens/Source/shotwell/plugins/shotwell-transitions/SlideEffect.vala" - result = _tmp0_; + result = _ ("Slide"); #line 20 "/home/jens/Source/shotwell/plugins/shotwell-transitions/SlideEffect.vala" return result; -#line 168 "SlideEffect.c" +#line 165 "SlideEffect.c" } static SpitTransitionsEffect* slide_effect_descriptor_real_create (ShotwellTransitionDescriptor* base, SpitHostInterface* host) { SlideEffectDescriptor * self; SpitTransitionsEffect* result = NULL; - SlideEffect* _tmp0_ = NULL; + SlideEffect* _tmp0_; #line 23 "/home/jens/Source/shotwell/plugins/shotwell-transitions/SlideEffect.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_SLIDE_EFFECT_DESCRIPTOR, SlideEffectDescriptor); #line 23 "/home/jens/Source/shotwell/plugins/shotwell-transitions/SlideEffect.vala" @@ -182,7 +179,7 @@ static SpitTransitionsEffect* slide_effect_descriptor_real_create (ShotwellTrans result = G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, SPIT_TRANSITIONS_TYPE_EFFECT, SpitTransitionsEffect); #line 24 "/home/jens/Source/shotwell/plugins/shotwell-transitions/SlideEffect.vala" return result; -#line 186 "SlideEffect.c" +#line 183 "SlideEffect.c" } @@ -190,12 +187,12 @@ static void slide_effect_descriptor_class_init (SlideEffectDescriptorClass * kla #line 10 "/home/jens/Source/shotwell/plugins/shotwell-transitions/SlideEffect.vala" slide_effect_descriptor_parent_class = g_type_class_peek_parent (klass); #line 10 "/home/jens/Source/shotwell/plugins/shotwell-transitions/SlideEffect.vala" - ((ShotwellTransitionDescriptorClass *) klass)->get_id = (const gchar* (*)(ShotwellTransitionDescriptor*)) slide_effect_descriptor_real_get_id; + ((ShotwellTransitionDescriptorClass *) klass)->get_id = (const gchar* (*) (ShotwellTransitionDescriptor *)) slide_effect_descriptor_real_get_id; #line 10 "/home/jens/Source/shotwell/plugins/shotwell-transitions/SlideEffect.vala" - ((ShotwellTransitionDescriptorClass *) klass)->get_pluggable_name = (const gchar* (*)(ShotwellTransitionDescriptor*)) slide_effect_descriptor_real_get_pluggable_name; + ((ShotwellTransitionDescriptorClass *) klass)->get_pluggable_name = (const gchar* (*) (ShotwellTransitionDescriptor *)) slide_effect_descriptor_real_get_pluggable_name; #line 10 "/home/jens/Source/shotwell/plugins/shotwell-transitions/SlideEffect.vala" - ((ShotwellTransitionDescriptorClass *) klass)->create = (SpitTransitionsEffect* (*)(ShotwellTransitionDescriptor*, SpitHostInterface*)) slide_effect_descriptor_real_create; -#line 199 "SlideEffect.c" + ((ShotwellTransitionDescriptorClass *) klass)->create = (SpitTransitionsEffect* (*) (ShotwellTransitionDescriptor *, SpitHostInterface*)) slide_effect_descriptor_real_create; +#line 196 "SlideEffect.c" } @@ -221,14 +218,14 @@ SlideEffect* slide_effect_construct (GType object_type) { self = (SlideEffect*) g_object_new (object_type, NULL); #line 32 "/home/jens/Source/shotwell/plugins/shotwell-transitions/SlideEffect.vala" return self; -#line 225 "SlideEffect.c" +#line 222 "SlideEffect.c" } SlideEffect* slide_effect_new (void) { #line 32 "/home/jens/Source/shotwell/plugins/shotwell-transitions/SlideEffect.vala" return slide_effect_construct (TYPE_SLIDE_EFFECT); -#line 232 "SlideEffect.c" +#line 229 "SlideEffect.c" } @@ -246,13 +243,13 @@ static void slide_effect_real_get_fps (SpitTransitionsEffect* base, gint* desire if (desired_fps) { #line 35 "/home/jens/Source/shotwell/plugins/shotwell-transitions/SlideEffect.vala" *desired_fps = _vala_desired_fps; -#line 250 "SlideEffect.c" +#line 247 "SlideEffect.c" } #line 35 "/home/jens/Source/shotwell/plugins/shotwell-transitions/SlideEffect.vala" if (min_fps) { #line 35 "/home/jens/Source/shotwell/plugins/shotwell-transitions/SlideEffect.vala" *min_fps = _vala_min_fps; -#line 256 "SlideEffect.c" +#line 253 "SlideEffect.c" } } @@ -265,7 +262,7 @@ static void slide_effect_real_start (SpitTransitionsEffect* base, SpitTransition g_return_if_fail (SPIT_TRANSITIONS_IS_VISUALS (visuals)); #line 40 "/home/jens/Source/shotwell/plugins/shotwell-transitions/SlideEffect.vala" g_return_if_fail (SPIT_TRANSITIONS_IS_MOTION (motion)); -#line 269 "SlideEffect.c" +#line 266 "SlideEffect.c" } @@ -278,22 +275,22 @@ static gboolean slide_effect_real_needs_clear_background (SpitTransitionsEffect* result = TRUE; #line 44 "/home/jens/Source/shotwell/plugins/shotwell-transitions/SlideEffect.vala" return result; -#line 282 "SlideEffect.c" +#line 279 "SlideEffect.c" } static void slide_effect_real_paint (SpitTransitionsEffect* base, SpitTransitionsVisuals* visuals, SpitTransitionsMotion* motion, cairo_t* ctx, gint width, gint height, gint frame_number) { SlideEffect * self; gdouble alpha = 0.0; - SpitTransitionsMotion* _tmp0_ = NULL; - gint _tmp1_ = 0; - gdouble _tmp2_ = 0.0; - SpitTransitionsVisuals* _tmp3_ = NULL; - GdkPixbuf* _tmp4_ = NULL; - GdkPixbuf* _tmp5_ = NULL; - SpitTransitionsVisuals* _tmp33_ = NULL; - GdkPixbuf* _tmp34_ = NULL; - GdkPixbuf* _tmp35_ = NULL; + SpitTransitionsMotion* _tmp0_; + gint _tmp1_; + gdouble _tmp2_; + SpitTransitionsVisuals* _tmp3_; + GdkPixbuf* _tmp4_; + GdkPixbuf* _tmp5_; + SpitTransitionsVisuals* _tmp33_; + GdkPixbuf* _tmp34_; + GdkPixbuf* _tmp35_; #line 47 "/home/jens/Source/shotwell/plugins/shotwell-transitions/SlideEffect.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_SLIDE_EFFECT, SlideEffect); #line 47 "/home/jens/Source/shotwell/plugins/shotwell-transitions/SlideEffect.vala" @@ -318,30 +315,30 @@ static void slide_effect_real_paint (SpitTransitionsEffect* base, SpitTransition _tmp5_ = _tmp4_; #line 51 "/home/jens/Source/shotwell/plugins/shotwell-transitions/SlideEffect.vala" if (_tmp5_ != NULL) { -#line 322 "SlideEffect.c" +#line 319 "SlideEffect.c" gint _tmp6_ = 0; - SpitTransitionsMotion* _tmp7_ = NULL; - SpitTransitionsDirection _tmp8_ = 0; - SpitTransitionsDirection _tmp9_ = 0; + SpitTransitionsMotion* _tmp7_; + SpitTransitionsDirection _tmp8_; + SpitTransitionsDirection _tmp9_; gint from_target_x = 0; gint from_current_x = 0; - SpitTransitionsVisuals* _tmp16_ = NULL; + SpitTransitionsVisuals* _tmp16_; GdkRectangle _tmp17_ = {0}; - GdkRectangle _tmp18_ = {0}; - gint _tmp19_ = 0; - gdouble _tmp20_ = 0.0; - gint _tmp21_ = 0; - gdouble _tmp22_ = 0.0; - cairo_t* _tmp23_ = NULL; - SpitTransitionsVisuals* _tmp24_ = NULL; - GdkPixbuf* _tmp25_ = NULL; - GdkPixbuf* _tmp26_ = NULL; - gint _tmp27_ = 0; - SpitTransitionsVisuals* _tmp28_ = NULL; + GdkRectangle _tmp18_; + gint _tmp19_; + gdouble _tmp20_; + gint _tmp21_; + gdouble _tmp22_; + cairo_t* _tmp23_; + SpitTransitionsVisuals* _tmp24_; + GdkPixbuf* _tmp25_; + GdkPixbuf* _tmp26_; + gint _tmp27_; + SpitTransitionsVisuals* _tmp28_; GdkRectangle _tmp29_ = {0}; - GdkRectangle _tmp30_ = {0}; - gint _tmp31_ = 0; - cairo_t* _tmp32_ = NULL; + GdkRectangle _tmp30_; + gint _tmp31_; + cairo_t* _tmp32_; #line 52 "/home/jens/Source/shotwell/plugins/shotwell-transitions/SlideEffect.vala" _tmp7_ = motion; #line 52 "/home/jens/Source/shotwell/plugins/shotwell-transitions/SlideEffect.vala" @@ -350,12 +347,12 @@ static void slide_effect_real_paint (SpitTransitionsEffect* base, SpitTransition _tmp9_ = _tmp8_; #line 52 "/home/jens/Source/shotwell/plugins/shotwell-transitions/SlideEffect.vala" if (_tmp9_ == SPIT_TRANSITIONS_DIRECTION_FORWARD) { -#line 354 "SlideEffect.c" - SpitTransitionsVisuals* _tmp10_ = NULL; - GdkPixbuf* _tmp11_ = NULL; - GdkPixbuf* _tmp12_ = NULL; - gint _tmp13_ = 0; - gint _tmp14_ = 0; +#line 351 "SlideEffect.c" + SpitTransitionsVisuals* _tmp10_; + GdkPixbuf* _tmp11_; + GdkPixbuf* _tmp12_; + gint _tmp13_; + gint _tmp14_; #line 53 "/home/jens/Source/shotwell/plugins/shotwell-transitions/SlideEffect.vala" _tmp10_ = visuals; #line 53 "/home/jens/Source/shotwell/plugins/shotwell-transitions/SlideEffect.vala" @@ -368,14 +365,14 @@ static void slide_effect_real_paint (SpitTransitionsEffect* base, SpitTransition _tmp14_ = _tmp13_; #line 53 "/home/jens/Source/shotwell/plugins/shotwell-transitions/SlideEffect.vala" _tmp6_ = -_tmp14_; -#line 372 "SlideEffect.c" +#line 369 "SlideEffect.c" } else { - gint _tmp15_ = 0; + gint _tmp15_; #line 53 "/home/jens/Source/shotwell/plugins/shotwell-transitions/SlideEffect.vala" _tmp15_ = width; #line 53 "/home/jens/Source/shotwell/plugins/shotwell-transitions/SlideEffect.vala" _tmp6_ = _tmp15_; -#line 379 "SlideEffect.c" +#line 376 "SlideEffect.c" } #line 52 "/home/jens/Source/shotwell/plugins/shotwell-transitions/SlideEffect.vala" from_target_x = _tmp6_; @@ -419,7 +416,7 @@ static void slide_effect_real_paint (SpitTransitionsEffect* base, SpitTransition _tmp32_ = ctx; #line 56 "/home/jens/Source/shotwell/plugins/shotwell-transitions/SlideEffect.vala" cairo_paint (_tmp32_); -#line 423 "SlideEffect.c" +#line 420 "SlideEffect.c" } #line 59 "/home/jens/Source/shotwell/plugins/shotwell-transitions/SlideEffect.vala" _tmp33_ = visuals; @@ -429,34 +426,34 @@ static void slide_effect_real_paint (SpitTransitionsEffect* base, SpitTransition _tmp35_ = _tmp34_; #line 59 "/home/jens/Source/shotwell/plugins/shotwell-transitions/SlideEffect.vala" if (_tmp35_ != NULL) { -#line 433 "SlideEffect.c" +#line 430 "SlideEffect.c" gint to_target_x = 0; - gint _tmp36_ = 0; - SpitTransitionsVisuals* _tmp37_ = NULL; - GdkPixbuf* _tmp38_ = NULL; - GdkPixbuf* _tmp39_ = NULL; - gint _tmp40_ = 0; - gint _tmp41_ = 0; + gint _tmp36_; + SpitTransitionsVisuals* _tmp37_; + GdkPixbuf* _tmp38_; + GdkPixbuf* _tmp39_; + gint _tmp40_; + gint _tmp41_; gint _tmp42_ = 0; - SpitTransitionsMotion* _tmp43_ = NULL; - SpitTransitionsDirection _tmp44_ = 0; - SpitTransitionsDirection _tmp45_ = 0; + SpitTransitionsMotion* _tmp43_; + SpitTransitionsDirection _tmp44_; + SpitTransitionsDirection _tmp45_; gint from_x = 0; gint to_current_x = 0; - gint _tmp52_ = 0; - gdouble _tmp53_ = 0.0; - gint _tmp54_ = 0; - gdouble _tmp55_ = 0.0; - cairo_t* _tmp56_ = NULL; - SpitTransitionsVisuals* _tmp57_ = NULL; - GdkPixbuf* _tmp58_ = NULL; - GdkPixbuf* _tmp59_ = NULL; - gint _tmp60_ = 0; - SpitTransitionsVisuals* _tmp61_ = NULL; + gint _tmp52_; + gdouble _tmp53_; + gint _tmp54_; + gdouble _tmp55_; + cairo_t* _tmp56_; + SpitTransitionsVisuals* _tmp57_; + GdkPixbuf* _tmp58_; + GdkPixbuf* _tmp59_; + gint _tmp60_; + SpitTransitionsVisuals* _tmp61_; GdkRectangle _tmp62_ = {0}; - GdkRectangle _tmp63_ = {0}; - gint _tmp64_ = 0; - cairo_t* _tmp65_ = NULL; + GdkRectangle _tmp63_; + gint _tmp64_; + cairo_t* _tmp65_; #line 60 "/home/jens/Source/shotwell/plugins/shotwell-transitions/SlideEffect.vala" _tmp36_ = width; #line 60 "/home/jens/Source/shotwell/plugins/shotwell-transitions/SlideEffect.vala" @@ -479,19 +476,19 @@ static void slide_effect_real_paint (SpitTransitionsEffect* base, SpitTransition _tmp45_ = _tmp44_; #line 61 "/home/jens/Source/shotwell/plugins/shotwell-transitions/SlideEffect.vala" if (_tmp45_ == SPIT_TRANSITIONS_DIRECTION_FORWARD) { -#line 483 "SlideEffect.c" - gint _tmp46_ = 0; +#line 480 "SlideEffect.c" + gint _tmp46_; #line 62 "/home/jens/Source/shotwell/plugins/shotwell-transitions/SlideEffect.vala" _tmp46_ = width; #line 62 "/home/jens/Source/shotwell/plugins/shotwell-transitions/SlideEffect.vala" _tmp42_ = _tmp46_; -#line 489 "SlideEffect.c" +#line 486 "SlideEffect.c" } else { - SpitTransitionsVisuals* _tmp47_ = NULL; - GdkPixbuf* _tmp48_ = NULL; - GdkPixbuf* _tmp49_ = NULL; - gint _tmp50_ = 0; - gint _tmp51_ = 0; + SpitTransitionsVisuals* _tmp47_; + GdkPixbuf* _tmp48_; + GdkPixbuf* _tmp49_; + gint _tmp50_; + gint _tmp51_; #line 62 "/home/jens/Source/shotwell/plugins/shotwell-transitions/SlideEffect.vala" _tmp47_ = visuals; #line 62 "/home/jens/Source/shotwell/plugins/shotwell-transitions/SlideEffect.vala" @@ -504,7 +501,7 @@ static void slide_effect_real_paint (SpitTransitionsEffect* base, SpitTransition _tmp51_ = _tmp50_; #line 62 "/home/jens/Source/shotwell/plugins/shotwell-transitions/SlideEffect.vala" _tmp42_ = -_tmp51_; -#line 508 "SlideEffect.c" +#line 505 "SlideEffect.c" } #line 61 "/home/jens/Source/shotwell/plugins/shotwell-transitions/SlideEffect.vala" from_x = _tmp42_; @@ -542,7 +539,7 @@ static void slide_effect_real_paint (SpitTransitionsEffect* base, SpitTransition _tmp65_ = ctx; #line 65 "/home/jens/Source/shotwell/plugins/shotwell-transitions/SlideEffect.vala" cairo_paint (_tmp65_); -#line 546 "SlideEffect.c" +#line 543 "SlideEffect.c" } } @@ -555,7 +552,7 @@ static void slide_effect_real_advance (SpitTransitionsEffect* base, SpitTransiti g_return_if_fail (SPIT_TRANSITIONS_IS_VISUALS (visuals)); #line 69 "/home/jens/Source/shotwell/plugins/shotwell-transitions/SlideEffect.vala" g_return_if_fail (SPIT_TRANSITIONS_IS_MOTION (motion)); -#line 559 "SlideEffect.c" +#line 556 "SlideEffect.c" } @@ -563,14 +560,14 @@ static void slide_effect_real_cancel (SpitTransitionsEffect* base) { SlideEffect * self; #line 72 "/home/jens/Source/shotwell/plugins/shotwell-transitions/SlideEffect.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_SLIDE_EFFECT, SlideEffect); -#line 567 "SlideEffect.c" +#line 564 "SlideEffect.c" } static void slide_effect_class_init (SlideEffectClass * klass) { #line 28 "/home/jens/Source/shotwell/plugins/shotwell-transitions/SlideEffect.vala" slide_effect_parent_class = g_type_class_peek_parent (klass); -#line 574 "SlideEffect.c" +#line 571 "SlideEffect.c" } @@ -578,18 +575,18 @@ static void slide_effect_spit_transitions_effect_interface_init (SpitTransitions #line 28 "/home/jens/Source/shotwell/plugins/shotwell-transitions/SlideEffect.vala" slide_effect_spit_transitions_effect_parent_iface = g_type_interface_peek_parent (iface); #line 28 "/home/jens/Source/shotwell/plugins/shotwell-transitions/SlideEffect.vala" - iface->get_fps = (void (*)(SpitTransitionsEffect*, gint*, gint*)) slide_effect_real_get_fps; + iface->get_fps = (void (*) (SpitTransitionsEffect *, gint*, gint*)) slide_effect_real_get_fps; #line 28 "/home/jens/Source/shotwell/plugins/shotwell-transitions/SlideEffect.vala" - iface->start = (void (*)(SpitTransitionsEffect*, SpitTransitionsVisuals*, SpitTransitionsMotion*)) slide_effect_real_start; + iface->start = (void (*) (SpitTransitionsEffect *, SpitTransitionsVisuals*, SpitTransitionsMotion*)) slide_effect_real_start; #line 28 "/home/jens/Source/shotwell/plugins/shotwell-transitions/SlideEffect.vala" - iface->needs_clear_background = (gboolean (*)(SpitTransitionsEffect*)) slide_effect_real_needs_clear_background; + iface->needs_clear_background = (gboolean (*) (SpitTransitionsEffect *)) slide_effect_real_needs_clear_background; #line 28 "/home/jens/Source/shotwell/plugins/shotwell-transitions/SlideEffect.vala" - iface->paint = (void (*)(SpitTransitionsEffect*, SpitTransitionsVisuals*, SpitTransitionsMotion*, cairo_t*, gint, gint, gint)) slide_effect_real_paint; + iface->paint = (void (*) (SpitTransitionsEffect *, SpitTransitionsVisuals*, SpitTransitionsMotion*, cairo_t*, gint, gint, gint)) slide_effect_real_paint; #line 28 "/home/jens/Source/shotwell/plugins/shotwell-transitions/SlideEffect.vala" - iface->advance = (void (*)(SpitTransitionsEffect*, SpitTransitionsVisuals*, SpitTransitionsMotion*, gint)) slide_effect_real_advance; + iface->advance = (void (*) (SpitTransitionsEffect *, SpitTransitionsVisuals*, SpitTransitionsMotion*, gint)) slide_effect_real_advance; #line 28 "/home/jens/Source/shotwell/plugins/shotwell-transitions/SlideEffect.vala" - iface->cancel = (void (*)(SpitTransitionsEffect*)) slide_effect_real_cancel; -#line 593 "SlideEffect.c" + iface->cancel = (void (*) (SpitTransitionsEffect *)) slide_effect_real_cancel; +#line 590 "SlideEffect.c" } -- cgit v1.2.3