Switch to unified view

a/upmpd/conman.cxx b/upmpd/conman.cxx
...
...
54
                               this,_1,_2));
54
                               this,_1,_2));
55
    dev->addActionMapping("GetProtocolInfo", 
55
    dev->addActionMapping("GetProtocolInfo", 
56
                          bind(&UpMpdConMan::getProtocolInfo, this, _1, _2));
56
                          bind(&UpMpdConMan::getProtocolInfo, this, _1, _2));
57
}
57
}
58
58
59
// "http-get:*:audio/mpeg:DLNA.ORG_PN=MP3,"
60
// "http-get:*:audio/L16:DLNA.ORG_PN=LPCM,"
61
// "http-get:*:audio/x-flac:DLNA.ORG_PN=FLAC"
62
static const string 
63
myProtocolInfo(
64
    "http-get:*:audio/wav:*,"
65
    "http-get:*:audio/wave:*,"
66
    "http-get:*:audio/x-wav:*,"
67
    "http-get:*:audio/x-aiff:*,"
68
    "http-get:*:audio/mpeg:*,"
69
    "http-get:*:audio/x-mpeg:*,"
70
    "http-get:*:audio/mp1:*,"
71
    "http-get:*:audio/aac:*,"
72
    "http-get:*:audio/flac:*,"
73
    "http-get:*:audio/x-flac:*,"
74
    "http-get:*:audio/m4a:*,"
75
    "http-get:*:audio/mp4:*,"
76
    "http-get:*:audio/x-m4a:*,"
77
    "http-get:*:audio/vorbis:*,"
78
    "http-get:*:audio/ogg:*,"
79
    "http-get:*:audio/x-ogg:*,"
80
    "http-get:*:audio/x-scpls:*,"
81
    "http-get:*:audio/L16;rate=11025;channels=1:*,"
82
    "http-get:*:audio/L16;rate=22050;channels=1:*,"
83
    "http-get:*:audio/L16;rate=44100;channels=1:*,"
84
    "http-get:*:audio/L16;rate=48000;channels=1:*,"
85
    "http-get:*:audio/L16;rate=88200;channels=1:*,"
86
    "http-get:*:audio/L16;rate=96000;channels=1:*,"
87
    "http-get:*:audio/L16;rate=176400;channels=1:*,"
88
    "http-get:*:audio/L16;rate=192000;channels=1:*,"
89
    "http-get:*:audio/L16;rate=11025;channels=2:*,"
90
    "http-get:*:audio/L16;rate=22050;channels=2:*,"
91
    "http-get:*:audio/L16;rate=44100;channels=2:*,"
92
    "http-get:*:audio/L16;rate=48000;channels=2:*,"
93
    "http-get:*:audio/L16;rate=88200;channels=2:*,"
94
    "http-get:*:audio/L16;rate=96000;channels=2:*,"
95
    "http-get:*:audio/L16;rate=176400;channels=2:*,"
96
    "http-get:*:audio/L16;rate=192000;channels=2:*"
97
    );
98
99
bool UpMpdConMan::getEventData(bool all, std::vector<std::string>& names, 
59
bool UpMpdConMan::getEventData(bool all, std::vector<std::string>& names, 
100
                                 std::vector<std::string>& values)
60
                                 std::vector<std::string>& values)
101
{
61
{
102
    //LOGDEB("UpMpd:getEventDataCM" << endl);
62
    //LOGDEB("UpMpd:getEventDataCM" << endl);
103
63
104
    // Our data never changes, so if this is not an unconditional request,
64
    // Our data never changes, so if this is not an unconditional request,
105
    // we return nothing.
65
    // we return nothing.
106
    if (all) {
66
    if (all) {
107
        names.push_back("SinkProtocolInfo");
67
        names.push_back("SinkProtocolInfo");
108
        values.push_back(myProtocolInfo);
68
        values.push_back(upmpdProtocolInfo);
109
    }
69
    }
110
    return true;
70
    return true;
111
}
71
}
112
72
113
int UpMpdConMan::getCurrentConnectionIDs(const SoapArgs& sc, SoapData& data)
73
int UpMpdConMan::getCurrentConnectionIDs(const SoapArgs& sc, SoapData& data)
...
...
142
102
143
int UpMpdConMan::getProtocolInfo(const SoapArgs& sc, SoapData& data)
103
int UpMpdConMan::getProtocolInfo(const SoapArgs& sc, SoapData& data)
144
{
104
{
145
    LOGDEB("UpMpdConMan::getProtocolInfo" << endl);
105
    LOGDEB("UpMpdConMan::getProtocolInfo" << endl);
146
    data.addarg("Source", "");
106
    data.addarg("Source", "");
147
    data.addarg("Sink", myProtocolInfo);
107
    data.addarg("Sink", upmpdProtocolInfo);
148
108
149
    return UPNP_E_SUCCESS;
109
    return UPNP_E_SUCCESS;
150
}
110
}