Skip to content

Commit 2a44c1e

Browse files
committed
Pass pins by reference
1 parent b3d2477 commit 2a44c1e

File tree

2 files changed

+9
-9
lines changed

2 files changed

+9
-9
lines changed

src/AudioBoard.h

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -12,22 +12,22 @@ namespace audio_driver {
1212
*/
1313
class AudioBoard {
1414
public:
15-
AudioBoard(AudioDriver *driver, DriverPins pins=NoPins) {
15+
AudioBoard(AudioDriver *driver, DriverPins* pins=&NoPins) {
1616
this->pins = pins;
1717
this->driver = driver;
1818
}
1919

20-
AudioBoard(AudioDriver &driver, DriverPins pins=NoPins) {
21-
this->pins = pins;
20+
AudioBoard(AudioDriver &driver, DriverPins& pins=NoPins) {
21+
this->pins = &pins;
2222
this->driver = &driver;
2323
}
2424

2525
bool begin(){
2626
AD_LOGD("AudioBoard::pins::begin");
27-
bool result_pins = pins.begin();
27+
bool result_pins = pins->begin();
2828
AD_LOGD("AudioBoard::pins::begin::returned:%s", result_pins ? "true" : "false");
2929
AD_LOGD("AudioBoard::driver::begin");
30-
bool result_driver = driver->begin(codec_cfg, pins);
30+
bool result_driver = driver->begin(codec_cfg, *pins);
3131
AD_LOGD("AudioBoard::driver::begin::returned:%s", result_driver ? "true" : "false");
3232
setVolume(DRIVER_DEFAULT_VOLUME);
3333
AD_LOGD("AudioBoard::volume::set");
@@ -47,13 +47,13 @@ class AudioBoard {
4747
}
4848

4949
bool end(void) {
50-
pins.end();
50+
pins->end();
5151
return driver->end();
5252
}
5353
bool setMute(bool enable) { return driver->setMute(enable); }
5454
bool setVolume(int volume) { return driver->setVolume(volume); }
5555
int getVolume() { return driver->getVolume(); }
56-
DriverPins& getPins() { return pins; }
56+
DriverPins& getPins() { return *pins; }
5757
bool setPAPower(bool enable) { return driver->setPAPower(enable); }
5858
/// set volume for adc: this is only supported on some defined codecs
5959
bool setInputVolume(int volume) {return driver->setInputVolume(volume);}
@@ -63,7 +63,7 @@ class AudioBoard {
6363
}
6464

6565
protected:
66-
DriverPins pins;
66+
DriverPins* pins;
6767
CodecConfig codec_cfg;
6868
AudioDriver* driver = nullptr;
6969
};

src/DriverPins.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -331,7 +331,7 @@ class DriverPins {
331331
// setup i2c
332332
AD_LOGD("DriverPins::begin::I2C");
333333
for (auto &tmp : i2c) {
334-
AD_LOGD("DriverPins::begin::I2C::begin");
334+
AD_LOGD("DriverPins::begin::I2C port:%d", tmp.port);
335335
result &= tmp.begin();
336336
}
337337
return result;

0 commit comments

Comments
 (0)