Switch to unified view

a/src/upmpd.hxx b/src/upmpd.hxx
...
...
19
#define _UPMPD_H_X_INCLUDED_
19
#define _UPMPD_H_X_INCLUDED_
20
20
21
#include <string>
21
#include <string>
22
#include <unordered_map>
22
#include <unordered_map>
23
#include <vector>
23
#include <vector>
24
#include <unordered_set>
25
#include <mutex>
26
24
27
#include "libupnpp/device/device.hxx"
25
#include "libupnpp/device/device.hxx"
28
26
27
#include "main.hxx"
28
29
class MPDCli;
29
class MPDCli;
30
class MpdStatus;
30
class MpdStatus;
31
32
extern std::string g_configfilename;
33
extern std::string g_datadir;
34
class ConfSimple;
35
extern std::mutex g_configlock;
36
extern ConfSimple *g_config;
37
extern std::string g_protocolInfo;
38
extern std::unordered_set<std::string> g_supportedFormats;
39
40
typedef struct ohInfoDesc {
41
    std::string name;
42
    std::string info;
43
    std::string url;
44
    std::string imageUri;
45
} ohInfoDesc_t;
46
47
typedef struct ohProductDesc {
48
    ohInfoDesc_t manufacturer;
49
    ohInfoDesc_t model;
50
    ohInfoDesc_t product;
51
    std::string room;
52
} ohProductDesc_t;
53
31
54
using namespace UPnPProvider;
32
using namespace UPnPProvider;
55
33
56
class UpSong;
34
class UpSong;
57
class UpMpdRenderCtl;
35
class UpMpdRenderCtl;