Mercurial > mplayer.hg

comparison stream/stream.h @ 30649:77cc0ca2c757

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Declare stream_fill_buffer() and stream_seek_long() unconditionally. They are public functions that are unconditionally compiled, so they should not be declared conditionally.
author diego
date Sun, 21 Feb 2010 23:30:34 +0000
parents 27b133678bbd
children 73d7c7884b0c
comparison
equal deleted inserted replaced
30648:74d39bc2b2c4 30649:77cc0ca2c757
140 streaming_ctrl_t *streaming_ctrl; 140 streaming_ctrl_t *streaming_ctrl;
141 #endif 141 #endif
142 unsigned char buffer[STREAM_BUFFER_SIZE>VCD_SECTOR_SIZE?STREAM_BUFFER_SIZE:VCD_SECTOR_SIZE]; 142 unsigned char buffer[STREAM_BUFFER_SIZE>VCD_SECTOR_SIZE?STREAM_BUFFER_SIZE:VCD_SECTOR_SIZE];
143 } stream_t; 143 } stream_t;
144 144
145 int stream_fill_buffer(stream_t *s);
146 int stream_seek_long(stream_t *s, off_t pos);
147
145 #ifdef CONFIG_STREAM_CACHE 148 #ifdef CONFIG_STREAM_CACHE
146 int stream_enable_cache(stream_t *stream,int size,int min,int prefill); 149 int stream_enable_cache(stream_t *stream,int size,int min,int prefill);
147 int cache_stream_fill_buffer(stream_t *s); 150 int cache_stream_fill_buffer(stream_t *s);
148 int cache_stream_seek_long(stream_t *s,off_t pos); 151 int cache_stream_seek_long(stream_t *s,off_t pos);
149 #else 152 #else
150 // no cache, define wrappers: 153 // no cache, define wrappers:
151 int stream_fill_buffer(stream_t *s);
152 int stream_seek_long(stream_t *s,off_t pos);
153 #define cache_stream_fill_buffer(x) stream_fill_buffer(x) 154 #define cache_stream_fill_buffer(x) stream_fill_buffer(x)
154 #define cache_stream_seek_long(x,y) stream_seek_long(x,y) 155 #define cache_stream_seek_long(x,y) stream_seek_long(x,y)
155 #define stream_enable_cache(x,y,z,w) 1 156 #define stream_enable_cache(x,y,z,w) 1
156 #endif 157 #endif
157 void fixup_network_stream_cache(stream_t *stream); 158 void fixup_network_stream_cache(stream_t *stream);