From b0cacfdc2f31f831e6cfabd0e1c282a4befaf81b Mon Sep 17 00:00:00 2001 From: Stephen Sinclair Date: Thu, 31 Aug 2017 11:35:19 -0300 Subject: [PATCH] Fix RtMidiIn/RtMidiOut constructor signatures wrt std::string&. Remove nullptr since we haven't moved to C++11 yet. --- RtMidi.h | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/RtMidi.h b/RtMidi.h index 528e9293..5bad8a9c 100644 --- a/RtMidi.h +++ b/RtMidi.h @@ -229,7 +229,7 @@ class RtMidiIn : public RtMidi \param queueSizeLimit An optional size of the MIDI input queue can be specified. */ RtMidiIn( RtMidi::Api api=UNSPECIFIED, - const std::string clientName = std::string( "RtMidi Input Client"), + const std::string& clientName = "RtMidi Input Client", unsigned int queueSizeLimit = 100 ); //! If a MIDI connection is still open, it will be closed by the destructor. @@ -359,7 +359,7 @@ class RtMidiOut : public RtMidi JACK (OS-X). */ RtMidiOut( RtMidi::Api api=UNSPECIFIED, - const std::string clientName = std::string( "RtMidi Output Client") ); + const std::string& clientName = "RtMidi Output Client" ); //! The destructor closes any open MIDI connections. ~RtMidiOut( void ) throw(); @@ -510,7 +510,7 @@ class MidiInApi : public MidiApi // Default constructor. MidiQueue() - :front(0), back(0), size(0), ringSize(0), ring(nullptr) {} + :front(0), back(0), size(0), ringSize(0), ring(0) {} bool push(const MidiMessage&); bool pop(std::vector*, double*); };