diff src/wma/wma.c @ 1430:bf7d4c236d9f

Start using tuple_new_from_filename.
author Tony Vroon <chainsaw@gentoo.org>
date Fri, 10 Aug 2007 13:49:59 +0100
parents a25c2cfcce83
children dc3e28d3b92a
line wrap: on
line diff
--- a/src/wma/wma.c	Fri Aug 10 13:16:57 2007 +0100
+++ b/src/wma/wma.c	Fri Aug 10 13:49:59 2007 +0100
@@ -245,22 +245,12 @@
 
 static Tuple *wma_get_song_tuple(gchar * filename)
 {
-    Tuple *ti = tuple_new();
+    Tuple *ti = tuple_new_from_filename(filename);
     AVFormatContext *in = NULL;
-    gchar *scratch;
 
     if (av_open_input_file(&in, str_twenty_to_space(filename), NULL, 0, NULL) < 0)
 	return NULL;
 
-    scratch = g_path_get_basename(filename);
-    tuple_associate_string(ti, "file-name", scratch);
-    g_free(scratch);
-
-    scratch = g_path_get_dirname(filename);
-    tuple_associate_string(ti, "file-path", scratch);
-    g_free(scratch);
-
-    tuple_associate_string(ti, "file-ext", extname(filename));
     tuple_associate_string(ti, "codec", "Windows Media Audio (WMA)");
     tuple_associate_string(ti, "quality", "lossy");
 
@@ -285,7 +275,7 @@
 
     av_close_input_file(in);
 
-    return tuple;
+    return ti;
 }
 
 static gchar *get_song_title(AVFormatContext *in, gchar * filename)