Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
P
purr-data
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Model registry
Operate
Environments
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Jonathan Wilkes
purr-data
Commits
d7432e4a
Commit
d7432e4a
authored
8 years ago
by
Albert Gräf
Browse files
Options
Downloads
Patches
Plain Diff
Backported vanilla commit 44776289 by umlaeute: silence DSP-error when autopatching.
parent
a85a24dc
No related branches found
Branches containing commit
No related tags found
Tags containing commit
1 merge request
!80
Backport of vanilla signalin fixes
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
pd/src/d_ugen.c
+4
-10
4 additions, 10 deletions
pd/src/d_ugen.c
with
4 additions
and
10 deletions
pd/src/d_ugen.c
+
4
−
10
View file @
d7432e4a
...
@@ -686,15 +686,9 @@ void ugen_connect(t_dspcontext *dc, t_object *x1, int outno, t_object *x2,
...
@@ -686,15 +686,9 @@ void ugen_connect(t_dspcontext *dc, t_object *x1, int outno, t_object *x2,
error
(
"object with signal outlets but no DSP method?"
);
error
(
"object with signal outlets but no DSP method?"
);
/* check if it's a "text" (i.e., object wasn't created) -
/* check if it's a "text" (i.e., object wasn't created) -
if so fail silently */
if so fail silently */
t_text
*
t2
=
(
t_text
*
)
x2
;
else
if
(
!
(
x2
&&
(
pd_class
(
&
x2
->
ob_pd
)
==
text_class
)))
// The following only happens if the DAC is on while connecting
pd_error
(
u1
->
u_obj
,
// objects. If this is not yet initialized object we don't
"signal outlet connect to nonsignal inlet (ignored)"
);
// really know if its inlet is signal or not, so we don't post
// the error.
if
(
pd_class
(
&
t2
->
te_pd
)
!=
text_class
||
(
pd_class
(
&
t2
->
te_pd
)
==
text_class
&&
t2
->
te_type
==
T_TEXT
))
pd_error
(
u1
->
u_obj
,
"signal outlet connect to nonsignal inlet (ignored)"
);
return
;
return
;
}
}
if
(
sigoutno
<
0
||
sigoutno
>=
u1
->
u_nout
||
siginno
>=
u2
->
u_nin
)
if
(
sigoutno
<
0
||
sigoutno
>=
u1
->
u_nout
||
siginno
>=
u2
->
u_nin
)
...
@@ -743,7 +737,7 @@ static void ugen_doit(t_dspcontext *dc, t_ugenbox *u)
...
@@ -743,7 +737,7 @@ static void ugen_doit(t_dspcontext *dc, t_ugenbox *u)
is set. We don't yet know if a subcanvas will be "blocking" so there
is set. We don't yet know if a subcanvas will be "blocking" so there
we delay new signal creation, which will be handled by calling
we delay new signal creation, which will be handled by calling
signal_setborrowed in the ugen_done_graph routine below. */
signal_setborrowed in the ugen_done_graph routine below. */
int
nonewsigs
=
(
class
==
canvas_class
||
int
nonewsigs
=
(
class
==
canvas_class
||
((
class
==
vinlet_class
)
&&
!
(
dc
->
dc_reblock
)));
((
class
==
vinlet_class
)
&&
!
(
dc
->
dc_reblock
)));
/* when we encounter a subcanvas or a signal outlet, suppress freeing
/* when we encounter a subcanvas or a signal outlet, suppress freeing
the input signals as they may be "borrowed" for the super or sub
the input signals as they may be "borrowed" for the super or sub
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment