RepoMirrors
/
mpv
mirror of https://github.com/mpv-player/mpv
1
0
Fork 0
Code Issues Releases Wiki Activity

Drop pointless _st suffix from 'struct stream'. 

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31237 b3059339-0415-0410-9bf9-f77b7e298cf2
This commit is contained in:
diego 2010-05-27 20:38:25 +00:00
parent 069f0d026c
commit 5e71e43bb5
9 changed files with 37 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
playtree.h
View File

@ -22,7 +22,7 @@
/// \file /// \file
/// \ingroup Playtree /// \ingroup Playtree
struct stream_st; struct stream;
struct m_config; struct m_config;
/// \defgroup PlaytreeIterReturn Playtree iterator return code /// \defgroup PlaytreeIterReturn Playtree iterator return code
@ -246,7 +246,7 @@ play_tree_iter_get_file(play_tree_iter_t* iter, int d);
/** \ingroup PlaytreeParser /** \ingroup PlaytreeParser
*/ */
play_tree_t* play_tree_t*
parse_playtree(struct stream_st *stream, int forced); parse_playtree(struct stream *stream, int forced);
/// Clean a tree by destroying all empty elements. /// Clean a tree by destroying all empty elements.
play_tree_t* play_tree_t*

6
playtreeparser.h
View File

@ -30,10 +30,10 @@
/// \file /// \file
struct stream_st; struct stream;
typedef struct play_tree_parser { typedef struct play_tree_parser {
struct stream_st* stream; struct stream *stream;
char *buffer,*iter,*line; char *buffer,*iter,*line;
int buffer_size , buffer_end; int buffer_size , buffer_end;
int deep,keep; int deep,keep;
@ -46,7 +46,7 @@ typedef struct play_tree_parser {
* \return The new parser. * \return The new parser.
*/ */
play_tree_parser_t* play_tree_parser_t*
play_tree_parser_new(struct stream_st* stream,int deep); play_tree_parser_new(struct stream *stream, int deep);
/// Destroy a parser. /// Destroy a parser.
void void

16
stream/stream.h
View File

@ -114,7 +114,7 @@ typedef struct streaming_control {
void *data; void *data;
} streaming_ctrl_t; } streaming_ctrl_t;
struct stream_st; struct stream;
typedef struct stream_info_st { typedef struct stream_info_st {
const char *info; const char *info;
const char *name; const char *name;
@ -123,7 +123,7 @@ typedef struct stream_info_st {
/// mode isn't used atm (ie always READ) but it shouldn't be ignored /// mode isn't used atm (ie always READ) but it shouldn't be ignored
/// opts is at least in it's defaults settings and may have been /// opts is at least in it's defaults settings and may have been
/// altered by url parsing if enabled and the options string parsing. /// altered by url parsing if enabled and the options string parsing.
int (*open)(struct stream_st* st, int mode, void* opts, int* file_format); int (*open)(struct stream* st, int mode, void* opts, int* file_format);
const char* protocols[MAX_STREAM_PROTOCOLS]; const char* protocols[MAX_STREAM_PROTOCOLS];
const void* opts; const void* opts;
int opts_url; /* If this is 1 we will parse the url as an option string int opts_url; /* If this is 1 we will parse the url as an option string
@ -131,19 +131,19 @@ typedef struct stream_info_st {
* options string given to open_stream_plugin */ * options string given to open_stream_plugin */
} stream_info_t; } stream_info_t;
typedef struct stream_st { typedef struct stream {
// Read // Read
int (*fill_buffer)(struct stream_st *s, char* buffer, int max_len); int (*fill_buffer)(struct stream *s, char* buffer, int max_len);
// Write // Write
int (*write_buffer)(struct stream_st *s, char* buffer, int len); int (*write_buffer)(struct stream *s, char* buffer, int len);
// Seek // Seek
int (*seek)(struct stream_st *s,off_t pos); int (*seek)(struct stream *s,off_t pos);
// Control // Control
// Will be later used to let streams like dvd and cdda report // Will be later used to let streams like dvd and cdda report
// their structure (ie tracks, chapters, etc) // their structure (ie tracks, chapters, etc)
int (*control)(struct stream_st *s,int cmd,void* arg); int (*control)(struct stream *s,int cmd,void* arg);
// Close // Close
void (*close)(struct stream_st *s); void (*close)(struct stream *s);
int fd; // file descriptor, see man open(2) int fd; // file descriptor, see man open(2)
int type; // see STREAMTYPE_* int type; // see STREAMTYPE_*

6
stream/stream_netstream.c
View File

@ -201,7 +201,7 @@ static int seek(stream_t *s,off_t newpos) {
return 1; return 1;
} }
static int net_stream_reset(struct stream_st *s) { static int net_stream_reset(struct stream *s) {
mp_net_stream_packet_t* pack; mp_net_stream_packet_t* pack;
pack = send_net_stream_cmd(s,NET_STREAM_RESET,NULL,0); pack = send_net_stream_cmd(s,NET_STREAM_RESET,NULL,0);
@ -212,7 +212,7 @@ static int net_stream_reset(struct stream_st *s) {
return 1; return 1;
} }
static int control(struct stream_st *s,int cmd,void* arg) { static int control(struct stream *s,int cmd,void* arg) {
switch(cmd) { switch(cmd) {
case STREAM_CTRL_RESET: case STREAM_CTRL_RESET:
return net_stream_reset(s); return net_stream_reset(s);
@ -220,7 +220,7 @@ static int control(struct stream_st *s,int cmd,void* arg) {
return STREAM_UNSUPPORTED; return STREAM_UNSUPPORTED;
} }
static void close_s(struct stream_st *s) { static void close_s(struct stream *s) {
mp_net_stream_packet_t* pack; mp_net_stream_packet_t* pack;
pack = send_net_stream_cmd(s,NET_STREAM_CLOSE,NULL,0); pack = send_net_stream_cmd(s,NET_STREAM_CLOSE,NULL,0);

18
stream/stream_radio.c
View File

@ -155,7 +155,7 @@ static const struct m_struct_st stream_opts = {
stream_opts_fields stream_opts_fields
}; };
static void close_s(struct stream_st * stream); static void close_s(struct stream *stream);
#ifdef CONFIG_RADIO_CAPTURE #ifdef CONFIG_RADIO_CAPTURE
static int clear_buffer(radio_priv_t* priv); static int clear_buffer(radio_priv_t* priv);
#endif #endif
@ -900,7 +900,7 @@ static int init_audio(radio_priv_t *priv)
* \parameter frequency pointer to float, which will contain frequency in MHz * \parameter frequency pointer to float, which will contain frequency in MHz
* \return 1 if success,0 - otherwise * \return 1 if success,0 - otherwise
*/ */
int radio_get_freq(struct stream_st *stream, float* frequency){ int radio_get_freq(struct stream *stream, float *frequency){
radio_priv_t* priv=(radio_priv_t*)stream->priv; radio_priv_t* priv=(radio_priv_t*)stream->priv;
if (!frequency) if (!frequency)
@ -915,7 +915,7 @@ int radio_get_freq(struct stream_st *stream, float* frequency){
* \parameter frequency frequency in MHz * \parameter frequency frequency in MHz
* \return 1 if success,0 - otherwise * \return 1 if success,0 - otherwise
*/ */
int radio_set_freq(struct stream_st *stream, float frequency){ int radio_set_freq(struct stream *stream, float frequency){
radio_priv_t* priv=(radio_priv_t*)stream->priv; radio_priv_t* priv=(radio_priv_t*)stream->priv;
if (set_frequency(priv,frequency)!=STREAM_OK){ if (set_frequency(priv,frequency)!=STREAM_OK){
@ -934,7 +934,7 @@ int radio_set_freq(struct stream_st *stream, float frequency){
* \return 1 if success,0 - otherwise * \return 1 if success,0 - otherwise
* *
*/ */
int radio_step_freq(struct stream_st *stream, float step_interval){ int radio_step_freq(struct stream *stream, float step_interval){
float frequency; float frequency;
radio_priv_t* priv=(radio_priv_t*)stream->priv; radio_priv_t* priv=(radio_priv_t*)stream->priv;
@ -957,7 +957,7 @@ int radio_step_freq(struct stream_st *stream, float step_interval){
* if channel parameter is NULL function prints error message and does nothing, otherwise * if channel parameter is NULL function prints error message and does nothing, otherwise
* changes channel to prev or next in list * changes channel to prev or next in list
*/ */
int radio_step_channel(struct stream_st *stream, int direction) { int radio_step_channel(struct stream *stream, int direction) {
radio_priv_t* priv=(radio_priv_t*)stream->priv; radio_priv_t* priv=(radio_priv_t*)stream->priv;
if (priv->radio_channel_list) { if (priv->radio_channel_list) {
@ -999,7 +999,7 @@ int radio_step_channel(struct stream_st *stream, int direction) {
* if channel parameter is NULL function prints error message and does nothing, otherwise * if channel parameter is NULL function prints error message and does nothing, otherwise
* changes channel to given * changes channel to given
*/ */
int radio_set_channel(struct stream_st *stream, char *channel) { int radio_set_channel(struct stream *stream, char *channel) {
radio_priv_t* priv=(radio_priv_t*)stream->priv; radio_priv_t* priv=(radio_priv_t*)stream->priv;
int i, channel_int; int i, channel_int;
radio_channels_t* tmp; radio_channels_t* tmp;
@ -1047,7 +1047,7 @@ int radio_set_channel(struct stream_st *stream, char *channel) {
* *
* NOTE: return value may be NULL (e.g. when channel list not initialized) * NOTE: return value may be NULL (e.g. when channel list not initialized)
*/ */
char* radio_get_channel_name(struct stream_st *stream){ char* radio_get_channel_name(struct stream *stream){
radio_priv_t* priv=(radio_priv_t*)stream->priv; radio_priv_t* priv=(radio_priv_t*)stream->priv;
if (priv->radio_channel_current) { if (priv->radio_channel_current) {
return priv->radio_channel_current->name; return priv->radio_channel_current->name;
@ -1059,7 +1059,7 @@ char* radio_get_channel_name(struct stream_st *stream){
* \brief fills given buffer with audio data * \brief fills given buffer with audio data
* \return number of bytes, written into buffer * \return number of bytes, written into buffer
*/ */
static int fill_buffer_s(struct stream_st *s, char* buffer, int max_len){ static int fill_buffer_s(struct stream *s, char* buffer, int max_len){
int len=max_len; int len=max_len;
#ifdef CONFIG_RADIO_CAPTURE #ifdef CONFIG_RADIO_CAPTURE
@ -1220,7 +1220,7 @@ static int open_s(stream_t *stream,int mode, void* opts, int* file_format) {
/***************************************************************** /*****************************************************************
* Close stream. Clear structures. * Close stream. Clear structures.
*/ */
static void close_s(struct stream_st * stream){ static void close_s(struct stream *stream){
radio_priv_t* priv=(radio_priv_t*)stream->priv; radio_priv_t* priv=(radio_priv_t*)stream->priv;
radio_channels_t * tmp; radio_channels_t * tmp;
if (!priv) return; if (!priv) return;

12
stream/stream_radio.h
View File

@ -55,11 +55,11 @@ typedef struct radio_param_s{
extern radio_param_t stream_radio_defaults; extern radio_param_t stream_radio_defaults;
int radio_set_freq(struct stream_st *stream, float freq); int radio_set_freq(struct stream *stream, float freq);
int radio_get_freq(struct stream_st *stream, float* freq); int radio_get_freq(struct stream *stream, float* freq);
char* radio_get_channel_name(struct stream_st *stream); char* radio_get_channel_name(struct stream *stream);
int radio_set_channel(struct stream_st *stream, char *channel); int radio_set_channel(struct stream *stream, char *channel);
int radio_step_channel(struct stream_st *stream, int direction); int radio_step_channel(struct stream *stream, int direction);
int radio_step_freq(struct stream_st *stream, float step_interval); int radio_step_freq(struct stream *stream, float step_interval);
#endif /* MPLAYER_STREAM_RADIO_H */ #endif /* MPLAYER_STREAM_RADIO_H */

2
stream/stream_rtsp.c
View File

@ -130,7 +130,7 @@ rtsp_streaming_start (stream_t *stream)
} }
static void static void
rtsp_streaming_close (struct stream_st *s) rtsp_streaming_close (struct stream *s)
{ {
rtsp_session_t *rtsp = NULL; rtsp_session_t *rtsp = NULL;

4
stream/stream_vstream.c
View File

@ -95,11 +95,11 @@ static int seek(stream_t *s,off_t newpos) {
return 1; return 1;
} }
static int control(struct stream_st *s,int cmd,void* arg) { static int control(struct stream *s, int cmd, void *arg) {
return STREAM_UNSUPPORTED; return STREAM_UNSUPPORTED;
} }
static void close_s(struct stream_st *s) { static void close_s(struct stream *s) {
} }
static int open_s(stream_t *stream, int mode, void* opts, int* file_format) { static int open_s(stream_t *stream, int mode, void* opts, int* file_format) {

6
subreader.h
View File

@ -88,12 +88,12 @@ sub_data* sub_read_file (char *filename, float pts);
subtitle* subcp_recode (subtitle *sub); subtitle* subcp_recode (subtitle *sub);
// enca_fd is the file enca uses to determine the codepage. // enca_fd is the file enca uses to determine the codepage.
// setting to NULL disables enca. // setting to NULL disables enca.
struct stream_st; struct stream;
void subcp_open (struct stream_st *st); /* for demux_ogg.c */ void subcp_open (struct stream *st); /* for demux_ogg.c */
void subcp_close (void); /* for demux_ogg.c */ void subcp_close (void); /* for demux_ogg.c */
#ifdef CONFIG_ENCA #ifdef CONFIG_ENCA
const char* guess_buffer_cp(unsigned char* buffer, int buflen, const char *preferred_language, const char *fallback); const char* guess_buffer_cp(unsigned char* buffer, int buflen, const char *preferred_language, const char *fallback);
const char* guess_cp(struct stream_st *st, const char *preferred_language, const char *fallback); const char* guess_cp(struct stream *st, const char *preferred_language, const char *fallback);
#endif #endif
char ** sub_filenames(const char *path, char *fname); char ** sub_filenames(const char *path, char *fname);
void list_sub_file(sub_data* subd); void list_sub_file(sub_data* subd);