Fix 'i2s_write_bytes' was not declared in this scope on ESP32 (earlephilhower#428)

qnxsgwy · web-flow · commit 6882b6e1b695 · 2021-09-08T08:57:25.000-07:00
diff --git a/src/AudioOutputI2S.cpp b/src/AudioOutputI2S.cpp
@@ -269,7 +269,12 @@ bool AudioOutputI2S::ConsumeSample(int16_t sample[2])
     {
       s32 = ((Amplify(ms[RIGHTCHANNEL])) << 16) | (Amplify(ms[LEFTCHANNEL]) & 0xffff);
     }
-    return i2s_write_bytes((i2s_port_t)portNo, (const char *)&s32, sizeof(uint32_t), 0);
+//"i2s_write_bytes" has been removed in the ESP32 Arduino 2.0.0,  use "i2s_write" instead.
+//    return i2s_write_bytes((i2s_port_t)portNo, (const char *)&s32, sizeof(uint32_t), 0);
+
+    size_t i2s_bytes_written;
+    i2s_write((i2s_port_t)portNo, (const char*)&s32, sizeof(uint32_t), &i2s_bytes_written, 0);
+    return i2s_bytes_written;
   #elif defined(ESP8266)
     uint32_t s32 = ((Amplify(ms[RIGHTCHANNEL])) << 16) | (Amplify(ms[LEFTCHANNEL]) & 0xffff);
     return i2s_write_sample_nb(s32); // If we can't store it, return false.  OTW true
diff --git a/src/AudioOutputI2SNoDAC.cpp b/src/AudioOutputI2SNoDAC.cpp
@@ -95,8 +95,14 @@ bool AudioOutputI2SNoDAC::ConsumeSample(int16_t sample[2])
 
   // Either send complete pulse stream or nothing
 #ifdef ESP32
-  if (!i2s_write_bytes((i2s_port_t)portNo, (const char *)dsBuff, sizeof(uint32_t) * (oversample/32), 0))
+//"i2s_write_bytes" has been removed in the ESP32 Arduino 2.0.0,  use "i2s_write" instead.
+//  if (!i2s_write_bytes((i2s_port_t)portNo, (const char *)dsBuff, sizeof(uint32_t) * (oversample/32), 0))
+
+  size_t i2s_bytes_written;
+  i2s_write((i2s_port_t)portNo, (const char *)dsBuff, sizeof(uint32_t) * (oversample/32), &i2s_bytes_written, 0);
+  if (!i2s_bytes_written){
     return false;
+  }
 #elif defined(ESP8266)
   if (!i2s_write_sample_nb(dsBuff[0])) return false; // No room at the inn
   // At this point we've sent in first of possibly 8 32-bits, need to send

Original file line number	Diff line number	Diff line change
`@@ -269,7 +269,12 @@ bool AudioOutputI2S::ConsumeSample(int16_t sample[2])`
`269`	`269`	`{`
`270`	`270`	`s32 = ((Amplify(ms[RIGHTCHANNEL])) << 16) \| (Amplify(ms[LEFTCHANNEL]) & 0xffff);`
`271`	`271`	`}`
`272`		`- return i2s_write_bytes((i2s_port_t)portNo, (const char *)&s32, sizeof(uint32_t), 0);`
	`272`	`+//"i2s_write_bytes" has been removed in the ESP32 Arduino 2.0.0, use "i2s_write" instead.`
	`273`	`+// return i2s_write_bytes((i2s_port_t)portNo, (const char *)&s32, sizeof(uint32_t), 0);`
	`274`	`+`
	`275`	`+ size_t i2s_bytes_written;`
	`276`	`+ i2s_write((i2s_port_t)portNo, (const char*)&s32, sizeof(uint32_t), &i2s_bytes_written, 0);`
	`277`	`+ return i2s_bytes_written;`
`273`	`278`	`#elif defined(ESP8266)`
`274`	`279`	`uint32_t s32 = ((Amplify(ms[RIGHTCHANNEL])) << 16) \| (Amplify(ms[LEFTCHANNEL]) & 0xffff);`
`275`	`280`	`return i2s_write_sample_nb(s32); // If we can't store it, return false. OTW true`