[Mplayer-cvslog] CVS: main/libmpdemux stream.h,1.50,1.51

[Arpi of Ize]

Update of /cvsroot/mplayer/main/libmpdemux
In directory mail:/var/tmp.root/cvs-serv4554

Modified Files:
	stream.h 
Log Message:
some cosmetics - reordering declarations, 10l for cache2


Index: stream.h
===================================================================
RCS file: /cvsroot/mplayer/main/libmpdemux/stream.h,v
retrieving revision 1.50
retrieving revision 1.51
diff -u -r1.50 -r1.51
--- stream.h	15 Sep 2002 20:51:55 -0000	1.50
+++ stream.h	15 Sep 2002 22:38:01 -0000	1.51
@@ -2,11 +2,10 @@
 #define __STREAM_H
 
 #include "mp_msg.h"
+#include <string.h>
 #include <inttypes.h>
 #include <sys/types.h>
 
-#define STREAM_BUFFER_SIZE 2048
-
 #define STREAMTYPE_DUMMY -1    // for placeholders, when the actual reading is handled in the demuxer
 #define STREAMTYPE_FILE 0      // read from seekable file
 #define STREAMTYPE_VCD  1      // raw mode-2 CDROM reading, 2324 bytes/sector
@@ -18,6 +17,8 @@
 #define STREAMTYPE_DVDNAV 9    // we cannot safely "seek" in this...
 #define STREAMTYPE_CDDA 10     // raw audio CD reader
 
+#define STREAM_BUFFER_SIZE 2048
+
 #define VCD_SECTOR_SIZE 2352
 #define VCD_SECTOR_OFFS 24
 #define VCD_SECTOR_DATA 2324
@@ -47,17 +48,14 @@
 
 #ifdef USE_STREAM_CACHE
 int stream_enable_cache(stream_t *stream,int size,int min,int prefill);
+int cache_stream_fill_buffer(stream_t *s);
+int cache_stream_seek_long(stream_t *s,off_t pos);
 #else
-// no cache
+// no cache, define wrappers:
 #define cache_stream_fill_buffer(x) stream_fill_buffer(x)
 #define cache_stream_seek_long(x,y) stream_seek_long(x,y)
 #define stream_enable_cache(x,y,z,w) 1
 #endif
-
-int cache_stream_fill_buffer(stream_t *s);
-int cache_stream_seek_long(stream_t *s,off_t pos);
-
-#include <string.h>
 
 inline static int stream_read_char(stream_t *s){
   return (s->buf_pos<s->buf_len)?s->buffer[s->buf_pos++]: