fixed song list play order mismatch

also sort by disc/track correctly

app/state/musicmap.ts

@@ -46,6 +46,7 @@ export const createMusicMapSlice = (set: SetState<Store>, get: GetState<Store>):
       artistId: child.artistId,
       title: child.title,
       track: child.track,
+      discNumber: child.discNumber,
       duration: child.duration,
       starred: child.starred,
       coverArt: coverArt || (await get().getAlbumCoverArt(child.albumId)),

app/state/trackplayer.ts

@@ -11,6 +11,8 @@ export type TrackExt = Track & {
   coverArt?: string
   artistId?: string
   albumId?: string
+  track?: number
+  discNumber?: number
 }
 
 export type Progress = {

app/state/trackplayermap.ts

@@ -34,6 +34,8 @@ export const createTrackPlayerMapSlice = (set: SetState<Store>, get: GetState<St
       duration: song.duration,
       artistId: song.artistId,
       albumId: song.albumId,
+      track: song.track,
+      discNumber: song.discNumber,
     }
   },
 
@@ -53,6 +55,8 @@ export const createTrackPlayerMapSlice = (set: SetState<Store>, get: GetState<St
       duration: track.duration,
       artistId: track.artistId,
       albumId: track.albumId,
+      track: track.track,
+      discNumber: track.discNumber,
     }
   },
 })