/*
- music-list.hh -- declare Music_list, Chord and Voice
+ music-list.hh -- declare Music_sequence, Simultaneous_music and Sequential_music
source file of the GNU LilyPond music typesetter
- (c) 1997 Han-Wen Nienhuys <hanwen@stack.nl>
+ (c) 1997--1998 Han-Wen Nienhuys <hanwen@cs.uu.nl>
*/
-#ifndef MUSIC_LIST_HH
-#define MUSIC_LIST_HH
+#ifndef Music_sequence_HH
+#define Music_sequence_HH
#include "music.hh"
#include "plist.hh"
+class Music_list : public Pointer_list<Music*>
+{
+public:
+ Musical_pitch do_relative_octave (Musical_pitch, bool);
+ void add_music (Music*);
+ Music_list (Music_list const&);
+ Music_list ();
+};
+
+
/**
Music can be a list of other "Music" elements
*/
-class Music_list : public Music {
-
+class Music_sequence : public Music
+{
public:
- int multi_level_i_;
-
- Music_list(Music_list const&);
- Music_list();
- DECLARE_MY_RUNTIME_TYPEINFO;
- VIRTUAL_COPY_CONS(Music_list,Music);
- virtual void add(Music*);
- virtual void transpose(Melodic_req const *);
-
- Pointer_list<Music*> music_p_list_;
+ int multi_level_i_;
+ Music_list * music_p_list_p_;
+
+ Music_sequence (Music_sequence const&);
+ Music_sequence (Music_list *l_p);
+ DECLARE_MY_RUNTIME_TYPEINFO;
+ VIRTUAL_COPY_CONS(Music_sequence,Music);
+
+ virtual void transpose (Musical_pitch );
+ virtual void compress (Moment);
+ void add_music (Music *music_p);
protected:
-
- virtual void do_print() const;
+ virtual void do_print() const;
};
/**
- Chord is a list of music-elements which happen simultaneously
+ Simultaneous_music is a list of music-elements which happen simultaneously
*/
-
-class Chord : public Music_list {
+class Simultaneous_music : public Music_sequence
+{
public:
- Chord();
- DECLARE_MY_RUNTIME_TYPEINFO;
- VIRTUAL_COPY_CONS(Chord,Music);
- virtual void translate(Moment dt);
- virtual MInterval time_int()const;
+ DECLARE_MY_RUNTIME_TYPEINFO;
+ VIRTUAL_COPY_CONS(Simultaneous_music,Music);
+
+ Simultaneous_music(Music_list *);
+ virtual Musical_pitch to_relative_octave (Musical_pitch);
+ virtual Moment duration () const;
};
/**
The request is a collection of Requests. A note that you enter in mudela is
one Request_chord, one syllable of lyrics is one Request_chord
*/
-class Request_chord : public Chord {
+class Request_chord : public Simultaneous_music
+{
public:
- DECLARE_MY_RUNTIME_TYPEINFO;
- Request_chord();
- VIRTUAL_COPY_CONS(Request_chord,Music);
+ VIRTUAL_COPY_CONS(Request_chord, Music);
+ DECLARE_MY_RUNTIME_TYPEINFO;
+ virtual Musical_pitch to_relative_octave (Musical_pitch);
+ Request_chord();
};
-
/**
- Voice is a list of music-elements which are placed behind each other.
+ Sequential_music is a list of music-elements which are placed behind each other.
*/
-class Voice : public Music_list {
-
+class Sequential_music : public Music_sequence
+{
public:
- Moment offset_mom_;
-
- Voice();
- DECLARE_MY_RUNTIME_TYPEINFO;
- VIRTUAL_COPY_CONS(Voice, Music);
- virtual void translate(Moment dt);
- virtual MInterval time_int()const;
-};
-
-/** A simple piece of music, which wishes to change the spot of its
- interpretor */
-class Change_reg : public Music {
-public:
-
- /// what kind of iterator needed to walk this music?
- String type_str_;
-
- /// what name (or look for this name)
- String id_str_;
+ DECLARE_MY_RUNTIME_TYPEINFO;
+ VIRTUAL_COPY_CONS(Sequential_music, Music);
- DECLARE_MY_RUNTIME_TYPEINFO;
- VIRTUAL_COPY_CONS(Change_reg, Music);
+ virtual Musical_pitch to_relative_octave (Musical_pitch);
+ Sequential_music(Music_list*);
+ virtual Moment duration () const;
};
-#endif // MUSIC_LIST_HH
+#endif // Music_sequence_HH