X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Finclude%2Fmusic-sequence.hh;h=94784ca45ac08325fe7f46488e4875e56bff1495;hb=98166b94174b63666a14a6a62bc16cf1b4163bce;hp=fd4e6225961a0f702436cd0eb1af788e0ac94bf6;hpb=2745cbd907f8216a4cc1fc5f488ae19efdfdbd10;p=lilypond.git

diff --git a/lily/include/music-sequence.hh b/lily/include/music-sequence.hh
index fd4e622596..94784ca45a 100644
--- a/lily/include/music-sequence.hh
+++ b/lily/include/music-sequence.hh
@@ -1,40 +1,39 @@
-/*   
+/*
   music-sequence.hh -- declare Music_sequence
-  
+
   source file of the GNU LilyPond music typesetter
-  
-  (c)  2000--2003 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);
-  static void transpose_list (SCM , Pitch);
-  static void compress_list (SCM, Moment);
-  
-  virtual void transpose (Pitch );
-  virtual void compress (Moment);
-
-  static Moment cumulative_length (SCM) ;
-  static Moment maximum_length (SCM) ;
-  static Moment first_start (SCM list) ;
+
+  static Moment cumulative_length (SCM);
+  static Moment maximum_length (SCM);
+  static Moment first_start (SCM list);
   static Moment minimum_start (SCM list);
-  
-protected:
-  virtual Pitch to_relative_octave (Pitch);
 };
+
+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