[3.0P] dont dump chain(1) in session.cc

[ardour.git] / libs / ardour / beats_frames_converter.cc

diff --git a/libs/ardour/beats_frames_converter.cc b/libs/ardour/beats_frames_converter.cc
index d6f7ab8a9e75de454efcfa9dceabaa29bf9ccf22..f93e5e7224642b07d2681fdd78a6798cf6ac56c3 100644 (file)
--- a/libs/ardour/beats_frames_converter.cc
+++ b/libs/ardour/beats_frames_converter.cc
@@ -1,5 +1,5 @@
 /*
-    Copyright (C) 2009 Paul Davis 
+    Copyright (C) 2009 Paul Davis
     Author: Dave Robillard
 
     This program is free software; you can redistribute it and/or modify
@@ -19,10 +19,8 @@
     $Id: midiregion.h 733 2006-08-01 17:19:38Z drobilla $
 */
 
-#include <ardour/audioengine.h>
-#include <ardour/beats_frames_converter.h>
-#include <ardour/session.h>
-#include <ardour/tempo.h>
+#include "ardour/beats_frames_converter.h"
+#include "ardour/tempo.h"
 
 namespace ARDOUR {
 
@@ -30,10 +28,10 @@ sframes_t
 BeatsFramesConverter::to(double beats) const
 {
        // FIXME: assumes tempo never changes after origin
-       const Tempo& tempo = _session.tempo_map().tempo_at(_origin);
+       const Tempo& tempo = _tempo_map.tempo_at(_origin);
        const double frames_per_beat = tempo.frames_per_beat(
-                       _session.engine().frame_rate(),
-                       _session.tempo_map().meter_at(_origin));
+                       _tempo_map.frame_rate(),
+                       _tempo_map.meter_at(_origin));
 
        return lrint(beats * frames_per_beat);
 }
@@ -42,10 +40,10 @@ double
 BeatsFramesConverter::from(sframes_t frames) const
 {
        // FIXME: assumes tempo never changes after origin
-       const Tempo& tempo = _session.tempo_map().tempo_at(_origin);
+       const Tempo& tempo = _tempo_map.tempo_at(_origin);
        const double frames_per_beat = tempo.frames_per_beat(
-                       _session.engine().frame_rate(),
-                       _session.tempo_map().meter_at(_origin));
+                       _tempo_map.frame_rate(),
+                       _tempo_map.meter_at(_origin));
 
        return frames / frames_per_beat;
 }