--- a
+++ b/upmpd/ohtime.cxx
@@ -0,0 +1,115 @@
+/* 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 "ohtime.hxx"
+#include "mpdcli.hxx"
+#include "upmpdutils.hxx"
+
+static const string sTpProduct("urn:av-openhome-org:service:Time:1");
+static const string sIdProduct("urn:av-openhome-org:serviceId:Time");
+
+OHTime::OHTime(UpMpd *dev)
+ : UpnpService(sTpProduct, sIdProduct, dev), m_dev(dev)
+{
+ dev->addActionMapping("Time", bind(&OHTime::ohtime, this, _1, _2));
+}
+
+void OHTime::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 OHTime::makestate(unordered_map<string, string> &st)
+{
+ st.clear();
+ string trackcount("0"), duration("0"), seconds("0");
+ getdata(trackcount, duration, seconds);
+ st["TrackCount"] = trackcount;
+ st["Duration"] = duration;
+ st["Seconds"] = seconds;
+ return true;
+}
+
+bool OHTime::getEventData(bool all, std::vector<std::string>& names,
+ std::vector<std::string>& values)
+{
+ LOGDEB("OHTime::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 OHTime::ohtime(const SoapArgs& sc, SoapData& data)
+{
+ LOGDEB("OHTime::ohtime" << endl);
+ string trackcount("0"), duration("0"), seconds("0");
+ getdata(trackcount, duration, seconds);
+ data.addarg("TrackCount", trackcount);
+ data.addarg("Duration", duration);
+ data.addarg("Seconds", seconds);
+ return UPNP_E_SUCCESS;
+}