Better linux support

impl/linux.js

@@ -1,22 +1,39 @@
 
-var spawn = require('child_process').spawn;
+var childProcess = require('child_process');
 
-var amixer = function (args, cb) {
+var isUbuntu = function (cb) {
+  childProcess.exec('uname -a', (err, stdout, stderr) => {
+    if (err) return cb(err);
 
+    return cb(null, stdout.toLowerCase().indexOf('ubuntu') > -1);
+  });
+};
+
+var amixer = function (args, cb) {
   var ret = '';
   var err = null;
-  var p = spawn('amixer', args);
+
+  isUbuntu((err, ubuntu) => {
+    if (err) return cb(err);
 
-  p.stdout.on('data', function (data) {
-    ret += data;
-  });
-
-  p.stderr.on('data', function (data) {
-    err = new Error('Alsa Mixer Error: ' + data);
-  });
+    if (ubuntu) {
+      args.unshift('pulse');
+      args.unshift('-D');
+    }
+
+    var p = childProcess.spawn('amixer', args);
+    p.stdout.on('data', function (data) {
+      ret += data;
+    });
+
+    p.stderr.on('data', function (data) {
+      err = new Error('Alsa Mixer Error: ' + data);
+    });
+
+    p.on('close', function () {
+      cb(err, ret.trim());
+    });
 
-  p.on('close', function () {
-    cb(err, ret.trim());
   });
 
 };
@@ -101,7 +118,13 @@ module.exports.getMuted = function (cb) {
 };
 
 module.exports.setMuted = function (val, cb) {
-  amixer(['set', 'PCM', (val?'mute':'unmute')], function (err) {
-    cb(err);
+  defaultDevice(function (err, dev) {
+    if (err) {
+      cb(err);
+    } else {
+      amixer(['set', dev, (val?'mute':'unmute')], function (err) {
+        cb(err);
+      });
+    }
   });
 };

test/basics.js

@@ -37,30 +37,51 @@ describe('loudness', function () {
   });
 
   it('should set and get the volume', function (done) {
-    loudness.setVolume(15, function (err) {
+    // test all options - from 0% to 100%
+    var indexes = Array.apply(null, {length: 101}).map(Number.call, Number);
+    async.eachSeries(indexes, function (index, next) {
+      loudness.setVolume(index, function (err) {
+
+        assert.ifError(err);
+
+        loudness.getVolume(function (err, vol) {
+
+          assert.ifError(err);
+          assert.equal(vol, index);
+
+          next();
+        });
+      });
+    }, function () {
+      done();
+    }); 
+  }).timeout(5000);
+
+  it('should mute the volume', function (done) {
+    loudness.setMuted(true, function (err) {
 
       assert.ifError(err);
 
-      loudness.getVolume(function (err, vol) {
+      loudness.getMuted(function (err, mute) {
 
         assert.ifError(err);
-        assert.equal(vol, 15);
+        assert.equal(mute, true);
 
         done();
       });
 
     });
   });
 
-  it('should set and get the mute state', function (done) {
-    loudness.setMuted(true, function (err) {
+  it('should unmute the volume', function (done) {
+    loudness.setMuted(false, function (err) {
 
       assert.ifError(err);
 
       loudness.getMuted(function (err, mute) {
 
         assert.ifError(err);
-        assert.equal(mute, true);
+        assert.equal(mute, false);
 
         done();
       });