release: 0.0.64

[lilypond.git] / lily / include / pulk-voices.hh

diff --git a/lily/include/pulk-voices.hh b/lily/include/pulk-voices.hh
index 2cc5a48831edd5e5275c6a436811a582ef35e744..9f01f4419e1f39627dcb4937c15b13a40e721c1e 100644 (file)
--- a/lily/include/pulk-voices.hh
+++ b/lily/include/pulk-voices.hh
@@ -12,13 +12,14 @@
 
 #ifndef PULK_VOICES_HH
 #define PULK_VOICES_HH
+
 #include "pqueue.hh"
 #include "plist.hh"
 #include "moment.hh"
 #include "proto.hh"
 #include "lily-proto.hh"
 #include "voice.hh"
-
+#include "time-description.hh"
 
 
 struct Voice_l { 
@@ -34,15 +35,17 @@ int compare(Voice_l const &p1, Voice_l const &p2);
 class Pulk_voices
 {
 PQueue< Voice_l > voice_pq_;
-    IPointerList< Pulk_voice * > pulk_p_list_;
-    PointerList<Staff *> staff_l_list_;
+    Pointer_list< Pulk_voice * > pulk_p_list_;
+    Link_list<Staff *> staff_l_list_;
+    Array < Time_description > time_arr_;
     Moment next_mom_;
 
 public:
     Moment last_;
+    bool time_checks_failed_b() const;
     bool ok() const;
-    Moment next_mom() { return next_mom_; }
-    Pulk_voices(PointerList<Staff*> const&);
+    Moment next_mom() const;
+    Pulk_voices(Link_list<Staff*> const&);
     void get_aligned_request(Request_column *col_l );
 };