X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Finclude%2Fmusic.hh;h=8cb69d0700b724e91f7b62f51d12074f86ec7caa;hb=47db9a3883d726ca53e2133a3b2298f78dd6a32e;hp=c8fec91cd5a534fc411be1719843bab0c83baf78;hpb=c668a48a83d7cdc70e97cb25069427c59d75c31a;p=lilypond.git

diff --git a/lily/include/music.hh b/lily/include/music.hh
index c8fec91cd5..8cb69d0700 100644
--- a/lily/include/music.hh
+++ b/lily/include/music.hh
@@ -1,65 +1,87 @@
 /*
-  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--2015 Han-Wen Nienhuys <hanwen@xs4all.nl>
 
-  (c) 1997--2004 Han-Wen Nienhuys <hanwen@cs.uu.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 "minterval.hh"
-#include "music-constructor.hh"
+#include "smobs.hh"
+#include "moment.hh"
+#include "pitch.hh"
+#include "prob.hh"
 
 #define is_mus_type(x) internal_is_music_type (ly_symbol2scm (x))
 
-
-class Music
+class Music : public Prob
 {
 public:
   Music (SCM init);
   Music (Music const &m);
   VIRTUAL_COPY_CONSTRUCTOR (Music, Music);
 
-  Input *origin () const; 
+  Input *origin () const;
   void set_spot (Input);
 
-  SCM internal_get_property (SCM) const;
-  void internal_set_property (SCM , SCM val);
-  SCM get_property_alist (bool mut) const;
   bool internal_is_music_type (SCM) const;
-  int duration_log () const;
-  
-  DECLARE_SCHEME_CALLBACK(relative_callback,(SCM,SCM));
-  virtual Pitch to_relative_octave (Pitch);
-  String name () 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 m) {
+    return dynamic_cast <Music *> (Prob::unsmob (m));
+  }
+  static bool is_smob (SCM m) {
+    return Prob::is_smob (m) && unsmob (m);
+  }
 
   /// 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:
-  DECLARE_SMOBS (Music,);
-  SCM immutable_property_alist_;
-  SCM mutable_property_alist_;
+  virtual SCM copy_mutable_properties () const;
+  virtual void type_check_assignment (SCM, SCM) const;
+  virtual void derived_mark () const;
 protected:
   SCM length_callback_;
   SCM start_callback_;
   friend SCM ly_extended_make_music (SCM, SCM);
 };
 
-DECLARE_TYPE_P(Music);
-DECLARE_UNSMOB(Music,music);
-
 Music *make_music_by_name (SCM sym);
 SCM ly_music_deep_copy (SCM);
-SCM ly_music_scorify (SCM, 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 */