Remove allegro.h from other headers

lib-src/header-substitutes/allegro.h

@@ -10,6 +10,11 @@
 #include "../portsmf/allegro.h"
 #pragma warning( pop )
 
+#elif defined(__linux__)
+
+#include <cstring> // Allegro include fails if this header isn't included due to no memcpy
+#include "../portsmf/allegro.h"
+
 #else //_MSC_VER
 
 #include "../portsmf/allegro.h"

src/AudioIO.cpp

@@ -474,6 +474,9 @@ time warp info and AudioIOListener and whether the playback is looped.
 #include "widgets/Warning.h"
 
 #ifdef EXPERIMENTAL_MIDI_OUT
+
+#include "../lib-src/header-substitutes/allegro.h"
+
    #define MIDI_SLEEP 10 /* milliseconds */
    // how long do we think the thread that fills MIDI buffers,
    // if it is separate from the portaudio thread,

src/AudioIO.h

@@ -30,8 +30,10 @@
 #ifdef EXPERIMENTAL_MIDI_OUT
 #include "../lib-src/portmidi/pm_common/portmidi.h"
 #include "../lib-src/portmidi/porttime/porttime.h"
-#include <cstring> // Allegro include fails if this header isn't included do to no memcpy
-#include "../lib-src/header-substitutes/allegro.h"
+
+class Alg_seq;
+class Alg_event;
+class Alg_iterator;
 
 class NoteTrack;
 using NoteTrackArray = std::vector < std::shared_ptr< NoteTrack > >;
@@ -377,10 +379,10 @@ public:
    /// to avoid problems of atomicity of updates
    volatile double mSystemMinusAudioTimePlusLatency;
 
-   Alg_seq_ptr      mSeq;
+   Alg_seq      *mSeq;
    std::unique_ptr<Alg_iterator> mIterator;
    /// The next event to play (or null)
-   Alg_event_ptr    mNextEvent;
+   Alg_event    *mNextEvent;
 
 #ifdef AUDIO_IO_GB_MIDI_WORKAROUND
    std::vector< std::pair< int, int > > mPendingNotesOff;

src/NoteTrack.cpp

@@ -26,6 +26,8 @@
 #include <wx/intl.h>
 
 #if defined(USE_MIDI)
+#include "../lib-src/header-substitutes/allegro.h"
+
 #include <sstream>
 
 #define ROUND(x) ((int) ((x) + 0.5))

src/NoteTrack.h

@@ -20,8 +20,6 @@
 
 #if defined(USE_MIDI)
 
-#include "../lib-src/header-substitutes/allegro.h"
-
 // define this switch to play MIDI during redisplay to sonify run times
 // Note that if SONIFY is defined, the default MIDI device will be opened
 // and may block normal MIDI playback.

src/effects/ScoreAlignDialog.cpp

@@ -47,7 +47,7 @@ It \TODO: description
 #include <wx/dialog.h>
 #include "../Prefs.h"
 #include "../ShuttleGui.h"
-#include "allegro.h"
+#include "../lib-src/header-substitutes/allegro.h"
 #include "audioreader.h"
 #include "scorealign.h"
 #include "scorealign-glue.h"

src/import/ImportMIDI.cpp

@@ -18,7 +18,9 @@
 
 #if defined(USE_MIDI)
 
-//#include "allegro.h"
+
+#include "../lib-src/header-substitutes/allegro.h"
+
 //#include "strparse.h"
 //#include "mfmidi.h"
 

src/tracks/playabletrack/notetrack/ui/NoteTrackView.cpp

@@ -12,6 +12,8 @@ Paul Licameli split from TrackPanel.cpp
 #include "NoteTrackView.h"
 
 #ifdef USE_MIDI
+#include "../lib-src/header-substitutes/allegro.h"
+
 #include "../../../../Experimental.h"
 
 #include "NoteTrackVRulerControls.h"

src/tracks/playabletrack/notetrack/ui/StretchHandle.cpp

@@ -11,6 +11,8 @@ Paul Licameli split from TrackPanel.cpp
 #include "../../../../Audacity.h" // for USE_* macros
 
 #ifdef USE_MIDI
+#include "../lib-src/header-substitutes/allegro.h"
+
 #include "StretchHandle.h"
 
 #include "../../../../HitTestResult.h"