Music: Add composer support.

Author: avuton

JMPDComm/backends/android/src/main/java/org/a0z/mpd/item/MusicParcelable.java

@@ -62,9 +62,9 @@ public MusicParcelable(final Music music) {
      * @param in The {@link android.os.Parcel} that contains our object
      */
     protected MusicParcelable(final Parcel in) {
-        super(in.readString(), in.readString(), in.readString(), in.readString(), in.readInt(),
-                in.readLong(), in.readString(), in.readLong(), in.readString(), in.readInt(),
-                in.readInt(), in.readInt(), in.readInt(), in.readString());
+        super(in.readString(), in.readString(), in.readString(), in.readString(), in.readString(),
+                in.readInt(), in.readLong(), in.readString(), in.readLong(), in.readString(),
+                in.readInt(), in.readInt(), in.readInt(), in.readInt(), in.readString());
     }
 
     @Override
@@ -77,6 +77,7 @@ public void writeToParcel(final Parcel dest, final int flags) {
         dest.writeString(getAlbum());
         dest.writeString(getArtist());
         dest.writeString(getAlbumArtist());
+        dest.writeString(getComposer());
         dest.writeString(getFullPath());
         dest.writeInt(getDisc());
         dest.writeLong(getDate());

JMPDComm/src/main/java/org/a0z/mpd/item/Music.java

@@ -104,6 +104,8 @@ public int compare(final Music lhs, final Music rhs) {
 
     private final String mArtist;
 
+    private final String mComposer;
+
     private final long mDate;
 
     private final int mDisc;
@@ -130,6 +132,7 @@ public Music() {
         this(null, /** Album */
                 null, /** Artist */
                 null, /** AlbumArtist */
+                null, /** Composer */
                 null, /** FullPath */
                 UNDEFINED_INT, /** Disc */
                 -1L, /** Date */
@@ -145,20 +148,21 @@ public Music() {
     }
 
     protected Music(final Music music) {
-        this(music.mAlbum, music.mArtist, music.mAlbumArtist, music.mFullPath, music.mDisc,
-                music.mDate, music.mGenre, music.mTime, music.mTitle,
+        this(music.mAlbum, music.mArtist, music.mAlbumArtist, music.mComposer, music.mFullPath,
+                music.mDisc, music.mDate, music.mGenre, music.mTime, music.mTitle,
                 music.mTotalTracks, music.mTrack, music.mSongId, music.mSongPos, music.mName);
     }
 
     protected Music(final String album, final String artist, final String albumArtist,
-            final String fullPath, final int disc, final long date, final String genre,
-            final long time, final String title, final int totalTracks,
+            final String composer, final String fullPath, final int disc, final long date,
+            final String genre, final long time, final String title, final int totalTracks,
             final int track, final int songId, final int songPos, final String name) {
         super();
 
         mAlbum = album;
         mArtist = artist;
         mAlbumArtist = albumArtist;
+        mComposer = composer;
         mFullPath = fullPath;
         mDisc = disc;
         mDate = date;
@@ -176,6 +180,7 @@ static Music build(final Collection<String> response) {
         String album = null;
         String artist = null;
         String albumArtist = null;
+        String composer = null;
         String fullPath = null;
         int disc = UNDEFINED_INT;
         long date = -1L;
@@ -210,6 +215,9 @@ static Music build(final Collection<String> response) {
                 case "Artist":
                     artist = pair[VALUE];
                     break;
+                case "Composer":
+                    composer = pair[VALUE];
+                    break;
                 case "Date":
                     try {
                         final Matcher matcher = DATE_DELIMITER.matcher(pair[VALUE]);
@@ -289,8 +297,8 @@ static Music build(final Collection<String> response) {
             }
         }
 
-        return new Music(album, artist, albumArtist, fullPath, disc, date, genre, time, title,
-                totalTracks, track, songId, songPos, name);
+        return new Music(album, artist, albumArtist, composer, fullPath, disc, date, genre, time,
+                title, totalTracks, track, songId, songPos, name);
     }
 
     /**
@@ -494,6 +502,7 @@ public boolean equals(final Object o) {
                     {mAlbum, music.mAlbum},
                     {mAlbumArtist, music.mAlbumArtist},
                     {mArtist, music.mArtist},
+                    {mComposer, music.mComposer},
                     {mGenre, music.mGenre},
                     {mName, music.mName},
                     {mTitle, music.mTitle}
@@ -585,6 +594,10 @@ public Artist getArtistAsArtist() {
         return new Artist(mArtist);
     }
 
+    public String getComposer() {
+        return mComposer;
+    }
+
     public long getDate() {
         return mDate;
     }

MPDroid/src/main/java/com/namelessdev/mpdroid/models/AbstractPlaylistMusic.java

@@ -25,12 +25,12 @@ public abstract class AbstractPlaylistMusic extends Music {
     private boolean mForceCoverRefresh = false;
 
     protected AbstractPlaylistMusic(final String album, final String artist,
-            final String albumartist,
+            final String albumartist, final String composer,
             final String fullpath, final int disc, final long date, final String genre,
             final long time, final String title,
             final int totalTracks, final int track, final int songId, final int pos,
             final String name) {
-        super(album, artist, albumartist, fullpath, disc, date, genre, time, title,
+        super(album, artist, albumartist, composer, fullpath, disc, date, genre, time, title,
                 totalTracks, track, songId, pos, name);
     }
 

MPDroid/src/main/java/com/namelessdev/mpdroid/models/PlaylistSong.java

@@ -27,10 +27,10 @@
 public class PlaylistSong extends AbstractPlaylistMusic {
 
     public PlaylistSong(final Music music) {
-        super(music.getAlbum(), music.getArtist(), music.getAlbumArtist(), music.getFullPath(),
-                music.getDisc(), music.getDate(), music.getGenre(), music.getTime(),
-                music.getTitle(), music.getTotalTracks(), music.getTrack(), music.getSongId(),
-                music.getPos(), music.getName());
+        super(music.getAlbum(), music.getArtist(), music.getAlbumArtist(), music.getComposer(),
+                music.getFullPath(), music.getDisc(), music.getDate(), music.getGenre(),
+                music.getTime(), music.getTitle(), music.getTotalTracks(), music.getTrack(),
+                music.getSongId(), music.getPos(), music.getName());
     }
 
     @Override

MPDroid/src/main/java/com/namelessdev/mpdroid/models/PlaylistStream.java

@@ -22,10 +22,10 @@
 public class PlaylistStream extends AbstractPlaylistMusic {
 
     public PlaylistStream(final Music music) {
-        super(music.getAlbum(), music.getArtist(), music.getAlbumArtist(), music.getFullPath(),
-                music.getDisc(), music.getDate(), music.getGenre(), music.getTime(),
-                music.getTitle(), music.getTotalTracks(), music.getTrack(), music.getSongId(),
-                music.getPos(), music.getName());
+        super(music.getAlbum(), music.getArtist(), music.getAlbumArtist(), music.getComposer(),
+                music.getFullPath(), music.getDisc(), music.getDate(), music.getGenre(),
+                music.getTime(), music.getTitle(), music.getTotalTracks(), music.getTrack(),
+                music.getSongId(), music.getPos(), music.getName());
     }
 
     @Override