Updates for the audio pipeline refactor (WIP).

Author: microbit-carlos

codal.json

@@ -2,7 +2,7 @@
     "target": {
         "name": "codal-microbit-v2",
         "url": "https://github.com/lancaster-university/codal-microbit-v2",
-        "branch": "master",
+        "branch": "audio-refactor",
         "type": "git"
     },
     "config":{

source/samples/MicrophoneTest.cpp

@@ -76,7 +76,7 @@ mems_mic_test()
 void
 mems_mic_zero_offset_test()
 {
-    LevelDetectorSPL* levelSPL = new LevelDetectorSPL(uBit.audio.processor->output, 85.0, 65.0, 16.0, 0, DEVICE_ID_SYSTEM_LEVEL_DETECTOR, false);
+    LevelDetectorSPL* levelSPL = new LevelDetectorSPL(uBit.audio.processor->output, 85.0, 65.0, 16.0, 0, DEVICE_ID_SYSTEM_LEVEL_DETECTOR);
     uBit.audio.activateMic();
 
     char float_str[20];

source/samples/OOB_v3.cpp

@@ -212,7 +212,8 @@ static void onButtonLogo(MicroBitEvent) {
 
     int sampleRate = 11000;
     static SplitterChannel *splitterChannel = uBit.audio.splitter->createChannel();
-    splitterChannel->requestSampleRate( sampleRate );
+    // FIXME: Update this to use the new requestSampleRate
+    // splitterChannel->requestSampleRate( sampleRate );
 
     // Uncomment these two lines and comment out the *recording declaration after them to insert a low-pass-filter.
     // static LowPassFilter *lowPassFilter = new LowPassFilter(*splitterChannel, 0.812313f, false);

source/samples/StreamAPITest.cpp

@@ -58,7 +58,8 @@ void stream_test_record() {
     static StreamRecording * recording = new StreamRecording( *input );
     static MixerChannel * output = uBit.audio.mixer.addChannel( *recording );
 
-    input->requestSampleRate( 11000 );
+    // FIXME: Update this to use the new requestSampleRate
+    // input->requestSampleRate( 11000 );
     output->setSampleRate( 11000 );
     output->setVolume( CONFIG_MIXER_INTERNAL_RANGE * 0.8 ); // 80% volume
 
@@ -67,7 +68,8 @@ void stream_test_record() {
     uBit.display.printChar( '1', 1000 );
 
     uBit.display.printChar( 'R' );
-    input->requestSampleRate( 11000 );
+    // FIXME: Update this to use the new requestSampleRate
+    // input->requestSampleRate( 11000 );
     recording->recordAsync();
     while( recording->isRecording() ) {
         uBit.display.printChar( '~' );
@@ -99,7 +101,8 @@ static const int STRSR_SAMPLE_RATE = 11000;
 
 static void strsr_handle_buttonA(MicroBitEvent) {
     static SplitterChannel *splitterChannel = uBit.audio.splitter->createChannel();
-    splitterChannel->requestSampleRate(STRSR_SAMPLE_RATE);
+    // FIXME: Update this to use the new requestSampleRate
+    // splitterChannel->requestSampleRate(STRSR_SAMPLE_RATE);
     static StreamRecording *recording = new StreamRecording(*splitterChannel);
     static MixerChannel *channel = uBit.audio.mixer.addChannel(*recording, STRSR_SAMPLE_RATE);
 
@@ -114,20 +117,24 @@ static void strsr_handle_buttonA(MicroBitEvent) {
     uBit.display.clear();
     uBit.audio.levelSPL->setUnit(LEVEL_DETECTOR_SPL_8BIT);
 
-    splitterChannel->requestSampleRate( STRSR_SAMPLE_RATE );
+    // FIXME: Update this to use the new requestSampleRate
+    // splitterChannel->requestSampleRate( STRSR_SAMPLE_RATE );
 
     DMESG( "RECORDING" );
     recording->recordAsync();
     bool showR = true;
     while (uBit.buttonA.isPressed()) {
         if( uBit.logo.isPressed() ) {
-            splitterChannel->requestSampleRate( abs((uBit.accelerometer.getRoll()-90) * 100) );
+            // FIXME: Update this to use the new requestSampleRate
+            // splitterChannel->requestSampleRate( abs((uBit.accelerometer.getRoll()-90) * 100) );
             DMESG( "Sample Rate: %d (mic = %d)", (int)splitterChannel->getSampleRate(), (int)uBit.audio.mic->getSampleRate() );
         } else {
-            if( uBit.buttonB.isPressed() )
-                splitterChannel->requestSampleRate( 5000 );
-            else
-                splitterChannel->requestSampleRate( STRSR_SAMPLE_RATE );
+            if( uBit.buttonB.isPressed() ) {}
+                // FIXME: Update this to use the new requestSampleRate
+                // splitterChannel->requestSampleRate( 5000 );
+            else {}
+                // FIXME: Update this to use the new requestSampleRate
+                // splitterChannel->requestSampleRate( STRSR_SAMPLE_RATE );
         }
 
         if (showR)