release: 1.5.19

[lilypond.git] / lily / music.cc

diff --git a/lily/music.cc b/lily/music.cc
index 75bf2746fb5d0da3b246e0aa92f4337e579d63e6..178a602aa74a1340a0a5f5a25a520e957cd3f7d9 100644 (file)
--- a/lily/music.cc
+++ b/lily/music.cc
@@ -19,18 +19,25 @@ ly_deep_mus_copy (SCM m)
   if (unsmob_music (m))
     {
       SCM ss =  unsmob_music (m)->clone ()->self_scm ();
-      scm_unprotect_object (ss);
+      scm_gc_unprotect_object (ss);
       return ss;
     }
   else if (gh_pair_p (m))
     {
-      return gh_cons (ly_deep_mus_copy (gh_car (m)), ly_deep_mus_copy (gh_cdr (m)));
+      return gh_cons (ly_deep_mus_copy (ly_car (m)), ly_deep_mus_copy (ly_cdr (m)));
     }
   else
     return m;
 }
 
 
+Music::Music ()
+{
+  immutable_property_alist_ = SCM_EOL;
+  mutable_property_alist_ = SCM_EOL;
+  smobify_self ();
+}
+
 Music::Music (Music const &m)
 {
   immutable_property_alist_ = m.immutable_property_alist_;
@@ -50,6 +57,7 @@ Music::Music (SCM l)
   smobify_self ();
 }
 
+
 SCM
 Music::mark_smob (SCM m)
 {
@@ -81,14 +89,21 @@ Music::length_mom () const
   return 0;
 }
 
+Moment
+Music::start_mom () const
+{
+  Moment m ;
+  return m;
+}
+
 void
 print_alist (SCM a, SCM port)
 {
-  for (SCM s = a; gh_pair_p (s); s = gh_cdr (s))
+  for (SCM s = a; gh_pair_p (s); s = ly_cdr (s))
     {
-      scm_display (gh_caar (s), port);
+      scm_display (ly_caar (s), port);
       scm_puts (" = ", port); 
-      scm_write (gh_cdar (s), port);
+      scm_write (ly_cdar (s), port);
       scm_puts ("\n", port);
     }
 }
@@ -120,30 +135,24 @@ Music::transpose (Pitch)
 }
 
 IMPLEMENT_TYPE_P (Music, "music?");
-IMPLEMENT_UNSMOB (Music,music);
+
 IMPLEMENT_SMOBS (Music);
 IMPLEMENT_DEFAULT_EQUAL_P (Music);
 
 /****************************/
 
 SCM
-Music::get_mus_property (const char *nm) const
-{
-  SCM sym = ly_symbol2scm (nm);
-  return get_mus_property (sym);
-}
-
-SCM
-Music::get_mus_property (SCM sym) const
+Music::internal_get_mus_property (SCM sym) const
 {
   SCM s = scm_sloppy_assq (sym, mutable_property_alist_);
   if (s != SCM_BOOL_F)
-    return gh_cdr (s);
+    return ly_cdr (s);
 
   s = scm_sloppy_assq (sym, immutable_property_alist_);
-  return (s == SCM_BOOL_F) ? SCM_EOL : gh_cdr (s); 
+  return (s == SCM_BOOL_F) ? SCM_EOL : ly_cdr (s); 
 }
 
+#if 0
 /*
   Remove the value associated with KEY, and return it. The result is
   that a next call will yield SCM_EOL (and not the underlying
@@ -158,18 +167,18 @@ Music::remove_mus_property (const char* key)
   return val;
 }
 
-void
-Music::set_mus_property (const char* k, SCM v)
+SCM
+Music::get_mus_property (const char *nm) const
 {
-  SCM s = ly_symbol2scm (k);
-  set_mus_property (s, v);
+  SCM sym = ly_symbol2scm (nm);
+  return get_mus_property (sym);
 }
 
 void
-Music::set_immutable_mus_property (const char*k, SCM v)
+Music::set_mus_property (const char* k, SCM v)
 {
   SCM s = ly_symbol2scm (k);
-  set_immutable_mus_property (s, v);
+  set_mus_property (s, v);
 }
 
 void
@@ -178,19 +187,19 @@ Music::set_immutable_mus_property (SCM s, SCM v)
   immutable_property_alist_ = gh_cons (gh_cons (s,v), mutable_property_alist_);
   mutable_property_alist_ = scm_assq_remove_x (mutable_property_alist_, s);
 }
+#endif
+
 void
-Music::set_mus_property (SCM s, SCM v)
+Music::internal_set_mus_property (SCM s, SCM v)
 {
   mutable_property_alist_ = scm_assq_set_x (mutable_property_alist_, s, v);
 }
 
 #include "main.hh"
+
 void
 Music::set_spot (Input ip)
 {
-  /* misuse midi-debug flag: don't store origin */
-  if (midi_debug_global_b)
-    return;
   set_mus_property ("origin", make_input (ip));
 }
 
@@ -219,7 +228,7 @@ ly_get_mus_property (SCM mus, SCM sym)
   
   if (sc)
     {
-      return sc->get_mus_property (sym);
+      return sc->internal_get_mus_property (sym);
     }
   else
     {
@@ -245,7 +254,7 @@ ly_set_mus_property (SCM mus, SCM sym, SCM val)
 
   if (sc)
     {
-      sc->set_mus_property (sym, val);
+      sc->internal_set_mus_property (sym, val);
     }
   else
     {
@@ -271,16 +280,33 @@ ly_make_music (SCM type)
   else
     {
       SCM s =       get_music (ly_scm2string (type))->self_scm ();
-      scm_unprotect_object (s);
+      scm_gc_unprotect_object (s);
       return s;
     }
 }
 
+SCM
+ly_music_name (SCM mus)
+{
+  Music * m = unsmob_music (mus);
+  const char *nm ="";
+  if (!m)
+    {
+      warning (_ ("ly_music_name (): Not a music expression"));
+      scm_write (mus, scm_current_error_port ());      
+    }
+   else
+     nm = classname (m);
+   return ly_str02scm (nm);
+}
+
 static void
 init_functions ()
 {
-  scm_make_gsubr ("ly-get-mus-property", 2, 0, 0, (Scheme_function_unknown)ly_get_mus_property);
-  scm_make_gsubr ("ly-set-mus-property", 3, 0, 0, (Scheme_function_unknown)ly_set_mus_property);
-  scm_make_gsubr ("ly-make-music", 1, 0, 0, (Scheme_function_unknown)ly_make_music);  
+  scm_c_define_gsubr ("ly-get-mus-property", 2, 0, 0, (Scheme_function_unknown)ly_get_mus_property);
+  scm_c_define_gsubr ("ly-set-mus-property", 3, 0, 0, (Scheme_function_unknown)ly_set_mus_property);
+  scm_c_define_gsubr ("ly-make-music", 1, 0, 0, (Scheme_function_unknown)ly_make_music);
+  scm_c_define_gsubr ("ly-music-name", 1, 0, 0, (Scheme_function_unknown)ly_music_name);    
 }
 ADD_SCM_INIT_FUNC (musicscm,init_functions);
+ADD_MUSIC(Music);