Atk kernel encoders and decoders: remove CtkScore class dependency.

Fixes #66. Thanks @davidgranstrom
ambisonictoolkit · Mar 28, 2018 · 4562424 · 4562424
1 parent b2d7509
commit 4562424
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 5 deletions.
diff --git a/Classes/ATKMatrix.sc b/Classes/ATKMatrix.sc
@@ -2070,7 +2070,7 @@ FoaDecoderKernel {
 				})
 			});
 
-			score.isKindOf(CtkScore).if({
+			(\CtkScore.asClass.notNil and:{score.isKindOf(\CtkScore.asClass)}).if({
 				kernel = subjectPath.files.collect({ arg kernelPath;
 					chans.collect({ arg chan;
 						var buf = CtkBuffer(kernelPath.fullPath, channels: [chan]);
@@ -2096,7 +2096,7 @@ FoaDecoderKernel {
 				score.add(kernelBundle)
 			});
 
-			(score.isKindOf(CtkScore).not && score.isKindOf(Score).not && score.notNil).if( {
+			(kernel.isNil && score.notNil).if( {
 				Error(
 					"Score is not a Score or a CtkScore. Score is a %.".format(
 						score.class.asString
@@ -2396,7 +2396,8 @@ FoaEncoderKernel {
 					})
 				})
 			});
-			score.isKindOf(CtkScore).if({
+
+			(\CtkScore.asClass.notNil and:{score.isKindOf(\CtkScore.asClass)}).if({
 				kernel = subjectPath.files.collect({ arg kernelPath;
 					chans.collect({ arg chan;
 						var buf = CtkBuffer(kernelPath.fullPath, channels: [chan]);
@@ -2422,7 +2423,7 @@ FoaEncoderKernel {
 				score.add(kernelBundle)
 			});
 
-			(score.isKindOf(CtkScore).not && score.isKindOf(Score).not && score.notNil).if({
+			(kernel.isNil && score.notNil).if({
 				Error(
 					"Score is not a Score or a CtkScore. Score is a %.".format(
 						score.class.asString

diff --git a/Classes/FoaAudition.sc b/Classes/FoaAudition.sc
@@ -333,7 +333,6 @@ FoaAudition {
 
             inbus ?? {
                 // assign internally to free if created
-                // internalInbus = CtkAudio.play( 4 );
                 internalInbus = server.audioBusAllocator.alloc( 4 );
                 inbus = internalInbus;
             };