X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Finclude%2Fmusic.hh;h=9f244081d32c3994ca9eda68d90774d666d36552;hb=5b4b0d6e9a197e8f9eb085b7c2ad78b8be3e5cfc;hp=9a7b6f2d97cff1e1e0fa0189e69dece543a7ad74;hpb=55fa3168d0fb5326341ff56d7a1638c89eb2ebaf;p=lilypond.git

diff --git a/lily/include/music.hh b/lily/include/music.hh
index 9a7b6f2d97..9f244081d3 100644
--- a/lily/include/music.hh
+++ b/lily/include/music.hh
@@ -3,58 +3,69 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c)  1997--1998 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c) 1997--2008 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"
+#include "smobs.hh"
+#include "moment.hh"
+#include "pitch.hh"
+#include "prob.hh"
 
-/** 
-  Anything which has length or pitch.
-  
-  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",
+#define is_mus_type(x) internal_is_music_type (ly_symbol2scm (x))
 
-  Music is hierarchical: 
+class Music : public Prob
+{
+public:
+  Music (SCM init);
+  Music (Music const &m);
+  VIRTUAL_COPY_CONSTRUCTOR (Music, Music);
 
-  @see Music_sequence
+  Input *origin () const;
+  void set_spot (Input);
 
-  */
-class Music:public Input {
-public:
-    
-  /** The kind of iterator needed to walk 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_;
-
-  /// what name (or look for this name)
-  String translator_id_str_;    
-
-  virtual Musical_pitch to_relative_octave (Musical_pitch);
-  virtual MInterval time_int() const;
-  virtual ~Music(){}
-  void print() const;
-  virtual void transpose (Musical_pitch );
-  virtual void translate (Moment dt);
-  VIRTUAL_COPY_CONS(Music,Music);
-  DECLARE_MY_RUNTIME_TYPEINFO;
-  Music();
+  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;
+
+  /// 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;
+  virtual void derived_mark () const;
 protected:
-  virtual void do_print() const;
+  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);
+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 */