aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorThomas Grill <xovo@users.sourceforge.net>2005-08-11 15:02:40 +0000
committerThomas Grill <xovo@users.sourceforge.net>2005-08-11 15:02:40 +0000
commit1ce70c40c0ea52f56d3c017c44c8e456a403ce81 (patch)
tree34252fdf0a174c687200d9bf266f0bd534353101
parent20d0aa013eb0f0e3f2b015a4453304ef9abb81ad (diff)
fixed integer representation
rename help file more fixes svn path=/trunk/; revision=3419
-rw-r--r--externals/grill/deljoin/deljoin-help.pd (renamed from externals/grill/deljoin/help-deljoin.pd)0
-rwxr-xr-xexternals/grill/deljoin/main.cpp12
2 files changed, 7 insertions, 5 deletions
diff --git a/externals/grill/deljoin/help-deljoin.pd b/externals/grill/deljoin/deljoin-help.pd
index bf49460e..bf49460e 100644
--- a/externals/grill/deljoin/help-deljoin.pd
+++ b/externals/grill/deljoin/deljoin-help.pd
diff --git a/externals/grill/deljoin/main.cpp b/externals/grill/deljoin/main.cpp
index d01e8fed..06d41d8b 100755
--- a/externals/grill/deljoin/main.cpp
+++ b/externals/grill/deljoin/main.cpp
@@ -130,11 +130,13 @@ void deljoin::m_list(const t_symbol *s,int argc,const t_atom *argv)
const t_atom &a = argv[i];
if(IsSymbol(a))
strcpy(t,GetString(a));
- else if(IsInt(a)) {
- STD::sprintf(t,"%i",GetInt(a),10);
- }
- else if(IsFloat(a)) {
- STD::sprintf(t,"%f",GetFloat(a),10);
+ else if(CanbeFloat(a)) {
+ const float f = GetAFloat(a);
+ const int fi = (int)f;
+ if(f == fi)
+ STD::sprintf(t,"%i",fi,10);
+ else
+ STD::sprintf(t,"%f",f,10);
}
// else do nothing