Switch to unified view

a/libupnpp/description.cxx b/libupnpp/description.cxx
...
...
29
#include "expatmm.hxx"
29
#include "expatmm.hxx"
30
#include "description.hxx"
30
#include "description.hxx"
31
31
32
class UPnPDeviceParser : public expatmm::inputRefXMLParser {
32
class UPnPDeviceParser : public expatmm::inputRefXMLParser {
33
public:
33
public:
34
    UPnPDeviceParser(const string& input, UPnPDevice& device)
34
    UPnPDeviceParser(const string& input, UPnPDeviceDesc& device)
35
        : expatmm::inputRefXMLParser(input), m_device(device)
35
        : expatmm::inputRefXMLParser(input), m_device(device)
36
        {}
36
        {}
37
37
38
protected:
38
protected:
39
    virtual void StartElement(const XML_Char *name, const XML_Char **)
39
    virtual void StartElement(const XML_Char *name, const XML_Char **)
...
...
97
            break;
97
            break;
98
        }
98
        }
99
    }
99
    }
100
100
101
private:
101
private:
102
    UPnPDevice& m_device;
102
    UPnPDeviceDesc& m_device;
103
    string m_tabs;
103
    string m_tabs;
104
    std::vector<std::string> m_path;
104
    std::vector<std::string> m_path;
105
    UPnPService m_tservice;
105
    UPnPServiceDesc m_tservice;
106
};
106
};
107
107
108
UPnPDevice::UPnPDevice(const string& url, const string& description)
108
UPnPDeviceDesc::UPnPDeviceDesc(const string& url, const string& description)
109
    : ok(false)
109
    : ok(false)
110
{
110
{
111
    //cerr << "UPnPDevice::UPnPDevice: url: " << url << endl;
111
    //cerr << "UPnPDeviceDesc::UPnPDeviceDesc: url: " << url << endl;
112
    //cerr << " description " << endl << description << endl;
112
    //cerr << " description " << endl << description << endl;
113
113
114
    UPnPDeviceParser mparser(description, *this);
114
    UPnPDeviceParser mparser(description, *this);
115
    if (!mparser.Parse())
115
    if (!mparser.Parse())
116
        return;
116
        return;