[rygel] media-export: Style fixes
- From: Jens Georg <jensgeorg src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [rygel] media-export: Style fixes
- Date: Sun, 7 Jun 2015 09:10:48 +0000 (UTC)
commit 2cba2c65de2e71226ef93de78782c15c680f2f49
Author: Jens Georg <mail jensge org>
Date: Mon Jun 1 20:49:44 2015 +0200
media-export: Style fixes
Signed-off-by: Jens Georg <mail jensge org>
.../rygel-media-export-item-factory.vala | 18 +++++++++---------
.../rygel-media-export-metadata-extractor.vala | 3 ++-
2 files changed, 11 insertions(+), 10 deletions(-)
---
diff --git a/src/plugins/media-export/rygel-media-export-item-factory.vala
b/src/plugins/media-export/rygel-media-export-item-factory.vala
index 8e2322a..a0866b2 100644
--- a/src/plugins/media-export/rygel-media-export-item-factory.vala
+++ b/src/plugins/media-export/rygel-media-export-item-factory.vala
@@ -57,8 +57,7 @@ namespace Rygel.MediaExport.ItemFactory {
item.mime_type = mime;
item.size = (int64) info.get_size ();
- item.modified = info.get_attribute_uint64
- (FileAttribute.TIME_MODIFIED);
+ item.modified = info.get_attribute_uint64 (FileAttribute.TIME_MODIFIED);
item.add_uri (file.get_uri ());
return item;
@@ -137,7 +136,7 @@ namespace Rygel.MediaExport.ItemFactory {
return null;
}
- if (audio_streams == null && video_streams.data.is_image()) {
+ if (audio_streams == null && video_streams.data.is_image ()) {
item = new PhotoItem (id, parent, "");
return fill_visual_item (item as PhotoItem,
file,
@@ -182,14 +181,15 @@ namespace Rygel.MediaExport.ItemFactory {
item.duration = -1;
}
- if (audio_info == null)
+ if (audio_info == null) {
return;
+ }
var tags = audio_info.get_tags ();
if (tags != null) {
- uint tmp;
- tags.get_uint (Tags.BITRATE, out tmp);
- item.bitrate = (int) tmp / 8;
+ uint tmp;
+ tags.get_uint (Tags.BITRATE, out tmp);
+ item.bitrate = (int) tmp / 8;
}
item.channels = (int) audio_info.get_channels ();
@@ -244,12 +244,12 @@ namespace Rygel.MediaExport.ItemFactory {
if (audio_info == null) {
return item;
}
-
+
var tags = audio_info.get_tags ();
if (tags == null) {
return item;
}
-
+
string artist;
tags.get_string (Tags.ARTIST, out artist);
item.artist = artist;
diff --git a/src/plugins/media-export/rygel-media-export-metadata-extractor.vala
b/src/plugins/media-export/rygel-media-export-metadata-extractor.vala
index cd9e2ad..280ba38 100644
--- a/src/plugins/media-export/rygel-media-export-metadata-extractor.vala
+++ b/src/plugins/media-export/rygel-media-export-metadata-extractor.vala
@@ -81,7 +81,7 @@ public class Rygel.MediaExport.MetadataExtractor: GLib.Object {
return;
}
this.file_hash.set (uri, file);
- this.discoverer.discovered.connect (on_done);
+ this.discoverer.discovered.connect (this.on_done);
this.discoverer.start ();
this.discoverer.discover_uri_async (uri);
this.guesser = new GUPnPDLNA.ProfileGuesser (true, true);
@@ -150,6 +150,7 @@ public class Rygel.MediaExport.MetadataExtractor: GLib.Object {
// signal error to parent
this.error (file, error);
+
return;
}
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]