command.c: simplify handle_connect()

[paraslash.git] / ogg_afh.c

diff --git a/ogg_afh.c b/ogg_afh.c
index 3445970bd867acfbcd7ad52a1df1a58edd9bf691..14163fe61ae643f673113c6ca435d003315d9110 100644 (file)
--- a/ogg_afh.c
+++ b/ogg_afh.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004-2006 Andre Noll <maan@systemlinux.org>
+ * Copyright (C) 2004-2007 Andre Noll <maan@systemlinux.org>
  *
  *     This program is free software; you can redistribute it and/or modify
  *     it under the terms of the GNU General Public License as published by
@@ -15,15 +15,16 @@
  *     along with this program; if not, write to the Free Software
  *     Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111, USA.
  */
-/** \file ogg.c para_server's ogg vorbis audio format handler */
+/** \file ogg_afh.c para_server's ogg vorbis audio format handler */
 
+#include <inttypes.h>
 #include <ogg/ogg.h>
 #include <vorbis/codec.h>
 #include <vorbis/vorbisfile.h>
 
 #include "server.cmdline.h"
 #include "server.h"
-#include "afs.h"
+#include "vss.h"
 #include "afh.h"
 #include "error.h"
 #include "string.h"
@@ -37,7 +38,7 @@ static FILE *infile;
 static int header_len, oggbuf_len, vi_channels;
 static char *header, *oggbuf;
 static ssize_t *chunk_table, max_chunk_len;
-struct audio_format_handler *af;
+static struct audio_format_handler *af;
 static long vi_sampling_rate, vi_bitrate, vi_bitrate_nominal,
        num_chunks;
 
@@ -129,7 +130,7 @@ static void tunetable(void)
                        continue;
                }
                if (j < 0)
-                       tv_scale(i + 2, &af->chunk_tv, &af->eof_tv);
+                       tv_scale(i, &af->chunk_tv, &af->eof_tv);
                for (j = lp; j < i; j++)
                        chunk_table[j] = chunk_table[i];
                lp = i;
@@ -207,14 +208,14 @@ static void ogg_close_audio_file(void)
        oggbuf_len = 0;
 }
 
-static int ogg_save_header(FILE *file, int header_len)
+static int ogg_save_header(FILE *file, int len)
 {
        int ret;
 
-       header = para_malloc(header_len);
+       header = para_malloc(len);
        rewind(file);
-       ret = read(fileno(file), header, header_len);
-       if (ret != header_len)
+       ret = read(fileno(file), header, len);
+       if (ret != len)
                return -E_OGG_READ;
        return 1;
 }