X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fglobal-context-scheme.cc;h=3dc5afa3ada95dcf4fca77e009f7349d6ad93baf;hb=47db9a3883d726ca53e2133a3b2298f78dd6a32e;hp=d1cd44201d483d58ce677bf3f278214170421881;hpb=e24fb7cc5671aea95211d4a0c56f28fb6fe8720e;p=lilypond.git diff --git a/lily/global-context-scheme.cc b/lily/global-context-scheme.cc index d1cd44201d..3dc5afa3ad 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--2014 Han-Wen Nienhuys + Copyright (C) 2005--2015 Han-Wen Nienhuys 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 (unsmob_context (context)); + Global_context *g = dynamic_cast (Context::unsmob (context)); - LY_ASSERT_TYPE (unsmob_global_context, context, 1); + LY_ASSERT_SMOB (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,8 +52,8 @@ 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 (unsmob_context (global)); - LY_ASSERT_TYPE (unsmob_global_context, global, 1); + Global_context *g = dynamic_cast (Context::unsmob (global)); + LY_ASSERT_SMOB (Global_context, global, 1); Translator_group *tg = new Translator_group (); tg->connect_to_context (g); @@ -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); @@ -87,23 +87,23 @@ LY_DEFINE (ly_interpret_music_expression, "ly:interpret-music-expression", " @var{ctx}. The context is returned in its final state.") { LY_ASSERT_SMOB (Music, mus, 1); - LY_ASSERT_TYPE (unsmob_global_context, ctx, 2); + LY_ASSERT_SMOB (Global_context, ctx, 2); - Music *music = unsmob_music (mus); + Music *music = Music::unsmob (mus); if (!music) { warning (_ ("no music found in score")); return SCM_BOOL_F; } - Global_context *g = dynamic_cast (unsmob_context (ctx)); + Global_context *g = dynamic_cast (Context::unsmob (ctx)); Cpu_timer timer; 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 ();