Switch to unified view

a/upmpd/ohplaylist.cxx b/upmpd/ohplaylist.cxx
...
...
13
 *   along with this program; if not, write to the
13
 *   along with this program; if not, write to the
14
 *   Free Software Foundation, Inc.,
14
 *   Free Software Foundation, Inc.,
15
 *   59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
15
 *   59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
16
 */
16
 */
17
17
18
#include <stdio.h>
18
#include "ohplaylist.hxx"
19
#include <stdlib.h>
20
#include <unistd.h>
21
#include <sys/types.h>
22
#include <pwd.h>
23
19
24
#include <string>
20
#include <stdlib.h>                     // for atoi
25
#include <iostream>
21
26
#include <sstream>
22
#include <upnp/upnp.h>                  // for UPNP_E_SUCCESS, etc
27
#include <vector>
23
28
#include <functional>
24
#include <functional>                   // for _Bind, bind, _1, _2
29
#include <set>
25
#include <iostream>                     // for endl, etc
26
#include <string>                       // for string, allocator, etc
27
#include <utility>                      // for pair
28
#include <vector>                       // for vector
29
30
#include "libupnpp/base64.hxx"          // for base64_encode
31
#include "libupnpp/log.hxx"             // for LOGDEB, LOGERR
32
#include "libupnpp/soaphelp.hxx"        // for SoapArgs, SoapData, i2s, etc
33
34
#include "ohmetacache.hxx"              // for dmcacheSave
35
#include "mpdcli.hxx"                   // for MpdStatus, UpSong, MPDCli, etc
36
#include "upmpd.hxx"                    // for UpMpd, etc
37
#include "upmpdutils.hxx"               // for didlmake, diffmaps, etc
38
30
using namespace std;
39
using namespace std;
31
using namespace std::placeholders;
40
using namespace std::placeholders;
32
33
#include "libupnpp/upnpplib.hxx"
34
#include "libupnpp/soaphelp.hxx"
35
#include "libupnpp/log.hxx"
36
#include "libupnpp/base64.hxx"
37
#include "libupnpp/device/device.hxx"
38
39
#include "upmpd.hxx"
40
#include "ohplaylist.hxx"
41
#include "ohmetacache.hxx"
42
#include "mpdcli.hxx"
43
#include "upmpdutils.hxx"
44
41
45
static const string sTpProduct("urn:av-openhome-org:service:Playlist:1");
42
static const string sTpProduct("urn:av-openhome-org:service:Playlist:1");
46
static const string sIdProduct("urn:av-openhome-org:serviceId:Playlist");
43
static const string sIdProduct("urn:av-openhome-org:serviceId:Playlist");
47
44
48
OHPlaylist::OHPlaylist(UpMpd *dev, UpMpdRenderCtl *ctl)
45
OHPlaylist::OHPlaylist(UpMpd *dev, UpMpdRenderCtl *ctl)