Rename struct audio format to audio_format_handler

[paraslash.git] / ogg.c

diff --git a/ogg.c b/ogg.c
index b38a8f4979a6dfccf4578f314b4914536546b05a..e5647b26eca11e8ce975d69034944174fb973164 100644 (file)
--- a/ogg.c
+++ b/ogg.c
@@ -36,7 +36,7 @@ static FILE *infile;
 static int header_len, oggbuf_len, vi_channels;
 static char *header, *oggbuf;
 static ssize_t *chunk_table, max_chunk_len;
 static int header_len, oggbuf_len, vi_channels;
 static char *header, *oggbuf;
 static ssize_t *chunk_table, max_chunk_len;

-struct audio_format *af;
+struct audio_format_handler *af;

 static long vi_sampling_rate, vi_bitrate, vi_bitrate_nominal,
        num_chunks;
 
 static long vi_sampling_rate, vi_bitrate, vi_bitrate_nominal,
        num_chunks;
 


@@ -170,8 +170,8 @@ static void ogg_compute_chunk_table(double time_total)
                        break;
                pos = ov_raw_tell(oggvorbis_file);
                diff = pos - old_pos;
                        break;
                pos = ov_raw_tell(oggvorbis_file);
                diff = pos - old_pos;

-               max_chunk_len = MAX(max_chunk_len, diff);
-               min = (i == 1)? diff : MIN(min, diff);
+               max_chunk_len = PARA_MAX(max_chunk_len, diff);
+               min = (i == 1)? diff : PARA_MIN(min, diff);

                chunk_table[i] = pos;
                if (i < 11 || !((i - 1) % 1000)|| i > num - 11)
                        PARA_DEBUG_LOG("chunk #%d: %g secs, pos: %zd, "
                chunk_table[i] = pos;
                if (i < 11 || !((i - 1) % 1000)|| i > num - 11)
                        PARA_DEBUG_LOG("chunk #%d: %g secs, pos: %zd, "