Skip to content

Commit 5dfbed6

Browse files
committed
fix final
1 parent 4269542 commit 5dfbed6

File tree

4 files changed

+7
-6
lines changed

4 files changed

+7
-6
lines changed

app.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ var users = {
2626
app.get('/:user', function(req, res, next){
2727
console.log("params >>", req.params);
2828
if(req.params.user && users[req.params.user]) {
29-
res.render("listen", {user:req.params.user});
29+
res.render("listen", {username:req.params.user});
3030
} else {
3131
next();
3232
}

listen.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -184,7 +184,7 @@ $( function() {
184184
var player = new MozPlayer;
185185
var socket = io.connect();
186186
if(user !== "") {
187-
socket.on(user, function(from, samples) {
187+
socket.on(username, function(from, samples) {
188188
player.play(new RadioStreamGenerator(samples));
189189
});
190190
}

views/listen.html

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<script>
2-
var user = "<%=user%>";
2+
var username = "<%=username%>";
33
</script>
44
<script src="http://code.jquery.com/jquery-1.6.1.min.js"></script>
55
<script src="/socket.io/socket.io.js"></script>

views/talk.html

+4-3
Original file line numberDiff line numberDiff line change
@@ -15,12 +15,13 @@
1515
<audio id="radio"></audio>
1616

1717
<script>
18+
if(typeof user === "undefined") user = "";
1819
var username = user.screenName || "milfont";
1920
var socket = io.connect();
2021
var mic;
2122
$("button[value='Record']").click(function() {
2223
var name = "id_" + new Date().getTime();
23-
socket.emit("start", username, name);
24+
socket.emit("start", "milfont", name);
2425
var $file = $("#file");
2526
$file.append("<br/>");
2627
var link = $("<a>");
@@ -33,7 +34,7 @@
3334
mic = new Microphone(function(){
3435
mic.swf.rate = 8;
3536
mic.onSamplesAvailable = function(data,channelCount){
36-
socket.emit('user message', username, name, data);
37+
socket.emit('user message', "milfont", name, data);
3738
};
3839
mic.start();
3940
});
@@ -42,7 +43,7 @@
4243
$("button[value='Stop']").click(function() {
4344
if(mic) {
4445
mic.stop();
45-
socket.emit('stop', username);
46+
socket.emit('stop', "milfont");
4647
}
4748
});
4849
</script>

0 commit comments

Comments
 (0)