Switch to unified view

a/src/mpdcli.hxx b/src/mpdcli.hxx
...
...
21
#include <string>                       // for string
21
#include <string>                       // for string
22
#include <cstdio>
22
#include <cstdio>
23
#include <vector>                       // for vector
23
#include <vector>                       // for vector
24
#include <memory>
24
#include <memory>
25
25
26
#include "upmpdutils.hxx"
27
26
struct mpd_song;
28
struct mpd_song;
27
28
class UpSong {
29
public:
30
    UpSong() : duration_secs(0), mpdid(0) {}
31
    void clear() {
32
        uri.clear(); 
33
        artist.clear(); 
34
        album.clear();
35
        title.clear();
36
        tracknum.clear();
37
        genre.clear();
38
        duration_secs = mpdid = 0;
39
    }
40
    std::string uri;
41
    std::string name; // only set for radios apparently
42
    std::string artist;
43
    std::string album;
44
    std::string title;
45
    std::string tracknum;
46
    std::string genre;
47
    std::string artUri; // This does not come from mpd, but we sometimes add it
48
    unsigned int duration_secs;
49
    int mpdid;
50
    std::string dump() {
51
        return std::string("Uri [") + uri + "] Artist [" + artist + "] Album ["
52
            +  album + "] Title [" + title + "] Tno [" + tracknum + "]";
53
    }
54
};
55
29
56
class MpdStatus {
30
class MpdStatus {
57
public:
31
public:
58
    MpdStatus() : trackcounter(0), detailscounter(0) {}
32
    MpdStatus() : trackcounter(0), detailscounter(0) {}
59
33