seth
/
jam-cloud
mirror of https://bitbucket.org/jamkazam/jam-cloud.git
1
0
Fork 0
Code Issues Actions Packages Projects Releases Wiki Activity

VRFS-1333 play tracking

This commit is contained in:
Jonathan Kolyer 2014-03-07 07:35:10 +00:00
parent eb98b97cd5
commit 38bde04ec7
3 changed files with 6 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
web/app/assets/javascripts/jam_rest.js
View File

@ -92,11 +92,11 @@
});
}
function addPlayablePlay(playableId, claimedRecordingId, userId) {
function addPlayablePlay(playableId, playableType, claimedRecordingId, userId) {
return $.ajax({
url: '/api/users/' + playableId + "/plays",
type: "POST",
data : JSON.stringify({user_id: userId, claimed_recording_id: claimedRecordingId}),
data : JSON.stringify({user_id: userId, claimed_recording_id: claimedRecordingId, playable_type: playableType}),
dataType : 'json',
contentType: 'application/json'
});

6
web/app/assets/javascripts/jquery.listenRecording.js
View File

@ -74,10 +74,8 @@
waitForLoaded().done(function() {
if(lastTime > -1) {audioDomElement.currentTime = lastTime;}
audioDomElement.play();
transition(PlayStateInitializing);
// keep this after transition, because any transition clears this timer
waitForBufferingTimeout = setTimeout(noBuffer, WAIT_FOR_BUFFER_TIMEOUT);
//context.JK.Rest().addPlayablePlay(null, null, context.JK.currentUserId);
isPlaying = true;
context.JK.Rest().addPlayablePlay(null, null, null, context.JK.currentUserId);
})
}

4
web/app/controllers/api_recordings_controller.rb
View File

@ -148,13 +148,13 @@ class ApiRecordingsController < ApiController
def add_play
if params[:id].blank?
render :json => { :message => "Recording ID is required" }, :status => 400
render :json => { :message => "Playable ID is required" }, :status => 400
return
end
play = PlayablePlay.new
play.playable_id = params[:id]
play.playable_type = 'JamRuby::Recording'
play.playable_type = params[:playable_type]
play.player_id = params[:user_id]
play.claimed_recording_id = params[:claimed_recording_id]
play.ip_address = request.remote_ip