Browse Source

WinMME driver compiles again.

git-svn-id: http://subversion.jackaudio.org/jack/jack2/trunk/jackmp@4320 0c269be4-1314-0410-8aa9-9f06e86f4224
tags/1.9.8
sletz 14 years ago
parent
commit
3bbff1f047
2 changed files with 6 additions and 5 deletions
  1. +2
    -2
      windows/jackd.workspace
  2. +4
    -3
      windows/winmme/JackWinMMEInputPort.cpp

+ 2
- 2
windows/jackd.workspace View File

@@ -1,13 +1,13 @@
<?xml version="1.0" encoding="UTF-8" standalone="yes" ?> <?xml version="1.0" encoding="UTF-8" standalone="yes" ?>
<CodeBlocks_workspace_file> <CodeBlocks_workspace_file>
<Workspace title="jack"> <Workspace title="jack">
<Project filename="libjackserver.cbp" />
<Project filename="libjackserver.cbp" active="1" />
<Project filename="jack_portaudio.cbp" /> <Project filename="jack_portaudio.cbp" />
<Project filename="jack_netdriver.cbp" /> <Project filename="jack_netdriver.cbp" />
<Project filename="jack_netonedriver.cbp" /> <Project filename="jack_netonedriver.cbp" />
<Project filename="jack_dummy.cbp" /> <Project filename="jack_dummy.cbp" />
<Project filename="jack_netmanager.cbp" /> <Project filename="jack_netmanager.cbp" />
<Project filename="jack_audioadapter.cbp" active="1" />
<Project filename="jack_audioadapter.cbp" />
<Project filename="libjack.cbp" /> <Project filename="libjack.cbp" />
<Project filename="jack_load.cbp" /> <Project filename="jack_load.cbp" />
<Project filename="jack_unload.cbp" /> <Project filename="jack_unload.cbp" />


+ 4
- 3
windows/winmme/JackWinMMEInputPort.cpp View File

@@ -21,7 +21,8 @@ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
#include <memory> #include <memory>
#include <stdexcept> #include <stdexcept>


#include "JackError.h"
#include "JackError.h"
#include "JackTime.h"
#include "JackMidiUtil.h" #include "JackMidiUtil.h"
#include "JackWinMMEInputPort.h" #include "JackWinMMEInputPort.h"
#include "JackMidiWriteQueue.h" #include "JackMidiWriteQueue.h"
@@ -225,7 +226,7 @@ JackWinMMEInputPort::ProcessWinMME(UINT message, DWORD param1, DWORD param2)
"status byte."); "status byte.");
return; return;
} }
EnqueueMessage(dwParam2, (size_t) length, message_buffer);
EnqueueMessage(param2, (size_t) length, message_buffer);
break; break;
} }
case MIM_LONGDATA: { case MIM_LONGDATA: {
@@ -242,7 +243,7 @@ JackWinMMEInputPort::ProcessWinMME(UINT message, DWORD param1, DWORD param2)
jack_error("JackWinMMEInputPort::ProcessWinMME - Discarding " jack_error("JackWinMMEInputPort::ProcessWinMME - Discarding "
"%d-byte sysex chunk.", byte_count); "%d-byte sysex chunk.", byte_count);
} else { } else {
EnqueueMessage(dwParam2, byte_count, data);
EnqueueMessage(param2, byte_count, data);
} }
// Is this realtime-safe? This function isn't run in the JACK thread, // Is this realtime-safe? This function isn't run in the JACK thread,
// but we still want it to perform as quickly as possible. Even if // but we still want it to perform as quickly as possible. Even if


Loading…
Cancel
Save