各トラックリストブロックで開始時刻をそろえるようにした

diff --git a/include/ir2midi/context.hpp b/include/ir2midi/context.hpp
index e122e0e..b808938 100644 (file)
--- a/include/ir2midi/context.hpp
+++ b/include/ir2midi/context.hpp
@@ -23,8 +23,8 @@ class TrackCompilerContext final
 {
 public:
     void EnterBlock();
-    void SaveTime();
-    void RestoreTime();
+    int GetLastTime();
+    void SetTime(int t);
     void UpdateTime(int relativeTime);
     void PushEvent(int relativeTime, const MIDI::MIDIEvent::EventType& ev);
     void SortEvents();
@@ -34,7 +34,6 @@ private:
     std::vector<AbsoluteMIDIEvent> m_Events;
     int m_BaseTimeForCurrentBlock = 0;
     int m_LastEventTime = 0;
-    int m_PrevLastEventTime = 0;
 };
 
 class IIR2MIDICompiler

diff --git a/src/ir2midi/context.cpp b/src/ir2midi/context.cpp
index 7362803..4a8e5d4 100644 (file)
--- a/src/ir2midi/context.cpp
+++ b/src/ir2midi/context.cpp
@@ -14,14 +14,15 @@ void TrackCompilerContext::EnterBlock()
     m_BaseTimeForCurrentBlock = m_LastEventTime;
 }
 
-void TrackCompilerContext::SaveTime()
+int TrackCompilerContext::GetLastTime()
 {
-    m_PrevLastEventTime = m_LastEventTime;
+    return m_LastEventTime;
 }
 
-void TrackCompilerContext::RestoreTime()
+void TrackCompilerContext::SetTime(int t)
 {
-    m_LastEventTime = m_PrevLastEventTime;
+    m_LastEventTime = t;
+    m_BaseTimeForCurrentBlock = t;
 }
 
 void TrackCompilerContext::UpdateTime(int relativeTime)

diff --git a/src/ir2midi/ir2midi.cpp b/src/ir2midi/ir2midi.cpp
index debc350..8279f4c 100644 (file)
--- a/src/ir2midi/ir2midi.cpp
+++ b/src/ir2midi/ir2midi.cpp
@@ -1,5 +1,7 @@
 
+#include <algorithm>
 #include <exception>
+#include <vector>
 
 #include <boost/variant.hpp>
 
@@ -124,17 +126,19 @@ void IR2MIDICompiler::operator()(const IR::TrackList& ir)
 {
     CheckForUnprocessedAttributes(ir.Attributes);
 
+    int lastTime = 0;
+
     for (auto&& i : ir.Tracks)
     {
         CheckForUnprocessedAttributes(i.Attributes);
         EnsureTrackInitialized(i.Number);
 
-        GetTrackContext(i.Number).SaveTime();
+        lastTime = std::max(GetTrackContext(i.Number).GetLastTime(), lastTime);
     }
 
     for (auto&& i : ir.Tracks)
     {
-        GetTrackContext(i.Number).RestoreTime();
+        GetTrackContext(i.Number).SetTime(lastTime);
 
         for (auto&& j : i.Items)
         {