# HG changeset patch # User William Pitcock # Date 1186744990 18000 # Node ID 40136e537bd9bc55ee058a5032c8b5137807ca9a # Parent de310b4826de90d66be16e2303eb3e7f8bd69250 wav: update to new tuple API. diff -r de310b4826de -r 40136e537bd9 src/wav/wav.c --- a/src/wav/wav.c Fri Aug 10 06:15:55 2007 -0500 +++ b/src/wav/wav.c Fri Aug 10 06:23:10 2007 -0500 @@ -29,7 +29,9 @@ #include #include -#include +#include +#include +#include #include "audacious/output.h" #include @@ -204,21 +206,33 @@ static gchar * get_title(const gchar * filename) { - TitleInput *input; + Tuple *tuple; gchar *title; + gchar *scratch; - input = bmp_title_input_new(); + tuple = tuple_new(); + + scratch = g_path_get_basename(filename); + tuple_associate_string(tuple, "file-name", scratch); + g_free(scratch); + + tuple_associate_string(tuple, "file-ext", get_extension(filename)); - input->file_name = g_path_get_basename(filename); - input->file_ext = get_extension(filename); - input->file_path = g_path_get_dirname(filename); + scratch = g_path_get_dirname(filename); + tuple_associate_string(tuple, "file-path", scratch); + g_free(scratch); + + tuple_associate_string(tuple, "codec", "RIFF/WAV Audio (ADPCM)"); + tuple_associate_string(tuple, "quality", "lossless"); - if (!(title = xmms_get_titlestring(xmms_get_gentitle_format(), input))) + title = tuple_formatter_process_string(tuple, cfg.gentitle_format); + if (*title == '\0') + { + g_free(title); title = g_strdup(input->file_name); + } - g_free(input->file_path); - g_free(input->file_name); - g_free(input); + mowgli_object_unref(tuple); return title; }