Merge branch 'settings' into dev

Author: Francois Best

src/MIDI.cpp

@@ -25,27 +25,6 @@
 
 // -----------------------------------------------------------------------------
 
-#if !(MIDI_BUILD_INPUT) && !(MIDI_BUILD_OUTPUT)
-#   error To use MIDI, you need to enable at least input or output.
-#endif
-
-#if MIDI_BUILD_THRU && !(MIDI_BUILD_OUTPUT)
-#   error For thru to work, you need to enable output.
-#endif
-#if MIDI_BUILD_THRU && !(MIDI_BUILD_INPUT)
-#   error For thru to work, you need to enable input.
-#endif
-
-// -----------------------------------------------------------------------------
-
-#if MIDI_AUTO_INSTANCIATE && defined(ARDUINO)
-    MIDI_CREATE_INSTANCE(MIDI_DEFAULT_SERIAL_CLASS,
-                         MIDI_DEFAULT_SERIAL_PORT,
-                         MIDI);
-#endif
-
-// -----------------------------------------------------------------------------
-
 BEGIN_MIDI_NAMESPACE
 
 /*! \brief Encode System Exclusive messages.

src/MIDI.h

@@ -26,10 +26,6 @@
 #include "midi_Settings.h"
 #include "midi_Defs.h"
 
-#ifdef FSE_AVR
-#include <ak47.h>
-#endif
-
 // -----------------------------------------------------------------------------
 
 BEGIN_MIDI_NAMESPACE
@@ -40,21 +36,19 @@ the hardware interface, meaning you can use HardwareSerial, SoftwareSerial
 or ak47's Uart classes. The only requirement is that the class implements
 the begin, read, write and available methods.
  */
-template<class SerialPort>
+template<class SerialPort, class Settings = DefaultSettings>
 class MidiInterface
 {
 public:
-    MidiInterface(SerialPort& inSerial);
-    ~MidiInterface();
+    inline  MidiInterface(SerialPort& inSerial);
+    inline ~MidiInterface();
 
 public:
     void begin(Channel inChannel = 1);
 
     // -------------------------------------------------------------------------
     // MIDI Output
 
-#if MIDI_BUILD_OUTPUT
-
 public:
     inline void sendNoteOn(DataByte inNoteNumber,
                            DataByte inVelocity,
@@ -100,17 +94,9 @@ class MidiInterface
               DataByte inData2,
               Channel inChannel);
 
-private:
-    inline StatusByte getStatus(MidiType inType,
-                                Channel inChannel) const;
-
-#endif // MIDI_BUILD_OUTPUT
-
     // -------------------------------------------------------------------------
     // MIDI Input
 
-#if MIDI_BUILD_INPUT
-
 public:
     inline bool read();
     inline bool read(Channel inChannel);
@@ -133,25 +119,10 @@ class MidiInterface
     static inline Channel getChannelFromStatusByte(byte inStatus);
 	static inline bool isChannelMessage(MidiType inType);
 
-private:
-    bool parse();
-    inline void handleNullVelocityNoteOnAsNoteOff();
-    inline bool inputFilter(Channel inChannel);
-    inline void resetInput();
-
-private:
-    StatusByte  mRunningStatus_RX;
-    Channel     mInputChannel;
-    byte        mPendingMessage[3];
-    unsigned    mPendingMessageExpectedLenght;
-    unsigned    mPendingMessageIndex;
-    Message     mMessage;
 
     // -------------------------------------------------------------------------
     // Input Callbacks
 
-#if MIDI_USE_CALLBACKS
-
 public:
     inline void setHandleNoteOff(void (*fptr)(byte channel, byte note, byte velocity));
     inline void setHandleNoteOn(void (*fptr)(byte channel, byte note, byte velocity));
@@ -196,14 +167,9 @@ class MidiInterface
     void (*mActiveSensingCallback)(void);
     void (*mSystemResetCallback)(void);
 
-#endif // MIDI_USE_CALLBACKS
-#endif // MIDI_BUILD_INPUT
-
     // -------------------------------------------------------------------------
     // MIDI Soft Thru
 
-#if MIDI_BUILD_THRU
-
 public:
     inline MidiFilterMode getFilterMode() const;
     inline bool getThruState() const;
@@ -216,11 +182,28 @@ class MidiInterface
 private:
     void thruFilter(byte inChannel);
 
+private:
+    bool parse();
+    inline void handleNullVelocityNoteOnAsNoteOff();
+    inline bool inputFilter(Channel inChannel);
+    inline void resetInput();
+
 private:
     bool            mThruActivated  : 1;
     MidiFilterMode  mThruFilterMode : 7;
 
-#endif // MIDI_BUILD_THRU
+private:
+    StatusByte  mRunningStatus_RX;
+    Channel     mInputChannel;
+    byte        mPendingMessage[3];
+    unsigned    mPendingMessageExpectedLenght;
+    unsigned    mPendingMessageIndex;
+    Message     mMessage;
+
+private:
+    inline StatusByte getStatus(MidiType inType,
+                                Channel inChannel) const;
+
 
 
 #if MIDI_USE_RUNNING_STATUS
@@ -241,10 +224,4 @@ END_MIDI_NAMESPACE
 
 // -----------------------------------------------------------------------------
 
-#if MIDI_AUTO_INSTANCIATE && defined(ARDUINO)
-    extern MIDI_NAMESPACE::MidiInterface<MIDI_DEFAULT_SERIAL_CLASS> MIDI;
-#endif
-
-// -----------------------------------------------------------------------------
-
 #include "MIDI.hpp"