Browse Source

Update type names in JackMidiUtil

pull/514/head
piegames 6 years ago
parent
commit
fb648d2cb3
2 changed files with 16 additions and 16 deletions
  1. +8
    -8
      common/JackMidiUtil.cpp
  2. +8
    -8
      common/JackMidiUtil.h

+ 8
- 8
common/JackMidiUtil.cpp View File

@@ -23,14 +23,14 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
#include "JackMidiUtil.h"
#include "JackTime.h"

jack_midi_data_t
Jack::ApplyRunningStatus(size_t *size, jack_midi_data_t **buffer,
jack_midi_data_t running_status)
jack_event_data_t
Jack::ApplyRunningStatus(size_t *size, jack_event_data_t **buffer,
jack_event_data_t running_status)
{

// Stolen and modified from alsa/midi_pack.h

jack_midi_data_t status = **buffer;
jack_event_data_t status = **buffer;
if ((status >= 0x80) && (status < 0xf0)) {
if (status == running_status) {
(*buffer)++;
@@ -44,9 +44,9 @@ Jack::ApplyRunningStatus(size_t *size, jack_midi_data_t **buffer,
return running_status;
}

jack_midi_data_t
Jack::ApplyRunningStatus(jack_midi_event_t *event,
jack_midi_data_t running_status)
jack_event_data_t
Jack::ApplyRunningStatus(jack_event_t *event,
jack_event_data_t running_status)
{
return ApplyRunningStatus(&(event->size), &(event->buffer),
running_status);
@@ -78,7 +78,7 @@ Jack::GetLastFrame()
}

int
Jack::GetMessageLength(jack_midi_data_t status_byte)
Jack::GetMessageLength(jack_event_data_t status_byte)
{
switch (status_byte & 0xf0) {
case 0x80:


+ 8
- 8
common/JackMidiUtil.h View File

@@ -20,7 +20,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
#ifndef __JackMidiUtil__
#define __JackMidiUtil__

#include "JackMidiPort.h"
#include "JackEventPort.h"

namespace Jack {

@@ -41,17 +41,17 @@ namespace Jack {
* message for each message that can be optimized.
*/

SERVER_EXPORT jack_midi_data_t
ApplyRunningStatus(size_t *size, jack_midi_data_t **buffer,
jack_midi_data_t running_status=0);
SERVER_EXPORT jack_event_data_t
ApplyRunningStatus(size_t *size, jack_event_data_t **buffer,
jack_event_data_t running_status=0);

/**
* A wrapper function for the above `ApplyRunningStatus` function.
*/

SERVER_EXPORT jack_midi_data_t
ApplyRunningStatus(jack_midi_event_t *event,
jack_midi_data_t running_status);
SERVER_EXPORT jack_event_data_t
ApplyRunningStatus(jack_event_t *event,
jack_event_data_t running_status);

/**
* Gets the estimated current time in frames. This function has the same
@@ -86,7 +86,7 @@ namespace Jack {
*/

SERVER_EXPORT int
GetMessageLength(jack_midi_data_t status_byte);
GetMessageLength(jack_event_data_t status_byte);

/**
* Gets the estimated time at which the given frame will occur. This


Loading…
Cancel
Save