Switch to unified view

a/src/upmpdutils.hxx b/src/upmpdutils.hxx
...
...
39
    }
39
    }
40
    std::string id;
40
    std::string id;
41
    std::string parentid;
41
    std::string parentid;
42
    std::string uri;
42
    std::string uri;
43
    std::string name; // only set for radios apparently. 
43
    std::string name; // only set for radios apparently. 
44
    std::string artist; // Reused as annot for containers
44
    std::string artist; 
45
    std::string album;
45
    std::string album;
46
    std::string title;
46
    std::string title;
47
    std::string tracknum;
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
51
    unsigned int duration_secs;
51
    unsigned int duration_secs;
52
    int mpdid;
52
    int mpdid;
...
...
58
            +  album + "] Title [" + title + "] Tno [" + tracknum + "]";
58
            +  album + "] Title [" + title + "] Tno [" + tracknum + "]";
59
    }
59
    }
60
    // Format to DIDL fragment 
60
    // Format to DIDL fragment 
61
    std::string didl();
61
    std::string didl();
62
62
63
    static UpSong container(const std::string& i, const std::string& p,
63
    static UpSong container(const std::string& id, const std::string& pid,
64
                const std::string& t, bool s = true,
64
                const std::string& title, bool sable = true,
65
                const std::string& annot = std::string()) {
65
                const std::string& annot = std::string()) {
66
    UpSong song;
66
    UpSong song;
67
    song.iscontainer = true;
67
    song.iscontainer = true;
68
  song.id = i; song.parentid = p; song.title = t; song.searchable = s;
68
  song.id = id;
69
  song.artist = annot;
69
        song.parentid = pid;
70
        song.title = title;
71
        song.searchable = sable;
72
  song.tracknum = annot;
70
    return song;
73
    return song;
71
    }
74
    }
72
    static UpSong item(const std::string& id, const std::string& parentid,
75
    static UpSong item(const std::string& id, const std::string& parentid,
73
                       const std::string& title) {
76
                       const std::string& title) {
74
    UpSong song;
77
    UpSong song;