* Documentation/index.html.in: Fix url to one big page. (backportme)

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

diff --git a/lily/include/music.hh b/lily/include/music.hh
index 083e476f734a9c7c2747cf1f79569037ae411f77..d669d39e52d89e361ee8fe3d6fefb564dfb771c1 100644 (file)
--- a/lily/include/music.hh
+++ b/lily/include/music.hh
@@ -3,59 +3,74 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c)  1997--1998 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c) 1997--2004 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"
+#include "smobs.hh"
+#include "music-constructor.hh"
 
-/** 
-  Anything which has length or pitch.
+#define is_mus_type(x) internal_is_music_type (ly_symbol2scm (x))
+
+/** 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",
+ (which has a duration which can be transposed) is considered "music",
 
   Music is hierarchical: 
 
-  @see Music_list
+  @see Music_sequence
+
 
+  TODO: make a equalp function for general music. 
   */
-class Music:public Input {
+class Music
+{
 public:
-  Music_list * parent_music_l_;
-    
-  /** 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_list: 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();
+  Music ();
+  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 mut) const;
+  bool internal_is_music_type (SCM) const;
+  int duration_log () const;
+  
+  virtual Pitch to_relative_octave (Pitch);
+  String name () const;
+  /// The duration of this piece of music
+  virtual Moment get_length () const;
+  virtual Moment start_mom () const;
+  void print () const;
+  /// Transpose, with the interval central C to #p#
+  virtual void transpose (Pitch p);
+
+  /// Scale the music in time by #factor#.
+  virtual void compress (Moment factor);
+  
 protected:
-  virtual void do_print() const;
+  DECLARE_SMOBS (Music,);
+  SCM immutable_property_alist_;
+  SCM mutable_property_alist_;
+  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);
+SCM ly_music_scorify (SCM, SCM);
 
+#endif /* MUSIC_HH */