From: David Kastrup <dak@gnu.org>
Date: Sun, 13 Jul 2014 10:40:26 +0000 (+0200)
Subject: Issue 4007: Fix parts of apparently dead code make-stream-event
X-Git-Tag: release/2.19.11-1~23
X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=1d37a6fb7e499d2fd37d26f6c602ada14cbddec0;p=lilypond.git

Issue 4007: Fix parts of apparently dead code make-stream-event

It is not clear whether the code will be operative for its intended purpose
afterwards, but leaving it in broken state is not going to help.
---

diff --git a/scm/define-event-classes.scm b/scm/define-event-classes.scm
index 40b1b7de40..ac6f215ae2 100644
--- a/scm/define-event-classes.scm
+++ b/scm/define-event-classes.scm
@@ -158,7 +158,7 @@ previously defined event class."
 ;;(pretty-print (cons (car music-event-tree) (sort-tree (cdr music-event-tree))))
 
 (defmacro-public make-stream-event (expr)
-  (Stream_event::undump (primitive-eval (list 'quasiquote expr))))
+  (ly:stream-event::undump (primitive-eval (list 'quasiquote expr))))
 
 (define* (simplify e)
   (cond
@@ -167,7 +167,7 @@ previously defined event class."
    ((pair? e) (cons (simplify (car e))
                     (simplify (cdr e))))
    ((ly:stream-event? e)
-    (list 'unquote (list 'make-stream-event (simplify (Stream_event::dump e)))))
+    (list 'unquote (list 'make-stream-event (simplify (ly:stream-event::dump e)))))
    ((ly:music? e)
     (list 'unquote (music->make-music e)))
    ((ly:moment? e)
@@ -182,7 +182,7 @@ previously defined event class."
     (list 'unquote `(ly:make-duration
                      ,(ly:duration-log e)
                      ,(ly:duration-dot-count e)
-                     ,(ly:duration-scale))))
+                     ,(ly:duration-scale e))))
    ((ly:pitch? e)
     (list 'unquote `(ly:make-pitch
                      ,(ly:pitch-octave e)