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.

6 files changed, 29 insertions, 29 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_*
diff --git a/stream/stream_netstream.c b/stream/stream_netstream.c
index ea7441a0d0..4627135dbd 100644
--- a/stream/stream_netstream.c
+++ b/stream/stream_netstream.c
@@ -203,7 +203,7 @@ static int seek(stream_t *s,off_t newpos) {
   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;
   
   pack = send_net_stream_cmd(s,NET_STREAM_RESET,NULL,0);  
@@ -214,7 +214,7 @@ static int net_stream_reset(struct stream_st *s) {
   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) {
   case STREAM_CTRL_RESET:
     return net_stream_reset(s);
@@ -222,7 +222,7 @@ static int control(struct stream_st *s,int cmd,void* arg) {
   return STREAM_UNSUPPORTED;
 }
 
-static void close_s(struct stream_st *s) {
+static void close_s(struct stream *s) {
   mp_net_stream_packet_t* pack;
   
   pack = send_net_stream_cmd(s,NET_STREAM_CLOSE,NULL,0);
diff --git a/stream/stream_radio.c b/stream/stream_radio.c
index d5a91aa471..300e41f2e1 100644
--- a/stream/stream_radio.c
+++ b/stream/stream_radio.c
@@ -154,7 +154,7 @@ static const struct m_struct_st stream_opts = {
     stream_opts_fields
 };
 
-static void close_s(struct stream_st * stream);
+static void close_s(struct stream *stream);
 #ifdef USE_RADIO_CAPTURE
 static int clear_buffer(radio_priv_t* priv);
 #endif
@@ -899,7 +899,7 @@ static int init_audio(radio_priv_t *priv)
  * \parameter frequency pointer to float, which will contain frequency in MHz
  * \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;
 
     if (!frequency)
@@ -914,7 +914,7 @@ int radio_get_freq(struct stream_st *stream, float* frequency){
  * \parameter frequency frequency in MHz
  * \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;
 
     if (set_frequency(priv,frequency)!=STREAM_OK){
@@ -933,7 +933,7 @@ int radio_set_freq(struct stream_st *stream, float frequency){
  * \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;
     radio_priv_t* priv=(radio_priv_t*)stream->priv;
     
@@ -956,7 +956,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
  *  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;
 
     if (priv->radio_channel_list) {
@@ -998,7 +998,7 @@ int radio_step_channel(struct stream_st *stream, int direction) {
  *  if channel parameter is NULL function prints error message and does nothing, otherwise
  *  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;
     int i, channel_int;
     radio_channels_t* tmp;
@@ -1046,7 +1046,7 @@ int radio_set_channel(struct stream_st *stream, char *channel) {
  *
  *  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;
     if (priv->radio_channel_current) {
         return priv->radio_channel_current->name;
@@ -1058,7 +1058,7 @@ char* radio_get_channel_name(struct stream_st *stream){
  * \brief fills given buffer with audio data
  * \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;
 
 #ifdef USE_RADIO_CAPTURE
@@ -1219,7 +1219,7 @@ static int open_s(stream_t *stream,int mode, void* opts, int* file_format) {
 /*****************************************************************
  * 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_channels_t * tmp;
     if (!priv) return;
diff --git a/stream/stream_radio.h b/stream/stream_radio.h
index 3a258d9085..1c76cb9cc7 100644
--- a/stream/stream_radio.h
+++ b/stream/stream_radio.h
@@ -36,11 +36,11 @@ typedef struct radio_param_s{
 
 extern radio_param_t stream_radio_defaults;
 
-int radio_set_freq(struct stream_st *stream, float freq);
-int radio_get_freq(struct stream_st *stream, float* freq);
-char* radio_get_channel_name(struct stream_st *stream);
-int radio_set_channel(struct stream_st *stream, char *channel);
-int radio_step_channel(struct stream_st *stream, int direction);
-int radio_step_freq(struct stream_st *stream, float step_interval);
+int radio_set_freq(struct stream *stream, float freq);
+int radio_get_freq(struct stream *stream, float* freq);
+char* radio_get_channel_name(struct stream *stream);
+int radio_set_channel(struct stream *stream, char *channel);
+int radio_step_channel(struct stream *stream, int direction);
+int radio_step_freq(struct stream *stream, float step_interval);
 
 #endif /* MPLAYER_STREAM_RADIO_H */
diff --git a/stream/stream_rtsp.c b/stream/stream_rtsp.c
index 58fda7aa3f..0c9f2774ff 100644
--- a/stream/stream_rtsp.c
+++ b/stream/stream_rtsp.c
@@ -127,7 +127,7 @@ rtsp_streaming_start (stream_t *stream)
 }
 
 static void
-rtsp_streaming_close (struct stream_st *s)
+rtsp_streaming_close (struct stream *s)
 {
   rtsp_session_t *rtsp = NULL;
   
diff --git a/stream/stream_vstream.c b/stream/stream_vstream.c
index a8ea09ba89..dab3f57619 100644
--- a/stream/stream_vstream.c
+++ b/stream/stream_vstream.c
@@ -97,11 +97,11 @@ static int seek(stream_t *s,off_t newpos) {
   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;
 }
 
-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) {