Merge remote branch 'origin/master' into release/unstable

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

diff --git a/lily/include/dispatcher.hh b/lily/include/dispatcher.hh
index 8b24f03c22d411b56946753e8b320aa51517dcba..f4fe9156bcde77d5fe72a58029c6db17dc052468 100644 (file)
--- a/lily/include/dispatcher.hh
+++ b/lily/include/dispatcher.hh
@@ -1,9 +1,20 @@
 /*
-  dispatcher.hh -- declare Dispatcher
+  This file is part of LilyPond, the GNU music typesetter.
 
-  source file of the GNU LilyPond music typesetter
+  Copyright (C) 2005 Erik Sandberg  <mandolaerik@gmail.com>
 
-  (c) 2005 Erik Sandberg  <mandolaerik@gmail.com>
+  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 DISPATCHER_HH
@@ -11,9 +22,16 @@
 
 #include "listener.hh"
 #include "stream-event.hh"
+#include "smobs.hh"
 
-class Dispatcher
+class Dispatcher : public Smob<Dispatcher>
 {
+public:
+  int print_smob (SCM, scm_print_state *);
+  SCM mark_smob ();
+  static const char type_p_name_[];
+  virtual ~Dispatcher ();
+private:
   /* Hash table. Each event-class maps to a list of listeners. */
   SCM listeners_;
   /* alist of dispatchers that we listen to. Each entry is a
@@ -28,14 +46,13 @@ class Dispatcher
 public:
   Dispatcher ();
   void broadcast (Stream_event *ev);
+  bool is_listened_class (SCM);
+  SCM listened_types ();
   void add_listener (Listener, SCM event_class);
   void remove_listener (Listener, SCM event_class);
   void register_as_listener (Dispatcher *dist);
   void unregister_as_listener (Dispatcher *dist);
-protected:
-  DECLARE_SMOBS (Dispatcher,);
 };
 
-DECLARE_UNSMOB (Dispatcher, dispatcher);
 
 #endif // DISPATCHER_HH