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

* cleaning up minor things

This commit is contained in:
Seth Call 2014-06-16 15:58:44 -05:00
parent 8d16bdacfa
commit 3ef4619872
2 changed files with 1 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ruby/lib/jam_ruby/models/active_music_session.rb
View File

@ -408,7 +408,7 @@ module JamRuby
# returns the set of users in a music_sessions and the music_session they are in and their latency. # returns the set of users in a music_sessions and the music_session they are in and their latency.
# ams_init must be called first. # ams_init must be called first.
# user.audio_latency / 2 , + other_user.audio_latency of them / 2, + network latency /2 # user.audio_latency / 2 , + other_user.audio_latency of them / 2, + network latency /2
def self.ams_users() def self.ams_users
return User.select('users.*, ams_users_tmp.music_session_id, ams_users_tmp.latency') return User.select('users.*, ams_users_tmp.music_session_id, ams_users_tmp.latency')
.joins( .joins(
%Q{ %Q{

2
web/app/controllers/api_music_sessions_controller.rb
View File

@ -89,8 +89,6 @@ class ApiMusicSessionsController < ApiController
music_session_users.each do |user| music_session_users.each do |user|
@user_scores[user.id] = {latency: user.latency} @user_scores[user.id] = {latency: user.latency}
end end
render "api_music_sessions/ams_index"
end end
end end