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

Fixes #414. Don't try and send t_symbol into object_error #415

Merged
merged 1 commit into from
Feb 26, 2024
Merged

Fixes #414. Don't try and send t_symbol into object_error #415

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
15 changes: 11 additions & 4 deletions source/include/clients/nrt/FluidListToBuf.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -210,7 +210,11 @@ void FluidListToBuf_list(FluidListToBuf* x, t_symbol* /*s*/, long argc,
{
if(isr())
{
object_error((t_object*) x, "Internal buffer %s not initialised and called on high-priority thread. Either initialise object with size, or call on main thread", x->output->name());
object_error((t_object*) x,
"Internal buffer %s not initialised and called on "
"high-priority thread. Either initialise object with "
"size, or call on main thread",
x->output->name()->s_name);
return;
} else resizeAnyway = true;
}
Expand All @@ -221,7 +225,8 @@ void FluidListToBuf_list(FluidListToBuf* x, t_symbol* /*s*/, long argc,

if (!buf.exists())
{
object_error((t_object*) x, "Buffer %s not found", x->output->name());
object_error((t_object*) x, "Buffer %s not found",
x->output->name()->s_name);
return;
}

Expand All @@ -236,14 +241,16 @@ void FluidListToBuf_list(FluidListToBuf* x, t_symbol* /*s*/, long argc,
x->axis == 0 ? 1 : x->startChannel + argc,
x->output->sampleRate())
.ok())
object_error((t_object*) x, "Can't resize buffer %s", x->output->name());
object_error((t_object*) x, "Can't resize buffer %s",
x->output->name()->s_name);
else
count = argc;
}

if (!buf.valid())
{
object_error((t_object*) x, "Buffer %s not initialised", x->output->name());
object_error((t_object*) x, "Buffer %s not initialised",
x->output->name()->s_name);
return;
}

Expand Down