From a95f9b7dde15703c7661462cbce81b89cedaff5e Mon Sep 17 00:00:00 2001 From: Bertrand Songis Date: Tue, 23 Aug 2016 21:07:40 +0200 Subject: [PATCH] getSystemAudioPath renamed to strAppendSystemAudioPath --- radio/src/audio_arm.cpp | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/radio/src/audio_arm.cpp b/radio/src/audio_arm.cpp index 0847c2247..f6871d136 100644 --- a/radio/src/audio_arm.cpp +++ b/radio/src/audio_arm.cpp @@ -203,7 +203,7 @@ char * getAudioPath(char * path) return path + sizeof(SOUNDS_PATH); } -char * getSystemAudioPath(char * path) +char * strAppendSystemAudioPath(char * path) { char * str = getAudioPath(path); strcpy(str, SYSTEM_SUBDIR "/"); @@ -212,7 +212,7 @@ char * getSystemAudioPath(char * path) void getSystemAudioFile(char * filename, int index) { - char * str = getSystemAudioPath(filename); + char * str = strAppendSystemAudioPath(filename); strcpy(str, audioFilenames[index]); strcat(str, SOUNDS_EXT); } @@ -232,7 +232,7 @@ void referenceSystemAudioFiles() assert(sizeof(audioFilenames)==AU_SPECIAL_SOUND_FIRST*sizeof(char *)); assert(sizeof(sdAvailableSystemAudioFiles)*8 >= AU_SPECIAL_SOUND_FIRST); - char * filename = getSystemAudioPath(path); + char * filename = strAppendSystemAudioPath(path); *(filename-1) = '\0'; FRESULT res = f_opendir(&dir, path); /* Open the directory */ @@ -1239,7 +1239,7 @@ void pushPrompt(uint16_t prompt, uint8_t id) { #if defined(SDCARD) char filename[AUDIO_FILENAME_MAXLEN+1]; - char * str = getSystemAudioPath(filename); + char * str = strAppendSystemAudioPath(filename); strcpy(str, "0000" SOUNDS_EXT); for (int8_t i=3; i>=0; i--) { str[i] = '0' + (prompt%10);