Skip to content

Commit 56426bb

Browse files
committed
use audio_eof as default event
audio_eof_mp3, audio_eof_stream, audio_eof_speech, audio_commercial no longer exists
1 parent 689ab20 commit 56426bb

File tree

12 files changed

+79
-120
lines changed

12 files changed

+79
-120
lines changed

README.md

Lines changed: 2 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -83,8 +83,8 @@ void audio_info(const char *info){
8383
void audio_id3data(const char *info){ //id3 metadata
8484
Serial.print("id3data ");Serial.println(info);
8585
}
86-
void audio_eof_mp3(const char *info){ //end of file
87-
Serial.print("eof_mp3 ");Serial.println(info);
86+
void audio_eof(const char *info){ //end of file
87+
Serial.print("eof ");Serial.println(info);
8888
}
8989
void audio_showstation(const char *info){
9090
Serial.print("station ");Serial.println(info);
@@ -95,18 +95,12 @@ void audio_showstreamtitle(const char *info){
9595
void audio_bitrate(const char *info){
9696
Serial.print("bitrate ");Serial.println(info);
9797
}
98-
void audio_commercial(const char *info){ //duration in sec
99-
Serial.print("commercial ");Serial.println(info);
100-
}
10198
void audio_icyurl(const char *info){ //homepage
10299
Serial.print("icyurl ");Serial.println(info);
103100
}
104101
void audio_lasthost(const char *info){ //stream URL played
105102
Serial.print("lasthost ");Serial.println(info);
106103
}
107-
void audio_eof_speech(const char *info){
108-
Serial.print("eof_speech ");Serial.println(info);
109-
}
110104

111105
````
112106

examples/AC101/main.cpp

Lines changed: 2 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -90,8 +90,8 @@ void audio_info(const char *info){
9090
void audio_id3data(const char *info){ //id3 metadata
9191
Serial.print("id3data ");Serial.println(info);
9292
}
93-
void audio_eof_mp3(const char *info){ //end of file
94-
Serial.print("eof_mp3 ");Serial.println(info);
93+
void audio_eof(const char *info){ //end of file
94+
Serial.print("eof ");Serial.println(info);
9595
}
9696
void audio_showstation(const char *info){
9797
Serial.print("station ");Serial.println(info);
@@ -102,15 +102,9 @@ void audio_showstreamtitle(const char *info){
102102
void audio_bitrate(const char *info){
103103
Serial.print("bitrate ");Serial.println(info);
104104
}
105-
void audio_commercial(const char *info){ //duration in sec
106-
Serial.print("commercial ");Serial.println(info);
107-
}
108105
void audio_icyurl(const char *info){ //homepage
109106
Serial.print("icyurl ");Serial.println(info);
110107
}
111108
void audio_lasthost(const char *info){ //stream URL played
112109
Serial.print("lasthost ");Serial.println(info);
113110
}
114-
void audio_eof_speech(const char *info){
115-
Serial.print("eof_speech ");Serial.println(info);
116-
}

examples/DLNA/src/main.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -178,7 +178,7 @@ void audio_info(const char *info){
178178
void audio_id3data(const char *info){ //id3 metadata
179179
Serial.print("id3data ");Serial.println(info);
180180
}
181-
void audio_eof_stream(const char* info){ // The webstream comes to an end
181+
void audio_eof(const char* info){ // The webstream comes to an end
182182
Serial.print("end of stream: ");Serial.println(info);
183183
}
184184
void audio_bitrate(const char *info){

examples/ES8388/main.cpp

Lines changed: 2 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -113,8 +113,8 @@ void audio_info(const char *info){
113113
void audio_id3data(const char *info){ //id3 metadata
114114
Serial.print("id3data ");Serial.println(info);
115115
}
116-
void audio_eof_mp3(const char *info){ //end of file
117-
Serial.print("eof_mp3 ");Serial.println(info);
116+
void audio_eof(const char *info){ //end of file
117+
Serial.print("eof ");Serial.println(info);
118118
}
119119
void audio_showstation(const char *info){
120120
Serial.print("station ");Serial.println(info);
@@ -125,15 +125,9 @@ void audio_showstreamtitle(const char *info){
125125
void audio_bitrate(const char *info){
126126
Serial.print("bitrate ");Serial.println(info);
127127
}
128-
void audio_commercial(const char *info){ //duration in sec
129-
Serial.print("commercial ");Serial.println(info);
130-
}
131128
void audio_icyurl(const char *info){ //homepage
132129
Serial.print("icyurl ");Serial.println(info);
133130
}
134131
void audio_lasthost(const char *info){ //stream URL played
135132
Serial.print("lasthost ");Serial.println(info);
136133
}
137-
void audio_eof_speech(const char *info){
138-
Serial.print("eof_speech ");Serial.println(info);
139-
}

examples/I2Saudio/I2Saudio.ino

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -77,7 +77,7 @@ void audio_info(const char *info){
7777
void audio_id3data(const char *info){ //id3 metadata
7878
Serial.print("id3data ");Serial.println(info);
7979
}
80-
void audio_eof_mp3(const char *info){ //end of file
80+
void audio_eof(const char *info){ //end of file
8181
Serial.print("eof_mp3 ");Serial.println(info);
8282
}
8383
void audio_showstation(const char *info){
@@ -89,9 +89,6 @@ void audio_showstreamtitle(const char *info){
8989
void audio_bitrate(const char *info){
9090
Serial.print("bitrate ");Serial.println(info);
9191
}
92-
void audio_commercial(const char *info){ //duration in sec
93-
Serial.print("commercial ");Serial.println(info);
94-
}
9592
void audio_icyurl(const char *info){ //homepage
9693
Serial.print("icyurl ");Serial.println(info);
9794
}

examples/M5Core2/M5Core2.ino

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -78,7 +78,7 @@ void audio_info(const char *info){
7878
void audio_id3data(const char *info){ //id3 metadata
7979
Serial.print("id3data ");Serial.println(info);
8080
}
81-
void audio_eof_mp3(const char *info){ //end of file
81+
void audio_eof(const char *info){ //end of file
8282
Serial.print("eof_mp3 ");Serial.println(info);
8383
}
8484
void audio_showstation(const char *info){
@@ -99,6 +99,3 @@ void audio_icyurl(const char *info){ //homepage
9999
void audio_lasthost(const char *info){ //stream URL played
100100
Serial.print("lasthost ");Serial.println(info);
101101
}
102-
void audio_eof_speech(const char *info){
103-
Serial.print("eof_speech ");Serial.println(info);
104-
}

examples/M5StickCPlus/M5StickCPlus.ino

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@ void audio_info(const char *info){
6060
void audio_id3data(const char *info){ //id3 metadata
6161
Serial.print("id3data ");Serial.println(info);
6262
}
63-
void audio_eof_mp3(const char *info){ //end of file
63+
void audio_eof(const char *info){ //end of file
6464
Serial.print("eof_mp3 ");Serial.println(info);
6565
}
6666
void audio_showstation(const char *info){
@@ -72,15 +72,9 @@ void audio_showstreamtitle(const char *info){
7272
void audio_bitrate(const char *info){
7373
Serial.print("bitrate ");Serial.println(info);
7474
}
75-
void audio_commercial(const char *info){ //duration in sec
76-
Serial.print("commercial ");Serial.println(info);
77-
}
7875
void audio_icyurl(const char *info){ //homepage
7976
Serial.print("icyurl ");Serial.println(info);
8077
}
8178
void audio_lasthost(const char *info){ //stream URL played
8279
Serial.print("lasthost ");Serial.println(info);
8380
}
84-
void audio_eof_speech(const char *info){
85-
Serial.print("eof_speech ");Serial.println(info);
86-
}

examples/Synchronised lyrics/synchronised_lyrics.ino

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ void audio_id3data(const char *info){ //id3 metadata
4040
// if(strncmp(info, "Year: ", 6) == 0) Serial.println(info + 6);
4141
Serial.print("id3data ");Serial.println(info);
4242
}
43-
void audio_eof_mp3(const char *info){ //end of file
43+
void audio_eof(const char *info){ //end of file
4444
Serial.print("eof_mp3 ");Serial.println(info);
4545
}
4646

examples/TalkingClock/TalkingClock.ino

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@ void loop(){
5858
}
5959
}
6060

61-
void audio_eof_mp3(const char *info){ //end of file
61+
void audio_eof(const char *info){ //end of file
6262
//Serial.printf("file :%s\n", info);
6363
if(timefile>0){
6464
if(timefile==1){audio.connecttoFS(SD, "/voice_time/080.mp3"); timefile--;} // stroke

examples/plays all files in a directory/plays_all_files_in_a_directory.ino

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -100,7 +100,7 @@ void audio_info(const char *info){
100100
void audio_id3data(const char *info){ //id3 metadata
101101
Serial.print("id3data ");Serial.println(info);
102102
}
103-
void audio_eof_mp3(const char *info){ //end of file
103+
void audio_eof(const char *info){ //end of file
104104
Serial.print("eof_mp3 ");Serial.println(info);
105105
if(v_audioContent.size() == 0){
106106
vector_clear_and_shrink(v_audioContent); // free memory

0 commit comments

Comments
 (0)