X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Finclude%2Fmusic.hh;h=f278786847033f827f1413e4108a3b0f2e8b8d33;hb=c49a146628e5f8422c72deb40a42899c4c5cdd33;hp=15ee2f7074fcbcc22231eaf99ed74b88039fb0a2;hpb=3a46c107cba4b3d2dba74e21f9046cc399c8baf1;p=lilypond.git

diff --git a/lily/include/music.hh b/lily/include/music.hh
index 15ee2f7074..f278786847 100644
--- a/lily/include/music.hh
+++ b/lily/include/music.hh
@@ -3,64 +3,60 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c)  1997--1998 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c) 1997--2006 Han-Wen Nienhuys <hanwen@xs4all.nl>
 */
 
-
-
 #ifndef MUSIC_HH
 #define MUSIC_HH
 
 #include "virtual-methods.hh"
-#include "input.hh"
-#include "minterval.hh"
-#include "lily-proto.hh"
-#include "string.hh"
-
-/** 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: 
+#include "smobs.hh"
+#include "moment.hh"
+#include "pitch.hh"
+#include "prob.hh"
 
-  @see Music_sequence
+#define is_mus_type(x) internal_is_music_type (ly_symbol2scm (x))
 
-  */
-class Music:public Input {
+class Music : public Prob
+{
 public:
-    
-  /** The kind of translation needed for this music.  This doesn't
-    make sense for simple (ie non-list) music, but it does no harm
-    here. Yes, it did harm Music_sequence: you can forget to copy it.
-      
-    */
-  String translator_type_str_;
+  Music (SCM init);
+  Music (Music const &m);
+  VIRTUAL_COPY_CONSTRUCTOR (Music, Music);
 
-  /// what identification for the translation unit
-  String translator_id_str_;    
+  Input *origin () const;
+  void set_spot (Input);
 
-  virtual Musical_pitch to_relative_octave (Musical_pitch);
+  bool internal_is_music_type (SCM) const;
 
-  /// The duration of this piece of music
-  virtual Moment length_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;
 
-  virtual ~Music(){}
-  void print() const;
   /// Transpose, with the interval central C to #p#
-  virtual void transpose (Musical_pitch p);
+  void transpose (Pitch p);
 
   /// Scale the music in time by #factor#.
-  virtual void compress (Moment factor);
-  VIRTUAL_COPY_CONS(Music);
+  void compress (Moment factor);
+
+  DECLARE_SCHEME_CALLBACK (duration_length_callback, (SCM));
   
-  Music();
 protected:
-  virtual void do_print() const;
+  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);
 };
 
-#endif // MUSIC_HH
-
-
+Music *unsmob_music (SCM);
+Music *make_music_by_name (SCM sym);
+SCM ly_music_deep_copy (SCM);
+extern SCM ly_music_p_proc;
 
+#endif /* MUSIC_HH */