[f-spot] Handle even file formats that don't support it using Taglib#.
- From: Ruben Vermeersch <rubenv src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [f-spot] Handle even file formats that don't support it using Taglib#.
- Date: Thu, 8 Jul 2010 16:53:23 +0000 (UTC)
commit 62ed0653420d38756bd01d4cba0fd61cf63b77c0
Author: Ruben Vermeersch <ruben savanne be>
Date: Fri Jul 2 23:05:00 2010 +0200
Handle even file formats that don't support it using Taglib#.
Sidecars for any format!
lib/TagLib/TagLib | 2 +-
lib/TagLib/sources.mk | 1 +
src/Imaging/ImageFile.cs | 14 ++++----------
3 files changed, 6 insertions(+), 11 deletions(-)
---
diff --git a/lib/TagLib/TagLib b/lib/TagLib/TagLib
index 600a7b2..e154d3a 160000
--- a/lib/TagLib/TagLib
+++ b/lib/TagLib/TagLib
@@ -1 +1 @@
-Subproject commit 600a7b29dbccbc8d75aa0ddb4a20b1fc816ef285
+Subproject commit e154d3af8a44e7ce64a6d1920dfc1dc50c3b6770
diff --git a/lib/TagLib/sources.mk b/lib/TagLib/sources.mk
index 87f2050..1459e1e 100644
--- a/lib/TagLib/sources.mk
+++ b/lib/TagLib/sources.mk
@@ -54,6 +54,7 @@ SOURCES = \
TagLib/src/TagLib/Image/ImageBlockFile.cs \
TagLib/src/TagLib/Image/ImageTag.cs \
TagLib/src/TagLib/Image/ImageOrientation.cs \
+ TagLib/src/TagLib/Image/NoMetadata/File.cs \
TagLib/src/TagLib/Jpeg/Codec.cs \
TagLib/src/TagLib/Jpeg/File.cs \
TagLib/src/TagLib/Jpeg/JpegCommentTag.cs \
diff --git a/src/Imaging/ImageFile.cs b/src/Imaging/ImageFile.cs
index fbecf60..d8793ed 100644
--- a/src/Imaging/ImageFile.cs
+++ b/src/Imaging/ImageFile.cs
@@ -30,10 +30,10 @@ namespace FSpot.Imaging {
static ImageFile ()
{
name_table = new Hashtable ();
- name_table [".svg"] = typeof (NoMetadataFile);
- name_table [".gif"] = typeof (NoMetadataFile);
- name_table [".bmp"] = typeof (NoMetadataFile);
- name_table [".pcx"] = typeof (NoMetadataFile);
+ name_table [".svg"] = typeof (TagLibFile);
+ name_table [".gif"] = typeof (TagLibFile);
+ name_table [".bmp"] = typeof (TagLibFile);
+ name_table [".pcx"] = typeof (TagLibFile);
name_table [".jpeg"] = typeof (TagLibFile);
name_table [".jpg"] = typeof (TagLibFile);
name_table [".png"] = typeof (TagLibFile);
@@ -251,12 +251,6 @@ namespace FSpot.Imaging {
}
}
- public class NoMetadataFile : BaseImageFile {
- public NoMetadataFile (SafeUri uri) : base (uri)
- {
- }
- }
-
public class TagLibFile : BaseImageFile {
private TagLib.Image.File metadata_file;
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]