1 files changed, 4 insertions, 23 deletions
diff --git a/stream/network.h b/stream/network.h
index 8e1f5982b3..b842b1ed24 100644
--- a/stream/network.h
+++ b/stream/network.h
@@ -35,6 +35,7 @@
 #include <arpa/inet.h>
 #endif
 
+#include "stream.h"
 #include "url.h"
 #include "http.h"
 
@@ -52,29 +53,6 @@ typedef struct {
 	int demuxer_type;
 } mime_struct_t;
 
-typedef enum {
-	streaming_stopped_e,
-	streaming_playing_e
-} streaming_status;
-
-typedef struct streaming_control {
-	URL_t *url;
-	streaming_status status;
-	int buffering;	// boolean
-	unsigned int prebuffer_size;
-	char *buffer;
-	unsigned int buffer_size;
-	unsigned int buffer_pos;
-	unsigned int bandwidth;	// The downstream available
-	int (*streaming_read)( int fd, char *buffer, int buffer_size, struct streaming_control *stream_ctrl );
-	int (*streaming_seek)( int fd, off_t pos, struct streaming_control *stream_ctrl );
-	void *data;
-    // hacks for asf
-    int *audio_id_ptr;
-    int *video_id_ptr;
-} streaming_ctrl_t;
-
-//int streaming_start( stream_t *stream, int *demuxer_type, URL_t *url );
 streaming_ctrl_t *streaming_ctrl_new(void);
 int streaming_bufferize( streaming_ctrl_t *streaming_ctrl, char *buffer, int size);
 
@@ -88,4 +66,7 @@ HTTP_header_t *http_read_response(int fd);
 int http_authenticate(HTTP_header_t *http_hdr, URL_t *url, int *auth_retry);
 URL_t* check4proxies(URL_t *url);
 
+void fixup_network_stream_cache(stream_t *stream);
+int http_seek(stream_t *stream, off_t pos);
+
 #endif /* MPLAYER_NETWORK_H */