X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fmusic.cc;h=56b6998820c821c2a4a2917a5090cd60aca92a44;hb=b3cf2199183a184c7eef9a9f8f3c9a691db1f0ad;hp=8ab9028da0944fa10db69672fd792c1b549d4e59;hpb=108cf0e8c08c8e15e2a800feb161cfad9057daa8;p=lilypond.git

diff --git a/lily/music.cc b/lily/music.cc
index 8ab9028da0..56b6998820 100644
--- a/lily/music.cc
+++ b/lily/music.cc
@@ -3,15 +3,19 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 1997--2005 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c) 1997--2006 Han-Wen Nienhuys <hanwen@xs4all.nl>
 */
 
 #include "music.hh"
-#include "music-sequence.hh"
+
+#include "context.hh"
+#include "dispatcher.hh"
 #include "duration.hh"
 #include "input-smob.hh"
+#include "international.hh"
 #include "ly-smobs.icc"
 #include "main.hh"
+#include "music-sequence.hh"
 #include "pitch.hh"
 #include "score.hh"
 #include "warn.hh"
@@ -31,23 +35,12 @@ Music::internal_is_music_type (SCM k) const
   return scm_c_memq (k, ifs) != SCM_BOOL_F;
 }
 
-String
-Music::name () const
-{
-  SCM nm = get_property ("name");
-  if (scm_is_symbol (nm))
-    return ly_symbol2string (nm);
-  else
-    return classname (this);
-}
-
 Music::Music (SCM init)
+  : Prob (ly_symbol2scm ("Music"), init)
 {
-  self_scm_ = SCM_EOL;
-  immutable_property_alist_ = init;
-  mutable_property_alist_ = SCM_EOL;
-  smobify_self ();
-
+  length_callback_ = SCM_EOL;
+  start_callback_ = SCM_EOL;
+  
   length_callback_ = get_property ("length-callback");
   if (!ly_is_procedure (length_callback_))
     length_callback_ = duration_length_callback_proc;
@@ -55,38 +48,34 @@ Music::Music (SCM init)
   start_callback_ = get_property ("start-callback");
 }
 
-Music::Music (Music const &m)
+void
+Music::derived_mark () const
 {
-  immutable_property_alist_ = m.immutable_property_alist_;
-  mutable_property_alist_ = SCM_EOL;
-  self_scm_ = SCM_EOL;
-
-  /* First we smobify_self, then we copy over the stuff.  If we don't,
-     stack vars that hold the copy might be optimized away, meaning
-     that they won't be protected from GC. */
-  smobify_self ();
-  mutable_property_alist_ = ly_music_deep_copy (m.mutable_property_alist_);
-  length_callback_ = m.length_callback_;
-  start_callback_ = m.start_callback_;
-  set_spot (*m.origin ());
+  scm_gc_mark (length_callback_);
+  scm_gc_mark (start_callback_);
 }
 
-Music::~Music ()
+SCM
+Music::copy_mutable_properties () const
 {
+  return ly_music_deep_copy (mutable_property_alist_);
 }
 
-SCM
-Music::get_property_alist (bool m) const
+void
+Music::type_check_assignment (SCM s, SCM v) const
 {
-  return (m) ? mutable_property_alist_ : immutable_property_alist_;
+  if (!::type_check_assignment (s, v, ly_symbol2scm ("music-type?")))
+    abort ();
 }
 
-SCM
-Music::mark_smob (SCM m)
+Music::Music (Music const &m)
+  : Prob (m)
 {
-  Music *mus = (Music *) SCM_CELL_WORD_1 (m);
-  scm_gc_mark (mus->immutable_property_alist_);
-  return mus->mutable_property_alist_;
+  length_callback_ = m.length_callback_;
+  start_callback_ = m.start_callback_;
+
+  /// why? 
+  set_spot (*m.origin ());
 }
 
 Moment
@@ -132,25 +121,6 @@ print_alist (SCM a, SCM port)
     }
 }
 
-int
-Music::print_smob (SCM s, SCM p, scm_print_state*)
-{
-  scm_puts ("#<Music ", p);
-  Music *m = unsmob_music (s);
-
-  SCM nm = m->get_property ("name");
-  if (scm_is_symbol (nm) || scm_is_string (nm))
-    scm_display (nm, p);
-  else
-    scm_puts (classname (m), p);
-
-  /* Printing properties takes a lot of time, especially during backtraces.
-     For inspecting, it is better to explicitly use an inspection
-     function.  */
-
-  scm_puts (">", p);
-  return 1;
-}
 
 Pitch
 Music::generic_to_relative_octave (Pitch last)
@@ -169,7 +139,7 @@ Music::generic_to_relative_octave (Pitch last)
 	  Pitch expected_pit (scm_to_int (check),
 			      new_pit.get_notename (),
 			      new_pit.get_alteration ());
-	  origin ()->warning (_f ("octave check failed; expected %s, found: %s",
+	  origin ()->warning (_f ("octave check failed; expected \"%s\", found: %s",
 				  expected_pit.to_string (),
 				  new_pit.to_string ()));
 	  new_pit = expected_pit;
@@ -253,43 +223,6 @@ Music::transpose (Pitch delta)
     set_property ("pitch-alist", ly_transpose_key_alist (pa, delta.smobbed_copy ()));
 }
 
-IMPLEMENT_TYPE_P (Music, "ly:music?");
-IMPLEMENT_SMOBS (Music);
-IMPLEMENT_DEFAULT_EQUAL_P (Music);
-
-SCM
-Music::internal_get_property (SCM sym) const
-{
-  SCM s = scm_sloppy_assq (sym, mutable_property_alist_);
-  if (s != SCM_BOOL_F)
-    return scm_cdr (s);
-
-  s = scm_sloppy_assq (sym, immutable_property_alist_);
-  return (s == SCM_BOOL_F) ? SCM_EOL : scm_cdr (s);
-}
-
-SCM
-Music::internal_get_object (SCM s) const
-{
-  return internal_get_property (s);
-}
-
-void
-Music::internal_set_object (SCM s, SCM v)
-{
-  return internal_set_property (s, v);
-}
-
-void
-Music::internal_set_property (SCM s, SCM v)
-{
-  if (do_internal_type_checking_global)
-    if (!type_check_assignment (s, v, ly_symbol2scm ("music-type?")))
-      abort ();
-
-  mutable_property_alist_ = scm_assq_set_x (mutable_property_alist_, s, v);
-}
-
 void
 Music::set_spot (Input ip)
 {
@@ -303,6 +236,13 @@ Music::origin () const
   return ip ? ip : &dummy_input_global;
 }
 
+void
+Music::send_to_context (Context *c)
+{
+  send_stream_event (c, "MusicEvent", origin (),
+  		     ly_symbol2scm("music"), self_scm (), 0);
+}
+
 Music *
 make_music_by_name (SCM sym)
 {
@@ -327,3 +267,10 @@ Music::duration_length_callback (SCM m)
     mom = d->get_length ();
   return mom.smobbed_copy ();
 }
+
+Music *
+unsmob_music (SCM m)
+{
+  return dynamic_cast<Music*> (unsmob_prob (m));
+}
+