From 3784d4f992f42308bc730501090f2f17c80742d3 Mon Sep 17 00:00:00 2001 From: diego Date: Mon, 22 Feb 2010 10:14:00 +0000 Subject: Remove commented-out declaration of non-existing function streaming_start. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30696 b3059339-0415-0410-9bf9-f77b7e298cf2 --- stream/network.h | 1 - 1 file changed, 1 deletion(-) (limited to 'stream/network.h') diff --git a/stream/network.h b/stream/network.h index c75d7f6fdb..aac88c1767 100644 --- a/stream/network.h +++ b/stream/network.h @@ -71,7 +71,6 @@ typedef struct streaming_control { void *data; } 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); -- cgit v1.2.3 From 638b2af889d6cafca224d0914499ff78ebe71358 Mon Sep 17 00:00:00 2001 From: diego Date: Mon, 22 Feb 2010 13:27:58 +0000 Subject: 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 --- stream/network.h | 20 +------------------- 1 file changed, 1 insertion(+), 19 deletions(-) (limited to 'stream/network.h') 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 #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); -- cgit v1.2.3 From c8a6c6385b908dd22e53f3cd403cdab0400a3d2c Mon Sep 17 00:00:00 2001 From: diego Date: Mon, 22 Feb 2010 13:50:48 +0000 Subject: Declare functions from network.c in network.h. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30698 b3059339-0415-0410-9bf9-f77b7e298cf2 --- stream/network.h | 3 +++ 1 file changed, 3 insertions(+) (limited to 'stream/network.h') diff --git a/stream/network.h b/stream/network.h index b4e24525da..b842b1ed24 100644 --- a/stream/network.h +++ b/stream/network.h @@ -66,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 */ -- cgit v1.2.3