summaryrefslogtreecommitdiffstats
path: root/kmix/Makefile.am
diff options
context:
space:
mode:
authorMichele Calgaro <michele.calgaro@yahoo.it>2020-05-20 01:19:55 +0900
committerMichele Calgaro <michele.calgaro@yahoo.it>2020-05-25 13:24:33 +0900
commitb06d352d14d9d917ff23288dd6a9433e4e75f7df (patch)
tree5518cf17eab0c4d4f3d76e02c610deccbea63339 /kmix/Makefile.am
parentc0249fdb66a93f3fd3b413f8c05d455f05ae8cdb (diff)
downloadtdemultimedia-b06d352d14d9d917ff23288dd6a9433e4e75f7df.tar.gz
tdemultimedia-b06d352d14d9d917ff23288dd6a9433e4e75f7df.zip
KMix: 1) added direct DCOP access to the user selected mixer/device channel used as master.
2) fixed bug with volume update 3) unlinked global keyboard shortcuts for volume control to avoid clashing with kmilo. A user can still link them manually if needed. Signed-off-by: Michele Calgaro <michele.calgaro@yahoo.it>
Diffstat (limited to 'kmix/Makefile.am')
-rw-r--r--kmix/Makefile.am4
1 files changed, 2 insertions, 2 deletions
diff --git a/kmix/Makefile.am b/kmix/Makefile.am
index 1de7f12d..6f832824 100644
--- a/kmix/Makefile.am
+++ b/kmix/Makefile.am
@@ -11,7 +11,7 @@ noinst_HEADERS = kmix.h kmixdockwidget.h kmixprefdlg.h kmixerwidget.h \
viewbase.h viewoutput.h viewinput.h viewsliders.h viewswitches.h viewsurround.h viewdockareapopup.h viewgrid.h \
mixdevicewidget.h mdwslider.h mdwswitch.h mdwenum.h \
mixer.h mixset.h mixdevice.h mixer_backend.h volume.h kledbutton.h version.h kmixtoolbox.h \
- ksmallslider.h kmixapplet.h mixerIface.h verticaltext.h \
+ ksmallslider.h kmixapplet.h mixerIface.h verticaltext.h kmixIface.h \
KMixApp.h dialogviewconfiguration.h kmixtoolbox.h mixertoolbox.h dialogselectmaster.h
@@ -22,7 +22,7 @@ kmix_la_SOURCES = main.cpp kmix.cpp kmixdockwidget.cpp kmixprefdlg.cpp \
viewsliders.cpp viewgrid.cpp \
mixdevicewidget.cpp mdwslider.cpp mdwswitch.cpp mdwenum.cpp \
kmixerwidget.cpp mixer.cpp mixset.cpp mixdevice.cpp mixer_backend.cpp ksmallslider.cpp \
- volume.cpp kledbutton.cpp verticaltext.cpp mixerIface.skel \
+ volume.cpp kledbutton.cpp verticaltext.cpp mixerIface.skel kmixIface.skel \
kmixtoolbox.cpp mixertoolbox.cpp dialogviewconfiguration.cpp KMixApp.cpp dialogselectmaster.cpp
kmix_la_LIBADD = $(LIB_TDEUI) $(LIB_TDEUTILS) $(LIBALIB) $(LIBOSSAUDIO) $(LIBASOUND) $(LIB_TQT) $(LIB_TDECORE) -lDCOP