# HG changeset patch
# User nenolod
# Date 1138923885 28800
# Node ID 59602b2e2781bfa72eff75ad808cdcd117e91a0e
# Parent  80a301d11c77fafcaeab2b9ef30924cf2c348618
[svn] squelch warnings -- they're getting annoying seeing again and again

diff -r 80a301d11c77 -r 59602b2e2781 Plugins/Input/mpg123/configure.c
--- a/Plugins/Input/mpg123/configure.c	Thu Feb 02 15:42:11 2006 -0800
+++ b/Plugins/Input/mpg123/configure.c	Thu Feb 02 15:44:45 2006 -0800
@@ -22,7 +22,6 @@
     *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;
 
 static GtkObject *streaming_size_adj, *streaming_pre_adj;
 static GtkWidget *streaming_proxy_use, *streaming_proxy_host_entry;
diff -r 80a301d11c77 -r 59602b2e2781 Plugins/Input/mpg123/mpg123.c
--- a/Plugins/Input/mpg123/mpg123.c	Thu Feb 02 15:42:11 2006 -0800
+++ b/Plugins/Input/mpg123/mpg123.c	Thu Feb 02 15:44:45 2006 -0800
@@ -226,107 +226,12 @@
     g_strfreev(mpg123_id3_encoding_list);
 }
 
-/* needed for is_our_file() */
-static int
-read_n_bytes(VFSFile * file, guint8 * buf, int n)
-{
-
-    if (vfs_fread(buf, 1, n, file) != n) {
-        return FALSE;
-    }
-    return TRUE;
-}
-
 static guint32
 convert_to_header(guint8 * buf)
 {
-
     return (buf[0] << 24) + (buf[1] << 16) + (buf[2] << 8) + buf[3];
 }
 
-static guint32
-convert_to_long(guint8 * buf)
-{
-
-    return (buf[3] << 24) + (buf[2] << 16) + (buf[1] << 8) + buf[0];
-}
-
-static guint16
-read_wav_id(char *filename)
-{
-    VFSFile *file;
-    guint16 wavid;
-    guint8 buf[4];
-    guint32 head;
-    long seek;
-
-    if (!(file = vfs_fopen(filename, "rb"))) {  /* Could not open file */
-        return 0;
-    }
-    if (!(read_n_bytes(file, buf, 4))) {
-        vfs_fclose(file);
-        return 0;
-    }
-    head = convert_to_header(buf);
-    if (head == ('R' << 24) + ('I' << 16) + ('F' << 8) + 'F') { /* Found a riff -- maybe WAVE */
-        if (vfs_fseek(file, 4, SEEK_CUR) != 0) {    /* some error occured */
-            vfs_fclose(file);
-            return 0;
-        }
-        if (!(read_n_bytes(file, buf, 4))) {
-            vfs_fclose(file);
-            return 0;
-        }
-        head = convert_to_header(buf);
-        if (head == ('W' << 24) + ('A' << 16) + ('V' << 8) + 'E') { /* Found a WAVE */
-            seek = 0;
-            do {
-/* we'll be looking for the fmt-chunk which comes before the data-chunk */
-/* A chunk consists of an header identifier (4 bytes), the length of the chunk
-   (4 bytes), and the chunkdata itself, padded to be an even number of bytes.
-   We'll skip all chunks until we find the "data"-one which could contain
-   mpeg-data */
-                if (seek != 0) {
-                    if (vfs_fseek(file, seek, SEEK_CUR) != 0) { /* some error occured */
-                        vfs_fclose(file);
-                        return 0;
-                    }
-                }
-                if (!(read_n_bytes(file, buf, 4))) {
-                    vfs_fclose(file);
-                    return 0;
-                }
-                head = convert_to_header(buf);
-                if (!(read_n_bytes(file, buf, 4))) {
-                    vfs_fclose(file);
-                    return 0;
-                }
-                seek = convert_to_long(buf);
-                seek = seek + (seek % 2);   /* Has to be even (padding) */
-                if (seek >= 2
-                    && head == ('f' << 24) + ('m' << 16) + ('t' << 8) + ' ') {
-                    if (!(read_n_bytes(file, buf, 2))) {
-                        vfs_fclose(file);
-                        return 0;
-                    }
-                    wavid = buf[0] + 256 * buf[1];
-                    seek -= 2;
-                    /* we could go on looking for
-                       other things, but all we
-                       wanted was the wavid */
-                    vfs_fclose(file);
-                    return wavid;
-                }
-            }
-            while (head != ('d' << 24) + ('a' << 16) + ('t' << 8) + 'a');
-            /* it's RIFF WAVE */
-        }
-        /* it's RIFF */
-    }
-    /* it's not even RIFF */
-    vfs_fclose(file);
-    return 0;
-}
 
 #define DET_BUF_SIZE 1024
 
@@ -463,9 +368,6 @@
 static int
 is_our_file(char *filename)
 {
-    char *ext;
-    guint16 wavid;
-
     if (!strncasecmp(filename, "http://", 7)) { 
 	return mpg123_detect_by_content_stream(filename);
     }