From fe29680e9c20b3f6ab33d02b46120f1f18a3583f Mon Sep 17 00:00:00 2001 From: trialuser02 Date: Mon, 11 Mar 2019 18:43:43 +0000 Subject: enabled softwate mute control git-svn-id: http://svn.code.sf.net/p/qmmp-dev/code/trunk/qmmp@8759 90c681e8-e032-0410-971d-27865f9a5e38 --- src/plugins/Output/alsa/outputalsa.cpp | 11 ++++++----- src/plugins/Output/alsa/outputalsa.h | 7 +++---- 2 files changed, 9 insertions(+), 9 deletions(-) (limited to 'src/plugins/Output/alsa') diff --git a/src/plugins/Output/alsa/outputalsa.cpp b/src/plugins/Output/alsa/outputalsa.cpp index 8a383558d..9489ad47f 100644 --- a/src/plugins/Output/alsa/outputalsa.cpp +++ b/src/plugins/Output/alsa/outputalsa.cpp @@ -439,6 +439,12 @@ VolumeSettings VolumeALSA::volume() const return vol; } +Volume::VolumeFlags VolumeALSA::flags() const +{ + + return Volume::HasNotifySignal; +} + int VolumeALSA::setupMixer(QString card, QString device) { char *name; @@ -557,8 +563,3 @@ int VolumeALSA::getMixer(snd_mixer_t **mixer, QString card) } return (*mixer != NULL); } - -/*bool VolumeALSA::hasNotifySignal() const -{ - return true; -}*/ diff --git a/src/plugins/Output/alsa/outputalsa.h b/src/plugins/Output/alsa/outputalsa.h index 57d850b3f..0360337d9 100644 --- a/src/plugins/Output/alsa/outputalsa.h +++ b/src/plugins/Output/alsa/outputalsa.h @@ -76,8 +76,7 @@ public: void setVolume(const VolumeSettings &vol) override; VolumeSettings volume() const override; - - //bool hasNotifySignal() const override; + VolumeFlags flags() const override; private: //alsa mixer @@ -85,8 +84,8 @@ private: void parseMixerName(char *str, char **name, int *index); int getMixer(snd_mixer_t **m_mixer, QString card); snd_mixer_elem_t* getMixerElem(snd_mixer_t *m_mixer, char *name, int index); - snd_mixer_t *m_mixer; - snd_mixer_elem_t *pcm_element; + snd_mixer_t *m_mixer = nullptr; + snd_mixer_elem_t *pcm_element = nullptr; }; #endif // OUTPUTALSA_H -- cgit v1.2.3-13-gbd6f