diff --git a/src/streamrestore.cpp b/src/streamrestore.cpp index bc534da..f04b75a 100644 --- a/src/streamrestore.cpp +++ b/src/streamrestore.cpp @@ -1,173 +1,194 @@ /* Copyright 2016 David Rosca 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 "streamrestore.h" #include "context.h" #include "debug.h" namespace QPulseAudio { StreamRestore::StreamRestore(quint32 index, const QVariantMap &properties, QObject *parent) : PulseObject(parent) , m_muted(false) { memset(&m_volume, 0, sizeof(m_volume)); memset(&m_channelMap, 0, sizeof(m_channelMap)); m_index = index; m_properties = properties; } void StreamRestore::update(const pa_ext_stream_restore_info *info) { + m_cache.valid = false; const QString infoName = QString::fromUtf8(info->name); if (m_name != infoName) { m_name = infoName; emit nameChanged(); } const QString infoDevice = QString::fromUtf8(info->device); if (m_device != infoDevice) { m_device = infoDevice; emit deviceChanged(); } if (m_muted != info->mute) { m_muted = info->mute; emit mutedChanged(); } if (memcmp(&m_volume, &info->volume, sizeof(pa_cvolume)) != 0) { m_volume = info->volume; emit volumeChanged(); emit channelVolumesChanged(); } if (memcmp(&m_channelMap, &info->channel_map, sizeof(pa_channel_map)) != 0) { m_channels.clear(); m_channels.reserve(info->channel_map.channels); for (int i = 0; i < info->channel_map.channels; ++i) { m_channels << QString::fromUtf8(pa_channel_position_to_pretty_string(info->channel_map.map[i])); } m_channelMap = info->channel_map; emit channelsChanged(); } } QString StreamRestore::name() const { return m_name; } QString StreamRestore::device() const { return m_device; } void StreamRestore::setDevice(const QString &device) { - writeChanges(m_volume, m_channelMap, m_muted, device); + if (m_cache.valid) { + writeChanges(m_cache.volume, m_cache.channelMap, m_cache.muted, device); + } else { + writeChanges(m_volume, m_channelMap, m_muted, device); + } } qint64 StreamRestore::volume() const { return m_volume.values[0]; } void StreamRestore::setVolume(qint64 volume) { - pa_cvolume vol = m_volume; + pa_cvolume vol = m_cache.valid ? m_cache.volume : m_volume; for (int i = 0; i < vol.channels; ++i) { vol.values[i] = volume; } - writeChanges(vol, m_channelMap, m_muted, m_device); + + if (m_cache.valid) { + writeChanges(vol, m_cache.channelMap, m_cache.muted, m_cache.device); + } else { + writeChanges(vol, m_channelMap, m_muted, m_device); + } } bool StreamRestore::isMuted() const { return m_muted; } void StreamRestore::setMuted(bool muted) { - if (m_muted == muted) { - return; + if (m_cache.valid) { + writeChanges(m_cache.volume, m_cache.channelMap, muted, m_cache.device); + } else { + writeChanges(m_volume, m_channelMap, muted, m_device); } - - writeChanges(m_volume, m_channelMap, muted, m_device); } bool StreamRestore::hasVolume() const { return true; } bool StreamRestore::isVolumeWritable() const { return true; } QStringList StreamRestore::channels() const { return m_channels; } QList StreamRestore::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; } void StreamRestore::setChannelVolume(int channel, qint64 volume) { Q_ASSERT(channel >= 0 && channel < m_volume.channels); - pa_cvolume vol = m_volume; + pa_cvolume vol = m_cache.valid ? m_cache.volume : m_volume; vol.values[channel] = volume; - writeChanges(vol, m_channelMap, m_muted, m_device); + + if (m_cache.valid) { + writeChanges(vol, m_cache.channelMap, m_cache.muted, m_cache.device); + } else { + writeChanges(vol, m_channelMap, m_muted, m_device); + } } quint32 StreamRestore::deviceIndex() const { return PA_INVALID_INDEX; } void StreamRestore::setDeviceIndex(quint32 deviceIndex) { Q_UNUSED(deviceIndex); qCWarning(PLASMAPA) << "Not implemented"; } void StreamRestore::writeChanges(const pa_cvolume &volume, const pa_channel_map &channelMap, bool muted, const QString &device) { const QByteArray nameData = m_name.toUtf8(); const QByteArray deviceData = device.toUtf8(); pa_ext_stream_restore_info info; info.name = nameData.constData(); info.channel_map = channelMap; info.volume = volume; info.device = deviceData.isEmpty() ? nullptr : deviceData.constData(); info.mute = muted; + m_cache.valid = true; + m_cache.volume = volume; + m_cache.channelMap = channelMap; + m_cache.muted = muted; + m_cache.device = device; + context()->streamRestoreWrite(&info); } } // QPulseAudio diff --git a/src/streamrestore.h b/src/streamrestore.h index 63bf466..fb8c974 100644 --- a/src/streamrestore.h +++ b/src/streamrestore.h @@ -1,93 +1,101 @@ /* Copyright 2016 David Rosca 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 STREAMRESTORE_H #define STREAMRESTORE_H #include "pulseobject.h" #include namespace QPulseAudio { class Q_DECL_EXPORT StreamRestore : public PulseObject { Q_OBJECT Q_PROPERTY(QString name READ name NOTIFY nameChanged) Q_PROPERTY(QString device READ device WRITE setDevice NOTIFY deviceChanged) 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 CONSTANT) Q_PROPERTY(bool volumeWritable READ isVolumeWritable CONSTANT) Q_PROPERTY(QStringList channels READ channels NOTIFY channelsChanged) Q_PROPERTY(QList channelVolumes READ channelVolumes NOTIFY channelVolumesChanged) Q_PROPERTY(quint32 deviceIndex READ deviceIndex WRITE setDeviceIndex NOTIFY deviceIndexChanged) public: StreamRestore(quint32 index, const QVariantMap &properties, QObject *parent); void update(const pa_ext_stream_restore_info *info); QString name() const; QString device() const; void setDevice(const QString &device); qint64 volume() const; void setVolume(qint64 volume); bool isMuted() const; void setMuted(bool muted); bool hasVolume() const; bool isVolumeWritable() const; QStringList channels() const; QList channelVolumes() const; quint32 deviceIndex() const; void setDeviceIndex(quint32 deviceIndex); Q_INVOKABLE void setChannelVolume(int channel, qint64 volume); signals: void nameChanged(); void deviceChanged(); void volumeChanged(); void mutedChanged(); void channelsChanged(); void channelVolumesChanged(); void deviceIndexChanged(); private: void writeChanges(const pa_cvolume &volume, const pa_channel_map &channelMap, bool muted, const QString &device); QString m_name; QString m_device; pa_cvolume m_volume; pa_channel_map m_channelMap; QStringList m_channels; bool m_muted; + + struct { + bool valid = false; + pa_cvolume volume; + pa_channel_map channelMap; + bool muted; + QString device; + } m_cache; }; } // QPulseAudio #endif // STREAMRESTORE_H