Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: patchr-app/flutter_midi
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: main
Choose a base ref
...
head repository: aestesis/flutter_midi
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: main
Choose a head ref
Can’t automatically merge. Don’t worry, you can still create the pull request.
  • 7 commits
  • 16 files changed
  • 1 contributor

Commits on Nov 29, 2023

  1. lil fixes

    renanyoy committed Nov 29, 2023

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
    Copy the full SHA
    ea7ffe6 View commit details
  2. lil fixes

    renanyoy committed Nov 29, 2023
    Copy the full SHA
    f27028f View commit details

Commits on Dec 14, 2023

  1. lil fixes

    renanyoy committed Dec 14, 2023
    Copy the full SHA
    5521d62 View commit details
  2. lil fixes

    renanyoy committed Dec 14, 2023
    Copy the full SHA
    46eac9d View commit details

Commits on Dec 18, 2023

  1. fixed message splitter

    renanyoy committed Dec 18, 2023
    Copy the full SHA
    a1a63ff View commit details
  2. fix operator ==

    renanyoy committed Dec 18, 2023
    Copy the full SHA
    e3b1f3f View commit details

Commits on Feb 27, 2024

  1. hash update

    renanyoy committed Feb 27, 2024
    Copy the full SHA
    fc6256b View commit details
1 change: 0 additions & 1 deletion midi_io/example/lib/destinations_tab.dart
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
import 'package:flutter/material.dart';
import 'package:flutter/widgets.dart';

import 'package:midi_io/midi_io.dart';
import 'package:provider/provider.dart';
1 change: 0 additions & 1 deletion midi_io/example/lib/sources_tab.dart
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
import 'package:flutter/material.dart';
import 'package:flutter/widgets.dart';

import 'package:midi_io/midi_io.dart';
import 'package:provider/provider.dart';
159 changes: 103 additions & 56 deletions midi_io/example/pubspec.lock
Original file line number Diff line number Diff line change
@@ -5,58 +5,58 @@ packages:
dependency: transitive
description:
name: async
url: "https://pub.dartlang.org"
sha256: "947bfcf187f74dbc5e146c9eb9c0f10c9f8b30743e341481c1e2ed3ecc18c20c"
url: "https://pub.dev"
source: hosted
version: "2.6.1"
version: "2.11.0"
boolean_selector:
dependency: transitive
description:
name: boolean_selector
url: "https://pub.dartlang.org"
sha256: "6cfb5af12253eaf2b368f07bacc5a80d1301a071c73360d746b7f2e32d762c66"
url: "https://pub.dev"
source: hosted
version: "2.1.0"
version: "2.1.1"
characters:
dependency: transitive
description:
name: characters
url: "https://pub.dartlang.org"
sha256: "04a925763edad70e8443c99234dc3328f442e811f1d8fd1a72f1c8ad0f69a605"
url: "https://pub.dev"
source: hosted
version: "1.1.0"
charcode:
dependency: transitive
description:
name: charcode
url: "https://pub.dartlang.org"
source: hosted
version: "1.2.0"
version: "1.3.0"
clock:
dependency: transitive
description:
name: clock
url: "https://pub.dartlang.org"
sha256: cb6d7f03e1de671e34607e909a7213e31d7752be4fb66a86d29fe1eb14bfb5cf
url: "https://pub.dev"
source: hosted
version: "1.1.0"
version: "1.1.1"
collection:
dependency: transitive
description:
name: collection
url: "https://pub.dartlang.org"
sha256: ee67cb0715911d28db6bf4af1026078bd6f0128b07a5f66fb2ed94ec6783c09a
url: "https://pub.dev"
source: hosted
version: "1.15.0"
version: "1.18.0"
cupertino_icons:
dependency: "direct main"
description:
name: cupertino_icons
url: "https://pub.dartlang.org"
sha256: d57953e10f9f8327ce64a508a355f0b1ec902193f66288e8cb5070e7c47eeb2d
url: "https://pub.dev"
source: hosted
version: "1.0.3"
version: "1.0.6"
fake_async:
dependency: transitive
description:
name: fake_async
url: "https://pub.dartlang.org"
sha256: "511392330127add0b769b75a987850d136345d9227c6b94c96a04cf4a391bf78"
url: "https://pub.dev"
source: hosted
version: "1.2.0"
version: "1.3.1"
flutter:
dependency: "direct main"
description: flutter
@@ -67,60 +67,99 @@ packages:
description: flutter
source: sdk
version: "0.0.0"
leak_tracker:
dependency: transitive
description:
name: leak_tracker
sha256: "7f0df31977cb2c0b88585095d168e689669a2cc9b97c309665e3386f3e9d341a"
url: "https://pub.dev"
source: hosted
version: "10.0.4"
leak_tracker_flutter_testing:
dependency: transitive
description:
name: leak_tracker_flutter_testing
sha256: "06e98f569d004c1315b991ded39924b21af84cf14cc94791b8aea337d25b57f8"
url: "https://pub.dev"
source: hosted
version: "3.0.3"
leak_tracker_testing:
dependency: transitive
description:
name: leak_tracker_testing
sha256: "6ba465d5d76e67ddf503e1161d1f4a6bc42306f9d66ca1e8f079a47290fb06d3"
url: "https://pub.dev"
source: hosted
version: "3.0.1"
matcher:
dependency: transitive
description:
name: matcher
url: "https://pub.dartlang.org"
sha256: d2323aa2060500f906aa31a895b4030b6da3ebdcc5619d14ce1aada65cd161cb
url: "https://pub.dev"
source: hosted
version: "0.12.10"
version: "0.12.16+1"
material_color_utilities:
dependency: transitive
description:
name: material_color_utilities
sha256: "0e0a020085b65b6083975e499759762399b4475f766c21668c4ecca34ea74e5a"
url: "https://pub.dev"
source: hosted
version: "0.8.0"
meta:
dependency: transitive
description:
name: meta
url: "https://pub.dartlang.org"
sha256: "7687075e408b093f36e6bbf6c91878cc0d4cd10f409506f7bc996f68220b9136"
url: "https://pub.dev"
source: hosted
version: "1.3.0"
version: "1.12.0"
midi_io:
dependency: "direct main"
description:
path: ".."
relative: true
source: path
version: "1.0.4"
version: "1.0.7"
midi_io_platform_interface:
dependency: transitive
description:
name: midi_io_platform_interface
url: "https://pub.dartlang.org"
sha256: ebaeadba56928edac6486f2e4704e5d037b12147d381590c8ec8db8c2a564301
url: "https://pub.dev"
source: hosted
version: "1.0.0"
version: "1.0.2"
nested:
dependency: transitive
description:
name: nested
url: "https://pub.dartlang.org"
sha256: "03bac4c528c64c95c722ec99280375a6f2fc708eec17c7b3f07253b626cd2a20"
url: "https://pub.dev"
source: hosted
version: "1.0.0"
path:
dependency: transitive
description:
name: path
url: "https://pub.dartlang.org"
sha256: "087ce49c3f0dc39180befefc60fdb4acd8f8620e5682fe2476afd0b3688bb4af"
url: "https://pub.dev"
source: hosted
version: "1.8.0"
version: "1.9.0"
plugin_platform_interface:
dependency: transitive
description:
name: plugin_platform_interface
url: "https://pub.dartlang.org"
sha256: "4820fbfdb9478b1ebae27888254d445073732dae3d6ea81f0b7e06d5dedc3f02"
url: "https://pub.dev"
source: hosted
version: "2.0.1"
version: "2.1.8"
provider:
dependency: "direct main"
description:
name: provider
url: "https://pub.dartlang.org"
sha256: "59471e0a4595e264625d3496af567ac85bdae1148ec985aff1e0555786f53ecf"
url: "https://pub.dev"
source: hosted
version: "5.0.0"
sky_engine:
@@ -132,58 +171,66 @@ packages:
dependency: transitive
description:
name: source_span
url: "https://pub.dartlang.org"
sha256: "53e943d4206a5e30df338fd4c6e7a077e02254531b138a15aec3bd143c1a8b3c"
url: "https://pub.dev"
source: hosted
version: "1.8.1"
version: "1.10.0"
stack_trace:
dependency: transitive
description:
name: stack_trace
url: "https://pub.dartlang.org"
sha256: "73713990125a6d93122541237550ee3352a2d84baad52d375a4cad2eb9b7ce0b"
url: "https://pub.dev"
source: hosted
version: "1.10.0"
version: "1.11.1"
stream_channel:
dependency: transitive
description:
name: stream_channel
url: "https://pub.dartlang.org"
sha256: ba2aa5d8cc609d96bbb2899c28934f9e1af5cddbd60a827822ea467161eb54e7
url: "https://pub.dev"
source: hosted
version: "2.1.0"
version: "2.1.2"
string_scanner:
dependency: transitive
description:
name: string_scanner
url: "https://pub.dartlang.org"
sha256: "556692adab6cfa87322a115640c11f13cb77b3f076ddcc5d6ae3c20242bedcde"
url: "https://pub.dev"
source: hosted
version: "1.1.0"
version: "1.2.0"
term_glyph:
dependency: transitive
description:
name: term_glyph
url: "https://pub.dartlang.org"
sha256: a29248a84fbb7c79282b40b8c72a1209db169a2e0542bce341da992fe1bc7e84
url: "https://pub.dev"
source: hosted
version: "1.2.0"
version: "1.2.1"
test_api:
dependency: transitive
description:
name: test_api
url: "https://pub.dartlang.org"
sha256: "9955ae474176f7ac8ee4e989dadfb411a58c30415bcfb648fa04b2b8a03afa7f"
url: "https://pub.dev"
source: hosted
version: "0.3.0"
typed_data:
version: "0.7.0"
vector_math:
dependency: transitive
description:
name: typed_data
url: "https://pub.dartlang.org"
name: vector_math
sha256: "80b3257d1492ce4d091729e3a67a60407d227c27241d6927be0130c98e741803"
url: "https://pub.dev"
source: hosted
version: "1.3.0"
vector_math:
version: "2.1.4"
vm_service:
dependency: transitive
description:
name: vector_math
url: "https://pub.dartlang.org"
name: vm_service
sha256: a2662fb1f114f4296cf3f5a50786a2d888268d7776cf681aa17d660ffa23b246
url: "https://pub.dev"
source: hosted
version: "2.1.0"
version: "14.0.0"
sdks:
dart: ">=2.12.0 <3.0.0"
flutter: ">=1.20.0"
dart: ">=3.3.0-0 <4.0.0"
flutter: ">=3.18.0-18.0.pre.54"
27 changes: 0 additions & 27 deletions midi_io/example/test/widget_test.dart

This file was deleted.

2 changes: 1 addition & 1 deletion midi_io/ios/Classes/WebMIDIKit/MIDIPortMap.swift
Original file line number Diff line number Diff line change
@@ -69,7 +69,7 @@ public class MIDIPortMap<Value: MIDIPort> : Collection, CustomStringConvertible,
internal final func remove(_ endpoint: MIDIEndpoint) -> Value? {
//disconnect?
guard let port = self[endpoint] else { assert(false); return nil }
assert(port.state == .connected)
//assert(port.state == .connected)
self[port.id] = nil
return port
}
1 change: 1 addition & 0 deletions midi_io/lib/src/message_splitter.dart
Original file line number Diff line number Diff line change
@@ -72,6 +72,7 @@ class MessageSplitter extends StreamTransformerBase<Uint8List, Uint8List> {
} else {
// if we get here we received something we don't understand,
// and that we weren't expecting, so drop the message
i++;
}
}
}
10 changes: 5 additions & 5 deletions midi_io/lib/src/midi_port.dart
Original file line number Diff line number Diff line change
@@ -145,7 +145,7 @@ class MidiDestinationPort extends MidiPort {
}

@override
bool operator ==(dynamic other) =>
bool operator ==(Object other) =>
other is MidiDestinationPort && id == other.id;

@override
@@ -177,15 +177,15 @@ class MidiSourcePort extends MidiPort {

/// The stream of Midi messages originating from this source port.
Stream<Uint8List> get messages {
return MidiPlatform.instance
Stream<Uint8List> stream = MidiPlatform.instance
.midiMessages()
.where((dynamic data) => data[Constants.port] == id)
.map<Uint8List?>((dynamic data) => data[Constants.data])
.transform(MessageSplitter());
.map<Uint8List>((dynamic data) => data[Constants.data] as Uint8List);
return stream.transform(MessageSplitter());
}

@override
bool operator ==(dynamic other) => other is MidiSourcePort && id == other.id;
bool operator ==(Object other) => other is MidiSourcePort && id == other.id;

@override
int get hashCode => id.hashCode;
404 changes: 203 additions & 201 deletions midi_io/macos/Classes/MidiIoPlugin.swift

Large diffs are not rendered by default.

1 change: 1 addition & 0 deletions midi_io/macos/Classes/WebMIDIKit/Extensions.swift
Original file line number Diff line number Diff line change
@@ -27,6 +27,7 @@ extension MIDIObjectType : CustomStringConvertible {
case .externalEntity: return "externalEntity"
case .externalSource: return "externalSource"
case .externalDestination: return "externalDestination"
default: return "unknownDestination"
}
}
}
4 changes: 2 additions & 2 deletions midi_io/macos/Classes/WebMIDIKit/MIDIClient.swift
Original file line number Diff line number Diff line change
@@ -28,8 +28,8 @@ internal final class MIDIClient : Equatable, Comparable, Hashable {
OSAssert(MIDIClientDispose(ref))
}

var hashValue: Int {
return ref.hashValue
func hash(into hasher: inout Hasher) {
hasher.combine(ref)
}

static func ==(lhs: MIDIClient, rhs: MIDIClient) -> Bool {
4 changes: 2 additions & 2 deletions midi_io/macos/Classes/WebMIDIKit/MIDIEndpoint.swift
Original file line number Diff line number Diff line change
@@ -32,8 +32,8 @@ internal class MIDIEndpoint : Equatable, Comparable, Hashable {
return lhs.id < rhs.id
}

final var hashValue: Int {
return id
func hash(into hasher: inout Hasher) {
hasher.combine(id)
}

final var id: Int {
5 changes: 2 additions & 3 deletions midi_io/macos/Classes/WebMIDIKit/MIDIPacketList.swift
Original file line number Diff line number Diff line change
@@ -53,7 +53,7 @@ extension MIDIPacket {

timeStamp = timestamp

var d = Data(data)
let d = Data(data)
length = UInt16(d.count)

/// write out bytes to data
@@ -92,8 +92,7 @@ extension MIDIPacketList: Sequence {
return AnyIterator {
defer {
p = MIDIPacketNext(&p).pointee
}

}
return i.next().map { _ in .init(packet: &p) }
}
}
4 changes: 2 additions & 2 deletions midi_io/macos/Classes/WebMIDIKit/MIDIPort.swift
Original file line number Diff line number Diff line change
@@ -106,8 +106,8 @@ public class MIDIPort : Equatable, Comparable, Hashable, CustomStringConvertible
return lhs.endpoint < rhs.endpoint
}

public final var hashValue: Int {
return endpoint.hashValue
public func hash(into hasher: inout Hasher) {
hasher.combine(endpoint)
}

public final var description: String {
2 changes: 1 addition & 1 deletion midi_io/macos/Classes/WebMIDIKit/MIDIPortMap.swift
Original file line number Diff line number Diff line change
@@ -69,7 +69,7 @@ public class MIDIPortMap<Value: MIDIPort> : Collection, CustomStringConvertible,
internal final func remove(_ endpoint: MIDIEndpoint) -> Value? {
//disconnect?
guard let port = self[endpoint] else { assert(false); return nil }
assert(port.state == .connected)
//assert(port.state == .connected)
self[port.id] = nil
return port
}
146 changes: 95 additions & 51 deletions midi_io/pubspec.lock
Original file line number Diff line number Diff line change
@@ -5,51 +5,50 @@ packages:
dependency: transitive
description:
name: async
url: "https://pub.dartlang.org"
sha256: "947bfcf187f74dbc5e146c9eb9c0f10c9f8b30743e341481c1e2ed3ecc18c20c"
url: "https://pub.dev"
source: hosted
version: "2.8.2"
version: "2.11.0"
boolean_selector:
dependency: transitive
description:
name: boolean_selector
url: "https://pub.dartlang.org"
sha256: "6cfb5af12253eaf2b368f07bacc5a80d1301a071c73360d746b7f2e32d762c66"
url: "https://pub.dev"
source: hosted
version: "2.1.0"
version: "2.1.1"
characters:
dependency: transitive
description:
name: characters
url: "https://pub.dartlang.org"
sha256: "04a925763edad70e8443c99234dc3328f442e811f1d8fd1a72f1c8ad0f69a605"
url: "https://pub.dev"
source: hosted
version: "1.2.0"
charcode:
dependency: transitive
description:
name: charcode
url: "https://pub.dartlang.org"
source: hosted
version: "1.3.1"
version: "1.3.0"
clock:
dependency: transitive
description:
name: clock
url: "https://pub.dartlang.org"
sha256: cb6d7f03e1de671e34607e909a7213e31d7752be4fb66a86d29fe1eb14bfb5cf
url: "https://pub.dev"
source: hosted
version: "1.1.0"
version: "1.1.1"
collection:
dependency: transitive
description:
name: collection
url: "https://pub.dartlang.org"
sha256: ee67cb0715911d28db6bf4af1026078bd6f0128b07a5f66fb2ed94ec6783c09a
url: "https://pub.dev"
source: hosted
version: "1.15.0"
version: "1.18.0"
fake_async:
dependency: transitive
description:
name: fake_async
url: "https://pub.dartlang.org"
sha256: "511392330127add0b769b75a987850d136345d9227c6b94c96a04cf4a391bf78"
url: "https://pub.dev"
source: hosted
version: "1.2.0"
version: "1.3.1"
flutter:
dependency: "direct main"
description: flutter
@@ -60,41 +59,78 @@ packages:
description: flutter
source: sdk
version: "0.0.0"
leak_tracker:
dependency: transitive
description:
name: leak_tracker
sha256: "7f0df31977cb2c0b88585095d168e689669a2cc9b97c309665e3386f3e9d341a"
url: "https://pub.dev"
source: hosted
version: "10.0.4"
leak_tracker_flutter_testing:
dependency: transitive
description:
name: leak_tracker_flutter_testing
sha256: "06e98f569d004c1315b991ded39924b21af84cf14cc94791b8aea337d25b57f8"
url: "https://pub.dev"
source: hosted
version: "3.0.3"
leak_tracker_testing:
dependency: transitive
description:
name: leak_tracker_testing
sha256: "6ba465d5d76e67ddf503e1161d1f4a6bc42306f9d66ca1e8f079a47290fb06d3"
url: "https://pub.dev"
source: hosted
version: "3.0.1"
matcher:
dependency: transitive
description:
name: matcher
url: "https://pub.dartlang.org"
sha256: d2323aa2060500f906aa31a895b4030b6da3ebdcc5619d14ce1aada65cd161cb
url: "https://pub.dev"
source: hosted
version: "0.12.11"
version: "0.12.16+1"
material_color_utilities:
dependency: transitive
description:
name: material_color_utilities
sha256: "0e0a020085b65b6083975e499759762399b4475f766c21668c4ecca34ea74e5a"
url: "https://pub.dev"
source: hosted
version: "0.8.0"
meta:
dependency: transitive
description:
name: meta
url: "https://pub.dartlang.org"
sha256: "7687075e408b093f36e6bbf6c91878cc0d4cd10f409506f7bc996f68220b9136"
url: "https://pub.dev"
source: hosted
version: "1.7.0"
version: "1.12.0"
midi_io_platform_interface:
dependency: "direct main"
description:
name: midi_io_platform_interface
url: "https://pub.dartlang.org"
sha256: ebaeadba56928edac6486f2e4704e5d037b12147d381590c8ec8db8c2a564301
url: "https://pub.dev"
source: hosted
version: "1.0.0"
version: "1.0.2"
path:
dependency: transitive
description:
name: path
url: "https://pub.dartlang.org"
sha256: "087ce49c3f0dc39180befefc60fdb4acd8f8620e5682fe2476afd0b3688bb4af"
url: "https://pub.dev"
source: hosted
version: "1.8.0"
version: "1.9.0"
plugin_platform_interface:
dependency: transitive
description:
name: plugin_platform_interface
url: "https://pub.dartlang.org"
sha256: "4820fbfdb9478b1ebae27888254d445073732dae3d6ea81f0b7e06d5dedc3f02"
url: "https://pub.dev"
source: hosted
version: "2.0.1"
version: "2.1.8"
sky_engine:
dependency: transitive
description: flutter
@@ -104,58 +140,66 @@ packages:
dependency: transitive
description:
name: source_span
url: "https://pub.dartlang.org"
sha256: "53e943d4206a5e30df338fd4c6e7a077e02254531b138a15aec3bd143c1a8b3c"
url: "https://pub.dev"
source: hosted
version: "1.8.1"
version: "1.10.0"
stack_trace:
dependency: transitive
description:
name: stack_trace
url: "https://pub.dartlang.org"
sha256: "73713990125a6d93122541237550ee3352a2d84baad52d375a4cad2eb9b7ce0b"
url: "https://pub.dev"
source: hosted
version: "1.10.0"
version: "1.11.1"
stream_channel:
dependency: transitive
description:
name: stream_channel
url: "https://pub.dartlang.org"
sha256: ba2aa5d8cc609d96bbb2899c28934f9e1af5cddbd60a827822ea467161eb54e7
url: "https://pub.dev"
source: hosted
version: "2.1.0"
version: "2.1.2"
string_scanner:
dependency: transitive
description:
name: string_scanner
url: "https://pub.dartlang.org"
sha256: "556692adab6cfa87322a115640c11f13cb77b3f076ddcc5d6ae3c20242bedcde"
url: "https://pub.dev"
source: hosted
version: "1.1.0"
version: "1.2.0"
term_glyph:
dependency: transitive
description:
name: term_glyph
url: "https://pub.dartlang.org"
sha256: a29248a84fbb7c79282b40b8c72a1209db169a2e0542bce341da992fe1bc7e84
url: "https://pub.dev"
source: hosted
version: "1.2.0"
version: "1.2.1"
test_api:
dependency: transitive
description:
name: test_api
url: "https://pub.dartlang.org"
sha256: "9955ae474176f7ac8ee4e989dadfb411a58c30415bcfb648fa04b2b8a03afa7f"
url: "https://pub.dev"
source: hosted
version: "0.4.3"
typed_data:
version: "0.7.0"
vector_math:
dependency: transitive
description:
name: typed_data
url: "https://pub.dartlang.org"
name: vector_math
sha256: "80b3257d1492ce4d091729e3a67a60407d227c27241d6927be0130c98e741803"
url: "https://pub.dev"
source: hosted
version: "1.3.0"
vector_math:
version: "2.1.4"
vm_service:
dependency: transitive
description:
name: vector_math
url: "https://pub.dartlang.org"
name: vm_service
sha256: a2662fb1f114f4296cf3f5a50786a2d888268d7776cf681aa17d660ffa23b246
url: "https://pub.dev"
source: hosted
version: "2.1.0"
version: "14.0.0"
sdks:
dart: ">=2.12.0 <3.0.0"
flutter: ">=1.20.0"
dart: ">=3.3.0-0 <4.0.0"
flutter: ">=3.18.0-18.0.pre.54"
23 changes: 0 additions & 23 deletions midi_io/test/midi_io_test.dart

This file was deleted.