X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fspring-smob.cc;h=19a5eef4c5ff87ffc4fc18a84f2f0af14fce3286;hb=a6a51abfd0195a3cf7d6ea095cf69808852f21ce;hp=8e263d06944bd406b3bbff5a7a12165ce3f7a917;hpb=4a401ca1c60f428daa242dbdd102fdb3f327ebfb;p=lilypond.git

diff --git a/lily/spring-smob.cc b/lily/spring-smob.cc
index 8e263d0694..19a5eef4c5 100644
--- a/lily/spring-smob.cc
+++ b/lily/spring-smob.cc
@@ -1,7 +1,7 @@
 /*
   This file is part of LilyPond, the GNU music typesetter.
 
-  Copyright (C) 1999--2011 Han-Wen Nienhuys <hanwen@xs4all.nl>
+  Copyright (C) 1999--2015 Han-Wen Nienhuys <hanwen@xs4all.nl>
 
   LilyPond is free software: you can redistribute it and/or modify
   it under the terms of the GNU General Public License as published by
@@ -19,26 +19,52 @@
 
 #include "spring.hh"
 #include "warn.hh"
-#include "ly-smobs.icc"
 
-IMPLEMENT_SIMPLE_SMOBS (Spring);
+
+
 
 SCM
-Spring::mark_smob (SCM)
+Spring::equal_p (SCM a, SCM b)
 {
-  return SCM_UNSPECIFIED;
+  // TODO SCM: This could be made simpler.
+  return scm_is_eq (a, b) ? SCM_BOOL_T : SCM_BOOL_F;
 }
 
-int
-Spring::print_smob (SCM, SCM p, scm_print_state *)
+LY_DEFINE (ly_make_spring, "ly:make-spring",
+           2, 0, 0, (SCM ideal, SCM min_dist),
+           "Make a spring.  @var{ideal} is the ideal distance of the"
+           " spring, and @var{min-dist} is the minimum distance.")
 {
-  scm_puts ("#<Spring smob>", p);
-  return 1;
+  LY_ASSERT_TYPE (scm_is_number, ideal, 1);
+  LY_ASSERT_TYPE (scm_is_number, min_dist, 2);
+
+  Spring s (scm_to_double (ideal), scm_to_double (min_dist));
+
+  return s.smobbed_copy ();
 }
 
-SCM
-Spring::equal_p (SCM a, SCM b)
+LY_DEFINE (ly_spring_set_inverse_compress_strength_x, "ly:spring-set-inverse-compress-strength!",
+           2, 0, 0, (SCM spring, SCM strength),
+           "Set the inverse compress @var{strength} of @var{spring}.")
+{
+  LY_ASSERT_SMOB (Spring, spring, 1);
+  LY_ASSERT_TYPE (scm_is_number, strength, 2);
+
+  Spring *s = unsmob<Spring> (spring);
+  s->set_inverse_compress_strength (scm_to_double (strength));
+  return s->smobbed_copy ();
+}
+
+LY_DEFINE (ly_spring_set_inverse_stretch_strength_x, "ly:spring-set-inverse-stretch-strength!",
+           2, 0, 0, (SCM spring, SCM strength),
+           "Set the inverse stretch @var{strength} of @var{spring}.")
 {
-  return a == b ? SCM_BOOL_T : SCM_BOOL_F;
+  LY_ASSERT_SMOB (Spring, spring, 1);
+  LY_ASSERT_TYPE (scm_is_number, strength, 2);
+
+  Spring *s = unsmob<Spring> (spring);
+  s->set_inverse_stretch_strength (scm_to_double (strength));
+  return s->smobbed_copy ();
 }
 
+const char * const Spring::type_p_name_ = "ly:spring?";