Just adding disc and track number to metadata (#167)

* replace frame requires updating position * formatting (...) * more (enougj) formating * bell fix * Update bell * Update bell * Add disc & track number * add Episode (podcast) number as well * initialize discNumber to 0 in podcast
feelfreelinux · Jan 15, 2024 · 541fed5 · 541fed5
1 parent 7e3930d
commit 541fed5
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 2 deletions.
diff --git a/cspot/bell b/cspot/bell
diff --git a/cspot/include/TrackQueue.h b/cspot/include/TrackQueue.h
@@ -24,7 +24,7 @@ class CDNAudioFile;
 // Used in got track info event
 struct TrackInfo {
   std::string name, album, artist, imageUrl, trackId;
-  uint32_t duration;
+  uint32_t duration, number, discNumber;
 
   void loadPbTrack(Track* pbTrack, const std::vector<uint8_t>& gid);
   void loadPbEpisode(Episode* pbEpisode, const std::vector<uint8_t>& gid);

diff --git a/cspot/protobuf/metadata.proto b/cspot/protobuf/metadata.proto
@@ -32,6 +32,8 @@ message Artist {
 message Track {
     optional bytes gid = 1;
     optional string name = 2;
+    optional sint32 number = 5;
+    optional sint32 disc_number = 6;
     optional sint32 duration = 0x7;
     optional Album album = 0x3;
     repeated Artist artist = 0x4;
@@ -44,6 +46,7 @@ message Episode {
     optional bytes gid = 1;
     optional string name = 2;
     optional sint32 duration = 7;
+    optional sint32 number = 65;
     repeated AudioFile file = 12;
     repeated Restriction restriction = 0x4B;
     optional ImageGroup covers = 0x44;

diff --git a/cspot/src/TrackQueue.cpp b/cspot/src/TrackQueue.cpp
@@ -97,6 +97,8 @@ void TrackInfo::loadPbTrack(Track* pbTrack, const std::vector<uint8_t>& gid) {
     }
   }
 
+  number = pbTrack->has_number ? pbTrack->number : 0;
+  discNumber = pbTrack->has_disc_number ? pbTrack->disc_number : 0;
   duration = pbTrack->duration;
 }
 
@@ -113,6 +115,8 @@ void TrackInfo::loadPbEpisode(Episode* pbEpisode,
     imageUrl = "https://i.scdn.co/image/" + bytesToHexString(imageId);
   }
 
+  number = pbEpisode->has_number ? pbEpisode->number : 0;
+  discNumber = 0;
   duration = pbEpisode->duration;
 }
+1 −1		external/mdnssvc
+18 −10		main/platform/linux/MDNSService.cpp
+14 −5		main/platform/win32/MDNSService.cpp
+6 −8		main/utilities/include/BellTask.h