* flower

[lilypond.git] / lily / include / music.hh

diff --git a/lily/include/music.hh b/lily/include/music.hh
index 196f461eeb6bd290bdf9a62539f01488ab51e4f8..aeb36a40c7da345b0074fd1ef682fc81199f9652 100644 (file)
--- a/lily/include/music.hh
+++ b/lily/include/music.hh
@@ -3,45 +3,62 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 1997 Han-Wen Nienhuys <hanwen@stack.nl>
+  (c) 1997--2005 Han-Wen Nienhuys <hanwen@cs.uu.nl>
 */
 
-
-
 #ifndef MUSIC_HH
 #define MUSIC_HH
 
 #include "virtual-methods.hh"
-#include "input.hh"
 #include "minterval.hh"
-#include "lily-proto.hh"
-#include "string.hh"
-
-/** In Lily, everything that has a length and a pitch (which can be
-  transposed) is considered "music", 
+#include "music-constructor.hh"
 
-  Music is hierarchical: 
+#define is_mus_type(x) internal_is_music_type (ly_symbol2scm (x))
 
-  @seealso Music_list
-  */
-class Music:public Input {
+class Music
+{
 public:
-    Music_list * parent_music_l_;
-
-    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();
+  Music (SCM init);
+  Music (Music const &m);
+  VIRTUAL_COPY_CONSTRUCTOR (Music, Music);
+
+  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 mutble) const;
+  bool internal_is_music_type (SCM) const;
+  int duration_log () const;
+
+  DECLARE_SCHEME_CALLBACK (relative_callback, (SCM, SCM));
+  Pitch to_relative_octave (Pitch);
+  Pitch generic_to_relative_octave (Pitch);
+  String name () const;
+  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);
+
 protected:
-    virtual void do_print() const;
-  
+  DECLARE_SMOBS (Music,);
+  SCM immutable_property_alist_;
+  SCM mutable_property_alist_;
+protected:
+  SCM length_callback_;
+  SCM start_callback_;
+  friend SCM ly_extended_make_music (SCM, SCM);
 };
 
-#endif // MUSIC_HH
-
+DECLARE_TYPE_P (Music);
+DECLARE_UNSMOB (Music, music);
 
+Music *make_music_by_name (SCM sym);
+SCM ly_music_deep_copy (SCM);
 
+#endif /* MUSIC_HH */