diff options
Diffstat (limited to 'media/packages')
3 files changed, 13 insertions, 10 deletions
diff --git a/media/packages/BluetoothMidiService/src/com/android/bluetoothmidiservice/BluetoothMidiDevice.java b/media/packages/BluetoothMidiService/src/com/android/bluetoothmidiservice/BluetoothMidiDevice.java index 0ccbf6a..60c6570 100644 --- a/media/packages/BluetoothMidiService/src/com/android/bluetoothmidiservice/BluetoothMidiDevice.java +++ b/media/packages/BluetoothMidiService/src/com/android/bluetoothmidiservice/BluetoothMidiDevice.java @@ -234,10 +234,10 @@ public final class BluetoothMidiDevice { break; } try { - mPacketEncoder.sendWithTimestamp(event.data, 0, event.count, + mPacketEncoder.send(event.data, 0, event.count, event.getTimestamp()); } catch (IOException e) { - Log.e(TAG, "mPacketAccumulator.sendWithTimestamp failed", e); + Log.e(TAG, "mPacketAccumulator.send failed", e); } mEventScheduler.addEventToPool(event); } diff --git a/media/packages/BluetoothMidiService/src/com/android/bluetoothmidiservice/BluetoothPacketDecoder.java b/media/packages/BluetoothMidiService/src/com/android/bluetoothmidiservice/BluetoothPacketDecoder.java index 1bce9fb..ea95a01 100644 --- a/media/packages/BluetoothMidiService/src/com/android/bluetoothmidiservice/BluetoothPacketDecoder.java +++ b/media/packages/BluetoothMidiService/src/com/android/bluetoothmidiservice/BluetoothPacketDecoder.java @@ -86,7 +86,7 @@ public class BluetoothPacketDecoder extends PacketDecoder { if (dataCount > 0) { // send previous message separately since it has a different timestamp try { - receiver.sendWithTimestamp(mBuffer, 0, dataCount, nanoTimestamp); + receiver.send(mBuffer, 0, dataCount, nanoTimestamp); } catch (IOException e) { // ??? } @@ -106,7 +106,7 @@ public class BluetoothPacketDecoder extends PacketDecoder { if (dataCount > 0) { try { - receiver.sendWithTimestamp(mBuffer, 0, dataCount, nanoTimestamp); + receiver.send(mBuffer, 0, dataCount, nanoTimestamp); } catch (IOException e) { // ??? } diff --git a/media/packages/BluetoothMidiService/src/com/android/bluetoothmidiservice/BluetoothPacketEncoder.java b/media/packages/BluetoothMidiService/src/com/android/bluetoothmidiservice/BluetoothPacketEncoder.java index 99ea353..5fb162c 100644 --- a/media/packages/BluetoothMidiService/src/com/android/bluetoothmidiservice/BluetoothPacketEncoder.java +++ b/media/packages/BluetoothMidiService/src/com/android/bluetoothmidiservice/BluetoothPacketEncoder.java @@ -53,7 +53,7 @@ public class BluetoothPacketEncoder extends PacketEncoder { // This receives normalized data from mMidiFramer and accumulates it into a packet buffer private final MidiReceiver mFramedDataReceiver = new MidiReceiver() { @Override - public void onReceive(byte[] msg, int offset, int count, long timestamp) + public void onSend(byte[] msg, int offset, int count, long timestamp) throws IOException { synchronized (mLock) { @@ -130,7 +130,8 @@ public class BluetoothPacketEncoder extends PacketEncoder { flushLocked(true); appendHeader(milliTimestamp); } - mAccumulationBuffer[mAccumulatedBytes++] = (byte)(0x80 | (milliTimestamp & 0x7F)); + mAccumulationBuffer[mAccumulatedBytes++] = + (byte)(0x80 | (milliTimestamp & 0x7F)); mAccumulationBuffer[mAccumulatedBytes++] = MidiConstants.STATUS_END_SYSEX; } } else { @@ -146,7 +147,8 @@ public class BluetoothPacketEncoder extends PacketEncoder { // now copy data bytes int dataLength = count - 1; - System.arraycopy(msg, offset + 1, mAccumulationBuffer, mAccumulatedBytes, dataLength); + System.arraycopy(msg, offset + 1, mAccumulationBuffer, mAccumulatedBytes, + dataLength); mAccumulatedBytes += dataLength; } @@ -160,7 +162,8 @@ public class BluetoothPacketEncoder extends PacketEncoder { // write header if we are starting a new packet if (mAccumulatedBytes == 0) { // header byte with timestamp bits 7 - 12 - mAccumulationBuffer[mAccumulatedBytes++] = (byte)(0x80 | ((milliTimestamp >> 7) & 0x3F)); + mAccumulationBuffer[mAccumulatedBytes++] = + (byte)(0x80 | ((milliTimestamp >> 7) & 0x3F)); mPacketTimestamp = milliTimestamp; return true; } else { @@ -177,10 +180,10 @@ public class BluetoothPacketEncoder extends PacketEncoder { } @Override - public void onReceive(byte[] msg, int offset, int count, long timestamp) + public void onSend(byte[] msg, int offset, int count, long timestamp) throws IOException { // normalize the data by passing it through a MidiFramer first - mMidiFramer.sendWithTimestamp(msg, offset, count, timestamp); + mMidiFramer.send(msg, offset, count, timestamp); } @Override |