X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fglobal-context-scheme.cc;h=16f51e0ded5400ff906545a4cae088788a5ffea0;hb=5bbfc22fce036b9b69df5e420de93e11da23c05e;hp=eeda64521001681855dfa9ee04df5a7aa54a89f4;hpb=a066a93ee74edebb9d238a1bac93c3bc7e8e6e4a;p=lilypond.git

diff --git a/lily/global-context-scheme.cc b/lily/global-context-scheme.cc
index eeda645210..16f51e0ded 100644
--- a/lily/global-context-scheme.cc
+++ b/lily/global-context-scheme.cc
@@ -1,7 +1,7 @@
 /*
   This file is part of LilyPond, the GNU music typesetter.
 
-  Copyright (C) 2005--2011 Han-Wen Nienhuys <hanwen@xs4all.nl>
+  Copyright (C) 2005--2014 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
@@ -34,14 +34,14 @@ LY_DEFINE (ly_format_output, "ly:format-output",
            " process it and return the @code{Music_output} object"
            " in its final state.")
 {
-  Global_context *g = dynamic_cast<Global_context *> (unsmob_context (context));
+  Global_context *g = dynamic_cast<Global_context *> (Context::unsmob (context));
 
   LY_ASSERT_TYPE (unsmob_global_context, context, 1);
 
   SCM output = g->get_output ();
   progress_indication ("\n");
 
-  if (Music_output *od = unsmob_music_output (output))
+  if (Music_output *od = Music_output::unsmob (output))
     od->process ();
 
   return output;
@@ -52,7 +52,7 @@ LY_DEFINE (ly_make_global_translator, "ly:make-global-translator",
            "Create a translator group and connect it to the global context"
            " @var{global}.  The translator group is returned.")
 {
-  Global_context *g = dynamic_cast<Global_context *> (unsmob_context (global));
+  Global_context *g = dynamic_cast<Global_context *> (Context::unsmob (global));
   LY_ASSERT_TYPE (unsmob_global_context, global, 1);
 
   Translator_group *tg = new Translator_group ();
@@ -68,7 +68,7 @@ LY_DEFINE (ly_make_global_context, "ly:make-global-context",
            " block @var{output-def}.  The context is returned.")
 {
   LY_ASSERT_SMOB (Output_def, output_def, 1);
-  Output_def *odef = unsmob_output_def (output_def);
+  Output_def *odef = Output_def::unsmob (output_def);
 
   Global_context *glob = new Global_context (odef);
 
@@ -90,21 +90,20 @@ LY_DEFINE (ly_interpret_music_expression, "ly:interpret-music-expression",
   LY_ASSERT_TYPE (unsmob_global_context, ctx, 2);
 
   Music *music = unsmob_music (mus);
-  if (!music
-      || !music->get_length ().to_bool ())
+  if (!music)
     {
       warning (_ ("no music found in score"));
       return SCM_BOOL_F;
     }
 
-  Global_context *g = dynamic_cast<Global_context *> (unsmob_context (ctx));
+  Global_context *g = dynamic_cast<Global_context *> (Context::unsmob (ctx));
 
   Cpu_timer timer;
 
-  message (_ ("Interpreting music... "));
+  message (_ ("Interpreting music..."));
 
   SCM protected_iter = Music_iterator::get_static_get_iterator (music);
-  Music_iterator *iter = unsmob_iterator (protected_iter);
+  Music_iterator *iter = Music_iterator::unsmob (protected_iter);
 
   iter->init_context (music, g);
   iter->construct_children ();