2 files changed, 7 insertions, 1 deletions

diff --git a/src/mpris.rs b/src/mpris.rs
index 0c637c0..a7ac360 100644
--- a/src/mpris.rs
+++ b/src/mpris.rs
@@ -128,7 +128,10 @@ fn build_metadata(track: &Track) -> HashMap<String, Value<'static>> {
         Value::new(track.album.clone().unwrap_or_default()),
     );
 
-    map.insert("xesam:trackNumber".into(), Value::new(0i32));
+    map.insert(
+        "xesam:trackNumber".into(),
+        Value::new(track.track_number.unwrap_or(0)),
+    );
 
     map
 }
diff --git a/src/queue.rs b/src/queue.rs
index 7675ddd..1f2f0fc 100644
--- a/src/queue.rs
+++ b/src/queue.rs
@@ -98,6 +98,7 @@ pub struct Track {
     pub title: Option<String>,
     pub artist: Option<String>,
     pub album: Option<String>,
+    pub track_number: Option<i32>,
     pub duration_secs: Option<f64>,
     pub is_stream: bool,
 }
@@ -115,6 +116,7 @@ impl Track {
             title: metadata.and_then(|m| m.title.clone()),
             artist: metadata.and_then(|m| m.artist.clone()),
             album: metadata.and_then(|m| m.album.clone()),
+            track_number: metadata.and_then(|m| m.track_number),
             duration_secs: metadata.and_then(|m| m.duration_secs),
             is_stream: false,
         }
@@ -139,6 +141,7 @@ impl Track {
             title: Some(title),
             artist: None,
             album: None,
+            track_number: None,
             duration_secs: None,
             is_stream: true,
         }