(1) silence non-process FIFO message (2) move MIDI state tracking down to the MidiPor...

[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 736068e69059e135d0a6fe73afaa8f8c1b38a14a..da0f6e4c18f455df95f372a848565b646fb41b7f 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,14 +19,14 @@
     $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/audioengine.h"
+#include "ardour/beats_frames_converter.h"
+#include "ardour/session.h"
+#include "ardour/tempo.h"
 
 namespace ARDOUR {
 
-nframes_t
+sframes_t
 BeatsFramesConverter::to(double beats) const
 {
        // FIXME: assumes tempo never changes after origin
@@ -39,7 +39,7 @@ BeatsFramesConverter::to(double beats) const
 }
 
 double
-BeatsFramesConverter::from(nframes_t frames) const
+BeatsFramesConverter::from(sframes_t frames) const
 {
        // FIXME: assumes tempo never changes after origin
        const Tempo& tempo = _session.tempo_map().tempo_at(_origin);