removed unused variable collectionName

diff --git a/lib/room.js b/lib/room.js
index 75d26b2bf9bdd4730ab750be424bc3edce8c887f..7b4c0ea69f21e522efaf11d558a1f55c4f6fafa0 100644 (file)
--- a/lib/room.js
+++ b/lib/room.js
@@ -33,7 +33,6 @@ function Room(roomname) {
         , artist // Artists in lowercase
         , artistName
         , artworkUrl
-        , collectionName
         , feat // Featured artists
         , finishline = 1
         , playedtracks = [] // The list of already played songs
@@ -338,17 +337,23 @@ function Room(roomname) {
                 return sendLoadTrack();
             }
             playedtracks.push(res);
-            songsdb.hmget('song:'+res, 'artistName', 'trackName', 'collectionName',
-                    'previewUrl', 'artworkUrl60', 'trackViewUrl', function(e, replies) {
+            var args = [
+                'song:'+res
+                , 'artistName'
+                , 'trackName'
+                , 'previewUrl'
+                , 'artworkUrl60'
+                , 'trackViewUrl'
+            ];
+            songsdb.hmget(args, function(e, replies) {
                 artistName = replies[0];
                 artist = artistName.toLowerCase();
                 trackName = replies[1];
                 title = trackName.toLowerCase();
                 feat = /feat\. (.+?)[)\]]/.test(title) ? RegExp.$1 : null;
-                collectionName = replies[2];
-                previewUrl = replies[3];
-                artworkUrl = replies[4];
-                trackViewUrl = replies[5];
+                previewUrl = replies[2];
+                artworkUrl = replies[3];
+                trackViewUrl = replies[4];
                 io.sockets.in(roomname).emit('loadtrack', previewUrl);
                 setTimeout(sendPlayTrack, 5000);
             });
@@ -386,7 +391,6 @@ function Room(roomname) {
             artistName: artistName,
             trackName: trackName,
             trackViewUrl: trackViewUrl,
-            collectionName: collectionName
         };
         io.sockets.in(roomname).emit('trackinfo', trackinfo);
         finishline = 1;