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/VideoMetadata.c | 892 +++++++++++++++++++++++++++------------------------- 1 file changed, 459 insertions(+), 433 deletions(-) (limited to 'src/VideoMetadata.c') diff --git a/src/VideoMetadata.c b/src/VideoMetadata.c index f406a1a..52b5d2d 100644 --- a/src/VideoMetadata.c +++ b/src/VideoMetadata.c @@ -1,4 +1,4 @@ -/* VideoMetadata.c generated by valac 0.34.4, the Vala compiler +/* VideoMetadata.c generated by valac 0.34.7, the Vala compiler * generated from VideoMetadata.vala, do not modify */ /* Copyright 2016 Software Freedom Conservancy Inc. @@ -596,13 +596,13 @@ static void video_metadata_class_init (VideoMetadataClass * klass) { #line 7 "/home/jens/Source/shotwell/src/VideoMetadata.vala" g_type_class_add_private (klass, sizeof (VideoMetadataPrivate)); #line 7 "/home/jens/Source/shotwell/src/VideoMetadata.vala" - ((MediaMetadataClass *) klass)->read_from_file = video_metadata_real_read_from_file; + ((MediaMetadataClass *) klass)->read_from_file = (void (*)(MediaMetadata*, GFile*, GError**)) video_metadata_real_read_from_file; #line 7 "/home/jens/Source/shotwell/src/VideoMetadata.vala" - ((MediaMetadataClass *) klass)->get_creation_date_time = video_metadata_real_get_creation_date_time; + ((MediaMetadataClass *) klass)->get_creation_date_time = (MetadataDateTime* (*)(MediaMetadata*)) video_metadata_real_get_creation_date_time; #line 7 "/home/jens/Source/shotwell/src/VideoMetadata.vala" - ((MediaMetadataClass *) klass)->get_title = video_metadata_real_get_title; + ((MediaMetadataClass *) klass)->get_title = (gchar* (*)(MediaMetadata*)) video_metadata_real_get_title; #line 7 "/home/jens/Source/shotwell/src/VideoMetadata.vala" - ((MediaMetadataClass *) klass)->get_comment = video_metadata_real_get_comment; + ((MediaMetadataClass *) klass)->get_comment = (gchar* (*)(MediaMetadata*)) video_metadata_real_get_comment; #line 607 "VideoMetadata.c" } @@ -868,6 +868,8 @@ gboolean quick_time_metadata_loader_is_supported (QuickTimeMetadataLoader* self) __finally575: #line 79 "/home/jens/Source/shotwell/src/VideoMetadata.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { +#line 871 "VideoMetadata.c" + gboolean _tmp21_ = FALSE; #line 79 "/home/jens/Source/shotwell/src/VideoMetadata.vala" _quick_time_atom_unref0 (test); #line 79 "/home/jens/Source/shotwell/src/VideoMetadata.vala" @@ -875,18 +877,18 @@ gboolean quick_time_metadata_loader_is_supported (QuickTimeMetadataLoader* self) #line 79 "/home/jens/Source/shotwell/src/VideoMetadata.vala" g_clear_error (&_inner_error_); #line 79 "/home/jens/Source/shotwell/src/VideoMetadata.vala" - return FALSE; -#line 879 "VideoMetadata.c" + return _tmp21_; +#line 881 "VideoMetadata.c" } { - QuickTimeAtom* _tmp21_ = NULL; + QuickTimeAtom* _tmp22_ = NULL; #line 107 "/home/jens/Source/shotwell/src/VideoMetadata.vala" - _tmp21_ = test; + _tmp22_ = test; #line 107 "/home/jens/Source/shotwell/src/VideoMetadata.vala" - quick_time_atom_close_file (_tmp21_, &_inner_error_); + quick_time_atom_close_file (_tmp22_, &_inner_error_); #line 107 "/home/jens/Source/shotwell/src/VideoMetadata.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 889 "VideoMetadata.c" +#line 891 "VideoMetadata.c" goto __catch576_g_error; } } @@ -894,25 +896,27 @@ gboolean quick_time_metadata_loader_is_supported (QuickTimeMetadataLoader* self) __catch576_g_error: { GError* e = NULL; - GError* _tmp22_ = NULL; - const gchar* _tmp23_ = NULL; + GError* _tmp23_ = NULL; + const gchar* _tmp24_ = NULL; #line 106 "/home/jens/Source/shotwell/src/VideoMetadata.vala" e = _inner_error_; #line 106 "/home/jens/Source/shotwell/src/VideoMetadata.vala" _inner_error_ = NULL; #line 109 "/home/jens/Source/shotwell/src/VideoMetadata.vala" - _tmp22_ = e; + _tmp23_ = e; #line 109 "/home/jens/Source/shotwell/src/VideoMetadata.vala" - _tmp23_ = _tmp22_->message; + _tmp24_ = _tmp23_->message; #line 109 "/home/jens/Source/shotwell/src/VideoMetadata.vala" - g_debug ("VideoMetadata.vala:109: Error while closing Quicktime file: %s", _tmp23_); + g_debug ("VideoMetadata.vala:109: Error while closing Quicktime file: %s", _tmp24_); #line 106 "/home/jens/Source/shotwell/src/VideoMetadata.vala" _g_error_free0 (e); -#line 911 "VideoMetadata.c" +#line 913 "VideoMetadata.c" } __finally576: #line 106 "/home/jens/Source/shotwell/src/VideoMetadata.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { +#line 918 "VideoMetadata.c" + gboolean _tmp25_ = FALSE; #line 106 "/home/jens/Source/shotwell/src/VideoMetadata.vala" _quick_time_atom_unref0 (test); #line 106 "/home/jens/Source/shotwell/src/VideoMetadata.vala" @@ -920,8 +924,8 @@ gboolean quick_time_metadata_loader_is_supported (QuickTimeMetadataLoader* self) #line 106 "/home/jens/Source/shotwell/src/VideoMetadata.vala" g_clear_error (&_inner_error_); #line 106 "/home/jens/Source/shotwell/src/VideoMetadata.vala" - return FALSE; -#line 924 "VideoMetadata.c" + return _tmp25_; +#line 928 "VideoMetadata.c" } #line 111 "/home/jens/Source/shotwell/src/VideoMetadata.vala" result = ret; @@ -929,7 +933,7 @@ gboolean quick_time_metadata_loader_is_supported (QuickTimeMetadataLoader* self) _quick_time_atom_unref0 (test); #line 111 "/home/jens/Source/shotwell/src/VideoMetadata.vala" return result; -#line 932 "VideoMetadata.c" +#line 936 "VideoMetadata.c" } @@ -939,8 +943,8 @@ static gulong quick_time_metadata_loader_get_creation_date_time_for_quicktime (Q GFile* _tmp0_ = NULL; QuickTimeAtom* _tmp1_ = NULL; time_t timestamp = 0; - time_t _tmp35_ = 0; time_t _tmp37_ = 0; + time_t _tmp39_ = 0; GError * _inner_error_ = NULL; #line 114 "/home/jens/Source/shotwell/src/VideoMetadata.vala" g_return_val_if_fail (IS_QUICK_TIME_METADATA_LOADER (self), 0UL); @@ -952,7 +956,7 @@ static gulong quick_time_metadata_loader_get_creation_date_time_for_quicktime (Q test = _tmp1_; #line 116 "/home/jens/Source/shotwell/src/VideoMetadata.vala" timestamp = (time_t) 0; -#line 955 "VideoMetadata.c" +#line 959 "VideoMetadata.c" { QuickTimeAtom* _tmp2_ = NULL; gboolean done = FALSE; @@ -962,14 +966,14 @@ static gulong quick_time_metadata_loader_get_creation_date_time_for_quicktime (Q quick_time_atom_open_file (_tmp2_, &_inner_error_); #line 119 "/home/jens/Source/shotwell/src/VideoMetadata.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 965 "VideoMetadata.c" +#line 969 "VideoMetadata.c" goto __catch577_g_error; } #line 120 "/home/jens/Source/shotwell/src/VideoMetadata.vala" done = FALSE; #line 121 "/home/jens/Source/shotwell/src/VideoMetadata.vala" while (TRUE) { -#line 972 "VideoMetadata.c" +#line 976 "VideoMetadata.c" gboolean _tmp3_ = FALSE; QuickTimeAtom* _tmp4_ = NULL; QuickTimeAtom* _tmp5_ = NULL; @@ -985,7 +989,7 @@ static gulong quick_time_metadata_loader_get_creation_date_time_for_quicktime (Q if (!(!_tmp3_)) { #line 121 "/home/jens/Source/shotwell/src/VideoMetadata.vala" break; -#line 988 "VideoMetadata.c" +#line 992 "VideoMetadata.c" } #line 123 "/home/jens/Source/shotwell/src/VideoMetadata.vala" _tmp4_ = test; @@ -993,7 +997,7 @@ static gulong quick_time_metadata_loader_get_creation_date_time_for_quicktime (Q quick_time_atom_read_atom (_tmp4_, &_inner_error_); #line 123 "/home/jens/Source/shotwell/src/VideoMetadata.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 996 "VideoMetadata.c" +#line 1000 "VideoMetadata.c" goto __catch577_g_error; } #line 124 "/home/jens/Source/shotwell/src/VideoMetadata.vala" @@ -1004,7 +1008,7 @@ static gulong quick_time_metadata_loader_get_creation_date_time_for_quicktime (Q if (_tmp6_) { #line 124 "/home/jens/Source/shotwell/src/VideoMetadata.vala" break; -#line 1007 "VideoMetadata.c" +#line 1011 "VideoMetadata.c" } #line 125 "/home/jens/Source/shotwell/src/VideoMetadata.vala" _tmp7_ = test; @@ -1018,7 +1022,7 @@ static gulong quick_time_metadata_loader_get_creation_date_time_for_quicktime (Q _g_free0 (_tmp9_); #line 125 "/home/jens/Source/shotwell/src/VideoMetadata.vala" if (_tmp10_) { -#line 1021 "VideoMetadata.c" +#line 1025 "VideoMetadata.c" QuickTimeAtom* child = NULL; QuickTimeAtom* _tmp11_ = NULL; QuickTimeAtom* _tmp12_ = NULL; @@ -1030,7 +1034,7 @@ static gulong quick_time_metadata_loader_get_creation_date_time_for_quicktime (Q child = _tmp12_; #line 127 "/home/jens/Source/shotwell/src/VideoMetadata.vala" while (TRUE) { -#line 1033 "VideoMetadata.c" +#line 1037 "VideoMetadata.c" gboolean _tmp13_ = FALSE; QuickTimeAtom* _tmp14_ = NULL; gboolean _tmp15_ = FALSE; @@ -1047,7 +1051,7 @@ static gulong quick_time_metadata_loader_get_creation_date_time_for_quicktime (Q if (!(!_tmp13_)) { #line 127 "/home/jens/Source/shotwell/src/VideoMetadata.vala" break; -#line 1050 "VideoMetadata.c" +#line 1054 "VideoMetadata.c" } #line 129 "/home/jens/Source/shotwell/src/VideoMetadata.vala" _tmp14_ = child; @@ -1057,7 +1061,7 @@ static gulong quick_time_metadata_loader_get_creation_date_time_for_quicktime (Q if (G_UNLIKELY (_inner_error_ != NULL)) { #line 129 "/home/jens/Source/shotwell/src/VideoMetadata.vala" _quick_time_atom_unref0 (child); -#line 1060 "VideoMetadata.c" +#line 1064 "VideoMetadata.c" goto __catch577_g_error; } #line 130 "/home/jens/Source/shotwell/src/VideoMetadata.vala" @@ -1068,7 +1072,7 @@ static gulong quick_time_metadata_loader_get_creation_date_time_for_quicktime (Q if (_tmp17_) { #line 130 "/home/jens/Source/shotwell/src/VideoMetadata.vala" _tmp15_ = TRUE; -#line 1071 "VideoMetadata.c" +#line 1075 "VideoMetadata.c" } else { QuickTimeAtom* _tmp18_ = NULL; guint64 _tmp19_ = 0ULL; @@ -1078,7 +1082,7 @@ static gulong quick_time_metadata_loader_get_creation_date_time_for_quicktime (Q _tmp19_ = quick_time_atom_section_size_remaining (_tmp18_); #line 130 "/home/jens/Source/shotwell/src/VideoMetadata.vala" _tmp15_ = ((guint64) 0) == _tmp19_; -#line 1081 "VideoMetadata.c" +#line 1085 "VideoMetadata.c" } #line 130 "/home/jens/Source/shotwell/src/VideoMetadata.vala" if (_tmp15_) { @@ -1086,7 +1090,7 @@ static gulong quick_time_metadata_loader_get_creation_date_time_for_quicktime (Q done = TRUE; #line 132 "/home/jens/Source/shotwell/src/VideoMetadata.vala" break; -#line 1089 "VideoMetadata.c" +#line 1093 "VideoMetadata.c" } #line 135 "/home/jens/Source/shotwell/src/VideoMetadata.vala" _tmp20_ = child; @@ -1100,7 +1104,7 @@ static gulong quick_time_metadata_loader_get_creation_date_time_for_quicktime (Q _g_free0 (_tmp22_); #line 135 "/home/jens/Source/shotwell/src/VideoMetadata.vala" if (_tmp23_) { -#line 1103 "VideoMetadata.c" +#line 1107 "VideoMetadata.c" QuickTimeAtom* _tmp24_ = NULL; guint32 _tmp25_ = 0U; QuickTimeAtom* _tmp26_ = NULL; @@ -1113,7 +1117,7 @@ static gulong quick_time_metadata_loader_get_creation_date_time_for_quicktime (Q if (G_UNLIKELY (_inner_error_ != NULL)) { #line 137 "/home/jens/Source/shotwell/src/VideoMetadata.vala" _quick_time_atom_unref0 (child); -#line 1116 "VideoMetadata.c" +#line 1120 "VideoMetadata.c" goto __catch577_g_error; } #line 139 "/home/jens/Source/shotwell/src/VideoMetadata.vala" @@ -1126,7 +1130,7 @@ static gulong quick_time_metadata_loader_get_creation_date_time_for_quicktime (Q if (G_UNLIKELY (_inner_error_ != NULL)) { #line 139 "/home/jens/Source/shotwell/src/VideoMetadata.vala" _quick_time_atom_unref0 (child); -#line 1129 "VideoMetadata.c" +#line 1133 "VideoMetadata.c" goto __catch577_g_error; } #line 139 "/home/jens/Source/shotwell/src/VideoMetadata.vala" @@ -1135,7 +1139,7 @@ static gulong quick_time_metadata_loader_get_creation_date_time_for_quicktime (Q done = TRUE; #line 141 "/home/jens/Source/shotwell/src/VideoMetadata.vala" break; -#line 1138 "VideoMetadata.c" +#line 1142 "VideoMetadata.c" } #line 143 "/home/jens/Source/shotwell/src/VideoMetadata.vala" _tmp28_ = child; @@ -1145,13 +1149,13 @@ static gulong quick_time_metadata_loader_get_creation_date_time_for_quicktime (Q if (G_UNLIKELY (_inner_error_ != NULL)) { #line 143 "/home/jens/Source/shotwell/src/VideoMetadata.vala" _quick_time_atom_unref0 (child); -#line 1148 "VideoMetadata.c" +#line 1152 "VideoMetadata.c" goto __catch577_g_error; } } #line 125 "/home/jens/Source/shotwell/src/VideoMetadata.vala" _quick_time_atom_unref0 (child); -#line 1154 "VideoMetadata.c" +#line 1158 "VideoMetadata.c" } #line 146 "/home/jens/Source/shotwell/src/VideoMetadata.vala" _tmp29_ = test; @@ -1159,7 +1163,7 @@ static gulong quick_time_metadata_loader_get_creation_date_time_for_quicktime (Q quick_time_atom_next_atom (_tmp29_, &_inner_error_); #line 146 "/home/jens/Source/shotwell/src/VideoMetadata.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 1162 "VideoMetadata.c" +#line 1166 "VideoMetadata.c" goto __catch577_g_error; } } @@ -1182,11 +1186,13 @@ static gulong quick_time_metadata_loader_get_creation_date_time_for_quicktime (Q g_debug ("VideoMetadata.vala:149: Error while testing for QuickTime file: %s", _tmp31_); #line 118 "/home/jens/Source/shotwell/src/VideoMetadata.vala" _g_error_free0 (e); -#line 1185 "VideoMetadata.c" +#line 1189 "VideoMetadata.c" } __finally577: #line 118 "/home/jens/Source/shotwell/src/VideoMetadata.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { +#line 1194 "VideoMetadata.c" + gulong _tmp32_ = 0UL; #line 118 "/home/jens/Source/shotwell/src/VideoMetadata.vala" _quick_time_atom_unref0 (test); #line 118 "/home/jens/Source/shotwell/src/VideoMetadata.vala" @@ -1194,18 +1200,18 @@ static gulong quick_time_metadata_loader_get_creation_date_time_for_quicktime (Q #line 118 "/home/jens/Source/shotwell/src/VideoMetadata.vala" g_clear_error (&_inner_error_); #line 118 "/home/jens/Source/shotwell/src/VideoMetadata.vala" - return 0UL; -#line 1198 "VideoMetadata.c" + return _tmp32_; +#line 1204 "VideoMetadata.c" } { - QuickTimeAtom* _tmp32_ = NULL; + QuickTimeAtom* _tmp33_ = NULL; #line 153 "/home/jens/Source/shotwell/src/VideoMetadata.vala" - _tmp32_ = test; + _tmp33_ = test; #line 153 "/home/jens/Source/shotwell/src/VideoMetadata.vala" - quick_time_atom_close_file (_tmp32_, &_inner_error_); + quick_time_atom_close_file (_tmp33_, &_inner_error_); #line 153 "/home/jens/Source/shotwell/src/VideoMetadata.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 1208 "VideoMetadata.c" +#line 1214 "VideoMetadata.c" goto __catch578_g_error; } } @@ -1213,25 +1219,27 @@ static gulong quick_time_metadata_loader_get_creation_date_time_for_quicktime (Q __catch578_g_error: { GError* e = NULL; - GError* _tmp33_ = NULL; - const gchar* _tmp34_ = NULL; + GError* _tmp34_ = NULL; + const gchar* _tmp35_ = NULL; #line 152 "/home/jens/Source/shotwell/src/VideoMetadata.vala" e = _inner_error_; #line 152 "/home/jens/Source/shotwell/src/VideoMetadata.vala" _inner_error_ = NULL; #line 155 "/home/jens/Source/shotwell/src/VideoMetadata.vala" - _tmp33_ = e; + _tmp34_ = e; #line 155 "/home/jens/Source/shotwell/src/VideoMetadata.vala" - _tmp34_ = _tmp33_->message; + _tmp35_ = _tmp34_->message; #line 155 "/home/jens/Source/shotwell/src/VideoMetadata.vala" - g_debug ("VideoMetadata.vala:155: Error while closing Quicktime file: %s", _tmp34_); + g_debug ("VideoMetadata.vala:155: Error while closing Quicktime file: %s", _tmp35_); #line 152 "/home/jens/Source/shotwell/src/VideoMetadata.vala" _g_error_free0 (e); -#line 1230 "VideoMetadata.c" +#line 1236 "VideoMetadata.c" } __finally578: #line 152 "/home/jens/Source/shotwell/src/VideoMetadata.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { +#line 1241 "VideoMetadata.c" + gulong _tmp36_ = 0UL; #line 152 "/home/jens/Source/shotwell/src/VideoMetadata.vala" _quick_time_atom_unref0 (test); #line 152 "/home/jens/Source/shotwell/src/VideoMetadata.vala" @@ -1239,37 +1247,37 @@ static gulong quick_time_metadata_loader_get_creation_date_time_for_quicktime (Q #line 152 "/home/jens/Source/shotwell/src/VideoMetadata.vala" g_clear_error (&_inner_error_); #line 152 "/home/jens/Source/shotwell/src/VideoMetadata.vala" - return 0UL; -#line 1243 "VideoMetadata.c" + return _tmp36_; +#line 1251 "VideoMetadata.c" } #line 166 "/home/jens/Source/shotwell/src/VideoMetadata.vala" - _tmp35_ = timestamp; + _tmp37_ = timestamp; #line 166 "/home/jens/Source/shotwell/src/VideoMetadata.vala" - if (_tmp35_ < ((time_t) 0)) { -#line 1249 "VideoMetadata.c" - time_t _tmp36_ = 0; + if (_tmp37_ < ((time_t) 0)) { +#line 1257 "VideoMetadata.c" + time_t _tmp38_ = 0; #line 167 "/home/jens/Source/shotwell/src/VideoMetadata.vala" - _tmp36_ = timestamp; + _tmp38_ = timestamp; #line 167 "/home/jens/Source/shotwell/src/VideoMetadata.vala" - timestamp = _tmp36_ + QUICK_TIME_METADATA_LOADER_QUICKTIME_EPOCH_ADJUSTMENT; -#line 1255 "VideoMetadata.c" + timestamp = _tmp38_ + QUICK_TIME_METADATA_LOADER_QUICKTIME_EPOCH_ADJUSTMENT; +#line 1263 "VideoMetadata.c" } #line 169 "/home/jens/Source/shotwell/src/VideoMetadata.vala" - _tmp37_ = timestamp; + _tmp39_ = timestamp; #line 169 "/home/jens/Source/shotwell/src/VideoMetadata.vala" - result = (gulong) _tmp37_; + result = (gulong) _tmp39_; #line 169 "/home/jens/Source/shotwell/src/VideoMetadata.vala" _quick_time_atom_unref0 (test); #line 169 "/home/jens/Source/shotwell/src/VideoMetadata.vala" return result; -#line 1265 "VideoMetadata.c" +#line 1273 "VideoMetadata.c" } static void value_quick_time_metadata_loader_init (GValue* value) { #line 53 "/home/jens/Source/shotwell/src/VideoMetadata.vala" value->data[0].v_pointer = NULL; -#line 1272 "VideoMetadata.c" +#line 1280 "VideoMetadata.c" } @@ -1278,7 +1286,7 @@ static void value_quick_time_metadata_loader_free_value (GValue* value) { if (value->data[0].v_pointer) { #line 53 "/home/jens/Source/shotwell/src/VideoMetadata.vala" quick_time_metadata_loader_unref (value->data[0].v_pointer); -#line 1281 "VideoMetadata.c" +#line 1289 "VideoMetadata.c" } } @@ -1288,11 +1296,11 @@ static void value_quick_time_metadata_loader_copy_value (const GValue* src_value if (src_value->data[0].v_pointer) { #line 53 "/home/jens/Source/shotwell/src/VideoMetadata.vala" dest_value->data[0].v_pointer = quick_time_metadata_loader_ref (src_value->data[0].v_pointer); -#line 1291 "VideoMetadata.c" +#line 1299 "VideoMetadata.c" } else { #line 53 "/home/jens/Source/shotwell/src/VideoMetadata.vala" dest_value->data[0].v_pointer = NULL; -#line 1295 "VideoMetadata.c" +#line 1303 "VideoMetadata.c" } } @@ -1300,37 +1308,37 @@ static void value_quick_time_metadata_loader_copy_value (const GValue* src_value static gpointer value_quick_time_metadata_loader_peek_pointer (const GValue* value) { #line 53 "/home/jens/Source/shotwell/src/VideoMetadata.vala" return value->data[0].v_pointer; -#line 1303 "VideoMetadata.c" +#line 1311 "VideoMetadata.c" } static gchar* value_quick_time_metadata_loader_collect_value (GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) { #line 53 "/home/jens/Source/shotwell/src/VideoMetadata.vala" if (collect_values[0].v_pointer) { -#line 1310 "VideoMetadata.c" +#line 1318 "VideoMetadata.c" QuickTimeMetadataLoader* object; object = collect_values[0].v_pointer; #line 53 "/home/jens/Source/shotwell/src/VideoMetadata.vala" if (object->parent_instance.g_class == NULL) { #line 53 "/home/jens/Source/shotwell/src/VideoMetadata.vala" return g_strconcat ("invalid unclassed object pointer for value type `", G_VALUE_TYPE_NAME (value), "'", NULL); -#line 1317 "VideoMetadata.c" +#line 1325 "VideoMetadata.c" } else if (!g_value_type_compatible (G_TYPE_FROM_INSTANCE (object), G_VALUE_TYPE (value))) { #line 53 "/home/jens/Source/shotwell/src/VideoMetadata.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 1321 "VideoMetadata.c" +#line 1329 "VideoMetadata.c" } #line 53 "/home/jens/Source/shotwell/src/VideoMetadata.vala" value->data[0].v_pointer = quick_time_metadata_loader_ref (object); -#line 1325 "VideoMetadata.c" +#line 1333 "VideoMetadata.c" } else { #line 53 "/home/jens/Source/shotwell/src/VideoMetadata.vala" value->data[0].v_pointer = NULL; -#line 1329 "VideoMetadata.c" +#line 1337 "VideoMetadata.c" } #line 53 "/home/jens/Source/shotwell/src/VideoMetadata.vala" return NULL; -#line 1333 "VideoMetadata.c" +#line 1341 "VideoMetadata.c" } @@ -1341,25 +1349,25 @@ static gchar* value_quick_time_metadata_loader_lcopy_value (const GValue* value, if (!object_p) { #line 53 "/home/jens/Source/shotwell/src/VideoMetadata.vala" return g_strdup_printf ("value location for `%s' passed as NULL", G_VALUE_TYPE_NAME (value)); -#line 1344 "VideoMetadata.c" +#line 1352 "VideoMetadata.c" } #line 53 "/home/jens/Source/shotwell/src/VideoMetadata.vala" if (!value->data[0].v_pointer) { #line 53 "/home/jens/Source/shotwell/src/VideoMetadata.vala" *object_p = NULL; -#line 1350 "VideoMetadata.c" +#line 1358 "VideoMetadata.c" } else if (collect_flags & G_VALUE_NOCOPY_CONTENTS) { #line 53 "/home/jens/Source/shotwell/src/VideoMetadata.vala" *object_p = value->data[0].v_pointer; -#line 1354 "VideoMetadata.c" +#line 1362 "VideoMetadata.c" } else { #line 53 "/home/jens/Source/shotwell/src/VideoMetadata.vala" *object_p = quick_time_metadata_loader_ref (value->data[0].v_pointer); -#line 1358 "VideoMetadata.c" +#line 1366 "VideoMetadata.c" } #line 53 "/home/jens/Source/shotwell/src/VideoMetadata.vala" return NULL; -#line 1362 "VideoMetadata.c" +#line 1370 "VideoMetadata.c" } @@ -1373,7 +1381,7 @@ GParamSpec* param_spec_quick_time_metadata_loader (const gchar* name, const gcha G_PARAM_SPEC (spec)->value_type = object_type; #line 53 "/home/jens/Source/shotwell/src/VideoMetadata.vala" return G_PARAM_SPEC (spec); -#line 1376 "VideoMetadata.c" +#line 1384 "VideoMetadata.c" } @@ -1382,7 +1390,7 @@ gpointer value_get_quick_time_metadata_loader (const GValue* value) { g_return_val_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, TYPE_QUICK_TIME_METADATA_LOADER), NULL); #line 53 "/home/jens/Source/shotwell/src/VideoMetadata.vala" return value->data[0].v_pointer; -#line 1385 "VideoMetadata.c" +#line 1393 "VideoMetadata.c" } @@ -1402,17 +1410,17 @@ void value_set_quick_time_metadata_loader (GValue* value, gpointer v_object) { value->data[0].v_pointer = v_object; #line 53 "/home/jens/Source/shotwell/src/VideoMetadata.vala" quick_time_metadata_loader_ref (value->data[0].v_pointer); -#line 1405 "VideoMetadata.c" +#line 1413 "VideoMetadata.c" } else { #line 53 "/home/jens/Source/shotwell/src/VideoMetadata.vala" value->data[0].v_pointer = NULL; -#line 1409 "VideoMetadata.c" +#line 1417 "VideoMetadata.c" } #line 53 "/home/jens/Source/shotwell/src/VideoMetadata.vala" if (old) { #line 53 "/home/jens/Source/shotwell/src/VideoMetadata.vala" quick_time_metadata_loader_unref (old); -#line 1415 "VideoMetadata.c" +#line 1423 "VideoMetadata.c" } } @@ -1431,17 +1439,17 @@ void value_take_quick_time_metadata_loader (GValue* value, gpointer v_object) { g_return_if_fail (g_value_type_compatible (G_TYPE_FROM_INSTANCE (v_object), G_VALUE_TYPE (value))); #line 53 "/home/jens/Source/shotwell/src/VideoMetadata.vala" value->data[0].v_pointer = v_object; -#line 1434 "VideoMetadata.c" +#line 1442 "VideoMetadata.c" } else { #line 53 "/home/jens/Source/shotwell/src/VideoMetadata.vala" value->data[0].v_pointer = NULL; -#line 1438 "VideoMetadata.c" +#line 1446 "VideoMetadata.c" } #line 53 "/home/jens/Source/shotwell/src/VideoMetadata.vala" if (old) { #line 53 "/home/jens/Source/shotwell/src/VideoMetadata.vala" quick_time_metadata_loader_unref (old); -#line 1444 "VideoMetadata.c" +#line 1452 "VideoMetadata.c" } } @@ -1453,7 +1461,7 @@ static void quick_time_metadata_loader_class_init (QuickTimeMetadataLoaderClass ((QuickTimeMetadataLoaderClass *) klass)->finalize = quick_time_metadata_loader_finalize; #line 53 "/home/jens/Source/shotwell/src/VideoMetadata.vala" g_type_class_add_private (klass, sizeof (QuickTimeMetadataLoaderPrivate)); -#line 1456 "VideoMetadata.c" +#line 1464 "VideoMetadata.c" } @@ -1464,7 +1472,7 @@ static void quick_time_metadata_loader_instance_init (QuickTimeMetadataLoader * self->priv->file = NULL; #line 53 "/home/jens/Source/shotwell/src/VideoMetadata.vala" self->ref_count = 1; -#line 1467 "VideoMetadata.c" +#line 1475 "VideoMetadata.c" } @@ -1476,7 +1484,7 @@ static void quick_time_metadata_loader_finalize (QuickTimeMetadataLoader* obj) { g_signal_handlers_destroy (self); #line 59 "/home/jens/Source/shotwell/src/VideoMetadata.vala" _g_object_unref0 (self->priv->file); -#line 1479 "VideoMetadata.c" +#line 1487 "VideoMetadata.c" } @@ -1501,7 +1509,7 @@ gpointer quick_time_metadata_loader_ref (gpointer instance) { g_atomic_int_inc (&self->ref_count); #line 53 "/home/jens/Source/shotwell/src/VideoMetadata.vala" return instance; -#line 1504 "VideoMetadata.c" +#line 1512 "VideoMetadata.c" } @@ -1514,7 +1522,7 @@ void quick_time_metadata_loader_unref (gpointer instance) { QUICK_TIME_METADATA_LOADER_GET_CLASS (self)->finalize (self); #line 53 "/home/jens/Source/shotwell/src/VideoMetadata.vala" g_type_free_instance ((GTypeInstance *) self); -#line 1517 "VideoMetadata.c" +#line 1525 "VideoMetadata.c" } } @@ -1537,21 +1545,21 @@ QuickTimeAtom* quick_time_atom_construct (GType object_type, GFile* file) { self->priv->file = _tmp1_; #line 181 "/home/jens/Source/shotwell/src/VideoMetadata.vala" return self; -#line 1540 "VideoMetadata.c" +#line 1548 "VideoMetadata.c" } QuickTimeAtom* quick_time_atom_new (GFile* file) { #line 181 "/home/jens/Source/shotwell/src/VideoMetadata.vala" return quick_time_atom_construct (TYPE_QUICK_TIME_ATOM, file); -#line 1547 "VideoMetadata.c" +#line 1555 "VideoMetadata.c" } static gpointer _quick_time_atom_ref0 (gpointer self) { #line 187 "/home/jens/Source/shotwell/src/VideoMetadata.vala" return self ? quick_time_atom_ref (self) : NULL; -#line 1554 "VideoMetadata.c" +#line 1562 "VideoMetadata.c" } @@ -1585,14 +1593,14 @@ static QuickTimeAtom* quick_time_atom_construct_with_input_stream (GType object_ self->priv->parent = _tmp3_; #line 185 "/home/jens/Source/shotwell/src/VideoMetadata.vala" return self; -#line 1588 "VideoMetadata.c" +#line 1596 "VideoMetadata.c" } static QuickTimeAtom* quick_time_atom_new_with_input_stream (GDataInputStream* input, QuickTimeAtom* parent) { #line 185 "/home/jens/Source/shotwell/src/VideoMetadata.vala" return quick_time_atom_construct_with_input_stream (TYPE_QUICK_TIME_ATOM, input, parent); -#line 1595 "VideoMetadata.c" +#line 1603 "VideoMetadata.c" } @@ -1614,7 +1622,7 @@ void quick_time_atom_open_file (QuickTimeAtom* self, GError** error) { g_propagate_error (error, _inner_error_); #line 191 "/home/jens/Source/shotwell/src/VideoMetadata.vala" return; -#line 1617 "VideoMetadata.c" +#line 1625 "VideoMetadata.c" } #line 192 "/home/jens/Source/shotwell/src/VideoMetadata.vala" _tmp1_ = self->priv->file; @@ -1628,7 +1636,7 @@ void quick_time_atom_open_file (QuickTimeAtom* self, GError** error) { g_propagate_error (error, _inner_error_); #line 192 "/home/jens/Source/shotwell/src/VideoMetadata.vala" return; -#line 1631 "VideoMetadata.c" +#line 1639 "VideoMetadata.c" } #line 192 "/home/jens/Source/shotwell/src/VideoMetadata.vala" _tmp3_ = g_data_input_stream_new (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, g_input_stream_get_type (), GInputStream)); @@ -1652,7 +1660,7 @@ void quick_time_atom_open_file (QuickTimeAtom* self, GError** error) { self->priv->section_name = _tmp5_; #line 190 "/home/jens/Source/shotwell/src/VideoMetadata.vala" _g_object_unref0 (_tmp0_); -#line 1655 "VideoMetadata.c" +#line 1663 "VideoMetadata.c" } @@ -1665,7 +1673,7 @@ void quick_time_atom_close_file (QuickTimeAtom* self, GError** error) { _tmp0_ = self->priv->input; #line 200 "/home/jens/Source/shotwell/src/VideoMetadata.vala" if (NULL != _tmp0_) { -#line 1668 "VideoMetadata.c" +#line 1676 "VideoMetadata.c" GDataInputStream* _tmp1_ = NULL; #line 201 "/home/jens/Source/shotwell/src/VideoMetadata.vala" _tmp1_ = self->priv->input; @@ -1677,13 +1685,13 @@ void quick_time_atom_close_file (QuickTimeAtom* self, GError** error) { g_propagate_error (error, _inner_error_); #line 201 "/home/jens/Source/shotwell/src/VideoMetadata.vala" return; -#line 1680 "VideoMetadata.c" +#line 1688 "VideoMetadata.c" } #line 202 "/home/jens/Source/shotwell/src/VideoMetadata.vala" _g_object_unref0 (self->priv->input); #line 202 "/home/jens/Source/shotwell/src/VideoMetadata.vala" self->priv->input = NULL; -#line 1686 "VideoMetadata.c" +#line 1694 "VideoMetadata.c" } } @@ -1704,7 +1712,7 @@ static void quick_time_atom_advance_section_offset (QuickTimeAtom* self, guint64 _tmp2_ = self->priv->parent; #line 208 "/home/jens/Source/shotwell/src/VideoMetadata.vala" if (NULL != _tmp2_) { -#line 1707 "VideoMetadata.c" +#line 1715 "VideoMetadata.c" QuickTimeAtom* _tmp3_ = NULL; guint64 _tmp4_ = 0ULL; #line 209 "/home/jens/Source/shotwell/src/VideoMetadata.vala" @@ -1713,7 +1721,7 @@ static void quick_time_atom_advance_section_offset (QuickTimeAtom* self, guint64 _tmp4_ = amount; #line 209 "/home/jens/Source/shotwell/src/VideoMetadata.vala" quick_time_atom_advance_section_offset (_tmp3_, _tmp4_); -#line 1716 "VideoMetadata.c" +#line 1724 "VideoMetadata.c" } } @@ -1732,7 +1740,7 @@ QuickTimeAtom* quick_time_atom_get_first_child_atom (QuickTimeAtom* self) { result = _tmp1_; #line 219 "/home/jens/Source/shotwell/src/VideoMetadata.vala" return result; -#line 1735 "VideoMetadata.c" +#line 1743 "VideoMetadata.c" } @@ -1754,17 +1762,19 @@ guchar quick_time_atom_read_byte (QuickTimeAtom* self, GError** error) { _tmp0_ = _tmp2_; #line 224 "/home/jens/Source/shotwell/src/VideoMetadata.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { +#line 1765 "VideoMetadata.c" + guchar _tmp3_ = '\0'; #line 224 "/home/jens/Source/shotwell/src/VideoMetadata.vala" g_propagate_error (error, _inner_error_); #line 224 "/home/jens/Source/shotwell/src/VideoMetadata.vala" - return '\0'; -#line 1761 "VideoMetadata.c" + return _tmp3_; +#line 1771 "VideoMetadata.c" } #line 224 "/home/jens/Source/shotwell/src/VideoMetadata.vala" result = (guchar) _tmp0_; #line 224 "/home/jens/Source/shotwell/src/VideoMetadata.vala" return result; -#line 1767 "VideoMetadata.c" +#line 1777 "VideoMetadata.c" } @@ -1786,17 +1796,19 @@ guint32 quick_time_atom_read_uint32 (QuickTimeAtom* self, GError** error) { _tmp0_ = _tmp2_; #line 229 "/home/jens/Source/shotwell/src/VideoMetadata.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { +#line 1799 "VideoMetadata.c" + guint32 _tmp3_ = 0U; #line 229 "/home/jens/Source/shotwell/src/VideoMetadata.vala" g_propagate_error (error, _inner_error_); #line 229 "/home/jens/Source/shotwell/src/VideoMetadata.vala" - return 0U; -#line 1793 "VideoMetadata.c" + return _tmp3_; +#line 1805 "VideoMetadata.c" } #line 229 "/home/jens/Source/shotwell/src/VideoMetadata.vala" result = _tmp0_; #line 229 "/home/jens/Source/shotwell/src/VideoMetadata.vala" return result; -#line 1799 "VideoMetadata.c" +#line 1811 "VideoMetadata.c" } @@ -1818,17 +1830,19 @@ guint64 quick_time_atom_read_uint64 (QuickTimeAtom* self, GError** error) { _tmp0_ = _tmp2_; #line 234 "/home/jens/Source/shotwell/src/VideoMetadata.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { +#line 1833 "VideoMetadata.c" + guint64 _tmp3_ = 0ULL; #line 234 "/home/jens/Source/shotwell/src/VideoMetadata.vala" g_propagate_error (error, _inner_error_); #line 234 "/home/jens/Source/shotwell/src/VideoMetadata.vala" - return 0ULL; -#line 1825 "VideoMetadata.c" + return _tmp3_; +#line 1839 "VideoMetadata.c" } #line 234 "/home/jens/Source/shotwell/src/VideoMetadata.vala" result = _tmp0_; #line 234 "/home/jens/Source/shotwell/src/VideoMetadata.vala" return result; -#line 1831 "VideoMetadata.c" +#line 1845 "VideoMetadata.c" } @@ -1846,7 +1860,7 @@ static gchar string_get (const gchar* self, glong index) { result = _tmp1_; #line 1087 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" return result; -#line 1849 "VideoMetadata.c" +#line 1863 "VideoMetadata.c" } @@ -1887,7 +1901,7 @@ void quick_time_atom_read_atom (QuickTimeAtom* self, GError** error) { g_propagate_error (error, _inner_error_); #line 239 "/home/jens/Source/shotwell/src/VideoMetadata.vala" return; -#line 1890 "VideoMetadata.c" +#line 1904 "VideoMetadata.c" } #line 239 "/home/jens/Source/shotwell/src/VideoMetadata.vala" self->priv->section_size = (guint64) _tmp0_; @@ -1907,7 +1921,7 @@ void quick_time_atom_read_atom (QuickTimeAtom* self, GError** error) { _g_string_free0 (sb); #line 243 "/home/jens/Source/shotwell/src/VideoMetadata.vala" return; -#line 1910 "VideoMetadata.c" +#line 1924 "VideoMetadata.c" } #line 243 "/home/jens/Source/shotwell/src/VideoMetadata.vala" _tmp5_ = sb; @@ -1925,7 +1939,7 @@ void quick_time_atom_read_atom (QuickTimeAtom* self, GError** error) { _g_string_free0 (sb); #line 244 "/home/jens/Source/shotwell/src/VideoMetadata.vala" return; -#line 1928 "VideoMetadata.c" +#line 1942 "VideoMetadata.c" } #line 244 "/home/jens/Source/shotwell/src/VideoMetadata.vala" _tmp8_ = sb; @@ -1943,7 +1957,7 @@ void quick_time_atom_read_atom (QuickTimeAtom* self, GError** error) { _g_string_free0 (sb); #line 245 "/home/jens/Source/shotwell/src/VideoMetadata.vala" return; -#line 1946 "VideoMetadata.c" +#line 1960 "VideoMetadata.c" } #line 245 "/home/jens/Source/shotwell/src/VideoMetadata.vala" _tmp11_ = sb; @@ -1961,7 +1975,7 @@ void quick_time_atom_read_atom (QuickTimeAtom* self, GError** error) { _g_string_free0 (sb); #line 246 "/home/jens/Source/shotwell/src/VideoMetadata.vala" return; -#line 1964 "VideoMetadata.c" +#line 1978 "VideoMetadata.c" } #line 246 "/home/jens/Source/shotwell/src/VideoMetadata.vala" _tmp14_ = sb; @@ -1985,7 +1999,7 @@ void quick_time_atom_read_atom (QuickTimeAtom* self, GError** error) { _tmp20_ = _tmp19_; #line 250 "/home/jens/Source/shotwell/src/VideoMetadata.vala" if (_tmp20_ != 4) { -#line 1988 "VideoMetadata.c" +#line 2002 "VideoMetadata.c" GFile* _tmp21_ = NULL; gchar* _tmp22_ = NULL; gchar* _tmp23_ = NULL; @@ -2011,20 +2025,20 @@ void quick_time_atom_read_atom (QuickTimeAtom* self, GError** error) { _g_string_free0 (sb); #line 251 "/home/jens/Source/shotwell/src/VideoMetadata.vala" return; -#line 2014 "VideoMetadata.c" +#line 2028 "VideoMetadata.c" } { gint i = 0; #line 254 "/home/jens/Source/shotwell/src/VideoMetadata.vala" i = 0; -#line 2020 "VideoMetadata.c" +#line 2034 "VideoMetadata.c" { gboolean _tmp26_ = FALSE; #line 254 "/home/jens/Source/shotwell/src/VideoMetadata.vala" _tmp26_ = TRUE; #line 254 "/home/jens/Source/shotwell/src/VideoMetadata.vala" while (TRUE) { -#line 2027 "VideoMetadata.c" +#line 2041 "VideoMetadata.c" gint _tmp28_ = 0; const gchar* _tmp29_ = NULL; gint _tmp30_ = 0; @@ -2035,13 +2049,13 @@ void quick_time_atom_read_atom (QuickTimeAtom* self, GError** error) { gboolean _tmp35_ = FALSE; #line 254 "/home/jens/Source/shotwell/src/VideoMetadata.vala" if (!_tmp26_) { -#line 2038 "VideoMetadata.c" +#line 2052 "VideoMetadata.c" gint _tmp27_ = 0; #line 254 "/home/jens/Source/shotwell/src/VideoMetadata.vala" _tmp27_ = i; #line 254 "/home/jens/Source/shotwell/src/VideoMetadata.vala" i = _tmp27_ + 1; -#line 2044 "VideoMetadata.c" +#line 2058 "VideoMetadata.c" } #line 254 "/home/jens/Source/shotwell/src/VideoMetadata.vala" _tmp26_ = FALSE; @@ -2057,7 +2071,7 @@ void quick_time_atom_read_atom (QuickTimeAtom* self, GError** error) { if (!(_tmp28_ < _tmp31_)) { #line 254 "/home/jens/Source/shotwell/src/VideoMetadata.vala" break; -#line 2060 "VideoMetadata.c" +#line 2074 "VideoMetadata.c" } #line 255 "/home/jens/Source/shotwell/src/VideoMetadata.vala" _tmp32_ = self->priv->section_name; @@ -2069,7 +2083,7 @@ void quick_time_atom_read_atom (QuickTimeAtom* self, GError** error) { _tmp35_ = g_ascii_isprint (_tmp34_); #line 255 "/home/jens/Source/shotwell/src/VideoMetadata.vala" if (!_tmp35_) { -#line 2072 "VideoMetadata.c" +#line 2086 "VideoMetadata.c" GFile* _tmp36_ = NULL; gchar* _tmp37_ = NULL; gchar* _tmp38_ = NULL; @@ -2095,7 +2109,7 @@ void quick_time_atom_read_atom (QuickTimeAtom* self, GError** error) { _g_string_free0 (sb); #line 256 "/home/jens/Source/shotwell/src/VideoMetadata.vala" return; -#line 2098 "VideoMetadata.c" +#line 2112 "VideoMetadata.c" } } } @@ -2104,7 +2118,7 @@ void quick_time_atom_read_atom (QuickTimeAtom* self, GError** error) { _tmp41_ = self->priv->section_size; #line 260 "/home/jens/Source/shotwell/src/VideoMetadata.vala" if (((guint64) 1) == _tmp41_) { -#line 2107 "VideoMetadata.c" +#line 2121 "VideoMetadata.c" guint64 _tmp42_ = 0ULL; guint64 _tmp43_ = 0ULL; #line 263 "/home/jens/Source/shotwell/src/VideoMetadata.vala" @@ -2119,15 +2133,15 @@ void quick_time_atom_read_atom (QuickTimeAtom* self, GError** error) { _g_string_free0 (sb); #line 263 "/home/jens/Source/shotwell/src/VideoMetadata.vala" return; -#line 2122 "VideoMetadata.c" +#line 2136 "VideoMetadata.c" } #line 263 "/home/jens/Source/shotwell/src/VideoMetadata.vala" self->priv->section_size = _tmp42_; -#line 2126 "VideoMetadata.c" +#line 2140 "VideoMetadata.c" } #line 237 "/home/jens/Source/shotwell/src/VideoMetadata.vala" _g_string_free0 (sb); -#line 2130 "VideoMetadata.c" +#line 2144 "VideoMetadata.c" } @@ -2149,7 +2163,7 @@ static void quick_time_atom_skip (QuickTimeAtom* self, guint64 skip_amount, GErr g_propagate_error (error, _inner_error_); #line 268 "/home/jens/Source/shotwell/src/VideoMetadata.vala" return; -#line 2152 "VideoMetadata.c" +#line 2166 "VideoMetadata.c" } } @@ -2176,7 +2190,7 @@ guint64 quick_time_atom_section_size_remaining (QuickTimeAtom* self) { result = _tmp2_ - _tmp3_; #line 273 "/home/jens/Source/shotwell/src/VideoMetadata.vala" return result; -#line 2179 "VideoMetadata.c" +#line 2193 "VideoMetadata.c" } @@ -2195,13 +2209,13 @@ void quick_time_atom_next_atom (QuickTimeAtom* self, GError** error) { g_propagate_error (error, _inner_error_); #line 277 "/home/jens/Source/shotwell/src/VideoMetadata.vala" return; -#line 2198 "VideoMetadata.c" +#line 2212 "VideoMetadata.c" } #line 278 "/home/jens/Source/shotwell/src/VideoMetadata.vala" self->priv->section_size = (guint64) 0; #line 279 "/home/jens/Source/shotwell/src/VideoMetadata.vala" self->priv->section_offset = (guint64) 0; -#line 2204 "VideoMetadata.c" +#line 2218 "VideoMetadata.c" } @@ -2219,7 +2233,7 @@ gchar* quick_time_atom_get_current_atom_name (QuickTimeAtom* self) { result = _tmp1_; #line 283 "/home/jens/Source/shotwell/src/VideoMetadata.vala" return result; -#line 2222 "VideoMetadata.c" +#line 2236 "VideoMetadata.c" } @@ -2234,14 +2248,14 @@ gboolean quick_time_atom_is_last_atom (QuickTimeAtom* self) { result = ((guint64) 0) == _tmp0_; #line 287 "/home/jens/Source/shotwell/src/VideoMetadata.vala" return result; -#line 2237 "VideoMetadata.c" +#line 2251 "VideoMetadata.c" } static void value_quick_time_atom_init (GValue* value) { #line 173 "/home/jens/Source/shotwell/src/VideoMetadata.vala" value->data[0].v_pointer = NULL; -#line 2244 "VideoMetadata.c" +#line 2258 "VideoMetadata.c" } @@ -2250,7 +2264,7 @@ static void value_quick_time_atom_free_value (GValue* value) { if (value->data[0].v_pointer) { #line 173 "/home/jens/Source/shotwell/src/VideoMetadata.vala" quick_time_atom_unref (value->data[0].v_pointer); -#line 2253 "VideoMetadata.c" +#line 2267 "VideoMetadata.c" } } @@ -2260,11 +2274,11 @@ static void value_quick_time_atom_copy_value (const GValue* src_value, GValue* d if (src_value->data[0].v_pointer) { #line 173 "/home/jens/Source/shotwell/src/VideoMetadata.vala" dest_value->data[0].v_pointer = quick_time_atom_ref (src_value->data[0].v_pointer); -#line 2263 "VideoMetadata.c" +#line 2277 "VideoMetadata.c" } else { #line 173 "/home/jens/Source/shotwell/src/VideoMetadata.vala" dest_value->data[0].v_pointer = NULL; -#line 2267 "VideoMetadata.c" +#line 2281 "VideoMetadata.c" } } @@ -2272,37 +2286,37 @@ static void value_quick_time_atom_copy_value (const GValue* src_value, GValue* d static gpointer value_quick_time_atom_peek_pointer (const GValue* value) { #line 173 "/home/jens/Source/shotwell/src/VideoMetadata.vala" return value->data[0].v_pointer; -#line 2275 "VideoMetadata.c" +#line 2289 "VideoMetadata.c" } static gchar* value_quick_time_atom_collect_value (GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) { #line 173 "/home/jens/Source/shotwell/src/VideoMetadata.vala" if (collect_values[0].v_pointer) { -#line 2282 "VideoMetadata.c" +#line 2296 "VideoMetadata.c" QuickTimeAtom* object; object = collect_values[0].v_pointer; #line 173 "/home/jens/Source/shotwell/src/VideoMetadata.vala" if (object->parent_instance.g_class == NULL) { #line 173 "/home/jens/Source/shotwell/src/VideoMetadata.vala" return g_strconcat ("invalid unclassed object pointer for value type `", G_VALUE_TYPE_NAME (value), "'", NULL); -#line 2289 "VideoMetadata.c" +#line 2303 "VideoMetadata.c" } else if (!g_value_type_compatible (G_TYPE_FROM_INSTANCE (object), G_VALUE_TYPE (value))) { #line 173 "/home/jens/Source/shotwell/src/VideoMetadata.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 2293 "VideoMetadata.c" +#line 2307 "VideoMetadata.c" } #line 173 "/home/jens/Source/shotwell/src/VideoMetadata.vala" value->data[0].v_pointer = quick_time_atom_ref (object); -#line 2297 "VideoMetadata.c" +#line 2311 "VideoMetadata.c" } else { #line 173 "/home/jens/Source/shotwell/src/VideoMetadata.vala" value->data[0].v_pointer = NULL; -#line 2301 "VideoMetadata.c" +#line 2315 "VideoMetadata.c" } #line 173 "/home/jens/Source/shotwell/src/VideoMetadata.vala" return NULL; -#line 2305 "VideoMetadata.c" +#line 2319 "VideoMetadata.c" } @@ -2313,25 +2327,25 @@ static gchar* value_quick_time_atom_lcopy_value (const GValue* value, guint n_co if (!object_p) { #line 173 "/home/jens/Source/shotwell/src/VideoMetadata.vala" return g_strdup_printf ("value location for `%s' passed as NULL", G_VALUE_TYPE_NAME (value)); -#line 2316 "VideoMetadata.c" +#line 2330 "VideoMetadata.c" } #line 173 "/home/jens/Source/shotwell/src/VideoMetadata.vala" if (!value->data[0].v_pointer) { #line 173 "/home/jens/Source/shotwell/src/VideoMetadata.vala" *object_p = NULL; -#line 2322 "VideoMetadata.c" +#line 2336 "VideoMetadata.c" } else if (collect_flags & G_VALUE_NOCOPY_CONTENTS) { #line 173 "/home/jens/Source/shotwell/src/VideoMetadata.vala" *object_p = value->data[0].v_pointer; -#line 2326 "VideoMetadata.c" +#line 2340 "VideoMetadata.c" } else { #line 173 "/home/jens/Source/shotwell/src/VideoMetadata.vala" *object_p = quick_time_atom_ref (value->data[0].v_pointer); -#line 2330 "VideoMetadata.c" +#line 2344 "VideoMetadata.c" } #line 173 "/home/jens/Source/shotwell/src/VideoMetadata.vala" return NULL; -#line 2334 "VideoMetadata.c" +#line 2348 "VideoMetadata.c" } @@ -2345,7 +2359,7 @@ GParamSpec* param_spec_quick_time_atom (const gchar* name, const gchar* nick, co G_PARAM_SPEC (spec)->value_type = object_type; #line 173 "/home/jens/Source/shotwell/src/VideoMetadata.vala" return G_PARAM_SPEC (spec); -#line 2348 "VideoMetadata.c" +#line 2362 "VideoMetadata.c" } @@ -2354,7 +2368,7 @@ gpointer value_get_quick_time_atom (const GValue* value) { g_return_val_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, TYPE_QUICK_TIME_ATOM), NULL); #line 173 "/home/jens/Source/shotwell/src/VideoMetadata.vala" return value->data[0].v_pointer; -#line 2357 "VideoMetadata.c" +#line 2371 "VideoMetadata.c" } @@ -2374,17 +2388,17 @@ void value_set_quick_time_atom (GValue* value, gpointer v_object) { value->data[0].v_pointer = v_object; #line 173 "/home/jens/Source/shotwell/src/VideoMetadata.vala" quick_time_atom_ref (value->data[0].v_pointer); -#line 2377 "VideoMetadata.c" +#line 2391 "VideoMetadata.c" } else { #line 173 "/home/jens/Source/shotwell/src/VideoMetadata.vala" value->data[0].v_pointer = NULL; -#line 2381 "VideoMetadata.c" +#line 2395 "VideoMetadata.c" } #line 173 "/home/jens/Source/shotwell/src/VideoMetadata.vala" if (old) { #line 173 "/home/jens/Source/shotwell/src/VideoMetadata.vala" quick_time_atom_unref (old); -#line 2387 "VideoMetadata.c" +#line 2401 "VideoMetadata.c" } } @@ -2403,17 +2417,17 @@ void value_take_quick_time_atom (GValue* value, gpointer v_object) { g_return_if_fail (g_value_type_compatible (G_TYPE_FROM_INSTANCE (v_object), G_VALUE_TYPE (value))); #line 173 "/home/jens/Source/shotwell/src/VideoMetadata.vala" value->data[0].v_pointer = v_object; -#line 2406 "VideoMetadata.c" +#line 2420 "VideoMetadata.c" } else { #line 173 "/home/jens/Source/shotwell/src/VideoMetadata.vala" value->data[0].v_pointer = NULL; -#line 2410 "VideoMetadata.c" +#line 2424 "VideoMetadata.c" } #line 173 "/home/jens/Source/shotwell/src/VideoMetadata.vala" if (old) { #line 173 "/home/jens/Source/shotwell/src/VideoMetadata.vala" quick_time_atom_unref (old); -#line 2416 "VideoMetadata.c" +#line 2430 "VideoMetadata.c" } } @@ -2425,7 +2439,7 @@ static void quick_time_atom_class_init (QuickTimeAtomClass * klass) { ((QuickTimeAtomClass *) klass)->finalize = quick_time_atom_finalize; #line 173 "/home/jens/Source/shotwell/src/VideoMetadata.vala" g_type_class_add_private (klass, sizeof (QuickTimeAtomPrivate)); -#line 2428 "VideoMetadata.c" +#line 2442 "VideoMetadata.c" } @@ -2449,7 +2463,7 @@ static void quick_time_atom_instance_init (QuickTimeAtom * self) { self->priv->parent = NULL; #line 173 "/home/jens/Source/shotwell/src/VideoMetadata.vala" self->ref_count = 1; -#line 2452 "VideoMetadata.c" +#line 2466 "VideoMetadata.c" } @@ -2467,7 +2481,7 @@ static void quick_time_atom_finalize (QuickTimeAtom* obj) { _g_object_unref0 (self->priv->input); #line 179 "/home/jens/Source/shotwell/src/VideoMetadata.vala" _quick_time_atom_unref0 (self->priv->parent); -#line 2470 "VideoMetadata.c" +#line 2484 "VideoMetadata.c" } @@ -2492,7 +2506,7 @@ gpointer quick_time_atom_ref (gpointer instance) { g_atomic_int_inc (&self->ref_count); #line 173 "/home/jens/Source/shotwell/src/VideoMetadata.vala" return instance; -#line 2495 "VideoMetadata.c" +#line 2509 "VideoMetadata.c" } @@ -2505,7 +2519,7 @@ void quick_time_atom_unref (gpointer instance) { QUICK_TIME_ATOM_GET_CLASS (self)->finalize (self); #line 173 "/home/jens/Source/shotwell/src/VideoMetadata.vala" g_type_free_instance ((GTypeInstance *) self); -#line 2508 "VideoMetadata.c" +#line 2522 "VideoMetadata.c" } } @@ -2528,14 +2542,14 @@ AVIMetadataLoader* avi_metadata_loader_construct (GType object_type, GFile* file self->priv->file = _tmp1_; #line 305 "/home/jens/Source/shotwell/src/VideoMetadata.vala" return self; -#line 2531 "VideoMetadata.c" +#line 2545 "VideoMetadata.c" } AVIMetadataLoader* avi_metadata_loader_new (GFile* file) { #line 305 "/home/jens/Source/shotwell/src/VideoMetadata.vala" return avi_metadata_loader_construct (TYPE_AVI_METADATA_LOADER, file); -#line 2538 "VideoMetadata.c" +#line 2552 "VideoMetadata.c" } @@ -2553,7 +2567,7 @@ MetadataDateTime* avi_metadata_loader_get_creation_date_time (AVIMetadataLoader* result = _tmp1_; #line 310 "/home/jens/Source/shotwell/src/VideoMetadata.vala" return result; -#line 2556 "VideoMetadata.c" +#line 2570 "VideoMetadata.c" } @@ -2565,7 +2579,7 @@ gchar* avi_metadata_loader_get_title (AVIMetadataLoader* self) { result = NULL; #line 315 "/home/jens/Source/shotwell/src/VideoMetadata.vala" return result; -#line 2568 "VideoMetadata.c" +#line 2582 "VideoMetadata.c" } @@ -2586,7 +2600,7 @@ gboolean avi_metadata_loader_is_supported (AVIMetadataLoader* self) { chunk = _tmp1_; #line 321 "/home/jens/Source/shotwell/src/VideoMetadata.vala" ret = FALSE; -#line 2589 "VideoMetadata.c" +#line 2603 "VideoMetadata.c" { AVIChunk* _tmp2_ = NULL; AVIChunk* _tmp3_ = NULL; @@ -2601,7 +2615,7 @@ gboolean avi_metadata_loader_is_supported (AVIMetadataLoader* self) { avi_chunk_open_file (_tmp2_, &_inner_error_); #line 323 "/home/jens/Source/shotwell/src/VideoMetadata.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 2604 "VideoMetadata.c" +#line 2618 "VideoMetadata.c" goto __catch579_g_error; } #line 324 "/home/jens/Source/shotwell/src/VideoMetadata.vala" @@ -2610,7 +2624,7 @@ gboolean avi_metadata_loader_is_supported (AVIMetadataLoader* self) { avi_chunk_read_chunk (_tmp3_, &_inner_error_); #line 324 "/home/jens/Source/shotwell/src/VideoMetadata.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 2613 "VideoMetadata.c" +#line 2627 "VideoMetadata.c" goto __catch579_g_error; } #line 326 "/home/jens/Source/shotwell/src/VideoMetadata.vala" @@ -2625,7 +2639,7 @@ gboolean avi_metadata_loader_is_supported (AVIMetadataLoader* self) { _g_free0 (_tmp7_); #line 326 "/home/jens/Source/shotwell/src/VideoMetadata.vala" if (_tmp8_) { -#line 2628 "VideoMetadata.c" +#line 2642 "VideoMetadata.c" gchar* _tmp9_ = NULL; AVIChunk* _tmp10_ = NULL; gchar* _tmp11_ = NULL; @@ -2639,7 +2653,7 @@ gboolean avi_metadata_loader_is_supported (AVIMetadataLoader* self) { _tmp9_ = _tmp11_; #line 327 "/home/jens/Source/shotwell/src/VideoMetadata.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 2642 "VideoMetadata.c" +#line 2656 "VideoMetadata.c" goto __catch579_g_error; } #line 327 "/home/jens/Source/shotwell/src/VideoMetadata.vala" @@ -2654,17 +2668,17 @@ gboolean avi_metadata_loader_is_supported (AVIMetadataLoader* self) { _g_free0 (_tmp13_); #line 326 "/home/jens/Source/shotwell/src/VideoMetadata.vala" _g_free0 (_tmp9_); -#line 2657 "VideoMetadata.c" +#line 2671 "VideoMetadata.c" } else { #line 326 "/home/jens/Source/shotwell/src/VideoMetadata.vala" _tmp4_ = FALSE; -#line 2661 "VideoMetadata.c" +#line 2675 "VideoMetadata.c" } #line 326 "/home/jens/Source/shotwell/src/VideoMetadata.vala" if (_tmp4_) { #line 328 "/home/jens/Source/shotwell/src/VideoMetadata.vala" ret = TRUE; -#line 2667 "VideoMetadata.c" +#line 2681 "VideoMetadata.c" } } goto __finally579; @@ -2685,11 +2699,13 @@ gboolean avi_metadata_loader_is_supported (AVIMetadataLoader* self) { g_debug ("VideoMetadata.vala:331: Error while testing for AVI file: %s", _tmp15_); #line 322 "/home/jens/Source/shotwell/src/VideoMetadata.vala" _g_error_free0 (e); -#line 2688 "VideoMetadata.c" +#line 2702 "VideoMetadata.c" } __finally579: #line 322 "/home/jens/Source/shotwell/src/VideoMetadata.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { +#line 2707 "VideoMetadata.c" + gboolean _tmp16_ = FALSE; #line 322 "/home/jens/Source/shotwell/src/VideoMetadata.vala" _avi_chunk_unref0 (chunk); #line 322 "/home/jens/Source/shotwell/src/VideoMetadata.vala" @@ -2697,18 +2713,18 @@ gboolean avi_metadata_loader_is_supported (AVIMetadataLoader* self) { #line 322 "/home/jens/Source/shotwell/src/VideoMetadata.vala" g_clear_error (&_inner_error_); #line 322 "/home/jens/Source/shotwell/src/VideoMetadata.vala" - return FALSE; -#line 2701 "VideoMetadata.c" + return _tmp16_; +#line 2717 "VideoMetadata.c" } { - AVIChunk* _tmp16_ = NULL; + AVIChunk* _tmp17_ = NULL; #line 335 "/home/jens/Source/shotwell/src/VideoMetadata.vala" - _tmp16_ = chunk; + _tmp17_ = chunk; #line 335 "/home/jens/Source/shotwell/src/VideoMetadata.vala" - avi_chunk_close_file (_tmp16_, &_inner_error_); + avi_chunk_close_file (_tmp17_, &_inner_error_); #line 335 "/home/jens/Source/shotwell/src/VideoMetadata.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 2711 "VideoMetadata.c" +#line 2727 "VideoMetadata.c" goto __catch580_g_error; } } @@ -2716,25 +2732,27 @@ gboolean avi_metadata_loader_is_supported (AVIMetadataLoader* self) { __catch580_g_error: { GError* e = NULL; - GError* _tmp17_ = NULL; - const gchar* _tmp18_ = NULL; + GError* _tmp18_ = NULL; + const gchar* _tmp19_ = NULL; #line 334 "/home/jens/Source/shotwell/src/VideoMetadata.vala" e = _inner_error_; #line 334 "/home/jens/Source/shotwell/src/VideoMetadata.vala" _inner_error_ = NULL; #line 337 "/home/jens/Source/shotwell/src/VideoMetadata.vala" - _tmp17_ = e; + _tmp18_ = e; #line 337 "/home/jens/Source/shotwell/src/VideoMetadata.vala" - _tmp18_ = _tmp17_->message; + _tmp19_ = _tmp18_->message; #line 337 "/home/jens/Source/shotwell/src/VideoMetadata.vala" - g_debug ("VideoMetadata.vala:337: Error while closing AVI file: %s", _tmp18_); + g_debug ("VideoMetadata.vala:337: Error while closing AVI file: %s", _tmp19_); #line 334 "/home/jens/Source/shotwell/src/VideoMetadata.vala" _g_error_free0 (e); -#line 2733 "VideoMetadata.c" +#line 2749 "VideoMetadata.c" } __finally580: #line 334 "/home/jens/Source/shotwell/src/VideoMetadata.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { +#line 2754 "VideoMetadata.c" + gboolean _tmp20_ = FALSE; #line 334 "/home/jens/Source/shotwell/src/VideoMetadata.vala" _avi_chunk_unref0 (chunk); #line 334 "/home/jens/Source/shotwell/src/VideoMetadata.vala" @@ -2742,8 +2760,8 @@ gboolean avi_metadata_loader_is_supported (AVIMetadataLoader* self) { #line 334 "/home/jens/Source/shotwell/src/VideoMetadata.vala" g_clear_error (&_inner_error_); #line 334 "/home/jens/Source/shotwell/src/VideoMetadata.vala" - return FALSE; -#line 2746 "VideoMetadata.c" + return _tmp20_; +#line 2764 "VideoMetadata.c" } #line 339 "/home/jens/Source/shotwell/src/VideoMetadata.vala" result = ret; @@ -2751,7 +2769,7 @@ gboolean avi_metadata_loader_is_supported (AVIMetadataLoader* self) { _avi_chunk_unref0 (chunk); #line 339 "/home/jens/Source/shotwell/src/VideoMetadata.vala" return result; -#line 2754 "VideoMetadata.c" +#line 2772 "VideoMetadata.c" } @@ -2769,7 +2787,7 @@ static gchar* avi_metadata_loader_read_nikon_nctg_tag (AVIMetadataLoader* self, found_date = FALSE; #line 345 "/home/jens/Source/shotwell/src/VideoMetadata.vala" while (TRUE) { -#line 2772 "VideoMetadata.c" +#line 2790 "VideoMetadata.c" AVIChunk* _tmp0_ = NULL; guint64 _tmp1_ = 0ULL; guint16 tag = 0U; @@ -2789,7 +2807,7 @@ static gchar* avi_metadata_loader_read_nikon_nctg_tag (AVIMetadataLoader* self, if (!(_tmp1_ > ((guint64) (sizeof (guint16) * 2)))) { #line 345 "/home/jens/Source/shotwell/src/VideoMetadata.vala" break; -#line 2792 "VideoMetadata.c" +#line 2810 "VideoMetadata.c" } #line 346 "/home/jens/Source/shotwell/src/VideoMetadata.vala" _tmp2_ = chunk; @@ -2803,7 +2821,7 @@ static gchar* avi_metadata_loader_read_nikon_nctg_tag (AVIMetadataLoader* self, g_propagate_error (error, _inner_error_); #line 346 "/home/jens/Source/shotwell/src/VideoMetadata.vala" return NULL; -#line 2806 "VideoMetadata.c" +#line 2824 "VideoMetadata.c" } #line 347 "/home/jens/Source/shotwell/src/VideoMetadata.vala" _tmp4_ = chunk; @@ -2817,7 +2835,7 @@ static gchar* avi_metadata_loader_read_nikon_nctg_tag (AVIMetadataLoader* self, g_propagate_error (error, _inner_error_); #line 347 "/home/jens/Source/shotwell/src/VideoMetadata.vala" return NULL; -#line 2820 "VideoMetadata.c" +#line 2838 "VideoMetadata.c" } #line 348 "/home/jens/Source/shotwell/src/VideoMetadata.vala" _tmp6_ = tag; @@ -2827,7 +2845,7 @@ static gchar* avi_metadata_loader_read_nikon_nctg_tag (AVIMetadataLoader* self, found_date = TRUE; #line 350 "/home/jens/Source/shotwell/src/VideoMetadata.vala" break; -#line 2830 "VideoMetadata.c" +#line 2848 "VideoMetadata.c" } #line 352 "/home/jens/Source/shotwell/src/VideoMetadata.vala" _tmp7_ = chunk; @@ -2841,14 +2859,14 @@ static gchar* avi_metadata_loader_read_nikon_nctg_tag (AVIMetadataLoader* self, g_propagate_error (error, _inner_error_); #line 352 "/home/jens/Source/shotwell/src/VideoMetadata.vala" return NULL; -#line 2844 "VideoMetadata.c" +#line 2862 "VideoMetadata.c" } } #line 355 "/home/jens/Source/shotwell/src/VideoMetadata.vala" _tmp9_ = found_date; #line 355 "/home/jens/Source/shotwell/src/VideoMetadata.vala" if (_tmp9_) { -#line 2851 "VideoMetadata.c" +#line 2869 "VideoMetadata.c" GString* sb = NULL; GString* _tmp10_ = NULL; GString* _tmp18_ = NULL; @@ -2858,19 +2876,19 @@ static gchar* avi_metadata_loader_read_nikon_nctg_tag (AVIMetadataLoader* self, _tmp10_ = g_string_new (""); #line 357 "/home/jens/Source/shotwell/src/VideoMetadata.vala" sb = _tmp10_; -#line 2861 "VideoMetadata.c" +#line 2879 "VideoMetadata.c" { gint i = 0; #line 358 "/home/jens/Source/shotwell/src/VideoMetadata.vala" i = 0; -#line 2866 "VideoMetadata.c" +#line 2884 "VideoMetadata.c" { gboolean _tmp11_ = FALSE; #line 358 "/home/jens/Source/shotwell/src/VideoMetadata.vala" _tmp11_ = TRUE; #line 358 "/home/jens/Source/shotwell/src/VideoMetadata.vala" while (TRUE) { -#line 2873 "VideoMetadata.c" +#line 2891 "VideoMetadata.c" gint _tmp13_ = 0; guchar _tmp14_ = '\0'; AVIChunk* _tmp15_ = NULL; @@ -2878,13 +2896,13 @@ static gchar* avi_metadata_loader_read_nikon_nctg_tag (AVIMetadataLoader* self, GString* _tmp17_ = NULL; #line 358 "/home/jens/Source/shotwell/src/VideoMetadata.vala" if (!_tmp11_) { -#line 2881 "VideoMetadata.c" +#line 2899 "VideoMetadata.c" gint _tmp12_ = 0; #line 358 "/home/jens/Source/shotwell/src/VideoMetadata.vala" _tmp12_ = i; #line 358 "/home/jens/Source/shotwell/src/VideoMetadata.vala" i = _tmp12_ + 1; -#line 2887 "VideoMetadata.c" +#line 2905 "VideoMetadata.c" } #line 358 "/home/jens/Source/shotwell/src/VideoMetadata.vala" _tmp11_ = FALSE; @@ -2894,7 +2912,7 @@ static gchar* avi_metadata_loader_read_nikon_nctg_tag (AVIMetadataLoader* self, if (!(_tmp13_ < AVI_METADATA_LOADER_NUMERICAL_DATE_LENGTH)) { #line 358 "/home/jens/Source/shotwell/src/VideoMetadata.vala" break; -#line 2897 "VideoMetadata.c" +#line 2915 "VideoMetadata.c" } #line 359 "/home/jens/Source/shotwell/src/VideoMetadata.vala" _tmp15_ = chunk; @@ -2910,13 +2928,13 @@ static gchar* avi_metadata_loader_read_nikon_nctg_tag (AVIMetadataLoader* self, _g_string_free0 (sb); #line 359 "/home/jens/Source/shotwell/src/VideoMetadata.vala" return NULL; -#line 2913 "VideoMetadata.c" +#line 2931 "VideoMetadata.c" } #line 359 "/home/jens/Source/shotwell/src/VideoMetadata.vala" _tmp17_ = sb; #line 359 "/home/jens/Source/shotwell/src/VideoMetadata.vala" g_string_append_c (_tmp17_, (gchar) _tmp14_); -#line 2919 "VideoMetadata.c" +#line 2937 "VideoMetadata.c" } } } @@ -2932,7 +2950,7 @@ static gchar* avi_metadata_loader_read_nikon_nctg_tag (AVIMetadataLoader* self, _g_string_free0 (sb); #line 361 "/home/jens/Source/shotwell/src/VideoMetadata.vala" return result; -#line 2935 "VideoMetadata.c" +#line 2953 "VideoMetadata.c" } #line 363 "/home/jens/Source/shotwell/src/VideoMetadata.vala" _tmp21_ = g_strdup (""); @@ -2940,7 +2958,7 @@ static gchar* avi_metadata_loader_read_nikon_nctg_tag (AVIMetadataLoader* self, result = _tmp21_; #line 363 "/home/jens/Source/shotwell/src/VideoMetadata.vala" return result; -#line 2943 "VideoMetadata.c" +#line 2961 "VideoMetadata.c" } @@ -2963,7 +2981,7 @@ static glong string_strnlen (gchar* str, glong maxlen) { _tmp3_ = end; #line 1296 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" if (_tmp3_ == NULL) { -#line 2966 "VideoMetadata.c" +#line 2984 "VideoMetadata.c" glong _tmp4_ = 0L; #line 1297 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp4_ = maxlen; @@ -2971,7 +2989,7 @@ static glong string_strnlen (gchar* str, glong maxlen) { result = _tmp4_; #line 1297 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" return result; -#line 2974 "VideoMetadata.c" +#line 2992 "VideoMetadata.c" } else { gchar* _tmp5_ = NULL; gchar* _tmp6_ = NULL; @@ -2983,7 +3001,7 @@ static glong string_strnlen (gchar* str, glong maxlen) { result = (glong) (_tmp5_ - _tmp6_); #line 1299 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" return result; -#line 2986 "VideoMetadata.c" +#line 3004 "VideoMetadata.c" } } @@ -3007,21 +3025,21 @@ static gchar* string_substring (const gchar* self, glong offset, glong len) { _tmp1_ = offset; #line 1308 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" if (_tmp1_ >= ((glong) 0)) { -#line 3010 "VideoMetadata.c" +#line 3028 "VideoMetadata.c" glong _tmp2_ = 0L; #line 1308 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp2_ = len; #line 1308 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp0_ = _tmp2_ >= ((glong) 0); -#line 3016 "VideoMetadata.c" +#line 3034 "VideoMetadata.c" } else { #line 1308 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp0_ = FALSE; -#line 3020 "VideoMetadata.c" +#line 3038 "VideoMetadata.c" } #line 1308 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" if (_tmp0_) { -#line 3024 "VideoMetadata.c" +#line 3042 "VideoMetadata.c" glong _tmp3_ = 0L; glong _tmp4_ = 0L; glong _tmp5_ = 0L; @@ -3033,7 +3051,7 @@ static gchar* string_substring (const gchar* self, glong offset, glong len) { _tmp5_ = string_strnlen ((gchar*) self, _tmp3_ + _tmp4_); #line 1310 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" string_length = _tmp5_; -#line 3036 "VideoMetadata.c" +#line 3054 "VideoMetadata.c" } else { gint _tmp6_ = 0; gint _tmp7_ = 0; @@ -3043,13 +3061,13 @@ static gchar* string_substring (const gchar* self, glong offset, glong len) { _tmp7_ = _tmp6_; #line 1312 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" string_length = (glong) _tmp7_; -#line 3046 "VideoMetadata.c" +#line 3064 "VideoMetadata.c" } #line 1315 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp8_ = offset; #line 1315 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" if (_tmp8_ < ((glong) 0)) { -#line 3052 "VideoMetadata.c" +#line 3070 "VideoMetadata.c" glong _tmp9_ = 0L; glong _tmp10_ = 0L; glong _tmp11_ = 0L; @@ -3063,7 +3081,7 @@ static gchar* string_substring (const gchar* self, glong offset, glong len) { _tmp11_ = offset; #line 1317 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" g_return_val_if_fail (_tmp11_ >= ((glong) 0), NULL); -#line 3066 "VideoMetadata.c" +#line 3084 "VideoMetadata.c" } else { glong _tmp12_ = 0L; glong _tmp13_ = 0L; @@ -3073,13 +3091,13 @@ static gchar* string_substring (const gchar* self, glong offset, glong len) { _tmp13_ = string_length; #line 1319 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" g_return_val_if_fail (_tmp12_ <= _tmp13_, NULL); -#line 3076 "VideoMetadata.c" +#line 3094 "VideoMetadata.c" } #line 1321 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp14_ = len; #line 1321 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" if (_tmp14_ < ((glong) 0)) { -#line 3082 "VideoMetadata.c" +#line 3100 "VideoMetadata.c" glong _tmp15_ = 0L; glong _tmp16_ = 0L; #line 1322 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" @@ -3088,7 +3106,7 @@ static gchar* string_substring (const gchar* self, glong offset, glong len) { _tmp16_ = offset; #line 1322 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" len = _tmp15_ - _tmp16_; -#line 3091 "VideoMetadata.c" +#line 3109 "VideoMetadata.c" } #line 1324 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp17_ = offset; @@ -3108,7 +3126,7 @@ static gchar* string_substring (const gchar* self, glong offset, glong len) { result = _tmp22_; #line 1325 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" return result; -#line 3111 "VideoMetadata.c" +#line 3129 "VideoMetadata.c" } @@ -3146,7 +3164,7 @@ static gchar* avi_metadata_loader_read_fuji_strd_tag (AVIMetadataLoader* self, A g_propagate_error (error, _inner_error_); #line 369 "/home/jens/Source/shotwell/src/VideoMetadata.vala" return NULL; -#line 3149 "VideoMetadata.c" +#line 3167 "VideoMetadata.c" } #line 370 "/home/jens/Source/shotwell/src/VideoMetadata.vala" _tmp1_ = chunk; @@ -3158,7 +3176,7 @@ static gchar* avi_metadata_loader_read_fuji_strd_tag (AVIMetadataLoader* self, A g_propagate_error (error, _inner_error_); #line 370 "/home/jens/Source/shotwell/src/VideoMetadata.vala" return NULL; -#line 3161 "VideoMetadata.c" +#line 3179 "VideoMetadata.c" } #line 372 "/home/jens/Source/shotwell/src/VideoMetadata.vala" colons = 0; @@ -3170,7 +3188,7 @@ static gchar* avi_metadata_loader_read_fuji_strd_tag (AVIMetadataLoader* self, A sb = _tmp2_; #line 376 "/home/jens/Source/shotwell/src/VideoMetadata.vala" while (TRUE) { -#line 3173 "VideoMetadata.c" +#line 3191 "VideoMetadata.c" gboolean _tmp3_ = FALSE; gint _tmp4_ = 0; guchar _tmp6_ = '\0'; @@ -3187,23 +3205,23 @@ static gchar* avi_metadata_loader_read_fuji_strd_tag (AVIMetadataLoader* self, A _tmp4_ = colons; #line 376 "/home/jens/Source/shotwell/src/VideoMetadata.vala" if (_tmp4_ <= 4) { -#line 3190 "VideoMetadata.c" +#line 3208 "VideoMetadata.c" gint _tmp5_ = 0; #line 376 "/home/jens/Source/shotwell/src/VideoMetadata.vala" _tmp5_ = post_colons; #line 376 "/home/jens/Source/shotwell/src/VideoMetadata.vala" _tmp3_ = _tmp5_ < 2; -#line 3196 "VideoMetadata.c" +#line 3214 "VideoMetadata.c" } else { #line 376 "/home/jens/Source/shotwell/src/VideoMetadata.vala" _tmp3_ = FALSE; -#line 3200 "VideoMetadata.c" +#line 3218 "VideoMetadata.c" } #line 376 "/home/jens/Source/shotwell/src/VideoMetadata.vala" if (!_tmp3_) { #line 376 "/home/jens/Source/shotwell/src/VideoMetadata.vala" break; -#line 3206 "VideoMetadata.c" +#line 3224 "VideoMetadata.c" } #line 377 "/home/jens/Source/shotwell/src/VideoMetadata.vala" _tmp7_ = chunk; @@ -3219,7 +3237,7 @@ static gchar* avi_metadata_loader_read_fuji_strd_tag (AVIMetadataLoader* self, A _g_string_free0 (sb); #line 377 "/home/jens/Source/shotwell/src/VideoMetadata.vala" return NULL; -#line 3222 "VideoMetadata.c" +#line 3240 "VideoMetadata.c" } #line 377 "/home/jens/Source/shotwell/src/VideoMetadata.vala" c = (gchar) _tmp6_; @@ -3227,25 +3245,25 @@ static gchar* avi_metadata_loader_read_fuji_strd_tag (AVIMetadataLoader* self, A _tmp9_ = colons; #line 378 "/home/jens/Source/shotwell/src/VideoMetadata.vala" if (4 == _tmp9_) { -#line 3230 "VideoMetadata.c" +#line 3248 "VideoMetadata.c" gint _tmp10_ = 0; #line 379 "/home/jens/Source/shotwell/src/VideoMetadata.vala" _tmp10_ = post_colons; #line 379 "/home/jens/Source/shotwell/src/VideoMetadata.vala" post_colons = _tmp10_ + 1; -#line 3236 "VideoMetadata.c" +#line 3254 "VideoMetadata.c" } #line 381 "/home/jens/Source/shotwell/src/VideoMetadata.vala" _tmp11_ = c; #line 381 "/home/jens/Source/shotwell/src/VideoMetadata.vala" if (':' == _tmp11_) { -#line 3242 "VideoMetadata.c" +#line 3260 "VideoMetadata.c" gint _tmp12_ = 0; #line 382 "/home/jens/Source/shotwell/src/VideoMetadata.vala" _tmp12_ = colons; #line 382 "/home/jens/Source/shotwell/src/VideoMetadata.vala" colons = _tmp12_ + 1; -#line 3248 "VideoMetadata.c" +#line 3266 "VideoMetadata.c" } #line 384 "/home/jens/Source/shotwell/src/VideoMetadata.vala" _tmp13_ = c; @@ -3253,7 +3271,7 @@ static gchar* avi_metadata_loader_read_fuji_strd_tag (AVIMetadataLoader* self, A _tmp14_ = g_ascii_isprint (_tmp13_); #line 384 "/home/jens/Source/shotwell/src/VideoMetadata.vala" if (_tmp14_) { -#line 3256 "VideoMetadata.c" +#line 3274 "VideoMetadata.c" GString* _tmp15_ = NULL; gchar _tmp16_ = '\0'; #line 385 "/home/jens/Source/shotwell/src/VideoMetadata.vala" @@ -3262,7 +3280,7 @@ static gchar* avi_metadata_loader_read_fuji_strd_tag (AVIMetadataLoader* self, A _tmp16_ = c; #line 385 "/home/jens/Source/shotwell/src/VideoMetadata.vala" g_string_append_c (_tmp15_, _tmp16_); -#line 3265 "VideoMetadata.c" +#line 3283 "VideoMetadata.c" } #line 387 "/home/jens/Source/shotwell/src/VideoMetadata.vala" _tmp17_ = sb; @@ -3270,7 +3288,7 @@ static gchar* avi_metadata_loader_read_fuji_strd_tag (AVIMetadataLoader* self, A _tmp18_ = _tmp17_->len; #line 387 "/home/jens/Source/shotwell/src/VideoMetadata.vala" if (_tmp18_ > ((gssize) AVI_METADATA_LOADER_MAX_STRD_LENGTH)) { -#line 3273 "VideoMetadata.c" +#line 3291 "VideoMetadata.c" gchar* _tmp19_ = NULL; #line 388 "/home/jens/Source/shotwell/src/VideoMetadata.vala" _tmp19_ = g_strdup (""); @@ -3280,7 +3298,7 @@ static gchar* avi_metadata_loader_read_fuji_strd_tag (AVIMetadataLoader* self, A _g_string_free0 (sb); #line 388 "/home/jens/Source/shotwell/src/VideoMetadata.vala" return result; -#line 3283 "VideoMetadata.c" +#line 3301 "VideoMetadata.c" } } #line 392 "/home/jens/Source/shotwell/src/VideoMetadata.vala" @@ -3293,7 +3311,7 @@ static gchar* avi_metadata_loader_read_fuji_strd_tag (AVIMetadataLoader* self, A _tmp23_ = _tmp22_; #line 392 "/home/jens/Source/shotwell/src/VideoMetadata.vala" if (_tmp23_ < AVI_METADATA_LOADER_NUMERICAL_DATE_LENGTH) { -#line 3296 "VideoMetadata.c" +#line 3314 "VideoMetadata.c" gchar* _tmp24_ = NULL; #line 393 "/home/jens/Source/shotwell/src/VideoMetadata.vala" _tmp24_ = g_strdup (""); @@ -3303,7 +3321,7 @@ static gchar* avi_metadata_loader_read_fuji_strd_tag (AVIMetadataLoader* self, A _g_string_free0 (sb); #line 393 "/home/jens/Source/shotwell/src/VideoMetadata.vala" return result; -#line 3306 "VideoMetadata.c" +#line 3324 "VideoMetadata.c" } #line 396 "/home/jens/Source/shotwell/src/VideoMetadata.vala" _tmp25_ = sb; @@ -3325,7 +3343,7 @@ static gchar* avi_metadata_loader_read_fuji_strd_tag (AVIMetadataLoader* self, A _g_string_free0 (sb); #line 396 "/home/jens/Source/shotwell/src/VideoMetadata.vala" return result; -#line 3328 "VideoMetadata.c" +#line 3346 "VideoMetadata.c" } @@ -3338,7 +3356,7 @@ static gchar* avi_metadata_loader_read_section (AVIMetadataLoader* self, AVIChun g_return_val_if_fail (IS_AVI_CHUNK (chunk), NULL); #line 401 "/home/jens/Source/shotwell/src/VideoMetadata.vala" while (TRUE) { -#line 3341 "VideoMetadata.c" +#line 3359 "VideoMetadata.c" AVIChunk* _tmp0_ = NULL; gchar* name = NULL; AVIChunk* _tmp1_ = NULL; @@ -3358,7 +3376,7 @@ static gchar* avi_metadata_loader_read_section (AVIMetadataLoader* self, AVIChun g_propagate_error (error, _inner_error_); #line 402 "/home/jens/Source/shotwell/src/VideoMetadata.vala" return NULL; -#line 3361 "VideoMetadata.c" +#line 3379 "VideoMetadata.c" } #line 403 "/home/jens/Source/shotwell/src/VideoMetadata.vala" _tmp1_ = chunk; @@ -3370,7 +3388,7 @@ static gchar* avi_metadata_loader_read_section (AVIMetadataLoader* self, AVIChun _tmp3_ = name; #line 404 "/home/jens/Source/shotwell/src/VideoMetadata.vala" if (g_strcmp0 ("IDIT", _tmp3_) == 0) { -#line 3373 "VideoMetadata.c" +#line 3391 "VideoMetadata.c" gchar* _tmp4_ = NULL; AVIChunk* _tmp5_ = NULL; gchar* _tmp6_ = NULL; @@ -3389,7 +3407,7 @@ static gchar* avi_metadata_loader_read_section (AVIMetadataLoader* self, AVIChun _g_free0 (name); #line 405 "/home/jens/Source/shotwell/src/VideoMetadata.vala" return NULL; -#line 3392 "VideoMetadata.c" +#line 3410 "VideoMetadata.c" } #line 405 "/home/jens/Source/shotwell/src/VideoMetadata.vala" _tmp7_ = _tmp4_; @@ -3403,14 +3421,14 @@ static gchar* avi_metadata_loader_read_section (AVIMetadataLoader* self, AVIChun _g_free0 (name); #line 405 "/home/jens/Source/shotwell/src/VideoMetadata.vala" return result; -#line 3406 "VideoMetadata.c" +#line 3424 "VideoMetadata.c" } else { const gchar* _tmp8_ = NULL; #line 406 "/home/jens/Source/shotwell/src/VideoMetadata.vala" _tmp8_ = name; #line 406 "/home/jens/Source/shotwell/src/VideoMetadata.vala" if (g_strcmp0 ("nctg", _tmp8_) == 0) { -#line 3413 "VideoMetadata.c" +#line 3431 "VideoMetadata.c" gchar* _tmp9_ = NULL; AVIChunk* _tmp10_ = NULL; gchar* _tmp11_ = NULL; @@ -3429,7 +3447,7 @@ static gchar* avi_metadata_loader_read_section (AVIMetadataLoader* self, AVIChun _g_free0 (name); #line 407 "/home/jens/Source/shotwell/src/VideoMetadata.vala" return NULL; -#line 3432 "VideoMetadata.c" +#line 3450 "VideoMetadata.c" } #line 407 "/home/jens/Source/shotwell/src/VideoMetadata.vala" _tmp12_ = _tmp9_; @@ -3443,14 +3461,14 @@ static gchar* avi_metadata_loader_read_section (AVIMetadataLoader* self, AVIChun _g_free0 (name); #line 407 "/home/jens/Source/shotwell/src/VideoMetadata.vala" return result; -#line 3446 "VideoMetadata.c" +#line 3464 "VideoMetadata.c" } else { const gchar* _tmp13_ = NULL; #line 408 "/home/jens/Source/shotwell/src/VideoMetadata.vala" _tmp13_ = name; #line 408 "/home/jens/Source/shotwell/src/VideoMetadata.vala" if (g_strcmp0 ("strd", _tmp13_) == 0) { -#line 3453 "VideoMetadata.c" +#line 3471 "VideoMetadata.c" gchar* _tmp14_ = NULL; AVIChunk* _tmp15_ = NULL; gchar* _tmp16_ = NULL; @@ -3469,7 +3487,7 @@ static gchar* avi_metadata_loader_read_section (AVIMetadataLoader* self, AVIChun _g_free0 (name); #line 409 "/home/jens/Source/shotwell/src/VideoMetadata.vala" return NULL; -#line 3472 "VideoMetadata.c" +#line 3490 "VideoMetadata.c" } #line 409 "/home/jens/Source/shotwell/src/VideoMetadata.vala" _tmp17_ = _tmp14_; @@ -3483,7 +3501,7 @@ static gchar* avi_metadata_loader_read_section (AVIMetadataLoader* self, AVIChun _g_free0 (name); #line 409 "/home/jens/Source/shotwell/src/VideoMetadata.vala" return result; -#line 3486 "VideoMetadata.c" +#line 3504 "VideoMetadata.c" } } } @@ -3491,7 +3509,7 @@ static gchar* avi_metadata_loader_read_section (AVIMetadataLoader* self, AVIChun _tmp18_ = name; #line 412 "/home/jens/Source/shotwell/src/VideoMetadata.vala" if (g_strcmp0 ("LIST", _tmp18_) == 0) { -#line 3494 "VideoMetadata.c" +#line 3512 "VideoMetadata.c" AVIChunk* _tmp19_ = NULL; gchar* _tmp20_ = NULL; gchar* _tmp21_ = NULL; @@ -3518,7 +3536,7 @@ static gchar* avi_metadata_loader_read_section (AVIMetadataLoader* self, AVIChun _g_free0 (name); #line 413 "/home/jens/Source/shotwell/src/VideoMetadata.vala" return NULL; -#line 3521 "VideoMetadata.c" +#line 3539 "VideoMetadata.c" } #line 414 "/home/jens/Source/shotwell/src/VideoMetadata.vala" _tmp22_ = chunk; @@ -3542,7 +3560,7 @@ static gchar* avi_metadata_loader_read_section (AVIMetadataLoader* self, AVIChun _g_free0 (name); #line 414 "/home/jens/Source/shotwell/src/VideoMetadata.vala" return NULL; -#line 3545 "VideoMetadata.c" +#line 3563 "VideoMetadata.c" } #line 415 "/home/jens/Source/shotwell/src/VideoMetadata.vala" _tmp27_ = _result_; @@ -3554,11 +3572,11 @@ static gchar* avi_metadata_loader_read_section (AVIMetadataLoader* self, AVIChun _g_free0 (name); #line 416 "/home/jens/Source/shotwell/src/VideoMetadata.vala" return result; -#line 3557 "VideoMetadata.c" +#line 3575 "VideoMetadata.c" } #line 412 "/home/jens/Source/shotwell/src/VideoMetadata.vala" _g_free0 (_result_); -#line 3561 "VideoMetadata.c" +#line 3579 "VideoMetadata.c" } #line 420 "/home/jens/Source/shotwell/src/VideoMetadata.vala" _tmp28_ = chunk; @@ -3570,7 +3588,7 @@ static gchar* avi_metadata_loader_read_section (AVIMetadataLoader* self, AVIChun _g_free0 (name); #line 421 "/home/jens/Source/shotwell/src/VideoMetadata.vala" break; -#line 3573 "VideoMetadata.c" +#line 3591 "VideoMetadata.c" } #line 423 "/home/jens/Source/shotwell/src/VideoMetadata.vala" _tmp30_ = chunk; @@ -3584,17 +3602,17 @@ static gchar* avi_metadata_loader_read_section (AVIMetadataLoader* self, AVIChun _g_free0 (name); #line 423 "/home/jens/Source/shotwell/src/VideoMetadata.vala" return NULL; -#line 3587 "VideoMetadata.c" +#line 3605 "VideoMetadata.c" } #line 401 "/home/jens/Source/shotwell/src/VideoMetadata.vala" _g_free0 (name); -#line 3591 "VideoMetadata.c" +#line 3609 "VideoMetadata.c" } #line 425 "/home/jens/Source/shotwell/src/VideoMetadata.vala" result = NULL; #line 425 "/home/jens/Source/shotwell/src/VideoMetadata.vala" return result; -#line 3597 "VideoMetadata.c" +#line 3615 "VideoMetadata.c" } @@ -3641,7 +3659,7 @@ static gulong avi_metadata_loader_parse_date (AVIMetadataLoader* self, const gch result = (gulong) 0; #line 434 "/home/jens/Source/shotwell/src/VideoMetadata.vala" return result; -#line 3644 "VideoMetadata.c" +#line 3662 "VideoMetadata.c" } #line 437 "/home/jens/Source/shotwell/src/VideoMetadata.vala" memset (&date, 0, sizeof (GDate)); @@ -3655,7 +3673,7 @@ static gulong avi_metadata_loader_parse_date (AVIMetadataLoader* self, const gch _tmp5_ = g_ascii_isdigit (_tmp4_); #line 443 "/home/jens/Source/shotwell/src/VideoMetadata.vala" if (_tmp5_) { -#line 3658 "VideoMetadata.c" +#line 3676 "VideoMetadata.c" gchar* tmp = NULL; const gchar* _tmp6_ = NULL; gchar* _tmp7_ = NULL; @@ -3698,7 +3716,7 @@ static gulong avi_metadata_loader_parse_date (AVIMetadataLoader* self, const gch _g_free0 (tmp); #line 452 "/home/jens/Source/shotwell/src/VideoMetadata.vala" return result; -#line 3701 "VideoMetadata.c" +#line 3719 "VideoMetadata.c" } #line 454 "/home/jens/Source/shotwell/src/VideoMetadata.vala" _tmp12_ = day; @@ -3718,7 +3736,7 @@ static gulong avi_metadata_loader_parse_date (AVIMetadataLoader* self, const gch seconds = (guint) ((_tmp15_ + (_tmp16_ * 60)) + (_tmp17_ * 3600)); #line 443 "/home/jens/Source/shotwell/src/VideoMetadata.vala" _g_free0 (tmp); -#line 3721 "VideoMetadata.c" +#line 3739 "VideoMetadata.c" } else { const gchar* _tmp18_ = NULL; gint _tmp19_ = 0; @@ -3738,7 +3756,7 @@ static gulong avi_metadata_loader_parse_date (AVIMetadataLoader* self, const gch result = (gulong) 0; #line 460 "/home/jens/Source/shotwell/src/VideoMetadata.vala" return result; -#line 3741 "VideoMetadata.c" +#line 3759 "VideoMetadata.c" } #line 462 "/home/jens/Source/shotwell/src/VideoMetadata.vala" _tmp20_ = day; @@ -3756,7 +3774,7 @@ static gulong avi_metadata_loader_parse_date (AVIMetadataLoader* self, const gch _tmp25_ = hour; #line 463 "/home/jens/Source/shotwell/src/VideoMetadata.vala" seconds = (guint) ((_tmp23_ + (_tmp24_ * 60)) + (_tmp25_ * 3600)); -#line 3759 "VideoMetadata.c" +#line 3777 "VideoMetadata.c" } #line 466 "/home/jens/Source/shotwell/src/VideoMetadata.vala" memset (&time, 0, sizeof (struct tm)); @@ -3780,7 +3798,7 @@ static gulong avi_metadata_loader_parse_date (AVIMetadataLoader* self, const gch _tmp31_ = tm; #line 472 "/home/jens/Source/shotwell/src/VideoMetadata.vala" if (_tmp30_ < ((gulong) _tmp31_)) { -#line 3783 "VideoMetadata.c" +#line 3801 "VideoMetadata.c" GFile* _tmp32_ = NULL; gchar* _tmp33_ = NULL; gchar* _tmp34_ = NULL; @@ -3798,13 +3816,13 @@ static gulong avi_metadata_loader_parse_date (AVIMetadataLoader* self, const gch result = (gulong) 0; #line 475 "/home/jens/Source/shotwell/src/VideoMetadata.vala" return result; -#line 3801 "VideoMetadata.c" +#line 3819 "VideoMetadata.c" } #line 478 "/home/jens/Source/shotwell/src/VideoMetadata.vala" result = _result_; #line 478 "/home/jens/Source/shotwell/src/VideoMetadata.vala" return result; -#line 3807 "VideoMetadata.c" +#line 3825 "VideoMetadata.c" } @@ -3856,157 +3874,157 @@ static GDateMonth avi_metadata_loader_month_from_string (AVIMetadataLoader* self if (_tmp4_ == ((0 != _tmp3_label0) ? _tmp3_label0 : (_tmp3_label0 = g_quark_from_static_string ("jan")))) { #line 482 "/home/jens/Source/shotwell/src/VideoMetadata.vala" switch (0) { -#line 3859 "VideoMetadata.c" +#line 3877 "VideoMetadata.c" default: { #line 484 "/home/jens/Source/shotwell/src/VideoMetadata.vala" result = G_DATE_JANUARY; #line 484 "/home/jens/Source/shotwell/src/VideoMetadata.vala" return result; -#line 3866 "VideoMetadata.c" +#line 3884 "VideoMetadata.c" } } } else if (_tmp4_ == ((0 != _tmp3_label1) ? _tmp3_label1 : (_tmp3_label1 = g_quark_from_static_string ("feb")))) { #line 482 "/home/jens/Source/shotwell/src/VideoMetadata.vala" switch (0) { -#line 3872 "VideoMetadata.c" +#line 3890 "VideoMetadata.c" default: { #line 486 "/home/jens/Source/shotwell/src/VideoMetadata.vala" result = G_DATE_FEBRUARY; #line 486 "/home/jens/Source/shotwell/src/VideoMetadata.vala" return result; -#line 3879 "VideoMetadata.c" +#line 3897 "VideoMetadata.c" } } } else if (_tmp4_ == ((0 != _tmp3_label2) ? _tmp3_label2 : (_tmp3_label2 = g_quark_from_static_string ("mar")))) { #line 482 "/home/jens/Source/shotwell/src/VideoMetadata.vala" switch (0) { -#line 3885 "VideoMetadata.c" +#line 3903 "VideoMetadata.c" default: { #line 488 "/home/jens/Source/shotwell/src/VideoMetadata.vala" result = G_DATE_MARCH; #line 488 "/home/jens/Source/shotwell/src/VideoMetadata.vala" return result; -#line 3892 "VideoMetadata.c" +#line 3910 "VideoMetadata.c" } } } else if (_tmp4_ == ((0 != _tmp3_label3) ? _tmp3_label3 : (_tmp3_label3 = g_quark_from_static_string ("apr")))) { #line 482 "/home/jens/Source/shotwell/src/VideoMetadata.vala" switch (0) { -#line 3898 "VideoMetadata.c" +#line 3916 "VideoMetadata.c" default: { #line 490 "/home/jens/Source/shotwell/src/VideoMetadata.vala" result = G_DATE_APRIL; #line 490 "/home/jens/Source/shotwell/src/VideoMetadata.vala" return result; -#line 3905 "VideoMetadata.c" +#line 3923 "VideoMetadata.c" } } } else if (_tmp4_ == ((0 != _tmp3_label4) ? _tmp3_label4 : (_tmp3_label4 = g_quark_from_static_string ("may")))) { #line 482 "/home/jens/Source/shotwell/src/VideoMetadata.vala" switch (0) { -#line 3911 "VideoMetadata.c" +#line 3929 "VideoMetadata.c" default: { #line 492 "/home/jens/Source/shotwell/src/VideoMetadata.vala" result = G_DATE_MAY; #line 492 "/home/jens/Source/shotwell/src/VideoMetadata.vala" return result; -#line 3918 "VideoMetadata.c" +#line 3936 "VideoMetadata.c" } } } else if (_tmp4_ == ((0 != _tmp3_label5) ? _tmp3_label5 : (_tmp3_label5 = g_quark_from_static_string ("jun")))) { #line 482 "/home/jens/Source/shotwell/src/VideoMetadata.vala" switch (0) { -#line 3924 "VideoMetadata.c" +#line 3942 "VideoMetadata.c" default: { #line 494 "/home/jens/Source/shotwell/src/VideoMetadata.vala" result = G_DATE_JUNE; #line 494 "/home/jens/Source/shotwell/src/VideoMetadata.vala" return result; -#line 3931 "VideoMetadata.c" +#line 3949 "VideoMetadata.c" } } } else if (_tmp4_ == ((0 != _tmp3_label6) ? _tmp3_label6 : (_tmp3_label6 = g_quark_from_static_string ("jul")))) { #line 482 "/home/jens/Source/shotwell/src/VideoMetadata.vala" switch (0) { -#line 3937 "VideoMetadata.c" +#line 3955 "VideoMetadata.c" default: { #line 496 "/home/jens/Source/shotwell/src/VideoMetadata.vala" result = G_DATE_JULY; #line 496 "/home/jens/Source/shotwell/src/VideoMetadata.vala" return result; -#line 3944 "VideoMetadata.c" +#line 3962 "VideoMetadata.c" } } } else if (_tmp4_ == ((0 != _tmp3_label7) ? _tmp3_label7 : (_tmp3_label7 = g_quark_from_static_string ("aug")))) { #line 482 "/home/jens/Source/shotwell/src/VideoMetadata.vala" switch (0) { -#line 3950 "VideoMetadata.c" +#line 3968 "VideoMetadata.c" default: { #line 498 "/home/jens/Source/shotwell/src/VideoMetadata.vala" result = G_DATE_AUGUST; #line 498 "/home/jens/Source/shotwell/src/VideoMetadata.vala" return result; -#line 3957 "VideoMetadata.c" +#line 3975 "VideoMetadata.c" } } } else if (_tmp4_ == ((0 != _tmp3_label8) ? _tmp3_label8 : (_tmp3_label8 = g_quark_from_static_string ("sep")))) { #line 482 "/home/jens/Source/shotwell/src/VideoMetadata.vala" switch (0) { -#line 3963 "VideoMetadata.c" +#line 3981 "VideoMetadata.c" default: { #line 500 "/home/jens/Source/shotwell/src/VideoMetadata.vala" result = G_DATE_SEPTEMBER; #line 500 "/home/jens/Source/shotwell/src/VideoMetadata.vala" return result; -#line 3970 "VideoMetadata.c" +#line 3988 "VideoMetadata.c" } } } else if (_tmp4_ == ((0 != _tmp3_label9) ? _tmp3_label9 : (_tmp3_label9 = g_quark_from_static_string ("oct")))) { #line 482 "/home/jens/Source/shotwell/src/VideoMetadata.vala" switch (0) { -#line 3976 "VideoMetadata.c" +#line 3994 "VideoMetadata.c" default: { #line 502 "/home/jens/Source/shotwell/src/VideoMetadata.vala" result = G_DATE_OCTOBER; #line 502 "/home/jens/Source/shotwell/src/VideoMetadata.vala" return result; -#line 3983 "VideoMetadata.c" +#line 4001 "VideoMetadata.c" } } } else if (_tmp4_ == ((0 != _tmp3_label10) ? _tmp3_label10 : (_tmp3_label10 = g_quark_from_static_string ("nov")))) { #line 482 "/home/jens/Source/shotwell/src/VideoMetadata.vala" switch (0) { -#line 3989 "VideoMetadata.c" +#line 4007 "VideoMetadata.c" default: { #line 504 "/home/jens/Source/shotwell/src/VideoMetadata.vala" result = G_DATE_NOVEMBER; #line 504 "/home/jens/Source/shotwell/src/VideoMetadata.vala" return result; -#line 3996 "VideoMetadata.c" +#line 4014 "VideoMetadata.c" } } } else if (_tmp4_ == ((0 != _tmp3_label11) ? _tmp3_label11 : (_tmp3_label11 = g_quark_from_static_string ("dec")))) { #line 482 "/home/jens/Source/shotwell/src/VideoMetadata.vala" switch (0) { -#line 4002 "VideoMetadata.c" +#line 4020 "VideoMetadata.c" default: { #line 506 "/home/jens/Source/shotwell/src/VideoMetadata.vala" result = G_DATE_DECEMBER; #line 506 "/home/jens/Source/shotwell/src/VideoMetadata.vala" return result; -#line 4009 "VideoMetadata.c" +#line 4027 "VideoMetadata.c" } } } @@ -4014,7 +4032,7 @@ static GDateMonth avi_metadata_loader_month_from_string (AVIMetadataLoader* self result = G_DATE_BAD_MONTH; #line 508 "/home/jens/Source/shotwell/src/VideoMetadata.vala" return result; -#line 4017 "VideoMetadata.c" +#line 4035 "VideoMetadata.c" } @@ -4037,7 +4055,7 @@ static gchar* string_strip (const gchar* self) { result = _result_; #line 1210 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" return result; -#line 4040 "VideoMetadata.c" +#line 4058 "VideoMetadata.c" } @@ -4058,7 +4076,7 @@ static gulong avi_metadata_loader_get_creation_date_time_for_avi (AVIMetadataLoa chunk = _tmp1_; #line 513 "/home/jens/Source/shotwell/src/VideoMetadata.vala" timestamp = (gulong) 0; -#line 4061 "VideoMetadata.c" +#line 4079 "VideoMetadata.c" { AVIChunk* _tmp2_ = NULL; AVIChunk* _tmp3_ = NULL; @@ -4072,7 +4090,7 @@ static gulong avi_metadata_loader_get_creation_date_time_for_avi (AVIMetadataLoa avi_chunk_open_file (_tmp2_, &_inner_error_); #line 515 "/home/jens/Source/shotwell/src/VideoMetadata.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 4075 "VideoMetadata.c" +#line 4093 "VideoMetadata.c" goto __catch581_g_error; } #line 516 "/home/jens/Source/shotwell/src/VideoMetadata.vala" @@ -4081,7 +4099,7 @@ static gulong avi_metadata_loader_get_creation_date_time_for_avi (AVIMetadataLoa avi_chunk_nonsection_skip (_tmp3_, (guint64) 12, &_inner_error_); #line 516 "/home/jens/Source/shotwell/src/VideoMetadata.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 4084 "VideoMetadata.c" +#line 4102 "VideoMetadata.c" goto __catch581_g_error; } #line 517 "/home/jens/Source/shotwell/src/VideoMetadata.vala" @@ -4092,14 +4110,14 @@ static gulong avi_metadata_loader_get_creation_date_time_for_avi (AVIMetadataLoa sdate = _tmp5_; #line 517 "/home/jens/Source/shotwell/src/VideoMetadata.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 4095 "VideoMetadata.c" +#line 4113 "VideoMetadata.c" goto __catch581_g_error; } #line 518 "/home/jens/Source/shotwell/src/VideoMetadata.vala" _tmp6_ = sdate; #line 518 "/home/jens/Source/shotwell/src/VideoMetadata.vala" if (NULL != _tmp6_) { -#line 4102 "VideoMetadata.c" +#line 4120 "VideoMetadata.c" const gchar* _tmp7_ = NULL; gchar* _tmp8_ = NULL; gchar* _tmp9_ = NULL; @@ -4116,11 +4134,11 @@ static gulong avi_metadata_loader_get_creation_date_time_for_avi (AVIMetadataLoa timestamp = _tmp10_; #line 519 "/home/jens/Source/shotwell/src/VideoMetadata.vala" _g_free0 (_tmp9_); -#line 4119 "VideoMetadata.c" +#line 4137 "VideoMetadata.c" } #line 514 "/home/jens/Source/shotwell/src/VideoMetadata.vala" _g_free0 (sdate); -#line 4123 "VideoMetadata.c" +#line 4141 "VideoMetadata.c" } goto __finally581; __catch581_g_error: @@ -4140,11 +4158,13 @@ static gulong avi_metadata_loader_get_creation_date_time_for_avi (AVIMetadataLoa g_debug ("VideoMetadata.vala:522: Error while reading AVI file: %s", _tmp12_); #line 514 "/home/jens/Source/shotwell/src/VideoMetadata.vala" _g_error_free0 (e); -#line 4143 "VideoMetadata.c" +#line 4161 "VideoMetadata.c" } __finally581: #line 514 "/home/jens/Source/shotwell/src/VideoMetadata.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { +#line 4166 "VideoMetadata.c" + gulong _tmp13_ = 0UL; #line 514 "/home/jens/Source/shotwell/src/VideoMetadata.vala" _avi_chunk_unref0 (chunk); #line 514 "/home/jens/Source/shotwell/src/VideoMetadata.vala" @@ -4152,18 +4172,18 @@ static gulong avi_metadata_loader_get_creation_date_time_for_avi (AVIMetadataLoa #line 514 "/home/jens/Source/shotwell/src/VideoMetadata.vala" g_clear_error (&_inner_error_); #line 514 "/home/jens/Source/shotwell/src/VideoMetadata.vala" - return 0UL; -#line 4156 "VideoMetadata.c" + return _tmp13_; +#line 4176 "VideoMetadata.c" } { - AVIChunk* _tmp13_ = NULL; + AVIChunk* _tmp14_ = NULL; #line 526 "/home/jens/Source/shotwell/src/VideoMetadata.vala" - _tmp13_ = chunk; + _tmp14_ = chunk; #line 526 "/home/jens/Source/shotwell/src/VideoMetadata.vala" - avi_chunk_close_file (_tmp13_, &_inner_error_); + avi_chunk_close_file (_tmp14_, &_inner_error_); #line 526 "/home/jens/Source/shotwell/src/VideoMetadata.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 4166 "VideoMetadata.c" +#line 4186 "VideoMetadata.c" goto __catch582_g_error; } } @@ -4171,25 +4191,27 @@ static gulong avi_metadata_loader_get_creation_date_time_for_avi (AVIMetadataLoa __catch582_g_error: { GError* e = NULL; - GError* _tmp14_ = NULL; - const gchar* _tmp15_ = NULL; + GError* _tmp15_ = NULL; + const gchar* _tmp16_ = NULL; #line 525 "/home/jens/Source/shotwell/src/VideoMetadata.vala" e = _inner_error_; #line 525 "/home/jens/Source/shotwell/src/VideoMetadata.vala" _inner_error_ = NULL; #line 528 "/home/jens/Source/shotwell/src/VideoMetadata.vala" - _tmp14_ = e; + _tmp15_ = e; #line 528 "/home/jens/Source/shotwell/src/VideoMetadata.vala" - _tmp15_ = _tmp14_->message; + _tmp16_ = _tmp15_->message; #line 528 "/home/jens/Source/shotwell/src/VideoMetadata.vala" - g_debug ("VideoMetadata.vala:528: Error while closing AVI file: %s", _tmp15_); + g_debug ("VideoMetadata.vala:528: Error while closing AVI file: %s", _tmp16_); #line 525 "/home/jens/Source/shotwell/src/VideoMetadata.vala" _g_error_free0 (e); -#line 4188 "VideoMetadata.c" +#line 4208 "VideoMetadata.c" } __finally582: #line 525 "/home/jens/Source/shotwell/src/VideoMetadata.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { +#line 4213 "VideoMetadata.c" + gulong _tmp17_ = 0UL; #line 525 "/home/jens/Source/shotwell/src/VideoMetadata.vala" _avi_chunk_unref0 (chunk); #line 525 "/home/jens/Source/shotwell/src/VideoMetadata.vala" @@ -4197,8 +4219,8 @@ static gulong avi_metadata_loader_get_creation_date_time_for_avi (AVIMetadataLoa #line 525 "/home/jens/Source/shotwell/src/VideoMetadata.vala" g_clear_error (&_inner_error_); #line 525 "/home/jens/Source/shotwell/src/VideoMetadata.vala" - return 0UL; -#line 4201 "VideoMetadata.c" + return _tmp17_; +#line 4223 "VideoMetadata.c" } #line 530 "/home/jens/Source/shotwell/src/VideoMetadata.vala" result = timestamp; @@ -4206,14 +4228,14 @@ static gulong avi_metadata_loader_get_creation_date_time_for_avi (AVIMetadataLoa _avi_chunk_unref0 (chunk); #line 530 "/home/jens/Source/shotwell/src/VideoMetadata.vala" return result; -#line 4209 "VideoMetadata.c" +#line 4231 "VideoMetadata.c" } static void value_avi_metadata_loader_init (GValue* value) { #line 292 "/home/jens/Source/shotwell/src/VideoMetadata.vala" value->data[0].v_pointer = NULL; -#line 4216 "VideoMetadata.c" +#line 4238 "VideoMetadata.c" } @@ -4222,7 +4244,7 @@ static void value_avi_metadata_loader_free_value (GValue* value) { if (value->data[0].v_pointer) { #line 292 "/home/jens/Source/shotwell/src/VideoMetadata.vala" avi_metadata_loader_unref (value->data[0].v_pointer); -#line 4225 "VideoMetadata.c" +#line 4247 "VideoMetadata.c" } } @@ -4232,11 +4254,11 @@ static void value_avi_metadata_loader_copy_value (const GValue* src_value, GValu if (src_value->data[0].v_pointer) { #line 292 "/home/jens/Source/shotwell/src/VideoMetadata.vala" dest_value->data[0].v_pointer = avi_metadata_loader_ref (src_value->data[0].v_pointer); -#line 4235 "VideoMetadata.c" +#line 4257 "VideoMetadata.c" } else { #line 292 "/home/jens/Source/shotwell/src/VideoMetadata.vala" dest_value->data[0].v_pointer = NULL; -#line 4239 "VideoMetadata.c" +#line 4261 "VideoMetadata.c" } } @@ -4244,37 +4266,37 @@ static void value_avi_metadata_loader_copy_value (const GValue* src_value, GValu static gpointer value_avi_metadata_loader_peek_pointer (const GValue* value) { #line 292 "/home/jens/Source/shotwell/src/VideoMetadata.vala" return value->data[0].v_pointer; -#line 4247 "VideoMetadata.c" +#line 4269 "VideoMetadata.c" } static gchar* value_avi_metadata_loader_collect_value (GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) { #line 292 "/home/jens/Source/shotwell/src/VideoMetadata.vala" if (collect_values[0].v_pointer) { -#line 4254 "VideoMetadata.c" +#line 4276 "VideoMetadata.c" AVIMetadataLoader* object; object = collect_values[0].v_pointer; #line 292 "/home/jens/Source/shotwell/src/VideoMetadata.vala" if (object->parent_instance.g_class == NULL) { #line 292 "/home/jens/Source/shotwell/src/VideoMetadata.vala" return g_strconcat ("invalid unclassed object pointer for value type `", G_VALUE_TYPE_NAME (value), "'", NULL); -#line 4261 "VideoMetadata.c" +#line 4283 "VideoMetadata.c" } else if (!g_value_type_compatible (G_TYPE_FROM_INSTANCE (object), G_VALUE_TYPE (value))) { #line 292 "/home/jens/Source/shotwell/src/VideoMetadata.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 4265 "VideoMetadata.c" +#line 4287 "VideoMetadata.c" } #line 292 "/home/jens/Source/shotwell/src/VideoMetadata.vala" value->data[0].v_pointer = avi_metadata_loader_ref (object); -#line 4269 "VideoMetadata.c" +#line 4291 "VideoMetadata.c" } else { #line 292 "/home/jens/Source/shotwell/src/VideoMetadata.vala" value->data[0].v_pointer = NULL; -#line 4273 "VideoMetadata.c" +#line 4295 "VideoMetadata.c" } #line 292 "/home/jens/Source/shotwell/src/VideoMetadata.vala" return NULL; -#line 4277 "VideoMetadata.c" +#line 4299 "VideoMetadata.c" } @@ -4285,25 +4307,25 @@ static gchar* value_avi_metadata_loader_lcopy_value (const GValue* value, guint if (!object_p) { #line 292 "/home/jens/Source/shotwell/src/VideoMetadata.vala" return g_strdup_printf ("value location for `%s' passed as NULL", G_VALUE_TYPE_NAME (value)); -#line 4288 "VideoMetadata.c" +#line 4310 "VideoMetadata.c" } #line 292 "/home/jens/Source/shotwell/src/VideoMetadata.vala" if (!value->data[0].v_pointer) { #line 292 "/home/jens/Source/shotwell/src/VideoMetadata.vala" *object_p = NULL; -#line 4294 "VideoMetadata.c" +#line 4316 "VideoMetadata.c" } else if (collect_flags & G_VALUE_NOCOPY_CONTENTS) { #line 292 "/home/jens/Source/shotwell/src/VideoMetadata.vala" *object_p = value->data[0].v_pointer; -#line 4298 "VideoMetadata.c" +#line 4320 "VideoMetadata.c" } else { #line 292 "/home/jens/Source/shotwell/src/VideoMetadata.vala" *object_p = avi_metadata_loader_ref (value->data[0].v_pointer); -#line 4302 "VideoMetadata.c" +#line 4324 "VideoMetadata.c" } #line 292 "/home/jens/Source/shotwell/src/VideoMetadata.vala" return NULL; -#line 4306 "VideoMetadata.c" +#line 4328 "VideoMetadata.c" } @@ -4317,7 +4339,7 @@ GParamSpec* param_spec_avi_metadata_loader (const gchar* name, const gchar* nick G_PARAM_SPEC (spec)->value_type = object_type; #line 292 "/home/jens/Source/shotwell/src/VideoMetadata.vala" return G_PARAM_SPEC (spec); -#line 4320 "VideoMetadata.c" +#line 4342 "VideoMetadata.c" } @@ -4326,7 +4348,7 @@ gpointer value_get_avi_metadata_loader (const GValue* value) { g_return_val_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, TYPE_AVI_METADATA_LOADER), NULL); #line 292 "/home/jens/Source/shotwell/src/VideoMetadata.vala" return value->data[0].v_pointer; -#line 4329 "VideoMetadata.c" +#line 4351 "VideoMetadata.c" } @@ -4346,17 +4368,17 @@ void value_set_avi_metadata_loader (GValue* value, gpointer v_object) { value->data[0].v_pointer = v_object; #line 292 "/home/jens/Source/shotwell/src/VideoMetadata.vala" avi_metadata_loader_ref (value->data[0].v_pointer); -#line 4349 "VideoMetadata.c" +#line 4371 "VideoMetadata.c" } else { #line 292 "/home/jens/Source/shotwell/src/VideoMetadata.vala" value->data[0].v_pointer = NULL; -#line 4353 "VideoMetadata.c" +#line 4375 "VideoMetadata.c" } #line 292 "/home/jens/Source/shotwell/src/VideoMetadata.vala" if (old) { #line 292 "/home/jens/Source/shotwell/src/VideoMetadata.vala" avi_metadata_loader_unref (old); -#line 4359 "VideoMetadata.c" +#line 4381 "VideoMetadata.c" } } @@ -4375,17 +4397,17 @@ void value_take_avi_metadata_loader (GValue* value, gpointer v_object) { g_return_if_fail (g_value_type_compatible (G_TYPE_FROM_INSTANCE (v_object), G_VALUE_TYPE (value))); #line 292 "/home/jens/Source/shotwell/src/VideoMetadata.vala" value->data[0].v_pointer = v_object; -#line 4378 "VideoMetadata.c" +#line 4400 "VideoMetadata.c" } else { #line 292 "/home/jens/Source/shotwell/src/VideoMetadata.vala" value->data[0].v_pointer = NULL; -#line 4382 "VideoMetadata.c" +#line 4404 "VideoMetadata.c" } #line 292 "/home/jens/Source/shotwell/src/VideoMetadata.vala" if (old) { #line 292 "/home/jens/Source/shotwell/src/VideoMetadata.vala" avi_metadata_loader_unref (old); -#line 4388 "VideoMetadata.c" +#line 4410 "VideoMetadata.c" } } @@ -4397,7 +4419,7 @@ static void avi_metadata_loader_class_init (AVIMetadataLoaderClass * klass) { ((AVIMetadataLoaderClass *) klass)->finalize = avi_metadata_loader_finalize; #line 292 "/home/jens/Source/shotwell/src/VideoMetadata.vala" g_type_class_add_private (klass, sizeof (AVIMetadataLoaderPrivate)); -#line 4400 "VideoMetadata.c" +#line 4422 "VideoMetadata.c" } @@ -4408,7 +4430,7 @@ static void avi_metadata_loader_instance_init (AVIMetadataLoader * self) { self->priv->file = NULL; #line 292 "/home/jens/Source/shotwell/src/VideoMetadata.vala" self->ref_count = 1; -#line 4411 "VideoMetadata.c" +#line 4433 "VideoMetadata.c" } @@ -4420,7 +4442,7 @@ static void avi_metadata_loader_finalize (AVIMetadataLoader* obj) { g_signal_handlers_destroy (self); #line 294 "/home/jens/Source/shotwell/src/VideoMetadata.vala" _g_object_unref0 (self->priv->file); -#line 4423 "VideoMetadata.c" +#line 4445 "VideoMetadata.c" } @@ -4445,7 +4467,7 @@ gpointer avi_metadata_loader_ref (gpointer instance) { g_atomic_int_inc (&self->ref_count); #line 292 "/home/jens/Source/shotwell/src/VideoMetadata.vala" return instance; -#line 4448 "VideoMetadata.c" +#line 4470 "VideoMetadata.c" } @@ -4458,7 +4480,7 @@ void avi_metadata_loader_unref (gpointer instance) { AVI_METADATA_LOADER_GET_CLASS (self)->finalize (self); #line 292 "/home/jens/Source/shotwell/src/VideoMetadata.vala" g_type_free_instance ((GTypeInstance *) self); -#line 4461 "VideoMetadata.c" +#line 4483 "VideoMetadata.c" } } @@ -4481,21 +4503,21 @@ AVIChunk* avi_chunk_construct (GType object_type, GFile* file) { self->priv->file = _tmp1_; #line 543 "/home/jens/Source/shotwell/src/VideoMetadata.vala" return self; -#line 4484 "VideoMetadata.c" +#line 4506 "VideoMetadata.c" } AVIChunk* avi_chunk_new (GFile* file) { #line 543 "/home/jens/Source/shotwell/src/VideoMetadata.vala" return avi_chunk_construct (TYPE_AVI_CHUNK, file); -#line 4491 "VideoMetadata.c" +#line 4513 "VideoMetadata.c" } static gpointer _avi_chunk_ref0 (gpointer self) { #line 549 "/home/jens/Source/shotwell/src/VideoMetadata.vala" return self ? avi_chunk_ref (self) : NULL; -#line 4498 "VideoMetadata.c" +#line 4520 "VideoMetadata.c" } @@ -4529,14 +4551,14 @@ static AVIChunk* avi_chunk_construct_with_input_stream (GType object_type, GData self->priv->parent = _tmp3_; #line 547 "/home/jens/Source/shotwell/src/VideoMetadata.vala" return self; -#line 4532 "VideoMetadata.c" +#line 4554 "VideoMetadata.c" } static AVIChunk* avi_chunk_new_with_input_stream (GDataInputStream* input, AVIChunk* parent) { #line 547 "/home/jens/Source/shotwell/src/VideoMetadata.vala" return avi_chunk_construct_with_input_stream (TYPE_AVI_CHUNK, input, parent); -#line 4539 "VideoMetadata.c" +#line 4561 "VideoMetadata.c" } @@ -4558,7 +4580,7 @@ void avi_chunk_open_file (AVIChunk* self, GError** error) { g_propagate_error (error, _inner_error_); #line 553 "/home/jens/Source/shotwell/src/VideoMetadata.vala" return; -#line 4561 "VideoMetadata.c" +#line 4583 "VideoMetadata.c" } #line 554 "/home/jens/Source/shotwell/src/VideoMetadata.vala" _tmp1_ = self->priv->file; @@ -4572,7 +4594,7 @@ void avi_chunk_open_file (AVIChunk* self, GError** error) { g_propagate_error (error, _inner_error_); #line 554 "/home/jens/Source/shotwell/src/VideoMetadata.vala" return; -#line 4575 "VideoMetadata.c" +#line 4597 "VideoMetadata.c" } #line 554 "/home/jens/Source/shotwell/src/VideoMetadata.vala" _tmp3_ = g_data_input_stream_new (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, g_input_stream_get_type (), GInputStream)); @@ -4596,7 +4618,7 @@ void avi_chunk_open_file (AVIChunk* self, GError** error) { self->priv->section_name = _tmp5_; #line 552 "/home/jens/Source/shotwell/src/VideoMetadata.vala" _g_object_unref0 (_tmp0_); -#line 4599 "VideoMetadata.c" +#line 4621 "VideoMetadata.c" } @@ -4609,7 +4631,7 @@ void avi_chunk_close_file (AVIChunk* self, GError** error) { _tmp0_ = self->priv->input; #line 562 "/home/jens/Source/shotwell/src/VideoMetadata.vala" if (NULL != _tmp0_) { -#line 4612 "VideoMetadata.c" +#line 4634 "VideoMetadata.c" GDataInputStream* _tmp1_ = NULL; #line 563 "/home/jens/Source/shotwell/src/VideoMetadata.vala" _tmp1_ = self->priv->input; @@ -4621,13 +4643,13 @@ void avi_chunk_close_file (AVIChunk* self, GError** error) { g_propagate_error (error, _inner_error_); #line 563 "/home/jens/Source/shotwell/src/VideoMetadata.vala" return; -#line 4624 "VideoMetadata.c" +#line 4646 "VideoMetadata.c" } #line 564 "/home/jens/Source/shotwell/src/VideoMetadata.vala" _g_object_unref0 (self->priv->input); #line 564 "/home/jens/Source/shotwell/src/VideoMetadata.vala" self->priv->input = NULL; -#line 4630 "VideoMetadata.c" +#line 4652 "VideoMetadata.c" } } @@ -4650,7 +4672,7 @@ void avi_chunk_nonsection_skip (AVIChunk* self, guint64 skip_amount, GError** er g_propagate_error (error, _inner_error_); #line 569 "/home/jens/Source/shotwell/src/VideoMetadata.vala" return; -#line 4653 "VideoMetadata.c" +#line 4675 "VideoMetadata.c" } } @@ -4678,7 +4700,7 @@ void avi_chunk_skip (AVIChunk* self, guint64 skip_amount, GError** error) { g_propagate_error (error, _inner_error_); #line 574 "/home/jens/Source/shotwell/src/VideoMetadata.vala" return; -#line 4681 "VideoMetadata.c" +#line 4703 "VideoMetadata.c" } } @@ -4697,7 +4719,7 @@ AVIChunk* avi_chunk_get_first_child_chunk (AVIChunk* self) { result = _tmp1_; #line 578 "/home/jens/Source/shotwell/src/VideoMetadata.vala" return result; -#line 4700 "VideoMetadata.c" +#line 4722 "VideoMetadata.c" } @@ -4718,7 +4740,7 @@ static void avi_chunk_advance_section_offset (AVIChunk* self, guint64 amount) { _tmp2_ = self->priv->section_size; #line 582 "/home/jens/Source/shotwell/src/VideoMetadata.vala" if ((_tmp0_ + _tmp1_) > _tmp2_) { -#line 4721 "VideoMetadata.c" +#line 4743 "VideoMetadata.c" guint64 _tmp3_ = 0ULL; guint64 _tmp4_ = 0ULL; #line 583 "/home/jens/Source/shotwell/src/VideoMetadata.vala" @@ -4727,7 +4749,7 @@ static void avi_chunk_advance_section_offset (AVIChunk* self, guint64 amount) { _tmp4_ = self->priv->section_offset; #line 583 "/home/jens/Source/shotwell/src/VideoMetadata.vala" amount = _tmp3_ - _tmp4_; -#line 4730 "VideoMetadata.c" +#line 4752 "VideoMetadata.c" } #line 585 "/home/jens/Source/shotwell/src/VideoMetadata.vala" _tmp5_ = self->priv->section_offset; @@ -4739,7 +4761,7 @@ static void avi_chunk_advance_section_offset (AVIChunk* self, guint64 amount) { _tmp7_ = self->priv->parent; #line 586 "/home/jens/Source/shotwell/src/VideoMetadata.vala" if (NULL != _tmp7_) { -#line 4742 "VideoMetadata.c" +#line 4764 "VideoMetadata.c" AVIChunk* _tmp8_ = NULL; guint64 _tmp9_ = 0ULL; #line 587 "/home/jens/Source/shotwell/src/VideoMetadata.vala" @@ -4748,7 +4770,7 @@ static void avi_chunk_advance_section_offset (AVIChunk* self, guint64 amount) { _tmp9_ = amount; #line 587 "/home/jens/Source/shotwell/src/VideoMetadata.vala" avi_chunk_advance_section_offset (_tmp8_, _tmp9_); -#line 4751 "VideoMetadata.c" +#line 4773 "VideoMetadata.c" } } @@ -4771,17 +4793,19 @@ guchar avi_chunk_read_byte (AVIChunk* self, GError** error) { _tmp0_ = _tmp2_; #line 593 "/home/jens/Source/shotwell/src/VideoMetadata.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { +#line 4796 "VideoMetadata.c" + guchar _tmp3_ = '\0'; #line 593 "/home/jens/Source/shotwell/src/VideoMetadata.vala" g_propagate_error (error, _inner_error_); #line 593 "/home/jens/Source/shotwell/src/VideoMetadata.vala" - return '\0'; -#line 4778 "VideoMetadata.c" + return _tmp3_; +#line 4802 "VideoMetadata.c" } #line 593 "/home/jens/Source/shotwell/src/VideoMetadata.vala" result = (guchar) _tmp0_; #line 593 "/home/jens/Source/shotwell/src/VideoMetadata.vala" return result; -#line 4784 "VideoMetadata.c" +#line 4808 "VideoMetadata.c" } @@ -4803,17 +4827,19 @@ guint16 avi_chunk_read_uint16 (AVIChunk* self, GError** error) { _tmp0_ = _tmp2_; #line 598 "/home/jens/Source/shotwell/src/VideoMetadata.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { +#line 4830 "VideoMetadata.c" + guint16 _tmp3_ = 0U; #line 598 "/home/jens/Source/shotwell/src/VideoMetadata.vala" g_propagate_error (error, _inner_error_); #line 598 "/home/jens/Source/shotwell/src/VideoMetadata.vala" - return 0U; -#line 4810 "VideoMetadata.c" + return _tmp3_; +#line 4836 "VideoMetadata.c" } #line 598 "/home/jens/Source/shotwell/src/VideoMetadata.vala" result = _tmp0_; #line 598 "/home/jens/Source/shotwell/src/VideoMetadata.vala" return result; -#line 4816 "VideoMetadata.c" +#line 4842 "VideoMetadata.c" } @@ -4863,7 +4889,7 @@ void avi_chunk_read_chunk (AVIChunk* self, GError** error) { _g_string_free0 (sb); #line 605 "/home/jens/Source/shotwell/src/VideoMetadata.vala" return; -#line 4866 "VideoMetadata.c" +#line 4892 "VideoMetadata.c" } #line 605 "/home/jens/Source/shotwell/src/VideoMetadata.vala" _tmp4_ = sb; @@ -4883,7 +4909,7 @@ void avi_chunk_read_chunk (AVIChunk* self, GError** error) { _g_string_free0 (sb); #line 606 "/home/jens/Source/shotwell/src/VideoMetadata.vala" return; -#line 4886 "VideoMetadata.c" +#line 4912 "VideoMetadata.c" } #line 606 "/home/jens/Source/shotwell/src/VideoMetadata.vala" _tmp8_ = sb; @@ -4903,7 +4929,7 @@ void avi_chunk_read_chunk (AVIChunk* self, GError** error) { _g_string_free0 (sb); #line 607 "/home/jens/Source/shotwell/src/VideoMetadata.vala" return; -#line 4906 "VideoMetadata.c" +#line 4932 "VideoMetadata.c" } #line 607 "/home/jens/Source/shotwell/src/VideoMetadata.vala" _tmp12_ = sb; @@ -4923,7 +4949,7 @@ void avi_chunk_read_chunk (AVIChunk* self, GError** error) { _g_string_free0 (sb); #line 608 "/home/jens/Source/shotwell/src/VideoMetadata.vala" return; -#line 4926 "VideoMetadata.c" +#line 4952 "VideoMetadata.c" } #line 608 "/home/jens/Source/shotwell/src/VideoMetadata.vala" _tmp16_ = sb; @@ -4953,7 +4979,7 @@ void avi_chunk_read_chunk (AVIChunk* self, GError** error) { _g_string_free0 (sb); #line 610 "/home/jens/Source/shotwell/src/VideoMetadata.vala" return; -#line 4956 "VideoMetadata.c" +#line 4982 "VideoMetadata.c" } #line 610 "/home/jens/Source/shotwell/src/VideoMetadata.vala" self->priv->section_size = (guint64) _tmp20_; @@ -4961,7 +4987,7 @@ void avi_chunk_read_chunk (AVIChunk* self, GError** error) { self->priv->section_offset = (guint64) 0; #line 601 "/home/jens/Source/shotwell/src/VideoMetadata.vala" _g_string_free0 (sb); -#line 4964 "VideoMetadata.c" +#line 4990 "VideoMetadata.c" } @@ -5003,7 +5029,7 @@ gchar* avi_chunk_read_name (AVIChunk* self, GError** error) { _g_string_free0 (sb); #line 616 "/home/jens/Source/shotwell/src/VideoMetadata.vala" return NULL; -#line 5006 "VideoMetadata.c" +#line 5032 "VideoMetadata.c" } #line 616 "/home/jens/Source/shotwell/src/VideoMetadata.vala" _tmp3_ = sb; @@ -5021,7 +5047,7 @@ gchar* avi_chunk_read_name (AVIChunk* self, GError** error) { _g_string_free0 (sb); #line 617 "/home/jens/Source/shotwell/src/VideoMetadata.vala" return NULL; -#line 5024 "VideoMetadata.c" +#line 5050 "VideoMetadata.c" } #line 617 "/home/jens/Source/shotwell/src/VideoMetadata.vala" _tmp6_ = sb; @@ -5039,7 +5065,7 @@ gchar* avi_chunk_read_name (AVIChunk* self, GError** error) { _g_string_free0 (sb); #line 618 "/home/jens/Source/shotwell/src/VideoMetadata.vala" return NULL; -#line 5042 "VideoMetadata.c" +#line 5068 "VideoMetadata.c" } #line 618 "/home/jens/Source/shotwell/src/VideoMetadata.vala" _tmp9_ = sb; @@ -5057,7 +5083,7 @@ gchar* avi_chunk_read_name (AVIChunk* self, GError** error) { _g_string_free0 (sb); #line 619 "/home/jens/Source/shotwell/src/VideoMetadata.vala" return NULL; -#line 5060 "VideoMetadata.c" +#line 5086 "VideoMetadata.c" } #line 619 "/home/jens/Source/shotwell/src/VideoMetadata.vala" _tmp12_ = sb; @@ -5075,7 +5101,7 @@ gchar* avi_chunk_read_name (AVIChunk* self, GError** error) { _g_string_free0 (sb); #line 620 "/home/jens/Source/shotwell/src/VideoMetadata.vala" return result; -#line 5078 "VideoMetadata.c" +#line 5104 "VideoMetadata.c" } @@ -5094,13 +5120,13 @@ void avi_chunk_next_chunk (AVIChunk* self, GError** error) { g_propagate_error (error, _inner_error_); #line 624 "/home/jens/Source/shotwell/src/VideoMetadata.vala" return; -#line 5097 "VideoMetadata.c" +#line 5123 "VideoMetadata.c" } #line 625 "/home/jens/Source/shotwell/src/VideoMetadata.vala" self->priv->section_size = (guint64) 0; #line 626 "/home/jens/Source/shotwell/src/VideoMetadata.vala" self->priv->section_offset = (guint64) 0; -#line 5103 "VideoMetadata.c" +#line 5129 "VideoMetadata.c" } @@ -5118,7 +5144,7 @@ gchar* avi_chunk_get_current_chunk_name (AVIChunk* self) { result = _tmp1_; #line 630 "/home/jens/Source/shotwell/src/VideoMetadata.vala" return result; -#line 5121 "VideoMetadata.c" +#line 5147 "VideoMetadata.c" } @@ -5133,7 +5159,7 @@ gboolean avi_chunk_is_last_chunk (AVIChunk* self) { result = _tmp0_ == ((guint64) 0); #line 634 "/home/jens/Source/shotwell/src/VideoMetadata.vala" return result; -#line 5136 "VideoMetadata.c" +#line 5162 "VideoMetadata.c" } @@ -5159,7 +5185,7 @@ guint64 avi_chunk_section_size_remaining (AVIChunk* self) { result = _tmp2_ - _tmp3_; #line 639 "/home/jens/Source/shotwell/src/VideoMetadata.vala" return result; -#line 5162 "VideoMetadata.c" +#line 5188 "VideoMetadata.c" } @@ -5179,7 +5205,7 @@ gchar* avi_chunk_section_to_string (AVIChunk* self, GError** error) { sb = _tmp0_; #line 645 "/home/jens/Source/shotwell/src/VideoMetadata.vala" while (TRUE) { -#line 5182 "VideoMetadata.c" +#line 5208 "VideoMetadata.c" guint64 _tmp1_ = 0ULL; guint64 _tmp2_ = 0ULL; guchar _tmp3_ = '\0'; @@ -5195,7 +5221,7 @@ gchar* avi_chunk_section_to_string (AVIChunk* self, GError** error) { if (!(_tmp1_ < _tmp2_)) { #line 645 "/home/jens/Source/shotwell/src/VideoMetadata.vala" break; -#line 5198 "VideoMetadata.c" +#line 5224 "VideoMetadata.c" } #line 646 "/home/jens/Source/shotwell/src/VideoMetadata.vala" _tmp4_ = avi_chunk_read_byte (self, &_inner_error_); @@ -5209,7 +5235,7 @@ gchar* avi_chunk_section_to_string (AVIChunk* self, GError** error) { _g_string_free0 (sb); #line 646 "/home/jens/Source/shotwell/src/VideoMetadata.vala" return NULL; -#line 5212 "VideoMetadata.c" +#line 5238 "VideoMetadata.c" } #line 646 "/home/jens/Source/shotwell/src/VideoMetadata.vala" _tmp5_ = sb; @@ -5221,7 +5247,7 @@ gchar* avi_chunk_section_to_string (AVIChunk* self, GError** error) { _tmp7_ = _tmp6_->len; #line 647 "/home/jens/Source/shotwell/src/VideoMetadata.vala" if (_tmp7_ > ((gssize) AVI_CHUNK_MAX_STRING_TO_SECTION_LENGTH)) { -#line 5224 "VideoMetadata.c" +#line 5250 "VideoMetadata.c" GString* _tmp8_ = NULL; const gchar* _tmp9_ = NULL; gchar* _tmp10_ = NULL; @@ -5237,7 +5263,7 @@ gchar* avi_chunk_section_to_string (AVIChunk* self, GError** error) { _g_string_free0 (sb); #line 648 "/home/jens/Source/shotwell/src/VideoMetadata.vala" return result; -#line 5240 "VideoMetadata.c" +#line 5266 "VideoMetadata.c" } } #line 651 "/home/jens/Source/shotwell/src/VideoMetadata.vala" @@ -5252,14 +5278,14 @@ gchar* avi_chunk_section_to_string (AVIChunk* self, GError** error) { _g_string_free0 (sb); #line 651 "/home/jens/Source/shotwell/src/VideoMetadata.vala" return result; -#line 5255 "VideoMetadata.c" +#line 5281 "VideoMetadata.c" } static void value_avi_chunk_init (GValue* value) { #line 534 "/home/jens/Source/shotwell/src/VideoMetadata.vala" value->data[0].v_pointer = NULL; -#line 5262 "VideoMetadata.c" +#line 5288 "VideoMetadata.c" } @@ -5268,7 +5294,7 @@ static void value_avi_chunk_free_value (GValue* value) { if (value->data[0].v_pointer) { #line 534 "/home/jens/Source/shotwell/src/VideoMetadata.vala" avi_chunk_unref (value->data[0].v_pointer); -#line 5271 "VideoMetadata.c" +#line 5297 "VideoMetadata.c" } } @@ -5278,11 +5304,11 @@ static void value_avi_chunk_copy_value (const GValue* src_value, GValue* dest_va if (src_value->data[0].v_pointer) { #line 534 "/home/jens/Source/shotwell/src/VideoMetadata.vala" dest_value->data[0].v_pointer = avi_chunk_ref (src_value->data[0].v_pointer); -#line 5281 "VideoMetadata.c" +#line 5307 "VideoMetadata.c" } else { #line 534 "/home/jens/Source/shotwell/src/VideoMetadata.vala" dest_value->data[0].v_pointer = NULL; -#line 5285 "VideoMetadata.c" +#line 5311 "VideoMetadata.c" } } @@ -5290,37 +5316,37 @@ static void value_avi_chunk_copy_value (const GValue* src_value, GValue* dest_va static gpointer value_avi_chunk_peek_pointer (const GValue* value) { #line 534 "/home/jens/Source/shotwell/src/VideoMetadata.vala" return value->data[0].v_pointer; -#line 5293 "VideoMetadata.c" +#line 5319 "VideoMetadata.c" } static gchar* value_avi_chunk_collect_value (GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) { #line 534 "/home/jens/Source/shotwell/src/VideoMetadata.vala" if (collect_values[0].v_pointer) { -#line 5300 "VideoMetadata.c" +#line 5326 "VideoMetadata.c" AVIChunk* object; object = collect_values[0].v_pointer; #line 534 "/home/jens/Source/shotwell/src/VideoMetadata.vala" if (object->parent_instance.g_class == NULL) { #line 534 "/home/jens/Source/shotwell/src/VideoMetadata.vala" return g_strconcat ("invalid unclassed object pointer for value type `", G_VALUE_TYPE_NAME (value), "'", NULL); -#line 5307 "VideoMetadata.c" +#line 5333 "VideoMetadata.c" } else if (!g_value_type_compatible (G_TYPE_FROM_INSTANCE (object), G_VALUE_TYPE (value))) { #line 534 "/home/jens/Source/shotwell/src/VideoMetadata.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 5311 "VideoMetadata.c" +#line 5337 "VideoMetadata.c" } #line 534 "/home/jens/Source/shotwell/src/VideoMetadata.vala" value->data[0].v_pointer = avi_chunk_ref (object); -#line 5315 "VideoMetadata.c" +#line 5341 "VideoMetadata.c" } else { #line 534 "/home/jens/Source/shotwell/src/VideoMetadata.vala" value->data[0].v_pointer = NULL; -#line 5319 "VideoMetadata.c" +#line 5345 "VideoMetadata.c" } #line 534 "/home/jens/Source/shotwell/src/VideoMetadata.vala" return NULL; -#line 5323 "VideoMetadata.c" +#line 5349 "VideoMetadata.c" } @@ -5331,25 +5357,25 @@ static gchar* value_avi_chunk_lcopy_value (const GValue* value, guint n_collect_ if (!object_p) { #line 534 "/home/jens/Source/shotwell/src/VideoMetadata.vala" return g_strdup_printf ("value location for `%s' passed as NULL", G_VALUE_TYPE_NAME (value)); -#line 5334 "VideoMetadata.c" +#line 5360 "VideoMetadata.c" } #line 534 "/home/jens/Source/shotwell/src/VideoMetadata.vala" if (!value->data[0].v_pointer) { #line 534 "/home/jens/Source/shotwell/src/VideoMetadata.vala" *object_p = NULL; -#line 5340 "VideoMetadata.c" +#line 5366 "VideoMetadata.c" } else if (collect_flags & G_VALUE_NOCOPY_CONTENTS) { #line 534 "/home/jens/Source/shotwell/src/VideoMetadata.vala" *object_p = value->data[0].v_pointer; -#line 5344 "VideoMetadata.c" +#line 5370 "VideoMetadata.c" } else { #line 534 "/home/jens/Source/shotwell/src/VideoMetadata.vala" *object_p = avi_chunk_ref (value->data[0].v_pointer); -#line 5348 "VideoMetadata.c" +#line 5374 "VideoMetadata.c" } #line 534 "/home/jens/Source/shotwell/src/VideoMetadata.vala" return NULL; -#line 5352 "VideoMetadata.c" +#line 5378 "VideoMetadata.c" } @@ -5363,7 +5389,7 @@ GParamSpec* param_spec_avi_chunk (const gchar* name, const gchar* nick, const gc G_PARAM_SPEC (spec)->value_type = object_type; #line 534 "/home/jens/Source/shotwell/src/VideoMetadata.vala" return G_PARAM_SPEC (spec); -#line 5366 "VideoMetadata.c" +#line 5392 "VideoMetadata.c" } @@ -5372,7 +5398,7 @@ gpointer value_get_avi_chunk (const GValue* value) { g_return_val_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, TYPE_AVI_CHUNK), NULL); #line 534 "/home/jens/Source/shotwell/src/VideoMetadata.vala" return value->data[0].v_pointer; -#line 5375 "VideoMetadata.c" +#line 5401 "VideoMetadata.c" } @@ -5392,17 +5418,17 @@ void value_set_avi_chunk (GValue* value, gpointer v_object) { value->data[0].v_pointer = v_object; #line 534 "/home/jens/Source/shotwell/src/VideoMetadata.vala" avi_chunk_ref (value->data[0].v_pointer); -#line 5395 "VideoMetadata.c" +#line 5421 "VideoMetadata.c" } else { #line 534 "/home/jens/Source/shotwell/src/VideoMetadata.vala" value->data[0].v_pointer = NULL; -#line 5399 "VideoMetadata.c" +#line 5425 "VideoMetadata.c" } #line 534 "/home/jens/Source/shotwell/src/VideoMetadata.vala" if (old) { #line 534 "/home/jens/Source/shotwell/src/VideoMetadata.vala" avi_chunk_unref (old); -#line 5405 "VideoMetadata.c" +#line 5431 "VideoMetadata.c" } } @@ -5421,17 +5447,17 @@ void value_take_avi_chunk (GValue* value, gpointer v_object) { g_return_if_fail (g_value_type_compatible (G_TYPE_FROM_INSTANCE (v_object), G_VALUE_TYPE (value))); #line 534 "/home/jens/Source/shotwell/src/VideoMetadata.vala" value->data[0].v_pointer = v_object; -#line 5424 "VideoMetadata.c" +#line 5450 "VideoMetadata.c" } else { #line 534 "/home/jens/Source/shotwell/src/VideoMetadata.vala" value->data[0].v_pointer = NULL; -#line 5428 "VideoMetadata.c" +#line 5454 "VideoMetadata.c" } #line 534 "/home/jens/Source/shotwell/src/VideoMetadata.vala" if (old) { #line 534 "/home/jens/Source/shotwell/src/VideoMetadata.vala" avi_chunk_unref (old); -#line 5434 "VideoMetadata.c" +#line 5460 "VideoMetadata.c" } } @@ -5443,7 +5469,7 @@ static void avi_chunk_class_init (AVIChunkClass * klass) { ((AVIChunkClass *) klass)->finalize = avi_chunk_finalize; #line 534 "/home/jens/Source/shotwell/src/VideoMetadata.vala" g_type_class_add_private (klass, sizeof (AVIChunkPrivate)); -#line 5446 "VideoMetadata.c" +#line 5472 "VideoMetadata.c" } @@ -5467,7 +5493,7 @@ static void avi_chunk_instance_init (AVIChunk * self) { self->priv->parent = NULL; #line 534 "/home/jens/Source/shotwell/src/VideoMetadata.vala" self->ref_count = 1; -#line 5470 "VideoMetadata.c" +#line 5496 "VideoMetadata.c" } @@ -5485,7 +5511,7 @@ static void avi_chunk_finalize (AVIChunk* obj) { _g_object_unref0 (self->priv->input); #line 540 "/home/jens/Source/shotwell/src/VideoMetadata.vala" _avi_chunk_unref0 (self->priv->parent); -#line 5488 "VideoMetadata.c" +#line 5514 "VideoMetadata.c" } @@ -5510,7 +5536,7 @@ gpointer avi_chunk_ref (gpointer instance) { g_atomic_int_inc (&self->ref_count); #line 534 "/home/jens/Source/shotwell/src/VideoMetadata.vala" return instance; -#line 5513 "VideoMetadata.c" +#line 5539 "VideoMetadata.c" } @@ -5523,7 +5549,7 @@ void avi_chunk_unref (gpointer instance) { AVI_CHUNK_GET_CLASS (self)->finalize (self); #line 534 "/home/jens/Source/shotwell/src/VideoMetadata.vala" g_type_free_instance ((GTypeInstance *) self); -#line 5526 "VideoMetadata.c" +#line 5552 "VideoMetadata.c" } } -- cgit v1.2.3