patch::: 1.3.86.jcn2

[lilypond.git] / lily / group-interface.cc

diff --git a/lily/group-interface.cc b/lily/group-interface.cc
index a24e883da67cf83019269d52e87ad63e01c01e71..b82807d5b23f8f8d1067ecf113aac85220d8632e 100644 (file)
--- a/lily/group-interface.cc
+++ b/lily/group-interface.cc
@@ -9,70 +9,51 @@
 #include "group-interface.hh"
 #include "score-element.hh"
 
-Group_interface::Group_interface (Score_element const* e)
+/*
+  ugh: clean me, junk elt_l_ field
+ */
+Group_interface::Group_interface (Score_element * e)
 {
   elt_l_ = (Score_element*)e;
   name_ = "elements";
 }
 
 
-Group_interface::Group_interface (Score_element const *e, String s)
+Group_interface::Group_interface (Score_element  *e, String s)
 {
   elt_l_ =(Score_element*)e;
   name_ = s;
 } 
 bool
-Group_interface::has_interface_b () 
+Group_interface::has_interface () 
 {
-  SCM el = elt_l_->get_elt_property (name_);
+  SCM el = elt_l_->get_elt_property (name_.ch_C());
 
   return el == SCM_EOL || gh_pair_p (el);
 }
 
 
-void
-Group_interface::add_element (Score_element*p) 
-{
-  p->used_b_ =  true;
-  elt_l_->used_b_ = true;
-
-  add_thing (p->self_scm_);
-}
 
 void
 Group_interface::add_thing (SCM s)
 {
-  elt_l_->set_elt_property (name_,
-                           gh_cons (s, elt_l_->get_elt_property (name_)));
-
+  elt_l_->set_elt_property (name_.ch_C (),
+                           gh_cons (s, elt_l_->get_elt_property (name_.ch_C())));
 }
 
 
 int
 Group_interface::count ()
 {
-  return scm_ilength (elt_l_->get_elt_property (name_));
+  return scm_ilength (elt_l_->get_elt_property (name_.ch_C()));
 }
 
 void
 Group_interface::set_interface ()
 {
-  if (!has_interface_b ())
+  if (!has_interface ())
     {
-      elt_l_->set_elt_property (name_, SCM_EOL);
-    }
-}
 
-Group_interface
-group (Score_element*s,String n)
-{
-  Group_interface gi (s,n);
-  return gi;
+    }
 }
 
-Group_interface
-group (Score_element*s)
-{
-  Group_interface gi (s);
-  return gi;
-}