# HG changeset patch
# User al3x
# Date 992532300 0
# Node ID ca1bc9edf735b19a1f58803b1694e423c7c4d058
# Parent  4f610bd631acca14fa9f8872fb0ae378a2937854
audio_out_format_name prototype added, ao_control_vol_t for aocontrol_get/set_volume added

diff -r 4f610bd631ac -r ca1bc9edf735 libao2/audio_out.h
--- a/libao2/audio_out.h	Thu Jun 14 12:42:56 2001 +0000
+++ b/libao2/audio_out.h	Thu Jun 14 15:25:00 2001 +0000
@@ -1,4 +1,3 @@
-
 typedef struct ao_info_s
 {
         /* driver name ("Matrox Millennium G200/G400" */
@@ -11,47 +10,22 @@
         const char *comment;
 } ao_info_t;
 
-typedef struct ao_functions_s {
-
+typedef struct ao_functions_s
+{
 	ao_info_t *info;
-
-        /*
-         */
         int (*control)(int cmd,int arg);
-
-        /*
-         */
         int (*init)(int rate,int channels,int format,int flags);
-
-        /*
-         */
         void (*uninit)();
-
-        /*
-         */
         void (*reset)();
+        int (*get_space)();
+        int (*play)(void* data,int len,int flags);
+        int (*get_delay)();
+        void (*pause)();
+        void (*resume)();
+} ao_functions_t;
 
-        /*
-         */
-        int (*get_space)();
-
-        /*
-         */
-        int (*play)(void* data,int len,int flags);
-
-        /*
-         */
-        int (*get_delay)();
-
-        /*
-         */
-        void (*pause)();
-
-        /*
-         */
-        void (*resume)();
-
-} ao_functions_t;
+// prototypes
+extern char *audio_out_format_name(int format);
 
 // NULL terminated array of all drivers
 extern ao_functions_t* audio_out_drivers[];
@@ -72,6 +46,11 @@
 
 #define AOCONTROL_SET_DEVICE 1
 #define AOCONTROL_GET_DEVICE 2
-#define AOCONTROL_QUERY_FORMAT 3
+#define AOCONTROL_QUERY_FORMAT 3 /* test for availabilty of a format */
 #define AOCONTROL_GET_VOLUME 4
 #define AOCONTROL_SET_VOLUME 5
+
+typedef struct ao_control_vol_s {
+	float left;
+	float right;
+} ao_control_vol_t;