From cf7321ca000a4cbdfabeaaf9cbe131bc7da02c28 Mon Sep 17 00:00:00 2001
From: Albert Graef <aggraef@gmail.com>
Date: Tue, 25 Oct 2016 15:53:01 +0200
Subject: [PATCH] Get rid of some really annoying legacy Tcl commands in the
core. As long as we don't have any LED indicators in the console window, show
an error for audio dropouts instead. Also get rid of some debugging messages
in the pddp.
---
externals/pddp/pddplink.c | 4 ++--
pd/src/g_array.c | 5 +++--
pd/src/m_sched.c | 15 ++++++++++-----
3 files changed, 15 insertions(+), 9 deletions(-)
diff --git a/externals/pddp/pddplink.c b/externals/pddp/pddplink.c
index 57bcdca08..336a0ce09 100644
--- a/externals/pddp/pddplink.c
+++ b/externals/pddp/pddplink.c
@@ -341,14 +341,14 @@ static char *pddplink_optext(int *sizep, int ac, t_atom *av)
static void pddplink_free(t_pddplink *x)
{
-post("freeing the thing...");
+//post("freeing the thing...");
if (x->x_vistext)
freebytes(x->x_vistext, x->x_vissize);
}
static void *pddplink_new(t_symbol *s, int ac, t_atom *av)
{
-post("creating a new link");
+//post("creating a new link");
t_pddplink xgen, *x;
int skip;
xgen.x_isboxed = 0;
diff --git a/pd/src/g_array.c b/pd/src/g_array.c
index aa1b0e0b9..e88aecbab 100644
--- a/pd/src/g_array.c
+++ b/pd/src/g_array.c
@@ -1548,8 +1548,9 @@ static void garray_doredraw(t_gobj *client, t_glist *glist)
if (selected)
{
//fprintf(stderr,"garray_doredraw isselected\n");
- sys_vgui("pdtk_select_all_gop_widgets .x%lx %lx %d\n",
- glist_getcanvas(glist), glist, 1);
+ // XXXFIXME?
+ //sys_vgui("pdtk_select_all_gop_widgets .x%lx %lx %d\n",
+ // glist_getcanvas(glist), glist, 1);
// a giant kludge-- we really just need gop items
// to be children of their gop <group>
t_scalar *sc = x->x_scalar;
diff --git a/pd/src/m_sched.c b/pd/src/m_sched.c
index 87b25b08a..b47e8a40f 100644
--- a/pd/src/m_sched.c
+++ b/pd/src/m_sched.c
@@ -294,7 +294,9 @@ void sys_log_error(int type)
if (type != ERR_NOTHING && !sched_diored &&
(sched_diddsp >= sched_dioredtime))
{
- sys_vgui("pdtk_pd_dio 1\n");
+ // XXXFIXME
+ //sys_vgui("pdtk_pd_dio 1\n");
+ error("audio I/O dropout");
sched_diored = 1;
}
sched_dioredtime =
@@ -327,7 +329,8 @@ static void sched_pollformeters( void)
return;
if (sched_diored && (sched_diddsp - sched_dioredtime > 0))
{
- sys_vgui("pdtk_pd_dio 0\n");
+ // XXXFIXME
+ //sys_vgui("pdtk_pd_dio 0\n");
sched_diored = 0;
}
if (sched_meterson)
@@ -347,7 +350,8 @@ static void sched_pollformeters( void)
if (inclip != sched_lastinclip || outclip != sched_lastoutclip
|| indb != sched_lastindb || outdb != sched_lastoutdb)
{
- sys_vgui("pdtk_pd_meters %d %d %d %d\n", indb, outdb, inclip, outclip);
+ // XXXFIXME
+ //sys_vgui("pdtk_pd_meters %d %d %d %d\n", indb, outdb, inclip, outclip);
sched_lastinclip = inclip;
sched_lastoutclip = outclip;
sched_lastindb = indb;
@@ -403,7 +407,8 @@ void sched_set_using_audio(int flag)
sys_time_per_dsp_tick = (TIMEUNITPERSECOND) *
((double)sys_schedblocksize) / sys_dacsr;
- sys_vgui("pdtk_pd_dsp %s\n", flag ? "on" : "off");
+ // XXXFIXME
+ //sys_vgui("pdtk_pd_dsp %s\n", flag ? "on" : "off");
}
/* take the scheduler forward one DSP tick, also handling clock timeouts */
@@ -510,7 +515,7 @@ static void m_pollingscheduler( void)
idletime = sys_getrealtime();
else if (sys_getrealtime() - idletime > 1.)
{
- error("audio I/O stuck... closing audio\n");
+ error("audio I/O stuck... closing audio");
sys_close_audio();
sched_set_using_audio(SCHED_AUDIO_NONE);
goto waitfortick;
--
GitLab