--- a
+++ b/upmpd/ohvolume.cxx
@@ -0,0 +1,226 @@
+/* Copyright (C) 2014 J.F.Dockes
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU 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 General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the
+ * Free Software Foundation, Inc.,
+ * 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ */
+
+#include <stdio.h>
+#include <stdlib.h>
+#include <unistd.h>
+#include <sys/types.h>
+#include <pwd.h>
+
+#include <string>
+#include <iostream>
+#include <sstream>
+#include <vector>
+#include <functional>
+#include <set>
+using namespace std;
+using namespace std::placeholders;
+
+#include "libupnpp/upnpplib.hxx"
+#include "libupnpp/soaphelp.hxx"
+#include "libupnpp/device.hxx"
+#include "libupnpp/log.hxx"
+
+#include "upmpd.hxx"
+#include "ohvolume.hxx"
+#include "mpdcli.hxx"
+#include "upmpdutils.hxx"
+#include "rendering.hxx"
+
+static const string sTpProduct("urn:av-openhome-org:service:Volume:1");
+static const string sIdProduct("urn:av-openhome-org:serviceId:Volume");
+
+OHVolume::OHVolume(UpMpd *dev, UpMpdRenderCtl *ctl)
+ : UpnpService(sTpProduct, sIdProduct, dev), m_dev(dev), m_ctl(ctl)
+{
+ dev->addActionMapping("Characteristics",
+ bind(&OHVolume::characteristics, this, _1, _2));
+ dev->addActionMapping("SetVolume",
+ bind(&OHVolume::setVolume, this, _1, _2));
+ dev->addActionMapping("Volume",
+ bind(&OHVolume::volume, this, _1, _2));
+ dev->addActionMapping("VolumeInc",
+ bind(&OHVolume::volumeInc, this, _1, _2));
+ dev->addActionMapping("VolumeDec",
+ bind(&OHVolume::volumeDec, this, _1, _2));
+ dev->addActionMapping("VolumeLimit",
+ bind(&OHVolume::volumeLimit, this, _1, _2));
+ dev->addActionMapping("Mute",
+ bind(&OHVolume::mute, this, _1, _2));
+ dev->addActionMapping("SetMute",
+ bind(&OHVolume::setMute, this, _1, _2));
+}
+
+void OHVolume::getdata(string& trackcount, string &duration,
+ string& seconds)
+{
+ const MpdStatus &mpds = m_dev->getMpdStatus();
+
+ char cbuf[30];
+ sprintf(cbuf, "%d", mpds.trackcounter);
+ trackcount = cbuf;
+ bool is_song = (mpds.state == MpdStatus::MPDS_PLAY) ||
+ (mpds.state == MpdStatus::MPDS_PAUSE);
+ if (is_song) {
+ sprintf(cbuf, "%u", mpds.songlenms / 1000);
+ duration = cbuf;
+ sprintf(cbuf, "%u", mpds.songelapsedms / 1000);
+ seconds = cbuf;
+ }
+}
+
+bool OHVolume::makestate(unordered_map<string, string> &st)
+{
+ st.clear();
+
+ st["VolumeMax"] = "100";
+ st["VolumeLimit"] = 100;
+ st["VolumeUnity"] = "100";
+ st["VolumeSteps"] = "100";
+ st["VolumeMilliDbPerSteps"] = "500";
+ st["BalanceMax"] = "0";
+ st["FadeMax"] = "0";
+ char cbuf[30];
+ int volume = m_ctl->getvolume_i();
+ sprintf(cbuf, "%d", volume);
+ st["Volume"] = cbuf;
+ st["Mute"] = volume == 0 ? "1" : "0";
+ return true;
+}
+
+bool OHVolume::getEventData(bool all, std::vector<std::string>& names,
+ std::vector<std::string>& values)
+{
+ LOGDEB("OHVolume::getEventData" << endl);
+
+ unordered_map<string, string> state;
+ makestate(state);
+
+ unordered_map<string, string> changed;
+ if (all) {
+ changed = state;
+ } else {
+ changed = diffmaps(m_state, state);
+ }
+ m_state = state;
+
+ for (unordered_map<string, string>::iterator it = changed.begin();
+ it != changed.end(); it++) {
+ names.push_back(it->first);
+ values.push_back(it->second);
+ }
+
+ return true;
+}
+
+int OHVolume::characteristics(const SoapArgs& sc, SoapData& data)
+{
+ LOGDEB("OHVolume::charact." << endl);
+ data.addarg("VolumeMax", "100");
+ data.addarg("VolumeUnity", "100");
+ data.addarg("VolumeSteps", "100");
+ // No idea...
+ data.addarg("VolumeMilliDbPerStep", "500");
+ data.addarg("BalanceMax", "0");
+ data.addarg("FadeMax", "0");
+ return UPNP_E_SUCCESS;
+}
+
+int OHVolume::setVolume(const SoapArgs& sc, SoapData& data)
+{
+ LOGDEB("OHVolume::setVolume" << endl);
+ map<string, string>::const_iterator it;
+
+ it = sc.args.find("Value");
+ if (it == sc.args.end() || it->second.empty()) {
+ return UPNP_E_INVALID_PARAM;
+ }
+ int volume = atoi(it->second.c_str());
+ m_ctl->setvolume_i(volume);
+
+ m_dev->loopWakeup();
+ return UPNP_E_SUCCESS;
+}
+
+int OHVolume::setMute(const SoapArgs& sc, SoapData& data)
+{
+ LOGDEB("OHVolume::setMute" << endl);
+ map<string, string>::const_iterator it;
+
+ it = sc.args.find("Value");
+ if (it == sc.args.end() || it->second.empty()) {
+ return UPNP_E_INVALID_PARAM;
+ }
+ bool mute;
+ if (it->second[0] == 'F' || it->second[0] == '0') {
+ mute = false;
+ } else if (it->second[0] == 'T' || it->second[0] == '1') {
+ mute = true;
+ } else {
+ return UPNP_E_INVALID_PARAM;
+ }
+ m_ctl->setmute_i(mute);
+ return UPNP_E_SUCCESS;
+}
+
+int OHVolume::volumeInc(const SoapArgs& sc, SoapData& data)
+{
+ LOGDEB("OHVolume::volumeInc" << endl);
+ int newvol = m_ctl->getvolume_i()+1;
+ if (newvol > 100)
+ newvol = 100;
+ m_ctl->setvolume_i(newvol);
+ m_dev->loopWakeup();
+ return UPNP_E_SUCCESS;
+}
+
+int OHVolume::volumeDec(const SoapArgs& sc, SoapData& data)
+{
+ LOGDEB("OHVolume::volumeDec" << endl);
+ int newvol = m_ctl->getvolume_i() - 1;
+ if (newvol < 0)
+ newvol = 0;
+ m_ctl->setvolume_i(newvol);
+ m_dev->loopWakeup();
+ return UPNP_E_SUCCESS;
+}
+
+int OHVolume::volume(const SoapArgs& sc, SoapData& data)
+{
+ LOGDEB("OHVolume::volume" << endl);
+ char cbuf[30];
+ int volume = m_ctl->getvolume_i();
+ sprintf(cbuf, "%d", volume);
+ data.addarg("Value", cbuf);
+ return UPNP_E_SUCCESS;
+}
+
+int OHVolume::mute(const SoapArgs& sc, SoapData& data)
+{
+ LOGDEB("OHVolume::mute" << endl);
+ bool mute = m_ctl->getvolume_i() == 0;
+ data.addarg("Value", mute ? "1" : "0");
+ return UPNP_E_SUCCESS;
+}
+
+int OHVolume::volumeLimit(const SoapArgs& sc, SoapData& data)
+{
+ LOGDEB("OHVolume::volumeLimit" << endl);
+ data.addarg("Value", "100");
+ return UPNP_E_SUCCESS;
+}
+