X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Finclude%2Fmusic.hh;h=e59f82c758f6a26d408a275c414298bb881f8d80;hb=0f2f6a5e7a2f484ea54b20e5642825667c91ec7f;hp=3c43209b47307e256f8b8607ca9938b7f40617fa;hpb=9f3572d98bb948c9689cd1f75401a029451fa001;p=lilypond.git

diff --git a/lily/include/music.hh b/lily/include/music.hh
index 3c43209b47..e59f82c758 100644
--- a/lily/include/music.hh
+++ b/lily/include/music.hh
@@ -1,15 +1,25 @@
 /*
-  music.hh -- declare Music
+  This file is part of LilyPond, the GNU music typesetter.
 
-  source file of the GNU LilyPond music typesetter
+  Copyright (C) 1997--2014 Han-Wen Nienhuys <hanwen@xs4all.nl>
 
-  (c) 1997--2006 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_HH
 #define MUSIC_HH
 
-#include "virtual-methods.hh"
 #include "smobs.hh"
 #include "moment.hh"
 #include "pitch.hh"
@@ -29,24 +39,27 @@ public:
 
   bool internal_is_music_type (SCM) const;
 
+  Stream_event *to_event () const;
+
   DECLARE_SCHEME_CALLBACK (relative_callback, (SCM, SCM));
   Pitch to_relative_octave (Pitch);
   Pitch generic_to_relative_octave (Pitch);
   Moment get_length () const;
   Moment start_mom () const;
   void print () const;
+  static Music *unsmob (SCM);
 
   /// Transpose, with the interval central C to #p#
   void transpose (Pitch p);
 
   /// Scale the music in time by #factor#.
   void compress (Moment factor);
-  
+
   // Broadcast the event in a context's event-source.
   void send_to_context (Context *c);
 
   DECLARE_SCHEME_CALLBACK (duration_length_callback, (SCM));
-  
+
 protected:
   virtual SCM copy_mutable_properties () const;
   virtual void type_check_assignment (SCM, SCM) const;
@@ -57,9 +70,13 @@ protected:
   friend SCM ly_extended_make_music (SCM, SCM);
 };
 
-Music *unsmob_music (SCM);
 Music *make_music_by_name (SCM sym);
 SCM ly_music_deep_copy (SCM);
+SCM ly_camel_case_2_lisp_identifier (SCM name_sym);
+
 extern SCM ly_music_p_proc;
 
+/* common transposition function for music and event */
+void transpose_mutable (SCM alist, Pitch delta);
+
 #endif /* MUSIC_HH */