X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Finclude%2Fmusic-sequence.hh;h=94784ca45ac08325fe7f46488e4875e56bff1495;hb=c394a8e24aa4c7133ac388f4df88209189811dd3;hp=b22d029582cee9a313e472f712b9ec531b2ffe67;hpb=4995fea559cd5399b4f462de546a15195d76f4c3;p=lilypond.git

diff --git a/lily/include/music-sequence.hh b/lily/include/music-sequence.hh
index b22d029582..94784ca45a 100644
--- a/lily/include/music-sequence.hh
+++ b/lily/include/music-sequence.hh
@@ -1,43 +1,39 @@
+/*
+  music-sequence.hh -- declare Music_sequence
 
-
-/*   
-  music-sequence.hh -- declare 
-  
   source file of the GNU LilyPond music typesetter
-  
-  (c) 2000--2001 Han-Wen Nienhuys <hanwen@cs.uu.nl>
-  
- */
+
+  (c) 2000--2007 Han-Wen Nienhuys <hanwen@xs4all.nl>
+*/
 
 #ifndef MUSIC_SEQUENCE_HH
 #define MUSIC_SEQUENCE_HH
-#include "music.hh"
-/**
-  Music can be a list of other "Music" elements
- */
-class Music_sequence : public Music
+
+#include "pitch.hh"
+#include "moment.hh"
+#include "lily-guile.hh"
+
+struct Music_sequence
 {
 public:
-  Music_sequence (SCM h);
-  Music_sequence ();
-  SCM music_list () const;
-  void append_music (Music *);
-  VIRTUAL_COPY_CONS (Music);
-  
+  DECLARE_SCHEME_CALLBACK (cumulative_length_callback, (SCM));
+  DECLARE_SCHEME_CALLBACK (maximum_length_callback, (SCM));
+  DECLARE_SCHEME_CALLBACK (minimum_start_callback, (SCM));
+  DECLARE_SCHEME_CALLBACK (first_start_callback, (SCM));
+  DECLARE_SCHEME_CALLBACK (simultaneous_relative_callback, (SCM, SCM));
+  DECLARE_SCHEME_CALLBACK (event_chord_relative_callback, (SCM, SCM));
+
   Pitch do_relative_octave (Pitch p, bool b);
-  virtual void transpose (Pitch );
-  void truncate (int k);
-  virtual void compress (Moment);
-  int length_i () const;
-  Moment cumulative_length () const;
-  Moment maximum_length () const;
 
-  Moment first_start () const;
-  Moment minimum_start () const;
-  
-protected:
-  virtual Pitch to_relative_octave (Pitch);
+  static Moment cumulative_length (SCM);
+  static Moment maximum_length (SCM);
+  static Moment first_start (SCM list);
+  static Moment minimum_start (SCM list);
+};
 
+SCM ly_transpose_key_alist (SCM l, SCM pit);
+Pitch music_list_to_relative (SCM l, Pitch p, bool ret_first);
+void transpose_music_list (SCM, Pitch);
+void compress_music_list (SCM, Moment);
 
-};
 #endif