[rygel] media-export: Fix coding style
- From: Zeeshan Ali Khattak <zeeshanak src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [rygel] media-export: Fix coding style
- Date: Fri, 7 Jan 2011 16:35:54 +0000 (UTC)
commit f86a22db2a2e2bd03af41104237446fa07ebc11d
Author: Jens Georg <mail jensge org>
Date: Wed Dec 29 21:30:10 2010 +0100
media-export: Fix coding style
.../rygel-media-export-metadata-extractor.vala | 24 ++++++++++---------
1 files changed, 13 insertions(+), 11 deletions(-)
---
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 17db2c6..92a3c1d 100644
--- a/src/plugins/media-export/rygel-media-export-metadata-extractor.vala
+++ b/src/plugins/media-export/rygel-media-export-metadata-extractor.vala
@@ -84,11 +84,21 @@ public class Rygel.MediaExport.MetadataExtractor: GLib.Object {
}
}
+ public void extract (File file) {
+ if (this.extract_metadata) {
+ string uri = file.get_uri ();
+ this.file_hash.set (uri, file);
+ this.discoverer.discover_uri (uri);
+ } else {
+ this.extract_basic_information (file);
+ }
+ }
+
private void on_done (GUPnP.DLNAInformation dlna,
- GLib.Error err) {
+ GLib.Error err) {
assert (this.file_hash.has_key (dlna.info.uri));
- File file = this.file_hash.get (dlna.info.uri);
+ var file = this.file_hash.get (dlna.info.uri);
this.file_hash.unset (dlna.info.uri);
@@ -99,6 +109,7 @@ public class Rygel.MediaExport.MetadataExtractor: GLib.Object {
dlna = null;
} else if ((dlna.info.result & Gst.DiscovererResult.ERROR) != 0) {
this.error (file, err);
+
return;
}
@@ -148,13 +159,4 @@ public class Rygel.MediaExport.MetadataExtractor: GLib.Object {
}
- public void extract (File file) {
- if (this.extract_metadata) {
- string uri = file.get_uri ();
- this.file_hash.set (uri, file);
- this.discoverer.discover_uri (uri);
- } else {
- this.extract_basic_information (file);
- }
- }
}
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]