Skip to content
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

Jump to bottom

Fix Hanging On Input Read #15

Open
wants to merge 5 commits into
base: master
Choose a base branch
from
Open

Fix Hanging On Input Read #15

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
3521492
fix errors in portmidi in handling
Kovak Jun 10, 2019
ffb3967
sleep between polling so we dont poll too fast
Kovak Jun 10, 2019
a0e78d8
make sleep time configurable
Kovak Jun 10, 2019
560d07d
fix some spacing things
Kovak Jun 11, 2019
7258af7
more spacing fixes
Kovak Jun 11, 2019
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
9 changes: 7 additions & 2 deletions lib/portmidi/input/reader.ex
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,10 @@
defmodule PortMidi.Input.Reader do
import PortMidi.Nifs.Input
alias PortMidi.Input.Server
require Logger

@buffer_size Application.get_env(:portmidi, :buffer_size, 256)
@input_poll_sleep Application.get_env(:portmidi, :input_poll_sleep, 1)

def start_link(server, device_name) do
Agent.start_link fn -> start(server, device_name) end
Expand Down Expand Up @@ -35,12 +37,15 @@ defmodule PortMidi.Input.Reader do

defp loop(server, stream) do
if do_poll(stream) == :read, do: read_and_send(server,stream)
:timer.sleep(@input_poll_sleep)
loop(server, stream)
end

defp read_and_send(server, stream) do
messages = do_read(stream, @buffer_size)
Server.new_messages(server, messages)
case do_read(stream, @buffer_size) do
{:error, reason} -> Logger.debug("Error Reading Midi: #{reason}")
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Just a thought - it would be nice to design a way to let the caller specify the behaviour when such a message happens (e.g. a configurable callback of some sort), maybe with a default implementation?

messages -> Server.new_messages(server, messages)
end
end

defp do_stop({_server, stream, task}) do
Expand Down
12 changes: 6 additions & 6 deletions src/portmidi_in.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -70,10 +70,13 @@ static ERL_NIF_TERM do_read(ErlNifEnv* env, int arc, const ERL_NIF_TERM argv[])
if(!enif_get_resource(env, argv[0], streamType, (PortMidiStream **) &stream)) {
return enif_make_badarg(env);
}

int bufferSize = enif_make_int(env, argv[2]);
long bufferSize;
enif_get_long(env, argv[1], &bufferSize);
int numEvents = Pm_Read(*stream, buffer, bufferSize);

if (numEvents < 0) {
ERL_NIF_TERM reason = enif_make_atom(env, makePmErrorAtom(numEvents));
return enif_make_tuple2(env, enif_make_atom(env, "error"), reason);
}
ERL_NIF_TERM events[numEvents];
for(int i = 0; i < numEvents; i++) {
status = enif_make_int(env, Pm_MessageStatus(buffer[i].message));
Expand All @@ -86,7 +89,6 @@ static ERL_NIF_TERM do_read(ErlNifEnv* env, int arc, const ERL_NIF_TERM argv[])
timestamp
);
}

return enif_make_list_from_array(env, events, numEvents);
}

Expand All @@ -97,9 +99,7 @@ static ERL_NIF_TERM do_close(ErlNifEnv* env, int arc, const ERL_NIF_TERM argv[])
if(!enif_get_resource(env, argv[0], streamType, (PortMidiStream **) &stream)) {
return enif_make_badarg(env);
}

Pm_Close(*stream);

return enif_make_atom(env, "ok");
}

Expand Down