|
@@ -87,22 +87,24 @@ audio.onended = () => store.dispatch (actionNextTrack())
|
|
|
|
|
|
|
|
|
|
|
|
+
|
|
|
+const trackActions = (urlVar) => {
|
|
|
+ audio.src = backURL + '/'+ urlVar.url
|
|
|
+ audio.load()
|
|
|
+ audio.ondurationchange = function(){actionSetDuration()}
|
|
|
+ audio.ontimeupdate = function(){actionTrackCurrentTime()}
|
|
|
+}
|
|
|
+
|
|
|
+
|
|
|
export const actionTrackLoad = (trackIndex) =>
|
|
|
({type:'ACTION_TRACK_LOAD', trackIndex})
|
|
|
|
|
|
export function* trackLoadWorker (action) {
|
|
|
let {trackIndex} = action
|
|
|
let {player:{playlist}} = yield select ()
|
|
|
- // if (playlistIndex !== trackIndex) {
|
|
|
- audio.src = backURL + '/'+ playlist[trackIndex].url
|
|
|
- audio.load()
|
|
|
- console.log(trackIndex)
|
|
|
- audio.ondurationchange = function(){actionSetDuration()}
|
|
|
- audio.ontimeupdate = function(){actionTrackCurrentTime()}
|
|
|
-
|
|
|
+ trackActions(playlist[trackIndex])
|
|
|
yield put({type:"TRACK_LOAD",playlistIndex:trackIndex})
|
|
|
yield put (actionTrackPlay())
|
|
|
-
|
|
|
}
|
|
|
export function* trackLoadWatcher() {
|
|
|
yield takeEvery ('ACTION_TRACK_LOAD',trackLoadWorker)
|
|
@@ -118,7 +120,6 @@ export const actionTrackPlay = () =>
|
|
|
export function* trackPlayWorker () {
|
|
|
yield audio.play()
|
|
|
yield put({type:"TRACK_PLAY",isPlaying:true,isPaused:false})
|
|
|
- console.log('play')
|
|
|
}
|
|
|
export function* trackPlayWatcher() {
|
|
|
yield takeEvery ('ACTION_TRACK_PLAY',trackPlayWorker)
|
|
@@ -135,18 +136,12 @@ export function* nextTrackWorker () {
|
|
|
let playlist = player.playlist
|
|
|
if (playlist.length === playlistIndex + 1) {
|
|
|
yield put({type:"NEXT_TRACK",playlistIndex:0})
|
|
|
- audio.src = backURL + '/'+ player.playlist[0].url
|
|
|
- audio.load()
|
|
|
- audio.ondurationchange = function(){actionSetDuration()}
|
|
|
- audio.ontimeupdate = function(){actionTrackCurrentTime()}
|
|
|
- audio.play()
|
|
|
+ trackActions(player.playlist[0])
|
|
|
+ yield put (actionTrackPlay())
|
|
|
} else {
|
|
|
yield put({type:"NEXT_TRACK",playlistIndex:playlistIndex+1})
|
|
|
- audio.src = backURL + '/'+ player.playlist[playlistIndex+1].url
|
|
|
- audio.load()
|
|
|
- audio.ondurationchange = function(){actionSetDuration()}
|
|
|
- audio.ontimeupdate = function(){actionTrackCurrentTime()}
|
|
|
- audio.play()
|
|
|
+ trackActions(player.playlist[playlistIndex+1])
|
|
|
+ yield put (actionTrackPlay())
|
|
|
}
|
|
|
console.log(playlistIndex)
|
|
|
}
|
|
@@ -165,18 +160,12 @@ export function* previousTrackWorker () {
|
|
|
let p = player.playlistIndex
|
|
|
if (p < 1) {
|
|
|
yield put({type:"NEXT_TRACK",playlistIndex:0})
|
|
|
- audio.src = backURL + '/'+ player.playlist[0].url
|
|
|
- audio.load()
|
|
|
- audio.ondurationchange = function(){actionSetDuration()}
|
|
|
- audio.ontimeupdate = function(){actionTrackCurrentTime()}
|
|
|
- audio.play()
|
|
|
+ trackActions(player.playlist[0])
|
|
|
+ yield put (actionTrackPlay())
|
|
|
} else {
|
|
|
yield put({type:"PREVIOUS_TRACK",playlistIndex:p-1})
|
|
|
- audio.src = backURL + '/'+ player.playlist[p-1].url
|
|
|
- audio.load()
|
|
|
- audio.ondurationchange = function(){actionSetDuration()}
|
|
|
- audio.ontimeupdate = function(){actionTrackCurrentTime()}
|
|
|
- audio.play()
|
|
|
+ trackActions(player.playlist[p-1])
|
|
|
+ yield put (actionTrackPlay())
|
|
|
}
|
|
|
|
|
|
|
|
@@ -187,9 +176,6 @@ export function* previousTrackWatcher() {
|
|
|
|
|
|
|
|
|
|
|
|
-
|
|
|
-
|
|
|
-
|
|
|
export const actionTrackStop = () =>
|
|
|
({type: 'ACTION_TRACK_STOP'})
|
|
|
|