Initialization fix in SongConverter as indicated by valgrind

include/amuse/SongState.hpp

@@ -45,7 +45,7 @@ class SongState
         uint16_t m_unk2;
         int16_t m_regionIndex;
         int16_t m_unk3;
-        bool indexValid() const;
+        bool indexValid(bool bigEndian) const;
     };
 
     /** Tempo change entry */

lib/AudioGroupData.cpp

@@ -7,10 +7,10 @@ IntrusiveAudioGroupData::~IntrusiveAudioGroupData()
 {
     if (m_owns)
     {
-        delete m_pool;
+        delete[] m_pool;
-        delete m_proj;
+        delete[] m_proj;
-        delete m_sdir;
+        delete[] m_sdir;
-        delete m_samp;
+        delete[] m_samp;
     }
 }
 
@@ -27,10 +27,10 @@ IntrusiveAudioGroupData& IntrusiveAudioGroupData::operator=(IntrusiveAudioGroupD
 {
     if (m_owns)
     {
-        delete m_pool;
+        delete[] m_pool;
-        delete m_proj;
+        delete[] m_proj;
-        delete m_sdir;
+        delete[] m_sdir;
-        delete m_samp;
+        delete[] m_samp;
     }
 
     m_owns = other.m_owns;

lib/SongConverter.cpp

@@ -42,8 +42,9 @@ struct PitchEvent {};
 struct Event
 {
     bool endEvent = false;
-    bool controlChange = false;
+    bool isNote = false;
-    bool progChange = false;
+    bool isControlChange = false;
+    bool isProgChange = false;
     uint8_t channel;
     uint8_t noteOrCtrl;
     uint8_t velOrVal;
@@ -54,15 +55,16 @@ struct Event
     int pitchBend;
 
     Event(NoteEvent, uint8_t chan, uint8_t note, uint8_t vel, uint16_t len)
-    : controlChange(false), channel(chan), noteOrCtrl(note), velOrVal(vel), length(len) {}
+    : isNote(true), channel(chan), noteOrCtrl(note), velOrVal(vel), length(len) {}
 
     Event(CtrlEvent, uint8_t chan, uint8_t note, uint8_t vel, uint16_t len)
-    : controlChange(true), channel(chan), noteOrCtrl(note), velOrVal(vel), length(len) {}
+    : isControlChange(true), channel(chan), noteOrCtrl(note), velOrVal(vel), length(len) {}
 
     Event(ProgEvent, uint8_t chan, uint8_t prog)
-    : progChange(true), channel(chan), program(prog) {}
+    : isProgChange(true), channel(chan), program(prog) {}
 
-    Event(PitchEvent, uint8_t chan, int pBend) : isPitchBend(true), channel(chan), pitchBend(pBend) {}
+    Event(PitchEvent, uint8_t chan, int pBend)
+    : isPitchBend(true), channel(chan), pitchBend(pBend) {}
 };
 
 class MIDIDecoder
@@ -711,7 +713,7 @@ std::vector<uint8_t> SongConverter::SongToMIDI(const unsigned char* data, Target
             std::multimap<int, Event> allEvents;
 
             /* Iterate all regions */
-            while (trk->m_nextRegion->indexValid())
+            while (trk->m_nextRegion->indexValid(song.m_bigEndian))
             {
                 std::multimap<int, Event> events;
                 trk->advanceRegion(nullptr);
@@ -814,27 +816,12 @@ std::vector<uint8_t> SongConverter::SongToMIDI(const unsigned char* data, Target
                     while (true)
                     {
                         /* Load next command */
-                        if (*reinterpret_cast<const uint32_t*>(trk->m_data) == 0xffff0000)
+                        if (*reinterpret_cast<const uint16_t*>(&trk->m_data[2]) == 0xffff)
                         {
                             /* End of channel */
                             trk->m_data = nullptr;
                             break;
                         }
-                        else if (trk->m_data[0] & 0x80 && trk->m_data[1] & 0x80)
-                        {
-                            /* Control change */
-                            uint8_t val = trk->m_data[0] & 0x7f;
-                            uint8_t ctrl = trk->m_data[1] & 0x7f;
-                            events.emplace(regStart + trk->m_eventWaitCountdown, Event{CtrlEvent{}, trk->m_midiChan, ctrl, val, 0});
-                            trk->m_data += 2;
-                        }
-                        else if (trk->m_data[0] & 0x80)
-                        {
-                            /* Program change */
-                            uint8_t prog = trk->m_data[0] & 0x7f;
-                            events.emplace(regStart + trk->m_eventWaitCountdown, Event{ProgEvent{}, trk->m_midiChan, prog});
-                            trk->m_data += 2;
-                        }
                         else
                         {
                             if ((trk->m_data[2] & 0x80) != 0x80)
@@ -877,7 +864,7 @@ std::vector<uint8_t> SongConverter::SongToMIDI(const unsigned char* data, Target
                 /* Resolve key-off events */
                 for (auto& pair : events)
                 {
-                    if (!pair.second.controlChange)
+                    if (pair.second.isNote)
                     {
                         auto it = allEvents.emplace(pair.first + pair.second.length, pair.second);
                         it->second.endEvent = true;
@@ -892,11 +879,11 @@ std::vector<uint8_t> SongConverter::SongToMIDI(const unsigned char* data, Target
                 encoder._sendContinuedValue(pair.first - lastTime);
                 lastTime = pair.first;
 
-                if (pair.second.controlChange)
+                if (pair.second.isControlChange)
                 {
                     encoder.controlChange(pair.second.channel, pair.second.noteOrCtrl, pair.second.velOrVal);
                 }
-                else if (pair.second.progChange)
+                else if (pair.second.isProgChange)
                 {
                     encoder.programChange(trk->m_midiChan, pair.second.program);
                 }
@@ -904,7 +891,7 @@ std::vector<uint8_t> SongConverter::SongToMIDI(const unsigned char* data, Target
                 {
                     encoder.pitchBend(trk->m_midiChan, pair.second.pitchBend);
                 }
-                else
+                else if (pair.second.isNote)
                 {
                     if (pair.second.endEvent)
                         encoder.noteOff(pair.second.channel, pair.second.noteOrCtrl, pair.second.velOrVal);
@@ -1092,7 +1079,7 @@ std::vector<uint8_t> SongConverter::MIDIToSong(const std::vector<uint8_t>& data,
                             lastModVal = 0;
                         }
 
-                        if (event.second.controlChange)
+                        if (event.second.isControlChange)
                         {
                             if (event.second.noteOrCtrl == 1)
                             {
@@ -1129,7 +1116,7 @@ std::vector<uint8_t> SongConverter::MIDIToSong(const std::vector<uint8_t>& data,
                                 }
                             }
                         }
-                        else if (event.second.progChange)
+                        else if (event.second.isProgChange)
                         {
                             if (target == Target::GCN)
                             {
@@ -1163,7 +1150,7 @@ std::vector<uint8_t> SongConverter::MIDIToSong(const std::vector<uint8_t>& data,
                             EncodeContinuousRLE(region.pitchBuf, newPitch - lastPitchVal);
                             lastPitchVal = newPitch;
                         }
-                        else
+                        else if (event.second.isNote)
                         {
                             if (target == Target::GCN)
                             {

lib/SongState.cpp

@@ -76,9 +76,9 @@ void SongState::Header::swapBig()
     m_unkOff = SBig(m_unkOff);
 }
 
-bool SongState::TrackRegion::indexValid() const
+bool SongState::TrackRegion::indexValid(bool bigEndian) const
 {
-    return SBig(m_regionIndex) >= 0;
+    return (bigEndian ? SBig(m_regionIndex) : m_regionIndex) >= 0;
 }
 
 void SongState::TempoChange::swapBig()
@@ -187,7 +187,7 @@ bool SongState::Track::advance(Sequencer& seq, int32_t ticks)
     int32_t endTick = m_parent.m_curTick + ticks;
 
     /* Advance region if needed */
-    while (m_nextRegion->indexValid())
+    while (m_nextRegion->indexValid(m_parent.m_bigEndian))
     {
         uint32_t nextRegTick = (m_parent.m_bigEndian ? SBig(m_nextRegion->m_startTick) :
                                                             m_nextRegion->m_startTick);
@@ -212,7 +212,7 @@ bool SongState::Track::advance(Sequencer& seq, int32_t ticks)
     }
 
     if (!m_data)
-        return !m_nextRegion->indexValid();
+        return !m_nextRegion->indexValid(m_parent.m_bigEndian);
 
     /* Update continuous pitch data */
     if (m_pitchWheelData)
@@ -300,7 +300,7 @@ bool SongState::Track::advance(Sequencer& seq, int32_t ticks)
             {
                 /* End of channel */
                 m_data = nullptr;
-                return !m_nextRegion->indexValid();
+                return !m_nextRegion->indexValid(m_parent.m_bigEndian);
             }
             else if (m_data[0] & 0x80 && m_data[1] & 0x80)
             {
@@ -348,26 +348,11 @@ bool SongState::Track::advance(Sequencer& seq, int32_t ticks)
             }
 
             /* Load next command */
-            if (*reinterpret_cast<const uint32_t*>(m_data) == 0xffff0000)
+            if (*reinterpret_cast<const uint16_t*>(&m_data[2]) == 0xffff)
             {
                 /* End of channel */
                 m_data = nullptr;
-                return !m_nextRegion->indexValid();
+                return !m_nextRegion->indexValid(m_parent.m_bigEndian);
-            }
-            else if (m_data[0] & 0x80 && m_data[1] & 0x80)
-            {
-                /* Control change */
-                uint8_t val = m_data[0] & 0x7f;
-                uint8_t ctrl = m_data[1] & 0x7f;
-                seq.setCtrlValue(m_midiChan, ctrl, val);
-                m_data += 2;
-            }
-            else if (m_data[0] & 0x80)
-            {
-                /* Program change */
-                uint8_t prog = m_data[0] & 0x7f;
-                seq.setChanProgram(m_midiChan, prog);
-                m_data += 2;
             }
             else
             {