Skip to content

Commit

Permalink
Removes Bugs
Browse files Browse the repository at this point in the history
  • Loading branch information
hareshkh committed Oct 19, 2016
1 parent 742ed79 commit 0ffadea
Show file tree
Hide file tree
Showing 4 changed files with 19 additions and 16 deletions.
2 changes: 1 addition & 1 deletion config/config.json
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
{
"base_url" : "http://192.168.1.111:3000"
"base_url" : "http://192.168.225.40:3000"
}
1 change: 1 addition & 0 deletions room.js
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ function Room(name) {
this.players = {};
this.isstartTime = false;
this.startTime;
this.selectedTrack = "";
}

Room.rooms = {};
Expand Down
25 changes: 13 additions & 12 deletions server.js
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ app.get('/create/room', function(req, res) {
app.get('/join/room', function(req, res) {
res.render('joiner');
});
app.get('/room/:room', function (req, res) {
app.get('/room/:room', function (req, res) {
res.render('room');
});

Expand All @@ -55,7 +55,6 @@ io.on('connection', function(socket) {
var myRoom = links[x];
var room;

// console.log(socket.handshake.headers.referer);
socket.on('startSetter', function(msg) {
console.log("Socket recieved");
if (!Room.isStartTime) {
Expand All @@ -69,17 +68,19 @@ io.on('connection', function(socket) {
socket.emit("roomAll", playerInstances);
if (socket.handshake.headers.referer.split('/')[3] == 'create') {
if(socket.handshake.headers.referer.split('/')[5] == undefined) {
room = Room.allocateFirst(socket,myRoom);
var selector = Math.floor(Math.random() * tracks.count);
console.log(tracks.ids[selector]);
socket.emit('songId', String(tracks.ids[selector]));
socket.emit('alertLink', baseUrl + "/room/" + myRoom);
playerInstances = playerInstances + " " + baseUrl + "/room/" + myRoom;
console.log("New room allocated");
}
room = Room.allocateFirst(socket,myRoom);
var selector = Math.floor(Math.random() * tracks.count);
room.selectedTrack = String(tracks.ids[selector]);
console.log("Track set = " + tracks.ids[selector]);
socket.emit('songId', room.selectedTrack);
socket.emit('alertLink', baseUrl + "/room/" + myRoom);
playerInstances = playerInstances + " " + baseUrl + "/room/" + myRoom;
console.log("New room allocated");
}
} else if (socket.handshake.headers.referer.split('/')[3] == 'room') {
console.log("Room '" + socket.handshake.headers.referer.split('/')[4] + "' joined" );
room = Room.allocateOther(socket, socket.handshake.headers.referer.split('/')[4]);
room = Room.allocateOther(socket, socket.handshake.headers.referer.split('/')[4]);
socket.emit('songId', room.selectedTrack);
console.log("Room '" + socket.handshake.headers.referer.split('/')[4] + "' joined" );
} else {
console.log(socket.handshake.headers.referer);
}
Expand Down
7 changes: 4 additions & 3 deletions tracks.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,8 @@
{
"ids" : [
"/tracks/98081145",
"/tracks/273851802"
"/tracks/273828810",
"/tracks/273851802",
"/tracks/279733461"
],
"count" : "2"
"count" : "3"
}

0 comments on commit 0ffadea

Please sign in to comment.