Switch to unified view

a/src/upmpdutils.hxx b/src/upmpdutils.hxx
...
...
44
// Convert UPnP metadata to UpSong for mpdcli to use
44
// Convert UPnP metadata to UpSong for mpdcli to use
45
extern bool uMetaToUpSong(const std::string&, UpSong *ups);
45
extern bool uMetaToUpSong(const std::string&, UpSong *ups);
46
// Convert UPnP content directory entry object to UpSong
46
// Convert UPnP content directory entry object to UpSong
47
bool dirObjToUpSong(const UPnPClient::UPnPDirObject& dobj, UpSong *ups);
47
bool dirObjToUpSong(const UPnPClient::UPnPDirObject& dobj, UpSong *ups);
48
48
49
// Extract the set of formats from protocolinfo data (comma separated
50
// list of 'proto:net:format:extradata' elements, e.g. http-get:*:audio/mpeg:*) 
51
// All format strings are changed to lower case in the output set.
52
extern bool protocolInfoToFormats(const std::string& pinfo,
53
                                  std::unordered_set<std::string>& formats);
54
55
// Extract content format from resource protocolinfo attribute. This
56
// should be made an UPnPResource method one day
57
std::string resourceContentFormat(const UPnPClient::UPnPResource& res);
58
59
60
// Replace the first occurrence of regexp. cxx11 regex does not work
49
// Replace the first occurrence of regexp. cxx11 regex does not work
61
// that well yet...
50
// that well yet...
62
extern std::string regsub1(const std::string& sexp, const std::string& input, 
51
extern std::string regsub1(const std::string& sexp, const std::string& input, 
63
                           const std::string& repl);
52
                           const std::string& repl);
64
53