X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Finclude%2Fmusic.hh;h=ec6f98766cdc3d912f6f87ee74dbcc3c33a3f0eb;hb=f9214bac21e9926dc3248416f58190c98c4167a9;hp=500eb003dc1d4e793fbb10e45ff2c34390ec2a16;hpb=5c2afd9ecbe4d91998a325f6323f05ea4d658d96;p=lilypond.git

diff --git a/lily/include/music.hh b/lily/include/music.hh
index 500eb003dc..ec6f98766c 100644
--- a/lily/include/music.hh
+++ b/lily/include/music.hh
@@ -3,73 +3,69 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c)  1997--2001 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c) 1997--2007 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",
+class Music : public Prob
+{
+public:
+  Music (SCM init);
+  Music (Music const &m);
+  VIRTUAL_COPY_CONSTRUCTOR (Music, Music);
 
-  Music is hierarchical: 
+  Input *origin () const;
+  void set_spot (Input);
 
-  @see Music_sequence
+  bool internal_is_music_type (SCM) const;
 
+  Stream_event *to_event () const;
 
-  TODO: make a equalp function for general music. 
-  */
-class Music {
-public:
-  Input *origin () const; 
-  void set_spot (Input);  
-  
-  SCM get_mus_property (const char*) const;
-  SCM get_mus_property (SCM) const;
-  void set_mus_property (const char * , SCM val);
-  void set_immutable_mus_property (const char * , SCM val);
-  void set_immutable_mus_property (SCM key, SCM val);  
-  void set_mus_property (SCM , SCM val);  
-  void set_mus_pointer (const char*, SCM val);
-  SCM remove_mus_property (const char* nm);
-
-  virtual Pitch to_relative_octave (Pitch);
-
-  /// The duration of this piece of music
-  virtual Moment length_mom () const;
-  virtual Moment start_mom () 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);
-  VIRTUAL_COPY_CONS (Music);
-  Music ();
-  Music (Music const &m);
-  Music (SCM);
+  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);
 };
 
+Music *unsmob_music (SCM);
+Music *make_music_by_name (SCM sym);
+SCM ly_music_deep_copy (SCM);
+SCM ly_camel_case_to_lisp_identifier (SCM name_sym);
 
-DECLARE_UNSMOB(Music,music);
-#endif // MUSIC_HH
-
+extern SCM ly_music_p_proc;
 
+/* common transposition function for music and event */
+void transpose_mutable (SCM alist, Pitch delta);
 
+#endif /* MUSIC_HH */