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

diff --git a/lily/include/music.hh b/lily/include/music.hh
index 41531a7902..9f244081d3 100644
--- a/lily/include/music.hh
+++ b/lily/include/music.hh
@@ -3,55 +3,69 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 1997 Han-Wen Nienhuys <hanwen@stack.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"
 
-/** In Lily, everything that has a length and a pitch (which can be
-  transposed) is considered "music", 
+#define is_mus_type(x) internal_is_music_type (ly_symbol2scm (x))
 
-  Music is hierarchical: 
-
-  @seealso Music_list
-  */
-class Music:public Input {
+class Music : public Prob
+{
 public:
-    Music_list * parent_music_l_;
-    
-    /** what 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_list: you can forget to copy it.
-      
-      */
-    String type_str_;
-
-    /// what name (or look for this name)
-    String id_str_;    
-
-    virtual MInterval time_int()const;
-    virtual ~Music(){}
-    void print() const;
-    virtual void transpose(Melodic_req const *);
-    virtual void translate(Moment dt);
-    VIRTUAL_COPY_CONS(Music,Music);
-    DECLARE_MY_RUNTIME_TYPEINFO;
-    Music();
-protected:
-    virtual void do_print() const;
+  Music (SCM init);
+  Music (Music const &m);
+  VIRTUAL_COPY_CONSTRUCTOR (Music, Music);
+
+  Input *origin () const;
+  void set_spot (Input);
+
+  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:
+  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 */