From 9e7cd144725a270e0460b21747619f447ca87684 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Frings-F=C3=BCrst?= Date: Fri, 14 Apr 2017 18:51:46 +0200 Subject: New upstream version 0.26.1 --- src/slideshow/TransitionEffects.c | 308 +++++++++++++++++++------------------- 1 file changed, 156 insertions(+), 152 deletions(-) (limited to 'src/slideshow/TransitionEffects.c') diff --git a/src/slideshow/TransitionEffects.c b/src/slideshow/TransitionEffects.c index f874db1..0e05963 100644 --- a/src/slideshow/TransitionEffects.c +++ b/src/slideshow/TransitionEffects.c @@ -1,4 +1,4 @@ -/* TransitionEffects.c generated by valac 0.34.4, the Vala compiler +/* TransitionEffects.c generated by valac 0.34.7, the Vala compiler * generated from TransitionEffects.vala, do not modify */ /* Copyright 2010 Maxim Kartashev @@ -641,13 +641,17 @@ GeeCollection* transition_effects_manager_get_effect_names (TransitionEffectsMan _tmp0__target = comparator_target; #line 75 "/home/jens/Source/shotwell/src/slideshow/TransitionEffects.vala" _tmp0__target_destroy_notify = comparator_target_destroy_notify; +#line 75 "/home/jens/Source/shotwell/src/slideshow/TransitionEffects.vala" + comparator = NULL; +#line 75 "/home/jens/Source/shotwell/src/slideshow/TransitionEffects.vala" + comparator_target = NULL; #line 75 "/home/jens/Source/shotwell/src/slideshow/TransitionEffects.vala" comparator_target_destroy_notify = NULL; #line 75 "/home/jens/Source/shotwell/src/slideshow/TransitionEffects.vala" - _tmp1_ = gee_tree_set_new (G_TYPE_STRING, (GBoxedCopyFunc) g_strdup, g_free, _tmp0_, _tmp0__target, _tmp0__target_destroy_notify); + _tmp1_ = gee_tree_set_new (G_TYPE_STRING, (GBoxedCopyFunc) g_strdup, (GDestroyNotify) g_free, _tmp0_, _tmp0__target, _tmp0__target_destroy_notify); #line 75 "/home/jens/Source/shotwell/src/slideshow/TransitionEffects.vala" effect_names = G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, GEE_TYPE_COLLECTION, GeeCollection); -#line 649 "TransitionEffects.c" +#line 653 "TransitionEffects.c" { GeeIterator* _desc_it = NULL; GeeMap* _tmp2_ = NULL; @@ -674,7 +678,7 @@ GeeCollection* transition_effects_manager_get_effect_names (TransitionEffectsMan _desc_it = _tmp7_; #line 76 "/home/jens/Source/shotwell/src/slideshow/TransitionEffects.vala" while (TRUE) { -#line 676 "TransitionEffects.c" +#line 680 "TransitionEffects.c" GeeIterator* _tmp8_ = NULL; gboolean _tmp9_ = FALSE; SpitTransitionsDescriptor* desc = NULL; @@ -691,7 +695,7 @@ GeeCollection* transition_effects_manager_get_effect_names (TransitionEffectsMan if (!_tmp9_) { #line 76 "/home/jens/Source/shotwell/src/slideshow/TransitionEffects.vala" break; -#line 693 "TransitionEffects.c" +#line 697 "TransitionEffects.c" } #line 76 "/home/jens/Source/shotwell/src/slideshow/TransitionEffects.vala" _tmp10_ = _desc_it; @@ -709,11 +713,11 @@ GeeCollection* transition_effects_manager_get_effect_names (TransitionEffectsMan gee_collection_add (_tmp12_, _tmp14_); #line 76 "/home/jens/Source/shotwell/src/slideshow/TransitionEffects.vala" _g_object_unref0 (desc); -#line 711 "TransitionEffects.c" +#line 715 "TransitionEffects.c" } #line 76 "/home/jens/Source/shotwell/src/slideshow/TransitionEffects.vala" _g_object_unref0 (_desc_it); -#line 715 "TransitionEffects.c" +#line 719 "TransitionEffects.c" } #line 79 "/home/jens/Source/shotwell/src/slideshow/TransitionEffects.vala" result = effect_names; @@ -727,7 +731,7 @@ GeeCollection* transition_effects_manager_get_effect_names (TransitionEffectsMan comparator_target_destroy_notify = NULL; #line 79 "/home/jens/Source/shotwell/src/slideshow/TransitionEffects.vala" return result; -#line 729 "TransitionEffects.c" +#line 733 "TransitionEffects.c" } @@ -737,7 +741,7 @@ gchar* transition_effects_manager_get_id_for_effect_name (TransitionEffectsManag g_return_val_if_fail (IS_TRANSITION_EFFECTS_MANAGER (self), NULL); #line 82 "/home/jens/Source/shotwell/src/slideshow/TransitionEffects.vala" g_return_val_if_fail (effect_name != NULL, NULL); -#line 739 "TransitionEffects.c" +#line 743 "TransitionEffects.c" { GeeIterator* _desc_it = NULL; GeeMap* _tmp0_ = NULL; @@ -764,7 +768,7 @@ gchar* transition_effects_manager_get_id_for_effect_name (TransitionEffectsManag _desc_it = _tmp5_; #line 83 "/home/jens/Source/shotwell/src/slideshow/TransitionEffects.vala" while (TRUE) { -#line 766 "TransitionEffects.c" +#line 770 "TransitionEffects.c" GeeIterator* _tmp6_ = NULL; gboolean _tmp7_ = FALSE; SpitTransitionsDescriptor* desc = NULL; @@ -781,7 +785,7 @@ gchar* transition_effects_manager_get_id_for_effect_name (TransitionEffectsManag if (!_tmp7_) { #line 83 "/home/jens/Source/shotwell/src/slideshow/TransitionEffects.vala" break; -#line 783 "TransitionEffects.c" +#line 787 "TransitionEffects.c" } #line 83 "/home/jens/Source/shotwell/src/slideshow/TransitionEffects.vala" _tmp8_ = _desc_it; @@ -797,7 +801,7 @@ gchar* transition_effects_manager_get_id_for_effect_name (TransitionEffectsManag _tmp12_ = effect_name; #line 84 "/home/jens/Source/shotwell/src/slideshow/TransitionEffects.vala" if (g_strcmp0 (_tmp11_, _tmp12_) == 0) { -#line 799 "TransitionEffects.c" +#line 803 "TransitionEffects.c" SpitTransitionsDescriptor* _tmp13_ = NULL; const gchar* _tmp14_ = NULL; gchar* _tmp15_ = NULL; @@ -815,21 +819,21 @@ gchar* transition_effects_manager_get_id_for_effect_name (TransitionEffectsManag _g_object_unref0 (_desc_it); #line 85 "/home/jens/Source/shotwell/src/slideshow/TransitionEffects.vala" return result; -#line 817 "TransitionEffects.c" +#line 821 "TransitionEffects.c" } #line 83 "/home/jens/Source/shotwell/src/slideshow/TransitionEffects.vala" _g_object_unref0 (desc); -#line 821 "TransitionEffects.c" +#line 825 "TransitionEffects.c" } #line 83 "/home/jens/Source/shotwell/src/slideshow/TransitionEffects.vala" _g_object_unref0 (_desc_it); -#line 825 "TransitionEffects.c" +#line 829 "TransitionEffects.c" } #line 88 "/home/jens/Source/shotwell/src/slideshow/TransitionEffects.vala" result = NULL; #line 88 "/home/jens/Source/shotwell/src/slideshow/TransitionEffects.vala" return result; -#line 831 "TransitionEffects.c" +#line 835 "TransitionEffects.c" } @@ -852,7 +856,7 @@ SpitTransitionsDescriptor* transition_effects_manager_get_effect_descriptor (Tra result = (SpitTransitionsDescriptor*) _tmp2_; #line 92 "/home/jens/Source/shotwell/src/slideshow/TransitionEffects.vala" return result; -#line 854 "TransitionEffects.c" +#line 858 "TransitionEffects.c" } @@ -878,7 +882,7 @@ gchar* transition_effects_manager_get_effect_name (TransitionEffectsManager* sel _tmp3_ = desc; #line 98 "/home/jens/Source/shotwell/src/slideshow/TransitionEffects.vala" if (_tmp3_ != NULL) { -#line 880 "TransitionEffects.c" +#line 884 "TransitionEffects.c" SpitTransitionsDescriptor* _tmp4_ = NULL; const gchar* _tmp5_ = NULL; #line 98 "/home/jens/Source/shotwell/src/slideshow/TransitionEffects.vala" @@ -887,14 +891,14 @@ gchar* transition_effects_manager_get_effect_name (TransitionEffectsManager* sel _tmp5_ = spit_pluggable_get_pluggable_name (G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, SPIT_TYPE_PLUGGABLE, SpitPluggable)); #line 98 "/home/jens/Source/shotwell/src/slideshow/TransitionEffects.vala" _tmp2_ = _tmp5_; -#line 889 "TransitionEffects.c" +#line 893 "TransitionEffects.c" } else { const gchar* _tmp6_ = NULL; #line 98 "/home/jens/Source/shotwell/src/slideshow/TransitionEffects.vala" _tmp6_ = _ ("(None)"); #line 98 "/home/jens/Source/shotwell/src/slideshow/TransitionEffects.vala" _tmp2_ = _tmp6_; -#line 896 "TransitionEffects.c" +#line 900 "TransitionEffects.c" } #line 98 "/home/jens/Source/shotwell/src/slideshow/TransitionEffects.vala" _tmp7_ = g_strdup (_tmp2_); @@ -904,7 +908,7 @@ gchar* transition_effects_manager_get_effect_name (TransitionEffectsManager* sel _g_object_unref0 (desc); #line 98 "/home/jens/Source/shotwell/src/slideshow/TransitionEffects.vala" return result; -#line 906 "TransitionEffects.c" +#line 910 "TransitionEffects.c" } @@ -922,7 +926,7 @@ SpitTransitionsDescriptor* transition_effects_manager_get_null_descriptor (Trans result = _tmp1_; #line 102 "/home/jens/Source/shotwell/src/slideshow/TransitionEffects.vala" return result; -#line 924 "TransitionEffects.c" +#line 928 "TransitionEffects.c" } @@ -947,7 +951,7 @@ TransitionClock* transition_effects_manager_create_transition_clock (TransitionE _tmp3_ = desc; #line 108 "/home/jens/Source/shotwell/src/slideshow/TransitionEffects.vala" if (_tmp3_ != NULL) { -#line 949 "TransitionEffects.c" +#line 953 "TransitionEffects.c" SpitTransitionsDescriptor* _tmp4_ = NULL; TransitionClock* _tmp5_ = NULL; #line 108 "/home/jens/Source/shotwell/src/slideshow/TransitionEffects.vala" @@ -958,13 +962,13 @@ TransitionClock* transition_effects_manager_create_transition_clock (TransitionE _transition_clock_unref0 (_tmp2_); #line 108 "/home/jens/Source/shotwell/src/slideshow/TransitionEffects.vala" _tmp2_ = _tmp5_; -#line 960 "TransitionEffects.c" +#line 964 "TransitionEffects.c" } else { #line 108 "/home/jens/Source/shotwell/src/slideshow/TransitionEffects.vala" _transition_clock_unref0 (_tmp2_); #line 108 "/home/jens/Source/shotwell/src/slideshow/TransitionEffects.vala" _tmp2_ = NULL; -#line 966 "TransitionEffects.c" +#line 970 "TransitionEffects.c" } #line 108 "/home/jens/Source/shotwell/src/slideshow/TransitionEffects.vala" result = _tmp2_; @@ -972,7 +976,7 @@ TransitionClock* transition_effects_manager_create_transition_clock (TransitionE _g_object_unref0 (desc); #line 108 "/home/jens/Source/shotwell/src/slideshow/TransitionEffects.vala" return result; -#line 974 "TransitionEffects.c" +#line 978 "TransitionEffects.c" } @@ -990,14 +994,14 @@ TransitionClock* transition_effects_manager_create_null_transition_clock (Transi result = _tmp1_; #line 112 "/home/jens/Source/shotwell/src/slideshow/TransitionEffects.vala" return result; -#line 992 "TransitionEffects.c" +#line 996 "TransitionEffects.c" } static void value_transition_effects_manager_init (GValue* value) { #line 8 "/home/jens/Source/shotwell/src/slideshow/TransitionEffects.vala" value->data[0].v_pointer = NULL; -#line 999 "TransitionEffects.c" +#line 1003 "TransitionEffects.c" } @@ -1006,7 +1010,7 @@ static void value_transition_effects_manager_free_value (GValue* value) { if (value->data[0].v_pointer) { #line 8 "/home/jens/Source/shotwell/src/slideshow/TransitionEffects.vala" transition_effects_manager_unref (value->data[0].v_pointer); -#line 1008 "TransitionEffects.c" +#line 1012 "TransitionEffects.c" } } @@ -1016,11 +1020,11 @@ static void value_transition_effects_manager_copy_value (const GValue* src_value if (src_value->data[0].v_pointer) { #line 8 "/home/jens/Source/shotwell/src/slideshow/TransitionEffects.vala" dest_value->data[0].v_pointer = transition_effects_manager_ref (src_value->data[0].v_pointer); -#line 1018 "TransitionEffects.c" +#line 1022 "TransitionEffects.c" } else { #line 8 "/home/jens/Source/shotwell/src/slideshow/TransitionEffects.vala" dest_value->data[0].v_pointer = NULL; -#line 1022 "TransitionEffects.c" +#line 1026 "TransitionEffects.c" } } @@ -1028,37 +1032,37 @@ static void value_transition_effects_manager_copy_value (const GValue* src_value static gpointer value_transition_effects_manager_peek_pointer (const GValue* value) { #line 8 "/home/jens/Source/shotwell/src/slideshow/TransitionEffects.vala" return value->data[0].v_pointer; -#line 1030 "TransitionEffects.c" +#line 1034 "TransitionEffects.c" } static gchar* value_transition_effects_manager_collect_value (GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) { #line 8 "/home/jens/Source/shotwell/src/slideshow/TransitionEffects.vala" if (collect_values[0].v_pointer) { -#line 1037 "TransitionEffects.c" +#line 1041 "TransitionEffects.c" TransitionEffectsManager* object; object = collect_values[0].v_pointer; #line 8 "/home/jens/Source/shotwell/src/slideshow/TransitionEffects.vala" if (object->parent_instance.g_class == NULL) { #line 8 "/home/jens/Source/shotwell/src/slideshow/TransitionEffects.vala" return g_strconcat ("invalid unclassed object pointer for value type `", G_VALUE_TYPE_NAME (value), "'", NULL); -#line 1044 "TransitionEffects.c" +#line 1048 "TransitionEffects.c" } else if (!g_value_type_compatible (G_TYPE_FROM_INSTANCE (object), G_VALUE_TYPE (value))) { #line 8 "/home/jens/Source/shotwell/src/slideshow/TransitionEffects.vala" return g_strconcat ("invalid object type `", g_type_name (G_TYPE_FROM_INSTANCE (object)), "' for value type `", G_VALUE_TYPE_NAME (value), "'", NULL); -#line 1048 "TransitionEffects.c" +#line 1052 "TransitionEffects.c" } #line 8 "/home/jens/Source/shotwell/src/slideshow/TransitionEffects.vala" value->data[0].v_pointer = transition_effects_manager_ref (object); -#line 1052 "TransitionEffects.c" +#line 1056 "TransitionEffects.c" } else { #line 8 "/home/jens/Source/shotwell/src/slideshow/TransitionEffects.vala" value->data[0].v_pointer = NULL; -#line 1056 "TransitionEffects.c" +#line 1060 "TransitionEffects.c" } #line 8 "/home/jens/Source/shotwell/src/slideshow/TransitionEffects.vala" return NULL; -#line 1060 "TransitionEffects.c" +#line 1064 "TransitionEffects.c" } @@ -1069,25 +1073,25 @@ static gchar* value_transition_effects_manager_lcopy_value (const GValue* value, if (!object_p) { #line 8 "/home/jens/Source/shotwell/src/slideshow/TransitionEffects.vala" return g_strdup_printf ("value location for `%s' passed as NULL", G_VALUE_TYPE_NAME (value)); -#line 1071 "TransitionEffects.c" +#line 1075 "TransitionEffects.c" } #line 8 "/home/jens/Source/shotwell/src/slideshow/TransitionEffects.vala" if (!value->data[0].v_pointer) { #line 8 "/home/jens/Source/shotwell/src/slideshow/TransitionEffects.vala" *object_p = NULL; -#line 1077 "TransitionEffects.c" +#line 1081 "TransitionEffects.c" } else if (collect_flags & G_VALUE_NOCOPY_CONTENTS) { #line 8 "/home/jens/Source/shotwell/src/slideshow/TransitionEffects.vala" *object_p = value->data[0].v_pointer; -#line 1081 "TransitionEffects.c" +#line 1085 "TransitionEffects.c" } else { #line 8 "/home/jens/Source/shotwell/src/slideshow/TransitionEffects.vala" *object_p = transition_effects_manager_ref (value->data[0].v_pointer); -#line 1085 "TransitionEffects.c" +#line 1089 "TransitionEffects.c" } #line 8 "/home/jens/Source/shotwell/src/slideshow/TransitionEffects.vala" return NULL; -#line 1089 "TransitionEffects.c" +#line 1093 "TransitionEffects.c" } @@ -1101,7 +1105,7 @@ GParamSpec* param_spec_transition_effects_manager (const gchar* name, const gcha G_PARAM_SPEC (spec)->value_type = object_type; #line 8 "/home/jens/Source/shotwell/src/slideshow/TransitionEffects.vala" return G_PARAM_SPEC (spec); -#line 1103 "TransitionEffects.c" +#line 1107 "TransitionEffects.c" } @@ -1110,7 +1114,7 @@ gpointer value_get_transition_effects_manager (const GValue* value) { g_return_val_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, TYPE_TRANSITION_EFFECTS_MANAGER), NULL); #line 8 "/home/jens/Source/shotwell/src/slideshow/TransitionEffects.vala" return value->data[0].v_pointer; -#line 1112 "TransitionEffects.c" +#line 1116 "TransitionEffects.c" } @@ -1130,17 +1134,17 @@ void value_set_transition_effects_manager (GValue* value, gpointer v_object) { value->data[0].v_pointer = v_object; #line 8 "/home/jens/Source/shotwell/src/slideshow/TransitionEffects.vala" transition_effects_manager_ref (value->data[0].v_pointer); -#line 1132 "TransitionEffects.c" +#line 1136 "TransitionEffects.c" } else { #line 8 "/home/jens/Source/shotwell/src/slideshow/TransitionEffects.vala" value->data[0].v_pointer = NULL; -#line 1136 "TransitionEffects.c" +#line 1140 "TransitionEffects.c" } #line 8 "/home/jens/Source/shotwell/src/slideshow/TransitionEffects.vala" if (old) { #line 8 "/home/jens/Source/shotwell/src/slideshow/TransitionEffects.vala" transition_effects_manager_unref (old); -#line 1142 "TransitionEffects.c" +#line 1146 "TransitionEffects.c" } } @@ -1159,17 +1163,17 @@ void value_take_transition_effects_manager (GValue* value, gpointer v_object) { g_return_if_fail (g_value_type_compatible (G_TYPE_FROM_INSTANCE (v_object), G_VALUE_TYPE (value))); #line 8 "/home/jens/Source/shotwell/src/slideshow/TransitionEffects.vala" value->data[0].v_pointer = v_object; -#line 1161 "TransitionEffects.c" +#line 1165 "TransitionEffects.c" } else { #line 8 "/home/jens/Source/shotwell/src/slideshow/TransitionEffects.vala" value->data[0].v_pointer = NULL; -#line 1165 "TransitionEffects.c" +#line 1169 "TransitionEffects.c" } #line 8 "/home/jens/Source/shotwell/src/slideshow/TransitionEffects.vala" if (old) { #line 8 "/home/jens/Source/shotwell/src/slideshow/TransitionEffects.vala" transition_effects_manager_unref (old); -#line 1171 "TransitionEffects.c" +#line 1175 "TransitionEffects.c" } } @@ -1181,7 +1185,7 @@ static void transition_effects_manager_class_init (TransitionEffectsManagerClass ((TransitionEffectsManagerClass *) klass)->finalize = transition_effects_manager_finalize; #line 8 "/home/jens/Source/shotwell/src/slideshow/TransitionEffects.vala" g_type_class_add_private (klass, sizeof (TransitionEffectsManagerPrivate)); -#line 1183 "TransitionEffects.c" +#line 1187 "TransitionEffects.c" } @@ -1192,7 +1196,7 @@ static void transition_effects_manager_instance_init (TransitionEffectsManager * #line 8 "/home/jens/Source/shotwell/src/slideshow/TransitionEffects.vala" self->priv = TRANSITION_EFFECTS_MANAGER_GET_PRIVATE (self); #line 14 "/home/jens/Source/shotwell/src/slideshow/TransitionEffects.vala" - _tmp0_ = gee_hash_map_new (G_TYPE_STRING, (GBoxedCopyFunc) g_strdup, g_free, SPIT_TRANSITIONS_TYPE_DESCRIPTOR, (GBoxedCopyFunc) g_object_ref, g_object_unref, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL); + _tmp0_ = gee_hash_map_new (G_TYPE_STRING, (GBoxedCopyFunc) g_strdup, (GDestroyNotify) g_free, SPIT_TRANSITIONS_TYPE_DESCRIPTOR, (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL); #line 14 "/home/jens/Source/shotwell/src/slideshow/TransitionEffects.vala" self->priv->effects = G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, GEE_TYPE_MAP, GeeMap); #line 16 "/home/jens/Source/shotwell/src/slideshow/TransitionEffects.vala" @@ -1205,7 +1209,7 @@ static void transition_effects_manager_instance_init (TransitionEffectsManager * self->priv->random_descriptor = G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, SPIT_TRANSITIONS_TYPE_DESCRIPTOR, SpitTransitionsDescriptor); #line 8 "/home/jens/Source/shotwell/src/slideshow/TransitionEffects.vala" self->ref_count = 1; -#line 1207 "TransitionEffects.c" +#line 1211 "TransitionEffects.c" } @@ -1234,7 +1238,7 @@ static void transition_effects_manager_finalize (TransitionEffectsManager* obj) _g_object_unref0 (self->priv->null_descriptor); #line 17 "/home/jens/Source/shotwell/src/slideshow/TransitionEffects.vala" _g_object_unref0 (self->priv->random_descriptor); -#line 1236 "TransitionEffects.c" +#line 1240 "TransitionEffects.c" } @@ -1259,7 +1263,7 @@ gpointer transition_effects_manager_ref (gpointer instance) { g_atomic_int_inc (&self->ref_count); #line 8 "/home/jens/Source/shotwell/src/slideshow/TransitionEffects.vala" return instance; -#line 1261 "TransitionEffects.c" +#line 1265 "TransitionEffects.c" } @@ -1272,7 +1276,7 @@ void transition_effects_manager_unref (gpointer instance) { TRANSITION_EFFECTS_MANAGER_GET_CLASS (self)->finalize (self); #line 8 "/home/jens/Source/shotwell/src/slideshow/TransitionEffects.vala" g_type_free_instance ((GTypeInstance *) self); -#line 1274 "TransitionEffects.c" +#line 1278 "TransitionEffects.c" } } @@ -1340,14 +1344,14 @@ TransitionClock* transition_clock_construct (GType object_type, SpitTransitionsD self->priv->paint_timer = _tmp12_; #line 136 "/home/jens/Source/shotwell/src/slideshow/TransitionEffects.vala" return self; -#line 1342 "TransitionEffects.c" +#line 1346 "TransitionEffects.c" } TransitionClock* transition_clock_new (SpitTransitionsDescriptor* desc) { #line 136 "/home/jens/Source/shotwell/src/slideshow/TransitionEffects.vala" return transition_clock_construct (TYPE_TRANSITION_CLOCK, desc); -#line 1349 "TransitionEffects.c" +#line 1353 "TransitionEffects.c" } @@ -1362,21 +1366,21 @@ gboolean transition_clock_is_in_progress (TransitionClock* self) { _tmp2_ = self->priv->cancelled; #line 152 "/home/jens/Source/shotwell/src/slideshow/TransitionEffects.vala" if (!_tmp2_) { -#line 1364 "TransitionEffects.c" +#line 1368 "TransitionEffects.c" SpitTransitionsMotion* _tmp3_ = NULL; #line 152 "/home/jens/Source/shotwell/src/slideshow/TransitionEffects.vala" _tmp3_ = self->priv->motion; #line 152 "/home/jens/Source/shotwell/src/slideshow/TransitionEffects.vala" _tmp1_ = _tmp3_ != NULL; -#line 1370 "TransitionEffects.c" +#line 1374 "TransitionEffects.c" } else { #line 152 "/home/jens/Source/shotwell/src/slideshow/TransitionEffects.vala" _tmp1_ = FALSE; -#line 1374 "TransitionEffects.c" +#line 1378 "TransitionEffects.c" } #line 152 "/home/jens/Source/shotwell/src/slideshow/TransitionEffects.vala" if (_tmp1_) { -#line 1378 "TransitionEffects.c" +#line 1382 "TransitionEffects.c" gint _tmp4_ = 0; SpitTransitionsMotion* _tmp5_ = NULL; gint _tmp6_ = 0; @@ -1391,17 +1395,17 @@ gboolean transition_clock_is_in_progress (TransitionClock* self) { _tmp7_ = _tmp6_; #line 152 "/home/jens/Source/shotwell/src/slideshow/TransitionEffects.vala" _tmp0_ = _tmp4_ < _tmp7_; -#line 1393 "TransitionEffects.c" +#line 1397 "TransitionEffects.c" } else { #line 152 "/home/jens/Source/shotwell/src/slideshow/TransitionEffects.vala" _tmp0_ = FALSE; -#line 1397 "TransitionEffects.c" +#line 1401 "TransitionEffects.c" } #line 152 "/home/jens/Source/shotwell/src/slideshow/TransitionEffects.vala" result = _tmp0_; #line 152 "/home/jens/Source/shotwell/src/slideshow/TransitionEffects.vala" return result; -#line 1403 "TransitionEffects.c" +#line 1407 "TransitionEffects.c" } @@ -1410,7 +1414,7 @@ static gboolean _transition_clock_tick_gsource_func (gpointer self) { result = transition_clock_tick ((TransitionClock*) self); #line 173 "/home/jens/Source/shotwell/src/slideshow/TransitionEffects.vala" return result; -#line 1412 "TransitionEffects.c" +#line 1416 "TransitionEffects.c" } @@ -1444,7 +1448,7 @@ void transition_clock_start (TransitionClock* self, SpitTransitionsVisuals* visu if (_tmp0_ == 0) { #line 161 "/home/jens/Source/shotwell/src/slideshow/TransitionEffects.vala" return; -#line 1446 "TransitionEffects.c" +#line 1450 "TransitionEffects.c" } #line 163 "/home/jens/Source/shotwell/src/slideshow/TransitionEffects.vala" _tmp1_ = visuals; @@ -1496,7 +1500,7 @@ void transition_clock_start (TransitionClock* self, SpitTransitionsVisuals* visu _tmp15_ = g_timeout_add_full (G_PRIORITY_HIGH, (guint) _tmp14_, _transition_clock_tick_gsource_func, transition_clock_ref (self), transition_clock_unref); #line 173 "/home/jens/Source/shotwell/src/slideshow/TransitionEffects.vala" self->priv->timer_id = _tmp15_; -#line 1498 "TransitionEffects.c" +#line 1502 "TransitionEffects.c" } @@ -1525,7 +1529,7 @@ static void transition_clock_reset (TransitionClock* self) { self->priv->current_fps = 0; #line 185 "/home/jens/Source/shotwell/src/slideshow/TransitionEffects.vala" self->priv->cancelled = FALSE; -#line 1527 "TransitionEffects.c" +#line 1531 "TransitionEffects.c" } @@ -1537,7 +1541,7 @@ static void transition_clock_cancel_timer (TransitionClock* self) { _tmp0_ = self->priv->timer_id; #line 189 "/home/jens/Source/shotwell/src/slideshow/TransitionEffects.vala" if (_tmp0_ != ((guint) 0)) { -#line 1539 "TransitionEffects.c" +#line 1543 "TransitionEffects.c" guint _tmp1_ = 0U; #line 190 "/home/jens/Source/shotwell/src/slideshow/TransitionEffects.vala" _tmp1_ = self->priv->timer_id; @@ -1545,7 +1549,7 @@ static void transition_clock_cancel_timer (TransitionClock* self) { g_source_remove (_tmp1_); #line 191 "/home/jens/Source/shotwell/src/slideshow/TransitionEffects.vala" self->priv->timer_id = (guint) 0; -#line 1547 "TransitionEffects.c" +#line 1551 "TransitionEffects.c" } } @@ -1578,7 +1582,7 @@ static gboolean transition_clock_is_fps_ok (TransitionClock* self) { result = TRUE; #line 200 "/home/jens/Source/shotwell/src/slideshow/TransitionEffects.vala" return result; -#line 1580 "TransitionEffects.c" +#line 1584 "TransitionEffects.c" } #line 202 "/home/jens/Source/shotwell/src/slideshow/TransitionEffects.vala" _tmp2_ = now_ms (); @@ -1594,7 +1598,7 @@ static gboolean transition_clock_is_fps_ok (TransitionClock* self) { result = TRUE; #line 204 "/home/jens/Source/shotwell/src/slideshow/TransitionEffects.vala" return result; -#line 1596 "TransitionEffects.c" +#line 1600 "TransitionEffects.c" } #line 206 "/home/jens/Source/shotwell/src/slideshow/TransitionEffects.vala" _tmp5_ = self->priv->frame_number; @@ -1608,7 +1612,7 @@ static gboolean transition_clock_is_fps_ok (TransitionClock* self) { _tmp8_ = self->priv->min_fps; #line 207 "/home/jens/Source/shotwell/src/slideshow/TransitionEffects.vala" if (_tmp7_ < _tmp8_) { -#line 1610 "TransitionEffects.c" +#line 1614 "TransitionEffects.c" gint _tmp9_ = 0; gint _tmp10_ = 0; gdouble _tmp11_ = 0.0; @@ -1624,7 +1628,7 @@ static gboolean transition_clock_is_fps_ok (TransitionClock* self) { #line 208 "/home/jens/Source/shotwell/src/slideshow/TransitionEffects.vala" g_debug ("TransitionEffects.vala:208: Transition rate of %dfps below minimum of " \ "%dfps (elapsed=%lf frames=%d)", _tmp9_, _tmp10_, _tmp11_, _tmp12_); -#line 1625 "TransitionEffects.c" +#line 1629 "TransitionEffects.c" } #line 212 "/home/jens/Source/shotwell/src/slideshow/TransitionEffects.vala" _tmp13_ = self->priv->current_fps; @@ -1634,7 +1638,7 @@ static gboolean transition_clock_is_fps_ok (TransitionClock* self) { result = _tmp13_ >= _tmp14_; #line 212 "/home/jens/Source/shotwell/src/slideshow/TransitionEffects.vala" return result; -#line 1635 "TransitionEffects.c" +#line 1639 "TransitionEffects.c" } @@ -1658,7 +1662,7 @@ void transition_clock_cancel (TransitionClock* self) { _tmp1__target = self->priv->repaint_target; #line 222 "/home/jens/Source/shotwell/src/slideshow/TransitionEffects.vala" _tmp1_ (_tmp1__target); -#line 1659 "TransitionEffects.c" +#line 1663 "TransitionEffects.c" } @@ -1690,7 +1694,7 @@ gboolean transition_clock_paint (TransitionClock* self, cairo_t* ctx, gint width result = FALSE; #line 229 "/home/jens/Source/shotwell/src/slideshow/TransitionEffects.vala" return result; -#line 1691 "TransitionEffects.c" +#line 1695 "TransitionEffects.c" } #line 231 "/home/jens/Source/shotwell/src/slideshow/TransitionEffects.vala" _tmp1_ = self->priv->paint_timer; @@ -1706,7 +1710,7 @@ gboolean transition_clock_paint (TransitionClock* self, cairo_t* ctx, gint width _tmp4_ = spit_transitions_effect_needs_clear_background (_tmp3_); #line 235 "/home/jens/Source/shotwell/src/slideshow/TransitionEffects.vala" if (_tmp4_) { -#line 1707 "TransitionEffects.c" +#line 1711 "TransitionEffects.c" cairo_t* _tmp5_ = NULL; SpitTransitionsVisuals* _tmp6_ = NULL; GdkRGBA _tmp7_ = {0}; @@ -1776,7 +1780,7 @@ gboolean transition_clock_paint (TransitionClock* self, cairo_t* ctx, gint width _tmp25_ = ctx; #line 239 "/home/jens/Source/shotwell/src/slideshow/TransitionEffects.vala" cairo_fill (_tmp25_); -#line 1777 "TransitionEffects.c" +#line 1781 "TransitionEffects.c" } #line 242 "/home/jens/Source/shotwell/src/slideshow/TransitionEffects.vala" _tmp26_ = self->priv->effect; @@ -1806,7 +1810,7 @@ gboolean transition_clock_paint (TransitionClock* self, cairo_t* ctx, gint width result = TRUE; #line 248 "/home/jens/Source/shotwell/src/slideshow/TransitionEffects.vala" return result; -#line 1807 "TransitionEffects.c" +#line 1811 "TransitionEffects.c" } @@ -1830,7 +1834,7 @@ static gboolean transition_clock_tick (TransitionClock* self) { g_debug ("TransitionEffects.vala:253: Cancelling transition: below minimum fps"); #line 254 "/home/jens/Source/shotwell/src/slideshow/TransitionEffects.vala" transition_clock_cancel (self); -#line 1831 "TransitionEffects.c" +#line 1835 "TransitionEffects.c" } #line 259 "/home/jens/Source/shotwell/src/slideshow/TransitionEffects.vala" _tmp1_ = self->priv->repaint; @@ -1848,7 +1852,7 @@ static gboolean transition_clock_tick (TransitionClock* self) { result = FALSE; #line 264 "/home/jens/Source/shotwell/src/slideshow/TransitionEffects.vala" return result; -#line 1849 "TransitionEffects.c" +#line 1853 "TransitionEffects.c" } #line 268 "/home/jens/Source/shotwell/src/slideshow/TransitionEffects.vala" _tmp3_ = self->priv->frame_number; @@ -1860,7 +1864,7 @@ static gboolean transition_clock_tick (TransitionClock* self) { _tmp6_ = _tmp5_; #line 268 "/home/jens/Source/shotwell/src/slideshow/TransitionEffects.vala" if (_tmp3_ < _tmp6_) { -#line 1861 "TransitionEffects.c" +#line 1865 "TransitionEffects.c" SpitTransitionsEffect* _tmp7_ = NULL; SpitTransitionsVisuals* _tmp8_ = NULL; SpitTransitionsMotion* _tmp9_ = NULL; @@ -1880,20 +1884,20 @@ static gboolean transition_clock_tick (TransitionClock* self) { _tmp11_ = self->priv->frame_number; #line 269 "/home/jens/Source/shotwell/src/slideshow/TransitionEffects.vala" spit_transitions_effect_advance (_tmp7_, _tmp8_, _tmp9_, _tmp11_); -#line 1881 "TransitionEffects.c" +#line 1885 "TransitionEffects.c" } #line 271 "/home/jens/Source/shotwell/src/slideshow/TransitionEffects.vala" result = TRUE; #line 271 "/home/jens/Source/shotwell/src/slideshow/TransitionEffects.vala" return result; -#line 1887 "TransitionEffects.c" +#line 1891 "TransitionEffects.c" } static void value_transition_clock_init (GValue* value) { #line 116 "/home/jens/Source/shotwell/src/slideshow/TransitionEffects.vala" value->data[0].v_pointer = NULL; -#line 1894 "TransitionEffects.c" +#line 1898 "TransitionEffects.c" } @@ -1902,7 +1906,7 @@ static void value_transition_clock_free_value (GValue* value) { if (value->data[0].v_pointer) { #line 116 "/home/jens/Source/shotwell/src/slideshow/TransitionEffects.vala" transition_clock_unref (value->data[0].v_pointer); -#line 1903 "TransitionEffects.c" +#line 1907 "TransitionEffects.c" } } @@ -1912,11 +1916,11 @@ static void value_transition_clock_copy_value (const GValue* src_value, GValue* if (src_value->data[0].v_pointer) { #line 116 "/home/jens/Source/shotwell/src/slideshow/TransitionEffects.vala" dest_value->data[0].v_pointer = transition_clock_ref (src_value->data[0].v_pointer); -#line 1913 "TransitionEffects.c" +#line 1917 "TransitionEffects.c" } else { #line 116 "/home/jens/Source/shotwell/src/slideshow/TransitionEffects.vala" dest_value->data[0].v_pointer = NULL; -#line 1917 "TransitionEffects.c" +#line 1921 "TransitionEffects.c" } } @@ -1924,37 +1928,37 @@ static void value_transition_clock_copy_value (const GValue* src_value, GValue* static gpointer value_transition_clock_peek_pointer (const GValue* value) { #line 116 "/home/jens/Source/shotwell/src/slideshow/TransitionEffects.vala" return value->data[0].v_pointer; -#line 1925 "TransitionEffects.c" +#line 1929 "TransitionEffects.c" } static gchar* value_transition_clock_collect_value (GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) { #line 116 "/home/jens/Source/shotwell/src/slideshow/TransitionEffects.vala" if (collect_values[0].v_pointer) { -#line 1932 "TransitionEffects.c" +#line 1936 "TransitionEffects.c" TransitionClock* object; object = collect_values[0].v_pointer; #line 116 "/home/jens/Source/shotwell/src/slideshow/TransitionEffects.vala" if (object->parent_instance.g_class == NULL) { #line 116 "/home/jens/Source/shotwell/src/slideshow/TransitionEffects.vala" return g_strconcat ("invalid unclassed object pointer for value type `", G_VALUE_TYPE_NAME (value), "'", NULL); -#line 1939 "TransitionEffects.c" +#line 1943 "TransitionEffects.c" } else if (!g_value_type_compatible (G_TYPE_FROM_INSTANCE (object), G_VALUE_TYPE (value))) { #line 116 "/home/jens/Source/shotwell/src/slideshow/TransitionEffects.vala" return g_strconcat ("invalid object type `", g_type_name (G_TYPE_FROM_INSTANCE (object)), "' for value type `", G_VALUE_TYPE_NAME (value), "'", NULL); -#line 1943 "TransitionEffects.c" +#line 1947 "TransitionEffects.c" } #line 116 "/home/jens/Source/shotwell/src/slideshow/TransitionEffects.vala" value->data[0].v_pointer = transition_clock_ref (object); -#line 1947 "TransitionEffects.c" +#line 1951 "TransitionEffects.c" } else { #line 116 "/home/jens/Source/shotwell/src/slideshow/TransitionEffects.vala" value->data[0].v_pointer = NULL; -#line 1951 "TransitionEffects.c" +#line 1955 "TransitionEffects.c" } #line 116 "/home/jens/Source/shotwell/src/slideshow/TransitionEffects.vala" return NULL; -#line 1955 "TransitionEffects.c" +#line 1959 "TransitionEffects.c" } @@ -1965,25 +1969,25 @@ static gchar* value_transition_clock_lcopy_value (const GValue* value, guint n_c if (!object_p) { #line 116 "/home/jens/Source/shotwell/src/slideshow/TransitionEffects.vala" return g_strdup_printf ("value location for `%s' passed as NULL", G_VALUE_TYPE_NAME (value)); -#line 1966 "TransitionEffects.c" +#line 1970 "TransitionEffects.c" } #line 116 "/home/jens/Source/shotwell/src/slideshow/TransitionEffects.vala" if (!value->data[0].v_pointer) { #line 116 "/home/jens/Source/shotwell/src/slideshow/TransitionEffects.vala" *object_p = NULL; -#line 1972 "TransitionEffects.c" +#line 1976 "TransitionEffects.c" } else if (collect_flags & G_VALUE_NOCOPY_CONTENTS) { #line 116 "/home/jens/Source/shotwell/src/slideshow/TransitionEffects.vala" *object_p = value->data[0].v_pointer; -#line 1976 "TransitionEffects.c" +#line 1980 "TransitionEffects.c" } else { #line 116 "/home/jens/Source/shotwell/src/slideshow/TransitionEffects.vala" *object_p = transition_clock_ref (value->data[0].v_pointer); -#line 1980 "TransitionEffects.c" +#line 1984 "TransitionEffects.c" } #line 116 "/home/jens/Source/shotwell/src/slideshow/TransitionEffects.vala" return NULL; -#line 1984 "TransitionEffects.c" +#line 1988 "TransitionEffects.c" } @@ -1997,7 +2001,7 @@ GParamSpec* param_spec_transition_clock (const gchar* name, const gchar* nick, c G_PARAM_SPEC (spec)->value_type = object_type; #line 116 "/home/jens/Source/shotwell/src/slideshow/TransitionEffects.vala" return G_PARAM_SPEC (spec); -#line 1998 "TransitionEffects.c" +#line 2002 "TransitionEffects.c" } @@ -2006,7 +2010,7 @@ gpointer value_get_transition_clock (const GValue* value) { g_return_val_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, TYPE_TRANSITION_CLOCK), NULL); #line 116 "/home/jens/Source/shotwell/src/slideshow/TransitionEffects.vala" return value->data[0].v_pointer; -#line 2007 "TransitionEffects.c" +#line 2011 "TransitionEffects.c" } @@ -2026,17 +2030,17 @@ void value_set_transition_clock (GValue* value, gpointer v_object) { value->data[0].v_pointer = v_object; #line 116 "/home/jens/Source/shotwell/src/slideshow/TransitionEffects.vala" transition_clock_ref (value->data[0].v_pointer); -#line 2027 "TransitionEffects.c" +#line 2031 "TransitionEffects.c" } else { #line 116 "/home/jens/Source/shotwell/src/slideshow/TransitionEffects.vala" value->data[0].v_pointer = NULL; -#line 2031 "TransitionEffects.c" +#line 2035 "TransitionEffects.c" } #line 116 "/home/jens/Source/shotwell/src/slideshow/TransitionEffects.vala" if (old) { #line 116 "/home/jens/Source/shotwell/src/slideshow/TransitionEffects.vala" transition_clock_unref (old); -#line 2037 "TransitionEffects.c" +#line 2041 "TransitionEffects.c" } } @@ -2055,17 +2059,17 @@ void value_take_transition_clock (GValue* value, gpointer v_object) { g_return_if_fail (g_value_type_compatible (G_TYPE_FROM_INSTANCE (v_object), G_VALUE_TYPE (value))); #line 116 "/home/jens/Source/shotwell/src/slideshow/TransitionEffects.vala" value->data[0].v_pointer = v_object; -#line 2056 "TransitionEffects.c" +#line 2060 "TransitionEffects.c" } else { #line 116 "/home/jens/Source/shotwell/src/slideshow/TransitionEffects.vala" value->data[0].v_pointer = NULL; -#line 2060 "TransitionEffects.c" +#line 2064 "TransitionEffects.c" } #line 116 "/home/jens/Source/shotwell/src/slideshow/TransitionEffects.vala" if (old) { #line 116 "/home/jens/Source/shotwell/src/slideshow/TransitionEffects.vala" transition_clock_unref (old); -#line 2066 "TransitionEffects.c" +#line 2070 "TransitionEffects.c" } } @@ -2077,7 +2081,7 @@ static void transition_clock_class_init (TransitionClockClass * klass) { ((TransitionClockClass *) klass)->finalize = transition_clock_finalize; #line 116 "/home/jens/Source/shotwell/src/slideshow/TransitionEffects.vala" g_type_class_add_private (klass, sizeof (TransitionClockPrivate)); -#line 2078 "TransitionEffects.c" +#line 2082 "TransitionEffects.c" } @@ -2102,7 +2106,7 @@ static void transition_clock_instance_init (TransitionClock * self) { self->priv->cancelled = FALSE; #line 116 "/home/jens/Source/shotwell/src/slideshow/TransitionEffects.vala" self->ref_count = 1; -#line 2103 "TransitionEffects.c" +#line 2107 "TransitionEffects.c" } @@ -2126,7 +2130,7 @@ static void transition_clock_finalize (TransitionClock* obj) { _tmp1_ = self->priv->motion; #line 148 "/home/jens/Source/shotwell/src/slideshow/TransitionEffects.vala" if (_tmp1_ != NULL) { -#line 2127 "TransitionEffects.c" +#line 2131 "TransitionEffects.c" SpitTransitionsMotion* _tmp2_ = NULL; gint _tmp3_ = 0; gint _tmp4_ = 0; @@ -2138,11 +2142,11 @@ static void transition_clock_finalize (TransitionClock* obj) { _tmp4_ = _tmp3_; #line 148 "/home/jens/Source/shotwell/src/slideshow/TransitionEffects.vala" _tmp0_ = _tmp4_; -#line 2139 "TransitionEffects.c" +#line 2143 "TransitionEffects.c" } else { #line 148 "/home/jens/Source/shotwell/src/slideshow/TransitionEffects.vala" _tmp0_ = 0; -#line 2143 "TransitionEffects.c" +#line 2147 "TransitionEffects.c" } #line 147 "/home/jens/Source/shotwell/src/slideshow/TransitionEffects.vala" _tmp5_ = self->priv->paint_timer; @@ -2171,7 +2175,7 @@ static void transition_clock_finalize (TransitionClock* obj) { _g_object_unref0 (self->priv->visuals); #line 129 "/home/jens/Source/shotwell/src/slideshow/TransitionEffects.vala" _g_object_unref0 (self->priv->motion); -#line 2171 "TransitionEffects.c" +#line 2175 "TransitionEffects.c" } @@ -2196,7 +2200,7 @@ gpointer transition_clock_ref (gpointer instance) { g_atomic_int_inc (&self->ref_count); #line 116 "/home/jens/Source/shotwell/src/slideshow/TransitionEffects.vala" return instance; -#line 2196 "TransitionEffects.c" +#line 2200 "TransitionEffects.c" } @@ -2209,7 +2213,7 @@ void transition_clock_unref (gpointer instance) { TRANSITION_CLOCK_GET_CLASS (self)->finalize (self); #line 116 "/home/jens/Source/shotwell/src/slideshow/TransitionEffects.vala" g_type_free_instance ((GTypeInstance *) self); -#line 2209 "TransitionEffects.c" +#line 2213 "TransitionEffects.c" } } @@ -2223,7 +2227,7 @@ static gint null_transition_descriptor_real_get_pluggable_interface (SpitPluggab result = SPIT_TRANSITIONS_CURRENT_INTERFACE; #line 279 "/home/jens/Source/shotwell/src/slideshow/TransitionEffects.vala" return result; -#line 2223 "TransitionEffects.c" +#line 2227 "TransitionEffects.c" } @@ -2236,7 +2240,7 @@ static const gchar* null_transition_descriptor_real_get_id (SpitPluggable* base) result = NULL_TRANSITION_DESCRIPTOR_EFFECT_ID; #line 283 "/home/jens/Source/shotwell/src/slideshow/TransitionEffects.vala" return result; -#line 2236 "TransitionEffects.c" +#line 2240 "TransitionEffects.c" } @@ -2252,7 +2256,7 @@ static const gchar* null_transition_descriptor_real_get_pluggable_name (SpitPlug result = _tmp0_; #line 287 "/home/jens/Source/shotwell/src/slideshow/TransitionEffects.vala" return result; -#line 2252 "TransitionEffects.c" +#line 2256 "TransitionEffects.c" } @@ -2262,7 +2266,7 @@ static void null_transition_descriptor_real_get_info (SpitPluggable* base, SpitP self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_NULL_TRANSITION_DESCRIPTOR, NullTransitionDescriptor); #line 290 "/home/jens/Source/shotwell/src/slideshow/TransitionEffects.vala" g_return_if_fail (info != NULL); -#line 2262 "TransitionEffects.c" +#line 2266 "TransitionEffects.c" } @@ -2270,7 +2274,7 @@ static void null_transition_descriptor_real_activation (SpitPluggable* base, gbo NullTransitionDescriptor * self; #line 293 "/home/jens/Source/shotwell/src/slideshow/TransitionEffects.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_NULL_TRANSITION_DESCRIPTOR, NullTransitionDescriptor); -#line 2270 "TransitionEffects.c" +#line 2274 "TransitionEffects.c" } @@ -2288,7 +2292,7 @@ static SpitTransitionsEffect* null_transition_descriptor_real_create (SpitTransi result = G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, SPIT_TRANSITIONS_TYPE_EFFECT, SpitTransitionsEffect); #line 297 "/home/jens/Source/shotwell/src/slideshow/TransitionEffects.vala" return result; -#line 2288 "TransitionEffects.c" +#line 2292 "TransitionEffects.c" } @@ -2298,21 +2302,21 @@ NullTransitionDescriptor* null_transition_descriptor_construct (GType object_typ self = (NullTransitionDescriptor*) g_object_new (object_type, NULL); #line 275 "/home/jens/Source/shotwell/src/slideshow/TransitionEffects.vala" return self; -#line 2298 "TransitionEffects.c" +#line 2302 "TransitionEffects.c" } NullTransitionDescriptor* null_transition_descriptor_new (void) { #line 275 "/home/jens/Source/shotwell/src/slideshow/TransitionEffects.vala" return null_transition_descriptor_construct (TYPE_NULL_TRANSITION_DESCRIPTOR); -#line 2305 "TransitionEffects.c" +#line 2309 "TransitionEffects.c" } static void null_transition_descriptor_class_init (NullTransitionDescriptorClass * klass) { #line 275 "/home/jens/Source/shotwell/src/slideshow/TransitionEffects.vala" null_transition_descriptor_parent_class = g_type_class_peek_parent (klass); -#line 2312 "TransitionEffects.c" +#line 2316 "TransitionEffects.c" } @@ -2329,7 +2333,7 @@ static void null_transition_descriptor_spit_pluggable_interface_init (SpitPlugga iface->get_info = (void (*)(SpitPluggable*, SpitPluggableInfo*)) null_transition_descriptor_real_get_info; #line 275 "/home/jens/Source/shotwell/src/slideshow/TransitionEffects.vala" iface->activation = (void (*)(SpitPluggable*, gboolean)) null_transition_descriptor_real_activation; -#line 2329 "TransitionEffects.c" +#line 2333 "TransitionEffects.c" } @@ -2338,7 +2342,7 @@ static void null_transition_descriptor_spit_transitions_descriptor_interface_ini null_transition_descriptor_spit_transitions_descriptor_parent_iface = g_type_interface_peek_parent (iface); #line 275 "/home/jens/Source/shotwell/src/slideshow/TransitionEffects.vala" iface->create = (SpitTransitionsEffect* (*)(SpitTransitionsDescriptor*, SpitHostInterface*)) null_transition_descriptor_real_create; -#line 2338 "TransitionEffects.c" +#line 2342 "TransitionEffects.c" } @@ -2368,14 +2372,14 @@ NullEffect* null_effect_construct (GType object_type) { self = (NullEffect*) g_object_new (object_type, NULL); #line 302 "/home/jens/Source/shotwell/src/slideshow/TransitionEffects.vala" return self; -#line 2368 "TransitionEffects.c" +#line 2372 "TransitionEffects.c" } NullEffect* null_effect_new (void) { #line 302 "/home/jens/Source/shotwell/src/slideshow/TransitionEffects.vala" return null_effect_construct (TYPE_NULL_EFFECT); -#line 2375 "TransitionEffects.c" +#line 2379 "TransitionEffects.c" } @@ -2393,13 +2397,13 @@ static void null_effect_real_get_fps (SpitTransitionsEffect* base, gint* desired if (desired_fps) { #line 305 "/home/jens/Source/shotwell/src/slideshow/TransitionEffects.vala" *desired_fps = _vala_desired_fps; -#line 2393 "TransitionEffects.c" +#line 2397 "TransitionEffects.c" } #line 305 "/home/jens/Source/shotwell/src/slideshow/TransitionEffects.vala" if (min_fps) { #line 305 "/home/jens/Source/shotwell/src/slideshow/TransitionEffects.vala" *min_fps = _vala_min_fps; -#line 2399 "TransitionEffects.c" +#line 2403 "TransitionEffects.c" } } @@ -2412,7 +2416,7 @@ static void null_effect_real_start (SpitTransitionsEffect* base, SpitTransitions g_return_if_fail (SPIT_TRANSITIONS_IS_VISUALS (visuals)); #line 310 "/home/jens/Source/shotwell/src/slideshow/TransitionEffects.vala" g_return_if_fail (SPIT_TRANSITIONS_IS_MOTION (motion)); -#line 2412 "TransitionEffects.c" +#line 2416 "TransitionEffects.c" } @@ -2425,7 +2429,7 @@ static gboolean null_effect_real_needs_clear_background (SpitTransitionsEffect* result = FALSE; #line 314 "/home/jens/Source/shotwell/src/slideshow/TransitionEffects.vala" return result; -#line 2425 "TransitionEffects.c" +#line 2429 "TransitionEffects.c" } @@ -2439,7 +2443,7 @@ static void null_effect_real_paint (SpitTransitionsEffect* base, SpitTransitions g_return_if_fail (SPIT_TRANSITIONS_IS_MOTION (motion)); #line 317 "/home/jens/Source/shotwell/src/slideshow/TransitionEffects.vala" g_return_if_fail (ctx != NULL); -#line 2439 "TransitionEffects.c" +#line 2443 "TransitionEffects.c" } @@ -2451,7 +2455,7 @@ static void null_effect_real_advance (SpitTransitionsEffect* base, SpitTransitio g_return_if_fail (SPIT_TRANSITIONS_IS_VISUALS (visuals)); #line 321 "/home/jens/Source/shotwell/src/slideshow/TransitionEffects.vala" g_return_if_fail (SPIT_TRANSITIONS_IS_MOTION (motion)); -#line 2451 "TransitionEffects.c" +#line 2455 "TransitionEffects.c" } @@ -2459,14 +2463,14 @@ static void null_effect_real_cancel (SpitTransitionsEffect* base) { NullEffect * self; #line 324 "/home/jens/Source/shotwell/src/slideshow/TransitionEffects.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_NULL_EFFECT, NullEffect); -#line 2459 "TransitionEffects.c" +#line 2463 "TransitionEffects.c" } static void null_effect_class_init (NullEffectClass * klass) { #line 301 "/home/jens/Source/shotwell/src/slideshow/TransitionEffects.vala" null_effect_parent_class = g_type_class_peek_parent (klass); -#line 2466 "TransitionEffects.c" +#line 2470 "TransitionEffects.c" } @@ -2485,7 +2489,7 @@ static void null_effect_spit_transitions_effect_interface_init (SpitTransitionsE iface->advance = (void (*)(SpitTransitionsEffect*, SpitTransitionsVisuals*, SpitTransitionsMotion*, gint)) null_effect_real_advance; #line 301 "/home/jens/Source/shotwell/src/slideshow/TransitionEffects.vala" iface->cancel = (void (*)(SpitTransitionsEffect*)) null_effect_real_cancel; -#line 2485 "TransitionEffects.c" +#line 2489 "TransitionEffects.c" } @@ -2516,7 +2520,7 @@ static gint random_effect_descriptor_real_get_pluggable_interface (SpitPluggable result = SPIT_TRANSITIONS_CURRENT_INTERFACE; #line 331 "/home/jens/Source/shotwell/src/slideshow/TransitionEffects.vala" return result; -#line 2516 "TransitionEffects.c" +#line 2520 "TransitionEffects.c" } @@ -2529,7 +2533,7 @@ static const gchar* random_effect_descriptor_real_get_id (SpitPluggable* base) { result = RANDOM_EFFECT_DESCRIPTOR_EFFECT_ID; #line 335 "/home/jens/Source/shotwell/src/slideshow/TransitionEffects.vala" return result; -#line 2529 "TransitionEffects.c" +#line 2533 "TransitionEffects.c" } @@ -2545,7 +2549,7 @@ static const gchar* random_effect_descriptor_real_get_pluggable_name (SpitPlugga result = _tmp0_; #line 339 "/home/jens/Source/shotwell/src/slideshow/TransitionEffects.vala" return result; -#line 2545 "TransitionEffects.c" +#line 2549 "TransitionEffects.c" } @@ -2555,7 +2559,7 @@ static void random_effect_descriptor_real_get_info (SpitPluggable* base, SpitPlu self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_RANDOM_EFFECT_DESCRIPTOR, RandomEffectDescriptor); #line 342 "/home/jens/Source/shotwell/src/slideshow/TransitionEffects.vala" g_return_if_fail (info != NULL); -#line 2555 "TransitionEffects.c" +#line 2559 "TransitionEffects.c" } @@ -2563,7 +2567,7 @@ static void random_effect_descriptor_real_activation (SpitPluggable* base, gbool RandomEffectDescriptor * self; #line 345 "/home/jens/Source/shotwell/src/slideshow/TransitionEffects.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_RANDOM_EFFECT_DESCRIPTOR, RandomEffectDescriptor); -#line 2563 "TransitionEffects.c" +#line 2567 "TransitionEffects.c" } @@ -2581,7 +2585,7 @@ static SpitTransitionsEffect* random_effect_descriptor_real_create (SpitTransiti result = G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, SPIT_TRANSITIONS_TYPE_EFFECT, SpitTransitionsEffect); #line 349 "/home/jens/Source/shotwell/src/slideshow/TransitionEffects.vala" return result; -#line 2581 "TransitionEffects.c" +#line 2585 "TransitionEffects.c" } @@ -2591,21 +2595,21 @@ RandomEffectDescriptor* random_effect_descriptor_construct (GType object_type) { self = (RandomEffectDescriptor*) g_object_new (object_type, NULL); #line 327 "/home/jens/Source/shotwell/src/slideshow/TransitionEffects.vala" return self; -#line 2591 "TransitionEffects.c" +#line 2595 "TransitionEffects.c" } RandomEffectDescriptor* random_effect_descriptor_new (void) { #line 327 "/home/jens/Source/shotwell/src/slideshow/TransitionEffects.vala" return random_effect_descriptor_construct (TYPE_RANDOM_EFFECT_DESCRIPTOR); -#line 2598 "TransitionEffects.c" +#line 2602 "TransitionEffects.c" } static void random_effect_descriptor_class_init (RandomEffectDescriptorClass * klass) { #line 327 "/home/jens/Source/shotwell/src/slideshow/TransitionEffects.vala" random_effect_descriptor_parent_class = g_type_class_peek_parent (klass); -#line 2605 "TransitionEffects.c" +#line 2609 "TransitionEffects.c" } @@ -2622,7 +2626,7 @@ static void random_effect_descriptor_spit_pluggable_interface_init (SpitPluggabl iface->get_info = (void (*)(SpitPluggable*, SpitPluggableInfo*)) random_effect_descriptor_real_get_info; #line 327 "/home/jens/Source/shotwell/src/slideshow/TransitionEffects.vala" iface->activation = (void (*)(SpitPluggable*, gboolean)) random_effect_descriptor_real_activation; -#line 2622 "TransitionEffects.c" +#line 2626 "TransitionEffects.c" } @@ -2631,7 +2635,7 @@ static void random_effect_descriptor_spit_transitions_descriptor_interface_init random_effect_descriptor_spit_transitions_descriptor_parent_iface = g_type_interface_peek_parent (iface); #line 327 "/home/jens/Source/shotwell/src/slideshow/TransitionEffects.vala" iface->create = (SpitTransitionsEffect* (*)(SpitTransitionsDescriptor*, SpitHostInterface*)) random_effect_descriptor_real_create; -#line 2631 "TransitionEffects.c" +#line 2635 "TransitionEffects.c" } -- cgit v1.2.3