cleanup: reindent audio_out.[ch]

Reindent audio_out.c and audio_out.h. Also remove trailing '_s' from
two struct names (which are not currently used anywhere) and make the
audio_out_drivers[] table static.

1 files changed, 30 insertions, 35 deletions

diff --git a/libao2/audio_out.h b/libao2/audio_out.h
index 8c10a47784..dddcb55a6a 100644
--- a/libao2/audio_out.h
+++ b/libao2/audio_out.h
@@ -21,42 +21,40 @@
 
 #include <stdbool.h>
 
-typedef struct ao_info_s
-{
-        /* driver name ("Matrox Millennium G200/G400" */
-        const char *name;
-        /* short name (for config strings) ("mga") */
-        const char *short_name;
-        /* author ("Aaron Holtzman <aholtzma@ess.engr.uvic.ca>") */
-        const char *author;
-        /* any additional comments */
-        const char *comment;
+typedef struct ao_info {
+    /* driver name ("Matrox Millennium G200/G400" */
+    const char *name;
+    /* short name (for config strings) ("mga") */
+    const char *short_name;
+    /* author ("Aaron Holtzman <aholtzma@ess.engr.uvic.ca>") */
+    const char *author;
+    /* any additional comments */
+    const char *comment;
 } ao_info_t;
 
 /* interface towards mplayer and */
-typedef struct ao_functions
-{
-	const ao_info_t *info;
-        int (*control)(int cmd,void *arg);
-        int (*init)(int rate,int channels,int format,int flags);
-        void (*uninit)(int immed);
-        void (*reset)(void);
-        int (*get_space)(void);
-        int (*play)(void* data,int len,int flags);
-        float (*get_delay)(void);
-        void (*pause)(void);
-        void (*resume)(void);
+typedef struct ao_functions {
+    const ao_info_t *info;
+    int (*control)(int cmd, void *arg);
+    int (*init)(int rate, int channels, int format, int flags);
+    void (*uninit)(int immed);
+    void (*reset)(void);
+    int (*get_space)(void);
+    int (*play)(void *data, int len, int flags);
+    float (*get_delay)(void);
+    void (*pause)(void);
+    void (*resume)(void);
 } ao_functions_t;
 
 /* global data used by mplayer and plugins */
 struct ao {
-  int samplerate;
-  int channels;
-  int format;
-  int bps;
-  int outburst;
-  int buffersize;
-  int pts;
+    int samplerate;
+    int channels;
+    int format;
+    int bps;
+    int outburst;
+    int buffersize;
+    int pts;
     bool initialized;
     const struct ao_functions *driver;
 };
@@ -65,9 +63,6 @@ extern char *ao_subdevice;
 
 void list_audio_out(void);
 
-// NULL terminated array of all drivers
-extern const ao_functions_t* const audio_out_drivers[];
-
 #define CONTROL_OK 1
 #define CONTROL_TRUE 1
 #define CONTROL_FALSE 0
@@ -85,9 +80,9 @@ extern const ao_functions_t* const audio_out_drivers[];
 
 #define AOPLAY_FINAL_CHUNK 1
 
-typedef struct ao_control_vol_s {
-	float left;
-	float right;
+typedef struct ao_control_vol {
+    float left;
+    float right;
 } ao_control_vol_t;
 
 struct ao *ao_create(void);