X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fscore.cc;h=d10023dd8506b5103bed7a09ef673a074cff8574;hb=90e4d7057f3857da049dfda3d130017d4719bd6b;hp=5ce7e3ba95efedf2fcd143453468601db3cd1a52;hpb=e0af94bb8939bc6f4998db6294010baa77139092;p=lilypond.git

diff --git a/lily/score.cc b/lily/score.cc
index 5ce7e3ba95..d10023dd85 100644
--- a/lily/score.cc
+++ b/lily/score.cc
@@ -28,9 +28,9 @@ using namespace std;
 #include "global-context.hh"
 #include "international.hh"
 #include "lily-parser.hh"
+#include "ly-module.hh"
 #include "main.hh"
 #include "music.hh"
-#include "music.hh"
 #include "output-def.hh"
 #include "paper-book.hh"
 #include "paper-score.hh"
@@ -40,7 +40,7 @@ using namespace std;
 Input *
 Score::origin () const
 {
-  return Input::unsmob (input_location_);
+  return unsmob<Input> (input_location_);
 }
 
 Score::Score ()
@@ -59,10 +59,10 @@ Score::~Score ()
 {
 }
 
-const char Score::type_p_name_[] = "ly:score?";
+const char * const Score::type_p_name_ = "ly:score?";
 
 SCM
-Score::mark_smob ()
+Score::mark_smob () const
 {
   scm_gc_mark (header_);
   for (vsize i = defs_.size (); i--;)
@@ -83,7 +83,7 @@ Score::Score (Score const &s)
   smobify_self ();
   input_location_ = s.origin ()->smobbed_copy ();
 
-  Music *m = Music::unsmob (s.music_);
+  Music *m = unsmob<Music> (s.music_);
   if (m)
     {
       Music *mclone = m->clone ();
@@ -139,7 +139,7 @@ Score::book_rendering (Output_def *layoutbook,
 
       /* TODO: fix or junk --no-layout.  */
       SCM context = ly_run_translator (music_, scaled);
-      if (dynamic_cast<Global_context *> (Context::unsmob (context)))
+      if (unsmob<Global_context> (context))
         {
           SCM s = ly_format_output (context);
 
@@ -155,24 +155,26 @@ Score::book_rendering (Output_def *layoutbook,
 void
 Score::set_music (SCM music)
 {
-  if (Music::is_smob (music_))
+  if (unsmob<Music> (music_))
     {
-      Music::unsmob (music)->origin ()->error (_ ("already have music in score"));
-      Music::unsmob (music_)->origin ()->error (_ ("this is the previous music"));
+      unsmob<Music> (music)->origin ()->non_fatal_error
+        (_ ("already have music in score"));
+      unsmob<Music> (music_)->origin ()->non_fatal_error
+        (_ ("this is the previous music"));
     }
-  Music *m = Music::unsmob (music);
+  Music *m = unsmob<Music> (music);
   if (m && to_boolean (m->get_property ("error-found")))
     {
-      m->origin ()->error (_ ("errors found, ignoring music expression"));
+      m->origin ()->non_fatal_error
+        (_ ("errors found, ignoring music expression"));
 
-      this->error_found_ = this->error_found_
-                           || to_boolean (m->get_property ("error-found"));
+      error_found_ = true;
     }
 
-  if (this->error_found_)
-    this->music_ = SCM_EOL;
+  if (error_found_)
+    music_ = SCM_EOL;
   else
-    this->music_ = music;
+    music_ = music;
 }
 
 SCM