Switch to unified view

a/src/upmpdutils.hxx b/src/upmpdutils.hxx
...
...
29
// This was originally purely a translation of data from mpd. Extended
29
// This was originally purely a translation of data from mpd. Extended
30
// to general purpose track/container descriptor
30
// to general purpose track/container descriptor
31
class UpSong {
31
class UpSong {
32
public:
32
public:
33
    UpSong()
33
    UpSong()
34
  : duration_secs(0), mpdid(0),
34
  : duration_secs(0), bitrate(0), samplefreq(0), mpdid(0),
35
      iscontainer(false), searchable(false) {
35
      iscontainer(false), searchable(false) {
36
    }
36
    }
37
    void clear() {
37
    void clear() {
38
    *this = UpSong();
38
    *this = UpSong();
39
    }
39
    }
...
...
45
    std::string album;
45
    std::string album;
46
    std::string title;
46
    std::string title;
47
    std::string tracknum; // Reused as annot for containers
47
    std::string tracknum; // Reused as annot for containers
48
    std::string genre;
48
    std::string genre;
49
    std::string artUri;
49
    std::string artUri;
50
50
    std::string upnpClass;
51
    std::string mime;
52
    
51
    unsigned int duration_secs;
53
    unsigned int duration_secs;
54
    unsigned int bitrate;
55
    unsigned int samplefreq;
56
    
52
    int mpdid;
57
    int mpdid;
53
    bool iscontainer;
58
    bool iscontainer;
54
    bool searchable;
59
    bool searchable;
55
60
56
    std::string dump() {
61
    std::string dump() {
57
        return std::string("Uri [") + uri + "] Artist [" + artist + "] Album ["
62
        return std::string("class [" + upnpClass + "] Artist [" + artist +
58
            +  album + "] Title [" + title + "] Tno [" + tracknum + "]";
63
                           "] Album [" +  album + " Title [" + title +
64
                           "] Tno [" + tracknum + "] Uri [" + uri + "]");
59
    }
65
    }
60
    // Format to DIDL fragment 
66
    // Format to DIDL fragment 
61
    std::string didl();
67
    std::string didl();
62
68
63
    static UpSong container(const std::string& id, const std::string& pid,
69
    static UpSong container(const std::string& id, const std::string& pid,