X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Finclude%2Fmusic-sequence.hh;h=2e54de4e6cb1c6205d1ba2acd7f9718432b39db9;hb=5b4b0d6e9a197e8f9eb085b7c2ad78b8be3e5cfc;hp=01753fd41ab6d7d1bfe4965647dabd8fbcad1708;hpb=a54fef48345564ae701839c525379939c840638d;p=lilypond.git

diff --git a/lily/include/music-sequence.hh b/lily/include/music-sequence.hh
index 01753fd41a..2e54de4e6c 100644
--- a/lily/include/music-sequence.hh
+++ b/lily/include/music-sequence.hh
@@ -1,38 +1,39 @@
-/*   
+/*
   music-sequence.hh -- declare Music_sequence
-  
+
   source file of the GNU LilyPond music typesetter
-  
-  (c) 2000--2004 Han-Wen Nienhuys <hanwen@cs.uu.nl>
-  
- */
+
+  (c) 2000--2008 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 ();
-  VIRTUAL_COPY_CONSTRUCTOR (Music, Music_sequence);
+  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));
 
-  SCM music_list () const;
-  void append_music (Music *);
-  
   Pitch do_relative_octave (Pitch p, bool b);
-  
-  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);
 };
 
-Pitch music_list_to_relative (SCM l,Pitch p, bool ret_first);
-void transpose_music_list (SCM , 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