- updated
git-svn-id: http://moon:8086/svn/software/trunk/projects/mpsk_rx_gui@117 b431acfa-c32f-4a4a-93f1-934dc6c82436
This commit is contained in:
@@ -30,7 +30,7 @@ namespace
|
||||
#endif
|
||||
|
||||
#if JUCE_ALSA_LOGGING
|
||||
#define JUCE_ALSA_LOG(dbgtext) { juce::String tempDbgBuf ("ALSA: "); tempDbgBuf << dbgtext; Logger::writeToLog (tempDbgBuf); DBG (tempDbgBuf) }
|
||||
#define JUCE_ALSA_LOG(dbgtext) { juce::String tempDbgBuf ("ALSA: "); tempDbgBuf << dbgtext; Logger::writeToLog (tempDbgBuf); DBG (tempDbgBuf); }
|
||||
#define JUCE_CHECKED_RESULT(x) (logErrorMessage (x, __LINE__))
|
||||
|
||||
static int logErrorMessage (int err, int lineNum)
|
||||
|
||||
@@ -419,7 +419,7 @@ public:
|
||||
port.deletePort();
|
||||
}
|
||||
|
||||
void sendMessageNow (const MidiMessage& message)
|
||||
bool sendMessageNow (const MidiMessage& message)
|
||||
{
|
||||
if (message.getRawDataSize() > maxEventSize)
|
||||
{
|
||||
@@ -435,12 +435,17 @@ public:
|
||||
const uint8* data = message.getRawData();
|
||||
|
||||
snd_seq_t* seqHandle = port.client->get();
|
||||
bool success = true;
|
||||
|
||||
while (numBytes > 0)
|
||||
{
|
||||
const long numSent = snd_midi_event_encode (midiParser, data, numBytes, &event);
|
||||
|
||||
if (numSent <= 0)
|
||||
{
|
||||
success = numSent == 0;
|
||||
break;
|
||||
}
|
||||
|
||||
numBytes -= numSent;
|
||||
data += numSent;
|
||||
@@ -449,11 +454,15 @@ public:
|
||||
snd_seq_ev_set_subs (&event);
|
||||
snd_seq_ev_set_direct (&event);
|
||||
|
||||
snd_seq_event_output (seqHandle, &event);
|
||||
if (snd_seq_event_output_direct (seqHandle, &event) < 0)
|
||||
{
|
||||
success = false;
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
||||
snd_seq_drain_output (seqHandle);
|
||||
snd_midi_event_reset_encode (midiParser);
|
||||
return success;
|
||||
}
|
||||
|
||||
private:
|
||||
|
||||
@@ -1255,7 +1255,7 @@ private:
|
||||
DSoundDeviceList deviceList;
|
||||
bool hasScanned;
|
||||
|
||||
void systemDeviceChanged()
|
||||
void systemDeviceChanged() override
|
||||
{
|
||||
DSoundDeviceList newList;
|
||||
newList.scan();
|
||||
|
||||
@@ -1418,7 +1418,7 @@ private:
|
||||
}
|
||||
|
||||
//==============================================================================
|
||||
void systemDeviceChanged()
|
||||
void systemDeviceChanged() override
|
||||
{
|
||||
StringArray newOutNames, newInNames, newOutIds, newInIds;
|
||||
scan (newOutNames, newInNames, newOutIds, newInIds);
|
||||
|
||||
Reference in New Issue
Block a user