summaryrefslogtreecommitdiff
path: root/src/VideoMetadata.c
diff options
context:
space:
mode:
authorJörg Frings-Fürst <debian@jff-webhosting.net>2017-12-15 20:38:57 +0100
committerJörg Frings-Fürst <debian@jff-webhosting.net>2017-12-15 20:38:57 +0100
commitf1353e9ffd34db5f755c7da0b3f9c10638fbfd38 (patch)
treea1f2ab30332a6383b0677bfcc2aec687b98851d6 /src/VideoMetadata.c
parentf8ca421bdacee8851965a4b802ada1d2366bdbc1 (diff)
parentede50c561ec9811704821a9ea0f04c3d6c20b5af (diff)
Merge branch 'release/0.26.4-1'0.26.4-1
Diffstat (limited to 'src/VideoMetadata.c')
-rw-r--r--src/VideoMetadata.c1672
1 files changed, 831 insertions, 841 deletions
diff --git a/src/VideoMetadata.c b/src/VideoMetadata.c
index 52b5d2d..c914694 100644
--- a/src/VideoMetadata.c
+++ b/src/VideoMetadata.c
@@ -1,4 +1,4 @@
-/* VideoMetadata.c generated by valac 0.34.7, the Vala compiler
+/* VideoMetadata.c generated by valac 0.36.6, the Vala compiler
* generated from VideoMetadata.vala, do not modify */
/* Copyright 2016 Software Freedom Conservancy Inc.
@@ -283,7 +283,7 @@ gchar* avi_metadata_loader_get_title (AVIMetadataLoader* self);
static MetadataDateTime* video_metadata_real_get_creation_date_time (MediaMetadata* base);
static gchar* video_metadata_real_get_title (MediaMetadata* base);
static gchar* video_metadata_real_get_comment (MediaMetadata* base);
-static void video_metadata_finalize (MediaMetadata* obj);
+static void video_metadata_finalize (MediaMetadata * obj);
#define QUICK_TIME_METADATA_LOADER_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), TYPE_QUICK_TIME_METADATA_LOADER, QuickTimeMetadataLoaderPrivate))
enum {
QUICK_TIME_METADATA_LOADER_DUMMY_PROPERTY
@@ -310,7 +310,7 @@ void quick_time_atom_close_file (QuickTimeAtom* self, GError** error);
QuickTimeAtom* quick_time_atom_get_first_child_atom (QuickTimeAtom* self);
guint64 quick_time_atom_section_size_remaining (QuickTimeAtom* self);
guint32 quick_time_atom_read_uint32 (QuickTimeAtom* self, GError** error);
-static void quick_time_metadata_loader_finalize (QuickTimeMetadataLoader* obj);
+static void quick_time_metadata_loader_finalize (QuickTimeMetadataLoader * obj);
#define QUICK_TIME_ATOM_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), TYPE_QUICK_TIME_ATOM, QuickTimeAtomPrivate))
enum {
QUICK_TIME_ATOM_DUMMY_PROPERTY
@@ -322,7 +322,7 @@ guchar quick_time_atom_read_byte (QuickTimeAtom* self, GError** error);
guint64 quick_time_atom_read_uint64 (QuickTimeAtom* self, GError** error);
static void quick_time_atom_skip (QuickTimeAtom* self, guint64 skip_amount, GError** error);
void skip_uint64 (GInputStream* input, guint64 skip_amount, GError** error);
-static void quick_time_atom_finalize (QuickTimeAtom* obj);
+static void quick_time_atom_finalize (QuickTimeAtom * obj);
#define AVI_METADATA_LOADER_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), TYPE_AVI_METADATA_LOADER, AVIMetadataLoaderPrivate))
enum {
AVI_METADATA_LOADER_DUMMY_PROPERTY
@@ -359,7 +359,7 @@ void avi_chunk_next_chunk (AVIChunk* self, GError** error);
static gulong avi_metadata_loader_parse_date (AVIMetadataLoader* self, const gchar* sdate);
static GDateMonth avi_metadata_loader_month_from_string (AVIMetadataLoader* self, const gchar* s);
void avi_chunk_nonsection_skip (AVIChunk* self, guint64 skip_amount, GError** error);
-static void avi_metadata_loader_finalize (AVIMetadataLoader* obj);
+static void avi_metadata_loader_finalize (AVIMetadataLoader * obj);
#define AVI_CHUNK_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), TYPE_AVI_CHUNK, AVIChunkPrivate))
enum {
AVI_CHUNK_DUMMY_PROPERTY
@@ -368,7 +368,7 @@ enum {
static AVIChunk* avi_chunk_new_with_input_stream (GDataInputStream* input, AVIChunk* parent);
static AVIChunk* avi_chunk_construct_with_input_stream (GType object_type, GDataInputStream* input, AVIChunk* parent);
static void avi_chunk_advance_section_offset (AVIChunk* self, guint64 amount);
-static void avi_chunk_finalize (AVIChunk* obj);
+static void avi_chunk_finalize (AVIChunk * obj);
VideoMetadata* video_metadata_construct (GType object_type) {
@@ -391,20 +391,20 @@ VideoMetadata* video_metadata_new (void) {
static void video_metadata_real_read_from_file (MediaMetadata* base, GFile* file, GError** error) {
VideoMetadata * self;
QuickTimeMetadataLoader* quicktime = NULL;
- GFile* _tmp0_ = NULL;
- QuickTimeMetadataLoader* _tmp1_ = NULL;
- QuickTimeMetadataLoader* _tmp2_ = NULL;
- gboolean _tmp3_ = FALSE;
+ GFile* _tmp0_;
+ QuickTimeMetadataLoader* _tmp1_;
+ QuickTimeMetadataLoader* _tmp2_;
+ gboolean _tmp3_;
AVIMetadataLoader* avi = NULL;
- GFile* _tmp8_ = NULL;
- AVIMetadataLoader* _tmp9_ = NULL;
- AVIMetadataLoader* _tmp10_ = NULL;
- gboolean _tmp11_ = FALSE;
- GFile* _tmp16_ = NULL;
- gchar* _tmp17_ = NULL;
- gchar* _tmp18_ = NULL;
- GError* _tmp19_ = NULL;
- GError* _tmp20_ = NULL;
+ GFile* _tmp8_;
+ AVIMetadataLoader* _tmp9_;
+ AVIMetadataLoader* _tmp10_;
+ gboolean _tmp11_;
+ GFile* _tmp16_;
+ gchar* _tmp17_;
+ gchar* _tmp18_;
+ GError* _tmp19_;
+ GError* _tmp20_;
GError * _inner_error_ = NULL;
#line 19 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_VIDEO_METADATA, VideoMetadata);
@@ -423,10 +423,10 @@ static void video_metadata_real_read_from_file (MediaMetadata* base, GFile* file
#line 21 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
if (_tmp3_) {
#line 426 "VideoMetadata.c"
- QuickTimeMetadataLoader* _tmp4_ = NULL;
- MetadataDateTime* _tmp5_ = NULL;
- QuickTimeMetadataLoader* _tmp6_ = NULL;
- gchar* _tmp7_ = NULL;
+ QuickTimeMetadataLoader* _tmp4_;
+ MetadataDateTime* _tmp5_;
+ QuickTimeMetadataLoader* _tmp6_;
+ gchar* _tmp7_;
#line 22 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
_tmp4_ = quicktime;
#line 22 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
@@ -466,10 +466,10 @@ static void video_metadata_real_read_from_file (MediaMetadata* base, GFile* file
#line 29 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
if (_tmp11_) {
#line 469 "VideoMetadata.c"
- AVIMetadataLoader* _tmp12_ = NULL;
- MetadataDateTime* _tmp13_ = NULL;
- AVIMetadataLoader* _tmp14_ = NULL;
- gchar* _tmp15_ = NULL;
+ AVIMetadataLoader* _tmp12_;
+ MetadataDateTime* _tmp13_;
+ AVIMetadataLoader* _tmp14_;
+ gchar* _tmp15_;
#line 30 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
_tmp12_ = avi;
#line 30 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
@@ -534,8 +534,8 @@ static gpointer _metadata_date_time_ref0 (gpointer self) {
static MetadataDateTime* video_metadata_real_get_creation_date_time (MediaMetadata* base) {
VideoMetadata * self;
MetadataDateTime* result = NULL;
- MetadataDateTime* _tmp0_ = NULL;
- MetadataDateTime* _tmp1_ = NULL;
+ MetadataDateTime* _tmp0_;
+ MetadataDateTime* _tmp1_;
#line 39 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_VIDEO_METADATA, VideoMetadata);
#line 40 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
@@ -553,8 +553,8 @@ static MetadataDateTime* video_metadata_real_get_creation_date_time (MediaMetada
static gchar* video_metadata_real_get_title (MediaMetadata* base) {
VideoMetadata * self;
gchar* result = NULL;
- const gchar* _tmp0_ = NULL;
- gchar* _tmp1_ = NULL;
+ const gchar* _tmp0_;
+ gchar* _tmp1_;
#line 43 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_VIDEO_METADATA, VideoMetadata);
#line 44 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
@@ -572,8 +572,8 @@ static gchar* video_metadata_real_get_title (MediaMetadata* base) {
static gchar* video_metadata_real_get_comment (MediaMetadata* base) {
VideoMetadata * self;
gchar* result = NULL;
- const gchar* _tmp0_ = NULL;
- gchar* _tmp1_ = NULL;
+ const gchar* _tmp0_;
+ gchar* _tmp1_;
#line 47 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_VIDEO_METADATA, VideoMetadata);
#line 48 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
@@ -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 = (void (*)(MediaMetadata*, GFile*, GError**)) 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 = (MetadataDateTime* (*)(MediaMetadata*)) 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 = (gchar* (*)(MediaMetadata*)) 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 = (gchar* (*)(MediaMetadata*)) video_metadata_real_get_comment;
+ ((MediaMetadataClass *) klass)->get_comment = (gchar* (*) (MediaMetadata *)) video_metadata_real_get_comment;
#line 607 "VideoMetadata.c"
}
@@ -620,7 +620,7 @@ static void video_metadata_instance_init (VideoMetadata * self) {
}
-static void video_metadata_finalize (MediaMetadata* obj) {
+static void video_metadata_finalize (MediaMetadata * obj) {
VideoMetadata * self;
#line 7 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_VIDEO_METADATA, VideoMetadata);
@@ -657,8 +657,8 @@ static gpointer _g_object_ref0 (gpointer self) {
QuickTimeMetadataLoader* quick_time_metadata_loader_construct (GType object_type, GFile* file) {
QuickTimeMetadataLoader* self = NULL;
- GFile* _tmp0_ = NULL;
- GFile* _tmp1_ = NULL;
+ GFile* _tmp0_;
+ GFile* _tmp1_;
#line 61 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
g_return_val_if_fail (G_IS_FILE (file), NULL);
#line 61 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
@@ -686,8 +686,8 @@ QuickTimeMetadataLoader* quick_time_metadata_loader_new (GFile* file) {
MetadataDateTime* quick_time_metadata_loader_get_creation_date_time (QuickTimeMetadataLoader* self) {
MetadataDateTime* result = NULL;
- gulong _tmp0_ = 0UL;
- MetadataDateTime* _tmp1_ = NULL;
+ gulong _tmp0_;
+ MetadataDateTime* _tmp1_;
#line 65 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
g_return_val_if_fail (IS_QUICK_TIME_METADATA_LOADER (self), NULL);
#line 66 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
@@ -717,8 +717,8 @@ gchar* quick_time_metadata_loader_get_title (QuickTimeMetadataLoader* self) {
gboolean quick_time_metadata_loader_is_supported (QuickTimeMetadataLoader* self) {
gboolean result = FALSE;
QuickTimeAtom* test = NULL;
- GFile* _tmp0_ = NULL;
- QuickTimeAtom* _tmp1_ = NULL;
+ GFile* _tmp0_;
+ QuickTimeAtom* _tmp1_;
gboolean ret = FALSE;
GError * _inner_error_ = NULL;
#line 75 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
@@ -733,12 +733,12 @@ gboolean quick_time_metadata_loader_is_supported (QuickTimeMetadataLoader* self)
ret = FALSE;
#line 735 "VideoMetadata.c"
{
- QuickTimeAtom* _tmp2_ = NULL;
- QuickTimeAtom* _tmp3_ = NULL;
- QuickTimeAtom* _tmp4_ = NULL;
- gchar* _tmp5_ = NULL;
- gchar* _tmp6_ = NULL;
- gboolean _tmp7_ = FALSE;
+ QuickTimeAtom* _tmp2_;
+ QuickTimeAtom* _tmp3_;
+ QuickTimeAtom* _tmp4_;
+ gchar* _tmp5_;
+ gchar* _tmp6_;
+ gboolean _tmp7_;
#line 80 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
_tmp2_ = test;
#line 80 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
@@ -746,7 +746,7 @@ gboolean quick_time_metadata_loader_is_supported (QuickTimeMetadataLoader* self)
#line 80 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
if (G_UNLIKELY (_inner_error_ != NULL)) {
#line 749 "VideoMetadata.c"
- goto __catch575_g_error;
+ goto __catch577_g_error;
}
#line 81 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
_tmp3_ = test;
@@ -755,7 +755,7 @@ gboolean quick_time_metadata_loader_is_supported (QuickTimeMetadataLoader* self)
#line 81 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
if (G_UNLIKELY (_inner_error_ != NULL)) {
#line 758 "VideoMetadata.c"
- goto __catch575_g_error;
+ goto __catch577_g_error;
}
#line 84 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
_tmp4_ = test;
@@ -776,14 +776,14 @@ gboolean quick_time_metadata_loader_is_supported (QuickTimeMetadataLoader* self)
#line 90 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
while (TRUE) {
#line 779 "VideoMetadata.c"
- QuickTimeAtom* _tmp8_ = NULL;
- gchar* _tmp9_ = NULL;
- gchar* _tmp10_ = NULL;
- gboolean _tmp11_ = FALSE;
- QuickTimeAtom* _tmp12_ = NULL;
- QuickTimeAtom* _tmp13_ = NULL;
- QuickTimeAtom* _tmp14_ = NULL;
- gboolean _tmp15_ = FALSE;
+ QuickTimeAtom* _tmp8_;
+ gchar* _tmp9_;
+ gchar* _tmp10_;
+ gboolean _tmp11_;
+ QuickTimeAtom* _tmp12_;
+ QuickTimeAtom* _tmp13_;
+ QuickTimeAtom* _tmp14_;
+ gboolean _tmp15_;
#line 91 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
_tmp8_ = test;
#line 91 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
@@ -809,7 +809,7 @@ gboolean quick_time_metadata_loader_is_supported (QuickTimeMetadataLoader* self)
#line 95 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
if (G_UNLIKELY (_inner_error_ != NULL)) {
#line 812 "VideoMetadata.c"
- goto __catch575_g_error;
+ goto __catch577_g_error;
}
#line 96 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
_tmp13_ = test;
@@ -818,7 +818,7 @@ gboolean quick_time_metadata_loader_is_supported (QuickTimeMetadataLoader* self)
#line 96 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
if (G_UNLIKELY (_inner_error_ != NULL)) {
#line 821 "VideoMetadata.c"
- goto __catch575_g_error;
+ goto __catch577_g_error;
}
#line 97 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
_tmp14_ = test;
@@ -833,15 +833,15 @@ gboolean quick_time_metadata_loader_is_supported (QuickTimeMetadataLoader* self)
}
}
}
- goto __finally575;
- __catch575_g_error:
+ goto __finally577;
+ __catch577_g_error:
{
GError* e = NULL;
- GFile* _tmp16_ = NULL;
- gchar* _tmp17_ = NULL;
- gchar* _tmp18_ = NULL;
- GError* _tmp19_ = NULL;
- const gchar* _tmp20_ = NULL;
+ GFile* _tmp16_;
+ gchar* _tmp17_;
+ gchar* _tmp18_;
+ GError* _tmp19_;
+ const gchar* _tmp20_;
#line 79 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
e = _inner_error_;
#line 79 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
@@ -865,7 +865,7 @@ gboolean quick_time_metadata_loader_is_supported (QuickTimeMetadataLoader* self)
_g_error_free0 (e);
#line 866 "VideoMetadata.c"
}
- __finally575:
+ __finally577:
#line 79 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
if (G_UNLIKELY (_inner_error_ != NULL)) {
#line 871 "VideoMetadata.c"
@@ -881,7 +881,7 @@ gboolean quick_time_metadata_loader_is_supported (QuickTimeMetadataLoader* self)
#line 881 "VideoMetadata.c"
}
{
- QuickTimeAtom* _tmp22_ = NULL;
+ QuickTimeAtom* _tmp22_;
#line 107 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
_tmp22_ = test;
#line 107 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
@@ -889,15 +889,15 @@ gboolean quick_time_metadata_loader_is_supported (QuickTimeMetadataLoader* self)
#line 107 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
if (G_UNLIKELY (_inner_error_ != NULL)) {
#line 891 "VideoMetadata.c"
- goto __catch576_g_error;
+ goto __catch578_g_error;
}
}
- goto __finally576;
- __catch576_g_error:
+ goto __finally578;
+ __catch578_g_error:
{
GError* e = NULL;
- GError* _tmp23_ = NULL;
- const gchar* _tmp24_ = NULL;
+ GError* _tmp23_;
+ const gchar* _tmp24_;
#line 106 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
e = _inner_error_;
#line 106 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
@@ -912,7 +912,7 @@ gboolean quick_time_metadata_loader_is_supported (QuickTimeMetadataLoader* self)
_g_error_free0 (e);
#line 913 "VideoMetadata.c"
}
- __finally576:
+ __finally578:
#line 106 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
if (G_UNLIKELY (_inner_error_ != NULL)) {
#line 918 "VideoMetadata.c"
@@ -940,11 +940,11 @@ gboolean quick_time_metadata_loader_is_supported (QuickTimeMetadataLoader* self)
static gulong quick_time_metadata_loader_get_creation_date_time_for_quicktime (QuickTimeMetadataLoader* self) {
gulong result = 0UL;
QuickTimeAtom* test = NULL;
- GFile* _tmp0_ = NULL;
- QuickTimeAtom* _tmp1_ = NULL;
+ GFile* _tmp0_;
+ QuickTimeAtom* _tmp1_;
time_t timestamp = 0;
- time_t _tmp37_ = 0;
- time_t _tmp39_ = 0;
+ time_t _tmp37_;
+ time_t _tmp39_;
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);
@@ -958,7 +958,7 @@ static gulong quick_time_metadata_loader_get_creation_date_time_for_quicktime (Q
timestamp = (time_t) 0;
#line 959 "VideoMetadata.c"
{
- QuickTimeAtom* _tmp2_ = NULL;
+ QuickTimeAtom* _tmp2_;
gboolean done = FALSE;
#line 119 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
_tmp2_ = test;
@@ -967,22 +967,22 @@ static gulong quick_time_metadata_loader_get_creation_date_time_for_quicktime (Q
#line 119 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
if (G_UNLIKELY (_inner_error_ != NULL)) {
#line 969 "VideoMetadata.c"
- goto __catch577_g_error;
+ goto __catch579_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 976 "VideoMetadata.c"
- gboolean _tmp3_ = FALSE;
- QuickTimeAtom* _tmp4_ = NULL;
- QuickTimeAtom* _tmp5_ = NULL;
- gboolean _tmp6_ = FALSE;
- QuickTimeAtom* _tmp7_ = NULL;
- gchar* _tmp8_ = NULL;
- gchar* _tmp9_ = NULL;
- gboolean _tmp10_ = FALSE;
- QuickTimeAtom* _tmp29_ = NULL;
+ gboolean _tmp3_;
+ QuickTimeAtom* _tmp4_;
+ QuickTimeAtom* _tmp5_;
+ gboolean _tmp6_;
+ QuickTimeAtom* _tmp7_;
+ gchar* _tmp8_;
+ gchar* _tmp9_;
+ gboolean _tmp10_;
+ QuickTimeAtom* _tmp29_;
#line 121 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
_tmp3_ = done;
#line 121 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
@@ -998,7 +998,7 @@ static gulong quick_time_metadata_loader_get_creation_date_time_for_quicktime (Q
#line 123 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
if (G_UNLIKELY (_inner_error_ != NULL)) {
#line 1000 "VideoMetadata.c"
- goto __catch577_g_error;
+ goto __catch579_g_error;
}
#line 124 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
_tmp5_ = test;
@@ -1024,8 +1024,8 @@ static gulong quick_time_metadata_loader_get_creation_date_time_for_quicktime (Q
if (_tmp10_) {
#line 1025 "VideoMetadata.c"
QuickTimeAtom* child = NULL;
- QuickTimeAtom* _tmp11_ = NULL;
- QuickTimeAtom* _tmp12_ = NULL;
+ QuickTimeAtom* _tmp11_;
+ QuickTimeAtom* _tmp12_;
#line 126 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
_tmp11_ = test;
#line 126 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
@@ -1035,16 +1035,16 @@ static gulong quick_time_metadata_loader_get_creation_date_time_for_quicktime (Q
#line 127 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
while (TRUE) {
#line 1037 "VideoMetadata.c"
- gboolean _tmp13_ = FALSE;
- QuickTimeAtom* _tmp14_ = NULL;
+ gboolean _tmp13_;
+ QuickTimeAtom* _tmp14_;
gboolean _tmp15_ = FALSE;
- QuickTimeAtom* _tmp16_ = NULL;
- gboolean _tmp17_ = FALSE;
- QuickTimeAtom* _tmp20_ = NULL;
- gchar* _tmp21_ = NULL;
- gchar* _tmp22_ = NULL;
- gboolean _tmp23_ = FALSE;
- QuickTimeAtom* _tmp28_ = NULL;
+ QuickTimeAtom* _tmp16_;
+ gboolean _tmp17_;
+ QuickTimeAtom* _tmp20_;
+ gchar* _tmp21_;
+ gchar* _tmp22_;
+ gboolean _tmp23_;
+ QuickTimeAtom* _tmp28_;
#line 127 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
_tmp13_ = done;
#line 127 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
@@ -1062,7 +1062,7 @@ static gulong quick_time_metadata_loader_get_creation_date_time_for_quicktime (Q
#line 129 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
_quick_time_atom_unref0 (child);
#line 1064 "VideoMetadata.c"
- goto __catch577_g_error;
+ goto __catch579_g_error;
}
#line 130 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
_tmp16_ = child;
@@ -1074,8 +1074,8 @@ static gulong quick_time_metadata_loader_get_creation_date_time_for_quicktime (Q
_tmp15_ = TRUE;
#line 1075 "VideoMetadata.c"
} else {
- QuickTimeAtom* _tmp18_ = NULL;
- guint64 _tmp19_ = 0ULL;
+ QuickTimeAtom* _tmp18_;
+ guint64 _tmp19_;
#line 130 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
_tmp18_ = child;
#line 130 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
@@ -1105,10 +1105,10 @@ static gulong quick_time_metadata_loader_get_creation_date_time_for_quicktime (Q
#line 135 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
if (_tmp23_) {
#line 1107 "VideoMetadata.c"
- QuickTimeAtom* _tmp24_ = NULL;
+ QuickTimeAtom* _tmp24_;
guint32 _tmp25_ = 0U;
- QuickTimeAtom* _tmp26_ = NULL;
- guint32 _tmp27_ = 0U;
+ QuickTimeAtom* _tmp26_;
+ guint32 _tmp27_;
#line 137 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
_tmp24_ = child;
#line 137 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
@@ -1118,7 +1118,7 @@ static gulong quick_time_metadata_loader_get_creation_date_time_for_quicktime (Q
#line 137 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
_quick_time_atom_unref0 (child);
#line 1120 "VideoMetadata.c"
- goto __catch577_g_error;
+ goto __catch579_g_error;
}
#line 139 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
_tmp26_ = child;
@@ -1131,7 +1131,7 @@ static gulong quick_time_metadata_loader_get_creation_date_time_for_quicktime (Q
#line 139 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
_quick_time_atom_unref0 (child);
#line 1133 "VideoMetadata.c"
- goto __catch577_g_error;
+ goto __catch579_g_error;
}
#line 139 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
timestamp = _tmp25_ - QUICK_TIME_METADATA_LOADER_QUICKTIME_EPOCH_ADJUSTMENT;
@@ -1150,7 +1150,7 @@ static gulong quick_time_metadata_loader_get_creation_date_time_for_quicktime (Q
#line 143 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
_quick_time_atom_unref0 (child);
#line 1152 "VideoMetadata.c"
- goto __catch577_g_error;
+ goto __catch579_g_error;
}
}
#line 125 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
@@ -1164,16 +1164,16 @@ static gulong quick_time_metadata_loader_get_creation_date_time_for_quicktime (Q
#line 146 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
if (G_UNLIKELY (_inner_error_ != NULL)) {
#line 1166 "VideoMetadata.c"
- goto __catch577_g_error;
+ goto __catch579_g_error;
}
}
}
- goto __finally577;
- __catch577_g_error:
+ goto __finally579;
+ __catch579_g_error:
{
GError* e = NULL;
- GError* _tmp30_ = NULL;
- const gchar* _tmp31_ = NULL;
+ GError* _tmp30_;
+ const gchar* _tmp31_;
#line 118 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
e = _inner_error_;
#line 118 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
@@ -1188,7 +1188,7 @@ static gulong quick_time_metadata_loader_get_creation_date_time_for_quicktime (Q
_g_error_free0 (e);
#line 1189 "VideoMetadata.c"
}
- __finally577:
+ __finally579:
#line 118 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
if (G_UNLIKELY (_inner_error_ != NULL)) {
#line 1194 "VideoMetadata.c"
@@ -1204,7 +1204,7 @@ static gulong quick_time_metadata_loader_get_creation_date_time_for_quicktime (Q
#line 1204 "VideoMetadata.c"
}
{
- QuickTimeAtom* _tmp33_ = NULL;
+ QuickTimeAtom* _tmp33_;
#line 153 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
_tmp33_ = test;
#line 153 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
@@ -1212,15 +1212,15 @@ static gulong quick_time_metadata_loader_get_creation_date_time_for_quicktime (Q
#line 153 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
if (G_UNLIKELY (_inner_error_ != NULL)) {
#line 1214 "VideoMetadata.c"
- goto __catch578_g_error;
+ goto __catch580_g_error;
}
}
- goto __finally578;
- __catch578_g_error:
+ goto __finally580;
+ __catch580_g_error:
{
GError* e = NULL;
- GError* _tmp34_ = NULL;
- const gchar* _tmp35_ = NULL;
+ GError* _tmp34_;
+ const gchar* _tmp35_;
#line 152 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
e = _inner_error_;
#line 152 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
@@ -1235,7 +1235,7 @@ static gulong quick_time_metadata_loader_get_creation_date_time_for_quicktime (Q
_g_error_free0 (e);
#line 1236 "VideoMetadata.c"
}
- __finally578:
+ __finally580:
#line 152 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
if (G_UNLIKELY (_inner_error_ != NULL)) {
#line 1241 "VideoMetadata.c"
@@ -1255,7 +1255,7 @@ static gulong quick_time_metadata_loader_get_creation_date_time_for_quicktime (Q
#line 166 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
if (_tmp37_ < ((time_t) 0)) {
#line 1257 "VideoMetadata.c"
- time_t _tmp38_ = 0;
+ time_t _tmp38_;
#line 167 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
_tmp38_ = timestamp;
#line 167 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
@@ -1316,7 +1316,7 @@ static gchar* value_quick_time_metadata_loader_collect_value (GValue* value, gui
#line 53 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
if (collect_values[0].v_pointer) {
#line 1318 "VideoMetadata.c"
- QuickTimeMetadataLoader* object;
+ QuickTimeMetadataLoader * object;
object = collect_values[0].v_pointer;
#line 53 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
if (object->parent_instance.g_class == NULL) {
@@ -1343,7 +1343,7 @@ static gchar* value_quick_time_metadata_loader_collect_value (GValue* value, gui
static gchar* value_quick_time_metadata_loader_lcopy_value (const GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) {
- QuickTimeMetadataLoader** object_p;
+ QuickTimeMetadataLoader ** object_p;
object_p = collect_values[0].v_pointer;
#line 53 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
if (!object_p) {
@@ -1395,7 +1395,7 @@ gpointer value_get_quick_time_metadata_loader (const GValue* value) {
void value_set_quick_time_metadata_loader (GValue* value, gpointer v_object) {
- QuickTimeMetadataLoader* old;
+ QuickTimeMetadataLoader * old;
#line 53 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, TYPE_QUICK_TIME_METADATA_LOADER));
#line 53 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
@@ -1426,7 +1426,7 @@ void value_set_quick_time_metadata_loader (GValue* value, gpointer v_object) {
void value_take_quick_time_metadata_loader (GValue* value, gpointer v_object) {
- QuickTimeMetadataLoader* old;
+ QuickTimeMetadataLoader * old;
#line 53 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, TYPE_QUICK_TIME_METADATA_LOADER));
#line 53 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
@@ -1476,7 +1476,7 @@ static void quick_time_metadata_loader_instance_init (QuickTimeMetadataLoader *
}
-static void quick_time_metadata_loader_finalize (QuickTimeMetadataLoader* obj) {
+static void quick_time_metadata_loader_finalize (QuickTimeMetadataLoader * obj) {
QuickTimeMetadataLoader * self;
#line 53 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_QUICK_TIME_METADATA_LOADER, QuickTimeMetadataLoader);
@@ -1503,7 +1503,7 @@ GType quick_time_metadata_loader_get_type (void) {
gpointer quick_time_metadata_loader_ref (gpointer instance) {
- QuickTimeMetadataLoader* self;
+ QuickTimeMetadataLoader * self;
self = instance;
#line 53 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
g_atomic_int_inc (&self->ref_count);
@@ -1514,7 +1514,7 @@ gpointer quick_time_metadata_loader_ref (gpointer instance) {
void quick_time_metadata_loader_unref (gpointer instance) {
- QuickTimeMetadataLoader* self;
+ QuickTimeMetadataLoader * self;
self = instance;
#line 53 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
if (g_atomic_int_dec_and_test (&self->ref_count)) {
@@ -1529,8 +1529,8 @@ void quick_time_metadata_loader_unref (gpointer instance) {
QuickTimeAtom* quick_time_atom_construct (GType object_type, GFile* file) {
QuickTimeAtom* self = NULL;
- GFile* _tmp0_ = NULL;
- GFile* _tmp1_ = NULL;
+ GFile* _tmp0_;
+ GFile* _tmp1_;
#line 181 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
g_return_val_if_fail (G_IS_FILE (file), NULL);
#line 181 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
@@ -1565,10 +1565,10 @@ static gpointer _quick_time_atom_ref0 (gpointer self) {
static QuickTimeAtom* quick_time_atom_construct_with_input_stream (GType object_type, GDataInputStream* input, QuickTimeAtom* parent) {
QuickTimeAtom* self = NULL;
- GDataInputStream* _tmp0_ = NULL;
- GDataInputStream* _tmp1_ = NULL;
- QuickTimeAtom* _tmp2_ = NULL;
- QuickTimeAtom* _tmp3_ = NULL;
+ GDataInputStream* _tmp0_;
+ GDataInputStream* _tmp1_;
+ QuickTimeAtom* _tmp2_;
+ QuickTimeAtom* _tmp3_;
#line 185 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
g_return_val_if_fail (G_IS_DATA_INPUT_STREAM (input), NULL);
#line 185 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
@@ -1606,11 +1606,11 @@ static QuickTimeAtom* quick_time_atom_new_with_input_stream (GDataInputStream* i
void quick_time_atom_open_file (QuickTimeAtom* self, GError** error) {
GFileInputStream* _tmp0_ = NULL;
- GFile* _tmp1_ = NULL;
- GFileInputStream* _tmp2_ = NULL;
- GDataInputStream* _tmp3_ = NULL;
- GDataInputStream* _tmp4_ = NULL;
- gchar* _tmp5_ = NULL;
+ GFile* _tmp1_;
+ GFileInputStream* _tmp2_;
+ GDataInputStream* _tmp3_;
+ GDataInputStream* _tmp4_;
+ gchar* _tmp5_;
GError * _inner_error_ = NULL;
#line 190 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
g_return_if_fail (IS_QUICK_TIME_ATOM (self));
@@ -1665,7 +1665,7 @@ void quick_time_atom_open_file (QuickTimeAtom* self, GError** error) {
void quick_time_atom_close_file (QuickTimeAtom* self, GError** error) {
- GDataInputStream* _tmp0_ = NULL;
+ GDataInputStream* _tmp0_;
GError * _inner_error_ = NULL;
#line 199 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
g_return_if_fail (IS_QUICK_TIME_ATOM (self));
@@ -1674,7 +1674,7 @@ void quick_time_atom_close_file (QuickTimeAtom* self, GError** error) {
#line 200 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
if (NULL != _tmp0_) {
#line 1676 "VideoMetadata.c"
- GDataInputStream* _tmp1_ = NULL;
+ GDataInputStream* _tmp1_;
#line 201 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
_tmp1_ = self->priv->input;
#line 201 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
@@ -1697,9 +1697,9 @@ void quick_time_atom_close_file (QuickTimeAtom* self, GError** error) {
static void quick_time_atom_advance_section_offset (QuickTimeAtom* self, guint64 amount) {
- guint64 _tmp0_ = 0ULL;
- guint64 _tmp1_ = 0ULL;
- QuickTimeAtom* _tmp2_ = NULL;
+ guint64 _tmp0_;
+ guint64 _tmp1_;
+ QuickTimeAtom* _tmp2_;
#line 206 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
g_return_if_fail (IS_QUICK_TIME_ATOM (self));
#line 207 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
@@ -1713,8 +1713,8 @@ static void quick_time_atom_advance_section_offset (QuickTimeAtom* self, guint64
#line 208 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
if (NULL != _tmp2_) {
#line 1715 "VideoMetadata.c"
- QuickTimeAtom* _tmp3_ = NULL;
- guint64 _tmp4_ = 0ULL;
+ QuickTimeAtom* _tmp3_;
+ guint64 _tmp4_;
#line 209 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
_tmp3_ = self->priv->parent;
#line 209 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
@@ -1728,8 +1728,8 @@ static void quick_time_atom_advance_section_offset (QuickTimeAtom* self, guint64
QuickTimeAtom* quick_time_atom_get_first_child_atom (QuickTimeAtom* self) {
QuickTimeAtom* result = NULL;
- GDataInputStream* _tmp0_ = NULL;
- QuickTimeAtom* _tmp1_ = NULL;
+ GDataInputStream* _tmp0_;
+ QuickTimeAtom* _tmp1_;
#line 213 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
g_return_val_if_fail (IS_QUICK_TIME_ATOM (self), NULL);
#line 219 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
@@ -1747,8 +1747,8 @@ QuickTimeAtom* quick_time_atom_get_first_child_atom (QuickTimeAtom* self) {
guchar quick_time_atom_read_byte (QuickTimeAtom* self, GError** error) {
guchar result = '\0';
guint8 _tmp0_ = 0U;
- GDataInputStream* _tmp1_ = NULL;
- guint8 _tmp2_ = 0U;
+ GDataInputStream* _tmp1_;
+ guint8 _tmp2_;
GError * _inner_error_ = NULL;
#line 222 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
g_return_val_if_fail (IS_QUICK_TIME_ATOM (self), '\0');
@@ -1781,8 +1781,8 @@ guchar quick_time_atom_read_byte (QuickTimeAtom* self, GError** error) {
guint32 quick_time_atom_read_uint32 (QuickTimeAtom* self, GError** error) {
guint32 result = 0U;
guint32 _tmp0_ = 0U;
- GDataInputStream* _tmp1_ = NULL;
- guint32 _tmp2_ = 0U;
+ GDataInputStream* _tmp1_;
+ guint32 _tmp2_;
GError * _inner_error_ = NULL;
#line 227 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
g_return_val_if_fail (IS_QUICK_TIME_ATOM (self), 0U);
@@ -1815,8 +1815,8 @@ guint32 quick_time_atom_read_uint32 (QuickTimeAtom* self, GError** error) {
guint64 quick_time_atom_read_uint64 (QuickTimeAtom* self, GError** error) {
guint64 result = 0ULL;
guint64 _tmp0_ = 0ULL;
- GDataInputStream* _tmp1_ = NULL;
- guint64 _tmp2_ = 0ULL;
+ GDataInputStream* _tmp1_;
+ guint64 _tmp2_;
GError * _inner_error_ = NULL;
#line 232 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
g_return_val_if_fail (IS_QUICK_TIME_ATOM (self), 0ULL);
@@ -1848,17 +1848,17 @@ guint64 quick_time_atom_read_uint64 (QuickTimeAtom* self, GError** error) {
static gchar string_get (const gchar* self, glong index) {
gchar result = '\0';
- glong _tmp0_ = 0L;
- gchar _tmp1_ = '\0';
-#line 1086 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+ glong _tmp0_;
+ gchar _tmp1_;
+#line 1110 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
g_return_val_if_fail (self != NULL, '\0');
-#line 1087 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1111 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
_tmp0_ = index;
-#line 1087 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1111 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
_tmp1_ = ((gchar*) self)[_tmp0_];
-#line 1087 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1111 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
result = _tmp1_;
-#line 1087 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1111 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
return result;
#line 1863 "VideoMetadata.c"
}
@@ -1866,28 +1866,28 @@ static gchar string_get (const gchar* self, glong index) {
void quick_time_atom_read_atom (QuickTimeAtom* self, GError** error) {
guint32 _tmp0_ = 0U;
- guint32 _tmp1_ = 0U;
+ guint32 _tmp1_;
GString* sb = NULL;
- GString* _tmp2_ = NULL;
+ GString* _tmp2_;
guchar _tmp3_ = '\0';
- guchar _tmp4_ = '\0';
- GString* _tmp5_ = NULL;
+ guchar _tmp4_;
+ GString* _tmp5_;
guchar _tmp6_ = '\0';
- guchar _tmp7_ = '\0';
- GString* _tmp8_ = NULL;
+ guchar _tmp7_;
+ GString* _tmp8_;
guchar _tmp9_ = '\0';
- guchar _tmp10_ = '\0';
- GString* _tmp11_ = NULL;
+ guchar _tmp10_;
+ GString* _tmp11_;
guchar _tmp12_ = '\0';
- guchar _tmp13_ = '\0';
- GString* _tmp14_ = NULL;
- GString* _tmp15_ = NULL;
- const gchar* _tmp16_ = NULL;
- gchar* _tmp17_ = NULL;
- const gchar* _tmp18_ = NULL;
- gint _tmp19_ = 0;
- gint _tmp20_ = 0;
- guint64 _tmp41_ = 0ULL;
+ guchar _tmp13_;
+ GString* _tmp14_;
+ GString* _tmp15_;
+ const gchar* _tmp16_;
+ gchar* _tmp17_;
+ const gchar* _tmp18_;
+ gint _tmp19_;
+ gint _tmp20_;
+ guint64 _tmp41_;
GError * _inner_error_ = NULL;
#line 237 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
g_return_if_fail (IS_QUICK_TIME_ATOM (self));
@@ -2000,11 +2000,11 @@ void quick_time_atom_read_atom (QuickTimeAtom* self, GError** error) {
#line 250 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
if (_tmp20_ != 4) {
#line 2002 "VideoMetadata.c"
- GFile* _tmp21_ = NULL;
- gchar* _tmp22_ = NULL;
- gchar* _tmp23_ = NULL;
- GError* _tmp24_ = NULL;
- GError* _tmp25_ = NULL;
+ GFile* _tmp21_;
+ gchar* _tmp22_;
+ gchar* _tmp23_;
+ GError* _tmp24_;
+ GError* _tmp25_;
#line 251 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
_tmp21_ = self->priv->file;
#line 251 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
@@ -2039,18 +2039,18 @@ void quick_time_atom_read_atom (QuickTimeAtom* self, GError** error) {
#line 254 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
while (TRUE) {
#line 2041 "VideoMetadata.c"
- gint _tmp28_ = 0;
- const gchar* _tmp29_ = NULL;
- gint _tmp30_ = 0;
- gint _tmp31_ = 0;
- const gchar* _tmp32_ = NULL;
- gint _tmp33_ = 0;
- gchar _tmp34_ = '\0';
- gboolean _tmp35_ = FALSE;
+ gint _tmp28_;
+ const gchar* _tmp29_;
+ gint _tmp30_;
+ gint _tmp31_;
+ const gchar* _tmp32_;
+ gint _tmp33_;
+ gchar _tmp34_;
+ gboolean _tmp35_;
#line 254 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
if (!_tmp26_) {
#line 2052 "VideoMetadata.c"
- gint _tmp27_ = 0;
+ gint _tmp27_;
#line 254 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
_tmp27_ = i;
#line 254 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
@@ -2084,11 +2084,11 @@ void quick_time_atom_read_atom (QuickTimeAtom* self, GError** error) {
#line 255 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
if (!_tmp35_) {
#line 2086 "VideoMetadata.c"
- GFile* _tmp36_ = NULL;
- gchar* _tmp37_ = NULL;
- gchar* _tmp38_ = NULL;
- GError* _tmp39_ = NULL;
- GError* _tmp40_ = NULL;
+ GFile* _tmp36_;
+ gchar* _tmp37_;
+ gchar* _tmp38_;
+ GError* _tmp39_;
+ GError* _tmp40_;
#line 256 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
_tmp36_ = self->priv->file;
#line 256 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
@@ -2120,7 +2120,7 @@ void quick_time_atom_read_atom (QuickTimeAtom* self, GError** error) {
if (((guint64) 1) == _tmp41_) {
#line 2121 "VideoMetadata.c"
guint64 _tmp42_ = 0ULL;
- guint64 _tmp43_ = 0ULL;
+ guint64 _tmp43_;
#line 263 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
_tmp43_ = quick_time_atom_read_uint64 (self, &_inner_error_);
#line 263 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
@@ -2146,8 +2146,8 @@ void quick_time_atom_read_atom (QuickTimeAtom* self, GError** error) {
static void quick_time_atom_skip (QuickTimeAtom* self, guint64 skip_amount, GError** error) {
- GDataInputStream* _tmp0_ = NULL;
- guint64 _tmp1_ = 0ULL;
+ GDataInputStream* _tmp0_;
+ guint64 _tmp1_;
GError * _inner_error_ = NULL;
#line 267 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
g_return_if_fail (IS_QUICK_TIME_ATOM (self));
@@ -2170,10 +2170,10 @@ static void quick_time_atom_skip (QuickTimeAtom* self, guint64 skip_amount, GErr
guint64 quick_time_atom_section_size_remaining (QuickTimeAtom* self) {
guint64 result = 0ULL;
- guint64 _tmp0_ = 0ULL;
- guint64 _tmp1_ = 0ULL;
- guint64 _tmp2_ = 0ULL;
- guint64 _tmp3_ = 0ULL;
+ guint64 _tmp0_;
+ guint64 _tmp1_;
+ guint64 _tmp2_;
+ guint64 _tmp3_;
#line 271 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
g_return_val_if_fail (IS_QUICK_TIME_ATOM (self), 0ULL);
#line 272 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
@@ -2195,7 +2195,7 @@ guint64 quick_time_atom_section_size_remaining (QuickTimeAtom* self) {
void quick_time_atom_next_atom (QuickTimeAtom* self, GError** error) {
- guint64 _tmp0_ = 0ULL;
+ guint64 _tmp0_;
GError * _inner_error_ = NULL;
#line 276 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
g_return_if_fail (IS_QUICK_TIME_ATOM (self));
@@ -2221,8 +2221,8 @@ void quick_time_atom_next_atom (QuickTimeAtom* self, GError** error) {
gchar* quick_time_atom_get_current_atom_name (QuickTimeAtom* self) {
gchar* result = NULL;
- const gchar* _tmp0_ = NULL;
- gchar* _tmp1_ = NULL;
+ const gchar* _tmp0_;
+ gchar* _tmp1_;
#line 282 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
g_return_val_if_fail (IS_QUICK_TIME_ATOM (self), NULL);
#line 283 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
@@ -2239,7 +2239,7 @@ gchar* quick_time_atom_get_current_atom_name (QuickTimeAtom* self) {
gboolean quick_time_atom_is_last_atom (QuickTimeAtom* self) {
gboolean result = FALSE;
- guint64 _tmp0_ = 0ULL;
+ guint64 _tmp0_;
#line 286 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
g_return_val_if_fail (IS_QUICK_TIME_ATOM (self), FALSE);
#line 287 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
@@ -2294,7 +2294,7 @@ static gchar* value_quick_time_atom_collect_value (GValue* value, guint n_collec
#line 173 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
if (collect_values[0].v_pointer) {
#line 2296 "VideoMetadata.c"
- QuickTimeAtom* object;
+ QuickTimeAtom * object;
object = collect_values[0].v_pointer;
#line 173 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
if (object->parent_instance.g_class == NULL) {
@@ -2321,7 +2321,7 @@ static gchar* value_quick_time_atom_collect_value (GValue* value, guint n_collec
static gchar* value_quick_time_atom_lcopy_value (const GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) {
- QuickTimeAtom** object_p;
+ QuickTimeAtom ** object_p;
object_p = collect_values[0].v_pointer;
#line 173 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
if (!object_p) {
@@ -2373,7 +2373,7 @@ gpointer value_get_quick_time_atom (const GValue* value) {
void value_set_quick_time_atom (GValue* value, gpointer v_object) {
- QuickTimeAtom* old;
+ QuickTimeAtom * old;
#line 173 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, TYPE_QUICK_TIME_ATOM));
#line 173 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
@@ -2404,7 +2404,7 @@ void value_set_quick_time_atom (GValue* value, gpointer v_object) {
void value_take_quick_time_atom (GValue* value, gpointer v_object) {
- QuickTimeAtom* old;
+ QuickTimeAtom * old;
#line 173 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, TYPE_QUICK_TIME_ATOM));
#line 173 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
@@ -2444,7 +2444,7 @@ static void quick_time_atom_class_init (QuickTimeAtomClass * klass) {
static void quick_time_atom_instance_init (QuickTimeAtom * self) {
- gchar* _tmp0_ = NULL;
+ gchar* _tmp0_;
#line 173 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
self->priv = QUICK_TIME_ATOM_GET_PRIVATE (self);
#line 174 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
@@ -2467,7 +2467,7 @@ static void quick_time_atom_instance_init (QuickTimeAtom * self) {
}
-static void quick_time_atom_finalize (QuickTimeAtom* obj) {
+static void quick_time_atom_finalize (QuickTimeAtom * obj) {
QuickTimeAtom * self;
#line 173 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_QUICK_TIME_ATOM, QuickTimeAtom);
@@ -2500,7 +2500,7 @@ GType quick_time_atom_get_type (void) {
gpointer quick_time_atom_ref (gpointer instance) {
- QuickTimeAtom* self;
+ QuickTimeAtom * self;
self = instance;
#line 173 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
g_atomic_int_inc (&self->ref_count);
@@ -2511,7 +2511,7 @@ gpointer quick_time_atom_ref (gpointer instance) {
void quick_time_atom_unref (gpointer instance) {
- QuickTimeAtom* self;
+ QuickTimeAtom * self;
self = instance;
#line 173 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
if (g_atomic_int_dec_and_test (&self->ref_count)) {
@@ -2526,8 +2526,8 @@ void quick_time_atom_unref (gpointer instance) {
AVIMetadataLoader* avi_metadata_loader_construct (GType object_type, GFile* file) {
AVIMetadataLoader* self = NULL;
- GFile* _tmp0_ = NULL;
- GFile* _tmp1_ = NULL;
+ GFile* _tmp0_;
+ GFile* _tmp1_;
#line 305 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
g_return_val_if_fail (G_IS_FILE (file), NULL);
#line 305 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
@@ -2555,8 +2555,8 @@ AVIMetadataLoader* avi_metadata_loader_new (GFile* file) {
MetadataDateTime* avi_metadata_loader_get_creation_date_time (AVIMetadataLoader* self) {
MetadataDateTime* result = NULL;
- gulong _tmp0_ = 0UL;
- MetadataDateTime* _tmp1_ = NULL;
+ gulong _tmp0_;
+ MetadataDateTime* _tmp1_;
#line 309 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
g_return_val_if_fail (IS_AVI_METADATA_LOADER (self), NULL);
#line 310 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
@@ -2586,8 +2586,8 @@ gchar* avi_metadata_loader_get_title (AVIMetadataLoader* self) {
gboolean avi_metadata_loader_is_supported (AVIMetadataLoader* self) {
gboolean result = FALSE;
AVIChunk* chunk = NULL;
- GFile* _tmp0_ = NULL;
- AVIChunk* _tmp1_ = NULL;
+ GFile* _tmp0_;
+ AVIChunk* _tmp1_;
gboolean ret = FALSE;
GError * _inner_error_ = NULL;
#line 319 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
@@ -2602,13 +2602,13 @@ gboolean avi_metadata_loader_is_supported (AVIMetadataLoader* self) {
ret = FALSE;
#line 2603 "VideoMetadata.c"
{
- AVIChunk* _tmp2_ = NULL;
- AVIChunk* _tmp3_ = NULL;
+ AVIChunk* _tmp2_;
+ AVIChunk* _tmp3_;
gboolean _tmp4_ = FALSE;
- AVIChunk* _tmp5_ = NULL;
- gchar* _tmp6_ = NULL;
- gchar* _tmp7_ = NULL;
- gboolean _tmp8_ = FALSE;
+ AVIChunk* _tmp5_;
+ gchar* _tmp6_;
+ gchar* _tmp7_;
+ gboolean _tmp8_;
#line 323 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
_tmp2_ = chunk;
#line 323 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
@@ -2616,7 +2616,7 @@ gboolean avi_metadata_loader_is_supported (AVIMetadataLoader* self) {
#line 323 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
if (G_UNLIKELY (_inner_error_ != NULL)) {
#line 2618 "VideoMetadata.c"
- goto __catch579_g_error;
+ goto __catch581_g_error;
}
#line 324 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
_tmp3_ = chunk;
@@ -2625,7 +2625,7 @@ gboolean avi_metadata_loader_is_supported (AVIMetadataLoader* self) {
#line 324 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
if (G_UNLIKELY (_inner_error_ != NULL)) {
#line 2627 "VideoMetadata.c"
- goto __catch579_g_error;
+ goto __catch581_g_error;
}
#line 326 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
_tmp5_ = chunk;
@@ -2641,10 +2641,8 @@ gboolean avi_metadata_loader_is_supported (AVIMetadataLoader* self) {
if (_tmp8_) {
#line 2642 "VideoMetadata.c"
gchar* _tmp9_ = NULL;
- AVIChunk* _tmp10_ = NULL;
- gchar* _tmp11_ = NULL;
- gchar* _tmp12_ = NULL;
- gchar* _tmp13_ = NULL;
+ AVIChunk* _tmp10_;
+ gchar* _tmp11_;
#line 327 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
_tmp10_ = chunk;
#line 327 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
@@ -2653,59 +2651,51 @@ 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 2656 "VideoMetadata.c"
- goto __catch579_g_error;
+#line 2654 "VideoMetadata.c"
+ goto __catch581_g_error;
}
#line 327 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
- _tmp12_ = _tmp9_;
-#line 327 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
- _tmp9_ = NULL;
-#line 327 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
- _tmp13_ = _tmp12_;
-#line 327 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
- _tmp4_ = g_strcmp0 ("AVI ", _tmp13_) == 0;
-#line 327 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
- _g_free0 (_tmp13_);
+ _tmp4_ = g_strcmp0 ("AVI ", _tmp9_) == 0;
#line 326 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
_g_free0 (_tmp9_);
-#line 2671 "VideoMetadata.c"
+#line 2661 "VideoMetadata.c"
} else {
#line 326 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
_tmp4_ = FALSE;
-#line 2675 "VideoMetadata.c"
+#line 2665 "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 2681 "VideoMetadata.c"
+#line 2671 "VideoMetadata.c"
}
}
- goto __finally579;
- __catch579_g_error:
+ goto __finally581;
+ __catch581_g_error:
{
GError* e = NULL;
- GError* _tmp14_ = NULL;
- const gchar* _tmp15_ = NULL;
+ GError* _tmp12_;
+ const gchar* _tmp13_;
#line 322 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
e = _inner_error_;
#line 322 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
_inner_error_ = NULL;
#line 331 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
- _tmp14_ = e;
+ _tmp12_ = e;
#line 331 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
- _tmp15_ = _tmp14_->message;
+ _tmp13_ = _tmp12_->message;
#line 331 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
- g_debug ("VideoMetadata.vala:331: Error while testing for AVI file: %s", _tmp15_);
+ g_debug ("VideoMetadata.vala:331: Error while testing for AVI file: %s", _tmp13_);
#line 322 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
_g_error_free0 (e);
-#line 2702 "VideoMetadata.c"
+#line 2692 "VideoMetadata.c"
}
- __finally579:
+ __finally581:
#line 322 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 2707 "VideoMetadata.c"
- gboolean _tmp16_ = FALSE;
+#line 2697 "VideoMetadata.c"
+ gboolean _tmp14_ = FALSE;
#line 322 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
_avi_chunk_unref0 (chunk);
#line 322 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
@@ -2713,46 +2703,46 @@ 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 _tmp16_;
-#line 2717 "VideoMetadata.c"
+ return _tmp14_;
+#line 2707 "VideoMetadata.c"
}
{
- AVIChunk* _tmp17_ = NULL;
+ AVIChunk* _tmp15_;
#line 335 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
- _tmp17_ = chunk;
+ _tmp15_ = chunk;
#line 335 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
- avi_chunk_close_file (_tmp17_, &_inner_error_);
+ avi_chunk_close_file (_tmp15_, &_inner_error_);
#line 335 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 2727 "VideoMetadata.c"
- goto __catch580_g_error;
+#line 2717 "VideoMetadata.c"
+ goto __catch582_g_error;
}
}
- goto __finally580;
- __catch580_g_error:
+ goto __finally582;
+ __catch582_g_error:
{
GError* e = NULL;
- GError* _tmp18_ = NULL;
- const gchar* _tmp19_ = NULL;
+ GError* _tmp16_;
+ const gchar* _tmp17_;
#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"
- _tmp18_ = e;
+ _tmp16_ = e;
#line 337 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
- _tmp19_ = _tmp18_->message;
+ _tmp17_ = _tmp16_->message;
#line 337 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
- g_debug ("VideoMetadata.vala:337: Error while closing AVI file: %s", _tmp19_);
+ g_debug ("VideoMetadata.vala:337: Error while closing AVI file: %s", _tmp17_);
#line 334 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
_g_error_free0 (e);
-#line 2749 "VideoMetadata.c"
+#line 2739 "VideoMetadata.c"
}
- __finally580:
+ __finally582:
#line 334 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 2754 "VideoMetadata.c"
- gboolean _tmp20_ = FALSE;
+#line 2744 "VideoMetadata.c"
+ gboolean _tmp18_ = FALSE;
#line 334 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
_avi_chunk_unref0 (chunk);
#line 334 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
@@ -2760,8 +2750,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 _tmp20_;
-#line 2764 "VideoMetadata.c"
+ return _tmp18_;
+#line 2754 "VideoMetadata.c"
}
#line 339 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
result = ret;
@@ -2769,15 +2759,15 @@ gboolean avi_metadata_loader_is_supported (AVIMetadataLoader* self) {
_avi_chunk_unref0 (chunk);
#line 339 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
return result;
-#line 2772 "VideoMetadata.c"
+#line 2762 "VideoMetadata.c"
}
static gchar* avi_metadata_loader_read_nikon_nctg_tag (AVIMetadataLoader* self, AVIChunk* chunk, GError** error) {
gchar* result = NULL;
gboolean found_date = FALSE;
- gboolean _tmp9_ = FALSE;
- gchar* _tmp21_ = NULL;
+ gboolean _tmp9_;
+ gchar* _tmp21_;
GError * _inner_error_ = NULL;
#line 343 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
g_return_val_if_fail (IS_AVI_METADATA_LOADER (self), NULL);
@@ -2787,18 +2777,18 @@ 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 2790 "VideoMetadata.c"
- AVIChunk* _tmp0_ = NULL;
- guint64 _tmp1_ = 0ULL;
+#line 2780 "VideoMetadata.c"
+ AVIChunk* _tmp0_;
+ guint64 _tmp1_;
guint16 tag = 0U;
- AVIChunk* _tmp2_ = NULL;
- guint16 _tmp3_ = 0U;
+ AVIChunk* _tmp2_;
+ guint16 _tmp3_;
guint16 size = 0U;
- AVIChunk* _tmp4_ = NULL;
- guint16 _tmp5_ = 0U;
- guint16 _tmp6_ = 0U;
- AVIChunk* _tmp7_ = NULL;
- guint16 _tmp8_ = 0U;
+ AVIChunk* _tmp4_;
+ guint16 _tmp5_;
+ guint16 _tmp6_;
+ AVIChunk* _tmp7_;
+ guint16 _tmp8_;
#line 345 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
_tmp0_ = chunk;
#line 345 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
@@ -2807,7 +2797,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 2810 "VideoMetadata.c"
+#line 2800 "VideoMetadata.c"
}
#line 346 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
_tmp2_ = chunk;
@@ -2821,7 +2811,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 2824 "VideoMetadata.c"
+#line 2814 "VideoMetadata.c"
}
#line 347 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
_tmp4_ = chunk;
@@ -2835,7 +2825,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 2838 "VideoMetadata.c"
+#line 2828 "VideoMetadata.c"
}
#line 348 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
_tmp6_ = tag;
@@ -2845,7 +2835,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 2848 "VideoMetadata.c"
+#line 2838 "VideoMetadata.c"
}
#line 352 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
_tmp7_ = chunk;
@@ -2859,50 +2849,50 @@ 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 2862 "VideoMetadata.c"
+#line 2852 "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 2869 "VideoMetadata.c"
+#line 2859 "VideoMetadata.c"
GString* sb = NULL;
- GString* _tmp10_ = NULL;
- GString* _tmp18_ = NULL;
- const gchar* _tmp19_ = NULL;
- gchar* _tmp20_ = NULL;
+ GString* _tmp10_;
+ GString* _tmp18_;
+ const gchar* _tmp19_;
+ gchar* _tmp20_;
#line 357 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
_tmp10_ = g_string_new ("");
#line 357 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
sb = _tmp10_;
-#line 2879 "VideoMetadata.c"
+#line 2869 "VideoMetadata.c"
{
gint i = 0;
#line 358 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
i = 0;
-#line 2884 "VideoMetadata.c"
+#line 2874 "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 2891 "VideoMetadata.c"
- gint _tmp13_ = 0;
+#line 2881 "VideoMetadata.c"
+ gint _tmp13_;
guchar _tmp14_ = '\0';
- AVIChunk* _tmp15_ = NULL;
- guchar _tmp16_ = '\0';
- GString* _tmp17_ = NULL;
+ AVIChunk* _tmp15_;
+ guchar _tmp16_;
+ GString* _tmp17_;
#line 358 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
if (!_tmp11_) {
-#line 2899 "VideoMetadata.c"
- gint _tmp12_ = 0;
+#line 2889 "VideoMetadata.c"
+ gint _tmp12_;
#line 358 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
_tmp12_ = i;
#line 358 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
i = _tmp12_ + 1;
-#line 2905 "VideoMetadata.c"
+#line 2895 "VideoMetadata.c"
}
#line 358 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
_tmp11_ = FALSE;
@@ -2912,7 +2902,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 2915 "VideoMetadata.c"
+#line 2905 "VideoMetadata.c"
}
#line 359 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
_tmp15_ = chunk;
@@ -2928,13 +2918,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 2931 "VideoMetadata.c"
+#line 2921 "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 2937 "VideoMetadata.c"
+#line 2927 "VideoMetadata.c"
}
}
}
@@ -2950,7 +2940,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 2953 "VideoMetadata.c"
+#line 2943 "VideoMetadata.c"
}
#line 363 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
_tmp21_ = g_strdup ("");
@@ -2958,50 +2948,50 @@ 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 2961 "VideoMetadata.c"
+#line 2951 "VideoMetadata.c"
}
static glong string_strnlen (gchar* str, glong maxlen) {
glong result = 0L;
gchar* end = NULL;
- gchar* _tmp0_ = NULL;
- glong _tmp1_ = 0L;
- gchar* _tmp2_ = NULL;
- gchar* _tmp3_ = NULL;
-#line 1295 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+ gchar* _tmp0_;
+ glong _tmp1_;
+ gchar* _tmp2_;
+ gchar* _tmp3_;
+#line 1322 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
_tmp0_ = str;
-#line 1295 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1322 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
_tmp1_ = maxlen;
-#line 1295 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1322 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
_tmp2_ = memchr (_tmp0_, 0, (gsize) _tmp1_);
-#line 1295 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1322 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
end = _tmp2_;
-#line 1296 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1323 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
_tmp3_ = end;
-#line 1296 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1323 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
if (_tmp3_ == NULL) {
-#line 2984 "VideoMetadata.c"
- glong _tmp4_ = 0L;
-#line 1297 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 2974 "VideoMetadata.c"
+ glong _tmp4_;
+#line 1324 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
_tmp4_ = maxlen;
-#line 1297 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1324 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
result = _tmp4_;
-#line 1297 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1324 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
return result;
-#line 2992 "VideoMetadata.c"
+#line 2982 "VideoMetadata.c"
} else {
- gchar* _tmp5_ = NULL;
- gchar* _tmp6_ = NULL;
-#line 1299 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+ gchar* _tmp5_;
+ gchar* _tmp6_;
+#line 1326 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
_tmp5_ = end;
-#line 1299 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1326 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
_tmp6_ = str;
-#line 1299 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1326 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
result = (glong) (_tmp5_ - _tmp6_);
-#line 1299 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1326 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
return result;
-#line 3004 "VideoMetadata.c"
+#line 2994 "VideoMetadata.c"
}
}
@@ -3010,145 +3000,145 @@ static gchar* string_substring (const gchar* self, glong offset, glong len) {
gchar* result = NULL;
glong string_length = 0L;
gboolean _tmp0_ = FALSE;
- glong _tmp1_ = 0L;
- glong _tmp8_ = 0L;
- glong _tmp14_ = 0L;
- glong _tmp17_ = 0L;
- glong _tmp18_ = 0L;
- glong _tmp19_ = 0L;
- glong _tmp20_ = 0L;
- glong _tmp21_ = 0L;
- gchar* _tmp22_ = NULL;
-#line 1306 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+ glong _tmp1_;
+ glong _tmp8_;
+ glong _tmp14_;
+ glong _tmp17_;
+ glong _tmp18_;
+ glong _tmp19_;
+ glong _tmp20_;
+ glong _tmp21_;
+ gchar* _tmp22_;
+#line 1333 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
g_return_val_if_fail (self != NULL, NULL);
-#line 1308 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1335 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
_tmp1_ = offset;
-#line 1308 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1335 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
if (_tmp1_ >= ((glong) 0)) {
-#line 3028 "VideoMetadata.c"
- glong _tmp2_ = 0L;
-#line 1308 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 3018 "VideoMetadata.c"
+ glong _tmp2_;
+#line 1335 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
_tmp2_ = len;
-#line 1308 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1335 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
_tmp0_ = _tmp2_ >= ((glong) 0);
-#line 3034 "VideoMetadata.c"
+#line 3024 "VideoMetadata.c"
} else {
-#line 1308 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1335 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
_tmp0_ = FALSE;
-#line 3038 "VideoMetadata.c"
+#line 3028 "VideoMetadata.c"
}
-#line 1308 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1335 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
if (_tmp0_) {
-#line 3042 "VideoMetadata.c"
- glong _tmp3_ = 0L;
- glong _tmp4_ = 0L;
- glong _tmp5_ = 0L;
-#line 1310 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 3032 "VideoMetadata.c"
+ glong _tmp3_;
+ glong _tmp4_;
+ glong _tmp5_;
+#line 1337 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
_tmp3_ = offset;
-#line 1310 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1337 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
_tmp4_ = len;
-#line 1310 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1337 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
_tmp5_ = string_strnlen ((gchar*) self, _tmp3_ + _tmp4_);
-#line 1310 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1337 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
string_length = _tmp5_;
-#line 3054 "VideoMetadata.c"
+#line 3044 "VideoMetadata.c"
} else {
- gint _tmp6_ = 0;
- gint _tmp7_ = 0;
-#line 1312 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+ gint _tmp6_;
+ gint _tmp7_;
+#line 1339 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
_tmp6_ = strlen (self);
-#line 1312 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1339 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
_tmp7_ = _tmp6_;
-#line 1312 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1339 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
string_length = (glong) _tmp7_;
-#line 3064 "VideoMetadata.c"
+#line 3054 "VideoMetadata.c"
}
-#line 1315 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1342 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
_tmp8_ = offset;
-#line 1315 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1342 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
if (_tmp8_ < ((glong) 0)) {
-#line 3070 "VideoMetadata.c"
- glong _tmp9_ = 0L;
- glong _tmp10_ = 0L;
- glong _tmp11_ = 0L;
-#line 1316 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 3060 "VideoMetadata.c"
+ glong _tmp9_;
+ glong _tmp10_;
+ glong _tmp11_;
+#line 1343 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
_tmp9_ = string_length;
-#line 1316 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1343 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
_tmp10_ = offset;
-#line 1316 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1343 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
offset = _tmp9_ + _tmp10_;
-#line 1317 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1344 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
_tmp11_ = offset;
-#line 1317 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1344 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
g_return_val_if_fail (_tmp11_ >= ((glong) 0), NULL);
-#line 3084 "VideoMetadata.c"
+#line 3074 "VideoMetadata.c"
} else {
- glong _tmp12_ = 0L;
- glong _tmp13_ = 0L;
-#line 1319 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+ glong _tmp12_;
+ glong _tmp13_;
+#line 1346 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
_tmp12_ = offset;
-#line 1319 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1346 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
_tmp13_ = string_length;
-#line 1319 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1346 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
g_return_val_if_fail (_tmp12_ <= _tmp13_, NULL);
-#line 3094 "VideoMetadata.c"
+#line 3084 "VideoMetadata.c"
}
-#line 1321 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1348 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
_tmp14_ = len;
-#line 1321 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1348 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
if (_tmp14_ < ((glong) 0)) {
-#line 3100 "VideoMetadata.c"
- glong _tmp15_ = 0L;
- glong _tmp16_ = 0L;
-#line 1322 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 3090 "VideoMetadata.c"
+ glong _tmp15_;
+ glong _tmp16_;
+#line 1349 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
_tmp15_ = string_length;
-#line 1322 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1349 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
_tmp16_ = offset;
-#line 1322 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1349 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
len = _tmp15_ - _tmp16_;
-#line 3109 "VideoMetadata.c"
+#line 3099 "VideoMetadata.c"
}
-#line 1324 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1351 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
_tmp17_ = offset;
-#line 1324 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1351 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
_tmp18_ = len;
-#line 1324 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1351 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
_tmp19_ = string_length;
-#line 1324 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1351 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
g_return_val_if_fail ((_tmp17_ + _tmp18_) <= _tmp19_, NULL);
-#line 1325 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1352 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
_tmp20_ = offset;
-#line 1325 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1352 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
_tmp21_ = len;
-#line 1325 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1352 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
_tmp22_ = g_strndup (((gchar*) self) + _tmp20_, (gsize) _tmp21_);
-#line 1325 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1352 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
result = _tmp22_;
-#line 1325 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1352 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
return result;
-#line 3129 "VideoMetadata.c"
+#line 3119 "VideoMetadata.c"
}
static gchar* avi_metadata_loader_read_fuji_strd_tag (AVIMetadataLoader* self, AVIChunk* chunk, GError** error) {
gchar* result = NULL;
- AVIChunk* _tmp0_ = NULL;
- AVIChunk* _tmp1_ = NULL;
+ AVIChunk* _tmp0_;
+ AVIChunk* _tmp1_;
gint colons = 0;
gint post_colons = 0;
GString* sb = NULL;
- GString* _tmp2_ = NULL;
- GString* _tmp20_ = NULL;
- const gchar* _tmp21_ = NULL;
- gint _tmp22_ = 0;
- gint _tmp23_ = 0;
- GString* _tmp25_ = NULL;
- const gchar* _tmp26_ = NULL;
- GString* _tmp27_ = NULL;
- const gchar* _tmp28_ = NULL;
- gint _tmp29_ = 0;
- gint _tmp30_ = 0;
- gchar* _tmp31_ = NULL;
+ GString* _tmp2_;
+ GString* _tmp20_;
+ const gchar* _tmp21_;
+ gint _tmp22_;
+ gint _tmp23_;
+ GString* _tmp25_;
+ const gchar* _tmp26_;
+ GString* _tmp27_;
+ const gchar* _tmp28_;
+ gint _tmp29_;
+ gint _tmp30_;
+ gchar* _tmp31_;
GError * _inner_error_ = NULL;
#line 368 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
g_return_val_if_fail (IS_AVI_METADATA_LOADER (self), NULL);
@@ -3164,7 +3154,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 3167 "VideoMetadata.c"
+#line 3157 "VideoMetadata.c"
}
#line 370 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
_tmp1_ = chunk;
@@ -3176,7 +3166,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 3179 "VideoMetadata.c"
+#line 3169 "VideoMetadata.c"
}
#line 372 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
colons = 0;
@@ -3188,40 +3178,40 @@ 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 3191 "VideoMetadata.c"
+#line 3181 "VideoMetadata.c"
gboolean _tmp3_ = FALSE;
- gint _tmp4_ = 0;
+ gint _tmp4_;
guchar _tmp6_ = '\0';
- AVIChunk* _tmp7_ = NULL;
- guchar _tmp8_ = '\0';
+ AVIChunk* _tmp7_;
+ guchar _tmp8_;
gchar c = '\0';
- gint _tmp9_ = 0;
- gchar _tmp11_ = '\0';
- gchar _tmp13_ = '\0';
- gboolean _tmp14_ = FALSE;
- GString* _tmp17_ = NULL;
- gssize _tmp18_ = 0L;
+ gint _tmp9_;
+ gchar _tmp11_;
+ gchar _tmp13_;
+ gboolean _tmp14_;
+ GString* _tmp17_;
+ gssize _tmp18_;
#line 376 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
_tmp4_ = colons;
#line 376 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
if (_tmp4_ <= 4) {
-#line 3208 "VideoMetadata.c"
- gint _tmp5_ = 0;
+#line 3198 "VideoMetadata.c"
+ gint _tmp5_;
#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 3214 "VideoMetadata.c"
+#line 3204 "VideoMetadata.c"
} else {
#line 376 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
_tmp3_ = FALSE;
-#line 3218 "VideoMetadata.c"
+#line 3208 "VideoMetadata.c"
}
#line 376 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
if (!_tmp3_) {
#line 376 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
break;
-#line 3224 "VideoMetadata.c"
+#line 3214 "VideoMetadata.c"
}
#line 377 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
_tmp7_ = chunk;
@@ -3237,7 +3227,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 3240 "VideoMetadata.c"
+#line 3230 "VideoMetadata.c"
}
#line 377 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
c = (gchar) _tmp6_;
@@ -3245,25 +3235,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 3248 "VideoMetadata.c"
- gint _tmp10_ = 0;
+#line 3238 "VideoMetadata.c"
+ gint _tmp10_;
#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 3254 "VideoMetadata.c"
+#line 3244 "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 3260 "VideoMetadata.c"
- gint _tmp12_ = 0;
+#line 3250 "VideoMetadata.c"
+ gint _tmp12_;
#line 382 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
_tmp12_ = colons;
#line 382 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
colons = _tmp12_ + 1;
-#line 3266 "VideoMetadata.c"
+#line 3256 "VideoMetadata.c"
}
#line 384 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
_tmp13_ = c;
@@ -3271,16 +3261,16 @@ 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 3274 "VideoMetadata.c"
- GString* _tmp15_ = NULL;
- gchar _tmp16_ = '\0';
+#line 3264 "VideoMetadata.c"
+ GString* _tmp15_;
+ gchar _tmp16_;
#line 385 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
_tmp15_ = sb;
#line 385 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
_tmp16_ = c;
#line 385 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
g_string_append_c (_tmp15_, _tmp16_);
-#line 3283 "VideoMetadata.c"
+#line 3273 "VideoMetadata.c"
}
#line 387 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
_tmp17_ = sb;
@@ -3288,8 +3278,8 @@ 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 3291 "VideoMetadata.c"
- gchar* _tmp19_ = NULL;
+#line 3281 "VideoMetadata.c"
+ gchar* _tmp19_;
#line 388 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
_tmp19_ = g_strdup ("");
#line 388 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
@@ -3298,7 +3288,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 3301 "VideoMetadata.c"
+#line 3291 "VideoMetadata.c"
}
}
#line 392 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
@@ -3311,8 +3301,8 @@ 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 3314 "VideoMetadata.c"
- gchar* _tmp24_ = NULL;
+#line 3304 "VideoMetadata.c"
+ gchar* _tmp24_;
#line 393 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
_tmp24_ = g_strdup ("");
#line 393 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
@@ -3321,7 +3311,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 3324 "VideoMetadata.c"
+#line 3314 "VideoMetadata.c"
}
#line 396 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
_tmp25_ = sb;
@@ -3343,7 +3333,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 3346 "VideoMetadata.c"
+#line 3336 "VideoMetadata.c"
}
@@ -3356,16 +3346,16 @@ 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 3359 "VideoMetadata.c"
- AVIChunk* _tmp0_ = NULL;
+#line 3349 "VideoMetadata.c"
+ AVIChunk* _tmp0_;
gchar* name = NULL;
- AVIChunk* _tmp1_ = NULL;
- gchar* _tmp2_ = NULL;
- const gchar* _tmp3_ = NULL;
- const gchar* _tmp18_ = NULL;
- AVIChunk* _tmp28_ = NULL;
- gboolean _tmp29_ = FALSE;
- AVIChunk* _tmp30_ = NULL;
+ AVIChunk* _tmp1_;
+ gchar* _tmp2_;
+ const gchar* _tmp3_;
+ const gchar* _tmp18_;
+ AVIChunk* _tmp28_;
+ gboolean _tmp29_;
+ AVIChunk* _tmp30_;
#line 402 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
_tmp0_ = chunk;
#line 402 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
@@ -3376,7 +3366,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 3379 "VideoMetadata.c"
+#line 3369 "VideoMetadata.c"
}
#line 403 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
_tmp1_ = chunk;
@@ -3388,11 +3378,11 @@ 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 3391 "VideoMetadata.c"
+#line 3381 "VideoMetadata.c"
gchar* _tmp4_ = NULL;
- AVIChunk* _tmp5_ = NULL;
- gchar* _tmp6_ = NULL;
- gchar* _tmp7_ = NULL;
+ AVIChunk* _tmp5_;
+ gchar* _tmp6_;
+ gchar* _tmp7_;
#line 405 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
_tmp5_ = chunk;
#line 405 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
@@ -3407,7 +3397,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 3410 "VideoMetadata.c"
+#line 3400 "VideoMetadata.c"
}
#line 405 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
_tmp7_ = _tmp4_;
@@ -3421,18 +3411,18 @@ 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 3424 "VideoMetadata.c"
+#line 3414 "VideoMetadata.c"
} else {
- const gchar* _tmp8_ = NULL;
+ const gchar* _tmp8_;
#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 3431 "VideoMetadata.c"
+#line 3421 "VideoMetadata.c"
gchar* _tmp9_ = NULL;
- AVIChunk* _tmp10_ = NULL;
- gchar* _tmp11_ = NULL;
- gchar* _tmp12_ = NULL;
+ AVIChunk* _tmp10_;
+ gchar* _tmp11_;
+ gchar* _tmp12_;
#line 407 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
_tmp10_ = chunk;
#line 407 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
@@ -3447,7 +3437,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 3450 "VideoMetadata.c"
+#line 3440 "VideoMetadata.c"
}
#line 407 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
_tmp12_ = _tmp9_;
@@ -3461,18 +3451,18 @@ 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 3464 "VideoMetadata.c"
+#line 3454 "VideoMetadata.c"
} else {
- const gchar* _tmp13_ = NULL;
+ const gchar* _tmp13_;
#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 3471 "VideoMetadata.c"
+#line 3461 "VideoMetadata.c"
gchar* _tmp14_ = NULL;
- AVIChunk* _tmp15_ = NULL;
- gchar* _tmp16_ = NULL;
- gchar* _tmp17_ = NULL;
+ AVIChunk* _tmp15_;
+ gchar* _tmp16_;
+ gchar* _tmp17_;
#line 409 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
_tmp15_ = chunk;
#line 409 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
@@ -3487,7 +3477,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 3490 "VideoMetadata.c"
+#line 3480 "VideoMetadata.c"
}
#line 409 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
_tmp17_ = _tmp14_;
@@ -3501,7 +3491,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 3504 "VideoMetadata.c"
+#line 3494 "VideoMetadata.c"
}
}
}
@@ -3509,17 +3499,17 @@ 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 3512 "VideoMetadata.c"
- AVIChunk* _tmp19_ = NULL;
- gchar* _tmp20_ = NULL;
- gchar* _tmp21_ = NULL;
+#line 3502 "VideoMetadata.c"
+ AVIChunk* _tmp19_;
+ gchar* _tmp20_;
+ gchar* _tmp21_;
gchar* _result_ = NULL;
- AVIChunk* _tmp22_ = NULL;
- AVIChunk* _tmp23_ = NULL;
- AVIChunk* _tmp24_ = NULL;
- gchar* _tmp25_ = NULL;
- gchar* _tmp26_ = NULL;
- const gchar* _tmp27_ = NULL;
+ AVIChunk* _tmp22_;
+ AVIChunk* _tmp23_;
+ AVIChunk* _tmp24_;
+ gchar* _tmp25_;
+ gchar* _tmp26_;
+ const gchar* _tmp27_;
#line 413 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
_tmp19_ = chunk;
#line 413 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
@@ -3536,7 +3526,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 3539 "VideoMetadata.c"
+#line 3529 "VideoMetadata.c"
}
#line 414 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
_tmp22_ = chunk;
@@ -3560,7 +3550,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 3563 "VideoMetadata.c"
+#line 3553 "VideoMetadata.c"
}
#line 415 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
_tmp27_ = _result_;
@@ -3572,11 +3562,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 3575 "VideoMetadata.c"
+#line 3565 "VideoMetadata.c"
}
#line 412 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
_g_free0 (_result_);
-#line 3579 "VideoMetadata.c"
+#line 3569 "VideoMetadata.c"
}
#line 420 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
_tmp28_ = chunk;
@@ -3588,7 +3578,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 3591 "VideoMetadata.c"
+#line 3581 "VideoMetadata.c"
}
#line 423 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
_tmp30_ = chunk;
@@ -3602,25 +3592,25 @@ 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 3605 "VideoMetadata.c"
+#line 3595 "VideoMetadata.c"
}
#line 401 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
_g_free0 (name);
-#line 3609 "VideoMetadata.c"
+#line 3599 "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 3615 "VideoMetadata.c"
+#line 3605 "VideoMetadata.c"
}
static gulong avi_metadata_loader_parse_date (AVIMetadataLoader* self, const gchar* sdate) {
gulong result = 0UL;
- const gchar* _tmp0_ = NULL;
- gint _tmp1_ = 0;
- gint _tmp2_ = 0;
+ const gchar* _tmp0_;
+ gint _tmp1_;
+ gint _tmp2_;
GDate date = {0};
guint seconds = 0U;
gint year = 0;
@@ -3631,18 +3621,18 @@ static gulong avi_metadata_loader_parse_date (AVIMetadataLoader* self, const gch
gint sec = 0;
gchar weekday[4] = {0};
gchar monthstr[4] = {0};
- const gchar* _tmp3_ = NULL;
- gchar _tmp4_ = '\0';
- gboolean _tmp5_ = FALSE;
+ const gchar* _tmp3_;
+ gchar _tmp4_;
+ gboolean _tmp5_;
struct tm time = {0};
struct tm _tmp26_ = {0};
time_t tm = 0;
- time_t _tmp27_ = 0;
+ time_t _tmp27_;
gulong _result_ = 0UL;
- time_t _tmp28_ = 0;
- guint _tmp29_ = 0U;
- gulong _tmp30_ = 0UL;
- time_t _tmp31_ = 0;
+ time_t _tmp28_;
+ guint _tmp29_;
+ gulong _tmp30_;
+ time_t _tmp31_;
#line 432 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
g_return_val_if_fail (IS_AVI_METADATA_LOADER (self), 0UL);
#line 432 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
@@ -3659,7 +3649,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 3662 "VideoMetadata.c"
+#line 3652 "VideoMetadata.c"
}
#line 437 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
memset (&date, 0, sizeof (GDate));
@@ -3673,21 +3663,21 @@ 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 3676 "VideoMetadata.c"
+#line 3666 "VideoMetadata.c"
gchar* tmp = NULL;
- const gchar* _tmp6_ = NULL;
- gchar* _tmp7_ = NULL;
- const gchar* _tmp8_ = NULL;
+ const gchar* _tmp6_;
+ gchar* _tmp7_;
+ const gchar* _tmp8_;
gint _result_ = 0;
- const gchar* _tmp9_ = NULL;
- gint _tmp10_ = 0;
- gint _tmp11_ = 0;
- gint _tmp12_ = 0;
- gint _tmp13_ = 0;
- gint _tmp14_ = 0;
- gint _tmp15_ = 0;
- gint _tmp16_ = 0;
- gint _tmp17_ = 0;
+ const gchar* _tmp9_;
+ gint _tmp10_;
+ gint _tmp11_;
+ gint _tmp12_;
+ gint _tmp13_;
+ gint _tmp14_;
+ gint _tmp15_;
+ gint _tmp16_;
+ gint _tmp17_;
#line 447 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
_tmp6_ = sdate;
#line 447 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
@@ -3716,7 +3706,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 3719 "VideoMetadata.c"
+#line 3709 "VideoMetadata.c"
}
#line 454 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
_tmp12_ = day;
@@ -3736,16 +3726,16 @@ 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 3739 "VideoMetadata.c"
+#line 3729 "VideoMetadata.c"
} else {
- const gchar* _tmp18_ = NULL;
- gint _tmp19_ = 0;
- gint _tmp20_ = 0;
- GDateMonth _tmp21_ = 0;
- gint _tmp22_ = 0;
- gint _tmp23_ = 0;
- gint _tmp24_ = 0;
- gint _tmp25_ = 0;
+ const gchar* _tmp18_;
+ gint _tmp19_;
+ gint _tmp20_;
+ GDateMonth _tmp21_;
+ gint _tmp22_;
+ gint _tmp23_;
+ gint _tmp24_;
+ gint _tmp25_;
#line 458 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
_tmp18_ = sdate;
#line 458 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
@@ -3756,7 +3746,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 3759 "VideoMetadata.c"
+#line 3749 "VideoMetadata.c"
}
#line 462 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
_tmp20_ = day;
@@ -3774,7 +3764,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 3777 "VideoMetadata.c"
+#line 3767 "VideoMetadata.c"
}
#line 466 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
memset (&time, 0, sizeof (struct tm));
@@ -3798,10 +3788,10 @@ 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 3801 "VideoMetadata.c"
- GFile* _tmp32_ = NULL;
- gchar* _tmp33_ = NULL;
- gchar* _tmp34_ = NULL;
+#line 3791 "VideoMetadata.c"
+ GFile* _tmp32_;
+ gchar* _tmp33_;
+ gchar* _tmp34_;
#line 473 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
_tmp32_ = self->priv->file;
#line 473 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
@@ -3816,21 +3806,21 @@ 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 3819 "VideoMetadata.c"
+#line 3809 "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 3825 "VideoMetadata.c"
+#line 3815 "VideoMetadata.c"
}
static GDateMonth avi_metadata_loader_month_from_string (AVIMetadataLoader* self, const gchar* s) {
GDateMonth result = 0;
- const gchar* _tmp0_ = NULL;
- gchar* _tmp1_ = NULL;
- gchar* _tmp2_ = NULL;
+ const gchar* _tmp0_;
+ gchar* _tmp1_;
+ gchar* _tmp2_;
GQuark _tmp4_ = 0U;
#line 482 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
static GQuark _tmp3_label0 = 0;
@@ -3874,157 +3864,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 3877 "VideoMetadata.c"
+#line 3867 "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 3884 "VideoMetadata.c"
+#line 3874 "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 3890 "VideoMetadata.c"
+#line 3880 "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 3897 "VideoMetadata.c"
+#line 3887 "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 3903 "VideoMetadata.c"
+#line 3893 "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 3910 "VideoMetadata.c"
+#line 3900 "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 3916 "VideoMetadata.c"
+#line 3906 "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 3923 "VideoMetadata.c"
+#line 3913 "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 3929 "VideoMetadata.c"
+#line 3919 "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 3936 "VideoMetadata.c"
+#line 3926 "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 3942 "VideoMetadata.c"
+#line 3932 "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 3949 "VideoMetadata.c"
+#line 3939 "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 3955 "VideoMetadata.c"
+#line 3945 "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 3962 "VideoMetadata.c"
+#line 3952 "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 3968 "VideoMetadata.c"
+#line 3958 "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 3975 "VideoMetadata.c"
+#line 3965 "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 3981 "VideoMetadata.c"
+#line 3971 "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 3988 "VideoMetadata.c"
+#line 3978 "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 3994 "VideoMetadata.c"
+#line 3984 "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 4001 "VideoMetadata.c"
+#line 3991 "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 4007 "VideoMetadata.c"
+#line 3997 "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 4014 "VideoMetadata.c"
+#line 4004 "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 4020 "VideoMetadata.c"
+#line 4010 "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 4027 "VideoMetadata.c"
+#line 4017 "VideoMetadata.c"
}
}
}
@@ -4032,38 +4022,38 @@ 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 4035 "VideoMetadata.c"
+#line 4025 "VideoMetadata.c"
}
static gchar* string_strip (const gchar* self) {
gchar* result = NULL;
gchar* _result_ = NULL;
- gchar* _tmp0_ = NULL;
- const gchar* _tmp1_ = NULL;
-#line 1207 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+ gchar* _tmp0_;
+ const gchar* _tmp1_;
+#line 1234 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
g_return_val_if_fail (self != NULL, NULL);
-#line 1208 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1235 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
_tmp0_ = g_strdup (self);
-#line 1208 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1235 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
_result_ = _tmp0_;
-#line 1209 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1236 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
_tmp1_ = _result_;
-#line 1209 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1236 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
g_strstrip (_tmp1_);
-#line 1210 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1237 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
result = _result_;
-#line 1210 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1237 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
return result;
-#line 4058 "VideoMetadata.c"
+#line 4048 "VideoMetadata.c"
}
static gulong avi_metadata_loader_get_creation_date_time_for_avi (AVIMetadataLoader* self) {
gulong result = 0UL;
AVIChunk* chunk = NULL;
- GFile* _tmp0_ = NULL;
- AVIChunk* _tmp1_ = NULL;
+ GFile* _tmp0_;
+ AVIChunk* _tmp1_;
gulong timestamp = 0UL;
GError * _inner_error_ = NULL;
#line 511 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
@@ -4076,22 +4066,22 @@ 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 4079 "VideoMetadata.c"
+#line 4069 "VideoMetadata.c"
{
- AVIChunk* _tmp2_ = NULL;
- AVIChunk* _tmp3_ = NULL;
+ AVIChunk* _tmp2_;
+ AVIChunk* _tmp3_;
gchar* sdate = NULL;
- AVIChunk* _tmp4_ = NULL;
- gchar* _tmp5_ = NULL;
- const gchar* _tmp6_ = NULL;
+ AVIChunk* _tmp4_;
+ gchar* _tmp5_;
+ const gchar* _tmp6_;
#line 515 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
_tmp2_ = chunk;
#line 515 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
avi_chunk_open_file (_tmp2_, &_inner_error_);
#line 515 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 4093 "VideoMetadata.c"
- goto __catch581_g_error;
+#line 4083 "VideoMetadata.c"
+ goto __catch583_g_error;
}
#line 516 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
_tmp3_ = chunk;
@@ -4099,8 +4089,8 @@ 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 4102 "VideoMetadata.c"
- goto __catch581_g_error;
+#line 4092 "VideoMetadata.c"
+ goto __catch583_g_error;
}
#line 517 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
_tmp4_ = chunk;
@@ -4110,18 +4100,18 @@ 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 4113 "VideoMetadata.c"
- goto __catch581_g_error;
+#line 4103 "VideoMetadata.c"
+ goto __catch583_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 4120 "VideoMetadata.c"
- const gchar* _tmp7_ = NULL;
- gchar* _tmp8_ = NULL;
- gchar* _tmp9_ = NULL;
- gulong _tmp10_ = 0UL;
+#line 4110 "VideoMetadata.c"
+ const gchar* _tmp7_;
+ gchar* _tmp8_;
+ gchar* _tmp9_;
+ gulong _tmp10_;
#line 519 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
_tmp7_ = sdate;
#line 519 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
@@ -4134,18 +4124,18 @@ 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 4137 "VideoMetadata.c"
+#line 4127 "VideoMetadata.c"
}
#line 514 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
_g_free0 (sdate);
-#line 4141 "VideoMetadata.c"
+#line 4131 "VideoMetadata.c"
}
- goto __finally581;
- __catch581_g_error:
+ goto __finally583;
+ __catch583_g_error:
{
GError* e = NULL;
- GError* _tmp11_ = NULL;
- const gchar* _tmp12_ = NULL;
+ GError* _tmp11_;
+ const gchar* _tmp12_;
#line 514 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
e = _inner_error_;
#line 514 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
@@ -4158,12 +4148,12 @@ 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 4161 "VideoMetadata.c"
+#line 4151 "VideoMetadata.c"
}
- __finally581:
+ __finally583:
#line 514 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 4166 "VideoMetadata.c"
+#line 4156 "VideoMetadata.c"
gulong _tmp13_ = 0UL;
#line 514 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
_avi_chunk_unref0 (chunk);
@@ -4173,26 +4163,26 @@ static gulong avi_metadata_loader_get_creation_date_time_for_avi (AVIMetadataLoa
g_clear_error (&_inner_error_);
#line 514 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
return _tmp13_;
-#line 4176 "VideoMetadata.c"
+#line 4166 "VideoMetadata.c"
}
{
- AVIChunk* _tmp14_ = NULL;
+ AVIChunk* _tmp14_;
#line 526 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
_tmp14_ = chunk;
#line 526 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
avi_chunk_close_file (_tmp14_, &_inner_error_);
#line 526 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 4186 "VideoMetadata.c"
- goto __catch582_g_error;
+#line 4176 "VideoMetadata.c"
+ goto __catch584_g_error;
}
}
- goto __finally582;
- __catch582_g_error:
+ goto __finally584;
+ __catch584_g_error:
{
GError* e = NULL;
- GError* _tmp15_ = NULL;
- const gchar* _tmp16_ = NULL;
+ GError* _tmp15_;
+ const gchar* _tmp16_;
#line 525 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
e = _inner_error_;
#line 525 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
@@ -4205,12 +4195,12 @@ static gulong avi_metadata_loader_get_creation_date_time_for_avi (AVIMetadataLoa
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 4208 "VideoMetadata.c"
+#line 4198 "VideoMetadata.c"
}
- __finally582:
+ __finally584:
#line 525 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 4213 "VideoMetadata.c"
+#line 4203 "VideoMetadata.c"
gulong _tmp17_ = 0UL;
#line 525 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
_avi_chunk_unref0 (chunk);
@@ -4220,7 +4210,7 @@ static gulong avi_metadata_loader_get_creation_date_time_for_avi (AVIMetadataLoa
g_clear_error (&_inner_error_);
#line 525 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
return _tmp17_;
-#line 4223 "VideoMetadata.c"
+#line 4213 "VideoMetadata.c"
}
#line 530 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
result = timestamp;
@@ -4228,14 +4218,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 4231 "VideoMetadata.c"
+#line 4221 "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 4238 "VideoMetadata.c"
+#line 4228 "VideoMetadata.c"
}
@@ -4244,7 +4234,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 4247 "VideoMetadata.c"
+#line 4237 "VideoMetadata.c"
}
}
@@ -4254,11 +4244,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 4257 "VideoMetadata.c"
+#line 4247 "VideoMetadata.c"
} else {
#line 292 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
dest_value->data[0].v_pointer = NULL;
-#line 4261 "VideoMetadata.c"
+#line 4251 "VideoMetadata.c"
}
}
@@ -4266,66 +4256,66 @@ 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 4269 "VideoMetadata.c"
+#line 4259 "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 4276 "VideoMetadata.c"
- AVIMetadataLoader* object;
+#line 4266 "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 4283 "VideoMetadata.c"
+#line 4273 "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 4287 "VideoMetadata.c"
+#line 4277 "VideoMetadata.c"
}
#line 292 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
value->data[0].v_pointer = avi_metadata_loader_ref (object);
-#line 4291 "VideoMetadata.c"
+#line 4281 "VideoMetadata.c"
} else {
#line 292 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
value->data[0].v_pointer = NULL;
-#line 4295 "VideoMetadata.c"
+#line 4285 "VideoMetadata.c"
}
#line 292 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
return NULL;
-#line 4299 "VideoMetadata.c"
+#line 4289 "VideoMetadata.c"
}
static gchar* value_avi_metadata_loader_lcopy_value (const GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) {
- AVIMetadataLoader** object_p;
+ AVIMetadataLoader ** object_p;
object_p = collect_values[0].v_pointer;
#line 292 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
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 4310 "VideoMetadata.c"
+#line 4300 "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 4316 "VideoMetadata.c"
+#line 4306 "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 4320 "VideoMetadata.c"
+#line 4310 "VideoMetadata.c"
} else {
#line 292 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
*object_p = avi_metadata_loader_ref (value->data[0].v_pointer);
-#line 4324 "VideoMetadata.c"
+#line 4314 "VideoMetadata.c"
}
#line 292 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
return NULL;
-#line 4328 "VideoMetadata.c"
+#line 4318 "VideoMetadata.c"
}
@@ -4339,7 +4329,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 4342 "VideoMetadata.c"
+#line 4332 "VideoMetadata.c"
}
@@ -4348,12 +4338,12 @@ 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 4351 "VideoMetadata.c"
+#line 4341 "VideoMetadata.c"
}
void value_set_avi_metadata_loader (GValue* value, gpointer v_object) {
- AVIMetadataLoader* old;
+ AVIMetadataLoader * old;
#line 292 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, TYPE_AVI_METADATA_LOADER));
#line 292 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
@@ -4368,23 +4358,23 @@ 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 4371 "VideoMetadata.c"
+#line 4361 "VideoMetadata.c"
} else {
#line 292 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
value->data[0].v_pointer = NULL;
-#line 4375 "VideoMetadata.c"
+#line 4365 "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 4381 "VideoMetadata.c"
+#line 4371 "VideoMetadata.c"
}
}
void value_take_avi_metadata_loader (GValue* value, gpointer v_object) {
- AVIMetadataLoader* old;
+ AVIMetadataLoader * old;
#line 292 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, TYPE_AVI_METADATA_LOADER));
#line 292 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
@@ -4397,17 +4387,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 4400 "VideoMetadata.c"
+#line 4390 "VideoMetadata.c"
} else {
#line 292 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
value->data[0].v_pointer = NULL;
-#line 4404 "VideoMetadata.c"
+#line 4394 "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 4410 "VideoMetadata.c"
+#line 4400 "VideoMetadata.c"
}
}
@@ -4419,7 +4409,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 4422 "VideoMetadata.c"
+#line 4412 "VideoMetadata.c"
}
@@ -4430,11 +4420,11 @@ 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 4433 "VideoMetadata.c"
+#line 4423 "VideoMetadata.c"
}
-static void avi_metadata_loader_finalize (AVIMetadataLoader* obj) {
+static void avi_metadata_loader_finalize (AVIMetadataLoader * obj) {
AVIMetadataLoader * self;
#line 292 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_AVI_METADATA_LOADER, AVIMetadataLoader);
@@ -4442,7 +4432,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 4445 "VideoMetadata.c"
+#line 4435 "VideoMetadata.c"
}
@@ -4461,18 +4451,18 @@ GType avi_metadata_loader_get_type (void) {
gpointer avi_metadata_loader_ref (gpointer instance) {
- AVIMetadataLoader* self;
+ AVIMetadataLoader * self;
self = instance;
#line 292 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
g_atomic_int_inc (&self->ref_count);
#line 292 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
return instance;
-#line 4470 "VideoMetadata.c"
+#line 4460 "VideoMetadata.c"
}
void avi_metadata_loader_unref (gpointer instance) {
- AVIMetadataLoader* self;
+ AVIMetadataLoader * self;
self = instance;
#line 292 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
if (g_atomic_int_dec_and_test (&self->ref_count)) {
@@ -4480,15 +4470,15 @@ 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 4483 "VideoMetadata.c"
+#line 4473 "VideoMetadata.c"
}
}
AVIChunk* avi_chunk_construct (GType object_type, GFile* file) {
AVIChunk* self = NULL;
- GFile* _tmp0_ = NULL;
- GFile* _tmp1_ = NULL;
+ GFile* _tmp0_;
+ GFile* _tmp1_;
#line 543 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
g_return_val_if_fail (G_IS_FILE (file), NULL);
#line 543 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
@@ -4503,30 +4493,30 @@ 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 4506 "VideoMetadata.c"
+#line 4496 "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 4513 "VideoMetadata.c"
+#line 4503 "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 4520 "VideoMetadata.c"
+#line 4510 "VideoMetadata.c"
}
static AVIChunk* avi_chunk_construct_with_input_stream (GType object_type, GDataInputStream* input, AVIChunk* parent) {
AVIChunk* self = NULL;
- GDataInputStream* _tmp0_ = NULL;
- GDataInputStream* _tmp1_ = NULL;
- AVIChunk* _tmp2_ = NULL;
- AVIChunk* _tmp3_ = NULL;
+ GDataInputStream* _tmp0_;
+ GDataInputStream* _tmp1_;
+ AVIChunk* _tmp2_;
+ AVIChunk* _tmp3_;
#line 547 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
g_return_val_if_fail (G_IS_DATA_INPUT_STREAM (input), NULL);
#line 547 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
@@ -4551,24 +4541,24 @@ 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 4554 "VideoMetadata.c"
+#line 4544 "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 4561 "VideoMetadata.c"
+#line 4551 "VideoMetadata.c"
}
void avi_chunk_open_file (AVIChunk* self, GError** error) {
GFileInputStream* _tmp0_ = NULL;
- GFile* _tmp1_ = NULL;
- GFileInputStream* _tmp2_ = NULL;
- GDataInputStream* _tmp3_ = NULL;
- GDataInputStream* _tmp4_ = NULL;
- gchar* _tmp5_ = NULL;
+ GFile* _tmp1_;
+ GFileInputStream* _tmp2_;
+ GDataInputStream* _tmp3_;
+ GDataInputStream* _tmp4_;
+ gchar* _tmp5_;
GError * _inner_error_ = NULL;
#line 552 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
g_return_if_fail (IS_AVI_CHUNK (self));
@@ -4580,7 +4570,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 4583 "VideoMetadata.c"
+#line 4573 "VideoMetadata.c"
}
#line 554 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
_tmp1_ = self->priv->file;
@@ -4594,7 +4584,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 4597 "VideoMetadata.c"
+#line 4587 "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));
@@ -4618,12 +4608,12 @@ 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 4621 "VideoMetadata.c"
+#line 4611 "VideoMetadata.c"
}
void avi_chunk_close_file (AVIChunk* self, GError** error) {
- GDataInputStream* _tmp0_ = NULL;
+ GDataInputStream* _tmp0_;
GError * _inner_error_ = NULL;
#line 561 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
g_return_if_fail (IS_AVI_CHUNK (self));
@@ -4631,8 +4621,8 @@ 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 4634 "VideoMetadata.c"
- GDataInputStream* _tmp1_ = NULL;
+#line 4624 "VideoMetadata.c"
+ GDataInputStream* _tmp1_;
#line 563 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
_tmp1_ = self->priv->input;
#line 563 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
@@ -4643,20 +4633,20 @@ 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 4646 "VideoMetadata.c"
+#line 4636 "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 4652 "VideoMetadata.c"
+#line 4642 "VideoMetadata.c"
}
}
void avi_chunk_nonsection_skip (AVIChunk* self, guint64 skip_amount, GError** error) {
- GDataInputStream* _tmp0_ = NULL;
- guint64 _tmp1_ = 0ULL;
+ GDataInputStream* _tmp0_;
+ guint64 _tmp1_;
GError * _inner_error_ = NULL;
#line 568 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
g_return_if_fail (IS_AVI_CHUNK (self));
@@ -4672,15 +4662,15 @@ 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 4675 "VideoMetadata.c"
+#line 4665 "VideoMetadata.c"
}
}
void avi_chunk_skip (AVIChunk* self, guint64 skip_amount, GError** error) {
- guint64 _tmp0_ = 0ULL;
- GDataInputStream* _tmp1_ = NULL;
- guint64 _tmp2_ = 0ULL;
+ guint64 _tmp0_;
+ GDataInputStream* _tmp1_;
+ guint64 _tmp2_;
GError * _inner_error_ = NULL;
#line 572 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
g_return_if_fail (IS_AVI_CHUNK (self));
@@ -4700,15 +4690,15 @@ 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 4703 "VideoMetadata.c"
+#line 4693 "VideoMetadata.c"
}
}
AVIChunk* avi_chunk_get_first_child_chunk (AVIChunk* self) {
AVIChunk* result = NULL;
- GDataInputStream* _tmp0_ = NULL;
- AVIChunk* _tmp1_ = NULL;
+ GDataInputStream* _tmp0_;
+ AVIChunk* _tmp1_;
#line 577 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
g_return_val_if_fail (IS_AVI_CHUNK (self), NULL);
#line 578 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
@@ -4719,17 +4709,17 @@ AVIChunk* avi_chunk_get_first_child_chunk (AVIChunk* self) {
result = _tmp1_;
#line 578 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
return result;
-#line 4722 "VideoMetadata.c"
+#line 4712 "VideoMetadata.c"
}
static void avi_chunk_advance_section_offset (AVIChunk* self, guint64 amount) {
- guint64 _tmp0_ = 0ULL;
- guint64 _tmp1_ = 0ULL;
- guint64 _tmp2_ = 0ULL;
- guint64 _tmp5_ = 0ULL;
- guint64 _tmp6_ = 0ULL;
- AVIChunk* _tmp7_ = NULL;
+ guint64 _tmp0_;
+ guint64 _tmp1_;
+ guint64 _tmp2_;
+ guint64 _tmp5_;
+ guint64 _tmp6_;
+ AVIChunk* _tmp7_;
#line 581 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
g_return_if_fail (IS_AVI_CHUNK (self));
#line 582 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
@@ -4740,16 +4730,16 @@ 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 4743 "VideoMetadata.c"
- guint64 _tmp3_ = 0ULL;
- guint64 _tmp4_ = 0ULL;
+#line 4733 "VideoMetadata.c"
+ guint64 _tmp3_;
+ guint64 _tmp4_;
#line 583 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
_tmp3_ = self->priv->section_size;
#line 583 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
_tmp4_ = self->priv->section_offset;
#line 583 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
amount = _tmp3_ - _tmp4_;
-#line 4752 "VideoMetadata.c"
+#line 4742 "VideoMetadata.c"
}
#line 585 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
_tmp5_ = self->priv->section_offset;
@@ -4761,16 +4751,16 @@ 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 4764 "VideoMetadata.c"
- AVIChunk* _tmp8_ = NULL;
- guint64 _tmp9_ = 0ULL;
+#line 4754 "VideoMetadata.c"
+ AVIChunk* _tmp8_;
+ guint64 _tmp9_;
#line 587 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
_tmp8_ = self->priv->parent;
#line 587 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
_tmp9_ = amount;
#line 587 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
avi_chunk_advance_section_offset (_tmp8_, _tmp9_);
-#line 4773 "VideoMetadata.c"
+#line 4763 "VideoMetadata.c"
}
}
@@ -4778,8 +4768,8 @@ static void avi_chunk_advance_section_offset (AVIChunk* self, guint64 amount) {
guchar avi_chunk_read_byte (AVIChunk* self, GError** error) {
guchar result = '\0';
guint8 _tmp0_ = 0U;
- GDataInputStream* _tmp1_ = NULL;
- guint8 _tmp2_ = 0U;
+ GDataInputStream* _tmp1_;
+ guint8 _tmp2_;
GError * _inner_error_ = NULL;
#line 591 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
g_return_val_if_fail (IS_AVI_CHUNK (self), '\0');
@@ -4793,27 +4783,27 @@ 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"
+#line 4786 "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 _tmp3_;
-#line 4802 "VideoMetadata.c"
+#line 4792 "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 4808 "VideoMetadata.c"
+#line 4798 "VideoMetadata.c"
}
guint16 avi_chunk_read_uint16 (AVIChunk* self, GError** error) {
guint16 result = 0U;
guint16 _tmp0_ = 0U;
- GDataInputStream* _tmp1_ = NULL;
- guint16 _tmp2_ = 0U;
+ GDataInputStream* _tmp1_;
+ guint16 _tmp2_;
GError * _inner_error_ = NULL;
#line 596 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
g_return_val_if_fail (IS_AVI_CHUNK (self), 0U);
@@ -4827,47 +4817,47 @@ 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"
+#line 4820 "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 _tmp3_;
-#line 4836 "VideoMetadata.c"
+#line 4826 "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 4842 "VideoMetadata.c"
+#line 4832 "VideoMetadata.c"
}
void avi_chunk_read_chunk (AVIChunk* self, GError** error) {
GString* sb = NULL;
- GString* _tmp0_ = NULL;
+ GString* _tmp0_;
guint8 _tmp1_ = 0U;
- GDataInputStream* _tmp2_ = NULL;
- guint8 _tmp3_ = 0U;
- GString* _tmp4_ = NULL;
+ GDataInputStream* _tmp2_;
+ guint8 _tmp3_;
+ GString* _tmp4_;
guint8 _tmp5_ = 0U;
- GDataInputStream* _tmp6_ = NULL;
- guint8 _tmp7_ = 0U;
- GString* _tmp8_ = NULL;
+ GDataInputStream* _tmp6_;
+ guint8 _tmp7_;
+ GString* _tmp8_;
guint8 _tmp9_ = 0U;
- GDataInputStream* _tmp10_ = NULL;
- guint8 _tmp11_ = 0U;
- GString* _tmp12_ = NULL;
+ GDataInputStream* _tmp10_;
+ guint8 _tmp11_;
+ GString* _tmp12_;
guint8 _tmp13_ = 0U;
- GDataInputStream* _tmp14_ = NULL;
- guint8 _tmp15_ = 0U;
- GString* _tmp16_ = NULL;
- GString* _tmp17_ = NULL;
- const gchar* _tmp18_ = NULL;
- gchar* _tmp19_ = NULL;
+ GDataInputStream* _tmp14_;
+ guint8 _tmp15_;
+ GString* _tmp16_;
+ GString* _tmp17_;
+ const gchar* _tmp18_;
+ gchar* _tmp19_;
guint32 _tmp20_ = 0U;
- GDataInputStream* _tmp21_ = NULL;
- guint32 _tmp22_ = 0U;
+ GDataInputStream* _tmp21_;
+ guint32 _tmp22_;
GError * _inner_error_ = NULL;
#line 601 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
g_return_if_fail (IS_AVI_CHUNK (self));
@@ -4889,7 +4879,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 4892 "VideoMetadata.c"
+#line 4882 "VideoMetadata.c"
}
#line 605 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
_tmp4_ = sb;
@@ -4909,7 +4899,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 4912 "VideoMetadata.c"
+#line 4902 "VideoMetadata.c"
}
#line 606 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
_tmp8_ = sb;
@@ -4929,7 +4919,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 4932 "VideoMetadata.c"
+#line 4922 "VideoMetadata.c"
}
#line 607 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
_tmp12_ = sb;
@@ -4949,7 +4939,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 4952 "VideoMetadata.c"
+#line 4942 "VideoMetadata.c"
}
#line 608 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
_tmp16_ = sb;
@@ -4979,7 +4969,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 4982 "VideoMetadata.c"
+#line 4972 "VideoMetadata.c"
}
#line 610 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
self->priv->section_size = (guint64) _tmp20_;
@@ -4987,29 +4977,29 @@ 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 4990 "VideoMetadata.c"
+#line 4980 "VideoMetadata.c"
}
gchar* avi_chunk_read_name (AVIChunk* self, GError** error) {
gchar* result = NULL;
GString* sb = NULL;
- GString* _tmp0_ = NULL;
+ GString* _tmp0_;
guchar _tmp1_ = '\0';
- guchar _tmp2_ = '\0';
- GString* _tmp3_ = NULL;
+ guchar _tmp2_;
+ GString* _tmp3_;
guchar _tmp4_ = '\0';
- guchar _tmp5_ = '\0';
- GString* _tmp6_ = NULL;
+ guchar _tmp5_;
+ GString* _tmp6_;
guchar _tmp7_ = '\0';
- guchar _tmp8_ = '\0';
- GString* _tmp9_ = NULL;
+ guchar _tmp8_;
+ GString* _tmp9_;
guchar _tmp10_ = '\0';
- guchar _tmp11_ = '\0';
- GString* _tmp12_ = NULL;
- GString* _tmp13_ = NULL;
- const gchar* _tmp14_ = NULL;
- gchar* _tmp15_ = NULL;
+ guchar _tmp11_;
+ GString* _tmp12_;
+ GString* _tmp13_;
+ const gchar* _tmp14_;
+ gchar* _tmp15_;
GError * _inner_error_ = NULL;
#line 614 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
g_return_val_if_fail (IS_AVI_CHUNK (self), NULL);
@@ -5029,7 +5019,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 5032 "VideoMetadata.c"
+#line 5022 "VideoMetadata.c"
}
#line 616 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
_tmp3_ = sb;
@@ -5047,7 +5037,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 5050 "VideoMetadata.c"
+#line 5040 "VideoMetadata.c"
}
#line 617 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
_tmp6_ = sb;
@@ -5065,7 +5055,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 5068 "VideoMetadata.c"
+#line 5058 "VideoMetadata.c"
}
#line 618 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
_tmp9_ = sb;
@@ -5083,7 +5073,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 5086 "VideoMetadata.c"
+#line 5076 "VideoMetadata.c"
}
#line 619 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
_tmp12_ = sb;
@@ -5101,12 +5091,12 @@ 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 5104 "VideoMetadata.c"
+#line 5094 "VideoMetadata.c"
}
void avi_chunk_next_chunk (AVIChunk* self, GError** error) {
- guint64 _tmp0_ = 0ULL;
+ guint64 _tmp0_;
GError * _inner_error_ = NULL;
#line 623 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
g_return_if_fail (IS_AVI_CHUNK (self));
@@ -5120,20 +5110,20 @@ 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 5123 "VideoMetadata.c"
+#line 5113 "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 5129 "VideoMetadata.c"
+#line 5119 "VideoMetadata.c"
}
gchar* avi_chunk_get_current_chunk_name (AVIChunk* self) {
gchar* result = NULL;
- const gchar* _tmp0_ = NULL;
- gchar* _tmp1_ = NULL;
+ const gchar* _tmp0_;
+ gchar* _tmp1_;
#line 629 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
g_return_val_if_fail (IS_AVI_CHUNK (self), NULL);
#line 630 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
@@ -5144,13 +5134,13 @@ gchar* avi_chunk_get_current_chunk_name (AVIChunk* self) {
result = _tmp1_;
#line 630 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
return result;
-#line 5147 "VideoMetadata.c"
+#line 5137 "VideoMetadata.c"
}
gboolean avi_chunk_is_last_chunk (AVIChunk* self) {
gboolean result = FALSE;
- guint64 _tmp0_ = 0ULL;
+ guint64 _tmp0_;
#line 633 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
g_return_val_if_fail (IS_AVI_CHUNK (self), FALSE);
#line 634 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
@@ -5159,16 +5149,16 @@ gboolean avi_chunk_is_last_chunk (AVIChunk* self) {
result = _tmp0_ == ((guint64) 0);
#line 634 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
return result;
-#line 5162 "VideoMetadata.c"
+#line 5152 "VideoMetadata.c"
}
guint64 avi_chunk_section_size_remaining (AVIChunk* self) {
guint64 result = 0ULL;
- guint64 _tmp0_ = 0ULL;
- guint64 _tmp1_ = 0ULL;
- guint64 _tmp2_ = 0ULL;
- guint64 _tmp3_ = 0ULL;
+ guint64 _tmp0_;
+ guint64 _tmp1_;
+ guint64 _tmp2_;
+ guint64 _tmp3_;
#line 637 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
g_return_val_if_fail (IS_AVI_CHUNK (self), 0ULL);
#line 638 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
@@ -5185,17 +5175,17 @@ guint64 avi_chunk_section_size_remaining (AVIChunk* self) {
result = _tmp2_ - _tmp3_;
#line 639 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
return result;
-#line 5188 "VideoMetadata.c"
+#line 5178 "VideoMetadata.c"
}
gchar* avi_chunk_section_to_string (AVIChunk* self, GError** error) {
gchar* result = NULL;
GString* sb = NULL;
- GString* _tmp0_ = NULL;
- GString* _tmp11_ = NULL;
- const gchar* _tmp12_ = NULL;
- gchar* _tmp13_ = NULL;
+ GString* _tmp0_;
+ GString* _tmp11_;
+ const gchar* _tmp12_;
+ gchar* _tmp13_;
GError * _inner_error_ = NULL;
#line 643 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
g_return_val_if_fail (IS_AVI_CHUNK (self), NULL);
@@ -5205,14 +5195,14 @@ gchar* avi_chunk_section_to_string (AVIChunk* self, GError** error) {
sb = _tmp0_;
#line 645 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
while (TRUE) {
-#line 5208 "VideoMetadata.c"
- guint64 _tmp1_ = 0ULL;
- guint64 _tmp2_ = 0ULL;
+#line 5198 "VideoMetadata.c"
+ guint64 _tmp1_;
+ guint64 _tmp2_;
guchar _tmp3_ = '\0';
- guchar _tmp4_ = '\0';
- GString* _tmp5_ = NULL;
- GString* _tmp6_ = NULL;
- gssize _tmp7_ = 0L;
+ guchar _tmp4_;
+ GString* _tmp5_;
+ GString* _tmp6_;
+ gssize _tmp7_;
#line 645 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
_tmp1_ = self->priv->section_offset;
#line 645 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
@@ -5221,7 +5211,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 5224 "VideoMetadata.c"
+#line 5214 "VideoMetadata.c"
}
#line 646 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
_tmp4_ = avi_chunk_read_byte (self, &_inner_error_);
@@ -5235,7 +5225,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 5238 "VideoMetadata.c"
+#line 5228 "VideoMetadata.c"
}
#line 646 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
_tmp5_ = sb;
@@ -5247,10 +5237,10 @@ 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 5250 "VideoMetadata.c"
- GString* _tmp8_ = NULL;
- const gchar* _tmp9_ = NULL;
- gchar* _tmp10_ = NULL;
+#line 5240 "VideoMetadata.c"
+ GString* _tmp8_;
+ const gchar* _tmp9_;
+ gchar* _tmp10_;
#line 648 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
_tmp8_ = sb;
#line 648 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
@@ -5263,7 +5253,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 5266 "VideoMetadata.c"
+#line 5256 "VideoMetadata.c"
}
}
#line 651 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
@@ -5278,14 +5268,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 5281 "VideoMetadata.c"
+#line 5271 "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 5288 "VideoMetadata.c"
+#line 5278 "VideoMetadata.c"
}
@@ -5294,7 +5284,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 5297 "VideoMetadata.c"
+#line 5287 "VideoMetadata.c"
}
}
@@ -5304,11 +5294,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 5307 "VideoMetadata.c"
+#line 5297 "VideoMetadata.c"
} else {
#line 534 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
dest_value->data[0].v_pointer = NULL;
-#line 5311 "VideoMetadata.c"
+#line 5301 "VideoMetadata.c"
}
}
@@ -5316,66 +5306,66 @@ 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 5319 "VideoMetadata.c"
+#line 5309 "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 5326 "VideoMetadata.c"
- AVIChunk* object;
+#line 5316 "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 5333 "VideoMetadata.c"
+#line 5323 "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 5337 "VideoMetadata.c"
+#line 5327 "VideoMetadata.c"
}
#line 534 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
value->data[0].v_pointer = avi_chunk_ref (object);
-#line 5341 "VideoMetadata.c"
+#line 5331 "VideoMetadata.c"
} else {
#line 534 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
value->data[0].v_pointer = NULL;
-#line 5345 "VideoMetadata.c"
+#line 5335 "VideoMetadata.c"
}
#line 534 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
return NULL;
-#line 5349 "VideoMetadata.c"
+#line 5339 "VideoMetadata.c"
}
static gchar* value_avi_chunk_lcopy_value (const GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) {
- AVIChunk** object_p;
+ AVIChunk ** object_p;
object_p = collect_values[0].v_pointer;
#line 534 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
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 5360 "VideoMetadata.c"
+#line 5350 "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 5366 "VideoMetadata.c"
+#line 5356 "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 5370 "VideoMetadata.c"
+#line 5360 "VideoMetadata.c"
} else {
#line 534 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
*object_p = avi_chunk_ref (value->data[0].v_pointer);
-#line 5374 "VideoMetadata.c"
+#line 5364 "VideoMetadata.c"
}
#line 534 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
return NULL;
-#line 5378 "VideoMetadata.c"
+#line 5368 "VideoMetadata.c"
}
@@ -5389,7 +5379,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 5392 "VideoMetadata.c"
+#line 5382 "VideoMetadata.c"
}
@@ -5398,12 +5388,12 @@ 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 5401 "VideoMetadata.c"
+#line 5391 "VideoMetadata.c"
}
void value_set_avi_chunk (GValue* value, gpointer v_object) {
- AVIChunk* old;
+ AVIChunk * old;
#line 534 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, TYPE_AVI_CHUNK));
#line 534 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
@@ -5418,23 +5408,23 @@ 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 5421 "VideoMetadata.c"
+#line 5411 "VideoMetadata.c"
} else {
#line 534 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
value->data[0].v_pointer = NULL;
-#line 5425 "VideoMetadata.c"
+#line 5415 "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 5431 "VideoMetadata.c"
+#line 5421 "VideoMetadata.c"
}
}
void value_take_avi_chunk (GValue* value, gpointer v_object) {
- AVIChunk* old;
+ AVIChunk * old;
#line 534 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, TYPE_AVI_CHUNK));
#line 534 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
@@ -5447,17 +5437,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 5450 "VideoMetadata.c"
+#line 5440 "VideoMetadata.c"
} else {
#line 534 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
value->data[0].v_pointer = NULL;
-#line 5454 "VideoMetadata.c"
+#line 5444 "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 5460 "VideoMetadata.c"
+#line 5450 "VideoMetadata.c"
}
}
@@ -5469,12 +5459,12 @@ 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 5472 "VideoMetadata.c"
+#line 5462 "VideoMetadata.c"
}
static void avi_chunk_instance_init (AVIChunk * self) {
- gchar* _tmp0_ = NULL;
+ gchar* _tmp0_;
#line 534 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
self->priv = AVI_CHUNK_GET_PRIVATE (self);
#line 535 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
@@ -5493,11 +5483,11 @@ 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 5496 "VideoMetadata.c"
+#line 5486 "VideoMetadata.c"
}
-static void avi_chunk_finalize (AVIChunk* obj) {
+static void avi_chunk_finalize (AVIChunk * obj) {
AVIChunk * self;
#line 534 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_AVI_CHUNK, AVIChunk);
@@ -5511,7 +5501,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 5514 "VideoMetadata.c"
+#line 5504 "VideoMetadata.c"
}
@@ -5530,18 +5520,18 @@ GType avi_chunk_get_type (void) {
gpointer avi_chunk_ref (gpointer instance) {
- AVIChunk* self;
+ AVIChunk * self;
self = instance;
#line 534 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
g_atomic_int_inc (&self->ref_count);
#line 534 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
return instance;
-#line 5539 "VideoMetadata.c"
+#line 5529 "VideoMetadata.c"
}
void avi_chunk_unref (gpointer instance) {
- AVIChunk* self;
+ AVIChunk * self;
self = instance;
#line 534 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
if (g_atomic_int_dec_and_test (&self->ref_count)) {
@@ -5549,7 +5539,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 5552 "VideoMetadata.c"
+#line 5542 "VideoMetadata.c"
}
}