refactor out player...

2 files changed, 6 insertions, 10 deletions

diff --git a/animism-align/frontend/app/views/audio/audio.actions.js b/animism-align/frontend/app/views/audio/audio.actions.js
index c12f7ee..0ee41c6 100644
--- a/animism-align/frontend/app/views/audio/audio.actions.js
+++ b/animism-align/frontend/app/views/audio/audio.actions.js
@@ -38,11 +38,7 @@ export const toggle = () => dispatch => {
     play()(dispatch)
   }
 }
-export const toggleMuted = () => dispatch => {
-  if (store.getState().audio.muted) {
-    audioPlayer.muted = false
-  } else {
-    audioPlayer.muted = true
-  }
-  dispatch({ type: types.audio.toggle_muted })
+export const setVolume = volume => dispatch => {
+  audioPlayer.volume = volume
+  dispatch({ type: types.audio.set_volume, volume })
 }
diff --git a/animism-align/frontend/app/views/audio/audio.reducer.js b/animism-align/frontend/app/views/audio/audio.reducer.js
index 09ce6ce..35a364d 100644
--- a/animism-align/frontend/app/views/audio/audio.reducer.js
+++ b/animism-align/frontend/app/views/audio/audio.reducer.js
@@ -4,7 +4,7 @@ import { session, getDefault, getDefaultInt } from 'app/session'
 const initialState = {
   playing: false,
   play_ts: 0,
-  muted: false,
+  volume: 1.0,
 }
 
 export default function alignReducer(state = initialState, action) {
@@ -25,10 +25,10 @@ export default function alignReducer(state = initialState, action) {
         ...state,
         play_ts: action.play_ts,
       }
-    case types.audio.toggle_muted:
+    case types.audio.set_volume:
       return {
         ...state,
-        muted: !state.muted,
+        volume: action.volume,
       }
     default:
       return state