[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    KDE/kdemultimedia/kmix
From:       Christian Esken <esken () kde ! org>
Date:       2011-09-02 19:52:49
Message-ID: 20110902195249.82937AC87C () svn ! kde ! org
[Download RAW message or body]

SVN commit 1251005 by esken:

Compile important backends (ALSA,Pulse,MPRIS2) separately.

 M  +18 -7     CMakeLists.txt  
 M  +13 -20    backends/kmix-backends.cpp  
 M  +2 -0      backends/mixer_pulse.cpp  


--- trunk/KDE/kdemultimedia/kmix/CMakeLists.txt #1251004:1251005
@@ -39,7 +39,22 @@
 qt4_add_dbus_adaptor( kmix_adaptor_SRCS dbus/org.kde.kmix.mixset.xml
 	dbus/dbusmixsetwrapper.h DBusMixSetWrapper )
 
-set(kmix_KDEINIT_SRCS ${kmix_adaptor_SRCS}
+set(kmix_backend_SRCS
+   backends/mixer_backend.cpp
+   backends/mixer_mpris2.cpp
+   )
+
+if (HAVE_LIBASOUND2)
+  set(kmix_backend_SRCS ${kmix_backend_SRCS}
+      backends/mixer_alsa9.cpp )
+endif (HAVE_LIBASOUND2)
+
+if (HAVE_PULSE)
+  set(kmix_backend_SRCS ${kmix_backend_SRCS}
+      backends/mixer_pulse.cpp )
+endif (HAVE_PULSE)
+
+set(kmix_KDEINIT_SRCS ${kmix_adaptor_SRCS} ${kmix_backend_SRCS}
    apps/main.cpp 
    apps/kmix.cpp 
    apps/KMixApp.cpp
@@ -70,8 +85,6 @@
    core/mixdevice.cpp
    core/mixdevicecomposite.cpp
    core/volume.cpp
-   backends/mixer_mpris2.cpp
-   backends/mixer_backend.cpp
    )
 
 kde4_add_kdeinit_executable( kmix ${kmix_KDEINIT_SRCS})
@@ -95,7 +108,7 @@
 
 ########### next target ###############
 
- set(kded_kmixd_SRCS ${kmix_adaptor_SRCS}
+ set(kded_kmixd_SRCS ${kmix_adaptor_SRCS} ${kmix_backend_SRCS}
     apps/kmixd.cpp 
     core/MasterControl.cpp
     core/mixer.cpp 
@@ -132,7 +145,7 @@
 
 ########### next target ###############
 
-set(kmixctrl_KDEINIT_SRCS ${kmix_adaptor_SRCS}
+set(kmixctrl_KDEINIT_SRCS ${kmix_adaptor_SRCS} ${kmix_backend_SRCS}
    apps/kmixctrl.cpp 
    core/MasterControl.cpp
    core/mixer.cpp 
@@ -141,8 +154,6 @@
    core/volume.cpp 
    core/mixertoolbox.cpp 
    core/kmixdevicemanager.cpp 
-   backends/mixer_mpris2.cpp
-   backends/mixer_backend.cpp
    )
 
 # gui/guiprofile.cpp
--- trunk/KDE/kdemultimedia/kmix/backends/kmix-backends.cpp #1251004:1251005
@@ -26,6 +26,7 @@
 #include <config-alsa.h>
 
 #include "mixer_backend.h"
+#include "mixer_alsa.h"
 #include "core/mixer.h"
 
 #include <QString>
@@ -38,14 +39,6 @@
 
 #ifdef __linux__
 
-#ifdef HAVE_LIBASOUND2
-#define ALSA_MIXER
-#endif
-
-#ifdef HAVE_PULSE
-#define PULSE_MIXER
-#endif
-
 #define OSS_MIXER
 #endif
 
@@ -72,16 +65,6 @@
 #include "backends/mixer_sun.cpp"
 #endif
 
-// Alsa API's 
-#if defined(ALSA_MIXER)
-#include "backends/mixer_alsa9.cpp"
-#endif
-
-// Pulse API
-#if defined(PULSE_MIXER)
-#include "backends/mixer_pulse.cpp"
-#endif
-
 // OSS 3 / 4
 #if defined(OSS_MIXER)
 #include "backends/mixer_oss.cpp"
@@ -120,17 +103,27 @@
 Mixer_Backend* MPRIS2_getMixer(Mixer *mixer, int device );
 QString MPRIS2_getDriverName();
 
+Mixer_Backend* ALSA_getMixer(Mixer *mixer, int device );
+QString ALSA_getDriverName();
+
+Mixer_Backend* PULSE_getMixer(Mixer *mixer, int device );
+QString PULSE_getDriverName();
+
+Mixer_Backend* FOO_getMixer(Mixer *mixer, int device );
+QString FOO_getDriverName();
+
+
 MixerFactory g_mixerFactories[] = {
 
 #if defined(SUN_MIXER)
     { SUN_getMixer, SUN_getDriverName },
 #endif
 
-#if defined(PULSE_MIXER)
+#if defined(HAVE_PULSE)
     { PULSE_getMixer, PULSE_getDriverName },
 #endif
 
-#if defined(ALSA_MIXER)
+#if defined(HAVE_LIBASOUND2)
     { ALSA_getMixer, ALSA_getDriverName },
 #endif
 
--- trunk/KDE/kdemultimedia/kmix/backends/mixer_pulse.cpp #1251004:1251005
@@ -23,6 +23,8 @@
 #include <QtCore/QAbstractEventDispatcher>
 #include <QTimer>
 
+#include <klocale.h>
+
 #include "mixer_pulse.h"
 #include "core/mixer.h"
 
[prev in list] [next in list] [prev in thread] [next in thread]