Switch to unified view

a/src/upmpd.hxx b/src/upmpd.hxx
...
...
30
extern std::string g_configfilename;
30
extern std::string g_configfilename;
31
extern std::string g_datadir;
31
extern std::string g_datadir;
32
class ConfSimple;
32
class ConfSimple;
33
extern ConfSimple *g_config;
33
extern ConfSimple *g_config;
34
extern std::string g_protocolInfo;
34
extern std::string g_protocolInfo;
35
36
typedef struct ohInfoDesc {
37
  std::string name;
38
  std::string info;
39
  std::string url;
40
  std::string imageUri;
41
} ohInfoDesc_t;
42
43
typedef struct ohProductDesc {
44
  ohInfoDesc_t manufacturer;
45
  ohInfoDesc_t model;
46
  ohInfoDesc_t product;
47
  std::string room;
48
} ohProductDesc_t;
35
49
36
using namespace UPnPProvider;
50
using namespace UPnPProvider;
37
51
38
class UpMpdRenderCtl;
52
class UpMpdRenderCtl;
39
class UpMpdAVTransport;
53
class UpMpdAVTransport;
...
...
86
        std::string sc2mpdpath;
100
        std::string sc2mpdpath;
87
        std::string senderpath;
101
        std::string senderpath;
88
        int sendermpdport;
102
        int sendermpdport;
89
    };
103
    };
90
    UpMpd(const std::string& deviceid, const std::string& friendlyname,
104
    UpMpd(const std::string& deviceid, const std::string& friendlyname,
105
          ohProductDesc_t& ohProductDesc,
91
          const std::unordered_map<std::string, VDirContent>& files,
106
          const std::unordered_map<std::string, VDirContent>& files,
92
          MPDCli *mpdcli, Options opts);
107
          MPDCli *mpdcli, Options opts);
93
    ~UpMpd();
108
    ~UpMpd();
94
109
95
    const MpdStatus &getMpdStatus();
110
    const MpdStatus &getMpdStatus();