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

diff --git a/lily/include/music-sequence.hh b/lily/include/music-sequence.hh
index 01753fd41a..bed9e3df2a 100644
--- a/lily/include/music-sequence.hh
+++ b/lily/include/music-sequence.hh
@@ -1,38 +1,51 @@
-/*   
-  music-sequence.hh -- declare Music_sequence
-  
-  source file of the GNU LilyPond music typesetter
-  
-  (c) 2000--2004 Han-Wen Nienhuys <hanwen@cs.uu.nl>
-  
- */
+/*
+  This file is part of LilyPond, the GNU music typesetter.
+
+  Copyright (C) 2000--2014 Han-Wen Nienhuys <hanwen@xs4all.nl>
+
+  LilyPond is free software: you can redistribute it and/or modify
+  it under the terms of the GNU General Public License as published by
+  the Free Software Foundation, either version 3 of the License, or
+  (at your option) any later version.
+
+  LilyPond is distributed in the hope that it will be useful,
+  but WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  GNU General Public License for more details.
+
+  You should have received a copy of the GNU General Public License
+  along with LilyPond.  If not, see <http://www.gnu.org/licenses/>.
+*/
 
 #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 (event_chord_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