patch::: 1.1.38.jcn1: Cons

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

diff --git a/mi2mu/include/mudela-score.hh b/mi2mu/include/mudela-score.hh
index 4d0992b35c2556d722a786cbb1de3a3123727a1a..87e901b7097118258db2569cd54082d5b3450a75 100644 (file)
--- a/mi2mu/include/mudela-score.hh
+++ b/mi2mu/include/mudela-score.hh
@@ -8,45 +8,43 @@
 
 #include "mi2mu-proto.hh"
 #include "proto.hh"
-#include "plist.hh"
+#include "cons.hh"
 #include "parray.hh"
 
 /// (mudela_score)
 class Mudela_score {
 public:
-    Mudela_score (int format_i, int tracks_i, int tempo_i);
-    ~Mudela_score();
+  Mudela_score (int format_i, int tracks_i, int tempo_i);
+  ~Mudela_score ();
 
-    void add_item (Mudela_item* mudela_item_p);
-    void add_staff (Mudela_staff* mudela_staff_p);
+  void add_item (Mudela_item* mudela_item_p);
+  void add_staff (Mudela_staff* mudela_staff_p);
 
-    Mudela_column* find_column_l (Moment mom);
-    Mudela_column* get_column_l (Moment mom);
+  Mudela_column* find_column_l (Moment mom);
+  Mudela_column* get_column_l (Moment mom);
 
-    void output (String filename_str);
-    void process();
+  void output (String filename_str);
+  void process ();
 
-    // ugh
-    Mudela_key* mudela_key_l_;
-    Mudela_time_signature* mudela_time_signature_l_;
-    Mudela_tempo* mudela_tempo_l_;
+  // ugh
+  Mudela_key* mudela_key_l_;
+  Mudela_time_signature* mudela_time_signature_l_;
+  Mudela_tempo* mudela_tempo_l_;
 
 private:
-    void filter_tempo();
-    void quantify_columns();
-    void quantify_durations();
-    void settle_columns();
+  void filter_tempo ();
+  void quantify_columns ();
+  void quantify_durations ();
+  void settle_columns ();
 
-    Pointer_list<Mudela_staff*> mudela_staff_p_list_;
-   // wants Pointer_array!
-//    Pointer_list<Mudela_column*> mudela_column_p_list_;
-    Link_array<Mudela_column> column_l_array_;
+  Cons_list<Mudela_staff> mudela_staff_p_list_;
+  Link_array<Mudela_column> column_l_array_;
 
-// ugh, ugh, ugh
+  // ugh, ugh, ugh
 public:
-    int format_i_;
-    int tracks_i_;
-    int tempo_i_;
+  int format_i_;
+  int tracks_i_;
+  int tempo_i_;
 };
 
 #endif // MUDELA_SCORE_HH