updated: rooms js to have separate display track and artist

diff --git a/lib/rooms.js b/lib/rooms.js
index 6d0f03dfb16d8f8eb6c50752fd28ca4af25ecbf1..c7df7a70add10259237991dc693f2e3a5e06dc0f 100644 (file)
--- a/lib/rooms.js
+++ b/lib/rooms.js
@@ -64,6 +64,9 @@ function Room(roomname) {
   this.totusers = 0; // The number of players in the room
   this.usersData = Object.create(null);
 
+  this.displayArtistNames = null;
+  this.displayTrackName = null;
+
   this.initialize();
 }
 
@@ -547,6 +550,8 @@ Room.prototype.sendLoadTrack = function() {
       'previewUrl',
       'artworkUrl60',
       'trackViewUrl',
+      'displayArtistNames',
+      'displayTrackName'
       function(err, replies) {
         if (err) {
           throw err;
@@ -565,6 +570,8 @@ Room.prototype.sendLoadTrack = function() {
         }
         room.artworkUrl = replies[3];
         room.trackViewUrl = replies[4];
+        room.displayArtistNames = replies[5];
+        room.displayTrackName = replies[6];
         primus.room(room.roomname).send('loadtrack', room.previewUrl);
 
         setTimeout(room.sendPlayTrack.bind(room), 5000);
@@ -598,8 +605,8 @@ Room.prototype.sendPlayTrack = function() {
 Room.prototype.sendTrackInfo = function() {
   primus.room(this.roomname).send('trackinfo', {
     artworkUrl: this.artworkUrl,
-    artistName: this.artistName,
-    trackName: this.trackName,
+    artistName: this.displayArtistNames,
+    trackName: this.displayTrackName,
     trackViewUrl: this.trackViewUrl
   });
 

diff --git a/util/set-custom-sis50.js b/util/set-custom-sis50.js
index a10f1cbbd37c01cfe20e08c88f1eed8434f7e92d..8acd0916f07685970fc2faa5f41d38060fb7e951 100644 (file)
--- a/util/set-custom-sis50.js
+++ b/util/set-custom-sis50.js
@@ -36,7 +36,11 @@ fs.readFile("util/song-map.csv", "utf8", (err, data) => {
       'artworkUrl60',
       "",
       'artworkUrl100',
-      ''
+      '',
+      'displayArtistNames',
+      '',
+      'displayTrackName',
+      '',
     );
     songsclient.zadd("hits", i, i);
   }