X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fdirectional-element-interface.cc;h=d8285449773f23fb74edc846d4b35f93cc171827;hb=7b5a9de4af9ec29ce4e7ef3166974da1dcdfc302;hp=4cc5ebb52f1ae2a3b416ab01fd7e72ece015df41;hpb=c735173d0ec717e9743a5032ac6a43bbba0da39f;p=lilypond.git

diff --git a/lily/directional-element-interface.cc b/lily/directional-element-interface.cc
index 4cc5ebb52f..d828544977 100644
--- a/lily/directional-element-interface.cc
+++ b/lily/directional-element-interface.cc
@@ -1,48 +1,33 @@
-/*   
-  directional-element.cc -- implement Directional_element
-  
-  source file of the GNU LilyPond music typesetter
-  
-  (c) 1999--2000 Han-Wen Nienhuys <hanwen@cs.uu.nl>
-  
- */
-
-#include "directional-element-interface.hh"
-
+/*
+  directional-element-interface.cc -- implement Directional_element
 
-Directional_element_interface::Directional_element_interface (Score_element const *s)
-{
-  elt_l_ =  (Score_element*)s;
-}
-
-bool
-Directional_element_interface::has_interface_b () const
-{
-  return isdir_b (elt_l_->get_elt_property ("direction"));
-}
+  source file of the GNU LilyPond music typesetter
 
+  (c) 1999--2006 Han-Wen Nienhuys <hanwen@xs4all.nl>
+*/
 
-  
+#include "directional-element-interface.hh"
+#include "warn.hh"
+#include "grob.hh"
 
 Direction
-Directional_element_interface::get () const
+get_grob_direction (Grob *me)
 {
-  // return dir_;
-  SCM d= elt_l_->get_elt_property ("direction");
-  if (!isdir_b(d))
+  SCM d = me->get_property ("direction");
+  if (d == ly_symbol2scm ("calculation-in-progress"))
+    {
+      programming_error ("Grob direction requested while calculation in progress. ");
+      return UP;
+    }
+  if (!is_direction (d))
     return CENTER;
-      
+
   return to_dir (d);
 }
 
 void
-Directional_element_interface::set (Direction d) 
-{
-  elt_l_->set_elt_property ("direction", gh_int2scm (d));
-}
-
-Directional_element_interface
-directional_element (Score_element const*s)
+set_grob_direction (Grob *me, Direction d)
 {
-  return s;
+  SCM sd = scm_from_int (d);
+  me->set_property ("direction", sd);
 }