More audio bindings tests

Author: kunitoki

modules/yup_audio_basics/synthesisers/yup_Synthesiser.cpp

@@ -106,7 +106,7 @@ Synthesiser::~Synthesiser()
 }
 
 //==============================================================================
-SynthesiserVoice* Synthesiser::getVoice (const int index) const
+SynthesiserVoice::Ptr Synthesiser::getVoice (const int index) const
 {
     const ScopedLock sl (lock);
     return voices[index];
@@ -118,7 +118,7 @@ void Synthesiser::clearVoices()
     voices.clear();
 }
 
-SynthesiserVoice* Synthesiser::addVoice (SynthesiserVoice* const newVoice)
+SynthesiserVoice* Synthesiser::addVoice (const SynthesiserVoice::Ptr newVoice)
 {
     SynthesiserVoice* voice;
 

modules/yup_audio_basics/synthesisers/yup_Synthesiser.h

@@ -99,7 +99,7 @@ class YUP_API SynthesiserSound : public ReferenceCountedObject
 
     @tags{Audio}
 */
-class YUP_API SynthesiserVoice
+class YUP_API SynthesiserVoice : public ReferenceCountedObject
 {
 public:
     //==============================================================================
@@ -261,6 +261,9 @@ class YUP_API SynthesiserVoice
     /** Returns true if this voice started playing its current note before the other voice did. */
     bool wasStartedBefore (const SynthesiserVoice& other) const noexcept;
 
+    /** The class is reference-counted, so this is a handy pointer class for it. */
+    using Ptr = ReferenceCountedObjectPtr<SynthesiserVoice>;
+
 protected:
     /** Resets the state of this voice after a sound has finished playing.
 
@@ -337,17 +340,16 @@ class YUP_API Synthesiser
     int getNumVoices() const noexcept { return voices.size(); }
 
     /** Returns one of the voices that have been added. */
-    SynthesiserVoice* getVoice (int index) const;
+    SynthesiserVoice::Ptr getVoice (int index) const;
 
     /** Adds a new voice to the synth.
 
         All the voices should be the same class of object and are treated equally.
 
-        The object passed in will be managed by the synthesiser, which will delete
-        it later on when no longer needed. The caller should not retain a pointer to the
-        voice.
+        The object passed in is reference counted, so will be deleted when the
+        synthesiser and all voices are no longer using it.
     */
-    SynthesiserVoice* addVoice (SynthesiserVoice* newVoice);
+    SynthesiserVoice* addVoice (SynthesiserVoice::Ptr newVoice);
 
     /** Deletes one of the voices. */
     void removeVoice (int index);
@@ -400,9 +402,7 @@ class YUP_API Synthesiser
 
         The midiChannel parameter is the channel, between 1 and 16 inclusive.
     */
-    virtual void noteOn (int midiChannel,
-                         int midiNoteNumber,
-                         float velocity);
+    virtual void noteOn (int midiChannel, int midiNoteNumber, float velocity);
 
     /** Triggers a note-off event.
 
@@ -416,10 +416,7 @@ class YUP_API Synthesiser
 
         The midiChannel parameter is the channel, between 1 and 16 inclusive.
     */
-    virtual void noteOff (int midiChannel,
-                          int midiNoteNumber,
-                          float velocity,
-                          bool allowTailOff);
+    virtual void noteOff (int midiChannel, int midiNoteNumber, float velocity, bool allowTailOff);
 
     /** Turns off all notes.
 
@@ -435,8 +432,7 @@ class YUP_API Synthesiser
         This method will be called automatically according to the midi data passed into
         renderNextBlock(), but may be called explicitly too.
     */
-    virtual void allNotesOff (int midiChannel,
-                              bool allowTailOff);
+    virtual void allNotesOff (int midiChannel, bool allowTailOff);
 
     /** Sends a pitch-wheel message to any active voices.
 
@@ -449,8 +445,7 @@ class YUP_API Synthesiser
         @param midiChannel          the midi channel, from 1 to 16 inclusive
         @param wheelValue           the wheel position, from 0 to 0x3fff, as returned by MidiMessage::getPitchWheelValue()
     */
-    virtual void handlePitchWheel (int midiChannel,
-                                   int wheelValue);
+    virtual void handlePitchWheel (int midiChannel, int wheelValue);
 
     /** Sends a midi controller message to any active voices.
 
@@ -464,9 +459,7 @@ class YUP_API Synthesiser
         @param controllerNumber     the midi controller type, as returned by MidiMessage::getControllerNumber()
         @param controllerValue      the midi controller value, between 0 and 127, as returned by MidiMessage::getControllerValue()
     */
-    virtual void handleController (int midiChannel,
-                                   int controllerNumber,
-                                   int controllerValue);
+    virtual void handleController (int midiChannel, int controllerNumber, int controllerValue);
 
     /** Sends an aftertouch message.
 
@@ -510,8 +503,7 @@ class YUP_API Synthesiser
         The base class implementation of this has no effect, but you may want to make your
         own synth react to program changes.
     */
-    virtual void handleProgramChange (int midiChannel,
-                                      int programNumber);
+    virtual void handleProgramChange (int midiChannel, int programNumber);
 
     //==============================================================================
     /** Tells the synthesiser what the sample rate is for the audio it's being used to render.
@@ -575,7 +567,7 @@ class YUP_API Synthesiser
     /** This is used to control access to the rendering callback and the note trigger methods. */
     CriticalSection lock;
 
-    OwnedArray<SynthesiserVoice> voices;
+    ReferenceCountedArray<SynthesiserVoice> voices;
     ReferenceCountedArray<SynthesiserSound> sounds;
 
     /** The last pitch-wheel values for each midi channel. */

modules/yup_python/bindings/yup_YupAudioBasics_bindings.cpp

@@ -256,6 +256,97 @@ void registerYupAudioBasicsBindings (py::module_& m)
             return Decibels::toString (decibels, decimalPlaces, minusInfinityDb, shouldIncludeSuffix, customMinusInfinityString);
         }, "decibels"_a, "decimalPlaces"_a = 2, "minusInfinityDb"_a = -100.0f, "shouldIncludeSuffix"_a = true, "customMinusInfinityString"_a = StringRef());
 
+    // ============================================================================================ yup::MidiMessage
+
+    py::class_<MidiMessage> classMidiMessage (m, "MidiMessage");
+
+    classMidiMessage
+        .def (py::init<>())
+        .def (py::init<const MidiMessage&>())
+        .def (py::init<const MidiMessage&, double>(), "other"_a, "newTimeStamp"_a)
+        .def ("getRawData", [] (const MidiMessage& self) -> py::bytes
+        {
+            return py::bytes (reinterpret_cast<const char*> (self.getRawData()), self.getRawDataSize());
+        })
+        .def ("getRawDataSize", &MidiMessage::getRawDataSize)
+        .def ("getDescription", &MidiMessage::getDescription)
+        .def ("getTimeStamp", &MidiMessage::getTimeStamp)
+        .def ("setTimeStamp", &MidiMessage::setTimeStamp)
+        .def ("addToTimeStamp", &MidiMessage::addToTimeStamp)
+        .def ("withTimeStamp", &MidiMessage::withTimeStamp)
+        .def ("getChannel", &MidiMessage::getChannel)
+        .def ("isForChannel", &MidiMessage::isForChannel)
+        .def ("setChannel", &MidiMessage::setChannel)
+        .def ("isSysEx", &MidiMessage::isSysEx)
+        .def ("getSysExDataSize", &MidiMessage::getSysExDataSize)
+        .def ("isNoteOn", &MidiMessage::isNoteOn, "returnTrueForVelocity0"_a = false)
+        .def ("isNoteOff", &MidiMessage::isNoteOff, "returnTrueForNoteOnVelocity0"_a = true)
+        .def ("isNoteOnOrOff", &MidiMessage::isNoteOnOrOff)
+        .def ("getNoteNumber", &MidiMessage::getNoteNumber)
+        .def ("setNoteNumber", &MidiMessage::setNoteNumber)
+        .def ("getVelocity", &MidiMessage::getVelocity)
+        .def ("getFloatVelocity", &MidiMessage::getFloatVelocity)
+        .def ("setVelocity", &MidiMessage::setVelocity)
+        .def ("multiplyVelocity", &MidiMessage::multiplyVelocity)
+        .def ("isAftertouch", &MidiMessage::isAftertouch)
+        .def ("getAfterTouchValue", &MidiMessage::getAfterTouchValue)
+        .def ("isProgramChange", &MidiMessage::isProgramChange)
+        .def ("getProgramChangeNumber", &MidiMessage::getProgramChangeNumber)
+        .def ("isPitchWheel", &MidiMessage::isPitchWheel)
+        .def ("getPitchWheelValue", &MidiMessage::getPitchWheelValue)
+        .def ("isController", &MidiMessage::isController)
+        .def ("getControllerNumber", &MidiMessage::getControllerNumber)
+        .def ("getControllerValue", &MidiMessage::getControllerValue)
+        .def ("isControllerOfType", &MidiMessage::isControllerOfType)
+        .def ("isAllNotesOff", &MidiMessage::isAllNotesOff)
+        .def ("isAllSoundOff", &MidiMessage::isAllSoundOff)
+        .def ("isResetAllControllers", &MidiMessage::isResetAllControllers)
+        .def_static ("noteOn", static_cast<MidiMessage (*)(int, int, float)> (&MidiMessage::noteOn), "channel"_a, "noteNumber"_a, "velocity"_a)
+        .def_static ("noteOff", static_cast<MidiMessage (*)(int, int, float)> (&MidiMessage::noteOff), "channel"_a, "noteNumber"_a, "velocity"_a)
+        .def_static ("noteOff", static_cast<MidiMessage (*)(int, int)> (&MidiMessage::noteOff), "channel"_a, "noteNumber"_a)
+        .def_static ("programChange", &MidiMessage::programChange, "channel"_a, "programNumber"_a)
+        .def_static ("pitchWheel", &MidiMessage::pitchWheel, "channel"_a, "position"_a)
+        .def_static ("aftertouchChange", &MidiMessage::aftertouchChange, "channel"_a, "noteNumber"_a, "aftertouchValue"_a)
+        .def_static ("channelPressureChange", &MidiMessage::channelPressureChange, "channel"_a, "pressure"_a)
+        .def_static ("controllerEvent", &MidiMessage::controllerEvent, "channel"_a, "controllerType"_a, "value"_a)
+        .def_static ("allNotesOff", &MidiMessage::allNotesOff, "channel"_a)
+        .def_static ("allSoundOff", &MidiMessage::allSoundOff, "channel"_a)
+        .def_static ("allControllersOff", &MidiMessage::allControllersOff, "channel"_a);
+
+    // ============================================================================================ yup::MidiMessageMetadata
+
+    py::class_<MidiMessageMetadata> classMidiMessageMetadata (m, "MidiMessageMetadata");
+
+    classMidiMessageMetadata
+        .def (py::init<>())
+        .def (py::init<const uint8*, int, int>())
+        .def ("getMessage", &MidiMessageMetadata::getMessage)
+        .def_readonly ("numBytes", &MidiMessageMetadata::numBytes)
+        .def_readonly ("samplePosition", &MidiMessageMetadata::samplePosition);
+
+    // ============================================================================================ yup::MidiBuffer
+
+    py::class_<MidiBuffer> classMidiBuffer (m, "MidiBuffer");
+
+    classMidiBuffer
+        .def (py::init<>())
+        .def (py::init<const MidiMessage&>())
+        .def ("clear", py::overload_cast<> (&MidiBuffer::clear))
+        .def ("clear", py::overload_cast<int, int> (&MidiBuffer::clear))
+        .def ("isEmpty", &MidiBuffer::isEmpty)
+        .def ("getNumEvents", &MidiBuffer::getNumEvents)
+        .def ("addEvent", py::overload_cast<const MidiMessage&, int> (&MidiBuffer::addEvent))
+        .def ("addEvents", &MidiBuffer::addEvents)
+        .def ("getFirstEventTime", &MidiBuffer::getFirstEventTime)
+        .def ("getLastEventTime", &MidiBuffer::getLastEventTime)
+        .def ("swapWith", &MidiBuffer::swapWith)
+        .def ("ensureSize", &MidiBuffer::ensureSize)
+        .def ("__iter__", [] (const MidiBuffer& self)
+        {
+            return py::make_iterator (self.begin(), self.end());
+        }, py::keep_alive<0, 1>())
+        .def ("__len__", &MidiBuffer::getNumEvents);
+
     // ============================================================================================ yup::ADSR
 
     py::class_<ADSR> classADSR (m, "ADSR");
@@ -382,7 +473,7 @@ void registerYupAudioBasicsBindings (py::module_& m)
 
     // ============================================================================================ yup::PositionableAudioSource
 
-    py::class_<PositionableAudioSource, PyPositionableAudioSource<>, AudioSource> classPositionableAudioSource (m, "PositionableAudioSource");
+    py::class_<PositionableAudioSource, PyPositionableAudioSource<>> classPositionableAudioSource (m, "PositionableAudioSource");
 
     classPositionableAudioSource
         .def (py::init<>())
@@ -422,7 +513,7 @@ void registerYupAudioBasicsBindings (py::module_& m)
 
     // ============================================================================================ yup::SynthesiserVoice
 
-    py::class_<SynthesiserVoice, PySynthesiserVoice> classSynthesiserVoice (m, "SynthesiserVoice");
+    py::class_<SynthesiserVoice, PySynthesiserVoice, ReferenceCountedObjectPtr<SynthesiserVoice>> classSynthesiserVoice (m, "SynthesiserVoice");
 
     classSynthesiserVoice
         .def (py::init<>())
@@ -443,11 +534,12 @@ void registerYupAudioBasicsBindings (py::module_& m)
 
     // ============================================================================================ yup::Synthesiser
 
-    py::class_<Synthesiser> classSynthesiser (m, "Synthesiser");
+    py::class_<Synthesiser, PySynthesiser> classSynthesiser (m, "Synthesiser");
 
     classSynthesiser
         .def (py::init<>())
         .def ("clearVoices", &Synthesiser::clearVoices)
+        .def ("getNumVoices", &Synthesiser::getNumVoices)
         .def ("getVoice", &Synthesiser::getVoice, py::return_value_policy::reference)
         .def ("addVoice", &Synthesiser::addVoice)
         .def ("removeVoice", &Synthesiser::removeVoice)
@@ -461,7 +553,17 @@ void registerYupAudioBasicsBindings (py::module_& m)
         .def ("setMinimumRenderingSubdivisionSize", &Synthesiser::setMinimumRenderingSubdivisionSize)
         .def ("setCurrentPlaybackSampleRate", &Synthesiser::setCurrentPlaybackSampleRate)
         .def ("renderNextBlock", py::overload_cast<AudioBuffer<float>&, const MidiBuffer&, int, int> (&Synthesiser::renderNextBlock), "outputAudio"_a, "inputMidi"_a, "startSample"_a, "numSamples"_a)
-        .def ("allNotesOff", &Synthesiser::allNotesOff);
+        .def ("noteOn", &Synthesiser::noteOn)
+        .def ("noteOff", &Synthesiser::noteOff)
+        .def ("allNotesOff", &Synthesiser::allNotesOff)
+        .def ("handlePitchWheel", &Synthesiser::handlePitchWheel)
+        .def ("handleController", &Synthesiser::handleController)
+        .def ("handleAftertouch", &Synthesiser::handleAftertouch)
+        .def ("handleChannelPressure", &Synthesiser::handleChannelPressure)
+        .def ("handleSustainPedal", &Synthesiser::handleSustainPedal)
+        .def ("handleSostenutoPedal", &Synthesiser::handleSostenutoPedal)
+        .def ("handleSoftPedal", &Synthesiser::handleSoftPedal)
+        .def ("handleProgramChange", &Synthesiser::handleProgramChange);
 
     // ============================================================================================ yup::AudioPlayHead
 

modules/yup_python/bindings/yup_YupAudioBasics_bindings.h

@@ -156,6 +156,70 @@ struct PySynthesiserVoice : SynthesiserVoice
     }
 };
 
+//==============================================================================
+struct PySynthesiser : Synthesiser
+{
+    void noteOn (int midiChannel, int midiNoteNumber, float velocity) override
+    {
+        PYBIND11_OVERRIDE (void, Synthesiser, noteOn, midiChannel, midiNoteNumber, velocity);
+    }
+
+    void noteOff (int midiChannel, int midiNoteNumber, float velocity, bool allowTailOff) override
+    {
+        PYBIND11_OVERRIDE (void, Synthesiser, noteOff, midiChannel, midiNoteNumber, velocity, allowTailOff);
+    }
+
+    void allNotesOff (int midiChannel, bool allowTailOff) override
+    {
+        PYBIND11_OVERRIDE (void, Synthesiser, allNotesOff, midiChannel, allowTailOff);
+    }
+
+    void handlePitchWheel (int midiChannel, int wheelValue) override
+    {
+        PYBIND11_OVERRIDE (void, Synthesiser, handlePitchWheel, midiChannel, wheelValue);
+    }
+
+    void handleController (int midiChannel, int controllerNumber, int controllerValue) override
+    {
+        PYBIND11_OVERRIDE (void, Synthesiser, handleController, midiChannel, controllerNumber, controllerValue);
+    }
+
+    void handleAftertouch (int midiChannel, int midiNoteNumber, int aftertouchValue) override
+    {
+        PYBIND11_OVERRIDE (void, Synthesiser, handleAftertouch, midiChannel, midiNoteNumber, aftertouchValue);
+    }
+
+    void handleChannelPressure (int midiChannel, int channelPressureValue) override
+    {
+        PYBIND11_OVERRIDE (void, Synthesiser, handleChannelPressure, midiChannel, channelPressureValue);
+    }
+
+    void handleSustainPedal (int midiChannel, bool isDown) override
+    {
+        PYBIND11_OVERRIDE (void, Synthesiser, handleSustainPedal, midiChannel, isDown);
+    }
+
+    void handleSostenutoPedal (int midiChannel, bool isDown) override
+    {
+        PYBIND11_OVERRIDE (void, Synthesiser, handleSostenutoPedal, midiChannel, isDown);
+    }
+
+    void handleSoftPedal (int midiChannel, bool isDown) override
+    {
+        PYBIND11_OVERRIDE (void, Synthesiser, handleSoftPedal, midiChannel, isDown);
+    }
+
+    void handleProgramChange (int midiChannel, int programNumber) override
+    {
+        PYBIND11_OVERRIDE (void, Synthesiser, handleProgramChange, midiChannel, programNumber);
+    }
+
+    void setCurrentPlaybackSampleRate (double sampleRate) override
+    {
+        PYBIND11_OVERRIDE (void, Synthesiser, setCurrentPlaybackSampleRate, sampleRate);
+    }
+};
+
 //==============================================================================
 
 struct PyAudioPlayHeadPositionInfo : AudioPlayHead::PositionInfo