From 586cb2591b36e8bfd4da863bceb1e3ee20486c9c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bart=C5=82omiej=20Pluta?= Date: Thu, 4 Jul 2019 13:22:07 +0200 Subject: [PATCH] Add mic function --- .gitignore | 1 + smnp/environment/factory.py | 4 +++- smnp/library/function/mic.py | 29 +++++++++++++++++++++++++++-- 3 files changed, 31 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index 5cc7e02..68bf81e 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,3 @@ __pycache__/ *.mus +.idea/* \ No newline at end of file diff --git a/smnp/environment/factory.py b/smnp/environment/factory.py index 389f578..244a3ed 100644 --- a/smnp/environment/factory.py +++ b/smnp/environment/factory.py @@ -4,6 +4,7 @@ from smnp.library.function.display import display from smnp.library.function.exit import exit from smnp.library.function.flat import flat from smnp.library.function.interval import interval +from smnp.library.function.mic import wait from smnp.library.function.semitones import semitones from smnp.library.function.sleep import sleep from smnp.library.function.type import objectType @@ -18,7 +19,8 @@ def createEnvironment(): semitones, interval, combine, - flat + flat, + wait ] methods = [ diff --git a/smnp/library/function/mic.py b/smnp/library/function/mic.py index 2bf5185..c532e6e 100644 --- a/smnp/library/function/mic.py +++ b/smnp/library/function/mic.py @@ -1,3 +1,28 @@ +from smnp.library.model import CombinedFunction, Function +from smnp.library.signature import signature, ofTypes +from smnp.mic.detector.noise import NoiseDetector +from smnp.type.model import Type + + +def _wait1(env): + nd = NoiseDetector() + nd.waitForComplete() + + +_sign1 = signature() + + +def _wait2(env, noiseTreshold, silenceTreshold): + nd = NoiseDetector(noiseTreshold.value, silenceTreshold.value) + nd.waitForComplete() + + +_sign2 = signature(ofTypes(Type.INTEGER), ofTypes(Type.INTEGER)) + + +wait = CombinedFunction( + 'wait', + Function(_sign1, _wait1), + Function(_sign2, _wait2) +) -def wait(args, env): - pass \ No newline at end of file