X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Finclude%2Fmusic.hh;h=32ca55babcdfaa9deff2d17706728d0f8e529961;hb=84a3f805e16aeec81ea36e33fa7e7e069ecec9f9;hp=9a7b6f2d97cff1e1e0fa0189e69dece543a7ad74;hpb=55fa3168d0fb5326341ff56d7a1638c89eb2ebaf;p=lilypond.git

diff --git a/lily/include/music.hh b/lily/include/music.hh
index 9a7b6f2d97..32ca55babc 100644
--- a/lily/include/music.hh
+++ b/lily/include/music.hh
@@ -1,60 +1,78 @@
 /*
-  music.hh -- declare Music
+  This file is part of LilyPond, the GNU music typesetter.
 
-  source file of the GNU LilyPond music typesetter
+  Copyright (C) 1997--2015 Han-Wen Nienhuys <hanwen@xs4all.nl>
 
-  (c)  1997--1998 Han-Wen Nienhuys <hanwen@cs.uu.nl>
-*/
+  LilyPond is free software: you can redistribute it and/or modify
+  it under the terms of the GNU General Public License as published by
+  the Free Software Foundation, either version 3 of the License, or
+  (at your option) any later version.
 
+  LilyPond is distributed in the hope that it will be useful,
+  but WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  GNU General Public License for more details.
 
+  You should have received a copy of the GNU General Public License
+  along with LilyPond.  If not, see <http://www.gnu.org/licenses/>.
+*/
 
 #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 "moment.hh"
+#include "pitch.hh"
+#include "prob.hh"
+
+#define is_mus_type(x) internal_is_music_type (ly_symbol2scm (x))
 
-/** 
-  Anything which has length or pitch.
-  
-  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 Music : public Preinit<Music>, public Prob
+{
+public:
+  void pre_init ();
+  Music (SCM init);
+  Music (Music const &m);
+  VIRTUAL_COPY_CONSTRUCTOR (Music, Music);
 
-  Music is hierarchical: 
+  Input *origin () const;
+  void set_spot (Input);
 
-  @see Music_sequence
+  bool internal_is_music_type (SCM) const;
 
-  */
-class Music:public Input {
-public:
-    
-  /** 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_sequence: 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();
+  Stream_event *to_event () const;
+
+  DECLARE_SCHEME_CALLBACK (relative_callback, (SCM, SCM));
+  Pitch to_relative_octave (Pitch);
+  Pitch generic_to_relative_octave (Pitch);
+  Moment get_length () const;
+  Moment start_mom () const;
+  void print () const;
+
+  /// Scale the music in time by #factor#.
+  void compress (Moment factor);
+
+  // Broadcast the event in a context's event-source.
+  void send_to_context (Context *c);
+
+  DECLARE_SCHEME_CALLBACK (duration_length_callback, (SCM));
+
+protected:
+  virtual SCM copy_mutable_properties () const;
+  virtual void type_check_assignment (SCM, SCM) const;
+  virtual void derived_mark () const;
 protected:
-  virtual void do_print() const;
+  SCM length_callback_;
+  SCM start_callback_;
+  friend SCM ly_extended_make_music (SCM, SCM);
 };
 
-#endif // MUSIC_HH
+Music *make_music_by_name (SCM sym);
+SCM music_deep_copy (SCM m);
+void set_origin (SCM m, SCM origin);
 
+SCM ly_camel_case_2_lisp_identifier (SCM name_sym);
 
+extern SCM ly_music_p_proc;
 
+#endif /* MUSIC_HH */