unsmob_pitch -> Pitch::unsmob and related

[lilypond.git] / lily / context-mod-scheme.cc

diff --git a/lily/context-mod-scheme.cc b/lily/context-mod-scheme.cc
index 4b3467eb20eeca15a4b3a721e94ed6a229508ed0..5028cfdf4d7f1563fd0e0868b4fe544bedb8a67b 100644 (file)
--- a/lily/context-mod-scheme.cc
+++ b/lily/context-mod-scheme.cc
@@ -1,7 +1,7 @@
 /*
   This file is part of LilyPond, the GNU music typesetter.
 
-  Copyright (C) 2010--2011 Jan Nieuwenhuizen <janneke@gnu.org>
+  Copyright (C) 2010--2014 Jan Nieuwenhuizen <janneke@gnu.org>
   Han-Wen Nienhuys <hanwen@xs4all.nl>
 
   LilyPond is free software: you can redistribute it and/or modify
@@ -26,7 +26,7 @@ LY_DEFINE (ly_get_context_mods, "ly:get-context-mods",
            "Returns the list of context modifications stored in"
            " @var{contextmod}.")
 {
-  Context_mod *tr = unsmob_context_mod (contextmod);
+  Context_mod *tr = Context_mod::unsmob (contextmod);
   LY_ASSERT_SMOB (Context_mod, contextmod, 1);
   return tr->get_mods ();
 }
@@ -36,7 +36,7 @@ LY_DEFINE (ly_add_context_mod, "ly:add-context-mod",
            "Adds the given context @var{modification} to the list"
            " @var{contextmods} of context modifications.")
 {
-  Context_mod *ctxmod = unsmob_context_mod (contextmods);
+  Context_mod *ctxmod = Context_mod::unsmob (contextmods);
   LY_ASSERT_SMOB (Context_mod, contextmods, 1);
   ctxmod->add_context_mod (modification);
   return SCM_UNSPECIFIED;
@@ -55,3 +55,16 @@ LY_DEFINE (ly_make_context_mod, "ly:make-context-mod",
   else
     return Context_mod ().smobbed_copy ();
 }
+
+LY_DEFINE (ly_context_mod_apply_x, "ly:context-mod-apply!",
+           2, 0, 0, (SCM context, SCM mod),
+           "Apply the context modification @var{mod} to @var{context}.")
+{
+  LY_ASSERT_SMOB (Context, context, 1);
+  LY_ASSERT_SMOB (Context_mod, mod, 2);
+
+  apply_property_operations (Context::unsmob (context),
+                             Context_mod::unsmob (mod)->get_mods ());
+  scm_remember_upto_here_1 (context);
+  return SCM_UNSPECIFIED;
+}