Plug memory leak: copy quoted events only once.

Conflicts:

	lily/music.cc

diff --git a/lily/include/music.hh b/lily/include/music.hh
index 223764bb14d897eeb25bbf466033d56e0bdb9c50..7d26098a1f4e17bcd7670320bb6cfb1880cbc8b2 100644 (file)
--- a/lily/include/music.hh
+++ b/lily/include/music.hh
@@ -67,6 +67,6 @@ SCM ly_camel_case_to_lisp_identifier (SCM name_sym);
 extern SCM ly_music_p_proc;
 
 /* common transposition function for music and event */
-SCM transpose_mutable (SCM alist, Pitch delta);
+void transpose_mutable (SCM alist, Pitch delta);
 
 #endif /* MUSIC_HH */

diff --git a/lily/music.cc b/lily/music.cc
index a6e18cabb4ca11356e3e65f8f5ae78533a13b2f3..607ba1455329c35985cc71183e411532f4b33183 100644 (file)
--- a/lily/music.cc
+++ b/lily/music.cc
@@ -185,29 +185,28 @@ Music::compress (Moment factor)
 }
 
 /*
-  This mutates alist.  Hence, make sure that it is not changed 
+  This mutates alist.  Hence, make sure that it is not shared 
 */
-SCM
+void
 transpose_mutable (SCM alist, Pitch delta)
 {
-  SCM retval = SCM_EOL;
-
   for (SCM s = alist; scm_is_pair (s); s = scm_cdr (s))
     {
       SCM entry = scm_car (s);
       SCM prop = scm_car (entry);
       SCM val = scm_cdr (entry);
-
+      SCM new_val = val;
+      
       if (Pitch *p = unsmob_pitch (val))
        {
          Pitch transposed = p->transposed (delta);
-         scm_set_cdr_x (entry, transposed.smobbed_copy ());
-
-         if (abs (transposed.get_alteration ()) > DOUBLE_SHARP)
+         if (transposed.get_alteration ().abs () > Rational (1,1))
            {
              warning (_f ("transposition by %s makes alteration larger than double",
                           delta.to_string ()));
            }
+
+         new_val = transposed.smobbed_copy ();
        }
       else if (prop == ly_symbol2scm ("element"))
        {
@@ -218,11 +217,11 @@ transpose_mutable (SCM alist, Pitch delta)
        transpose_music_list (val, delta);
       else if (prop == ly_symbol2scm ("pitch-alist") &&
               scm_is_pair (val))
-       entry = scm_cons (prop, ly_transpose_key_alist (val, delta.smobbed_copy ()));
-      retval = scm_cons (entry, retval);
-    }
+       new_val = ly_transpose_key_alist (val, delta.smobbed_copy ());
 
-  return scm_reverse_x (retval, SCM_EOL);
+      if (val != new_val)
+       scm_set_cdr_x (entry , new_val);
+    }
 }
 
 void
@@ -231,7 +230,7 @@ Music::transpose (Pitch delta)
   if (to_boolean (get_property ("untransposable")))
     return;
 
-  mutable_property_alist_ = transpose_mutable (mutable_property_alist_, delta);
+  transpose_mutable (mutable_property_alist_, delta);
 }
 
 void

diff --git a/lily/quote-iterator.cc b/lily/quote-iterator.cc
index f33a43221205b38a90b23bed6be56a0e96743cfb..f7b39fae4206a6adf3d7e6efd6307bd27552c02e 100644 (file)
--- a/lily/quote-iterator.cc
+++ b/lily/quote-iterator.cc
@@ -247,8 +247,7 @@ Quote_iterator::process (Moment m)
                  Pitch diff = pitch_interval (qp, mp);
                  ev = ev->clone ();
                  
-                 SCM props =  transpose_mutable (ev->get_property_alist (true), diff);
-                 ev = new Stream_event (ev->get_property ("class"), props);
+                 transpose_mutable (ev->get_property_alist (true), diff);
                  transposed_musics_ = scm_cons (ev->unprotect (), transposed_musics_);
                }
              quote_outlet_.get_outlet ()->event_source ()->broadcast (ev);