Freeamp's "Search for Music" + CDRoms

[CJ Kucera]

Hello again.

I thought it would be nice to have the CDRom be one of the default
items to search under in FreeAmp's "Search for Music" screen, as
I typically keep my mp3s on CD, not my hard drive.  As such, I
cobbled together a quick little patch to do that.  It'll search
to see if /cdrom exists (for Debian distros), and if that path
isn't found, it'll default to /mnt/cdrom.  Not elegant, I know,
but it should get the job done.

Patch is attached, thanks again!
-CJ

-- 
WOW: Nyctitropic         |  "Let us rain some DOOM upon the filthy heads
apocalyptech.com/wow     |             of our DOOMED enemies!"
[EMAIL PROTECTED]     |                    - Zim

diff -r -u freeamp-2.1.1/ui/musicbrowser/unix/src/introwizard.cpp 
freeamp-2.1.1-patched/ui/musicbrowser/unix/src/introwizard.cpp
--- freeamp-2.1.1/ui/musicbrowser/unix/src/introwizard.cpp      Tue Aug 14 15:33:53 
2001
+++ freeamp-2.1.1-patched/ui/musicbrowser/unix/src/introwizard.cpp      Tue May 14 
+10:07:29 2002
@@ -165,6 +165,18 @@
     p->UpdateEntry();
 }
 
+static void search_select_cdrom(GtkWidget *widget, IntroWizardUI *p)
+{
+    struct stat statbuf;
+    /* This is hardly the most efficient way to find out where the CDRom is */
+    if (!stat("/cdrom", &statbuf))
+       p->SetSearchPath("/cdrom");
+    else
+       p->SetSearchPath("/mnt/cdrom");
+    p->custom = false;
+    p->UpdateEntry();
+}
+
 static void search_select_share(GtkWidget *widget, IntroWizardUI *p)
 {
     p->SetSearchPath("/usr/share");
@@ -670,6 +682,12 @@
    menuitem = gtk_menu_item_new_with_label("My Home Directory");
    gtk_signal_connect(GTK_OBJECT(menuitem), "activate",
                       GTK_SIGNAL_FUNC(search_select_home), this);
+   gtk_widget_show(menuitem);
+   gtk_menu_append(GTK_MENU(menu), menuitem);
+
+   menuitem = gtk_menu_item_new_with_label("CD-Rom");
+   gtk_signal_connect(GTK_OBJECT(menuitem), "activate",
+                      GTK_SIGNAL_FUNC(search_select_cdrom), this);
    gtk_widget_show(menuitem);
    gtk_menu_append(GTK_MENU(menu), menuitem);
 
diff -r -u freeamp-2.1.1/ui/musicbrowser/unix/src/musicsearch.cpp 
freeamp-2.1.1-patched/ui/musicbrowser/unix/src/musicsearch.cpp
--- freeamp-2.1.1/ui/musicbrowser/unix/src/musicsearch.cpp      Wed Feb  7 11:13:42 
2001
+++ freeamp-2.1.1-patched/ui/musicbrowser/unix/src/musicsearch.cpp      Tue May 14 
+10:07:29 2002
@@ -91,6 +91,18 @@
     p->UpdateEntry();
 }
 
+static void search_select_cdrom(GtkWidget *widget, musicsearchUI *p)
+{
+    struct stat statbuf;
+    /* This is hardly the most efficient way to find out where the CDRom is */
+    if (!stat("/cdrom", &statbuf))
+       p->SetSearchPath("/cdrom");
+    else
+       p->SetSearchPath("/mnt/cdrom");
+    p->custom = false;
+    p->UpdateEntry();
+}
+
 static void search_select_share(GtkWidget *widget, musicsearchUI *p)
 {
     p->SetSearchPath("/usr/share");
@@ -217,6 +229,12 @@
    menuitem = gtk_menu_item_new_with_label("My Home Directory");
    gtk_signal_connect(GTK_OBJECT(menuitem), "activate",
                       GTK_SIGNAL_FUNC(search_select_home), this);
+   gtk_widget_show(menuitem);
+   gtk_menu_append(GTK_MENU(menu), menuitem);
+
+   menuitem = gtk_menu_item_new_with_label("CD-Rom");
+   gtk_signal_connect(GTK_OBJECT(menuitem), "activate",
+                      GTK_SIGNAL_FUNC(search_select_cdrom), this);
    gtk_widget_show(menuitem);
    gtk_menu_append(GTK_MENU(menu), menuitem);