release: 1.0.3

[lilypond.git] / mi2mu / include / mudela-staff.hh

diff --git a/mi2mu/include/mudela-staff.hh b/mi2mu/include/mudela-staff.hh
index 4608e0859c66631d736c75719031138b51afbd64..4b4fd75c60e6719f2515465db1e0e059c35ee3b0 100644 (file)
--- a/mi2mu/include/mudela-staff.hh
+++ b/mi2mu/include/mudela-staff.hh
@@ -14,32 +14,28 @@
 /// (mudela_staff)
 class Mudela_staff {
 public:
-    Mudela_staff (int number_i, String copyright_str, String track_name_str, String instrument_str);
-
-    void add_item (Mudela_item* mudela_item_p);
-    void eat_voice (Link_list<Mudela_item*>& items);
-    String id_str();
-    String name_str();
-    void output (Mudela_stream& mudela_stream_r);
-    void process();
-
-    String copyright_str_;
-    String instrument_str_;
-    String name_str_;
-    Mudela_key* mudela_key_l_;
-    Mudela_time_signature* mudela_time_signature_l_;
-    Mudela_tempo* mudela_tempo_l_;
-    int number_i_;
+  Mudela_staff (int number_i, String copyright_str, String track_name_str, String instrument_str);
+
+  void add_item (Mudela_item* mudela_item_p);
+  void eat_voice (Link_list<Mudela_item*>& items);
+  String id_str();
+  String name_str();
+  void output (Mudela_stream& mudela_stream_r);
+  void process();
+
+  String copyright_str_;
+  String instrument_str_;
+  String name_str_;
+  Mudela_key* mudela_key_l_;
+  Mudela_time_signature* mudela_time_signature_l_;
+  Mudela_tempo* mudela_tempo_l_;
+  int number_i_;
 
 private:
-    void output_mudela_begin_bar (Mudela_stream& mudela_stream_r, Moment now_mom, int bar_i);
-#if 0
-    void output_mudela_rest (Mudela_stream& mudela_stream_r, Moment begin_mom, Moment end_mom);
-    void output_mudela_rest_remain (Mudela_stream& mudela_stream_r, Moment mom);
-#endif
-
-    Pointer_list<Mudela_voice*> mudela_voice_p_list_;
-    Pointer_list<Mudela_item*> mudela_item_p_list_;
+  void output_mudela_begin_bar (Mudela_stream& mudela_stream_r, Moment now_mom, int bar_i);
+
+  Pointer_list<Mudela_voice*> mudela_voice_p_list_;
+  Pointer_list<Mudela_item*> mudela_item_p_list_;
 };
 
 #endif // MUDELA_STAFF_HH