X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=mix.h;h=5d68b2bb0b34df798e38efad7b0ceeff687982fc;hp=60c4392fabab76bb58ad1c2ee0ee211d52469ad7;hb=b1206644af64376f11877f14fa9f9dd3c30f8e4b;hpb=94802b02fadd65ac1704fe9fcbcf0a2b023d2fa4

diff --git a/mix.h b/mix.h
index 60c4392f..5d68b2bb 100644
--- a/mix.h
+++ b/mix.h
@@ -4,7 +4,7 @@
  * Licensed under the GPL v2. For licencing details see COPYING.
  */
 
-/** \file mix.h Mixer API (used by para_fade). */
+/** \file mix.h Mixer API for para_mixer. */
 
 /**
  * Opaque structure which corresponds to an instance of a mixer.
@@ -16,10 +16,14 @@ struct mixer_handle;
 
 /**
  * Operations provided by each mixer plugin.
+ *
+ * Each mixer plugin must define a non-static instance of this structure, with
+ * all pointers initialized to non-NULL values. No other symbols need to be
+ * exported.
  */
 struct mixer {
-	/** Called on startup, must fill in all other members. */
-	void (*init)(struct mixer *self);
+	/** Used to identify the mixer. */
+	const char * const name;
 	/** Return a handle that can be passed to other methods. */
 	int (*open)(const char *dev, struct mixer_handle **handle);
 	/** Returns a string of all valid mixer channels. */
@@ -34,3 +38,6 @@ struct mixer {
 	/** Free all resources associated with the given handle. */
 	void (*close)(struct mixer_handle **handle);
 };
+
+/** Declared even if unsupported because it does not hurt and avoids ifdefs. */
+extern const struct mixer alsa_mixer, oss_mixer;