diff options
| author | tpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da> | 2010-03-25 17:53:28 +0000 |
|---|---|---|
| committer | tpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da> | 2010-03-25 17:53:28 +0000 |
| commit | ba91edcc600a84fb3d3fc00f68454d2b0fc5063f (patch) | |
| tree | 4da2e9dffc6f8b634a2f3c3f23dd6689016bd369 /kmix/kmix-platforms.cpp | |
| parent | b83c65dd813fdd4157234004197acf33ab01da93 (diff) | |
| download | tdemultimedia-ba91edcc600a84fb3d3fc00f68454d2b0fc5063f.tar.gz tdemultimedia-ba91edcc600a84fb3d3fc00f68454d2b0fc5063f.zip | |
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
Diffstat (limited to 'kmix/kmix-platforms.cpp')
| -rw-r--r-- | kmix/kmix-platforms.cpp | 18 |
1 files changed, 10 insertions, 8 deletions
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 } }; |