# HG changeset patch # User c.rhodes # Date 1185210395 -3600 # Node ID 8b5818686d7cf12333d86c9c8433db761ea1e371 # Parent 291f3be180e913d13ecd6e2a253087f3c16c3160 krumhansl-key-finder is in amuse-harmony darcs-hash:20070723170635-dc3a5-6129fc594c87c1ce5148451ad06a3c7a8a85b2fa.gz diff -r 291f3be180e9 -r 8b5818686d7c implementations/gsharp/gsharp-import.lisp --- a/implementations/gsharp/gsharp-import.lisp Mon Jul 23 18:05:59 2007 +0100 +++ b/implementations/gsharp/gsharp-import.lisp Mon Jul 23 18:06:35 2007 +0100 @@ -95,7 +95,7 @@ () (let* ((segment (gsharp-cursor::segment (gsharp::current-cursor))) (composition (amuse-gsharp::segment-composition segment)) - (result (amuse-utils:krumhansl-key-finder composition composition)) + (result (amuse-harmony:krumhansl-key-finder composition composition)) (name (aref #("C" "C#" "D" "Eb" "E" "F" "F#" "G" "Ab" "A" "Bb" "B") (car result))) (string (format nil "Key: ~A ~(~A~)" name (cadr result)))) (esa:display-message string))) diff -r 291f3be180e9 -r 8b5818686d7c implementations/tabcode/tabcode-import.lisp --- a/implementations/tabcode/tabcode-import.lisp Mon Jul 23 18:05:59 2007 +0100 +++ b/implementations/tabcode/tabcode-import.lisp Mon Jul 23 18:06:35 2007 +0100 @@ -106,7 +106,7 @@ (syntax (climacs::syntax buffer)) (tabwords (slot-value syntax 'tabcode-syntax::tabwords)) (composition (amuse-tabcode::make-tabcode-composition tabwords)) - (result (amuse-utils:krumhansl-key-finder composition composition)) + (result (amuse-harmony:krumhansl-key-finder composition composition)) (name (aref #("C" "C#" "D" "Eb" "E" "F" "F#" "G" "Ab" "A" "Bb" "B") (car result))) (string (format nil "{~A ~(~A~)}~%" name (cadr result)))) (drei-buffer:insert-buffer-sequence buffer 0 string)))