フレーズの最後の休符が無視されていたのを修正

diff --git a/include/ir/event.hpp b/include/ir/event.hpp
index 1104f30..c7d66fa 100644 (file)
--- a/include/ir/event.hpp
+++ b/include/ir/event.hpp
@@ -15,6 +15,8 @@ namespace IR
 
 class Rest final
 {
+public:
+    int Duration;
 };
 
 class PolyphonicAftertouch final

diff --git a/include/ir2midi/context.hpp b/include/ir2midi/context.hpp
index dc414a3..e122e0e 100644 (file)
--- a/include/ir2midi/context.hpp
+++ b/include/ir2midi/context.hpp
@@ -25,6 +25,7 @@ public:
     void EnterBlock();
     void SaveTime();
     void RestoreTime();
+    void UpdateTime(int relativeTime);
     void PushEvent(int relativeTime, const MIDI::MIDIEvent::EventType& ev);
     void SortEvents();
     const std::vector<AbsoluteMIDIEvent>& GetEvents() const;

diff --git a/src/ast2ir/phrase2ir.cpp b/src/ast2ir/phrase2ir.cpp
index cbed111..e6cf511 100644 (file)
--- a/src/ast2ir/phrase2ir.cpp
+++ b/src/ast2ir/phrase2ir.cpp
@@ -220,9 +220,7 @@ std::vector<IR::Block::EventType> Phrase2IRCompiler::operator()(const AST::NoteR
 std::vector<IR::Block::EventType> Phrase2IRCompiler::operator()(const AST::Rest& ast, int duration)
 {
     static_cast<void>(ast);
-    static_cast<void>(duration);
-
-    return {IR::Event{m_RelativeTime, IR::Rest{}}};
+    return {IR::Event{m_RelativeTime, IR::Rest{duration}}};
 }
 
 std::vector<IR::Block::EventType> Phrase2IRCompiler::operator()(const AST::NoteNumber& ast, int duration)

diff --git a/src/ir2midi/context.cpp b/src/ir2midi/context.cpp
index 8734a22..7362803 100644 (file)
--- a/src/ir2midi/context.cpp
+++ b/src/ir2midi/context.cpp
@@ -24,9 +24,14 @@ void TrackCompilerContext::RestoreTime()
     m_LastEventTime = m_PrevLastEventTime;
 }
 
-void TrackCompilerContext::PushEvent(int relativeTime, const MIDI::MIDIEvent::EventType& ev)
+void TrackCompilerContext::UpdateTime(int relativeTime)
 {
     m_LastEventTime = m_BaseTimeForCurrentBlock + relativeTime;
+}
+
+void TrackCompilerContext::PushEvent(int relativeTime, const MIDI::MIDIEvent::EventType& ev)
+{
+    UpdateTime(relativeTime);
     m_Events.push_back(AbsoluteMIDIEvent{m_LastEventTime, ev});
 }
 

diff --git a/src/ir2midi/ir2midi.cpp b/src/ir2midi/ir2midi.cpp
index 7d6d861..debc350 100644 (file)
--- a/src/ir2midi/ir2midi.cpp
+++ b/src/ir2midi/ir2midi.cpp
@@ -31,8 +31,9 @@ public:
         m_Context.PushEvent(m_RelativeTime + ev.Duration, MIDI::NoteOff{m_Channel, ev.Number, ev.OffVelocity});
     }
 
-    void operator()(const IR::Rest&)
+    void operator()(const IR::Rest& ev)
     {
+        m_Context.UpdateTime(m_RelativeTime + ev.Duration);
     }
 
     void operator()(const IR::PolyphonicAftertouch& ev)