* flower

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

diff --git a/lily/include/music.hh b/lily/include/music.hh
index ad8dca599f93affbd60d72d04f3cabdd3a22c7c4..aeb36a40c7da345b0074fd1ef682fc81199f9652 100644 (file)
--- a/lily/include/music.hh
+++ b/lily/include/music.hh
@@ -3,64 +3,62 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c)  1997--1999 Han-Wen Nienhuys <hanwen@cs.uu.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"
-
-/** 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",
+#include "music-constructor.hh"
 
-  Music is hierarchical: 
+#define is_mus_type(x) internal_is_music_type (ly_symbol2scm (x))
 
-  @see Music_sequence
-
-  */
-class Music:public Input {
+class Music
+{
 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_;
-
-  /// what identification for the translation unit
-  String translator_id_str_;    
+  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;
 
-  virtual Musical_pitch to_relative_octave (Musical_pitch);
-
-  /// The duration of this piece of music
-  virtual Moment length_mom () 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);
-  
-  Music();
+  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 */