diff --git a/src/volumeobject.cpp b/src/volumeobject.cpp index e86ce1e..ea580af 100644 --- a/src/volumeobject.cpp +++ b/src/volumeobject.cpp @@ -1,78 +1,79 @@ /* Copyright 2014-2015 Harald Sitter This library is free software; you can redistribute it and/or modify it under the terms of the GNU Lesser General Public License as published by the Free Software Foundation; either version 2.1 of the License, or (at your option) version 3, or any later version accepted by the membership of KDE e.V. (or its successor approved by the membership of KDE e.V.), which shall act as a proxy defined in Section 6 of version 3 of the license. This library 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 Lesser General Public License for more details. You should have received a copy of the GNU Lesser General Public License along with this library. If not, see . */ #include "volumeobject.h" namespace QPulseAudio { VolumeObject::VolumeObject(QObject *parent) : PulseObject(parent) , m_muted(true) , m_hasVolume(true) , m_volumeWritable(true) { + pa_cvolume_init(&m_volume); } VolumeObject::~VolumeObject() { } qint64 VolumeObject::volume() const { return m_volume.values[0]; } bool VolumeObject::isMuted() const { return m_muted; } pa_cvolume VolumeObject::cvolume() const { return m_volume; } bool VolumeObject::hasVolume() const { return m_hasVolume; } bool VolumeObject::isVolumeWritable() const { return m_volumeWritable; } QStringList VolumeObject::channels() const { return m_channels; } QList VolumeObject::channelVolumes() const { QList ret; ret.reserve(m_volume.channels); for (int i = 0; i < m_volume.channels; ++i) { ret << m_volume.values[i]; } return ret; } } // QPulseAudio diff --git a/src/volumeobject.h b/src/volumeobject.h index b1185b1..5824391 100644 --- a/src/volumeobject.h +++ b/src/volumeobject.h @@ -1,101 +1,101 @@ /* Copyright 2014-2015 Harald Sitter This library is free software; you can redistribute it and/or modify it under the terms of the GNU Lesser General Public License as published by the Free Software Foundation; either version 2.1 of the License, or (at your option) version 3, or any later version accepted by the membership of KDE e.V. (or its successor approved by the membership of KDE e.V.), which shall act as a proxy defined in Section 6 of version 3 of the license. This library 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 Lesser General Public License for more details. You should have received a copy of the GNU Lesser General Public License along with this library. If not, see . */ #ifndef VOLUMEOBJECT_H #define VOLUMEOBJECT_H #include #include "pulseobject.h" namespace QPulseAudio { class VolumeObject : public PulseObject { Q_OBJECT Q_PROPERTY(qint64 volume READ volume WRITE setVolume NOTIFY volumeChanged) Q_PROPERTY(bool muted READ isMuted WRITE setMuted NOTIFY mutedChanged) Q_PROPERTY(bool hasVolume READ hasVolume NOTIFY hasVolumeChanged) Q_PROPERTY(bool volumeWritable READ isVolumeWritable NOTIFY isVolumeWritableChanged) Q_PROPERTY(QStringList channels READ channels NOTIFY channelsChanged) Q_PROPERTY(QList channelVolumes READ channelVolumes NOTIFY channelVolumesChanged) public: VolumeObject(QObject *parent); virtual ~VolumeObject(); template void updateVolumeObject(PAInfo *info) { updatePulseObject(info); if (m_muted != info->mute) { m_muted = info->mute; emit mutedChanged(); } - if (memcmp(&m_volume, &info->volume, sizeof(pa_cvolume)) != 0) { + if (pa_cvolume_equal(&m_volume, &info->volume) != 0) { m_volume = info->volume; emit volumeChanged(); emit channelVolumesChanged(); } QStringList infoChannels; infoChannels.reserve(info->channel_map.channels); for (int i = 0; i < info->channel_map.channels; ++i) { infoChannels << QString::fromUtf8(pa_channel_position_to_pretty_string(info->channel_map.map[i])); } if (m_channels != infoChannels) { m_channels = infoChannels; emit channelsChanged(); } } qint64 volume() const; virtual void setVolume(qint64 volume) = 0; bool isMuted() const; virtual void setMuted(bool muted) = 0; bool hasVolume() const; bool isVolumeWritable() const; QStringList channels() const; QList channelVolumes() const; Q_INVOKABLE virtual void setChannelVolume(int channel, qint64 volume) = 0; signals: void volumeChanged(); void mutedChanged(); void hasVolumeChanged(); void isVolumeWritableChanged(); void channelsChanged(); void channelVolumesChanged(); protected: pa_cvolume cvolume() const; pa_cvolume m_volume; bool m_muted; bool m_hasVolume; bool m_volumeWritable; QStringList m_channels; }; } // QPulseAudio #endif // VOLUMEOBJECT_H