diff options
Diffstat (limited to 'plugins/shotwell-transitions')
| -rw-r--r-- | plugins/shotwell-transitions/BlindsEffect.c | 658 | ||||
| -rw-r--r-- | plugins/shotwell-transitions/ChessEffect.c | 621 | ||||
| -rw-r--r-- | plugins/shotwell-transitions/CircleEffect.c | 367 | ||||
| -rw-r--r-- | plugins/shotwell-transitions/CirclesEffect.c | 499 | ||||
| -rw-r--r-- | plugins/shotwell-transitions/ClockEffect.c | 500 | ||||
| -rw-r--r-- | plugins/shotwell-transitions/CrumbleEffect.c | 680 | ||||
| -rw-r--r-- | plugins/shotwell-transitions/FadeEffect.c | 336 | ||||
| -rw-r--r-- | plugins/shotwell-transitions/SlideEffect.c | 468 | ||||
| -rw-r--r-- | plugins/shotwell-transitions/SquaresEffect.c | 536 | ||||
| -rw-r--r-- | plugins/shotwell-transitions/StripesEffect.c | 568 | ||||
| -rw-r--r-- | plugins/shotwell-transitions/shotwell-transitions.c | 666 | 
11 files changed, 3075 insertions, 2824 deletions
diff --git a/plugins/shotwell-transitions/BlindsEffect.c b/plugins/shotwell-transitions/BlindsEffect.c index 20733f9..ef1f15e 100644 --- a/plugins/shotwell-transitions/BlindsEffect.c +++ b/plugins/shotwell-transitions/BlindsEffect.c @@ -1,4 +1,4 @@ -/* BlindsEffect.c generated by valac 0.36.6, the Vala compiler +/* BlindsEffect.c generated by valac 0.40.4, the Vala compiler   * generated from BlindsEffect.vala, do not modify */  /* Copyright 2013 Jens Bav @@ -8,6 +8,7 @@   * (version 2.1 or later).  See the COPYING file in this distribution.   */ +  #include <glib.h>  #include <glib-object.h>  #include <shotwell-plugin-dev-1.0.h> @@ -43,6 +44,11 @@ typedef struct _ShotwellTransitionDescriptorPrivate ShotwellTransitionDescriptor  typedef struct _BlindsEffectDescriptor BlindsEffectDescriptor;  typedef struct _BlindsEffectDescriptorClass BlindsEffectDescriptorClass;  typedef struct _BlindsEffectDescriptorPrivate BlindsEffectDescriptorPrivate; +enum  { +	BLINDS_EFFECT_DESCRIPTOR_0_PROPERTY, +	BLINDS_EFFECT_DESCRIPTOR_NUM_PROPERTIES +}; +static GParamSpec* blinds_effect_descriptor_properties[BLINDS_EFFECT_DESCRIPTOR_NUM_PROPERTIES];  #define TYPE_BLINDS_EFFECT (blinds_effect_get_type ())  #define BLINDS_EFFECT(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), TYPE_BLINDS_EFFECT, BlindsEffect)) @@ -54,6 +60,11 @@ typedef struct _BlindsEffectDescriptorPrivate BlindsEffectDescriptorPrivate;  typedef struct _BlindsEffect BlindsEffect;  typedef struct _BlindsEffectClass BlindsEffectClass;  typedef struct _BlindsEffectPrivate BlindsEffectPrivate; +enum  { +	BLINDS_EFFECT_0_PROPERTY, +	BLINDS_EFFECT_NUM_PROPERTIES +}; +static GParamSpec* blinds_effect_properties[BLINDS_EFFECT_NUM_PROPERTIES];  #define _cairo_surface_destroy0(var) ((var == NULL) ? NULL : (var = (cairo_surface_destroy (var), NULL)))  #define _cairo_destroy0(var) ((var == NULL) ? NULL : (var = (cairo_destroy (var), NULL))) @@ -102,59 +113,77 @@ static SpitTransitionsEffectIface * blinds_effect_spit_transitions_effect_parent  GType shotwell_transition_descriptor_get_type (void) G_GNUC_CONST;  GType blinds_effect_descriptor_get_type (void) G_GNUC_CONST; -enum  { -	BLINDS_EFFECT_DESCRIPTOR_DUMMY_PROPERTY -};  BlindsEffectDescriptor* blinds_effect_descriptor_new (GFile* resource_directory); -BlindsEffectDescriptor* blinds_effect_descriptor_construct (GType object_type, GFile* resource_directory); -ShotwellTransitionDescriptor* shotwell_transition_descriptor_construct (GType object_type, GFile* resource_directory); +BlindsEffectDescriptor* blinds_effect_descriptor_construct (GType object_type, +                                                            GFile* resource_directory); +ShotwellTransitionDescriptor* shotwell_transition_descriptor_construct (GType object_type, +                                                                        GFile* resource_directory);  static const gchar* blinds_effect_descriptor_real_get_id (ShotwellTransitionDescriptor* base);  static const gchar* blinds_effect_descriptor_real_get_pluggable_name (ShotwellTransitionDescriptor* base); -static SpitTransitionsEffect* blinds_effect_descriptor_real_create (ShotwellTransitionDescriptor* base, SpitHostInterface* host); +static SpitTransitionsEffect* blinds_effect_descriptor_real_create (ShotwellTransitionDescriptor* base, +                                                             SpitHostInterface* host);  BlindsEffect* blinds_effect_new (void);  BlindsEffect* blinds_effect_construct (GType object_type);  GType blinds_effect_get_type (void) G_GNUC_CONST;  #define BLINDS_EFFECT_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), TYPE_BLINDS_EFFECT, BlindsEffectPrivate)) -enum  { -	BLINDS_EFFECT_DUMMY_PROPERTY -};  #define BLINDS_EFFECT_DESIRED_FPS 30  #define BLINDS_EFFECT_MIN_FPS 15  #define BLINDS_EFFECT_BLIND_WIDTH 50 -static void blinds_effect_real_get_fps (SpitTransitionsEffect* base, gint* desired_fps, gint* min_fps); +static void blinds_effect_real_get_fps (SpitTransitionsEffect* base, +                                 gint* desired_fps, +                                 gint* min_fps);  static gboolean blinds_effect_real_needs_clear_background (SpitTransitionsEffect* base); -static void blinds_effect_real_start (SpitTransitionsEffect* base, SpitTransitionsVisuals* visuals, SpitTransitionsMotion* motion); -static void blinds_effect_real_paint (SpitTransitionsEffect* base, SpitTransitionsVisuals* visuals, SpitTransitionsMotion* motion, cairo_t* ctx, gint width, gint height, gint frame_number); -static void blinds_effect_real_advance (SpitTransitionsEffect* base, SpitTransitionsVisuals* visuals, SpitTransitionsMotion* motion, gint frame_number); +static void blinds_effect_real_start (SpitTransitionsEffect* base, +                               SpitTransitionsVisuals* visuals, +                               SpitTransitionsMotion* motion); +static void blinds_effect_real_paint (SpitTransitionsEffect* base, +                               SpitTransitionsVisuals* visuals, +                               SpitTransitionsMotion* motion, +                               cairo_t* ctx, +                               gint width, +                               gint height, +                               gint frame_number); +static void blinds_effect_real_advance (SpitTransitionsEffect* base, +                                 SpitTransitionsVisuals* visuals, +                                 SpitTransitionsMotion* motion, +                                 gint frame_number);  static void blinds_effect_real_cancel (SpitTransitionsEffect* base);  static void blinds_effect_finalize (GObject * obj); -static void _vala_array_destroy (gpointer array, gint array_length, GDestroyNotify destroy_func); -static void _vala_array_free (gpointer array, gint array_length, GDestroyNotify destroy_func); - - -BlindsEffectDescriptor* blinds_effect_descriptor_construct (GType object_type, GFile* resource_directory) { +static void _vala_array_destroy (gpointer array, +                          gint array_length, +                          GDestroyNotify destroy_func); +static void _vala_array_free (gpointer array, +                       gint array_length, +                       GDestroyNotify destroy_func); + + +BlindsEffectDescriptor* +blinds_effect_descriptor_construct (GType object_type, +                                    GFile* resource_directory) +{  	BlindsEffectDescriptor * self = NULL; -	GFile* _tmp0_;  #line 11 "/home/jens/Source/shotwell/plugins/shotwell-transitions/BlindsEffect.vala"  	g_return_val_if_fail (G_IS_FILE (resource_directory), NULL);  #line 12 "/home/jens/Source/shotwell/plugins/shotwell-transitions/BlindsEffect.vala" -	_tmp0_ = resource_directory; -#line 12 "/home/jens/Source/shotwell/plugins/shotwell-transitions/BlindsEffect.vala" -	self = (BlindsEffectDescriptor*) shotwell_transition_descriptor_construct (object_type, _tmp0_); +	self = (BlindsEffectDescriptor*) shotwell_transition_descriptor_construct (object_type, resource_directory);  #line 11 "/home/jens/Source/shotwell/plugins/shotwell-transitions/BlindsEffect.vala"  	return self; -#line 147 "BlindsEffect.c" +#line 172 "BlindsEffect.c"  } -BlindsEffectDescriptor* blinds_effect_descriptor_new (GFile* resource_directory) { +BlindsEffectDescriptor* +blinds_effect_descriptor_new (GFile* resource_directory) +{  #line 11 "/home/jens/Source/shotwell/plugins/shotwell-transitions/BlindsEffect.vala"  	return blinds_effect_descriptor_construct (TYPE_BLINDS_EFFECT_DESCRIPTOR, resource_directory); -#line 154 "BlindsEffect.c" +#line 181 "BlindsEffect.c"  } -static const gchar* blinds_effect_descriptor_real_get_id (ShotwellTransitionDescriptor* base) { +static const gchar* +blinds_effect_descriptor_real_get_id (ShotwellTransitionDescriptor* base) +{  	BlindsEffectDescriptor * self;  	const gchar* result = NULL;  #line 15 "/home/jens/Source/shotwell/plugins/shotwell-transitions/BlindsEffect.vala" @@ -163,11 +192,13 @@ static const gchar* blinds_effect_descriptor_real_get_id (ShotwellTransitionDesc  	result = "org.yorba.shotwell.transitions.blinds";  #line 16 "/home/jens/Source/shotwell/plugins/shotwell-transitions/BlindsEffect.vala"  	return result; -#line 167 "BlindsEffect.c" +#line 196 "BlindsEffect.c"  } -static const gchar* blinds_effect_descriptor_real_get_pluggable_name (ShotwellTransitionDescriptor* base) { +static const gchar* +blinds_effect_descriptor_real_get_pluggable_name (ShotwellTransitionDescriptor* base) +{  	BlindsEffectDescriptor * self;  	const gchar* result = NULL;  #line 19 "/home/jens/Source/shotwell/plugins/shotwell-transitions/BlindsEffect.vala" @@ -176,11 +207,14 @@ static const gchar* blinds_effect_descriptor_real_get_pluggable_name (ShotwellTr  	result = _ ("Blinds");  #line 20 "/home/jens/Source/shotwell/plugins/shotwell-transitions/BlindsEffect.vala"  	return result; -#line 180 "BlindsEffect.c" +#line 211 "BlindsEffect.c"  } -static SpitTransitionsEffect* blinds_effect_descriptor_real_create (ShotwellTransitionDescriptor* base, SpitHostInterface* host) { +static SpitTransitionsEffect* +blinds_effect_descriptor_real_create (ShotwellTransitionDescriptor* base, +                                      SpitHostInterface* host) +{  	BlindsEffectDescriptor * self;  	SpitTransitionsEffect* result = NULL;  	BlindsEffect* _tmp0_; @@ -194,11 +228,13 @@ static SpitTransitionsEffect* blinds_effect_descriptor_real_create (ShotwellTran  	result = G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, SPIT_TRANSITIONS_TYPE_EFFECT, SpitTransitionsEffect);  #line 24 "/home/jens/Source/shotwell/plugins/shotwell-transitions/BlindsEffect.vala"  	return result; -#line 198 "BlindsEffect.c" +#line 232 "BlindsEffect.c"  } -static void blinds_effect_descriptor_class_init (BlindsEffectDescriptorClass * klass) { +static void +blinds_effect_descriptor_class_init (BlindsEffectDescriptorClass * klass) +{  #line 10 "/home/jens/Source/shotwell/plugins/shotwell-transitions/BlindsEffect.vala"  	blinds_effect_descriptor_parent_class = g_type_class_peek_parent (klass);  #line 10 "/home/jens/Source/shotwell/plugins/shotwell-transitions/BlindsEffect.vala" @@ -207,15 +243,19 @@ static void blinds_effect_descriptor_class_init (BlindsEffectDescriptorClass * k  	((ShotwellTransitionDescriptorClass *) klass)->get_pluggable_name = (const gchar* (*) (ShotwellTransitionDescriptor *)) blinds_effect_descriptor_real_get_pluggable_name;  #line 10 "/home/jens/Source/shotwell/plugins/shotwell-transitions/BlindsEffect.vala"  	((ShotwellTransitionDescriptorClass *) klass)->create = (SpitTransitionsEffect* (*) (ShotwellTransitionDescriptor *, SpitHostInterface*)) blinds_effect_descriptor_real_create; -#line 211 "BlindsEffect.c" +#line 247 "BlindsEffect.c"  } -static void blinds_effect_descriptor_instance_init (BlindsEffectDescriptor * self) { +static void +blinds_effect_descriptor_instance_init (BlindsEffectDescriptor * self) +{  } -GType blinds_effect_descriptor_get_type (void) { +GType +blinds_effect_descriptor_get_type (void) +{  	static volatile gsize blinds_effect_descriptor_type_id__volatile = 0;  	if (g_once_init_enter (&blinds_effect_descriptor_type_id__volatile)) {  		static const GTypeInfo g_define_type_info = { sizeof (BlindsEffectDescriptorClass), (GBaseInitFunc) NULL, (GBaseFinalizeFunc) NULL, (GClassInitFunc) blinds_effect_descriptor_class_init, (GClassFinalizeFunc) NULL, NULL, sizeof (BlindsEffectDescriptor), 0, (GInstanceInitFunc) blinds_effect_descriptor_instance_init, NULL }; @@ -227,24 +267,32 @@ GType blinds_effect_descriptor_get_type (void) {  } -BlindsEffect* blinds_effect_construct (GType object_type) { +BlindsEffect* +blinds_effect_construct (GType object_type) +{  	BlindsEffect * self = NULL;  #line 38 "/home/jens/Source/shotwell/plugins/shotwell-transitions/BlindsEffect.vala"  	self = (BlindsEffect*) g_object_new (object_type, NULL);  #line 38 "/home/jens/Source/shotwell/plugins/shotwell-transitions/BlindsEffect.vala"  	return self; -#line 237 "BlindsEffect.c" +#line 279 "BlindsEffect.c"  } -BlindsEffect* blinds_effect_new (void) { +BlindsEffect* +blinds_effect_new (void) +{  #line 38 "/home/jens/Source/shotwell/plugins/shotwell-transitions/BlindsEffect.vala"  	return blinds_effect_construct (TYPE_BLINDS_EFFECT); -#line 244 "BlindsEffect.c" +#line 288 "BlindsEffect.c"  } -static void blinds_effect_real_get_fps (SpitTransitionsEffect* base, gint* desired_fps, gint* min_fps) { +static void +blinds_effect_real_get_fps (SpitTransitionsEffect* base, +                            gint* desired_fps, +                            gint* min_fps) +{  	BlindsEffect * self;  	gint _vala_desired_fps = 0;  	gint _vala_min_fps = 0; @@ -258,18 +306,20 @@ static void blinds_effect_real_get_fps (SpitTransitionsEffect* base, gint* desir  	if (desired_fps) {  #line 41 "/home/jens/Source/shotwell/plugins/shotwell-transitions/BlindsEffect.vala"  		*desired_fps = _vala_desired_fps; -#line 262 "BlindsEffect.c" +#line 310 "BlindsEffect.c"  	}  #line 41 "/home/jens/Source/shotwell/plugins/shotwell-transitions/BlindsEffect.vala"  	if (min_fps) {  #line 41 "/home/jens/Source/shotwell/plugins/shotwell-transitions/BlindsEffect.vala"  		*min_fps = _vala_min_fps; -#line 268 "BlindsEffect.c" +#line 316 "BlindsEffect.c"  	}  } -static gboolean blinds_effect_real_needs_clear_background (SpitTransitionsEffect* base) { +static gboolean +blinds_effect_real_needs_clear_background (SpitTransitionsEffect* base) +{  	BlindsEffect * self;  	gboolean result = FALSE;  #line 46 "/home/jens/Source/shotwell/plugins/shotwell-transitions/BlindsEffect.vala" @@ -278,15 +328,18 @@ static gboolean blinds_effect_real_needs_clear_background (SpitTransitionsEffect  	result = TRUE;  #line 47 "/home/jens/Source/shotwell/plugins/shotwell-transitions/BlindsEffect.vala"  	return result; -#line 282 "BlindsEffect.c" +#line 332 "BlindsEffect.c"  } -static void blinds_effect_real_start (SpitTransitionsEffect* base, SpitTransitionsVisuals* visuals, SpitTransitionsMotion* motion) { +static void +blinds_effect_real_start (SpitTransitionsEffect* base, +                          SpitTransitionsVisuals* visuals, +                          SpitTransitionsMotion* motion) +{  	BlindsEffect * self; -	SpitTransitionsVisuals* _tmp0_; +	GdkPixbuf* _tmp0_;  	GdkPixbuf* _tmp1_; -	GdkPixbuf* _tmp2_;  #line 50 "/home/jens/Source/shotwell/plugins/shotwell-transitions/BlindsEffect.vala"  	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_BLINDS_EFFECT, BlindsEffect);  #line 50 "/home/jens/Source/shotwell/plugins/shotwell-transitions/BlindsEffect.vala" @@ -294,188 +347,171 @@ static void blinds_effect_real_start (SpitTransitionsEffect* base, SpitTransitio  #line 50 "/home/jens/Source/shotwell/plugins/shotwell-transitions/BlindsEffect.vala"  	g_return_if_fail (SPIT_TRANSITIONS_IS_MOTION (motion));  #line 51 "/home/jens/Source/shotwell/plugins/shotwell-transitions/BlindsEffect.vala" -	_tmp0_ = visuals; +	_tmp0_ = spit_transitions_visuals_get_from_pixbuf (visuals);  #line 51 "/home/jens/Source/shotwell/plugins/shotwell-transitions/BlindsEffect.vala" -	_tmp1_ = spit_transitions_visuals_get_from_pixbuf (_tmp0_); +	_tmp1_ = _tmp0_;  #line 51 "/home/jens/Source/shotwell/plugins/shotwell-transitions/BlindsEffect.vala" -	_tmp2_ = _tmp1_; -#line 51 "/home/jens/Source/shotwell/plugins/shotwell-transitions/BlindsEffect.vala" -	if (_tmp2_ != NULL) { -#line 305 "BlindsEffect.c" -		SpitTransitionsVisuals* _tmp3_; -		GdkPixbuf* _tmp4_; -		GdkPixbuf* _tmp5_; -		gint _tmp6_; -		gint _tmp7_; -		SpitTransitionsVisuals* _tmp8_; -		GdkPixbuf* _tmp9_; -		GdkPixbuf* _tmp10_; +	if (_tmp1_ != NULL) { +#line 356 "BlindsEffect.c" +		GdkPixbuf* _tmp2_; +		GdkPixbuf* _tmp3_; +		gint _tmp4_; +		gint _tmp5_; +		GdkPixbuf* _tmp6_; +		GdkPixbuf* _tmp7_; +		gint _tmp8_; +		gint _tmp9_; +		gint _tmp10_;  		gint _tmp11_; -		gint _tmp12_; -		gint _tmp13_; -		gdouble _tmp14_; -		gint _tmp15_; -		cairo_surface_t** _tmp16_; +		cairo_surface_t** _tmp12_;  #line 52 "/home/jens/Source/shotwell/plugins/shotwell-transitions/BlindsEffect.vala" -		_tmp3_ = visuals; +		_tmp2_ = spit_transitions_visuals_get_to_pixbuf (visuals);  #line 52 "/home/jens/Source/shotwell/plugins/shotwell-transitions/BlindsEffect.vala" -		_tmp4_ = spit_transitions_visuals_get_to_pixbuf (_tmp3_); +		_tmp3_ = _tmp2_;  #line 52 "/home/jens/Source/shotwell/plugins/shotwell-transitions/BlindsEffect.vala" -		_tmp5_ = _tmp4_; -#line 52 "/home/jens/Source/shotwell/plugins/shotwell-transitions/BlindsEffect.vala" -		_tmp6_ = gdk_pixbuf_get_width (_tmp5_); +		_tmp4_ = gdk_pixbuf_get_width (_tmp3_);  #line 52 "/home/jens/Source/shotwell/plugins/shotwell-transitions/BlindsEffect.vala" -		_tmp7_ = _tmp6_; +		_tmp5_ = _tmp4_;  #line 52 "/home/jens/Source/shotwell/plugins/shotwell-transitions/BlindsEffect.vala" -		self->priv->blind_count = _tmp7_ / BLINDS_EFFECT_BLIND_WIDTH; -#line 53 "/home/jens/Source/shotwell/plugins/shotwell-transitions/BlindsEffect.vala" -		_tmp8_ = visuals; -#line 53 "/home/jens/Source/shotwell/plugins/shotwell-transitions/BlindsEffect.vala" -		_tmp9_ = spit_transitions_visuals_get_to_pixbuf (_tmp8_); +		self->priv->blind_count = _tmp5_ / BLINDS_EFFECT_BLIND_WIDTH;  #line 53 "/home/jens/Source/shotwell/plugins/shotwell-transitions/BlindsEffect.vala" -		_tmp10_ = _tmp9_; +		_tmp6_ = spit_transitions_visuals_get_to_pixbuf (visuals);  #line 53 "/home/jens/Source/shotwell/plugins/shotwell-transitions/BlindsEffect.vala" -		_tmp11_ = gdk_pixbuf_get_width (_tmp10_); +		_tmp7_ = _tmp6_;  #line 53 "/home/jens/Source/shotwell/plugins/shotwell-transitions/BlindsEffect.vala" -		_tmp12_ = _tmp11_; +		_tmp8_ = gdk_pixbuf_get_width (_tmp7_);  #line 53 "/home/jens/Source/shotwell/plugins/shotwell-transitions/BlindsEffect.vala" -		_tmp13_ = self->priv->blind_count; +		_tmp9_ = _tmp8_;  #line 53 "/home/jens/Source/shotwell/plugins/shotwell-transitions/BlindsEffect.vala" -		_tmp14_ = ceil (((gdouble) _tmp12_) / ((gdouble) _tmp13_)); +		_tmp10_ = self->priv->blind_count;  #line 53 "/home/jens/Source/shotwell/plugins/shotwell-transitions/BlindsEffect.vala" -		self->priv->current_blind_width = (gint) _tmp14_; +		self->priv->current_blind_width = (gint) ceil (((gdouble) _tmp9_) / ((gdouble) _tmp10_));  #line 56 "/home/jens/Source/shotwell/plugins/shotwell-transitions/BlindsEffect.vala" -		_tmp15_ = self->priv->blind_count; +		_tmp11_ = self->priv->blind_count;  #line 56 "/home/jens/Source/shotwell/plugins/shotwell-transitions/BlindsEffect.vala" -		_tmp16_ = g_new0 (cairo_surface_t*, _tmp15_ + 1); +		_tmp12_ = g_new0 (cairo_surface_t*, _tmp11_ + 1);  #line 56 "/home/jens/Source/shotwell/plugins/shotwell-transitions/BlindsEffect.vala"  		self->priv->to_blinds = (_vala_array_free (self->priv->to_blinds, self->priv->to_blinds_length1, (GDestroyNotify) cairo_surface_destroy), NULL);  #line 56 "/home/jens/Source/shotwell/plugins/shotwell-transitions/BlindsEffect.vala" -		self->priv->to_blinds = _tmp16_; +		self->priv->to_blinds = _tmp12_;  #line 56 "/home/jens/Source/shotwell/plugins/shotwell-transitions/BlindsEffect.vala" -		self->priv->to_blinds_length1 = _tmp15_; +		self->priv->to_blinds_length1 = _tmp11_;  #line 56 "/home/jens/Source/shotwell/plugins/shotwell-transitions/BlindsEffect.vala"  		self->priv->_to_blinds_size_ = self->priv->to_blinds_length1; -#line 360 "BlindsEffect.c" +#line 402 "BlindsEffect.c"  		{  			gint i = 0;  #line 58 "/home/jens/Source/shotwell/plugins/shotwell-transitions/BlindsEffect.vala"  			i = 0; -#line 365 "BlindsEffect.c" +#line 407 "BlindsEffect.c"  			{ -				gboolean _tmp17_ = FALSE; +				gboolean _tmp13_ = FALSE;  #line 58 "/home/jens/Source/shotwell/plugins/shotwell-transitions/BlindsEffect.vala" -				_tmp17_ = TRUE; +				_tmp13_ = TRUE;  #line 58 "/home/jens/Source/shotwell/plugins/shotwell-transitions/BlindsEffect.vala"  				while (TRUE) { -#line 372 "BlindsEffect.c" +#line 414 "BlindsEffect.c" +					gint _tmp15_; +					gint _tmp16_; +					cairo_surface_t** _tmp17_; +					gint _tmp17__length1; +					gint _tmp18_;  					gint _tmp19_; -					gint _tmp20_; -					cairo_surface_t** _tmp21_; -					gint _tmp21__length1; +					GdkPixbuf* _tmp20_; +					GdkPixbuf* _tmp21_;  					gint _tmp22_;  					gint _tmp23_; -					SpitTransitionsVisuals* _tmp24_; -					GdkPixbuf* _tmp25_; -					GdkPixbuf* _tmp26_; -					gint _tmp27_; -					gint _tmp28_; -					cairo_surface_t* _tmp29_; -					cairo_surface_t* _tmp30_; +					cairo_surface_t* _tmp24_; +					cairo_surface_t* _tmp25_;  					cairo_t* ctx = NULL; -					cairo_surface_t** _tmp31_; -					gint _tmp31__length1; -					gint _tmp32_; -					cairo_surface_t* _tmp33_; -					cairo_t* _tmp34_; +					cairo_surface_t** _tmp26_; +					gint _tmp26__length1; +					gint _tmp27_; +					cairo_surface_t* _tmp28_; +					cairo_t* _tmp29_; +					cairo_t* _tmp30_; +					GdkPixbuf* _tmp31_; +					GdkPixbuf* _tmp32_; +					gint _tmp33_; +					gint _tmp34_;  					cairo_t* _tmp35_; -					SpitTransitionsVisuals* _tmp36_; -					GdkPixbuf* _tmp37_; -					GdkPixbuf* _tmp38_; -					gint _tmp39_; -					gint _tmp40_; -					cairo_t* _tmp41_;  #line 58 "/home/jens/Source/shotwell/plugins/shotwell-transitions/BlindsEffect.vala" -					if (!_tmp17_) { -#line 401 "BlindsEffect.c" -						gint _tmp18_; +					if (!_tmp13_) { +#line 441 "BlindsEffect.c" +						gint _tmp14_;  #line 58 "/home/jens/Source/shotwell/plugins/shotwell-transitions/BlindsEffect.vala" -						_tmp18_ = i; +						_tmp14_ = i;  #line 58 "/home/jens/Source/shotwell/plugins/shotwell-transitions/BlindsEffect.vala" -						i = _tmp18_ + 1; -#line 407 "BlindsEffect.c" +						i = _tmp14_ + 1; +#line 447 "BlindsEffect.c"  					}  #line 58 "/home/jens/Source/shotwell/plugins/shotwell-transitions/BlindsEffect.vala" -					_tmp17_ = FALSE; +					_tmp13_ = FALSE;  #line 58 "/home/jens/Source/shotwell/plugins/shotwell-transitions/BlindsEffect.vala" -					_tmp19_ = i; +					_tmp15_ = i;  #line 58 "/home/jens/Source/shotwell/plugins/shotwell-transitions/BlindsEffect.vala" -					_tmp20_ = self->priv->blind_count; +					_tmp16_ = self->priv->blind_count;  #line 58 "/home/jens/Source/shotwell/plugins/shotwell-transitions/BlindsEffect.vala" -					if (!(_tmp19_ < _tmp20_)) { +					if (!(_tmp15_ < _tmp16_)) {  #line 58 "/home/jens/Source/shotwell/plugins/shotwell-transitions/BlindsEffect.vala"  						break; -#line 419 "BlindsEffect.c" +#line 459 "BlindsEffect.c"  					}  #line 59 "/home/jens/Source/shotwell/plugins/shotwell-transitions/BlindsEffect.vala" -					_tmp21_ = self->priv->to_blinds; +					_tmp17_ = self->priv->to_blinds;  #line 59 "/home/jens/Source/shotwell/plugins/shotwell-transitions/BlindsEffect.vala" -					_tmp21__length1 = self->priv->to_blinds_length1; +					_tmp17__length1 = self->priv->to_blinds_length1;  #line 59 "/home/jens/Source/shotwell/plugins/shotwell-transitions/BlindsEffect.vala" -					_tmp22_ = i; +					_tmp18_ = i;  #line 59 "/home/jens/Source/shotwell/plugins/shotwell-transitions/BlindsEffect.vala" -					_tmp23_ = self->priv->current_blind_width; +					_tmp19_ = self->priv->current_blind_width;  #line 59 "/home/jens/Source/shotwell/plugins/shotwell-transitions/BlindsEffect.vala" -					_tmp24_ = visuals; +					_tmp20_ = spit_transitions_visuals_get_to_pixbuf (visuals);  #line 59 "/home/jens/Source/shotwell/plugins/shotwell-transitions/BlindsEffect.vala" -					_tmp25_ = spit_transitions_visuals_get_to_pixbuf (_tmp24_); +					_tmp21_ = _tmp20_;  #line 59 "/home/jens/Source/shotwell/plugins/shotwell-transitions/BlindsEffect.vala" -					_tmp26_ = _tmp25_; +					_tmp22_ = gdk_pixbuf_get_height (_tmp21_);  #line 59 "/home/jens/Source/shotwell/plugins/shotwell-transitions/BlindsEffect.vala" -					_tmp27_ = gdk_pixbuf_get_height (_tmp26_); +					_tmp23_ = _tmp22_;  #line 59 "/home/jens/Source/shotwell/plugins/shotwell-transitions/BlindsEffect.vala" -					_tmp28_ = _tmp27_; +					_tmp24_ = cairo_image_surface_create (CAIRO_FORMAT_RGB24, _tmp19_, _tmp23_);  #line 59 "/home/jens/Source/shotwell/plugins/shotwell-transitions/BlindsEffect.vala" -					_tmp29_ = cairo_image_surface_create (CAIRO_FORMAT_RGB24, _tmp23_, _tmp28_); +					_cairo_surface_destroy0 (_tmp17_[_tmp18_]);  #line 59 "/home/jens/Source/shotwell/plugins/shotwell-transitions/BlindsEffect.vala" -					_cairo_surface_destroy0 (_tmp21_[_tmp22_]); +					_tmp17_[_tmp18_] = _tmp24_;  #line 59 "/home/jens/Source/shotwell/plugins/shotwell-transitions/BlindsEffect.vala" -					_tmp21_[_tmp22_] = _tmp29_; -#line 59 "/home/jens/Source/shotwell/plugins/shotwell-transitions/BlindsEffect.vala" -					_tmp30_ = _tmp21_[_tmp22_]; +					_tmp25_ = _tmp17_[_tmp18_];  #line 61 "/home/jens/Source/shotwell/plugins/shotwell-transitions/BlindsEffect.vala" -					_tmp31_ = self->priv->to_blinds; +					_tmp26_ = self->priv->to_blinds;  #line 61 "/home/jens/Source/shotwell/plugins/shotwell-transitions/BlindsEffect.vala" -					_tmp31__length1 = self->priv->to_blinds_length1; +					_tmp26__length1 = self->priv->to_blinds_length1;  #line 61 "/home/jens/Source/shotwell/plugins/shotwell-transitions/BlindsEffect.vala" -					_tmp32_ = i; +					_tmp27_ = i;  #line 61 "/home/jens/Source/shotwell/plugins/shotwell-transitions/BlindsEffect.vala" -					_tmp33_ = _tmp31_[_tmp32_]; +					_tmp28_ = _tmp26_[_tmp27_];  #line 61 "/home/jens/Source/shotwell/plugins/shotwell-transitions/BlindsEffect.vala" -					_tmp34_ = cairo_create (_tmp33_); +					_tmp29_ = cairo_create (_tmp28_);  #line 61 "/home/jens/Source/shotwell/plugins/shotwell-transitions/BlindsEffect.vala" -					ctx = _tmp34_; +					ctx = _tmp29_;  #line 62 "/home/jens/Source/shotwell/plugins/shotwell-transitions/BlindsEffect.vala" -					_tmp35_ = ctx; +					_tmp30_ = ctx;  #line 62 "/home/jens/Source/shotwell/plugins/shotwell-transitions/BlindsEffect.vala" -					_tmp36_ = visuals; +					_tmp31_ = spit_transitions_visuals_get_to_pixbuf (visuals);  #line 62 "/home/jens/Source/shotwell/plugins/shotwell-transitions/BlindsEffect.vala" -					_tmp37_ = spit_transitions_visuals_get_to_pixbuf (_tmp36_); +					_tmp32_ = _tmp31_;  #line 62 "/home/jens/Source/shotwell/plugins/shotwell-transitions/BlindsEffect.vala" -					_tmp38_ = _tmp37_; +					_tmp33_ = i;  #line 62 "/home/jens/Source/shotwell/plugins/shotwell-transitions/BlindsEffect.vala" -					_tmp39_ = i; +					_tmp34_ = self->priv->current_blind_width;  #line 62 "/home/jens/Source/shotwell/plugins/shotwell-transitions/BlindsEffect.vala" -					_tmp40_ = self->priv->current_blind_width; -#line 62 "/home/jens/Source/shotwell/plugins/shotwell-transitions/BlindsEffect.vala" -					gdk_cairo_set_source_pixbuf (_tmp35_, _tmp38_, (gdouble) ((-_tmp39_) * _tmp40_), (gdouble) 0); +					gdk_cairo_set_source_pixbuf (_tmp30_, _tmp32_, (gdouble) ((-_tmp33_) * _tmp34_), (gdouble) 0);  #line 63 "/home/jens/Source/shotwell/plugins/shotwell-transitions/BlindsEffect.vala" -					_tmp41_ = ctx; +					_tmp35_ = ctx;  #line 63 "/home/jens/Source/shotwell/plugins/shotwell-transitions/BlindsEffect.vala" -					cairo_paint (_tmp41_); +					cairo_paint (_tmp35_);  #line 58 "/home/jens/Source/shotwell/plugins/shotwell-transitions/BlindsEffect.vala"  					_cairo_destroy0 (ctx); -#line 479 "BlindsEffect.c" +#line 515 "BlindsEffect.c"  				}  			}  		} @@ -483,27 +519,27 @@ static void blinds_effect_real_start (SpitTransitionsEffect* base, SpitTransitio  } -static void blinds_effect_real_paint (SpitTransitionsEffect* base, SpitTransitionsVisuals* visuals, SpitTransitionsMotion* motion, cairo_t* ctx, gint width, gint height, gint frame_number) { +static void +blinds_effect_real_paint (SpitTransitionsEffect* base, +                          SpitTransitionsVisuals* visuals, +                          SpitTransitionsMotion* motion, +                          cairo_t* ctx, +                          gint width, +                          gint height, +                          gint frame_number) +{  	BlindsEffect * self;  	gdouble alpha = 0.0; -	SpitTransitionsMotion* _tmp0_; -	gint _tmp1_; -	gdouble _tmp2_;  	gint y = 0; -	SpitTransitionsVisuals* _tmp3_; -	GdkRectangle _tmp4_ = {0}; -	GdkRectangle _tmp5_; -	gint _tmp6_; +	GdkRectangle _tmp0_ = {0}; +	GdkRectangle _tmp1_; +	gint _tmp2_;  	gint x = 0; -	SpitTransitionsVisuals* _tmp7_; -	GdkRectangle _tmp8_ = {0}; -	GdkRectangle _tmp9_; -	gint _tmp10_; -	SpitTransitionsVisuals* _tmp11_; -	GdkPixbuf* _tmp12_; -	GdkPixbuf* _tmp13_; -	cairo_t* _tmp53_; -	cairo_t* _tmp54_; +	GdkRectangle _tmp3_ = {0}; +	GdkRectangle _tmp4_; +	gint _tmp5_; +	GdkPixbuf* _tmp6_; +	GdkPixbuf* _tmp7_;  #line 68 "/home/jens/Source/shotwell/plugins/shotwell-transitions/BlindsEffect.vala"  	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_BLINDS_EFFECT, BlindsEffect);  #line 68 "/home/jens/Source/shotwell/plugins/shotwell-transitions/BlindsEffect.vala" @@ -513,215 +549,177 @@ static void blinds_effect_real_paint (SpitTransitionsEffect* base, SpitTransitio  #line 68 "/home/jens/Source/shotwell/plugins/shotwell-transitions/BlindsEffect.vala"  	g_return_if_fail (ctx != NULL);  #line 70 "/home/jens/Source/shotwell/plugins/shotwell-transitions/BlindsEffect.vala" -	_tmp0_ = motion; -#line 70 "/home/jens/Source/shotwell/plugins/shotwell-transitions/BlindsEffect.vala" -	_tmp1_ = frame_number; -#line 70 "/home/jens/Source/shotwell/plugins/shotwell-transitions/BlindsEffect.vala" -	_tmp2_ = spit_transitions_motion_get_alpha (_tmp0_, _tmp1_); -#line 70 "/home/jens/Source/shotwell/plugins/shotwell-transitions/BlindsEffect.vala" -	alpha = _tmp2_; -#line 71 "/home/jens/Source/shotwell/plugins/shotwell-transitions/BlindsEffect.vala" -	_tmp3_ = visuals; +	alpha = spit_transitions_motion_get_alpha (motion, frame_number);  #line 71 "/home/jens/Source/shotwell/plugins/shotwell-transitions/BlindsEffect.vala" -	spit_transitions_visuals_get_to_pos (_tmp3_, &_tmp4_); +	spit_transitions_visuals_get_to_pos (visuals, &_tmp0_);  #line 71 "/home/jens/Source/shotwell/plugins/shotwell-transitions/BlindsEffect.vala" -	_tmp5_ = _tmp4_; +	_tmp1_ = _tmp0_;  #line 71 "/home/jens/Source/shotwell/plugins/shotwell-transitions/BlindsEffect.vala" -	_tmp6_ = _tmp5_.y; +	_tmp2_ = _tmp1_.y;  #line 71 "/home/jens/Source/shotwell/plugins/shotwell-transitions/BlindsEffect.vala" -	y = _tmp6_; +	y = _tmp2_;  #line 72 "/home/jens/Source/shotwell/plugins/shotwell-transitions/BlindsEffect.vala" -	_tmp7_ = visuals; +	spit_transitions_visuals_get_to_pos (visuals, &_tmp3_);  #line 72 "/home/jens/Source/shotwell/plugins/shotwell-transitions/BlindsEffect.vala" -	spit_transitions_visuals_get_to_pos (_tmp7_, &_tmp8_); +	_tmp4_ = _tmp3_;  #line 72 "/home/jens/Source/shotwell/plugins/shotwell-transitions/BlindsEffect.vala" -	_tmp9_ = _tmp8_; +	_tmp5_ = _tmp4_.x;  #line 72 "/home/jens/Source/shotwell/plugins/shotwell-transitions/BlindsEffect.vala" -	_tmp10_ = _tmp9_.x; -#line 72 "/home/jens/Source/shotwell/plugins/shotwell-transitions/BlindsEffect.vala" -	x = _tmp10_; -#line 74 "/home/jens/Source/shotwell/plugins/shotwell-transitions/BlindsEffect.vala" -	_tmp11_ = visuals; +	x = _tmp5_;  #line 74 "/home/jens/Source/shotwell/plugins/shotwell-transitions/BlindsEffect.vala" -	_tmp12_ = spit_transitions_visuals_get_from_pixbuf (_tmp11_); +	_tmp6_ = spit_transitions_visuals_get_from_pixbuf (visuals);  #line 74 "/home/jens/Source/shotwell/plugins/shotwell-transitions/BlindsEffect.vala" -	_tmp13_ = _tmp12_; +	_tmp7_ = _tmp6_;  #line 74 "/home/jens/Source/shotwell/plugins/shotwell-transitions/BlindsEffect.vala" -	if (_tmp13_ != NULL) { -#line 552 "BlindsEffect.c" -		cairo_t* _tmp14_; -		SpitTransitionsVisuals* _tmp15_; -		GdkPixbuf* _tmp16_; -		GdkPixbuf* _tmp17_; -		SpitTransitionsVisuals* _tmp18_; -		GdkRectangle _tmp19_ = {0}; -		GdkRectangle _tmp20_; -		gint _tmp21_; -		SpitTransitionsVisuals* _tmp22_; -		GdkRectangle _tmp23_ = {0}; -		GdkRectangle _tmp24_; -		gint _tmp25_; -		cairo_t* _tmp26_; -		gdouble _tmp27_; -#line 75 "/home/jens/Source/shotwell/plugins/shotwell-transitions/BlindsEffect.vala" -		_tmp14_ = ctx; -#line 75 "/home/jens/Source/shotwell/plugins/shotwell-transitions/BlindsEffect.vala" -		_tmp15_ = visuals; -#line 75 "/home/jens/Source/shotwell/plugins/shotwell-transitions/BlindsEffect.vala" -		_tmp16_ = spit_transitions_visuals_get_from_pixbuf (_tmp15_); -#line 75 "/home/jens/Source/shotwell/plugins/shotwell-transitions/BlindsEffect.vala" -		_tmp17_ = _tmp16_; +	if (_tmp7_ != NULL) { +#line 576 "BlindsEffect.c" +		GdkPixbuf* _tmp8_; +		GdkPixbuf* _tmp9_; +		GdkRectangle _tmp10_ = {0}; +		GdkRectangle _tmp11_; +		gint _tmp12_; +		GdkRectangle _tmp13_ = {0}; +		GdkRectangle _tmp14_; +		gint _tmp15_; +		gdouble _tmp16_;  #line 75 "/home/jens/Source/shotwell/plugins/shotwell-transitions/BlindsEffect.vala" -		_tmp18_ = visuals; +		_tmp8_ = spit_transitions_visuals_get_from_pixbuf (visuals);  #line 75 "/home/jens/Source/shotwell/plugins/shotwell-transitions/BlindsEffect.vala" -		spit_transitions_visuals_get_from_pos (_tmp18_, &_tmp19_); +		_tmp9_ = _tmp8_;  #line 75 "/home/jens/Source/shotwell/plugins/shotwell-transitions/BlindsEffect.vala" -		_tmp20_ = _tmp19_; +		spit_transitions_visuals_get_from_pos (visuals, &_tmp10_);  #line 75 "/home/jens/Source/shotwell/plugins/shotwell-transitions/BlindsEffect.vala" -		_tmp21_ = _tmp20_.x; +		_tmp11_ = _tmp10_;  #line 75 "/home/jens/Source/shotwell/plugins/shotwell-transitions/BlindsEffect.vala" -		_tmp22_ = visuals; +		_tmp12_ = _tmp11_.x;  #line 75 "/home/jens/Source/shotwell/plugins/shotwell-transitions/BlindsEffect.vala" -		spit_transitions_visuals_get_from_pos (_tmp22_, &_tmp23_); +		spit_transitions_visuals_get_from_pos (visuals, &_tmp13_);  #line 75 "/home/jens/Source/shotwell/plugins/shotwell-transitions/BlindsEffect.vala" -		_tmp24_ = _tmp23_; +		_tmp14_ = _tmp13_;  #line 75 "/home/jens/Source/shotwell/plugins/shotwell-transitions/BlindsEffect.vala" -		_tmp25_ = _tmp24_.y; +		_tmp15_ = _tmp14_.y;  #line 75 "/home/jens/Source/shotwell/plugins/shotwell-transitions/BlindsEffect.vala" -		gdk_cairo_set_source_pixbuf (_tmp14_, _tmp17_, (gdouble) _tmp21_, (gdouble) _tmp25_); -#line 77 "/home/jens/Source/shotwell/plugins/shotwell-transitions/BlindsEffect.vala" -		_tmp26_ = ctx; +		gdk_cairo_set_source_pixbuf (ctx, _tmp9_, (gdouble) _tmp12_, (gdouble) _tmp15_);  #line 77 "/home/jens/Source/shotwell/plugins/shotwell-transitions/BlindsEffect.vala" -		_tmp27_ = alpha; +		_tmp16_ = alpha;  #line 77 "/home/jens/Source/shotwell/plugins/shotwell-transitions/BlindsEffect.vala" -		cairo_paint_with_alpha (_tmp26_, 1 - (_tmp27_ * 2)); -#line 599 "BlindsEffect.c" +		cairo_paint_with_alpha (ctx, 1 - (_tmp16_ * 2)); +#line 608 "BlindsEffect.c"  	}  	{  		gint i = 0;  #line 80 "/home/jens/Source/shotwell/plugins/shotwell-transitions/BlindsEffect.vala"  		i = 0; -#line 605 "BlindsEffect.c" +#line 614 "BlindsEffect.c"  		{ -			gboolean _tmp28_ = FALSE; +			gboolean _tmp17_ = FALSE;  #line 80 "/home/jens/Source/shotwell/plugins/shotwell-transitions/BlindsEffect.vala" -			_tmp28_ = TRUE; +			_tmp17_ = TRUE;  #line 80 "/home/jens/Source/shotwell/plugins/shotwell-transitions/BlindsEffect.vala"  			while (TRUE) { -#line 612 "BlindsEffect.c" +#line 621 "BlindsEffect.c" +				gint _tmp19_; +				gint _tmp20_; +				cairo_surface_t** _tmp21_; +				gint _tmp21__length1; +				gint _tmp22_; +				cairo_surface_t* _tmp23_; +				gint _tmp24_; +				gint _tmp25_; +				gint _tmp26_; +				gint _tmp27_; +				gint _tmp28_; +				gint _tmp29_;  				gint _tmp30_;  				gint _tmp31_; -				cairo_t* _tmp32_; -				cairo_surface_t** _tmp33_; -				gint _tmp33__length1; -				gint _tmp34_; -				cairo_surface_t* _tmp35_; +				gint _tmp32_; +				gdouble _tmp33_; +				GdkPixbuf* _tmp34_; +				GdkPixbuf* _tmp35_;  				gint _tmp36_;  				gint _tmp37_; -				gint _tmp38_; -				gint _tmp39_; -				cairo_t* _tmp40_; -				gint _tmp41_; -				gint _tmp42_; -				gint _tmp43_; -				gint _tmp44_; -				gint _tmp45_; -				gdouble _tmp46_; -				SpitTransitionsVisuals* _tmp47_; -				GdkPixbuf* _tmp48_; -				GdkPixbuf* _tmp49_; -				gint _tmp50_; -				gint _tmp51_; -				cairo_t* _tmp52_;  #line 80 "/home/jens/Source/shotwell/plugins/shotwell-transitions/BlindsEffect.vala" -				if (!_tmp28_) { -#line 639 "BlindsEffect.c" -					gint _tmp29_; +				if (!_tmp17_) { +#line 644 "BlindsEffect.c" +					gint _tmp18_;  #line 80 "/home/jens/Source/shotwell/plugins/shotwell-transitions/BlindsEffect.vala" -					_tmp29_ = i; +					_tmp18_ = i;  #line 80 "/home/jens/Source/shotwell/plugins/shotwell-transitions/BlindsEffect.vala" -					i = _tmp29_ + 1; -#line 645 "BlindsEffect.c" +					i = _tmp18_ + 1; +#line 650 "BlindsEffect.c"  				}  #line 80 "/home/jens/Source/shotwell/plugins/shotwell-transitions/BlindsEffect.vala" -				_tmp28_ = FALSE; +				_tmp17_ = FALSE;  #line 80 "/home/jens/Source/shotwell/plugins/shotwell-transitions/BlindsEffect.vala" -				_tmp30_ = i; +				_tmp19_ = i;  #line 80 "/home/jens/Source/shotwell/plugins/shotwell-transitions/BlindsEffect.vala" -				_tmp31_ = self->priv->blind_count; +				_tmp20_ = self->priv->blind_count;  #line 80 "/home/jens/Source/shotwell/plugins/shotwell-transitions/BlindsEffect.vala" -				if (!(_tmp30_ < _tmp31_)) { +				if (!(_tmp19_ < _tmp20_)) {  #line 80 "/home/jens/Source/shotwell/plugins/shotwell-transitions/BlindsEffect.vala"  					break; -#line 657 "BlindsEffect.c" +#line 662 "BlindsEffect.c"  				}  #line 81 "/home/jens/Source/shotwell/plugins/shotwell-transitions/BlindsEffect.vala" -				_tmp32_ = ctx; +				_tmp21_ = self->priv->to_blinds;  #line 81 "/home/jens/Source/shotwell/plugins/shotwell-transitions/BlindsEffect.vala" -				_tmp33_ = self->priv->to_blinds; +				_tmp21__length1 = self->priv->to_blinds_length1;  #line 81 "/home/jens/Source/shotwell/plugins/shotwell-transitions/BlindsEffect.vala" -				_tmp33__length1 = self->priv->to_blinds_length1; +				_tmp22_ = i;  #line 81 "/home/jens/Source/shotwell/plugins/shotwell-transitions/BlindsEffect.vala" -				_tmp34_ = i; +				_tmp23_ = _tmp21_[_tmp22_];  #line 81 "/home/jens/Source/shotwell/plugins/shotwell-transitions/BlindsEffect.vala" -				_tmp35_ = _tmp33_[_tmp34_]; +				_tmp24_ = x;  #line 81 "/home/jens/Source/shotwell/plugins/shotwell-transitions/BlindsEffect.vala" -				_tmp36_ = x; +				_tmp25_ = i;  #line 81 "/home/jens/Source/shotwell/plugins/shotwell-transitions/BlindsEffect.vala" -				_tmp37_ = i; +				_tmp26_ = self->priv->current_blind_width;  #line 81 "/home/jens/Source/shotwell/plugins/shotwell-transitions/BlindsEffect.vala" -				_tmp38_ = self->priv->current_blind_width; +				_tmp27_ = y;  #line 81 "/home/jens/Source/shotwell/plugins/shotwell-transitions/BlindsEffect.vala" -				_tmp39_ = y; -#line 81 "/home/jens/Source/shotwell/plugins/shotwell-transitions/BlindsEffect.vala" -				cairo_set_source_surface (_tmp32_, _tmp35_, (gdouble) (_tmp36_ + (_tmp37_ * _tmp38_)), (gdouble) _tmp39_); -#line 82 "/home/jens/Source/shotwell/plugins/shotwell-transitions/BlindsEffect.vala" -				_tmp40_ = ctx; -#line 82 "/home/jens/Source/shotwell/plugins/shotwell-transitions/BlindsEffect.vala" -				_tmp41_ = x; +				cairo_set_source_surface (ctx, _tmp23_, (gdouble) (_tmp24_ + (_tmp25_ * _tmp26_)), (gdouble) _tmp27_);  #line 82 "/home/jens/Source/shotwell/plugins/shotwell-transitions/BlindsEffect.vala" -				_tmp42_ = i; +				_tmp28_ = x;  #line 82 "/home/jens/Source/shotwell/plugins/shotwell-transitions/BlindsEffect.vala" -				_tmp43_ = self->priv->current_blind_width; +				_tmp29_ = i;  #line 82 "/home/jens/Source/shotwell/plugins/shotwell-transitions/BlindsEffect.vala" -				_tmp44_ = y; +				_tmp30_ = self->priv->current_blind_width;  #line 82 "/home/jens/Source/shotwell/plugins/shotwell-transitions/BlindsEffect.vala" -				_tmp45_ = self->priv->current_blind_width; +				_tmp31_ = y;  #line 82 "/home/jens/Source/shotwell/plugins/shotwell-transitions/BlindsEffect.vala" -				_tmp46_ = alpha; +				_tmp32_ = self->priv->current_blind_width;  #line 82 "/home/jens/Source/shotwell/plugins/shotwell-transitions/BlindsEffect.vala" -				_tmp47_ = visuals; +				_tmp33_ = alpha;  #line 82 "/home/jens/Source/shotwell/plugins/shotwell-transitions/BlindsEffect.vala" -				_tmp48_ = spit_transitions_visuals_get_to_pixbuf (_tmp47_); +				_tmp34_ = spit_transitions_visuals_get_to_pixbuf (visuals);  #line 82 "/home/jens/Source/shotwell/plugins/shotwell-transitions/BlindsEffect.vala" -				_tmp49_ = _tmp48_; +				_tmp35_ = _tmp34_;  #line 82 "/home/jens/Source/shotwell/plugins/shotwell-transitions/BlindsEffect.vala" -				_tmp50_ = gdk_pixbuf_get_height (_tmp49_); +				_tmp36_ = gdk_pixbuf_get_height (_tmp35_);  #line 82 "/home/jens/Source/shotwell/plugins/shotwell-transitions/BlindsEffect.vala" -				_tmp51_ = _tmp50_; +				_tmp37_ = _tmp36_;  #line 82 "/home/jens/Source/shotwell/plugins/shotwell-transitions/BlindsEffect.vala" -				cairo_rectangle (_tmp40_, (gdouble) (_tmp41_ + (_tmp42_ * _tmp43_)), (gdouble) _tmp44_, _tmp45_ * (_tmp46_ + 0.5), (gdouble) _tmp51_); +				cairo_rectangle (ctx, (gdouble) (_tmp28_ + (_tmp29_ * _tmp30_)), (gdouble) _tmp31_, _tmp32_ * (_tmp33_ + 0.5), (gdouble) _tmp37_);  #line 84 "/home/jens/Source/shotwell/plugins/shotwell-transitions/BlindsEffect.vala" -				_tmp52_ = ctx; -#line 84 "/home/jens/Source/shotwell/plugins/shotwell-transitions/BlindsEffect.vala" -				cairo_fill (_tmp52_); -#line 709 "BlindsEffect.c" +				cairo_fill (ctx); +#line 706 "BlindsEffect.c"  			}  		}  	}  #line 87 "/home/jens/Source/shotwell/plugins/shotwell-transitions/BlindsEffect.vala" -	_tmp53_ = ctx; -#line 87 "/home/jens/Source/shotwell/plugins/shotwell-transitions/BlindsEffect.vala" -	cairo_clip (_tmp53_); -#line 88 "/home/jens/Source/shotwell/plugins/shotwell-transitions/BlindsEffect.vala" -	_tmp54_ = ctx; +	cairo_clip (ctx);  #line 88 "/home/jens/Source/shotwell/plugins/shotwell-transitions/BlindsEffect.vala" -	cairo_paint (_tmp54_); -#line 721 "BlindsEffect.c" +	cairo_paint (ctx); +#line 714 "BlindsEffect.c"  } -static void blinds_effect_real_advance (SpitTransitionsEffect* base, SpitTransitionsVisuals* visuals, SpitTransitionsMotion* motion, gint frame_number) { +static void +blinds_effect_real_advance (SpitTransitionsEffect* base, +                            SpitTransitionsVisuals* visuals, +                            SpitTransitionsMotion* motion, +                            gint frame_number) +{  	BlindsEffect * self;  #line 91 "/home/jens/Source/shotwell/plugins/shotwell-transitions/BlindsEffect.vala"  	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_BLINDS_EFFECT, BlindsEffect); @@ -729,11 +727,13 @@ static void blinds_effect_real_advance (SpitTransitionsEffect* base, SpitTransit  	g_return_if_fail (SPIT_TRANSITIONS_IS_VISUALS (visuals));  #line 91 "/home/jens/Source/shotwell/plugins/shotwell-transitions/BlindsEffect.vala"  	g_return_if_fail (SPIT_TRANSITIONS_IS_MOTION (motion)); -#line 733 "BlindsEffect.c" +#line 731 "BlindsEffect.c"  } -static void blinds_effect_real_cancel (SpitTransitionsEffect* base) { +static void +blinds_effect_real_cancel (SpitTransitionsEffect* base) +{  	BlindsEffect * self;  #line 94 "/home/jens/Source/shotwell/plugins/shotwell-transitions/BlindsEffect.vala"  	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_BLINDS_EFFECT, BlindsEffect); @@ -741,18 +741,22 @@ static void blinds_effect_real_cancel (SpitTransitionsEffect* base) {  } -static void blinds_effect_class_init (BlindsEffectClass * klass) { +static void +blinds_effect_class_init (BlindsEffectClass * klass) +{  #line 28 "/home/jens/Source/shotwell/plugins/shotwell-transitions/BlindsEffect.vala"  	blinds_effect_parent_class = g_type_class_peek_parent (klass);  #line 28 "/home/jens/Source/shotwell/plugins/shotwell-transitions/BlindsEffect.vala"  	g_type_class_add_private (klass, sizeof (BlindsEffectPrivate));  #line 28 "/home/jens/Source/shotwell/plugins/shotwell-transitions/BlindsEffect.vala"  	G_OBJECT_CLASS (klass)->finalize = blinds_effect_finalize; -#line 752 "BlindsEffect.c" +#line 754 "BlindsEffect.c"  } -static void blinds_effect_spit_transitions_effect_interface_init (SpitTransitionsEffectIface * iface) { +static void +blinds_effect_spit_transitions_effect_interface_init (SpitTransitionsEffectIface * iface) +{  #line 28 "/home/jens/Source/shotwell/plugins/shotwell-transitions/BlindsEffect.vala"  	blinds_effect_spit_transitions_effect_parent_iface = g_type_interface_peek_parent (iface);  #line 28 "/home/jens/Source/shotwell/plugins/shotwell-transitions/BlindsEffect.vala" @@ -767,18 +771,22 @@ static void blinds_effect_spit_transitions_effect_interface_init (SpitTransition  	iface->advance = (void (*) (SpitTransitionsEffect *, SpitTransitionsVisuals*, SpitTransitionsMotion*, gint)) blinds_effect_real_advance;  #line 28 "/home/jens/Source/shotwell/plugins/shotwell-transitions/BlindsEffect.vala"  	iface->cancel = (void (*) (SpitTransitionsEffect *)) blinds_effect_real_cancel; -#line 771 "BlindsEffect.c" +#line 775 "BlindsEffect.c"  } -static void blinds_effect_instance_init (BlindsEffect * self) { +static void +blinds_effect_instance_init (BlindsEffect * self) +{  #line 28 "/home/jens/Source/shotwell/plugins/shotwell-transitions/BlindsEffect.vala"  	self->priv = BLINDS_EFFECT_GET_PRIVATE (self); -#line 778 "BlindsEffect.c" +#line 784 "BlindsEffect.c"  } -static void blinds_effect_finalize (GObject * obj) { +static void +blinds_effect_finalize (GObject * obj) +{  	BlindsEffect * self;  #line 28 "/home/jens/Source/shotwell/plugins/shotwell-transitions/BlindsEffect.vala"  	self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_BLINDS_EFFECT, BlindsEffect); @@ -786,11 +794,13 @@ static void blinds_effect_finalize (GObject * obj) {  	self->priv->to_blinds = (_vala_array_free (self->priv->to_blinds, self->priv->to_blinds_length1, (GDestroyNotify) cairo_surface_destroy), NULL);  #line 28 "/home/jens/Source/shotwell/plugins/shotwell-transitions/BlindsEffect.vala"  	G_OBJECT_CLASS (blinds_effect_parent_class)->finalize (obj); -#line 790 "BlindsEffect.c" +#line 798 "BlindsEffect.c"  } -GType blinds_effect_get_type (void) { +GType +blinds_effect_get_type (void) +{  	static volatile gsize blinds_effect_type_id__volatile = 0;  	if (g_once_init_enter (&blinds_effect_type_id__volatile)) {  		static const GTypeInfo g_define_type_info = { sizeof (BlindsEffectClass), (GBaseInitFunc) NULL, (GBaseFinalizeFunc) NULL, (GClassInitFunc) blinds_effect_class_init, (GClassFinalizeFunc) NULL, NULL, sizeof (BlindsEffect), 0, (GInstanceInitFunc) blinds_effect_instance_init, NULL }; @@ -804,7 +814,11 @@ GType blinds_effect_get_type (void) {  } -static void _vala_array_destroy (gpointer array, gint array_length, GDestroyNotify destroy_func) { +static void +_vala_array_destroy (gpointer array, +                     gint array_length, +                     GDestroyNotify destroy_func) +{  	if ((array != NULL) && (destroy_func != NULL)) {  		int i;  		for (i = 0; i < array_length; i = i + 1) { @@ -816,7 +830,11 @@ 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_free (gpointer array, +                  gint array_length, +                  GDestroyNotify destroy_func) +{  	_vala_array_destroy (array, array_length, destroy_func);  	g_free (array);  } diff --git a/plugins/shotwell-transitions/ChessEffect.c b/plugins/shotwell-transitions/ChessEffect.c index e0e3b30..103eeb0 100644 --- a/plugins/shotwell-transitions/ChessEffect.c +++ b/plugins/shotwell-transitions/ChessEffect.c @@ -1,4 +1,4 @@ -/* ChessEffect.c generated by valac 0.36.6, the Vala compiler +/* ChessEffect.c generated by valac 0.40.4, the Vala compiler   * generated from ChessEffect.vala, do not modify */  /* Copyright 2013 Jens Bav @@ -8,6 +8,7 @@   * (version 2.1 or later).  See the COPYING file in this distribution.   */ +  #include <glib.h>  #include <glib-object.h>  #include <shotwell-plugin-dev-1.0.h> @@ -42,6 +43,11 @@ typedef struct _ShotwellTransitionDescriptorPrivate ShotwellTransitionDescriptor  typedef struct _ChessEffectDescriptor ChessEffectDescriptor;  typedef struct _ChessEffectDescriptorClass ChessEffectDescriptorClass;  typedef struct _ChessEffectDescriptorPrivate ChessEffectDescriptorPrivate; +enum  { +	CHESS_EFFECT_DESCRIPTOR_0_PROPERTY, +	CHESS_EFFECT_DESCRIPTOR_NUM_PROPERTIES +}; +static GParamSpec* chess_effect_descriptor_properties[CHESS_EFFECT_DESCRIPTOR_NUM_PROPERTIES];  #define TYPE_CHESS_EFFECT (chess_effect_get_type ())  #define CHESS_EFFECT(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), TYPE_CHESS_EFFECT, ChessEffect)) @@ -53,6 +59,11 @@ typedef struct _ChessEffectDescriptorPrivate ChessEffectDescriptorPrivate;  typedef struct _ChessEffect ChessEffect;  typedef struct _ChessEffectClass ChessEffectClass;  typedef struct _ChessEffectPrivate ChessEffectPrivate; +enum  { +	CHESS_EFFECT_0_PROPERTY, +	CHESS_EFFECT_NUM_PROPERTIES +}; +static GParamSpec* chess_effect_properties[CHESS_EFFECT_NUM_PROPERTIES];  struct _ShotwellTransitionDescriptor {  	GObject parent_instance; @@ -96,57 +107,71 @@ static SpitTransitionsEffectIface * chess_effect_spit_transitions_effect_parent_  GType shotwell_transition_descriptor_get_type (void) G_GNUC_CONST;  GType chess_effect_descriptor_get_type (void) G_GNUC_CONST; -enum  { -	CHESS_EFFECT_DESCRIPTOR_DUMMY_PROPERTY -};  ChessEffectDescriptor* chess_effect_descriptor_new (GFile* resource_directory); -ChessEffectDescriptor* chess_effect_descriptor_construct (GType object_type, GFile* resource_directory); -ShotwellTransitionDescriptor* shotwell_transition_descriptor_construct (GType object_type, GFile* resource_directory); +ChessEffectDescriptor* chess_effect_descriptor_construct (GType object_type, +                                                          GFile* resource_directory); +ShotwellTransitionDescriptor* shotwell_transition_descriptor_construct (GType object_type, +                                                                        GFile* resource_directory);  static const gchar* chess_effect_descriptor_real_get_id (ShotwellTransitionDescriptor* base);  static const gchar* chess_effect_descriptor_real_get_pluggable_name (ShotwellTransitionDescriptor* base); -static SpitTransitionsEffect* chess_effect_descriptor_real_create (ShotwellTransitionDescriptor* base, SpitHostInterface* host); +static SpitTransitionsEffect* chess_effect_descriptor_real_create (ShotwellTransitionDescriptor* base, +                                                            SpitHostInterface* host);  ChessEffect* chess_effect_new (void);  ChessEffect* chess_effect_construct (GType object_type);  GType chess_effect_get_type (void) G_GNUC_CONST;  #define CHESS_EFFECT_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), TYPE_CHESS_EFFECT, ChessEffectPrivate)) -enum  { -	CHESS_EFFECT_DUMMY_PROPERTY -};  #define CHESS_EFFECT_DESIRED_FPS 25  #define CHESS_EFFECT_MIN_FPS 10  #define CHESS_EFFECT_SQUARE_SIZE 100 -static void chess_effect_real_get_fps (SpitTransitionsEffect* base, gint* desired_fps, gint* min_fps); -static void chess_effect_real_start (SpitTransitionsEffect* base, SpitTransitionsVisuals* visuals, SpitTransitionsMotion* motion); +static void chess_effect_real_get_fps (SpitTransitionsEffect* base, +                                gint* desired_fps, +                                gint* min_fps); +static void chess_effect_real_start (SpitTransitionsEffect* base, +                              SpitTransitionsVisuals* visuals, +                              SpitTransitionsMotion* motion);  static gboolean chess_effect_real_needs_clear_background (SpitTransitionsEffect* base); -static void chess_effect_real_paint (SpitTransitionsEffect* base, SpitTransitionsVisuals* visuals, SpitTransitionsMotion* motion, cairo_t* ctx, gint width, gint height, gint frame_number); -static void chess_effect_real_advance (SpitTransitionsEffect* base, SpitTransitionsVisuals* visuals, SpitTransitionsMotion* motion, gint frame_number); +static void chess_effect_real_paint (SpitTransitionsEffect* base, +                              SpitTransitionsVisuals* visuals, +                              SpitTransitionsMotion* motion, +                              cairo_t* ctx, +                              gint width, +                              gint height, +                              gint frame_number); +static void chess_effect_real_advance (SpitTransitionsEffect* base, +                                SpitTransitionsVisuals* visuals, +                                SpitTransitionsMotion* motion, +                                gint frame_number);  static void chess_effect_real_cancel (SpitTransitionsEffect* base);  static void chess_effect_finalize (GObject * obj); -ChessEffectDescriptor* chess_effect_descriptor_construct (GType object_type, GFile* resource_directory) { +ChessEffectDescriptor* +chess_effect_descriptor_construct (GType object_type, +                                   GFile* resource_directory) +{  	ChessEffectDescriptor * self = NULL; -	GFile* _tmp0_;  #line 11 "/home/jens/Source/shotwell/plugins/shotwell-transitions/ChessEffect.vala"  	g_return_val_if_fail (G_IS_FILE (resource_directory), NULL);  #line 12 "/home/jens/Source/shotwell/plugins/shotwell-transitions/ChessEffect.vala" -	_tmp0_ = resource_directory; -#line 12 "/home/jens/Source/shotwell/plugins/shotwell-transitions/ChessEffect.vala" -	self = (ChessEffectDescriptor*) shotwell_transition_descriptor_construct (object_type, _tmp0_); +	self = (ChessEffectDescriptor*) shotwell_transition_descriptor_construct (object_type, resource_directory);  #line 11 "/home/jens/Source/shotwell/plugins/shotwell-transitions/ChessEffect.vala"  	return self; -#line 139 "ChessEffect.c" +#line 160 "ChessEffect.c"  } -ChessEffectDescriptor* chess_effect_descriptor_new (GFile* resource_directory) { +ChessEffectDescriptor* +chess_effect_descriptor_new (GFile* resource_directory) +{  #line 11 "/home/jens/Source/shotwell/plugins/shotwell-transitions/ChessEffect.vala"  	return chess_effect_descriptor_construct (TYPE_CHESS_EFFECT_DESCRIPTOR, resource_directory); -#line 146 "ChessEffect.c" +#line 169 "ChessEffect.c"  } -static const gchar* chess_effect_descriptor_real_get_id (ShotwellTransitionDescriptor* base) { +static const gchar* +chess_effect_descriptor_real_get_id (ShotwellTransitionDescriptor* base) +{  	ChessEffectDescriptor * self;  	const gchar* result = NULL;  #line 15 "/home/jens/Source/shotwell/plugins/shotwell-transitions/ChessEffect.vala" @@ -155,11 +180,13 @@ static const gchar* chess_effect_descriptor_real_get_id (ShotwellTransitionDescr  	result = "org.yorba.shotwell.transitions.chess";  #line 16 "/home/jens/Source/shotwell/plugins/shotwell-transitions/ChessEffect.vala"  	return result; -#line 159 "ChessEffect.c" +#line 184 "ChessEffect.c"  } -static const gchar* chess_effect_descriptor_real_get_pluggable_name (ShotwellTransitionDescriptor* base) { +static const gchar* +chess_effect_descriptor_real_get_pluggable_name (ShotwellTransitionDescriptor* base) +{  	ChessEffectDescriptor * self;  	const gchar* result = NULL;  #line 19 "/home/jens/Source/shotwell/plugins/shotwell-transitions/ChessEffect.vala" @@ -168,11 +195,14 @@ static const gchar* chess_effect_descriptor_real_get_pluggable_name (ShotwellTra  	result = _ ("Chess");  #line 20 "/home/jens/Source/shotwell/plugins/shotwell-transitions/ChessEffect.vala"  	return result; -#line 172 "ChessEffect.c" +#line 199 "ChessEffect.c"  } -static SpitTransitionsEffect* chess_effect_descriptor_real_create (ShotwellTransitionDescriptor* base, SpitHostInterface* host) { +static SpitTransitionsEffect* +chess_effect_descriptor_real_create (ShotwellTransitionDescriptor* base, +                                     SpitHostInterface* host) +{  	ChessEffectDescriptor * self;  	SpitTransitionsEffect* result = NULL;  	ChessEffect* _tmp0_; @@ -186,11 +216,13 @@ static SpitTransitionsEffect* chess_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/ChessEffect.vala"  	return result; -#line 190 "ChessEffect.c" +#line 220 "ChessEffect.c"  } -static void chess_effect_descriptor_class_init (ChessEffectDescriptorClass * klass) { +static void +chess_effect_descriptor_class_init (ChessEffectDescriptorClass * klass) +{  #line 10 "/home/jens/Source/shotwell/plugins/shotwell-transitions/ChessEffect.vala"  	chess_effect_descriptor_parent_class = g_type_class_peek_parent (klass);  #line 10 "/home/jens/Source/shotwell/plugins/shotwell-transitions/ChessEffect.vala" @@ -199,15 +231,19 @@ static void chess_effect_descriptor_class_init (ChessEffectDescriptorClass * kla  	((ShotwellTransitionDescriptorClass *) klass)->get_pluggable_name = (const gchar* (*) (ShotwellTransitionDescriptor *)) chess_effect_descriptor_real_get_pluggable_name;  #line 10 "/home/jens/Source/shotwell/plugins/shotwell-transitions/ChessEffect.vala"  	((ShotwellTransitionDescriptorClass *) klass)->create = (SpitTransitionsEffect* (*) (ShotwellTransitionDescriptor *, SpitHostInterface*)) chess_effect_descriptor_real_create; -#line 203 "ChessEffect.c" +#line 235 "ChessEffect.c"  } -static void chess_effect_descriptor_instance_init (ChessEffectDescriptor * self) { +static void +chess_effect_descriptor_instance_init (ChessEffectDescriptor * self) +{  } -GType chess_effect_descriptor_get_type (void) { +GType +chess_effect_descriptor_get_type (void) +{  	static volatile gsize chess_effect_descriptor_type_id__volatile = 0;  	if (g_once_init_enter (&chess_effect_descriptor_type_id__volatile)) {  		static const GTypeInfo g_define_type_info = { sizeof (ChessEffectDescriptorClass), (GBaseInitFunc) NULL, (GBaseFinalizeFunc) NULL, (GClassInitFunc) chess_effect_descriptor_class_init, (GClassFinalizeFunc) NULL, NULL, sizeof (ChessEffectDescriptor), 0, (GInstanceInitFunc) chess_effect_descriptor_instance_init, NULL }; @@ -219,24 +255,32 @@ GType chess_effect_descriptor_get_type (void) {  } -ChessEffect* chess_effect_construct (GType object_type) { +ChessEffect* +chess_effect_construct (GType object_type) +{  	ChessEffect * self = NULL;  #line 35 "/home/jens/Source/shotwell/plugins/shotwell-transitions/ChessEffect.vala"  	self = (ChessEffect*) g_object_new (object_type, NULL);  #line 35 "/home/jens/Source/shotwell/plugins/shotwell-transitions/ChessEffect.vala"  	return self; -#line 229 "ChessEffect.c" +#line 267 "ChessEffect.c"  } -ChessEffect* chess_effect_new (void) { +ChessEffect* +chess_effect_new (void) +{  #line 35 "/home/jens/Source/shotwell/plugins/shotwell-transitions/ChessEffect.vala"  	return chess_effect_construct (TYPE_CHESS_EFFECT); -#line 236 "ChessEffect.c" +#line 276 "ChessEffect.c"  } -static void chess_effect_real_get_fps (SpitTransitionsEffect* base, gint* desired_fps, gint* min_fps) { +static void +chess_effect_real_get_fps (SpitTransitionsEffect* base, +                           gint* desired_fps, +                           gint* min_fps) +{  	ChessEffect * self;  	gint _vala_desired_fps = 0;  	gint _vala_min_fps = 0; @@ -250,27 +294,29 @@ static void chess_effect_real_get_fps (SpitTransitionsEffect* base, gint* desire  	if (desired_fps) {  #line 38 "/home/jens/Source/shotwell/plugins/shotwell-transitions/ChessEffect.vala"  		*desired_fps = _vala_desired_fps; -#line 254 "ChessEffect.c" +#line 298 "ChessEffect.c"  	}  #line 38 "/home/jens/Source/shotwell/plugins/shotwell-transitions/ChessEffect.vala"  	if (min_fps) {  #line 38 "/home/jens/Source/shotwell/plugins/shotwell-transitions/ChessEffect.vala"  		*min_fps = _vala_min_fps; -#line 260 "ChessEffect.c" +#line 304 "ChessEffect.c"  	}  } -static void chess_effect_real_start (SpitTransitionsEffect* base, SpitTransitionsVisuals* visuals, SpitTransitionsMotion* motion) { +static void +chess_effect_real_start (SpitTransitionsEffect* base, +                         SpitTransitionsVisuals* visuals, +                         SpitTransitionsMotion* motion) +{  	ChessEffect * self; -	SpitTransitionsVisuals* _tmp0_; -	GdkRectangle _tmp1_ = {0}; -	GdkRectangle _tmp2_; -	gint _tmp3_; -	SpitTransitionsVisuals* _tmp4_; -	GdkRectangle _tmp5_ = {0}; -	GdkRectangle _tmp6_; -	gint _tmp7_; +	GdkRectangle _tmp0_ = {0}; +	GdkRectangle _tmp1_; +	gint _tmp2_; +	GdkRectangle _tmp3_ = {0}; +	GdkRectangle _tmp4_; +	gint _tmp5_;  #line 43 "/home/jens/Source/shotwell/plugins/shotwell-transitions/ChessEffect.vala"  	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_CHESS_EFFECT, ChessEffect);  #line 43 "/home/jens/Source/shotwell/plugins/shotwell-transitions/ChessEffect.vala" @@ -278,30 +324,28 @@ static void chess_effect_real_start (SpitTransitionsEffect* base, SpitTransition  #line 43 "/home/jens/Source/shotwell/plugins/shotwell-transitions/ChessEffect.vala"  	g_return_if_fail (SPIT_TRANSITIONS_IS_MOTION (motion));  #line 44 "/home/jens/Source/shotwell/plugins/shotwell-transitions/ChessEffect.vala" -	_tmp0_ = visuals; +	spit_transitions_visuals_get_to_pos (visuals, &_tmp0_);  #line 44 "/home/jens/Source/shotwell/plugins/shotwell-transitions/ChessEffect.vala" -	spit_transitions_visuals_get_to_pos (_tmp0_, &_tmp1_); +	_tmp1_ = _tmp0_;  #line 44 "/home/jens/Source/shotwell/plugins/shotwell-transitions/ChessEffect.vala" -	_tmp2_ = _tmp1_; -#line 44 "/home/jens/Source/shotwell/plugins/shotwell-transitions/ChessEffect.vala" -	_tmp3_ = _tmp2_.height; +	_tmp2_ = _tmp1_.height;  #line 44 "/home/jens/Source/shotwell/plugins/shotwell-transitions/ChessEffect.vala" -	self->priv->square_count_y = (gdouble) ((_tmp3_ / CHESS_EFFECT_SQUARE_SIZE) + 2); -#line 45 "/home/jens/Source/shotwell/plugins/shotwell-transitions/ChessEffect.vala" -	_tmp4_ = visuals; +	self->priv->square_count_y = (gdouble) ((_tmp2_ / CHESS_EFFECT_SQUARE_SIZE) + 2);  #line 45 "/home/jens/Source/shotwell/plugins/shotwell-transitions/ChessEffect.vala" -	spit_transitions_visuals_get_to_pos (_tmp4_, &_tmp5_); +	spit_transitions_visuals_get_to_pos (visuals, &_tmp3_);  #line 45 "/home/jens/Source/shotwell/plugins/shotwell-transitions/ChessEffect.vala" -	_tmp6_ = _tmp5_; +	_tmp4_ = _tmp3_;  #line 45 "/home/jens/Source/shotwell/plugins/shotwell-transitions/ChessEffect.vala" -	_tmp7_ = _tmp6_.width; +	_tmp5_ = _tmp4_.width;  #line 45 "/home/jens/Source/shotwell/plugins/shotwell-transitions/ChessEffect.vala" -	self->priv->square_count_x = (gdouble) ((_tmp7_ / CHESS_EFFECT_SQUARE_SIZE) + 2); -#line 301 "ChessEffect.c" +	self->priv->square_count_x = (gdouble) ((_tmp5_ / CHESS_EFFECT_SQUARE_SIZE) + 2); +#line 343 "ChessEffect.c"  } -static gboolean chess_effect_real_needs_clear_background (SpitTransitionsEffect* base) { +static gboolean +chess_effect_real_needs_clear_background (SpitTransitionsEffect* base) +{  	ChessEffect * self;  	gboolean result = FALSE;  #line 48 "/home/jens/Source/shotwell/plugins/shotwell-transitions/ChessEffect.vala" @@ -310,24 +354,27 @@ static gboolean chess_effect_real_needs_clear_background (SpitTransitionsEffect*  	result = TRUE;  #line 49 "/home/jens/Source/shotwell/plugins/shotwell-transitions/ChessEffect.vala"  	return result; -#line 314 "ChessEffect.c" +#line 358 "ChessEffect.c"  } -static void chess_effect_real_paint (SpitTransitionsEffect* base, SpitTransitionsVisuals* visuals, SpitTransitionsMotion* motion, cairo_t* ctx, gint width, gint height, gint frame_number) { +static void +chess_effect_real_paint (SpitTransitionsEffect* base, +                         SpitTransitionsVisuals* visuals, +                         SpitTransitionsMotion* motion, +                         cairo_t* ctx, +                         gint width, +                         gint height, +                         gint frame_number) +{  	ChessEffect * self;  	gdouble alpha = 0.0; -	SpitTransitionsMotion* _tmp0_; -	gint _tmp1_; -	gdouble _tmp2_;  	gdouble size = 0.0; -	gdouble _tmp3_; -	SpitTransitionsVisuals* _tmp4_; -	GdkPixbuf* _tmp5_; -	GdkPixbuf* _tmp6_; -	SpitTransitionsVisuals* _tmp21_; -	GdkPixbuf* _tmp22_; -	GdkPixbuf* _tmp23_; +	gdouble _tmp0_; +	GdkPixbuf* _tmp1_; +	GdkPixbuf* _tmp2_; +	GdkPixbuf* _tmp12_; +	GdkPixbuf* _tmp13_;  #line 52 "/home/jens/Source/shotwell/plugins/shotwell-transitions/ChessEffect.vala"  	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_CHESS_EFFECT, ChessEffect);  #line 52 "/home/jens/Source/shotwell/plugins/shotwell-transitions/ChessEffect.vala" @@ -337,329 +384,266 @@ static void chess_effect_real_paint (SpitTransitionsEffect* base, SpitTransition  #line 52 "/home/jens/Source/shotwell/plugins/shotwell-transitions/ChessEffect.vala"  	g_return_if_fail (ctx != NULL);  #line 54 "/home/jens/Source/shotwell/plugins/shotwell-transitions/ChessEffect.vala" -	_tmp0_ = motion; -#line 54 "/home/jens/Source/shotwell/plugins/shotwell-transitions/ChessEffect.vala" -	_tmp1_ = frame_number; -#line 54 "/home/jens/Source/shotwell/plugins/shotwell-transitions/ChessEffect.vala" -	_tmp2_ = spit_transitions_motion_get_alpha (_tmp0_, _tmp1_); -#line 54 "/home/jens/Source/shotwell/plugins/shotwell-transitions/ChessEffect.vala" -	alpha = _tmp2_; +	alpha = spit_transitions_motion_get_alpha (motion, frame_number);  #line 55 "/home/jens/Source/shotwell/plugins/shotwell-transitions/ChessEffect.vala" -	_tmp3_ = alpha; +	_tmp0_ = alpha;  #line 55 "/home/jens/Source/shotwell/plugins/shotwell-transitions/ChessEffect.vala" -	size = (2 * _tmp3_) * CHESS_EFFECT_SQUARE_SIZE; +	size = (2 * _tmp0_) * CHESS_EFFECT_SQUARE_SIZE;  #line 56 "/home/jens/Source/shotwell/plugins/shotwell-transitions/ChessEffect.vala" -	_tmp4_ = visuals; +	_tmp1_ = spit_transitions_visuals_get_from_pixbuf (visuals);  #line 56 "/home/jens/Source/shotwell/plugins/shotwell-transitions/ChessEffect.vala" -	_tmp5_ = spit_transitions_visuals_get_from_pixbuf (_tmp4_); -#line 56 "/home/jens/Source/shotwell/plugins/shotwell-transitions/ChessEffect.vala" -	_tmp6_ = _tmp5_; +	_tmp2_ = _tmp1_;  #line 56 "/home/jens/Source/shotwell/plugins/shotwell-transitions/ChessEffect.vala" -	if (_tmp6_ != NULL) { -#line 360 "ChessEffect.c" -		cairo_t* _tmp7_; -		SpitTransitionsVisuals* _tmp8_; -		GdkPixbuf* _tmp9_; -		GdkPixbuf* _tmp10_; -		SpitTransitionsVisuals* _tmp11_; -		GdkRectangle _tmp12_ = {0}; -		GdkRectangle _tmp13_; -		gint _tmp14_; -		SpitTransitionsVisuals* _tmp15_; -		GdkRectangle _tmp16_ = {0}; -		GdkRectangle _tmp17_; -		gint _tmp18_; -		cairo_t* _tmp19_; -		gdouble _tmp20_; -#line 57 "/home/jens/Source/shotwell/plugins/shotwell-transitions/ChessEffect.vala" -		_tmp7_ = ctx; -#line 57 "/home/jens/Source/shotwell/plugins/shotwell-transitions/ChessEffect.vala" -		_tmp8_ = visuals; -#line 57 "/home/jens/Source/shotwell/plugins/shotwell-transitions/ChessEffect.vala" -		_tmp9_ = spit_transitions_visuals_get_from_pixbuf (_tmp8_); -#line 57 "/home/jens/Source/shotwell/plugins/shotwell-transitions/ChessEffect.vala" -		_tmp10_ = _tmp9_; +	if (_tmp2_ != NULL) { +#line 399 "ChessEffect.c" +		GdkPixbuf* _tmp3_; +		GdkPixbuf* _tmp4_; +		GdkRectangle _tmp5_ = {0}; +		GdkRectangle _tmp6_; +		gint _tmp7_; +		GdkRectangle _tmp8_ = {0}; +		GdkRectangle _tmp9_; +		gint _tmp10_; +		gdouble _tmp11_;  #line 57 "/home/jens/Source/shotwell/plugins/shotwell-transitions/ChessEffect.vala" -		_tmp11_ = visuals; +		_tmp3_ = spit_transitions_visuals_get_from_pixbuf (visuals);  #line 57 "/home/jens/Source/shotwell/plugins/shotwell-transitions/ChessEffect.vala" -		spit_transitions_visuals_get_from_pos (_tmp11_, &_tmp12_); +		_tmp4_ = _tmp3_;  #line 57 "/home/jens/Source/shotwell/plugins/shotwell-transitions/ChessEffect.vala" -		_tmp13_ = _tmp12_; +		spit_transitions_visuals_get_from_pos (visuals, &_tmp5_);  #line 57 "/home/jens/Source/shotwell/plugins/shotwell-transitions/ChessEffect.vala" -		_tmp14_ = _tmp13_.x; +		_tmp6_ = _tmp5_;  #line 57 "/home/jens/Source/shotwell/plugins/shotwell-transitions/ChessEffect.vala" -		_tmp15_ = visuals; +		_tmp7_ = _tmp6_.x;  #line 57 "/home/jens/Source/shotwell/plugins/shotwell-transitions/ChessEffect.vala" -		spit_transitions_visuals_get_from_pos (_tmp15_, &_tmp16_); +		spit_transitions_visuals_get_from_pos (visuals, &_tmp8_);  #line 57 "/home/jens/Source/shotwell/plugins/shotwell-transitions/ChessEffect.vala" -		_tmp17_ = _tmp16_; +		_tmp9_ = _tmp8_;  #line 57 "/home/jens/Source/shotwell/plugins/shotwell-transitions/ChessEffect.vala" -		_tmp18_ = _tmp17_.y; +		_tmp10_ = _tmp9_.y;  #line 57 "/home/jens/Source/shotwell/plugins/shotwell-transitions/ChessEffect.vala" -		gdk_cairo_set_source_pixbuf (_tmp7_, _tmp10_, (gdouble) _tmp14_, (gdouble) _tmp18_); -#line 59 "/home/jens/Source/shotwell/plugins/shotwell-transitions/ChessEffect.vala" -		_tmp19_ = ctx; +		gdk_cairo_set_source_pixbuf (ctx, _tmp4_, (gdouble) _tmp7_, (gdouble) _tmp10_);  #line 59 "/home/jens/Source/shotwell/plugins/shotwell-transitions/ChessEffect.vala" -		_tmp20_ = alpha; +		_tmp11_ = alpha;  #line 59 "/home/jens/Source/shotwell/plugins/shotwell-transitions/ChessEffect.vala" -		cairo_paint_with_alpha (_tmp19_, 1 - _tmp20_); -#line 407 "ChessEffect.c" +		cairo_paint_with_alpha (ctx, 1 - _tmp11_); +#line 431 "ChessEffect.c"  	}  #line 62 "/home/jens/Source/shotwell/plugins/shotwell-transitions/ChessEffect.vala" -	_tmp21_ = visuals; +	_tmp12_ = spit_transitions_visuals_get_to_pixbuf (visuals);  #line 62 "/home/jens/Source/shotwell/plugins/shotwell-transitions/ChessEffect.vala" -	_tmp22_ = spit_transitions_visuals_get_to_pixbuf (_tmp21_); +	_tmp13_ = _tmp12_;  #line 62 "/home/jens/Source/shotwell/plugins/shotwell-transitions/ChessEffect.vala" -	_tmp23_ = _tmp22_; -#line 62 "/home/jens/Source/shotwell/plugins/shotwell-transitions/ChessEffect.vala" -	if (_tmp23_ != NULL) { -#line 417 "ChessEffect.c" -		cairo_t* _tmp24_; -		SpitTransitionsVisuals* _tmp25_; -		GdkPixbuf* _tmp26_; -		GdkPixbuf* _tmp27_; -		SpitTransitionsVisuals* _tmp28_; -		GdkRectangle _tmp29_ = {0}; -		GdkRectangle _tmp30_; -		gint _tmp31_; -		SpitTransitionsVisuals* _tmp32_; -		GdkRectangle _tmp33_ = {0}; -		GdkRectangle _tmp34_; -		gint _tmp35_; -		cairo_t* _tmp81_; -		cairo_t* _tmp82_; -		gdouble _tmp83_; -#line 63 "/home/jens/Source/shotwell/plugins/shotwell-transitions/ChessEffect.vala" -		_tmp24_ = ctx; -#line 63 "/home/jens/Source/shotwell/plugins/shotwell-transitions/ChessEffect.vala" -		_tmp25_ = visuals; -#line 63 "/home/jens/Source/shotwell/plugins/shotwell-transitions/ChessEffect.vala" -		_tmp26_ = spit_transitions_visuals_get_to_pixbuf (_tmp25_); -#line 63 "/home/jens/Source/shotwell/plugins/shotwell-transitions/ChessEffect.vala" -		_tmp27_ = _tmp26_; +	if (_tmp13_ != NULL) { +#line 439 "ChessEffect.c" +		GdkPixbuf* _tmp14_; +		GdkPixbuf* _tmp15_; +		GdkRectangle _tmp16_ = {0}; +		GdkRectangle _tmp17_; +		gint _tmp18_; +		GdkRectangle _tmp19_ = {0}; +		GdkRectangle _tmp20_; +		gint _tmp21_; +		gdouble _tmp59_;  #line 63 "/home/jens/Source/shotwell/plugins/shotwell-transitions/ChessEffect.vala" -		_tmp28_ = visuals; +		_tmp14_ = spit_transitions_visuals_get_to_pixbuf (visuals);  #line 63 "/home/jens/Source/shotwell/plugins/shotwell-transitions/ChessEffect.vala" -		spit_transitions_visuals_get_to_pos (_tmp28_, &_tmp29_); +		_tmp15_ = _tmp14_;  #line 63 "/home/jens/Source/shotwell/plugins/shotwell-transitions/ChessEffect.vala" -		_tmp30_ = _tmp29_; +		spit_transitions_visuals_get_to_pos (visuals, &_tmp16_);  #line 63 "/home/jens/Source/shotwell/plugins/shotwell-transitions/ChessEffect.vala" -		_tmp31_ = _tmp30_.x; +		_tmp17_ = _tmp16_;  #line 63 "/home/jens/Source/shotwell/plugins/shotwell-transitions/ChessEffect.vala" -		_tmp32_ = visuals; +		_tmp18_ = _tmp17_.x;  #line 63 "/home/jens/Source/shotwell/plugins/shotwell-transitions/ChessEffect.vala" -		spit_transitions_visuals_get_to_pos (_tmp32_, &_tmp33_); +		spit_transitions_visuals_get_to_pos (visuals, &_tmp19_);  #line 63 "/home/jens/Source/shotwell/plugins/shotwell-transitions/ChessEffect.vala" -		_tmp34_ = _tmp33_; +		_tmp20_ = _tmp19_;  #line 63 "/home/jens/Source/shotwell/plugins/shotwell-transitions/ChessEffect.vala" -		_tmp35_ = _tmp34_.y; +		_tmp21_ = _tmp20_.y;  #line 63 "/home/jens/Source/shotwell/plugins/shotwell-transitions/ChessEffect.vala" -		gdk_cairo_set_source_pixbuf (_tmp24_, _tmp27_, (gdouble) _tmp31_, (gdouble) _tmp35_); -#line 459 "ChessEffect.c" +		gdk_cairo_set_source_pixbuf (ctx, _tmp15_, (gdouble) _tmp18_, (gdouble) _tmp21_); +#line 467 "ChessEffect.c"  		{  			gdouble y = 0.0;  #line 64 "/home/jens/Source/shotwell/plugins/shotwell-transitions/ChessEffect.vala"  			y = (gdouble) 0; -#line 464 "ChessEffect.c" +#line 472 "ChessEffect.c"  			{ -				gboolean _tmp36_ = FALSE; +				gboolean _tmp22_ = FALSE;  #line 64 "/home/jens/Source/shotwell/plugins/shotwell-transitions/ChessEffect.vala" -				_tmp36_ = TRUE; +				_tmp22_ = TRUE;  #line 64 "/home/jens/Source/shotwell/plugins/shotwell-transitions/ChessEffect.vala"  				while (TRUE) { -#line 471 "ChessEffect.c" -					gdouble _tmp38_; -					gdouble _tmp39_; +#line 479 "ChessEffect.c" +					gdouble _tmp24_; +					gdouble _tmp25_;  #line 64 "/home/jens/Source/shotwell/plugins/shotwell-transitions/ChessEffect.vala" -					if (!_tmp36_) { -#line 476 "ChessEffect.c" -						gdouble _tmp37_; +					if (!_tmp22_) { +#line 484 "ChessEffect.c" +						gdouble _tmp23_;  #line 64 "/home/jens/Source/shotwell/plugins/shotwell-transitions/ChessEffect.vala" -						_tmp37_ = y; +						_tmp23_ = y;  #line 64 "/home/jens/Source/shotwell/plugins/shotwell-transitions/ChessEffect.vala" -						y = _tmp37_ + 1; -#line 482 "ChessEffect.c" +						y = _tmp23_ + 1; +#line 490 "ChessEffect.c"  					}  #line 64 "/home/jens/Source/shotwell/plugins/shotwell-transitions/ChessEffect.vala" -					_tmp36_ = FALSE; +					_tmp22_ = FALSE;  #line 64 "/home/jens/Source/shotwell/plugins/shotwell-transitions/ChessEffect.vala" -					_tmp38_ = y; +					_tmp24_ = y;  #line 64 "/home/jens/Source/shotwell/plugins/shotwell-transitions/ChessEffect.vala" -					_tmp39_ = self->priv->square_count_y; +					_tmp25_ = self->priv->square_count_y;  #line 64 "/home/jens/Source/shotwell/plugins/shotwell-transitions/ChessEffect.vala" -					if (!(_tmp38_ <= _tmp39_)) { +					if (!(_tmp24_ <= _tmp25_)) {  #line 64 "/home/jens/Source/shotwell/plugins/shotwell-transitions/ChessEffect.vala"  						break; -#line 494 "ChessEffect.c" +#line 502 "ChessEffect.c"  					}  					{  						gdouble x = 0.0;  #line 65 "/home/jens/Source/shotwell/plugins/shotwell-transitions/ChessEffect.vala"  						x = (gdouble) 0; -#line 500 "ChessEffect.c" +#line 508 "ChessEffect.c"  						{ -							gboolean _tmp40_ = FALSE; +							gboolean _tmp26_ = FALSE;  #line 65 "/home/jens/Source/shotwell/plugins/shotwell-transitions/ChessEffect.vala" -							_tmp40_ = TRUE; +							_tmp26_ = TRUE;  #line 65 "/home/jens/Source/shotwell/plugins/shotwell-transitions/ChessEffect.vala"  							while (TRUE) { -#line 507 "ChessEffect.c" -								gdouble _tmp42_; -								gdouble _tmp43_; -								gdouble _tmp44_ = 0.0; -								gdouble _tmp45_; -								gdouble _tmp46_; +#line 515 "ChessEffect.c" +								gdouble _tmp28_; +								gdouble _tmp29_; +								gdouble _tmp30_ = 0.0; +								gdouble _tmp31_; +								gdouble _tmp32_;  								gdouble translation = 0.0; -								SpitTransitionsMotion* _tmp47_; -								SpitTransitionsDirection _tmp48_; -								SpitTransitionsDirection _tmp49_; +								SpitTransitionsDirection _tmp33_; +								SpitTransitionsDirection _tmp34_;  #line 65 "/home/jens/Source/shotwell/plugins/shotwell-transitions/ChessEffect.vala" -								if (!_tmp40_) { -#line 519 "ChessEffect.c" -									gdouble _tmp41_; +								if (!_tmp26_) { +#line 526 "ChessEffect.c" +									gdouble _tmp27_;  #line 65 "/home/jens/Source/shotwell/plugins/shotwell-transitions/ChessEffect.vala" -									_tmp41_ = x; +									_tmp27_ = x;  #line 65 "/home/jens/Source/shotwell/plugins/shotwell-transitions/ChessEffect.vala" -									x = _tmp41_ + 1; -#line 525 "ChessEffect.c" +									x = _tmp27_ + 1; +#line 532 "ChessEffect.c"  								}  #line 65 "/home/jens/Source/shotwell/plugins/shotwell-transitions/ChessEffect.vala" -								_tmp40_ = FALSE; +								_tmp26_ = FALSE;  #line 65 "/home/jens/Source/shotwell/plugins/shotwell-transitions/ChessEffect.vala" -								_tmp42_ = x; +								_tmp28_ = x;  #line 65 "/home/jens/Source/shotwell/plugins/shotwell-transitions/ChessEffect.vala" -								_tmp43_ = self->priv->square_count_x; +								_tmp29_ = self->priv->square_count_x;  #line 65 "/home/jens/Source/shotwell/plugins/shotwell-transitions/ChessEffect.vala" -								if (!(_tmp42_ <= _tmp43_)) { +								if (!(_tmp28_ <= _tmp29_)) {  #line 65 "/home/jens/Source/shotwell/plugins/shotwell-transitions/ChessEffect.vala"  									break; -#line 537 "ChessEffect.c" +#line 544 "ChessEffect.c"  								}  #line 66 "/home/jens/Source/shotwell/plugins/shotwell-transitions/ChessEffect.vala" -								_tmp45_ = x; +								_tmp31_ = x;  #line 66 "/home/jens/Source/shotwell/plugins/shotwell-transitions/ChessEffect.vala" -								_tmp46_ = y; +								_tmp32_ = y;  #line 66 "/home/jens/Source/shotwell/plugins/shotwell-transitions/ChessEffect.vala" -								if (fmod (_tmp45_ + _tmp46_, 2) == ((gdouble) 0)) { +								if (fmod (_tmp31_ + _tmp32_, 2) == ((gdouble) 0)) {  #line 66 "/home/jens/Source/shotwell/plugins/shotwell-transitions/ChessEffect.vala" -									_tmp44_ = (-1.5) * CHESS_EFFECT_SQUARE_SIZE; -#line 547 "ChessEffect.c" +									_tmp30_ = (-1.5) * CHESS_EFFECT_SQUARE_SIZE; +#line 554 "ChessEffect.c"  								} else {  #line 66 "/home/jens/Source/shotwell/plugins/shotwell-transitions/ChessEffect.vala" -									_tmp44_ = 1.5 * CHESS_EFFECT_SQUARE_SIZE; -#line 551 "ChessEffect.c" +									_tmp30_ = 1.5 * CHESS_EFFECT_SQUARE_SIZE; +#line 558 "ChessEffect.c"  								}  #line 66 "/home/jens/Source/shotwell/plugins/shotwell-transitions/ChessEffect.vala" -								translation = _tmp44_; -#line 67 "/home/jens/Source/shotwell/plugins/shotwell-transitions/ChessEffect.vala" -								_tmp47_ = motion; +								translation = _tmp30_;  #line 67 "/home/jens/Source/shotwell/plugins/shotwell-transitions/ChessEffect.vala" -								_tmp48_ = spit_transitions_motion_get_direction (_tmp47_); +								_tmp33_ = spit_transitions_motion_get_direction (motion);  #line 67 "/home/jens/Source/shotwell/plugins/shotwell-transitions/ChessEffect.vala" -								_tmp49_ = _tmp48_; +								_tmp34_ = _tmp33_;  #line 67 "/home/jens/Source/shotwell/plugins/shotwell-transitions/ChessEffect.vala" -								if (_tmp49_ == SPIT_TRANSITIONS_DIRECTION_FORWARD) { -#line 563 "ChessEffect.c" -									cairo_t* _tmp50_; -									SpitTransitionsVisuals* _tmp51_; -									GdkRectangle _tmp52_ = {0}; -									GdkRectangle _tmp53_; -									gint _tmp54_; -									gdouble _tmp55_; -									gdouble _tmp56_; -									SpitTransitionsVisuals* _tmp57_; -									GdkRectangle _tmp58_ = {0}; -									GdkRectangle _tmp59_; -									gint _tmp60_; -									gdouble _tmp61_; -									gdouble _tmp62_; -#line 68 "/home/jens/Source/shotwell/plugins/shotwell-transitions/ChessEffect.vala" -									_tmp50_ = ctx; +								if (_tmp34_ == SPIT_TRANSITIONS_DIRECTION_FORWARD) { +#line 568 "ChessEffect.c" +									GdkRectangle _tmp35_ = {0}; +									GdkRectangle _tmp36_; +									gint _tmp37_; +									gdouble _tmp38_; +									gdouble _tmp39_; +									GdkRectangle _tmp40_ = {0}; +									GdkRectangle _tmp41_; +									gint _tmp42_; +									gdouble _tmp43_; +									gdouble _tmp44_;  #line 68 "/home/jens/Source/shotwell/plugins/shotwell-transitions/ChessEffect.vala" -									_tmp51_ = visuals; +									spit_transitions_visuals_get_to_pos (visuals, &_tmp35_);  #line 68 "/home/jens/Source/shotwell/plugins/shotwell-transitions/ChessEffect.vala" -									spit_transitions_visuals_get_to_pos (_tmp51_, &_tmp52_); +									_tmp36_ = _tmp35_;  #line 68 "/home/jens/Source/shotwell/plugins/shotwell-transitions/ChessEffect.vala" -									_tmp53_ = _tmp52_; +									_tmp37_ = _tmp36_.x;  #line 68 "/home/jens/Source/shotwell/plugins/shotwell-transitions/ChessEffect.vala" -									_tmp54_ = _tmp53_.x; +									_tmp38_ = translation;  #line 68 "/home/jens/Source/shotwell/plugins/shotwell-transitions/ChessEffect.vala" -									_tmp55_ = translation; +									_tmp39_ = x;  #line 68 "/home/jens/Source/shotwell/plugins/shotwell-transitions/ChessEffect.vala" -									_tmp56_ = x; +									spit_transitions_visuals_get_to_pos (visuals, &_tmp40_);  #line 68 "/home/jens/Source/shotwell/plugins/shotwell-transitions/ChessEffect.vala" -									_tmp57_ = visuals; +									_tmp41_ = _tmp40_;  #line 68 "/home/jens/Source/shotwell/plugins/shotwell-transitions/ChessEffect.vala" -									spit_transitions_visuals_get_to_pos (_tmp57_, &_tmp58_); +									_tmp42_ = _tmp41_.y;  #line 68 "/home/jens/Source/shotwell/plugins/shotwell-transitions/ChessEffect.vala" -									_tmp59_ = _tmp58_; +									_tmp43_ = y;  #line 68 "/home/jens/Source/shotwell/plugins/shotwell-transitions/ChessEffect.vala" -									_tmp60_ = _tmp59_.y; +									_tmp44_ = size;  #line 68 "/home/jens/Source/shotwell/plugins/shotwell-transitions/ChessEffect.vala" -									_tmp61_ = y; -#line 68 "/home/jens/Source/shotwell/plugins/shotwell-transitions/ChessEffect.vala" -									_tmp62_ = size; -#line 68 "/home/jens/Source/shotwell/plugins/shotwell-transitions/ChessEffect.vala" -									cairo_rectangle (_tmp50_, (_tmp54_ + _tmp55_) + (_tmp56_ * CHESS_EFFECT_SQUARE_SIZE), _tmp60_ + (_tmp61_ * CHESS_EFFECT_SQUARE_SIZE), _tmp62_, (gdouble) CHESS_EFFECT_SQUARE_SIZE); -#line 605 "ChessEffect.c" +									cairo_rectangle (ctx, (_tmp37_ + _tmp38_) + (_tmp39_ * CHESS_EFFECT_SQUARE_SIZE), _tmp42_ + (_tmp43_ * CHESS_EFFECT_SQUARE_SIZE), _tmp44_, (gdouble) CHESS_EFFECT_SQUARE_SIZE); +#line 601 "ChessEffect.c"  								} else { -									cairo_t* _tmp63_; -									SpitTransitionsVisuals* _tmp64_; -									GdkRectangle _tmp65_ = {0}; -									GdkRectangle _tmp66_; -									gint _tmp67_; -									SpitTransitionsVisuals* _tmp68_; -									GdkRectangle _tmp69_ = {0}; -									GdkRectangle _tmp70_; -									gint _tmp71_; -									gdouble _tmp72_; -									gdouble _tmp73_; -									gdouble _tmp74_; -									SpitTransitionsVisuals* _tmp75_; -									GdkRectangle _tmp76_ = {0}; -									GdkRectangle _tmp77_; -									gint _tmp78_; -									gdouble _tmp79_; -									gdouble _tmp80_; -#line 71 "/home/jens/Source/shotwell/plugins/shotwell-transitions/ChessEffect.vala" -									_tmp63_ = ctx; -#line 71 "/home/jens/Source/shotwell/plugins/shotwell-transitions/ChessEffect.vala" -									_tmp64_ = visuals; -#line 71 "/home/jens/Source/shotwell/plugins/shotwell-transitions/ChessEffect.vala" -									spit_transitions_visuals_get_to_pos (_tmp64_, &_tmp65_); -#line 71 "/home/jens/Source/shotwell/plugins/shotwell-transitions/ChessEffect.vala" -									_tmp66_ = _tmp65_; +									GdkRectangle _tmp45_ = {0}; +									GdkRectangle _tmp46_; +									gint _tmp47_; +									GdkRectangle _tmp48_ = {0}; +									GdkRectangle _tmp49_; +									gint _tmp50_; +									gdouble _tmp51_; +									gdouble _tmp52_; +									gdouble _tmp53_; +									GdkRectangle _tmp54_ = {0}; +									GdkRectangle _tmp55_; +									gint _tmp56_; +									gdouble _tmp57_; +									gdouble _tmp58_;  #line 71 "/home/jens/Source/shotwell/plugins/shotwell-transitions/ChessEffect.vala" -									_tmp67_ = _tmp66_.x; +									spit_transitions_visuals_get_to_pos (visuals, &_tmp45_);  #line 71 "/home/jens/Source/shotwell/plugins/shotwell-transitions/ChessEffect.vala" -									_tmp68_ = visuals; +									_tmp46_ = _tmp45_;  #line 71 "/home/jens/Source/shotwell/plugins/shotwell-transitions/ChessEffect.vala" -									spit_transitions_visuals_get_to_pos (_tmp68_, &_tmp69_); +									_tmp47_ = _tmp46_.x;  #line 71 "/home/jens/Source/shotwell/plugins/shotwell-transitions/ChessEffect.vala" -									_tmp70_ = _tmp69_; +									spit_transitions_visuals_get_to_pos (visuals, &_tmp48_);  #line 71 "/home/jens/Source/shotwell/plugins/shotwell-transitions/ChessEffect.vala" -									_tmp71_ = _tmp70_.width; +									_tmp49_ = _tmp48_;  #line 71 "/home/jens/Source/shotwell/plugins/shotwell-transitions/ChessEffect.vala" -									_tmp72_ = translation; +									_tmp50_ = _tmp49_.width;  #line 71 "/home/jens/Source/shotwell/plugins/shotwell-transitions/ChessEffect.vala" -									_tmp73_ = x; +									_tmp51_ = translation;  #line 71 "/home/jens/Source/shotwell/plugins/shotwell-transitions/ChessEffect.vala" -									_tmp74_ = size; +									_tmp52_ = x;  #line 71 "/home/jens/Source/shotwell/plugins/shotwell-transitions/ChessEffect.vala" -									_tmp75_ = visuals; +									_tmp53_ = size;  #line 71 "/home/jens/Source/shotwell/plugins/shotwell-transitions/ChessEffect.vala" -									spit_transitions_visuals_get_to_pos (_tmp75_, &_tmp76_); +									spit_transitions_visuals_get_to_pos (visuals, &_tmp54_);  #line 71 "/home/jens/Source/shotwell/plugins/shotwell-transitions/ChessEffect.vala" -									_tmp77_ = _tmp76_; +									_tmp55_ = _tmp54_;  #line 71 "/home/jens/Source/shotwell/plugins/shotwell-transitions/ChessEffect.vala" -									_tmp78_ = _tmp77_.y; +									_tmp56_ = _tmp55_.y;  #line 71 "/home/jens/Source/shotwell/plugins/shotwell-transitions/ChessEffect.vala" -									_tmp79_ = y; +									_tmp57_ = y;  #line 71 "/home/jens/Source/shotwell/plugins/shotwell-transitions/ChessEffect.vala" -									_tmp80_ = size; +									_tmp58_ = size;  #line 71 "/home/jens/Source/shotwell/plugins/shotwell-transitions/ChessEffect.vala" -									cairo_rectangle (_tmp63_, (((_tmp67_ + _tmp71_) + _tmp72_) - (_tmp73_ * CHESS_EFFECT_SQUARE_SIZE)) - _tmp74_, _tmp78_ + (_tmp79_ * CHESS_EFFECT_SQUARE_SIZE), _tmp80_, (gdouble) CHESS_EFFECT_SQUARE_SIZE); -#line 663 "ChessEffect.c" +									cairo_rectangle (ctx, (((_tmp47_ + _tmp50_) + _tmp51_) - (_tmp52_ * CHESS_EFFECT_SQUARE_SIZE)) - _tmp53_, _tmp56_ + (_tmp57_ * CHESS_EFFECT_SQUARE_SIZE), _tmp58_, (gdouble) CHESS_EFFECT_SQUARE_SIZE); +#line 647 "ChessEffect.c"  								}  							}  						} @@ -668,21 +652,22 @@ static void chess_effect_real_paint (SpitTransitionsEffect* base, SpitTransition  			}  		}  #line 78 "/home/jens/Source/shotwell/plugins/shotwell-transitions/ChessEffect.vala" -		_tmp81_ = ctx; -#line 78 "/home/jens/Source/shotwell/plugins/shotwell-transitions/ChessEffect.vala" -		cairo_clip (_tmp81_); -#line 79 "/home/jens/Source/shotwell/plugins/shotwell-transitions/ChessEffect.vala" -		_tmp82_ = ctx; +		cairo_clip (ctx);  #line 79 "/home/jens/Source/shotwell/plugins/shotwell-transitions/ChessEffect.vala" -		_tmp83_ = alpha; +		_tmp59_ = alpha;  #line 79 "/home/jens/Source/shotwell/plugins/shotwell-transitions/ChessEffect.vala" -		cairo_paint_with_alpha (_tmp82_, _tmp83_); -#line 681 "ChessEffect.c" +		cairo_paint_with_alpha (ctx, _tmp59_); +#line 661 "ChessEffect.c"  	}  } -static void chess_effect_real_advance (SpitTransitionsEffect* base, SpitTransitionsVisuals* visuals, SpitTransitionsMotion* motion, gint frame_number) { +static void +chess_effect_real_advance (SpitTransitionsEffect* base, +                           SpitTransitionsVisuals* visuals, +                           SpitTransitionsMotion* motion, +                           gint frame_number) +{  	ChessEffect * self;  #line 83 "/home/jens/Source/shotwell/plugins/shotwell-transitions/ChessEffect.vala"  	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_CHESS_EFFECT, ChessEffect); @@ -690,30 +675,36 @@ static void chess_effect_real_advance (SpitTransitionsEffect* base, SpitTransiti  	g_return_if_fail (SPIT_TRANSITIONS_IS_VISUALS (visuals));  #line 83 "/home/jens/Source/shotwell/plugins/shotwell-transitions/ChessEffect.vala"  	g_return_if_fail (SPIT_TRANSITIONS_IS_MOTION (motion)); -#line 694 "ChessEffect.c" +#line 679 "ChessEffect.c"  } -static void chess_effect_real_cancel (SpitTransitionsEffect* base) { +static void +chess_effect_real_cancel (SpitTransitionsEffect* base) +{  	ChessEffect * self;  #line 86 "/home/jens/Source/shotwell/plugins/shotwell-transitions/ChessEffect.vala"  	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_CHESS_EFFECT, ChessEffect); -#line 702 "ChessEffect.c" +#line 689 "ChessEffect.c"  } -static void chess_effect_class_init (ChessEffectClass * klass) { +static void +chess_effect_class_init (ChessEffectClass * klass) +{  #line 28 "/home/jens/Source/shotwell/plugins/shotwell-transitions/ChessEffect.vala"  	chess_effect_parent_class = g_type_class_peek_parent (klass);  #line 28 "/home/jens/Source/shotwell/plugins/shotwell-transitions/ChessEffect.vala"  	g_type_class_add_private (klass, sizeof (ChessEffectPrivate));  #line 28 "/home/jens/Source/shotwell/plugins/shotwell-transitions/ChessEffect.vala"  	G_OBJECT_CLASS (klass)->finalize = chess_effect_finalize; -#line 713 "ChessEffect.c" +#line 702 "ChessEffect.c"  } -static void chess_effect_spit_transitions_effect_interface_init (SpitTransitionsEffectIface * iface) { +static void +chess_effect_spit_transitions_effect_interface_init (SpitTransitionsEffectIface * iface) +{  #line 28 "/home/jens/Source/shotwell/plugins/shotwell-transitions/ChessEffect.vala"  	chess_effect_spit_transitions_effect_parent_iface = g_type_interface_peek_parent (iface);  #line 28 "/home/jens/Source/shotwell/plugins/shotwell-transitions/ChessEffect.vala" @@ -728,28 +719,34 @@ static void chess_effect_spit_transitions_effect_interface_init (SpitTransitions  	iface->advance = (void (*) (SpitTransitionsEffect *, SpitTransitionsVisuals*, SpitTransitionsMotion*, gint)) chess_effect_real_advance;  #line 28 "/home/jens/Source/shotwell/plugins/shotwell-transitions/ChessEffect.vala"  	iface->cancel = (void (*) (SpitTransitionsEffect *)) chess_effect_real_cancel; -#line 732 "ChessEffect.c" +#line 723 "ChessEffect.c"  } -static void chess_effect_instance_init (ChessEffect * self) { +static void +chess_effect_instance_init (ChessEffect * self) +{  #line 28 "/home/jens/Source/shotwell/plugins/shotwell-transitions/ChessEffect.vala"  	self->priv = CHESS_EFFECT_GET_PRIVATE (self); -#line 739 "ChessEffect.c" +#line 732 "ChessEffect.c"  } -static void chess_effect_finalize (GObject * obj) { +static void +chess_effect_finalize (GObject * obj) +{  	ChessEffect * self;  #line 28 "/home/jens/Source/shotwell/plugins/shotwell-transitions/ChessEffect.vala"  	self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_CHESS_EFFECT, ChessEffect);  #line 28 "/home/jens/Source/shotwell/plugins/shotwell-transitions/ChessEffect.vala"  	G_OBJECT_CLASS (chess_effect_parent_class)->finalize (obj); -#line 749 "ChessEffect.c" +#line 744 "ChessEffect.c"  } -GType chess_effect_get_type (void) { +GType +chess_effect_get_type (void) +{  	static volatile gsize chess_effect_type_id__volatile = 0;  	if (g_once_init_enter (&chess_effect_type_id__volatile)) {  		static const GTypeInfo g_define_type_info = { sizeof (ChessEffectClass), (GBaseInitFunc) NULL, (GBaseFinalizeFunc) NULL, (GClassInitFunc) chess_effect_class_init, (GClassFinalizeFunc) NULL, NULL, sizeof (ChessEffect), 0, (GInstanceInitFunc) chess_effect_instance_init, NULL }; diff --git a/plugins/shotwell-transitions/CircleEffect.c b/plugins/shotwell-transitions/CircleEffect.c index 97680cb..cb2b660 100644 --- a/plugins/shotwell-transitions/CircleEffect.c +++ b/plugins/shotwell-transitions/CircleEffect.c @@ -1,4 +1,4 @@ -/* CircleEffect.c generated by valac 0.36.6, the Vala compiler +/* CircleEffect.c generated by valac 0.40.4, the Vala compiler   * generated from CircleEffect.vala, do not modify */  /* Copyright 2013 Jens Bav @@ -8,6 +8,7 @@   * (version 2.1 or later).  See the COPYING file in this distribution.   */ +  #include <glib.h>  #include <glib-object.h>  #include <shotwell-plugin-dev-1.0.h> @@ -42,6 +43,11 @@ typedef struct _ShotwellTransitionDescriptorPrivate ShotwellTransitionDescriptor  typedef struct _CircleEffectDescriptor CircleEffectDescriptor;  typedef struct _CircleEffectDescriptorClass CircleEffectDescriptorClass;  typedef struct _CircleEffectDescriptorPrivate CircleEffectDescriptorPrivate; +enum  { +	CIRCLE_EFFECT_DESCRIPTOR_0_PROPERTY, +	CIRCLE_EFFECT_DESCRIPTOR_NUM_PROPERTIES +}; +static GParamSpec* circle_effect_descriptor_properties[CIRCLE_EFFECT_DESCRIPTOR_NUM_PROPERTIES];  #define TYPE_CIRCLE_EFFECT (circle_effect_get_type ())  #define CIRCLE_EFFECT(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), TYPE_CIRCLE_EFFECT, CircleEffect)) @@ -53,6 +59,11 @@ typedef struct _CircleEffectDescriptorPrivate CircleEffectDescriptorPrivate;  typedef struct _CircleEffect CircleEffect;  typedef struct _CircleEffectClass CircleEffectClass;  typedef struct _CircleEffectPrivate CircleEffectPrivate; +enum  { +	CIRCLE_EFFECT_0_PROPERTY, +	CIRCLE_EFFECT_NUM_PROPERTIES +}; +static GParamSpec* circle_effect_properties[CIRCLE_EFFECT_NUM_PROPERTIES];  struct _ShotwellTransitionDescriptor {  	GObject parent_instance; @@ -91,54 +102,68 @@ static SpitTransitionsEffectIface * circle_effect_spit_transitions_effect_parent  GType shotwell_transition_descriptor_get_type (void) G_GNUC_CONST;  GType circle_effect_descriptor_get_type (void) G_GNUC_CONST; -enum  { -	CIRCLE_EFFECT_DESCRIPTOR_DUMMY_PROPERTY -};  CircleEffectDescriptor* circle_effect_descriptor_new (GFile* resource_directory); -CircleEffectDescriptor* circle_effect_descriptor_construct (GType object_type, GFile* resource_directory); -ShotwellTransitionDescriptor* shotwell_transition_descriptor_construct (GType object_type, GFile* resource_directory); +CircleEffectDescriptor* circle_effect_descriptor_construct (GType object_type, +                                                            GFile* resource_directory); +ShotwellTransitionDescriptor* shotwell_transition_descriptor_construct (GType object_type, +                                                                        GFile* resource_directory);  static const gchar* circle_effect_descriptor_real_get_id (ShotwellTransitionDescriptor* base);  static const gchar* circle_effect_descriptor_real_get_pluggable_name (ShotwellTransitionDescriptor* base); -static SpitTransitionsEffect* circle_effect_descriptor_real_create (ShotwellTransitionDescriptor* base, SpitHostInterface* host); +static SpitTransitionsEffect* circle_effect_descriptor_real_create (ShotwellTransitionDescriptor* base, +                                                             SpitHostInterface* host);  CircleEffect* circle_effect_new (void);  CircleEffect* circle_effect_construct (GType object_type);  GType circle_effect_get_type (void) G_GNUC_CONST; -enum  { -	CIRCLE_EFFECT_DUMMY_PROPERTY -};  #define CIRCLE_EFFECT_DESIRED_FPS 25  #define CIRCLE_EFFECT_MIN_FPS 15 -static void circle_effect_real_get_fps (SpitTransitionsEffect* base, gint* desired_fps, gint* min_fps); -static void circle_effect_real_start (SpitTransitionsEffect* base, SpitTransitionsVisuals* visuals, SpitTransitionsMotion* motion); +static void circle_effect_real_get_fps (SpitTransitionsEffect* base, +                                 gint* desired_fps, +                                 gint* min_fps); +static void circle_effect_real_start (SpitTransitionsEffect* base, +                               SpitTransitionsVisuals* visuals, +                               SpitTransitionsMotion* motion);  static gboolean circle_effect_real_needs_clear_background (SpitTransitionsEffect* base); -static void circle_effect_real_paint (SpitTransitionsEffect* base, SpitTransitionsVisuals* visuals, SpitTransitionsMotion* motion, cairo_t* ctx, gint width, gint height, gint frame_number); -static void circle_effect_real_advance (SpitTransitionsEffect* base, SpitTransitionsVisuals* visuals, SpitTransitionsMotion* motion, gint frame_number); +static void circle_effect_real_paint (SpitTransitionsEffect* base, +                               SpitTransitionsVisuals* visuals, +                               SpitTransitionsMotion* motion, +                               cairo_t* ctx, +                               gint width, +                               gint height, +                               gint frame_number); +static void circle_effect_real_advance (SpitTransitionsEffect* base, +                                 SpitTransitionsVisuals* visuals, +                                 SpitTransitionsMotion* motion, +                                 gint frame_number);  static void circle_effect_real_cancel (SpitTransitionsEffect* base); -CircleEffectDescriptor* circle_effect_descriptor_construct (GType object_type, GFile* resource_directory) { +CircleEffectDescriptor* +circle_effect_descriptor_construct (GType object_type, +                                    GFile* resource_directory) +{  	CircleEffectDescriptor * self = NULL; -	GFile* _tmp0_;  #line 11 "/home/jens/Source/shotwell/plugins/shotwell-transitions/CircleEffect.vala"  	g_return_val_if_fail (G_IS_FILE (resource_directory), NULL);  #line 12 "/home/jens/Source/shotwell/plugins/shotwell-transitions/CircleEffect.vala" -	_tmp0_ = resource_directory; -#line 12 "/home/jens/Source/shotwell/plugins/shotwell-transitions/CircleEffect.vala" -	self = (CircleEffectDescriptor*) shotwell_transition_descriptor_construct (object_type, _tmp0_); +	self = (CircleEffectDescriptor*) shotwell_transition_descriptor_construct (object_type, resource_directory);  #line 11 "/home/jens/Source/shotwell/plugins/shotwell-transitions/CircleEffect.vala"  	return self; -#line 131 "CircleEffect.c" +#line 152 "CircleEffect.c"  } -CircleEffectDescriptor* circle_effect_descriptor_new (GFile* resource_directory) { +CircleEffectDescriptor* +circle_effect_descriptor_new (GFile* resource_directory) +{  #line 11 "/home/jens/Source/shotwell/plugins/shotwell-transitions/CircleEffect.vala"  	return circle_effect_descriptor_construct (TYPE_CIRCLE_EFFECT_DESCRIPTOR, resource_directory); -#line 138 "CircleEffect.c" +#line 161 "CircleEffect.c"  } -static const gchar* circle_effect_descriptor_real_get_id (ShotwellTransitionDescriptor* base) { +static const gchar* +circle_effect_descriptor_real_get_id (ShotwellTransitionDescriptor* base) +{  	CircleEffectDescriptor * self;  	const gchar* result = NULL;  #line 15 "/home/jens/Source/shotwell/plugins/shotwell-transitions/CircleEffect.vala" @@ -147,11 +172,13 @@ static const gchar* circle_effect_descriptor_real_get_id (ShotwellTransitionDesc  	result = "org.yorba.shotwell.transitions.circle";  #line 16 "/home/jens/Source/shotwell/plugins/shotwell-transitions/CircleEffect.vala"  	return result; -#line 151 "CircleEffect.c" +#line 176 "CircleEffect.c"  } -static const gchar* circle_effect_descriptor_real_get_pluggable_name (ShotwellTransitionDescriptor* base) { +static const gchar* +circle_effect_descriptor_real_get_pluggable_name (ShotwellTransitionDescriptor* base) +{  	CircleEffectDescriptor * self;  	const gchar* result = NULL;  #line 19 "/home/jens/Source/shotwell/plugins/shotwell-transitions/CircleEffect.vala" @@ -160,11 +187,14 @@ static const gchar* circle_effect_descriptor_real_get_pluggable_name (ShotwellTr  	result = _ ("Circle");  #line 20 "/home/jens/Source/shotwell/plugins/shotwell-transitions/CircleEffect.vala"  	return result; -#line 164 "CircleEffect.c" +#line 191 "CircleEffect.c"  } -static SpitTransitionsEffect* circle_effect_descriptor_real_create (ShotwellTransitionDescriptor* base, SpitHostInterface* host) { +static SpitTransitionsEffect* +circle_effect_descriptor_real_create (ShotwellTransitionDescriptor* base, +                                      SpitHostInterface* host) +{  	CircleEffectDescriptor * self;  	SpitTransitionsEffect* result = NULL;  	CircleEffect* _tmp0_; @@ -178,11 +208,13 @@ static SpitTransitionsEffect* circle_effect_descriptor_real_create (ShotwellTran  	result = G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, SPIT_TRANSITIONS_TYPE_EFFECT, SpitTransitionsEffect);  #line 24 "/home/jens/Source/shotwell/plugins/shotwell-transitions/CircleEffect.vala"  	return result; -#line 182 "CircleEffect.c" +#line 212 "CircleEffect.c"  } -static void circle_effect_descriptor_class_init (CircleEffectDescriptorClass * klass) { +static void +circle_effect_descriptor_class_init (CircleEffectDescriptorClass * klass) +{  #line 10 "/home/jens/Source/shotwell/plugins/shotwell-transitions/CircleEffect.vala"  	circle_effect_descriptor_parent_class = g_type_class_peek_parent (klass);  #line 10 "/home/jens/Source/shotwell/plugins/shotwell-transitions/CircleEffect.vala" @@ -191,15 +223,19 @@ static void circle_effect_descriptor_class_init (CircleEffectDescriptorClass * k  	((ShotwellTransitionDescriptorClass *) klass)->get_pluggable_name = (const gchar* (*) (ShotwellTransitionDescriptor *)) circle_effect_descriptor_real_get_pluggable_name;  #line 10 "/home/jens/Source/shotwell/plugins/shotwell-transitions/CircleEffect.vala"  	((ShotwellTransitionDescriptorClass *) klass)->create = (SpitTransitionsEffect* (*) (ShotwellTransitionDescriptor *, SpitHostInterface*)) circle_effect_descriptor_real_create; -#line 195 "CircleEffect.c" +#line 227 "CircleEffect.c"  } -static void circle_effect_descriptor_instance_init (CircleEffectDescriptor * self) { +static void +circle_effect_descriptor_instance_init (CircleEffectDescriptor * self) +{  } -GType circle_effect_descriptor_get_type (void) { +GType +circle_effect_descriptor_get_type (void) +{  	static volatile gsize circle_effect_descriptor_type_id__volatile = 0;  	if (g_once_init_enter (&circle_effect_descriptor_type_id__volatile)) {  		static const GTypeInfo g_define_type_info = { sizeof (CircleEffectDescriptorClass), (GBaseInitFunc) NULL, (GBaseFinalizeFunc) NULL, (GClassInitFunc) circle_effect_descriptor_class_init, (GClassFinalizeFunc) NULL, NULL, sizeof (CircleEffectDescriptor), 0, (GInstanceInitFunc) circle_effect_descriptor_instance_init, NULL }; @@ -211,24 +247,32 @@ GType circle_effect_descriptor_get_type (void) {  } -CircleEffect* circle_effect_construct (GType object_type) { +CircleEffect* +circle_effect_construct (GType object_type) +{  	CircleEffect * self = NULL;  #line 32 "/home/jens/Source/shotwell/plugins/shotwell-transitions/CircleEffect.vala"  	self = (CircleEffect*) g_object_new (object_type, NULL);  #line 32 "/home/jens/Source/shotwell/plugins/shotwell-transitions/CircleEffect.vala"  	return self; -#line 221 "CircleEffect.c" +#line 259 "CircleEffect.c"  } -CircleEffect* circle_effect_new (void) { +CircleEffect* +circle_effect_new (void) +{  #line 32 "/home/jens/Source/shotwell/plugins/shotwell-transitions/CircleEffect.vala"  	return circle_effect_construct (TYPE_CIRCLE_EFFECT); -#line 228 "CircleEffect.c" +#line 268 "CircleEffect.c"  } -static void circle_effect_real_get_fps (SpitTransitionsEffect* base, gint* desired_fps, gint* min_fps) { +static void +circle_effect_real_get_fps (SpitTransitionsEffect* base, +                            gint* desired_fps, +                            gint* min_fps) +{  	CircleEffect * self;  	gint _vala_desired_fps = 0;  	gint _vala_min_fps = 0; @@ -242,18 +286,22 @@ static void circle_effect_real_get_fps (SpitTransitionsEffect* base, gint* desir  	if (desired_fps) {  #line 35 "/home/jens/Source/shotwell/plugins/shotwell-transitions/CircleEffect.vala"  		*desired_fps = _vala_desired_fps; -#line 246 "CircleEffect.c" +#line 290 "CircleEffect.c"  	}  #line 35 "/home/jens/Source/shotwell/plugins/shotwell-transitions/CircleEffect.vala"  	if (min_fps) {  #line 35 "/home/jens/Source/shotwell/plugins/shotwell-transitions/CircleEffect.vala"  		*min_fps = _vala_min_fps; -#line 252 "CircleEffect.c" +#line 296 "CircleEffect.c"  	}  } -static void circle_effect_real_start (SpitTransitionsEffect* base, SpitTransitionsVisuals* visuals, SpitTransitionsMotion* motion) { +static void +circle_effect_real_start (SpitTransitionsEffect* base, +                          SpitTransitionsVisuals* visuals, +                          SpitTransitionsMotion* motion) +{  	CircleEffect * self;  #line 40 "/home/jens/Source/shotwell/plugins/shotwell-transitions/CircleEffect.vala"  	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_CIRCLE_EFFECT, CircleEffect); @@ -261,11 +309,13 @@ static void circle_effect_real_start (SpitTransitionsEffect* base, SpitTransitio  	g_return_if_fail (SPIT_TRANSITIONS_IS_VISUALS (visuals));  #line 40 "/home/jens/Source/shotwell/plugins/shotwell-transitions/CircleEffect.vala"  	g_return_if_fail (SPIT_TRANSITIONS_IS_MOTION (motion)); -#line 265 "CircleEffect.c" +#line 313 "CircleEffect.c"  } -static gboolean circle_effect_real_needs_clear_background (SpitTransitionsEffect* base) { +static gboolean +circle_effect_real_needs_clear_background (SpitTransitionsEffect* base) +{  	CircleEffect * self;  	gboolean result = FALSE;  #line 43 "/home/jens/Source/shotwell/plugins/shotwell-transitions/CircleEffect.vala" @@ -274,27 +324,27 @@ static gboolean circle_effect_real_needs_clear_background (SpitTransitionsEffect  	result = TRUE;  #line 44 "/home/jens/Source/shotwell/plugins/shotwell-transitions/CircleEffect.vala"  	return result; -#line 278 "CircleEffect.c" +#line 328 "CircleEffect.c"  } -static void circle_effect_real_paint (SpitTransitionsEffect* base, SpitTransitionsVisuals* visuals, SpitTransitionsMotion* motion, cairo_t* ctx, gint width, gint height, gint frame_number) { +static void +circle_effect_real_paint (SpitTransitionsEffect* base, +                          SpitTransitionsVisuals* visuals, +                          SpitTransitionsMotion* motion, +                          cairo_t* ctx, +                          gint width, +                          gint height, +                          gint frame_number) +{  	CircleEffect * self;  	gdouble alpha = 0.0; -	SpitTransitionsMotion* _tmp0_; -	gint _tmp1_; -	gdouble _tmp2_;  	gint radius = 0; -	gdouble _tmp3_; -	gint _tmp4_; -	gint _tmp5_; -	gdouble _tmp6_; -	SpitTransitionsVisuals* _tmp7_; -	GdkPixbuf* _tmp8_; -	GdkPixbuf* _tmp9_; -	SpitTransitionsVisuals* _tmp24_; -	GdkPixbuf* _tmp25_; -	GdkPixbuf* _tmp26_; +	gdouble _tmp0_; +	GdkPixbuf* _tmp1_; +	GdkPixbuf* _tmp2_; +	GdkPixbuf* _tmp12_; +	GdkPixbuf* _tmp13_;  #line 47 "/home/jens/Source/shotwell/plugins/shotwell-transitions/CircleEffect.vala"  	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_CIRCLE_EFFECT, CircleEffect);  #line 47 "/home/jens/Source/shotwell/plugins/shotwell-transitions/CircleEffect.vala" @@ -304,157 +354,104 @@ static void circle_effect_real_paint (SpitTransitionsEffect* base, SpitTransitio  #line 47 "/home/jens/Source/shotwell/plugins/shotwell-transitions/CircleEffect.vala"  	g_return_if_fail (ctx != NULL);  #line 49 "/home/jens/Source/shotwell/plugins/shotwell-transitions/CircleEffect.vala" -	_tmp0_ = motion; -#line 49 "/home/jens/Source/shotwell/plugins/shotwell-transitions/CircleEffect.vala" -	_tmp1_ = frame_number; -#line 49 "/home/jens/Source/shotwell/plugins/shotwell-transitions/CircleEffect.vala" -	_tmp2_ = spit_transitions_motion_get_alpha (_tmp0_, _tmp1_); -#line 49 "/home/jens/Source/shotwell/plugins/shotwell-transitions/CircleEffect.vala" -	alpha = _tmp2_; -#line 50 "/home/jens/Source/shotwell/plugins/shotwell-transitions/CircleEffect.vala" -	_tmp3_ = alpha; -#line 50 "/home/jens/Source/shotwell/plugins/shotwell-transitions/CircleEffect.vala" -	_tmp4_ = width; -#line 50 "/home/jens/Source/shotwell/plugins/shotwell-transitions/CircleEffect.vala" -	_tmp5_ = height; +	alpha = spit_transitions_motion_get_alpha (motion, frame_number);  #line 50 "/home/jens/Source/shotwell/plugins/shotwell-transitions/CircleEffect.vala" -	_tmp6_ = fmax ((gdouble) _tmp4_, (gdouble) _tmp5_); +	_tmp0_ = alpha;  #line 50 "/home/jens/Source/shotwell/plugins/shotwell-transitions/CircleEffect.vala" -	radius = (gint) (_tmp3_ * _tmp6_); +	radius = (gint) (_tmp0_ * fmax ((gdouble) width, (gdouble) height));  #line 52 "/home/jens/Source/shotwell/plugins/shotwell-transitions/CircleEffect.vala" -	_tmp7_ = visuals; +	_tmp1_ = spit_transitions_visuals_get_from_pixbuf (visuals);  #line 52 "/home/jens/Source/shotwell/plugins/shotwell-transitions/CircleEffect.vala" -	_tmp8_ = spit_transitions_visuals_get_from_pixbuf (_tmp7_); +	_tmp2_ = _tmp1_;  #line 52 "/home/jens/Source/shotwell/plugins/shotwell-transitions/CircleEffect.vala" -	_tmp9_ = _tmp8_; -#line 52 "/home/jens/Source/shotwell/plugins/shotwell-transitions/CircleEffect.vala" -	if (_tmp9_ != NULL) { -#line 333 "CircleEffect.c" -		cairo_t* _tmp10_; -		SpitTransitionsVisuals* _tmp11_; -		GdkPixbuf* _tmp12_; -		GdkPixbuf* _tmp13_; -		SpitTransitionsVisuals* _tmp14_; -		GdkRectangle _tmp15_ = {0}; -		GdkRectangle _tmp16_; -		gint _tmp17_; -		SpitTransitionsVisuals* _tmp18_; -		GdkRectangle _tmp19_ = {0}; -		GdkRectangle _tmp20_; -		gint _tmp21_; -		cairo_t* _tmp22_; -		gdouble _tmp23_; -#line 53 "/home/jens/Source/shotwell/plugins/shotwell-transitions/CircleEffect.vala" -		_tmp10_ = ctx; +	if (_tmp2_ != NULL) { +#line 369 "CircleEffect.c" +		GdkPixbuf* _tmp3_; +		GdkPixbuf* _tmp4_; +		GdkRectangle _tmp5_ = {0}; +		GdkRectangle _tmp6_; +		gint _tmp7_; +		GdkRectangle _tmp8_ = {0}; +		GdkRectangle _tmp9_; +		gint _tmp10_; +		gdouble _tmp11_;  #line 53 "/home/jens/Source/shotwell/plugins/shotwell-transitions/CircleEffect.vala" -		_tmp11_ = visuals; +		_tmp3_ = spit_transitions_visuals_get_from_pixbuf (visuals);  #line 53 "/home/jens/Source/shotwell/plugins/shotwell-transitions/CircleEffect.vala" -		_tmp12_ = spit_transitions_visuals_get_from_pixbuf (_tmp11_); +		_tmp4_ = _tmp3_;  #line 53 "/home/jens/Source/shotwell/plugins/shotwell-transitions/CircleEffect.vala" -		_tmp13_ = _tmp12_; +		spit_transitions_visuals_get_from_pos (visuals, &_tmp5_);  #line 53 "/home/jens/Source/shotwell/plugins/shotwell-transitions/CircleEffect.vala" -		_tmp14_ = visuals; +		_tmp6_ = _tmp5_;  #line 53 "/home/jens/Source/shotwell/plugins/shotwell-transitions/CircleEffect.vala" -		spit_transitions_visuals_get_from_pos (_tmp14_, &_tmp15_); +		_tmp7_ = _tmp6_.x;  #line 53 "/home/jens/Source/shotwell/plugins/shotwell-transitions/CircleEffect.vala" -		_tmp16_ = _tmp15_; +		spit_transitions_visuals_get_from_pos (visuals, &_tmp8_);  #line 53 "/home/jens/Source/shotwell/plugins/shotwell-transitions/CircleEffect.vala" -		_tmp17_ = _tmp16_.x; +		_tmp9_ = _tmp8_;  #line 53 "/home/jens/Source/shotwell/plugins/shotwell-transitions/CircleEffect.vala" -		_tmp18_ = visuals; +		_tmp10_ = _tmp9_.y;  #line 53 "/home/jens/Source/shotwell/plugins/shotwell-transitions/CircleEffect.vala" -		spit_transitions_visuals_get_from_pos (_tmp18_, &_tmp19_); -#line 53 "/home/jens/Source/shotwell/plugins/shotwell-transitions/CircleEffect.vala" -		_tmp20_ = _tmp19_; -#line 53 "/home/jens/Source/shotwell/plugins/shotwell-transitions/CircleEffect.vala" -		_tmp21_ = _tmp20_.y; -#line 53 "/home/jens/Source/shotwell/plugins/shotwell-transitions/CircleEffect.vala" -		gdk_cairo_set_source_pixbuf (_tmp10_, _tmp13_, (gdouble) _tmp17_, (gdouble) _tmp21_); -#line 55 "/home/jens/Source/shotwell/plugins/shotwell-transitions/CircleEffect.vala" -		_tmp22_ = ctx; +		gdk_cairo_set_source_pixbuf (ctx, _tmp4_, (gdouble) _tmp7_, (gdouble) _tmp10_);  #line 55 "/home/jens/Source/shotwell/plugins/shotwell-transitions/CircleEffect.vala" -		_tmp23_ = alpha; +		_tmp11_ = alpha;  #line 55 "/home/jens/Source/shotwell/plugins/shotwell-transitions/CircleEffect.vala" -		cairo_paint_with_alpha (_tmp22_, 1 - _tmp23_); -#line 380 "CircleEffect.c" +		cairo_paint_with_alpha (ctx, 1 - _tmp11_); +#line 401 "CircleEffect.c"  	}  #line 58 "/home/jens/Source/shotwell/plugins/shotwell-transitions/CircleEffect.vala" -	_tmp24_ = visuals; +	_tmp12_ = spit_transitions_visuals_get_to_pixbuf (visuals);  #line 58 "/home/jens/Source/shotwell/plugins/shotwell-transitions/CircleEffect.vala" -	_tmp25_ = spit_transitions_visuals_get_to_pixbuf (_tmp24_); +	_tmp13_ = _tmp12_;  #line 58 "/home/jens/Source/shotwell/plugins/shotwell-transitions/CircleEffect.vala" -	_tmp26_ = _tmp25_; -#line 58 "/home/jens/Source/shotwell/plugins/shotwell-transitions/CircleEffect.vala" -	if (_tmp26_ != NULL) { -#line 390 "CircleEffect.c" -		cairo_t* _tmp27_; -		SpitTransitionsVisuals* _tmp28_; -		GdkPixbuf* _tmp29_; -		GdkPixbuf* _tmp30_; -		SpitTransitionsVisuals* _tmp31_; -		GdkRectangle _tmp32_ = {0}; -		GdkRectangle _tmp33_; -		gint _tmp34_; -		SpitTransitionsVisuals* _tmp35_; -		GdkRectangle _tmp36_ = {0}; -		GdkRectangle _tmp37_; -		gint _tmp38_; -		cairo_t* _tmp39_; -		gint _tmp40_; -		gint _tmp41_; -		gint _tmp42_; -		cairo_t* _tmp43_; -		cairo_t* _tmp44_; -#line 59 "/home/jens/Source/shotwell/plugins/shotwell-transitions/CircleEffect.vala" -		_tmp27_ = ctx; -#line 59 "/home/jens/Source/shotwell/plugins/shotwell-transitions/CircleEffect.vala" -		_tmp28_ = visuals; -#line 59 "/home/jens/Source/shotwell/plugins/shotwell-transitions/CircleEffect.vala" -		_tmp29_ = spit_transitions_visuals_get_to_pixbuf (_tmp28_); -#line 59 "/home/jens/Source/shotwell/plugins/shotwell-transitions/CircleEffect.vala" -		_tmp30_ = _tmp29_; +	if (_tmp13_ != NULL) { +#line 409 "CircleEffect.c" +		GdkPixbuf* _tmp14_; +		GdkPixbuf* _tmp15_; +		GdkRectangle _tmp16_ = {0}; +		GdkRectangle _tmp17_; +		gint _tmp18_; +		GdkRectangle _tmp19_ = {0}; +		GdkRectangle _tmp20_; +		gint _tmp21_; +		gint _tmp22_;  #line 59 "/home/jens/Source/shotwell/plugins/shotwell-transitions/CircleEffect.vala" -		_tmp31_ = visuals; +		_tmp14_ = spit_transitions_visuals_get_to_pixbuf (visuals);  #line 59 "/home/jens/Source/shotwell/plugins/shotwell-transitions/CircleEffect.vala" -		spit_transitions_visuals_get_to_pos (_tmp31_, &_tmp32_); +		_tmp15_ = _tmp14_;  #line 59 "/home/jens/Source/shotwell/plugins/shotwell-transitions/CircleEffect.vala" -		_tmp33_ = _tmp32_; +		spit_transitions_visuals_get_to_pos (visuals, &_tmp16_);  #line 59 "/home/jens/Source/shotwell/plugins/shotwell-transitions/CircleEffect.vala" -		_tmp34_ = _tmp33_.x; +		_tmp17_ = _tmp16_;  #line 59 "/home/jens/Source/shotwell/plugins/shotwell-transitions/CircleEffect.vala" -		_tmp35_ = visuals; +		_tmp18_ = _tmp17_.x;  #line 59 "/home/jens/Source/shotwell/plugins/shotwell-transitions/CircleEffect.vala" -		spit_transitions_visuals_get_to_pos (_tmp35_, &_tmp36_); +		spit_transitions_visuals_get_to_pos (visuals, &_tmp19_);  #line 59 "/home/jens/Source/shotwell/plugins/shotwell-transitions/CircleEffect.vala" -		_tmp37_ = _tmp36_; +		_tmp20_ = _tmp19_;  #line 59 "/home/jens/Source/shotwell/plugins/shotwell-transitions/CircleEffect.vala" -		_tmp38_ = _tmp37_.y; +		_tmp21_ = _tmp20_.y;  #line 59 "/home/jens/Source/shotwell/plugins/shotwell-transitions/CircleEffect.vala" -		gdk_cairo_set_source_pixbuf (_tmp27_, _tmp30_, (gdouble) _tmp34_, (gdouble) _tmp38_); +		gdk_cairo_set_source_pixbuf (ctx, _tmp15_, (gdouble) _tmp18_, (gdouble) _tmp21_);  #line 60 "/home/jens/Source/shotwell/plugins/shotwell-transitions/CircleEffect.vala" -		_tmp39_ = ctx; +		_tmp22_ = radius;  #line 60 "/home/jens/Source/shotwell/plugins/shotwell-transitions/CircleEffect.vala" -		_tmp40_ = width; -#line 60 "/home/jens/Source/shotwell/plugins/shotwell-transitions/CircleEffect.vala" -		_tmp41_ = height; -#line 60 "/home/jens/Source/shotwell/plugins/shotwell-transitions/CircleEffect.vala" -		_tmp42_ = radius; -#line 60 "/home/jens/Source/shotwell/plugins/shotwell-transitions/CircleEffect.vala" -		cairo_arc (_tmp39_, (gdouble) (((gint) _tmp40_) / 2), (gdouble) (((gint) _tmp41_) / 2), (gdouble) _tmp42_, (gdouble) 0, 2 * G_PI); +		cairo_arc (ctx, (gdouble) (((gint) width) / 2), (gdouble) (((gint) height) / 2), (gdouble) _tmp22_, (gdouble) 0, 2 * G_PI);  #line 61 "/home/jens/Source/shotwell/plugins/shotwell-transitions/CircleEffect.vala" -		_tmp43_ = ctx; -#line 61 "/home/jens/Source/shotwell/plugins/shotwell-transitions/CircleEffect.vala" -		cairo_clip (_tmp43_); -#line 62 "/home/jens/Source/shotwell/plugins/shotwell-transitions/CircleEffect.vala" -		_tmp44_ = ctx; +		cairo_clip (ctx);  #line 62 "/home/jens/Source/shotwell/plugins/shotwell-transitions/CircleEffect.vala" -		cairo_paint (_tmp44_); -#line 453 "CircleEffect.c" +		cairo_paint (ctx); +#line 445 "CircleEffect.c"  	}  } -static void circle_effect_real_advance (SpitTransitionsEffect* base, SpitTransitionsVisuals* visuals, SpitTransitionsMotion* motion, gint frame_number) { +static void +circle_effect_real_advance (SpitTransitionsEffect* base, +                            SpitTransitionsVisuals* visuals, +                            SpitTransitionsMotion* motion, +                            gint frame_number) +{  	CircleEffect * self;  #line 66 "/home/jens/Source/shotwell/plugins/shotwell-transitions/CircleEffect.vala"  	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_CIRCLE_EFFECT, CircleEffect); @@ -462,26 +459,32 @@ static void circle_effect_real_advance (SpitTransitionsEffect* base, SpitTransit  	g_return_if_fail (SPIT_TRANSITIONS_IS_VISUALS (visuals));  #line 66 "/home/jens/Source/shotwell/plugins/shotwell-transitions/CircleEffect.vala"  	g_return_if_fail (SPIT_TRANSITIONS_IS_MOTION (motion)); -#line 466 "CircleEffect.c" +#line 463 "CircleEffect.c"  } -static void circle_effect_real_cancel (SpitTransitionsEffect* base) { +static void +circle_effect_real_cancel (SpitTransitionsEffect* base) +{  	CircleEffect * self;  #line 69 "/home/jens/Source/shotwell/plugins/shotwell-transitions/CircleEffect.vala"  	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_CIRCLE_EFFECT, CircleEffect); -#line 474 "CircleEffect.c" +#line 473 "CircleEffect.c"  } -static void circle_effect_class_init (CircleEffectClass * klass) { +static void +circle_effect_class_init (CircleEffectClass * klass) +{  #line 28 "/home/jens/Source/shotwell/plugins/shotwell-transitions/CircleEffect.vala"  	circle_effect_parent_class = g_type_class_peek_parent (klass); -#line 481 "CircleEffect.c" +#line 482 "CircleEffect.c"  } -static void circle_effect_spit_transitions_effect_interface_init (SpitTransitionsEffectIface * iface) { +static void +circle_effect_spit_transitions_effect_interface_init (SpitTransitionsEffectIface * iface) +{  #line 28 "/home/jens/Source/shotwell/plugins/shotwell-transitions/CircleEffect.vala"  	circle_effect_spit_transitions_effect_parent_iface = g_type_interface_peek_parent (iface);  #line 28 "/home/jens/Source/shotwell/plugins/shotwell-transitions/CircleEffect.vala" @@ -496,15 +499,19 @@ static void circle_effect_spit_transitions_effect_interface_init (SpitTransition  	iface->advance = (void (*) (SpitTransitionsEffect *, SpitTransitionsVisuals*, SpitTransitionsMotion*, gint)) circle_effect_real_advance;  #line 28 "/home/jens/Source/shotwell/plugins/shotwell-transitions/CircleEffect.vala"  	iface->cancel = (void (*) (SpitTransitionsEffect *)) circle_effect_real_cancel; -#line 500 "CircleEffect.c" +#line 503 "CircleEffect.c"  } -static void circle_effect_instance_init (CircleEffect * self) { +static void +circle_effect_instance_init (CircleEffect * self) +{  } -GType circle_effect_get_type (void) { +GType +circle_effect_get_type (void) +{  	static volatile gsize circle_effect_type_id__volatile = 0;  	if (g_once_init_enter (&circle_effect_type_id__volatile)) {  		static const GTypeInfo g_define_type_info = { sizeof (CircleEffectClass), (GBaseInitFunc) NULL, (GBaseFinalizeFunc) NULL, (GClassInitFunc) circle_effect_class_init, (GClassFinalizeFunc) NULL, NULL, sizeof (CircleEffect), 0, (GInstanceInitFunc) circle_effect_instance_init, NULL }; diff --git a/plugins/shotwell-transitions/CirclesEffect.c b/plugins/shotwell-transitions/CirclesEffect.c index 2ae59b7..410dc93 100644 --- a/plugins/shotwell-transitions/CirclesEffect.c +++ b/plugins/shotwell-transitions/CirclesEffect.c @@ -1,4 +1,4 @@ -/* CirclesEffect.c generated by valac 0.36.6, the Vala compiler +/* CirclesEffect.c generated by valac 0.40.4, the Vala compiler   * generated from CirclesEffect.vala, do not modify */  /* Copyright 2013 Jens Bav @@ -8,6 +8,7 @@   * (version 2.1 or later).  See the COPYING file in this distribution.   */ +  #include <glib.h>  #include <glib-object.h>  #include <shotwell-plugin-dev-1.0.h> @@ -42,6 +43,11 @@ typedef struct _ShotwellTransitionDescriptorPrivate ShotwellTransitionDescriptor  typedef struct _CirclesEffectDescriptor CirclesEffectDescriptor;  typedef struct _CirclesEffectDescriptorClass CirclesEffectDescriptorClass;  typedef struct _CirclesEffectDescriptorPrivate CirclesEffectDescriptorPrivate; +enum  { +	CIRCLES_EFFECT_DESCRIPTOR_0_PROPERTY, +	CIRCLES_EFFECT_DESCRIPTOR_NUM_PROPERTIES +}; +static GParamSpec* circles_effect_descriptor_properties[CIRCLES_EFFECT_DESCRIPTOR_NUM_PROPERTIES];  #define TYPE_CIRCLES_EFFECT (circles_effect_get_type ())  #define CIRCLES_EFFECT(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), TYPE_CIRCLES_EFFECT, CirclesEffect)) @@ -53,6 +59,11 @@ typedef struct _CirclesEffectDescriptorPrivate CirclesEffectDescriptorPrivate;  typedef struct _CirclesEffect CirclesEffect;  typedef struct _CirclesEffectClass CirclesEffectClass;  typedef struct _CirclesEffectPrivate CirclesEffectPrivate; +enum  { +	CIRCLES_EFFECT_0_PROPERTY, +	CIRCLES_EFFECT_NUM_PROPERTIES +}; +static GParamSpec* circles_effect_properties[CIRCLES_EFFECT_NUM_PROPERTIES];  struct _ShotwellTransitionDescriptor {  	GObject parent_instance; @@ -91,55 +102,69 @@ static SpitTransitionsEffectIface * circles_effect_spit_transitions_effect_paren  GType shotwell_transition_descriptor_get_type (void) G_GNUC_CONST;  GType circles_effect_descriptor_get_type (void) G_GNUC_CONST; -enum  { -	CIRCLES_EFFECT_DESCRIPTOR_DUMMY_PROPERTY -};  CirclesEffectDescriptor* circles_effect_descriptor_new (GFile* resource_directory); -CirclesEffectDescriptor* circles_effect_descriptor_construct (GType object_type, GFile* resource_directory); -ShotwellTransitionDescriptor* shotwell_transition_descriptor_construct (GType object_type, GFile* resource_directory); +CirclesEffectDescriptor* circles_effect_descriptor_construct (GType object_type, +                                                              GFile* resource_directory); +ShotwellTransitionDescriptor* shotwell_transition_descriptor_construct (GType object_type, +                                                                        GFile* resource_directory);  static const gchar* circles_effect_descriptor_real_get_id (ShotwellTransitionDescriptor* base);  static const gchar* circles_effect_descriptor_real_get_pluggable_name (ShotwellTransitionDescriptor* base); -static SpitTransitionsEffect* circles_effect_descriptor_real_create (ShotwellTransitionDescriptor* base, SpitHostInterface* host); +static SpitTransitionsEffect* circles_effect_descriptor_real_create (ShotwellTransitionDescriptor* base, +                                                              SpitHostInterface* host);  CirclesEffect* circles_effect_new (void);  CirclesEffect* circles_effect_construct (GType object_type);  GType circles_effect_get_type (void) G_GNUC_CONST; -enum  { -	CIRCLES_EFFECT_DUMMY_PROPERTY -};  #define CIRCLES_EFFECT_DESIRED_FPS 25  #define CIRCLES_EFFECT_MIN_FPS 15  #define CIRCLES_EFFECT_SPEED 2.5 -static void circles_effect_real_get_fps (SpitTransitionsEffect* base, gint* desired_fps, gint* min_fps); -static void circles_effect_real_start (SpitTransitionsEffect* base, SpitTransitionsVisuals* visuals, SpitTransitionsMotion* motion); +static void circles_effect_real_get_fps (SpitTransitionsEffect* base, +                                  gint* desired_fps, +                                  gint* min_fps); +static void circles_effect_real_start (SpitTransitionsEffect* base, +                                SpitTransitionsVisuals* visuals, +                                SpitTransitionsMotion* motion);  static gboolean circles_effect_real_needs_clear_background (SpitTransitionsEffect* base); -static void circles_effect_real_paint (SpitTransitionsEffect* base, SpitTransitionsVisuals* visuals, SpitTransitionsMotion* motion, cairo_t* ctx, gint width, gint height, gint frame_number); -static void circles_effect_real_advance (SpitTransitionsEffect* base, SpitTransitionsVisuals* visuals, SpitTransitionsMotion* motion, gint frame_number); +static void circles_effect_real_paint (SpitTransitionsEffect* base, +                                SpitTransitionsVisuals* visuals, +                                SpitTransitionsMotion* motion, +                                cairo_t* ctx, +                                gint width, +                                gint height, +                                gint frame_number); +static void circles_effect_real_advance (SpitTransitionsEffect* base, +                                  SpitTransitionsVisuals* visuals, +                                  SpitTransitionsMotion* motion, +                                  gint frame_number);  static void circles_effect_real_cancel (SpitTransitionsEffect* base); -CirclesEffectDescriptor* circles_effect_descriptor_construct (GType object_type, GFile* resource_directory) { +CirclesEffectDescriptor* +circles_effect_descriptor_construct (GType object_type, +                                     GFile* resource_directory) +{  	CirclesEffectDescriptor * self = NULL; -	GFile* _tmp0_;  #line 11 "/home/jens/Source/shotwell/plugins/shotwell-transitions/CirclesEffect.vala"  	g_return_val_if_fail (G_IS_FILE (resource_directory), NULL);  #line 12 "/home/jens/Source/shotwell/plugins/shotwell-transitions/CirclesEffect.vala" -	_tmp0_ = resource_directory; -#line 12 "/home/jens/Source/shotwell/plugins/shotwell-transitions/CirclesEffect.vala" -	self = (CirclesEffectDescriptor*) shotwell_transition_descriptor_construct (object_type, _tmp0_); +	self = (CirclesEffectDescriptor*) shotwell_transition_descriptor_construct (object_type, resource_directory);  #line 11 "/home/jens/Source/shotwell/plugins/shotwell-transitions/CirclesEffect.vala"  	return self; -#line 132 "CirclesEffect.c" +#line 153 "CirclesEffect.c"  } -CirclesEffectDescriptor* circles_effect_descriptor_new (GFile* resource_directory) { +CirclesEffectDescriptor* +circles_effect_descriptor_new (GFile* resource_directory) +{  #line 11 "/home/jens/Source/shotwell/plugins/shotwell-transitions/CirclesEffect.vala"  	return circles_effect_descriptor_construct (TYPE_CIRCLES_EFFECT_DESCRIPTOR, resource_directory); -#line 139 "CirclesEffect.c" +#line 162 "CirclesEffect.c"  } -static const gchar* circles_effect_descriptor_real_get_id (ShotwellTransitionDescriptor* base) { +static const gchar* +circles_effect_descriptor_real_get_id (ShotwellTransitionDescriptor* base) +{  	CirclesEffectDescriptor * self;  	const gchar* result = NULL;  #line 15 "/home/jens/Source/shotwell/plugins/shotwell-transitions/CirclesEffect.vala" @@ -148,11 +173,13 @@ static const gchar* circles_effect_descriptor_real_get_id (ShotwellTransitionDes  	result = "org.yorba.shotwell.transitions.circles";  #line 16 "/home/jens/Source/shotwell/plugins/shotwell-transitions/CirclesEffect.vala"  	return result; -#line 152 "CirclesEffect.c" +#line 177 "CirclesEffect.c"  } -static const gchar* circles_effect_descriptor_real_get_pluggable_name (ShotwellTransitionDescriptor* base) { +static const gchar* +circles_effect_descriptor_real_get_pluggable_name (ShotwellTransitionDescriptor* base) +{  	CirclesEffectDescriptor * self;  	const gchar* result = NULL;  #line 19 "/home/jens/Source/shotwell/plugins/shotwell-transitions/CirclesEffect.vala" @@ -161,11 +188,14 @@ static const gchar* circles_effect_descriptor_real_get_pluggable_name (ShotwellT  	result = _ ("Circles");  #line 20 "/home/jens/Source/shotwell/plugins/shotwell-transitions/CirclesEffect.vala"  	return result; -#line 165 "CirclesEffect.c" +#line 192 "CirclesEffect.c"  } -static SpitTransitionsEffect* circles_effect_descriptor_real_create (ShotwellTransitionDescriptor* base, SpitHostInterface* host) { +static SpitTransitionsEffect* +circles_effect_descriptor_real_create (ShotwellTransitionDescriptor* base, +                                       SpitHostInterface* host) +{  	CirclesEffectDescriptor * self;  	SpitTransitionsEffect* result = NULL;  	CirclesEffect* _tmp0_; @@ -179,11 +209,13 @@ static SpitTransitionsEffect* circles_effect_descriptor_real_create (ShotwellTra  	result = G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, SPIT_TRANSITIONS_TYPE_EFFECT, SpitTransitionsEffect);  #line 24 "/home/jens/Source/shotwell/plugins/shotwell-transitions/CirclesEffect.vala"  	return result; -#line 183 "CirclesEffect.c" +#line 213 "CirclesEffect.c"  } -static void circles_effect_descriptor_class_init (CirclesEffectDescriptorClass * klass) { +static void +circles_effect_descriptor_class_init (CirclesEffectDescriptorClass * klass) +{  #line 10 "/home/jens/Source/shotwell/plugins/shotwell-transitions/CirclesEffect.vala"  	circles_effect_descriptor_parent_class = g_type_class_peek_parent (klass);  #line 10 "/home/jens/Source/shotwell/plugins/shotwell-transitions/CirclesEffect.vala" @@ -192,15 +224,19 @@ static void circles_effect_descriptor_class_init (CirclesEffectDescriptorClass *  	((ShotwellTransitionDescriptorClass *) klass)->get_pluggable_name = (const gchar* (*) (ShotwellTransitionDescriptor *)) circles_effect_descriptor_real_get_pluggable_name;  #line 10 "/home/jens/Source/shotwell/plugins/shotwell-transitions/CirclesEffect.vala"  	((ShotwellTransitionDescriptorClass *) klass)->create = (SpitTransitionsEffect* (*) (ShotwellTransitionDescriptor *, SpitHostInterface*)) circles_effect_descriptor_real_create; -#line 196 "CirclesEffect.c" +#line 228 "CirclesEffect.c"  } -static void circles_effect_descriptor_instance_init (CirclesEffectDescriptor * self) { +static void +circles_effect_descriptor_instance_init (CirclesEffectDescriptor * self) +{  } -GType circles_effect_descriptor_get_type (void) { +GType +circles_effect_descriptor_get_type (void) +{  	static volatile gsize circles_effect_descriptor_type_id__volatile = 0;  	if (g_once_init_enter (&circles_effect_descriptor_type_id__volatile)) {  		static const GTypeInfo g_define_type_info = { sizeof (CirclesEffectDescriptorClass), (GBaseInitFunc) NULL, (GBaseFinalizeFunc) NULL, (GClassInitFunc) circles_effect_descriptor_class_init, (GClassFinalizeFunc) NULL, NULL, sizeof (CirclesEffectDescriptor), 0, (GInstanceInitFunc) circles_effect_descriptor_instance_init, NULL }; @@ -212,24 +248,32 @@ GType circles_effect_descriptor_get_type (void) {  } -CirclesEffect* circles_effect_construct (GType object_type) { +CirclesEffect* +circles_effect_construct (GType object_type) +{  	CirclesEffect * self = NULL;  #line 33 "/home/jens/Source/shotwell/plugins/shotwell-transitions/CirclesEffect.vala"  	self = (CirclesEffect*) g_object_new (object_type, NULL);  #line 33 "/home/jens/Source/shotwell/plugins/shotwell-transitions/CirclesEffect.vala"  	return self; -#line 222 "CirclesEffect.c" +#line 260 "CirclesEffect.c"  } -CirclesEffect* circles_effect_new (void) { +CirclesEffect* +circles_effect_new (void) +{  #line 33 "/home/jens/Source/shotwell/plugins/shotwell-transitions/CirclesEffect.vala"  	return circles_effect_construct (TYPE_CIRCLES_EFFECT); -#line 229 "CirclesEffect.c" +#line 269 "CirclesEffect.c"  } -static void circles_effect_real_get_fps (SpitTransitionsEffect* base, gint* desired_fps, gint* min_fps) { +static void +circles_effect_real_get_fps (SpitTransitionsEffect* base, +                             gint* desired_fps, +                             gint* min_fps) +{  	CirclesEffect * self;  	gint _vala_desired_fps = 0;  	gint _vala_min_fps = 0; @@ -243,18 +287,22 @@ static void circles_effect_real_get_fps (SpitTransitionsEffect* base, gint* desi  	if (desired_fps) {  #line 36 "/home/jens/Source/shotwell/plugins/shotwell-transitions/CirclesEffect.vala"  		*desired_fps = _vala_desired_fps; -#line 247 "CirclesEffect.c" +#line 291 "CirclesEffect.c"  	}  #line 36 "/home/jens/Source/shotwell/plugins/shotwell-transitions/CirclesEffect.vala"  	if (min_fps) {  #line 36 "/home/jens/Source/shotwell/plugins/shotwell-transitions/CirclesEffect.vala"  		*min_fps = _vala_min_fps; -#line 253 "CirclesEffect.c" +#line 297 "CirclesEffect.c"  	}  } -static void circles_effect_real_start (SpitTransitionsEffect* base, SpitTransitionsVisuals* visuals, SpitTransitionsMotion* motion) { +static void +circles_effect_real_start (SpitTransitionsEffect* base, +                           SpitTransitionsVisuals* visuals, +                           SpitTransitionsMotion* motion) +{  	CirclesEffect * self;  #line 41 "/home/jens/Source/shotwell/plugins/shotwell-transitions/CirclesEffect.vala"  	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_CIRCLES_EFFECT, CirclesEffect); @@ -262,11 +310,13 @@ static void circles_effect_real_start (SpitTransitionsEffect* base, SpitTransiti  	g_return_if_fail (SPIT_TRANSITIONS_IS_VISUALS (visuals));  #line 41 "/home/jens/Source/shotwell/plugins/shotwell-transitions/CirclesEffect.vala"  	g_return_if_fail (SPIT_TRANSITIONS_IS_MOTION (motion)); -#line 266 "CirclesEffect.c" +#line 314 "CirclesEffect.c"  } -static gboolean circles_effect_real_needs_clear_background (SpitTransitionsEffect* base) { +static gboolean +circles_effect_real_needs_clear_background (SpitTransitionsEffect* base) +{  	CirclesEffect * self;  	gboolean result = FALSE;  #line 44 "/home/jens/Source/shotwell/plugins/shotwell-transitions/CirclesEffect.vala" @@ -275,32 +325,33 @@ static gboolean circles_effect_real_needs_clear_background (SpitTransitionsEffec  	result = TRUE;  #line 45 "/home/jens/Source/shotwell/plugins/shotwell-transitions/CirclesEffect.vala"  	return result; -#line 279 "CirclesEffect.c" +#line 329 "CirclesEffect.c"  } -static void circles_effect_real_paint (SpitTransitionsEffect* base, SpitTransitionsVisuals* visuals, SpitTransitionsMotion* motion, cairo_t* ctx, gint width, gint height, gint frame_number) { +static void +circles_effect_real_paint (SpitTransitionsEffect* base, +                           SpitTransitionsVisuals* visuals, +                           SpitTransitionsMotion* motion, +                           cairo_t* ctx, +                           gint width, +                           gint height, +                           gint frame_number) +{  	CirclesEffect * self;  	gdouble alpha = 0.0; -	SpitTransitionsMotion* _tmp0_; -	gint _tmp1_; -	gdouble _tmp2_;  	gint distance = 0;  	gint radius = 0;  	gint circleCountX = 0; -	gint _tmp3_; -	gint _tmp4_; +	gint _tmp0_;  	gint circleCountY = 0; -	gint _tmp5_; -	gint _tmp6_; +	gint _tmp1_;  	gdouble maxRadius = 0.0; -	gint _tmp7_; -	SpitTransitionsVisuals* _tmp8_; -	GdkPixbuf* _tmp9_; -	GdkPixbuf* _tmp10_; -	SpitTransitionsVisuals* _tmp25_; -	GdkPixbuf* _tmp26_; -	GdkPixbuf* _tmp27_; +	gint _tmp2_; +	GdkPixbuf* _tmp3_; +	GdkPixbuf* _tmp4_; +	GdkPixbuf* _tmp14_; +	GdkPixbuf* _tmp15_;  #line 48 "/home/jens/Source/shotwell/plugins/shotwell-transitions/CirclesEffect.vala"  	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_CIRCLES_EFFECT, CirclesEffect);  #line 48 "/home/jens/Source/shotwell/plugins/shotwell-transitions/CirclesEffect.vala" @@ -310,263 +361,208 @@ static void circles_effect_real_paint (SpitTransitionsEffect* base, SpitTransiti  #line 48 "/home/jens/Source/shotwell/plugins/shotwell-transitions/CirclesEffect.vala"  	g_return_if_fail (ctx != NULL);  #line 50 "/home/jens/Source/shotwell/plugins/shotwell-transitions/CirclesEffect.vala" -	_tmp0_ = motion; -#line 50 "/home/jens/Source/shotwell/plugins/shotwell-transitions/CirclesEffect.vala" -	_tmp1_ = frame_number; -#line 50 "/home/jens/Source/shotwell/plugins/shotwell-transitions/CirclesEffect.vala" -	_tmp2_ = spit_transitions_motion_get_alpha (_tmp0_, _tmp1_); -#line 50 "/home/jens/Source/shotwell/plugins/shotwell-transitions/CirclesEffect.vala" -	alpha = _tmp2_; +	alpha = spit_transitions_motion_get_alpha (motion, frame_number);  #line 51 "/home/jens/Source/shotwell/plugins/shotwell-transitions/CirclesEffect.vala"  	distance = 60;  #line 52 "/home/jens/Source/shotwell/plugins/shotwell-transitions/CirclesEffect.vala" -	_tmp3_ = width; -#line 52 "/home/jens/Source/shotwell/plugins/shotwell-transitions/CirclesEffect.vala" -	_tmp4_ = distance; +	_tmp0_ = distance;  #line 52 "/home/jens/Source/shotwell/plugins/shotwell-transitions/CirclesEffect.vala" -	circleCountX = _tmp3_ / (2 * _tmp4_); +	circleCountX = width / (2 * _tmp0_);  #line 53 "/home/jens/Source/shotwell/plugins/shotwell-transitions/CirclesEffect.vala" -	_tmp5_ = height; +	_tmp1_ = distance;  #line 53 "/home/jens/Source/shotwell/plugins/shotwell-transitions/CirclesEffect.vala" -	_tmp6_ = distance; -#line 53 "/home/jens/Source/shotwell/plugins/shotwell-transitions/CirclesEffect.vala" -	circleCountY = _tmp5_ / _tmp6_; +	circleCountY = height / _tmp1_;  #line 54 "/home/jens/Source/shotwell/plugins/shotwell-transitions/CirclesEffect.vala" -	_tmp7_ = distance; +	_tmp2_ = distance;  #line 54 "/home/jens/Source/shotwell/plugins/shotwell-transitions/CirclesEffect.vala" -	maxRadius = CIRCLES_EFFECT_SPEED * _tmp7_; -#line 56 "/home/jens/Source/shotwell/plugins/shotwell-transitions/CirclesEffect.vala" -	_tmp8_ = visuals; +	maxRadius = CIRCLES_EFFECT_SPEED * _tmp2_;  #line 56 "/home/jens/Source/shotwell/plugins/shotwell-transitions/CirclesEffect.vala" -	_tmp9_ = spit_transitions_visuals_get_from_pixbuf (_tmp8_); +	_tmp3_ = spit_transitions_visuals_get_from_pixbuf (visuals);  #line 56 "/home/jens/Source/shotwell/plugins/shotwell-transitions/CirclesEffect.vala" -	_tmp10_ = _tmp9_; +	_tmp4_ = _tmp3_;  #line 56 "/home/jens/Source/shotwell/plugins/shotwell-transitions/CirclesEffect.vala" -	if (_tmp10_ != NULL) { -#line 347 "CirclesEffect.c" -		cairo_t* _tmp11_; -		SpitTransitionsVisuals* _tmp12_; -		GdkPixbuf* _tmp13_; -		GdkPixbuf* _tmp14_; -		SpitTransitionsVisuals* _tmp15_; -		GdkRectangle _tmp16_ = {0}; -		GdkRectangle _tmp17_; -		gint _tmp18_; -		SpitTransitionsVisuals* _tmp19_; -		GdkRectangle _tmp20_ = {0}; -		GdkRectangle _tmp21_; -		gint _tmp22_; -		cairo_t* _tmp23_; -		gdouble _tmp24_; +	if (_tmp4_ != NULL) { +#line 386 "CirclesEffect.c" +		GdkPixbuf* _tmp5_; +		GdkPixbuf* _tmp6_; +		GdkRectangle _tmp7_ = {0}; +		GdkRectangle _tmp8_; +		gint _tmp9_; +		GdkRectangle _tmp10_ = {0}; +		GdkRectangle _tmp11_; +		gint _tmp12_; +		gdouble _tmp13_;  #line 57 "/home/jens/Source/shotwell/plugins/shotwell-transitions/CirclesEffect.vala" -		_tmp11_ = ctx; +		_tmp5_ = spit_transitions_visuals_get_from_pixbuf (visuals);  #line 57 "/home/jens/Source/shotwell/plugins/shotwell-transitions/CirclesEffect.vala" -		_tmp12_ = visuals; +		_tmp6_ = _tmp5_;  #line 57 "/home/jens/Source/shotwell/plugins/shotwell-transitions/CirclesEffect.vala" -		_tmp13_ = spit_transitions_visuals_get_from_pixbuf (_tmp12_); +		spit_transitions_visuals_get_from_pos (visuals, &_tmp7_);  #line 57 "/home/jens/Source/shotwell/plugins/shotwell-transitions/CirclesEffect.vala" -		_tmp14_ = _tmp13_; +		_tmp8_ = _tmp7_;  #line 57 "/home/jens/Source/shotwell/plugins/shotwell-transitions/CirclesEffect.vala" -		_tmp15_ = visuals; +		_tmp9_ = _tmp8_.x;  #line 57 "/home/jens/Source/shotwell/plugins/shotwell-transitions/CirclesEffect.vala" -		spit_transitions_visuals_get_from_pos (_tmp15_, &_tmp16_); +		spit_transitions_visuals_get_from_pos (visuals, &_tmp10_);  #line 57 "/home/jens/Source/shotwell/plugins/shotwell-transitions/CirclesEffect.vala" -		_tmp17_ = _tmp16_; -#line 57 "/home/jens/Source/shotwell/plugins/shotwell-transitions/CirclesEffect.vala" -		_tmp18_ = _tmp17_.x; -#line 57 "/home/jens/Source/shotwell/plugins/shotwell-transitions/CirclesEffect.vala" -		_tmp19_ = visuals; -#line 57 "/home/jens/Source/shotwell/plugins/shotwell-transitions/CirclesEffect.vala" -		spit_transitions_visuals_get_from_pos (_tmp19_, &_tmp20_); -#line 57 "/home/jens/Source/shotwell/plugins/shotwell-transitions/CirclesEffect.vala" -		_tmp21_ = _tmp20_; +		_tmp11_ = _tmp10_;  #line 57 "/home/jens/Source/shotwell/plugins/shotwell-transitions/CirclesEffect.vala" -		_tmp22_ = _tmp21_.y; +		_tmp12_ = _tmp11_.y;  #line 57 "/home/jens/Source/shotwell/plugins/shotwell-transitions/CirclesEffect.vala" -		gdk_cairo_set_source_pixbuf (_tmp11_, _tmp14_, (gdouble) _tmp18_, (gdouble) _tmp22_); +		gdk_cairo_set_source_pixbuf (ctx, _tmp6_, (gdouble) _tmp9_, (gdouble) _tmp12_);  #line 59 "/home/jens/Source/shotwell/plugins/shotwell-transitions/CirclesEffect.vala" -		_tmp23_ = ctx; +		_tmp13_ = alpha;  #line 59 "/home/jens/Source/shotwell/plugins/shotwell-transitions/CirclesEffect.vala" -		_tmp24_ = alpha; -#line 59 "/home/jens/Source/shotwell/plugins/shotwell-transitions/CirclesEffect.vala" -		cairo_paint_with_alpha (_tmp23_, 1 - _tmp24_); -#line 394 "CirclesEffect.c" +		cairo_paint_with_alpha (ctx, 1 - _tmp13_); +#line 418 "CirclesEffect.c"  	}  #line 62 "/home/jens/Source/shotwell/plugins/shotwell-transitions/CirclesEffect.vala" -	_tmp25_ = visuals; -#line 62 "/home/jens/Source/shotwell/plugins/shotwell-transitions/CirclesEffect.vala" -	_tmp26_ = spit_transitions_visuals_get_to_pixbuf (_tmp25_); +	_tmp14_ = spit_transitions_visuals_get_to_pixbuf (visuals);  #line 62 "/home/jens/Source/shotwell/plugins/shotwell-transitions/CirclesEffect.vala" -	_tmp27_ = _tmp26_; +	_tmp15_ = _tmp14_;  #line 62 "/home/jens/Source/shotwell/plugins/shotwell-transitions/CirclesEffect.vala" -	if (_tmp27_ != NULL) { -#line 404 "CirclesEffect.c" -		cairo_t* _tmp28_; -		SpitTransitionsVisuals* _tmp29_; -		GdkPixbuf* _tmp30_; -		GdkPixbuf* _tmp31_; -		SpitTransitionsVisuals* _tmp32_; -		GdkRectangle _tmp33_ = {0}; -		GdkRectangle _tmp34_; -		gint _tmp35_; -		SpitTransitionsVisuals* _tmp36_; -		GdkRectangle _tmp37_ = {0}; -		GdkRectangle _tmp38_; -		gint _tmp39_; -		cairo_t* _tmp63_; -		cairo_t* _tmp64_; -		gdouble _tmp65_; -#line 63 "/home/jens/Source/shotwell/plugins/shotwell-transitions/CirclesEffect.vala" -		_tmp28_ = ctx; -#line 63 "/home/jens/Source/shotwell/plugins/shotwell-transitions/CirclesEffect.vala" -		_tmp29_ = visuals; +	if (_tmp15_ != NULL) { +#line 426 "CirclesEffect.c" +		GdkPixbuf* _tmp16_; +		GdkPixbuf* _tmp17_; +		GdkRectangle _tmp18_ = {0}; +		GdkRectangle _tmp19_; +		gint _tmp20_; +		GdkRectangle _tmp21_ = {0}; +		GdkRectangle _tmp22_; +		gint _tmp23_; +		gdouble _tmp43_;  #line 63 "/home/jens/Source/shotwell/plugins/shotwell-transitions/CirclesEffect.vala" -		_tmp30_ = spit_transitions_visuals_get_to_pixbuf (_tmp29_); +		_tmp16_ = spit_transitions_visuals_get_to_pixbuf (visuals);  #line 63 "/home/jens/Source/shotwell/plugins/shotwell-transitions/CirclesEffect.vala" -		_tmp31_ = _tmp30_; -#line 63 "/home/jens/Source/shotwell/plugins/shotwell-transitions/CirclesEffect.vala" -		_tmp32_ = visuals; -#line 63 "/home/jens/Source/shotwell/plugins/shotwell-transitions/CirclesEffect.vala" -		spit_transitions_visuals_get_to_pos (_tmp32_, &_tmp33_); +		_tmp17_ = _tmp16_;  #line 63 "/home/jens/Source/shotwell/plugins/shotwell-transitions/CirclesEffect.vala" -		_tmp34_ = _tmp33_; +		spit_transitions_visuals_get_to_pos (visuals, &_tmp18_);  #line 63 "/home/jens/Source/shotwell/plugins/shotwell-transitions/CirclesEffect.vala" -		_tmp35_ = _tmp34_.x; +		_tmp19_ = _tmp18_;  #line 63 "/home/jens/Source/shotwell/plugins/shotwell-transitions/CirclesEffect.vala" -		_tmp36_ = visuals; +		_tmp20_ = _tmp19_.x;  #line 63 "/home/jens/Source/shotwell/plugins/shotwell-transitions/CirclesEffect.vala" -		spit_transitions_visuals_get_to_pos (_tmp36_, &_tmp37_); +		spit_transitions_visuals_get_to_pos (visuals, &_tmp21_);  #line 63 "/home/jens/Source/shotwell/plugins/shotwell-transitions/CirclesEffect.vala" -		_tmp38_ = _tmp37_; +		_tmp22_ = _tmp21_;  #line 63 "/home/jens/Source/shotwell/plugins/shotwell-transitions/CirclesEffect.vala" -		_tmp39_ = _tmp38_.y; +		_tmp23_ = _tmp22_.y;  #line 63 "/home/jens/Source/shotwell/plugins/shotwell-transitions/CirclesEffect.vala" -		gdk_cairo_set_source_pixbuf (_tmp28_, _tmp31_, (gdouble) _tmp35_, (gdouble) _tmp39_); -#line 446 "CirclesEffect.c" +		gdk_cairo_set_source_pixbuf (ctx, _tmp17_, (gdouble) _tmp20_, (gdouble) _tmp23_); +#line 454 "CirclesEffect.c"  		{  			gint y = 0;  #line 65 "/home/jens/Source/shotwell/plugins/shotwell-transitions/CirclesEffect.vala"  			y = 0; -#line 451 "CirclesEffect.c" +#line 459 "CirclesEffect.c"  			{ -				gboolean _tmp40_ = FALSE; +				gboolean _tmp24_ = FALSE;  #line 65 "/home/jens/Source/shotwell/plugins/shotwell-transitions/CirclesEffect.vala" -				_tmp40_ = TRUE; +				_tmp24_ = TRUE;  #line 65 "/home/jens/Source/shotwell/plugins/shotwell-transitions/CirclesEffect.vala"  				while (TRUE) { -#line 458 "CirclesEffect.c" -					gint _tmp42_; -					gint _tmp43_; +#line 466 "CirclesEffect.c" +					gint _tmp26_; +					gint _tmp27_;  #line 65 "/home/jens/Source/shotwell/plugins/shotwell-transitions/CirclesEffect.vala" -					if (!_tmp40_) { -#line 463 "CirclesEffect.c" -						gint _tmp41_; +					if (!_tmp24_) { +#line 471 "CirclesEffect.c" +						gint _tmp25_;  #line 65 "/home/jens/Source/shotwell/plugins/shotwell-transitions/CirclesEffect.vala" -						_tmp41_ = y; +						_tmp25_ = y;  #line 65 "/home/jens/Source/shotwell/plugins/shotwell-transitions/CirclesEffect.vala" -						y = _tmp41_ + 1; -#line 469 "CirclesEffect.c" +						y = _tmp25_ + 1; +#line 477 "CirclesEffect.c"  					}  #line 65 "/home/jens/Source/shotwell/plugins/shotwell-transitions/CirclesEffect.vala" -					_tmp40_ = FALSE; +					_tmp24_ = FALSE;  #line 65 "/home/jens/Source/shotwell/plugins/shotwell-transitions/CirclesEffect.vala" -					_tmp42_ = y; +					_tmp26_ = y;  #line 65 "/home/jens/Source/shotwell/plugins/shotwell-transitions/CirclesEffect.vala" -					_tmp43_ = circleCountY; +					_tmp27_ = circleCountY;  #line 65 "/home/jens/Source/shotwell/plugins/shotwell-transitions/CirclesEffect.vala" -					if (!(_tmp42_ <= _tmp43_)) { +					if (!(_tmp26_ <= _tmp27_)) {  #line 65 "/home/jens/Source/shotwell/plugins/shotwell-transitions/CirclesEffect.vala"  						break; -#line 481 "CirclesEffect.c" +#line 489 "CirclesEffect.c"  					}  					{  						gint x = 0;  #line 66 "/home/jens/Source/shotwell/plugins/shotwell-transitions/CirclesEffect.vala"  						x = 0; -#line 487 "CirclesEffect.c" +#line 495 "CirclesEffect.c"  						{ -							gboolean _tmp44_ = FALSE; +							gboolean _tmp28_ = FALSE;  #line 66 "/home/jens/Source/shotwell/plugins/shotwell-transitions/CirclesEffect.vala" -							_tmp44_ = TRUE; +							_tmp28_ = TRUE;  #line 66 "/home/jens/Source/shotwell/plugins/shotwell-transitions/CirclesEffect.vala"  							while (TRUE) { -#line 494 "CirclesEffect.c" -								gint _tmp46_; -								gint _tmp47_; -								gdouble _tmp48_; -								gint _tmp49_; -								gint _tmp50_; -								gint _tmp51_; -								gint _tmp52_; -								gdouble _tmp53_; -								gdouble _tmp54_; -								gdouble _tmp55_; -								cairo_t* _tmp56_; -								gint _tmp57_; -								gint _tmp58_; -								gint _tmp59_; -								gint _tmp60_; -								gint _tmp61_; -								cairo_t* _tmp62_; +#line 502 "CirclesEffect.c" +								gint _tmp30_; +								gint _tmp31_; +								gdouble _tmp32_; +								gint _tmp33_; +								gint _tmp34_; +								gint _tmp35_; +								gint _tmp36_; +								gdouble _tmp37_; +								gint _tmp38_; +								gint _tmp39_; +								gint _tmp40_; +								gint _tmp41_; +								gint _tmp42_;  #line 66 "/home/jens/Source/shotwell/plugins/shotwell-transitions/CirclesEffect.vala" -								if (!_tmp44_) { -#line 514 "CirclesEffect.c" -									gint _tmp45_; +								if (!_tmp28_) { +#line 518 "CirclesEffect.c" +									gint _tmp29_;  #line 66 "/home/jens/Source/shotwell/plugins/shotwell-transitions/CirclesEffect.vala" -									_tmp45_ = x; +									_tmp29_ = x;  #line 66 "/home/jens/Source/shotwell/plugins/shotwell-transitions/CirclesEffect.vala" -									x = _tmp45_ + 1; -#line 520 "CirclesEffect.c" +									x = _tmp29_ + 1; +#line 524 "CirclesEffect.c"  								}  #line 66 "/home/jens/Source/shotwell/plugins/shotwell-transitions/CirclesEffect.vala" -								_tmp44_ = FALSE; +								_tmp28_ = FALSE;  #line 66 "/home/jens/Source/shotwell/plugins/shotwell-transitions/CirclesEffect.vala" -								_tmp46_ = x; +								_tmp30_ = x;  #line 66 "/home/jens/Source/shotwell/plugins/shotwell-transitions/CirclesEffect.vala" -								_tmp47_ = circleCountX; +								_tmp31_ = circleCountX;  #line 66 "/home/jens/Source/shotwell/plugins/shotwell-transitions/CirclesEffect.vala" -								if (!(_tmp46_ <= _tmp47_)) { +								if (!(_tmp30_ <= _tmp31_)) {  #line 66 "/home/jens/Source/shotwell/plugins/shotwell-transitions/CirclesEffect.vala"  									break; -#line 532 "CirclesEffect.c" +#line 536 "CirclesEffect.c"  								}  #line 67 "/home/jens/Source/shotwell/plugins/shotwell-transitions/CirclesEffect.vala" -								_tmp48_ = alpha; -#line 67 "/home/jens/Source/shotwell/plugins/shotwell-transitions/CirclesEffect.vala" -								_tmp49_ = x; -#line 67 "/home/jens/Source/shotwell/plugins/shotwell-transitions/CirclesEffect.vala" -								_tmp50_ = y; +								_tmp32_ = alpha;  #line 67 "/home/jens/Source/shotwell/plugins/shotwell-transitions/CirclesEffect.vala" -								_tmp51_ = circleCountY; +								_tmp33_ = x;  #line 67 "/home/jens/Source/shotwell/plugins/shotwell-transitions/CirclesEffect.vala" -								_tmp52_ = circleCountX; +								_tmp34_ = y;  #line 67 "/home/jens/Source/shotwell/plugins/shotwell-transitions/CirclesEffect.vala" -								_tmp53_ = fmin ((gdouble) 1, _tmp48_ - (((gdouble) (_tmp49_ + _tmp50_)) / ((gdouble) ((_tmp51_ + _tmp52_) * CIRCLES_EFFECT_SPEED)))); +								_tmp35_ = circleCountY;  #line 67 "/home/jens/Source/shotwell/plugins/shotwell-transitions/CirclesEffect.vala" -								_tmp54_ = fmax ((gdouble) 0, _tmp53_); +								_tmp36_ = circleCountX;  #line 67 "/home/jens/Source/shotwell/plugins/shotwell-transitions/CirclesEffect.vala" -								_tmp55_ = maxRadius; +								_tmp37_ = maxRadius;  #line 67 "/home/jens/Source/shotwell/plugins/shotwell-transitions/CirclesEffect.vala" -								radius = (gint) (_tmp54_ * _tmp55_); +								radius = (gint) (fmax ((gdouble) 0, fmin ((gdouble) 1, _tmp32_ - (((gdouble) (_tmp33_ + _tmp34_)) / ((gdouble) ((_tmp35_ + _tmp36_) * CIRCLES_EFFECT_SPEED))))) * _tmp37_);  #line 69 "/home/jens/Source/shotwell/plugins/shotwell-transitions/CirclesEffect.vala" -								_tmp56_ = ctx; +								_tmp38_ = distance;  #line 69 "/home/jens/Source/shotwell/plugins/shotwell-transitions/CirclesEffect.vala" -								_tmp57_ = distance; +								_tmp39_ = x;  #line 69 "/home/jens/Source/shotwell/plugins/shotwell-transitions/CirclesEffect.vala" -								_tmp58_ = x; +								_tmp40_ = distance;  #line 69 "/home/jens/Source/shotwell/plugins/shotwell-transitions/CirclesEffect.vala" -								_tmp59_ = distance; +								_tmp41_ = y;  #line 69 "/home/jens/Source/shotwell/plugins/shotwell-transitions/CirclesEffect.vala" -								_tmp60_ = y; +								_tmp42_ = radius;  #line 69 "/home/jens/Source/shotwell/plugins/shotwell-transitions/CirclesEffect.vala" -								_tmp61_ = radius; -#line 69 "/home/jens/Source/shotwell/plugins/shotwell-transitions/CirclesEffect.vala" -								cairo_arc (_tmp56_, (gdouble) ((2 * _tmp57_) * _tmp58_), (gdouble) ((2 * _tmp59_) * _tmp60_), (gdouble) _tmp61_, (gdouble) 0, 2 * G_PI); -#line 70 "/home/jens/Source/shotwell/plugins/shotwell-transitions/CirclesEffect.vala" -								_tmp62_ = ctx; +								cairo_arc (ctx, (gdouble) ((2 * _tmp38_) * _tmp39_), (gdouble) ((2 * _tmp40_) * _tmp41_), (gdouble) _tmp42_, (gdouble) 0, 2 * G_PI);  #line 70 "/home/jens/Source/shotwell/plugins/shotwell-transitions/CirclesEffect.vala" -								cairo_fill (_tmp62_); -#line 570 "CirclesEffect.c" +								cairo_fill (ctx); +#line 566 "CirclesEffect.c"  							}  						}  					} @@ -574,21 +570,22 @@ static void circles_effect_real_paint (SpitTransitionsEffect* base, SpitTransiti  			}  		}  #line 74 "/home/jens/Source/shotwell/plugins/shotwell-transitions/CirclesEffect.vala" -		_tmp63_ = ctx; -#line 74 "/home/jens/Source/shotwell/plugins/shotwell-transitions/CirclesEffect.vala" -		cairo_clip (_tmp63_); -#line 75 "/home/jens/Source/shotwell/plugins/shotwell-transitions/CirclesEffect.vala" -		_tmp64_ = ctx; +		cairo_clip (ctx);  #line 75 "/home/jens/Source/shotwell/plugins/shotwell-transitions/CirclesEffect.vala" -		_tmp65_ = alpha; +		_tmp43_ = alpha;  #line 75 "/home/jens/Source/shotwell/plugins/shotwell-transitions/CirclesEffect.vala" -		cairo_paint_with_alpha (_tmp64_, _tmp65_); -#line 587 "CirclesEffect.c" +		cairo_paint_with_alpha (ctx, _tmp43_); +#line 579 "CirclesEffect.c"  	}  } -static void circles_effect_real_advance (SpitTransitionsEffect* base, SpitTransitionsVisuals* visuals, SpitTransitionsMotion* motion, gint frame_number) { +static void +circles_effect_real_advance (SpitTransitionsEffect* base, +                             SpitTransitionsVisuals* visuals, +                             SpitTransitionsMotion* motion, +                             gint frame_number) +{  	CirclesEffect * self;  #line 81 "/home/jens/Source/shotwell/plugins/shotwell-transitions/CirclesEffect.vala"  	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_CIRCLES_EFFECT, CirclesEffect); @@ -596,26 +593,32 @@ static void circles_effect_real_advance (SpitTransitionsEffect* base, SpitTransi  	g_return_if_fail (SPIT_TRANSITIONS_IS_VISUALS (visuals));  #line 81 "/home/jens/Source/shotwell/plugins/shotwell-transitions/CirclesEffect.vala"  	g_return_if_fail (SPIT_TRANSITIONS_IS_MOTION (motion)); -#line 600 "CirclesEffect.c" +#line 597 "CirclesEffect.c"  } -static void circles_effect_real_cancel (SpitTransitionsEffect* base) { +static void +circles_effect_real_cancel (SpitTransitionsEffect* base) +{  	CirclesEffect * self;  #line 84 "/home/jens/Source/shotwell/plugins/shotwell-transitions/CirclesEffect.vala"  	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_CIRCLES_EFFECT, CirclesEffect); -#line 608 "CirclesEffect.c" +#line 607 "CirclesEffect.c"  } -static void circles_effect_class_init (CirclesEffectClass * klass) { +static void +circles_effect_class_init (CirclesEffectClass * klass) +{  #line 28 "/home/jens/Source/shotwell/plugins/shotwell-transitions/CirclesEffect.vala"  	circles_effect_parent_class = g_type_class_peek_parent (klass); -#line 615 "CirclesEffect.c" +#line 616 "CirclesEffect.c"  } -static void circles_effect_spit_transitions_effect_interface_init (SpitTransitionsEffectIface * iface) { +static void +circles_effect_spit_transitions_effect_interface_init (SpitTransitionsEffectIface * iface) +{  #line 28 "/home/jens/Source/shotwell/plugins/shotwell-transitions/CirclesEffect.vala"  	circles_effect_spit_transitions_effect_parent_iface = g_type_interface_peek_parent (iface);  #line 28 "/home/jens/Source/shotwell/plugins/shotwell-transitions/CirclesEffect.vala" @@ -630,15 +633,19 @@ static void circles_effect_spit_transitions_effect_interface_init (SpitTransitio  	iface->advance = (void (*) (SpitTransitionsEffect *, SpitTransitionsVisuals*, SpitTransitionsMotion*, gint)) circles_effect_real_advance;  #line 28 "/home/jens/Source/shotwell/plugins/shotwell-transitions/CirclesEffect.vala"  	iface->cancel = (void (*) (SpitTransitionsEffect *)) circles_effect_real_cancel; -#line 634 "CirclesEffect.c" +#line 637 "CirclesEffect.c"  } -static void circles_effect_instance_init (CirclesEffect * self) { +static void +circles_effect_instance_init (CirclesEffect * self) +{  } -GType circles_effect_get_type (void) { +GType +circles_effect_get_type (void) +{  	static volatile gsize circles_effect_type_id__volatile = 0;  	if (g_once_init_enter (&circles_effect_type_id__volatile)) {  		static const GTypeInfo g_define_type_info = { sizeof (CirclesEffectClass), (GBaseInitFunc) NULL, (GBaseFinalizeFunc) NULL, (GClassInitFunc) circles_effect_class_init, (GClassFinalizeFunc) NULL, NULL, sizeof (CirclesEffect), 0, (GInstanceInitFunc) circles_effect_instance_init, NULL }; diff --git a/plugins/shotwell-transitions/ClockEffect.c b/plugins/shotwell-transitions/ClockEffect.c index c1f5257..f8f3748 100644 --- a/plugins/shotwell-transitions/ClockEffect.c +++ b/plugins/shotwell-transitions/ClockEffect.c @@ -1,4 +1,4 @@ -/* ClockEffect.c generated by valac 0.36.6, the Vala compiler +/* ClockEffect.c generated by valac 0.40.4, the Vala compiler   * generated from ClockEffect.vala, do not modify */  /* Copyright 2013 Jens Bav @@ -8,6 +8,7 @@   * (version 2.1 or later).  See the COPYING file in this distribution.   */ +  #include <glib.h>  #include <glib-object.h>  #include <shotwell-plugin-dev-1.0.h> @@ -42,6 +43,11 @@ typedef struct _ShotwellTransitionDescriptorPrivate ShotwellTransitionDescriptor  typedef struct _ClockEffectDescriptor ClockEffectDescriptor;  typedef struct _ClockEffectDescriptorClass ClockEffectDescriptorClass;  typedef struct _ClockEffectDescriptorPrivate ClockEffectDescriptorPrivate; +enum  { +	CLOCK_EFFECT_DESCRIPTOR_0_PROPERTY, +	CLOCK_EFFECT_DESCRIPTOR_NUM_PROPERTIES +}; +static GParamSpec* clock_effect_descriptor_properties[CLOCK_EFFECT_DESCRIPTOR_NUM_PROPERTIES];  #define TYPE_CLOCK_EFFECT (clock_effect_get_type ())  #define CLOCK_EFFECT(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), TYPE_CLOCK_EFFECT, ClockEffect)) @@ -53,6 +59,11 @@ typedef struct _ClockEffectDescriptorPrivate ClockEffectDescriptorPrivate;  typedef struct _ClockEffect ClockEffect;  typedef struct _ClockEffectClass ClockEffectClass;  typedef struct _ClockEffectPrivate ClockEffectPrivate; +enum  { +	CLOCK_EFFECT_0_PROPERTY, +	CLOCK_EFFECT_NUM_PROPERTIES +}; +static GParamSpec* clock_effect_properties[CLOCK_EFFECT_NUM_PROPERTIES];  struct _ShotwellTransitionDescriptor {  	GObject parent_instance; @@ -91,55 +102,69 @@ static SpitTransitionsEffectIface * clock_effect_spit_transitions_effect_parent_  GType shotwell_transition_descriptor_get_type (void) G_GNUC_CONST;  GType clock_effect_descriptor_get_type (void) G_GNUC_CONST; -enum  { -	CLOCK_EFFECT_DESCRIPTOR_DUMMY_PROPERTY -};  ClockEffectDescriptor* clock_effect_descriptor_new (GFile* resource_directory); -ClockEffectDescriptor* clock_effect_descriptor_construct (GType object_type, GFile* resource_directory); -ShotwellTransitionDescriptor* shotwell_transition_descriptor_construct (GType object_type, GFile* resource_directory); +ClockEffectDescriptor* clock_effect_descriptor_construct (GType object_type, +                                                          GFile* resource_directory); +ShotwellTransitionDescriptor* shotwell_transition_descriptor_construct (GType object_type, +                                                                        GFile* resource_directory);  static const gchar* clock_effect_descriptor_real_get_id (ShotwellTransitionDescriptor* base);  static const gchar* clock_effect_descriptor_real_get_pluggable_name (ShotwellTransitionDescriptor* base); -static SpitTransitionsEffect* clock_effect_descriptor_real_create (ShotwellTransitionDescriptor* base, SpitHostInterface* host); +static SpitTransitionsEffect* clock_effect_descriptor_real_create (ShotwellTransitionDescriptor* base, +                                                            SpitHostInterface* host);  ClockEffect* clock_effect_new (void);  ClockEffect* clock_effect_construct (GType object_type);  GType clock_effect_get_type (void) G_GNUC_CONST; -enum  { -	CLOCK_EFFECT_DUMMY_PROPERTY -};  #define CLOCK_EFFECT_DESIRED_FPS 25  #define CLOCK_EFFECT_MIN_FPS 15  #define CLOCK_EFFECT_TOP_RADIANT (0.5 * G_PI) -static void clock_effect_real_get_fps (SpitTransitionsEffect* base, gint* desired_fps, gint* min_fps); -static void clock_effect_real_start (SpitTransitionsEffect* base, SpitTransitionsVisuals* visuals, SpitTransitionsMotion* motion); +static void clock_effect_real_get_fps (SpitTransitionsEffect* base, +                                gint* desired_fps, +                                gint* min_fps); +static void clock_effect_real_start (SpitTransitionsEffect* base, +                              SpitTransitionsVisuals* visuals, +                              SpitTransitionsMotion* motion);  static gboolean clock_effect_real_needs_clear_background (SpitTransitionsEffect* base); -static void clock_effect_real_paint (SpitTransitionsEffect* base, SpitTransitionsVisuals* visuals, SpitTransitionsMotion* motion, cairo_t* ctx, gint width, gint height, gint frame_number); -static void clock_effect_real_advance (SpitTransitionsEffect* base, SpitTransitionsVisuals* visuals, SpitTransitionsMotion* motion, gint frame_number); +static void clock_effect_real_paint (SpitTransitionsEffect* base, +                              SpitTransitionsVisuals* visuals, +                              SpitTransitionsMotion* motion, +                              cairo_t* ctx, +                              gint width, +                              gint height, +                              gint frame_number); +static void clock_effect_real_advance (SpitTransitionsEffect* base, +                                SpitTransitionsVisuals* visuals, +                                SpitTransitionsMotion* motion, +                                gint frame_number);  static void clock_effect_real_cancel (SpitTransitionsEffect* base); -ClockEffectDescriptor* clock_effect_descriptor_construct (GType object_type, GFile* resource_directory) { +ClockEffectDescriptor* +clock_effect_descriptor_construct (GType object_type, +                                   GFile* resource_directory) +{  	ClockEffectDescriptor * self = NULL; -	GFile* _tmp0_;  #line 11 "/home/jens/Source/shotwell/plugins/shotwell-transitions/ClockEffect.vala"  	g_return_val_if_fail (G_IS_FILE (resource_directory), NULL);  #line 12 "/home/jens/Source/shotwell/plugins/shotwell-transitions/ClockEffect.vala" -	_tmp0_ = resource_directory; -#line 12 "/home/jens/Source/shotwell/plugins/shotwell-transitions/ClockEffect.vala" -	self = (ClockEffectDescriptor*) shotwell_transition_descriptor_construct (object_type, _tmp0_); +	self = (ClockEffectDescriptor*) shotwell_transition_descriptor_construct (object_type, resource_directory);  #line 11 "/home/jens/Source/shotwell/plugins/shotwell-transitions/ClockEffect.vala"  	return self; -#line 132 "ClockEffect.c" +#line 153 "ClockEffect.c"  } -ClockEffectDescriptor* clock_effect_descriptor_new (GFile* resource_directory) { +ClockEffectDescriptor* +clock_effect_descriptor_new (GFile* resource_directory) +{  #line 11 "/home/jens/Source/shotwell/plugins/shotwell-transitions/ClockEffect.vala"  	return clock_effect_descriptor_construct (TYPE_CLOCK_EFFECT_DESCRIPTOR, resource_directory); -#line 139 "ClockEffect.c" +#line 162 "ClockEffect.c"  } -static const gchar* clock_effect_descriptor_real_get_id (ShotwellTransitionDescriptor* base) { +static const gchar* +clock_effect_descriptor_real_get_id (ShotwellTransitionDescriptor* base) +{  	ClockEffectDescriptor * self;  	const gchar* result = NULL;  #line 15 "/home/jens/Source/shotwell/plugins/shotwell-transitions/ClockEffect.vala" @@ -148,11 +173,13 @@ static const gchar* clock_effect_descriptor_real_get_id (ShotwellTransitionDescr  	result = "org.yorba.shotwell.transitions.clock";  #line 16 "/home/jens/Source/shotwell/plugins/shotwell-transitions/ClockEffect.vala"  	return result; -#line 152 "ClockEffect.c" +#line 177 "ClockEffect.c"  } -static const gchar* clock_effect_descriptor_real_get_pluggable_name (ShotwellTransitionDescriptor* base) { +static const gchar* +clock_effect_descriptor_real_get_pluggable_name (ShotwellTransitionDescriptor* base) +{  	ClockEffectDescriptor * self;  	const gchar* result = NULL;  #line 19 "/home/jens/Source/shotwell/plugins/shotwell-transitions/ClockEffect.vala" @@ -161,11 +188,14 @@ static const gchar* clock_effect_descriptor_real_get_pluggable_name (ShotwellTra  	result = _ ("Clock");  #line 20 "/home/jens/Source/shotwell/plugins/shotwell-transitions/ClockEffect.vala"  	return result; -#line 165 "ClockEffect.c" +#line 192 "ClockEffect.c"  } -static SpitTransitionsEffect* clock_effect_descriptor_real_create (ShotwellTransitionDescriptor* base, SpitHostInterface* host) { +static SpitTransitionsEffect* +clock_effect_descriptor_real_create (ShotwellTransitionDescriptor* base, +                                     SpitHostInterface* host) +{  	ClockEffectDescriptor * self;  	SpitTransitionsEffect* result = NULL;  	ClockEffect* _tmp0_; @@ -179,11 +209,13 @@ static SpitTransitionsEffect* clock_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/ClockEffect.vala"  	return result; -#line 183 "ClockEffect.c" +#line 213 "ClockEffect.c"  } -static void clock_effect_descriptor_class_init (ClockEffectDescriptorClass * klass) { +static void +clock_effect_descriptor_class_init (ClockEffectDescriptorClass * klass) +{  #line 10 "/home/jens/Source/shotwell/plugins/shotwell-transitions/ClockEffect.vala"  	clock_effect_descriptor_parent_class = g_type_class_peek_parent (klass);  #line 10 "/home/jens/Source/shotwell/plugins/shotwell-transitions/ClockEffect.vala" @@ -192,15 +224,19 @@ static void clock_effect_descriptor_class_init (ClockEffectDescriptorClass * kla  	((ShotwellTransitionDescriptorClass *) klass)->get_pluggable_name = (const gchar* (*) (ShotwellTransitionDescriptor *)) clock_effect_descriptor_real_get_pluggable_name;  #line 10 "/home/jens/Source/shotwell/plugins/shotwell-transitions/ClockEffect.vala"  	((ShotwellTransitionDescriptorClass *) klass)->create = (SpitTransitionsEffect* (*) (ShotwellTransitionDescriptor *, SpitHostInterface*)) clock_effect_descriptor_real_create; -#line 196 "ClockEffect.c" +#line 228 "ClockEffect.c"  } -static void clock_effect_descriptor_instance_init (ClockEffectDescriptor * self) { +static void +clock_effect_descriptor_instance_init (ClockEffectDescriptor * self) +{  } -GType clock_effect_descriptor_get_type (void) { +GType +clock_effect_descriptor_get_type (void) +{  	static volatile gsize clock_effect_descriptor_type_id__volatile = 0;  	if (g_once_init_enter (&clock_effect_descriptor_type_id__volatile)) {  		static const GTypeInfo g_define_type_info = { sizeof (ClockEffectDescriptorClass), (GBaseInitFunc) NULL, (GBaseFinalizeFunc) NULL, (GClassInitFunc) clock_effect_descriptor_class_init, (GClassFinalizeFunc) NULL, NULL, sizeof (ClockEffectDescriptor), 0, (GInstanceInitFunc) clock_effect_descriptor_instance_init, NULL }; @@ -212,24 +248,32 @@ GType clock_effect_descriptor_get_type (void) {  } -ClockEffect* clock_effect_construct (GType object_type) { +ClockEffect* +clock_effect_construct (GType object_type) +{  	ClockEffect * self = NULL;  #line 33 "/home/jens/Source/shotwell/plugins/shotwell-transitions/ClockEffect.vala"  	self = (ClockEffect*) g_object_new (object_type, NULL);  #line 33 "/home/jens/Source/shotwell/plugins/shotwell-transitions/ClockEffect.vala"  	return self; -#line 222 "ClockEffect.c" +#line 260 "ClockEffect.c"  } -ClockEffect* clock_effect_new (void) { +ClockEffect* +clock_effect_new (void) +{  #line 33 "/home/jens/Source/shotwell/plugins/shotwell-transitions/ClockEffect.vala"  	return clock_effect_construct (TYPE_CLOCK_EFFECT); -#line 229 "ClockEffect.c" +#line 269 "ClockEffect.c"  } -static void clock_effect_real_get_fps (SpitTransitionsEffect* base, gint* desired_fps, gint* min_fps) { +static void +clock_effect_real_get_fps (SpitTransitionsEffect* base, +                           gint* desired_fps, +                           gint* min_fps) +{  	ClockEffect * self;  	gint _vala_desired_fps = 0;  	gint _vala_min_fps = 0; @@ -243,18 +287,22 @@ static void clock_effect_real_get_fps (SpitTransitionsEffect* base, gint* desire  	if (desired_fps) {  #line 36 "/home/jens/Source/shotwell/plugins/shotwell-transitions/ClockEffect.vala"  		*desired_fps = _vala_desired_fps; -#line 247 "ClockEffect.c" +#line 291 "ClockEffect.c"  	}  #line 36 "/home/jens/Source/shotwell/plugins/shotwell-transitions/ClockEffect.vala"  	if (min_fps) {  #line 36 "/home/jens/Source/shotwell/plugins/shotwell-transitions/ClockEffect.vala"  		*min_fps = _vala_min_fps; -#line 253 "ClockEffect.c" +#line 297 "ClockEffect.c"  	}  } -static void clock_effect_real_start (SpitTransitionsEffect* base, SpitTransitionsVisuals* visuals, SpitTransitionsMotion* motion) { +static void +clock_effect_real_start (SpitTransitionsEffect* base, +                         SpitTransitionsVisuals* visuals, +                         SpitTransitionsMotion* motion) +{  	ClockEffect * self;  #line 41 "/home/jens/Source/shotwell/plugins/shotwell-transitions/ClockEffect.vala"  	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_CLOCK_EFFECT, ClockEffect); @@ -262,11 +310,13 @@ static void clock_effect_real_start (SpitTransitionsEffect* base, SpitTransition  	g_return_if_fail (SPIT_TRANSITIONS_IS_VISUALS (visuals));  #line 41 "/home/jens/Source/shotwell/plugins/shotwell-transitions/ClockEffect.vala"  	g_return_if_fail (SPIT_TRANSITIONS_IS_MOTION (motion)); -#line 266 "ClockEffect.c" +#line 314 "ClockEffect.c"  } -static gboolean clock_effect_real_needs_clear_background (SpitTransitionsEffect* base) { +static gboolean +clock_effect_real_needs_clear_background (SpitTransitionsEffect* base) +{  	ClockEffect * self;  	gboolean result = FALSE;  #line 44 "/home/jens/Source/shotwell/plugins/shotwell-transitions/ClockEffect.vala" @@ -275,37 +325,36 @@ static gboolean clock_effect_real_needs_clear_background (SpitTransitionsEffect*  	result = TRUE;  #line 45 "/home/jens/Source/shotwell/plugins/shotwell-transitions/ClockEffect.vala"  	return result; -#line 279 "ClockEffect.c" +#line 329 "ClockEffect.c"  } -static void clock_effect_real_paint (SpitTransitionsEffect* base, SpitTransitionsVisuals* visuals, SpitTransitionsMotion* motion, cairo_t* ctx, gint width, gint height, gint frame_number) { +static void +clock_effect_real_paint (SpitTransitionsEffect* base, +                         SpitTransitionsVisuals* visuals, +                         SpitTransitionsMotion* motion, +                         cairo_t* ctx, +                         gint width, +                         gint height, +                         gint frame_number) +{  	ClockEffect * self;  	gdouble alpha = 0.0; -	SpitTransitionsMotion* _tmp0_; -	gint _tmp1_; -	gdouble _tmp2_;  	gdouble start_angle = 0.0;  	gdouble stop_angle = 0.0; -	SpitTransitionsMotion* _tmp3_; -	SpitTransitionsDirection _tmp4_; -	SpitTransitionsDirection _tmp5_; +	SpitTransitionsDirection _tmp0_; +	SpitTransitionsDirection _tmp1_;  	gint radius = 0; -	SpitTransitionsVisuals* _tmp8_; -	GdkRectangle _tmp9_ = {0}; -	GdkRectangle _tmp10_; -	gint _tmp11_; -	SpitTransitionsVisuals* _tmp12_; -	GdkRectangle _tmp13_ = {0}; -	GdkRectangle _tmp14_; -	gint _tmp15_; -	gdouble _tmp16_; -	SpitTransitionsVisuals* _tmp17_; -	GdkPixbuf* _tmp18_; -	GdkPixbuf* _tmp19_; -	SpitTransitionsVisuals* _tmp34_; -	GdkPixbuf* _tmp35_; -	GdkPixbuf* _tmp36_; +	GdkRectangle _tmp4_ = {0}; +	GdkRectangle _tmp5_; +	gint _tmp6_; +	GdkRectangle _tmp7_ = {0}; +	GdkRectangle _tmp8_; +	gint _tmp9_; +	GdkPixbuf* _tmp10_; +	GdkPixbuf* _tmp11_; +	GdkPixbuf* _tmp21_; +	GdkPixbuf* _tmp22_;  #line 48 "/home/jens/Source/shotwell/plugins/shotwell-transitions/ClockEffect.vala"  	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_CLOCK_EFFECT, ClockEffect);  #line 48 "/home/jens/Source/shotwell/plugins/shotwell-transitions/ClockEffect.vala" @@ -315,260 +364,199 @@ static void clock_effect_real_paint (SpitTransitionsEffect* base, SpitTransition  #line 48 "/home/jens/Source/shotwell/plugins/shotwell-transitions/ClockEffect.vala"  	g_return_if_fail (ctx != NULL);  #line 50 "/home/jens/Source/shotwell/plugins/shotwell-transitions/ClockEffect.vala" -	_tmp0_ = motion; -#line 50 "/home/jens/Source/shotwell/plugins/shotwell-transitions/ClockEffect.vala" -	_tmp1_ = frame_number; -#line 50 "/home/jens/Source/shotwell/plugins/shotwell-transitions/ClockEffect.vala" -	_tmp2_ = spit_transitions_motion_get_alpha (_tmp0_, _tmp1_); -#line 50 "/home/jens/Source/shotwell/plugins/shotwell-transitions/ClockEffect.vala" -	alpha = _tmp2_; +	alpha = spit_transitions_motion_get_alpha (motion, frame_number);  #line 51 "/home/jens/Source/shotwell/plugins/shotwell-transitions/ClockEffect.vala"  	start_angle = -CLOCK_EFFECT_TOP_RADIANT;  #line 51 "/home/jens/Source/shotwell/plugins/shotwell-transitions/ClockEffect.vala"  	stop_angle = -CLOCK_EFFECT_TOP_RADIANT;  #line 53 "/home/jens/Source/shotwell/plugins/shotwell-transitions/ClockEffect.vala" -	_tmp3_ = motion; +	_tmp0_ = spit_transitions_motion_get_direction (motion);  #line 53 "/home/jens/Source/shotwell/plugins/shotwell-transitions/ClockEffect.vala" -	_tmp4_ = spit_transitions_motion_get_direction (_tmp3_); +	_tmp1_ = _tmp0_;  #line 53 "/home/jens/Source/shotwell/plugins/shotwell-transitions/ClockEffect.vala" -	_tmp5_ = _tmp4_; -#line 53 "/home/jens/Source/shotwell/plugins/shotwell-transitions/ClockEffect.vala" -	if (_tmp5_ == SPIT_TRANSITIONS_DIRECTION_FORWARD) { -#line 338 "ClockEffect.c" -		gdouble _tmp6_; +	if (_tmp1_ == SPIT_TRANSITIONS_DIRECTION_FORWARD) { +#line 379 "ClockEffect.c" +		gdouble _tmp2_;  #line 54 "/home/jens/Source/shotwell/plugins/shotwell-transitions/ClockEffect.vala" -		_tmp6_ = alpha; +		_tmp2_ = alpha;  #line 54 "/home/jens/Source/shotwell/plugins/shotwell-transitions/ClockEffect.vala" -		stop_angle = ((_tmp6_ * G_PI) * 2) - CLOCK_EFFECT_TOP_RADIANT; -#line 344 "ClockEffect.c" +		stop_angle = ((_tmp2_ * G_PI) * 2) - CLOCK_EFFECT_TOP_RADIANT; +#line 385 "ClockEffect.c"  	} else { -		gdouble _tmp7_; +		gdouble _tmp3_;  #line 56 "/home/jens/Source/shotwell/plugins/shotwell-transitions/ClockEffect.vala" -		_tmp7_ = alpha; +		_tmp3_ = alpha;  #line 56 "/home/jens/Source/shotwell/plugins/shotwell-transitions/ClockEffect.vala" -		start_angle = ((2 * (1 - _tmp7_)) * G_PI) - CLOCK_EFFECT_TOP_RADIANT; -#line 351 "ClockEffect.c" +		start_angle = ((2 * (1 - _tmp3_)) * G_PI) - CLOCK_EFFECT_TOP_RADIANT; +#line 392 "ClockEffect.c"  	}  #line 58 "/home/jens/Source/shotwell/plugins/shotwell-transitions/ClockEffect.vala" -	_tmp8_ = visuals; -#line 58 "/home/jens/Source/shotwell/plugins/shotwell-transitions/ClockEffect.vala" -	spit_transitions_visuals_get_to_pos (_tmp8_, &_tmp9_); -#line 58 "/home/jens/Source/shotwell/plugins/shotwell-transitions/ClockEffect.vala" -	_tmp10_ = _tmp9_; +	spit_transitions_visuals_get_to_pos (visuals, &_tmp4_);  #line 58 "/home/jens/Source/shotwell/plugins/shotwell-transitions/ClockEffect.vala" -	_tmp11_ = _tmp10_.width; -#line 58 "/home/jens/Source/shotwell/plugins/shotwell-transitions/ClockEffect.vala" -	_tmp12_ = visuals; +	_tmp5_ = _tmp4_;  #line 58 "/home/jens/Source/shotwell/plugins/shotwell-transitions/ClockEffect.vala" -	spit_transitions_visuals_get_to_pos (_tmp12_, &_tmp13_); +	_tmp6_ = _tmp5_.width;  #line 58 "/home/jens/Source/shotwell/plugins/shotwell-transitions/ClockEffect.vala" -	_tmp14_ = _tmp13_; +	spit_transitions_visuals_get_to_pos (visuals, &_tmp7_);  #line 58 "/home/jens/Source/shotwell/plugins/shotwell-transitions/ClockEffect.vala" -	_tmp15_ = _tmp14_.height; +	_tmp8_ = _tmp7_;  #line 58 "/home/jens/Source/shotwell/plugins/shotwell-transitions/ClockEffect.vala" -	_tmp16_ = fmax ((gdouble) _tmp11_, (gdouble) _tmp15_); +	_tmp9_ = _tmp8_.height;  #line 58 "/home/jens/Source/shotwell/plugins/shotwell-transitions/ClockEffect.vala" -	radius = (gint) _tmp16_; -#line 60 "/home/jens/Source/shotwell/plugins/shotwell-transitions/ClockEffect.vala" -	_tmp17_ = visuals; +	radius = (gint) fmax ((gdouble) _tmp6_, (gdouble) _tmp9_);  #line 60 "/home/jens/Source/shotwell/plugins/shotwell-transitions/ClockEffect.vala" -	_tmp18_ = spit_transitions_visuals_get_from_pixbuf (_tmp17_); +	_tmp10_ = spit_transitions_visuals_get_from_pixbuf (visuals);  #line 60 "/home/jens/Source/shotwell/plugins/shotwell-transitions/ClockEffect.vala" -	_tmp19_ = _tmp18_; +	_tmp11_ = _tmp10_;  #line 60 "/home/jens/Source/shotwell/plugins/shotwell-transitions/ClockEffect.vala" -	if (_tmp19_ != NULL) { -#line 381 "ClockEffect.c" -		cairo_t* _tmp20_; -		SpitTransitionsVisuals* _tmp21_; -		GdkPixbuf* _tmp22_; -		GdkPixbuf* _tmp23_; -		SpitTransitionsVisuals* _tmp24_; -		GdkRectangle _tmp25_ = {0}; -		GdkRectangle _tmp26_; -		gint _tmp27_; -		SpitTransitionsVisuals* _tmp28_; -		GdkRectangle _tmp29_ = {0}; -		GdkRectangle _tmp30_; -		gint _tmp31_; -		cairo_t* _tmp32_; -		gdouble _tmp33_; +	if (_tmp11_ != NULL) { +#line 414 "ClockEffect.c" +		GdkPixbuf* _tmp12_; +		GdkPixbuf* _tmp13_; +		GdkRectangle _tmp14_ = {0}; +		GdkRectangle _tmp15_; +		gint _tmp16_; +		GdkRectangle _tmp17_ = {0}; +		GdkRectangle _tmp18_; +		gint _tmp19_; +		gdouble _tmp20_;  #line 61 "/home/jens/Source/shotwell/plugins/shotwell-transitions/ClockEffect.vala" -		_tmp20_ = ctx; +		_tmp12_ = spit_transitions_visuals_get_from_pixbuf (visuals);  #line 61 "/home/jens/Source/shotwell/plugins/shotwell-transitions/ClockEffect.vala" -		_tmp21_ = visuals; +		_tmp13_ = _tmp12_;  #line 61 "/home/jens/Source/shotwell/plugins/shotwell-transitions/ClockEffect.vala" -		_tmp22_ = spit_transitions_visuals_get_from_pixbuf (_tmp21_); +		spit_transitions_visuals_get_from_pos (visuals, &_tmp14_);  #line 61 "/home/jens/Source/shotwell/plugins/shotwell-transitions/ClockEffect.vala" -		_tmp23_ = _tmp22_; +		_tmp15_ = _tmp14_;  #line 61 "/home/jens/Source/shotwell/plugins/shotwell-transitions/ClockEffect.vala" -		_tmp24_ = visuals; +		_tmp16_ = _tmp15_.x;  #line 61 "/home/jens/Source/shotwell/plugins/shotwell-transitions/ClockEffect.vala" -		spit_transitions_visuals_get_from_pos (_tmp24_, &_tmp25_); +		spit_transitions_visuals_get_from_pos (visuals, &_tmp17_);  #line 61 "/home/jens/Source/shotwell/plugins/shotwell-transitions/ClockEffect.vala" -		_tmp26_ = _tmp25_; +		_tmp18_ = _tmp17_;  #line 61 "/home/jens/Source/shotwell/plugins/shotwell-transitions/ClockEffect.vala" -		_tmp27_ = _tmp26_.x; +		_tmp19_ = _tmp18_.y;  #line 61 "/home/jens/Source/shotwell/plugins/shotwell-transitions/ClockEffect.vala" -		_tmp28_ = visuals; -#line 61 "/home/jens/Source/shotwell/plugins/shotwell-transitions/ClockEffect.vala" -		spit_transitions_visuals_get_from_pos (_tmp28_, &_tmp29_); -#line 61 "/home/jens/Source/shotwell/plugins/shotwell-transitions/ClockEffect.vala" -		_tmp30_ = _tmp29_; -#line 61 "/home/jens/Source/shotwell/plugins/shotwell-transitions/ClockEffect.vala" -		_tmp31_ = _tmp30_.y; -#line 61 "/home/jens/Source/shotwell/plugins/shotwell-transitions/ClockEffect.vala" -		gdk_cairo_set_source_pixbuf (_tmp20_, _tmp23_, (gdouble) _tmp27_, (gdouble) _tmp31_); +		gdk_cairo_set_source_pixbuf (ctx, _tmp13_, (gdouble) _tmp16_, (gdouble) _tmp19_);  #line 63 "/home/jens/Source/shotwell/plugins/shotwell-transitions/ClockEffect.vala" -		_tmp32_ = ctx; +		_tmp20_ = alpha;  #line 63 "/home/jens/Source/shotwell/plugins/shotwell-transitions/ClockEffect.vala" -		_tmp33_ = alpha; -#line 63 "/home/jens/Source/shotwell/plugins/shotwell-transitions/ClockEffect.vala" -		cairo_paint_with_alpha (_tmp32_, 1 - _tmp33_); -#line 428 "ClockEffect.c" +		cairo_paint_with_alpha (ctx, 1 - _tmp20_); +#line 446 "ClockEffect.c"  	}  #line 66 "/home/jens/Source/shotwell/plugins/shotwell-transitions/ClockEffect.vala" -	_tmp34_ = visuals; -#line 66 "/home/jens/Source/shotwell/plugins/shotwell-transitions/ClockEffect.vala" -	_tmp35_ = spit_transitions_visuals_get_to_pixbuf (_tmp34_); +	_tmp21_ = spit_transitions_visuals_get_to_pixbuf (visuals);  #line 66 "/home/jens/Source/shotwell/plugins/shotwell-transitions/ClockEffect.vala" -	_tmp36_ = _tmp35_; +	_tmp22_ = _tmp21_;  #line 66 "/home/jens/Source/shotwell/plugins/shotwell-transitions/ClockEffect.vala" -	if (_tmp36_ != NULL) { -#line 438 "ClockEffect.c" -		cairo_t* _tmp37_; -		SpitTransitionsVisuals* _tmp38_; -		GdkPixbuf* _tmp39_; -		GdkPixbuf* _tmp40_; -		SpitTransitionsVisuals* _tmp41_; -		GdkRectangle _tmp42_ = {0}; -		GdkRectangle _tmp43_; -		gint _tmp44_; -		SpitTransitionsVisuals* _tmp45_; -		GdkRectangle _tmp46_ = {0}; -		GdkRectangle _tmp47_; -		gint _tmp48_; +	if (_tmp22_ != NULL) { +#line 454 "ClockEffect.c" +		GdkPixbuf* _tmp23_; +		GdkPixbuf* _tmp24_; +		GdkRectangle _tmp25_ = {0}; +		GdkRectangle _tmp26_; +		gint _tmp27_; +		GdkRectangle _tmp28_ = {0}; +		GdkRectangle _tmp29_; +		gint _tmp30_;  		gint x = 0; -		SpitTransitionsVisuals* _tmp49_; -		GdkRectangle _tmp50_ = {0}; -		GdkRectangle _tmp51_; -		gint _tmp52_; -		SpitTransitionsVisuals* _tmp53_; -		GdkRectangle _tmp54_ = {0}; -		GdkRectangle _tmp55_; -		gint _tmp56_; +		GdkRectangle _tmp31_ = {0}; +		GdkRectangle _tmp32_; +		gint _tmp33_; +		GdkRectangle _tmp34_ = {0}; +		GdkRectangle _tmp35_; +		gint _tmp36_;  		gint y = 0; -		SpitTransitionsVisuals* _tmp57_; -		GdkRectangle _tmp58_ = {0}; -		GdkRectangle _tmp59_; -		gint _tmp60_; -		SpitTransitionsVisuals* _tmp61_; -		GdkRectangle _tmp62_ = {0}; -		GdkRectangle _tmp63_; -		gint _tmp64_; -		cairo_t* _tmp65_; -		gint _tmp66_; -		gint _tmp67_; -		cairo_t* _tmp68_; -		gint _tmp69_; -		gint _tmp70_; -		gint _tmp71_; -		gdouble _tmp72_; -		gdouble _tmp73_; -		cairo_t* _tmp74_; -#line 67 "/home/jens/Source/shotwell/plugins/shotwell-transitions/ClockEffect.vala" -		_tmp37_ = ctx; -#line 67 "/home/jens/Source/shotwell/plugins/shotwell-transitions/ClockEffect.vala" -		_tmp38_ = visuals; -#line 67 "/home/jens/Source/shotwell/plugins/shotwell-transitions/ClockEffect.vala" -		_tmp39_ = spit_transitions_visuals_get_to_pixbuf (_tmp38_); -#line 67 "/home/jens/Source/shotwell/plugins/shotwell-transitions/ClockEffect.vala" -		_tmp40_ = _tmp39_; +		GdkRectangle _tmp37_ = {0}; +		GdkRectangle _tmp38_; +		gint _tmp39_; +		GdkRectangle _tmp40_ = {0}; +		GdkRectangle _tmp41_; +		gint _tmp42_; +		gint _tmp43_; +		gint _tmp44_; +		gint _tmp45_; +		gint _tmp46_; +		gint _tmp47_; +		gdouble _tmp48_; +		gdouble _tmp49_;  #line 67 "/home/jens/Source/shotwell/plugins/shotwell-transitions/ClockEffect.vala" -		_tmp41_ = visuals; +		_tmp23_ = spit_transitions_visuals_get_to_pixbuf (visuals);  #line 67 "/home/jens/Source/shotwell/plugins/shotwell-transitions/ClockEffect.vala" -		spit_transitions_visuals_get_to_pos (_tmp41_, &_tmp42_); +		_tmp24_ = _tmp23_;  #line 67 "/home/jens/Source/shotwell/plugins/shotwell-transitions/ClockEffect.vala" -		_tmp43_ = _tmp42_; +		spit_transitions_visuals_get_to_pos (visuals, &_tmp25_);  #line 67 "/home/jens/Source/shotwell/plugins/shotwell-transitions/ClockEffect.vala" -		_tmp44_ = _tmp43_.x; +		_tmp26_ = _tmp25_;  #line 67 "/home/jens/Source/shotwell/plugins/shotwell-transitions/ClockEffect.vala" -		_tmp45_ = visuals; +		_tmp27_ = _tmp26_.x;  #line 67 "/home/jens/Source/shotwell/plugins/shotwell-transitions/ClockEffect.vala" -		spit_transitions_visuals_get_to_pos (_tmp45_, &_tmp46_); +		spit_transitions_visuals_get_to_pos (visuals, &_tmp28_);  #line 67 "/home/jens/Source/shotwell/plugins/shotwell-transitions/ClockEffect.vala" -		_tmp47_ = _tmp46_; +		_tmp29_ = _tmp28_;  #line 67 "/home/jens/Source/shotwell/plugins/shotwell-transitions/ClockEffect.vala" -		_tmp48_ = _tmp47_.y; +		_tmp30_ = _tmp29_.y;  #line 67 "/home/jens/Source/shotwell/plugins/shotwell-transitions/ClockEffect.vala" -		gdk_cairo_set_source_pixbuf (_tmp37_, _tmp40_, (gdouble) _tmp44_, (gdouble) _tmp48_); -#line 69 "/home/jens/Source/shotwell/plugins/shotwell-transitions/ClockEffect.vala" -		_tmp49_ = visuals; +		gdk_cairo_set_source_pixbuf (ctx, _tmp24_, (gdouble) _tmp27_, (gdouble) _tmp30_);  #line 69 "/home/jens/Source/shotwell/plugins/shotwell-transitions/ClockEffect.vala" -		spit_transitions_visuals_get_to_pos (_tmp49_, &_tmp50_); +		spit_transitions_visuals_get_to_pos (visuals, &_tmp31_);  #line 69 "/home/jens/Source/shotwell/plugins/shotwell-transitions/ClockEffect.vala" -		_tmp51_ = _tmp50_; +		_tmp32_ = _tmp31_;  #line 69 "/home/jens/Source/shotwell/plugins/shotwell-transitions/ClockEffect.vala" -		_tmp52_ = _tmp51_.x; +		_tmp33_ = _tmp32_.x;  #line 69 "/home/jens/Source/shotwell/plugins/shotwell-transitions/ClockEffect.vala" -		_tmp53_ = visuals; +		spit_transitions_visuals_get_to_pos (visuals, &_tmp34_);  #line 69 "/home/jens/Source/shotwell/plugins/shotwell-transitions/ClockEffect.vala" -		spit_transitions_visuals_get_to_pos (_tmp53_, &_tmp54_); +		_tmp35_ = _tmp34_;  #line 69 "/home/jens/Source/shotwell/plugins/shotwell-transitions/ClockEffect.vala" -		_tmp55_ = _tmp54_; +		_tmp36_ = _tmp35_.width;  #line 69 "/home/jens/Source/shotwell/plugins/shotwell-transitions/ClockEffect.vala" -		_tmp56_ = _tmp55_.width; -#line 69 "/home/jens/Source/shotwell/plugins/shotwell-transitions/ClockEffect.vala" -		x = _tmp52_ + (((gint) _tmp56_) / 2); -#line 70 "/home/jens/Source/shotwell/plugins/shotwell-transitions/ClockEffect.vala" -		_tmp57_ = visuals; -#line 70 "/home/jens/Source/shotwell/plugins/shotwell-transitions/ClockEffect.vala" -		spit_transitions_visuals_get_to_pos (_tmp57_, &_tmp58_); +		x = _tmp33_ + (((gint) _tmp36_) / 2);  #line 70 "/home/jens/Source/shotwell/plugins/shotwell-transitions/ClockEffect.vala" -		_tmp59_ = _tmp58_; +		spit_transitions_visuals_get_to_pos (visuals, &_tmp37_);  #line 70 "/home/jens/Source/shotwell/plugins/shotwell-transitions/ClockEffect.vala" -		_tmp60_ = _tmp59_.y; +		_tmp38_ = _tmp37_;  #line 70 "/home/jens/Source/shotwell/plugins/shotwell-transitions/ClockEffect.vala" -		_tmp61_ = visuals; +		_tmp39_ = _tmp38_.y;  #line 70 "/home/jens/Source/shotwell/plugins/shotwell-transitions/ClockEffect.vala" -		spit_transitions_visuals_get_to_pos (_tmp61_, &_tmp62_); +		spit_transitions_visuals_get_to_pos (visuals, &_tmp40_);  #line 70 "/home/jens/Source/shotwell/plugins/shotwell-transitions/ClockEffect.vala" -		_tmp63_ = _tmp62_; +		_tmp41_ = _tmp40_;  #line 70 "/home/jens/Source/shotwell/plugins/shotwell-transitions/ClockEffect.vala" -		_tmp64_ = _tmp63_.height; +		_tmp42_ = _tmp41_.height;  #line 70 "/home/jens/Source/shotwell/plugins/shotwell-transitions/ClockEffect.vala" -		y = _tmp60_ + (((gint) _tmp64_) / 2); +		y = _tmp39_ + (((gint) _tmp42_) / 2);  #line 72 "/home/jens/Source/shotwell/plugins/shotwell-transitions/ClockEffect.vala" -		_tmp65_ = ctx; +		_tmp43_ = x;  #line 72 "/home/jens/Source/shotwell/plugins/shotwell-transitions/ClockEffect.vala" -		_tmp66_ = x; +		_tmp44_ = y;  #line 72 "/home/jens/Source/shotwell/plugins/shotwell-transitions/ClockEffect.vala" -		_tmp67_ = y; -#line 72 "/home/jens/Source/shotwell/plugins/shotwell-transitions/ClockEffect.vala" -		cairo_move_to (_tmp65_, (gdouble) _tmp66_, (gdouble) _tmp67_); -#line 73 "/home/jens/Source/shotwell/plugins/shotwell-transitions/ClockEffect.vala" -		_tmp68_ = ctx; +		cairo_move_to (ctx, (gdouble) _tmp43_, (gdouble) _tmp44_);  #line 73 "/home/jens/Source/shotwell/plugins/shotwell-transitions/ClockEffect.vala" -		_tmp69_ = x; +		_tmp45_ = x;  #line 73 "/home/jens/Source/shotwell/plugins/shotwell-transitions/ClockEffect.vala" -		_tmp70_ = y; +		_tmp46_ = y;  #line 73 "/home/jens/Source/shotwell/plugins/shotwell-transitions/ClockEffect.vala" -		_tmp71_ = radius; +		_tmp47_ = radius;  #line 73 "/home/jens/Source/shotwell/plugins/shotwell-transitions/ClockEffect.vala" -		_tmp72_ = start_angle; +		_tmp48_ = start_angle;  #line 73 "/home/jens/Source/shotwell/plugins/shotwell-transitions/ClockEffect.vala" -		_tmp73_ = stop_angle; +		_tmp49_ = stop_angle;  #line 73 "/home/jens/Source/shotwell/plugins/shotwell-transitions/ClockEffect.vala" -		cairo_arc (_tmp68_, (gdouble) _tmp69_, (gdouble) _tmp70_, (gdouble) _tmp71_, _tmp72_, _tmp73_); -#line 74 "/home/jens/Source/shotwell/plugins/shotwell-transitions/ClockEffect.vala" -		_tmp74_ = ctx; +		cairo_arc (ctx, (gdouble) _tmp45_, (gdouble) _tmp46_, (gdouble) _tmp47_, _tmp48_, _tmp49_);  #line 74 "/home/jens/Source/shotwell/plugins/shotwell-transitions/ClockEffect.vala" -		cairo_fill_preserve (_tmp74_); -#line 567 "ClockEffect.c" +		cairo_fill_preserve (ctx); +#line 550 "ClockEffect.c"  	}  } -static void clock_effect_real_advance (SpitTransitionsEffect* base, SpitTransitionsVisuals* visuals, SpitTransitionsMotion* motion, gint frame_number) { +static void +clock_effect_real_advance (SpitTransitionsEffect* base, +                           SpitTransitionsVisuals* visuals, +                           SpitTransitionsMotion* motion, +                           gint frame_number) +{  	ClockEffect * self;  #line 78 "/home/jens/Source/shotwell/plugins/shotwell-transitions/ClockEffect.vala"  	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_CLOCK_EFFECT, ClockEffect); @@ -576,26 +564,32 @@ static void clock_effect_real_advance (SpitTransitionsEffect* base, SpitTransiti  	g_return_if_fail (SPIT_TRANSITIONS_IS_VISUALS (visuals));  #line 78 "/home/jens/Source/shotwell/plugins/shotwell-transitions/ClockEffect.vala"  	g_return_if_fail (SPIT_TRANSITIONS_IS_MOTION (motion)); -#line 580 "ClockEffect.c" +#line 568 "ClockEffect.c"  } -static void clock_effect_real_cancel (SpitTransitionsEffect* base) { +static void +clock_effect_real_cancel (SpitTransitionsEffect* base) +{  	ClockEffect * self;  #line 81 "/home/jens/Source/shotwell/plugins/shotwell-transitions/ClockEffect.vala"  	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_CLOCK_EFFECT, ClockEffect); -#line 588 "ClockEffect.c" +#line 578 "ClockEffect.c"  } -static void clock_effect_class_init (ClockEffectClass * klass) { +static void +clock_effect_class_init (ClockEffectClass * klass) +{  #line 28 "/home/jens/Source/shotwell/plugins/shotwell-transitions/ClockEffect.vala"  	clock_effect_parent_class = g_type_class_peek_parent (klass); -#line 595 "ClockEffect.c" +#line 587 "ClockEffect.c"  } -static void clock_effect_spit_transitions_effect_interface_init (SpitTransitionsEffectIface * iface) { +static void +clock_effect_spit_transitions_effect_interface_init (SpitTransitionsEffectIface * iface) +{  #line 28 "/home/jens/Source/shotwell/plugins/shotwell-transitions/ClockEffect.vala"  	clock_effect_spit_transitions_effect_parent_iface = g_type_interface_peek_parent (iface);  #line 28 "/home/jens/Source/shotwell/plugins/shotwell-transitions/ClockEffect.vala" @@ -610,15 +604,19 @@ static void clock_effect_spit_transitions_effect_interface_init (SpitTransitions  	iface->advance = (void (*) (SpitTransitionsEffect *, SpitTransitionsVisuals*, SpitTransitionsMotion*, gint)) clock_effect_real_advance;  #line 28 "/home/jens/Source/shotwell/plugins/shotwell-transitions/ClockEffect.vala"  	iface->cancel = (void (*) (SpitTransitionsEffect *)) clock_effect_real_cancel; -#line 614 "ClockEffect.c" +#line 608 "ClockEffect.c"  } -static void clock_effect_instance_init (ClockEffect * self) { +static void +clock_effect_instance_init (ClockEffect * self) +{  } -GType clock_effect_get_type (void) { +GType +clock_effect_get_type (void) +{  	static volatile gsize clock_effect_type_id__volatile = 0;  	if (g_once_init_enter (&clock_effect_type_id__volatile)) {  		static const GTypeInfo g_define_type_info = { sizeof (ClockEffectClass), (GBaseInitFunc) NULL, (GBaseFinalizeFunc) NULL, (GClassInitFunc) clock_effect_class_init, (GClassFinalizeFunc) NULL, NULL, sizeof (ClockEffect), 0, (GInstanceInitFunc) clock_effect_instance_init, NULL }; diff --git a/plugins/shotwell-transitions/CrumbleEffect.c b/plugins/shotwell-transitions/CrumbleEffect.c index 56f3667..62b4c5e 100644 --- a/plugins/shotwell-transitions/CrumbleEffect.c +++ b/plugins/shotwell-transitions/CrumbleEffect.c @@ -1,4 +1,4 @@ -/* CrumbleEffect.c generated by valac 0.36.6, the Vala compiler +/* CrumbleEffect.c generated by valac 0.40.4, the Vala compiler   * generated from CrumbleEffect.vala, do not modify */  /* Copyright 2010 Maxim Kartashev @@ -8,6 +8,7 @@   * (version 2.1 or later).  See the COPYING file in this distribution.   */ +  #include <glib.h>  #include <glib-object.h>  #include <shotwell-plugin-dev-1.0.h> @@ -43,6 +44,11 @@ typedef struct _ShotwellTransitionDescriptorPrivate ShotwellTransitionDescriptor  typedef struct _CrumbleEffectDescriptor CrumbleEffectDescriptor;  typedef struct _CrumbleEffectDescriptorClass CrumbleEffectDescriptorClass;  typedef struct _CrumbleEffectDescriptorPrivate CrumbleEffectDescriptorPrivate; +enum  { +	CRUMBLE_EFFECT_DESCRIPTOR_0_PROPERTY, +	CRUMBLE_EFFECT_DESCRIPTOR_NUM_PROPERTIES +}; +static GParamSpec* crumble_effect_descriptor_properties[CRUMBLE_EFFECT_DESCRIPTOR_NUM_PROPERTIES];  #define TYPE_CRUMBLE_EFFECT (crumble_effect_get_type ())  #define CRUMBLE_EFFECT(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), TYPE_CRUMBLE_EFFECT, CrumbleEffect)) @@ -54,6 +60,11 @@ typedef struct _CrumbleEffectDescriptorPrivate CrumbleEffectDescriptorPrivate;  typedef struct _CrumbleEffect CrumbleEffect;  typedef struct _CrumbleEffectClass CrumbleEffectClass;  typedef struct _CrumbleEffectPrivate CrumbleEffectPrivate; +enum  { +	CRUMBLE_EFFECT_0_PROPERTY, +	CRUMBLE_EFFECT_NUM_PROPERTIES +}; +static GParamSpec* crumble_effect_properties[CRUMBLE_EFFECT_NUM_PROPERTIES];  #define _cairo_surface_destroy0(var) ((var == NULL) ? NULL : (var = (cairo_surface_destroy (var), NULL)))  #define _cairo_destroy0(var) ((var == NULL) ? NULL : (var = (cairo_destroy (var), NULL)))  #define _g_rand_free0(var) ((var == NULL) ? NULL : (var = (g_rand_free (var), NULL))) @@ -105,59 +116,77 @@ static SpitTransitionsEffectIface * crumble_effect_spit_transitions_effect_paren  GType shotwell_transition_descriptor_get_type (void) G_GNUC_CONST;  GType crumble_effect_descriptor_get_type (void) G_GNUC_CONST; -enum  { -	CRUMBLE_EFFECT_DESCRIPTOR_DUMMY_PROPERTY -};  CrumbleEffectDescriptor* crumble_effect_descriptor_new (GFile* resource_directory); -CrumbleEffectDescriptor* crumble_effect_descriptor_construct (GType object_type, GFile* resource_directory); -ShotwellTransitionDescriptor* shotwell_transition_descriptor_construct (GType object_type, GFile* resource_directory); +CrumbleEffectDescriptor* crumble_effect_descriptor_construct (GType object_type, +                                                              GFile* resource_directory); +ShotwellTransitionDescriptor* shotwell_transition_descriptor_construct (GType object_type, +                                                                        GFile* resource_directory);  static const gchar* crumble_effect_descriptor_real_get_id (ShotwellTransitionDescriptor* base);  static const gchar* crumble_effect_descriptor_real_get_pluggable_name (ShotwellTransitionDescriptor* base); -static SpitTransitionsEffect* crumble_effect_descriptor_real_create (ShotwellTransitionDescriptor* base, SpitHostInterface* host); +static SpitTransitionsEffect* crumble_effect_descriptor_real_create (ShotwellTransitionDescriptor* base, +                                                              SpitHostInterface* host);  CrumbleEffect* crumble_effect_new (void);  CrumbleEffect* crumble_effect_construct (GType object_type);  GType crumble_effect_get_type (void) G_GNUC_CONST;  #define CRUMBLE_EFFECT_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), TYPE_CRUMBLE_EFFECT, CrumbleEffectPrivate)) -enum  { -	CRUMBLE_EFFECT_DUMMY_PROPERTY -};  #define CRUMBLE_EFFECT_DESIRED_FPS 25  #define CRUMBLE_EFFECT_MIN_FPS 15  #define CRUMBLE_EFFECT_STRIPE_WIDTH 10 -static void crumble_effect_real_get_fps (SpitTransitionsEffect* base, gint* desired_fps, gint* min_fps); +static void crumble_effect_real_get_fps (SpitTransitionsEffect* base, +                                  gint* desired_fps, +                                  gint* min_fps);  static gboolean crumble_effect_real_needs_clear_background (SpitTransitionsEffect* base); -static void crumble_effect_real_start (SpitTransitionsEffect* base, SpitTransitionsVisuals* visuals, SpitTransitionsMotion* motion); -static void crumble_effect_real_paint (SpitTransitionsEffect* base, SpitTransitionsVisuals* visuals, SpitTransitionsMotion* motion, cairo_t* ctx, gint width, gint height, gint frame_number); -static void crumble_effect_real_advance (SpitTransitionsEffect* base, SpitTransitionsVisuals* visuals, SpitTransitionsMotion* motion, gint frame_number); +static void crumble_effect_real_start (SpitTransitionsEffect* base, +                                SpitTransitionsVisuals* visuals, +                                SpitTransitionsMotion* motion); +static void crumble_effect_real_paint (SpitTransitionsEffect* base, +                                SpitTransitionsVisuals* visuals, +                                SpitTransitionsMotion* motion, +                                cairo_t* ctx, +                                gint width, +                                gint height, +                                gint frame_number); +static void crumble_effect_real_advance (SpitTransitionsEffect* base, +                                  SpitTransitionsVisuals* visuals, +                                  SpitTransitionsMotion* motion, +                                  gint frame_number);  static void crumble_effect_real_cancel (SpitTransitionsEffect* base);  static void crumble_effect_finalize (GObject * obj); -static void _vala_array_destroy (gpointer array, gint array_length, GDestroyNotify destroy_func); -static void _vala_array_free (gpointer array, gint array_length, GDestroyNotify destroy_func); - - -CrumbleEffectDescriptor* crumble_effect_descriptor_construct (GType object_type, GFile* resource_directory) { +static void _vala_array_destroy (gpointer array, +                          gint array_length, +                          GDestroyNotify destroy_func); +static void _vala_array_free (gpointer array, +                       gint array_length, +                       GDestroyNotify destroy_func); + + +CrumbleEffectDescriptor* +crumble_effect_descriptor_construct (GType object_type, +                                     GFile* resource_directory) +{  	CrumbleEffectDescriptor * self = NULL; -	GFile* _tmp0_;  #line 11 "/home/jens/Source/shotwell/plugins/shotwell-transitions/CrumbleEffect.vala"  	g_return_val_if_fail (G_IS_FILE (resource_directory), NULL);  #line 12 "/home/jens/Source/shotwell/plugins/shotwell-transitions/CrumbleEffect.vala" -	_tmp0_ = resource_directory; -#line 12 "/home/jens/Source/shotwell/plugins/shotwell-transitions/CrumbleEffect.vala" -	self = (CrumbleEffectDescriptor*) shotwell_transition_descriptor_construct (object_type, _tmp0_); +	self = (CrumbleEffectDescriptor*) shotwell_transition_descriptor_construct (object_type, resource_directory);  #line 11 "/home/jens/Source/shotwell/plugins/shotwell-transitions/CrumbleEffect.vala"  	return self; -#line 150 "CrumbleEffect.c" +#line 175 "CrumbleEffect.c"  } -CrumbleEffectDescriptor* crumble_effect_descriptor_new (GFile* resource_directory) { +CrumbleEffectDescriptor* +crumble_effect_descriptor_new (GFile* resource_directory) +{  #line 11 "/home/jens/Source/shotwell/plugins/shotwell-transitions/CrumbleEffect.vala"  	return crumble_effect_descriptor_construct (TYPE_CRUMBLE_EFFECT_DESCRIPTOR, resource_directory); -#line 157 "CrumbleEffect.c" +#line 184 "CrumbleEffect.c"  } -static const gchar* crumble_effect_descriptor_real_get_id (ShotwellTransitionDescriptor* base) { +static const gchar* +crumble_effect_descriptor_real_get_id (ShotwellTransitionDescriptor* base) +{  	CrumbleEffectDescriptor * self;  	const gchar* result = NULL;  #line 15 "/home/jens/Source/shotwell/plugins/shotwell-transitions/CrumbleEffect.vala" @@ -166,11 +195,13 @@ static const gchar* crumble_effect_descriptor_real_get_id (ShotwellTransitionDes  	result = "org.yorba.shotwell.transitions.crumble";  #line 16 "/home/jens/Source/shotwell/plugins/shotwell-transitions/CrumbleEffect.vala"  	return result; -#line 170 "CrumbleEffect.c" +#line 199 "CrumbleEffect.c"  } -static const gchar* crumble_effect_descriptor_real_get_pluggable_name (ShotwellTransitionDescriptor* base) { +static const gchar* +crumble_effect_descriptor_real_get_pluggable_name (ShotwellTransitionDescriptor* base) +{  	CrumbleEffectDescriptor * self;  	const gchar* result = NULL;  #line 19 "/home/jens/Source/shotwell/plugins/shotwell-transitions/CrumbleEffect.vala" @@ -179,11 +210,14 @@ static const gchar* crumble_effect_descriptor_real_get_pluggable_name (ShotwellT  	result = _ ("Crumble");  #line 20 "/home/jens/Source/shotwell/plugins/shotwell-transitions/CrumbleEffect.vala"  	return result; -#line 183 "CrumbleEffect.c" +#line 214 "CrumbleEffect.c"  } -static SpitTransitionsEffect* crumble_effect_descriptor_real_create (ShotwellTransitionDescriptor* base, SpitHostInterface* host) { +static SpitTransitionsEffect* +crumble_effect_descriptor_real_create (ShotwellTransitionDescriptor* base, +                                       SpitHostInterface* host) +{  	CrumbleEffectDescriptor * self;  	SpitTransitionsEffect* result = NULL;  	CrumbleEffect* _tmp0_; @@ -197,11 +231,13 @@ static SpitTransitionsEffect* crumble_effect_descriptor_real_create (ShotwellTra  	result = G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, SPIT_TRANSITIONS_TYPE_EFFECT, SpitTransitionsEffect);  #line 24 "/home/jens/Source/shotwell/plugins/shotwell-transitions/CrumbleEffect.vala"  	return result; -#line 201 "CrumbleEffect.c" +#line 235 "CrumbleEffect.c"  } -static void crumble_effect_descriptor_class_init (CrumbleEffectDescriptorClass * klass) { +static void +crumble_effect_descriptor_class_init (CrumbleEffectDescriptorClass * klass) +{  #line 10 "/home/jens/Source/shotwell/plugins/shotwell-transitions/CrumbleEffect.vala"  	crumble_effect_descriptor_parent_class = g_type_class_peek_parent (klass);  #line 10 "/home/jens/Source/shotwell/plugins/shotwell-transitions/CrumbleEffect.vala" @@ -210,15 +246,19 @@ static void crumble_effect_descriptor_class_init (CrumbleEffectDescriptorClass *  	((ShotwellTransitionDescriptorClass *) klass)->get_pluggable_name = (const gchar* (*) (ShotwellTransitionDescriptor *)) crumble_effect_descriptor_real_get_pluggable_name;  #line 10 "/home/jens/Source/shotwell/plugins/shotwell-transitions/CrumbleEffect.vala"  	((ShotwellTransitionDescriptorClass *) klass)->create = (SpitTransitionsEffect* (*) (ShotwellTransitionDescriptor *, SpitHostInterface*)) crumble_effect_descriptor_real_create; -#line 214 "CrumbleEffect.c" +#line 250 "CrumbleEffect.c"  } -static void crumble_effect_descriptor_instance_init (CrumbleEffectDescriptor * self) { +static void +crumble_effect_descriptor_instance_init (CrumbleEffectDescriptor * self) +{  } -GType crumble_effect_descriptor_get_type (void) { +GType +crumble_effect_descriptor_get_type (void) +{  	static volatile gsize crumble_effect_descriptor_type_id__volatile = 0;  	if (g_once_init_enter (&crumble_effect_descriptor_type_id__volatile)) {  		static const GTypeInfo g_define_type_info = { sizeof (CrumbleEffectDescriptorClass), (GBaseInitFunc) NULL, (GBaseFinalizeFunc) NULL, (GClassInitFunc) crumble_effect_descriptor_class_init, (GClassFinalizeFunc) NULL, NULL, sizeof (CrumbleEffectDescriptor), 0, (GInstanceInitFunc) crumble_effect_descriptor_instance_init, NULL }; @@ -230,24 +270,32 @@ GType crumble_effect_descriptor_get_type (void) {  } -CrumbleEffect* crumble_effect_construct (GType object_type) { +CrumbleEffect* +crumble_effect_construct (GType object_type) +{  	CrumbleEffect * self = NULL;  #line 38 "/home/jens/Source/shotwell/plugins/shotwell-transitions/CrumbleEffect.vala"  	self = (CrumbleEffect*) g_object_new (object_type, NULL);  #line 38 "/home/jens/Source/shotwell/plugins/shotwell-transitions/CrumbleEffect.vala"  	return self; -#line 240 "CrumbleEffect.c" +#line 282 "CrumbleEffect.c"  } -CrumbleEffect* crumble_effect_new (void) { +CrumbleEffect* +crumble_effect_new (void) +{  #line 38 "/home/jens/Source/shotwell/plugins/shotwell-transitions/CrumbleEffect.vala"  	return crumble_effect_construct (TYPE_CRUMBLE_EFFECT); -#line 247 "CrumbleEffect.c" +#line 291 "CrumbleEffect.c"  } -static void crumble_effect_real_get_fps (SpitTransitionsEffect* base, gint* desired_fps, gint* min_fps) { +static void +crumble_effect_real_get_fps (SpitTransitionsEffect* base, +                             gint* desired_fps, +                             gint* min_fps) +{  	CrumbleEffect * self;  	gint _vala_desired_fps = 0;  	gint _vala_min_fps = 0; @@ -261,18 +309,20 @@ static void crumble_effect_real_get_fps (SpitTransitionsEffect* base, gint* desi  	if (desired_fps) {  #line 41 "/home/jens/Source/shotwell/plugins/shotwell-transitions/CrumbleEffect.vala"  		*desired_fps = _vala_desired_fps; -#line 265 "CrumbleEffect.c" +#line 313 "CrumbleEffect.c"  	}  #line 41 "/home/jens/Source/shotwell/plugins/shotwell-transitions/CrumbleEffect.vala"  	if (min_fps) {  #line 41 "/home/jens/Source/shotwell/plugins/shotwell-transitions/CrumbleEffect.vala"  		*min_fps = _vala_min_fps; -#line 271 "CrumbleEffect.c" +#line 319 "CrumbleEffect.c"  	}  } -static gboolean crumble_effect_real_needs_clear_background (SpitTransitionsEffect* base) { +static gboolean +crumble_effect_real_needs_clear_background (SpitTransitionsEffect* base) +{  	CrumbleEffect * self;  	gboolean result = FALSE;  #line 46 "/home/jens/Source/shotwell/plugins/shotwell-transitions/CrumbleEffect.vala" @@ -281,17 +331,20 @@ static gboolean crumble_effect_real_needs_clear_background (SpitTransitionsEffec  	result = TRUE;  #line 47 "/home/jens/Source/shotwell/plugins/shotwell-transitions/CrumbleEffect.vala"  	return result; -#line 285 "CrumbleEffect.c" +#line 335 "CrumbleEffect.c"  } -static void crumble_effect_real_start (SpitTransitionsEffect* base, SpitTransitionsVisuals* visuals, SpitTransitionsMotion* motion) { +static void +crumble_effect_real_start (SpitTransitionsEffect* base, +                           SpitTransitionsVisuals* visuals, +                           SpitTransitionsMotion* motion) +{  	CrumbleEffect * self;  	GRand* rand = NULL;  	GRand* _tmp0_; -	SpitTransitionsVisuals* _tmp1_; +	GdkPixbuf* _tmp1_;  	GdkPixbuf* _tmp2_; -	GdkPixbuf* _tmp3_;  #line 50 "/home/jens/Source/shotwell/plugins/shotwell-transitions/CrumbleEffect.vala"  	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_CRUMBLE_EFFECT, CrumbleEffect);  #line 50 "/home/jens/Source/shotwell/plugins/shotwell-transitions/CrumbleEffect.vala" @@ -303,210 +356,201 @@ static void crumble_effect_real_start (SpitTransitionsEffect* base, SpitTransiti  #line 51 "/home/jens/Source/shotwell/plugins/shotwell-transitions/CrumbleEffect.vala"  	rand = _tmp0_;  #line 55 "/home/jens/Source/shotwell/plugins/shotwell-transitions/CrumbleEffect.vala" -	_tmp1_ = visuals; -#line 55 "/home/jens/Source/shotwell/plugins/shotwell-transitions/CrumbleEffect.vala" -	_tmp2_ = spit_transitions_visuals_get_from_pixbuf (_tmp1_); +	_tmp1_ = spit_transitions_visuals_get_from_pixbuf (visuals);  #line 55 "/home/jens/Source/shotwell/plugins/shotwell-transitions/CrumbleEffect.vala" -	_tmp3_ = _tmp2_; +	_tmp2_ = _tmp1_;  #line 55 "/home/jens/Source/shotwell/plugins/shotwell-transitions/CrumbleEffect.vala" -	if (_tmp3_ != NULL) { -#line 314 "CrumbleEffect.c" -		SpitTransitionsVisuals* _tmp4_; -		GdkPixbuf* _tmp5_; -		GdkPixbuf* _tmp6_; +	if (_tmp2_ != NULL) { +#line 365 "CrumbleEffect.c" +		GdkPixbuf* _tmp3_; +		GdkPixbuf* _tmp4_; +		gint _tmp5_; +		gint _tmp6_;  		gint _tmp7_; -		gint _tmp8_; +		cairo_surface_t** _tmp8_;  		gint _tmp9_; -		cairo_surface_t** _tmp10_; -		gint _tmp11_; -		gdouble* _tmp12_; -#line 56 "/home/jens/Source/shotwell/plugins/shotwell-transitions/CrumbleEffect.vala" -		_tmp4_ = visuals; +		gdouble* _tmp10_;  #line 56 "/home/jens/Source/shotwell/plugins/shotwell-transitions/CrumbleEffect.vala" -		_tmp5_ = spit_transitions_visuals_get_from_pixbuf (_tmp4_); +		_tmp3_ = spit_transitions_visuals_get_from_pixbuf (visuals);  #line 56 "/home/jens/Source/shotwell/plugins/shotwell-transitions/CrumbleEffect.vala" -		_tmp6_ = _tmp5_; +		_tmp4_ = _tmp3_;  #line 56 "/home/jens/Source/shotwell/plugins/shotwell-transitions/CrumbleEffect.vala" -		_tmp7_ = gdk_pixbuf_get_width (_tmp6_); +		_tmp5_ = gdk_pixbuf_get_width (_tmp4_);  #line 56 "/home/jens/Source/shotwell/plugins/shotwell-transitions/CrumbleEffect.vala" -		_tmp8_ = _tmp7_; +		_tmp6_ = _tmp5_;  #line 56 "/home/jens/Source/shotwell/plugins/shotwell-transitions/CrumbleEffect.vala" -		self->priv->stripes_count = _tmp8_ / CRUMBLE_EFFECT_STRIPE_WIDTH; +		self->priv->stripes_count = _tmp6_ / CRUMBLE_EFFECT_STRIPE_WIDTH;  #line 57 "/home/jens/Source/shotwell/plugins/shotwell-transitions/CrumbleEffect.vala" -		_tmp9_ = self->priv->stripes_count; +		_tmp7_ = self->priv->stripes_count;  #line 57 "/home/jens/Source/shotwell/plugins/shotwell-transitions/CrumbleEffect.vala" -		_tmp10_ = g_new0 (cairo_surface_t*, _tmp9_ + 1); +		_tmp8_ = g_new0 (cairo_surface_t*, _tmp7_ + 1);  #line 57 "/home/jens/Source/shotwell/plugins/shotwell-transitions/CrumbleEffect.vala"  		self->priv->from_stripes = (_vala_array_free (self->priv->from_stripes, self->priv->from_stripes_length1, (GDestroyNotify) cairo_surface_destroy), NULL);  #line 57 "/home/jens/Source/shotwell/plugins/shotwell-transitions/CrumbleEffect.vala" -		self->priv->from_stripes = _tmp10_; +		self->priv->from_stripes = _tmp8_;  #line 57 "/home/jens/Source/shotwell/plugins/shotwell-transitions/CrumbleEffect.vala" -		self->priv->from_stripes_length1 = _tmp9_; +		self->priv->from_stripes_length1 = _tmp7_;  #line 57 "/home/jens/Source/shotwell/plugins/shotwell-transitions/CrumbleEffect.vala"  		self->priv->_from_stripes_size_ = self->priv->from_stripes_length1;  #line 58 "/home/jens/Source/shotwell/plugins/shotwell-transitions/CrumbleEffect.vala" -		_tmp11_ = self->priv->stripes_count; +		_tmp9_ = self->priv->stripes_count;  #line 58 "/home/jens/Source/shotwell/plugins/shotwell-transitions/CrumbleEffect.vala" -		_tmp12_ = g_new0 (gdouble, _tmp11_); +		_tmp10_ = g_new0 (gdouble, _tmp9_);  #line 58 "/home/jens/Source/shotwell/plugins/shotwell-transitions/CrumbleEffect.vala"  		self->priv->accelerations = (g_free (self->priv->accelerations), NULL);  #line 58 "/home/jens/Source/shotwell/plugins/shotwell-transitions/CrumbleEffect.vala" -		self->priv->accelerations = _tmp12_; +		self->priv->accelerations = _tmp10_;  #line 58 "/home/jens/Source/shotwell/plugins/shotwell-transitions/CrumbleEffect.vala" -		self->priv->accelerations_length1 = _tmp11_; +		self->priv->accelerations_length1 = _tmp9_;  #line 58 "/home/jens/Source/shotwell/plugins/shotwell-transitions/CrumbleEffect.vala"  		self->priv->_accelerations_size_ = self->priv->accelerations_length1; -#line 360 "CrumbleEffect.c" +#line 408 "CrumbleEffect.c"  		{  			gint i = 0;  #line 59 "/home/jens/Source/shotwell/plugins/shotwell-transitions/CrumbleEffect.vala"  			i = 0; -#line 365 "CrumbleEffect.c" +#line 413 "CrumbleEffect.c"  			{ -				gboolean _tmp13_ = FALSE; +				gboolean _tmp11_ = FALSE;  #line 59 "/home/jens/Source/shotwell/plugins/shotwell-transitions/CrumbleEffect.vala" -				_tmp13_ = TRUE; +				_tmp11_ = TRUE;  #line 59 "/home/jens/Source/shotwell/plugins/shotwell-transitions/CrumbleEffect.vala"  				while (TRUE) { -#line 372 "CrumbleEffect.c" -					gint _tmp15_; +#line 420 "CrumbleEffect.c" +					gint _tmp13_; +					gint _tmp14_; +					cairo_surface_t** _tmp15_; +					gint _tmp15__length1;  					gint _tmp16_; -					cairo_surface_t** _tmp17_; -					gint _tmp17__length1; -					gint _tmp18_; -					SpitTransitionsVisuals* _tmp19_; -					GdkPixbuf* _tmp20_; -					GdkPixbuf* _tmp21_; -					gint _tmp22_; -					gint _tmp23_; -					cairo_surface_t* _tmp24_; -					cairo_surface_t* _tmp25_; +					GdkPixbuf* _tmp17_; +					GdkPixbuf* _tmp18_; +					gint _tmp19_; +					gint _tmp20_; +					cairo_surface_t* _tmp21_; +					cairo_surface_t* _tmp22_;  					cairo_t* ctx = NULL; -					cairo_surface_t** _tmp26_; -					gint _tmp26__length1; -					gint _tmp27_; -					cairo_surface_t* _tmp28_; -					cairo_t* _tmp29_; -					cairo_t* _tmp30_; -					SpitTransitionsVisuals* _tmp31_; -					GdkPixbuf* _tmp32_; -					GdkPixbuf* _tmp33_; -					gint _tmp34_; -					cairo_t* _tmp35_; -					gdouble* _tmp36_; -					gint _tmp36__length1; -					gint _tmp37_; -					GRand* _tmp38_; -					gdouble _tmp39_; -					gdouble _tmp40_; +					cairo_surface_t** _tmp23_; +					gint _tmp23__length1; +					gint _tmp24_; +					cairo_surface_t* _tmp25_; +					cairo_t* _tmp26_; +					cairo_t* _tmp27_; +					GdkPixbuf* _tmp28_; +					GdkPixbuf* _tmp29_; +					gint _tmp30_; +					cairo_t* _tmp31_; +					gdouble* _tmp32_; +					gint _tmp32__length1; +					gint _tmp33_; +					GRand* _tmp34_; +					gdouble _tmp35_;  #line 59 "/home/jens/Source/shotwell/plugins/shotwell-transitions/CrumbleEffect.vala" -					if (!_tmp13_) { -#line 405 "CrumbleEffect.c" -						gint _tmp14_; +					if (!_tmp11_) { +#line 450 "CrumbleEffect.c" +						gint _tmp12_;  #line 59 "/home/jens/Source/shotwell/plugins/shotwell-transitions/CrumbleEffect.vala" -						_tmp14_ = i; +						_tmp12_ = i;  #line 59 "/home/jens/Source/shotwell/plugins/shotwell-transitions/CrumbleEffect.vala" -						i = _tmp14_ + 1; -#line 411 "CrumbleEffect.c" +						i = _tmp12_ + 1; +#line 456 "CrumbleEffect.c"  					}  #line 59 "/home/jens/Source/shotwell/plugins/shotwell-transitions/CrumbleEffect.vala" -					_tmp13_ = FALSE; +					_tmp11_ = FALSE;  #line 59 "/home/jens/Source/shotwell/plugins/shotwell-transitions/CrumbleEffect.vala" -					_tmp15_ = i; +					_tmp13_ = i;  #line 59 "/home/jens/Source/shotwell/plugins/shotwell-transitions/CrumbleEffect.vala" -					_tmp16_ = self->priv->stripes_count; +					_tmp14_ = self->priv->stripes_count;  #line 59 "/home/jens/Source/shotwell/plugins/shotwell-transitions/CrumbleEffect.vala" -					if (!(_tmp15_ < _tmp16_)) { +					if (!(_tmp13_ < _tmp14_)) {  #line 59 "/home/jens/Source/shotwell/plugins/shotwell-transitions/CrumbleEffect.vala"  						break; -#line 423 "CrumbleEffect.c" +#line 468 "CrumbleEffect.c"  					}  #line 60 "/home/jens/Source/shotwell/plugins/shotwell-transitions/CrumbleEffect.vala" -					_tmp17_ = self->priv->from_stripes; +					_tmp15_ = self->priv->from_stripes;  #line 60 "/home/jens/Source/shotwell/plugins/shotwell-transitions/CrumbleEffect.vala" -					_tmp17__length1 = self->priv->from_stripes_length1; +					_tmp15__length1 = self->priv->from_stripes_length1;  #line 60 "/home/jens/Source/shotwell/plugins/shotwell-transitions/CrumbleEffect.vala" -					_tmp18_ = i; +					_tmp16_ = i;  #line 60 "/home/jens/Source/shotwell/plugins/shotwell-transitions/CrumbleEffect.vala" -					_tmp19_ = visuals; +					_tmp17_ = spit_transitions_visuals_get_from_pixbuf (visuals);  #line 60 "/home/jens/Source/shotwell/plugins/shotwell-transitions/CrumbleEffect.vala" -					_tmp20_ = spit_transitions_visuals_get_from_pixbuf (_tmp19_); +					_tmp18_ = _tmp17_;  #line 60 "/home/jens/Source/shotwell/plugins/shotwell-transitions/CrumbleEffect.vala" -					_tmp21_ = _tmp20_; -#line 60 "/home/jens/Source/shotwell/plugins/shotwell-transitions/CrumbleEffect.vala" -					_tmp22_ = gdk_pixbuf_get_height (_tmp21_); +					_tmp19_ = gdk_pixbuf_get_height (_tmp18_);  #line 60 "/home/jens/Source/shotwell/plugins/shotwell-transitions/CrumbleEffect.vala" -					_tmp23_ = _tmp22_; +					_tmp20_ = _tmp19_;  #line 60 "/home/jens/Source/shotwell/plugins/shotwell-transitions/CrumbleEffect.vala" -					_tmp24_ = cairo_image_surface_create (CAIRO_FORMAT_RGB24, CRUMBLE_EFFECT_STRIPE_WIDTH, _tmp23_); +					_tmp21_ = cairo_image_surface_create (CAIRO_FORMAT_RGB24, CRUMBLE_EFFECT_STRIPE_WIDTH, _tmp20_);  #line 60 "/home/jens/Source/shotwell/plugins/shotwell-transitions/CrumbleEffect.vala" -					_cairo_surface_destroy0 (_tmp17_[_tmp18_]); +					_cairo_surface_destroy0 (_tmp15_[_tmp16_]);  #line 60 "/home/jens/Source/shotwell/plugins/shotwell-transitions/CrumbleEffect.vala" -					_tmp17_[_tmp18_] = _tmp24_; +					_tmp15_[_tmp16_] = _tmp21_;  #line 60 "/home/jens/Source/shotwell/plugins/shotwell-transitions/CrumbleEffect.vala" -					_tmp25_ = _tmp17_[_tmp18_]; +					_tmp22_ = _tmp15_[_tmp16_];  #line 62 "/home/jens/Source/shotwell/plugins/shotwell-transitions/CrumbleEffect.vala" -					_tmp26_ = self->priv->from_stripes; +					_tmp23_ = self->priv->from_stripes;  #line 62 "/home/jens/Source/shotwell/plugins/shotwell-transitions/CrumbleEffect.vala" -					_tmp26__length1 = self->priv->from_stripes_length1; +					_tmp23__length1 = self->priv->from_stripes_length1;  #line 62 "/home/jens/Source/shotwell/plugins/shotwell-transitions/CrumbleEffect.vala" -					_tmp27_ = i; +					_tmp24_ = i;  #line 62 "/home/jens/Source/shotwell/plugins/shotwell-transitions/CrumbleEffect.vala" -					_tmp28_ = _tmp26_[_tmp27_]; +					_tmp25_ = _tmp23_[_tmp24_];  #line 62 "/home/jens/Source/shotwell/plugins/shotwell-transitions/CrumbleEffect.vala" -					_tmp29_ = cairo_create (_tmp28_); +					_tmp26_ = cairo_create (_tmp25_);  #line 62 "/home/jens/Source/shotwell/plugins/shotwell-transitions/CrumbleEffect.vala" -					ctx = _tmp29_; -#line 63 "/home/jens/Source/shotwell/plugins/shotwell-transitions/CrumbleEffect.vala" -					_tmp30_ = ctx; +					ctx = _tmp26_;  #line 63 "/home/jens/Source/shotwell/plugins/shotwell-transitions/CrumbleEffect.vala" -					_tmp31_ = visuals; +					_tmp27_ = ctx;  #line 63 "/home/jens/Source/shotwell/plugins/shotwell-transitions/CrumbleEffect.vala" -					_tmp32_ = spit_transitions_visuals_get_from_pixbuf (_tmp31_); +					_tmp28_ = spit_transitions_visuals_get_from_pixbuf (visuals);  #line 63 "/home/jens/Source/shotwell/plugins/shotwell-transitions/CrumbleEffect.vala" -					_tmp33_ = _tmp32_; +					_tmp29_ = _tmp28_;  #line 63 "/home/jens/Source/shotwell/plugins/shotwell-transitions/CrumbleEffect.vala" -					_tmp34_ = i; +					_tmp30_ = i;  #line 63 "/home/jens/Source/shotwell/plugins/shotwell-transitions/CrumbleEffect.vala" -					gdk_cairo_set_source_pixbuf (_tmp30_, _tmp33_, (gdouble) ((-_tmp34_) * CRUMBLE_EFFECT_STRIPE_WIDTH), (gdouble) 0); +					gdk_cairo_set_source_pixbuf (_tmp27_, _tmp29_, (gdouble) ((-_tmp30_) * CRUMBLE_EFFECT_STRIPE_WIDTH), (gdouble) 0);  #line 64 "/home/jens/Source/shotwell/plugins/shotwell-transitions/CrumbleEffect.vala" -					_tmp35_ = ctx; +					_tmp31_ = ctx;  #line 64 "/home/jens/Source/shotwell/plugins/shotwell-transitions/CrumbleEffect.vala" -					cairo_paint (_tmp35_); +					cairo_paint (_tmp31_);  #line 65 "/home/jens/Source/shotwell/plugins/shotwell-transitions/CrumbleEffect.vala" -					_tmp36_ = self->priv->accelerations; +					_tmp32_ = self->priv->accelerations;  #line 65 "/home/jens/Source/shotwell/plugins/shotwell-transitions/CrumbleEffect.vala" -					_tmp36__length1 = self->priv->accelerations_length1; +					_tmp32__length1 = self->priv->accelerations_length1;  #line 65 "/home/jens/Source/shotwell/plugins/shotwell-transitions/CrumbleEffect.vala" -					_tmp37_ = i; +					_tmp33_ = i;  #line 65 "/home/jens/Source/shotwell/plugins/shotwell-transitions/CrumbleEffect.vala" -					_tmp38_ = rand; +					_tmp34_ = rand;  #line 65 "/home/jens/Source/shotwell/plugins/shotwell-transitions/CrumbleEffect.vala" -					_tmp39_ = g_rand_double (_tmp38_); +					_tmp32_[_tmp33_] = g_rand_double (_tmp34_);  #line 65 "/home/jens/Source/shotwell/plugins/shotwell-transitions/CrumbleEffect.vala" -					_tmp36_[_tmp37_] = _tmp39_; -#line 65 "/home/jens/Source/shotwell/plugins/shotwell-transitions/CrumbleEffect.vala" -					_tmp40_ = _tmp36_[_tmp37_]; +					_tmp35_ = _tmp32_[_tmp33_];  #line 59 "/home/jens/Source/shotwell/plugins/shotwell-transitions/CrumbleEffect.vala"  					_cairo_destroy0 (ctx); -#line 493 "CrumbleEffect.c" +#line 532 "CrumbleEffect.c"  				}  			}  		}  	}  #line 50 "/home/jens/Source/shotwell/plugins/shotwell-transitions/CrumbleEffect.vala"  	_g_rand_free0 (rand); -#line 500 "CrumbleEffect.c" +#line 539 "CrumbleEffect.c"  } -static void crumble_effect_real_paint (SpitTransitionsEffect* base, SpitTransitionsVisuals* visuals, SpitTransitionsMotion* motion, cairo_t* ctx, gint width, gint height, gint frame_number) { +static void +crumble_effect_real_paint (SpitTransitionsEffect* base, +                           SpitTransitionsVisuals* visuals, +                           SpitTransitionsMotion* motion, +                           cairo_t* ctx, +                           gint width, +                           gint height, +                           gint frame_number) +{  	CrumbleEffect * self;  	gdouble alpha = 0.0; -	SpitTransitionsMotion* _tmp0_; -	gint _tmp1_; -	gdouble _tmp2_; -	gdouble _tmp3_; +	gdouble _tmp0_;  #line 70 "/home/jens/Source/shotwell/plugins/shotwell-transitions/CrumbleEffect.vala"  	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_CRUMBLE_EFFECT, CrumbleEffect);  #line 70 "/home/jens/Source/shotwell/plugins/shotwell-transitions/CrumbleEffect.vala" @@ -516,239 +560,205 @@ static void crumble_effect_real_paint (SpitTransitionsEffect* base, SpitTransiti  #line 70 "/home/jens/Source/shotwell/plugins/shotwell-transitions/CrumbleEffect.vala"  	g_return_if_fail (ctx != NULL);  #line 72 "/home/jens/Source/shotwell/plugins/shotwell-transitions/CrumbleEffect.vala" -	_tmp0_ = motion; -#line 72 "/home/jens/Source/shotwell/plugins/shotwell-transitions/CrumbleEffect.vala" -	_tmp1_ = frame_number; -#line 72 "/home/jens/Source/shotwell/plugins/shotwell-transitions/CrumbleEffect.vala" -	_tmp2_ = spit_transitions_motion_get_alpha (_tmp0_, _tmp1_); -#line 72 "/home/jens/Source/shotwell/plugins/shotwell-transitions/CrumbleEffect.vala" -	alpha = _tmp2_; +	alpha = spit_transitions_motion_get_alpha (motion, frame_number);  #line 74 "/home/jens/Source/shotwell/plugins/shotwell-transitions/CrumbleEffect.vala" -	_tmp3_ = alpha; +	_tmp0_ = alpha;  #line 74 "/home/jens/Source/shotwell/plugins/shotwell-transitions/CrumbleEffect.vala" -	if (_tmp3_ < 0.5) { -#line 531 "CrumbleEffect.c" -		gdouble _tmp4_; +	if (_tmp0_ < 0.5) { +#line 569 "CrumbleEffect.c" +		gdouble _tmp1_;  #line 76 "/home/jens/Source/shotwell/plugins/shotwell-transitions/CrumbleEffect.vala" -		_tmp4_ = alpha; +		_tmp1_ = alpha;  #line 76 "/home/jens/Source/shotwell/plugins/shotwell-transitions/CrumbleEffect.vala" -		alpha = _tmp4_ * 2; -#line 537 "CrumbleEffect.c" +		alpha = _tmp1_ * 2; +#line 575 "CrumbleEffect.c"  		{  			gint i = 0;  #line 79 "/home/jens/Source/shotwell/plugins/shotwell-transitions/CrumbleEffect.vala"  			i = 0; -#line 542 "CrumbleEffect.c" +#line 580 "CrumbleEffect.c"  			{ -				gboolean _tmp5_ = FALSE; +				gboolean _tmp2_ = FALSE;  #line 79 "/home/jens/Source/shotwell/plugins/shotwell-transitions/CrumbleEffect.vala" -				_tmp5_ = TRUE; +				_tmp2_ = TRUE;  #line 79 "/home/jens/Source/shotwell/plugins/shotwell-transitions/CrumbleEffect.vala"  				while (TRUE) { -#line 549 "CrumbleEffect.c" -					gint _tmp7_; -					gint _tmp8_; +#line 587 "CrumbleEffect.c" +					gint _tmp4_; +					gint _tmp5_;  					gint x = 0; -					SpitTransitionsVisuals* _tmp9_; -					GdkRectangle _tmp10_ = {0}; -					GdkRectangle _tmp11_; -					gint _tmp12_; -					gint _tmp13_; +					GdkRectangle _tmp6_ = {0}; +					GdkRectangle _tmp7_; +					gint _tmp8_; +					gint _tmp9_;  					gdouble a = 0.0; +					gdouble _tmp10_; +					gdouble _tmp11_; +					gdouble* _tmp12_; +					gint _tmp12__length1; +					gint _tmp13_;  					gdouble _tmp14_; -					gdouble _tmp15_; -					gdouble* _tmp16_; -					gint _tmp16__length1; -					gint _tmp17_; -					gdouble _tmp18_;  					gint y = 0; -					SpitTransitionsVisuals* _tmp19_; -					GdkRectangle _tmp20_ = {0}; -					GdkRectangle _tmp21_; -					gint _tmp22_; -					SpitTransitionsVisuals* _tmp23_; -					GdkPixbuf* _tmp24_; -					GdkPixbuf* _tmp25_; -					gint _tmp26_; +					GdkRectangle _tmp15_ = {0}; +					GdkRectangle _tmp16_; +					gint _tmp17_; +					GdkPixbuf* _tmp18_; +					GdkPixbuf* _tmp19_; +					gint _tmp20_; +					gint _tmp21_; +					gdouble _tmp22_; +					gdouble _tmp23_; +					cairo_surface_t** _tmp24_; +					gint _tmp24__length1; +					gint _tmp25_; +					cairo_surface_t* _tmp26_;  					gint _tmp27_; -					gdouble _tmp28_; -					gdouble _tmp29_; -					cairo_t* _tmp30_; -					cairo_surface_t** _tmp31_; -					gint _tmp31__length1; -					gint _tmp32_; -					cairo_surface_t* _tmp33_; -					gint _tmp34_; -					gint _tmp35_; -					cairo_t* _tmp36_; +					gint _tmp28_;  #line 79 "/home/jens/Source/shotwell/plugins/shotwell-transitions/CrumbleEffect.vala" -					if (!_tmp5_) { -#line 587 "CrumbleEffect.c" -						gint _tmp6_; +					if (!_tmp2_) { +#line 620 "CrumbleEffect.c" +						gint _tmp3_;  #line 79 "/home/jens/Source/shotwell/plugins/shotwell-transitions/CrumbleEffect.vala" -						_tmp6_ = i; +						_tmp3_ = i;  #line 79 "/home/jens/Source/shotwell/plugins/shotwell-transitions/CrumbleEffect.vala" -						i = _tmp6_ + 1; -#line 593 "CrumbleEffect.c" +						i = _tmp3_ + 1; +#line 626 "CrumbleEffect.c"  					}  #line 79 "/home/jens/Source/shotwell/plugins/shotwell-transitions/CrumbleEffect.vala" -					_tmp5_ = FALSE; +					_tmp2_ = FALSE;  #line 79 "/home/jens/Source/shotwell/plugins/shotwell-transitions/CrumbleEffect.vala" -					_tmp7_ = i; +					_tmp4_ = i;  #line 79 "/home/jens/Source/shotwell/plugins/shotwell-transitions/CrumbleEffect.vala" -					_tmp8_ = self->priv->stripes_count; +					_tmp5_ = self->priv->stripes_count;  #line 79 "/home/jens/Source/shotwell/plugins/shotwell-transitions/CrumbleEffect.vala" -					if (!(_tmp7_ < _tmp8_)) { +					if (!(_tmp4_ < _tmp5_)) {  #line 79 "/home/jens/Source/shotwell/plugins/shotwell-transitions/CrumbleEffect.vala"  						break; -#line 605 "CrumbleEffect.c" +#line 638 "CrumbleEffect.c"  					}  #line 80 "/home/jens/Source/shotwell/plugins/shotwell-transitions/CrumbleEffect.vala" -					_tmp9_ = visuals; +					spit_transitions_visuals_get_from_pos (visuals, &_tmp6_);  #line 80 "/home/jens/Source/shotwell/plugins/shotwell-transitions/CrumbleEffect.vala" -					spit_transitions_visuals_get_from_pos (_tmp9_, &_tmp10_); +					_tmp7_ = _tmp6_;  #line 80 "/home/jens/Source/shotwell/plugins/shotwell-transitions/CrumbleEffect.vala" -					_tmp11_ = _tmp10_; +					_tmp8_ = _tmp7_.x;  #line 80 "/home/jens/Source/shotwell/plugins/shotwell-transitions/CrumbleEffect.vala" -					_tmp12_ = _tmp11_.x; +					_tmp9_ = i;  #line 80 "/home/jens/Source/shotwell/plugins/shotwell-transitions/CrumbleEffect.vala" -					_tmp13_ = i; -#line 80 "/home/jens/Source/shotwell/plugins/shotwell-transitions/CrumbleEffect.vala" -					x = _tmp12_ + (_tmp13_ * CRUMBLE_EFFECT_STRIPE_WIDTH); +					x = _tmp8_ + (_tmp9_ * CRUMBLE_EFFECT_STRIPE_WIDTH);  #line 81 "/home/jens/Source/shotwell/plugins/shotwell-transitions/CrumbleEffect.vala" -					_tmp14_ = alpha; +					_tmp10_ = alpha;  #line 81 "/home/jens/Source/shotwell/plugins/shotwell-transitions/CrumbleEffect.vala" -					_tmp15_ = alpha; +					_tmp11_ = alpha;  #line 81 "/home/jens/Source/shotwell/plugins/shotwell-transitions/CrumbleEffect.vala" -					_tmp16_ = self->priv->accelerations; +					_tmp12_ = self->priv->accelerations;  #line 81 "/home/jens/Source/shotwell/plugins/shotwell-transitions/CrumbleEffect.vala" -					_tmp16__length1 = self->priv->accelerations_length1; +					_tmp12__length1 = self->priv->accelerations_length1;  #line 81 "/home/jens/Source/shotwell/plugins/shotwell-transitions/CrumbleEffect.vala" -					_tmp17_ = i; +					_tmp13_ = i;  #line 81 "/home/jens/Source/shotwell/plugins/shotwell-transitions/CrumbleEffect.vala" -					_tmp18_ = _tmp16_[_tmp17_]; +					_tmp14_ = _tmp12_[_tmp13_];  #line 81 "/home/jens/Source/shotwell/plugins/shotwell-transitions/CrumbleEffect.vala" -					a = _tmp14_ + (_tmp15_ * _tmp18_); +					a = _tmp10_ + (_tmp11_ * _tmp14_);  #line 82 "/home/jens/Source/shotwell/plugins/shotwell-transitions/CrumbleEffect.vala" -					_tmp19_ = visuals; +					spit_transitions_visuals_get_from_pos (visuals, &_tmp15_);  #line 82 "/home/jens/Source/shotwell/plugins/shotwell-transitions/CrumbleEffect.vala" -					spit_transitions_visuals_get_from_pos (_tmp19_, &_tmp20_); +					_tmp16_ = _tmp15_;  #line 82 "/home/jens/Source/shotwell/plugins/shotwell-transitions/CrumbleEffect.vala" -					_tmp21_ = _tmp20_; -#line 82 "/home/jens/Source/shotwell/plugins/shotwell-transitions/CrumbleEffect.vala" -					_tmp22_ = _tmp21_.y; +					_tmp17_ = _tmp16_.y;  #line 82 "/home/jens/Source/shotwell/plugins/shotwell-transitions/CrumbleEffect.vala" -					_tmp23_ = visuals; +					_tmp18_ = spit_transitions_visuals_get_from_pixbuf (visuals);  #line 82 "/home/jens/Source/shotwell/plugins/shotwell-transitions/CrumbleEffect.vala" -					_tmp24_ = spit_transitions_visuals_get_from_pixbuf (_tmp23_); +					_tmp19_ = _tmp18_;  #line 82 "/home/jens/Source/shotwell/plugins/shotwell-transitions/CrumbleEffect.vala" -					_tmp25_ = _tmp24_; +					_tmp20_ = gdk_pixbuf_get_height (_tmp19_);  #line 82 "/home/jens/Source/shotwell/plugins/shotwell-transitions/CrumbleEffect.vala" -					_tmp26_ = gdk_pixbuf_get_height (_tmp25_); -#line 82 "/home/jens/Source/shotwell/plugins/shotwell-transitions/CrumbleEffect.vala" -					_tmp27_ = _tmp26_; +					_tmp21_ = _tmp20_;  #line 82 "/home/jens/Source/shotwell/plugins/shotwell-transitions/CrumbleEffect.vala" -					_tmp28_ = a; +					_tmp22_ = a;  #line 82 "/home/jens/Source/shotwell/plugins/shotwell-transitions/CrumbleEffect.vala" -					_tmp29_ = a; +					_tmp23_ = a;  #line 82 "/home/jens/Source/shotwell/plugins/shotwell-transitions/CrumbleEffect.vala" -					y = _tmp22_ + ((gint) ((_tmp27_ * _tmp28_) * _tmp29_)); +					y = _tmp17_ + ((gint) ((_tmp21_ * _tmp22_) * _tmp23_));  #line 84 "/home/jens/Source/shotwell/plugins/shotwell-transitions/CrumbleEffect.vala" -					_tmp30_ = ctx; +					_tmp24_ = self->priv->from_stripes;  #line 84 "/home/jens/Source/shotwell/plugins/shotwell-transitions/CrumbleEffect.vala" -					_tmp31_ = self->priv->from_stripes; +					_tmp24__length1 = self->priv->from_stripes_length1;  #line 84 "/home/jens/Source/shotwell/plugins/shotwell-transitions/CrumbleEffect.vala" -					_tmp31__length1 = self->priv->from_stripes_length1; +					_tmp25_ = i;  #line 84 "/home/jens/Source/shotwell/plugins/shotwell-transitions/CrumbleEffect.vala" -					_tmp32_ = i; +					_tmp26_ = _tmp24_[_tmp25_];  #line 84 "/home/jens/Source/shotwell/plugins/shotwell-transitions/CrumbleEffect.vala" -					_tmp33_ = _tmp31_[_tmp32_]; +					_tmp27_ = x;  #line 84 "/home/jens/Source/shotwell/plugins/shotwell-transitions/CrumbleEffect.vala" -					_tmp34_ = x; +					_tmp28_ = y;  #line 84 "/home/jens/Source/shotwell/plugins/shotwell-transitions/CrumbleEffect.vala" -					_tmp35_ = y; -#line 84 "/home/jens/Source/shotwell/plugins/shotwell-transitions/CrumbleEffect.vala" -					cairo_set_source_surface (_tmp30_, _tmp33_, (gdouble) _tmp34_, (gdouble) _tmp35_); -#line 85 "/home/jens/Source/shotwell/plugins/shotwell-transitions/CrumbleEffect.vala" -					_tmp36_ = ctx; +					cairo_set_source_surface (ctx, _tmp26_, (gdouble) _tmp27_, (gdouble) _tmp28_);  #line 85 "/home/jens/Source/shotwell/plugins/shotwell-transitions/CrumbleEffect.vala" -					cairo_paint (_tmp36_); -#line 677 "CrumbleEffect.c" +					cairo_paint (ctx); +#line 700 "CrumbleEffect.c"  				}  			}  		}  	} else { -		SpitTransitionsVisuals* _tmp37_; -		GdkPixbuf* _tmp38_; -		GdkPixbuf* _tmp39_; -#line 87 "/home/jens/Source/shotwell/plugins/shotwell-transitions/CrumbleEffect.vala" -		_tmp37_ = visuals; +		GdkPixbuf* _tmp29_; +		GdkPixbuf* _tmp30_;  #line 87 "/home/jens/Source/shotwell/plugins/shotwell-transitions/CrumbleEffect.vala" -		_tmp38_ = spit_transitions_visuals_get_to_pixbuf (_tmp37_); +		_tmp29_ = spit_transitions_visuals_get_to_pixbuf (visuals);  #line 87 "/home/jens/Source/shotwell/plugins/shotwell-transitions/CrumbleEffect.vala" -		_tmp39_ = _tmp38_; +		_tmp30_ = _tmp29_;  #line 87 "/home/jens/Source/shotwell/plugins/shotwell-transitions/CrumbleEffect.vala" -		if (_tmp39_ != NULL) { -#line 693 "CrumbleEffect.c" +		if (_tmp30_ != NULL) { +#line 713 "CrumbleEffect.c" +			gdouble _tmp31_; +			GdkPixbuf* _tmp32_; +			GdkPixbuf* _tmp33_; +			GdkRectangle _tmp34_ = {0}; +			GdkRectangle _tmp35_; +			gint _tmp36_; +			GdkRectangle _tmp37_ = {0}; +			GdkRectangle _tmp38_; +			gint _tmp39_;  			gdouble _tmp40_; -			cairo_t* _tmp41_; -			SpitTransitionsVisuals* _tmp42_; -			GdkPixbuf* _tmp43_; -			GdkPixbuf* _tmp44_; -			SpitTransitionsVisuals* _tmp45_; -			GdkRectangle _tmp46_ = {0}; -			GdkRectangle _tmp47_; -			gint _tmp48_; -			SpitTransitionsVisuals* _tmp49_; -			GdkRectangle _tmp50_ = {0}; -			GdkRectangle _tmp51_; -			gint _tmp52_; -			cairo_t* _tmp53_; -			gdouble _tmp54_;  #line 89 "/home/jens/Source/shotwell/plugins/shotwell-transitions/CrumbleEffect.vala" -			_tmp40_ = alpha; +			_tmp31_ = alpha;  #line 89 "/home/jens/Source/shotwell/plugins/shotwell-transitions/CrumbleEffect.vala" -			alpha = (_tmp40_ - 0.5) * 2; -#line 90 "/home/jens/Source/shotwell/plugins/shotwell-transitions/CrumbleEffect.vala" -			_tmp41_ = ctx; -#line 90 "/home/jens/Source/shotwell/plugins/shotwell-transitions/CrumbleEffect.vala" -			_tmp42_ = visuals; -#line 90 "/home/jens/Source/shotwell/plugins/shotwell-transitions/CrumbleEffect.vala" -			_tmp43_ = spit_transitions_visuals_get_to_pixbuf (_tmp42_); +			alpha = (_tmp31_ - 0.5) * 2;  #line 90 "/home/jens/Source/shotwell/plugins/shotwell-transitions/CrumbleEffect.vala" -			_tmp44_ = _tmp43_; +			_tmp32_ = spit_transitions_visuals_get_to_pixbuf (visuals);  #line 90 "/home/jens/Source/shotwell/plugins/shotwell-transitions/CrumbleEffect.vala" -			_tmp45_ = visuals; +			_tmp33_ = _tmp32_;  #line 90 "/home/jens/Source/shotwell/plugins/shotwell-transitions/CrumbleEffect.vala" -			spit_transitions_visuals_get_to_pos (_tmp45_, &_tmp46_); +			spit_transitions_visuals_get_to_pos (visuals, &_tmp34_);  #line 90 "/home/jens/Source/shotwell/plugins/shotwell-transitions/CrumbleEffect.vala" -			_tmp47_ = _tmp46_; +			_tmp35_ = _tmp34_;  #line 90 "/home/jens/Source/shotwell/plugins/shotwell-transitions/CrumbleEffect.vala" -			_tmp48_ = _tmp47_.x; +			_tmp36_ = _tmp35_.x;  #line 90 "/home/jens/Source/shotwell/plugins/shotwell-transitions/CrumbleEffect.vala" -			_tmp49_ = visuals; +			spit_transitions_visuals_get_to_pos (visuals, &_tmp37_);  #line 90 "/home/jens/Source/shotwell/plugins/shotwell-transitions/CrumbleEffect.vala" -			spit_transitions_visuals_get_to_pos (_tmp49_, &_tmp50_); +			_tmp38_ = _tmp37_;  #line 90 "/home/jens/Source/shotwell/plugins/shotwell-transitions/CrumbleEffect.vala" -			_tmp51_ = _tmp50_; +			_tmp39_ = _tmp38_.y;  #line 90 "/home/jens/Source/shotwell/plugins/shotwell-transitions/CrumbleEffect.vala" -			_tmp52_ = _tmp51_.y; -#line 90 "/home/jens/Source/shotwell/plugins/shotwell-transitions/CrumbleEffect.vala" -			gdk_cairo_set_source_pixbuf (_tmp41_, _tmp44_, (gdouble) _tmp48_, (gdouble) _tmp52_); -#line 91 "/home/jens/Source/shotwell/plugins/shotwell-transitions/CrumbleEffect.vala" -			_tmp53_ = ctx; +			gdk_cairo_set_source_pixbuf (ctx, _tmp33_, (gdouble) _tmp36_, (gdouble) _tmp39_);  #line 91 "/home/jens/Source/shotwell/plugins/shotwell-transitions/CrumbleEffect.vala" -			_tmp54_ = alpha; +			_tmp40_ = alpha;  #line 91 "/home/jens/Source/shotwell/plugins/shotwell-transitions/CrumbleEffect.vala" -			cairo_paint_with_alpha (_tmp53_, _tmp54_); -#line 745 "CrumbleEffect.c" +			cairo_paint_with_alpha (ctx, _tmp40_); +#line 750 "CrumbleEffect.c"  		} else {  		}  	}  } -static void crumble_effect_real_advance (SpitTransitionsEffect* base, SpitTransitionsVisuals* visuals, SpitTransitionsMotion* motion, gint frame_number) { +static void +crumble_effect_real_advance (SpitTransitionsEffect* base, +                             SpitTransitionsVisuals* visuals, +                             SpitTransitionsMotion* motion, +                             gint frame_number) +{  	CrumbleEffect * self;  #line 97 "/home/jens/Source/shotwell/plugins/shotwell-transitions/CrumbleEffect.vala"  	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_CRUMBLE_EFFECT, CrumbleEffect); @@ -756,30 +766,36 @@ static void crumble_effect_real_advance (SpitTransitionsEffect* base, SpitTransi  	g_return_if_fail (SPIT_TRANSITIONS_IS_VISUALS (visuals));  #line 97 "/home/jens/Source/shotwell/plugins/shotwell-transitions/CrumbleEffect.vala"  	g_return_if_fail (SPIT_TRANSITIONS_IS_MOTION (motion)); -#line 760 "CrumbleEffect.c" +#line 770 "CrumbleEffect.c"  } -static void crumble_effect_real_cancel (SpitTransitionsEffect* base) { +static void +crumble_effect_real_cancel (SpitTransitionsEffect* base) +{  	CrumbleEffect * self;  #line 100 "/home/jens/Source/shotwell/plugins/shotwell-transitions/CrumbleEffect.vala"  	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_CRUMBLE_EFFECT, CrumbleEffect); -#line 768 "CrumbleEffect.c" +#line 780 "CrumbleEffect.c"  } -static void crumble_effect_class_init (CrumbleEffectClass * klass) { +static void +crumble_effect_class_init (CrumbleEffectClass * klass) +{  #line 28 "/home/jens/Source/shotwell/plugins/shotwell-transitions/CrumbleEffect.vala"  	crumble_effect_parent_class = g_type_class_peek_parent (klass);  #line 28 "/home/jens/Source/shotwell/plugins/shotwell-transitions/CrumbleEffect.vala"  	g_type_class_add_private (klass, sizeof (CrumbleEffectPrivate));  #line 28 "/home/jens/Source/shotwell/plugins/shotwell-transitions/CrumbleEffect.vala"  	G_OBJECT_CLASS (klass)->finalize = crumble_effect_finalize; -#line 779 "CrumbleEffect.c" +#line 793 "CrumbleEffect.c"  } -static void crumble_effect_spit_transitions_effect_interface_init (SpitTransitionsEffectIface * iface) { +static void +crumble_effect_spit_transitions_effect_interface_init (SpitTransitionsEffectIface * iface) +{  #line 28 "/home/jens/Source/shotwell/plugins/shotwell-transitions/CrumbleEffect.vala"  	crumble_effect_spit_transitions_effect_parent_iface = g_type_interface_peek_parent (iface);  #line 28 "/home/jens/Source/shotwell/plugins/shotwell-transitions/CrumbleEffect.vala" @@ -794,18 +810,22 @@ static void crumble_effect_spit_transitions_effect_interface_init (SpitTransitio  	iface->advance = (void (*) (SpitTransitionsEffect *, SpitTransitionsVisuals*, SpitTransitionsMotion*, gint)) crumble_effect_real_advance;  #line 28 "/home/jens/Source/shotwell/plugins/shotwell-transitions/CrumbleEffect.vala"  	iface->cancel = (void (*) (SpitTransitionsEffect *)) crumble_effect_real_cancel; -#line 798 "CrumbleEffect.c" +#line 814 "CrumbleEffect.c"  } -static void crumble_effect_instance_init (CrumbleEffect * self) { +static void +crumble_effect_instance_init (CrumbleEffect * self) +{  #line 28 "/home/jens/Source/shotwell/plugins/shotwell-transitions/CrumbleEffect.vala"  	self->priv = CRUMBLE_EFFECT_GET_PRIVATE (self); -#line 805 "CrumbleEffect.c" +#line 823 "CrumbleEffect.c"  } -static void crumble_effect_finalize (GObject * obj) { +static void +crumble_effect_finalize (GObject * obj) +{  	CrumbleEffect * self;  #line 28 "/home/jens/Source/shotwell/plugins/shotwell-transitions/CrumbleEffect.vala"  	self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_CRUMBLE_EFFECT, CrumbleEffect); @@ -815,11 +835,13 @@ static void crumble_effect_finalize (GObject * obj) {  	self->priv->accelerations = (g_free (self->priv->accelerations), NULL);  #line 28 "/home/jens/Source/shotwell/plugins/shotwell-transitions/CrumbleEffect.vala"  	G_OBJECT_CLASS (crumble_effect_parent_class)->finalize (obj); -#line 819 "CrumbleEffect.c" +#line 839 "CrumbleEffect.c"  } -GType crumble_effect_get_type (void) { +GType +crumble_effect_get_type (void) +{  	static volatile gsize crumble_effect_type_id__volatile = 0;  	if (g_once_init_enter (&crumble_effect_type_id__volatile)) {  		static const GTypeInfo g_define_type_info = { sizeof (CrumbleEffectClass), (GBaseInitFunc) NULL, (GBaseFinalizeFunc) NULL, (GClassInitFunc) crumble_effect_class_init, (GClassFinalizeFunc) NULL, NULL, sizeof (CrumbleEffect), 0, (GInstanceInitFunc) crumble_effect_instance_init, NULL }; @@ -833,7 +855,11 @@ GType crumble_effect_get_type (void) {  } -static void _vala_array_destroy (gpointer array, gint array_length, GDestroyNotify destroy_func) { +static void +_vala_array_destroy (gpointer array, +                     gint array_length, +                     GDestroyNotify destroy_func) +{  	if ((array != NULL) && (destroy_func != NULL)) {  		int i;  		for (i = 0; i < array_length; i = i + 1) { @@ -845,7 +871,11 @@ 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_free (gpointer array, +                  gint array_length, +                  GDestroyNotify destroy_func) +{  	_vala_array_destroy (array, array_length, destroy_func);  	g_free (array);  } diff --git a/plugins/shotwell-transitions/FadeEffect.c b/plugins/shotwell-transitions/FadeEffect.c index 8234972..25551e2 100644 --- a/plugins/shotwell-transitions/FadeEffect.c +++ b/plugins/shotwell-transitions/FadeEffect.c @@ -1,4 +1,4 @@ -/* FadeEffect.c generated by valac 0.36.6, the Vala compiler +/* FadeEffect.c generated by valac 0.40.4, the Vala compiler   * generated from FadeEffect.vala, do not modify */  /* Copyright 2010 Maxim Kartashev @@ -8,6 +8,7 @@   * (version 2.1 or later).  See the COPYING file in this distribution.   */ +  #include <glib.h>  #include <glib-object.h>  #include <shotwell-plugin-dev-1.0.h> @@ -42,6 +43,11 @@ typedef struct _ShotwellTransitionDescriptorPrivate ShotwellTransitionDescriptor  typedef struct _FadeEffectDescriptor FadeEffectDescriptor;  typedef struct _FadeEffectDescriptorClass FadeEffectDescriptorClass;  typedef struct _FadeEffectDescriptorPrivate FadeEffectDescriptorPrivate; +enum  { +	FADE_EFFECT_DESCRIPTOR_0_PROPERTY, +	FADE_EFFECT_DESCRIPTOR_NUM_PROPERTIES +}; +static GParamSpec* fade_effect_descriptor_properties[FADE_EFFECT_DESCRIPTOR_NUM_PROPERTIES];  #define TYPE_FADE_EFFECT (fade_effect_get_type ())  #define FADE_EFFECT(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), TYPE_FADE_EFFECT, FadeEffect)) @@ -53,6 +59,11 @@ typedef struct _FadeEffectDescriptorPrivate FadeEffectDescriptorPrivate;  typedef struct _FadeEffect FadeEffect;  typedef struct _FadeEffectClass FadeEffectClass;  typedef struct _FadeEffectPrivate FadeEffectPrivate; +enum  { +	FADE_EFFECT_0_PROPERTY, +	FADE_EFFECT_NUM_PROPERTIES +}; +static GParamSpec* fade_effect_properties[FADE_EFFECT_NUM_PROPERTIES];  struct _ShotwellTransitionDescriptor {  	GObject parent_instance; @@ -91,54 +102,68 @@ static SpitTransitionsEffectIface * fade_effect_spit_transitions_effect_parent_i  GType shotwell_transition_descriptor_get_type (void) G_GNUC_CONST;  GType fade_effect_descriptor_get_type (void) G_GNUC_CONST; -enum  { -	FADE_EFFECT_DESCRIPTOR_DUMMY_PROPERTY -};  FadeEffectDescriptor* fade_effect_descriptor_new (GFile* resource_directory); -FadeEffectDescriptor* fade_effect_descriptor_construct (GType object_type, GFile* resource_directory); -ShotwellTransitionDescriptor* shotwell_transition_descriptor_construct (GType object_type, GFile* resource_directory); +FadeEffectDescriptor* fade_effect_descriptor_construct (GType object_type, +                                                        GFile* resource_directory); +ShotwellTransitionDescriptor* shotwell_transition_descriptor_construct (GType object_type, +                                                                        GFile* resource_directory);  static const gchar* fade_effect_descriptor_real_get_id (ShotwellTransitionDescriptor* base);  static const gchar* fade_effect_descriptor_real_get_pluggable_name (ShotwellTransitionDescriptor* base); -static SpitTransitionsEffect* fade_effect_descriptor_real_create (ShotwellTransitionDescriptor* base, SpitHostInterface* host); +static SpitTransitionsEffect* fade_effect_descriptor_real_create (ShotwellTransitionDescriptor* base, +                                                           SpitHostInterface* host);  FadeEffect* fade_effect_new (void);  FadeEffect* fade_effect_construct (GType object_type);  GType fade_effect_get_type (void) G_GNUC_CONST; -enum  { -	FADE_EFFECT_DUMMY_PROPERTY -};  #define FADE_EFFECT_DESIRED_FPS 30  #define FADE_EFFECT_MIN_FPS 20 -static void fade_effect_real_get_fps (SpitTransitionsEffect* base, gint* desired_fps, gint* min_fps); -static void fade_effect_real_start (SpitTransitionsEffect* base, SpitTransitionsVisuals* visuals, SpitTransitionsMotion* motion); +static void fade_effect_real_get_fps (SpitTransitionsEffect* base, +                               gint* desired_fps, +                               gint* min_fps); +static void fade_effect_real_start (SpitTransitionsEffect* base, +                             SpitTransitionsVisuals* visuals, +                             SpitTransitionsMotion* motion);  static gboolean fade_effect_real_needs_clear_background (SpitTransitionsEffect* base); -static void fade_effect_real_paint (SpitTransitionsEffect* base, SpitTransitionsVisuals* visuals, SpitTransitionsMotion* motion, cairo_t* ctx, gint width, gint height, gint frame_number); -static void fade_effect_real_advance (SpitTransitionsEffect* base, SpitTransitionsVisuals* visuals, SpitTransitionsMotion* motion, gint frame_number); +static void fade_effect_real_paint (SpitTransitionsEffect* base, +                             SpitTransitionsVisuals* visuals, +                             SpitTransitionsMotion* motion, +                             cairo_t* ctx, +                             gint width, +                             gint height, +                             gint frame_number); +static void fade_effect_real_advance (SpitTransitionsEffect* base, +                               SpitTransitionsVisuals* visuals, +                               SpitTransitionsMotion* motion, +                               gint frame_number);  static void fade_effect_real_cancel (SpitTransitionsEffect* base); -FadeEffectDescriptor* fade_effect_descriptor_construct (GType object_type, GFile* resource_directory) { +FadeEffectDescriptor* +fade_effect_descriptor_construct (GType object_type, +                                  GFile* resource_directory) +{  	FadeEffectDescriptor * self = NULL; -	GFile* _tmp0_;  #line 11 "/home/jens/Source/shotwell/plugins/shotwell-transitions/FadeEffect.vala"  	g_return_val_if_fail (G_IS_FILE (resource_directory), NULL);  #line 12 "/home/jens/Source/shotwell/plugins/shotwell-transitions/FadeEffect.vala" -	_tmp0_ = resource_directory; -#line 12 "/home/jens/Source/shotwell/plugins/shotwell-transitions/FadeEffect.vala" -	self = (FadeEffectDescriptor*) shotwell_transition_descriptor_construct (object_type, _tmp0_); +	self = (FadeEffectDescriptor*) shotwell_transition_descriptor_construct (object_type, resource_directory);  #line 11 "/home/jens/Source/shotwell/plugins/shotwell-transitions/FadeEffect.vala"  	return self; -#line 131 "FadeEffect.c" +#line 152 "FadeEffect.c"  } -FadeEffectDescriptor* fade_effect_descriptor_new (GFile* resource_directory) { +FadeEffectDescriptor* +fade_effect_descriptor_new (GFile* resource_directory) +{  #line 11 "/home/jens/Source/shotwell/plugins/shotwell-transitions/FadeEffect.vala"  	return fade_effect_descriptor_construct (TYPE_FADE_EFFECT_DESCRIPTOR, resource_directory); -#line 138 "FadeEffect.c" +#line 161 "FadeEffect.c"  } -static const gchar* fade_effect_descriptor_real_get_id (ShotwellTransitionDescriptor* base) { +static const gchar* +fade_effect_descriptor_real_get_id (ShotwellTransitionDescriptor* base) +{  	FadeEffectDescriptor * self;  	const gchar* result = NULL;  #line 15 "/home/jens/Source/shotwell/plugins/shotwell-transitions/FadeEffect.vala" @@ -147,11 +172,13 @@ static const gchar* fade_effect_descriptor_real_get_id (ShotwellTransitionDescri  	result = "org.yorba.shotwell.transitions.fade";  #line 16 "/home/jens/Source/shotwell/plugins/shotwell-transitions/FadeEffect.vala"  	return result; -#line 151 "FadeEffect.c" +#line 176 "FadeEffect.c"  } -static const gchar* fade_effect_descriptor_real_get_pluggable_name (ShotwellTransitionDescriptor* base) { +static const gchar* +fade_effect_descriptor_real_get_pluggable_name (ShotwellTransitionDescriptor* base) +{  	FadeEffectDescriptor * self;  	const gchar* result = NULL;  #line 19 "/home/jens/Source/shotwell/plugins/shotwell-transitions/FadeEffect.vala" @@ -160,11 +187,14 @@ static const gchar* fade_effect_descriptor_real_get_pluggable_name (ShotwellTran  	result = _ ("Fade");  #line 20 "/home/jens/Source/shotwell/plugins/shotwell-transitions/FadeEffect.vala"  	return result; -#line 164 "FadeEffect.c" +#line 191 "FadeEffect.c"  } -static SpitTransitionsEffect* fade_effect_descriptor_real_create (ShotwellTransitionDescriptor* base, SpitHostInterface* host) { +static SpitTransitionsEffect* +fade_effect_descriptor_real_create (ShotwellTransitionDescriptor* base, +                                    SpitHostInterface* host) +{  	FadeEffectDescriptor * self;  	SpitTransitionsEffect* result = NULL;  	FadeEffect* _tmp0_; @@ -178,11 +208,13 @@ static SpitTransitionsEffect* fade_effect_descriptor_real_create (ShotwellTransi  	result = G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, SPIT_TRANSITIONS_TYPE_EFFECT, SpitTransitionsEffect);  #line 24 "/home/jens/Source/shotwell/plugins/shotwell-transitions/FadeEffect.vala"  	return result; -#line 182 "FadeEffect.c" +#line 212 "FadeEffect.c"  } -static void fade_effect_descriptor_class_init (FadeEffectDescriptorClass * klass) { +static void +fade_effect_descriptor_class_init (FadeEffectDescriptorClass * klass) +{  #line 10 "/home/jens/Source/shotwell/plugins/shotwell-transitions/FadeEffect.vala"  	fade_effect_descriptor_parent_class = g_type_class_peek_parent (klass);  #line 10 "/home/jens/Source/shotwell/plugins/shotwell-transitions/FadeEffect.vala" @@ -191,15 +223,19 @@ static void fade_effect_descriptor_class_init (FadeEffectDescriptorClass * klass  	((ShotwellTransitionDescriptorClass *) klass)->get_pluggable_name = (const gchar* (*) (ShotwellTransitionDescriptor *)) fade_effect_descriptor_real_get_pluggable_name;  #line 10 "/home/jens/Source/shotwell/plugins/shotwell-transitions/FadeEffect.vala"  	((ShotwellTransitionDescriptorClass *) klass)->create = (SpitTransitionsEffect* (*) (ShotwellTransitionDescriptor *, SpitHostInterface*)) fade_effect_descriptor_real_create; -#line 195 "FadeEffect.c" +#line 227 "FadeEffect.c"  } -static void fade_effect_descriptor_instance_init (FadeEffectDescriptor * self) { +static void +fade_effect_descriptor_instance_init (FadeEffectDescriptor * self) +{  } -GType fade_effect_descriptor_get_type (void) { +GType +fade_effect_descriptor_get_type (void) +{  	static volatile gsize fade_effect_descriptor_type_id__volatile = 0;  	if (g_once_init_enter (&fade_effect_descriptor_type_id__volatile)) {  		static const GTypeInfo g_define_type_info = { sizeof (FadeEffectDescriptorClass), (GBaseInitFunc) NULL, (GBaseFinalizeFunc) NULL, (GClassInitFunc) fade_effect_descriptor_class_init, (GClassFinalizeFunc) NULL, NULL, sizeof (FadeEffectDescriptor), 0, (GInstanceInitFunc) fade_effect_descriptor_instance_init, NULL }; @@ -211,24 +247,32 @@ GType fade_effect_descriptor_get_type (void) {  } -FadeEffect* fade_effect_construct (GType object_type) { +FadeEffect* +fade_effect_construct (GType object_type) +{  	FadeEffect * self = NULL;  #line 32 "/home/jens/Source/shotwell/plugins/shotwell-transitions/FadeEffect.vala"  	self = (FadeEffect*) g_object_new (object_type, NULL);  #line 32 "/home/jens/Source/shotwell/plugins/shotwell-transitions/FadeEffect.vala"  	return self; -#line 221 "FadeEffect.c" +#line 259 "FadeEffect.c"  } -FadeEffect* fade_effect_new (void) { +FadeEffect* +fade_effect_new (void) +{  #line 32 "/home/jens/Source/shotwell/plugins/shotwell-transitions/FadeEffect.vala"  	return fade_effect_construct (TYPE_FADE_EFFECT); -#line 228 "FadeEffect.c" +#line 268 "FadeEffect.c"  } -static void fade_effect_real_get_fps (SpitTransitionsEffect* base, gint* desired_fps, gint* min_fps) { +static void +fade_effect_real_get_fps (SpitTransitionsEffect* base, +                          gint* desired_fps, +                          gint* min_fps) +{  	FadeEffect * self;  	gint _vala_desired_fps = 0;  	gint _vala_min_fps = 0; @@ -242,18 +286,22 @@ static void fade_effect_real_get_fps (SpitTransitionsEffect* base, gint* desired  	if (desired_fps) {  #line 35 "/home/jens/Source/shotwell/plugins/shotwell-transitions/FadeEffect.vala"  		*desired_fps = _vala_desired_fps; -#line 246 "FadeEffect.c" +#line 290 "FadeEffect.c"  	}  #line 35 "/home/jens/Source/shotwell/plugins/shotwell-transitions/FadeEffect.vala"  	if (min_fps) {  #line 35 "/home/jens/Source/shotwell/plugins/shotwell-transitions/FadeEffect.vala"  		*min_fps = _vala_min_fps; -#line 252 "FadeEffect.c" +#line 296 "FadeEffect.c"  	}  } -static void fade_effect_real_start (SpitTransitionsEffect* base, SpitTransitionsVisuals* visuals, SpitTransitionsMotion* motion) { +static void +fade_effect_real_start (SpitTransitionsEffect* base, +                        SpitTransitionsVisuals* visuals, +                        SpitTransitionsMotion* motion) +{  	FadeEffect * self;  #line 40 "/home/jens/Source/shotwell/plugins/shotwell-transitions/FadeEffect.vala"  	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_FADE_EFFECT, FadeEffect); @@ -261,11 +309,13 @@ static void fade_effect_real_start (SpitTransitionsEffect* base, SpitTransitions  	g_return_if_fail (SPIT_TRANSITIONS_IS_VISUALS (visuals));  #line 40 "/home/jens/Source/shotwell/plugins/shotwell-transitions/FadeEffect.vala"  	g_return_if_fail (SPIT_TRANSITIONS_IS_MOTION (motion)); -#line 265 "FadeEffect.c" +#line 313 "FadeEffect.c"  } -static gboolean fade_effect_real_needs_clear_background (SpitTransitionsEffect* base) { +static gboolean +fade_effect_real_needs_clear_background (SpitTransitionsEffect* base) +{  	FadeEffect * self;  	gboolean result = FALSE;  #line 43 "/home/jens/Source/shotwell/plugins/shotwell-transitions/FadeEffect.vala" @@ -274,22 +324,25 @@ static gboolean fade_effect_real_needs_clear_background (SpitTransitionsEffect*  	result = TRUE;  #line 44 "/home/jens/Source/shotwell/plugins/shotwell-transitions/FadeEffect.vala"  	return result; -#line 278 "FadeEffect.c" +#line 328 "FadeEffect.c"  } -static void fade_effect_real_paint (SpitTransitionsEffect* base, SpitTransitionsVisuals* visuals, SpitTransitionsMotion* motion, cairo_t* ctx, gint width, gint height, gint frame_number) { +static void +fade_effect_real_paint (SpitTransitionsEffect* base, +                        SpitTransitionsVisuals* visuals, +                        SpitTransitionsMotion* motion, +                        cairo_t* ctx, +                        gint width, +                        gint height, +                        gint frame_number) +{  	FadeEffect * self;  	gdouble alpha = 0.0; -	SpitTransitionsMotion* _tmp0_; -	gint _tmp1_; -	gdouble _tmp2_; -	SpitTransitionsVisuals* _tmp3_; -	GdkPixbuf* _tmp4_; -	GdkPixbuf* _tmp5_; -	SpitTransitionsVisuals* _tmp20_; -	GdkPixbuf* _tmp21_; -	GdkPixbuf* _tmp22_; +	GdkPixbuf* _tmp0_; +	GdkPixbuf* _tmp1_; +	GdkPixbuf* _tmp11_; +	GdkPixbuf* _tmp12_;  #line 47 "/home/jens/Source/shotwell/plugins/shotwell-transitions/FadeEffect.vala"  	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_FADE_EFFECT, FadeEffect);  #line 47 "/home/jens/Source/shotwell/plugins/shotwell-transitions/FadeEffect.vala" @@ -299,131 +352,96 @@ static void fade_effect_real_paint (SpitTransitionsEffect* base, SpitTransitions  #line 47 "/home/jens/Source/shotwell/plugins/shotwell-transitions/FadeEffect.vala"  	g_return_if_fail (ctx != NULL);  #line 49 "/home/jens/Source/shotwell/plugins/shotwell-transitions/FadeEffect.vala" -	_tmp0_ = motion; -#line 49 "/home/jens/Source/shotwell/plugins/shotwell-transitions/FadeEffect.vala" -	_tmp1_ = frame_number; -#line 49 "/home/jens/Source/shotwell/plugins/shotwell-transitions/FadeEffect.vala" -	_tmp2_ = spit_transitions_motion_get_alpha (_tmp0_, _tmp1_); -#line 49 "/home/jens/Source/shotwell/plugins/shotwell-transitions/FadeEffect.vala" -	alpha = _tmp2_; -#line 53 "/home/jens/Source/shotwell/plugins/shotwell-transitions/FadeEffect.vala" -	_tmp3_ = visuals; +	alpha = spit_transitions_motion_get_alpha (motion, frame_number);  #line 53 "/home/jens/Source/shotwell/plugins/shotwell-transitions/FadeEffect.vala" -	_tmp4_ = spit_transitions_visuals_get_from_pixbuf (_tmp3_); +	_tmp0_ = spit_transitions_visuals_get_from_pixbuf (visuals);  #line 53 "/home/jens/Source/shotwell/plugins/shotwell-transitions/FadeEffect.vala" -	_tmp5_ = _tmp4_; +	_tmp1_ = _tmp0_;  #line 53 "/home/jens/Source/shotwell/plugins/shotwell-transitions/FadeEffect.vala" -	if (_tmp5_ != NULL) { -#line 318 "FadeEffect.c" -		cairo_t* _tmp6_; -		SpitTransitionsVisuals* _tmp7_; -		GdkPixbuf* _tmp8_; -		GdkPixbuf* _tmp9_; -		SpitTransitionsVisuals* _tmp10_; -		GdkRectangle _tmp11_ = {0}; -		GdkRectangle _tmp12_; -		gint _tmp13_; -		SpitTransitionsVisuals* _tmp14_; -		GdkRectangle _tmp15_ = {0}; -		GdkRectangle _tmp16_; -		gint _tmp17_; -		cairo_t* _tmp18_; -		gdouble _tmp19_; -#line 54 "/home/jens/Source/shotwell/plugins/shotwell-transitions/FadeEffect.vala" -		_tmp6_ = ctx; +	if (_tmp1_ != NULL) { +#line 363 "FadeEffect.c" +		GdkPixbuf* _tmp2_; +		GdkPixbuf* _tmp3_; +		GdkRectangle _tmp4_ = {0}; +		GdkRectangle _tmp5_; +		gint _tmp6_; +		GdkRectangle _tmp7_ = {0}; +		GdkRectangle _tmp8_; +		gint _tmp9_; +		gdouble _tmp10_;  #line 54 "/home/jens/Source/shotwell/plugins/shotwell-transitions/FadeEffect.vala" -		_tmp7_ = visuals; +		_tmp2_ = spit_transitions_visuals_get_from_pixbuf (visuals);  #line 54 "/home/jens/Source/shotwell/plugins/shotwell-transitions/FadeEffect.vala" -		_tmp8_ = spit_transitions_visuals_get_from_pixbuf (_tmp7_); +		_tmp3_ = _tmp2_;  #line 54 "/home/jens/Source/shotwell/plugins/shotwell-transitions/FadeEffect.vala" -		_tmp9_ = _tmp8_; +		spit_transitions_visuals_get_from_pos (visuals, &_tmp4_);  #line 54 "/home/jens/Source/shotwell/plugins/shotwell-transitions/FadeEffect.vala" -		_tmp10_ = visuals; +		_tmp5_ = _tmp4_;  #line 54 "/home/jens/Source/shotwell/plugins/shotwell-transitions/FadeEffect.vala" -		spit_transitions_visuals_get_from_pos (_tmp10_, &_tmp11_); +		_tmp6_ = _tmp5_.x;  #line 54 "/home/jens/Source/shotwell/plugins/shotwell-transitions/FadeEffect.vala" -		_tmp12_ = _tmp11_; +		spit_transitions_visuals_get_from_pos (visuals, &_tmp7_);  #line 54 "/home/jens/Source/shotwell/plugins/shotwell-transitions/FadeEffect.vala" -		_tmp13_ = _tmp12_.x; +		_tmp8_ = _tmp7_;  #line 54 "/home/jens/Source/shotwell/plugins/shotwell-transitions/FadeEffect.vala" -		_tmp14_ = visuals; +		_tmp9_ = _tmp8_.y;  #line 54 "/home/jens/Source/shotwell/plugins/shotwell-transitions/FadeEffect.vala" -		spit_transitions_visuals_get_from_pos (_tmp14_, &_tmp15_); -#line 54 "/home/jens/Source/shotwell/plugins/shotwell-transitions/FadeEffect.vala" -		_tmp16_ = _tmp15_; -#line 54 "/home/jens/Source/shotwell/plugins/shotwell-transitions/FadeEffect.vala" -		_tmp17_ = _tmp16_.y; -#line 54 "/home/jens/Source/shotwell/plugins/shotwell-transitions/FadeEffect.vala" -		gdk_cairo_set_source_pixbuf (_tmp6_, _tmp9_, (gdouble) _tmp13_, (gdouble) _tmp17_); -#line 55 "/home/jens/Source/shotwell/plugins/shotwell-transitions/FadeEffect.vala" -		_tmp18_ = ctx; +		gdk_cairo_set_source_pixbuf (ctx, _tmp3_, (gdouble) _tmp6_, (gdouble) _tmp9_);  #line 55 "/home/jens/Source/shotwell/plugins/shotwell-transitions/FadeEffect.vala" -		_tmp19_ = alpha; +		_tmp10_ = alpha;  #line 55 "/home/jens/Source/shotwell/plugins/shotwell-transitions/FadeEffect.vala" -		cairo_paint_with_alpha (_tmp18_, 1.0 - _tmp19_); -#line 365 "FadeEffect.c" +		cairo_paint_with_alpha (ctx, 1.0 - _tmp10_); +#line 395 "FadeEffect.c"  	}  #line 58 "/home/jens/Source/shotwell/plugins/shotwell-transitions/FadeEffect.vala" -	_tmp20_ = visuals; +	_tmp11_ = spit_transitions_visuals_get_to_pixbuf (visuals);  #line 58 "/home/jens/Source/shotwell/plugins/shotwell-transitions/FadeEffect.vala" -	_tmp21_ = spit_transitions_visuals_get_to_pixbuf (_tmp20_); +	_tmp12_ = _tmp11_;  #line 58 "/home/jens/Source/shotwell/plugins/shotwell-transitions/FadeEffect.vala" -	_tmp22_ = _tmp21_; -#line 58 "/home/jens/Source/shotwell/plugins/shotwell-transitions/FadeEffect.vala" -	if (_tmp22_ != NULL) { -#line 375 "FadeEffect.c" -		cairo_t* _tmp23_; -		SpitTransitionsVisuals* _tmp24_; -		GdkPixbuf* _tmp25_; -		GdkPixbuf* _tmp26_; -		SpitTransitionsVisuals* _tmp27_; -		GdkRectangle _tmp28_ = {0}; -		GdkRectangle _tmp29_; -		gint _tmp30_; -		SpitTransitionsVisuals* _tmp31_; -		GdkRectangle _tmp32_ = {0}; -		GdkRectangle _tmp33_; -		gint _tmp34_; -		cairo_t* _tmp35_; -		gdouble _tmp36_; -#line 59 "/home/jens/Source/shotwell/plugins/shotwell-transitions/FadeEffect.vala" -		_tmp23_ = ctx; -#line 59 "/home/jens/Source/shotwell/plugins/shotwell-transitions/FadeEffect.vala" -		_tmp24_ = visuals; -#line 59 "/home/jens/Source/shotwell/plugins/shotwell-transitions/FadeEffect.vala" -		_tmp25_ = spit_transitions_visuals_get_to_pixbuf (_tmp24_); -#line 59 "/home/jens/Source/shotwell/plugins/shotwell-transitions/FadeEffect.vala" -		_tmp26_ = _tmp25_; +	if (_tmp12_ != NULL) { +#line 403 "FadeEffect.c" +		GdkPixbuf* _tmp13_; +		GdkPixbuf* _tmp14_; +		GdkRectangle _tmp15_ = {0}; +		GdkRectangle _tmp16_; +		gint _tmp17_; +		GdkRectangle _tmp18_ = {0}; +		GdkRectangle _tmp19_; +		gint _tmp20_; +		gdouble _tmp21_;  #line 59 "/home/jens/Source/shotwell/plugins/shotwell-transitions/FadeEffect.vala" -		_tmp27_ = visuals; +		_tmp13_ = spit_transitions_visuals_get_to_pixbuf (visuals);  #line 59 "/home/jens/Source/shotwell/plugins/shotwell-transitions/FadeEffect.vala" -		spit_transitions_visuals_get_to_pos (_tmp27_, &_tmp28_); +		_tmp14_ = _tmp13_;  #line 59 "/home/jens/Source/shotwell/plugins/shotwell-transitions/FadeEffect.vala" -		_tmp29_ = _tmp28_; +		spit_transitions_visuals_get_to_pos (visuals, &_tmp15_);  #line 59 "/home/jens/Source/shotwell/plugins/shotwell-transitions/FadeEffect.vala" -		_tmp30_ = _tmp29_.x; +		_tmp16_ = _tmp15_;  #line 59 "/home/jens/Source/shotwell/plugins/shotwell-transitions/FadeEffect.vala" -		_tmp31_ = visuals; +		_tmp17_ = _tmp16_.x;  #line 59 "/home/jens/Source/shotwell/plugins/shotwell-transitions/FadeEffect.vala" -		spit_transitions_visuals_get_to_pos (_tmp31_, &_tmp32_); +		spit_transitions_visuals_get_to_pos (visuals, &_tmp18_);  #line 59 "/home/jens/Source/shotwell/plugins/shotwell-transitions/FadeEffect.vala" -		_tmp33_ = _tmp32_; +		_tmp19_ = _tmp18_;  #line 59 "/home/jens/Source/shotwell/plugins/shotwell-transitions/FadeEffect.vala" -		_tmp34_ = _tmp33_.y; +		_tmp20_ = _tmp19_.y;  #line 59 "/home/jens/Source/shotwell/plugins/shotwell-transitions/FadeEffect.vala" -		gdk_cairo_set_source_pixbuf (_tmp23_, _tmp26_, (gdouble) _tmp30_, (gdouble) _tmp34_); -#line 60 "/home/jens/Source/shotwell/plugins/shotwell-transitions/FadeEffect.vala" -		_tmp35_ = ctx; +		gdk_cairo_set_source_pixbuf (ctx, _tmp14_, (gdouble) _tmp17_, (gdouble) _tmp20_);  #line 60 "/home/jens/Source/shotwell/plugins/shotwell-transitions/FadeEffect.vala" -		_tmp36_ = alpha; +		_tmp21_ = alpha;  #line 60 "/home/jens/Source/shotwell/plugins/shotwell-transitions/FadeEffect.vala" -		cairo_paint_with_alpha (_tmp35_, _tmp36_); -#line 422 "FadeEffect.c" +		cairo_paint_with_alpha (ctx, _tmp21_); +#line 435 "FadeEffect.c"  	}  } -static void fade_effect_real_advance (SpitTransitionsEffect* base, SpitTransitionsVisuals* visuals, SpitTransitionsMotion* motion, gint frame_number) { +static void +fade_effect_real_advance (SpitTransitionsEffect* base, +                          SpitTransitionsVisuals* visuals, +                          SpitTransitionsMotion* motion, +                          gint frame_number) +{  	FadeEffect * self;  #line 64 "/home/jens/Source/shotwell/plugins/shotwell-transitions/FadeEffect.vala"  	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_FADE_EFFECT, FadeEffect); @@ -431,26 +449,32 @@ static void fade_effect_real_advance (SpitTransitionsEffect* base, SpitTransitio  	g_return_if_fail (SPIT_TRANSITIONS_IS_VISUALS (visuals));  #line 64 "/home/jens/Source/shotwell/plugins/shotwell-transitions/FadeEffect.vala"  	g_return_if_fail (SPIT_TRANSITIONS_IS_MOTION (motion)); -#line 435 "FadeEffect.c" +#line 453 "FadeEffect.c"  } -static void fade_effect_real_cancel (SpitTransitionsEffect* base) { +static void +fade_effect_real_cancel (SpitTransitionsEffect* base) +{  	FadeEffect * self;  #line 67 "/home/jens/Source/shotwell/plugins/shotwell-transitions/FadeEffect.vala"  	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_FADE_EFFECT, FadeEffect); -#line 443 "FadeEffect.c" +#line 463 "FadeEffect.c"  } -static void fade_effect_class_init (FadeEffectClass * klass) { +static void +fade_effect_class_init (FadeEffectClass * klass) +{  #line 28 "/home/jens/Source/shotwell/plugins/shotwell-transitions/FadeEffect.vala"  	fade_effect_parent_class = g_type_class_peek_parent (klass); -#line 450 "FadeEffect.c" +#line 472 "FadeEffect.c"  } -static void fade_effect_spit_transitions_effect_interface_init (SpitTransitionsEffectIface * iface) { +static void +fade_effect_spit_transitions_effect_interface_init (SpitTransitionsEffectIface * iface) +{  #line 28 "/home/jens/Source/shotwell/plugins/shotwell-transitions/FadeEffect.vala"  	fade_effect_spit_transitions_effect_parent_iface = g_type_interface_peek_parent (iface);  #line 28 "/home/jens/Source/shotwell/plugins/shotwell-transitions/FadeEffect.vala" @@ -465,15 +489,19 @@ static void fade_effect_spit_transitions_effect_interface_init (SpitTransitionsE  	iface->advance = (void (*) (SpitTransitionsEffect *, SpitTransitionsVisuals*, SpitTransitionsMotion*, gint)) fade_effect_real_advance;  #line 28 "/home/jens/Source/shotwell/plugins/shotwell-transitions/FadeEffect.vala"  	iface->cancel = (void (*) (SpitTransitionsEffect *)) fade_effect_real_cancel; -#line 469 "FadeEffect.c" +#line 493 "FadeEffect.c"  } -static void fade_effect_instance_init (FadeEffect * self) { +static void +fade_effect_instance_init (FadeEffect * self) +{  } -GType fade_effect_get_type (void) { +GType +fade_effect_get_type (void) +{  	static volatile gsize fade_effect_type_id__volatile = 0;  	if (g_once_init_enter (&fade_effect_type_id__volatile)) {  		static const GTypeInfo g_define_type_info = { sizeof (FadeEffectClass), (GBaseInitFunc) NULL, (GBaseFinalizeFunc) NULL, (GClassInitFunc) fade_effect_class_init, (GClassFinalizeFunc) NULL, NULL, sizeof (FadeEffect), 0, (GInstanceInitFunc) fade_effect_instance_init, NULL }; diff --git a/plugins/shotwell-transitions/SlideEffect.c b/plugins/shotwell-transitions/SlideEffect.c index 7cc87e7..f516265 100644 --- a/plugins/shotwell-transitions/SlideEffect.c +++ b/plugins/shotwell-transitions/SlideEffect.c @@ -1,4 +1,4 @@ -/* SlideEffect.c generated by valac 0.36.6, the Vala compiler +/* SlideEffect.c generated by valac 0.40.4, the Vala compiler   * generated from SlideEffect.vala, do not modify */  /* Copyright 2010 Maxim Kartashev @@ -8,6 +8,7 @@   * (version 2.1 or later).  See the COPYING file in this distribution.   */ +  #include <glib.h>  #include <glib-object.h>  #include <shotwell-plugin-dev-1.0.h> @@ -43,6 +44,11 @@ typedef struct _ShotwellTransitionDescriptorPrivate ShotwellTransitionDescriptor  typedef struct _SlideEffectDescriptor SlideEffectDescriptor;  typedef struct _SlideEffectDescriptorClass SlideEffectDescriptorClass;  typedef struct _SlideEffectDescriptorPrivate SlideEffectDescriptorPrivate; +enum  { +	SLIDE_EFFECT_DESCRIPTOR_0_PROPERTY, +	SLIDE_EFFECT_DESCRIPTOR_NUM_PROPERTIES +}; +static GParamSpec* slide_effect_descriptor_properties[SLIDE_EFFECT_DESCRIPTOR_NUM_PROPERTIES];  #define TYPE_SLIDE_EFFECT (slide_effect_get_type ())  #define SLIDE_EFFECT(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), TYPE_SLIDE_EFFECT, SlideEffect)) @@ -54,6 +60,11 @@ typedef struct _SlideEffectDescriptorPrivate SlideEffectDescriptorPrivate;  typedef struct _SlideEffect SlideEffect;  typedef struct _SlideEffectClass SlideEffectClass;  typedef struct _SlideEffectPrivate SlideEffectPrivate; +enum  { +	SLIDE_EFFECT_0_PROPERTY, +	SLIDE_EFFECT_NUM_PROPERTIES +}; +static GParamSpec* slide_effect_properties[SLIDE_EFFECT_NUM_PROPERTIES];  struct _ShotwellTransitionDescriptor {  	GObject parent_instance; @@ -92,54 +103,68 @@ static SpitTransitionsEffectIface * slide_effect_spit_transitions_effect_parent_  GType shotwell_transition_descriptor_get_type (void) G_GNUC_CONST;  GType slide_effect_descriptor_get_type (void) G_GNUC_CONST; -enum  { -	SLIDE_EFFECT_DESCRIPTOR_DUMMY_PROPERTY -};  SlideEffectDescriptor* slide_effect_descriptor_new (GFile* resource_directory); -SlideEffectDescriptor* slide_effect_descriptor_construct (GType object_type, GFile* resource_directory); -ShotwellTransitionDescriptor* shotwell_transition_descriptor_construct (GType object_type, GFile* resource_directory); +SlideEffectDescriptor* slide_effect_descriptor_construct (GType object_type, +                                                          GFile* resource_directory); +ShotwellTransitionDescriptor* shotwell_transition_descriptor_construct (GType object_type, +                                                                        GFile* resource_directory);  static const gchar* slide_effect_descriptor_real_get_id (ShotwellTransitionDescriptor* base);  static const gchar* slide_effect_descriptor_real_get_pluggable_name (ShotwellTransitionDescriptor* base); -static SpitTransitionsEffect* slide_effect_descriptor_real_create (ShotwellTransitionDescriptor* base, SpitHostInterface* host); +static SpitTransitionsEffect* slide_effect_descriptor_real_create (ShotwellTransitionDescriptor* base, +                                                            SpitHostInterface* host);  SlideEffect* slide_effect_new (void);  SlideEffect* slide_effect_construct (GType object_type);  GType slide_effect_get_type (void) G_GNUC_CONST; -enum  { -	SLIDE_EFFECT_DUMMY_PROPERTY -};  #define SLIDE_EFFECT_DESIRED_FPS 25  #define SLIDE_EFFECT_MIN_FPS 15 -static void slide_effect_real_get_fps (SpitTransitionsEffect* base, gint* desired_fps, gint* min_fps); -static void slide_effect_real_start (SpitTransitionsEffect* base, SpitTransitionsVisuals* visuals, SpitTransitionsMotion* motion); +static void slide_effect_real_get_fps (SpitTransitionsEffect* base, +                                gint* desired_fps, +                                gint* min_fps); +static void slide_effect_real_start (SpitTransitionsEffect* base, +                              SpitTransitionsVisuals* visuals, +                              SpitTransitionsMotion* motion);  static gboolean slide_effect_real_needs_clear_background (SpitTransitionsEffect* base); -static void slide_effect_real_paint (SpitTransitionsEffect* base, SpitTransitionsVisuals* visuals, SpitTransitionsMotion* motion, cairo_t* ctx, gint width, gint height, gint frame_number); -static void slide_effect_real_advance (SpitTransitionsEffect* base, SpitTransitionsVisuals* visuals, SpitTransitionsMotion* motion, gint frame_number); +static void slide_effect_real_paint (SpitTransitionsEffect* base, +                              SpitTransitionsVisuals* visuals, +                              SpitTransitionsMotion* motion, +                              cairo_t* ctx, +                              gint width, +                              gint height, +                              gint frame_number); +static void slide_effect_real_advance (SpitTransitionsEffect* base, +                                SpitTransitionsVisuals* visuals, +                                SpitTransitionsMotion* motion, +                                gint frame_number);  static void slide_effect_real_cancel (SpitTransitionsEffect* base); -SlideEffectDescriptor* slide_effect_descriptor_construct (GType object_type, GFile* resource_directory) { +SlideEffectDescriptor* +slide_effect_descriptor_construct (GType object_type, +                                   GFile* resource_directory) +{  	SlideEffectDescriptor * self = 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" -	_tmp0_ = resource_directory; -#line 12 "/home/jens/Source/shotwell/plugins/shotwell-transitions/SlideEffect.vala" -	self = (SlideEffectDescriptor*) shotwell_transition_descriptor_construct (object_type, _tmp0_); +	self = (SlideEffectDescriptor*) shotwell_transition_descriptor_construct (object_type, resource_directory);  #line 11 "/home/jens/Source/shotwell/plugins/shotwell-transitions/SlideEffect.vala"  	return self; -#line 132 "SlideEffect.c" +#line 153 "SlideEffect.c"  } -SlideEffectDescriptor* slide_effect_descriptor_new (GFile* resource_directory) { +SlideEffectDescriptor* +slide_effect_descriptor_new (GFile* resource_directory) +{  #line 11 "/home/jens/Source/shotwell/plugins/shotwell-transitions/SlideEffect.vala"  	return slide_effect_descriptor_construct (TYPE_SLIDE_EFFECT_DESCRIPTOR, resource_directory); -#line 139 "SlideEffect.c" +#line 162 "SlideEffect.c"  } -static const gchar* slide_effect_descriptor_real_get_id (ShotwellTransitionDescriptor* base) { +static const gchar* +slide_effect_descriptor_real_get_id (ShotwellTransitionDescriptor* base) +{  	SlideEffectDescriptor * self;  	const gchar* result = NULL;  #line 15 "/home/jens/Source/shotwell/plugins/shotwell-transitions/SlideEffect.vala" @@ -148,11 +173,13 @@ static const gchar* slide_effect_descriptor_real_get_id (ShotwellTransitionDescr  	result = "org.yorba.shotwell.transitions.slide";  #line 16 "/home/jens/Source/shotwell/plugins/shotwell-transitions/SlideEffect.vala"  	return result; -#line 152 "SlideEffect.c" +#line 177 "SlideEffect.c"  } -static const gchar* slide_effect_descriptor_real_get_pluggable_name (ShotwellTransitionDescriptor* base) { +static const gchar* +slide_effect_descriptor_real_get_pluggable_name (ShotwellTransitionDescriptor* base) +{  	SlideEffectDescriptor * self;  	const gchar* result = NULL;  #line 19 "/home/jens/Source/shotwell/plugins/shotwell-transitions/SlideEffect.vala" @@ -161,11 +188,14 @@ static const gchar* slide_effect_descriptor_real_get_pluggable_name (ShotwellTra  	result = _ ("Slide");  #line 20 "/home/jens/Source/shotwell/plugins/shotwell-transitions/SlideEffect.vala"  	return result; -#line 165 "SlideEffect.c" +#line 192 "SlideEffect.c"  } -static SpitTransitionsEffect* slide_effect_descriptor_real_create (ShotwellTransitionDescriptor* base, SpitHostInterface* host) { +static SpitTransitionsEffect* +slide_effect_descriptor_real_create (ShotwellTransitionDescriptor* base, +                                     SpitHostInterface* host) +{  	SlideEffectDescriptor * self;  	SpitTransitionsEffect* result = NULL;  	SlideEffect* _tmp0_; @@ -179,11 +209,13 @@ 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 183 "SlideEffect.c" +#line 213 "SlideEffect.c"  } -static void slide_effect_descriptor_class_init (SlideEffectDescriptorClass * klass) { +static void +slide_effect_descriptor_class_init (SlideEffectDescriptorClass * klass) +{  #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" @@ -192,15 +224,19 @@ static void slide_effect_descriptor_class_init (SlideEffectDescriptorClass * kla  	((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 196 "SlideEffect.c" +#line 228 "SlideEffect.c"  } -static void slide_effect_descriptor_instance_init (SlideEffectDescriptor * self) { +static void +slide_effect_descriptor_instance_init (SlideEffectDescriptor * self) +{  } -GType slide_effect_descriptor_get_type (void) { +GType +slide_effect_descriptor_get_type (void) +{  	static volatile gsize slide_effect_descriptor_type_id__volatile = 0;  	if (g_once_init_enter (&slide_effect_descriptor_type_id__volatile)) {  		static const GTypeInfo g_define_type_info = { sizeof (SlideEffectDescriptorClass), (GBaseInitFunc) NULL, (GBaseFinalizeFunc) NULL, (GClassInitFunc) slide_effect_descriptor_class_init, (GClassFinalizeFunc) NULL, NULL, sizeof (SlideEffectDescriptor), 0, (GInstanceInitFunc) slide_effect_descriptor_instance_init, NULL }; @@ -212,24 +248,32 @@ GType slide_effect_descriptor_get_type (void) {  } -SlideEffect* slide_effect_construct (GType object_type) { +SlideEffect* +slide_effect_construct (GType object_type) +{  	SlideEffect * self = NULL;  #line 32 "/home/jens/Source/shotwell/plugins/shotwell-transitions/SlideEffect.vala"  	self = (SlideEffect*) g_object_new (object_type, NULL);  #line 32 "/home/jens/Source/shotwell/plugins/shotwell-transitions/SlideEffect.vala"  	return self; -#line 222 "SlideEffect.c" +#line 260 "SlideEffect.c"  } -SlideEffect* slide_effect_new (void) { +SlideEffect* +slide_effect_new (void) +{  #line 32 "/home/jens/Source/shotwell/plugins/shotwell-transitions/SlideEffect.vala"  	return slide_effect_construct (TYPE_SLIDE_EFFECT); -#line 229 "SlideEffect.c" +#line 269 "SlideEffect.c"  } -static void slide_effect_real_get_fps (SpitTransitionsEffect* base, gint* desired_fps, gint* min_fps) { +static void +slide_effect_real_get_fps (SpitTransitionsEffect* base, +                           gint* desired_fps, +                           gint* min_fps) +{  	SlideEffect * self;  	gint _vala_desired_fps = 0;  	gint _vala_min_fps = 0; @@ -243,18 +287,22 @@ 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 247 "SlideEffect.c" +#line 291 "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 253 "SlideEffect.c" +#line 297 "SlideEffect.c"  	}  } -static void slide_effect_real_start (SpitTransitionsEffect* base, SpitTransitionsVisuals* visuals, SpitTransitionsMotion* motion) { +static void +slide_effect_real_start (SpitTransitionsEffect* base, +                         SpitTransitionsVisuals* visuals, +                         SpitTransitionsMotion* motion) +{  	SlideEffect * self;  #line 40 "/home/jens/Source/shotwell/plugins/shotwell-transitions/SlideEffect.vala"  	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_SLIDE_EFFECT, SlideEffect); @@ -262,11 +310,13 @@ 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 266 "SlideEffect.c" +#line 314 "SlideEffect.c"  } -static gboolean slide_effect_real_needs_clear_background (SpitTransitionsEffect* base) { +static gboolean +slide_effect_real_needs_clear_background (SpitTransitionsEffect* base) +{  	SlideEffect * self;  	gboolean result = FALSE;  #line 43 "/home/jens/Source/shotwell/plugins/shotwell-transitions/SlideEffect.vala" @@ -275,22 +325,25 @@ 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 279 "SlideEffect.c" +#line 329 "SlideEffect.c"  } -static void slide_effect_real_paint (SpitTransitionsEffect* base, SpitTransitionsVisuals* visuals, SpitTransitionsMotion* motion, cairo_t* ctx, gint width, gint height, gint frame_number) { +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_; -	gint _tmp1_; -	gdouble _tmp2_; -	SpitTransitionsVisuals* _tmp3_; -	GdkPixbuf* _tmp4_; -	GdkPixbuf* _tmp5_; -	SpitTransitionsVisuals* _tmp33_; -	GdkPixbuf* _tmp34_; -	GdkPixbuf* _tmp35_; +	GdkPixbuf* _tmp0_; +	GdkPixbuf* _tmp1_; +	GdkPixbuf* _tmp21_; +	GdkPixbuf* _tmp22_;  #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" @@ -300,251 +353,194 @@ static void slide_effect_real_paint (SpitTransitionsEffect* base, SpitTransition  #line 47 "/home/jens/Source/shotwell/plugins/shotwell-transitions/SlideEffect.vala"  	g_return_if_fail (ctx != NULL);  #line 49 "/home/jens/Source/shotwell/plugins/shotwell-transitions/SlideEffect.vala" -	_tmp0_ = motion; -#line 49 "/home/jens/Source/shotwell/plugins/shotwell-transitions/SlideEffect.vala" -	_tmp1_ = frame_number; -#line 49 "/home/jens/Source/shotwell/plugins/shotwell-transitions/SlideEffect.vala" -	_tmp2_ = spit_transitions_motion_get_alpha (_tmp0_, _tmp1_); -#line 49 "/home/jens/Source/shotwell/plugins/shotwell-transitions/SlideEffect.vala" -	alpha = _tmp2_; +	alpha = spit_transitions_motion_get_alpha (motion, frame_number);  #line 51 "/home/jens/Source/shotwell/plugins/shotwell-transitions/SlideEffect.vala" -	_tmp3_ = visuals; +	_tmp0_ = spit_transitions_visuals_get_from_pixbuf (visuals);  #line 51 "/home/jens/Source/shotwell/plugins/shotwell-transitions/SlideEffect.vala" -	_tmp4_ = spit_transitions_visuals_get_from_pixbuf (_tmp3_); +	_tmp1_ = _tmp0_;  #line 51 "/home/jens/Source/shotwell/plugins/shotwell-transitions/SlideEffect.vala" -	_tmp5_ = _tmp4_; -#line 51 "/home/jens/Source/shotwell/plugins/shotwell-transitions/SlideEffect.vala" -	if (_tmp5_ != NULL) { -#line 319 "SlideEffect.c" -		gint _tmp6_ = 0; -		SpitTransitionsMotion* _tmp7_; -		SpitTransitionsDirection _tmp8_; -		SpitTransitionsDirection _tmp9_; +	if (_tmp1_ != NULL) { +#line 364 "SlideEffect.c" +		gint _tmp2_ = 0; +		SpitTransitionsDirection _tmp3_; +		SpitTransitionsDirection _tmp4_;  		gint from_target_x = 0;  		gint from_current_x = 0; -		SpitTransitionsVisuals* _tmp16_; -		GdkRectangle _tmp17_ = {0}; -		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_; -		gint _tmp31_; -		cairo_t* _tmp32_; -#line 52 "/home/jens/Source/shotwell/plugins/shotwell-transitions/SlideEffect.vala" -		_tmp7_ = motion; +		GdkRectangle _tmp9_ = {0}; +		GdkRectangle _tmp10_; +		gint _tmp11_; +		gdouble _tmp12_; +		gint _tmp13_; +		gdouble _tmp14_; +		GdkPixbuf* _tmp15_; +		GdkPixbuf* _tmp16_; +		gint _tmp17_; +		GdkRectangle _tmp18_ = {0}; +		GdkRectangle _tmp19_; +		gint _tmp20_;  #line 52 "/home/jens/Source/shotwell/plugins/shotwell-transitions/SlideEffect.vala" -		_tmp8_ = spit_transitions_motion_get_direction (_tmp7_); +		_tmp3_ = spit_transitions_motion_get_direction (motion);  #line 52 "/home/jens/Source/shotwell/plugins/shotwell-transitions/SlideEffect.vala" -		_tmp9_ = _tmp8_; +		_tmp4_ = _tmp3_;  #line 52 "/home/jens/Source/shotwell/plugins/shotwell-transitions/SlideEffect.vala" -		if (_tmp9_ == SPIT_TRANSITIONS_DIRECTION_FORWARD) { -#line 351 "SlideEffect.c" -			SpitTransitionsVisuals* _tmp10_; -			GdkPixbuf* _tmp11_; -			GdkPixbuf* _tmp12_; -			gint _tmp13_; -			gint _tmp14_; +		if (_tmp4_ == SPIT_TRANSITIONS_DIRECTION_FORWARD) { +#line 388 "SlideEffect.c" +			GdkPixbuf* _tmp5_; +			GdkPixbuf* _tmp6_; +			gint _tmp7_; +			gint _tmp8_;  #line 53 "/home/jens/Source/shotwell/plugins/shotwell-transitions/SlideEffect.vala" -			_tmp10_ = visuals; +			_tmp5_ = spit_transitions_visuals_get_from_pixbuf (visuals);  #line 53 "/home/jens/Source/shotwell/plugins/shotwell-transitions/SlideEffect.vala" -			_tmp11_ = spit_transitions_visuals_get_from_pixbuf (_tmp10_); +			_tmp6_ = _tmp5_;  #line 53 "/home/jens/Source/shotwell/plugins/shotwell-transitions/SlideEffect.vala" -			_tmp12_ = _tmp11_; +			_tmp7_ = gdk_pixbuf_get_width (_tmp6_);  #line 53 "/home/jens/Source/shotwell/plugins/shotwell-transitions/SlideEffect.vala" -			_tmp13_ = gdk_pixbuf_get_width (_tmp12_); +			_tmp8_ = _tmp7_;  #line 53 "/home/jens/Source/shotwell/plugins/shotwell-transitions/SlideEffect.vala" -			_tmp14_ = _tmp13_; -#line 53 "/home/jens/Source/shotwell/plugins/shotwell-transitions/SlideEffect.vala" -			_tmp6_ = -_tmp14_; -#line 369 "SlideEffect.c" +			_tmp2_ = -_tmp8_; +#line 403 "SlideEffect.c"  		} else { -			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 376 "SlideEffect.c" +			_tmp2_ = width; +#line 407 "SlideEffect.c"  		}  #line 52 "/home/jens/Source/shotwell/plugins/shotwell-transitions/SlideEffect.vala" -		from_target_x = _tmp6_; -#line 54 "/home/jens/Source/shotwell/plugins/shotwell-transitions/SlideEffect.vala" -		_tmp16_ = visuals; +		from_target_x = _tmp2_;  #line 54 "/home/jens/Source/shotwell/plugins/shotwell-transitions/SlideEffect.vala" -		spit_transitions_visuals_get_from_pos (_tmp16_, &_tmp17_); +		spit_transitions_visuals_get_from_pos (visuals, &_tmp9_);  #line 54 "/home/jens/Source/shotwell/plugins/shotwell-transitions/SlideEffect.vala" -		_tmp18_ = _tmp17_; +		_tmp10_ = _tmp9_;  #line 54 "/home/jens/Source/shotwell/plugins/shotwell-transitions/SlideEffect.vala" -		_tmp19_ = _tmp18_.x; +		_tmp11_ = _tmp10_.x;  #line 54 "/home/jens/Source/shotwell/plugins/shotwell-transitions/SlideEffect.vala" -		_tmp20_ = alpha; +		_tmp12_ = alpha;  #line 54 "/home/jens/Source/shotwell/plugins/shotwell-transitions/SlideEffect.vala" -		_tmp21_ = from_target_x; +		_tmp13_ = from_target_x;  #line 54 "/home/jens/Source/shotwell/plugins/shotwell-transitions/SlideEffect.vala" -		_tmp22_ = alpha; +		_tmp14_ = alpha;  #line 54 "/home/jens/Source/shotwell/plugins/shotwell-transitions/SlideEffect.vala" -		from_current_x = (gint) ((_tmp19_ * (1 - _tmp20_)) + (_tmp21_ * _tmp22_)); -#line 55 "/home/jens/Source/shotwell/plugins/shotwell-transitions/SlideEffect.vala" -		_tmp23_ = ctx; -#line 55 "/home/jens/Source/shotwell/plugins/shotwell-transitions/SlideEffect.vala" -		_tmp24_ = visuals; +		from_current_x = (gint) ((_tmp11_ * (1 - _tmp12_)) + (_tmp13_ * _tmp14_));  #line 55 "/home/jens/Source/shotwell/plugins/shotwell-transitions/SlideEffect.vala" -		_tmp25_ = spit_transitions_visuals_get_from_pixbuf (_tmp24_); +		_tmp15_ = spit_transitions_visuals_get_from_pixbuf (visuals);  #line 55 "/home/jens/Source/shotwell/plugins/shotwell-transitions/SlideEffect.vala" -		_tmp26_ = _tmp25_; -#line 55 "/home/jens/Source/shotwell/plugins/shotwell-transitions/SlideEffect.vala" -		_tmp27_ = from_current_x; +		_tmp16_ = _tmp15_;  #line 55 "/home/jens/Source/shotwell/plugins/shotwell-transitions/SlideEffect.vala" -		_tmp28_ = visuals; +		_tmp17_ = from_current_x;  #line 55 "/home/jens/Source/shotwell/plugins/shotwell-transitions/SlideEffect.vala" -		spit_transitions_visuals_get_from_pos (_tmp28_, &_tmp29_); +		spit_transitions_visuals_get_from_pos (visuals, &_tmp18_);  #line 55 "/home/jens/Source/shotwell/plugins/shotwell-transitions/SlideEffect.vala" -		_tmp30_ = _tmp29_; +		_tmp19_ = _tmp18_;  #line 55 "/home/jens/Source/shotwell/plugins/shotwell-transitions/SlideEffect.vala" -		_tmp31_ = _tmp30_.y; +		_tmp20_ = _tmp19_.y;  #line 55 "/home/jens/Source/shotwell/plugins/shotwell-transitions/SlideEffect.vala" -		gdk_cairo_set_source_pixbuf (_tmp23_, _tmp26_, (gdouble) _tmp27_, (gdouble) _tmp31_); -#line 56 "/home/jens/Source/shotwell/plugins/shotwell-transitions/SlideEffect.vala" -		_tmp32_ = ctx; +		gdk_cairo_set_source_pixbuf (ctx, _tmp16_, (gdouble) _tmp17_, (gdouble) _tmp20_);  #line 56 "/home/jens/Source/shotwell/plugins/shotwell-transitions/SlideEffect.vala" -		cairo_paint (_tmp32_); -#line 420 "SlideEffect.c" +		cairo_paint (ctx); +#line 441 "SlideEffect.c"  	}  #line 59 "/home/jens/Source/shotwell/plugins/shotwell-transitions/SlideEffect.vala" -	_tmp33_ = visuals; +	_tmp21_ = spit_transitions_visuals_get_to_pixbuf (visuals);  #line 59 "/home/jens/Source/shotwell/plugins/shotwell-transitions/SlideEffect.vala" -	_tmp34_ = spit_transitions_visuals_get_to_pixbuf (_tmp33_); +	_tmp22_ = _tmp21_;  #line 59 "/home/jens/Source/shotwell/plugins/shotwell-transitions/SlideEffect.vala" -	_tmp35_ = _tmp34_; -#line 59 "/home/jens/Source/shotwell/plugins/shotwell-transitions/SlideEffect.vala" -	if (_tmp35_ != NULL) { -#line 430 "SlideEffect.c" +	if (_tmp22_ != NULL) { +#line 449 "SlideEffect.c"  		gint to_target_x = 0; +		GdkPixbuf* _tmp23_; +		GdkPixbuf* _tmp24_; +		gint _tmp25_; +		gint _tmp26_; +		gint _tmp27_ = 0; +		SpitTransitionsDirection _tmp28_; +		SpitTransitionsDirection _tmp29_; +		gint from_x = 0; +		gint to_current_x = 0; +		gint _tmp34_; +		gdouble _tmp35_;  		gint _tmp36_; -		SpitTransitionsVisuals* _tmp37_; +		gdouble _tmp37_;  		GdkPixbuf* _tmp38_;  		GdkPixbuf* _tmp39_;  		gint _tmp40_; -		gint _tmp41_; -		gint _tmp42_ = 0; -		SpitTransitionsMotion* _tmp43_; -		SpitTransitionsDirection _tmp44_; -		SpitTransitionsDirection _tmp45_; -		gint from_x = 0; -		gint to_current_x = 0; -		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_; -		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" -		_tmp37_ = visuals; +		GdkRectangle _tmp41_ = {0}; +		GdkRectangle _tmp42_; +		gint _tmp43_;  #line 60 "/home/jens/Source/shotwell/plugins/shotwell-transitions/SlideEffect.vala" -		_tmp38_ = spit_transitions_visuals_get_to_pixbuf (_tmp37_); +		_tmp23_ = spit_transitions_visuals_get_to_pixbuf (visuals);  #line 60 "/home/jens/Source/shotwell/plugins/shotwell-transitions/SlideEffect.vala" -		_tmp39_ = _tmp38_; +		_tmp24_ = _tmp23_;  #line 60 "/home/jens/Source/shotwell/plugins/shotwell-transitions/SlideEffect.vala" -		_tmp40_ = gdk_pixbuf_get_width (_tmp39_); +		_tmp25_ = gdk_pixbuf_get_width (_tmp24_);  #line 60 "/home/jens/Source/shotwell/plugins/shotwell-transitions/SlideEffect.vala" -		_tmp41_ = _tmp40_; +		_tmp26_ = _tmp25_;  #line 60 "/home/jens/Source/shotwell/plugins/shotwell-transitions/SlideEffect.vala" -		to_target_x = (_tmp36_ - _tmp41_) / 2; -#line 61 "/home/jens/Source/shotwell/plugins/shotwell-transitions/SlideEffect.vala" -		_tmp43_ = motion; +		to_target_x = (width - _tmp26_) / 2;  #line 61 "/home/jens/Source/shotwell/plugins/shotwell-transitions/SlideEffect.vala" -		_tmp44_ = spit_transitions_motion_get_direction (_tmp43_); +		_tmp28_ = spit_transitions_motion_get_direction (motion);  #line 61 "/home/jens/Source/shotwell/plugins/shotwell-transitions/SlideEffect.vala" -		_tmp45_ = _tmp44_; +		_tmp29_ = _tmp28_;  #line 61 "/home/jens/Source/shotwell/plugins/shotwell-transitions/SlideEffect.vala" -		if (_tmp45_ == SPIT_TRANSITIONS_DIRECTION_FORWARD) { -#line 480 "SlideEffect.c" -			gint _tmp46_; +		if (_tmp29_ == SPIT_TRANSITIONS_DIRECTION_FORWARD) {  #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 486 "SlideEffect.c" +			_tmp27_ = width; +#line 488 "SlideEffect.c"  		} else { -			SpitTransitionsVisuals* _tmp47_; -			GdkPixbuf* _tmp48_; -			GdkPixbuf* _tmp49_; -			gint _tmp50_; -			gint _tmp51_; -#line 62 "/home/jens/Source/shotwell/plugins/shotwell-transitions/SlideEffect.vala" -			_tmp47_ = visuals; +			GdkPixbuf* _tmp30_; +			GdkPixbuf* _tmp31_; +			gint _tmp32_; +			gint _tmp33_;  #line 62 "/home/jens/Source/shotwell/plugins/shotwell-transitions/SlideEffect.vala" -			_tmp48_ = spit_transitions_visuals_get_to_pixbuf (_tmp47_); +			_tmp30_ = spit_transitions_visuals_get_to_pixbuf (visuals);  #line 62 "/home/jens/Source/shotwell/plugins/shotwell-transitions/SlideEffect.vala" -			_tmp49_ = _tmp48_; +			_tmp31_ = _tmp30_;  #line 62 "/home/jens/Source/shotwell/plugins/shotwell-transitions/SlideEffect.vala" -			_tmp50_ = gdk_pixbuf_get_width (_tmp49_); +			_tmp32_ = gdk_pixbuf_get_width (_tmp31_);  #line 62 "/home/jens/Source/shotwell/plugins/shotwell-transitions/SlideEffect.vala" -			_tmp51_ = _tmp50_; +			_tmp33_ = _tmp32_;  #line 62 "/home/jens/Source/shotwell/plugins/shotwell-transitions/SlideEffect.vala" -			_tmp42_ = -_tmp51_; -#line 505 "SlideEffect.c" +			_tmp27_ = -_tmp33_; +#line 504 "SlideEffect.c"  		}  #line 61 "/home/jens/Source/shotwell/plugins/shotwell-transitions/SlideEffect.vala" -		from_x = _tmp42_; +		from_x = _tmp27_;  #line 63 "/home/jens/Source/shotwell/plugins/shotwell-transitions/SlideEffect.vala" -		_tmp52_ = from_x; +		_tmp34_ = from_x;  #line 63 "/home/jens/Source/shotwell/plugins/shotwell-transitions/SlideEffect.vala" -		_tmp53_ = alpha; +		_tmp35_ = alpha;  #line 63 "/home/jens/Source/shotwell/plugins/shotwell-transitions/SlideEffect.vala" -		_tmp54_ = to_target_x; +		_tmp36_ = to_target_x;  #line 63 "/home/jens/Source/shotwell/plugins/shotwell-transitions/SlideEffect.vala" -		_tmp55_ = alpha; +		_tmp37_ = alpha;  #line 63 "/home/jens/Source/shotwell/plugins/shotwell-transitions/SlideEffect.vala" -		to_current_x = (gint) ((_tmp52_ * (1 - _tmp53_)) + (_tmp54_ * _tmp55_)); +		to_current_x = (gint) ((_tmp34_ * (1 - _tmp35_)) + (_tmp36_ * _tmp37_));  #line 64 "/home/jens/Source/shotwell/plugins/shotwell-transitions/SlideEffect.vala" -		_tmp56_ = ctx; +		_tmp38_ = spit_transitions_visuals_get_to_pixbuf (visuals);  #line 64 "/home/jens/Source/shotwell/plugins/shotwell-transitions/SlideEffect.vala" -		_tmp57_ = visuals; -#line 64 "/home/jens/Source/shotwell/plugins/shotwell-transitions/SlideEffect.vala" -		_tmp58_ = spit_transitions_visuals_get_to_pixbuf (_tmp57_); -#line 64 "/home/jens/Source/shotwell/plugins/shotwell-transitions/SlideEffect.vala" -		_tmp59_ = _tmp58_; -#line 64 "/home/jens/Source/shotwell/plugins/shotwell-transitions/SlideEffect.vala" -		_tmp60_ = to_current_x; +		_tmp39_ = _tmp38_;  #line 64 "/home/jens/Source/shotwell/plugins/shotwell-transitions/SlideEffect.vala" -		_tmp61_ = visuals; +		_tmp40_ = to_current_x;  #line 64 "/home/jens/Source/shotwell/plugins/shotwell-transitions/SlideEffect.vala" -		spit_transitions_visuals_get_to_pos (_tmp61_, &_tmp62_); +		spit_transitions_visuals_get_to_pos (visuals, &_tmp41_);  #line 64 "/home/jens/Source/shotwell/plugins/shotwell-transitions/SlideEffect.vala" -		_tmp63_ = _tmp62_; +		_tmp42_ = _tmp41_;  #line 64 "/home/jens/Source/shotwell/plugins/shotwell-transitions/SlideEffect.vala" -		_tmp64_ = _tmp63_.y; +		_tmp43_ = _tmp42_.y;  #line 64 "/home/jens/Source/shotwell/plugins/shotwell-transitions/SlideEffect.vala" -		gdk_cairo_set_source_pixbuf (_tmp56_, _tmp59_, (gdouble) _tmp60_, (gdouble) _tmp64_); -#line 65 "/home/jens/Source/shotwell/plugins/shotwell-transitions/SlideEffect.vala" -		_tmp65_ = ctx; +		gdk_cairo_set_source_pixbuf (ctx, _tmp39_, (gdouble) _tmp40_, (gdouble) _tmp43_);  #line 65 "/home/jens/Source/shotwell/plugins/shotwell-transitions/SlideEffect.vala" -		cairo_paint (_tmp65_); -#line 543 "SlideEffect.c" +		cairo_paint (ctx); +#line 534 "SlideEffect.c"  	}  } -static void slide_effect_real_advance (SpitTransitionsEffect* base, SpitTransitionsVisuals* visuals, SpitTransitionsMotion* motion, gint frame_number) { +static void +slide_effect_real_advance (SpitTransitionsEffect* base, +                           SpitTransitionsVisuals* visuals, +                           SpitTransitionsMotion* motion, +                           gint frame_number) +{  	SlideEffect * self;  #line 69 "/home/jens/Source/shotwell/plugins/shotwell-transitions/SlideEffect.vala"  	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_SLIDE_EFFECT, SlideEffect); @@ -552,26 +548,32 @@ 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 556 "SlideEffect.c" +#line 552 "SlideEffect.c"  } -static void slide_effect_real_cancel (SpitTransitionsEffect* base) { +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 564 "SlideEffect.c" +#line 562 "SlideEffect.c"  } -static void slide_effect_class_init (SlideEffectClass * klass) { +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 571 "SlideEffect.c"  } -static void slide_effect_spit_transitions_effect_interface_init (SpitTransitionsEffectIface * iface) { +static void +slide_effect_spit_transitions_effect_interface_init (SpitTransitionsEffectIface * iface) +{  #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" @@ -586,15 +588,19 @@ static void slide_effect_spit_transitions_effect_interface_init (SpitTransitions  	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 590 "SlideEffect.c" +#line 592 "SlideEffect.c"  } -static void slide_effect_instance_init (SlideEffect * self) { +static void +slide_effect_instance_init (SlideEffect * self) +{  } -GType slide_effect_get_type (void) { +GType +slide_effect_get_type (void) +{  	static volatile gsize slide_effect_type_id__volatile = 0;  	if (g_once_init_enter (&slide_effect_type_id__volatile)) {  		static const GTypeInfo g_define_type_info = { sizeof (SlideEffectClass), (GBaseInitFunc) NULL, (GBaseFinalizeFunc) NULL, (GClassInitFunc) slide_effect_class_init, (GClassFinalizeFunc) NULL, NULL, sizeof (SlideEffect), 0, (GInstanceInitFunc) slide_effect_instance_init, NULL }; diff --git a/plugins/shotwell-transitions/SquaresEffect.c b/plugins/shotwell-transitions/SquaresEffect.c index 402d502..50bef64 100644 --- a/plugins/shotwell-transitions/SquaresEffect.c +++ b/plugins/shotwell-transitions/SquaresEffect.c @@ -1,4 +1,4 @@ -/* SquaresEffect.c generated by valac 0.36.6, the Vala compiler +/* SquaresEffect.c generated by valac 0.40.4, the Vala compiler   * generated from SquaresEffect.vala, do not modify */  /* Copyright 2013 Jens Bav @@ -8,6 +8,7 @@   * (version 2.1 or later).  See the COPYING file in this distribution.   */ +  #include <glib.h>  #include <glib-object.h>  #include <shotwell-plugin-dev-1.0.h> @@ -42,6 +43,11 @@ typedef struct _ShotwellTransitionDescriptorPrivate ShotwellTransitionDescriptor  typedef struct _SquaresEffectDescriptor SquaresEffectDescriptor;  typedef struct _SquaresEffectDescriptorClass SquaresEffectDescriptorClass;  typedef struct _SquaresEffectDescriptorPrivate SquaresEffectDescriptorPrivate; +enum  { +	SQUARES_EFFECT_DESCRIPTOR_0_PROPERTY, +	SQUARES_EFFECT_DESCRIPTOR_NUM_PROPERTIES +}; +static GParamSpec* squares_effect_descriptor_properties[SQUARES_EFFECT_DESCRIPTOR_NUM_PROPERTIES];  #define TYPE_SQUARES_EFFECT (squares_effect_get_type ())  #define SQUARES_EFFECT(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), TYPE_SQUARES_EFFECT, SquaresEffect)) @@ -53,6 +59,11 @@ typedef struct _SquaresEffectDescriptorPrivate SquaresEffectDescriptorPrivate;  typedef struct _SquaresEffect SquaresEffect;  typedef struct _SquaresEffectClass SquaresEffectClass;  typedef struct _SquaresEffectPrivate SquaresEffectPrivate; +enum  { +	SQUARES_EFFECT_0_PROPERTY, +	SQUARES_EFFECT_NUM_PROPERTIES +}; +static GParamSpec* squares_effect_properties[SQUARES_EFFECT_NUM_PROPERTIES];  struct _ShotwellTransitionDescriptor {  	GObject parent_instance; @@ -96,57 +107,71 @@ static SpitTransitionsEffectIface * squares_effect_spit_transitions_effect_paren  GType shotwell_transition_descriptor_get_type (void) G_GNUC_CONST;  GType squares_effect_descriptor_get_type (void) G_GNUC_CONST; -enum  { -	SQUARES_EFFECT_DESCRIPTOR_DUMMY_PROPERTY -};  SquaresEffectDescriptor* squares_effect_descriptor_new (GFile* resource_directory); -SquaresEffectDescriptor* squares_effect_descriptor_construct (GType object_type, GFile* resource_directory); -ShotwellTransitionDescriptor* shotwell_transition_descriptor_construct (GType object_type, GFile* resource_directory); +SquaresEffectDescriptor* squares_effect_descriptor_construct (GType object_type, +                                                              GFile* resource_directory); +ShotwellTransitionDescriptor* shotwell_transition_descriptor_construct (GType object_type, +                                                                        GFile* resource_directory);  static const gchar* squares_effect_descriptor_real_get_id (ShotwellTransitionDescriptor* base);  static const gchar* squares_effect_descriptor_real_get_pluggable_name (ShotwellTransitionDescriptor* base); -static SpitTransitionsEffect* squares_effect_descriptor_real_create (ShotwellTransitionDescriptor* base, SpitHostInterface* host); +static SpitTransitionsEffect* squares_effect_descriptor_real_create (ShotwellTransitionDescriptor* base, +                                                              SpitHostInterface* host);  SquaresEffect* squares_effect_new (void);  SquaresEffect* squares_effect_construct (GType object_type);  GType squares_effect_get_type (void) G_GNUC_CONST;  #define SQUARES_EFFECT_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), TYPE_SQUARES_EFFECT, SquaresEffectPrivate)) -enum  { -	SQUARES_EFFECT_DUMMY_PROPERTY -};  #define SQUARES_EFFECT_DESIRED_FPS 25  #define SQUARES_EFFECT_MIN_FPS 10  #define SQUARES_EFFECT_SQUARE_SIZE 100 -static void squares_effect_real_get_fps (SpitTransitionsEffect* base, gint* desired_fps, gint* min_fps); -static void squares_effect_real_start (SpitTransitionsEffect* base, SpitTransitionsVisuals* visuals, SpitTransitionsMotion* motion); +static void squares_effect_real_get_fps (SpitTransitionsEffect* base, +                                  gint* desired_fps, +                                  gint* min_fps); +static void squares_effect_real_start (SpitTransitionsEffect* base, +                                SpitTransitionsVisuals* visuals, +                                SpitTransitionsMotion* motion);  static gboolean squares_effect_real_needs_clear_background (SpitTransitionsEffect* base); -static void squares_effect_real_paint (SpitTransitionsEffect* base, SpitTransitionsVisuals* visuals, SpitTransitionsMotion* motion, cairo_t* ctx, gint width, gint height, gint frame_number); -static void squares_effect_real_advance (SpitTransitionsEffect* base, SpitTransitionsVisuals* visuals, SpitTransitionsMotion* motion, gint frame_number); +static void squares_effect_real_paint (SpitTransitionsEffect* base, +                                SpitTransitionsVisuals* visuals, +                                SpitTransitionsMotion* motion, +                                cairo_t* ctx, +                                gint width, +                                gint height, +                                gint frame_number); +static void squares_effect_real_advance (SpitTransitionsEffect* base, +                                  SpitTransitionsVisuals* visuals, +                                  SpitTransitionsMotion* motion, +                                  gint frame_number);  static void squares_effect_real_cancel (SpitTransitionsEffect* base);  static void squares_effect_finalize (GObject * obj); -SquaresEffectDescriptor* squares_effect_descriptor_construct (GType object_type, GFile* resource_directory) { +SquaresEffectDescriptor* +squares_effect_descriptor_construct (GType object_type, +                                     GFile* resource_directory) +{  	SquaresEffectDescriptor * self = NULL; -	GFile* _tmp0_;  #line 11 "/home/jens/Source/shotwell/plugins/shotwell-transitions/SquaresEffect.vala"  	g_return_val_if_fail (G_IS_FILE (resource_directory), NULL);  #line 12 "/home/jens/Source/shotwell/plugins/shotwell-transitions/SquaresEffect.vala" -	_tmp0_ = resource_directory; -#line 12 "/home/jens/Source/shotwell/plugins/shotwell-transitions/SquaresEffect.vala" -	self = (SquaresEffectDescriptor*) shotwell_transition_descriptor_construct (object_type, _tmp0_); +	self = (SquaresEffectDescriptor*) shotwell_transition_descriptor_construct (object_type, resource_directory);  #line 11 "/home/jens/Source/shotwell/plugins/shotwell-transitions/SquaresEffect.vala"  	return self; -#line 139 "SquaresEffect.c" +#line 160 "SquaresEffect.c"  } -SquaresEffectDescriptor* squares_effect_descriptor_new (GFile* resource_directory) { +SquaresEffectDescriptor* +squares_effect_descriptor_new (GFile* resource_directory) +{  #line 11 "/home/jens/Source/shotwell/plugins/shotwell-transitions/SquaresEffect.vala"  	return squares_effect_descriptor_construct (TYPE_SQUARES_EFFECT_DESCRIPTOR, resource_directory); -#line 146 "SquaresEffect.c" +#line 169 "SquaresEffect.c"  } -static const gchar* squares_effect_descriptor_real_get_id (ShotwellTransitionDescriptor* base) { +static const gchar* +squares_effect_descriptor_real_get_id (ShotwellTransitionDescriptor* base) +{  	SquaresEffectDescriptor * self;  	const gchar* result = NULL;  #line 15 "/home/jens/Source/shotwell/plugins/shotwell-transitions/SquaresEffect.vala" @@ -155,11 +180,13 @@ static const gchar* squares_effect_descriptor_real_get_id (ShotwellTransitionDes  	result = "org.yorba.shotwell.transitions.squares";  #line 16 "/home/jens/Source/shotwell/plugins/shotwell-transitions/SquaresEffect.vala"  	return result; -#line 159 "SquaresEffect.c" +#line 184 "SquaresEffect.c"  } -static const gchar* squares_effect_descriptor_real_get_pluggable_name (ShotwellTransitionDescriptor* base) { +static const gchar* +squares_effect_descriptor_real_get_pluggable_name (ShotwellTransitionDescriptor* base) +{  	SquaresEffectDescriptor * self;  	const gchar* result = NULL;  #line 19 "/home/jens/Source/shotwell/plugins/shotwell-transitions/SquaresEffect.vala" @@ -168,11 +195,14 @@ static const gchar* squares_effect_descriptor_real_get_pluggable_name (ShotwellT  	result = _ ("Squares");  #line 20 "/home/jens/Source/shotwell/plugins/shotwell-transitions/SquaresEffect.vala"  	return result; -#line 172 "SquaresEffect.c" +#line 199 "SquaresEffect.c"  } -static SpitTransitionsEffect* squares_effect_descriptor_real_create (ShotwellTransitionDescriptor* base, SpitHostInterface* host) { +static SpitTransitionsEffect* +squares_effect_descriptor_real_create (ShotwellTransitionDescriptor* base, +                                       SpitHostInterface* host) +{  	SquaresEffectDescriptor * self;  	SpitTransitionsEffect* result = NULL;  	SquaresEffect* _tmp0_; @@ -186,11 +216,13 @@ static SpitTransitionsEffect* squares_effect_descriptor_real_create (ShotwellTra  	result = G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, SPIT_TRANSITIONS_TYPE_EFFECT, SpitTransitionsEffect);  #line 24 "/home/jens/Source/shotwell/plugins/shotwell-transitions/SquaresEffect.vala"  	return result; -#line 190 "SquaresEffect.c" +#line 220 "SquaresEffect.c"  } -static void squares_effect_descriptor_class_init (SquaresEffectDescriptorClass * klass) { +static void +squares_effect_descriptor_class_init (SquaresEffectDescriptorClass * klass) +{  #line 10 "/home/jens/Source/shotwell/plugins/shotwell-transitions/SquaresEffect.vala"  	squares_effect_descriptor_parent_class = g_type_class_peek_parent (klass);  #line 10 "/home/jens/Source/shotwell/plugins/shotwell-transitions/SquaresEffect.vala" @@ -199,15 +231,19 @@ static void squares_effect_descriptor_class_init (SquaresEffectDescriptorClass *  	((ShotwellTransitionDescriptorClass *) klass)->get_pluggable_name = (const gchar* (*) (ShotwellTransitionDescriptor *)) squares_effect_descriptor_real_get_pluggable_name;  #line 10 "/home/jens/Source/shotwell/plugins/shotwell-transitions/SquaresEffect.vala"  	((ShotwellTransitionDescriptorClass *) klass)->create = (SpitTransitionsEffect* (*) (ShotwellTransitionDescriptor *, SpitHostInterface*)) squares_effect_descriptor_real_create; -#line 203 "SquaresEffect.c" +#line 235 "SquaresEffect.c"  } -static void squares_effect_descriptor_instance_init (SquaresEffectDescriptor * self) { +static void +squares_effect_descriptor_instance_init (SquaresEffectDescriptor * self) +{  } -GType squares_effect_descriptor_get_type (void) { +GType +squares_effect_descriptor_get_type (void) +{  	static volatile gsize squares_effect_descriptor_type_id__volatile = 0;  	if (g_once_init_enter (&squares_effect_descriptor_type_id__volatile)) {  		static const GTypeInfo g_define_type_info = { sizeof (SquaresEffectDescriptorClass), (GBaseInitFunc) NULL, (GBaseFinalizeFunc) NULL, (GClassInitFunc) squares_effect_descriptor_class_init, (GClassFinalizeFunc) NULL, NULL, sizeof (SquaresEffectDescriptor), 0, (GInstanceInitFunc) squares_effect_descriptor_instance_init, NULL }; @@ -219,24 +255,32 @@ GType squares_effect_descriptor_get_type (void) {  } -SquaresEffect* squares_effect_construct (GType object_type) { +SquaresEffect* +squares_effect_construct (GType object_type) +{  	SquaresEffect * self = NULL;  #line 35 "/home/jens/Source/shotwell/plugins/shotwell-transitions/SquaresEffect.vala"  	self = (SquaresEffect*) g_object_new (object_type, NULL);  #line 35 "/home/jens/Source/shotwell/plugins/shotwell-transitions/SquaresEffect.vala"  	return self; -#line 229 "SquaresEffect.c" +#line 267 "SquaresEffect.c"  } -SquaresEffect* squares_effect_new (void) { +SquaresEffect* +squares_effect_new (void) +{  #line 35 "/home/jens/Source/shotwell/plugins/shotwell-transitions/SquaresEffect.vala"  	return squares_effect_construct (TYPE_SQUARES_EFFECT); -#line 236 "SquaresEffect.c" +#line 276 "SquaresEffect.c"  } -static void squares_effect_real_get_fps (SpitTransitionsEffect* base, gint* desired_fps, gint* min_fps) { +static void +squares_effect_real_get_fps (SpitTransitionsEffect* base, +                             gint* desired_fps, +                             gint* min_fps) +{  	SquaresEffect * self;  	gint _vala_desired_fps = 0;  	gint _vala_min_fps = 0; @@ -250,27 +294,29 @@ static void squares_effect_real_get_fps (SpitTransitionsEffect* base, gint* desi  	if (desired_fps) {  #line 38 "/home/jens/Source/shotwell/plugins/shotwell-transitions/SquaresEffect.vala"  		*desired_fps = _vala_desired_fps; -#line 254 "SquaresEffect.c" +#line 298 "SquaresEffect.c"  	}  #line 38 "/home/jens/Source/shotwell/plugins/shotwell-transitions/SquaresEffect.vala"  	if (min_fps) {  #line 38 "/home/jens/Source/shotwell/plugins/shotwell-transitions/SquaresEffect.vala"  		*min_fps = _vala_min_fps; -#line 260 "SquaresEffect.c" +#line 304 "SquaresEffect.c"  	}  } -static void squares_effect_real_start (SpitTransitionsEffect* base, SpitTransitionsVisuals* visuals, SpitTransitionsMotion* motion) { +static void +squares_effect_real_start (SpitTransitionsEffect* base, +                           SpitTransitionsVisuals* visuals, +                           SpitTransitionsMotion* motion) +{  	SquaresEffect * self; -	SpitTransitionsVisuals* _tmp0_; -	GdkRectangle _tmp1_ = {0}; -	GdkRectangle _tmp2_; -	gint _tmp3_; -	SpitTransitionsVisuals* _tmp4_; -	GdkRectangle _tmp5_ = {0}; -	GdkRectangle _tmp6_; -	gint _tmp7_; +	GdkRectangle _tmp0_ = {0}; +	GdkRectangle _tmp1_; +	gint _tmp2_; +	GdkRectangle _tmp3_ = {0}; +	GdkRectangle _tmp4_; +	gint _tmp5_;  #line 43 "/home/jens/Source/shotwell/plugins/shotwell-transitions/SquaresEffect.vala"  	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_SQUARES_EFFECT, SquaresEffect);  #line 43 "/home/jens/Source/shotwell/plugins/shotwell-transitions/SquaresEffect.vala" @@ -278,30 +324,28 @@ static void squares_effect_real_start (SpitTransitionsEffect* base, SpitTransiti  #line 43 "/home/jens/Source/shotwell/plugins/shotwell-transitions/SquaresEffect.vala"  	g_return_if_fail (SPIT_TRANSITIONS_IS_MOTION (motion));  #line 44 "/home/jens/Source/shotwell/plugins/shotwell-transitions/SquaresEffect.vala" -	_tmp0_ = visuals; -#line 44 "/home/jens/Source/shotwell/plugins/shotwell-transitions/SquaresEffect.vala" -	spit_transitions_visuals_get_to_pos (_tmp0_, &_tmp1_); +	spit_transitions_visuals_get_to_pos (visuals, &_tmp0_);  #line 44 "/home/jens/Source/shotwell/plugins/shotwell-transitions/SquaresEffect.vala" -	_tmp2_ = _tmp1_; +	_tmp1_ = _tmp0_;  #line 44 "/home/jens/Source/shotwell/plugins/shotwell-transitions/SquaresEffect.vala" -	_tmp3_ = _tmp2_.width; +	_tmp2_ = _tmp1_.width;  #line 44 "/home/jens/Source/shotwell/plugins/shotwell-transitions/SquaresEffect.vala" -	self->priv->square_count_x = (gdouble) ((_tmp3_ / SQUARES_EFFECT_SQUARE_SIZE) + 1); +	self->priv->square_count_x = (gdouble) ((_tmp2_ / SQUARES_EFFECT_SQUARE_SIZE) + 1);  #line 45 "/home/jens/Source/shotwell/plugins/shotwell-transitions/SquaresEffect.vala" -	_tmp4_ = visuals; +	spit_transitions_visuals_get_to_pos (visuals, &_tmp3_);  #line 45 "/home/jens/Source/shotwell/plugins/shotwell-transitions/SquaresEffect.vala" -	spit_transitions_visuals_get_to_pos (_tmp4_, &_tmp5_); +	_tmp4_ = _tmp3_;  #line 45 "/home/jens/Source/shotwell/plugins/shotwell-transitions/SquaresEffect.vala" -	_tmp6_ = _tmp5_; +	_tmp5_ = _tmp4_.height;  #line 45 "/home/jens/Source/shotwell/plugins/shotwell-transitions/SquaresEffect.vala" -	_tmp7_ = _tmp6_.height; -#line 45 "/home/jens/Source/shotwell/plugins/shotwell-transitions/SquaresEffect.vala" -	self->priv->square_count_y = (gdouble) ((_tmp7_ / SQUARES_EFFECT_SQUARE_SIZE) + 1); -#line 301 "SquaresEffect.c" +	self->priv->square_count_y = (gdouble) ((_tmp5_ / SQUARES_EFFECT_SQUARE_SIZE) + 1); +#line 343 "SquaresEffect.c"  } -static gboolean squares_effect_real_needs_clear_background (SpitTransitionsEffect* base) { +static gboolean +squares_effect_real_needs_clear_background (SpitTransitionsEffect* base) +{  	SquaresEffect * self;  	gboolean result = FALSE;  #line 48 "/home/jens/Source/shotwell/plugins/shotwell-transitions/SquaresEffect.vala" @@ -310,22 +354,25 @@ static gboolean squares_effect_real_needs_clear_background (SpitTransitionsEffec  	result = TRUE;  #line 49 "/home/jens/Source/shotwell/plugins/shotwell-transitions/SquaresEffect.vala"  	return result; -#line 314 "SquaresEffect.c" +#line 358 "SquaresEffect.c"  } -static void squares_effect_real_paint (SpitTransitionsEffect* base, SpitTransitionsVisuals* visuals, SpitTransitionsMotion* motion, cairo_t* ctx, gint width, gint height, gint frame_number) { +static void +squares_effect_real_paint (SpitTransitionsEffect* base, +                           SpitTransitionsVisuals* visuals, +                           SpitTransitionsMotion* motion, +                           cairo_t* ctx, +                           gint width, +                           gint height, +                           gint frame_number) +{  	SquaresEffect * self;  	gdouble alpha = 0.0; -	SpitTransitionsMotion* _tmp0_; -	gint _tmp1_; -	gdouble _tmp2_; -	SpitTransitionsVisuals* _tmp3_; -	GdkPixbuf* _tmp4_; -	GdkPixbuf* _tmp5_; -	SpitTransitionsVisuals* _tmp20_; -	GdkPixbuf* _tmp21_; -	GdkPixbuf* _tmp22_; +	GdkPixbuf* _tmp0_; +	GdkPixbuf* _tmp1_; +	GdkPixbuf* _tmp11_; +	GdkPixbuf* _tmp12_;  #line 52 "/home/jens/Source/shotwell/plugins/shotwell-transitions/SquaresEffect.vala"  	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_SQUARES_EFFECT, SquaresEffect);  #line 52 "/home/jens/Source/shotwell/plugins/shotwell-transitions/SquaresEffect.vala" @@ -335,267 +382,213 @@ static void squares_effect_real_paint (SpitTransitionsEffect* base, SpitTransiti  #line 52 "/home/jens/Source/shotwell/plugins/shotwell-transitions/SquaresEffect.vala"  	g_return_if_fail (ctx != NULL);  #line 54 "/home/jens/Source/shotwell/plugins/shotwell-transitions/SquaresEffect.vala" -	_tmp0_ = motion; -#line 54 "/home/jens/Source/shotwell/plugins/shotwell-transitions/SquaresEffect.vala" -	_tmp1_ = frame_number; -#line 54 "/home/jens/Source/shotwell/plugins/shotwell-transitions/SquaresEffect.vala" -	_tmp2_ = spit_transitions_motion_get_alpha (_tmp0_, _tmp1_); -#line 54 "/home/jens/Source/shotwell/plugins/shotwell-transitions/SquaresEffect.vala" -	alpha = _tmp2_; -#line 55 "/home/jens/Source/shotwell/plugins/shotwell-transitions/SquaresEffect.vala" -	_tmp3_ = visuals; +	alpha = spit_transitions_motion_get_alpha (motion, frame_number);  #line 55 "/home/jens/Source/shotwell/plugins/shotwell-transitions/SquaresEffect.vala" -	_tmp4_ = spit_transitions_visuals_get_from_pixbuf (_tmp3_); +	_tmp0_ = spit_transitions_visuals_get_from_pixbuf (visuals);  #line 55 "/home/jens/Source/shotwell/plugins/shotwell-transitions/SquaresEffect.vala" -	_tmp5_ = _tmp4_; +	_tmp1_ = _tmp0_;  #line 55 "/home/jens/Source/shotwell/plugins/shotwell-transitions/SquaresEffect.vala" -	if (_tmp5_ != NULL) { -#line 354 "SquaresEffect.c" -		cairo_t* _tmp6_; -		SpitTransitionsVisuals* _tmp7_; -		GdkPixbuf* _tmp8_; -		GdkPixbuf* _tmp9_; -		SpitTransitionsVisuals* _tmp10_; -		GdkRectangle _tmp11_ = {0}; -		GdkRectangle _tmp12_; -		gint _tmp13_; -		SpitTransitionsVisuals* _tmp14_; -		GdkRectangle _tmp15_ = {0}; -		GdkRectangle _tmp16_; -		gint _tmp17_; -		cairo_t* _tmp18_; -		gdouble _tmp19_; -#line 56 "/home/jens/Source/shotwell/plugins/shotwell-transitions/SquaresEffect.vala" -		_tmp6_ = ctx; -#line 56 "/home/jens/Source/shotwell/plugins/shotwell-transitions/SquaresEffect.vala" -		_tmp7_ = visuals; +	if (_tmp1_ != NULL) { +#line 393 "SquaresEffect.c" +		GdkPixbuf* _tmp2_; +		GdkPixbuf* _tmp3_; +		GdkRectangle _tmp4_ = {0}; +		GdkRectangle _tmp5_; +		gint _tmp6_; +		GdkRectangle _tmp7_ = {0}; +		GdkRectangle _tmp8_; +		gint _tmp9_; +		gdouble _tmp10_;  #line 56 "/home/jens/Source/shotwell/plugins/shotwell-transitions/SquaresEffect.vala" -		_tmp8_ = spit_transitions_visuals_get_from_pixbuf (_tmp7_); +		_tmp2_ = spit_transitions_visuals_get_from_pixbuf (visuals);  #line 56 "/home/jens/Source/shotwell/plugins/shotwell-transitions/SquaresEffect.vala" -		_tmp9_ = _tmp8_; +		_tmp3_ = _tmp2_;  #line 56 "/home/jens/Source/shotwell/plugins/shotwell-transitions/SquaresEffect.vala" -		_tmp10_ = visuals; +		spit_transitions_visuals_get_from_pos (visuals, &_tmp4_);  #line 56 "/home/jens/Source/shotwell/plugins/shotwell-transitions/SquaresEffect.vala" -		spit_transitions_visuals_get_from_pos (_tmp10_, &_tmp11_); +		_tmp5_ = _tmp4_;  #line 56 "/home/jens/Source/shotwell/plugins/shotwell-transitions/SquaresEffect.vala" -		_tmp12_ = _tmp11_; +		_tmp6_ = _tmp5_.x;  #line 56 "/home/jens/Source/shotwell/plugins/shotwell-transitions/SquaresEffect.vala" -		_tmp13_ = _tmp12_.x; +		spit_transitions_visuals_get_from_pos (visuals, &_tmp7_);  #line 56 "/home/jens/Source/shotwell/plugins/shotwell-transitions/SquaresEffect.vala" -		_tmp14_ = visuals; +		_tmp8_ = _tmp7_;  #line 56 "/home/jens/Source/shotwell/plugins/shotwell-transitions/SquaresEffect.vala" -		spit_transitions_visuals_get_from_pos (_tmp14_, &_tmp15_); +		_tmp9_ = _tmp8_.y;  #line 56 "/home/jens/Source/shotwell/plugins/shotwell-transitions/SquaresEffect.vala" -		_tmp16_ = _tmp15_; -#line 56 "/home/jens/Source/shotwell/plugins/shotwell-transitions/SquaresEffect.vala" -		_tmp17_ = _tmp16_.y; -#line 56 "/home/jens/Source/shotwell/plugins/shotwell-transitions/SquaresEffect.vala" -		gdk_cairo_set_source_pixbuf (_tmp6_, _tmp9_, (gdouble) _tmp13_, (gdouble) _tmp17_); +		gdk_cairo_set_source_pixbuf (ctx, _tmp3_, (gdouble) _tmp6_, (gdouble) _tmp9_);  #line 58 "/home/jens/Source/shotwell/plugins/shotwell-transitions/SquaresEffect.vala" -		_tmp18_ = ctx; +		_tmp10_ = alpha;  #line 58 "/home/jens/Source/shotwell/plugins/shotwell-transitions/SquaresEffect.vala" -		_tmp19_ = alpha; -#line 58 "/home/jens/Source/shotwell/plugins/shotwell-transitions/SquaresEffect.vala" -		cairo_paint_with_alpha (_tmp18_, 1 - _tmp19_); -#line 401 "SquaresEffect.c" +		cairo_paint_with_alpha (ctx, 1 - _tmp10_); +#line 425 "SquaresEffect.c"  	}  #line 61 "/home/jens/Source/shotwell/plugins/shotwell-transitions/SquaresEffect.vala" -	_tmp20_ = visuals; -#line 61 "/home/jens/Source/shotwell/plugins/shotwell-transitions/SquaresEffect.vala" -	_tmp21_ = spit_transitions_visuals_get_to_pixbuf (_tmp20_); +	_tmp11_ = spit_transitions_visuals_get_to_pixbuf (visuals);  #line 61 "/home/jens/Source/shotwell/plugins/shotwell-transitions/SquaresEffect.vala" -	_tmp22_ = _tmp21_; +	_tmp12_ = _tmp11_;  #line 61 "/home/jens/Source/shotwell/plugins/shotwell-transitions/SquaresEffect.vala" -	if (_tmp22_ != NULL) { -#line 411 "SquaresEffect.c" -		cairo_t* _tmp23_; -		SpitTransitionsVisuals* _tmp24_; -		GdkPixbuf* _tmp25_; -		GdkPixbuf* _tmp26_; -		SpitTransitionsVisuals* _tmp27_; -		GdkRectangle _tmp28_ = {0}; -		GdkRectangle _tmp29_; -		gint _tmp30_; -		SpitTransitionsVisuals* _tmp31_; -		GdkRectangle _tmp32_ = {0}; -		GdkRectangle _tmp33_; -		gint _tmp34_; -		cairo_t* _tmp65_; -		cairo_t* _tmp66_; -		gdouble _tmp67_; -#line 62 "/home/jens/Source/shotwell/plugins/shotwell-transitions/SquaresEffect.vala" -		_tmp23_ = ctx; -#line 62 "/home/jens/Source/shotwell/plugins/shotwell-transitions/SquaresEffect.vala" -		_tmp24_ = visuals; -#line 62 "/home/jens/Source/shotwell/plugins/shotwell-transitions/SquaresEffect.vala" -		_tmp25_ = spit_transitions_visuals_get_to_pixbuf (_tmp24_); -#line 62 "/home/jens/Source/shotwell/plugins/shotwell-transitions/SquaresEffect.vala" -		_tmp26_ = _tmp25_; +	if (_tmp12_ != NULL) { +#line 433 "SquaresEffect.c" +		GdkPixbuf* _tmp13_; +		GdkPixbuf* _tmp14_; +		GdkRectangle _tmp15_ = {0}; +		GdkRectangle _tmp16_; +		gint _tmp17_; +		GdkRectangle _tmp18_ = {0}; +		GdkRectangle _tmp19_; +		gint _tmp20_; +		gdouble _tmp46_;  #line 62 "/home/jens/Source/shotwell/plugins/shotwell-transitions/SquaresEffect.vala" -		_tmp27_ = visuals; +		_tmp13_ = spit_transitions_visuals_get_to_pixbuf (visuals);  #line 62 "/home/jens/Source/shotwell/plugins/shotwell-transitions/SquaresEffect.vala" -		spit_transitions_visuals_get_to_pos (_tmp27_, &_tmp28_); +		_tmp14_ = _tmp13_;  #line 62 "/home/jens/Source/shotwell/plugins/shotwell-transitions/SquaresEffect.vala" -		_tmp29_ = _tmp28_; +		spit_transitions_visuals_get_to_pos (visuals, &_tmp15_);  #line 62 "/home/jens/Source/shotwell/plugins/shotwell-transitions/SquaresEffect.vala" -		_tmp30_ = _tmp29_.x; +		_tmp16_ = _tmp15_;  #line 62 "/home/jens/Source/shotwell/plugins/shotwell-transitions/SquaresEffect.vala" -		_tmp31_ = visuals; +		_tmp17_ = _tmp16_.x;  #line 62 "/home/jens/Source/shotwell/plugins/shotwell-transitions/SquaresEffect.vala" -		spit_transitions_visuals_get_to_pos (_tmp31_, &_tmp32_); +		spit_transitions_visuals_get_to_pos (visuals, &_tmp18_);  #line 62 "/home/jens/Source/shotwell/plugins/shotwell-transitions/SquaresEffect.vala" -		_tmp33_ = _tmp32_; +		_tmp19_ = _tmp18_;  #line 62 "/home/jens/Source/shotwell/plugins/shotwell-transitions/SquaresEffect.vala" -		_tmp34_ = _tmp33_.y; +		_tmp20_ = _tmp19_.y;  #line 62 "/home/jens/Source/shotwell/plugins/shotwell-transitions/SquaresEffect.vala" -		gdk_cairo_set_source_pixbuf (_tmp23_, _tmp26_, (gdouble) _tmp30_, (gdouble) _tmp34_); -#line 453 "SquaresEffect.c" +		gdk_cairo_set_source_pixbuf (ctx, _tmp14_, (gdouble) _tmp17_, (gdouble) _tmp20_); +#line 461 "SquaresEffect.c"  		{  			gdouble y = 0.0;  #line 63 "/home/jens/Source/shotwell/plugins/shotwell-transitions/SquaresEffect.vala"  			y = (gdouble) 0; -#line 458 "SquaresEffect.c" +#line 466 "SquaresEffect.c"  			{ -				gboolean _tmp35_ = FALSE; +				gboolean _tmp21_ = FALSE;  #line 63 "/home/jens/Source/shotwell/plugins/shotwell-transitions/SquaresEffect.vala" -				_tmp35_ = TRUE; +				_tmp21_ = TRUE;  #line 63 "/home/jens/Source/shotwell/plugins/shotwell-transitions/SquaresEffect.vala"  				while (TRUE) { -#line 465 "SquaresEffect.c" -					gdouble _tmp37_; -					gdouble _tmp38_; +#line 473 "SquaresEffect.c" +					gdouble _tmp23_; +					gdouble _tmp24_;  #line 63 "/home/jens/Source/shotwell/plugins/shotwell-transitions/SquaresEffect.vala" -					if (!_tmp35_) { -#line 470 "SquaresEffect.c" -						gdouble _tmp36_; +					if (!_tmp21_) { +#line 478 "SquaresEffect.c" +						gdouble _tmp22_;  #line 63 "/home/jens/Source/shotwell/plugins/shotwell-transitions/SquaresEffect.vala" -						_tmp36_ = y; +						_tmp22_ = y;  #line 63 "/home/jens/Source/shotwell/plugins/shotwell-transitions/SquaresEffect.vala" -						y = _tmp36_ + 1; -#line 476 "SquaresEffect.c" +						y = _tmp22_ + 1; +#line 484 "SquaresEffect.c"  					}  #line 63 "/home/jens/Source/shotwell/plugins/shotwell-transitions/SquaresEffect.vala" -					_tmp35_ = FALSE; +					_tmp21_ = FALSE;  #line 63 "/home/jens/Source/shotwell/plugins/shotwell-transitions/SquaresEffect.vala" -					_tmp37_ = y; +					_tmp23_ = y;  #line 63 "/home/jens/Source/shotwell/plugins/shotwell-transitions/SquaresEffect.vala" -					_tmp38_ = self->priv->square_count_y; +					_tmp24_ = self->priv->square_count_y;  #line 63 "/home/jens/Source/shotwell/plugins/shotwell-transitions/SquaresEffect.vala" -					if (!(_tmp37_ <= _tmp38_)) { +					if (!(_tmp23_ <= _tmp24_)) {  #line 63 "/home/jens/Source/shotwell/plugins/shotwell-transitions/SquaresEffect.vala"  						break; -#line 488 "SquaresEffect.c" +#line 496 "SquaresEffect.c"  					}  					{  						gdouble x = 0.0;  #line 64 "/home/jens/Source/shotwell/plugins/shotwell-transitions/SquaresEffect.vala"  						x = (gdouble) 0; -#line 494 "SquaresEffect.c" +#line 502 "SquaresEffect.c"  						{ -							gboolean _tmp39_ = FALSE; +							gboolean _tmp25_ = FALSE;  #line 64 "/home/jens/Source/shotwell/plugins/shotwell-transitions/SquaresEffect.vala" -							_tmp39_ = TRUE; +							_tmp25_ = TRUE;  #line 64 "/home/jens/Source/shotwell/plugins/shotwell-transitions/SquaresEffect.vala"  							while (TRUE) { -#line 501 "SquaresEffect.c" -								gdouble _tmp41_; -								gdouble _tmp42_; +#line 509 "SquaresEffect.c" +								gdouble _tmp27_; +								gdouble _tmp28_;  								gdouble size = 0.0; +								gdouble _tmp29_; +								gdouble _tmp30_; +								gdouble _tmp31_; +								gdouble _tmp32_; +								gdouble _tmp33_; +								gdouble _tmp34_; +								gdouble _tmp35_; +								GdkRectangle _tmp36_ = {0}; +								GdkRectangle _tmp37_; +								gint _tmp38_; +								gdouble _tmp39_; +								GdkRectangle _tmp40_ = {0}; +								GdkRectangle _tmp41_; +								gint _tmp42_;  								gdouble _tmp43_;  								gdouble _tmp44_;  								gdouble _tmp45_; -								gdouble _tmp46_; -								gdouble _tmp47_; -								gdouble _tmp48_; -								gdouble _tmp49_; -								gdouble _tmp50_; -								cairo_t* _tmp51_; -								SpitTransitionsVisuals* _tmp52_; -								GdkRectangle _tmp53_ = {0}; -								GdkRectangle _tmp54_; -								gint _tmp55_; -								gdouble _tmp56_; -								SpitTransitionsVisuals* _tmp57_; -								GdkRectangle _tmp58_ = {0}; -								GdkRectangle _tmp59_; -								gint _tmp60_; -								gdouble _tmp61_; -								gdouble _tmp62_; -								gdouble _tmp63_; -								cairo_t* _tmp64_;  #line 64 "/home/jens/Source/shotwell/plugins/shotwell-transitions/SquaresEffect.vala" -								if (!_tmp39_) { -#line 529 "SquaresEffect.c" -									gdouble _tmp40_; +								if (!_tmp25_) { +#line 532 "SquaresEffect.c" +									gdouble _tmp26_;  #line 64 "/home/jens/Source/shotwell/plugins/shotwell-transitions/SquaresEffect.vala" -									_tmp40_ = x; +									_tmp26_ = x;  #line 64 "/home/jens/Source/shotwell/plugins/shotwell-transitions/SquaresEffect.vala" -									x = _tmp40_ + 1; -#line 535 "SquaresEffect.c" +									x = _tmp26_ + 1; +#line 538 "SquaresEffect.c"  								}  #line 64 "/home/jens/Source/shotwell/plugins/shotwell-transitions/SquaresEffect.vala" -								_tmp39_ = FALSE; +								_tmp25_ = FALSE;  #line 64 "/home/jens/Source/shotwell/plugins/shotwell-transitions/SquaresEffect.vala" -								_tmp41_ = x; +								_tmp27_ = x;  #line 64 "/home/jens/Source/shotwell/plugins/shotwell-transitions/SquaresEffect.vala" -								_tmp42_ = self->priv->square_count_x; +								_tmp28_ = self->priv->square_count_x;  #line 64 "/home/jens/Source/shotwell/plugins/shotwell-transitions/SquaresEffect.vala" -								if (!(_tmp41_ <= _tmp42_)) { +								if (!(_tmp27_ <= _tmp28_)) {  #line 64 "/home/jens/Source/shotwell/plugins/shotwell-transitions/SquaresEffect.vala"  									break; -#line 547 "SquaresEffect.c" +#line 550 "SquaresEffect.c"  								}  #line 65 "/home/jens/Source/shotwell/plugins/shotwell-transitions/SquaresEffect.vala" -								_tmp43_ = alpha; +								_tmp29_ = alpha;  #line 65 "/home/jens/Source/shotwell/plugins/shotwell-transitions/SquaresEffect.vala" -								_tmp44_ = self->priv->square_count_x; +								_tmp30_ = self->priv->square_count_x;  #line 65 "/home/jens/Source/shotwell/plugins/shotwell-transitions/SquaresEffect.vala" -								_tmp45_ = x; +								_tmp31_ = x;  #line 65 "/home/jens/Source/shotwell/plugins/shotwell-transitions/SquaresEffect.vala" -								_tmp46_ = self->priv->square_count_x; +								_tmp32_ = self->priv->square_count_x;  #line 65 "/home/jens/Source/shotwell/plugins/shotwell-transitions/SquaresEffect.vala" -								_tmp47_ = self->priv->square_count_y; +								_tmp33_ = self->priv->square_count_y;  #line 65 "/home/jens/Source/shotwell/plugins/shotwell-transitions/SquaresEffect.vala" -								_tmp48_ = y; +								_tmp34_ = y;  #line 65 "/home/jens/Source/shotwell/plugins/shotwell-transitions/SquaresEffect.vala" -								_tmp49_ = self->priv->square_count_y; +								_tmp35_ = self->priv->square_count_y;  #line 65 "/home/jens/Source/shotwell/plugins/shotwell-transitions/SquaresEffect.vala" -								_tmp50_ = fmin ((gdouble) 1, _tmp43_ + ((((_tmp44_ - _tmp45_) / _tmp46_) + ((_tmp47_ - _tmp48_) / _tmp49_)) / 2.5)); -#line 65 "/home/jens/Source/shotwell/plugins/shotwell-transitions/SquaresEffect.vala" -								size = SQUARES_EFFECT_SQUARE_SIZE * _tmp50_; -#line 68 "/home/jens/Source/shotwell/plugins/shotwell-transitions/SquaresEffect.vala" -								_tmp51_ = ctx; +								size = SQUARES_EFFECT_SQUARE_SIZE * fmin ((gdouble) 1, _tmp29_ + ((((_tmp30_ - _tmp31_) / _tmp32_) + ((_tmp33_ - _tmp34_) / _tmp35_)) / 2.5));  #line 68 "/home/jens/Source/shotwell/plugins/shotwell-transitions/SquaresEffect.vala" -								_tmp52_ = visuals; +								spit_transitions_visuals_get_to_pos (visuals, &_tmp36_);  #line 68 "/home/jens/Source/shotwell/plugins/shotwell-transitions/SquaresEffect.vala" -								spit_transitions_visuals_get_to_pos (_tmp52_, &_tmp53_); +								_tmp37_ = _tmp36_;  #line 68 "/home/jens/Source/shotwell/plugins/shotwell-transitions/SquaresEffect.vala" -								_tmp54_ = _tmp53_; +								_tmp38_ = _tmp37_.x;  #line 68 "/home/jens/Source/shotwell/plugins/shotwell-transitions/SquaresEffect.vala" -								_tmp55_ = _tmp54_.x; +								_tmp39_ = x;  #line 68 "/home/jens/Source/shotwell/plugins/shotwell-transitions/SquaresEffect.vala" -								_tmp56_ = x; +								spit_transitions_visuals_get_to_pos (visuals, &_tmp40_);  #line 68 "/home/jens/Source/shotwell/plugins/shotwell-transitions/SquaresEffect.vala" -								_tmp57_ = visuals; +								_tmp41_ = _tmp40_;  #line 68 "/home/jens/Source/shotwell/plugins/shotwell-transitions/SquaresEffect.vala" -								spit_transitions_visuals_get_to_pos (_tmp57_, &_tmp58_); +								_tmp42_ = _tmp41_.y;  #line 68 "/home/jens/Source/shotwell/plugins/shotwell-transitions/SquaresEffect.vala" -								_tmp59_ = _tmp58_; +								_tmp43_ = y;  #line 68 "/home/jens/Source/shotwell/plugins/shotwell-transitions/SquaresEffect.vala" -								_tmp60_ = _tmp59_.y; +								_tmp44_ = size;  #line 68 "/home/jens/Source/shotwell/plugins/shotwell-transitions/SquaresEffect.vala" -								_tmp61_ = y; +								_tmp45_ = size;  #line 68 "/home/jens/Source/shotwell/plugins/shotwell-transitions/SquaresEffect.vala" -								_tmp62_ = size; -#line 68 "/home/jens/Source/shotwell/plugins/shotwell-transitions/SquaresEffect.vala" -								_tmp63_ = size; -#line 68 "/home/jens/Source/shotwell/plugins/shotwell-transitions/SquaresEffect.vala" -								cairo_rectangle (_tmp51_, _tmp55_ + (_tmp56_ * SQUARES_EFFECT_SQUARE_SIZE), _tmp60_ + (_tmp61_ * SQUARES_EFFECT_SQUARE_SIZE), _tmp62_, _tmp63_); -#line 71 "/home/jens/Source/shotwell/plugins/shotwell-transitions/SquaresEffect.vala" -								_tmp64_ = ctx; +								cairo_rectangle (ctx, _tmp38_ + (_tmp39_ * SQUARES_EFFECT_SQUARE_SIZE), _tmp42_ + (_tmp43_ * SQUARES_EFFECT_SQUARE_SIZE), _tmp44_, _tmp45_);  #line 71 "/home/jens/Source/shotwell/plugins/shotwell-transitions/SquaresEffect.vala" -								cairo_fill (_tmp64_); -#line 599 "SquaresEffect.c" +								cairo_fill (ctx); +#line 592 "SquaresEffect.c"  							}  						}  					} @@ -603,21 +596,22 @@ static void squares_effect_real_paint (SpitTransitionsEffect* base, SpitTransiti  			}  		}  #line 75 "/home/jens/Source/shotwell/plugins/shotwell-transitions/SquaresEffect.vala" -		_tmp65_ = ctx; -#line 75 "/home/jens/Source/shotwell/plugins/shotwell-transitions/SquaresEffect.vala" -		cairo_clip (_tmp65_); -#line 76 "/home/jens/Source/shotwell/plugins/shotwell-transitions/SquaresEffect.vala" -		_tmp66_ = ctx; +		cairo_clip (ctx);  #line 76 "/home/jens/Source/shotwell/plugins/shotwell-transitions/SquaresEffect.vala" -		_tmp67_ = alpha; +		_tmp46_ = alpha;  #line 76 "/home/jens/Source/shotwell/plugins/shotwell-transitions/SquaresEffect.vala" -		cairo_paint_with_alpha (_tmp66_, _tmp67_); -#line 616 "SquaresEffect.c" +		cairo_paint_with_alpha (ctx, _tmp46_); +#line 605 "SquaresEffect.c"  	}  } -static void squares_effect_real_advance (SpitTransitionsEffect* base, SpitTransitionsVisuals* visuals, SpitTransitionsMotion* motion, gint frame_number) { +static void +squares_effect_real_advance (SpitTransitionsEffect* base, +                             SpitTransitionsVisuals* visuals, +                             SpitTransitionsMotion* motion, +                             gint frame_number) +{  	SquaresEffect * self;  #line 80 "/home/jens/Source/shotwell/plugins/shotwell-transitions/SquaresEffect.vala"  	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_SQUARES_EFFECT, SquaresEffect); @@ -625,30 +619,36 @@ static void squares_effect_real_advance (SpitTransitionsEffect* base, SpitTransi  	g_return_if_fail (SPIT_TRANSITIONS_IS_VISUALS (visuals));  #line 80 "/home/jens/Source/shotwell/plugins/shotwell-transitions/SquaresEffect.vala"  	g_return_if_fail (SPIT_TRANSITIONS_IS_MOTION (motion)); -#line 629 "SquaresEffect.c" +#line 623 "SquaresEffect.c"  } -static void squares_effect_real_cancel (SpitTransitionsEffect* base) { +static void +squares_effect_real_cancel (SpitTransitionsEffect* base) +{  	SquaresEffect * self;  #line 83 "/home/jens/Source/shotwell/plugins/shotwell-transitions/SquaresEffect.vala"  	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_SQUARES_EFFECT, SquaresEffect); -#line 637 "SquaresEffect.c" +#line 633 "SquaresEffect.c"  } -static void squares_effect_class_init (SquaresEffectClass * klass) { +static void +squares_effect_class_init (SquaresEffectClass * klass) +{  #line 28 "/home/jens/Source/shotwell/plugins/shotwell-transitions/SquaresEffect.vala"  	squares_effect_parent_class = g_type_class_peek_parent (klass);  #line 28 "/home/jens/Source/shotwell/plugins/shotwell-transitions/SquaresEffect.vala"  	g_type_class_add_private (klass, sizeof (SquaresEffectPrivate));  #line 28 "/home/jens/Source/shotwell/plugins/shotwell-transitions/SquaresEffect.vala"  	G_OBJECT_CLASS (klass)->finalize = squares_effect_finalize; -#line 648 "SquaresEffect.c" +#line 646 "SquaresEffect.c"  } -static void squares_effect_spit_transitions_effect_interface_init (SpitTransitionsEffectIface * iface) { +static void +squares_effect_spit_transitions_effect_interface_init (SpitTransitionsEffectIface * iface) +{  #line 28 "/home/jens/Source/shotwell/plugins/shotwell-transitions/SquaresEffect.vala"  	squares_effect_spit_transitions_effect_parent_iface = g_type_interface_peek_parent (iface);  #line 28 "/home/jens/Source/shotwell/plugins/shotwell-transitions/SquaresEffect.vala" @@ -667,24 +667,30 @@ static void squares_effect_spit_transitions_effect_interface_init (SpitTransitio  } -static void squares_effect_instance_init (SquaresEffect * self) { +static void +squares_effect_instance_init (SquaresEffect * self) +{  #line 28 "/home/jens/Source/shotwell/plugins/shotwell-transitions/SquaresEffect.vala"  	self->priv = SQUARES_EFFECT_GET_PRIVATE (self); -#line 674 "SquaresEffect.c" +#line 676 "SquaresEffect.c"  } -static void squares_effect_finalize (GObject * obj) { +static void +squares_effect_finalize (GObject * obj) +{  	SquaresEffect * self;  #line 28 "/home/jens/Source/shotwell/plugins/shotwell-transitions/SquaresEffect.vala"  	self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_SQUARES_EFFECT, SquaresEffect);  #line 28 "/home/jens/Source/shotwell/plugins/shotwell-transitions/SquaresEffect.vala"  	G_OBJECT_CLASS (squares_effect_parent_class)->finalize (obj); -#line 684 "SquaresEffect.c" +#line 688 "SquaresEffect.c"  } -GType squares_effect_get_type (void) { +GType +squares_effect_get_type (void) +{  	static volatile gsize squares_effect_type_id__volatile = 0;  	if (g_once_init_enter (&squares_effect_type_id__volatile)) {  		static const GTypeInfo g_define_type_info = { sizeof (SquaresEffectClass), (GBaseInitFunc) NULL, (GBaseFinalizeFunc) NULL, (GClassInitFunc) squares_effect_class_init, (GClassFinalizeFunc) NULL, NULL, sizeof (SquaresEffect), 0, (GInstanceInitFunc) squares_effect_instance_init, NULL }; diff --git a/plugins/shotwell-transitions/StripesEffect.c b/plugins/shotwell-transitions/StripesEffect.c index 53ef18d..d0bac4d 100644 --- a/plugins/shotwell-transitions/StripesEffect.c +++ b/plugins/shotwell-transitions/StripesEffect.c @@ -1,4 +1,4 @@ -/* StripesEffect.c generated by valac 0.36.6, the Vala compiler +/* StripesEffect.c generated by valac 0.40.4, the Vala compiler   * generated from StripesEffect.vala, do not modify */  /* Copyright 2013 Jens Bav @@ -8,6 +8,7 @@   * (version 2.1 or later).  See the COPYING file in this distribution.   */ +  #include <glib.h>  #include <glib-object.h>  #include <shotwell-plugin-dev-1.0.h> @@ -42,6 +43,11 @@ typedef struct _ShotwellTransitionDescriptorPrivate ShotwellTransitionDescriptor  typedef struct _StripesEffectDescriptor StripesEffectDescriptor;  typedef struct _StripesEffectDescriptorClass StripesEffectDescriptorClass;  typedef struct _StripesEffectDescriptorPrivate StripesEffectDescriptorPrivate; +enum  { +	STRIPES_EFFECT_DESCRIPTOR_0_PROPERTY, +	STRIPES_EFFECT_DESCRIPTOR_NUM_PROPERTIES +}; +static GParamSpec* stripes_effect_descriptor_properties[STRIPES_EFFECT_DESCRIPTOR_NUM_PROPERTIES];  #define TYPE_STRIPES_EFFECT (stripes_effect_get_type ())  #define STRIPES_EFFECT(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), TYPE_STRIPES_EFFECT, StripesEffect)) @@ -53,6 +59,11 @@ typedef struct _StripesEffectDescriptorPrivate StripesEffectDescriptorPrivate;  typedef struct _StripesEffect StripesEffect;  typedef struct _StripesEffectClass StripesEffectClass;  typedef struct _StripesEffectPrivate StripesEffectPrivate; +enum  { +	STRIPES_EFFECT_0_PROPERTY, +	STRIPES_EFFECT_NUM_PROPERTIES +}; +static GParamSpec* stripes_effect_properties[STRIPES_EFFECT_NUM_PROPERTIES];  struct _ShotwellTransitionDescriptor {  	GObject parent_instance; @@ -95,57 +106,71 @@ static SpitTransitionsEffectIface * stripes_effect_spit_transitions_effect_paren  GType shotwell_transition_descriptor_get_type (void) G_GNUC_CONST;  GType stripes_effect_descriptor_get_type (void) G_GNUC_CONST; -enum  { -	STRIPES_EFFECT_DESCRIPTOR_DUMMY_PROPERTY -};  StripesEffectDescriptor* stripes_effect_descriptor_new (GFile* resource_directory); -StripesEffectDescriptor* stripes_effect_descriptor_construct (GType object_type, GFile* resource_directory); -ShotwellTransitionDescriptor* shotwell_transition_descriptor_construct (GType object_type, GFile* resource_directory); +StripesEffectDescriptor* stripes_effect_descriptor_construct (GType object_type, +                                                              GFile* resource_directory); +ShotwellTransitionDescriptor* shotwell_transition_descriptor_construct (GType object_type, +                                                                        GFile* resource_directory);  static const gchar* stripes_effect_descriptor_real_get_id (ShotwellTransitionDescriptor* base);  static const gchar* stripes_effect_descriptor_real_get_pluggable_name (ShotwellTransitionDescriptor* base); -static SpitTransitionsEffect* stripes_effect_descriptor_real_create (ShotwellTransitionDescriptor* base, SpitHostInterface* host); +static SpitTransitionsEffect* stripes_effect_descriptor_real_create (ShotwellTransitionDescriptor* base, +                                                              SpitHostInterface* host);  StripesEffect* stripes_effect_new (void);  StripesEffect* stripes_effect_construct (GType object_type);  GType stripes_effect_get_type (void) G_GNUC_CONST;  #define STRIPES_EFFECT_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), TYPE_STRIPES_EFFECT, StripesEffectPrivate)) -enum  { -	STRIPES_EFFECT_DUMMY_PROPERTY -};  #define STRIPES_EFFECT_DESIRED_FPS 25  #define STRIPES_EFFECT_MIN_FPS 10  #define STRIPES_EFFECT_STRIPE_HEIGHT 100 -static void stripes_effect_real_get_fps (SpitTransitionsEffect* base, gint* desired_fps, gint* min_fps); -static void stripes_effect_real_start (SpitTransitionsEffect* base, SpitTransitionsVisuals* visuals, SpitTransitionsMotion* motion); +static void stripes_effect_real_get_fps (SpitTransitionsEffect* base, +                                  gint* desired_fps, +                                  gint* min_fps); +static void stripes_effect_real_start (SpitTransitionsEffect* base, +                                SpitTransitionsVisuals* visuals, +                                SpitTransitionsMotion* motion);  static gboolean stripes_effect_real_needs_clear_background (SpitTransitionsEffect* base); -static void stripes_effect_real_paint (SpitTransitionsEffect* base, SpitTransitionsVisuals* visuals, SpitTransitionsMotion* motion, cairo_t* ctx, gint width, gint height, gint frame_number); -static void stripes_effect_real_advance (SpitTransitionsEffect* base, SpitTransitionsVisuals* visuals, SpitTransitionsMotion* motion, gint frame_number); +static void stripes_effect_real_paint (SpitTransitionsEffect* base, +                                SpitTransitionsVisuals* visuals, +                                SpitTransitionsMotion* motion, +                                cairo_t* ctx, +                                gint width, +                                gint height, +                                gint frame_number); +static void stripes_effect_real_advance (SpitTransitionsEffect* base, +                                  SpitTransitionsVisuals* visuals, +                                  SpitTransitionsMotion* motion, +                                  gint frame_number);  static void stripes_effect_real_cancel (SpitTransitionsEffect* base);  static void stripes_effect_finalize (GObject * obj); -StripesEffectDescriptor* stripes_effect_descriptor_construct (GType object_type, GFile* resource_directory) { +StripesEffectDescriptor* +stripes_effect_descriptor_construct (GType object_type, +                                     GFile* resource_directory) +{  	StripesEffectDescriptor * self = NULL; -	GFile* _tmp0_;  #line 11 "/home/jens/Source/shotwell/plugins/shotwell-transitions/StripesEffect.vala"  	g_return_val_if_fail (G_IS_FILE (resource_directory), NULL);  #line 12 "/home/jens/Source/shotwell/plugins/shotwell-transitions/StripesEffect.vala" -	_tmp0_ = resource_directory; -#line 12 "/home/jens/Source/shotwell/plugins/shotwell-transitions/StripesEffect.vala" -	self = (StripesEffectDescriptor*) shotwell_transition_descriptor_construct (object_type, _tmp0_); +	self = (StripesEffectDescriptor*) shotwell_transition_descriptor_construct (object_type, resource_directory);  #line 11 "/home/jens/Source/shotwell/plugins/shotwell-transitions/StripesEffect.vala"  	return self; -#line 138 "StripesEffect.c" +#line 159 "StripesEffect.c"  } -StripesEffectDescriptor* stripes_effect_descriptor_new (GFile* resource_directory) { +StripesEffectDescriptor* +stripes_effect_descriptor_new (GFile* resource_directory) +{  #line 11 "/home/jens/Source/shotwell/plugins/shotwell-transitions/StripesEffect.vala"  	return stripes_effect_descriptor_construct (TYPE_STRIPES_EFFECT_DESCRIPTOR, resource_directory); -#line 145 "StripesEffect.c" +#line 168 "StripesEffect.c"  } -static const gchar* stripes_effect_descriptor_real_get_id (ShotwellTransitionDescriptor* base) { +static const gchar* +stripes_effect_descriptor_real_get_id (ShotwellTransitionDescriptor* base) +{  	StripesEffectDescriptor * self;  	const gchar* result = NULL;  #line 15 "/home/jens/Source/shotwell/plugins/shotwell-transitions/StripesEffect.vala" @@ -154,11 +179,13 @@ static const gchar* stripes_effect_descriptor_real_get_id (ShotwellTransitionDes  	result = "org.yorba.shotwell.transitions.stripes";  #line 16 "/home/jens/Source/shotwell/plugins/shotwell-transitions/StripesEffect.vala"  	return result; -#line 158 "StripesEffect.c" +#line 183 "StripesEffect.c"  } -static const gchar* stripes_effect_descriptor_real_get_pluggable_name (ShotwellTransitionDescriptor* base) { +static const gchar* +stripes_effect_descriptor_real_get_pluggable_name (ShotwellTransitionDescriptor* base) +{  	StripesEffectDescriptor * self;  	const gchar* result = NULL;  #line 19 "/home/jens/Source/shotwell/plugins/shotwell-transitions/StripesEffect.vala" @@ -167,11 +194,14 @@ static const gchar* stripes_effect_descriptor_real_get_pluggable_name (ShotwellT  	result = _ ("Stripes");  #line 20 "/home/jens/Source/shotwell/plugins/shotwell-transitions/StripesEffect.vala"  	return result; -#line 171 "StripesEffect.c" +#line 198 "StripesEffect.c"  } -static SpitTransitionsEffect* stripes_effect_descriptor_real_create (ShotwellTransitionDescriptor* base, SpitHostInterface* host) { +static SpitTransitionsEffect* +stripes_effect_descriptor_real_create (ShotwellTransitionDescriptor* base, +                                       SpitHostInterface* host) +{  	StripesEffectDescriptor * self;  	SpitTransitionsEffect* result = NULL;  	StripesEffect* _tmp0_; @@ -185,11 +215,13 @@ static SpitTransitionsEffect* stripes_effect_descriptor_real_create (ShotwellTra  	result = G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, SPIT_TRANSITIONS_TYPE_EFFECT, SpitTransitionsEffect);  #line 24 "/home/jens/Source/shotwell/plugins/shotwell-transitions/StripesEffect.vala"  	return result; -#line 189 "StripesEffect.c" +#line 219 "StripesEffect.c"  } -static void stripes_effect_descriptor_class_init (StripesEffectDescriptorClass * klass) { +static void +stripes_effect_descriptor_class_init (StripesEffectDescriptorClass * klass) +{  #line 10 "/home/jens/Source/shotwell/plugins/shotwell-transitions/StripesEffect.vala"  	stripes_effect_descriptor_parent_class = g_type_class_peek_parent (klass);  #line 10 "/home/jens/Source/shotwell/plugins/shotwell-transitions/StripesEffect.vala" @@ -198,15 +230,19 @@ static void stripes_effect_descriptor_class_init (StripesEffectDescriptorClass *  	((ShotwellTransitionDescriptorClass *) klass)->get_pluggable_name = (const gchar* (*) (ShotwellTransitionDescriptor *)) stripes_effect_descriptor_real_get_pluggable_name;  #line 10 "/home/jens/Source/shotwell/plugins/shotwell-transitions/StripesEffect.vala"  	((ShotwellTransitionDescriptorClass *) klass)->create = (SpitTransitionsEffect* (*) (ShotwellTransitionDescriptor *, SpitHostInterface*)) stripes_effect_descriptor_real_create; -#line 202 "StripesEffect.c" +#line 234 "StripesEffect.c"  } -static void stripes_effect_descriptor_instance_init (StripesEffectDescriptor * self) { +static void +stripes_effect_descriptor_instance_init (StripesEffectDescriptor * self) +{  } -GType stripes_effect_descriptor_get_type (void) { +GType +stripes_effect_descriptor_get_type (void) +{  	static volatile gsize stripes_effect_descriptor_type_id__volatile = 0;  	if (g_once_init_enter (&stripes_effect_descriptor_type_id__volatile)) {  		static const GTypeInfo g_define_type_info = { sizeof (StripesEffectDescriptorClass), (GBaseInitFunc) NULL, (GBaseFinalizeFunc) NULL, (GClassInitFunc) stripes_effect_descriptor_class_init, (GClassFinalizeFunc) NULL, NULL, sizeof (StripesEffectDescriptor), 0, (GInstanceInitFunc) stripes_effect_descriptor_instance_init, NULL }; @@ -218,24 +254,32 @@ GType stripes_effect_descriptor_get_type (void) {  } -StripesEffect* stripes_effect_construct (GType object_type) { +StripesEffect* +stripes_effect_construct (GType object_type) +{  	StripesEffect * self = NULL;  #line 34 "/home/jens/Source/shotwell/plugins/shotwell-transitions/StripesEffect.vala"  	self = (StripesEffect*) g_object_new (object_type, NULL);  #line 34 "/home/jens/Source/shotwell/plugins/shotwell-transitions/StripesEffect.vala"  	return self; -#line 228 "StripesEffect.c" +#line 266 "StripesEffect.c"  } -StripesEffect* stripes_effect_new (void) { +StripesEffect* +stripes_effect_new (void) +{  #line 34 "/home/jens/Source/shotwell/plugins/shotwell-transitions/StripesEffect.vala"  	return stripes_effect_construct (TYPE_STRIPES_EFFECT); -#line 235 "StripesEffect.c" +#line 275 "StripesEffect.c"  } -static void stripes_effect_real_get_fps (SpitTransitionsEffect* base, gint* desired_fps, gint* min_fps) { +static void +stripes_effect_real_get_fps (SpitTransitionsEffect* base, +                             gint* desired_fps, +                             gint* min_fps) +{  	StripesEffect * self;  	gint _vala_desired_fps = 0;  	gint _vala_min_fps = 0; @@ -249,23 +293,26 @@ static void stripes_effect_real_get_fps (SpitTransitionsEffect* base, gint* desi  	if (desired_fps) {  #line 37 "/home/jens/Source/shotwell/plugins/shotwell-transitions/StripesEffect.vala"  		*desired_fps = _vala_desired_fps; -#line 253 "StripesEffect.c" +#line 297 "StripesEffect.c"  	}  #line 37 "/home/jens/Source/shotwell/plugins/shotwell-transitions/StripesEffect.vala"  	if (min_fps) {  #line 37 "/home/jens/Source/shotwell/plugins/shotwell-transitions/StripesEffect.vala"  		*min_fps = _vala_min_fps; -#line 259 "StripesEffect.c" +#line 303 "StripesEffect.c"  	}  } -static void stripes_effect_real_start (SpitTransitionsEffect* base, SpitTransitionsVisuals* visuals, SpitTransitionsMotion* motion) { +static void +stripes_effect_real_start (SpitTransitionsEffect* base, +                           SpitTransitionsVisuals* visuals, +                           SpitTransitionsMotion* motion) +{  	StripesEffect * self; -	SpitTransitionsVisuals* _tmp0_; -	GdkRectangle _tmp1_ = {0}; -	GdkRectangle _tmp2_; -	gint _tmp3_; +	GdkRectangle _tmp0_ = {0}; +	GdkRectangle _tmp1_; +	gint _tmp2_;  #line 42 "/home/jens/Source/shotwell/plugins/shotwell-transitions/StripesEffect.vala"  	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_STRIPES_EFFECT, StripesEffect);  #line 42 "/home/jens/Source/shotwell/plugins/shotwell-transitions/StripesEffect.vala" @@ -273,20 +320,20 @@ static void stripes_effect_real_start (SpitTransitionsEffect* base, SpitTransiti  #line 42 "/home/jens/Source/shotwell/plugins/shotwell-transitions/StripesEffect.vala"  	g_return_if_fail (SPIT_TRANSITIONS_IS_MOTION (motion));  #line 43 "/home/jens/Source/shotwell/plugins/shotwell-transitions/StripesEffect.vala" -	_tmp0_ = visuals; -#line 43 "/home/jens/Source/shotwell/plugins/shotwell-transitions/StripesEffect.vala" -	spit_transitions_visuals_get_to_pos (_tmp0_, &_tmp1_); +	spit_transitions_visuals_get_to_pos (visuals, &_tmp0_);  #line 43 "/home/jens/Source/shotwell/plugins/shotwell-transitions/StripesEffect.vala" -	_tmp2_ = _tmp1_; +	_tmp1_ = _tmp0_;  #line 43 "/home/jens/Source/shotwell/plugins/shotwell-transitions/StripesEffect.vala" -	_tmp3_ = _tmp2_.height; +	_tmp2_ = _tmp1_.height;  #line 43 "/home/jens/Source/shotwell/plugins/shotwell-transitions/StripesEffect.vala" -	self->priv->stripe_count = (_tmp3_ / STRIPES_EFFECT_STRIPE_HEIGHT) + 1; -#line 286 "StripesEffect.c" +	self->priv->stripe_count = (_tmp2_ / STRIPES_EFFECT_STRIPE_HEIGHT) + 1; +#line 331 "StripesEffect.c"  } -static gboolean stripes_effect_real_needs_clear_background (SpitTransitionsEffect* base) { +static gboolean +stripes_effect_real_needs_clear_background (SpitTransitionsEffect* base) +{  	StripesEffect * self;  	gboolean result = FALSE;  #line 46 "/home/jens/Source/shotwell/plugins/shotwell-transitions/StripesEffect.vala" @@ -295,22 +342,25 @@ static gboolean stripes_effect_real_needs_clear_background (SpitTransitionsEffec  	result = TRUE;  #line 47 "/home/jens/Source/shotwell/plugins/shotwell-transitions/StripesEffect.vala"  	return result; -#line 299 "StripesEffect.c" +#line 346 "StripesEffect.c"  } -static void stripes_effect_real_paint (SpitTransitionsEffect* base, SpitTransitionsVisuals* visuals, SpitTransitionsMotion* motion, cairo_t* ctx, gint width, gint height, gint frame_number) { +static void +stripes_effect_real_paint (SpitTransitionsEffect* base, +                           SpitTransitionsVisuals* visuals, +                           SpitTransitionsMotion* motion, +                           cairo_t* ctx, +                           gint width, +                           gint height, +                           gint frame_number) +{  	StripesEffect * self;  	gdouble alpha = 0.0; -	SpitTransitionsMotion* _tmp0_; -	gint _tmp1_; -	gdouble _tmp2_; -	SpitTransitionsVisuals* _tmp3_; -	GdkPixbuf* _tmp4_; -	GdkPixbuf* _tmp5_; -	SpitTransitionsVisuals* _tmp21_; -	GdkPixbuf* _tmp22_; -	GdkPixbuf* _tmp23_; +	GdkPixbuf* _tmp0_; +	GdkPixbuf* _tmp1_; +	GdkPixbuf* _tmp11_; +	GdkPixbuf* _tmp12_;  #line 50 "/home/jens/Source/shotwell/plugins/shotwell-transitions/StripesEffect.vala"  	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_STRIPES_EFFECT, StripesEffect);  #line 50 "/home/jens/Source/shotwell/plugins/shotwell-transitions/StripesEffect.vala" @@ -320,313 +370,245 @@ static void stripes_effect_real_paint (SpitTransitionsEffect* base, SpitTransiti  #line 50 "/home/jens/Source/shotwell/plugins/shotwell-transitions/StripesEffect.vala"  	g_return_if_fail (ctx != NULL);  #line 52 "/home/jens/Source/shotwell/plugins/shotwell-transitions/StripesEffect.vala" -	_tmp0_ = motion; -#line 52 "/home/jens/Source/shotwell/plugins/shotwell-transitions/StripesEffect.vala" -	_tmp1_ = frame_number; -#line 52 "/home/jens/Source/shotwell/plugins/shotwell-transitions/StripesEffect.vala" -	_tmp2_ = spit_transitions_motion_get_alpha (_tmp0_, _tmp1_); -#line 52 "/home/jens/Source/shotwell/plugins/shotwell-transitions/StripesEffect.vala" -	alpha = _tmp2_; -#line 53 "/home/jens/Source/shotwell/plugins/shotwell-transitions/StripesEffect.vala" -	_tmp3_ = visuals; +	alpha = spit_transitions_motion_get_alpha (motion, frame_number);  #line 53 "/home/jens/Source/shotwell/plugins/shotwell-transitions/StripesEffect.vala" -	_tmp4_ = spit_transitions_visuals_get_from_pixbuf (_tmp3_); +	_tmp0_ = spit_transitions_visuals_get_from_pixbuf (visuals);  #line 53 "/home/jens/Source/shotwell/plugins/shotwell-transitions/StripesEffect.vala" -	_tmp5_ = _tmp4_; +	_tmp1_ = _tmp0_;  #line 53 "/home/jens/Source/shotwell/plugins/shotwell-transitions/StripesEffect.vala" -	if (_tmp5_ != NULL) { -#line 339 "StripesEffect.c" -		cairo_t* _tmp6_; -		SpitTransitionsVisuals* _tmp7_; -		GdkPixbuf* _tmp8_; -		GdkPixbuf* _tmp9_; -		SpitTransitionsVisuals* _tmp10_; -		GdkRectangle _tmp11_ = {0}; -		GdkRectangle _tmp12_; -		gint _tmp13_; -		SpitTransitionsVisuals* _tmp14_; -		GdkRectangle _tmp15_ = {0}; -		GdkRectangle _tmp16_; -		gint _tmp17_; -		cairo_t* _tmp18_; -		gdouble _tmp19_; -		gdouble _tmp20_; +	if (_tmp1_ != NULL) { +#line 381 "StripesEffect.c" +		GdkPixbuf* _tmp2_; +		GdkPixbuf* _tmp3_; +		GdkRectangle _tmp4_ = {0}; +		GdkRectangle _tmp5_; +		gint _tmp6_; +		GdkRectangle _tmp7_ = {0}; +		GdkRectangle _tmp8_; +		gint _tmp9_; +		gdouble _tmp10_;  #line 54 "/home/jens/Source/shotwell/plugins/shotwell-transitions/StripesEffect.vala" -		_tmp6_ = ctx; +		_tmp2_ = spit_transitions_visuals_get_from_pixbuf (visuals);  #line 54 "/home/jens/Source/shotwell/plugins/shotwell-transitions/StripesEffect.vala" -		_tmp7_ = visuals; +		_tmp3_ = _tmp2_;  #line 54 "/home/jens/Source/shotwell/plugins/shotwell-transitions/StripesEffect.vala" -		_tmp8_ = spit_transitions_visuals_get_from_pixbuf (_tmp7_); +		spit_transitions_visuals_get_from_pos (visuals, &_tmp4_);  #line 54 "/home/jens/Source/shotwell/plugins/shotwell-transitions/StripesEffect.vala" -		_tmp9_ = _tmp8_; +		_tmp5_ = _tmp4_;  #line 54 "/home/jens/Source/shotwell/plugins/shotwell-transitions/StripesEffect.vala" -		_tmp10_ = visuals; +		_tmp6_ = _tmp5_.x;  #line 54 "/home/jens/Source/shotwell/plugins/shotwell-transitions/StripesEffect.vala" -		spit_transitions_visuals_get_from_pos (_tmp10_, &_tmp11_); +		spit_transitions_visuals_get_from_pos (visuals, &_tmp7_);  #line 54 "/home/jens/Source/shotwell/plugins/shotwell-transitions/StripesEffect.vala" -		_tmp12_ = _tmp11_; +		_tmp8_ = _tmp7_;  #line 54 "/home/jens/Source/shotwell/plugins/shotwell-transitions/StripesEffect.vala" -		_tmp13_ = _tmp12_.x; +		_tmp9_ = _tmp8_.y;  #line 54 "/home/jens/Source/shotwell/plugins/shotwell-transitions/StripesEffect.vala" -		_tmp14_ = visuals; -#line 54 "/home/jens/Source/shotwell/plugins/shotwell-transitions/StripesEffect.vala" -		spit_transitions_visuals_get_from_pos (_tmp14_, &_tmp15_); -#line 54 "/home/jens/Source/shotwell/plugins/shotwell-transitions/StripesEffect.vala" -		_tmp16_ = _tmp15_; -#line 54 "/home/jens/Source/shotwell/plugins/shotwell-transitions/StripesEffect.vala" -		_tmp17_ = _tmp16_.y; -#line 54 "/home/jens/Source/shotwell/plugins/shotwell-transitions/StripesEffect.vala" -		gdk_cairo_set_source_pixbuf (_tmp6_, _tmp9_, (gdouble) _tmp13_, (gdouble) _tmp17_); -#line 56 "/home/jens/Source/shotwell/plugins/shotwell-transitions/StripesEffect.vala" -		_tmp18_ = ctx; +		gdk_cairo_set_source_pixbuf (ctx, _tmp3_, (gdouble) _tmp6_, (gdouble) _tmp9_);  #line 56 "/home/jens/Source/shotwell/plugins/shotwell-transitions/StripesEffect.vala" -		_tmp19_ = alpha; +		_tmp10_ = alpha;  #line 56 "/home/jens/Source/shotwell/plugins/shotwell-transitions/StripesEffect.vala" -		_tmp20_ = fmin ((gdouble) 1, _tmp19_ * 2); -#line 56 "/home/jens/Source/shotwell/plugins/shotwell-transitions/StripesEffect.vala" -		cairo_paint_with_alpha (_tmp18_, 1 - _tmp20_); -#line 389 "StripesEffect.c" +		cairo_paint_with_alpha (ctx, 1 - fmin ((gdouble) 1, _tmp10_ * 2)); +#line 413 "StripesEffect.c"  	}  #line 59 "/home/jens/Source/shotwell/plugins/shotwell-transitions/StripesEffect.vala" -	_tmp21_ = visuals; -#line 59 "/home/jens/Source/shotwell/plugins/shotwell-transitions/StripesEffect.vala" -	_tmp22_ = spit_transitions_visuals_get_to_pixbuf (_tmp21_); +	_tmp11_ = spit_transitions_visuals_get_to_pixbuf (visuals);  #line 59 "/home/jens/Source/shotwell/plugins/shotwell-transitions/StripesEffect.vala" -	_tmp23_ = _tmp22_; +	_tmp12_ = _tmp11_;  #line 59 "/home/jens/Source/shotwell/plugins/shotwell-transitions/StripesEffect.vala" -	if (_tmp23_ != NULL) { -#line 399 "StripesEffect.c" -		cairo_t* _tmp24_; -		SpitTransitionsVisuals* _tmp25_; -		GdkPixbuf* _tmp26_; -		GdkPixbuf* _tmp27_; -		SpitTransitionsVisuals* _tmp28_; -		GdkRectangle _tmp29_ = {0}; -		GdkRectangle _tmp30_; -		gint _tmp31_; -		SpitTransitionsVisuals* _tmp32_; -		GdkRectangle _tmp33_ = {0}; -		GdkRectangle _tmp34_; -		gint _tmp35_; +	if (_tmp12_ != NULL) { +#line 421 "StripesEffect.c" +		GdkPixbuf* _tmp13_; +		GdkPixbuf* _tmp14_; +		GdkRectangle _tmp15_ = {0}; +		GdkRectangle _tmp16_; +		gint _tmp17_; +		GdkRectangle _tmp18_ = {0}; +		GdkRectangle _tmp19_; +		gint _tmp20_;  		gint x = 0; -		SpitTransitionsVisuals* _tmp36_; -		GdkRectangle _tmp37_ = {0}; -		GdkRectangle _tmp38_; -		gint _tmp39_; +		GdkRectangle _tmp21_ = {0}; +		GdkRectangle _tmp22_; +		gint _tmp23_;  		gint y = 0; -		SpitTransitionsVisuals* _tmp40_; -		GdkRectangle _tmp41_ = {0}; -		GdkRectangle _tmp42_; -		gint _tmp43_; -		cairo_t* _tmp79_; -		cairo_t* _tmp80_; -		gdouble _tmp81_; -#line 60 "/home/jens/Source/shotwell/plugins/shotwell-transitions/StripesEffect.vala" -		_tmp24_ = ctx; +		GdkRectangle _tmp24_ = {0}; +		GdkRectangle _tmp25_; +		gint _tmp26_; +		gdouble _tmp55_;  #line 60 "/home/jens/Source/shotwell/plugins/shotwell-transitions/StripesEffect.vala" -		_tmp25_ = visuals; +		_tmp13_ = spit_transitions_visuals_get_to_pixbuf (visuals);  #line 60 "/home/jens/Source/shotwell/plugins/shotwell-transitions/StripesEffect.vala" -		_tmp26_ = spit_transitions_visuals_get_to_pixbuf (_tmp25_); +		_tmp14_ = _tmp13_;  #line 60 "/home/jens/Source/shotwell/plugins/shotwell-transitions/StripesEffect.vala" -		_tmp27_ = _tmp26_; +		spit_transitions_visuals_get_to_pos (visuals, &_tmp15_);  #line 60 "/home/jens/Source/shotwell/plugins/shotwell-transitions/StripesEffect.vala" -		_tmp28_ = visuals; -#line 60 "/home/jens/Source/shotwell/plugins/shotwell-transitions/StripesEffect.vala" -		spit_transitions_visuals_get_to_pos (_tmp28_, &_tmp29_); -#line 60 "/home/jens/Source/shotwell/plugins/shotwell-transitions/StripesEffect.vala" -		_tmp30_ = _tmp29_; -#line 60 "/home/jens/Source/shotwell/plugins/shotwell-transitions/StripesEffect.vala" -		_tmp31_ = _tmp30_.x; +		_tmp16_ = _tmp15_;  #line 60 "/home/jens/Source/shotwell/plugins/shotwell-transitions/StripesEffect.vala" -		_tmp32_ = visuals; +		_tmp17_ = _tmp16_.x;  #line 60 "/home/jens/Source/shotwell/plugins/shotwell-transitions/StripesEffect.vala" -		spit_transitions_visuals_get_to_pos (_tmp32_, &_tmp33_); +		spit_transitions_visuals_get_to_pos (visuals, &_tmp18_);  #line 60 "/home/jens/Source/shotwell/plugins/shotwell-transitions/StripesEffect.vala" -		_tmp34_ = _tmp33_; +		_tmp19_ = _tmp18_;  #line 60 "/home/jens/Source/shotwell/plugins/shotwell-transitions/StripesEffect.vala" -		_tmp35_ = _tmp34_.y; +		_tmp20_ = _tmp19_.y;  #line 60 "/home/jens/Source/shotwell/plugins/shotwell-transitions/StripesEffect.vala" -		gdk_cairo_set_source_pixbuf (_tmp24_, _tmp27_, (gdouble) _tmp31_, (gdouble) _tmp35_); -#line 61 "/home/jens/Source/shotwell/plugins/shotwell-transitions/StripesEffect.vala" -		_tmp36_ = visuals; +		gdk_cairo_set_source_pixbuf (ctx, _tmp14_, (gdouble) _tmp17_, (gdouble) _tmp20_);  #line 61 "/home/jens/Source/shotwell/plugins/shotwell-transitions/StripesEffect.vala" -		spit_transitions_visuals_get_to_pos (_tmp36_, &_tmp37_); +		spit_transitions_visuals_get_to_pos (visuals, &_tmp21_);  #line 61 "/home/jens/Source/shotwell/plugins/shotwell-transitions/StripesEffect.vala" -		_tmp38_ = _tmp37_; +		_tmp22_ = _tmp21_;  #line 61 "/home/jens/Source/shotwell/plugins/shotwell-transitions/StripesEffect.vala" -		_tmp39_ = _tmp38_.x; +		_tmp23_ = _tmp22_.x;  #line 61 "/home/jens/Source/shotwell/plugins/shotwell-transitions/StripesEffect.vala" -		x = _tmp39_; -#line 62 "/home/jens/Source/shotwell/plugins/shotwell-transitions/StripesEffect.vala" -		_tmp40_ = visuals; +		x = _tmp23_;  #line 62 "/home/jens/Source/shotwell/plugins/shotwell-transitions/StripesEffect.vala" -		spit_transitions_visuals_get_to_pos (_tmp40_, &_tmp41_); +		spit_transitions_visuals_get_to_pos (visuals, &_tmp24_);  #line 62 "/home/jens/Source/shotwell/plugins/shotwell-transitions/StripesEffect.vala" -		_tmp42_ = _tmp41_; +		_tmp25_ = _tmp24_;  #line 62 "/home/jens/Source/shotwell/plugins/shotwell-transitions/StripesEffect.vala" -		_tmp43_ = _tmp42_.y; +		_tmp26_ = _tmp25_.y;  #line 62 "/home/jens/Source/shotwell/plugins/shotwell-transitions/StripesEffect.vala" -		y = _tmp43_; -#line 471 "StripesEffect.c" +		y = _tmp26_; +#line 473 "StripesEffect.c"  		{  			gint i = 0;  #line 63 "/home/jens/Source/shotwell/plugins/shotwell-transitions/StripesEffect.vala"  			i = 0; -#line 476 "StripesEffect.c" +#line 478 "StripesEffect.c"  			{ -				gboolean _tmp44_ = FALSE; +				gboolean _tmp27_ = FALSE;  #line 63 "/home/jens/Source/shotwell/plugins/shotwell-transitions/StripesEffect.vala" -				_tmp44_ = TRUE; +				_tmp27_ = TRUE;  #line 63 "/home/jens/Source/shotwell/plugins/shotwell-transitions/StripesEffect.vala"  				while (TRUE) { -#line 483 "StripesEffect.c" -					gint _tmp46_; -					gint _tmp47_; -					gint _tmp48_; -					SpitTransitionsMotion* _tmp49_; -					SpitTransitionsDirection _tmp50_; -					SpitTransitionsDirection _tmp51_; +#line 485 "StripesEffect.c" +					gint _tmp29_; +					gint _tmp30_; +					gint _tmp31_; +					SpitTransitionsDirection _tmp32_; +					SpitTransitionsDirection _tmp33_;  #line 63 "/home/jens/Source/shotwell/plugins/shotwell-transitions/StripesEffect.vala" -					if (!_tmp44_) { -#line 492 "StripesEffect.c" -						gint _tmp45_; +					if (!_tmp27_) { +#line 493 "StripesEffect.c" +						gint _tmp28_;  #line 63 "/home/jens/Source/shotwell/plugins/shotwell-transitions/StripesEffect.vala" -						_tmp45_ = i; +						_tmp28_ = i;  #line 63 "/home/jens/Source/shotwell/plugins/shotwell-transitions/StripesEffect.vala" -						i = _tmp45_ + 1; -#line 498 "StripesEffect.c" +						i = _tmp28_ + 1; +#line 499 "StripesEffect.c"  					}  #line 63 "/home/jens/Source/shotwell/plugins/shotwell-transitions/StripesEffect.vala" -					_tmp44_ = FALSE; +					_tmp27_ = FALSE;  #line 63 "/home/jens/Source/shotwell/plugins/shotwell-transitions/StripesEffect.vala" -					_tmp46_ = i; +					_tmp29_ = i;  #line 63 "/home/jens/Source/shotwell/plugins/shotwell-transitions/StripesEffect.vala" -					_tmp47_ = self->priv->stripe_count; +					_tmp30_ = self->priv->stripe_count;  #line 63 "/home/jens/Source/shotwell/plugins/shotwell-transitions/StripesEffect.vala" -					if (!(_tmp46_ <= _tmp47_)) { +					if (!(_tmp29_ <= _tmp30_)) {  #line 63 "/home/jens/Source/shotwell/plugins/shotwell-transitions/StripesEffect.vala"  						break; -#line 510 "StripesEffect.c" +#line 511 "StripesEffect.c"  					}  #line 64 "/home/jens/Source/shotwell/plugins/shotwell-transitions/StripesEffect.vala" -					_tmp48_ = i; +					_tmp31_ = i;  #line 64 "/home/jens/Source/shotwell/plugins/shotwell-transitions/StripesEffect.vala" -					_tmp49_ = motion; +					_tmp32_ = spit_transitions_motion_get_direction (motion);  #line 64 "/home/jens/Source/shotwell/plugins/shotwell-transitions/StripesEffect.vala" -					_tmp50_ = spit_transitions_motion_get_direction (_tmp49_); +					_tmp33_ = _tmp32_;  #line 64 "/home/jens/Source/shotwell/plugins/shotwell-transitions/StripesEffect.vala" -					_tmp51_ = _tmp50_; -#line 64 "/home/jens/Source/shotwell/plugins/shotwell-transitions/StripesEffect.vala" -					if ((_tmp48_ % 2) == ((gint) _tmp51_)) { -#line 522 "StripesEffect.c" -						cairo_t* _tmp52_; -						gint _tmp53_; -						SpitTransitionsVisuals* _tmp54_; -						GdkRectangle _tmp55_ = {0}; -						GdkRectangle _tmp56_; -						gint _tmp57_; -						gdouble _tmp58_; -						SpitTransitionsVisuals* _tmp59_; -						GdkRectangle _tmp60_ = {0}; -						GdkRectangle _tmp61_; -						gint _tmp62_; -						gint _tmp63_; -						gint _tmp64_; -						gint _tmp65_; -						SpitTransitionsVisuals* _tmp66_; -						GdkRectangle _tmp67_ = {0}; -						GdkRectangle _tmp68_; -						gint _tmp69_; -#line 65 "/home/jens/Source/shotwell/plugins/shotwell-transitions/StripesEffect.vala" -						_tmp52_ = ctx; -#line 65 "/home/jens/Source/shotwell/plugins/shotwell-transitions/StripesEffect.vala" -						_tmp53_ = x; -#line 65 "/home/jens/Source/shotwell/plugins/shotwell-transitions/StripesEffect.vala" -						_tmp54_ = visuals; -#line 65 "/home/jens/Source/shotwell/plugins/shotwell-transitions/StripesEffect.vala" -						spit_transitions_visuals_get_to_pos (_tmp54_, &_tmp55_); +					if ((_tmp31_ % 2) == ((gint) _tmp33_)) { +#line 521 "StripesEffect.c" +						gint _tmp34_; +						GdkRectangle _tmp35_ = {0}; +						GdkRectangle _tmp36_; +						gint _tmp37_; +						gdouble _tmp38_; +						GdkRectangle _tmp39_ = {0}; +						GdkRectangle _tmp40_; +						gint _tmp41_; +						gint _tmp42_; +						gint _tmp43_; +						gint _tmp44_; +						GdkRectangle _tmp45_ = {0}; +						GdkRectangle _tmp46_; +						gint _tmp47_;  #line 65 "/home/jens/Source/shotwell/plugins/shotwell-transitions/StripesEffect.vala" -						_tmp56_ = _tmp55_; +						_tmp34_ = x;  #line 65 "/home/jens/Source/shotwell/plugins/shotwell-transitions/StripesEffect.vala" -						_tmp57_ = _tmp56_.width; +						spit_transitions_visuals_get_to_pos (visuals, &_tmp35_);  #line 65 "/home/jens/Source/shotwell/plugins/shotwell-transitions/StripesEffect.vala" -						_tmp58_ = alpha; +						_tmp36_ = _tmp35_;  #line 65 "/home/jens/Source/shotwell/plugins/shotwell-transitions/StripesEffect.vala" -						_tmp59_ = visuals; +						_tmp37_ = _tmp36_.width;  #line 65 "/home/jens/Source/shotwell/plugins/shotwell-transitions/StripesEffect.vala" -						spit_transitions_visuals_get_to_pos (_tmp59_, &_tmp60_); +						_tmp38_ = alpha;  #line 65 "/home/jens/Source/shotwell/plugins/shotwell-transitions/StripesEffect.vala" -						_tmp61_ = _tmp60_; +						spit_transitions_visuals_get_to_pos (visuals, &_tmp39_);  #line 65 "/home/jens/Source/shotwell/plugins/shotwell-transitions/StripesEffect.vala" -						_tmp62_ = _tmp61_.width; +						_tmp40_ = _tmp39_;  #line 65 "/home/jens/Source/shotwell/plugins/shotwell-transitions/StripesEffect.vala" -						_tmp63_ = y; +						_tmp41_ = _tmp40_.width;  #line 65 "/home/jens/Source/shotwell/plugins/shotwell-transitions/StripesEffect.vala" -						_tmp64_ = i; +						_tmp42_ = y;  #line 65 "/home/jens/Source/shotwell/plugins/shotwell-transitions/StripesEffect.vala" -						_tmp65_ = x; +						_tmp43_ = i;  #line 65 "/home/jens/Source/shotwell/plugins/shotwell-transitions/StripesEffect.vala" -						_tmp66_ = visuals; +						_tmp44_ = x;  #line 65 "/home/jens/Source/shotwell/plugins/shotwell-transitions/StripesEffect.vala" -						spit_transitions_visuals_get_to_pos (_tmp66_, &_tmp67_); +						spit_transitions_visuals_get_to_pos (visuals, &_tmp45_);  #line 65 "/home/jens/Source/shotwell/plugins/shotwell-transitions/StripesEffect.vala" -						_tmp68_ = _tmp67_; +						_tmp46_ = _tmp45_;  #line 65 "/home/jens/Source/shotwell/plugins/shotwell-transitions/StripesEffect.vala" -						_tmp69_ = _tmp68_.width; +						_tmp47_ = _tmp46_.width;  #line 65 "/home/jens/Source/shotwell/plugins/shotwell-transitions/StripesEffect.vala" -						cairo_rectangle (_tmp52_, (_tmp53_ + _tmp57_) - (_tmp58_ * _tmp62_), (gdouble) (_tmp63_ + (_tmp64_ * STRIPES_EFFECT_STRIPE_HEIGHT)), (gdouble) (_tmp65_ + _tmp69_), (gdouble) STRIPES_EFFECT_STRIPE_HEIGHT); -#line 579 "StripesEffect.c" +						cairo_rectangle (ctx, (_tmp34_ + _tmp37_) - (_tmp38_ * _tmp41_), (gdouble) (_tmp42_ + (_tmp43_ * STRIPES_EFFECT_STRIPE_HEIGHT)), (gdouble) (_tmp44_ + _tmp47_), (gdouble) STRIPES_EFFECT_STRIPE_HEIGHT); +#line 566 "StripesEffect.c"  					} else { -						cairo_t* _tmp70_; -						gint _tmp71_; -						gint _tmp72_; -						gint _tmp73_; -						SpitTransitionsVisuals* _tmp74_; -						GdkRectangle _tmp75_ = {0}; -						GdkRectangle _tmp76_; -						gint _tmp77_; -						gdouble _tmp78_; -#line 68 "/home/jens/Source/shotwell/plugins/shotwell-transitions/StripesEffect.vala" -						_tmp70_ = ctx; -#line 68 "/home/jens/Source/shotwell/plugins/shotwell-transitions/StripesEffect.vala" -						_tmp71_ = x; +						gint _tmp48_; +						gint _tmp49_; +						gint _tmp50_; +						GdkRectangle _tmp51_ = {0}; +						GdkRectangle _tmp52_; +						gint _tmp53_; +						gdouble _tmp54_;  #line 68 "/home/jens/Source/shotwell/plugins/shotwell-transitions/StripesEffect.vala" -						_tmp72_ = y; +						_tmp48_ = x;  #line 68 "/home/jens/Source/shotwell/plugins/shotwell-transitions/StripesEffect.vala" -						_tmp73_ = i; +						_tmp49_ = y;  #line 68 "/home/jens/Source/shotwell/plugins/shotwell-transitions/StripesEffect.vala" -						_tmp74_ = visuals; +						_tmp50_ = i;  #line 68 "/home/jens/Source/shotwell/plugins/shotwell-transitions/StripesEffect.vala" -						spit_transitions_visuals_get_to_pos (_tmp74_, &_tmp75_); +						spit_transitions_visuals_get_to_pos (visuals, &_tmp51_);  #line 68 "/home/jens/Source/shotwell/plugins/shotwell-transitions/StripesEffect.vala" -						_tmp76_ = _tmp75_; +						_tmp52_ = _tmp51_;  #line 68 "/home/jens/Source/shotwell/plugins/shotwell-transitions/StripesEffect.vala" -						_tmp77_ = _tmp76_.width; +						_tmp53_ = _tmp52_.width;  #line 68 "/home/jens/Source/shotwell/plugins/shotwell-transitions/StripesEffect.vala" -						_tmp78_ = alpha; +						_tmp54_ = alpha;  #line 68 "/home/jens/Source/shotwell/plugins/shotwell-transitions/StripesEffect.vala" -						cairo_rectangle (_tmp70_, (gdouble) _tmp71_, (gdouble) (_tmp72_ + (STRIPES_EFFECT_STRIPE_HEIGHT * _tmp73_)), _tmp77_ * _tmp78_, (gdouble) STRIPES_EFFECT_STRIPE_HEIGHT); -#line 610 "StripesEffect.c" +						cairo_rectangle (ctx, (gdouble) _tmp48_, (gdouble) (_tmp49_ + (STRIPES_EFFECT_STRIPE_HEIGHT * _tmp50_)), _tmp53_ * _tmp54_, (gdouble) STRIPES_EFFECT_STRIPE_HEIGHT); +#line 591 "StripesEffect.c"  					}  				}  			}  		}  #line 73 "/home/jens/Source/shotwell/plugins/shotwell-transitions/StripesEffect.vala" -		_tmp79_ = ctx; -#line 73 "/home/jens/Source/shotwell/plugins/shotwell-transitions/StripesEffect.vala" -		cairo_clip (_tmp79_); -#line 74 "/home/jens/Source/shotwell/plugins/shotwell-transitions/StripesEffect.vala" -		_tmp80_ = ctx; +		cairo_clip (ctx);  #line 74 "/home/jens/Source/shotwell/plugins/shotwell-transitions/StripesEffect.vala" -		_tmp81_ = alpha; +		_tmp55_ = alpha;  #line 74 "/home/jens/Source/shotwell/plugins/shotwell-transitions/StripesEffect.vala" -		cairo_paint_with_alpha (_tmp80_, _tmp81_); -#line 625 "StripesEffect.c" +		cairo_paint_with_alpha (ctx, _tmp55_); +#line 602 "StripesEffect.c"  	}  } -static void stripes_effect_real_advance (SpitTransitionsEffect* base, SpitTransitionsVisuals* visuals, SpitTransitionsMotion* motion, gint frame_number) { +static void +stripes_effect_real_advance (SpitTransitionsEffect* base, +                             SpitTransitionsVisuals* visuals, +                             SpitTransitionsMotion* motion, +                             gint frame_number) +{  	StripesEffect * self;  #line 78 "/home/jens/Source/shotwell/plugins/shotwell-transitions/StripesEffect.vala"  	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_STRIPES_EFFECT, StripesEffect); @@ -634,30 +616,36 @@ static void stripes_effect_real_advance (SpitTransitionsEffect* base, SpitTransi  	g_return_if_fail (SPIT_TRANSITIONS_IS_VISUALS (visuals));  #line 78 "/home/jens/Source/shotwell/plugins/shotwell-transitions/StripesEffect.vala"  	g_return_if_fail (SPIT_TRANSITIONS_IS_MOTION (motion)); -#line 638 "StripesEffect.c" +#line 620 "StripesEffect.c"  } -static void stripes_effect_real_cancel (SpitTransitionsEffect* base) { +static void +stripes_effect_real_cancel (SpitTransitionsEffect* base) +{  	StripesEffect * self;  #line 81 "/home/jens/Source/shotwell/plugins/shotwell-transitions/StripesEffect.vala"  	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_STRIPES_EFFECT, StripesEffect); -#line 646 "StripesEffect.c" +#line 630 "StripesEffect.c"  } -static void stripes_effect_class_init (StripesEffectClass * klass) { +static void +stripes_effect_class_init (StripesEffectClass * klass) +{  #line 28 "/home/jens/Source/shotwell/plugins/shotwell-transitions/StripesEffect.vala"  	stripes_effect_parent_class = g_type_class_peek_parent (klass);  #line 28 "/home/jens/Source/shotwell/plugins/shotwell-transitions/StripesEffect.vala"  	g_type_class_add_private (klass, sizeof (StripesEffectPrivate));  #line 28 "/home/jens/Source/shotwell/plugins/shotwell-transitions/StripesEffect.vala"  	G_OBJECT_CLASS (klass)->finalize = stripes_effect_finalize; -#line 657 "StripesEffect.c" +#line 643 "StripesEffect.c"  } -static void stripes_effect_spit_transitions_effect_interface_init (SpitTransitionsEffectIface * iface) { +static void +stripes_effect_spit_transitions_effect_interface_init (SpitTransitionsEffectIface * iface) +{  #line 28 "/home/jens/Source/shotwell/plugins/shotwell-transitions/StripesEffect.vala"  	stripes_effect_spit_transitions_effect_parent_iface = g_type_interface_peek_parent (iface);  #line 28 "/home/jens/Source/shotwell/plugins/shotwell-transitions/StripesEffect.vala" @@ -672,28 +660,34 @@ static void stripes_effect_spit_transitions_effect_interface_init (SpitTransitio  	iface->advance = (void (*) (SpitTransitionsEffect *, SpitTransitionsVisuals*, SpitTransitionsMotion*, gint)) stripes_effect_real_advance;  #line 28 "/home/jens/Source/shotwell/plugins/shotwell-transitions/StripesEffect.vala"  	iface->cancel = (void (*) (SpitTransitionsEffect *)) stripes_effect_real_cancel; -#line 676 "StripesEffect.c" +#line 664 "StripesEffect.c"  } -static void stripes_effect_instance_init (StripesEffect * self) { +static void +stripes_effect_instance_init (StripesEffect * self) +{  #line 28 "/home/jens/Source/shotwell/plugins/shotwell-transitions/StripesEffect.vala"  	self->priv = STRIPES_EFFECT_GET_PRIVATE (self); -#line 683 "StripesEffect.c" +#line 673 "StripesEffect.c"  } -static void stripes_effect_finalize (GObject * obj) { +static void +stripes_effect_finalize (GObject * obj) +{  	StripesEffect * self;  #line 28 "/home/jens/Source/shotwell/plugins/shotwell-transitions/StripesEffect.vala"  	self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_STRIPES_EFFECT, StripesEffect);  #line 28 "/home/jens/Source/shotwell/plugins/shotwell-transitions/StripesEffect.vala"  	G_OBJECT_CLASS (stripes_effect_parent_class)->finalize (obj); -#line 693 "StripesEffect.c" +#line 685 "StripesEffect.c"  } -GType stripes_effect_get_type (void) { +GType +stripes_effect_get_type (void) +{  	static volatile gsize stripes_effect_type_id__volatile = 0;  	if (g_once_init_enter (&stripes_effect_type_id__volatile)) {  		static const GTypeInfo g_define_type_info = { sizeof (StripesEffectClass), (GBaseInitFunc) NULL, (GBaseFinalizeFunc) NULL, (GClassInitFunc) stripes_effect_class_init, (GClassFinalizeFunc) NULL, NULL, sizeof (StripesEffect), 0, (GInstanceInitFunc) stripes_effect_instance_init, NULL }; diff --git a/plugins/shotwell-transitions/shotwell-transitions.c b/plugins/shotwell-transitions/shotwell-transitions.c index 37d3f6d..b8be39c 100644 --- a/plugins/shotwell-transitions/shotwell-transitions.c +++ b/plugins/shotwell-transitions/shotwell-transitions.c @@ -1,4 +1,4 @@ -/* shotwell-transitions.c generated by valac 0.36.6, the Vala compiler +/* shotwell-transitions.c generated by valac 0.40.4, the Vala compiler   * generated from shotwell-transitions.vala, do not modify */  /* Copyright 2016 Software Freedom Conservancy Inc. @@ -7,6 +7,7 @@   * (version 2.1 or later).  See the COPYING file in this distribution.   */ +  #include <glib.h>  #include <glib-object.h>  #include <shotwell-plugin-dev-1.0.h> @@ -28,6 +29,11 @@  typedef struct _ShotwellTransitions ShotwellTransitions;  typedef struct _ShotwellTransitionsClass ShotwellTransitionsClass;  typedef struct _ShotwellTransitionsPrivate ShotwellTransitionsPrivate; +enum  { +	SHOTWELL_TRANSITIONS_0_PROPERTY, +	SHOTWELL_TRANSITIONS_NUM_PROPERTIES +}; +static GParamSpec* shotwell_transitions_properties[SHOTWELL_TRANSITIONS_NUM_PROPERTIES];  #define TYPE_SHOTWELL_TRANSITION_DESCRIPTOR (shotwell_transition_descriptor_get_type ())  #define SHOTWELL_TRANSITION_DESCRIPTOR(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), TYPE_SHOTWELL_TRANSITION_DESCRIPTOR, ShotwellTransitionDescriptor)) @@ -140,6 +146,11 @@ typedef struct _StripesEffectDescriptor StripesEffectDescriptor;  typedef struct _StripesEffectDescriptorClass StripesEffectDescriptorClass;  #define _g_object_unref0(var) ((var == NULL) ? NULL : (var = (g_object_unref (var), NULL)))  typedef struct _ShotwellTransitionDescriptorPrivate ShotwellTransitionDescriptorPrivate; +enum  { +	SHOTWELL_TRANSITION_DESCRIPTOR_0_PROPERTY, +	SHOTWELL_TRANSITION_DESCRIPTOR_NUM_PROPERTIES +}; +static GParamSpec* shotwell_transition_descriptor_properties[SHOTWELL_TRANSITION_DESCRIPTOR_NUM_PROPERTIES];  #define _g_free0(var) (var = (g_free (var), NULL))  struct _ShotwellTransitions { @@ -183,389 +194,491 @@ static SpitTransitionsDescriptorIface * shotwell_transition_descriptor_spit_tran  GType shotwell_transitions_get_type (void) G_GNUC_CONST;  #define SHOTWELL_TRANSITIONS_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), TYPE_SHOTWELL_TRANSITIONS, ShotwellTransitionsPrivate)) -enum  { -	SHOTWELL_TRANSITIONS_DUMMY_PROPERTY -};  ShotwellTransitions* shotwell_transitions_new (GFile* module_file); -ShotwellTransitions* shotwell_transitions_construct (GType object_type, GFile* module_file); +ShotwellTransitions* shotwell_transitions_construct (GType object_type, +                                                     GFile* module_file);  FadeEffectDescriptor* fade_effect_descriptor_new (GFile* resource_directory); -FadeEffectDescriptor* fade_effect_descriptor_construct (GType object_type, GFile* resource_directory); +FadeEffectDescriptor* fade_effect_descriptor_construct (GType object_type, +                                                        GFile* resource_directory);  GType shotwell_transition_descriptor_get_type (void) G_GNUC_CONST;  GType fade_effect_descriptor_get_type (void) G_GNUC_CONST; -static void _vala_array_add1 (SpitPluggable** * array, int* length, int* size, SpitPluggable* value); +static void _vala_array_add1 (SpitPluggable** * array, +                       int* length, +                       int* size, +                       SpitPluggable* value);  SlideEffectDescriptor* slide_effect_descriptor_new (GFile* resource_directory); -SlideEffectDescriptor* slide_effect_descriptor_construct (GType object_type, GFile* resource_directory); +SlideEffectDescriptor* slide_effect_descriptor_construct (GType object_type, +                                                          GFile* resource_directory);  GType slide_effect_descriptor_get_type (void) G_GNUC_CONST; -static void _vala_array_add2 (SpitPluggable** * array, int* length, int* size, SpitPluggable* value); +static void _vala_array_add2 (SpitPluggable** * array, +                       int* length, +                       int* size, +                       SpitPluggable* value);  CrumbleEffectDescriptor* crumble_effect_descriptor_new (GFile* resource_directory); -CrumbleEffectDescriptor* crumble_effect_descriptor_construct (GType object_type, GFile* resource_directory); +CrumbleEffectDescriptor* crumble_effect_descriptor_construct (GType object_type, +                                                              GFile* resource_directory);  GType crumble_effect_descriptor_get_type (void) G_GNUC_CONST; -static void _vala_array_add3 (SpitPluggable** * array, int* length, int* size, SpitPluggable* value); +static void _vala_array_add3 (SpitPluggable** * array, +                       int* length, +                       int* size, +                       SpitPluggable* value);  BlindsEffectDescriptor* blinds_effect_descriptor_new (GFile* resource_directory); -BlindsEffectDescriptor* blinds_effect_descriptor_construct (GType object_type, GFile* resource_directory); +BlindsEffectDescriptor* blinds_effect_descriptor_construct (GType object_type, +                                                            GFile* resource_directory);  GType blinds_effect_descriptor_get_type (void) G_GNUC_CONST; -static void _vala_array_add4 (SpitPluggable** * array, int* length, int* size, SpitPluggable* value); +static void _vala_array_add4 (SpitPluggable** * array, +                       int* length, +                       int* size, +                       SpitPluggable* value);  CircleEffectDescriptor* circle_effect_descriptor_new (GFile* resource_directory); -CircleEffectDescriptor* circle_effect_descriptor_construct (GType object_type, GFile* resource_directory); +CircleEffectDescriptor* circle_effect_descriptor_construct (GType object_type, +                                                            GFile* resource_directory);  GType circle_effect_descriptor_get_type (void) G_GNUC_CONST; -static void _vala_array_add5 (SpitPluggable** * array, int* length, int* size, SpitPluggable* value); +static void _vala_array_add5 (SpitPluggable** * array, +                       int* length, +                       int* size, +                       SpitPluggable* value);  CirclesEffectDescriptor* circles_effect_descriptor_new (GFile* resource_directory); -CirclesEffectDescriptor* circles_effect_descriptor_construct (GType object_type, GFile* resource_directory); +CirclesEffectDescriptor* circles_effect_descriptor_construct (GType object_type, +                                                              GFile* resource_directory);  GType circles_effect_descriptor_get_type (void) G_GNUC_CONST; -static void _vala_array_add6 (SpitPluggable** * array, int* length, int* size, SpitPluggable* value); +static void _vala_array_add6 (SpitPluggable** * array, +                       int* length, +                       int* size, +                       SpitPluggable* value);  ClockEffectDescriptor* clock_effect_descriptor_new (GFile* resource_directory); -ClockEffectDescriptor* clock_effect_descriptor_construct (GType object_type, GFile* resource_directory); +ClockEffectDescriptor* clock_effect_descriptor_construct (GType object_type, +                                                          GFile* resource_directory);  GType clock_effect_descriptor_get_type (void) G_GNUC_CONST; -static void _vala_array_add7 (SpitPluggable** * array, int* length, int* size, SpitPluggable* value); +static void _vala_array_add7 (SpitPluggable** * array, +                       int* length, +                       int* size, +                       SpitPluggable* value);  SquaresEffectDescriptor* squares_effect_descriptor_new (GFile* resource_directory); -SquaresEffectDescriptor* squares_effect_descriptor_construct (GType object_type, GFile* resource_directory); +SquaresEffectDescriptor* squares_effect_descriptor_construct (GType object_type, +                                                              GFile* resource_directory);  GType squares_effect_descriptor_get_type (void) G_GNUC_CONST; -static void _vala_array_add8 (SpitPluggable** * array, int* length, int* size, SpitPluggable* value); +static void _vala_array_add8 (SpitPluggable** * array, +                       int* length, +                       int* size, +                       SpitPluggable* value);  ChessEffectDescriptor* chess_effect_descriptor_new (GFile* resource_directory); -ChessEffectDescriptor* chess_effect_descriptor_construct (GType object_type, GFile* resource_directory); +ChessEffectDescriptor* chess_effect_descriptor_construct (GType object_type, +                                                          GFile* resource_directory);  GType chess_effect_descriptor_get_type (void) G_GNUC_CONST; -static void _vala_array_add9 (SpitPluggable** * array, int* length, int* size, SpitPluggable* value); +static void _vala_array_add9 (SpitPluggable** * array, +                       int* length, +                       int* size, +                       SpitPluggable* value);  StripesEffectDescriptor* stripes_effect_descriptor_new (GFile* resource_directory); -StripesEffectDescriptor* stripes_effect_descriptor_construct (GType object_type, GFile* resource_directory); +StripesEffectDescriptor* stripes_effect_descriptor_construct (GType object_type, +                                                              GFile* resource_directory);  GType stripes_effect_descriptor_get_type (void) G_GNUC_CONST; -static void _vala_array_add10 (SpitPluggable** * array, int* length, int* size, SpitPluggable* value); +static void _vala_array_add10 (SpitPluggable** * array, +                        int* length, +                        int* size, +                        SpitPluggable* value);  static const gchar* shotwell_transitions_real_get_module_name (SpitModule* base);  static const gchar* shotwell_transitions_real_get_version (SpitModule* base);  static const gchar* shotwell_transitions_real_get_id (SpitModule* base); -static SpitPluggable** shotwell_transitions_real_get_pluggables (SpitModule* base, int* result_length1); +static SpitPluggable** shotwell_transitions_real_get_pluggables (SpitModule* base, +                                                          int* result_length1);  static void shotwell_transitions_finalize (GObject * obj);  SpitModule* spit_entry_point (SpitEntryPointParams* params); -enum  { -	SHOTWELL_TRANSITION_DESCRIPTOR_DUMMY_PROPERTY -};  #define SHOTWELL_TRANSITION_DESCRIPTOR_ICON_FILENAME "slideshow-plugin.png" -ShotwellTransitionDescriptor* shotwell_transition_descriptor_construct (GType object_type, GFile* resource_directory); -static gint shotwell_transition_descriptor_real_get_pluggable_interface (SpitPluggable* base, gint min_host_interface, gint max_host_interface); +ShotwellTransitionDescriptor* shotwell_transition_descriptor_construct (GType object_type, +                                                                        GFile* resource_directory); +static gint shotwell_transition_descriptor_real_get_pluggable_interface (SpitPluggable* base, +                                                                  gint min_host_interface, +                                                                  gint max_host_interface);  const gchar* shotwell_transition_descriptor_get_id (ShotwellTransitionDescriptor* self);  static const gchar* shotwell_transition_descriptor_real_get_id (ShotwellTransitionDescriptor* self);  const gchar* shotwell_transition_descriptor_get_pluggable_name (ShotwellTransitionDescriptor* self);  static const gchar* shotwell_transition_descriptor_real_get_pluggable_name (ShotwellTransitionDescriptor* self); -static void shotwell_transition_descriptor_real_get_info (SpitPluggable* base, SpitPluggableInfo* info); -static GdkPixbuf** _vala_array_dup1 (GdkPixbuf** self, int length); -static void shotwell_transition_descriptor_real_activation (SpitPluggable* base, gboolean enabled); -SpitTransitionsEffect* shotwell_transition_descriptor_create (ShotwellTransitionDescriptor* self, SpitHostInterface* host); -static SpitTransitionsEffect* shotwell_transition_descriptor_real_create (ShotwellTransitionDescriptor* self, SpitHostInterface* host); +static void shotwell_transition_descriptor_real_get_info (SpitPluggable* base, +                                                   SpitPluggableInfo* info); +static GdkPixbuf** _vala_array_dup1 (GdkPixbuf** self, +                              int length); +static void shotwell_transition_descriptor_real_activation (SpitPluggable* base, +                                                     gboolean enabled); +SpitTransitionsEffect* shotwell_transition_descriptor_create (ShotwellTransitionDescriptor* self, +                                                              SpitHostInterface* host); +static SpitTransitionsEffect* shotwell_transition_descriptor_real_create (ShotwellTransitionDescriptor* self, +                                                                   SpitHostInterface* host);  static void shotwell_transition_descriptor_finalize (GObject * obj); -static void _vala_array_destroy (gpointer array, gint array_length, GDestroyNotify destroy_func); -static void _vala_array_free (gpointer array, gint array_length, GDestroyNotify destroy_func); - - -static void _vala_array_add1 (SpitPluggable** * array, int* length, int* size, SpitPluggable* value) { +static void _vala_array_destroy (gpointer array, +                          gint array_length, +                          GDestroyNotify destroy_func); +static void _vala_array_free (gpointer array, +                       gint array_length, +                       GDestroyNotify destroy_func); + + +static void +_vala_array_add1 (SpitPluggable** * array, +                  int* length, +                  int* size, +                  SpitPluggable* value) +{  #line 15 "/home/jens/Source/shotwell/plugins/shotwell-transitions/shotwell-transitions.vala"  	if ((*length) == (*size)) {  #line 15 "/home/jens/Source/shotwell/plugins/shotwell-transitions/shotwell-transitions.vala"  		*size = (*size) ? (2 * (*size)) : 4;  #line 15 "/home/jens/Source/shotwell/plugins/shotwell-transitions/shotwell-transitions.vala"  		*array = g_renew (SpitPluggable*, *array, (*size) + 1); -#line 266 "shotwell-transitions.c" +#line 330 "shotwell-transitions.c"  	}  #line 15 "/home/jens/Source/shotwell/plugins/shotwell-transitions/shotwell-transitions.vala"  	(*array)[(*length)++] = value;  #line 15 "/home/jens/Source/shotwell/plugins/shotwell-transitions/shotwell-transitions.vala"  	(*array)[*length] = NULL; -#line 272 "shotwell-transitions.c" +#line 336 "shotwell-transitions.c"  } -static void _vala_array_add2 (SpitPluggable** * array, int* length, int* size, SpitPluggable* value) { +static void +_vala_array_add2 (SpitPluggable** * array, +                  int* length, +                  int* size, +                  SpitPluggable* value) +{  #line 16 "/home/jens/Source/shotwell/plugins/shotwell-transitions/shotwell-transitions.vala"  	if ((*length) == (*size)) {  #line 16 "/home/jens/Source/shotwell/plugins/shotwell-transitions/shotwell-transitions.vala"  		*size = (*size) ? (2 * (*size)) : 4;  #line 16 "/home/jens/Source/shotwell/plugins/shotwell-transitions/shotwell-transitions.vala"  		*array = g_renew (SpitPluggable*, *array, (*size) + 1); -#line 283 "shotwell-transitions.c" +#line 352 "shotwell-transitions.c"  	}  #line 16 "/home/jens/Source/shotwell/plugins/shotwell-transitions/shotwell-transitions.vala"  	(*array)[(*length)++] = value;  #line 16 "/home/jens/Source/shotwell/plugins/shotwell-transitions/shotwell-transitions.vala"  	(*array)[*length] = NULL; -#line 289 "shotwell-transitions.c" +#line 358 "shotwell-transitions.c"  } -static void _vala_array_add3 (SpitPluggable** * array, int* length, int* size, SpitPluggable* value) { +static void +_vala_array_add3 (SpitPluggable** * array, +                  int* length, +                  int* size, +                  SpitPluggable* value) +{  #line 17 "/home/jens/Source/shotwell/plugins/shotwell-transitions/shotwell-transitions.vala"  	if ((*length) == (*size)) {  #line 17 "/home/jens/Source/shotwell/plugins/shotwell-transitions/shotwell-transitions.vala"  		*size = (*size) ? (2 * (*size)) : 4;  #line 17 "/home/jens/Source/shotwell/plugins/shotwell-transitions/shotwell-transitions.vala"  		*array = g_renew (SpitPluggable*, *array, (*size) + 1); -#line 300 "shotwell-transitions.c" +#line 374 "shotwell-transitions.c"  	}  #line 17 "/home/jens/Source/shotwell/plugins/shotwell-transitions/shotwell-transitions.vala"  	(*array)[(*length)++] = value;  #line 17 "/home/jens/Source/shotwell/plugins/shotwell-transitions/shotwell-transitions.vala"  	(*array)[*length] = NULL; -#line 306 "shotwell-transitions.c" +#line 380 "shotwell-transitions.c"  } -static void _vala_array_add4 (SpitPluggable** * array, int* length, int* size, SpitPluggable* value) { +static void +_vala_array_add4 (SpitPluggable** * array, +                  int* length, +                  int* size, +                  SpitPluggable* value) +{  #line 18 "/home/jens/Source/shotwell/plugins/shotwell-transitions/shotwell-transitions.vala"  	if ((*length) == (*size)) {  #line 18 "/home/jens/Source/shotwell/plugins/shotwell-transitions/shotwell-transitions.vala"  		*size = (*size) ? (2 * (*size)) : 4;  #line 18 "/home/jens/Source/shotwell/plugins/shotwell-transitions/shotwell-transitions.vala"  		*array = g_renew (SpitPluggable*, *array, (*size) + 1); -#line 317 "shotwell-transitions.c" +#line 396 "shotwell-transitions.c"  	}  #line 18 "/home/jens/Source/shotwell/plugins/shotwell-transitions/shotwell-transitions.vala"  	(*array)[(*length)++] = value;  #line 18 "/home/jens/Source/shotwell/plugins/shotwell-transitions/shotwell-transitions.vala"  	(*array)[*length] = NULL; -#line 323 "shotwell-transitions.c" +#line 402 "shotwell-transitions.c"  } -static void _vala_array_add5 (SpitPluggable** * array, int* length, int* size, SpitPluggable* value) { +static void +_vala_array_add5 (SpitPluggable** * array, +                  int* length, +                  int* size, +                  SpitPluggable* value) +{  #line 19 "/home/jens/Source/shotwell/plugins/shotwell-transitions/shotwell-transitions.vala"  	if ((*length) == (*size)) {  #line 19 "/home/jens/Source/shotwell/plugins/shotwell-transitions/shotwell-transitions.vala"  		*size = (*size) ? (2 * (*size)) : 4;  #line 19 "/home/jens/Source/shotwell/plugins/shotwell-transitions/shotwell-transitions.vala"  		*array = g_renew (SpitPluggable*, *array, (*size) + 1); -#line 334 "shotwell-transitions.c" +#line 418 "shotwell-transitions.c"  	}  #line 19 "/home/jens/Source/shotwell/plugins/shotwell-transitions/shotwell-transitions.vala"  	(*array)[(*length)++] = value;  #line 19 "/home/jens/Source/shotwell/plugins/shotwell-transitions/shotwell-transitions.vala"  	(*array)[*length] = NULL; -#line 340 "shotwell-transitions.c" +#line 424 "shotwell-transitions.c"  } -static void _vala_array_add6 (SpitPluggable** * array, int* length, int* size, SpitPluggable* value) { +static void +_vala_array_add6 (SpitPluggable** * array, +                  int* length, +                  int* size, +                  SpitPluggable* value) +{  #line 20 "/home/jens/Source/shotwell/plugins/shotwell-transitions/shotwell-transitions.vala"  	if ((*length) == (*size)) {  #line 20 "/home/jens/Source/shotwell/plugins/shotwell-transitions/shotwell-transitions.vala"  		*size = (*size) ? (2 * (*size)) : 4;  #line 20 "/home/jens/Source/shotwell/plugins/shotwell-transitions/shotwell-transitions.vala"  		*array = g_renew (SpitPluggable*, *array, (*size) + 1); -#line 351 "shotwell-transitions.c" +#line 440 "shotwell-transitions.c"  	}  #line 20 "/home/jens/Source/shotwell/plugins/shotwell-transitions/shotwell-transitions.vala"  	(*array)[(*length)++] = value;  #line 20 "/home/jens/Source/shotwell/plugins/shotwell-transitions/shotwell-transitions.vala"  	(*array)[*length] = NULL; -#line 357 "shotwell-transitions.c" +#line 446 "shotwell-transitions.c"  } -static void _vala_array_add7 (SpitPluggable** * array, int* length, int* size, SpitPluggable* value) { +static void +_vala_array_add7 (SpitPluggable** * array, +                  int* length, +                  int* size, +                  SpitPluggable* value) +{  #line 21 "/home/jens/Source/shotwell/plugins/shotwell-transitions/shotwell-transitions.vala"  	if ((*length) == (*size)) {  #line 21 "/home/jens/Source/shotwell/plugins/shotwell-transitions/shotwell-transitions.vala"  		*size = (*size) ? (2 * (*size)) : 4;  #line 21 "/home/jens/Source/shotwell/plugins/shotwell-transitions/shotwell-transitions.vala"  		*array = g_renew (SpitPluggable*, *array, (*size) + 1); -#line 368 "shotwell-transitions.c" +#line 462 "shotwell-transitions.c"  	}  #line 21 "/home/jens/Source/shotwell/plugins/shotwell-transitions/shotwell-transitions.vala"  	(*array)[(*length)++] = value;  #line 21 "/home/jens/Source/shotwell/plugins/shotwell-transitions/shotwell-transitions.vala"  	(*array)[*length] = NULL; -#line 374 "shotwell-transitions.c" +#line 468 "shotwell-transitions.c"  } -static void _vala_array_add8 (SpitPluggable** * array, int* length, int* size, SpitPluggable* value) { +static void +_vala_array_add8 (SpitPluggable** * array, +                  int* length, +                  int* size, +                  SpitPluggable* value) +{  #line 22 "/home/jens/Source/shotwell/plugins/shotwell-transitions/shotwell-transitions.vala"  	if ((*length) == (*size)) {  #line 22 "/home/jens/Source/shotwell/plugins/shotwell-transitions/shotwell-transitions.vala"  		*size = (*size) ? (2 * (*size)) : 4;  #line 22 "/home/jens/Source/shotwell/plugins/shotwell-transitions/shotwell-transitions.vala"  		*array = g_renew (SpitPluggable*, *array, (*size) + 1); -#line 385 "shotwell-transitions.c" +#line 484 "shotwell-transitions.c"  	}  #line 22 "/home/jens/Source/shotwell/plugins/shotwell-transitions/shotwell-transitions.vala"  	(*array)[(*length)++] = value;  #line 22 "/home/jens/Source/shotwell/plugins/shotwell-transitions/shotwell-transitions.vala"  	(*array)[*length] = NULL; -#line 391 "shotwell-transitions.c" +#line 490 "shotwell-transitions.c"  } -static void _vala_array_add9 (SpitPluggable** * array, int* length, int* size, SpitPluggable* value) { +static void +_vala_array_add9 (SpitPluggable** * array, +                  int* length, +                  int* size, +                  SpitPluggable* value) +{  #line 23 "/home/jens/Source/shotwell/plugins/shotwell-transitions/shotwell-transitions.vala"  	if ((*length) == (*size)) {  #line 23 "/home/jens/Source/shotwell/plugins/shotwell-transitions/shotwell-transitions.vala"  		*size = (*size) ? (2 * (*size)) : 4;  #line 23 "/home/jens/Source/shotwell/plugins/shotwell-transitions/shotwell-transitions.vala"  		*array = g_renew (SpitPluggable*, *array, (*size) + 1); -#line 402 "shotwell-transitions.c" +#line 506 "shotwell-transitions.c"  	}  #line 23 "/home/jens/Source/shotwell/plugins/shotwell-transitions/shotwell-transitions.vala"  	(*array)[(*length)++] = value;  #line 23 "/home/jens/Source/shotwell/plugins/shotwell-transitions/shotwell-transitions.vala"  	(*array)[*length] = NULL; -#line 408 "shotwell-transitions.c" +#line 512 "shotwell-transitions.c"  } -static void _vala_array_add10 (SpitPluggable** * array, int* length, int* size, SpitPluggable* value) { +static void +_vala_array_add10 (SpitPluggable** * array, +                   int* length, +                   int* size, +                   SpitPluggable* value) +{  #line 24 "/home/jens/Source/shotwell/plugins/shotwell-transitions/shotwell-transitions.vala"  	if ((*length) == (*size)) {  #line 24 "/home/jens/Source/shotwell/plugins/shotwell-transitions/shotwell-transitions.vala"  		*size = (*size) ? (2 * (*size)) : 4;  #line 24 "/home/jens/Source/shotwell/plugins/shotwell-transitions/shotwell-transitions.vala"  		*array = g_renew (SpitPluggable*, *array, (*size) + 1); -#line 419 "shotwell-transitions.c" +#line 528 "shotwell-transitions.c"  	}  #line 24 "/home/jens/Source/shotwell/plugins/shotwell-transitions/shotwell-transitions.vala"  	(*array)[(*length)++] = value;  #line 24 "/home/jens/Source/shotwell/plugins/shotwell-transitions/shotwell-transitions.vala"  	(*array)[*length] = NULL; -#line 425 "shotwell-transitions.c" +#line 534 "shotwell-transitions.c"  } -ShotwellTransitions* shotwell_transitions_construct (GType object_type, GFile* module_file) { +ShotwellTransitions* +shotwell_transitions_construct (GType object_type, +                                GFile* module_file) +{  	ShotwellTransitions * self = NULL;  	GFile* resource_directory = NULL;  	GFile* _tmp0_; -	GFile* _tmp1_; -	SpitPluggable** _tmp2_; -	gint _tmp2__length1; -	FadeEffectDescriptor* _tmp3_; -	SpitPluggable** _tmp4_; -	gint _tmp4__length1; -	SlideEffectDescriptor* _tmp5_; -	SpitPluggable** _tmp6_; -	gint _tmp6__length1; -	CrumbleEffectDescriptor* _tmp7_; -	SpitPluggable** _tmp8_; -	gint _tmp8__length1; -	BlindsEffectDescriptor* _tmp9_; -	SpitPluggable** _tmp10_; -	gint _tmp10__length1; -	CircleEffectDescriptor* _tmp11_; -	SpitPluggable** _tmp12_; -	gint _tmp12__length1; -	CirclesEffectDescriptor* _tmp13_; -	SpitPluggable** _tmp14_; -	gint _tmp14__length1; -	ClockEffectDescriptor* _tmp15_; -	SpitPluggable** _tmp16_; -	gint _tmp16__length1; -	SquaresEffectDescriptor* _tmp17_; -	SpitPluggable** _tmp18_; -	gint _tmp18__length1; -	ChessEffectDescriptor* _tmp19_; -	SpitPluggable** _tmp20_; -	gint _tmp20__length1; -	StripesEffectDescriptor* _tmp21_; +	SpitPluggable** _tmp1_; +	gint _tmp1__length1; +	FadeEffectDescriptor* _tmp2_; +	SpitPluggable** _tmp3_; +	gint _tmp3__length1; +	SlideEffectDescriptor* _tmp4_; +	SpitPluggable** _tmp5_; +	gint _tmp5__length1; +	CrumbleEffectDescriptor* _tmp6_; +	SpitPluggable** _tmp7_; +	gint _tmp7__length1; +	BlindsEffectDescriptor* _tmp8_; +	SpitPluggable** _tmp9_; +	gint _tmp9__length1; +	CircleEffectDescriptor* _tmp10_; +	SpitPluggable** _tmp11_; +	gint _tmp11__length1; +	CirclesEffectDescriptor* _tmp12_; +	SpitPluggable** _tmp13_; +	gint _tmp13__length1; +	ClockEffectDescriptor* _tmp14_; +	SpitPluggable** _tmp15_; +	gint _tmp15__length1; +	SquaresEffectDescriptor* _tmp16_; +	SpitPluggable** _tmp17_; +	gint _tmp17__length1; +	ChessEffectDescriptor* _tmp18_; +	SpitPluggable** _tmp19_; +	gint _tmp19__length1; +	StripesEffectDescriptor* _tmp20_;  #line 12 "/home/jens/Source/shotwell/plugins/shotwell-transitions/shotwell-transitions.vala"  	g_return_val_if_fail (G_IS_FILE (module_file), NULL);  #line 12 "/home/jens/Source/shotwell/plugins/shotwell-transitions/shotwell-transitions.vala"  	self = (ShotwellTransitions*) g_object_new (object_type, NULL);  #line 13 "/home/jens/Source/shotwell/plugins/shotwell-transitions/shotwell-transitions.vala" -	_tmp0_ = module_file; -#line 13 "/home/jens/Source/shotwell/plugins/shotwell-transitions/shotwell-transitions.vala" -	_tmp1_ = g_file_get_parent (_tmp0_); +	_tmp0_ = g_file_get_parent (module_file);  #line 13 "/home/jens/Source/shotwell/plugins/shotwell-transitions/shotwell-transitions.vala" -	resource_directory = _tmp1_; +	resource_directory = _tmp0_;  #line 15 "/home/jens/Source/shotwell/plugins/shotwell-transitions/shotwell-transitions.vala" -	_tmp2_ = self->priv->pluggables; +	_tmp1_ = self->priv->pluggables;  #line 15 "/home/jens/Source/shotwell/plugins/shotwell-transitions/shotwell-transitions.vala" -	_tmp2__length1 = self->priv->pluggables_length1; +	_tmp1__length1 = self->priv->pluggables_length1;  #line 15 "/home/jens/Source/shotwell/plugins/shotwell-transitions/shotwell-transitions.vala" -	_tmp3_ = fade_effect_descriptor_new (resource_directory); +	_tmp2_ = fade_effect_descriptor_new (resource_directory);  #line 15 "/home/jens/Source/shotwell/plugins/shotwell-transitions/shotwell-transitions.vala" -	_vala_array_add1 (&self->priv->pluggables, &self->priv->pluggables_length1, &self->priv->_pluggables_size_, G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, SPIT_TYPE_PLUGGABLE, SpitPluggable)); +	_vala_array_add1 (&self->priv->pluggables, &self->priv->pluggables_length1, &self->priv->_pluggables_size_, G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, SPIT_TYPE_PLUGGABLE, SpitPluggable));  #line 16 "/home/jens/Source/shotwell/plugins/shotwell-transitions/shotwell-transitions.vala" -	_tmp4_ = self->priv->pluggables; +	_tmp3_ = self->priv->pluggables;  #line 16 "/home/jens/Source/shotwell/plugins/shotwell-transitions/shotwell-transitions.vala" -	_tmp4__length1 = self->priv->pluggables_length1; +	_tmp3__length1 = self->priv->pluggables_length1;  #line 16 "/home/jens/Source/shotwell/plugins/shotwell-transitions/shotwell-transitions.vala" -	_tmp5_ = slide_effect_descriptor_new (resource_directory); +	_tmp4_ = slide_effect_descriptor_new (resource_directory);  #line 16 "/home/jens/Source/shotwell/plugins/shotwell-transitions/shotwell-transitions.vala" -	_vala_array_add2 (&self->priv->pluggables, &self->priv->pluggables_length1, &self->priv->_pluggables_size_, G_TYPE_CHECK_INSTANCE_CAST (_tmp5_, SPIT_TYPE_PLUGGABLE, SpitPluggable)); +	_vala_array_add2 (&self->priv->pluggables, &self->priv->pluggables_length1, &self->priv->_pluggables_size_, G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, SPIT_TYPE_PLUGGABLE, SpitPluggable));  #line 17 "/home/jens/Source/shotwell/plugins/shotwell-transitions/shotwell-transitions.vala" -	_tmp6_ = self->priv->pluggables; +	_tmp5_ = self->priv->pluggables;  #line 17 "/home/jens/Source/shotwell/plugins/shotwell-transitions/shotwell-transitions.vala" -	_tmp6__length1 = self->priv->pluggables_length1; +	_tmp5__length1 = self->priv->pluggables_length1;  #line 17 "/home/jens/Source/shotwell/plugins/shotwell-transitions/shotwell-transitions.vala" -	_tmp7_ = crumble_effect_descriptor_new (resource_directory); +	_tmp6_ = crumble_effect_descriptor_new (resource_directory);  #line 17 "/home/jens/Source/shotwell/plugins/shotwell-transitions/shotwell-transitions.vala" -	_vala_array_add3 (&self->priv->pluggables, &self->priv->pluggables_length1, &self->priv->_pluggables_size_, G_TYPE_CHECK_INSTANCE_CAST (_tmp7_, SPIT_TYPE_PLUGGABLE, SpitPluggable)); +	_vala_array_add3 (&self->priv->pluggables, &self->priv->pluggables_length1, &self->priv->_pluggables_size_, G_TYPE_CHECK_INSTANCE_CAST (_tmp6_, SPIT_TYPE_PLUGGABLE, SpitPluggable));  #line 18 "/home/jens/Source/shotwell/plugins/shotwell-transitions/shotwell-transitions.vala" -	_tmp8_ = self->priv->pluggables; +	_tmp7_ = self->priv->pluggables;  #line 18 "/home/jens/Source/shotwell/plugins/shotwell-transitions/shotwell-transitions.vala" -	_tmp8__length1 = self->priv->pluggables_length1; +	_tmp7__length1 = self->priv->pluggables_length1;  #line 18 "/home/jens/Source/shotwell/plugins/shotwell-transitions/shotwell-transitions.vala" -	_tmp9_ = blinds_effect_descriptor_new (resource_directory); +	_tmp8_ = blinds_effect_descriptor_new (resource_directory);  #line 18 "/home/jens/Source/shotwell/plugins/shotwell-transitions/shotwell-transitions.vala" -	_vala_array_add4 (&self->priv->pluggables, &self->priv->pluggables_length1, &self->priv->_pluggables_size_, G_TYPE_CHECK_INSTANCE_CAST (_tmp9_, SPIT_TYPE_PLUGGABLE, SpitPluggable)); +	_vala_array_add4 (&self->priv->pluggables, &self->priv->pluggables_length1, &self->priv->_pluggables_size_, G_TYPE_CHECK_INSTANCE_CAST (_tmp8_, SPIT_TYPE_PLUGGABLE, SpitPluggable));  #line 19 "/home/jens/Source/shotwell/plugins/shotwell-transitions/shotwell-transitions.vala" -	_tmp10_ = self->priv->pluggables; +	_tmp9_ = self->priv->pluggables;  #line 19 "/home/jens/Source/shotwell/plugins/shotwell-transitions/shotwell-transitions.vala" -	_tmp10__length1 = self->priv->pluggables_length1; +	_tmp9__length1 = self->priv->pluggables_length1;  #line 19 "/home/jens/Source/shotwell/plugins/shotwell-transitions/shotwell-transitions.vala" -	_tmp11_ = circle_effect_descriptor_new (resource_directory); +	_tmp10_ = circle_effect_descriptor_new (resource_directory);  #line 19 "/home/jens/Source/shotwell/plugins/shotwell-transitions/shotwell-transitions.vala" -	_vala_array_add5 (&self->priv->pluggables, &self->priv->pluggables_length1, &self->priv->_pluggables_size_, G_TYPE_CHECK_INSTANCE_CAST (_tmp11_, SPIT_TYPE_PLUGGABLE, SpitPluggable)); +	_vala_array_add5 (&self->priv->pluggables, &self->priv->pluggables_length1, &self->priv->_pluggables_size_, G_TYPE_CHECK_INSTANCE_CAST (_tmp10_, SPIT_TYPE_PLUGGABLE, SpitPluggable));  #line 20 "/home/jens/Source/shotwell/plugins/shotwell-transitions/shotwell-transitions.vala" -	_tmp12_ = self->priv->pluggables; +	_tmp11_ = self->priv->pluggables;  #line 20 "/home/jens/Source/shotwell/plugins/shotwell-transitions/shotwell-transitions.vala" -	_tmp12__length1 = self->priv->pluggables_length1; +	_tmp11__length1 = self->priv->pluggables_length1;  #line 20 "/home/jens/Source/shotwell/plugins/shotwell-transitions/shotwell-transitions.vala" -	_tmp13_ = circles_effect_descriptor_new (resource_directory); +	_tmp12_ = circles_effect_descriptor_new (resource_directory);  #line 20 "/home/jens/Source/shotwell/plugins/shotwell-transitions/shotwell-transitions.vala" -	_vala_array_add6 (&self->priv->pluggables, &self->priv->pluggables_length1, &self->priv->_pluggables_size_, G_TYPE_CHECK_INSTANCE_CAST (_tmp13_, SPIT_TYPE_PLUGGABLE, SpitPluggable)); +	_vala_array_add6 (&self->priv->pluggables, &self->priv->pluggables_length1, &self->priv->_pluggables_size_, G_TYPE_CHECK_INSTANCE_CAST (_tmp12_, SPIT_TYPE_PLUGGABLE, SpitPluggable));  #line 21 "/home/jens/Source/shotwell/plugins/shotwell-transitions/shotwell-transitions.vala" -	_tmp14_ = self->priv->pluggables; +	_tmp13_ = self->priv->pluggables;  #line 21 "/home/jens/Source/shotwell/plugins/shotwell-transitions/shotwell-transitions.vala" -	_tmp14__length1 = self->priv->pluggables_length1; +	_tmp13__length1 = self->priv->pluggables_length1;  #line 21 "/home/jens/Source/shotwell/plugins/shotwell-transitions/shotwell-transitions.vala" -	_tmp15_ = clock_effect_descriptor_new (resource_directory); +	_tmp14_ = clock_effect_descriptor_new (resource_directory);  #line 21 "/home/jens/Source/shotwell/plugins/shotwell-transitions/shotwell-transitions.vala" -	_vala_array_add7 (&self->priv->pluggables, &self->priv->pluggables_length1, &self->priv->_pluggables_size_, G_TYPE_CHECK_INSTANCE_CAST (_tmp15_, SPIT_TYPE_PLUGGABLE, SpitPluggable)); +	_vala_array_add7 (&self->priv->pluggables, &self->priv->pluggables_length1, &self->priv->_pluggables_size_, G_TYPE_CHECK_INSTANCE_CAST (_tmp14_, SPIT_TYPE_PLUGGABLE, SpitPluggable));  #line 22 "/home/jens/Source/shotwell/plugins/shotwell-transitions/shotwell-transitions.vala" -	_tmp16_ = self->priv->pluggables; +	_tmp15_ = self->priv->pluggables;  #line 22 "/home/jens/Source/shotwell/plugins/shotwell-transitions/shotwell-transitions.vala" -	_tmp16__length1 = self->priv->pluggables_length1; +	_tmp15__length1 = self->priv->pluggables_length1;  #line 22 "/home/jens/Source/shotwell/plugins/shotwell-transitions/shotwell-transitions.vala" -	_tmp17_ = squares_effect_descriptor_new (resource_directory); +	_tmp16_ = squares_effect_descriptor_new (resource_directory);  #line 22 "/home/jens/Source/shotwell/plugins/shotwell-transitions/shotwell-transitions.vala" -	_vala_array_add8 (&self->priv->pluggables, &self->priv->pluggables_length1, &self->priv->_pluggables_size_, G_TYPE_CHECK_INSTANCE_CAST (_tmp17_, SPIT_TYPE_PLUGGABLE, SpitPluggable)); +	_vala_array_add8 (&self->priv->pluggables, &self->priv->pluggables_length1, &self->priv->_pluggables_size_, G_TYPE_CHECK_INSTANCE_CAST (_tmp16_, SPIT_TYPE_PLUGGABLE, SpitPluggable));  #line 23 "/home/jens/Source/shotwell/plugins/shotwell-transitions/shotwell-transitions.vala" -	_tmp18_ = self->priv->pluggables; +	_tmp17_ = self->priv->pluggables;  #line 23 "/home/jens/Source/shotwell/plugins/shotwell-transitions/shotwell-transitions.vala" -	_tmp18__length1 = self->priv->pluggables_length1; +	_tmp17__length1 = self->priv->pluggables_length1;  #line 23 "/home/jens/Source/shotwell/plugins/shotwell-transitions/shotwell-transitions.vala" -	_tmp19_ = chess_effect_descriptor_new (resource_directory); +	_tmp18_ = chess_effect_descriptor_new (resource_directory);  #line 23 "/home/jens/Source/shotwell/plugins/shotwell-transitions/shotwell-transitions.vala" -	_vala_array_add9 (&self->priv->pluggables, &self->priv->pluggables_length1, &self->priv->_pluggables_size_, G_TYPE_CHECK_INSTANCE_CAST (_tmp19_, SPIT_TYPE_PLUGGABLE, SpitPluggable)); +	_vala_array_add9 (&self->priv->pluggables, &self->priv->pluggables_length1, &self->priv->_pluggables_size_, G_TYPE_CHECK_INSTANCE_CAST (_tmp18_, SPIT_TYPE_PLUGGABLE, SpitPluggable));  #line 24 "/home/jens/Source/shotwell/plugins/shotwell-transitions/shotwell-transitions.vala" -	_tmp20_ = self->priv->pluggables; +	_tmp19_ = self->priv->pluggables;  #line 24 "/home/jens/Source/shotwell/plugins/shotwell-transitions/shotwell-transitions.vala" -	_tmp20__length1 = self->priv->pluggables_length1; +	_tmp19__length1 = self->priv->pluggables_length1;  #line 24 "/home/jens/Source/shotwell/plugins/shotwell-transitions/shotwell-transitions.vala" -	_tmp21_ = stripes_effect_descriptor_new (resource_directory); +	_tmp20_ = stripes_effect_descriptor_new (resource_directory);  #line 24 "/home/jens/Source/shotwell/plugins/shotwell-transitions/shotwell-transitions.vala" -	_vala_array_add10 (&self->priv->pluggables, &self->priv->pluggables_length1, &self->priv->_pluggables_size_, G_TYPE_CHECK_INSTANCE_CAST (_tmp21_, SPIT_TYPE_PLUGGABLE, SpitPluggable)); +	_vala_array_add10 (&self->priv->pluggables, &self->priv->pluggables_length1, &self->priv->_pluggables_size_, G_TYPE_CHECK_INSTANCE_CAST (_tmp20_, SPIT_TYPE_PLUGGABLE, SpitPluggable));  #line 12 "/home/jens/Source/shotwell/plugins/shotwell-transitions/shotwell-transitions.vala"  	_g_object_unref0 (resource_directory);  #line 12 "/home/jens/Source/shotwell/plugins/shotwell-transitions/shotwell-transitions.vala"  	return self; -#line 558 "shotwell-transitions.c" +#line 667 "shotwell-transitions.c"  } -ShotwellTransitions* shotwell_transitions_new (GFile* module_file) { +ShotwellTransitions* +shotwell_transitions_new (GFile* module_file) +{  #line 12 "/home/jens/Source/shotwell/plugins/shotwell-transitions/shotwell-transitions.vala"  	return shotwell_transitions_construct (TYPE_SHOTWELL_TRANSITIONS, module_file); -#line 565 "shotwell-transitions.c" +#line 676 "shotwell-transitions.c"  } -static const gchar* shotwell_transitions_real_get_module_name (SpitModule* base) { +static const gchar* +shotwell_transitions_real_get_module_name (SpitModule* base) +{  	ShotwellTransitions * self;  	const gchar* result = NULL;  #line 27 "/home/jens/Source/shotwell/plugins/shotwell-transitions/shotwell-transitions.vala" @@ -574,11 +687,13 @@ static const gchar* shotwell_transitions_real_get_module_name (SpitModule* base)  	result = _ ("Core Slideshow Transitions");  #line 28 "/home/jens/Source/shotwell/plugins/shotwell-transitions/shotwell-transitions.vala"  	return result; -#line 578 "shotwell-transitions.c" +#line 691 "shotwell-transitions.c"  } -static const gchar* shotwell_transitions_real_get_version (SpitModule* base) { +static const gchar* +shotwell_transitions_real_get_version (SpitModule* base) +{  	ShotwellTransitions * self;  	const gchar* result = NULL;  #line 31 "/home/jens/Source/shotwell/plugins/shotwell-transitions/shotwell-transitions.vala" @@ -587,11 +702,13 @@ static const gchar* shotwell_transitions_real_get_version (SpitModule* base) {  	result = _VERSION;  #line 32 "/home/jens/Source/shotwell/plugins/shotwell-transitions/shotwell-transitions.vala"  	return result; -#line 591 "shotwell-transitions.c" +#line 706 "shotwell-transitions.c"  } -static const gchar* shotwell_transitions_real_get_id (SpitModule* base) { +static const gchar* +shotwell_transitions_real_get_id (SpitModule* base) +{  	ShotwellTransitions * self;  	const gchar* result = NULL;  #line 35 "/home/jens/Source/shotwell/plugins/shotwell-transitions/shotwell-transitions.vala" @@ -600,11 +717,14 @@ static const gchar* shotwell_transitions_real_get_id (SpitModule* base) {  	result = "org.yorba.shotwell.transitions";  #line 36 "/home/jens/Source/shotwell/plugins/shotwell-transitions/shotwell-transitions.vala"  	return result; -#line 604 "shotwell-transitions.c" +#line 721 "shotwell-transitions.c"  } -static SpitPluggable** shotwell_transitions_real_get_pluggables (SpitModule* base, int* result_length1) { +static SpitPluggable** +shotwell_transitions_real_get_pluggables (SpitModule* base, +                                          int* result_length1) +{  	ShotwellTransitions * self;  	SpitPluggable** result = NULL;  	SpitPluggable** _tmp0_; @@ -625,28 +745,32 @@ static SpitPluggable** shotwell_transitions_real_get_pluggables (SpitModule* bas  	if (result_length1) {  #line 40 "/home/jens/Source/shotwell/plugins/shotwell-transitions/shotwell-transitions.vala"  		*result_length1 = _tmp1__length1; -#line 629 "shotwell-transitions.c" +#line 749 "shotwell-transitions.c"  	}  #line 40 "/home/jens/Source/shotwell/plugins/shotwell-transitions/shotwell-transitions.vala"  	result = _tmp1_;  #line 40 "/home/jens/Source/shotwell/plugins/shotwell-transitions/shotwell-transitions.vala"  	return result; -#line 635 "shotwell-transitions.c" +#line 755 "shotwell-transitions.c"  } -static void shotwell_transitions_class_init (ShotwellTransitionsClass * klass) { +static void +shotwell_transitions_class_init (ShotwellTransitionsClass * klass) +{  #line 9 "/home/jens/Source/shotwell/plugins/shotwell-transitions/shotwell-transitions.vala"  	shotwell_transitions_parent_class = g_type_class_peek_parent (klass);  #line 9 "/home/jens/Source/shotwell/plugins/shotwell-transitions/shotwell-transitions.vala"  	g_type_class_add_private (klass, sizeof (ShotwellTransitionsPrivate));  #line 9 "/home/jens/Source/shotwell/plugins/shotwell-transitions/shotwell-transitions.vala"  	G_OBJECT_CLASS (klass)->finalize = shotwell_transitions_finalize; -#line 646 "shotwell-transitions.c" +#line 768 "shotwell-transitions.c"  } -static void shotwell_transitions_spit_module_interface_init (SpitModuleIface * iface) { +static void +shotwell_transitions_spit_module_interface_init (SpitModuleIface * iface) +{  #line 9 "/home/jens/Source/shotwell/plugins/shotwell-transitions/shotwell-transitions.vala"  	shotwell_transitions_spit_module_parent_iface = g_type_interface_peek_parent (iface);  #line 9 "/home/jens/Source/shotwell/plugins/shotwell-transitions/shotwell-transitions.vala" @@ -657,11 +781,13 @@ static void shotwell_transitions_spit_module_interface_init (SpitModuleIface * i  	iface->get_id = (const gchar* (*) (SpitModule *)) shotwell_transitions_real_get_id;  #line 9 "/home/jens/Source/shotwell/plugins/shotwell-transitions/shotwell-transitions.vala"  	iface->get_pluggables = (SpitPluggable** (*) (SpitModule *, int*)) shotwell_transitions_real_get_pluggables; -#line 661 "shotwell-transitions.c" +#line 785 "shotwell-transitions.c"  } -static void shotwell_transitions_instance_init (ShotwellTransitions * self) { +static void +shotwell_transitions_instance_init (ShotwellTransitions * self) +{  	SpitPluggable** _tmp0_;  #line 9 "/home/jens/Source/shotwell/plugins/shotwell-transitions/shotwell-transitions.vala"  	self->priv = SHOTWELL_TRANSITIONS_GET_PRIVATE (self); @@ -673,11 +799,13 @@ static void shotwell_transitions_instance_init (ShotwellTransitions * self) {  	self->priv->pluggables_length1 = 0;  #line 10 "/home/jens/Source/shotwell/plugins/shotwell-transitions/shotwell-transitions.vala"  	self->priv->_pluggables_size_ = self->priv->pluggables_length1; -#line 677 "shotwell-transitions.c" +#line 803 "shotwell-transitions.c"  } -static void shotwell_transitions_finalize (GObject * obj) { +static void +shotwell_transitions_finalize (GObject * obj) +{  	ShotwellTransitions * self;  #line 9 "/home/jens/Source/shotwell/plugins/shotwell-transitions/shotwell-transitions.vala"  	self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_SHOTWELL_TRANSITIONS, ShotwellTransitions); @@ -685,11 +813,13 @@ static void shotwell_transitions_finalize (GObject * obj) {  	self->priv->pluggables = (_vala_array_free (self->priv->pluggables, self->priv->pluggables_length1, (GDestroyNotify) g_object_unref), NULL);  #line 9 "/home/jens/Source/shotwell/plugins/shotwell-transitions/shotwell-transitions.vala"  	G_OBJECT_CLASS (shotwell_transitions_parent_class)->finalize (obj); -#line 689 "shotwell-transitions.c" +#line 817 "shotwell-transitions.c"  } -GType shotwell_transitions_get_type (void) { +GType +shotwell_transitions_get_type (void) +{  	static volatile gsize shotwell_transitions_type_id__volatile = 0;  	if (g_once_init_enter (&shotwell_transitions_type_id__volatile)) {  		static const GTypeInfo g_define_type_info = { sizeof (ShotwellTransitionsClass), (GBaseInitFunc) NULL, (GBaseFinalizeFunc) NULL, (GClassInitFunc) shotwell_transitions_class_init, (GClassFinalizeFunc) NULL, NULL, sizeof (ShotwellTransitions), 0, (GInstanceInitFunc) shotwell_transitions_instance_init, NULL }; @@ -703,65 +833,55 @@ GType shotwell_transitions_get_type (void) {  } -SpitModule* spit_entry_point (SpitEntryPointParams* params) { +SpitModule* +spit_entry_point (SpitEntryPointParams* params) +{  	SpitModule* result = NULL; -	SpitEntryPointParams* _tmp0_; +	gint _tmp0_;  	gint _tmp1_; -	SpitEntryPointParams* _tmp2_; +	ShotwellTransitions* _tmp2_ = NULL;  	gint _tmp3_; -	gint _tmp4_; -	ShotwellTransitions* _tmp5_ = NULL; -	SpitEntryPointParams* _tmp6_; -	gint _tmp7_; -#line 46 "/home/jens/Source/shotwell/plugins/shotwell-transitions/shotwell-transitions.vala" -	_tmp0_ = params; -#line 46 "/home/jens/Source/shotwell/plugins/shotwell-transitions/shotwell-transitions.vala" -	_tmp1_ = (*_tmp0_).host_min_spit_interface;  #line 46 "/home/jens/Source/shotwell/plugins/shotwell-transitions/shotwell-transitions.vala" -	_tmp2_ = params; +	_tmp0_ = (*params).host_min_spit_interface;  #line 46 "/home/jens/Source/shotwell/plugins/shotwell-transitions/shotwell-transitions.vala" -	_tmp3_ = (*_tmp2_).host_max_spit_interface; +	_tmp1_ = (*params).host_max_spit_interface;  #line 46 "/home/jens/Source/shotwell/plugins/shotwell-transitions/shotwell-transitions.vala" -	_tmp4_ = spit_negotiate_interfaces (_tmp1_, _tmp3_, SPIT_CURRENT_INTERFACE); -#line 46 "/home/jens/Source/shotwell/plugins/shotwell-transitions/shotwell-transitions.vala" -	(*params).module_spit_interface = _tmp4_; -#line 49 "/home/jens/Source/shotwell/plugins/shotwell-transitions/shotwell-transitions.vala" -	_tmp6_ = params; +	(*params).module_spit_interface = spit_negotiate_interfaces (_tmp0_, _tmp1_, SPIT_CURRENT_INTERFACE);  #line 49 "/home/jens/Source/shotwell/plugins/shotwell-transitions/shotwell-transitions.vala" -	_tmp7_ = (*_tmp6_).module_spit_interface; +	_tmp3_ = (*params).module_spit_interface;  #line 49 "/home/jens/Source/shotwell/plugins/shotwell-transitions/shotwell-transitions.vala" -	if (_tmp7_ != SPIT_UNSUPPORTED_INTERFACE) { -#line 735 "shotwell-transitions.c" -		SpitEntryPointParams* _tmp8_; -		GFile* _tmp9_; -		ShotwellTransitions* _tmp10_; -#line 50 "/home/jens/Source/shotwell/plugins/shotwell-transitions/shotwell-transitions.vala" -		_tmp8_ = params; +	if (_tmp3_ != SPIT_UNSUPPORTED_INTERFACE) { +#line 855 "shotwell-transitions.c" +		GFile* _tmp4_; +		ShotwellTransitions* _tmp5_;  #line 50 "/home/jens/Source/shotwell/plugins/shotwell-transitions/shotwell-transitions.vala" -		_tmp9_ = (*_tmp8_).module_file; +		_tmp4_ = (*params).module_file;  #line 50 "/home/jens/Source/shotwell/plugins/shotwell-transitions/shotwell-transitions.vala" -		_tmp10_ = shotwell_transitions_new (_tmp9_); +		_tmp5_ = shotwell_transitions_new (_tmp4_);  #line 50 "/home/jens/Source/shotwell/plugins/shotwell-transitions/shotwell-transitions.vala" -		_g_object_unref0 (_tmp5_); +		_g_object_unref0 (_tmp2_);  #line 50 "/home/jens/Source/shotwell/plugins/shotwell-transitions/shotwell-transitions.vala" -		_tmp5_ = _tmp10_; -#line 749 "shotwell-transitions.c" +		_tmp2_ = _tmp5_; +#line 866 "shotwell-transitions.c"  	} else {  #line 50 "/home/jens/Source/shotwell/plugins/shotwell-transitions/shotwell-transitions.vala" -		_g_object_unref0 (_tmp5_); +		_g_object_unref0 (_tmp2_);  #line 50 "/home/jens/Source/shotwell/plugins/shotwell-transitions/shotwell-transitions.vala" -		_tmp5_ = NULL; -#line 755 "shotwell-transitions.c" +		_tmp2_ = NULL; +#line 872 "shotwell-transitions.c"  	}  #line 49 "/home/jens/Source/shotwell/plugins/shotwell-transitions/shotwell-transitions.vala" -	result = G_TYPE_CHECK_INSTANCE_CAST (_tmp5_, SPIT_TYPE_MODULE, SpitModule); +	result = G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, SPIT_TYPE_MODULE, SpitModule);  #line 49 "/home/jens/Source/shotwell/plugins/shotwell-transitions/shotwell-transitions.vala"  	return result; -#line 761 "shotwell-transitions.c" +#line 878 "shotwell-transitions.c"  } -ShotwellTransitionDescriptor* shotwell_transition_descriptor_construct (GType object_type, GFile* resource_directory) { +ShotwellTransitionDescriptor* +shotwell_transition_descriptor_construct (GType object_type, +                                          GFile* resource_directory) +{  	ShotwellTransitionDescriptor * self = NULL;  	GdkPixbuf** _tmp0_;  	gint _tmp0__length1; @@ -775,7 +895,7 @@ ShotwellTransitionDescriptor* shotwell_transition_descriptor_construct (GType ob  	_tmp0__length1 = shotwell_transition_descriptor_icon_pixbuf_set_length1;  #line 60 "/home/jens/Source/shotwell/plugins/shotwell-transitions/shotwell-transitions.vala"  	if (_tmp0_ == NULL) { -#line 779 "shotwell-transitions.c" +#line 899 "shotwell-transitions.c"  		gint _tmp1_;  		GdkPixbuf** _tmp2_;  #line 61 "/home/jens/Source/shotwell/plugins/shotwell-transitions/shotwell-transitions.vala" @@ -788,101 +908,112 @@ ShotwellTransitionDescriptor* shotwell_transition_descriptor_construct (GType ob  		shotwell_transition_descriptor_icon_pixbuf_set_length1 = _tmp1_;  #line 61 "/home/jens/Source/shotwell/plugins/shotwell-transitions/shotwell-transitions.vala"  		_shotwell_transition_descriptor_icon_pixbuf_set_size_ = shotwell_transition_descriptor_icon_pixbuf_set_length1; -#line 792 "shotwell-transitions.c" +#line 912 "shotwell-transitions.c"  	}  #line 59 "/home/jens/Source/shotwell/plugins/shotwell-transitions/shotwell-transitions.vala"  	return self; -#line 796 "shotwell-transitions.c" +#line 916 "shotwell-transitions.c"  } -static gint shotwell_transition_descriptor_real_get_pluggable_interface (SpitPluggable* base, gint min_host_interface, gint max_host_interface) { +static gint +shotwell_transition_descriptor_real_get_pluggable_interface (SpitPluggable* base, +                                                             gint min_host_interface, +                                                             gint max_host_interface) +{  	ShotwellTransitionDescriptor * self;  	gint result = 0; -	gint _tmp0_; -	gint _tmp1_; -	gint _tmp2_;  #line 65 "/home/jens/Source/shotwell/plugins/shotwell-transitions/shotwell-transitions.vala"  	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_SHOTWELL_TRANSITION_DESCRIPTOR, ShotwellTransitionDescriptor);  #line 66 "/home/jens/Source/shotwell/plugins/shotwell-transitions/shotwell-transitions.vala" -	_tmp0_ = min_host_interface; -#line 66 "/home/jens/Source/shotwell/plugins/shotwell-transitions/shotwell-transitions.vala" -	_tmp1_ = max_host_interface; -#line 66 "/home/jens/Source/shotwell/plugins/shotwell-transitions/shotwell-transitions.vala" -	_tmp2_ = spit_negotiate_interfaces (_tmp0_, _tmp1_, SPIT_TRANSITIONS_CURRENT_INTERFACE); -#line 66 "/home/jens/Source/shotwell/plugins/shotwell-transitions/shotwell-transitions.vala" -	result = _tmp2_; +	result = spit_negotiate_interfaces (min_host_interface, max_host_interface, SPIT_TRANSITIONS_CURRENT_INTERFACE);  #line 66 "/home/jens/Source/shotwell/plugins/shotwell-transitions/shotwell-transitions.vala"  	return result; -#line 818 "shotwell-transitions.c" +#line 933 "shotwell-transitions.c"  } -static const gchar* shotwell_transition_descriptor_real_get_id (ShotwellTransitionDescriptor* self) { +static const gchar* +shotwell_transition_descriptor_real_get_id (ShotwellTransitionDescriptor* self) +{  #line 70 "/home/jens/Source/shotwell/plugins/shotwell-transitions/shotwell-transitions.vala"  	g_critical ("Type `%s' does not implement abstract method `shotwell_transition_descriptor_get_id'", g_type_name (G_TYPE_FROM_INSTANCE (self)));  #line 70 "/home/jens/Source/shotwell/plugins/shotwell-transitions/shotwell-transitions.vala"  	return NULL; -#line 827 "shotwell-transitions.c" +#line 944 "shotwell-transitions.c"  } -const gchar* shotwell_transition_descriptor_get_id (ShotwellTransitionDescriptor* self) { +const gchar* +shotwell_transition_descriptor_get_id (ShotwellTransitionDescriptor* self) +{  #line 70 "/home/jens/Source/shotwell/plugins/shotwell-transitions/shotwell-transitions.vala"  	g_return_val_if_fail (IS_SHOTWELL_TRANSITION_DESCRIPTOR (self), NULL);  #line 70 "/home/jens/Source/shotwell/plugins/shotwell-transitions/shotwell-transitions.vala"  	return SHOTWELL_TRANSITION_DESCRIPTOR_GET_CLASS (self)->get_id (self); -#line 836 "shotwell-transitions.c" +#line 955 "shotwell-transitions.c"  } -static const gchar* shotwell_transition_descriptor_real_get_pluggable_name (ShotwellTransitionDescriptor* self) { +static const gchar* +shotwell_transition_descriptor_real_get_pluggable_name (ShotwellTransitionDescriptor* self) +{  #line 72 "/home/jens/Source/shotwell/plugins/shotwell-transitions/shotwell-transitions.vala"  	g_critical ("Type `%s' does not implement abstract method `shotwell_transition_descriptor_get_pluggable_name'", g_type_name (G_TYPE_FROM_INSTANCE (self)));  #line 72 "/home/jens/Source/shotwell/plugins/shotwell-transitions/shotwell-transitions.vala"  	return NULL; -#line 845 "shotwell-transitions.c" +#line 966 "shotwell-transitions.c"  } -const gchar* shotwell_transition_descriptor_get_pluggable_name (ShotwellTransitionDescriptor* self) { +const gchar* +shotwell_transition_descriptor_get_pluggable_name (ShotwellTransitionDescriptor* self) +{  #line 72 "/home/jens/Source/shotwell/plugins/shotwell-transitions/shotwell-transitions.vala"  	g_return_val_if_fail (IS_SHOTWELL_TRANSITION_DESCRIPTOR (self), NULL);  #line 72 "/home/jens/Source/shotwell/plugins/shotwell-transitions/shotwell-transitions.vala"  	return SHOTWELL_TRANSITION_DESCRIPTOR_GET_CLASS (self)->get_pluggable_name (self); -#line 854 "shotwell-transitions.c" +#line 977 "shotwell-transitions.c"  } -static gpointer _g_object_ref0 (gpointer self) { +static gpointer +_g_object_ref0 (gpointer self) +{  #line 83 "/home/jens/Source/shotwell/plugins/shotwell-transitions/shotwell-transitions.vala"  	return self ? g_object_ref (self) : NULL; -#line 861 "shotwell-transitions.c" +#line 986 "shotwell-transitions.c"  } -static GdkPixbuf** _vala_array_dup1 (GdkPixbuf** self, int length) { +static GdkPixbuf** +_vala_array_dup1 (GdkPixbuf** self, +                  int length) +{  	GdkPixbuf** result;  	int i;  #line 83 "/home/jens/Source/shotwell/plugins/shotwell-transitions/shotwell-transitions.vala"  	result = g_new0 (GdkPixbuf*, length + 1);  #line 83 "/home/jens/Source/shotwell/plugins/shotwell-transitions/shotwell-transitions.vala"  	for (i = 0; i < length; i++) { -#line 872 "shotwell-transitions.c" +#line 1000 "shotwell-transitions.c"  		GdkPixbuf* _tmp0_;  #line 83 "/home/jens/Source/shotwell/plugins/shotwell-transitions/shotwell-transitions.vala"  		_tmp0_ = _g_object_ref0 (self[i]);  #line 83 "/home/jens/Source/shotwell/plugins/shotwell-transitions/shotwell-transitions.vala"  		result[i] = _tmp0_; -#line 878 "shotwell-transitions.c" +#line 1006 "shotwell-transitions.c"  	}  #line 83 "/home/jens/Source/shotwell/plugins/shotwell-transitions/shotwell-transitions.vala"  	return result; -#line 882 "shotwell-transitions.c" +#line 1010 "shotwell-transitions.c"  } -static void shotwell_transition_descriptor_real_get_info (SpitPluggable* base, SpitPluggableInfo* info) { +static void +shotwell_transition_descriptor_real_get_info (SpitPluggable* base, +                                              SpitPluggableInfo* info) +{  	ShotwellTransitionDescriptor * self;  	gchar* _tmp0_;  	gchar* _tmp1_; @@ -958,37 +1089,48 @@ static void shotwell_transition_descriptor_real_get_info (SpitPluggable* base, S  	(*info).icons = _tmp8_;  #line 83 "/home/jens/Source/shotwell/plugins/shotwell-transitions/shotwell-transitions.vala"  	(*info).icons_length1 = _tmp8__length1; -#line 961 "shotwell-transitions.c" +#line 1092 "shotwell-transitions.c"  } -static void shotwell_transition_descriptor_real_activation (SpitPluggable* base, gboolean enabled) { +static void +shotwell_transition_descriptor_real_activation (SpitPluggable* base, +                                                gboolean enabled) +{  	ShotwellTransitionDescriptor * self;  #line 86 "/home/jens/Source/shotwell/plugins/shotwell-transitions/shotwell-transitions.vala"  	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_SHOTWELL_TRANSITION_DESCRIPTOR, ShotwellTransitionDescriptor); -#line 969 "shotwell-transitions.c" +#line 1103 "shotwell-transitions.c"  } -static SpitTransitionsEffect* shotwell_transition_descriptor_real_create (ShotwellTransitionDescriptor* self, SpitHostInterface* host) { +static SpitTransitionsEffect* +shotwell_transition_descriptor_real_create (ShotwellTransitionDescriptor* self, +                                            SpitHostInterface* host) +{  #line 89 "/home/jens/Source/shotwell/plugins/shotwell-transitions/shotwell-transitions.vala"  	g_critical ("Type `%s' does not implement abstract method `shotwell_transition_descriptor_create'", g_type_name (G_TYPE_FROM_INSTANCE (self)));  #line 89 "/home/jens/Source/shotwell/plugins/shotwell-transitions/shotwell-transitions.vala"  	return NULL; -#line 978 "shotwell-transitions.c" +#line 1115 "shotwell-transitions.c"  } -SpitTransitionsEffect* shotwell_transition_descriptor_create (ShotwellTransitionDescriptor* self, SpitHostInterface* host) { +SpitTransitionsEffect* +shotwell_transition_descriptor_create (ShotwellTransitionDescriptor* self, +                                       SpitHostInterface* host) +{  #line 89 "/home/jens/Source/shotwell/plugins/shotwell-transitions/shotwell-transitions.vala"  	g_return_val_if_fail (IS_SHOTWELL_TRANSITION_DESCRIPTOR (self), NULL);  #line 89 "/home/jens/Source/shotwell/plugins/shotwell-transitions/shotwell-transitions.vala"  	return SHOTWELL_TRANSITION_DESCRIPTOR_GET_CLASS (self)->create (self, host); -#line 987 "shotwell-transitions.c" +#line 1127 "shotwell-transitions.c"  } -static void shotwell_transition_descriptor_class_init (ShotwellTransitionDescriptorClass * klass) { +static void +shotwell_transition_descriptor_class_init (ShotwellTransitionDescriptorClass * klass) +{  #line 54 "/home/jens/Source/shotwell/plugins/shotwell-transitions/shotwell-transitions.vala"  	shotwell_transition_descriptor_parent_class = g_type_class_peek_parent (klass);  #line 54 "/home/jens/Source/shotwell/plugins/shotwell-transitions/shotwell-transitions.vala" @@ -999,11 +1141,13 @@ static void shotwell_transition_descriptor_class_init (ShotwellTransitionDescrip  	((ShotwellTransitionDescriptorClass *) klass)->create = (SpitTransitionsEffect* (*) (ShotwellTransitionDescriptor *, SpitHostInterface*)) shotwell_transition_descriptor_real_create;  #line 54 "/home/jens/Source/shotwell/plugins/shotwell-transitions/shotwell-transitions.vala"  	G_OBJECT_CLASS (klass)->finalize = shotwell_transition_descriptor_finalize; -#line 1002 "shotwell-transitions.c" +#line 1144 "shotwell-transitions.c"  } -static void shotwell_transition_descriptor_spit_pluggable_interface_init (SpitPluggableIface * iface) { +static void +shotwell_transition_descriptor_spit_pluggable_interface_init (SpitPluggableIface * iface) +{  #line 54 "/home/jens/Source/shotwell/plugins/shotwell-transitions/shotwell-transitions.vala"  	shotwell_transition_descriptor_spit_pluggable_parent_iface = g_type_interface_peek_parent (iface);  #line 54 "/home/jens/Source/shotwell/plugins/shotwell-transitions/shotwell-transitions.vala" @@ -1016,34 +1160,42 @@ static void shotwell_transition_descriptor_spit_pluggable_interface_init (SpitPl  	iface->get_info = (void (*) (SpitPluggable *, SpitPluggableInfo*)) shotwell_transition_descriptor_real_get_info;  #line 54 "/home/jens/Source/shotwell/plugins/shotwell-transitions/shotwell-transitions.vala"  	iface->activation = (void (*) (SpitPluggable *, gboolean)) shotwell_transition_descriptor_real_activation; -#line 1019 "shotwell-transitions.c" +#line 1163 "shotwell-transitions.c"  } -static void shotwell_transition_descriptor_spit_transitions_descriptor_interface_init (SpitTransitionsDescriptorIface * iface) { +static void +shotwell_transition_descriptor_spit_transitions_descriptor_interface_init (SpitTransitionsDescriptorIface * iface) +{  #line 54 "/home/jens/Source/shotwell/plugins/shotwell-transitions/shotwell-transitions.vala"  	shotwell_transition_descriptor_spit_transitions_descriptor_parent_iface = g_type_interface_peek_parent (iface);  #line 54 "/home/jens/Source/shotwell/plugins/shotwell-transitions/shotwell-transitions.vala"  	iface->create = (SpitTransitionsEffect* (*) (SpitTransitionsDescriptor *, SpitHostInterface*)) shotwell_transition_descriptor_create; -#line 1028 "shotwell-transitions.c" +#line 1174 "shotwell-transitions.c"  } -static void shotwell_transition_descriptor_instance_init (ShotwellTransitionDescriptor * self) { +static void +shotwell_transition_descriptor_instance_init (ShotwellTransitionDescriptor * self) +{  } -static void shotwell_transition_descriptor_finalize (GObject * obj) { +static void +shotwell_transition_descriptor_finalize (GObject * obj) +{  	ShotwellTransitionDescriptor * self;  #line 54 "/home/jens/Source/shotwell/plugins/shotwell-transitions/shotwell-transitions.vala"  	self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_SHOTWELL_TRANSITION_DESCRIPTOR, ShotwellTransitionDescriptor);  #line 54 "/home/jens/Source/shotwell/plugins/shotwell-transitions/shotwell-transitions.vala"  	G_OBJECT_CLASS (shotwell_transition_descriptor_parent_class)->finalize (obj); -#line 1042 "shotwell-transitions.c" +#line 1192 "shotwell-transitions.c"  } -GType shotwell_transition_descriptor_get_type (void) { +GType +shotwell_transition_descriptor_get_type (void) +{  	static volatile gsize shotwell_transition_descriptor_type_id__volatile = 0;  	if (g_once_init_enter (&shotwell_transition_descriptor_type_id__volatile)) {  		static const GTypeInfo g_define_type_info = { sizeof (ShotwellTransitionDescriptorClass), (GBaseInitFunc) NULL, (GBaseFinalizeFunc) NULL, (GClassInitFunc) shotwell_transition_descriptor_class_init, (GClassFinalizeFunc) NULL, NULL, sizeof (ShotwellTransitionDescriptor), 0, (GInstanceInitFunc) shotwell_transition_descriptor_instance_init, NULL }; @@ -1059,7 +1211,11 @@ GType shotwell_transition_descriptor_get_type (void) {  } -static void _vala_array_destroy (gpointer array, gint array_length, GDestroyNotify destroy_func) { +static void +_vala_array_destroy (gpointer array, +                     gint array_length, +                     GDestroyNotify destroy_func) +{  	if ((array != NULL) && (destroy_func != NULL)) {  		int i;  		for (i = 0; i < array_length; i = i + 1) { @@ -1071,7 +1227,11 @@ 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_free (gpointer array, +                  gint array_length, +                  GDestroyNotify destroy_func) +{  	_vala_array_destroy (array, array_length, destroy_func);  	g_free (array);  }  | 
