From 3ef4619872cdc8dce79919f45eda74e96b246fb7 Mon Sep 17 00:00:00 2001 From: Seth Call Date: Mon, 16 Jun 2014 15:58:44 -0500 Subject: [PATCH] * cleaning up minor things --- ruby/lib/jam_ruby/models/active_music_session.rb | 2 +- web/app/controllers/api_music_sessions_controller.rb | 2 -- 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/ruby/lib/jam_ruby/models/active_music_session.rb b/ruby/lib/jam_ruby/models/active_music_session.rb index cc97f572c..e37facf03 100644 --- a/ruby/lib/jam_ruby/models/active_music_session.rb +++ b/ruby/lib/jam_ruby/models/active_music_session.rb @@ -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. # ams_init must be called first. # 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') .joins( %Q{ diff --git a/web/app/controllers/api_music_sessions_controller.rb b/web/app/controllers/api_music_sessions_controller.rb index f633c3c7b..73ab417f4 100644 --- a/web/app/controllers/api_music_sessions_controller.rb +++ b/web/app/controllers/api_music_sessions_controller.rb @@ -89,8 +89,6 @@ class ApiMusicSessionsController < ApiController music_session_users.each do |user| @user_scores[user.id] = {latency: user.latency} end - - render "api_music_sessions/ams_index" end end