revert inadvertently committed debug settings

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

diff --git a/libs/ardour/midi_region.cc b/libs/ardour/midi_region.cc
index 6dd7fc61ae3cdb7cfa629ed7e22f1ca01bf31b85..4c678c04e0d818f961a451c760857a6ab03d36a4 100644 (file)
--- a/libs/ardour/midi_region.cc
+++ b/libs/ardour/midi_region.cc
@@ -44,7 +44,7 @@
 #include "ardour/tempo.h"
 #include "ardour/types.h"
 
-#include "i18n.h"
+#include "pbd/i18n.h"
 #include <locale.h>
 
 using namespace std;
@@ -102,7 +102,7 @@ MidiRegion::MidiRegion (boost::shared_ptr<const MidiRegion> other)
 }
 
 /** Create a new MidiRegion that is part of an existing one */
-MidiRegion::MidiRegion (boost::shared_ptr<const MidiRegion> other, frameoffset_t offset, const int32_t& sub_num)
+MidiRegion::MidiRegion (boost::shared_ptr<const MidiRegion> other, frameoffset_t offset, const int32_t sub_num)
        : Region (other, offset, sub_num)
        , _start_beats (Properties::start_beats, Evoral::Beats())
        , _length_beats (Properties::length_beats, other->_length_beats)
@@ -188,7 +188,7 @@ MidiRegion::set_start_beats_from_start_frames ()
 }
 
 void
-MidiRegion::set_length_internal (framecnt_t len, const int32_t& sub_num)
+MidiRegion::set_length_internal (framecnt_t len, const int32_t sub_num)
 {
        Region::set_length_internal (len, sub_num);
        update_length_beats (sub_num);
@@ -227,13 +227,13 @@ MidiRegion::update_after_tempo_map_change (bool /* send */)
 }
 
 void
-MidiRegion::update_length_beats (const int32_t& sub_num)
+MidiRegion::update_length_beats (const int32_t sub_num)
 {
        _length_beats = Evoral::Beats (_session.tempo_map().exact_beat_at_frame (_position + _length, sub_num) - beat());
 }
 
 void
-MidiRegion::set_position_internal (framepos_t pos, bool allow_bbt_recompute, const int32_t& sub_num)
+MidiRegion::set_position_internal (framepos_t pos, bool allow_bbt_recompute, const int32_t sub_num)
 {
        Region::set_position_internal (pos, allow_bbt_recompute, sub_num);
 
@@ -486,7 +486,7 @@ MidiRegion::fix_negative_start ()
 }
 
 void
-MidiRegion::set_start_internal (framecnt_t s, const int32_t& sub_num)
+MidiRegion::set_start_internal (framecnt_t s, const int32_t sub_num)
 {
        Region::set_start_internal (s, sub_num);
 
@@ -496,7 +496,7 @@ MidiRegion::set_start_internal (framecnt_t s, const int32_t& sub_num)
 }
 
 void
-MidiRegion::trim_to_internal (framepos_t position, framecnt_t length, const int32_t& sub_num)
+MidiRegion::trim_to_internal (framepos_t position, framecnt_t length, const int32_t sub_num)
 {
        framepos_t new_start;
 
@@ -506,8 +506,12 @@ MidiRegion::trim_to_internal (framepos_t position, framecnt_t length, const int3
 
        PropertyChange what_changed;
 
-       /* beat has not been set by set_position_internal */
-       const double beat_delta = _session.tempo_map().exact_beat_at_frame (position, sub_num) - beat();
+       /* beat has been set exactly by set_position_internal, but the source starts on a frame.
+          working in beats seems the correct thing to do, but reports of a missing first note
+          on playback suggest otherwise. for now, we work in exact beats.
+       */
+       const double pos_beat = _session.tempo_map().exact_beat_at_frame (position, sub_num);
+       const double beat_delta = pos_beat - beat();
 
        /* Set position before length, otherwise for MIDI regions this bad thing happens:
         * 1. we call set_length_internal; length in beats is computed using the region's current
@@ -522,10 +526,8 @@ MidiRegion::trim_to_internal (framepos_t position, framecnt_t length, const int3
                what_changed.add (Properties::position);
        }
 
-       const double new_beat = _session.tempo_map().exact_beat_at_frame (position, sub_num);
        const double new_start_beat = _start_beats.val().to_double() + beat_delta;
-
-       new_start = _position - _session.tempo_map().frame_at_beat (new_beat - new_start_beat);
+       new_start = _position - _session.tempo_map().frame_at_beat (beat() - new_start_beat);
 
        if (!verify_start_and_length (new_start, length)) {
                return;