Skip to content

fix: cancel ALSA receive subscription on disconnect for clean shutdown #13

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
thorinside wants to merge 1 commit into
base: master
Choose a base branch
from
Open

fix: cancel ALSA receive subscription on disconnect for clean shutdown #13

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
64 changes: 44 additions & 20 deletions lib/flutter_midi_command_linux.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,15 +8,22 @@ class LinuxMidiDevice extends MidiDevice {
int cardId;
int deviceId;
AlsaMidiDevice _device;

LinuxMidiDevice(this._device, this.cardId, this.deviceId, String name, String type,
this._rxStreamCtrl, bool connected)
: super(
AlsaMidiDevice.hardwareId(cardId, deviceId),
name,
type,
connected,
) {
StreamSubscription? _receivedMessagesSub;

LinuxMidiDevice(
this._device,
this.cardId,
this.deviceId,
String name,
String type,
this._rxStreamCtrl,
bool connected,
) : super(
AlsaMidiDevice.hardwareId(cardId, deviceId),
name,
type,
connected,
) {
// Get input, output ports
var i = 0;
_device.inputPorts.toList().forEach((element) {
Expand All @@ -33,7 +40,7 @@ class LinuxMidiDevice extends MidiDevice {
connected = true;

// connect up incoming alsa midi data to our rx stream of MidiPackets
_device.receivedMessages.listen((event) {
_receivedMessagesSub = _device.receivedMessages.listen((event) {
_rxStreamCtrl.add(MidiPacket(event.data, event.timestamp, this));
});
return true;
Expand All @@ -44,18 +51,23 @@ class LinuxMidiDevice extends MidiDevice {
}

disconnect() {
_receivedMessagesSub?.cancel();
_receivedMessagesSub = null;
_device.disconnect();
connected = false;
}
}

class FlutterMidiCommandLinux extends MidiCommandPlatform {
StreamController<MidiPacket> _rxStreamController = StreamController<MidiPacket>.broadcast();
StreamController<MidiPacket> _rxStreamController =
StreamController<MidiPacket>.broadcast();
late Stream<MidiPacket> _rxStream;
StreamController<String> _setupStreamController = StreamController<String>.broadcast();
StreamController<String> _setupStreamController =
StreamController<String>.broadcast();
late Stream<String> _setupStream;

Map<String, LinuxMidiDevice> _connectedDevices = Map<String, LinuxMidiDevice>();
Map<String, LinuxMidiDevice> _connectedDevices =
Map<String, LinuxMidiDevice>();

final List<AlsaMidiDevice> _allAlsaDevices = [];

Expand Down Expand Up @@ -88,15 +100,19 @@ class FlutterMidiCommandLinux extends MidiCommandPlatform {
"native",
_rxStreamController,
_connectedDevices.containsKey(
AlsaMidiDevice.hardwareId(alsMidiDevice.cardId, alsMidiDevice.deviceId)),
AlsaMidiDevice.hardwareId(
alsMidiDevice.cardId,
alsMidiDevice.deviceId,
),
),
),
)
.toList();
}


/// Prepares Bluetooth system
@override Future<void> startBluetoothCentral() async {
@override
Future<void> startBluetoothCentral() async {
return Future.error("Not available on linux");
}

Expand All @@ -112,7 +128,10 @@ class FlutterMidiCommandLinux extends MidiCommandPlatform {

/// Connects to the device.
@override
Future<void> connectToDevice(MidiDevice device, {List<MidiPort>? ports}) async {
Future<void> connectToDevice(
MidiDevice device, {
List<MidiPort>? ports,
}) async {
print('connect to $device');

var linuxDevice = device as LinuxMidiDevice;
Expand Down Expand Up @@ -140,12 +159,17 @@ class FlutterMidiCommandLinux extends MidiCommandPlatform {

@override
void teardown() {
_connectedDevices.values.forEach((device) {
_connectedDevices.values.toList().forEach((device) {
disconnectDevice(device, remove: false);
});
_connectedDevices.clear();
_setupStreamController.add("deviceDisconnected");
_rxStreamController.close();
if (!_setupStreamController.isClosed) {
_setupStreamController.add("deviceDisconnected");
_setupStreamController.close();
}
if (!_rxStreamController.isClosed) {
_rxStreamController.close();
}
}

/// Sends data to the currently connected device.wmidi hardware driver name
Expand Down