mirror/JUCE
1
0
Fork 0
mirror of https://github.com/juce-framework/JUCE.git synced 2026-01-10 23:44:24 +00:00
Code Activity

Minor clean-ups.

Browse source
This commit is contained in:
jules 2013-03-07 21:49:12 +00:00
parent 00ce488607
commit 4c6358ae87
1 changed files with 17 additions and 47 deletions
Download patch file Download diff file Expand all files Collapse all files

64
modules/juce_audio_devices/native/juce_linux_Midi.cpp
View file

@ -187,11 +187,8 @@ namespace
class MidiOutputDevice class MidiOutputDevice
{ {
public: public:
MidiOutputDevice (MidiOutput* const midiOutput_, MidiOutputDevice (MidiOutput* output, snd_seq_t* handle)
snd_seq_t* const seqHandle_) : midiOutput (output), seqHandle (handle),
:
midiOutput (midiOutput_),
seqHandle (seqHandle_),
maxEventSize (16 * 1024) maxEventSize (16 * 1024)
{ {
jassert (seqHandle != 0 && midiOutput != 0); jassert (seqHandle != 0 && midiOutput != 0);
@ -263,11 +260,9 @@ int MidiOutput::getDefaultDeviceIndex()
MidiOutput* MidiOutput::openDevice (int deviceIndex) MidiOutput* MidiOutput::openDevice (int deviceIndex)
{ {
MidiOutput* newDevice = nullptr; MidiOutput* newDevice = nullptr;
StringArray devices; StringArray devices;
snd_seq_t* const handle = iterateMidiDevices (false, devices, deviceIndex);
if (handle != 0) if (snd_seq_t* const handle = iterateMidiDevices (false, devices, deviceIndex))
{ {
newDevice = new MidiOutput(); newDevice = new MidiOutput();
newDevice->internal = new MidiOutputDevice (newDevice, handle); newDevice->internal = new MidiOutputDevice (newDevice, handle);
@ -280,9 +275,7 @@ MidiOutput* MidiOutput::createNewDevice (const String& deviceName)
{ {
MidiOutput* newDevice = nullptr; MidiOutput* newDevice = nullptr;
snd_seq_t* const handle = createMidiDevice (false, deviceName); if (snd_seq_t* const handle = createMidiDevice (false, deviceName))
if (handle != 0)
{ {
newDevice = new MidiOutput(); newDevice = new MidiOutput();
newDevice->internal = new MidiOutputDevice (newDevice, handle); newDevice->internal = new MidiOutputDevice (newDevice, handle);
@ -306,15 +299,11 @@ void MidiOutput::sendMessageNow (const MidiMessage& message)
class MidiInputThread : public Thread class MidiInputThread : public Thread
{ {
public: public:
MidiInputThread (MidiInput* const midiInput_, MidiInputThread (MidiInput* input, snd_seq_t* handle, MidiInputCallback* cb)
snd_seq_t* const seqHandle_,
MidiInputCallback* const callback_)
: Thread ("Juce MIDI Input"), : Thread ("Juce MIDI Input"),
midiInput (midiInput_), midiInput (input), seqHandle (handle), callback (cb)
seqHandle (seqHandle_),
callback (callback_)
{ {
jassert (seqHandle != 0 && callback != 0 && midiInput != 0); jassert (seqHandle != nullptr && callback != nullptr && midiInput != nullptr);
} }
~MidiInputThread() ~MidiInputThread()
@ -332,7 +321,7 @@ public:
HeapBlock <uint8> buffer (maxEventSize); HeapBlock <uint8> buffer (maxEventSize);
const int numPfds = snd_seq_poll_descriptors_count (seqHandle, POLLIN); const int numPfds = snd_seq_poll_descriptors_count (seqHandle, POLLIN);
struct pollfd* const pfd = (struct pollfd*) alloca (numPfds * sizeof (struct pollfd)); HeapBlock <pollfd> pfd (numPfds);
snd_seq_poll_descriptors (seqHandle, pfd, numPfds, POLLIN); snd_seq_poll_descriptors (seqHandle, pfd, numPfds, POLLIN);
@ -341,7 +330,6 @@ public:
if (poll (pfd, numPfds, 500) > 0) if (poll (pfd, numPfds, 500) > 0)
{ {
snd_seq_event_t* inputEvent = nullptr; snd_seq_event_t* inputEvent = nullptr;
snd_seq_nonblock (seqHandle, 1); snd_seq_nonblock (seqHandle, 1);
do do
@ -354,14 +342,9 @@ public:
snd_midi_event_reset_decode (midiParser); snd_midi_event_reset_decode (midiParser);
if (numBytes > 0) if (numBytes > 0)
{ callback->handleIncomingMidiMessage (midiInput,
const MidiMessage message ((const uint8*) buffer, MidiMessage ((const uint8*) buffer, numBytes,
numBytes, Time::getMillisecondCounter() * 0.001));
Time::getMillisecondCounter() * 0.001);
callback->handleIncomingMidiMessage (midiInput, message);
}
snd_seq_free_event (inputEvent); snd_seq_free_event (inputEvent);
} }
@ -385,9 +368,8 @@ private:
}; };
//============================================================================== //==============================================================================
MidiInput::MidiInput (const String& name_) MidiInput::MidiInput (const String& nm)
: name (name_), : name (nm), internal (nullptr)
internal (0)
{ {
} }
@ -397,15 +379,8 @@ MidiInput::~MidiInput()
delete static_cast <MidiInputThread*> (internal); delete static_cast <MidiInputThread*> (internal);
} }
void MidiInput::start() void MidiInput::start() { static_cast <MidiInputThread*> (internal)->startThread(); }
{ void MidiInput::stop() { static_cast <MidiInputThread*> (internal)->stopThread (3000); }
static_cast <MidiInputThread*> (internal)->startThread();
}
void MidiInput::stop()
{
static_cast <MidiInputThread*> (internal)->stopThread (3000);
}
int MidiInput::getDefaultDeviceIndex() int MidiInput::getDefaultDeviceIndex()
{ {
@ -422,11 +397,9 @@ StringArray MidiInput::getDevices()
MidiInput* MidiInput::openDevice (int deviceIndex, MidiInputCallback* callback) MidiInput* MidiInput::openDevice (int deviceIndex, MidiInputCallback* callback)
{ {
MidiInput* newDevice = nullptr; MidiInput* newDevice = nullptr;
StringArray devices; StringArray devices;
snd_seq_t* const handle = iterateMidiDevices (true, devices, deviceIndex);
if (handle != 0) if (snd_seq_t* const handle = iterateMidiDevices (true, devices, deviceIndex))
{ {
newDevice = new MidiInput (devices [deviceIndex]); newDevice = new MidiInput (devices [deviceIndex]);
newDevice->internal = new MidiInputThread (newDevice, handle, callback); newDevice->internal = new MidiInputThread (newDevice, handle, callback);
@ -439,9 +412,7 @@ MidiInput* MidiInput::createNewDevice (const String& deviceName, MidiInputCallba
{ {
MidiInput* newDevice = nullptr; MidiInput* newDevice = nullptr;
snd_seq_t* const handle = createMidiDevice (true, deviceName); if (snd_seq_t* const handle = createMidiDevice (true, deviceName))
if (handle != 0)
{ {
newDevice = new MidiInput (deviceName); newDevice = new MidiInput (deviceName);
newDevice->internal = new MidiInputThread (newDevice, handle, callback); newDevice->internal = new MidiInputThread (newDevice, handle, callback);
@ -451,7 +422,6 @@ MidiInput* MidiInput::createNewDevice (const String& deviceName, MidiInputCallba
} }
//============================================================================== //==============================================================================
#else #else