seeking and zooming the waveform. playing the audio

5 files changed, 135 insertions, 26 deletions

diff --git a/animism-align/frontend/views/align/components/cursor.component.js b/animism-align/frontend/views/align/components/cursor.component.js
index c92f807..a5ad438 100644
--- a/animism-align/frontend/views/align/components/cursor.component.js
+++ b/animism-align/frontend/views/align/components/cursor.component.js
@@ -1,7 +1,7 @@
 import React, { Component } from 'react'
 
 import { ZOOM_STEPS } from '../constants'
-import { clamp, timestamp } from '../../../util'
+import { timestamp } from '../../../util'
 
 const Cursor = ({ timeline }) => {
   const { start_ts, zoom, cursor_ts, duration } = timeline
diff --git a/animism-align/frontend/views/align/components/playButton.component.js b/animism-align/frontend/views/align/components/playButton.component.js
new file mode 100644
index 0000000..fcb1422
--- /dev/null
+++ b/animism-align/frontend/views/align/components/playButton.component.js
@@ -0,0 +1,31 @@
+import React, { Component } from 'react'
+// import { Link } from 'react-router-dom'
+import { bindActionCreators } from 'redux'
+import { connect } from 'react-redux'
+
+import actions from '../../../actions'
+// import * as alignActions from '../align.actions'
+
+import { ZOOM_STEPS } from '../constants'
+import { clamp } from '../../../util'
+
+const PlayButton = ({ audio }) => {
+  return (
+    <div
+      className={audio.playing ? 'playButton playing' : 'playButton paused'}
+      onClick={() => {
+        audio.playing ? actions.audio.pause() : actions.audio.play()
+      }}
+    />
+  )
+}
+
+const mapStateToProps = state => ({
+  audio: state.audio,
+})
+
+const mapDispatchToProps = dispatch => ({
+  // alignActions: bindActionCreators({ ...alignActions }, dispatch),
+})
+
+export default connect(mapStateToProps, mapDispatchToProps)(PlayButton)
diff --git a/animism-align/frontend/views/align/components/playCursor.component.js b/animism-align/frontend/views/align/components/playCursor.component.js
new file mode 100644
index 0000000..f191bb1
--- /dev/null
+++ b/animism-align/frontend/views/align/components/playCursor.component.js
@@ -0,0 +1,43 @@
+import React, { Component } from 'react'
+// import { Link } from 'react-router-dom'
+import { bindActionCreators } from 'redux'
+import { connect } from 'react-redux'
+
+import { ZOOM_STEPS } from '../constants'
+import { timestamp } from '../../../util'
+
+const PlayCursor = ({ timeline, audio }) => {
+  const { start_ts, zoom, duration } = timeline
+  const { play_ts } = audio
+  const secondsPerPixel = ZOOM_STEPS[zoom] * 0.1
+  const y = (play_ts - start_ts) / secondsPerPixel
+  // console.log(play_ts, y)
+  return (
+    <div
+      className='cursor playCursor'
+      style={{
+        top: y,
+      }}
+    >
+      <div className='line' />
+    </div>
+  )
+}
+
+/*
+      <div className='tickLabel'>
+        {timestamp(cursor_ts, 1)}
+      </div>
+
+*/
+
+const mapStateToProps = state => ({
+  timeline: state.align.timeline,
+  audio: state.audio,
+})
+
+const mapDispatchToProps = dispatch => ({
+  // alignActions: bindActionCreators({ ...alignActions }, dispatch),
+})
+
+export default connect(mapStateToProps, mapDispatchToProps)(PlayCursor)
diff --git a/animism-align/frontend/views/align/components/timeline.component.js b/animism-align/frontend/views/align/components/timeline.component.js
index 86175cf..3b12cb5 100644
--- a/animism-align/frontend/views/align/components/timeline.component.js
+++ b/animism-align/frontend/views/align/components/timeline.component.js
@@ -9,6 +9,8 @@ import actions from '../../../actions'
 import Waveform from './waveform.component'
 import Ticks from './ticks.component'
 import Cursor from './cursor.component'
+import PlayButton from './playButton.component'
+import PlayCursor from './playCursor.component'
 
 import { ZOOM_STEPS } from '../constants'
 import { clamp } from '../../../util'
@@ -19,6 +21,7 @@ class Timeline extends Component {
     this.handleKeydown = this.handleKeydown.bind(this)
     this.handleMouseMove = this.handleMouseMove.bind(this)
     this.handleWheel = this.handleWheel.bind(this)
+    this.handleClick = this.handleClick.bind(this)
   }
   componentDidMount() {
     this.bind()
@@ -33,10 +36,31 @@ class Timeline extends Component {
     document.removeEventListener('keydown', this.handleKeydown)
   }
   handleKeydown(e) {
-    if (e.shiftKey && e.keyCode === 189) {
-      actions.align.setZoom(this.props.timeline.zoom - 1)
-    } else if (e.shiftKey && e.keyCode === 187) {
-      actions.align.setZoom(this.props.timeline.zoom + 1)
+    if (document.activeElement !== document.body) {
+      return
+    }
+    if (e.shiftKey) {
+      switch (e.keyCode) {
+        case 187: // plus
+          actions.align.setZoom(this.props.timeline.zoom - 1)
+          break
+        case 189: // minus
+          actions.align.setZoom(this.props.timeline.zoom + 1)
+          break
+      }
+    } else {
+      console.log(e.keyCode)
+      switch (e.keyCode) {
+        case 32: // spacebar
+          actions.audio.toggle()
+          break
+        case 38: // up
+          actions.audio.jump(- ZOOM_STEPS[this.props.timeline.zoom] * 0.1)
+          break
+        case 40: // down
+          actions.audio.jump(ZOOM_STEPS[this.props.timeline.zoom] * 0.1)
+          break
+      }
     }
   }
   handleWheel(e) {
@@ -45,28 +69,26 @@ class Timeline extends Component {
     let widthTimeDuration = window.innerHeight * secondsPerPixel // secs per pixel
 
     start_ts = clamp(start_ts + e.deltaY * ZOOM_STEPS[zoom], 0, Math.max(0, duration - widthTimeDuration / 2))
-    console.log(start_ts)
-    actions.align.setScrollPosition(start_ts)
+    if (e.shiftKey) {
+      if (Math.abs(e.deltaY) < 2) return
+      if (e.deltaY > 0) {
+        actions.align.throttledSetZoom(this.props.timeline.zoom + 1)
+      } else {
+        actions.align.throttledSetZoom(this.props.timeline.zoom - 1)
+      }
+    } else if (e.altKey) {
+      actions.audio.seek(start_ts)
+    } else {
+      actions.align.setScrollPosition(start_ts)
+    }
   }
   handleMouseMove(e) {
-    const { start_ts, zoom, duration } = this.props.timeline
-    const y = e.pageY
-    const height = window.innerHeight
-
-    let secondsPerPixel = ZOOM_STEPS[zoom] * 0.1
-    let widthTimeDuration = height * secondsPerPixel
-
-    let timeMin = start_ts
-    let timeMax = Math.min(start_ts + widthTimeDuration, duration)
-    let timeWidth = timeMax - timeMin
-
-    let cursor_ts = y * secondsPerPixel + start_ts
-    cursor_ts = clamp(cursor_ts, 0, timeMax)
-
+    const cursor_ts = positionToTime(e.pageY, this.props.timeline)
     actions.align.setCursor(cursor_ts)
-
-    // let pixelMin = timeMin / secondsPerPixel
-    // const ts = 
+  }
+  handleClick(e) {
+    const play_ts = positionToTime(e.pageY, this.props.timeline)
+    actions.audio.seek(play_ts)
   }
   render() {
     return (
@@ -75,14 +97,27 @@ class Timeline extends Component {
         onWheel={this.handleWheel}
         onMouseMove={this.handleMouseMove}
       >
-        <Waveform />
+        <Waveform onClick={this.handleClick} />
         <Ticks timeline={this.props.timeline} />
         <Cursor timeline={this.props.timeline} />
+        <PlayCursor />
+        <PlayButton />
       </div>
     )
   }
 }
 
+const positionToTime = (y, { start_ts, zoom, duration }) => {
+  const secondsPerPixel = ZOOM_STEPS[zoom] * 0.1
+  const widthTimeDuration = window.innerHeight * secondsPerPixel
+
+  const timeMin = start_ts
+  const timeMax = Math.min(start_ts + widthTimeDuration, duration)
+  const timeWidth = timeMax - timeMin
+
+  return clamp(y * secondsPerPixel + start_ts, 0, timeMax)
+}
+
 const mapStateToProps = state => ({
   timeline: state.align.timeline,
 })
diff --git a/animism-align/frontend/views/align/components/waveform.component.js b/animism-align/frontend/views/align/components/waveform.component.js
index 4cd9963..e454623 100644
--- a/animism-align/frontend/views/align/components/waveform.component.js
+++ b/animism-align/frontend/views/align/components/waveform.component.js
@@ -83,7 +83,7 @@ class Waveform extends Component {
   }
   render() {
     return (
-      <canvas ref={this.canvasRef} />
+      <canvas ref={this.canvasRef} onClick={this.props.onClick} />
     )
   }
 }