diff options
author | Uoti Urpala <uau@symbol.nonexistent.invalid> | 2008-04-24 05:49:44 +0300 |
---|---|---|
committer | Uoti Urpala <uau@symbol.nonexistent.invalid> | 2008-04-25 03:34:22 +0300 |
commit | 0e757bf9daa55db9fa7052efe5aef09f90044054 (patch) | |
tree | 2d4588bee5aab5d07d6f95879413db5dacbeb04d /stream/stream.h | |
parent | 6f971b635434609e69d7c326b1f3eded88d2caf2 (diff) | |
download | mpv-0e757bf9daa55db9fa7052efe5aef09f90044054.tar.bz2 mpv-0e757bf9daa55db9fa7052efe5aef09f90044054.tar.xz |
Remove _s/_st suffix from some struct names
Since the names are always used after the keyword "struct" having a
suffix as in "struct demuxer_st" is almost completely pointless.
Diffstat (limited to 'stream/stream.h')
-rw-r--r-- | stream/stream.h | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/stream/stream.h b/stream/stream.h index f7c8c018e7..50df5baa7e 100644 --- a/stream/stream.h +++ b/stream/stream.h @@ -69,7 +69,7 @@ #include "network.h" #endif -struct stream_st; +struct stream; typedef struct stream_info_st { const char *info; const char *name; @@ -78,7 +78,7 @@ typedef struct stream_info_st { /// 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 /// 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 void* opts; int opts_url; /* If this is 1 we will parse the url as an option string @@ -86,19 +86,19 @@ typedef struct stream_info_st { * options string given to open_stream_plugin */ } stream_info_t; -typedef struct stream_st { +typedef struct stream { // 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 - int (*write_buffer)(struct stream_st *s, char* buffer, int len); + int (*write_buffer)(struct stream *s, char* buffer, int len); // Seek - int (*seek)(struct stream_st *s,off_t pos); + int (*seek)(struct stream *s,off_t pos); // Control // Will be later used to let streams like dvd and cdda report // 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 - void (*close)(struct stream_st *s); + void (*close)(struct stream *s); int fd; // file descriptor, see man open(2) int type; // see STREAMTYPE_* |