diff options
| author | Jörg Frings-Fürst <debian@jff-webhosting.net> | 2017-11-12 16:48:02 +0100 |
|---|---|---|
| committer | Jörg Frings-Fürst <debian@jff-webhosting.net> | 2017-11-12 16:48:02 +0100 |
| commit | abdaad68fb94e2d61448a6dfc14847df8a2c32b9 (patch) | |
| tree | 26855c5dd3bfffdbf319d5ba4a38223a28de3e7c /src/plugins/TransitionsInterfaces.c | |
| parent | 0f67b3cc674377559e66c5a6729fd499049a992f (diff) | |
| parent | dd7f98a232efe86f6e6055119c9414a0f9d9e67b (diff) | |
Merge branch 'feature/upstream' into develop
Diffstat (limited to 'src/plugins/TransitionsInterfaces.c')
| -rw-r--r-- | src/plugins/TransitionsInterfaces.c | 587 |
1 files changed, 361 insertions, 226 deletions
diff --git a/src/plugins/TransitionsInterfaces.c b/src/plugins/TransitionsInterfaces.c index 110b59a..0e06742 100644 --- a/src/plugins/TransitionsInterfaces.c +++ b/src/plugins/TransitionsInterfaces.c @@ -1,4 +1,4 @@ -/* TransitionsInterfaces.c generated by valac 0.34.7, the Vala compiler +/* TransitionsInterfaces.c generated by valac 0.36.6, the Vala compiler * generated from TransitionsInterfaces.vala, do not modify */ /* Copyright 2016 Software Freedom Conservancy Inc. @@ -228,19 +228,19 @@ GType spit_transitions_visuals_get_type (void) G_GNUC_CONST; #define SPIT_TRANSITIONS_VISUALS_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), SPIT_TRANSITIONS_TYPE_VISUALS, SpitTransitionsVisualsPrivate)) enum { SPIT_TRANSITIONS_VISUALS_DUMMY_PROPERTY, - SPIT_TRANSITIONS_VISUALS_FROM_PIXBUF, - SPIT_TRANSITIONS_VISUALS_FROM_POS, - SPIT_TRANSITIONS_VISUALS_TO_PIXBUF, - SPIT_TRANSITIONS_VISUALS_TO_POS, - SPIT_TRANSITIONS_VISUALS_BG_COLOR + SPIT_TRANSITIONS_VISUALS_FROM_PIXBUF_PROPERTY, + SPIT_TRANSITIONS_VISUALS_FROM_POS_PROPERTY, + SPIT_TRANSITIONS_VISUALS_TO_PIXBUF_PROPERTY, + SPIT_TRANSITIONS_VISUALS_TO_POS_PROPERTY, + SPIT_TRANSITIONS_VISUALS_BG_COLOR_PROPERTY }; SpitTransitionsVisuals* spit_transitions_visuals_new (GdkPixbuf* from_pixbuf, GdkRectangle* from_pos, GdkPixbuf* to_pixbuf, GdkRectangle* to_pos, GdkRGBA* bg_color); SpitTransitionsVisuals* spit_transitions_visuals_construct (GType object_type, GdkPixbuf* from_pixbuf, GdkRectangle* from_pos, GdkPixbuf* to_pixbuf, GdkRectangle* to_pos, GdkRGBA* bg_color); static void spit_transitions_visuals_set_from_pixbuf (SpitTransitionsVisuals* self, GdkPixbuf* value); -static void spit_transitions_visuals_set_from_pos (SpitTransitionsVisuals* self, GdkRectangle* value); +static void spit_transitions_visuals_set_from_pos (SpitTransitionsVisuals* self, GdkRectangle * value); static void spit_transitions_visuals_set_to_pixbuf (SpitTransitionsVisuals* self, GdkPixbuf* value); -static void spit_transitions_visuals_set_to_pos (SpitTransitionsVisuals* self, GdkRectangle* value); -static void spit_transitions_visuals_set_bg_color (SpitTransitionsVisuals* self, GdkRGBA* value); +static void spit_transitions_visuals_set_to_pos (SpitTransitionsVisuals* self, GdkRectangle * value); +static void spit_transitions_visuals_set_bg_color (SpitTransitionsVisuals* self, GdkRGBA * value); void spit_transitions_visuals_reserved0 (SpitTransitionsVisuals* self); static void spit_transitions_visuals_real_reserved0 (SpitTransitionsVisuals* self); void spit_transitions_visuals_reserved1 (SpitTransitionsVisuals* self); @@ -258,22 +258,24 @@ static void spit_transitions_visuals_real_reserved6 (SpitTransitionsVisuals* sel void spit_transitions_visuals_reserved7 (SpitTransitionsVisuals* self); static void spit_transitions_visuals_real_reserved7 (SpitTransitionsVisuals* self); GdkPixbuf* spit_transitions_visuals_get_from_pixbuf (SpitTransitionsVisuals* self); -void spit_transitions_visuals_get_from_pos (SpitTransitionsVisuals* self, GdkRectangle* result); +void spit_transitions_visuals_get_from_pos (SpitTransitionsVisuals* self, GdkRectangle * result); +static gboolean _cairo_rectangle_int_equal (const cairo_rectangle_int_t * s1, const cairo_rectangle_int_t * s2); GdkPixbuf* spit_transitions_visuals_get_to_pixbuf (SpitTransitionsVisuals* self); -void spit_transitions_visuals_get_to_pos (SpitTransitionsVisuals* self, GdkRectangle* result); -void spit_transitions_visuals_get_bg_color (SpitTransitionsVisuals* self, GdkRGBA* result); -static void spit_transitions_visuals_finalize (GObject* obj); +void spit_transitions_visuals_get_to_pos (SpitTransitionsVisuals* self, GdkRectangle * result); +void spit_transitions_visuals_get_bg_color (SpitTransitionsVisuals* self, GdkRGBA * result); +static gboolean _gdk_rgba_equal (const GdkRGBA * s1, const GdkRGBA * s2); +static void spit_transitions_visuals_finalize (GObject * obj); static void _vala_spit_transitions_visuals_get_property (GObject * object, guint property_id, GValue * value, GParamSpec * pspec); static void _vala_spit_transitions_visuals_set_property (GObject * object, guint property_id, const GValue * value, GParamSpec * pspec); GType spit_transitions_motion_get_type (void) G_GNUC_CONST; #define SPIT_TRANSITIONS_MOTION_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), SPIT_TRANSITIONS_TYPE_MOTION, SpitTransitionsMotionPrivate)) enum { SPIT_TRANSITIONS_MOTION_DUMMY_PROPERTY, - SPIT_TRANSITIONS_MOTION_DIRECTION, - SPIT_TRANSITIONS_MOTION_FPS, - SPIT_TRANSITIONS_MOTION_DURATION_MSEC, - SPIT_TRANSITIONS_MOTION_TOTAL_FRAMES, - SPIT_TRANSITIONS_MOTION_TICK_MSEC + SPIT_TRANSITIONS_MOTION_DIRECTION_PROPERTY, + SPIT_TRANSITIONS_MOTION_FPS_PROPERTY, + SPIT_TRANSITIONS_MOTION_DURATION_MSEC_PROPERTY, + SPIT_TRANSITIONS_MOTION_TOTAL_FRAMES_PROPERTY, + SPIT_TRANSITIONS_MOTION_TICK_MSEC_PROPERTY }; SpitTransitionsMotion* spit_transitions_motion_new (SpitTransitionsDirection direction, gint fps, gint duration_msec); SpitTransitionsMotion* spit_transitions_motion_construct (GType object_type, SpitTransitionsDirection direction, gint fps, gint duration_msec); @@ -302,7 +304,7 @@ SpitTransitionsDirection spit_transitions_motion_get_direction (SpitTransitionsM gint spit_transitions_motion_get_fps (SpitTransitionsMotion* self); gint spit_transitions_motion_get_duration_msec (SpitTransitionsMotion* self); gint spit_transitions_motion_get_tick_msec (SpitTransitionsMotion* self); -static void spit_transitions_motion_finalize (GObject* obj); +static void spit_transitions_motion_finalize (GObject * obj); static void _vala_spit_transitions_motion_get_property (GObject * object, guint property_id, GValue * value, GParamSpec * pspec); static void _vala_spit_transitions_motion_set_property (GObject * object, guint property_id, const GValue * value, GParamSpec * pspec); GType spit_pluggable_info_get_type (void) G_GNUC_CONST; @@ -379,11 +381,11 @@ GType spit_transitions_direction_get_type (void) { SpitTransitionsVisuals* spit_transitions_visuals_construct (GType object_type, GdkPixbuf* from_pixbuf, GdkRectangle* from_pos, GdkPixbuf* to_pixbuf, GdkRectangle* to_pos, GdkRGBA* bg_color) { SpitTransitionsVisuals * self = NULL; - GdkPixbuf* _tmp0_ = NULL; - GdkRectangle _tmp1_ = {0}; - GdkPixbuf* _tmp2_ = NULL; - GdkRectangle _tmp3_ = {0}; - GdkRGBA _tmp4_ = {0}; + GdkPixbuf* _tmp0_; + GdkRectangle _tmp1_; + GdkPixbuf* _tmp2_; + GdkRectangle _tmp3_; + GdkRGBA _tmp4_; #line 94 "/home/jens/Source/shotwell/src/plugins/TransitionsInterfaces.vala" g_return_val_if_fail ((from_pixbuf == NULL) || GDK_IS_PIXBUF (from_pixbuf), NULL); #line 94 "/home/jens/Source/shotwell/src/plugins/TransitionsInterfaces.vala" @@ -418,14 +420,14 @@ SpitTransitionsVisuals* spit_transitions_visuals_construct (GType object_type, G spit_transitions_visuals_set_bg_color (self, &_tmp4_); #line 94 "/home/jens/Source/shotwell/src/plugins/TransitionsInterfaces.vala" return self; -#line 422 "TransitionsInterfaces.c" +#line 424 "TransitionsInterfaces.c" } SpitTransitionsVisuals* spit_transitions_visuals_new (GdkPixbuf* from_pixbuf, GdkRectangle* from_pos, GdkPixbuf* to_pixbuf, GdkRectangle* to_pos, GdkRGBA* bg_color) { #line 94 "/home/jens/Source/shotwell/src/plugins/TransitionsInterfaces.vala" return spit_transitions_visuals_construct (SPIT_TRANSITIONS_TYPE_VISUALS, from_pixbuf, from_pos, to_pixbuf, to_pos, bg_color); -#line 429 "TransitionsInterfaces.c" +#line 431 "TransitionsInterfaces.c" } @@ -438,7 +440,7 @@ void spit_transitions_visuals_reserved0 (SpitTransitionsVisuals* self) { g_return_if_fail (SPIT_TRANSITIONS_IS_VISUALS (self)); #line 106 "/home/jens/Source/shotwell/src/plugins/TransitionsInterfaces.vala" SPIT_TRANSITIONS_VISUALS_GET_CLASS (self)->reserved0 (self); -#line 442 "TransitionsInterfaces.c" +#line 444 "TransitionsInterfaces.c" } @@ -451,7 +453,7 @@ void spit_transitions_visuals_reserved1 (SpitTransitionsVisuals* self) { g_return_if_fail (SPIT_TRANSITIONS_IS_VISUALS (self)); #line 107 "/home/jens/Source/shotwell/src/plugins/TransitionsInterfaces.vala" SPIT_TRANSITIONS_VISUALS_GET_CLASS (self)->reserved1 (self); -#line 455 "TransitionsInterfaces.c" +#line 457 "TransitionsInterfaces.c" } @@ -464,7 +466,7 @@ void spit_transitions_visuals_reserved2 (SpitTransitionsVisuals* self) { g_return_if_fail (SPIT_TRANSITIONS_IS_VISUALS (self)); #line 108 "/home/jens/Source/shotwell/src/plugins/TransitionsInterfaces.vala" SPIT_TRANSITIONS_VISUALS_GET_CLASS (self)->reserved2 (self); -#line 468 "TransitionsInterfaces.c" +#line 470 "TransitionsInterfaces.c" } @@ -477,7 +479,7 @@ void spit_transitions_visuals_reserved3 (SpitTransitionsVisuals* self) { g_return_if_fail (SPIT_TRANSITIONS_IS_VISUALS (self)); #line 109 "/home/jens/Source/shotwell/src/plugins/TransitionsInterfaces.vala" SPIT_TRANSITIONS_VISUALS_GET_CLASS (self)->reserved3 (self); -#line 481 "TransitionsInterfaces.c" +#line 483 "TransitionsInterfaces.c" } @@ -490,7 +492,7 @@ void spit_transitions_visuals_reserved4 (SpitTransitionsVisuals* self) { g_return_if_fail (SPIT_TRANSITIONS_IS_VISUALS (self)); #line 110 "/home/jens/Source/shotwell/src/plugins/TransitionsInterfaces.vala" SPIT_TRANSITIONS_VISUALS_GET_CLASS (self)->reserved4 (self); -#line 494 "TransitionsInterfaces.c" +#line 496 "TransitionsInterfaces.c" } @@ -503,7 +505,7 @@ void spit_transitions_visuals_reserved5 (SpitTransitionsVisuals* self) { g_return_if_fail (SPIT_TRANSITIONS_IS_VISUALS (self)); #line 111 "/home/jens/Source/shotwell/src/plugins/TransitionsInterfaces.vala" SPIT_TRANSITIONS_VISUALS_GET_CLASS (self)->reserved5 (self); -#line 507 "TransitionsInterfaces.c" +#line 509 "TransitionsInterfaces.c" } @@ -516,7 +518,7 @@ void spit_transitions_visuals_reserved6 (SpitTransitionsVisuals* self) { g_return_if_fail (SPIT_TRANSITIONS_IS_VISUALS (self)); #line 112 "/home/jens/Source/shotwell/src/plugins/TransitionsInterfaces.vala" SPIT_TRANSITIONS_VISUALS_GET_CLASS (self)->reserved6 (self); -#line 520 "TransitionsInterfaces.c" +#line 522 "TransitionsInterfaces.c" } @@ -529,13 +531,13 @@ void spit_transitions_visuals_reserved7 (SpitTransitionsVisuals* self) { g_return_if_fail (SPIT_TRANSITIONS_IS_VISUALS (self)); #line 113 "/home/jens/Source/shotwell/src/plugins/TransitionsInterfaces.vala" SPIT_TRANSITIONS_VISUALS_GET_CLASS (self)->reserved7 (self); -#line 533 "TransitionsInterfaces.c" +#line 535 "TransitionsInterfaces.c" } GdkPixbuf* spit_transitions_visuals_get_from_pixbuf (SpitTransitionsVisuals* self) { GdkPixbuf* result; - GdkPixbuf* _tmp0_ = NULL; + GdkPixbuf* _tmp0_; #line 66 "/home/jens/Source/shotwell/src/plugins/TransitionsInterfaces.vala" g_return_val_if_fail (SPIT_TRANSITIONS_IS_VISUALS (self), NULL); #line 66 "/home/jens/Source/shotwell/src/plugins/TransitionsInterfaces.vala" @@ -544,38 +546,42 @@ GdkPixbuf* spit_transitions_visuals_get_from_pixbuf (SpitTransitionsVisuals* sel result = _tmp0_; #line 66 "/home/jens/Source/shotwell/src/plugins/TransitionsInterfaces.vala" return result; -#line 548 "TransitionsInterfaces.c" +#line 550 "TransitionsInterfaces.c" } static gpointer _g_object_ref0 (gpointer self) { #line 66 "/home/jens/Source/shotwell/src/plugins/TransitionsInterfaces.vala" return self ? g_object_ref (self) : NULL; -#line 555 "TransitionsInterfaces.c" +#line 557 "TransitionsInterfaces.c" } static void spit_transitions_visuals_set_from_pixbuf (SpitTransitionsVisuals* self, GdkPixbuf* value) { - GdkPixbuf* _tmp0_ = NULL; - GdkPixbuf* _tmp1_ = NULL; #line 66 "/home/jens/Source/shotwell/src/plugins/TransitionsInterfaces.vala" g_return_if_fail (SPIT_TRANSITIONS_IS_VISUALS (self)); #line 66 "/home/jens/Source/shotwell/src/plugins/TransitionsInterfaces.vala" - _tmp0_ = value; + if (spit_transitions_visuals_get_from_pixbuf (self) != value) { +#line 566 "TransitionsInterfaces.c" + GdkPixbuf* _tmp0_; + GdkPixbuf* _tmp1_; #line 66 "/home/jens/Source/shotwell/src/plugins/TransitionsInterfaces.vala" - _tmp1_ = _g_object_ref0 (_tmp0_); + _tmp0_ = value; #line 66 "/home/jens/Source/shotwell/src/plugins/TransitionsInterfaces.vala" - _g_object_unref0 (self->priv->_from_pixbuf); + _tmp1_ = _g_object_ref0 (_tmp0_); +#line 66 "/home/jens/Source/shotwell/src/plugins/TransitionsInterfaces.vala" + _g_object_unref0 (self->priv->_from_pixbuf); #line 66 "/home/jens/Source/shotwell/src/plugins/TransitionsInterfaces.vala" - self->priv->_from_pixbuf = _tmp1_; + self->priv->_from_pixbuf = _tmp1_; #line 66 "/home/jens/Source/shotwell/src/plugins/TransitionsInterfaces.vala" - g_object_notify ((GObject *) self, "from-pixbuf"); -#line 574 "TransitionsInterfaces.c" + g_object_notify ((GObject *) self, "from-pixbuf"); +#line 579 "TransitionsInterfaces.c" + } } -void spit_transitions_visuals_get_from_pos (SpitTransitionsVisuals* self, GdkRectangle* result) { - GdkRectangle _tmp0_ = {0}; +void spit_transitions_visuals_get_from_pos (SpitTransitionsVisuals* self, GdkRectangle * result) { + GdkRectangle _tmp0_; #line 73 "/home/jens/Source/shotwell/src/plugins/TransitionsInterfaces.vala" g_return_if_fail (SPIT_TRANSITIONS_IS_VISUALS (self)); #line 73 "/home/jens/Source/shotwell/src/plugins/TransitionsInterfaces.vala" @@ -584,27 +590,81 @@ void spit_transitions_visuals_get_from_pos (SpitTransitionsVisuals* self, GdkRec *result = _tmp0_; #line 73 "/home/jens/Source/shotwell/src/plugins/TransitionsInterfaces.vala" return; -#line 588 "TransitionsInterfaces.c" +#line 594 "TransitionsInterfaces.c" +} + + +static gboolean _cairo_rectangle_int_equal (const cairo_rectangle_int_t * s1, const cairo_rectangle_int_t * s2) { +#line 73 "/home/jens/Source/shotwell/src/plugins/TransitionsInterfaces.vala" + if (s1 == s2) { +#line 73 "/home/jens/Source/shotwell/src/plugins/TransitionsInterfaces.vala" + return TRUE; +#line 603 "TransitionsInterfaces.c" + } +#line 73 "/home/jens/Source/shotwell/src/plugins/TransitionsInterfaces.vala" + if (s1 == NULL) { +#line 73 "/home/jens/Source/shotwell/src/plugins/TransitionsInterfaces.vala" + return FALSE; +#line 609 "TransitionsInterfaces.c" + } +#line 73 "/home/jens/Source/shotwell/src/plugins/TransitionsInterfaces.vala" + if (s2 == NULL) { +#line 73 "/home/jens/Source/shotwell/src/plugins/TransitionsInterfaces.vala" + return FALSE; +#line 615 "TransitionsInterfaces.c" + } +#line 73 "/home/jens/Source/shotwell/src/plugins/TransitionsInterfaces.vala" + if (s1->x != s2->x) { +#line 73 "/home/jens/Source/shotwell/src/plugins/TransitionsInterfaces.vala" + return FALSE; +#line 621 "TransitionsInterfaces.c" + } +#line 73 "/home/jens/Source/shotwell/src/plugins/TransitionsInterfaces.vala" + if (s1->y != s2->y) { +#line 73 "/home/jens/Source/shotwell/src/plugins/TransitionsInterfaces.vala" + return FALSE; +#line 627 "TransitionsInterfaces.c" + } +#line 73 "/home/jens/Source/shotwell/src/plugins/TransitionsInterfaces.vala" + if (s1->width != s2->width) { +#line 73 "/home/jens/Source/shotwell/src/plugins/TransitionsInterfaces.vala" + return FALSE; +#line 633 "TransitionsInterfaces.c" + } +#line 73 "/home/jens/Source/shotwell/src/plugins/TransitionsInterfaces.vala" + if (s1->height != s2->height) { +#line 73 "/home/jens/Source/shotwell/src/plugins/TransitionsInterfaces.vala" + return FALSE; +#line 639 "TransitionsInterfaces.c" + } +#line 73 "/home/jens/Source/shotwell/src/plugins/TransitionsInterfaces.vala" + return TRUE; +#line 643 "TransitionsInterfaces.c" } -static void spit_transitions_visuals_set_from_pos (SpitTransitionsVisuals* self, GdkRectangle* value) { - GdkRectangle _tmp0_ = {0}; +static void spit_transitions_visuals_set_from_pos (SpitTransitionsVisuals* self, GdkRectangle * value) { + GdkRectangle old_value; #line 73 "/home/jens/Source/shotwell/src/plugins/TransitionsInterfaces.vala" g_return_if_fail (SPIT_TRANSITIONS_IS_VISUALS (self)); #line 73 "/home/jens/Source/shotwell/src/plugins/TransitionsInterfaces.vala" - _tmp0_ = *value; + if (_cairo_rectangle_int_equal (value, (spit_transitions_visuals_get_from_pos (self, &old_value), &old_value)) != TRUE) { +#line 653 "TransitionsInterfaces.c" + GdkRectangle _tmp0_; #line 73 "/home/jens/Source/shotwell/src/plugins/TransitionsInterfaces.vala" - self->priv->_from_pos = _tmp0_; + _tmp0_ = *value; #line 73 "/home/jens/Source/shotwell/src/plugins/TransitionsInterfaces.vala" - g_object_notify ((GObject *) self, "from-pos"); -#line 602 "TransitionsInterfaces.c" + self->priv->_from_pos = _tmp0_; +#line 73 "/home/jens/Source/shotwell/src/plugins/TransitionsInterfaces.vala" + g_object_notify ((GObject *) self, "from-pos"); +#line 661 "TransitionsInterfaces.c" + } } GdkPixbuf* spit_transitions_visuals_get_to_pixbuf (SpitTransitionsVisuals* self) { GdkPixbuf* result; - GdkPixbuf* _tmp0_ = NULL; + GdkPixbuf* _tmp0_; #line 80 "/home/jens/Source/shotwell/src/plugins/TransitionsInterfaces.vala" g_return_val_if_fail (SPIT_TRANSITIONS_IS_VISUALS (self), NULL); #line 80 "/home/jens/Source/shotwell/src/plugins/TransitionsInterfaces.vala" @@ -613,31 +673,35 @@ GdkPixbuf* spit_transitions_visuals_get_to_pixbuf (SpitTransitionsVisuals* self) result = _tmp0_; #line 80 "/home/jens/Source/shotwell/src/plugins/TransitionsInterfaces.vala" return result; -#line 617 "TransitionsInterfaces.c" +#line 677 "TransitionsInterfaces.c" } static void spit_transitions_visuals_set_to_pixbuf (SpitTransitionsVisuals* self, GdkPixbuf* value) { - GdkPixbuf* _tmp0_ = NULL; - GdkPixbuf* _tmp1_ = NULL; #line 80 "/home/jens/Source/shotwell/src/plugins/TransitionsInterfaces.vala" g_return_if_fail (SPIT_TRANSITIONS_IS_VISUALS (self)); #line 80 "/home/jens/Source/shotwell/src/plugins/TransitionsInterfaces.vala" - _tmp0_ = value; + if (spit_transitions_visuals_get_to_pixbuf (self) != value) { +#line 686 "TransitionsInterfaces.c" + GdkPixbuf* _tmp0_; + GdkPixbuf* _tmp1_; #line 80 "/home/jens/Source/shotwell/src/plugins/TransitionsInterfaces.vala" - _tmp1_ = _g_object_ref0 (_tmp0_); + _tmp0_ = value; #line 80 "/home/jens/Source/shotwell/src/plugins/TransitionsInterfaces.vala" - _g_object_unref0 (self->priv->_to_pixbuf); + _tmp1_ = _g_object_ref0 (_tmp0_); +#line 80 "/home/jens/Source/shotwell/src/plugins/TransitionsInterfaces.vala" + _g_object_unref0 (self->priv->_to_pixbuf); #line 80 "/home/jens/Source/shotwell/src/plugins/TransitionsInterfaces.vala" - self->priv->_to_pixbuf = _tmp1_; + self->priv->_to_pixbuf = _tmp1_; #line 80 "/home/jens/Source/shotwell/src/plugins/TransitionsInterfaces.vala" - g_object_notify ((GObject *) self, "to-pixbuf"); -#line 636 "TransitionsInterfaces.c" + g_object_notify ((GObject *) self, "to-pixbuf"); +#line 699 "TransitionsInterfaces.c" + } } -void spit_transitions_visuals_get_to_pos (SpitTransitionsVisuals* self, GdkRectangle* result) { - GdkRectangle _tmp0_ = {0}; +void spit_transitions_visuals_get_to_pos (SpitTransitionsVisuals* self, GdkRectangle * result) { + GdkRectangle _tmp0_; #line 87 "/home/jens/Source/shotwell/src/plugins/TransitionsInterfaces.vala" g_return_if_fail (SPIT_TRANSITIONS_IS_VISUALS (self)); #line 87 "/home/jens/Source/shotwell/src/plugins/TransitionsInterfaces.vala" @@ -646,26 +710,31 @@ void spit_transitions_visuals_get_to_pos (SpitTransitionsVisuals* self, GdkRecta *result = _tmp0_; #line 87 "/home/jens/Source/shotwell/src/plugins/TransitionsInterfaces.vala" return; -#line 650 "TransitionsInterfaces.c" +#line 714 "TransitionsInterfaces.c" } -static void spit_transitions_visuals_set_to_pos (SpitTransitionsVisuals* self, GdkRectangle* value) { - GdkRectangle _tmp0_ = {0}; +static void spit_transitions_visuals_set_to_pos (SpitTransitionsVisuals* self, GdkRectangle * value) { + GdkRectangle old_value; #line 87 "/home/jens/Source/shotwell/src/plugins/TransitionsInterfaces.vala" g_return_if_fail (SPIT_TRANSITIONS_IS_VISUALS (self)); #line 87 "/home/jens/Source/shotwell/src/plugins/TransitionsInterfaces.vala" - _tmp0_ = *value; + if (_cairo_rectangle_int_equal (value, (spit_transitions_visuals_get_to_pos (self, &old_value), &old_value)) != TRUE) { +#line 724 "TransitionsInterfaces.c" + GdkRectangle _tmp0_; #line 87 "/home/jens/Source/shotwell/src/plugins/TransitionsInterfaces.vala" - self->priv->_to_pos = _tmp0_; + _tmp0_ = *value; #line 87 "/home/jens/Source/shotwell/src/plugins/TransitionsInterfaces.vala" - g_object_notify ((GObject *) self, "to-pos"); -#line 664 "TransitionsInterfaces.c" + self->priv->_to_pos = _tmp0_; +#line 87 "/home/jens/Source/shotwell/src/plugins/TransitionsInterfaces.vala" + g_object_notify ((GObject *) self, "to-pos"); +#line 732 "TransitionsInterfaces.c" + } } -void spit_transitions_visuals_get_bg_color (SpitTransitionsVisuals* self, GdkRGBA* result) { - GdkRGBA _tmp0_ = {0}; +void spit_transitions_visuals_get_bg_color (SpitTransitionsVisuals* self, GdkRGBA * result) { + GdkRGBA _tmp0_; #line 92 "/home/jens/Source/shotwell/src/plugins/TransitionsInterfaces.vala" g_return_if_fail (SPIT_TRANSITIONS_IS_VISUALS (self)); #line 92 "/home/jens/Source/shotwell/src/plugins/TransitionsInterfaces.vala" @@ -674,21 +743,75 @@ void spit_transitions_visuals_get_bg_color (SpitTransitionsVisuals* self, GdkRGB *result = _tmp0_; #line 92 "/home/jens/Source/shotwell/src/plugins/TransitionsInterfaces.vala" return; -#line 678 "TransitionsInterfaces.c" +#line 747 "TransitionsInterfaces.c" +} + + +static gboolean _gdk_rgba_equal (const GdkRGBA * s1, const GdkRGBA * s2) { +#line 92 "/home/jens/Source/shotwell/src/plugins/TransitionsInterfaces.vala" + if (s1 == s2) { +#line 92 "/home/jens/Source/shotwell/src/plugins/TransitionsInterfaces.vala" + return TRUE; +#line 756 "TransitionsInterfaces.c" + } +#line 92 "/home/jens/Source/shotwell/src/plugins/TransitionsInterfaces.vala" + if (s1 == NULL) { +#line 92 "/home/jens/Source/shotwell/src/plugins/TransitionsInterfaces.vala" + return FALSE; +#line 762 "TransitionsInterfaces.c" + } +#line 92 "/home/jens/Source/shotwell/src/plugins/TransitionsInterfaces.vala" + if (s2 == NULL) { +#line 92 "/home/jens/Source/shotwell/src/plugins/TransitionsInterfaces.vala" + return FALSE; +#line 768 "TransitionsInterfaces.c" + } +#line 92 "/home/jens/Source/shotwell/src/plugins/TransitionsInterfaces.vala" + if (s1->red != s2->red) { +#line 92 "/home/jens/Source/shotwell/src/plugins/TransitionsInterfaces.vala" + return FALSE; +#line 774 "TransitionsInterfaces.c" + } +#line 92 "/home/jens/Source/shotwell/src/plugins/TransitionsInterfaces.vala" + if (s1->green != s2->green) { +#line 92 "/home/jens/Source/shotwell/src/plugins/TransitionsInterfaces.vala" + return FALSE; +#line 780 "TransitionsInterfaces.c" + } +#line 92 "/home/jens/Source/shotwell/src/plugins/TransitionsInterfaces.vala" + if (s1->blue != s2->blue) { +#line 92 "/home/jens/Source/shotwell/src/plugins/TransitionsInterfaces.vala" + return FALSE; +#line 786 "TransitionsInterfaces.c" + } +#line 92 "/home/jens/Source/shotwell/src/plugins/TransitionsInterfaces.vala" + if (s1->alpha != s2->alpha) { +#line 92 "/home/jens/Source/shotwell/src/plugins/TransitionsInterfaces.vala" + return FALSE; +#line 792 "TransitionsInterfaces.c" + } +#line 92 "/home/jens/Source/shotwell/src/plugins/TransitionsInterfaces.vala" + return TRUE; +#line 796 "TransitionsInterfaces.c" } -static void spit_transitions_visuals_set_bg_color (SpitTransitionsVisuals* self, GdkRGBA* value) { - GdkRGBA _tmp0_ = {0}; +static void spit_transitions_visuals_set_bg_color (SpitTransitionsVisuals* self, GdkRGBA * value) { + GdkRGBA old_value; #line 92 "/home/jens/Source/shotwell/src/plugins/TransitionsInterfaces.vala" g_return_if_fail (SPIT_TRANSITIONS_IS_VISUALS (self)); #line 92 "/home/jens/Source/shotwell/src/plugins/TransitionsInterfaces.vala" - _tmp0_ = *value; + if (_gdk_rgba_equal (value, (spit_transitions_visuals_get_bg_color (self, &old_value), &old_value)) != TRUE) { +#line 806 "TransitionsInterfaces.c" + GdkRGBA _tmp0_; +#line 92 "/home/jens/Source/shotwell/src/plugins/TransitionsInterfaces.vala" + _tmp0_ = *value; #line 92 "/home/jens/Source/shotwell/src/plugins/TransitionsInterfaces.vala" - self->priv->_bg_color = _tmp0_; + self->priv->_bg_color = _tmp0_; #line 92 "/home/jens/Source/shotwell/src/plugins/TransitionsInterfaces.vala" - g_object_notify ((GObject *) self, "bg-color"); -#line 692 "TransitionsInterfaces.c" + g_object_notify ((GObject *) self, "bg-color"); +#line 814 "TransitionsInterfaces.c" + } } @@ -698,77 +821,77 @@ static void spit_transitions_visuals_class_init (SpitTransitionsVisualsClass * k #line 60 "/home/jens/Source/shotwell/src/plugins/TransitionsInterfaces.vala" g_type_class_add_private (klass, sizeof (SpitTransitionsVisualsPrivate)); #line 60 "/home/jens/Source/shotwell/src/plugins/TransitionsInterfaces.vala" - ((SpitTransitionsVisualsClass *) klass)->reserved0 = (void (*)(SpitTransitionsVisuals*)) spit_transitions_visuals_real_reserved0; + ((SpitTransitionsVisualsClass *) klass)->reserved0 = (void (*) (SpitTransitionsVisuals *)) spit_transitions_visuals_real_reserved0; #line 60 "/home/jens/Source/shotwell/src/plugins/TransitionsInterfaces.vala" - ((SpitTransitionsVisualsClass *) klass)->reserved1 = (void (*)(SpitTransitionsVisuals*)) spit_transitions_visuals_real_reserved1; + ((SpitTransitionsVisualsClass *) klass)->reserved1 = (void (*) (SpitTransitionsVisuals *)) spit_transitions_visuals_real_reserved1; #line 60 "/home/jens/Source/shotwell/src/plugins/TransitionsInterfaces.vala" - ((SpitTransitionsVisualsClass *) klass)->reserved2 = (void (*)(SpitTransitionsVisuals*)) spit_transitions_visuals_real_reserved2; + ((SpitTransitionsVisualsClass *) klass)->reserved2 = (void (*) (SpitTransitionsVisuals *)) spit_transitions_visuals_real_reserved2; #line 60 "/home/jens/Source/shotwell/src/plugins/TransitionsInterfaces.vala" - ((SpitTransitionsVisualsClass *) klass)->reserved3 = (void (*)(SpitTransitionsVisuals*)) spit_transitions_visuals_real_reserved3; + ((SpitTransitionsVisualsClass *) klass)->reserved3 = (void (*) (SpitTransitionsVisuals *)) spit_transitions_visuals_real_reserved3; #line 60 "/home/jens/Source/shotwell/src/plugins/TransitionsInterfaces.vala" - ((SpitTransitionsVisualsClass *) klass)->reserved4 = (void (*)(SpitTransitionsVisuals*)) spit_transitions_visuals_real_reserved4; + ((SpitTransitionsVisualsClass *) klass)->reserved4 = (void (*) (SpitTransitionsVisuals *)) spit_transitions_visuals_real_reserved4; #line 60 "/home/jens/Source/shotwell/src/plugins/TransitionsInterfaces.vala" - ((SpitTransitionsVisualsClass *) klass)->reserved5 = (void (*)(SpitTransitionsVisuals*)) spit_transitions_visuals_real_reserved5; + ((SpitTransitionsVisualsClass *) klass)->reserved5 = (void (*) (SpitTransitionsVisuals *)) spit_transitions_visuals_real_reserved5; #line 60 "/home/jens/Source/shotwell/src/plugins/TransitionsInterfaces.vala" - ((SpitTransitionsVisualsClass *) klass)->reserved6 = (void (*)(SpitTransitionsVisuals*)) spit_transitions_visuals_real_reserved6; + ((SpitTransitionsVisualsClass *) klass)->reserved6 = (void (*) (SpitTransitionsVisuals *)) spit_transitions_visuals_real_reserved6; #line 60 "/home/jens/Source/shotwell/src/plugins/TransitionsInterfaces.vala" - ((SpitTransitionsVisualsClass *) klass)->reserved7 = (void (*)(SpitTransitionsVisuals*)) spit_transitions_visuals_real_reserved7; + ((SpitTransitionsVisualsClass *) klass)->reserved7 = (void (*) (SpitTransitionsVisuals *)) spit_transitions_visuals_real_reserved7; #line 60 "/home/jens/Source/shotwell/src/plugins/TransitionsInterfaces.vala" G_OBJECT_CLASS (klass)->get_property = _vala_spit_transitions_visuals_get_property; #line 60 "/home/jens/Source/shotwell/src/plugins/TransitionsInterfaces.vala" G_OBJECT_CLASS (klass)->set_property = _vala_spit_transitions_visuals_set_property; #line 60 "/home/jens/Source/shotwell/src/plugins/TransitionsInterfaces.vala" G_OBJECT_CLASS (klass)->finalize = spit_transitions_visuals_finalize; -#line 723 "TransitionsInterfaces.c" +#line 846 "TransitionsInterfaces.c" /** * Returns the starting pixbuf (the pixbuf currently on the display). * * If transitioning from a blank screen, this will return null. */ #line 60 "/home/jens/Source/shotwell/src/plugins/TransitionsInterfaces.vala" - g_object_class_install_property (G_OBJECT_CLASS (klass), SPIT_TRANSITIONS_VISUALS_FROM_PIXBUF, g_param_spec_object ("from-pixbuf", "from-pixbuf", "from-pixbuf", gdk_pixbuf_get_type (), G_PARAM_STATIC_NAME | G_PARAM_STATIC_NICK | G_PARAM_STATIC_BLURB | G_PARAM_READABLE)); -#line 731 "TransitionsInterfaces.c" + g_object_class_install_property (G_OBJECT_CLASS (klass), SPIT_TRANSITIONS_VISUALS_FROM_PIXBUF_PROPERTY, g_param_spec_object ("from-pixbuf", "from-pixbuf", "from-pixbuf", gdk_pixbuf_get_type (), G_PARAM_STATIC_NAME | G_PARAM_STATIC_NICK | G_PARAM_STATIC_BLURB | G_PARAM_READABLE)); +#line 854 "TransitionsInterfaces.c" /** * Returns the position of the starting pixbuf on the display. * * If transitioning from a blank screen, this will be zeroed. */ #line 60 "/home/jens/Source/shotwell/src/plugins/TransitionsInterfaces.vala" - g_object_class_install_property (G_OBJECT_CLASS (klass), SPIT_TRANSITIONS_VISUALS_FROM_POS, g_param_spec_boxed ("from-pos", "from-pos", "from-pos", gdk_rectangle_get_type (), G_PARAM_STATIC_NAME | G_PARAM_STATIC_NICK | G_PARAM_STATIC_BLURB | G_PARAM_READABLE)); -#line 739 "TransitionsInterfaces.c" + g_object_class_install_property (G_OBJECT_CLASS (klass), SPIT_TRANSITIONS_VISUALS_FROM_POS_PROPERTY, g_param_spec_boxed ("from-pos", "from-pos", "from-pos", gdk_rectangle_get_type (), G_PARAM_STATIC_NAME | G_PARAM_STATIC_NICK | G_PARAM_STATIC_BLURB | G_PARAM_READABLE)); +#line 862 "TransitionsInterfaces.c" /** * Returns the ending pixbuf (the pixbuf that the transition should result in). * * If transitioning to a blank screen, this will return null. */ #line 60 "/home/jens/Source/shotwell/src/plugins/TransitionsInterfaces.vala" - g_object_class_install_property (G_OBJECT_CLASS (klass), SPIT_TRANSITIONS_VISUALS_TO_PIXBUF, g_param_spec_object ("to-pixbuf", "to-pixbuf", "to-pixbuf", gdk_pixbuf_get_type (), G_PARAM_STATIC_NAME | G_PARAM_STATIC_NICK | G_PARAM_STATIC_BLURB | G_PARAM_READABLE)); -#line 747 "TransitionsInterfaces.c" + g_object_class_install_property (G_OBJECT_CLASS (klass), SPIT_TRANSITIONS_VISUALS_TO_PIXBUF_PROPERTY, g_param_spec_object ("to-pixbuf", "to-pixbuf", "to-pixbuf", gdk_pixbuf_get_type (), G_PARAM_STATIC_NAME | G_PARAM_STATIC_NICK | G_PARAM_STATIC_BLURB | G_PARAM_READABLE)); +#line 870 "TransitionsInterfaces.c" /** * Returns the position of the ending pixbuf on the display. * * If transitioning to a blank screen, this will be zeroed. */ #line 60 "/home/jens/Source/shotwell/src/plugins/TransitionsInterfaces.vala" - g_object_class_install_property (G_OBJECT_CLASS (klass), SPIT_TRANSITIONS_VISUALS_TO_POS, g_param_spec_boxed ("to-pos", "to-pos", "to-pos", gdk_rectangle_get_type (), G_PARAM_STATIC_NAME | G_PARAM_STATIC_NICK | G_PARAM_STATIC_BLURB | G_PARAM_READABLE)); -#line 755 "TransitionsInterfaces.c" + g_object_class_install_property (G_OBJECT_CLASS (klass), SPIT_TRANSITIONS_VISUALS_TO_POS_PROPERTY, g_param_spec_boxed ("to-pos", "to-pos", "to-pos", gdk_rectangle_get_type (), G_PARAM_STATIC_NAME | G_PARAM_STATIC_NICK | G_PARAM_STATIC_BLURB | G_PARAM_READABLE)); +#line 878 "TransitionsInterfaces.c" /** * Returns the background color of the viewport. */ #line 60 "/home/jens/Source/shotwell/src/plugins/TransitionsInterfaces.vala" - g_object_class_install_property (G_OBJECT_CLASS (klass), SPIT_TRANSITIONS_VISUALS_BG_COLOR, g_param_spec_boxed ("bg-color", "bg-color", "bg-color", gdk_rgba_get_type (), G_PARAM_STATIC_NAME | G_PARAM_STATIC_NICK | G_PARAM_STATIC_BLURB | G_PARAM_READABLE)); -#line 761 "TransitionsInterfaces.c" + g_object_class_install_property (G_OBJECT_CLASS (klass), SPIT_TRANSITIONS_VISUALS_BG_COLOR_PROPERTY, g_param_spec_boxed ("bg-color", "bg-color", "bg-color", gdk_rgba_get_type (), G_PARAM_STATIC_NAME | G_PARAM_STATIC_NICK | G_PARAM_STATIC_BLURB | G_PARAM_READABLE)); +#line 884 "TransitionsInterfaces.c" } static void spit_transitions_visuals_instance_init (SpitTransitionsVisuals * self) { #line 60 "/home/jens/Source/shotwell/src/plugins/TransitionsInterfaces.vala" self->priv = SPIT_TRANSITIONS_VISUALS_GET_PRIVATE (self); -#line 768 "TransitionsInterfaces.c" +#line 891 "TransitionsInterfaces.c" } -static void spit_transitions_visuals_finalize (GObject* obj) { +static void spit_transitions_visuals_finalize (GObject * obj) { SpitTransitionsVisuals * self; #line 60 "/home/jens/Source/shotwell/src/plugins/TransitionsInterfaces.vala" self = G_TYPE_CHECK_INSTANCE_CAST (obj, SPIT_TRANSITIONS_TYPE_VISUALS, SpitTransitionsVisuals); @@ -778,7 +901,7 @@ static void spit_transitions_visuals_finalize (GObject* obj) { _g_object_unref0 (self->priv->_to_pixbuf); #line 60 "/home/jens/Source/shotwell/src/plugins/TransitionsInterfaces.vala" G_OBJECT_CLASS (spit_transitions_visuals_parent_class)->finalize (obj); -#line 782 "TransitionsInterfaces.c" +#line 905 "TransitionsInterfaces.c" } @@ -814,63 +937,63 @@ static void _vala_spit_transitions_visuals_get_property (GObject * object, guint #line 60 "/home/jens/Source/shotwell/src/plugins/TransitionsInterfaces.vala" switch (property_id) { #line 60 "/home/jens/Source/shotwell/src/plugins/TransitionsInterfaces.vala" - case SPIT_TRANSITIONS_VISUALS_FROM_PIXBUF: + case SPIT_TRANSITIONS_VISUALS_FROM_PIXBUF_PROPERTY: #line 60 "/home/jens/Source/shotwell/src/plugins/TransitionsInterfaces.vala" g_value_set_object (value, spit_transitions_visuals_get_from_pixbuf (self)); #line 60 "/home/jens/Source/shotwell/src/plugins/TransitionsInterfaces.vala" break; #line 60 "/home/jens/Source/shotwell/src/plugins/TransitionsInterfaces.vala" - case SPIT_TRANSITIONS_VISUALS_FROM_POS: -#line 825 "TransitionsInterfaces.c" + case SPIT_TRANSITIONS_VISUALS_FROM_POS_PROPERTY: +#line 948 "TransitionsInterfaces.c" { GdkRectangle boxed; #line 60 "/home/jens/Source/shotwell/src/plugins/TransitionsInterfaces.vala" spit_transitions_visuals_get_from_pos (self, &boxed); #line 60 "/home/jens/Source/shotwell/src/plugins/TransitionsInterfaces.vala" g_value_set_boxed (value, &boxed); -#line 832 "TransitionsInterfaces.c" +#line 955 "TransitionsInterfaces.c" } #line 60 "/home/jens/Source/shotwell/src/plugins/TransitionsInterfaces.vala" break; #line 60 "/home/jens/Source/shotwell/src/plugins/TransitionsInterfaces.vala" - case SPIT_TRANSITIONS_VISUALS_TO_PIXBUF: + case SPIT_TRANSITIONS_VISUALS_TO_PIXBUF_PROPERTY: #line 60 "/home/jens/Source/shotwell/src/plugins/TransitionsInterfaces.vala" g_value_set_object (value, spit_transitions_visuals_get_to_pixbuf (self)); #line 60 "/home/jens/Source/shotwell/src/plugins/TransitionsInterfaces.vala" break; #line 60 "/home/jens/Source/shotwell/src/plugins/TransitionsInterfaces.vala" - case SPIT_TRANSITIONS_VISUALS_TO_POS: -#line 844 "TransitionsInterfaces.c" + case SPIT_TRANSITIONS_VISUALS_TO_POS_PROPERTY: +#line 967 "TransitionsInterfaces.c" { GdkRectangle boxed; #line 60 "/home/jens/Source/shotwell/src/plugins/TransitionsInterfaces.vala" spit_transitions_visuals_get_to_pos (self, &boxed); #line 60 "/home/jens/Source/shotwell/src/plugins/TransitionsInterfaces.vala" g_value_set_boxed (value, &boxed); -#line 851 "TransitionsInterfaces.c" +#line 974 "TransitionsInterfaces.c" } #line 60 "/home/jens/Source/shotwell/src/plugins/TransitionsInterfaces.vala" break; #line 60 "/home/jens/Source/shotwell/src/plugins/TransitionsInterfaces.vala" - case SPIT_TRANSITIONS_VISUALS_BG_COLOR: -#line 857 "TransitionsInterfaces.c" + case SPIT_TRANSITIONS_VISUALS_BG_COLOR_PROPERTY: +#line 980 "TransitionsInterfaces.c" { GdkRGBA boxed; #line 60 "/home/jens/Source/shotwell/src/plugins/TransitionsInterfaces.vala" spit_transitions_visuals_get_bg_color (self, &boxed); #line 60 "/home/jens/Source/shotwell/src/plugins/TransitionsInterfaces.vala" g_value_set_boxed (value, &boxed); -#line 864 "TransitionsInterfaces.c" +#line 987 "TransitionsInterfaces.c" } #line 60 "/home/jens/Source/shotwell/src/plugins/TransitionsInterfaces.vala" break; -#line 868 "TransitionsInterfaces.c" +#line 991 "TransitionsInterfaces.c" default: #line 60 "/home/jens/Source/shotwell/src/plugins/TransitionsInterfaces.vala" G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec); #line 60 "/home/jens/Source/shotwell/src/plugins/TransitionsInterfaces.vala" break; -#line 874 "TransitionsInterfaces.c" +#line 997 "TransitionsInterfaces.c" } } @@ -881,51 +1004,51 @@ static void _vala_spit_transitions_visuals_set_property (GObject * object, guint #line 60 "/home/jens/Source/shotwell/src/plugins/TransitionsInterfaces.vala" switch (property_id) { #line 60 "/home/jens/Source/shotwell/src/plugins/TransitionsInterfaces.vala" - case SPIT_TRANSITIONS_VISUALS_FROM_PIXBUF: + case SPIT_TRANSITIONS_VISUALS_FROM_PIXBUF_PROPERTY: #line 60 "/home/jens/Source/shotwell/src/plugins/TransitionsInterfaces.vala" spit_transitions_visuals_set_from_pixbuf (self, g_value_get_object (value)); #line 60 "/home/jens/Source/shotwell/src/plugins/TransitionsInterfaces.vala" break; #line 60 "/home/jens/Source/shotwell/src/plugins/TransitionsInterfaces.vala" - case SPIT_TRANSITIONS_VISUALS_FROM_POS: + case SPIT_TRANSITIONS_VISUALS_FROM_POS_PROPERTY: #line 60 "/home/jens/Source/shotwell/src/plugins/TransitionsInterfaces.vala" spit_transitions_visuals_set_from_pos (self, g_value_get_boxed (value)); #line 60 "/home/jens/Source/shotwell/src/plugins/TransitionsInterfaces.vala" break; #line 60 "/home/jens/Source/shotwell/src/plugins/TransitionsInterfaces.vala" - case SPIT_TRANSITIONS_VISUALS_TO_PIXBUF: + case SPIT_TRANSITIONS_VISUALS_TO_PIXBUF_PROPERTY: #line 60 "/home/jens/Source/shotwell/src/plugins/TransitionsInterfaces.vala" spit_transitions_visuals_set_to_pixbuf (self, g_value_get_object (value)); #line 60 "/home/jens/Source/shotwell/src/plugins/TransitionsInterfaces.vala" break; #line 60 "/home/jens/Source/shotwell/src/plugins/TransitionsInterfaces.vala" - case SPIT_TRANSITIONS_VISUALS_TO_POS: + case SPIT_TRANSITIONS_VISUALS_TO_POS_PROPERTY: #line 60 "/home/jens/Source/shotwell/src/plugins/TransitionsInterfaces.vala" spit_transitions_visuals_set_to_pos (self, g_value_get_boxed (value)); #line 60 "/home/jens/Source/shotwell/src/plugins/TransitionsInterfaces.vala" break; #line 60 "/home/jens/Source/shotwell/src/plugins/TransitionsInterfaces.vala" - case SPIT_TRANSITIONS_VISUALS_BG_COLOR: + case SPIT_TRANSITIONS_VISUALS_BG_COLOR_PROPERTY: #line 60 "/home/jens/Source/shotwell/src/plugins/TransitionsInterfaces.vala" spit_transitions_visuals_set_bg_color (self, g_value_get_boxed (value)); #line 60 "/home/jens/Source/shotwell/src/plugins/TransitionsInterfaces.vala" break; -#line 914 "TransitionsInterfaces.c" +#line 1037 "TransitionsInterfaces.c" default: #line 60 "/home/jens/Source/shotwell/src/plugins/TransitionsInterfaces.vala" G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec); #line 60 "/home/jens/Source/shotwell/src/plugins/TransitionsInterfaces.vala" break; -#line 920 "TransitionsInterfaces.c" +#line 1043 "TransitionsInterfaces.c" } } SpitTransitionsMotion* spit_transitions_motion_construct (GType object_type, SpitTransitionsDirection direction, gint fps, gint duration_msec) { SpitTransitionsMotion * self = NULL; - SpitTransitionsDirection _tmp0_ = 0; - gint _tmp1_ = 0; - gint _tmp2_ = 0; + SpitTransitionsDirection _tmp0_; + gint _tmp1_; + gint _tmp2_; #line 157 "/home/jens/Source/shotwell/src/plugins/TransitionsInterfaces.vala" self = (SpitTransitionsMotion*) g_object_new (object_type, NULL); #line 158 "/home/jens/Source/shotwell/src/plugins/TransitionsInterfaces.vala" @@ -942,14 +1065,14 @@ SpitTransitionsMotion* spit_transitions_motion_construct (GType object_type, Spi spit_transitions_motion_set_duration_msec (self, _tmp2_); #line 157 "/home/jens/Source/shotwell/src/plugins/TransitionsInterfaces.vala" return self; -#line 946 "TransitionsInterfaces.c" +#line 1069 "TransitionsInterfaces.c" } SpitTransitionsMotion* spit_transitions_motion_new (SpitTransitionsDirection direction, gint fps, gint duration_msec) { #line 157 "/home/jens/Source/shotwell/src/plugins/TransitionsInterfaces.vala" return spit_transitions_motion_construct (SPIT_TRANSITIONS_TYPE_MOTION, direction, fps, duration_msec); -#line 953 "TransitionsInterfaces.c" +#line 1076 "TransitionsInterfaces.c" } @@ -959,9 +1082,9 @@ SpitTransitionsMotion* spit_transitions_motion_new (SpitTransitionsDirection dir */ gdouble spit_transitions_motion_get_alpha (SpitTransitionsMotion* self, gint frame_number) { gdouble result = 0.0; - gint _tmp0_ = 0; - gint _tmp1_ = 0; - gint _tmp2_ = 0; + gint _tmp0_; + gint _tmp1_; + gint _tmp2_; #line 167 "/home/jens/Source/shotwell/src/plugins/TransitionsInterfaces.vala" g_return_val_if_fail (SPIT_TRANSITIONS_IS_MOTION (self), 0.0); #line 168 "/home/jens/Source/shotwell/src/plugins/TransitionsInterfaces.vala" @@ -974,7 +1097,7 @@ gdouble spit_transitions_motion_get_alpha (SpitTransitionsMotion* self, gint fra result = ((gdouble) _tmp0_) / ((gdouble) _tmp2_); #line 168 "/home/jens/Source/shotwell/src/plugins/TransitionsInterfaces.vala" return result; -#line 978 "TransitionsInterfaces.c" +#line 1101 "TransitionsInterfaces.c" } @@ -987,7 +1110,7 @@ void spit_transitions_motion_reserved0 (SpitTransitionsMotion* self) { g_return_if_fail (SPIT_TRANSITIONS_IS_MOTION (self)); #line 174 "/home/jens/Source/shotwell/src/plugins/TransitionsInterfaces.vala" SPIT_TRANSITIONS_MOTION_GET_CLASS (self)->reserved0 (self); -#line 991 "TransitionsInterfaces.c" +#line 1114 "TransitionsInterfaces.c" } @@ -1000,7 +1123,7 @@ void spit_transitions_motion_reserved1 (SpitTransitionsMotion* self) { g_return_if_fail (SPIT_TRANSITIONS_IS_MOTION (self)); #line 175 "/home/jens/Source/shotwell/src/plugins/TransitionsInterfaces.vala" SPIT_TRANSITIONS_MOTION_GET_CLASS (self)->reserved1 (self); -#line 1004 "TransitionsInterfaces.c" +#line 1127 "TransitionsInterfaces.c" } @@ -1013,7 +1136,7 @@ void spit_transitions_motion_reserved2 (SpitTransitionsMotion* self) { g_return_if_fail (SPIT_TRANSITIONS_IS_MOTION (self)); #line 176 "/home/jens/Source/shotwell/src/plugins/TransitionsInterfaces.vala" SPIT_TRANSITIONS_MOTION_GET_CLASS (self)->reserved2 (self); -#line 1017 "TransitionsInterfaces.c" +#line 1140 "TransitionsInterfaces.c" } @@ -1026,7 +1149,7 @@ void spit_transitions_motion_reserved3 (SpitTransitionsMotion* self) { g_return_if_fail (SPIT_TRANSITIONS_IS_MOTION (self)); #line 177 "/home/jens/Source/shotwell/src/plugins/TransitionsInterfaces.vala" SPIT_TRANSITIONS_MOTION_GET_CLASS (self)->reserved3 (self); -#line 1030 "TransitionsInterfaces.c" +#line 1153 "TransitionsInterfaces.c" } @@ -1039,7 +1162,7 @@ void spit_transitions_motion_reserved4 (SpitTransitionsMotion* self) { g_return_if_fail (SPIT_TRANSITIONS_IS_MOTION (self)); #line 178 "/home/jens/Source/shotwell/src/plugins/TransitionsInterfaces.vala" SPIT_TRANSITIONS_MOTION_GET_CLASS (self)->reserved4 (self); -#line 1043 "TransitionsInterfaces.c" +#line 1166 "TransitionsInterfaces.c" } @@ -1052,7 +1175,7 @@ void spit_transitions_motion_reserved5 (SpitTransitionsMotion* self) { g_return_if_fail (SPIT_TRANSITIONS_IS_MOTION (self)); #line 179 "/home/jens/Source/shotwell/src/plugins/TransitionsInterfaces.vala" SPIT_TRANSITIONS_MOTION_GET_CLASS (self)->reserved5 (self); -#line 1056 "TransitionsInterfaces.c" +#line 1179 "TransitionsInterfaces.c" } @@ -1065,7 +1188,7 @@ void spit_transitions_motion_reserved6 (SpitTransitionsMotion* self) { g_return_if_fail (SPIT_TRANSITIONS_IS_MOTION (self)); #line 180 "/home/jens/Source/shotwell/src/plugins/TransitionsInterfaces.vala" SPIT_TRANSITIONS_MOTION_GET_CLASS (self)->reserved6 (self); -#line 1069 "TransitionsInterfaces.c" +#line 1192 "TransitionsInterfaces.c" } @@ -1078,13 +1201,13 @@ void spit_transitions_motion_reserved7 (SpitTransitionsMotion* self) { g_return_if_fail (SPIT_TRANSITIONS_IS_MOTION (self)); #line 181 "/home/jens/Source/shotwell/src/plugins/TransitionsInterfaces.vala" SPIT_TRANSITIONS_MOTION_GET_CLASS (self)->reserved7 (self); -#line 1082 "TransitionsInterfaces.c" +#line 1205 "TransitionsInterfaces.c" } SpitTransitionsDirection spit_transitions_motion_get_direction (SpitTransitionsMotion* self) { SpitTransitionsDirection result; - SpitTransitionsDirection _tmp0_ = 0; + SpitTransitionsDirection _tmp0_; #line 126 "/home/jens/Source/shotwell/src/plugins/TransitionsInterfaces.vala" g_return_val_if_fail (SPIT_TRANSITIONS_IS_MOTION (self), 0); #line 126 "/home/jens/Source/shotwell/src/plugins/TransitionsInterfaces.vala" @@ -1093,27 +1216,31 @@ SpitTransitionsDirection spit_transitions_motion_get_direction (SpitTransitionsM result = _tmp0_; #line 126 "/home/jens/Source/shotwell/src/plugins/TransitionsInterfaces.vala" return result; -#line 1097 "TransitionsInterfaces.c" +#line 1220 "TransitionsInterfaces.c" } static void spit_transitions_motion_set_direction (SpitTransitionsMotion* self, SpitTransitionsDirection value) { - SpitTransitionsDirection _tmp0_ = 0; #line 126 "/home/jens/Source/shotwell/src/plugins/TransitionsInterfaces.vala" g_return_if_fail (SPIT_TRANSITIONS_IS_MOTION (self)); #line 126 "/home/jens/Source/shotwell/src/plugins/TransitionsInterfaces.vala" - _tmp0_ = value; + if (spit_transitions_motion_get_direction (self) != value) { +#line 1229 "TransitionsInterfaces.c" + SpitTransitionsDirection _tmp0_; #line 126 "/home/jens/Source/shotwell/src/plugins/TransitionsInterfaces.vala" - self->priv->_direction = _tmp0_; + _tmp0_ = value; #line 126 "/home/jens/Source/shotwell/src/plugins/TransitionsInterfaces.vala" - g_object_notify ((GObject *) self, "direction"); -#line 1111 "TransitionsInterfaces.c" + self->priv->_direction = _tmp0_; +#line 126 "/home/jens/Source/shotwell/src/plugins/TransitionsInterfaces.vala" + g_object_notify ((GObject *) self, "direction"); +#line 1237 "TransitionsInterfaces.c" + } } gint spit_transitions_motion_get_fps (SpitTransitionsMotion* self) { gint result; - gint _tmp0_ = 0; + gint _tmp0_; #line 131 "/home/jens/Source/shotwell/src/plugins/TransitionsInterfaces.vala" g_return_val_if_fail (SPIT_TRANSITIONS_IS_MOTION (self), 0); #line 131 "/home/jens/Source/shotwell/src/plugins/TransitionsInterfaces.vala" @@ -1122,27 +1249,31 @@ gint spit_transitions_motion_get_fps (SpitTransitionsMotion* self) { result = _tmp0_; #line 131 "/home/jens/Source/shotwell/src/plugins/TransitionsInterfaces.vala" return result; -#line 1126 "TransitionsInterfaces.c" +#line 1253 "TransitionsInterfaces.c" } static void spit_transitions_motion_set_fps (SpitTransitionsMotion* self, gint value) { - gint _tmp0_ = 0; #line 131 "/home/jens/Source/shotwell/src/plugins/TransitionsInterfaces.vala" g_return_if_fail (SPIT_TRANSITIONS_IS_MOTION (self)); #line 131 "/home/jens/Source/shotwell/src/plugins/TransitionsInterfaces.vala" - _tmp0_ = value; + if (spit_transitions_motion_get_fps (self) != value) { +#line 1262 "TransitionsInterfaces.c" + gint _tmp0_; #line 131 "/home/jens/Source/shotwell/src/plugins/TransitionsInterfaces.vala" - self->priv->_fps = _tmp0_; + _tmp0_ = value; #line 131 "/home/jens/Source/shotwell/src/plugins/TransitionsInterfaces.vala" - g_object_notify ((GObject *) self, "fps"); -#line 1140 "TransitionsInterfaces.c" + self->priv->_fps = _tmp0_; +#line 131 "/home/jens/Source/shotwell/src/plugins/TransitionsInterfaces.vala" + g_object_notify ((GObject *) self, "fps"); +#line 1270 "TransitionsInterfaces.c" + } } gint spit_transitions_motion_get_duration_msec (SpitTransitionsMotion* self) { gint result; - gint _tmp0_ = 0; + gint _tmp0_; #line 136 "/home/jens/Source/shotwell/src/plugins/TransitionsInterfaces.vala" g_return_val_if_fail (SPIT_TRANSITIONS_IS_MOTION (self), 0); #line 136 "/home/jens/Source/shotwell/src/plugins/TransitionsInterfaces.vala" @@ -1151,28 +1282,32 @@ gint spit_transitions_motion_get_duration_msec (SpitTransitionsMotion* self) { result = _tmp0_; #line 136 "/home/jens/Source/shotwell/src/plugins/TransitionsInterfaces.vala" return result; -#line 1155 "TransitionsInterfaces.c" +#line 1286 "TransitionsInterfaces.c" } static void spit_transitions_motion_set_duration_msec (SpitTransitionsMotion* self, gint value) { - gint _tmp0_ = 0; #line 136 "/home/jens/Source/shotwell/src/plugins/TransitionsInterfaces.vala" g_return_if_fail (SPIT_TRANSITIONS_IS_MOTION (self)); #line 136 "/home/jens/Source/shotwell/src/plugins/TransitionsInterfaces.vala" - _tmp0_ = value; + if (spit_transitions_motion_get_duration_msec (self) != value) { +#line 1295 "TransitionsInterfaces.c" + gint _tmp0_; #line 136 "/home/jens/Source/shotwell/src/plugins/TransitionsInterfaces.vala" - self->priv->_duration_msec = _tmp0_; + _tmp0_ = value; #line 136 "/home/jens/Source/shotwell/src/plugins/TransitionsInterfaces.vala" - g_object_notify ((GObject *) self, "duration-msec"); -#line 1169 "TransitionsInterfaces.c" + self->priv->_duration_msec = _tmp0_; +#line 136 "/home/jens/Source/shotwell/src/plugins/TransitionsInterfaces.vala" + g_object_notify ((GObject *) self, "duration-msec"); +#line 1303 "TransitionsInterfaces.c" + } } gint spit_transitions_motion_get_total_frames (SpitTransitionsMotion* self) { gint result; - gint _tmp0_ = 0; - gint _tmp1_ = 0; + gint _tmp0_; + gint _tmp1_; #line 143 "/home/jens/Source/shotwell/src/plugins/TransitionsInterfaces.vala" g_return_val_if_fail (SPIT_TRANSITIONS_IS_MOTION (self), 0); #line 144 "/home/jens/Source/shotwell/src/plugins/TransitionsInterfaces.vala" @@ -1183,13 +1318,13 @@ gint spit_transitions_motion_get_total_frames (SpitTransitionsMotion* self) { result = (gint) (((gdouble) _tmp0_) * (((gdouble) _tmp1_) / 1000.0)); #line 144 "/home/jens/Source/shotwell/src/plugins/TransitionsInterfaces.vala" return result; -#line 1187 "TransitionsInterfaces.c" +#line 1322 "TransitionsInterfaces.c" } gint spit_transitions_motion_get_tick_msec (SpitTransitionsMotion* self) { gint result; - gint _tmp0_ = 0; + gint _tmp0_; #line 152 "/home/jens/Source/shotwell/src/plugins/TransitionsInterfaces.vala" g_return_val_if_fail (SPIT_TRANSITIONS_IS_MOTION (self), 0); #line 153 "/home/jens/Source/shotwell/src/plugins/TransitionsInterfaces.vala" @@ -1198,7 +1333,7 @@ gint spit_transitions_motion_get_tick_msec (SpitTransitionsMotion* self) { result = (gint) (1000.0 / ((gdouble) _tmp0_)); #line 153 "/home/jens/Source/shotwell/src/plugins/TransitionsInterfaces.vala" return result; -#line 1202 "TransitionsInterfaces.c" +#line 1337 "TransitionsInterfaces.c" } @@ -1208,76 +1343,76 @@ static void spit_transitions_motion_class_init (SpitTransitionsMotionClass * kla #line 122 "/home/jens/Source/shotwell/src/plugins/TransitionsInterfaces.vala" g_type_class_add_private (klass, sizeof (SpitTransitionsMotionPrivate)); #line 122 "/home/jens/Source/shotwell/src/plugins/TransitionsInterfaces.vala" - ((SpitTransitionsMotionClass *) klass)->reserved0 = (void (*)(SpitTransitionsMotion*)) spit_transitions_motion_real_reserved0; + ((SpitTransitionsMotionClass *) klass)->reserved0 = (void (*) (SpitTransitionsMotion *)) spit_transitions_motion_real_reserved0; #line 122 "/home/jens/Source/shotwell/src/plugins/TransitionsInterfaces.vala" - ((SpitTransitionsMotionClass *) klass)->reserved1 = (void (*)(SpitTransitionsMotion*)) spit_transitions_motion_real_reserved1; + ((SpitTransitionsMotionClass *) klass)->reserved1 = (void (*) (SpitTransitionsMotion *)) spit_transitions_motion_real_reserved1; #line 122 "/home/jens/Source/shotwell/src/plugins/TransitionsInterfaces.vala" - ((SpitTransitionsMotionClass *) klass)->reserved2 = (void (*)(SpitTransitionsMotion*)) spit_transitions_motion_real_reserved2; + ((SpitTransitionsMotionClass *) klass)->reserved2 = (void (*) (SpitTransitionsMotion *)) spit_transitions_motion_real_reserved2; #line 122 "/home/jens/Source/shotwell/src/plugins/TransitionsInterfaces.vala" - ((SpitTransitionsMotionClass *) klass)->reserved3 = (void (*)(SpitTransitionsMotion*)) spit_transitions_motion_real_reserved3; + ((SpitTransitionsMotionClass *) klass)->reserved3 = (void (*) (SpitTransitionsMotion *)) spit_transitions_motion_real_reserved3; #line 122 "/home/jens/Source/shotwell/src/plugins/TransitionsInterfaces.vala" - ((SpitTransitionsMotionClass *) klass)->reserved4 = (void (*)(SpitTransitionsMotion*)) spit_transitions_motion_real_reserved4; + ((SpitTransitionsMotionClass *) klass)->reserved4 = (void (*) (SpitTransitionsMotion *)) spit_transitions_motion_real_reserved4; #line 122 "/home/jens/Source/shotwell/src/plugins/TransitionsInterfaces.vala" - ((SpitTransitionsMotionClass *) klass)->reserved5 = (void (*)(SpitTransitionsMotion*)) spit_transitions_motion_real_reserved5; + ((SpitTransitionsMotionClass *) klass)->reserved5 = (void (*) (SpitTransitionsMotion *)) spit_transitions_motion_real_reserved5; #line 122 "/home/jens/Source/shotwell/src/plugins/TransitionsInterfaces.vala" - ((SpitTransitionsMotionClass *) klass)->reserved6 = (void (*)(SpitTransitionsMotion*)) spit_transitions_motion_real_reserved6; + ((SpitTransitionsMotionClass *) klass)->reserved6 = (void (*) (SpitTransitionsMotion *)) spit_transitions_motion_real_reserved6; #line 122 "/home/jens/Source/shotwell/src/plugins/TransitionsInterfaces.vala" - ((SpitTransitionsMotionClass *) klass)->reserved7 = (void (*)(SpitTransitionsMotion*)) spit_transitions_motion_real_reserved7; + ((SpitTransitionsMotionClass *) klass)->reserved7 = (void (*) (SpitTransitionsMotion *)) spit_transitions_motion_real_reserved7; #line 122 "/home/jens/Source/shotwell/src/plugins/TransitionsInterfaces.vala" G_OBJECT_CLASS (klass)->get_property = _vala_spit_transitions_motion_get_property; #line 122 "/home/jens/Source/shotwell/src/plugins/TransitionsInterfaces.vala" G_OBJECT_CLASS (klass)->set_property = _vala_spit_transitions_motion_set_property; #line 122 "/home/jens/Source/shotwell/src/plugins/TransitionsInterfaces.vala" G_OBJECT_CLASS (klass)->finalize = spit_transitions_motion_finalize; -#line 1233 "TransitionsInterfaces.c" +#line 1368 "TransitionsInterfaces.c" /** * Returns the direction the transition should occur in (if pertinent to the {@link Effect}. */ #line 122 "/home/jens/Source/shotwell/src/plugins/TransitionsInterfaces.vala" - g_object_class_install_property (G_OBJECT_CLASS (klass), SPIT_TRANSITIONS_MOTION_DIRECTION, g_param_spec_enum ("direction", "direction", "direction", SPIT_TRANSITIONS_TYPE_DIRECTION, 0, G_PARAM_STATIC_NAME | G_PARAM_STATIC_NICK | G_PARAM_STATIC_BLURB | G_PARAM_READABLE)); -#line 1239 "TransitionsInterfaces.c" + g_object_class_install_property (G_OBJECT_CLASS (klass), SPIT_TRANSITIONS_MOTION_DIRECTION_PROPERTY, g_param_spec_enum ("direction", "direction", "direction", SPIT_TRANSITIONS_TYPE_DIRECTION, 0, G_PARAM_STATIC_NAME | G_PARAM_STATIC_NICK | G_PARAM_STATIC_BLURB | G_PARAM_READABLE)); +#line 1374 "TransitionsInterfaces.c" /** * Returns the frames per second of the {@link Effect}. */ #line 122 "/home/jens/Source/shotwell/src/plugins/TransitionsInterfaces.vala" - g_object_class_install_property (G_OBJECT_CLASS (klass), SPIT_TRANSITIONS_MOTION_FPS, g_param_spec_int ("fps", "fps", "fps", G_MININT, G_MAXINT, 0, G_PARAM_STATIC_NAME | G_PARAM_STATIC_NICK | G_PARAM_STATIC_BLURB | G_PARAM_READABLE)); -#line 1245 "TransitionsInterfaces.c" + g_object_class_install_property (G_OBJECT_CLASS (klass), SPIT_TRANSITIONS_MOTION_FPS_PROPERTY, g_param_spec_int ("fps", "fps", "fps", G_MININT, G_MAXINT, 0, G_PARAM_STATIC_NAME | G_PARAM_STATIC_NICK | G_PARAM_STATIC_BLURB | G_PARAM_READABLE)); +#line 1380 "TransitionsInterfaces.c" /** * Returns the amount of time the transition should take (in milliseconds). */ #line 122 "/home/jens/Source/shotwell/src/plugins/TransitionsInterfaces.vala" - g_object_class_install_property (G_OBJECT_CLASS (klass), SPIT_TRANSITIONS_MOTION_DURATION_MSEC, g_param_spec_int ("duration-msec", "duration-msec", "duration-msec", G_MININT, G_MAXINT, 0, G_PARAM_STATIC_NAME | G_PARAM_STATIC_NICK | G_PARAM_STATIC_BLURB | G_PARAM_READABLE)); -#line 1251 "TransitionsInterfaces.c" + g_object_class_install_property (G_OBJECT_CLASS (klass), SPIT_TRANSITIONS_MOTION_DURATION_MSEC_PROPERTY, g_param_spec_int ("duration-msec", "duration-msec", "duration-msec", G_MININT, G_MAXINT, 0, G_PARAM_STATIC_NAME | G_PARAM_STATIC_NICK | G_PARAM_STATIC_BLURB | G_PARAM_READABLE)); +#line 1386 "TransitionsInterfaces.c" /** * Returns the number of frames that should be required to perform the transition in the * expected {@link duration_msec}. */ #line 122 "/home/jens/Source/shotwell/src/plugins/TransitionsInterfaces.vala" - g_object_class_install_property (G_OBJECT_CLASS (klass), SPIT_TRANSITIONS_MOTION_TOTAL_FRAMES, g_param_spec_int ("total-frames", "total-frames", "total-frames", G_MININT, G_MAXINT, 0, G_PARAM_STATIC_NAME | G_PARAM_STATIC_NICK | G_PARAM_STATIC_BLURB | G_PARAM_READABLE)); -#line 1258 "TransitionsInterfaces.c" + g_object_class_install_property (G_OBJECT_CLASS (klass), SPIT_TRANSITIONS_MOTION_TOTAL_FRAMES_PROPERTY, g_param_spec_int ("total-frames", "total-frames", "total-frames", G_MININT, G_MAXINT, 0, G_PARAM_STATIC_NAME | G_PARAM_STATIC_NICK | G_PARAM_STATIC_BLURB | G_PARAM_READABLE)); +#line 1393 "TransitionsInterfaces.c" /** * Returns the approximate time between each frame draw (in milliseconds). */ #line 122 "/home/jens/Source/shotwell/src/plugins/TransitionsInterfaces.vala" - g_object_class_install_property (G_OBJECT_CLASS (klass), SPIT_TRANSITIONS_MOTION_TICK_MSEC, g_param_spec_int ("tick-msec", "tick-msec", "tick-msec", G_MININT, G_MAXINT, 0, G_PARAM_STATIC_NAME | G_PARAM_STATIC_NICK | G_PARAM_STATIC_BLURB | G_PARAM_READABLE)); -#line 1264 "TransitionsInterfaces.c" + g_object_class_install_property (G_OBJECT_CLASS (klass), SPIT_TRANSITIONS_MOTION_TICK_MSEC_PROPERTY, g_param_spec_int ("tick-msec", "tick-msec", "tick-msec", G_MININT, G_MAXINT, 0, G_PARAM_STATIC_NAME | G_PARAM_STATIC_NICK | G_PARAM_STATIC_BLURB | G_PARAM_READABLE)); +#line 1399 "TransitionsInterfaces.c" } static void spit_transitions_motion_instance_init (SpitTransitionsMotion * self) { #line 122 "/home/jens/Source/shotwell/src/plugins/TransitionsInterfaces.vala" self->priv = SPIT_TRANSITIONS_MOTION_GET_PRIVATE (self); -#line 1271 "TransitionsInterfaces.c" +#line 1406 "TransitionsInterfaces.c" } -static void spit_transitions_motion_finalize (GObject* obj) { +static void spit_transitions_motion_finalize (GObject * obj) { SpitTransitionsMotion * self; #line 122 "/home/jens/Source/shotwell/src/plugins/TransitionsInterfaces.vala" self = G_TYPE_CHECK_INSTANCE_CAST (obj, SPIT_TRANSITIONS_TYPE_MOTION, SpitTransitionsMotion); #line 122 "/home/jens/Source/shotwell/src/plugins/TransitionsInterfaces.vala" G_OBJECT_CLASS (spit_transitions_motion_parent_class)->finalize (obj); -#line 1281 "TransitionsInterfaces.c" +#line 1416 "TransitionsInterfaces.c" } @@ -1305,42 +1440,42 @@ static void _vala_spit_transitions_motion_get_property (GObject * object, guint #line 122 "/home/jens/Source/shotwell/src/plugins/TransitionsInterfaces.vala" switch (property_id) { #line 122 "/home/jens/Source/shotwell/src/plugins/TransitionsInterfaces.vala" - case SPIT_TRANSITIONS_MOTION_DIRECTION: + case SPIT_TRANSITIONS_MOTION_DIRECTION_PROPERTY: #line 122 "/home/jens/Source/shotwell/src/plugins/TransitionsInterfaces.vala" g_value_set_enum (value, spit_transitions_motion_get_direction (self)); #line 122 "/home/jens/Source/shotwell/src/plugins/TransitionsInterfaces.vala" break; #line 122 "/home/jens/Source/shotwell/src/plugins/TransitionsInterfaces.vala" - case SPIT_TRANSITIONS_MOTION_FPS: + case SPIT_TRANSITIONS_MOTION_FPS_PROPERTY: #line 122 "/home/jens/Source/shotwell/src/plugins/TransitionsInterfaces.vala" g_value_set_int (value, spit_transitions_motion_get_fps (self)); #line 122 "/home/jens/Source/shotwell/src/plugins/TransitionsInterfaces.vala" break; #line 122 "/home/jens/Source/shotwell/src/plugins/TransitionsInterfaces.vala" - case SPIT_TRANSITIONS_MOTION_DURATION_MSEC: + case SPIT_TRANSITIONS_MOTION_DURATION_MSEC_PROPERTY: #line 122 "/home/jens/Source/shotwell/src/plugins/TransitionsInterfaces.vala" g_value_set_int (value, spit_transitions_motion_get_duration_msec (self)); #line 122 "/home/jens/Source/shotwell/src/plugins/TransitionsInterfaces.vala" break; #line 122 "/home/jens/Source/shotwell/src/plugins/TransitionsInterfaces.vala" - case SPIT_TRANSITIONS_MOTION_TOTAL_FRAMES: + case SPIT_TRANSITIONS_MOTION_TOTAL_FRAMES_PROPERTY: #line 122 "/home/jens/Source/shotwell/src/plugins/TransitionsInterfaces.vala" g_value_set_int (value, spit_transitions_motion_get_total_frames (self)); #line 122 "/home/jens/Source/shotwell/src/plugins/TransitionsInterfaces.vala" break; #line 122 "/home/jens/Source/shotwell/src/plugins/TransitionsInterfaces.vala" - case SPIT_TRANSITIONS_MOTION_TICK_MSEC: + case SPIT_TRANSITIONS_MOTION_TICK_MSEC_PROPERTY: #line 122 "/home/jens/Source/shotwell/src/plugins/TransitionsInterfaces.vala" g_value_set_int (value, spit_transitions_motion_get_tick_msec (self)); #line 122 "/home/jens/Source/shotwell/src/plugins/TransitionsInterfaces.vala" break; -#line 1338 "TransitionsInterfaces.c" +#line 1473 "TransitionsInterfaces.c" default: #line 122 "/home/jens/Source/shotwell/src/plugins/TransitionsInterfaces.vala" G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec); #line 122 "/home/jens/Source/shotwell/src/plugins/TransitionsInterfaces.vala" break; -#line 1344 "TransitionsInterfaces.c" +#line 1479 "TransitionsInterfaces.c" } } @@ -1351,30 +1486,30 @@ static void _vala_spit_transitions_motion_set_property (GObject * object, guint #line 122 "/home/jens/Source/shotwell/src/plugins/TransitionsInterfaces.vala" switch (property_id) { #line 122 "/home/jens/Source/shotwell/src/plugins/TransitionsInterfaces.vala" - case SPIT_TRANSITIONS_MOTION_DIRECTION: + case SPIT_TRANSITIONS_MOTION_DIRECTION_PROPERTY: #line 122 "/home/jens/Source/shotwell/src/plugins/TransitionsInterfaces.vala" spit_transitions_motion_set_direction (self, g_value_get_enum (value)); #line 122 "/home/jens/Source/shotwell/src/plugins/TransitionsInterfaces.vala" break; #line 122 "/home/jens/Source/shotwell/src/plugins/TransitionsInterfaces.vala" - case SPIT_TRANSITIONS_MOTION_FPS: + case SPIT_TRANSITIONS_MOTION_FPS_PROPERTY: #line 122 "/home/jens/Source/shotwell/src/plugins/TransitionsInterfaces.vala" spit_transitions_motion_set_fps (self, g_value_get_int (value)); #line 122 "/home/jens/Source/shotwell/src/plugins/TransitionsInterfaces.vala" break; #line 122 "/home/jens/Source/shotwell/src/plugins/TransitionsInterfaces.vala" - case SPIT_TRANSITIONS_MOTION_DURATION_MSEC: + case SPIT_TRANSITIONS_MOTION_DURATION_MSEC_PROPERTY: #line 122 "/home/jens/Source/shotwell/src/plugins/TransitionsInterfaces.vala" spit_transitions_motion_set_duration_msec (self, g_value_get_int (value)); #line 122 "/home/jens/Source/shotwell/src/plugins/TransitionsInterfaces.vala" break; -#line 1372 "TransitionsInterfaces.c" +#line 1507 "TransitionsInterfaces.c" default: #line 122 "/home/jens/Source/shotwell/src/plugins/TransitionsInterfaces.vala" G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec); #line 122 "/home/jens/Source/shotwell/src/plugins/TransitionsInterfaces.vala" break; -#line 1378 "TransitionsInterfaces.c" +#line 1513 "TransitionsInterfaces.c" } } @@ -1387,7 +1522,7 @@ SpitTransitionsEffect* spit_transitions_descriptor_create (SpitTransitionsDescri g_return_val_if_fail (SPIT_TRANSITIONS_IS_DESCRIPTOR (self), NULL); #line 191 "/home/jens/Source/shotwell/src/plugins/TransitionsInterfaces.vala" return SPIT_TRANSITIONS_DESCRIPTOR_GET_INTERFACE (self)->create (self, host); -#line 1391 "TransitionsInterfaces.c" +#line 1526 "TransitionsInterfaces.c" } @@ -1400,7 +1535,7 @@ void spit_transitions_descriptor_reserved0 (SpitTransitionsDescriptor* self) { g_return_if_fail (SPIT_TRANSITIONS_IS_DESCRIPTOR (self)); #line 196 "/home/jens/Source/shotwell/src/plugins/TransitionsInterfaces.vala" SPIT_TRANSITIONS_DESCRIPTOR_GET_INTERFACE (self)->reserved0 (self); -#line 1404 "TransitionsInterfaces.c" +#line 1539 "TransitionsInterfaces.c" } @@ -1413,7 +1548,7 @@ void spit_transitions_descriptor_reserved1 (SpitTransitionsDescriptor* self) { g_return_if_fail (SPIT_TRANSITIONS_IS_DESCRIPTOR (self)); #line 197 "/home/jens/Source/shotwell/src/plugins/TransitionsInterfaces.vala" SPIT_TRANSITIONS_DESCRIPTOR_GET_INTERFACE (self)->reserved1 (self); -#line 1417 "TransitionsInterfaces.c" +#line 1552 "TransitionsInterfaces.c" } @@ -1426,7 +1561,7 @@ void spit_transitions_descriptor_reserved2 (SpitTransitionsDescriptor* self) { g_return_if_fail (SPIT_TRANSITIONS_IS_DESCRIPTOR (self)); #line 198 "/home/jens/Source/shotwell/src/plugins/TransitionsInterfaces.vala" SPIT_TRANSITIONS_DESCRIPTOR_GET_INTERFACE (self)->reserved2 (self); -#line 1430 "TransitionsInterfaces.c" +#line 1565 "TransitionsInterfaces.c" } @@ -1439,7 +1574,7 @@ void spit_transitions_descriptor_reserved3 (SpitTransitionsDescriptor* self) { g_return_if_fail (SPIT_TRANSITIONS_IS_DESCRIPTOR (self)); #line 199 "/home/jens/Source/shotwell/src/plugins/TransitionsInterfaces.vala" SPIT_TRANSITIONS_DESCRIPTOR_GET_INTERFACE (self)->reserved3 (self); -#line 1443 "TransitionsInterfaces.c" +#line 1578 "TransitionsInterfaces.c" } @@ -1452,7 +1587,7 @@ void spit_transitions_descriptor_reserved4 (SpitTransitionsDescriptor* self) { g_return_if_fail (SPIT_TRANSITIONS_IS_DESCRIPTOR (self)); #line 200 "/home/jens/Source/shotwell/src/plugins/TransitionsInterfaces.vala" SPIT_TRANSITIONS_DESCRIPTOR_GET_INTERFACE (self)->reserved4 (self); -#line 1456 "TransitionsInterfaces.c" +#line 1591 "TransitionsInterfaces.c" } @@ -1465,7 +1600,7 @@ void spit_transitions_descriptor_reserved5 (SpitTransitionsDescriptor* self) { g_return_if_fail (SPIT_TRANSITIONS_IS_DESCRIPTOR (self)); #line 201 "/home/jens/Source/shotwell/src/plugins/TransitionsInterfaces.vala" SPIT_TRANSITIONS_DESCRIPTOR_GET_INTERFACE (self)->reserved5 (self); -#line 1469 "TransitionsInterfaces.c" +#line 1604 "TransitionsInterfaces.c" } @@ -1478,7 +1613,7 @@ void spit_transitions_descriptor_reserved6 (SpitTransitionsDescriptor* self) { g_return_if_fail (SPIT_TRANSITIONS_IS_DESCRIPTOR (self)); #line 202 "/home/jens/Source/shotwell/src/plugins/TransitionsInterfaces.vala" SPIT_TRANSITIONS_DESCRIPTOR_GET_INTERFACE (self)->reserved6 (self); -#line 1482 "TransitionsInterfaces.c" +#line 1617 "TransitionsInterfaces.c" } @@ -1491,7 +1626,7 @@ void spit_transitions_descriptor_reserved7 (SpitTransitionsDescriptor* self) { g_return_if_fail (SPIT_TRANSITIONS_IS_DESCRIPTOR (self)); #line 203 "/home/jens/Source/shotwell/src/plugins/TransitionsInterfaces.vala" SPIT_TRANSITIONS_DESCRIPTOR_GET_INTERFACE (self)->reserved7 (self); -#line 1495 "TransitionsInterfaces.c" +#line 1630 "TransitionsInterfaces.c" } @@ -1518,7 +1653,7 @@ static void spit_transitions_descriptor_base_init (SpitTransitionsDescriptorIfac iface->reserved6 = spit_transitions_descriptor_real_reserved6; #line 187 "/home/jens/Source/shotwell/src/plugins/TransitionsInterfaces.vala" iface->reserved7 = spit_transitions_descriptor_real_reserved7; -#line 1522 "TransitionsInterfaces.c" +#line 1657 "TransitionsInterfaces.c" } } @@ -1555,7 +1690,7 @@ void spit_transitions_effect_get_fps (SpitTransitionsEffect* self, gint* desired g_return_if_fail (SPIT_TRANSITIONS_IS_EFFECT (self)); #line 240 "/home/jens/Source/shotwell/src/plugins/TransitionsInterfaces.vala" SPIT_TRANSITIONS_EFFECT_GET_INTERFACE (self)->get_fps (self, desired_fps, min_fps); -#line 1559 "TransitionsInterfaces.c" +#line 1694 "TransitionsInterfaces.c" } @@ -1569,7 +1704,7 @@ void spit_transitions_effect_start (SpitTransitionsEffect* self, SpitTransitions g_return_if_fail (SPIT_TRANSITIONS_IS_EFFECT (self)); #line 247 "/home/jens/Source/shotwell/src/plugins/TransitionsInterfaces.vala" SPIT_TRANSITIONS_EFFECT_GET_INTERFACE (self)->start (self, visuals, motion); -#line 1573 "TransitionsInterfaces.c" +#line 1708 "TransitionsInterfaces.c" } @@ -1581,7 +1716,7 @@ gboolean spit_transitions_effect_needs_clear_background (SpitTransitionsEffect* g_return_val_if_fail (SPIT_TRANSITIONS_IS_EFFECT (self), FALSE); #line 252 "/home/jens/Source/shotwell/src/plugins/TransitionsInterfaces.vala" return SPIT_TRANSITIONS_EFFECT_GET_INTERFACE (self)->needs_clear_background (self); -#line 1585 "TransitionsInterfaces.c" +#line 1720 "TransitionsInterfaces.c" } @@ -1601,7 +1736,7 @@ void spit_transitions_effect_paint (SpitTransitionsEffect* self, SpitTransitions g_return_if_fail (SPIT_TRANSITIONS_IS_EFFECT (self)); #line 265 "/home/jens/Source/shotwell/src/plugins/TransitionsInterfaces.vala" SPIT_TRANSITIONS_EFFECT_GET_INTERFACE (self)->paint (self, visuals, motion, ctx, width, height, frame_number); -#line 1605 "TransitionsInterfaces.c" +#line 1740 "TransitionsInterfaces.c" } @@ -1619,7 +1754,7 @@ void spit_transitions_effect_advance (SpitTransitionsEffect* self, SpitTransitio g_return_if_fail (SPIT_TRANSITIONS_IS_EFFECT (self)); #line 277 "/home/jens/Source/shotwell/src/plugins/TransitionsInterfaces.vala" SPIT_TRANSITIONS_EFFECT_GET_INTERFACE (self)->advance (self, visuals, motion, frame_number); -#line 1623 "TransitionsInterfaces.c" +#line 1758 "TransitionsInterfaces.c" } @@ -1633,7 +1768,7 @@ void spit_transitions_effect_cancel (SpitTransitionsEffect* self) { g_return_if_fail (SPIT_TRANSITIONS_IS_EFFECT (self)); #line 284 "/home/jens/Source/shotwell/src/plugins/TransitionsInterfaces.vala" SPIT_TRANSITIONS_EFFECT_GET_INTERFACE (self)->cancel (self); -#line 1637 "TransitionsInterfaces.c" +#line 1772 "TransitionsInterfaces.c" } @@ -1646,7 +1781,7 @@ void spit_transitions_effect_reserved0 (SpitTransitionsEffect* self) { g_return_if_fail (SPIT_TRANSITIONS_IS_EFFECT (self)); #line 289 "/home/jens/Source/shotwell/src/plugins/TransitionsInterfaces.vala" SPIT_TRANSITIONS_EFFECT_GET_INTERFACE (self)->reserved0 (self); -#line 1650 "TransitionsInterfaces.c" +#line 1785 "TransitionsInterfaces.c" } @@ -1659,7 +1794,7 @@ void spit_transitions_effect_reserved1 (SpitTransitionsEffect* self) { g_return_if_fail (SPIT_TRANSITIONS_IS_EFFECT (self)); #line 290 "/home/jens/Source/shotwell/src/plugins/TransitionsInterfaces.vala" SPIT_TRANSITIONS_EFFECT_GET_INTERFACE (self)->reserved1 (self); -#line 1663 "TransitionsInterfaces.c" +#line 1798 "TransitionsInterfaces.c" } @@ -1672,7 +1807,7 @@ void spit_transitions_effect_reserved2 (SpitTransitionsEffect* self) { g_return_if_fail (SPIT_TRANSITIONS_IS_EFFECT (self)); #line 291 "/home/jens/Source/shotwell/src/plugins/TransitionsInterfaces.vala" SPIT_TRANSITIONS_EFFECT_GET_INTERFACE (self)->reserved2 (self); -#line 1676 "TransitionsInterfaces.c" +#line 1811 "TransitionsInterfaces.c" } @@ -1685,7 +1820,7 @@ void spit_transitions_effect_reserved3 (SpitTransitionsEffect* self) { g_return_if_fail (SPIT_TRANSITIONS_IS_EFFECT (self)); #line 292 "/home/jens/Source/shotwell/src/plugins/TransitionsInterfaces.vala" SPIT_TRANSITIONS_EFFECT_GET_INTERFACE (self)->reserved3 (self); -#line 1689 "TransitionsInterfaces.c" +#line 1824 "TransitionsInterfaces.c" } @@ -1698,7 +1833,7 @@ void spit_transitions_effect_reserved4 (SpitTransitionsEffect* self) { g_return_if_fail (SPIT_TRANSITIONS_IS_EFFECT (self)); #line 293 "/home/jens/Source/shotwell/src/plugins/TransitionsInterfaces.vala" SPIT_TRANSITIONS_EFFECT_GET_INTERFACE (self)->reserved4 (self); -#line 1702 "TransitionsInterfaces.c" +#line 1837 "TransitionsInterfaces.c" } @@ -1711,7 +1846,7 @@ void spit_transitions_effect_reserved5 (SpitTransitionsEffect* self) { g_return_if_fail (SPIT_TRANSITIONS_IS_EFFECT (self)); #line 294 "/home/jens/Source/shotwell/src/plugins/TransitionsInterfaces.vala" SPIT_TRANSITIONS_EFFECT_GET_INTERFACE (self)->reserved5 (self); -#line 1715 "TransitionsInterfaces.c" +#line 1850 "TransitionsInterfaces.c" } @@ -1724,7 +1859,7 @@ void spit_transitions_effect_reserved6 (SpitTransitionsEffect* self) { g_return_if_fail (SPIT_TRANSITIONS_IS_EFFECT (self)); #line 295 "/home/jens/Source/shotwell/src/plugins/TransitionsInterfaces.vala" SPIT_TRANSITIONS_EFFECT_GET_INTERFACE (self)->reserved6 (self); -#line 1728 "TransitionsInterfaces.c" +#line 1863 "TransitionsInterfaces.c" } @@ -1737,7 +1872,7 @@ void spit_transitions_effect_reserved7 (SpitTransitionsEffect* self) { g_return_if_fail (SPIT_TRANSITIONS_IS_EFFECT (self)); #line 296 "/home/jens/Source/shotwell/src/plugins/TransitionsInterfaces.vala" SPIT_TRANSITIONS_EFFECT_GET_INTERFACE (self)->reserved7 (self); -#line 1741 "TransitionsInterfaces.c" +#line 1876 "TransitionsInterfaces.c" } @@ -1764,7 +1899,7 @@ static void spit_transitions_effect_base_init (SpitTransitionsEffectIface * ifac iface->reserved6 = spit_transitions_effect_real_reserved6; #line 229 "/home/jens/Source/shotwell/src/plugins/TransitionsInterfaces.vala" iface->reserved7 = spit_transitions_effect_real_reserved7; -#line 1768 "TransitionsInterfaces.c" +#line 1903 "TransitionsInterfaces.c" } } |