changeset 558:3fb3657d2e14 trunk

[svn] - Update mpg123 configure options - Update NEWS.

--- a/NEWS	Wed Feb 01 13:36:46 2006 -0800
+++ b/NEWS	Wed Feb 01 13:57:44 2006 -0800
@@ -1,13 +1,14 @@
-Audacious 0.2 (2006-01-??)
+Audacious 0.2 (2006-02-01)
 
 Enhancements
 * Many UI changes
 * Removed X11 dependency (only GTK is required now -- please port me to 
   your favourite operating system)
-* Updated console music input plugin to Game_Music_Emu.
+* Updated console music input plugin to Game_Music_Emu 0.3.
 * Added timidity input plugin.
-
-(many more, document before release)
+* Added ALSA midi support
+* Added musepack support
+* Cleaned up many plugins
 
 Bugfixes
 * A lot

--- a/Plugins/Input/mpg123/configure.c	Wed Feb 01 13:36:46 2006 -0800
+++ b/Plugins/Input/mpg123/configure.c	Wed Feb 01 13:57:44 2006 -0800
@@ -22,8 +22,7 @@
     *decode_ch_mono;
 static GtkWidget *decode_freq_frame, *decode_freq_vbox, *decode_freq_1to1,
     *decode_freq_1to2, *decode_freq_1to4;
-static GtkWidget *option_frame, *option_vbox, *detect_by_content,
-    *detect_by_extension, *detect_by_both;
+static GtkWidget *option_frame, *option_vbox;
 
 static GtkObject *streaming_size_adj, *streaming_pre_adj;
 static GtkWidget *streaming_proxy_use, *streaming_proxy_host_entry;
@@ -68,14 +67,7 @@
     if (GTK_TOGGLE_BUTTON(decode_freq_1to4)->active)
         mpg123_cfg.downsample = 2;
 
-    if (GTK_TOGGLE_BUTTON(detect_by_content)->active)
-        mpg123_cfg.detect_by = DETECT_CONTENT;
-    else if (GTK_TOGGLE_BUTTON(detect_by_extension)->active)
-        mpg123_cfg.detect_by = DETECT_EXTENSION;
-    else if (GTK_TOGGLE_BUTTON(detect_by_both)->active)
-        mpg123_cfg.detect_by = DETECT_BOTH;
-    else
-        mpg123_cfg.detect_by = DETECT_EXTENSION;
+    mpg123_cfg.detect_by = DETECT_CONTENT;
 
     mpg123_cfg.http_buffer_size =
         (gint) GTK_ADJUSTMENT(streaming_size_adj)->value;
@@ -414,48 +406,6 @@
     gtk_box_pack_start(GTK_BOX(decode_freq_vbox), decode_freq_1to4, FALSE,
                        FALSE, 0);
 
-    option_frame = gtk_frame_new(_("Options"));
-    gtk_box_pack_start(GTK_BOX(decode_vbox), option_frame, FALSE, FALSE, 0);
-
-    option_vbox = gtk_vbox_new(FALSE, 5);
-    gtk_container_set_border_width(GTK_CONTAINER(option_vbox), 5);
-    gtk_container_add(GTK_CONTAINER(option_frame), option_vbox);
-
-    detect_by_content = gtk_radio_button_new_with_label(NULL, _("Content"));
-
-    detect_by_extension =
-        gtk_radio_button_new_with_label(gtk_radio_button_group
-                                        (GTK_RADIO_BUTTON
-                                         (detect_by_content)),
-                                        _("Extension"));
-
-    detect_by_both =
-        gtk_radio_button_new_with_label(gtk_radio_button_group
-                                        (GTK_RADIO_BUTTON
-                                         (detect_by_content)),
-                                        _("Extension and content"));
-
-    switch (mpg123_cfg.detect_by) {
-    case DETECT_CONTENT:
-        gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(detect_by_content),
-                                     TRUE);
-        break;
-    case DETECT_BOTH:
-        gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(detect_by_both), TRUE);
-        break;
-    case DETECT_EXTENSION:
-    default:
-        gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON
-                                     (detect_by_extension), TRUE);
-        break;
-    }
-
-    gtk_box_pack_start(GTK_BOX(option_vbox), detect_by_content, FALSE,
-                       FALSE, 0);
-    gtk_box_pack_start(GTK_BOX(option_vbox), detect_by_extension, FALSE,
-                       FALSE, 0);
-    gtk_box_pack_start(GTK_BOX(option_vbox), detect_by_both, FALSE, FALSE, 0);
-
     gtk_notebook_append_page(GTK_NOTEBOOK(notebook), decode_vbox,
                              gtk_label_new(_("Decoder")));
 

--- a/Plugins/Input/mpg123/mpg123.c	Wed Feb 01 13:36:46 2006 -0800
+++ b/Plugins/Input/mpg123/mpg123.c	Wed Feb 01 13:57:44 2006 -0800
@@ -466,44 +466,12 @@
     char *ext;
     guint16 wavid;
 
-    /* FIXME: wtf? */
-    /* We assume all http:// (except those ending in .ogg) are mpeg --
-     * why do we do that? */
     if (!strncasecmp(filename, "http://", 7)) { 
-#ifdef NOTYET
-        ext = strrchr(filename, '.');
-        if (ext) {
-            if (!strncasecmp(ext, ".ogg", 4))
-                return FALSE;
-            if (!strncasecmp(ext, ".rm", 3) ||
-                !strncasecmp(ext, ".ra", 3) ||
-                !strncasecmp(ext, ".rpm", 4) || 
-                !strncasecmp(ext, ".ram", 4))
-                return FALSE;
-        }
-        return TRUE;
-#else
 	return mpg123_detect_by_content_stream(filename);
-#endif
     }
-    if (mpg123_cfg.detect_by == DETECT_CONTENT)
+    else
         return (mpg123_detect_by_content(filename));
 
-    ext = strrchr(filename, '.');
-    if (ext) {
-        if (!strncasecmp(ext, ".mp2", 4) || !strncasecmp(ext, ".mp3", 4) || !strncasecmp((ext - 4), ".mp3.part", 9) ) {
-            return TRUE;
-        }
-        if (!strncasecmp(ext, ".wav", 4)) {
-            wavid = read_wav_id(filename);
-            if (wavid == 85 || wavid == 80) {   /* Microsoft says 80, files say 85... */
-                return TRUE;
-            }
-        }
-    }
-
-    if (mpg123_cfg.detect_by == DETECT_BOTH)
-        return (mpg123_detect_by_content(filename));
     return FALSE;
 }