Move struct streaming_control from network.h to stream.h, where it is used.

This will help in declaring some public functions where they really belong.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30697 b3059339-0415-0410-9bf9-f77b7e298cf2

1 files changed, 1 insertions, 19 deletions

diff --git a/stream/network.h b/stream/network.h
index aac88c1767..b4e24525da 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,25 +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;
-} streaming_ctrl_t;
-
 streaming_ctrl_t *streaming_ctrl_new(void);
 int streaming_bufferize( streaming_ctrl_t *streaming_ctrl, char *buffer, int size);