merge fix.

magnuskiro · magnuskiro · commit 5c9ced400af4 · 2015-11-14T20:03:53.000+01:00
diff --git a/chords.html b/chords.html
@@ -0,0 +1,45 @@
+<!doctype html>
+<html>
+    <head>
+        <title>Chords</title>
+        <script src="/static/fastclick/lib/fastclick.js"></script>
+        <script src="/static/socket.io/node_modules/socket.io-client/socket.io.js"></script>
+        <style>
+            table, td, th {
+                border: 2px solid black;
+            }
+            td {
+                background-color: green;
+            }
+        </style>
+    </head>
+    <body>
+        <table width="100%" height="800px">
+            <tr>
+                <td onclick="play('C')"></td>
+            </tr>
+            <tr>
+                <td onclick="play('G')"></td>
+            </tr>
+            <tr>
+                <td onclick="play('Am')"></td>
+            </tr>
+            <tr>
+                <td onclick="play('F')"></td>
+            </tr>
+        </table>
+        <script>
+            var socket = io(),
+
+                play = function (chord) {
+                    socket.emit('chord', chord);
+                };
+
+            if ('addEventListener' in document) {
+                document.addEventListener('DOMContentLoaded', function() {
+                    FastClick.attach(document.body);
+                }, false);
+            }
+        </script>
+    </body>
+</html>
diff --git a/server.js b/server.js
@@ -7,19 +7,41 @@ var express = require('express'),
     io = require('socket.io')(http),
     url = require('url'),
     shell = require('shelljs'),
-    port = 3000;
+
+    port = 3000,
+    chords = {
+        'C': ['C3', 'E3', 'G3'],
+        'Dm': ['D3', 'F3', 'A3'],
+        'Em': ['E3', 'G3', 'B3'],
+        'F': ['F3', 'A3', 'C3'],
+        'G': ['G3', 'B3', 'D3'],
+        'Am': ['A3', 'C3', 'E3']
+    };
 
 app.use('/static', express.static(__dirname + '/node_modules'));
 
 app.get('/', function (req, res) {
     res.sendFile(__dirname + '/index.html');
 });
 
+app.get('/chords', function (req, res) {
+    res.sendFile(__dirname + '/chords.html');
+});
+
 io.on('connection', function (socket){
     console.log('a user connected');
 
     socket.on('play', function (msg) {
-        shell.exec('play -qn synth 2 pluck ' + msg, {async: true});
+        var command = 'play -qn synth 2 pluck ' + msg;
+
+        shell.exec(command, {async: true});
+    });
+
+    socket.on('chord', function (msg) {
+        var chord = chords[msg],
+            command = 'play -qn synth sin ' + chord[0] + ' sin ' + chord[1] + ' sin ' + chord[2] + ' delay 0 .01 .02 remix - fade 0 2 .1 norm -1';
+
+        shell.exec(command, {async: true});
     });
 
     socket.on('disconnect', function() {
