changeset 3171:93d2cda7e072 trunk

Automated merge with ssh://hg.atheme.org//hg/audacious
author William Pitcock <nenolod@atheme-project.org>
date Thu, 26 Jul 2007 14:25:23 -0500
parents 603577228518 (current diff) b1964057a1a0 (diff)
children 959fba26290d
files src/audacious/input.c
diffstat 3 files changed, 19 insertions(+), 8 deletions(-) [+]
line wrap: on
line diff
--- a/src/audacious/input.c	Thu Jul 26 14:22:26 2007 -0500
+++ b/src/audacious/input.c	Thu Jul 26 14:25:23 2007 -0500
@@ -380,6 +380,8 @@
                 continue;
             if (ip->is_our_file != NULL)
                 ret = ip->is_our_file(filename_proxy);
+            else
+                ret = 0;
             if (ret > 0)
             {
                 g_free(filename_proxy);
--- a/src/audacious/ui_main.c	Thu Jul 26 14:22:26 2007 -0500
+++ b/src/audacious/ui_main.c	Thu Jul 26 14:25:23 2007 -0500
@@ -2228,6 +2228,8 @@
 {
     GList *list, *node;
     gchar *filename;
+	
+	/*
     gchar *path;
     ConfigDb *db;
 
@@ -2241,20 +2243,21 @@
     }
     else
         bmp_cfg_db_close(db);
-
-    if (!(list = input_scan_dir(path))) {
+	*/
+
+    if (!(list = input_scan_dir(CDDA_DUMMY_PATH))) {
         run_no_audiocd_dialog();
         return;
     }
 
     for (node = list; node; node = g_list_next(node)) {
-        filename = g_build_filename(path, node->data, NULL);
+        filename = g_build_filename(CDDA_DUMMY_PATH, node->data, NULL);
         playlist_add(playlist_get_active(), filename);
         g_free(filename);
         g_free(node->data);
     }
 
-    g_free(path);
+    /*g_free(path);*/
     g_list_free(list);
 
 }
@@ -2264,15 +2267,19 @@
 {
     GList *list, *node;
     gchar *filename;
+	/*
     gchar *path;
     ConfigDb *db;
+	*/
     Playlist *playlist = playlist_get_active();
 
+	/*
     db = bmp_cfg_db_open();
     bmp_cfg_db_get_string(db, "CDDA", "directory", &path);
     bmp_cfg_db_close(db);
-
-    if (!(list = input_scan_dir(path))) {
+	*/
+
+    if (!(list = input_scan_dir(CDDA_DUMMY_PATH))) {
         run_no_audiocd_dialog();
         return;
     }
@@ -2280,13 +2287,13 @@
     playlist_clear(playlist);
 
     for (node = list; node; node = g_list_next(node)) {
-        filename = g_build_filename(path, node->data, NULL);
+        filename = g_build_filename(CDDA_DUMMY_PATH, node->data, NULL);
         playlist_add(playlist, filename);
         g_free(filename);
         g_free(node->data);
     }
 
-    g_free(path);
+    /*g_free(path);*/
     g_list_free(list);
 
     playlist_set_position(playlist, 0);
--- a/src/audacious/ui_main.h	Thu Jul 26 14:22:26 2007 -0500
+++ b/src/audacious/ui_main.h	Thu Jul 26 14:25:23 2007 -0500
@@ -43,6 +43,8 @@
 
 #define MAINWIN_DEFAULT_FONT     "Sans Bold 9"
 
+#define CDDA_DUMMY_PATH          "cdda://default"
+
 
 typedef enum {
     TIMER_ELAPSED,