X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=libs%2Fardour%2Fsession_time.cc;h=eef05e879a0f41cbb2534f8b022dca74639d5658;hb=bc3e1a212250a67e53e86c972287a275834a967a;hp=38eb0b4b28859005a5f42f9a440e136169db7a1d;hpb=e0b694f630e31039e082c1ce640dfaf85bfede3c;p=ardour.git

diff --git a/libs/ardour/session_time.cc b/libs/ardour/session_time.cc
index 38eb0b4b28..eef05e879a 100644
--- a/libs/ardour/session_time.cc
+++ b/libs/ardour/session_time.cc
@@ -496,13 +496,13 @@ Session::jack_timebase_callback (jack_transport_state_t /*state*/,
 			
 			pos->beats_per_bar = metric.meter().divisions_per_bar();
 			pos->beat_type = metric.meter().note_divisor();
-			pos->ticks_per_beat = Timecode::BBT_Time::ticks_per_bar_division;
+			pos->ticks_per_beat = Timecode::BBT_Time::ticks_per_beat;
 			pos->beats_per_minute = metric.tempo().beats_per_minute();
 			
 			pos->valid = jack_position_bits_t (pos->valid | JackPositionBBT);
 
 		} catch (...) {
-			warning << _("failed to set tempo map information for JACK due to issues with tempo map") << endmsg;
+			/* no message */
 		}
 	}
 
@@ -559,7 +559,7 @@ Session::convert_to_frames (AnyTime const & position)
 
 	switch (position.type) {
 	case AnyTime::BBT:
-		return _tempo_map->frame_time_rt (position.bbt);
+		return _tempo_map->frame_time (position.bbt);
 		break;
 
 	case AnyTime::Timecode: