Merge pull request #20 from DeekyJay/howler-fix

Fixed Howler Issues With Buffer, No Playback, and Global Volume

package.json

@@ -1,6 +1,6 @@
 {
   "name": "SoundwaveInteractive",
-  "version": "0.9.7",
+  "version": "0.9.8",
   "description": "Soundwave Interactive Beam Soundboard",
   "main": "main.js",
   "engines": {

src/containers/Audio.js

@@ -80,7 +80,7 @@ export class Audio extends React.Component {
           <div
             className='form-group'
             onClick={this.checkChanged}>
-            <span className='checkbox-label'>Minimize to system tray</span>
+            <span className='checkbox-label'>Minimize to System Tray</span>
             <span className={`custom-checkbox ${trayMinimize ? 'sicon-round-check' : ''}`}></span>
           </div>
         </div>

src/containers/SoundList.js

@@ -7,7 +7,8 @@ import SoundItem from '../components/SoundItem/SoundItem'
 import ReactToolTip from 'react-tooltip'
 import Dropzone from 'react-dropzone'
 import { SortableContainer, SortableElement } from 'react-sortable-hoc'
-import { Howl } from 'howler'
+import { Howl, Howler } from 'howler'
+console.log(Howler)
 import { toastr } from 'redux-toastr'
 import ReactSlider from 'rc-slider'
 import Ink from '../components/Ink'
@@ -172,7 +173,7 @@ export class SoundList extends React.Component {
         html5: true,
         volume: parseFloat(sound.volume) * 0.01
       })
-      if (selectedOutput) howl._audioNode[0].setSinkId(selectedOutput)
+      if (selectedOutput) howl._sounds[0]._node.setSinkId(selectedOutput)
       howl.once('end', () => {
         howl.unload()
         this.setState({ ...this.state, isPlaying: false, howl: null })

src/redux/modules/App.js

@@ -2,6 +2,7 @@ import { remote, ipcRenderer } from 'electron'
 import _ from 'lodash'
 import storage from 'electron-json-storage'
 import { Howler } from 'howler'
+Howler.usingWebAudio = false
 import { shareAnalytics } from '../utils/analytics'
 
 const { BrowserWindow, app } = remote
@@ -66,6 +67,7 @@ export const actions = {
         data.shareAnalytics !== null) shareAnalytics(data.shareAnalytics)
       ipcDispatch = dispatch
       console.log(data)
+      if (data.globalVolume) Howler.volume(parseInt(data.globalVolume) * 0.01)
       dispatch({
         type: constants.APP_INITIALIZE,
         payload: data
@@ -85,10 +87,10 @@ export const actions = {
           })
         })
       } else {
-          mainWindow.minimize()
-          dispatch({
-            type: constants.MINIMIZE
-          })
+        mainWindow.minimize()
+        dispatch({
+          type: constants.MINIMIZE
+        })
       }
     }
   },

src/redux/modules/Sounds.js

@@ -7,8 +7,6 @@ import { actions as interactiveActions } from './Interactive'
 import { actions as boardActions } from './Board'
 import analytics from '../utils/analytics'
 import { Howl, Howler } from 'howler'
-Howler.usingWebAudio = true
-Howler.ctx = true
 // Constants
 export const constants = {
   SOUNDS_INITIALIZE: 'SOUNDS_INITIALIZE',
@@ -140,7 +138,7 @@ export const actions = {
           html5: true,
           volume: parseFloat(sound.volume) * 0.01
         })
-        if (selectedOutput) howl._audioNode[0].setSinkId(selectedOutput)
+        if (selectedOutput) howl._sounds[0]._node.setSinkId(selectedOutput)
         howl.once('end', () => {
           howl.unload()
           dispatch({ type: constants.PLAY_SOUND_ENDED })