Refactor I2S to be cleaner, more extensible
With the multiple I2S modes on the ESP32, it makes sense to use a cleaner class hierarchy for the I2S tools. Make I2SNoDAC into a subclass of I2S (renamed from I2SDAC) and remove about 80% of the code which was identical exept for the per-sample bitstream synthesis.
This commit is contained in:
1 parent
7a7f8bf449
commit
96fc37dce5
12 files changed
+113
-175
No files matched your search
@@ -1,12 +1,12 @@
|
||||
#include <Arduino.h>
|
||||
#include "AudioGeneratorAAC.h"
|
||||
#include "AudioOutputI2SDAC.h"
|
||||
#include "AudioOutputI2S.h"
|
||||
#include "AudioFileSourcePROGMEM.h"
|
||||
#include "sampleaac.h"
|
||||
|
||||
AudioFileSourcePROGMEM *in;
|
||||
AudioGeneratorAAC *aac;
|
||||
AudioOutputI2SDAC *out;
|
||||
AudioOutputI2S *out;
|
||||
|
||||
void setup()
|
||||
{
|
||||
@@ -14,7 +14,7 @@ void setup()
|
||||
|
||||
in = new AudioFileSourcePROGMEM(sampleaac, sizeof(sampleaac));
|
||||
aac = new AudioGeneratorAAC();
|
||||
out = new AudioOutputI2SDAC();
|
||||
out = new AudioOutputI2S();
|
||||
|
||||
aac->begin(in, out);
|
||||
}
|
||||
|
||||
@@ -1,11 +1,11 @@
|
||||
#include <Arduino.h>
|
||||
#include <AudioOutputI2SDAC.h>
|
||||
#include <AudioOutputI2S.h>
|
||||
#include <AudioFileSourcePROGMEM.h>
|
||||
#include <AudioGeneratorFLAC.h>
|
||||
|
||||
#include "sample.h"
|
||||
|
||||
AudioOutputI2SDAC *out;
|
||||
AudioOutputI2S *out;
|
||||
AudioFileSourcePROGMEM *file;
|
||||
AudioGeneratorFLAC *flac;
|
||||
|
||||
@@ -14,7 +14,7 @@ void setup()
|
||||
Serial.begin(115200);
|
||||
Serial.println("Starting up...\n");
|
||||
file = new AudioFileSourcePROGMEM( sample_flac, sizeof(sample_flac) );
|
||||
out = new AudioOutputI2SDAC();
|
||||
out = new AudioOutputI2S();
|
||||
flac = new AudioGeneratorFLAC();
|
||||
flac->begin(file, out);
|
||||
}
|
||||
|
||||
@@ -8,13 +8,13 @@
|
||||
|
||||
|
||||
#include <AudioOutputNull.h>
|
||||
#include <AudioOutputI2SDAC.h>
|
||||
#include <AudioOutputI2S.h>
|
||||
#include <AudioGeneratorMIDI.h>
|
||||
#include <AudioFileSourceSPIFFS.h>
|
||||
|
||||
AudioFileSourceSPIFFS *sf2;
|
||||
AudioFileSourceSPIFFS *mid;
|
||||
AudioOutputI2SDAC *dac;
|
||||
AudioOutputI2S *dac;
|
||||
AudioGeneratorMIDI *midi;
|
||||
|
||||
void setup()
|
||||
@@ -30,7 +30,7 @@ void setup()
|
||||
sf2 = new AudioFileSourceSPIFFS(soundfont);
|
||||
mid = new AudioFileSourceSPIFFS(midifile);
|
||||
|
||||
dac = new AudioOutputI2SDAC();
|
||||
dac = new AudioOutputI2S();
|
||||
midi = new AudioGeneratorMIDI();
|
||||
midi->SetSoundfont(sf2);
|
||||
midi->SetSampleRate(22050);
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
#include <Arduino.h>
|
||||
#include "AudioFileSourcePROGMEM.h"
|
||||
#include "AudioGeneratorMOD.h"
|
||||
#include "AudioOutputI2SDAC.h"
|
||||
#include "AudioOutputI2S.h"
|
||||
#ifdef ESP32
|
||||
#include <WiFi.h>
|
||||
#else
|
||||
@@ -13,7 +13,7 @@
|
||||
|
||||
AudioGeneratorMOD *mod;
|
||||
AudioFileSourcePROGMEM *file;
|
||||
AudioOutputI2SDAC *out;
|
||||
AudioOutputI2S *out;
|
||||
|
||||
void setup()
|
||||
{
|
||||
@@ -21,7 +21,7 @@ void setup()
|
||||
Serial.begin(115200);
|
||||
delay(1000);
|
||||
file = new AudioFileSourcePROGMEM( enigma_mod, sizeof(enigma_mod) );
|
||||
out = new AudioOutputI2SDAC();
|
||||
out = new AudioOutputI2S();
|
||||
mod = new AudioGeneratorMOD();
|
||||
mod->SetBufferSize(3*1024);
|
||||
mod->SetSampleRate(44100);
|
||||
|
||||
@@ -28,7 +28,7 @@
|
||||
#include "AudioFileSourceBuffer.h"
|
||||
#include "AudioGeneratorMP3.h"
|
||||
#include "AudioGeneratorAAC.h"
|
||||
#include "AudioOutputI2SDAC.h"
|
||||
#include "AudioOutputI2S.h"
|
||||
#include <EEPROM.h>
|
||||
|
||||
// Custom web server that doesn't need much RAM
|
||||
@@ -45,7 +45,7 @@ WiFiServer server(80);
|
||||
AudioGenerator *decoder = NULL;
|
||||
AudioFileSourceICYStream *file = NULL;
|
||||
AudioFileSourceBuffer *buff = NULL;
|
||||
AudioOutputI2SDAC *out = NULL;
|
||||
AudioOutputI2S *out = NULL;
|
||||
|
||||
int volume = 100;
|
||||
char title[64];
|
||||
@@ -283,7 +283,7 @@ void setup()
|
||||
|
||||
file = NULL;
|
||||
buff = NULL;
|
||||
out = new AudioOutputI2SDAC();
|
||||
out = new AudioOutputI2S();
|
||||
decoder = NULL;
|
||||
|
||||
LoadSettings();
|
||||
|
||||
Reference in new issue
Block a user