@lls/lls-audio 0.0.6 → 0.0.8

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@lls/lls-audio",
-  "version": "0.0.6",
+  "version": "0.0.8",
   "main": "index.js",
   "devDependencies": {
     "@kadira/storybook": "^2.21.0",

package/player/CustomWave.js

@@ -16,7 +16,7 @@ function _possibleConstructorReturn(self, call) { if (!self) { throw new Referen
 
 function _inherits(subClass, superClass) { if (typeof superClass !== "function" && superClass !== null) { throw new TypeError("Super expression must either be null or a function, not " + typeof superClass); } subClass.prototype = Object.create(superClass && superClass.prototype, { constructor: { value: subClass, enumerable: false, writable: true, configurable: true } }); if (superClass) Object.setPrototypeOf ? Object.setPrototypeOf(subClass, superClass) : subClass.__proto__ = superClass; }
 
-var RESOLUTION = 1;
+var RESOLUTION = 2;
 var colorScheme = ['#888', '#e51400'];
 
 var chunks = function chunks(arr, chunkSize) {
@@ -97,7 +97,7 @@ var _initialiseProps = function _initialiseProps() {
 
     // Duration and step calculation
     var maxDuration = totalTime || waveform.duration;
-    var levelStep = maxWidth / maxDuration;
+    var levelStep = Math.ceil(waveform.max.length / maxWidth) * RESOLUTION;
 
     // Range positions
     //@todo: this range stuff should not be here. Waveform should just be passed an array of colors and ranges
@@ -105,7 +105,7 @@ var _initialiseProps = function _initialiseProps() {
     var endX = range ? range.endTime / maxDuration * maxWidth : maxDuration;
 
     // Split data into chunks per level
-    var maxLevelChunks = chunks(waveform.max, Math.floor(pixels_per_second));
+    var maxLevelChunks = chunks(waveform.max, levelStep);
 
     // Calculate average for each level + highest average
 
@@ -127,7 +127,7 @@ var _initialiseProps = function _initialiseProps() {
 
     _this2.ctx.clearRect(0, 0, maxWidth, maxHeight);
     averages.forEach(function (average, i) {
-      var x = i * levelStep;
+      var x = i * RESOLUTION;
       var h = average * (maxHeight / highestAverage);
 
       var color = x >= startX && x <= endX ? colorScheme[1] : colorScheme[0];

package/player/index.js

@@ -18,10 +18,6 @@ var _CustomWave2 = _interopRequireDefault(_CustomWave);
 
 var _audio = require('../utils/audio');
 
-var _FontIcon = require('material-ui/FontIcon');
-
-var _FontIcon2 = _interopRequireDefault(_FontIcon);
-
 var _noImportant = require('aphrodite/no-important');
 
 var _reactInputRange = require('react-input-range');

package/stories/index.js

@@ -6,14 +6,6 @@ var _react2 = _interopRequireDefault(_react);
 
 var _storybook = require('@kadira/storybook');
 
-var _getMuiTheme = require('material-ui/styles/getMuiTheme');
-
-var _getMuiTheme2 = _interopRequireDefault(_getMuiTheme);
-
-var _MuiThemeProvider = require('material-ui/styles/MuiThemeProvider');
-
-var _MuiThemeProvider2 = _interopRequireDefault(_MuiThemeProvider);
-
 var _player = require('./player');
 
 var _player2 = _interopRequireDefault(_player);
@@ -22,14 +14,13 @@ var _recorder = require('./recorder');
 
 var _recorder2 = _interopRequireDefault(_recorder);
 
-require('../common/material-ui.css');
-
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 
-//import PlayerCustom from './playerCustom'
 (0, _storybook.storiesOf)('Player', module).add('Custom waveform', function () {
   return _react2.default.createElement(_player2.default, null);
 });
+//import PlayerCustom from './playerCustom'
+
 (0, _storybook.storiesOf)('Recorder', module).add('Normal', function () {
   return _react2.default.createElement(_recorder2.default, null);
 });

package/stories/player.js

@@ -15,7 +15,7 @@ var _player2 = _interopRequireDefault(_player);
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 
 var PlayerExample = function PlayerExample() {
-  return _react2.default.createElement(_player2.default, { url: 'cranberries_zombie.mp3' });
+  return _react2.default.createElement(_player2.default, { url: 'http://lls-media-public.s3.amazonaws.com/upload/LeLivreScolaire/p15vcjbl4lvpl9l7g8ov8ammh1.mp3' });
 };
 
 exports.default = PlayerExample;