# HG changeset patch
# User Dan Fuhry <dan@enanocms.org>
# Date 1350097088 14400
# Node ID 3a98ce7762a0be67c70087ebdd51f8f548d8e620
# Parent  07ceb3e35e258e690fb356c35b266968b0c12266
Fixed key detection for Kutless songs

diff -r 07ceb3e35e25 -r 3a98ce7762a0 Halftone.php
--- a/Halftone.php	Sat Sep 15 13:18:13 2012 -0400
+++ b/Halftone.php	Fri Oct 12 22:58:08 2012 -0400
@@ -77,6 +77,8 @@
 
 function detect_key($chord_list)
 {
+	global $circle_of_fifths;
+	
 	$majors = array();
 	$minors = array();
 	$sharp_or_flat = ACC_SHARP;
@@ -127,12 +129,26 @@
 			unset($majors[$key]);
 	}
 	*/
+	// go through the circle of fifths, and if both its fourth and fifth are in the song but the root is not, add it
+	foreach ( $circle_of_fifths as $key )
+	{
+		$consonants = get_consonants($key);
+		if ( isset($majors[ key_to_name($consonants['fourth']) ]) &&
+			 isset($majors[ key_to_name($consonants['fifth']) ]) &&
+		 	!isset($majors[ key_to_name($consonants['first']) ]) )
+			// I call this the Kutless Exception. The song does not contain its root chord. This just adds
+			// that root to the list of possibilities, and it needs to score high enough to beat out the
+			// others.
+			$majors[ key_to_name($key) ] = 0;
+	}
 	// now we go through each of the detected major chords, calculate its consonants, and determine how many of its consonants are present in the song.
 	$scores = array();
 	foreach ( $majors as $key => $count )
 	{
 		$scores[$key] = 0;
+		
 		$consonants = get_consonants(name_to_key($key));
+		
 		if ( isset($majors[key_to_name($consonants['fourth'])]) )
 			$scores[$key] += 2;
 		if ( isset($majors[key_to_name($consonants['fifth'])]) )