X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Finclude%2Fmusic.hh;h=00d6f1962cb171e3ca0cb01e249b18e4bb2d208e;hb=135df3ea31bc75c9d413eebf877b3b43a0c9aead;hp=d669d39e52d89e361ee8fe3d6fefb564dfb771c1;hpb=4190a75c5b6022eff073d9bd9280990c46d9e5d2;p=lilypond.git

diff --git a/lily/include/music.hh b/lily/include/music.hh
index d669d39e52..00d6f1962c 100644
--- a/lily/include/music.hh
+++ b/lily/include/music.hh
@@ -3,74 +3,69 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 1997--2004 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c) 1997--2009 Han-Wen Nienhuys <hanwen@xs4all.nl>
 */
 
 #ifndef MUSIC_HH
 #define MUSIC_HH
 
-#include "virtual-methods.hh"
-#include "minterval.hh"
-#include "lily-proto.hh"
-#include "string.hh"
 #include "smobs.hh"
-#include "music-constructor.hh"
+#include "moment.hh"
+#include "pitch.hh"
+#include "prob.hh"
 
 #define is_mus_type(x) internal_is_music_type (ly_symbol2scm (x))
 
-/** Music is anything that has duration and supports both time compression and
-  transposition.
-  
-  In Lily, everything that can be thought to have a length and a pitch
- (which has a duration which can be transposed) is considered "music",
-
-  Music is hierarchical: 
-
-  @see Music_sequence
-
-
-  TODO: make a equalp function for general music. 
-  */
-class Music
+class Music : public Prob
 {
 public:
-  Music ();
+  Music (SCM init);
   Music (Music const &m);
   VIRTUAL_COPY_CONSTRUCTOR (Music, Music);
 
-  Input *origin () const; 
-  void set_spot (Input);  
+  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;
-  
-  virtual Pitch to_relative_octave (Pitch);
-  String name () const;
-  /// The duration of this piece of music
-  virtual Moment get_length () const;
-  virtual Moment start_mom () 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;
+
   /// Transpose, with the interval central C to #p#
-  virtual void transpose (Pitch p);
+  void transpose (Pitch p);
 
   /// Scale the music in time by #factor#.
-  virtual void compress (Moment 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;
+  virtual void derived_mark () const;
 protected:
-  DECLARE_SMOBS (Music,);
-  SCM immutable_property_alist_;
-  SCM mutable_property_alist_;
+  SCM length_callback_;
+  SCM start_callback_;
   friend SCM ly_extended_make_music (SCM, SCM);
 };
 
-DECLARE_TYPE_P(Music);
-DECLARE_UNSMOB(Music,music);
-
+Music *unsmob_music (SCM);
 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 */