release: 0.0.61

[lilypond.git] / lily / include / input-staff.hh

diff --git a/lily/include/input-staff.hh b/lily/include/input-staff.hh
index 3b874a1b393423e1c68eabb5fd79f3610e6c87aa..0bbdc1326614117cf05f4ff0a6ddf2ccf48da5fd 100644 (file)
--- a/lily/include/input-staff.hh
+++ b/lily/include/input-staff.hh
@@ -11,22 +11,20 @@
 #include "plist.hh"
 #include "varray.hh"
 #include "proto.hh"
+#include "input.hh"
 
-struct Input_staff {
+class Input_staff:public Input {
+public:
     
-    const char * defined_ch_c_l_;
-    String type;
-    
-    IPointerList<Input_music*> music_;
-    Input_music * score_wide_music_p_;
+    IPointer_list<Input_music*> music_;
+    Input_register * ireg_p_;
     
     /* *************** */
     ~Input_staff();
     void add(Input_music*m);
     Input_staff(Input_staff const&);
-    Input_staff(String);
-    void set_score_wide(Input_music*m);
-    Staff* parse(Score*, Input_music *score_wide);
+    Input_staff();
+    Staff* parse(Score*);
     void print() const;
 };