[prev in list] [next in list] [prev in thread] [next in thread]
List: kde-commits
Subject: [kmix/kmix-improvements] /: move old daemon and UI to oldsrc/
From: Trever Fischer <tdfischer () fedoraproject ! org>
Date: 2013-02-19 19:56:03
Message-ID: 20130219195603.0B69DA6091 () git ! kde ! org
[Download RAW message or body]
Git commit ba6cc9321725ceee650d83eb5a4da611c10f69b0 by Trever Fischer.
Committed on 27/09/2012 at 17:20.
Pushed by tdfischer into branch 'kmix-improvements'.
move old daemon and UI to oldsrc/
M +16 -28 CMakeLists.txt
R +0 -0 oldsrc/backends/kmix-backends.cpp [from: \
src/backends/kmix-backends.cpp - 100% similarity] R +0 -0 \
oldsrc/backends/mixer_alsa.h [from: src/backends/mixer_alsa.h - 100% similarity] R \
+0 -0 oldsrc/backends/mixer_alsa9.cpp [from: src/backends/mixer_alsa9.cpp - \
100% similarity] R +0 -0 oldsrc/backends/mixer_backend.cpp [from: \
src/backends/mixer_backend.cpp - 100% similarity] R +0 -0 \
oldsrc/backends/mixer_backend.h [from: src/backends/mixer_backend.h - 100% \
similarity] R +0 -0 oldsrc/backends/mixer_backend_i18n.cpp [from: \
src/backends/mixer_backend_i18n.cpp - 100% similarity] R +0 -0 \
oldsrc/backends/mixer_mpris2.cpp [from: src/backends/mixer_mpris2.cpp - 100% \
similarity] R +0 -0 oldsrc/backends/mixer_mpris2.h [from: \
src/backends/mixer_mpris2.h - 100% similarity] R +0 -0 \
oldsrc/backends/mixer_oss.cpp [from: src/backends/mixer_oss.cpp - 100% similarity] R \
+0 -0 oldsrc/backends/mixer_oss.h [from: src/backends/mixer_oss.h - 100% \
similarity] R +0 -0 oldsrc/backends/mixer_oss4.cpp [from: \
src/backends/mixer_oss4.cpp - 100% similarity] R +0 -0 \
oldsrc/backends/mixer_oss4.h [from: src/backends/mixer_oss4.h - 100% similarity] R \
+0 -0 oldsrc/backends/mixer_pulse.cpp [from: src/backends/mixer_pulse.cpp - \
100% similarity] R +0 -0 oldsrc/backends/mixer_pulse.h [from: \
src/backends/mixer_pulse.h - 100% similarity] R +0 -0 \
oldsrc/backends/mixer_sun.cpp [from: src/backends/mixer_sun.cpp - 100% similarity] R \
+0 -0 oldsrc/backends/mixer_sun.h [from: src/backends/mixer_sun.h - 100% \
similarity] R +0 -0 oldsrc/core/ControlPool.cpp [from: \
src/core/ControlPool.cpp - 100% similarity] R +0 -0 oldsrc/core/ControlPool.h \
[from: src/core/ControlPool.h - 100% similarity] R +0 -0 \
oldsrc/core/MasterControl.cpp [from: src/core/MasterControl.cpp - 100% similarity] R \
+0 -0 oldsrc/core/MasterControl.h [from: src/core/MasterControl.h - 100% \
similarity] R +0 -0 oldsrc/core/kmixdevicemanager.cpp [from: \
src/core/kmixdevicemanager.cpp - 100% similarity] R +0 -0 \
oldsrc/core/kmixdevicemanager.h [from: src/core/kmixdevicemanager.h - 100% \
similarity] R +0 -0 oldsrc/core/mixdevice.cpp [from: src/core/mixdevice.cpp - \
100% similarity] R +0 -0 oldsrc/core/mixdevice.h [from: src/core/mixdevice.h - \
100% similarity] R +0 -0 oldsrc/core/mixdevicecomposite.cpp [from: \
src/core/mixdevicecomposite.cpp - 100% similarity] R +0 -0 \
oldsrc/core/mixdevicecomposite.h [from: src/core/mixdevicecomposite.h - 100% \
similarity] R +0 -0 oldsrc/core/mixer.cpp [from: src/core/mixer.cpp - 100% \
similarity] R +0 -0 oldsrc/core/mixer.h [from: src/core/mixer.h - 100% \
similarity] R +0 -0 oldsrc/core/mixertoolbox.cpp [from: \
src/core/mixertoolbox.cpp - 100% similarity] R +0 -0 \
oldsrc/core/mixertoolbox.h [from: src/core/mixertoolbox.h - 100% similarity] R +0 \
-0 oldsrc/core/mixset.cpp [from: src/core/mixset.cpp - 100% similarity] R +0 \
-0 oldsrc/core/mixset.h [from: src/core/mixset.h - 100% similarity] R +0 -0 \
oldsrc/core/version.h [from: src/core/version.h - 100% similarity] R +0 -0 \
oldsrc/core/volume.cpp [from: src/core/volume.cpp - 100% similarity] R +0 -0 \
oldsrc/core/volume.h [from: src/core/volume.h - 100% similarity] C +0 -0 \
oldsrc/daemon/CMakeLists.txt [from: src/daemon/CMakeLists.txt - 100% similarity] C \
+0 -0 oldsrc/daemon/KMixDApp.cpp [from: src/daemon/KMixDApp.cpp - 100% \
similarity] C +0 -0 oldsrc/daemon/KMixDApp.h [from: src/daemon/KMixDApp.h - \
100% similarity] R +0 -0 oldsrc/daemon/main.cpp [from: src/daemon2/main.cpp - \
100% similarity] R +0 -0 oldsrc/daemon/org.kde.kmix.service.cmake [from: \
src/daemon/org.kde.kmix.service.cmake - 100% similarity] R +0 -0 \
oldsrc/dbus/dbuscontrolwrapper.cpp [from: src/dbus/dbuscontrolwrapper.cpp - 100% \
similarity] R +0 -0 oldsrc/dbus/dbuscontrolwrapper.h [from: \
src/dbus/dbuscontrolwrapper.h - 100% similarity] R +0 -0 \
oldsrc/dbus/dbusmixerwrapper.cpp [from: src/dbus/dbusmixerwrapper.cpp - 100% \
similarity] R +0 -0 oldsrc/dbus/dbusmixerwrapper.h [from: \
src/dbus/dbusmixerwrapper.h - 100% similarity] R +0 -0 \
oldsrc/dbus/dbusmixsetwrapper.cpp [from: src/dbus/dbusmixsetwrapper.cpp - 100% \
similarity] R +0 -0 oldsrc/dbus/dbusmixsetwrapper.h [from: \
src/dbus/dbusmixsetwrapper.h - 100% similarity] R +0 -0 \
oldsrc/dbus/org.kde.kmix.mixer.xml [from: src/dbus/org.kde.kmix.mixer.xml - 100% \
similarity] R +0 -0 oldsrc/dbus/org.kde.kmix.mixset.xml [from: \
src/dbus/org.kde.kmix.mixset.xml - 100% similarity] C +0 -0 \
oldsrc/gui/CMakeLists.txt [from: src/gui/CMakeLists.txt - 100% similarity] C +0 \
-0 oldsrc/gui/KMixApp.cpp [from: src/gui/KMixApp.cpp - 100% similarity] C +0 \
-0 oldsrc/gui/KMixApp.h [from: src/gui/KMixApp.h - 100% similarity] R +0 -0 \
oldsrc/gui/dialogaddview.cpp [from: src/gui/dialogaddview.cpp - 100% similarity] R \
+0 -0 oldsrc/gui/dialogaddview.h [from: src/gui/dialogaddview.h - 100% \
similarity] R +0 -0 oldsrc/gui/dialogselectmaster.cpp [from: \
src/gui/dialogselectmaster.cpp - 100% similarity] R +0 -0 \
oldsrc/gui/dialogselectmaster.h [from: src/gui/dialogselectmaster.h - 100% \
similarity] R +0 -0 oldsrc/gui/dialogviewconfiguration.cpp [from: \
src/gui/dialogviewconfiguration.cpp - 100% similarity] R +0 -0 \
oldsrc/gui/dialogviewconfiguration.h [from: src/gui/dialogviewconfiguration.h - 100% \
similarity] R +0 -0 oldsrc/gui/guiprofile.cpp [from: src/gui/guiprofile.cpp - \
100% similarity] R +0 -0 oldsrc/gui/guiprofile.h [from: src/gui/guiprofile.h - \
100% similarity] R +0 -0 oldsrc/gui/kmix.cpp [from: src/gui/kmix.cpp - 100% \
similarity] R +0 -0 oldsrc/gui/kmix.desktop [from: src/gui2/kmix.desktop - \
100% similarity] R +0 -0 oldsrc/gui/kmix.h [from: src/gui/kmix.h - 100% \
similarity] R +0 -0 oldsrc/gui/kmix_autostart.desktop [from: \
src/gui2/kmix_autostart.desktop - 100% similarity] R +0 -0 \
oldsrc/gui/kmixdockwidget.cpp [from: src/gui/kmixdockwidget.cpp - 100% similarity] R \
+0 -0 oldsrc/gui/kmixdockwidget.h [from: src/gui/kmixdockwidget.h - 100% \
similarity] R +0 -0 oldsrc/gui/kmixerwidget.cpp [from: \
src/gui/kmixerwidget.cpp - 100% similarity] R +0 -0 oldsrc/gui/kmixerwidget.h \
[from: src/gui/kmixerwidget.h - 100% similarity] R +0 -0 \
oldsrc/gui/kmixprefdlg.cpp [from: src/gui/kmixprefdlg.cpp - 100% similarity] R +0 \
-0 oldsrc/gui/kmixprefdlg.h [from: src/gui/kmixprefdlg.h - 100% similarity] R +0 \
-0 oldsrc/gui/kmixtoolbox.cpp [from: src/gui/kmixtoolbox.cpp - 100% similarity] R \
+0 -0 oldsrc/gui/kmixtoolbox.h [from: src/gui/kmixtoolbox.h - 100% similarity] \
R +0 -0 oldsrc/gui/kmixui.rc [from: src/gui2/kmixui.rc - 100% similarity] R \
+0 -0 oldsrc/gui/ksmallslider.cpp [from: src/gui/ksmallslider.cpp - 100% \
similarity] R +0 -0 oldsrc/gui/ksmallslider.h [from: src/gui/ksmallslider.h - \
100% similarity] C +0 -0 oldsrc/gui/main.cpp [from: src/gui/main.cpp - 100% \
similarity] R +0 -0 oldsrc/gui/mdwenum.cpp [from: src/gui/mdwenum.cpp - 100% \
similarity] R +0 -0 oldsrc/gui/mdwenum.h [from: src/gui/mdwenum.h - 100% \
similarity] R +0 -0 oldsrc/gui/mdwmoveaction.cpp [from: \
src/gui/mdwmoveaction.cpp - 100% similarity] R +0 -0 \
oldsrc/gui/mdwmoveaction.h [from: src/gui/mdwmoveaction.h - 100% similarity] R +0 \
-0 oldsrc/gui/mdwslider.cpp [from: src/gui/mdwslider.cpp - 100% similarity] R +0 \
-0 oldsrc/gui/mdwslider.h [from: src/gui/mdwslider.h - 100% similarity] R +0 \
-0 oldsrc/gui/mdwswitch.cpp [from: src/gui/mdwswitch.cpp - 100% similarity] R +0 \
-0 oldsrc/gui/mdwswitch.h [from: src/gui/mdwswitch.h - 100% similarity] R +0 \
-0 oldsrc/gui/mixdevicewidget.cpp [from: src/gui/mixdevicewidget.cpp - 100% \
similarity] R +0 -0 oldsrc/gui/mixdevicewidget.h [from: \
src/gui/mixdevicewidget.h - 100% similarity] R +0 -0 oldsrc/gui/osdwidget.cpp \
[from: src/gui/osdwidget.cpp - 100% similarity] R +0 -0 oldsrc/gui/osdwidget.h \
[from: src/gui/osdwidget.h - 100% similarity] R +0 -0 \
oldsrc/gui/verticaltext.cpp [from: src/gui/verticaltext.cpp - 100% similarity] R +0 \
-0 oldsrc/gui/verticaltext.h [from: src/gui/verticaltext.h - 100% similarity] R \
+0 -0 oldsrc/gui/viewbase.cpp [from: src/gui/viewbase.cpp - 100% similarity] R \
+0 -0 oldsrc/gui/viewbase.h [from: src/gui/viewbase.h - 100% similarity] R +0 \
-0 oldsrc/gui/viewdockareapopup.cpp [from: src/gui/viewdockareapopup.cpp - 100% \
similarity] R +0 -0 oldsrc/gui/viewdockareapopup.h [from: \
src/gui/viewdockareapopup.h - 100% similarity] R +0 -0 \
oldsrc/gui/viewsliders.cpp [from: src/gui/viewsliders.cpp - 100% similarity] R +0 \
-0 oldsrc/gui/viewsliders.h [from: src/gui/viewsliders.h - 100% similarity] R +0 \
-0 oldsrc/gui/volumeslider.cpp [from: src/gui/volumeslider.cpp - 100% similarity] \
R +0 -0 oldsrc/gui/volumeslider.h [from: src/gui/volumeslider.h - 100% \
similarity] R +0 -0 oldsrc/gui/volumesliderextradata.h [from: \
src/gui/volumesliderextradata.h - 100% similarity] R +0 -0 \
oldsrc/plasma/CMakeLists.txt [from: src/plasma/CMakeLists.txt - 100% similarity] R \
+0 -0 oldsrc/plasma/engine/CMakeLists.txt [from: \
src/plasma/engine/CMakeLists.txt - 100% similarity] R +0 -0 \
oldsrc/plasma/engine/mixer.operations [from: src/plasma/engine/mixer.operations - \
100% similarity] R +0 -0 oldsrc/plasma/engine/mixerengine.cpp [from: \
src/plasma/engine/mixerengine.cpp - 100% similarity] R +0 -0 \
oldsrc/plasma/engine/mixerengine.h [from: src/plasma/engine/mixerengine.h - 100% \
similarity] R +0 -0 oldsrc/plasma/engine/mixerservice.cpp [from: \
src/plasma/engine/mixerservice.cpp - 100% similarity] R +0 -0 \
oldsrc/plasma/engine/mixerservice.h [from: src/plasma/engine/mixerservice.h - 100% \
similarity] R +0 -0 oldsrc/plasma/engine/plasma-engine-mixer.desktop [from: \
src/plasma/engine/plasma-engine-mixer.desktop - 100% similarity] A +5 -0 \
src/CMakeLists.txt R +0 -0 src/daemon/Backend.cpp [from: \
src/daemon2/Backend.cpp - 100% similarity] R +0 -0 src/daemon/Backend.h [from: \
src/daemon2/Backend.h - 100% similarity] R +0 -0 src/daemon/BackendManager.cpp \
[from: src/daemon2/BackendManager.cpp - 100% similarity] R +0 -0 \
src/daemon/BackendManager.h [from: src/daemon2/BackendManager.h - 100% similarity] M \
+31 -36 src/daemon/CMakeLists.txt R +0 -0 src/daemon/Control.cpp [from: \
src/daemon2/Control.cpp - 100% similarity] R +0 -0 src/daemon/Control.h [from: \
src/daemon2/Control.h - 100% similarity] R +0 -0 src/daemon/ControlGroup.cpp \
[from: src/daemon2/ControlGroup.cpp - 100% similarity] R +0 -0 \
src/daemon/ControlGroup.h [from: src/daemon2/ControlGroup.h - 100% similarity] M +68 \
-19 src/daemon/KMixDApp.cpp M +20 -2 src/daemon/KMixDApp.h
R +0 -0 src/daemon/backends/ALSA.cpp [from: src/daemon2/backends/ALSA.cpp - \
100% similarity] R +0 -0 src/daemon/backends/ALSA.h [from: \
src/daemon2/backends/ALSA.h - 100% similarity] R +0 -0 \
src/daemon/backends/ALSAControl.cpp [from: src/daemon2/backends/ALSAControl.cpp - \
100% similarity] R +0 -0 src/daemon/backends/ALSAControl.h [from: \
src/daemon2/backends/ALSAControl.h - 100% similarity] R +0 -0 \
src/daemon/backends/PulseAudio.cpp [from: src/daemon2/backends/PulseAudio.cpp - 100% \
similarity] R +0 -0 src/daemon/backends/PulseAudio.h [from: \
src/daemon2/backends/PulseAudio.h - 100% similarity] R +0 -0 \
src/daemon/backends/PulseControl.cpp [from: src/daemon2/backends/PulseControl.cpp - \
100% similarity] R +0 -0 src/daemon/backends/PulseControl.h [from: \
src/daemon2/backends/PulseControl.h - 100% similarity] R +0 -0 \
src/daemon/backends/PulseSinkControl.cpp [from: \
src/daemon2/backends/PulseSinkControl.cpp - 100% similarity] R +0 -0 \
src/daemon/backends/PulseSinkControl.h [from: src/daemon2/backends/PulseSinkControl.h \
- 100% similarity] R +0 -0 src/daemon/backends/PulseSinkInputControl.cpp \
[from: src/daemon2/backends/PulseSinkInputControl.cpp - 100% similarity] R +0 -0 \
src/daemon/backends/PulseSinkInputControl.h [from: \
src/daemon2/backends/PulseSinkInputControl.h - 100% similarity] R +0 -0 \
src/daemon/backends/PulseSourceOutputControl.cpp [from: \
src/daemon2/backends/PulseSourceOutputControl.cpp - 100% similarity] R +0 -0 \
src/daemon/backends/PulseSourceOutputControl.h [from: \
src/daemon2/backends/PulseSourceOutputControl.h - 100% similarity] R +0 -0 \
src/daemon/org.kde.kmixd.service.cmake [from: src/daemon2/org.kde.kmixd.service.cmake \
- 100% similarity] D +0 -66 src/daemon2/CMakeLists.txt
D +0 -108 src/daemon2/KMixDApp.cpp
D +0 -57 src/daemon2/KMixDApp.h
A +4 -0 src/dbus/CMakeLists.txt
M +10 -40 src/gui/CMakeLists.txt
R +0 -0 src/gui/ControlGroupTab.cpp [from: src/gui2/ControlGroupTab.cpp - 100% \
similarity] R +0 -0 src/gui/ControlGroupTab.h [from: \
src/gui2/ControlGroupTab.h - 100% similarity] R +0 -0 \
src/gui/ControlMonitor.cpp [from: src/gui2/ControlMonitor.cpp - 100% similarity] R \
+0 -0 src/gui/ControlMonitor.h [from: src/gui2/ControlMonitor.h - 100% \
similarity] R +0 -0 src/gui/ControlSlider.cpp [from: \
src/gui2/ControlSlider.cpp - 100% similarity] R +0 -0 src/gui/ControlSlider.h \
[from: src/gui2/ControlSlider.h - 100% similarity] M +15 -90 src/gui/KMixApp.cpp
M +2 -9 src/gui/KMixApp.h
R +0 -3 src/gui/KMixWindow.cpp [from: src/gui2/KMixWindow.cpp - 098% \
similarity] R +0 -3 src/gui/KMixWindow.h [from: src/gui2/KMixWindow.h - 098% \
similarity] M +2 -10 src/gui/main.cpp
D +0 -36 src/gui2/CMakeLists.txt
D +0 -65 src/gui2/KMixApp.cpp
D +0 -41 src/gui2/KMixApp.h
D +0 -72 src/gui2/main.cpp
A +4 -0 src/version.h.in
http://commits.kde.org/kmix/ba6cc9321725ceee650d83eb5a4da611c10f69b0
diff --git a/CMakeLists.txt b/CMakeLists.txt
index eedc928..ebd138f 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1,7 +1,14 @@
project(kmix)
+set(CMAKE_INCLUDE_CURRENT_DIR TRUE)
+
set(CMAKE_MODULE_PATH ${CMAKE_SOURCE_DIR}/cmake/modules ${CMAKE_MODULE_PATH})
+set(KMIX_VERSION_MAJOR 4)
+set(KMIX_VERSION_MINOR 2)
+set(KMIX_VERSION_PATCH 0)
+set(KMIX_VERSION "${KMIX_VERSION_MAJOR}.${KMIX_VERSION_MINOR}.${KMIX_VERSION_PATCH}")
+
find_package(KDE4 REQUIRED)
include(KDE4Defaults)
include(MacroLibrary)
@@ -19,7 +26,8 @@ alsa_configure_file(${CMAKE_BINARY_DIR}/config-alsa.h)
add_definitions (${QT_DEFINITIONS} ${QT_QTDBUS_DEFINITIONS} ${KDE4_DEFINITIONS} )
add_definitions(-DKDE_DEFAULT_DEBUG_AREA=67100)
-include_directories (${CMAKE_SOURCE_DIR} ${CMAKE_BINARY_DIR} ${KDE4_INCLUDES} \
${CMAKE_SOURCE_DIR}/src ) +include_directories (${KDE4_INCLUDES})
+
if(MSVC)
include_directories( ${TAGLIB_INCLUDES} )
endif(MSVC)
@@ -27,16 +35,8 @@ endif(MSVC)
configure_file (config.h.cmake ${CMAKE_CURRENT_BINARY_DIR}/config.h )
-
include_directories( ${GLIB2_INCLUDE_DIR} /usr/lib/oss/include)
-add_subdirectory( doc )
-add_subdirectory( icons )
-add_subdirectory( pics )
-add_subdirectory( profiles )
-add_subdirectory( src/daemon2 )
-#add_subdirectory( tests )
-
if (PULSEAUDIO_FOUND)
add_definitions(-DHAVE_PULSE)
@@ -49,24 +49,12 @@ if (CANBERRA_FOUND)
include_directories(${CANBERRA_INCLUDE_DIRS})
endif (CANBERRA_FOUND)
-set(kmix_adaptor_SRCS
- src/dbus/dbusmixerwrapper.cpp
- src/dbus/dbusmixsetwrapper.cpp
- src/dbus/dbuscontrolwrapper.cpp)
-qt4_add_dbus_adaptor( kmix_adaptor_SRCS src/dbus/org.kde.kmix.control.xml
- src/dbus/dbuscontrolwrapper.h DBusControlWrapper )
-qt4_add_dbus_adaptor( kmix_adaptor_SRCS src/dbus/org.kde.kmix.mixer.xml
- src/dbus/dbusmixerwrapper.h DBusMixerWrapper )
-qt4_add_dbus_adaptor( kmix_adaptor_SRCS src/dbus/org.kde.kmix.mixset.xml
- src/dbus/dbusmixsetwrapper.h DBusMixSetWrapper )
-
-add_subdirectory( src/gui2 )
-
-########### next target ###############
-#add_subdirectory( src/plasma )
-
-install( FILES src/dbus/org.kde.kmix.control.xml DESTINATION \
${DBUS_INTERFACES_INSTALL_DIR} )
-install( FILES src/dbus/org.kde.kmix.mixer.xml DESTINATION \
${DBUS_INTERFACES_INSTALL_DIR} )
-install( FILES src/dbus/org.kde.kmix.mixset.xml DESTINATION \
${DBUS_INTERFACES_INSTALL_DIR} ) +add_subdirectory( doc )
+add_subdirectory( icons )
+add_subdirectory( pics )
+add_subdirectory( profiles )
+add_subdirectory( src )
+#add_subdirectory( tests )
+
macro_display_feature_log()
diff --git a/src/backends/kmix-backends.cpp b/oldsrc/backends/kmix-backends.cpp
similarity index 100%
rename from src/backends/kmix-backends.cpp
rename to oldsrc/backends/kmix-backends.cpp
diff --git a/src/backends/mixer_alsa.h b/oldsrc/backends/mixer_alsa.h
similarity index 100%
rename from src/backends/mixer_alsa.h
rename to oldsrc/backends/mixer_alsa.h
diff --git a/src/backends/mixer_alsa9.cpp b/oldsrc/backends/mixer_alsa9.cpp
similarity index 100%
rename from src/backends/mixer_alsa9.cpp
rename to oldsrc/backends/mixer_alsa9.cpp
diff --git a/src/backends/mixer_backend.cpp b/oldsrc/backends/mixer_backend.cpp
similarity index 100%
rename from src/backends/mixer_backend.cpp
rename to oldsrc/backends/mixer_backend.cpp
diff --git a/src/backends/mixer_backend.h b/oldsrc/backends/mixer_backend.h
similarity index 100%
rename from src/backends/mixer_backend.h
rename to oldsrc/backends/mixer_backend.h
diff --git a/src/backends/mixer_backend_i18n.cpp \
b/oldsrc/backends/mixer_backend_i18n.cpp similarity index 100%
rename from src/backends/mixer_backend_i18n.cpp
rename to oldsrc/backends/mixer_backend_i18n.cpp
diff --git a/src/backends/mixer_mpris2.cpp b/oldsrc/backends/mixer_mpris2.cpp
similarity index 100%
rename from src/backends/mixer_mpris2.cpp
rename to oldsrc/backends/mixer_mpris2.cpp
diff --git a/src/backends/mixer_mpris2.h b/oldsrc/backends/mixer_mpris2.h
similarity index 100%
rename from src/backends/mixer_mpris2.h
rename to oldsrc/backends/mixer_mpris2.h
diff --git a/src/backends/mixer_oss.cpp b/oldsrc/backends/mixer_oss.cpp
similarity index 100%
rename from src/backends/mixer_oss.cpp
rename to oldsrc/backends/mixer_oss.cpp
diff --git a/src/backends/mixer_oss.h b/oldsrc/backends/mixer_oss.h
similarity index 100%
rename from src/backends/mixer_oss.h
rename to oldsrc/backends/mixer_oss.h
diff --git a/src/backends/mixer_oss4.cpp b/oldsrc/backends/mixer_oss4.cpp
similarity index 100%
rename from src/backends/mixer_oss4.cpp
rename to oldsrc/backends/mixer_oss4.cpp
diff --git a/src/backends/mixer_oss4.h b/oldsrc/backends/mixer_oss4.h
similarity index 100%
rename from src/backends/mixer_oss4.h
rename to oldsrc/backends/mixer_oss4.h
diff --git a/src/backends/mixer_pulse.cpp b/oldsrc/backends/mixer_pulse.cpp
similarity index 100%
rename from src/backends/mixer_pulse.cpp
rename to oldsrc/backends/mixer_pulse.cpp
diff --git a/src/backends/mixer_pulse.h b/oldsrc/backends/mixer_pulse.h
similarity index 100%
rename from src/backends/mixer_pulse.h
rename to oldsrc/backends/mixer_pulse.h
diff --git a/src/backends/mixer_sun.cpp b/oldsrc/backends/mixer_sun.cpp
similarity index 100%
rename from src/backends/mixer_sun.cpp
rename to oldsrc/backends/mixer_sun.cpp
diff --git a/src/backends/mixer_sun.h b/oldsrc/backends/mixer_sun.h
similarity index 100%
rename from src/backends/mixer_sun.h
rename to oldsrc/backends/mixer_sun.h
diff --git a/src/core/ControlPool.cpp b/oldsrc/core/ControlPool.cpp
similarity index 100%
rename from src/core/ControlPool.cpp
rename to oldsrc/core/ControlPool.cpp
diff --git a/src/core/ControlPool.h b/oldsrc/core/ControlPool.h
similarity index 100%
rename from src/core/ControlPool.h
rename to oldsrc/core/ControlPool.h
diff --git a/src/core/MasterControl.cpp b/oldsrc/core/MasterControl.cpp
similarity index 100%
rename from src/core/MasterControl.cpp
rename to oldsrc/core/MasterControl.cpp
diff --git a/src/core/MasterControl.h b/oldsrc/core/MasterControl.h
similarity index 100%
rename from src/core/MasterControl.h
rename to oldsrc/core/MasterControl.h
diff --git a/src/core/kmixdevicemanager.cpp b/oldsrc/core/kmixdevicemanager.cpp
similarity index 100%
rename from src/core/kmixdevicemanager.cpp
rename to oldsrc/core/kmixdevicemanager.cpp
diff --git a/src/core/kmixdevicemanager.h b/oldsrc/core/kmixdevicemanager.h
similarity index 100%
rename from src/core/kmixdevicemanager.h
rename to oldsrc/core/kmixdevicemanager.h
diff --git a/src/core/mixdevice.cpp b/oldsrc/core/mixdevice.cpp
similarity index 100%
rename from src/core/mixdevice.cpp
rename to oldsrc/core/mixdevice.cpp
diff --git a/src/core/mixdevice.h b/oldsrc/core/mixdevice.h
similarity index 100%
rename from src/core/mixdevice.h
rename to oldsrc/core/mixdevice.h
diff --git a/src/core/mixdevicecomposite.cpp b/oldsrc/core/mixdevicecomposite.cpp
similarity index 100%
rename from src/core/mixdevicecomposite.cpp
rename to oldsrc/core/mixdevicecomposite.cpp
diff --git a/src/core/mixdevicecomposite.h b/oldsrc/core/mixdevicecomposite.h
similarity index 100%
rename from src/core/mixdevicecomposite.h
rename to oldsrc/core/mixdevicecomposite.h
diff --git a/src/core/mixer.cpp b/oldsrc/core/mixer.cpp
similarity index 100%
rename from src/core/mixer.cpp
rename to oldsrc/core/mixer.cpp
diff --git a/src/core/mixer.h b/oldsrc/core/mixer.h
similarity index 100%
rename from src/core/mixer.h
rename to oldsrc/core/mixer.h
diff --git a/src/core/mixertoolbox.cpp b/oldsrc/core/mixertoolbox.cpp
similarity index 100%
rename from src/core/mixertoolbox.cpp
rename to oldsrc/core/mixertoolbox.cpp
diff --git a/src/core/mixertoolbox.h b/oldsrc/core/mixertoolbox.h
similarity index 100%
rename from src/core/mixertoolbox.h
rename to oldsrc/core/mixertoolbox.h
diff --git a/src/core/mixset.cpp b/oldsrc/core/mixset.cpp
similarity index 100%
rename from src/core/mixset.cpp
rename to oldsrc/core/mixset.cpp
diff --git a/src/core/mixset.h b/oldsrc/core/mixset.h
similarity index 100%
rename from src/core/mixset.h
rename to oldsrc/core/mixset.h
diff --git a/src/core/version.h b/oldsrc/core/version.h
similarity index 100%
rename from src/core/version.h
rename to oldsrc/core/version.h
diff --git a/src/core/volume.cpp b/oldsrc/core/volume.cpp
similarity index 100%
rename from src/core/volume.cpp
rename to oldsrc/core/volume.cpp
diff --git a/src/core/volume.h b/oldsrc/core/volume.h
similarity index 100%
rename from src/core/volume.h
rename to oldsrc/core/volume.h
diff --git a/src/daemon/CMakeLists.txt b/oldsrc/daemon/CMakeLists.txt
similarity index 100%
copy from src/daemon/CMakeLists.txt
copy to oldsrc/daemon/CMakeLists.txt
diff --git a/src/daemon/KMixDApp.cpp b/oldsrc/daemon/KMixDApp.cpp
similarity index 100%
copy from src/daemon/KMixDApp.cpp
copy to oldsrc/daemon/KMixDApp.cpp
diff --git a/src/daemon/KMixDApp.h b/oldsrc/daemon/KMixDApp.h
similarity index 100%
copy from src/daemon/KMixDApp.h
copy to oldsrc/daemon/KMixDApp.h
diff --git a/src/daemon2/main.cpp b/oldsrc/daemon/main.cpp
similarity index 100%
rename from src/daemon2/main.cpp
rename to oldsrc/daemon/main.cpp
diff --git a/src/daemon/org.kde.kmix.service.cmake \
b/oldsrc/daemon/org.kde.kmix.service.cmake similarity index 100%
rename from src/daemon/org.kde.kmix.service.cmake
rename to oldsrc/daemon/org.kde.kmix.service.cmake
diff --git a/src/dbus/dbuscontrolwrapper.cpp b/oldsrc/dbus/dbuscontrolwrapper.cpp
similarity index 100%
rename from src/dbus/dbuscontrolwrapper.cpp
rename to oldsrc/dbus/dbuscontrolwrapper.cpp
diff --git a/src/dbus/dbuscontrolwrapper.h b/oldsrc/dbus/dbuscontrolwrapper.h
similarity index 100%
rename from src/dbus/dbuscontrolwrapper.h
rename to oldsrc/dbus/dbuscontrolwrapper.h
diff --git a/src/dbus/dbusmixerwrapper.cpp b/oldsrc/dbus/dbusmixerwrapper.cpp
similarity index 100%
rename from src/dbus/dbusmixerwrapper.cpp
rename to oldsrc/dbus/dbusmixerwrapper.cpp
diff --git a/src/dbus/dbusmixerwrapper.h b/oldsrc/dbus/dbusmixerwrapper.h
similarity index 100%
rename from src/dbus/dbusmixerwrapper.h
rename to oldsrc/dbus/dbusmixerwrapper.h
diff --git a/src/dbus/dbusmixsetwrapper.cpp b/oldsrc/dbus/dbusmixsetwrapper.cpp
similarity index 100%
rename from src/dbus/dbusmixsetwrapper.cpp
rename to oldsrc/dbus/dbusmixsetwrapper.cpp
diff --git a/src/dbus/dbusmixsetwrapper.h b/oldsrc/dbus/dbusmixsetwrapper.h
similarity index 100%
rename from src/dbus/dbusmixsetwrapper.h
rename to oldsrc/dbus/dbusmixsetwrapper.h
diff --git a/src/dbus/org.kde.kmix.mixer.xml b/oldsrc/dbus/org.kde.kmix.mixer.xml
similarity index 100%
rename from src/dbus/org.kde.kmix.mixer.xml
rename to oldsrc/dbus/org.kde.kmix.mixer.xml
diff --git a/src/dbus/org.kde.kmix.mixset.xml b/oldsrc/dbus/org.kde.kmix.mixset.xml
similarity index 100%
rename from src/dbus/org.kde.kmix.mixset.xml
rename to oldsrc/dbus/org.kde.kmix.mixset.xml
diff --git a/src/gui/CMakeLists.txt b/oldsrc/gui/CMakeLists.txt
similarity index 100%
copy from src/gui/CMakeLists.txt
copy to oldsrc/gui/CMakeLists.txt
diff --git a/src/gui/KMixApp.cpp b/oldsrc/gui/KMixApp.cpp
similarity index 100%
copy from src/gui/KMixApp.cpp
copy to oldsrc/gui/KMixApp.cpp
diff --git a/src/gui/KMixApp.h b/oldsrc/gui/KMixApp.h
similarity index 100%
copy from src/gui/KMixApp.h
copy to oldsrc/gui/KMixApp.h
diff --git a/src/gui/dialogaddview.cpp b/oldsrc/gui/dialogaddview.cpp
similarity index 100%
rename from src/gui/dialogaddview.cpp
rename to oldsrc/gui/dialogaddview.cpp
diff --git a/src/gui/dialogaddview.h b/oldsrc/gui/dialogaddview.h
similarity index 100%
rename from src/gui/dialogaddview.h
rename to oldsrc/gui/dialogaddview.h
diff --git a/src/gui/dialogselectmaster.cpp b/oldsrc/gui/dialogselectmaster.cpp
similarity index 100%
rename from src/gui/dialogselectmaster.cpp
rename to oldsrc/gui/dialogselectmaster.cpp
diff --git a/src/gui/dialogselectmaster.h b/oldsrc/gui/dialogselectmaster.h
similarity index 100%
rename from src/gui/dialogselectmaster.h
rename to oldsrc/gui/dialogselectmaster.h
diff --git a/src/gui/dialogviewconfiguration.cpp \
b/oldsrc/gui/dialogviewconfiguration.cpp similarity index 100%
rename from src/gui/dialogviewconfiguration.cpp
rename to oldsrc/gui/dialogviewconfiguration.cpp
diff --git a/src/gui/dialogviewconfiguration.h b/oldsrc/gui/dialogviewconfiguration.h
similarity index 100%
rename from src/gui/dialogviewconfiguration.h
rename to oldsrc/gui/dialogviewconfiguration.h
diff --git a/src/gui/guiprofile.cpp b/oldsrc/gui/guiprofile.cpp
similarity index 100%
rename from src/gui/guiprofile.cpp
rename to oldsrc/gui/guiprofile.cpp
diff --git a/src/gui/guiprofile.h b/oldsrc/gui/guiprofile.h
similarity index 100%
rename from src/gui/guiprofile.h
rename to oldsrc/gui/guiprofile.h
diff --git a/src/gui/kmix.cpp b/oldsrc/gui/kmix.cpp
similarity index 100%
rename from src/gui/kmix.cpp
rename to oldsrc/gui/kmix.cpp
diff --git a/src/gui2/kmix.desktop b/oldsrc/gui/kmix.desktop
similarity index 100%
rename from src/gui2/kmix.desktop
rename to oldsrc/gui/kmix.desktop
diff --git a/src/gui/kmix.h b/oldsrc/gui/kmix.h
similarity index 100%
rename from src/gui/kmix.h
rename to oldsrc/gui/kmix.h
diff --git a/src/gui2/kmix_autostart.desktop b/oldsrc/gui/kmix_autostart.desktop
similarity index 100%
rename from src/gui2/kmix_autostart.desktop
rename to oldsrc/gui/kmix_autostart.desktop
diff --git a/src/gui/kmixdockwidget.cpp b/oldsrc/gui/kmixdockwidget.cpp
similarity index 100%
rename from src/gui/kmixdockwidget.cpp
rename to oldsrc/gui/kmixdockwidget.cpp
diff --git a/src/gui/kmixdockwidget.h b/oldsrc/gui/kmixdockwidget.h
similarity index 100%
rename from src/gui/kmixdockwidget.h
rename to oldsrc/gui/kmixdockwidget.h
diff --git a/src/gui/kmixerwidget.cpp b/oldsrc/gui/kmixerwidget.cpp
similarity index 100%
rename from src/gui/kmixerwidget.cpp
rename to oldsrc/gui/kmixerwidget.cpp
diff --git a/src/gui/kmixerwidget.h b/oldsrc/gui/kmixerwidget.h
similarity index 100%
rename from src/gui/kmixerwidget.h
rename to oldsrc/gui/kmixerwidget.h
diff --git a/src/gui/kmixprefdlg.cpp b/oldsrc/gui/kmixprefdlg.cpp
similarity index 100%
rename from src/gui/kmixprefdlg.cpp
rename to oldsrc/gui/kmixprefdlg.cpp
diff --git a/src/gui/kmixprefdlg.h b/oldsrc/gui/kmixprefdlg.h
similarity index 100%
rename from src/gui/kmixprefdlg.h
rename to oldsrc/gui/kmixprefdlg.h
diff --git a/src/gui/kmixtoolbox.cpp b/oldsrc/gui/kmixtoolbox.cpp
similarity index 100%
rename from src/gui/kmixtoolbox.cpp
rename to oldsrc/gui/kmixtoolbox.cpp
diff --git a/src/gui/kmixtoolbox.h b/oldsrc/gui/kmixtoolbox.h
similarity index 100%
rename from src/gui/kmixtoolbox.h
rename to oldsrc/gui/kmixtoolbox.h
diff --git a/src/gui2/kmixui.rc b/oldsrc/gui/kmixui.rc
similarity index 100%
rename from src/gui2/kmixui.rc
rename to oldsrc/gui/kmixui.rc
diff --git a/src/gui/ksmallslider.cpp b/oldsrc/gui/ksmallslider.cpp
similarity index 100%
rename from src/gui/ksmallslider.cpp
rename to oldsrc/gui/ksmallslider.cpp
diff --git a/src/gui/ksmallslider.h b/oldsrc/gui/ksmallslider.h
similarity index 100%
rename from src/gui/ksmallslider.h
rename to oldsrc/gui/ksmallslider.h
diff --git a/src/gui/main.cpp b/oldsrc/gui/main.cpp
similarity index 100%
copy from src/gui/main.cpp
copy to oldsrc/gui/main.cpp
diff --git a/src/gui/mdwenum.cpp b/oldsrc/gui/mdwenum.cpp
similarity index 100%
rename from src/gui/mdwenum.cpp
rename to oldsrc/gui/mdwenum.cpp
diff --git a/src/gui/mdwenum.h b/oldsrc/gui/mdwenum.h
similarity index 100%
rename from src/gui/mdwenum.h
rename to oldsrc/gui/mdwenum.h
diff --git a/src/gui/mdwmoveaction.cpp b/oldsrc/gui/mdwmoveaction.cpp
similarity index 100%
rename from src/gui/mdwmoveaction.cpp
rename to oldsrc/gui/mdwmoveaction.cpp
diff --git a/src/gui/mdwmoveaction.h b/oldsrc/gui/mdwmoveaction.h
similarity index 100%
rename from src/gui/mdwmoveaction.h
rename to oldsrc/gui/mdwmoveaction.h
diff --git a/src/gui/mdwslider.cpp b/oldsrc/gui/mdwslider.cpp
similarity index 100%
rename from src/gui/mdwslider.cpp
rename to oldsrc/gui/mdwslider.cpp
diff --git a/src/gui/mdwslider.h b/oldsrc/gui/mdwslider.h
similarity index 100%
rename from src/gui/mdwslider.h
rename to oldsrc/gui/mdwslider.h
diff --git a/src/gui/mdwswitch.cpp b/oldsrc/gui/mdwswitch.cpp
similarity index 100%
rename from src/gui/mdwswitch.cpp
rename to oldsrc/gui/mdwswitch.cpp
diff --git a/src/gui/mdwswitch.h b/oldsrc/gui/mdwswitch.h
similarity index 100%
rename from src/gui/mdwswitch.h
rename to oldsrc/gui/mdwswitch.h
diff --git a/src/gui/mixdevicewidget.cpp b/oldsrc/gui/mixdevicewidget.cpp
similarity index 100%
rename from src/gui/mixdevicewidget.cpp
rename to oldsrc/gui/mixdevicewidget.cpp
diff --git a/src/gui/mixdevicewidget.h b/oldsrc/gui/mixdevicewidget.h
similarity index 100%
rename from src/gui/mixdevicewidget.h
rename to oldsrc/gui/mixdevicewidget.h
diff --git a/src/gui/osdwidget.cpp b/oldsrc/gui/osdwidget.cpp
similarity index 100%
rename from src/gui/osdwidget.cpp
rename to oldsrc/gui/osdwidget.cpp
diff --git a/src/gui/osdwidget.h b/oldsrc/gui/osdwidget.h
similarity index 100%
rename from src/gui/osdwidget.h
rename to oldsrc/gui/osdwidget.h
diff --git a/src/gui/verticaltext.cpp b/oldsrc/gui/verticaltext.cpp
similarity index 100%
rename from src/gui/verticaltext.cpp
rename to oldsrc/gui/verticaltext.cpp
diff --git a/src/gui/verticaltext.h b/oldsrc/gui/verticaltext.h
similarity index 100%
rename from src/gui/verticaltext.h
rename to oldsrc/gui/verticaltext.h
diff --git a/src/gui/viewbase.cpp b/oldsrc/gui/viewbase.cpp
similarity index 100%
rename from src/gui/viewbase.cpp
rename to oldsrc/gui/viewbase.cpp
diff --git a/src/gui/viewbase.h b/oldsrc/gui/viewbase.h
similarity index 100%
rename from src/gui/viewbase.h
rename to oldsrc/gui/viewbase.h
diff --git a/src/gui/viewdockareapopup.cpp b/oldsrc/gui/viewdockareapopup.cpp
similarity index 100%
rename from src/gui/viewdockareapopup.cpp
rename to oldsrc/gui/viewdockareapopup.cpp
diff --git a/src/gui/viewdockareapopup.h b/oldsrc/gui/viewdockareapopup.h
similarity index 100%
rename from src/gui/viewdockareapopup.h
rename to oldsrc/gui/viewdockareapopup.h
diff --git a/src/gui/viewsliders.cpp b/oldsrc/gui/viewsliders.cpp
similarity index 100%
rename from src/gui/viewsliders.cpp
rename to oldsrc/gui/viewsliders.cpp
diff --git a/src/gui/viewsliders.h b/oldsrc/gui/viewsliders.h
similarity index 100%
rename from src/gui/viewsliders.h
rename to oldsrc/gui/viewsliders.h
diff --git a/src/gui/volumeslider.cpp b/oldsrc/gui/volumeslider.cpp
similarity index 100%
rename from src/gui/volumeslider.cpp
rename to oldsrc/gui/volumeslider.cpp
diff --git a/src/gui/volumeslider.h b/oldsrc/gui/volumeslider.h
similarity index 100%
rename from src/gui/volumeslider.h
rename to oldsrc/gui/volumeslider.h
diff --git a/src/gui/volumesliderextradata.h b/oldsrc/gui/volumesliderextradata.h
similarity index 100%
rename from src/gui/volumesliderextradata.h
rename to oldsrc/gui/volumesliderextradata.h
diff --git a/src/plasma/CMakeLists.txt b/oldsrc/plasma/CMakeLists.txt
similarity index 100%
rename from src/plasma/CMakeLists.txt
rename to oldsrc/plasma/CMakeLists.txt
diff --git a/src/plasma/engine/CMakeLists.txt b/oldsrc/plasma/engine/CMakeLists.txt
similarity index 100%
rename from src/plasma/engine/CMakeLists.txt
rename to oldsrc/plasma/engine/CMakeLists.txt
diff --git a/src/plasma/engine/mixer.operations \
b/oldsrc/plasma/engine/mixer.operations similarity index 100%
rename from src/plasma/engine/mixer.operations
rename to oldsrc/plasma/engine/mixer.operations
diff --git a/src/plasma/engine/mixerengine.cpp b/oldsrc/plasma/engine/mixerengine.cpp
similarity index 100%
rename from src/plasma/engine/mixerengine.cpp
rename to oldsrc/plasma/engine/mixerengine.cpp
diff --git a/src/plasma/engine/mixerengine.h b/oldsrc/plasma/engine/mixerengine.h
similarity index 100%
rename from src/plasma/engine/mixerengine.h
rename to oldsrc/plasma/engine/mixerengine.h
diff --git a/src/plasma/engine/mixerservice.cpp \
b/oldsrc/plasma/engine/mixerservice.cpp similarity index 100%
rename from src/plasma/engine/mixerservice.cpp
rename to oldsrc/plasma/engine/mixerservice.cpp
diff --git a/src/plasma/engine/mixerservice.h b/oldsrc/plasma/engine/mixerservice.h
similarity index 100%
rename from src/plasma/engine/mixerservice.h
rename to oldsrc/plasma/engine/mixerservice.h
diff --git a/src/plasma/engine/plasma-engine-mixer.desktop \
b/oldsrc/plasma/engine/plasma-engine-mixer.desktop similarity index 100%
rename from src/plasma/engine/plasma-engine-mixer.desktop
rename to oldsrc/plasma/engine/plasma-engine-mixer.desktop
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
new file mode 100644
index 0000000..7f01a19
--- /dev/null
+++ b/src/CMakeLists.txt
@@ -0,0 +1,5 @@
+configure_file(${CMAKE_CURRENT_SOURCE_DIR}/version.h.in \
${CMAKE_CURRENT_BINARY_DIR}/version.h) +
+add_subdirectory( daemon )
+add_subdirectory( gui )
+add_subdirectory( dbus )
diff --git a/src/daemon2/Backend.cpp b/src/daemon/Backend.cpp
similarity index 100%
rename from src/daemon2/Backend.cpp
rename to src/daemon/Backend.cpp
diff --git a/src/daemon2/Backend.h b/src/daemon/Backend.h
similarity index 100%
rename from src/daemon2/Backend.h
rename to src/daemon/Backend.h
diff --git a/src/daemon2/BackendManager.cpp b/src/daemon/BackendManager.cpp
similarity index 100%
rename from src/daemon2/BackendManager.cpp
rename to src/daemon/BackendManager.cpp
diff --git a/src/daemon2/BackendManager.h b/src/daemon/BackendManager.h
similarity index 100%
rename from src/daemon2/BackendManager.h
rename to src/daemon/BackendManager.h
diff --git a/src/daemon/CMakeLists.txt b/src/daemon/CMakeLists.txt
index 13e866d..b090c8d 100644
--- a/src/daemon/CMakeLists.txt
+++ b/src/daemon/CMakeLists.txt
@@ -1,42 +1,37 @@
-
-set(kmixd_backend_SRCS
- ../backends/mixer_backend.cpp
- ../backends/mixer_mpris2.cpp
- )
-
-if (HAVE_LIBASOUND2)
- set(kmixd_backend_SRCS ${kmixd_backend_SRCS}
- ../backends/mixer_alsa9.cpp )
-endif (HAVE_LIBASOUND2)
-
-if (PULSEAUDIO_FOUND)
- set(kmixd_backend_SRCS ${kmixd_backend_SRCS}
- ../backends/mixer_pulse.cpp )
-endif (PULSEAUDIO_FOUND)
-
set(kmixd_SRCS
main.cpp
KMixDApp.cpp
- ../dbus/dbusmixsetwrapper.cpp
- ../dbus/dbusmixerwrapper.cpp
- ../dbus/dbuscontrolwrapper.cpp
- ../core/mixertoolbox.cpp
- ../core/kmixdevicemanager.cpp
- ../core/ControlPool.cpp
- ../core/MasterControl.cpp
- ../core/mixer.cpp
- ../core/mixset.cpp
- ../core/mixdevice.cpp
- ../core/mixdevicecomposite.cpp
- ../core/volume.cpp
+ Backend.cpp
+ BackendManager.cpp
+ ControlGroup.cpp
+ Control.cpp
)
-qt4_add_dbus_adaptor( kmixd_SRCS ../dbus/org.kde.kmix.mixset.xml
- ../dbus/dbusmixsetwrapper.h DBusMixSetWrapper )
+if (HAVE_LIBASOUND2)
+ set(kmixd_SRCS ${kmixd_SRCS}
+ backends/ALSA.cpp
+ backends/ALSAControl.cpp
+ )
+endif()
+
+if (PULSEAUDIO_FOUND)
+ set(kmixd_SRCS ${kmixd_SRCS}
+ backends/PulseAudio.cpp
+ backends/PulseControl.cpp
+ backends/PulseSourceOutputControl.cpp
+ backends/PulseSinkInputControl.cpp
+ backends/PulseSinkControl.cpp
+ )
+endif()
+
+qt4_add_dbus_adaptor( kmixd_SRCS ../dbus/org.kde.kmix.kmixd.xml
+ KMixDApp.h KMixDApp )
qt4_add_dbus_adaptor( kmixd_SRCS ../dbus/org.kde.kmix.control.xml
- ../dbus/dbuscontrolwrapper.h DBusControlWrapper )
-qt4_add_dbus_adaptor( kmixd_SRCS ../dbus/org.kde.kmix.mixer.xml
- ../dbus/dbusmixerwrapper.h DBusMixerWrapper )
+ Control.h Control )
+qt4_add_dbus_adaptor( kmixd_SRCS ../dbus/org.kde.kmix.controlgroup.xml
+ ControlGroup.h ControlGroup )
+qt4_add_dbus_interface(kmixd_SRCS ../dbus/org.kde.kmix.controlmonitor.xml
+ controlmonitor_interface)
kde4_add_executable(kmixd ${kmixd_SRCS} ${kmixd_backend_SRCS})
@@ -57,7 +52,7 @@ endif (PULSEAUDIO_FOUND)
install( TARGETS kmixd ${INSTALL_TARGETS_DEFAULT_ARGS} )
-configure_file(org.kde.kmix.service.cmake
- ${CMAKE_CURRENT_BINARY_DIR}/org.kde.kmix.service)
+configure_file(org.kde.kmixd.service.cmake
+ ${CMAKE_CURRENT_BINARY_DIR}/org.kde.kmixd.service)
-install( FILES ${CMAKE_CURRENT_BINARY_DIR}/org.kde.kmix.service DESTINATION \
${DBUS_SERVICES_INSTALL_DIR} ) +install( FILES \
${CMAKE_CURRENT_BINARY_DIR}/org.kde.kmixd.service DESTINATION \
${DBUS_SERVICES_INSTALL_DIR} )
diff --git a/src/daemon2/Control.cpp b/src/daemon/Control.cpp
similarity index 100%
rename from src/daemon2/Control.cpp
rename to src/daemon/Control.cpp
diff --git a/src/daemon2/Control.h b/src/daemon/Control.h
similarity index 100%
rename from src/daemon2/Control.h
rename to src/daemon/Control.h
diff --git a/src/daemon2/ControlGroup.cpp b/src/daemon/ControlGroup.cpp
similarity index 100%
rename from src/daemon2/ControlGroup.cpp
rename to src/daemon/ControlGroup.cpp
diff --git a/src/daemon2/ControlGroup.h b/src/daemon/ControlGroup.h
similarity index 100%
rename from src/daemon2/ControlGroup.h
rename to src/daemon/ControlGroup.h
diff --git a/src/daemon/KMixDApp.cpp b/src/daemon/KMixDApp.cpp
index 800c7bb..ed3553e 100644
--- a/src/daemon/KMixDApp.cpp
+++ b/src/daemon/KMixDApp.cpp
@@ -19,17 +19,20 @@
*/
#include "KMixDApp.h"
-#include "core/ControlPool.h"
-#include "core/kmixdevicemanager.h"
-#include "core/mixertoolbox.h"
-#include "dbus/dbusmixsetwrapper.h"
+#include "kmixdadaptor.h"
+#include "ControlGroup.h"
+#include "BackendManager.h"
+#include "Control.h"
#include <QtDBus/QDBusConnection>
#include <QtCore/QDebug>
KMixDApp::KMixDApp(int &argc, char **argv)
: QCoreApplication(argc, argv)
+ , m_master(0)
{
+ connect(BackendManager::instance(), SIGNAL(controlAdded(Control*)), this, \
SLOT(controlAdded(Control*))); + connect(BackendManager::instance(), \
SIGNAL(controlRemoved(Control*)), this, SLOT(controlRemoved(Control*))); }
KMixDApp::~KMixDApp()
@@ -38,22 +41,68 @@ KMixDApp::~KMixDApp()
int KMixDApp::start()
{
- int ret = 1;
-
if (QDBusConnection::sessionBus().registerService("org.kde.kmixd")) {
- MixerToolBox::instance()->initMixer();
- KMixDeviceManager *devs = KMixDeviceManager::instance();
- devs->initHotplug();
- DBusMixSetWrapper *wrapper = new DBusMixSetWrapper( this, "/Mixers");
- connect( devs, SIGNAL(plugged(const char*,QString,QString&)),
- wrapper, SIGNAL(mixersChanged()) );
- connect( devs, SIGNAL(unplugged(QString)),
- wrapper, SIGNAL(mixersChanged()) );
- ret = exec();
-
- MixerToolBox::cleanup();
- ControlPool::cleanup();
- KMixDeviceManager::cleanup();
+ new KMixDAdaptor(this);
+ QDBusConnection::sessionBus().registerObject("/KMixD", this);
+ return exec();
+ }
+ return 1;
+}
+
+void KMixDApp::setMaster(int id)
+{
+ Q_ASSERT(false);
+}
+
+QStringList KMixDApp::mixerGroups() const
+{
+ QStringList ret;
+ foreach(ControlGroup *group, BackendManager::instance()->groups()) {
+ ret << QString("/groups/%1").arg(group->id());
}
return ret;
}
+
+QString KMixDApp::masterControl() const
+{
+ return QString("/controls/%1").arg(m_master->id());
+}
+
+int KMixDApp::masterVolume() const
+{
+ if (m_master) {
+ int sum;
+ for(int i = 0;i<m_master->channels();i++) {
+ sum+=m_master->getVolume(i);
+ }
+ return sum/m_master->channels();
+ }
+ return 0;
+}
+
+void KMixDApp::setMasterVolume(int v)
+{
+ if (m_master) {
+ for(int i = 0;i<m_master->channels();i++) {
+ m_master->setVolume(i, v);
+ }
+ }
+}
+
+void KMixDApp::controlAdded(Control *control)
+{
+ if (control->category() == Control::HardwareOutput) {
+ if (m_master)
+ disconnect(m_master, SIGNAL(volumeChanged(int)), this, \
SIGNAL(masterVolumeChanged())); + m_master = control;
+ emit masterChanged(QString("/controls/%1").arg(m_master->id()));
+ connect(m_master, SIGNAL(volumeChanged(int)), this, \
SIGNAL(masterVolumeChanged())); + }
+}
+
+void KMixDApp::controlRemoved(Control *control)
+{
+ if (control == m_master) {
+ m_master = 0;
+ }
+}
diff --git a/src/daemon/KMixDApp.h b/src/daemon/KMixDApp.h
index 31dd35d..27a8cb0 100644
--- a/src/daemon/KMixDApp.h
+++ b/src/daemon/KMixDApp.h
@@ -22,18 +22,36 @@
#define KMixApp_h
#include <QtCore/QCoreApplication>
+#include <QtCore/QStringList>
-class KMixDeviceManager;
+class Control;
class KMixDApp : public QCoreApplication
{
Q_OBJECT
+ Q_PROPERTY(QStringList mixerGroups READ mixerGroups);
+ Q_PROPERTY(QString masterControl READ masterControl);
+ Q_PROPERTY(int masterVolume READ masterVolume WRITE setMasterVolume);
public:
KMixDApp(int &argc, char **argv);
~KMixDApp();
int start();
+ void setMaster(int masterID);
+ QStringList mixerGroups() const;
+ QString masterControl() const;
+
+ int masterVolume() const;
+ void setMasterVolume(int v);
+signals:
+ void groupAdded(const QString &name);
+ void groupRemoved(const QString &name);
+ void masterChanged(const QString &path);
+ void masterVolumeChanged();
+private slots:
+ void controlAdded(Control *);
+ void controlRemoved(Control *);
private:
- KMixDeviceManager *m_devManager;
+ Control *m_master;
};
#endif
diff --git a/src/daemon2/backends/ALSA.cpp b/src/daemon/backends/ALSA.cpp
similarity index 100%
rename from src/daemon2/backends/ALSA.cpp
rename to src/daemon/backends/ALSA.cpp
diff --git a/src/daemon2/backends/ALSA.h b/src/daemon/backends/ALSA.h
similarity index 100%
rename from src/daemon2/backends/ALSA.h
rename to src/daemon/backends/ALSA.h
diff --git a/src/daemon2/backends/ALSAControl.cpp \
b/src/daemon/backends/ALSAControl.cpp similarity index 100%
rename from src/daemon2/backends/ALSAControl.cpp
rename to src/daemon/backends/ALSAControl.cpp
diff --git a/src/daemon2/backends/ALSAControl.h b/src/daemon/backends/ALSAControl.h
similarity index 100%
rename from src/daemon2/backends/ALSAControl.h
rename to src/daemon/backends/ALSAControl.h
diff --git a/src/daemon2/backends/PulseAudio.cpp b/src/daemon/backends/PulseAudio.cpp
similarity index 100%
rename from src/daemon2/backends/PulseAudio.cpp
rename to src/daemon/backends/PulseAudio.cpp
diff --git a/src/daemon2/backends/PulseAudio.h b/src/daemon/backends/PulseAudio.h
similarity index 100%
rename from src/daemon2/backends/PulseAudio.h
rename to src/daemon/backends/PulseAudio.h
diff --git a/src/daemon2/backends/PulseControl.cpp \
b/src/daemon/backends/PulseControl.cpp similarity index 100%
rename from src/daemon2/backends/PulseControl.cpp
rename to src/daemon/backends/PulseControl.cpp
diff --git a/src/daemon2/backends/PulseControl.h b/src/daemon/backends/PulseControl.h
similarity index 100%
rename from src/daemon2/backends/PulseControl.h
rename to src/daemon/backends/PulseControl.h
diff --git a/src/daemon2/backends/PulseSinkControl.cpp \
b/src/daemon/backends/PulseSinkControl.cpp similarity index 100%
rename from src/daemon2/backends/PulseSinkControl.cpp
rename to src/daemon/backends/PulseSinkControl.cpp
diff --git a/src/daemon2/backends/PulseSinkControl.h \
b/src/daemon/backends/PulseSinkControl.h similarity index 100%
rename from src/daemon2/backends/PulseSinkControl.h
rename to src/daemon/backends/PulseSinkControl.h
diff --git a/src/daemon2/backends/PulseSinkInputControl.cpp \
b/src/daemon/backends/PulseSinkInputControl.cpp similarity index 100%
rename from src/daemon2/backends/PulseSinkInputControl.cpp
rename to src/daemon/backends/PulseSinkInputControl.cpp
diff --git a/src/daemon2/backends/PulseSinkInputControl.h \
b/src/daemon/backends/PulseSinkInputControl.h similarity index 100%
rename from src/daemon2/backends/PulseSinkInputControl.h
rename to src/daemon/backends/PulseSinkInputControl.h
diff --git a/src/daemon2/backends/PulseSourceOutputControl.cpp \
b/src/daemon/backends/PulseSourceOutputControl.cpp similarity index 100%
rename from src/daemon2/backends/PulseSourceOutputControl.cpp
rename to src/daemon/backends/PulseSourceOutputControl.cpp
diff --git a/src/daemon2/backends/PulseSourceOutputControl.h \
b/src/daemon/backends/PulseSourceOutputControl.h similarity index 100%
rename from src/daemon2/backends/PulseSourceOutputControl.h
rename to src/daemon/backends/PulseSourceOutputControl.h
diff --git a/src/daemon2/org.kde.kmixd.service.cmake \
b/src/daemon/org.kde.kmixd.service.cmake similarity index 100%
rename from src/daemon2/org.kde.kmixd.service.cmake
rename to src/daemon/org.kde.kmixd.service.cmake
diff --git a/src/daemon2/CMakeLists.txt b/src/daemon2/CMakeLists.txt
deleted file mode 100644
index 905b620..0000000
--- a/src/daemon2/CMakeLists.txt
+++ /dev/null
@@ -1,66 +0,0 @@
-
-#set(kmixd_backend_SRCS
-# ../backends/mixer_backend.cpp
-# ../backends/mixer_mpris2.cpp
-# )
-#
-#if (HAVE_LIBASOUND2)
-# set(kmixd_backend_SRCS ${kmixd_backend_SRCS}
-# ../backends/mixer_alsa9.cpp )
-#endif (HAVE_LIBASOUND2)
-#
-#if (PULSEAUDIO_FOUND)
-# set(kmixd_backend_SRCS ${kmixd_backend_SRCS}
-# ../backends/mixer_pulse.cpp )
-#endif (PULSEAUDIO_FOUND)
-
-set(kmixd_SRCS
- main.cpp
- KMixDApp.cpp
- Backend.cpp
- BackendManager.cpp
- ControlGroup.cpp
- Control.cpp
-
- backends/ALSA.cpp
- backends/ALSAControl.cpp
-
- backends/PulseAudio.cpp
- backends/PulseControl.cpp
- backends/PulseSourceOutputControl.cpp
- backends/PulseSinkInputControl.cpp
- backends/PulseSinkControl.cpp
-)
-
-qt4_add_dbus_adaptor( kmixd_SRCS ../dbus/org.kde.kmix.kmixd.xml
- KMixDApp.h KMixDApp )
-qt4_add_dbus_adaptor( kmixd_SRCS ../dbus/org.kde.kmix.control.xml
- Control.h Control )
-qt4_add_dbus_adaptor( kmixd_SRCS ../dbus/org.kde.kmix.controlgroup.xml
- ControlGroup.h ControlGroup )
-qt4_add_dbus_interface(kmixd_SRCS ../dbus/org.kde.kmix.controlmonitor.xml
- controlmonitor_interface)
-
-kde4_add_executable(kmixd ${kmixd_SRCS} ${kmixd_backend_SRCS})
-
-target_link_libraries(kmixd
- ${QT_QTCORE_LIBRARY}
- ${QT_QTDBUS_LIBRARY}
- ${KDE4_KDEUI_LIBS}
- ${KDE4_SOLID_LIBS}
-)
-
-if (HAVE_LIBASOUND2)
- target_link_libraries(kmixd ${ASOUND_LIBRARY})
-endif (HAVE_LIBASOUND2)
-
-if (PULSEAUDIO_FOUND)
- target_link_libraries(kmixd ${PULSEAUDIO_LIBRARY} ${PULSEAUDIO_MAINLOOP_LIBRARY} \
${GLIB2_LIBRARIES})
-endif (PULSEAUDIO_FOUND)
-
-install( TARGETS kmixd ${INSTALL_TARGETS_DEFAULT_ARGS} )
-
-configure_file(org.kde.kmixd.service.cmake
- ${CMAKE_CURRENT_BINARY_DIR}/org.kde.kmixd.service)
-
-install( FILES ${CMAKE_CURRENT_BINARY_DIR}/org.kde.kmixd.service DESTINATION \
${DBUS_SERVICES_INSTALL_DIR} )
diff --git a/src/daemon2/KMixDApp.cpp b/src/daemon2/KMixDApp.cpp
deleted file mode 100644
index ed3553e..0000000
--- a/src/daemon2/KMixDApp.cpp
+++ /dev/null
@@ -1,108 +0,0 @@
-/*
- * KMix -- KDE's full featured mini mixer
- *
- * Copyright (C) Trever Fischer <tdfischer@fedoraproject.org>
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Library General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Library General Public License for more details.
- *
- * You should have received a copy of the GNU Library General Public
- * License along with this program; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA \
02110-1301, USA.
- */
-
-#include "KMixDApp.h"
-#include "kmixdadaptor.h"
-#include "ControlGroup.h"
-#include "BackendManager.h"
-#include "Control.h"
-
-#include <QtDBus/QDBusConnection>
-#include <QtCore/QDebug>
-
-KMixDApp::KMixDApp(int &argc, char **argv)
- : QCoreApplication(argc, argv)
- , m_master(0)
-{
- connect(BackendManager::instance(), SIGNAL(controlAdded(Control*)), this, \
SLOT(controlAdded(Control*)));
- connect(BackendManager::instance(), SIGNAL(controlRemoved(Control*)), this, \
SLOT(controlRemoved(Control*)));
-}
-
-KMixDApp::~KMixDApp()
-{
-}
-
-int KMixDApp::start()
-{
- if (QDBusConnection::sessionBus().registerService("org.kde.kmixd")) {
- new KMixDAdaptor(this);
- QDBusConnection::sessionBus().registerObject("/KMixD", this);
- return exec();
- }
- return 1;
-}
-
-void KMixDApp::setMaster(int id)
-{
- Q_ASSERT(false);
-}
-
-QStringList KMixDApp::mixerGroups() const
-{
- QStringList ret;
- foreach(ControlGroup *group, BackendManager::instance()->groups()) {
- ret << QString("/groups/%1").arg(group->id());
- }
- return ret;
-}
-
-QString KMixDApp::masterControl() const
-{
- return QString("/controls/%1").arg(m_master->id());
-}
-
-int KMixDApp::masterVolume() const
-{
- if (m_master) {
- int sum;
- for(int i = 0;i<m_master->channels();i++) {
- sum+=m_master->getVolume(i);
- }
- return sum/m_master->channels();
- }
- return 0;
-}
-
-void KMixDApp::setMasterVolume(int v)
-{
- if (m_master) {
- for(int i = 0;i<m_master->channels();i++) {
- m_master->setVolume(i, v);
- }
- }
-}
-
-void KMixDApp::controlAdded(Control *control)
-{
- if (control->category() == Control::HardwareOutput) {
- if (m_master)
- disconnect(m_master, SIGNAL(volumeChanged(int)), this, \
SIGNAL(masterVolumeChanged()));
- m_master = control;
- emit masterChanged(QString("/controls/%1").arg(m_master->id()));
- connect(m_master, SIGNAL(volumeChanged(int)), this, \
SIGNAL(masterVolumeChanged()));
- }
-}
-
-void KMixDApp::controlRemoved(Control *control)
-{
- if (control == m_master) {
- m_master = 0;
- }
-}
diff --git a/src/daemon2/KMixDApp.h b/src/daemon2/KMixDApp.h
deleted file mode 100644
index 27a8cb0..0000000
--- a/src/daemon2/KMixDApp.h
+++ /dev/null
@@ -1,57 +0,0 @@
-//-*-C++-*-
-/*
- * KMix -- KDE's full featured mini mixer
- *
- * Copyright (C) Trever Fischer <tdfischer@fedoraproject.org>
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Library General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Library General Public License for more details.
- *
- * You should have received a copy of the GNU Library General Public
- * License along with this program; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA \
02110-1301, USA.
- */
-#ifndef KMixApp_h
-#define KMixApp_h
-
-#include <QtCore/QCoreApplication>
-#include <QtCore/QStringList>
-
-class Control;
-
-class KMixDApp : public QCoreApplication
-{
- Q_OBJECT
- Q_PROPERTY(QStringList mixerGroups READ mixerGroups);
- Q_PROPERTY(QString masterControl READ masterControl);
- Q_PROPERTY(int masterVolume READ masterVolume WRITE setMasterVolume);
-public:
- KMixDApp(int &argc, char **argv);
- ~KMixDApp();
- int start();
- void setMaster(int masterID);
- QStringList mixerGroups() const;
- QString masterControl() const;
-
- int masterVolume() const;
- void setMasterVolume(int v);
-signals:
- void groupAdded(const QString &name);
- void groupRemoved(const QString &name);
- void masterChanged(const QString &path);
- void masterVolumeChanged();
-private slots:
- void controlAdded(Control *);
- void controlRemoved(Control *);
-private:
- Control *m_master;
-};
-
-#endif
diff --git a/src/dbus/CMakeLists.txt b/src/dbus/CMakeLists.txt
new file mode 100644
index 0000000..fe780d7
--- /dev/null
+++ b/src/dbus/CMakeLists.txt
@@ -0,0 +1,4 @@
+install( FILES org.kde.kmix.control.xml DESTINATION ${DBUS_INTERFACES_INSTALL_DIR} )
+install( FILES org.kde.kmix.controlgroup.xml DESTINATION \
${DBUS_INTERFACES_INSTALL_DIR} ) +install( FILES org.kde.kmix.kmixd.xml DESTINATION \
${DBUS_INTERFACES_INSTALL_DIR} ) +
diff --git a/src/gui/CMakeLists.txt b/src/gui/CMakeLists.txt
index 491b35a..07053ee 100644
--- a/src/gui/CMakeLists.txt
+++ b/src/gui/CMakeLists.txt
@@ -1,50 +1,20 @@
set(kmix_KDEINIT_SRCS
main.cpp
- kmix.cpp
+ KMixWindow.cpp
KMixApp.cpp
- kmixdockwidget.cpp
- kmixprefdlg.cpp
- viewbase.cpp
- viewdockareapopup.cpp
- viewsliders.cpp
- mixdevicewidget.cpp
- mdwmoveaction.cpp
- mdwslider.cpp
- mdwenum.cpp
- kmixerwidget.cpp
- ksmallslider.cpp
- verticaltext.cpp
- volumeslider.cpp
- kmixtoolbox.cpp
- dialogaddview.cpp
- dialogviewconfiguration.cpp
- dialogselectmaster.cpp
- guiprofile.cpp
- osdwidget.cpp
- ../dbus/dbusmixsetwrapper.cpp
- ../dbus/dbusmixerwrapper.cpp
- ../dbus/dbuscontrolwrapper.cpp
- ../core/mixertoolbox.cpp
- ../core/kmixdevicemanager.cpp
- ../core/ControlPool.cpp
- ../core/MasterControl.cpp
- ../core/mixer.cpp
- ../core/mixset.cpp
- ../core/mixdevice.cpp
- ../core/mixdevicecomposite.cpp
- ../core/volume.cpp
- ../backends/mixer_backend.cpp
- ../backends/mixer_mpris2.cpp
- ../backends/mixer_alsa9.cpp
- ../backends/mixer_pulse.cpp
+ ControlSlider.cpp
+ ControlGroupTab.cpp
+ ControlMonitor.cpp
)
-qt4_add_dbus_interface(kmix_KDEINIT_SRCS ../dbus/org.kde.kmix.mixset.xml
- mixset_interface)
-qt4_add_dbus_interface(kmix_KDEINIT_SRCS ../dbus/org.kde.kmix.mixer.xml
- mixer_interface)
+qt4_add_dbus_interface(kmix_KDEINIT_SRCS ../dbus/org.kde.kmix.kmixd.xml
+ kmixd_interface)
+qt4_add_dbus_interface(kmix_KDEINIT_SRCS ../dbus/org.kde.kmix.controlgroup.xml
+ controlgroup_interface)
qt4_add_dbus_interface(kmix_KDEINIT_SRCS ../dbus/org.kde.kmix.control.xml
control_interface)
+qt4_add_dbus_adaptor( kmix_KDEINIT_SRCS ../dbus/org.kde.kmix.controlmonitor.xml
+ ControlMonitor.h ControlMonitor)
kde4_add_kdeinit_executable( kmix ${kmix_KDEINIT_SRCS})
diff --git a/src/gui2/ControlGroupTab.cpp b/src/gui/ControlGroupTab.cpp
similarity index 100%
rename from src/gui2/ControlGroupTab.cpp
rename to src/gui/ControlGroupTab.cpp
diff --git a/src/gui2/ControlGroupTab.h b/src/gui/ControlGroupTab.h
similarity index 100%
rename from src/gui2/ControlGroupTab.h
rename to src/gui/ControlGroupTab.h
diff --git a/src/gui2/ControlMonitor.cpp b/src/gui/ControlMonitor.cpp
similarity index 100%
rename from src/gui2/ControlMonitor.cpp
rename to src/gui/ControlMonitor.cpp
diff --git a/src/gui2/ControlMonitor.h b/src/gui/ControlMonitor.h
similarity index 100%
rename from src/gui2/ControlMonitor.h
rename to src/gui/ControlMonitor.h
diff --git a/src/gui2/ControlSlider.cpp b/src/gui/ControlSlider.cpp
similarity index 100%
rename from src/gui2/ControlSlider.cpp
rename to src/gui/ControlSlider.cpp
diff --git a/src/gui2/ControlSlider.h b/src/gui/ControlSlider.h
similarity index 100%
rename from src/gui2/ControlSlider.h
rename to src/gui/ControlSlider.h
diff --git a/src/gui/KMixApp.cpp b/src/gui/KMixApp.cpp
index b64884b..798f4f4 100644
--- a/src/gui/KMixApp.cpp
+++ b/src/gui/KMixApp.cpp
@@ -20,15 +20,10 @@
*/
#include "KMixApp.h"
-#include "kmix.h"
+#include "KMixWindow.h"
#include <kdebug.h>
+#include <KDE/KStatusNotifierItem>
-#include "core/ControlPool.h"
-#include "core/kmixdevicemanager.h"
-#include "core/mixertoolbox.h"
-
-
-bool KMixApp::_keepVisibility = false;
KMixApp::KMixApp()
: KUniqueApplication(), m_kmix( 0 )
@@ -45,9 +40,6 @@ KMixApp::KMixApp()
KMixApp::~KMixApp()
{
- MixerToolBox::cleanup();
- ControlPool::cleanup();
- KMixDeviceManager::cleanup();
delete m_kmix;
}
@@ -55,86 +47,19 @@ KMixApp::~KMixApp()
int
KMixApp::newInstance()
{
- // There are 3 cases for a new instance
-
- //kDebug(67100) << "KMixApp::newInstance() isRestored()=" << isRestored() << \
"_keepVisibility=" << _keepVisibility;
- static bool first = true;
- if ( !first )
- { // There already exists an instance/window
-
- /* !!! @bug : _keepVisibilty has the wrong value here.
- It is supposed to have the value set by the command line
- arg, and the keepVisibilty() method.
- All looks fine, BUT(!!!) THIS code is NEVER entered in
- the just started process.
- KDE IPC (DBUS) has instead notified the already running
- KMix process, about a newInstance(). So _keepVisibilty
- has always the value of the first started KMix process.
- This is a bug in KMix and must be fixed.
- cesken, 2008-11-01
- */
-
- kDebug(67100) << "KMixApp::newInstance() Instance exists";
-
- if ( ! _keepVisibility && !isSessionRestored() ) {
- kDebug(67100) << "KMixApp::newInstance() SHOW WINDOW (_keepVisibility=" << \
_keepVisibility << ", isSessionRestored=" << isSessionRestored();
- // CASE 1: If KMix is running AND the *USER*
- // starts it again, the KMix main window will be shown.
- // If KMix is restored by SM or the --keepvisibilty is used, KMix will NOT
- // explicitly be shown.
- KUniqueApplication::newInstance();
-// if ( !m_kmix ) {
-// m_kmix->show();
-// } else {
-// kWarning(67100) << "KMixApp::newInstance() Window has not finished \
constructing yet so ignoring the show() request.";
-// }
- }
- else {
- // CASE 2: If KMix is running, AND ( session gets restored \
OR keepvisibilty command line switch )
- kDebug(67100) << "KMixApp::newInstance() REGULAR_START _keepVisibility=" << \
_keepVisibility;
- // Special case: Command line arg --keepVisibility was used:
- // We don't want to change the visibiliy, thus we don't call show() here.
- //
- // Hint: --keepVisibility is a special option for applications that
- // want to start a mixer service, but don't need to show the KMix
- // GUI (like KMilo , KAlarm, ...).
- // See (e.g.) Bug 58901 for deeper insight.
- }
- }
- else
- {
- // CASE 3: KMix was not running yet => instanciate a new one
- //kDebug(67100) << "KMixApp::newInstance() Instanciate: _keepVisibility=" << \
_keepVisibility ;
- first = false; // NB See https://qa.mandriva.com/show_bug.cgi?id=56893#c3
- // It is important to track this via a separate variable and not
- // based on m_kmix to handle this race condition.
- // Specific protection for the activation-prior-to-full-construction
- // case exists above in the 'already running case'
- m_kmix = new KMixWindow(_keepVisibility);
- //connect(this, SIGNAL(stopUpdatesOnVisibility()), m_kmix, \
SLOT(stopVisibilityUpdates()));
- if ( isSessionRestored() && KMainWindow::canBeRestored(0) )
- {
- m_kmix->restore(0, false);
- }
- }
-
+ if ( m_kmix ) {
+ m_kmix->show();
+ } else {
+ m_kmix = new KMixWindow(NULL);
+ m_icon = new KStatusNotifierItem("kmix");
+ m_icon->setAssociatedWidget(m_kmix);
+ m_icon->setCategory(KStatusNotifierItem::Hardware);
+ m_icon->setIconByName("kmix");
+ m_icon->setStandardActionsEnabled(true);
+ m_icon->setStatus(KStatusNotifierItem::Passive);
+ m_icon->setTitle("KMix");
+ m_icon->setToolTip("kmix", "KMix", "Volume");
+ }
return 0;
}
-void KMixApp::keepVisibility(bool val_keepVisibility) {
- _keepVisibility = val_keepVisibility;
-}
-
-/*
-void
-KMixApp::quitExtended()
-{
- // This method is here to quit hold from the dock icon: When directly calling
- // quit(), the main window will be hidden before saving the configuration.
- // isVisible() would return on quit always false (which would be bad).
- kDebug(67100) << "quitExtended ENTER";
- emit stopUpdatesOnVisibility();
- quit();
-}
-*/
-
diff --git a/src/gui/KMixApp.h b/src/gui/KMixApp.h
index f1a614d..a6dac94 100644
--- a/src/gui/KMixApp.h
+++ b/src/gui/KMixApp.h
@@ -24,6 +24,7 @@
#include <kuniqueapplication.h>
class KMixWindow;
+class KStatusNotifierItem;
class KMixApp : public KUniqueApplication
{
@@ -32,17 +33,9 @@ Q_OBJECT
KMixApp();
~KMixApp();
int newInstance ();
-
- public slots:
- //void quitExtended(); // For a hack on visibility()
- static void keepVisibility(bool);
-/*
- signals:
- void stopUpdatesOnVisibility();
-*/
private:
KMixWindow *m_kmix;
- static bool _keepVisibility;
+ KStatusNotifierItem *m_icon;
};
#endif
diff --git a/src/gui2/KMixWindow.cpp b/src/gui/KMixWindow.cpp
similarity index 98%
rename from src/gui2/KMixWindow.cpp
rename to src/gui/KMixWindow.cpp
index 9dcf2c9..32bf45f 100644
--- a/src/gui2/KMixWindow.cpp
+++ b/src/gui/KMixWindow.cpp
@@ -36,8 +36,6 @@
#include <KDE/KApplication>
// KMix
-#include "core/version.h"
-
#include "kmixd_interface.h"
#include "controlgroup_interface.h"
@@ -53,7 +51,6 @@ KMixWindow::KMixWindow(QWidget* parent)
: KXmlGuiWindow(parent, Qt::WindowFlags( KDE_DEFAULT_WINDOWFLAGS | \
Qt::WindowContextHelpButtonHint) ) {
// disable delete-on-close because KMix might just sit in the background waiting \
for cards to be plugged in
- qDebug() << "construct";
setAttribute(Qt::WA_DeleteOnClose, false);
m_daemon = new org::kde::KMix::KMixD(KMIX_DBUS_SERVICE, KMIX_DBUS_PATH, \
QDBusConnection::sessionBus(), this); initActions();
diff --git a/src/gui2/KMixWindow.h b/src/gui/KMixWindow.h
similarity index 98%
rename from src/gui2/KMixWindow.h
rename to src/gui/KMixWindow.h
index c8355fe..8cc1c44 100644
--- a/src/gui2/KMixWindow.h
+++ b/src/gui/KMixWindow.h
@@ -21,9 +21,6 @@
#ifndef KMIX_H
#define KMIX_H
-
-#include <config.h>
-
// Qt
// KDE
diff --git a/src/gui/main.cpp b/src/gui/main.cpp
index c637620..a7502b1 100644
--- a/src/gui/main.cpp
+++ b/src/gui/main.cpp
@@ -27,7 +27,7 @@
#include <kstandarddirs.h>
#include "KMixApp.h"
-#include "core/version.h"
+#include "../version.h"
static const char description[] =
I18N_NOOP("KMix - KDE's full featured mini mixer");
@@ -35,7 +35,7 @@ I18N_NOOP("KMix - KDE's full featured mini mixer");
extern "C" KDE_EXPORT int kdemain(int argc, char *argv[])
{
KAboutData aboutData( "kmix", 0, ki18n("KMix"),
- APP_VERSION, ki18n(description), KAboutData::License_GPL,
+ KMIX_VERSION, ki18n(description), KAboutData::License_GPL,
ki18n("(c) 1996-2012 The KMix Authors"));
// Author Policy: Long-term maintainers and backend writers/maintainers go in the \
Authors list. @@ -60,16 +60,8 @@ extern "C" KDE_EXPORT int kdemain(int argc, char \
*argv[])
KCmdLineArgs::init( argc, argv, &aboutData );
- KCmdLineOptions options;
- options.add("keepvisibility", ki18n("Inhibits the unhiding of the KMix main \
window, if KMix is already running."));
- KCmdLineArgs::addCmdLineOptions( options ); // Add our own options.
KUniqueApplication::addCmdLineOptions();
- KCmdLineArgs *args = KCmdLineArgs::parsedArgs();
- bool hasArgKeepvisibility = args->isSet("keepvisibility");
- //kDebug(67100) << "hasArgKeepvisibility=" << hasArgKeepvisibility;
- KMixApp::keepVisibility(hasArgKeepvisibility);
-
if (!KMixApp::start())
return 0;
diff --git a/src/gui2/CMakeLists.txt b/src/gui2/CMakeLists.txt
deleted file mode 100644
index 07053ee..0000000
--- a/src/gui2/CMakeLists.txt
+++ /dev/null
@@ -1,36 +0,0 @@
-set(kmix_KDEINIT_SRCS
- main.cpp
- KMixWindow.cpp
- KMixApp.cpp
- ControlSlider.cpp
- ControlGroupTab.cpp
- ControlMonitor.cpp
-)
-
-qt4_add_dbus_interface(kmix_KDEINIT_SRCS ../dbus/org.kde.kmix.kmixd.xml
- kmixd_interface)
-qt4_add_dbus_interface(kmix_KDEINIT_SRCS ../dbus/org.kde.kmix.controlgroup.xml
- controlgroup_interface)
-qt4_add_dbus_interface(kmix_KDEINIT_SRCS ../dbus/org.kde.kmix.control.xml
- control_interface)
-qt4_add_dbus_adaptor( kmix_KDEINIT_SRCS ../dbus/org.kde.kmix.controlmonitor.xml
- ControlMonitor.h ControlMonitor)
-
-kde4_add_kdeinit_executable( kmix ${kmix_KDEINIT_SRCS})
-
-target_link_libraries(kdeinit_kmix ${KDE4_PHONON_LIBS} ${KDE4_SOLID_LIBS} \
${KDE4_KDEUI_LIBS} ${KDE4_PLASMA_LIBS} ${QT_QTXML_LIBRARY})
-
-if (CANBERRA_FOUND)
- target_link_libraries(kdeinit_kmix ${CANBERRA_LIBRARIES})
-endif (CANBERRA_FOUND)
-
-install(TARGETS kdeinit_kmix DESTINATION ${LIB_INSTALL_DIR} )
-
-target_link_libraries(kdeinit_kmix ${ASOUND_LIBRARY} ${PULSEAUDIO_LIBRARY} \
${PULSEAUDIO_MAINLOOP_LIBRARY} ${GLIB2_LIBRARIES})
-
-target_link_libraries( kmix kdeinit_kmix )
-install(TARGETS kmix ${INSTALL_TARGETS_DEFAULT_ARGS} )
-
-install( PROGRAMS kmix.desktop DESTINATION ${XDG_APPS_INSTALL_DIR} )
-install( FILES kmix_autostart.desktop DESTINATION ${AUTOSTART_INSTALL_DIR})
-install( FILES kmixui.rc DESTINATION ${DATA_INSTALL_DIR}/kmix )
diff --git a/src/gui2/KMixApp.cpp b/src/gui2/KMixApp.cpp
deleted file mode 100644
index 798f4f4..0000000
--- a/src/gui2/KMixApp.cpp
+++ /dev/null
@@ -1,65 +0,0 @@
-/*
- * KMix -- KDE's full featured mini mixer
- *
- * Copyright (C) 2000 Stefan Schimanski <schimmi@kde.org>
- * Copyright (C) 2001 Preston Brown <pbrown@kde.org>
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Library General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Library General Public License for more details.
- *
- * You should have received a copy of the GNU Library General Public
- * License along with this program; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA \
02110-1301, USA.
- */
-
-#include "KMixApp.h"
-#include "KMixWindow.h"
-#include <kdebug.h>
-#include <KDE/KStatusNotifierItem>
-
-
-KMixApp::KMixApp()
- : KUniqueApplication(), m_kmix( 0 )
-{
- // We must disable QuitOnLastWindowClosed. Rationale:
- // 1) The normal state of KMix is to only have the dock icon shown.
- // 2a) The dock icon gets reconstructed, whenever a soundcard is hotplugged or \
unplugged.
- // 2b) The dock icon gets reconstructed, when the user selects a new master.
- // 3) During the reconstruction, it can easily happen that no window is present \
=> KMix would quit
- // => disable QuitOnLastWindowClosed
- setQuitOnLastWindowClosed ( false );
-}
-
-
-KMixApp::~KMixApp()
-{
- delete m_kmix;
-}
-
-
-int
-KMixApp::newInstance()
-{
- if ( m_kmix ) {
- m_kmix->show();
- } else {
- m_kmix = new KMixWindow(NULL);
- m_icon = new KStatusNotifierItem("kmix");
- m_icon->setAssociatedWidget(m_kmix);
- m_icon->setCategory(KStatusNotifierItem::Hardware);
- m_icon->setIconByName("kmix");
- m_icon->setStandardActionsEnabled(true);
- m_icon->setStatus(KStatusNotifierItem::Passive);
- m_icon->setTitle("KMix");
- m_icon->setToolTip("kmix", "KMix", "Volume");
- }
- return 0;
-}
-
diff --git a/src/gui2/KMixApp.h b/src/gui2/KMixApp.h
deleted file mode 100644
index a6dac94..0000000
--- a/src/gui2/KMixApp.h
+++ /dev/null
@@ -1,41 +0,0 @@
-//-*-C++-*-
-/*
- * KMix -- KDE's full featured mini mixer
- *
- * Copyright Christian Esken <esken@kde.org>
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Library General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Library General Public License for more details.
- *
- * You should have received a copy of the GNU Library General Public
- * License along with this program; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA \
02110-1301, USA.
- */
-#ifndef KMixApp_h
-#define KMixApp_h
-
-#include <kuniqueapplication.h>
-
-class KMixWindow;
-class KStatusNotifierItem;
-
-class KMixApp : public KUniqueApplication
-{
-Q_OBJECT
- public:
- KMixApp();
- ~KMixApp();
- int newInstance ();
- private:
- KMixWindow *m_kmix;
- KStatusNotifierItem *m_icon;
-};
-
-#endif
diff --git a/src/gui2/main.cpp b/src/gui2/main.cpp
deleted file mode 100644
index 1807bd0..0000000
--- a/src/gui2/main.cpp
+++ /dev/null
@@ -1,72 +0,0 @@
-/*
- * KMix -- KDE's full featured mini mixer
- *
- *
- * Copyright (C) 2000 Stefan Schimanski <schimmi@kde.org>
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Library General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Library General Public License for more details.
- *
- * You should have received a copy of the GNU Library General Public
- * License along with this program; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA \
02110-1301, USA.
- */
-
-#include <kcmdlineargs.h>
-#include <kaboutdata.h>
-#include <kdebug.h>
-#include <klocale.h>
-#include <kglobal.h>
-#include <kstandarddirs.h>
-
-#include "KMixApp.h"
-#include "core/version.h"
-
-static const char description[] =
-I18N_NOOP("KMix - KDE's full featured mini mixer");
-
-extern "C" KDE_EXPORT int kdemain(int argc, char *argv[])
-{
- KAboutData aboutData( "kmix", 0, ki18n("KMix"),
- APP_VERSION, ki18n(description), KAboutData::License_GPL,
- ki18n("(c) 1996-2012 The KMix Authors"));
-
- // Author Policy: Long-term maintainers and backend writers/maintainers go in the \
Authors list.
- aboutData.addAuthor(ki18n("Christian Esken") , ki18n("Original author and \
current maintainer"), "esken@kde.org");
- aboutData.addAuthor(ki18n("Colin Guthrie") , ki18n("PulseAudio support"), \
"colin@mageia.org");
- aboutData.addAuthor(ki18n("Helio Chissini de Castro"), ki18n("ALSA 0.9x port"), \
"helio@kde.org" );
- aboutData.addAuthor(ki18n("Brian Hanson") , ki18n("Solaris support"), \
"bhanson@hotmail.com");
- aboutData.addAuthor(ki18n("Trever Fischer") , ki18n("Major refactoring"), \
"tdfischer@fedoraproject.org");
-// The HP/UX port is not maintained anymore, and no official part of KMix anymore
-// aboutData.addAuthor(ki18n("Helge Deller") , ki18n("HP/UX port"), \
"deller@gmx.de");
-// The initial support was for ALSA 0.5. The new code is not based on it IIRC.
-// aboutData.addAuthor(ki18n("Nick Lopez") , ki18n("Initial ALSA port"), \
"kimo_sabe@usa.net");
-
- // Credit Policy: Authors who did a discrete part, like the Dataengine, OSD, help \
on specific platforms or soundcards.
- aboutData.addCredit(ki18n("Igor Poboiko") , ki18n("Plasma Dataengine"), \
"igor.poboiko@gmail.com");
- aboutData.addCredit(ki18n("Stefan Schimanski") , ki18n("Temporary maintainer"), \
"schimmi@kde.org");
- aboutData.addCredit(ki18n("Sebestyen Zoltan") , ki18n("*BSD fixes"), \
"szoli@digo.inf.elte.hu");
- aboutData.addCredit(ki18n("Lennart Augustsson"), ki18n("*BSD fixes"), \
"augustss@cs.chalmers.se");
- aboutData.addCredit(ki18n("Nadeem Hasan") , ki18n("Mute and volume preview, \
other fixes"), "nhasan@kde.org");
- aboutData.addCredit(ki18n("Erwin Mascher") , ki18n("Improving support for \
emu10k1 based soundcards"));
- aboutData.addCredit(ki18n("Valentin Rusu") , ki18n("TerraTec DMX6Fire \
support"), "kde@rusu.info");
-
- KCmdLineArgs::init( argc, argv, &aboutData );
-
- KUniqueApplication::addCmdLineOptions();
-
- if (!KMixApp::start())
- return 0;
-
- KMixApp *app = new KMixApp();
- int ret = app->exec();
- delete app;
- return ret;
-}
diff --git a/src/version.h.in b/src/version.h.in
new file mode 100644
index 0000000..428571b
--- /dev/null
+++ b/src/version.h.in
@@ -0,0 +1,4 @@
+#define KMIX_VERSION_MAJOR "@KMIX_VERSION_MAJOR@"
+#define KMIX_VERSION_MINOR "@KMIX_VERSION_MINOR@"
+#define KMIX_VERSION_PATCH "@KMIX_VERSION_PATCH@"
+#define KMIX_VERSION "@KMIX_VERSION@"
[prev in list] [next in list] [prev in thread] [next in thread]
Configure |
About |
News |
Add a list |
Sponsored by KoreLogic