1 files changed, 59 insertions, 3 deletions

diff --git a/src/libaudtag/audtag.c b/src/libaudtag/audtag.c
index 2e0d6b0..0ef0f3e 100644
--- a/src/libaudtag/audtag.c
+++ b/src/libaudtag/audtag.c
@@ -17,6 +17,9 @@
  * the use of this software.
  */
 
+#include <stdlib.h>
+#include <string.h>
+
 #include <glib.h>
 
 #include <libaudcore/tuple.h>
@@ -38,8 +41,11 @@ EXPORT bool_t tag_tuple_read (Tuple * tuple, VFSFile * handle)
 {
     tag_module_t * module = find_tag_module (handle, TAG_TYPE_NONE);
 
-    if (module == NULL)
+    if (! module || ! module->read_tag)
+    {
+        TAGDBG ("read_tag() not supported for %s\n", vfs_get_filename (handle));
         return FALSE;
+    }
 
     return module->read_tag (tuple, handle);
 }
@@ -48,8 +54,11 @@ EXPORT bool_t tag_image_read (VFSFile * handle, void * * data, int64_t * size)
 {
     tag_module_t * module = find_tag_module (handle, TAG_TYPE_NONE);
 
-    if (module == NULL || module->read_image == NULL)
+    if (! module || ! module->read_image)
+    {
+        TAGDBG ("read_image() not supported for %s\n", vfs_get_filename (handle));
         return FALSE;
+    }
 
     return module->read_image (handle, data, size);
 }
@@ -58,12 +67,59 @@ EXPORT bool_t tag_tuple_write (const Tuple * tuple, VFSFile * handle, int new_ty
 {
     tag_module_t * module = find_tag_module (handle, new_type);
 
-    if (module == NULL)
+    if (! module || ! module->write_tag)
+    {
+        TAGDBG ("write_tag() not supported for %s\n", vfs_get_filename (handle));
         return FALSE;
+    }
 
     return module->write_tag (tuple, handle);
 }
 
+EXPORT bool_t tag_update_stream_metadata (Tuple * tuple, VFSFile * handle)
+{
+    bool_t updated = FALSE;
+    char * old, * new;
+    int value;
+
+    old = tuple_get_str (tuple, FIELD_TITLE);
+    new = vfs_get_metadata (handle, "track-name");
+
+    if (new && (! old || strcmp (old, new)))
+    {
+        tuple_set_str (tuple, FIELD_TITLE, new);
+        updated = TRUE;
+    }
+
+    str_unref (old);
+    str_unref (new);
+
+    old = tuple_get_str (tuple, FIELD_ARTIST);
+    new = vfs_get_metadata (handle, "stream-name");
+
+    if (new && (! old || strcmp (old, new)))
+    {
+        tuple_set_str (tuple, FIELD_ARTIST, new);
+        updated = TRUE;
+    }
+
+    str_unref (old);
+    str_unref (new);
+
+    new = vfs_get_metadata (handle, "content-bitrate");
+    value = new ? atoi (new) / 1000 : 0;
+
+    if (value && value != tuple_get_int (tuple, FIELD_BITRATE))
+    {
+        tuple_set_int (tuple, FIELD_BITRATE, value);
+        updated = TRUE;
+    }
+
+    str_unref (new);
+
+    return updated;
+}
+
 /* deprecated */
 EXPORT bool_t tag_tuple_write_to_file (Tuple * tuple, VFSFile * handle)
 {