changeset 2059:70b1f1fc4804

use aud_cfg in some places
author William Pitcock <nenolod@atheme.org>
date Sat, 13 Oct 2007 23:48:00 -0500
parents fffa7e3d39e0
children 0803fba87da8
files src/alsa/audio.c src/m3u/m3u.c src/pls/pls.c src/wavpack/libwavpack.cxx
diffstat 4 files changed, 6 insertions(+), 6 deletions(-) [+]
line wrap: on
line diff
--- a/src/alsa/audio.c	Sat Oct 13 23:44:59 2007 -0500
+++ b/src/alsa/audio.c	Sat Oct 13 23:48:00 2007 -0500
@@ -755,7 +755,7 @@
 	prebuffer = TRUE;
 	remove_prebuffer = FALSE;
 
-	thread_buffer_size = (guint64)cfg.output_buffer_size * inputf->bps / 1000;
+	thread_buffer_size = (guint64)aud_cfg->output_buffer_size * inputf->bps / 1000;
 	if (thread_buffer_size < hw_buffer_size)
 		thread_buffer_size = hw_buffer_size * 2;
 	if (thread_buffer_size < 8192)
--- a/src/m3u/m3u.c	Sat Oct 13 23:44:59 2007 -0500
+++ b/src/m3u/m3u.c	Sat Oct 13 23:48:00 2007 -0500
@@ -124,7 +124,7 @@
         }
 
         if (is_extm3u) {
-            if (cfg.use_pl_metadata && ext_info)
+            if (aud_cfg->use_pl_metadata && ext_info)
                 parse_extm3u_info(ext_info, &ext_title, &ext_len);
             g_free(ext_info);
             ext_info = NULL;
@@ -162,7 +162,7 @@
     g_free(fn);
     g_return_if_fail(file != NULL);
 
-    if (cfg.use_pl_metadata)
+    if (aud_cfg->use_pl_metadata)
         aud_vfs_fprintf(file, "#EXTM3U\n");
 
     PLAYLIST_LOCK(playlist);
@@ -170,7 +170,7 @@
     for (node = playlist->entries; node; node = g_list_next(node)) {
         PlaylistEntry *entry = PLAYLIST_ENTRY(node->data);
 
-        if (entry->title && cfg.use_pl_metadata) {
+        if (entry->title && aud_cfg->use_pl_metadata) {
             gint seconds;
 
             if (entry->length > 0)
--- a/src/pls/pls.c	Sat Oct 13 23:44:59 2007 -0500
+++ b/src/pls/pls.c	Sat Oct 13 23:48:00 2007 -0500
@@ -72,7 +72,7 @@
             else
                 uri = line;
 
-            if (cfg.use_pl_metadata)
+            if (aud_cfg->use_pl_metadata)
             {
                 g_snprintf(title_key, sizeof(title_key), "Title%d", i);
 
--- a/src/wavpack/libwavpack.cxx	Sat Oct 13 23:44:59 2007 -0500
+++ b/src/wavpack/libwavpack.cxx	Sat Oct 13 23:48:00 2007 -0500
@@ -426,7 +426,7 @@
 
     ti = aud_tuple_from_WavpackContext(fn, ctx);
 
-    displaytitle = aud_tuple_formatter_make_title_string(ti, cfg.gentitle_format);
+    displaytitle = aud_tuple_formatter_make_title_string(ti, aud_get_gentitle_format());
     if (!displaytitle || *displaytitle == '\0')
         displaytitle = g_strdup(fn);