From bd1ff5651112db6a314abb403c245042213807c9 Mon Sep 17 00:00:00 2001
From: Jonathan Wilkes <jon.w.wilkes@gmail.com>
Date: Tue, 30 Aug 2016 18:02:25 -0400
Subject: [PATCH] add default float for Pd's "quit" method (useful for
automated build tests)
---
pd/src/g_editor.c | 2 +-
pd/src/m_glob.c | 3 ++-
pd/src/m_imp.h | 2 +-
pd/src/s_inter.c | 4 ++--
4 files changed, 6 insertions(+), 5 deletions(-)
diff --git a/pd/src/g_editor.c b/pd/src/g_editor.c
index 214a7a74c..85ba108ff 100644
--- a/pd/src/g_editor.c
+++ b/pd/src/g_editor.c
@@ -5416,7 +5416,7 @@ void glob_verifyquit(void *dummy, t_floatarg f)
else
{
post("Quitting Pd...");
- glob_quit(0);
+ glob_quit(0, 0);
}
}
diff --git a/pd/src/m_glob.c b/pd/src/m_glob.c
index db6f64d6a..35636d292 100644
--- a/pd/src/m_glob.c
+++ b/pd/src/m_glob.c
@@ -103,7 +103,8 @@ void glob_init(void)
gensym("filename"), A_SYMBOL, A_SYMBOL, 0);
class_addmethod(glob_pdobject, (t_method)glob_evalfile, gensym("open"),
A_SYMBOL, A_SYMBOL, 0);
- class_addmethod(glob_pdobject, (t_method)glob_quit, gensym("quit"), 0);
+ class_addmethod(glob_pdobject, (t_method)glob_quit, gensym("quit"),
+ A_DEFFLOAT, 0);
class_addmethod(glob_pdobject, (t_method)glob_verifyquit,
gensym("verifyquit"), A_DEFFLOAT, 0);
class_addmethod(glob_pdobject, (t_method)glob_foo, gensym("foo"), A_GIMME, 0);
diff --git a/pd/src/m_imp.h b/pd/src/m_imp.h
index cffba1ffa..c54267124 100644
--- a/pd/src/m_imp.h
+++ b/pd/src/m_imp.h
@@ -104,6 +104,6 @@ EXTERN int obj_sigoutletindex(t_object *x, int m);
/* misc */
EXTERN void glob_evalfile(t_pd *ignore, t_symbol *name, t_symbol *dir);
EXTERN void glob_initfromgui(void *dummy, t_symbol *s, int argc, t_atom *argv);
-EXTERN void glob_quit(void *dummy);
+EXTERN void glob_quit(void *dummy, t_floatarg status);
#define __m_imp_h_
#endif /* __m_imp_h_ */
diff --git a/pd/src/s_inter.c b/pd/src/s_inter.c
index 85e9b3ddb..37d6ac0b6 100644
--- a/pd/src/s_inter.c
+++ b/pd/src/s_inter.c
@@ -1632,7 +1632,7 @@ extern void glob_closeall(void *dummy, t_floatarg fforce);
extern int do_not_redraw;
-void glob_quit(void *dummy)
+void glob_quit(void *dummy, t_floatarg status)
{
/* If we're going to try to cleanly close everything here, we should
do the same for all open patches and that is currently not the case,
@@ -1654,6 +1654,6 @@ void glob_quit(void *dummy)
sys_closesocket(sys_guisock);
sys_rmpollfn(sys_guisock);
}
- sys_bail(0);
+ sys_bail(status);
}
--
GitLab