@checksub_team/peaks_timeline 1.4.30 → 1.4.33

package/peaks.js

@@ -12938,16 +12938,6 @@ exports.default = _default;
 
 /**
  * ArrayBuffer adapter consumes binary waveform data.
- * It is used as a data abstraction layer by `WaveformData`.
- *
- * This is supposed to be the fastest adapter ever:
- * * **Pros**: working directly in memory, everything is done by reference
- *   (including the offsetting)
- * * **Cons**: binary data are hardly readable without data format knowledge
- *   (and this is why this adapter exists).
- *
- * @param {ArrayBuffer} buffer
- * @constructor
  */
 
 function WaveformDataArrayBufferAdapter(buffer) {
@@ -12957,19 +12947,14 @@ function WaveformDataArrayBufferAdapter(buffer) {
 
 /**
  * Detects if a set of data is suitable for the ArrayBuffer adapter.
- * It is used internally by `WaveformData.create` so you should not bother using it.
- *
- * @static
- * @param {Mixed} data
- * @returns {boolean}
  */
 
 WaveformDataArrayBufferAdapter.isCompatible = function isCompatible(data) {
-  const isCompatible = data && typeof data === "object" && "byteLength" in data;
+  var isCompatible = data && typeof data === "object" && "byteLength" in data;
 
   if (isCompatible) {
-    const view = new DataView(data);
-    const version = view.getInt32(0, true);
+    var view = new DataView(data);
+    var version = view.getInt32(0, true);
 
     if (version !== 1 && version !== 2) {
       throw new TypeError("This waveform data version not supported.");
@@ -12979,15 +12964,10 @@ WaveformDataArrayBufferAdapter.isCompatible = function isCompatible(data) {
   return isCompatible;
 };
 
-/**
- * @namespace WaveformDataArrayBufferAdapter
- */
-
  WaveformDataArrayBufferAdapter.prototype = {
+
   /**
    * Returns the data format version number.
-   *
-   * @return {Integer} Version number of the consumed data format.
    */
 
   get version() {
@@ -13006,8 +12986,6 @@ WaveformDataArrayBufferAdapter.isCompatible = function isCompatible(data) {
 
   /**
    * Returns the number of channels.
-   *
-   * @return {Integer} Number of channels.
    */
 
   get channels() {
@@ -13021,8 +12999,6 @@ WaveformDataArrayBufferAdapter.isCompatible = function isCompatible(data) {
 
   /**
    * Returns the number of samples per second.
-   *
-   * @return {Integer} Number of samples per second.
    */
 
   get sample_rate() {
@@ -13031,8 +13007,6 @@ WaveformDataArrayBufferAdapter.isCompatible = function isCompatible(data) {
 
   /**
    * Returns the scale (number of samples per pixel).
-   *
-   * @return {Integer} Number of samples per pixel.
    */
 
   get scale() {
@@ -13041,8 +13015,6 @@ WaveformDataArrayBufferAdapter.isCompatible = function isCompatible(data) {
 
   /**
    * Returns the length of the waveform data (number of data points).
-   *
-   * @return {Integer} Length of the waveform data.
    */
 
   get length() {
@@ -13050,10 +13022,7 @@ WaveformDataArrayBufferAdapter.isCompatible = function isCompatible(data) {
   },
 
   /**
-   * Returns a value at a specific offset.
-   *
-   * @param {Integer} index
-   * @return {Integer} waveform value
+   * Returns a waveform data value at a specific offset.
    */
 
   at: function at_sample(index) {
@@ -13063,9 +13032,6 @@ WaveformDataArrayBufferAdapter.isCompatible = function isCompatible(data) {
   /**
    * Returns a new ArrayBuffer with the concatenated waveform.
    * All waveforms must have identical metadata (version, channels, etc)
-   *
-   * @param {...WaveformDataArrayBufferAdapter} otherAdapters One or more adapters to concatenate
-   * @return {ArrayBuffer} concatenated ArrayBuffer
    */
 
   concatBuffers: function() {
@@ -13155,10 +13121,9 @@ WaveformDataObjectAdapter.isCompatible = function isCompatible(data) {
  */
 
 WaveformDataObjectAdapter.prototype = {
+
   /**
    * Returns the data format version number.
-   *
-   * @return {Integer} Version number of the consumed data format.
    */
 
   get version() {
@@ -13175,8 +13140,6 @@ WaveformDataObjectAdapter.prototype = {
 
   /**
    * Returns the number of channels.
-   *
-   * @return {Integer} Number of channels.
    */
 
   get channels() {
@@ -13185,8 +13148,6 @@ WaveformDataObjectAdapter.prototype = {
 
   /**
    * Returns the number of samples per second.
-   *
-   * @return {Integer} Number of samples per second.
    */
 
   get sample_rate() {
@@ -13195,8 +13156,6 @@ WaveformDataObjectAdapter.prototype = {
 
   /**
    * Returns the scale (number of samples per pixel).
-   *
-   * @return {Integer} Number of samples per pixel.
    */
 
   get scale() {
@@ -13205,8 +13164,6 @@ WaveformDataObjectAdapter.prototype = {
 
   /**
    * Returns the length of the waveform data (number of data points).
-   *
-   * @return {Integer} Length of the waveform data.
    */
 
   get length() {
@@ -13214,14 +13171,11 @@ WaveformDataObjectAdapter.prototype = {
   },
 
   /**
-   * Returns a value at a specific offset.
-   *
-   * @param {Integer} index
-   * @return {number} waveform value
+   * Returns a waveform data value at a specific offset.
    */
 
   at: function at_sample(index) {
-    const data = this._data.data;
+    var data = this._data.data;
 
     if (index >= 0 && index < data.length) {
       return data[index];
@@ -13234,9 +13188,6 @@ WaveformDataObjectAdapter.prototype = {
   /**
    * Returns a new data object with the concatenated waveform.
    * Both waveforms must have identical metadata (version, channels, etc)
-   *
-   * @param {...WaveformDataObjectAdapter} otherAdapters One or more adapters
-   * @return {Mixed} combined waveform data
    */
 
   concatBuffers: function() {
@@ -13261,165 +13212,166 @@ module.exports = WaveformDataObjectAdapter;
 
 var WaveformData = _dereq_("../core");
 var InlineWorker = _dereq_("inline-worker");
+var MainThreadWorker = _dereq_("../util/main-thread-worker");
 
-/**
- * This callback is executed once the audio has been decoded by the browser and
- * resampled by waveform-data.
- *
- * @callback onAudioResampled
- * @param {Error?}
- * @param {WaveformData} waveform_data Waveform instance of the browser decoded audio
- * @param {AudioBuffer} audio_buffer Decoded audio buffer
- */
-
-/**
- * AudioBuffer-based WaveformData generator
- *
- * Adapted from BlockFile::CalcSummary in Audacity, with permission.
- * @see https://code.google.com/p/audacity/source/browse/audacity-src/trunk/src/BlockFile.cpp
- *
- * @param {Object.<{scale: Number, amplitude_scale: Number, split_channels: Boolean}>} options
- * @param {onAudioResampled} callback
- * @returns {Function.<AudioBuffer>}
- */
+function processWorker(workerArgs, callback) {
+  var WaveformWorker = workerArgs.disable_worker ? MainThreadWorker : InlineWorker;
 
-function getAudioDecoder(options, callback) {
-  return function onAudioDecoded(audio_buffer) {
-    var worker = new InlineWorker(function() {
-      var INT8_MAX = 127;
-      var INT8_MIN = -128;
+  var worker = new WaveformWorker(function() {
+    var INT8_MAX = 127;
+    var INT8_MIN = -128;
 
-      function calculateWaveformDataLength(audio_sample_count, scale) {
-        var data_length = Math.floor(audio_sample_count / scale);
+    function calculateWaveformDataLength(audio_sample_count, scale) {
+      var data_length = Math.floor(audio_sample_count / scale);
 
-        var samples_remaining = audio_sample_count - (data_length * scale);
+      var samples_remaining = audio_sample_count - (data_length * scale);
 
-        if (samples_remaining > 0) {
-          data_length++;
-        }
-
-        return data_length;
+      if (samples_remaining > 0) {
+        data_length++;
       }
 
-      this.addEventListener("message", function(evt) {
-        var scale = evt.data.scale;
-        var amplitude_scale = evt.data.amplitude_scale;
-        var split_channels = evt.data.split_channels;
-        var audio_buffer = evt.data.audio_buffer;
-
-        var channels = audio_buffer.channels;
-        var output_channels = split_channels ? channels.length : 1;
-        var version = output_channels === 1 ? 1 : 2;
-        var header_size = version === 1 ? 20 : 24;
-        var data_length = calculateWaveformDataLength(audio_buffer.length, scale);
-        var total_size = header_size + data_length * 2 * output_channels;
-        var data_object = new DataView(new ArrayBuffer(total_size));
-
-        var min_value = new Array(output_channels);
-        var max_value = new Array(output_channels);
+      return data_length;
+    }
 
-        for (let channel = 0; channel < output_channels; channel++) {
-          min_value[channel] = Infinity;
-          max_value[channel] = -Infinity;
-        }
+    this.addEventListener("message", function listener(evt) {
+      if (!evt.data.audio_buffer) {
+        return;
+      }
 
-        var scale_counter = 0;
-        var buffer_length = audio_buffer.length;
-        var offset = header_size;
-        var channel, i;
+      var scale = evt.data.scale;
+      var amplitude_scale = evt.data.amplitude_scale;
+      var split_channels = evt.data.split_channels;
+      var audio_buffer = evt.data.audio_buffer;
+
+      var channels = audio_buffer.channels;
+      var output_channels = split_channels ? channels.length : 1;
+      var version = output_channels === 1 ? 1 : 2;
+      var header_size = version === 1 ? 20 : 24;
+      var data_length = calculateWaveformDataLength(audio_buffer.length, scale);
+      var total_size = header_size + data_length * 2 * output_channels;
+      var data_object = new DataView(new ArrayBuffer(total_size));
+
+      var scale_counter = 0;
+      var buffer_length = audio_buffer.length;
+      var offset = header_size;
+      var channel, i;
+
+      var min_value = new Array(output_channels);
+      var max_value = new Array(output_channels);
+
+      for (channel = 0; channel < output_channels; channel++) {
+        min_value[channel] = Infinity;
+        max_value[channel] = -Infinity;
+      }
 
-        data_object.setInt32(0, version, true); // Version
-        data_object.setUint32(4, 1, true); // Is 8 bit?
-        data_object.setInt32(8, audio_buffer.sampleRate, true); // Sample rate
-        data_object.setInt32(12, scale, true); // Scale
-        data_object.setInt32(16, data_length, true); // Length
+      data_object.setInt32(0, version, true); // Version
+      data_object.setUint32(4, 1, true); // Is 8 bit?
+      data_object.setInt32(8, audio_buffer.sampleRate, true); // Sample rate
+      data_object.setInt32(12, scale, true); // Scale
+      data_object.setInt32(16, data_length, true); // Length
 
-        if (version === 2) {
-          data_object.setInt32(20, output_channels, true);
-        }
+      if (version === 2) {
+        data_object.setInt32(20, output_channels, true);
+      }
 
-        for (i = 0; i < buffer_length; i++) {
-          var sample = 0;
+      for (i = 0; i < buffer_length; i++) {
+        var sample = 0;
 
-          if (output_channels === 1) {
-            for (channel = 0; channel < channels.length; ++channel) {
-              sample += channels[channel][i];
-            }
+        if (output_channels === 1) {
+          for (channel = 0; channel < channels.length; ++channel) {
+            sample += channels[channel][i];
+          }
 
-            sample = Math.floor(INT8_MAX * sample * amplitude_scale / channels.length);
+          sample = Math.floor(INT8_MAX * sample * amplitude_scale / channels.length);
 
-            if (sample < min_value[0]) {
-              min_value[0] = sample;
+          if (sample < min_value[0]) {
+            min_value[0] = sample;
 
-              if (min_value[0] < INT8_MIN) {
-                min_value[0] = INT8_MIN;
-              }
+            if (min_value[0] < INT8_MIN) {
+              min_value[0] = INT8_MIN;
             }
+          }
 
-            if (sample > max_value[0]) {
-              max_value[0] = sample;
+          if (sample > max_value[0]) {
+            max_value[0] = sample;
 
-              if (max_value[0] > INT8_MAX) {
-                max_value[0] = INT8_MAX;
-              }
+            if (max_value[0] > INT8_MAX) {
+              max_value[0] = INT8_MAX;
             }
           }
-          else {
-            for (channel = 0; channel < output_channels; ++channel) {
-              sample = Math.floor(INT8_MAX * channels[channel][i] * amplitude_scale);
-
-              if (sample < min_value[channel]) {
-                min_value[channel] = sample;
-
-                if (min_value[channel] < INT8_MIN) {
-                  min_value[channel] = INT8_MIN;
-                }
-              }
+        }
+        else {
+          for (channel = 0; channel < output_channels; ++channel) {
+            sample = Math.floor(INT8_MAX * channels[channel][i] * amplitude_scale);
 
-              if (sample > max_value[channel]) {
-                max_value[channel] = sample;
+            if (sample < min_value[channel]) {
+              min_value[channel] = sample;
 
-                if (max_value[channel] > INT8_MAX) {
-                  max_value[channel] = INT8_MAX;
-                }
+              if (min_value[channel] < INT8_MIN) {
+                min_value[channel] = INT8_MIN;
               }
             }
-          }
 
-          if (++scale_counter === scale) {
-            for (channel = 0; channel < output_channels; channel++) {
-              data_object.setInt8(offset++, min_value[channel]);
-              data_object.setInt8(offset++, max_value[channel]);
+            if (sample > max_value[channel]) {
+              max_value[channel] = sample;
 
-              min_value[channel] = Infinity;
-              max_value[channel] = -Infinity;
+              if (max_value[channel] > INT8_MAX) {
+                max_value[channel] = INT8_MAX;
+              }
             }
-
-            scale_counter = 0;
           }
         }
 
-        if (scale_counter > 0) {
+        if (++scale_counter === scale) {
           for (channel = 0; channel < output_channels; channel++) {
             data_object.setInt8(offset++, min_value[channel]);
             data_object.setInt8(offset++, max_value[channel]);
+
+            min_value[channel] = Infinity;
+            max_value[channel] = -Infinity;
           }
+
+          scale_counter = 0;
         }
+      }
+
+      if (scale_counter > 0) {
+        for (channel = 0; channel < output_channels; channel++) {
+          data_object.setInt8(offset++, min_value[channel]);
+          data_object.setInt8(offset++, max_value[channel]);
+        }
+      }
 
-        this.postMessage(data_object);
-      });
+      this.postMessage(data_object);
+      this.removeEventListener("message", listener);
+      this.close();
     });
+  });
 
-    worker.addEventListener("message", function(evt) {
-      var data_object = evt.data;
+  worker.addEventListener("message", function listener(evt) {
+    if (evt.data.audio_buffer) {
+      return;
+    }
 
-      callback(
-        null,
-        new WaveformData(data_object.buffer),
-        audio_buffer
-      );
-    });
+    callback(evt.data);
+
+    // We're only sending a single message to each listener, so
+    // remove the callback afterwards to avoid leaks.
+    worker.removeEventListener("message", listener);
+  });
+
+  worker.postMessage(workerArgs);
+}
+
+/**
+ * AudioBuffer-based WaveformData generator
+ *
+ * Adapted from BlockFile::CalcSummary in Audacity, with permission.
+ * See https://code.google.com/p/audacity/source/browse/audacity-src/trunk/src/BlockFile.cpp
+ */
 
+function getAudioDecoder(options, callback) {
+  return function onAudioDecoded(audio_buffer) {
     // Construct a simple object with the necessary AudioBuffer data,
     // as we cannot send an AudioBuffer to a Web Worker.
     var audio_buffer_obj = {
@@ -13433,35 +13385,38 @@ function getAudioDecoder(options, callback) {
       audio_buffer_obj.channels[channel] = audio_buffer.getChannelData(channel);
     }
 
-    worker.postMessage({
+    var worker_args = {
       scale: options.scale,
       amplitude_scale: options.amplitude_scale,
       split_channels: options.split_channels,
-      audio_buffer: audio_buffer_obj
+      audio_buffer: audio_buffer_obj,
+      disable_worker: options.disable_worker
+    };
+
+    processWorker(worker_args, function(data_object) {
+      callback(null, new WaveformData(data_object.buffer), audio_buffer);
     });
   };
 }
 
 module.exports = getAudioDecoder;
 
-},{"../core":83,"inline-worker":3}],80:[function(_dereq_,module,exports){
+},{"../core":83,"../util/main-thread-worker":84,"inline-worker":3}],80:[function(_dereq_,module,exports){
 "use strict";
 
 var defaultOptions = {
   scale: 512,
   amplitude_scale: 1.0,
-  split_channels: false
+  split_channels: false,
+  disable_worker: false
 };
 
 function getOptions(options) {
-  if (Object.prototype.hasOwnProperty.call(options, "scale_adjuster")) {
-    throw new Error("Please rename the 'scale_adjuster' option to 'amplitude_scale'");
-  }
-
   var opts = {
     scale: options.scale || defaultOptions.scale,
     amplitude_scale: options.amplitude_scale || defaultOptions.amplitude_scale,
-    split_channels: options.split_channels || defaultOptions.split_channels
+    split_channels: options.split_channels || defaultOptions.split_channels,
+    disable_worker: options.disable_worker || defaultOptions.disable_worker
   };
 
   return opts;
@@ -13503,39 +13458,7 @@ function createFromAudioBuffer(audioBuffer, options, callback) {
 }
 
 /**
- * Creates a working WaveformData based on binary audio data.
- *
- * This is still quite experimental and the result will mostly depend on the
- * level of browser support.
- *
- * ```javascript
- * const xhr = new XMLHttpRequest();
- * const audioContext = new AudioContext();
- *
- * // URL of a CORS MP3/Ogg file
- * xhr.open('GET', 'https://example.com/audio/track.ogg');
- * xhr.responseType = 'arraybuffer';
- *
- * xhr.addEventListener('load', function(progressEvent) {
- *   WaveformData.createFromAudio(audioContext, progressEvent.target.response,
- *     function(err, waveform) {
- *     if (err) {
- *       console.error(err);
- *       return;
- *     }
- *
- *     console.log(waveform.duration);
- *   });
- * });
- *
- * xhr.send();
- * ```
- *
- * @todo Use `SourceBuffer.appendBuffer` and `ProgressEvent` to stream the decoding?
- * @param {AudioContext|webkitAudioContext} audio_context
- * @param {ArrayBuffer} audio_data
- * @param {callback} what to do once the decoding is done
- * @constructor
+ * Creates a WaveformData instance from audio.
  */
 
 function createFromAudio(options, callback) {
@@ -13548,7 +13471,10 @@ function createFromAudio(options, callback) {
     return createFromAudioBuffer(options.audio_buffer, opts, callback);
   }
   else {
-    throw new TypeError("Please pass either an AudioContext and ArrayBuffer, or an AudioBuffer object");
+    throw new TypeError(
+      // eslint-disable-next-line
+      "WaveformData.createFromAudio(): Pass either an AudioContext and ArrayBuffer, or an AudioBuffer object"
+    );
   }
 }
 
@@ -13559,10 +13485,6 @@ module.exports = createFromAudio;
 
 /**
  * Provides access to the waveform data for a single audio channel.
- *
- * @param {WaveformData} waveformData Waveform data.
- * @param {Number} channelIndex Channel number.
- * @constructor
  */
 
 function WaveformDataChannel(waveformData, channelIndex) {
@@ -13571,58 +13493,27 @@ function WaveformDataChannel(waveformData, channelIndex) {
 }
 
 /**
- * Returns a min value for a specific offset.
- *
- * ```javascript
- * var waveform = WaveformData.create({ ... });
- * var channel = waveform.channel(0);
- *
- * console.log(channel.min_sample(10)); // -> -12
- * ```
- *
- * @api
- * @param {Integer} offset
- * @return {Number} Offset min value
+ * Returns the waveform minimum at the given index position.
  */
 
 WaveformDataChannel.prototype.min_sample = function(index) {
-  const offset = (index * this._waveformData.channels + this._channelIndex) * 2;
+  var offset = (index * this._waveformData.channels + this._channelIndex) * 2;
 
   return this._waveformData._adapter.at(offset);
 };
 
 /**
- * Returns a max value for a specific offset.
- *
- * ```javascript
- * var waveform = WaveformData.create({ ... });
- * var channel = waveform.channel(0);
- *
- * console.log(channel.max_sample(10)); // -> 12
- * ```
- *
- * @api
- * @param {Integer} offset
- * @return {Number} Offset max value
+ * Returns the waveform maximum at the given index position.
  */
 
 WaveformDataChannel.prototype.max_sample = function(index) {
-  const offset = (index * this._waveformData.channels + this._channelIndex) * 2 + 1;
+  var offset = (index * this._waveformData.channels + this._channelIndex) * 2 + 1;
 
   return this._waveformData._adapter.at(offset);
 };
 
 /**
- * Returns all the min values within the current offset.
- *
- * ```javascript
- * var waveform = WaveformData.create({ ... });
- * var channel = waveform.channel(0);
- *
- * console.log(channel.min_array()); // -> [-7, -5, -10]
- * ```
- *
- * @return {Array.<Integer>} Min values contained in the offset.
+ * Returns all the waveform minimum values as an array.
  */
 
 WaveformDataChannel.prototype.min_array = function() {
@@ -13634,16 +13525,7 @@ WaveformDataChannel.prototype.min_array = function() {
 };
 
 /**
- * Returns all the max values within the current offset.
- *
- * ```javascript
- * var waveform = WaveformData.create({ ... });
- * var channel = waveform.channel(0);
- *
- * console.log(channel.max_array()); // -> [9, 6, 11]
- * ```
- *
- * @return {Array.<Integer>} Max values contained in the offset.
+ * Returns all the waveform maximum values as an array.
  */
 
 WaveformDataChannel.prototype.max_array = function() {
@@ -13669,32 +13551,7 @@ var adapters = [
 ];
 
 /**
- * Facade to iterate on audio waveform response.
- *
- * ```javascript
- * var waveform = new WaveformData({ ... });
- *
- * var json_waveform = new WaveformData(xhr.responseText);
- *
- * var arraybuff_waveform = new WaveformData(
- *   getArrayBufferData()
- * );
- * ```
- *
- * ## Offsets
- *
- * An **offset** is a non-destructive way to iterate on a subset of data.
- *
- * It is the easiest way to **navigate** through data without having to deal
- * with complex calculations. Simply iterate over the data to display them.
- *
- * *Notice*: the default offset is the entire set of data.
- *
- * @param {String|ArrayBuffer|Object} data Waveform data,
- * to be consumed by the related adapter.
- * @param {WaveformData.adapter|Function} adapter Backend adapter used to manage
- * access to the data.
- * @constructor
+ * Provides access to waveform data.
  */
 
 function WaveformData(data) {
@@ -13704,45 +13561,19 @@ function WaveformData(data) {
 
   this._channels = [];
 
-  for (let channel = 0; channel < this.channels; channel++) {
+  for (var channel = 0; channel < this.channels; channel++) {
     this._channels[channel] = new WaveformDataChannel(this, channel);
   }
 }
 
 /**
- * Creates an instance of WaveformData by guessing the adapter from the
- * data type. It can also accept an XMLHttpRequest response.
- *
- * ```javascript
- * var xhr = new XMLHttpRequest();
- * xhr.open("GET", "http://example.com/waveforms/track.dat");
- * xhr.responseType = "arraybuffer";
- *
- * xhr.addEventListener("load", function onResponse(progressEvent) {
- *   var waveform = WaveformData.create(progressEvent.target);
- *
- *   console.log(waveform.duration);
- * });
- *
- * xhr.send();
- * ```
- *
- * @static
- * @throws TypeError
- * @param {Object} data
- * @return {WaveformData}
+ * Creates and returns a WaveformData instance from the given waveform data.
  */
 
 WaveformData.create = function create(data) {
   return new WaveformData(data);
 };
 
-/**
- * Public API for the Waveform Data manager.
- *
- * @namespace WaveformData
- */
-
 WaveformData.prototype = {
 
   _getAdapter: function(data) {
@@ -13756,47 +13587,23 @@ WaveformData.prototype = {
     });
 
     if (Adapter === null) {
-      throw new TypeError("Could not detect a WaveformData adapter from the input.");
+      throw new TypeError(
+        "WaveformData.create(): Could not detect a WaveformData adapter from the input"
+      );
     }
 
     return Adapter;
   },
 
   /**
-   * Creates a new WaveformData object with resampled data.
-   * Returns a rescaled waveform, to either fit the waveform to a specific
-   * width, or to a specific zoom level.
-   *
-   * **Note**: You may specify either the *width* or the *scale*, but not both.
-   * The `scale` will be deduced from the `width` you want to fit the data into.
+   * Creates and returns a new WaveformData object with resampled data.
+   * Use this method to create waveform data at different zoom levels.
    *
    * Adapted from Sequence::GetWaveDisplay in Audacity, with permission.
-   *
-   * ```javascript
-   * var waveform = WaveformData.create({ ... });
-   * // ...
-   *
-   * // fitting the data in a 500px wide canvas
-   * var resampled_waveform = waveform.resample({ width: 500 });
-   *
-   * console.log(resampled_waveform.min.length);   // -> 500
-   *
-   * // zooming out on a 3 times less precise scale
-   * var resampled_waveform = waveform.resample({ scale: waveform.scale * 3 });
-   * ```
-   *
-   * @see https://code.google.com/p/audacity/source/browse/audacity-src/trunk/src/Sequence.cpp
-   * @param {Number|{width: Number, scale: Number}} options Either a constraint width or a constraint sample rate
-   * @return {WaveformData} New resampled object
+   * https://code.google.com/p/audacity/source/browse/audacity-src/trunk/src/Sequence.cpp
    */
 
   resample: function(options) {
-    if (typeof options === "number") {
-      options = {
-        width: options
-      };
-    }
-
     options.input_index = typeof options.input_index === "number" ? options.input_index : null;
     options.output_index = typeof options.output_index === "number" ? options.output_index : null;
     options.scale = typeof options.scale === "number" ? options.scale : null;
@@ -13805,48 +13612,63 @@ WaveformData.prototype = {
     var is_partial_resampling = Boolean(options.input_index) || Boolean(options.output_index);
 
     if (options.input_index != null && (options.input_index < 0)) {
-      throw new RangeError("options.input_index should be a positive integer value. [" + options.input_index + "]");
+      throw new RangeError(
+        "WaveformData.resample(): input_index should be a positive integer value"
+      );
     }
 
     if (options.output_index != null && (options.output_index < 0)) {
-      throw new RangeError("options.output_index should be a positive integer value. [" + options.output_index + "]");
+      throw new RangeError(
+        "WaveformData.resample(): output_index should be a positive integer value"
+      );
     }
 
     if (options.width != null && (options.width <= 0)) {
-      throw new RangeError("options.width should be a strictly positive integer value. [" + options.width + "]");
+      throw new RangeError("WaveformData.resample(): width should be a positive integer value");
     }
 
     if (options.scale != null && (options.scale <= 0)) {
-      throw new RangeError("options.scale should be a strictly positive integer value. [" + options.scale + "]");
+      throw new RangeError("WaveformData.resample(): scale should be a positive integer value");
     }
 
     if (!options.scale && !options.width) {
-      throw new RangeError("You should provide either a resampling scale or a width in pixel the data should fit in.");
+      throw new Error("WaveformData.resample(): Missing scale or width option");
     }
 
-    var definedPartialOptionsCount = ["width", "scale", "output_index", "input_index"].reduce(function(count, key) {
-      return count + (options[key] === null ? 0 : 1);
-    }, 0);
-
-    if (is_partial_resampling && definedPartialOptionsCount !== 4) {
-      throw new Error("Some partial resampling options are missing. You provided " + definedPartialOptionsCount + " of them over 4.");
+    if (is_partial_resampling) {
+      if (options.width === null ||
+          options.scale === null ||
+          options.input_index === null ||
+          options.output_index === null) {
+        throw new Error(
+          "WaveformData.resample(): Missing width, scale, input_index, or output_index option"
+        );
+      }
     }
 
     var output_data = [];
-    var samples_per_pixel = options.scale || Math.floor(this.duration * this.sample_rate / options.width); // scale we want to reach
+    // Scale we want to reach
+    var samples_per_pixel = options.scale ||
+      Math.floor(this.duration * this.sample_rate / options.width);
     var scale = this.scale; // scale we are coming from
     var channel_count = 2 * this.channels;
 
-    var input_buffer_size = this.length; // the amount of data we want to resample i.e. final zoom want to resample all data but for intermediate zoom we want to resample subset
-    var input_index = options.input_index || 0; // is this start point? or is this the index at current scale
-    var output_index = options.output_index || 0; // is this end point? or is this the index at scale we want to be?
+    // The amount of data we want to resample i.e. final zoom want to resample
+    // all data but for intermediate zoom we want to resample subset
+    var input_buffer_size = this.length;
+    // Is this start point? or is this the index at current scale?
+    var input_index = options.input_index || 0;
+    // Is this end point? or is this the index at scale we want to be?
+    var output_index = options.output_index || 0;
 
     var channels = this.channels;
 
     var min = new Array(channels);
     var max = new Array(channels);
 
-    for (let channel = 0; channel < channels; ++channel) {
+    var channel;
+
+    for (channel = 0; channel < channels; ++channel) {
       if (input_buffer_size > 0) {
         min[channel] = this.channel(channel).min_sample(input_index);
         max[channel] = this.channel(channel).max_sample(input_index);
@@ -13861,7 +13683,9 @@ WaveformData.prototype = {
     var max_value = 127;
 
     if (samples_per_pixel < scale) {
-      throw new Error("Zoom level " + samples_per_pixel + " too low, minimum: " + scale);
+      throw new Error(
+        "WaveformData.resample(): Zoom level " + samples_per_pixel + " too low, minimum: " + scale
+      );
     }
 
     var where, prev_where, stop, value, last_input_index;
@@ -13870,15 +13694,11 @@ WaveformData.prototype = {
       return Math.floor(x * samples_per_pixel);
     }
 
-    function add_sample(min, max) {
-      output_data.push(min, max);
-    }
-
     while (input_index < input_buffer_size) {
       while (Math.floor(sample_at_pixel(output_index) / scale) <= input_index) {
         if (output_index > 0) {
-          for (let channel = 0; channel < channels; ++channel) {
-            add_sample(min[channel], max[channel]);
+          for (channel = 0; channel < channels; ++channel) {
+            output_data.push(min[channel], max[channel]);
           }
         }
 
@@ -13890,7 +13710,7 @@ WaveformData.prototype = {
         prev_where = sample_at_pixel(output_index - 1);
 
         if (where !== prev_where) {
-          for (let channel = 0; channel < channels; ++channel) {
+          for (channel = 0; channel < channels; ++channel) {
             min[channel] = max_value;
             max[channel] = min_value;
           }
@@ -13905,7 +13725,7 @@ WaveformData.prototype = {
       }
 
       while (input_index < stop) {
-        for (let channel = 0; channel < channels; ++channel) {
+        for (channel = 0; channel < channels; ++channel) {
           value = this.channel(channel).min_sample(input_index);
 
           if (value < min[channel]) {
@@ -13930,14 +13750,14 @@ WaveformData.prototype = {
     if (is_partial_resampling) {
       if ((output_data.length / channel_count) > options.width &&
           input_index !== last_input_index) {
-          for (let channel = 0; channel < channels; ++channel) {
-            add_sample(min[channel], max[channel]);
+          for (channel = 0; channel < channels; ++channel) {
+            output_data.push(min[channel], max[channel]);
           }
       }
     }
     else if (input_index !== last_input_index) {
-      for (let channel = 0; channel < channels; ++channel) {
-        add_sample(min[channel], max[channel]);
+      for (channel = 0; channel < channels; ++channel) {
+        output_data.push(min[channel], max[channel]);
       }
     }
 
@@ -13953,11 +13773,9 @@ WaveformData.prototype = {
   },
 
   /**
-   * Return a new WaveformData instance with the concatenated result of multiple waveforms.
-   *
-   * @param {...WaveformData} otherWaveforms One or more waveform instances to concatenate
-   * @return {WaveformData} New concatenated object
+   * Concatenates with one or more other waveforms, returning a new WaveformData object.
    */
+
   concat: function() {
     var self = this;
     var otherWaveforms = Array.prototype.slice.call(arguments);
@@ -13969,7 +13787,7 @@ WaveformData.prototype = {
         self.scale !== otherWaveform.scale ||
         Object.getPrototypeOf(self._adapter) !== Object.getPrototypeOf(otherWaveform._adapter) ||
         self._adapter.version !== otherWaveform._adapter.version) {
-        throw new Error("Waveforms are incompatible");
+        throw new Error("WaveformData.concat(): Waveforms are incompatible");
       }
     });
 
@@ -13984,12 +13802,6 @@ WaveformData.prototype = {
 
   /**
    * Return the unpacked values for a particular offset.
-   *
-   * @param {Integer} start
-   * @param {Integer} length
-   * @param {Integer} correction The step to skip for each iteration
-   * (as the response body is [min, max, min, max...])
-   * @return {Array.<Integer>}
    */
 
   _offsetValues: function getOffsetValues(start, length, correction) {
@@ -14008,14 +13820,6 @@ WaveformData.prototype = {
 
   /**
    * Returns the length of the waveform, in pixels.
-   *
-   * ```javascript
-   * var waveform = WaveformData.create({ ... });
-   * console.log(waveform.length); // -> 600
-   * ```
-   *
-   * @api
-   * @return {Integer} Length of the waveform, in pixels.
    */
 
   get length() {
@@ -14032,14 +13836,6 @@ WaveformData.prototype = {
 
   /**
    * Returns the (approximate) duration of the audio file, in seconds.
-   *
-   * ```javascript
-   * var waveform = WaveformData.create({ ... });
-   * console.log(waveform.duration); // -> 10.33333333333
-   * ```
-   *
-   * @api
-   * @return {number} Duration of the audio waveform, in seconds.
    */
 
   get duration() {
@@ -14047,16 +13843,7 @@ WaveformData.prototype = {
   },
 
   /**
-   * Return the number of pixels per second.
-   *
-   * ```javascript
-   * var waveform = WaveformData.create({ ... });
-   *
-   * console.log(waveform.pixels_per_second); // -> 93.75
-   * ```
-   *
-   * @api
-   * @return {number} Number of pixels per second.
+   * Returns the number of pixels per second.
    */
 
   get pixels_per_second() {
@@ -14064,15 +13851,7 @@ WaveformData.prototype = {
   },
 
   /**
-   * Return the amount of time represented by a single pixel.
-   *
-   * ```javascript
-   * var waveform = WaveformData.create({ ... });
-   *
-   * console.log(waveform.seconds_per_pixel);       // -> 0.010666666666666666
-   * ```
-   *
-   * @return {number} Amount of time (in seconds) contained in a pixel.
+   * Returns the amount of time represented by a single pixel, in seconds.
    */
 
   get seconds_per_pixel() {
@@ -14081,14 +13860,6 @@ WaveformData.prototype = {
 
   /**
    * Returns the number of waveform channels.
-   *
-   * ```javascript
-   * var waveform = WaveformData.create({ ... });
-   * console.log(waveform.channels);    // -> 1
-   * ```
-   *
-   * @api
-   * @return {number} Number of channels.
    */
 
   get channels() {
@@ -14097,16 +13868,6 @@ WaveformData.prototype = {
 
   /**
    * Returns a waveform channel.
-   *
-   * ```javascript
-   * var waveform = WaveformData.create({ ... });
-   * var channel = waveform.channel(0);
-   * console.log(channel.min_sample(0)); // -> 1
-   * ```
-   *
-   * @api
-   * @param {Number} Channel index.
-   * @return {WaveformDataChannel} Waveform channel.
    */
 
   channel: function(index) {
@@ -14119,9 +13880,7 @@ WaveformData.prototype = {
   },
 
   /**
-   * Returns the number of samples per second.
-   *
-   * @return {Integer} Number of samples per second.
+   * Returns the number of audio samples per second.
    */
 
   get sample_rate() {
@@ -14129,9 +13888,7 @@ WaveformData.prototype = {
   },
 
   /**
-   * Returns the scale (number of samples per pixel).
-   *
-   * @return {Integer} Number of samples per pixel.
+   * Returns the number of audio samples per pixel.
    */
 
   get scale() {
@@ -14139,10 +13896,7 @@ WaveformData.prototype = {
   },
 
   /**
-   * Returns the pixel location for a given time.
-   *
-   * @param {number} time
-   * @return {integer} Index location for a specific time.
+   * Returns the waveform data index position for a given time.
    */
 
   at_time: function at_time(time) {
@@ -14150,14 +13904,36 @@ WaveformData.prototype = {
   },
 
   /**
-   * Returns the time in seconds for a given index
-   *
-   * @param {Integer} index
-   * @return {number}
+   * Returns the time in seconds for a given index.
    */
 
   time: function time(index) {
     return index * this.scale / this.sample_rate;
+  },
+
+  /**
+   * Returns an object containing the waveform data.
+   */
+
+  toJSON: function() {
+    const waveform = {
+      version: 2,
+      channels: this.channels,
+      sample_rate: this.sample_rate,
+      samples_per_pixel: this.scale,
+      bits: this.bits,
+      length: this.length,
+      data: []
+    };
+
+    for (var i = 0; i < this.length; i++) {
+      for (var channel = 0; channel < this.channels; channel++) {
+        waveform.data.push(this.channel(channel).min_sample(i));
+        waveform.data.push(this.channel(channel).max_sample(i));
+      }
+    }
+
+    return waveform;
   }
 };
 
@@ -14166,13 +13942,54 @@ module.exports = WaveformData;
 },{"./adapters/arraybuffer":77,"./adapters/object":78,"./channel":82}],84:[function(_dereq_,module,exports){
 "use strict";
 
+function MainThreadWorker(func) {
+  this._listeners = {};
+
+  func.call(this);
+}
+
+MainThreadWorker.prototype.addEventListener = function(event, listener) {
+  if (!this._listeners[event]) {
+    this._listeners[event] = [];
+  }
+
+  this._listeners[event].push(listener);
+};
+
+MainThreadWorker.prototype.removeEventListener = function(event, listener) {
+  if (this._listeners[event]) {
+    this._listeners[event] = this._listeners[event].filter(function(item) {
+      return item !== listener;
+    });
+  }
+};
+
+MainThreadWorker.prototype.postMessage = function(data) {
+  var event = { data: data };
+
+  var listeners = this._listeners.message;
+
+  for (var i = 0; i < listeners.length; i++) {
+    listeners[i].call(this, event);
+  }
+};
+
+MainThreadWorker.prototype.close = function() {
+  this._listeners = {};
+};
+
+module.exports = MainThreadWorker;
+
+},{}],85:[function(_dereq_,module,exports){
+"use strict";
+
 var WaveformData = _dereq_("./lib/core");
 
 WaveformData.createFromAudio = _dereq_("./lib/builders/webaudio");
 
 module.exports = WaveformData;
 
-},{"./lib/builders/webaudio":81,"./lib/core":83}],85:[function(_dereq_,module,exports){
+},{"./lib/builders/webaudio":81,"./lib/core":83}],86:[function(_dereq_,module,exports){
 module.exports = function (Data) {
     'use strict';
     function DataRetriever(peaks) {
@@ -14222,7 +14039,7 @@ module.exports = function (Data) {
     };
     return DataRetriever;
 }(_dereq_('./data'));
-},{"./data":86}],86:[function(_dereq_,module,exports){
+},{"./data":87}],87:[function(_dereq_,module,exports){
 module.exports = function () {
     'use strict';
     function Data(type, content) {
@@ -14254,7 +14071,7 @@ module.exports = function () {
     };
     return Data;
 }();
-},{}],87:[function(_dereq_,module,exports){
+},{}],88:[function(_dereq_,module,exports){
 module.exports = function (Utils, Konva) {
     'use strict';
     function DefaultSegmentMarker(options) {
@@ -14338,7 +14155,7 @@ module.exports = function (Utils, Konva) {
     };
     return DefaultSegmentMarker;
 }(_dereq_('./utils'), _dereq_('konva'));
-},{"./utils":110,"konva":43}],88:[function(_dereq_,module,exports){
+},{"./utils":111,"konva":43}],89:[function(_dereq_,module,exports){
 module.exports = function () {
     'use strict';
     function Invoker() {
@@ -14387,7 +14204,7 @@ module.exports = function () {
     };
     return Invoker;
 }();
-},{}],89:[function(_dereq_,module,exports){
+},{}],90:[function(_dereq_,module,exports){
 module.exports = function () {
     'use strict';
     var nodes = [
@@ -14470,7 +14287,7 @@ module.exports = function () {
     };
     return KeyboardHandler;
 }();
-},{}],90:[function(_dereq_,module,exports){
+},{}],91:[function(_dereq_,module,exports){
 module.exports = function (Konva, Utils) {
     'use strict';
     function LineIndicator(peaks, view, container) {
@@ -14691,7 +14508,7 @@ module.exports = function (Konva, Utils) {
     };
     return LineIndicator;
 }(_dereq_('konva'), _dereq_('./utils'));
-},{"./utils":110,"konva":43}],91:[function(_dereq_,module,exports){
+},{"./utils":111,"konva":43}],92:[function(_dereq_,module,exports){
 module.exports = function (Konva, Utils) {
     'use strict';
     function Line(peaks, view, y, id, position) {
@@ -15154,7 +14971,7 @@ module.exports = function (Konva, Utils) {
     };
     return Line;
 }(_dereq_('konva'), _dereq_('./utils'));
-},{"./utils":110,"konva":43}],92:[function(_dereq_,module,exports){
+},{"./utils":111,"konva":43}],93:[function(_dereq_,module,exports){
 module.exports = function (SegmentsGroup, Line, LineIndicator, Utils) {
     'use strict';
     function Lines(peaks, view, layer) {
@@ -15186,6 +15003,9 @@ module.exports = function (SegmentsGroup, Line, LineIndicator, Utils) {
                 self._segmentsGroups[segment.line] = new SegmentsGroup(self._peaks, self._view, true);
             }
             self._segmentsGroups[segment.line].onSegmentsAdd([segment]);
+            if (Utils.objectHasProperty(self._segmentsGroupToLine, segment.line)) {
+                self._segmentsGroupToLine[segment.line].refreshSegmentsHeight();
+            }
         });
     };
     Lines.prototype._onSegmentsUpdate = function (segment) {
@@ -15230,7 +15050,7 @@ module.exports = function (SegmentsGroup, Line, LineIndicator, Utils) {
         }
     };
     Lines.prototype.addSourceGroup = function (sourceGroup, position) {
-        if (!this._linesByPosition[position]) {
+        if (!this._linesByPosition[position] || this._linesByPosition[position].isSegmentsLine()) {
             this._createLine(position);
             this._setInteractions(position);
         }
@@ -15450,7 +15270,7 @@ module.exports = function (SegmentsGroup, Line, LineIndicator, Utils) {
     };
     return Lines;
 }(_dereq_('./segments-group'), _dereq_('./line'), _dereq_('./line-indicator'), _dereq_('./utils'));
-},{"./line":91,"./line-indicator":90,"./segments-group":102,"./utils":110}],93:[function(_dereq_,module,exports){
+},{"./line":92,"./line-indicator":91,"./segments-group":103,"./utils":111}],94:[function(_dereq_,module,exports){
 module.exports = function (Colors, EventEmitter, TimelineSegments, TimelineSources, KeyboardHandler, Player, MarkerFactories, TimelineZoomView, Utils) {
     'use strict';
     function Peaks() {
@@ -15689,7 +15509,7 @@ module.exports = function (Colors, EventEmitter, TimelineSegments, TimelineSourc
     };
     return Peaks;
 }(_dereq_('colors.css'), _dereq_('eventemitter2'), _dereq_('./timeline-segments'), _dereq_('./timeline-sources'), _dereq_('./keyboard-handler'), _dereq_('./player'), _dereq_('./marker-factories'), _dereq_('./timeline-zoomview'), _dereq_('./utils'));
-},{"./keyboard-handler":89,"./marker-factories":94,"./player":97,"./timeline-segments":107,"./timeline-sources":108,"./timeline-zoomview":109,"./utils":110,"colors.css":1,"eventemitter2":2}],94:[function(_dereq_,module,exports){
+},{"./keyboard-handler":90,"./marker-factories":95,"./player":98,"./timeline-segments":108,"./timeline-sources":109,"./timeline-zoomview":110,"./utils":111,"colors.css":1,"eventemitter2":2}],95:[function(_dereq_,module,exports){
 module.exports = function (DefaultSegmentMarker, Utils, Konva) {
     'use strict';
     function createSegmentMarker(options) {
@@ -15721,7 +15541,7 @@ module.exports = function (DefaultSegmentMarker, Utils, Konva) {
         createSegmentLabel: createSegmentLabel
     };
 }(_dereq_('./default-segment-marker'), _dereq_('./utils'), _dereq_('konva'));
-},{"./default-segment-marker":87,"./utils":110,"konva":43}],95:[function(_dereq_,module,exports){
+},{"./default-segment-marker":88,"./utils":111,"konva":43}],96:[function(_dereq_,module,exports){
 module.exports = function (Utils, SourceGroup, Konva) {
     'use strict';
     var TIME_X_OFFSET = 20;
@@ -15993,7 +15813,7 @@ module.exports = function (Utils, SourceGroup, Konva) {
     };
     return ModeLayer;
 }(_dereq_('./utils'), _dereq_('./source-group'), _dereq_('konva'));
-},{"./source-group":103,"./utils":110,"konva":43}],96:[function(_dereq_,module,exports){
+},{"./source-group":104,"./utils":111,"konva":43}],97:[function(_dereq_,module,exports){
 module.exports = function (Konva) {
     'use strict';
     function getMarkerObject(obj) {
@@ -16089,7 +15909,7 @@ module.exports = function (Konva) {
     };
     return MouseDragHandler;
 }(_dereq_('konva'));
-},{"konva":43}],97:[function(_dereq_,module,exports){
+},{"konva":43}],98:[function(_dereq_,module,exports){
 module.exports = function (Utils) {
     'use strict';
     function Player(peaks) {
@@ -16173,7 +15993,7 @@ module.exports = function (Utils) {
     };
     return Player;
 }(_dereq_('./utils'));
-},{"./utils":110}],98:[function(_dereq_,module,exports){
+},{"./utils":111}],99:[function(_dereq_,module,exports){
 module.exports = function (Utils, Konva) {
     'use strict';
     var HANDLE_RADIUS = 10;
@@ -16418,7 +16238,7 @@ module.exports = function (Utils, Konva) {
     };
     return PlayheadLayer;
 }(_dereq_('./utils'), _dereq_('konva'));
-},{"./utils":110,"konva":43}],99:[function(_dereq_,module,exports){
+},{"./utils":111,"konva":43}],100:[function(_dereq_,module,exports){
 module.exports = function (Konva) {
     'use strict';
     function SegmentMarker(options) {
@@ -16504,7 +16324,7 @@ module.exports = function (Konva) {
     };
     return SegmentMarker;
 }(_dereq_('konva'));
-},{"konva":43}],100:[function(_dereq_,module,exports){
+},{"konva":43}],101:[function(_dereq_,module,exports){
 module.exports = function (Konva, SegmentMarker) {
     'use strict';
     var SEGMENT_WIDTH = 10;
@@ -16529,7 +16349,7 @@ module.exports = function (Konva, SegmentMarker) {
             fill: segment.color + Math.round(segment.opacity * 255).toString(16),
             stroke: segment.textColor + 'FF',
             strokeWidth: 1,
-            draggable: true
+            draggable: this._segment.editable
         });
         var self = this;
         this._rectangle.dragBoundFunc(function () {
@@ -16678,7 +16498,7 @@ module.exports = function (Konva, SegmentMarker) {
     SegmentShape.prototype._onMouseEnter = function () {
         this._view.setCursor('pointer');
         this._view.setHoveredElement(this);
-        this._rectangle.fill(this._segment.activeColor + Math.round(this._segment.opacity * 255).toString(16));
+        this._rectangle.fill(this._segment.hoverColor + Math.round(this._segment.opacity * 255).toString(16));
         this._view.drawSourcesLayer();
         this._peaks.emit('segments.mouseenter', this._segment);
     };
@@ -16741,7 +16561,7 @@ module.exports = function (Konva, SegmentMarker) {
     };
     return SegmentShape;
 }(_dereq_('konva'), _dereq_('./segment-marker'));
-},{"./segment-marker":99,"konva":43}],101:[function(_dereq_,module,exports){
+},{"./segment-marker":100,"konva":43}],102:[function(_dereq_,module,exports){
 module.exports = function (Utils) {
     'use strict';
     function validateSegment(peaks, options, context) {
@@ -16774,8 +16594,18 @@ module.exports = function (Utils) {
         if (!Utils.isInteger(options.line)) {
             throw new TypeError('peaks.segments.' + context + ': line must be an integer');
         }
+        if (Utils.isNullOrUndefined(options.editable)) {
+            options.editable = true;
+        } else if (!Utils.isBoolean(options.editable)) {
+            throw new TypeError('peaks.segments.' + context + ': editable must be a boolean');
+        }
+        if (Utils.isNullOrUndefined(options.hoverColor)) {
+            options.hoverColor = Utils.shadeColor(options.color, 20);
+        } else if (!Utils.isValidColor(options.hoverColor)) {
+            throw new TypeError('peaks.segments.' + context + ': hoverColor must be a boolean');
+        }
     }
-    function Segment(peaks, id, startTime, endTime, labelText, color, textColor, handleTextColor, opacity, editable, allowDeletion, line) {
+    function Segment(peaks, id, startTime, endTime, labelText, color, textColor, handleTextColor, hoverColor, opacity, editable, allowDeletion, line) {
         var opts = {
             startTime: startTime,
             endTime: endTime,
@@ -16783,6 +16613,7 @@ module.exports = function (Utils) {
             color: color,
             textColor: textColor,
             handleTextColor: handleTextColor,
+            hoverColor: hoverColor,
             opacity: opacity,
             editable: editable,
             allowDeletion: allowDeletion,
@@ -16795,7 +16626,7 @@ module.exports = function (Utils) {
         this._endTime = opts.endTime;
         this._labelText = opts.labelText;
         this._color = opts.color;
-        this._activeColor = Utils.shadeColor(color, 20);
+        this._hoverColor = opts.hoverColor;
         this._textColor = opts.textColor;
         this._handleTextColor = opts.handleTextColor;
         this._opacity = opts.opacity;
@@ -16841,10 +16672,10 @@ module.exports = function (Utils) {
                 return this._color;
             }
         },
-        activeColor: {
+        hoverColor: {
             enumerable: true,
             get: function () {
-                return this._activeColor;
+                return this._hoverColor;
             }
         },
         textColor: {
@@ -16911,6 +16742,7 @@ module.exports = function (Utils) {
         this._color = opts.color;
         this._textColor = opts.textColor;
         this._handleTextColor = opts.handleTextColor;
+        this._hoverColor = opts.hoverColor;
         this._opacity = opts.opacity;
         this._editable = opts.editable;
         this._allowDeletion = opts.allowDeletion;
@@ -16922,7 +16754,7 @@ module.exports = function (Utils) {
     };
     return Segment;
 }(_dereq_('./utils'));
-},{"./utils":110}],102:[function(_dereq_,module,exports){
+},{"./utils":111}],103:[function(_dereq_,module,exports){
 module.exports = function (SegmentShape, Utils, Konva) {
     'use strict';
     function SegmentsGroup(peaks, view, allowEditing) {
@@ -17253,20 +17085,25 @@ module.exports = function (SegmentShape, Utils, Konva) {
                     }
                 } else if (segment.startTime >= newStartTime) {
                     if (newStartTime < previousSegment.endTime) {
-                        if (previousSegment.startTime + previousSegment.minSize > newStartTime) {
-                            newStartTime = previousSegment.startTime + previousSegment.minSize;
-                            startLimited = true;
-                        }
-                        if (previousSegment.endTime !== newStartTime) {
-                            newXs = this.manageCollision(previousSegment, this._view.timeToPixels(previousSegment.startTime), this._view.timeToPixels(newStartTime));
-                            if (newXs.startX !== null) {
-                                previousSegment.startTime = this._view.pixelsToTime(newXs.startX);
+                        if (previousSegment.editable) {
+                            if (previousSegment.startTime + previousSegment.minSize > newStartTime) {
+                                newStartTime = previousSegment.startTime + previousSegment.minSize;
+                                startLimited = true;
                             }
-                            if (newXs.endX !== null) {
-                                previousSegment.endTime = this._view.pixelsToTime(newXs.endX);
+                            if (previousSegment.endTime !== newStartTime) {
+                                newXs = this.manageCollision(previousSegment, this._view.timeToPixels(previousSegment.startTime), this._view.timeToPixels(newStartTime));
+                                if (newXs.startX !== null) {
+                                    previousSegment.startTime = this._view.pixelsToTime(newXs.startX);
+                                }
+                                if (newXs.endX !== null) {
+                                    previousSegment.endTime = this._view.pixelsToTime(newXs.endX);
+                                }
+                                this._updateSegment(previousSegment);
+                                this.addToUpdatedSegments(previousSegment);
                             }
-                            this._updateSegment(previousSegment);
-                            this.addToUpdatedSegments(previousSegment);
+                        } else {
+                            newStartTime = previousSegment.endTime;
+                            startLimited = true;
                         }
                     }
                 }
@@ -17294,20 +17131,25 @@ module.exports = function (SegmentShape, Utils, Konva) {
                     }
                 } else if (segment.endTime <= newEndTime) {
                     if (newEndTime > nextSegment.startTime) {
-                        if (nextSegment.endTime - nextSegment.minSize < newEndTime) {
-                            newEndTime = nextSegment.endTime - nextSegment.minSize;
-                            endLimited = true;
-                        }
-                        if (nextSegment.startTime !== newEndTime) {
-                            newXs = this.manageCollision(nextSegment, this._view.timeToPixels(newEndTime), this._view.timeToPixels(nextSegment.endTime));
-                            if (newXs.startX !== null) {
-                                nextSegment.startTime = this._view.pixelsToTime(newXs.startX);
+                        if (nextSegment.editable) {
+                            if (nextSegment.endTime - nextSegment.minSize < newEndTime) {
+                                newEndTime = nextSegment.endTime - nextSegment.minSize;
+                                endLimited = true;
                             }
-                            if (newXs.endX !== null) {
-                                nextSegment.endTime = this._view.pixelsToTime(newXs.endX);
+                            if (nextSegment.startTime !== newEndTime) {
+                                newXs = this.manageCollision(nextSegment, this._view.timeToPixels(newEndTime), this._view.timeToPixels(nextSegment.endTime));
+                                if (newXs.startX !== null) {
+                                    nextSegment.startTime = this._view.pixelsToTime(newXs.startX);
+                                }
+                                if (newXs.endX !== null) {
+                                    nextSegment.endTime = this._view.pixelsToTime(newXs.endX);
+                                }
+                                this._updateSegment(nextSegment);
+                                this.addToUpdatedSegments(nextSegment);
                             }
-                            this._updateSegment(nextSegment);
-                            this.addToUpdatedSegments(nextSegment);
+                        } else {
+                            newEndTime = nextSegment.startTime;
+                            endLimited = true;
                         }
                     }
                 }
@@ -17409,7 +17251,7 @@ module.exports = function (SegmentShape, Utils, Konva) {
     };
     return SegmentsGroup;
 }(_dereq_('./segment-shape'), _dereq_('./utils'), _dereq_('konva'));
-},{"./segment-shape":100,"./utils":110,"konva":43}],103:[function(_dereq_,module,exports){
+},{"./segment-shape":101,"./utils":111,"konva":43}],104:[function(_dereq_,module,exports){
 module.exports = function (WaveformBuilder, WaveformShape, Utils, Konva) {
     'use strict';
     var SPACING_BETWEEN_PREVIEW_AND_BORDER_RATIO = 0.15;
@@ -18114,7 +17956,7 @@ module.exports = function (WaveformBuilder, WaveformShape, Utils, Konva) {
     };
     return SourceGroup;
 }(_dereq_('./waveform-builder'), _dereq_('./waveform-shape'), _dereq_('./utils'), _dereq_('konva'));
-},{"./utils":110,"./waveform-builder":111,"./waveform-shape":112,"konva":43}],104:[function(_dereq_,module,exports){
+},{"./utils":111,"./waveform-builder":112,"./waveform-shape":113,"konva":43}],105:[function(_dereq_,module,exports){
 module.exports = function (Utils) {
     'use strict';
     function validateSource(peaks, options, context) {
@@ -18250,11 +18092,8 @@ module.exports = function (Utils) {
         } else if (options.wrapping === 'complete') {
             options.wrapped = false;
         }
-        if (!Utils.isNullOrUndefined(options.tts) && !Utils.isBoolean(options.tts)) {
-            throw new TypeError('peaks.sources.' + context + ': tts must be a boolean or undefined');
-        }
     }
-    function Source(peaks, id, originId, elementId, title, url, previewUrl, binaryUrl, kind, duration, startTime, endTime, mediaStartTime, mediaEndTime, color, borderColor, selectedColor, textColor, borderWidth, wrapped, position, draggable, resizable, wrapping, previewHeight, binaryHeight, tts) {
+    function Source(peaks, id, originId, elementId, title, url, previewUrl, binaryUrl, kind, duration, startTime, endTime, mediaStartTime, mediaEndTime, color, borderColor, selectedColor, textColor, borderWidth, wrapped, position, draggable, resizable, wrapping, previewHeight, binaryHeight) {
         var opts = {
             title: title,
             url: url,
@@ -18277,8 +18116,7 @@ module.exports = function (Utils) {
             resizable: resizable,
             wrapping: wrapping,
             previewHeight: previewHeight,
-            binaryHeight: binaryHeight,
-            tts: tts
+            binaryHeight: binaryHeight
         };
         validateSource(peaks, opts, 'add()');
         this._peaks = peaks;
@@ -18308,7 +18146,6 @@ module.exports = function (Utils) {
         this._previewHeight = opts.previewHeight;
         this._binaryHeight = opts.binaryHeight;
         this._minSize = peaks.options.minSourceSize;
-        this._tts = opts.tts;
     }
     Object.defineProperties(Source.prototype, {
         id: {
@@ -18514,14 +18351,6 @@ module.exports = function (Utils) {
             get: function () {
                 return this._minSize;
             }
-        },
-        tts: {
-            get: function () {
-                return this._tts;
-            },
-            set: function (tts) {
-                this._tts = tts;
-            }
         }
     });
     Source.prototype.updateTimes = function (newStartTime, newEndTime) {
@@ -18631,8 +18460,7 @@ module.exports = function (Utils) {
             resizable: this.resizable,
             wrapping: this.wrapping,
             previewHeight: this.previewHeight,
-            binaryHeight: this.binaryHeight,
-            tts: this.tts
+            binaryHeight: this.binaryHeight
         };
         Utils.extend(opts, options);
         validateSource(this._peaks, opts, 'update()');
@@ -18658,7 +18486,6 @@ module.exports = function (Utils) {
         this._wrapping = opts.wrapping;
         this._previewHeight = opts.previewHeight;
         this._binaryHeight = opts.binaryHeight;
-        this._tts = opts.tts;
         this._peaks.emit('source.update', this);
     };
     Source.prototype.isVisible = function (startTime, endTime) {
@@ -18666,7 +18493,7 @@ module.exports = function (Utils) {
     };
     return Source;
 }(_dereq_('./utils'));
-},{"./utils":110}],105:[function(_dereq_,module,exports){
+},{"./utils":111}],106:[function(_dereq_,module,exports){
 module.exports = function (SourceGroup, Lines, DataRetriever, Utils, Invoker, Konva) {
     'use strict';
     function SourcesLayer(peaks, view, allowEditing) {
@@ -19013,7 +18840,7 @@ module.exports = function (SourceGroup, Lines, DataRetriever, Utils, Invoker, Ko
     };
     return SourcesLayer;
 }(_dereq_('./source-group'), _dereq_('./lines'), _dereq_('./data-retriever'), _dereq_('./utils'), _dereq_('./invoker'), _dereq_('konva'));
-},{"./data-retriever":85,"./invoker":88,"./lines":92,"./source-group":103,"./utils":110,"konva":43}],106:[function(_dereq_,module,exports){
+},{"./data-retriever":86,"./invoker":89,"./lines":93,"./source-group":104,"./utils":111,"konva":43}],107:[function(_dereq_,module,exports){
 module.exports = function (Utils, Konva) {
     'use strict';
     var LEFT_PADDING = 4;
@@ -19154,7 +18981,7 @@ module.exports = function (Utils, Konva) {
     };
     return TimelineAxis;
 }(_dereq_('./utils'), _dereq_('konva'));
-},{"./utils":110,"konva":43}],107:[function(_dereq_,module,exports){
+},{"./utils":111,"konva":43}],108:[function(_dereq_,module,exports){
 module.exports = function (Colors, Segment, Utils) {
     'use strict';
     function TimelineSegments(peaks) {
@@ -19197,7 +19024,7 @@ module.exports = function (Colors, Segment, Utils) {
         if (!Utils.isObject(options)) {
             throw new TypeError('peaks.segments.add(): expected a Segment object parameter');
         }
-        var segment = new Segment(this._peaks, Utils.isNullOrUndefined(options.id) ? this._getNextSegmentId() : options.id, options.startTime, options.endTime, options.labelText, options.color || this._getSegmentColor(), options.textColor || '#000000', options.handleTextColor || '#000000', options.opacity || 1, true, options.allowDeletion || false, options.line);
+        var segment = new Segment(this._peaks, Utils.isNullOrUndefined(options.id) ? this._getNextSegmentId() : options.id, options.startTime, options.endTime, options.labelText, options.color || this._getSegmentColor(), options.textColor || '#000000', options.handleTextColor || '#000000', options.hoverColor, options.opacity || 1, options.editable, options.allowDeletion || false, options.line);
         return segment;
     };
     TimelineSegments.prototype.getSegments = function () {
@@ -19304,7 +19131,7 @@ module.exports = function (Colors, Segment, Utils) {
     };
     return TimelineSegments;
 }(_dereq_('colors.css'), _dereq_('./segment'), _dereq_('./utils'));
-},{"./segment":101,"./utils":110,"colors.css":1}],108:[function(_dereq_,module,exports){
+},{"./segment":102,"./utils":111,"colors.css":1}],109:[function(_dereq_,module,exports){
 module.exports = function (Source, Utils) {
     'use strict';
     function TimelineSources(peaks) {
@@ -19347,8 +19174,7 @@ module.exports = function (Source, Utils) {
                 resizable: sourceToCut.resizable,
                 wrapping: sourceToCut.wrapping,
                 previewHeight: sourceToCut.previewHeight,
-                binaryHeight: sourceToCut.binaryHeight,
-                tts: sourceToCut.tts
+                binaryHeight: sourceToCut.binaryHeight
             }]);
         this._peaks.emit('sources.updated');
     };
@@ -19363,7 +19189,7 @@ module.exports = function (Source, Utils) {
         if (!Utils.isObject(options)) {
             throw new TypeError('peaks.sources.add(): expected a Source object parameter');
         }
-        var source = new Source(this._peaks, options.id || this._getNextSourceId(), options.originId, options.elementId, options.title, options.url, options.previewUrl, options.binaryUrl, options.kind, options.duration, options.startTime, options.endTime, options.mediaStartTime, options.mediaEndTime, options.color, options.borderColor, options.selectedColor, options.textColor, options.borderWidth, options.wrapped, options.position, options.draggable, options.resizable, options.wrapping, options.previewHeight, options.binaryHeight, options.tts);
+        var source = new Source(this._peaks, options.id || this._getNextSourceId(), options.originId, options.elementId, options.title, options.url, options.previewUrl, options.binaryUrl, options.kind, options.duration, options.startTime, options.endTime, options.mediaStartTime, options.mediaEndTime, options.color, options.borderColor, options.selectedColor, options.textColor, options.borderWidth, options.wrapped, options.position, options.draggable, options.resizable, options.wrapping, options.previewHeight, options.binaryHeight);
         return source;
     };
     TimelineSources.prototype.getSources = function () {
@@ -19472,7 +19298,7 @@ module.exports = function (Source, Utils) {
     };
     return TimelineSources;
 }(_dereq_('./source'), _dereq_('./utils'));
-},{"./source":104,"./utils":110}],109:[function(_dereq_,module,exports){
+},{"./source":105,"./utils":111}],110:[function(_dereq_,module,exports){
 module.exports = function (MouseDragHandler, PlayheadLayer, SourcesLayer, ModeLayer, TimelineAxis, Utils, Konva) {
     'use strict';
     function TimelineZoomView(container, peaks) {
@@ -19938,9 +19764,6 @@ module.exports = function (MouseDragHandler, PlayheadLayer, SourcesLayer, ModeLa
         var frameStartTime = null;
         var frameEndTime = null;
         if (frameOffset !== undefined && frameOffset !== null) {
-            if (this._timelineLength < this._width) {
-                frameOffset = 0;
-            }
             this.setFrameOffset(frameOffset);
             frameStartTime = this.pixelsToTime(this._frameOffset);
             frameEndTime = this.pixelsToTime(this._frameOffset + this._width);
@@ -20024,7 +19847,7 @@ module.exports = function (MouseDragHandler, PlayheadLayer, SourcesLayer, ModeLa
     };
     return TimelineZoomView;
 }(_dereq_('./mouse-drag-handler'), _dereq_('./playhead-layer'), _dereq_('./sources-layer'), _dereq_('./mode-layer'), _dereq_('./timeline-axis'), _dereq_('./utils'), _dereq_('konva'));
-},{"./mode-layer":95,"./mouse-drag-handler":96,"./playhead-layer":98,"./sources-layer":105,"./timeline-axis":106,"./utils":110,"konva":43}],110:[function(_dereq_,module,exports){
+},{"./mode-layer":96,"./mouse-drag-handler":97,"./playhead-layer":99,"./sources-layer":106,"./timeline-axis":107,"./utils":111,"konva":43}],111:[function(_dereq_,module,exports){
 module.exports = function (UUID) {
     'use strict';
     if (typeof Number.isFinite !== 'function') {
@@ -20188,7 +20011,7 @@ module.exports = function (UUID) {
         }
     };
 }(_dereq_('uuid'));
-},{"uuid":62}],111:[function(_dereq_,module,exports){
+},{"uuid":62}],112:[function(_dereq_,module,exports){
 module.exports = function (WaveformData, Utils) {
     'use strict';
     var isXhr2 = 'withCredentials' in new XMLHttpRequest();
@@ -20380,7 +20203,7 @@ module.exports = function (WaveformData, Utils) {
     };
     return WaveformBuilder;
 }(_dereq_('waveform-data'), _dereq_('./utils'));
-},{"./utils":110,"waveform-data":84}],112:[function(_dereq_,module,exports){
+},{"./utils":111,"waveform-data":85}],113:[function(_dereq_,module,exports){
 module.exports = function (Utils, Konva) {
     'use strict';
     function scaleY(amplitude, height, scale) {
@@ -20473,6 +20296,6 @@ module.exports = function (Utils, Konva) {
     };
     return WaveformShape;
 }(_dereq_('./utils'), _dereq_('konva'));
-},{"./utils":110,"konva":43}]},{},[93])(93)
+},{"./utils":111,"konva":43}]},{},[94])(94)
 });
 //# sourceMappingURL=peaks.js.map