X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Finclude%2Fmusic.hh;h=f85ecd8bb313b726078a8f8df667cf1e603ebdfb;hb=11b3094461e045deafd0e2b1cef8c60f79e259a1;hp=8f30e4469821cf537ab226714d3dfef3ad6ae47c;hpb=615a9212789c2cb2994748c023d0e19f3a83a0fd;p=lilypond.git

diff --git a/lily/include/music.hh b/lily/include/music.hh
index 8f30e44698..f85ecd8bb3 100644
--- a/lily/include/music.hh
+++ b/lily/include/music.hh
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c)  1997--1998 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c)  1997--2003 Han-Wen Nienhuys <hanwen@cs.uu.nl>
 */
 
 
@@ -12,55 +12,64 @@
 #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"
+
+
+#define get_mus_property(x) internal_get_mus_property(ly_symbol2scm(x))
+#define set_mus_property(x,y) internal_set_mus_property(ly_symbol2scm (x), y)
+#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_sequence
 
+
+  TODO: make a equalp function for general music. 
   */
-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_;    
-
-  virtual Musical_pitch to_relative_octave (Musical_pitch);
+  Input *origin () const; 
+  void set_spot (Input);  
 
+  SCM internal_get_mus_property (SCM) const;
+  void internal_set_mus_property (SCM , SCM val);
+  SCM get_property_alist (bool mut) const;
+  bool internal_is_music_type (SCM) const;
+  
+  virtual Pitch to_relative_octave (Pitch);
+  String name ()const;
   /// The duration of this piece of music
-  virtual Moment duration () const;
-
-  virtual ~Music(){}
-  void print() const;
+  virtual Moment get_length () const;
+  virtual Moment start_mom () const;
+  void print () const;
   /// Transpose, with the interval central C to #p#
-  virtual void transpose (Musical_pitch p);
+  virtual void transpose (Pitch p);
 
   /// Scale the music in time by #factor#.
   virtual void compress (Moment factor);
-  VIRTUAL_COPY_CONS(Music);
-  
-  Music();
+  VIRTUAL_COPY_CONS (Music);
+  Music ();
+  Music (Music const &m);
 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_UNSMOB(Music,music);
 
+Music* make_music_by_name (SCM sym);
 
+#endif // MUSIC_HH