corrije study14

convergence.sc

@@ -51,10 +51,12 @@
     		)
     	}),
 
-		instruments1 = this.getInstruments(instruments),
+		instruments_ = this.getInstruments(instruments),
+
+		player_ = this.getPlayer(player, canon, instruments_),
+
+		data = (melody: melody, cp: cp, voices: voices, instruments: instruments_, player: player);
 
-		data = (melody: melody, cp: cp, voices: voices);
-		player = this.getPlayer(player, canon, instruments1);
 		^(
 			canon: canon,
 			data: data,

helpers.sc

@@ -1,26 +1,26 @@
 +Can {
-	//~melody ::[Float] -> [Float] -> [(dur, note)]
+	//melody ::[Float] -> [Float] -> [(dur, note)]
 	*melody {|durs, notes|
 		^[durs.size, notes.size].minItem.collect({|i|
 			(dur: durs[i], note: notes[i])
 		})
 	}
 
-	//~convvoices :: ([Float], [Float], [Float]) -> [(tempo, transp, amp)]
+	//convvoices :: ([Float], [Float], [Float]) -> [(tempo, transp, amp)]
 	*convoices { | tempos, transps, amps = ([])|
 		^[tempos.size, transps.size].minItem.collect({|i|
 			(tempo: tempos[i], transp: transps[i], amp: amps[i] ? 1)
 		})
 	}
 
-	//~makeDivVoices :: ([Float], [Float]) ->[(transp: Float, amp: Float)]
+	//divoices :: ([Float], [Float]) ->[(transp: Float, amp: Float)]
 	*divoices { |transps, amps = ([])|
 		^transps.collect({|transp, i|
 			(transp: transp, amp: amps[i] ? 1)
 		})
 	}
 
-	//~makeDivTempos :: ([Float], [Float], Boolean) ->[(tempo: Float, percentage: Float)]
+	//divtempos :: ([Float], [Float], Boolean) ->[(tempo: Float, percentage: Float)]
 	*divtempos { | tempos, percentageForTempo, normalize= false|
 		var percentages = if(normalize, {percentageForTempo.normalizeSum*100}, {percentageForTempo});
 
@@ -29,10 +29,14 @@
 		});
 	}
 
-	//~mergeCanons :: Canon -> Canon -> Canon
+	//mergeCanons :: Canon -> Canon -> Canon
 	*mergeCanons {|a, b|
+		var canon = a.canon ++ b.canon;
+		var player = this.getPlayer(a.data.player, canon, a.data.instruments);
 		^(
-			canon: a.canon ++ b.canon,
+			canon: canon,
+			player: player,
+			play: {player.play},
 			data: (
 				voices: a.data.voices ++ b.data.voices,
 				cp: [a.data.cp, b.data.cp].minItem,//for now we keep only the first cp, for the visualizer purposes, it does not affect the cp in the canons that will sound