RepoMirrors/mpv
1
0
Fork 0
mirror of https://github.com/mpv-player/mpv synced 2025-01-26 01:23:17 +00:00
Code Issues Releases Wiki Activity

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

Browse Source 
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
This commit is contained in:
diego 2010-02-22 13:27:58 +00:00
parent 3784d4f992
commit 638b2af889
2 changed files with 24 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
stream/network.h
View File

@ -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);

26
stream/stream.h
View File

@ -21,6 +21,7 @@
#include "config.h"
#include "mp_msg.h"
#include "url.h"
#include <string.h>
#include <inttypes.h>
#include <sys/types.h>
@ -89,9 +90,24 @@
#define STREAM_CTRL_SET_ANGLE 11
#ifdef CONFIG_NETWORK
#include "network.h"
#endif
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;
struct stream_st;
typedef struct stream_info_st {
@ -142,6 +158,10 @@ typedef struct stream_st {
unsigned char buffer[STREAM_BUFFER_SIZE>VCD_SECTOR_SIZE?STREAM_BUFFER_SIZE:VCD_SECTOR_SIZE];
} stream_t;
#ifdef CONFIG_NETWORK
#include "network.h"
#endif
int stream_fill_buffer(stream_t *s);
int stream_seek_long(stream_t *s, off_t pos);