|
a/upmpd/upmpd.cxx |
|
b/upmpd/upmpd.cxx |
|
... |
|
... |
| 39 |
#include "mpdcli.hxx"
|
39 |
#include "mpdcli.hxx"
|
| 40 |
#include "upmpdutils.hxx"
|
40 |
#include "upmpdutils.hxx"
|
| 41 |
#include "rendering.hxx"
|
41 |
#include "rendering.hxx"
|
| 42 |
#include "avtransport.hxx"
|
42 |
#include "avtransport.hxx"
|
| 43 |
#include "conman.hxx"
|
43 |
#include "conman.hxx"
|
|
|
44 |
#include "ohproduct.hxx"
|
| 44 |
|
45 |
|
| 45 |
static const string dfltFriendlyName("UpMpd");
|
46 |
static const string dfltFriendlyName("UpMpd");
|
| 46 |
|
47 |
|
| 47 |
// Note: if we ever need this to work without cxx11, there is this:
|
48 |
// Note: if we ever need this to work without cxx11, there is this:
|
| 48 |
// http://www.tutok.sk/fastgl/callback.html
|
49 |
// http://www.tutok.sk/fastgl/callback.html
|
|
... |
|
... |
| 53 |
m_options(opts)
|
54 |
m_options(opts)
|
| 54 |
{
|
55 |
{
|
| 55 |
m_services.push_back(new UpMpdRenderCtl(this));
|
56 |
m_services.push_back(new UpMpdRenderCtl(this));
|
| 56 |
m_services.push_back(new UpMpdAVTransport(this));
|
57 |
m_services.push_back(new UpMpdAVTransport(this));
|
| 57 |
m_services.push_back(new UpMpdConMan(this));
|
58 |
m_services.push_back(new UpMpdConMan(this));
|
|
|
59 |
m_services.push_back(new OHProduct(this));
|
| 58 |
}
|
60 |
}
|
| 59 |
|
61 |
|
| 60 |
UpMpd::~UpMpd()
|
62 |
UpMpd::~UpMpd()
|
| 61 |
{
|
63 |
{
|
| 62 |
for (vector<UpnpService*>::iterator it = m_services.begin();
|
64 |
for (vector<UpnpService*>::iterator it = m_services.begin();
|
|
... |
|
... |
| 110 |
static string datadir(DATADIR "/");
|
112 |
static string datadir(DATADIR "/");
|
| 111 |
static string configdir(CONFIGDIR "/");
|
113 |
static string configdir(CONFIGDIR "/");
|
| 112 |
|
114 |
|
| 113 |
// Our XML description data. !Keep description.xml first!
|
115 |
// Our XML description data. !Keep description.xml first!
|
| 114 |
static const char *xmlfilenames[] = {/* keep first */ "description.xml",
|
116 |
static const char *xmlfilenames[] = {/* keep first */ "description.xml",
|
| 115 |
"RenderingControl.xml", "AVTransport.xml", "ConnectionManager.xml"};
|
117 |
"RenderingControl.xml", "AVTransport.xml", "ConnectionManager.xml",
|
|
|
118 |
"OHProduct.xml",
|
|
|
119 |
};
|
| 116 |
|
120 |
|
| 117 |
static const int xmlfilenamescnt = sizeof(xmlfilenames) / sizeof(char *);
|
121 |
static const int xmlfilenamescnt = sizeof(xmlfilenames) / sizeof(char *);
|
| 118 |
|
122 |
|
| 119 |
int main(int argc, char *argv[])
|
123 |
int main(int argc, char *argv[])
|
| 120 |
{
|
124 |
{
|