X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Finclude%2Fmusic.hh;h=87b4b93eda7b968552b51bf913ad8153c30d06ba;hb=764c49729f95f421d9d6cc8eee5386706039a2c7;hp=06fbcd73957dee0818ccef74d092dd6d2dfdc8c5;hpb=0d2593e4ef1f3d1eb6994223f1de8f6c8fbcd066;p=lilypond.git

diff --git a/lily/include/music.hh b/lily/include/music.hh
index 06fbcd7395..87b4b93eda 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 Han-Wen Nienhuys <hanwen@stack.nl>
+  (c)  1997--2002 Han-Wen Nienhuys <hanwen@cs.uu.nl>
 */
 
 
@@ -11,59 +11,61 @@
 #ifndef MUSIC_HH
 #define MUSIC_HH
 
-#include "plist.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"
 
-class Music:public Input {
-public:
-    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)
-    NAME_MEMBERS();
-    Music();
-protected:
-    virtual void do_print() const;
-  
-};
 
-class Music_list : public Music {
-public:
-    Music_list(Music_list const&);    
-    Music_list();
-    NAME_MEMBERS();
-    VIRTUAL_COPY_CONS(Music_list,Music)
-    virtual void add(Music*);
-    virtual void transpose(Melodic_req const *);
-protected:
-    Pointer_list<Music*> music_p_list_;
- 
-    virtual void do_print() const;
-};
+#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)
 
+/** 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",
 
-class Chord : public Music_list {
-public:
-    NAME_MEMBERS();
-    VIRTUAL_COPY_CONS(Chord,Music)
-    virtual void translate(Moment dt);
-    virtual MInterval time_int()const;
-};
+  Music is hierarchical: 
 
+  @see Music_sequence
 
-class MVoice : public Music_list {
+
+  TODO: make a equalp function for general music. 
+  */
+class Music {
 public:
-    NAME_MEMBERS();
-    VIRTUAL_COPY_CONS(MVoice, Music)
-    virtual void translate(Moment dt);
-    virtual MInterval time_int()const;
+  Input *origin () const; 
+  void set_spot (Input);  
+
+  SCM internal_get_mus_property (SCM) const;
+  void internal_set_mus_property (SCM , SCM val);
+
+  virtual Pitch to_relative_octave (Pitch);
+
+  /// The duration of this piece of music
+  virtual Moment length_mom () 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);
+  VIRTUAL_COPY_CONS (Music);
+  Music ();
+  Music (Music const &m);
+  Music (SCM);
+protected:
+  DECLARE_SMOBS (Music,);
+  SCM immutable_property_alist_;
+  SCM mutable_property_alist_;
 };
 
+
+DECLARE_UNSMOB(Music,music);
 #endif // MUSIC_HH