diff options
| author | Tim E. Real <termtech@rogers.com> | 2013-01-17 08:29:55 +0000 |
|---|---|---|
| committer | Tim E. Real <termtech@rogers.com> | 2013-01-17 08:29:55 +0000 |
| commit | 44ec81027b75f7e59492ef41b3a38c15d0532877 (patch) | |
| tree | d66f6a2db37fe6fbaffab0dab137b853f1b3425d | |
| parent | 48a4361dc66411d0edb0f92826a1fb6b0e06c386 (diff) | |
Fixed song length way too big after recorded wave is added.
| -rw-r--r-- | muse2/ChangeLog | 3 | ||||
| -rw-r--r-- | muse2/muse/wave.cpp | 2 |
2 files changed, 4 insertions, 1 deletions
diff --git a/muse2/ChangeLog b/muse2/ChangeLog index 77506419..9b89ddc3 100644 --- a/muse2/ChangeLog +++ b/muse2/ChangeLog @@ -1,3 +1,6 @@ +17.01.2013: + - Fixed song length way too big after recorded wave is added. (Tim) + Was a simple regression in Song::cmdAddRecordedWave back when tempo recording was added. 15.01.2013: - Reinstate old Arranger "Paste to track" (Ctl+Shift+V) and "Paste clone to track" (Ctl+Shift+B). (Tim...) - Changed default shortcut of Arranger "Paste clone" to Ctl+B. diff --git a/muse2/muse/wave.cpp b/muse2/muse/wave.cpp index c2969f6d..8c647685 100644 --- a/muse2/muse/wave.cpp +++ b/muse2/muse/wave.cpp @@ -1085,7 +1085,7 @@ void Song::cmdAddRecordedWave(MusECore::WaveTrack* track, MusECore::Pos s, MusEC unsigned sframe = (a_rast == 1) ? s.frame() : Pos(AL::sigmap.raster1(s.tick(), MusEGlobal::song->arrangerRaster())).frame(); // Round the end up using the Arranger part snap raster value. unsigned eframe = (a_rast == 1) ? e.frame() : Pos(AL::sigmap.raster2(e.tick(), MusEGlobal::song->arrangerRaster())).frame(); - unsigned etick = Pos(eframe).tick(); + unsigned etick = Pos(eframe, false).tick(); // Done using master tempo map. Restore master flag. if(MusEGlobal::extSyncFlag.value() && !master_was_on) |