From ba91edcc600a84fb3d3fc00f68454d2b0fc5063f Mon Sep 17 00:00:00 2001
From: tpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da>
Date: Thu, 25 Mar 2010 17:53:28 +0000
Subject: Add support for ALSA plugins to kmix Patch courtesy of
 ledest@gmail.com and Michael Shigorin

git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdemultimedia@1107453 283d02a7-25f6-0310-bc7c-ecb5cbfe19da
---
 kmix/kmix-platforms.cpp | 18 ++++++++++--------
 1 file changed, 10 insertions(+), 8 deletions(-)

(limited to 'kmix/kmix-platforms.cpp')

diff --git a/kmix/kmix-platforms.cpp b/kmix/kmix-platforms.cpp
index d7d57334..222119eb 100644
--- a/kmix/kmix-platforms.cpp
+++ b/kmix/kmix-platforms.cpp
@@ -108,42 +108,44 @@
 
 typedef Mixer_Backend *getMixerFunc( int device );
 typedef QString getDriverNameFunc( );
+typedef DevIterator* getDevIteratorFunc( );
 
 struct MixerFactory {
     getMixerFunc *getMixer;
     getDriverNameFunc *getDriverName;
+    getDevIteratorFunc *getDevIterator;
 };
 
 MixerFactory g_mixerFactories[] = {
 
 #if defined(NAS_MIXER)
-    { NAS_getMixer, 0 },
+    { NAS_getMixer, NULL, NULL },
 #endif
 
 #if defined(SUN_MIXER)
-    { SUN_getMixer, SUN_getDriverName },
+    { SUN_getMixer, SUN_getDriverName, NULL },
 #endif
 
 #if defined(IRIX_MIXER)
-    { IRIX_getMixer, IRIX_getDriverName },
+    { IRIX_getMixer, IRIX_getDriverName, NULL },
 #endif
 
 #if defined(ALSA_MIXER)
-    { ALSA_getMixer, ALSA_getDriverName },
+    { ALSA_getMixer, ALSA_getDriverName, ALSA_getDevIterator },
 #endif
 
 #if defined(OSS4_MIXER)
-    { OSS4_getMixer, OSS4_getDriverName },
+    { OSS4_getMixer, OSS4_getDriverName, NULL },
 #endif
 
 #if defined(OSS_MIXER)
-    { OSS_getMixer, OSS_getDriverName },
+    { OSS_getMixer, OSS_getDriverName, NULL },
 #endif
 
 #if defined(HPUX_MIXER)
-    { HPUX_getMixer, HPUX_getDriverName },
+    { HPUX_getMixer, HPUX_getDriverName, NULL },
 #endif
 
-    { 0, 0 }
+    { NULL, NULL, NULL }
 };
 
-- 
cgit v1.2.1