From f3b6acf00acb8f8b69a44c66577f4684cd6c5da8 Mon Sep 17 00:00:00 2001 From: Marcin Kulik Date: Mon, 9 Jul 2012 19:54:32 +0200 Subject: [PATCH] Move benchmarking code to player view --- app/assets/javascripts/player/movie.js.coffee | 6 ------ app/assets/javascripts/player/player_view.js.coffee | 8 ++++++++ 2 files changed, 8 insertions(+), 6 deletions(-) diff --git a/app/assets/javascripts/player/movie.js.coffee b/app/assets/javascripts/player/movie.js.coffee index 7d9dc03..d55df2a 100644 --- a/app/assets/javascripts/player/movie.js.coffee +++ b/app/assets/javascripts/player/movie.js.coffee @@ -36,9 +36,6 @@ class AsciiIo.Movie @start() start: -> - if @options.benchmark - @startedAt = @now() - @playing = true @trigger 'started' @lastFrameAt = @now() @@ -193,9 +190,6 @@ class AsciiIo.Movie @playing = false @trigger 'finished' - if @options.benchmark - console.log "finished in #{(@now() - @startedAt) / 1000.0}s" - false processFrameWithDelay: (delay) -> diff --git a/app/assets/javascripts/player/player_view.js.coffee b/app/assets/javascripts/player/player_view.js.coffee index 31de403..cda8d2b 100644 --- a/app/assets/javascripts/player/player_view.js.coffee +++ b/app/assets/javascripts/player/player_view.js.coffee @@ -97,6 +97,14 @@ class AsciiIo.PlayerView extends Backbone.View @hudView.on 'play-click', => @movie.togglePlay() @hudView.on 'seek-click', (percent) => @movie.seek(percent) + if @options.benchmark + @movie.on 'started', => + @startedAt = (new Date).getTime() + + @movie.on 'finished', => + now = (new Date).getTime() + console.log "finished in #{(now - @startedAt) / 1000.0}s" + onStartPromptClick: -> @hideToggleOverlay() @movie.togglePlay()