Switch to unified view

a/src/upmpd.cxx b/src/upmpd.cxx
...
...
54
#include "ohsndrcv.hxx"
54
#include "ohsndrcv.hxx"
55
55
56
using namespace std;
56
using namespace std;
57
using namespace std::placeholders;
57
using namespace std::placeholders;
58
using namespace UPnPP;
58
using namespace UPnPP;
59
60
bool OHService::getEventData(bool all, vector<string>& names, 
61
                                      vector<std::string>& values)
62
{
63
    //LOGDEB("OHService::getEventData" << std::endl);
64
65
    std::unordered_map<std::string, std::string> state, changed;
66
    makestate(state);
67
    if (all) {
68
        changed = state;
69
    } else {
70
        changed = diffmaps(m_state, state);
71
    }
72
    m_state = state;
73
74
    for (auto it = changed.begin(); it != changed.end(); it++) {
75
        //LOGDEB("OHService: state change: " << it->first << " -> "
76
        // << it->second << endl);
77
        names.push_back(it->first);
78
        values.push_back(it->second);
79
    }
80
81
    return true;
82
}
59
83
60
// Note: if we ever need this to work without cxx11, there is this:
84
// Note: if we ever need this to work without cxx11, there is this:
61
// http://www.tutok.sk/fastgl/callback.html
85
// http://www.tutok.sk/fastgl/callback.html
62
UpMpd::UpMpd(const string& deviceid, const string& friendlyname,
86
UpMpd::UpMpd(const string& deviceid, const string& friendlyname,
63
             const unordered_map<string, VDirContent>& files,
87
             const unordered_map<string, VDirContent>& files,