rudism
/
pinebuds
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Rename some CN sound variable names for consistency. Builds!

This commit is contained in:
Thatcher Chamberlin 2023-02-17 22:23:25 -05:00
parent e35da82d83
commit d119ccc2ce
2 changed files with 90 additions and 90 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

92
services/bt_app/app_media_player.cpp
View File

@ -471,181 +471,181 @@ void media_runtime_audio_prompt_update(uint16_t id, uint8_t **ptr,
g_app_audio_data =
(g_language == MEDIA_DEFAULT_LANGUAGE)
? (U8 *)EN_SOUND_POWER_ON
: (U8 *)CN_POWER_ON; // aud_get_reouce((AUD_ID_ENUM)id,
: (U8 *)CN_SOUND_POWER_ON; // aud_get_reouce((AUD_ID_ENUM)id,
// &g_app_audio_length, &type);
g_app_audio_length = (g_language == MEDIA_DEFAULT_LANGUAGE)
? EN_SOUND_POWER_ON_len
: CN_POWER_ON_len;
: CN_SOUND_POWER_ON_len;
break;
case AUD_ID_POWER_OFF:
g_app_audio_data = (g_language == MEDIA_DEFAULT_LANGUAGE)
? (U8 *)EN_SOUND_POWER_OFF
: (U8 *)CN_POWER_OFF;
: (U8 *)CN_SOUND_POWER_OFF;
g_app_audio_length = (g_language == MEDIA_DEFAULT_LANGUAGE)
? EN_SOUND_POWER_OFF_len
: CN_POWER_OFF_len;
: CN_SOUND_POWER_OFF_len;
break;
case AUD_ID_BT_PAIR_ENABLE:
g_app_audio_data = (g_language == MEDIA_DEFAULT_LANGUAGE)
? (U8 *)EN_SOUND_PAIR_ENABLE
: (U8 *)CN_BT_PAIR_ENABLE;
: (U8 *)CN_SOUND_PAIR_ENABLE;
g_app_audio_length = (g_language == MEDIA_DEFAULT_LANGUAGE)
? EN_SOUND_PAIR_ENABLE_len
: CN_BT_PAIR_ENABLE_len;
: CN_SOUND_PAIR_ENABLE_len;
break;
case AUD_ID_BT_PAIRING:
g_app_audio_data = (g_language == MEDIA_DEFAULT_LANGUAGE)
? (U8 *)EN_SOUND_PAIRING
: (U8 *)CN_BT_PAIRING;
: (U8 *)CN_SOUND_PAIRING;
g_app_audio_length = (g_language == MEDIA_DEFAULT_LANGUAGE)
? EN_SOUND_PAIRING_len
: CN_BT_PAIRING_len;
: CN_SOUND_PAIRING_len;
break;
case AUD_ID_BT_PAIRING_SUC:
g_app_audio_data = (g_language == MEDIA_DEFAULT_LANGUAGE)
? (U8 *)EN_SOUND_PAIRING_SUCCESS
: (U8 *)CN_BT_PAIRING_SUCCESS;
: (U8 *)CN_SOUND_PAIRING_SUCCESS;
g_app_audio_length = (g_language == MEDIA_DEFAULT_LANGUAGE)
? EN_SOUND_PAIRING_SUCCESS_len
: CN_BT_PAIRING_SUCCESS_len;
: CN_SOUND_PAIRING_SUCCESS_len;
break;
case AUD_ID_BT_PAIRING_FAIL:
g_app_audio_data = (g_language == MEDIA_DEFAULT_LANGUAGE)
? (U8 *)EN_SOUND_PAIRING_FAIL
: (U8 *)CN_BT_PAIRING_FAIL;
: (U8 *)CN_SOUND_PAIRING_FAIL;
g_app_audio_length = (g_language == MEDIA_DEFAULT_LANGUAGE)
? EN_SOUND_PAIRING_FAIL_len
: CN_BT_PAIRING_FAIL_len;
: CN_SOUND_PAIRING_FAIL_len;
break;
case AUD_ID_BT_CALL_REFUSE:
g_app_audio_data = (g_language == MEDIA_DEFAULT_LANGUAGE)
? (U8 *)EN_SOUND_REFUSE
: (U8 *)CN_BT_REFUSE;
: (U8 *)CN_SOUND_REFUSE;
g_app_audio_length = (g_language == MEDIA_DEFAULT_LANGUAGE)
? EN_SOUND_REFUSE_len
: CN_BT_REFUSE_len;
: CN_SOUND_REFUSE_len;
break;
case AUD_ID_BT_CALL_OVER:
g_app_audio_data = (g_language == MEDIA_DEFAULT_LANGUAGE)
? (U8 *)EN_SOUND_OVER
: (U8 *)CN_BT_OVER;
: (U8 *)CN_SOUND_OVER;
g_app_audio_length = (g_language == MEDIA_DEFAULT_LANGUAGE)
? EN_SOUND_OVER_len
: CN_BT_OVER_len;
: CN_SOUND_OVER_len;
break;
case AUD_ID_BT_CALL_ANSWER:
g_app_audio_data = (g_language == MEDIA_DEFAULT_LANGUAGE)
? (U8 *)EN_SOUND_ANSWER
: (U8 *)CN_BT_ANSWER;
: (U8 *)CN_SOUND_ANSWER;
g_app_audio_length = (g_language == MEDIA_DEFAULT_LANGUAGE)
? EN_SOUND_ANSWER_len
: CN_BT_ANSWER_len;
: CN_SOUND_ANSWER_len;
break;
case AUD_ID_BT_CALL_HUNG_UP:
g_app_audio_data = (g_language == MEDIA_DEFAULT_LANGUAGE)
? (U8 *)EN_SOUND_HUNG_UP
: (U8 *)CN_BT_HUNG_UP;
: (U8 *)CN_SOUND_HUNG_UP;
g_app_audio_length = (g_language == MEDIA_DEFAULT_LANGUAGE)
? EN_SOUND_HUNG_UP_len
: CN_BT_HUNG_UP_len;
: CN_SOUND_HUNG_UP_len;
break;
case AUD_ID_BT_CALL_INCOMING_CALL:
g_app_audio_data = (g_language == MEDIA_DEFAULT_LANGUAGE)
? (U8 *)EN_SOUND_INCOMING_CALL
: (U8 *)CN_BT_INCOMING_CALL;
: (U8 *)CN_SOUND_INCOMING_CALL;
g_app_audio_length = (g_language == MEDIA_DEFAULT_LANGUAGE)
? EN_SOUND_INCOMING_CALL_len
: CN_BT_INCOMING_CALL_len;
: CN_SOUND_INCOMING_CALL_len;
break;
case AUD_ID_BT_CHARGE_PLEASE:
g_app_audio_data = (g_language == MEDIA_DEFAULT_LANGUAGE)
? (U8 *)EN_SOUND_CHARGE_PLEASE
: (U8 *)CN_CHARGE_PLEASE;
: (U8 *)CN_SOUND_CHARGE_PLEASE;
g_app_audio_length = (g_language == MEDIA_DEFAULT_LANGUAGE)
? EN_SOUND_CHARGE_PLEASE_len
: CN_CHARGE_PLEASE_len;
: CN_SOUND_CHARGE_PLEASE_len;
break;
case AUD_ID_BT_CHARGE_FINISH:
g_app_audio_data = (g_language == MEDIA_DEFAULT_LANGUAGE)
? (U8 *)EN_SOUND_CHARGE_FINISH
: (U8 *)CN_CHARGE_FINISH;
: (U8 *)CN_SOUND_CHARGE_FINISH;
g_app_audio_length = (g_language == MEDIA_DEFAULT_LANGUAGE)
? EN_SOUND_CHARGE_FINISH_len
: CN_CHARGE_FINISH_len;
: CN_SOUND_CHARGE_FINISH_len;
break;
case AUD_ID_BT_CONNECTED:
g_app_audio_data = (g_language == MEDIA_DEFAULT_LANGUAGE)
? (U8 *)EN_SOUND_CONNECTED
: (U8 *)CN_BT_CONNECTED;
: (U8 *)CN_SOUND_CONNECTED;
g_app_audio_length = (g_language == MEDIA_DEFAULT_LANGUAGE)
? EN_SOUND_CONNECTED_len
: CN_BT_CONNECTED_len;
: CN_SOUND_CONNECTED_len;
break;
case AUD_ID_BT_DIS_CONNECT:
g_app_audio_data = (g_language == MEDIA_DEFAULT_LANGUAGE)
? (U8 *)EN_SOUND_DIS_CONNECT
: (U8 *)CN_BT_DIS_CONNECT;
: (U8 *)CN_SOUND_DIS_CONNECT;
g_app_audio_length = (g_language == MEDIA_DEFAULT_LANGUAGE)
? EN_SOUND_DIS_CONNECT_len
: CN_BT_DIS_CONNECT_len;
: CN_SOUND_DIS_CONNECT_len;
break;
case AUD_ID_BT_WARNING:
g_app_audio_data = (g_language == MEDIA_DEFAULT_LANGUAGE)
? (U8 *)EN_SOUND_WARNING
: (U8 *)CN_BT_WARNING;
: (U8 *)CN_SOUND_WARNING;
g_app_audio_length = (g_language == MEDIA_DEFAULT_LANGUAGE)
? EN_SOUND_WARNING_len
: CN_BT_WARNING_len;
: CN_SOUND_WARNING_len;
break;
case AUDIO_ID_BT_ALEXA_START:
g_app_audio_data = (g_language == MEDIA_DEFAULT_LANGUAGE)
? (U8 *)EN_SOUND_ALEXA_START
: (U8 *)CN_BT_ALEXA_START;
: (U8 *)CN_SOUND_ALEXA_START;
g_app_audio_length = (g_language == MEDIA_DEFAULT_LANGUAGE)
? EN_SOUND_ALEXA_START_len
: CN_BT_ALEXA_START_len;
: CN_SOUND_ALEXA_START_len;
break;
case AUDIO_ID_BT_ALEXA_STOP:
case AUDIO_ID_FIND_MY_BUDS:
case AUDIO_ID_FIND_TILE:
g_app_audio_data = (g_language == MEDIA_DEFAULT_LANGUAGE)
? (U8 *)EN_SOUND_ALEXA_STOP
: (U8 *)CN_BT_ALEXA_STOP;
: (U8 *)CN_SOUND_ALEXA_STOP;
g_app_audio_length = (g_language == MEDIA_DEFAULT_LANGUAGE)
? EN_SOUND_ALEXA_STOP_len
: CN_BT_ALEXA_STOP_len;
: CN_SOUND_ALEXA_STOP_len;
break;
case AUDIO_ID_BT_GSOUND_MIC_OPEN:
g_app_audio_data = (g_language == MEDIA_DEFAULT_LANGUAGE)
? (U8 *)EN_SOUND_GSOUND_MIC_OPEN
: (U8 *)CN_BT_GSOUND_MIC_OPEN;
: (U8 *)CN_SOUND_GSOUND_MIC_OPEN;
g_app_audio_length = (g_language == MEDIA_DEFAULT_LANGUAGE)
? EN_SOUND_GSOUND_MIC_OPEN_len
: CN_BT_GSOUND_MIC_OPEN_len;
: CN_SOUND_GSOUND_MIC_OPEN_len;
break;
case AUDIO_ID_BT_GSOUND_MIC_CLOSE:
g_app_audio_data = (g_language == MEDIA_DEFAULT_LANGUAGE)
? (U8 *)EN_SOUND_GSOUND_MIC_CLOSE
: (U8 *)CN_BT_GSOUND_MIC_CLOSE;
: (U8 *)CN_SOUND_GSOUND_MIC_CLOSE;
g_app_audio_length = (g_language == MEDIA_DEFAULT_LANGUAGE)
? EN_SOUND_GSOUND_MIC_CLOSE_len
: CN_BT_GSOUND_MIC_CLOSE_len;
: CN_SOUND_GSOUND_MIC_CLOSE_len;
break;
case AUDIO_ID_BT_GSOUND_NC:
g_app_audio_data = (g_language == MEDIA_DEFAULT_LANGUAGE)
? (U8 *)EN_SOUND_GSOUND_NC
: (U8 *)CN_BT_GSOUND_NC;
: (U8 *)CN_SOUND_GSOUND_NC;
g_app_audio_length = (g_language == MEDIA_DEFAULT_LANGUAGE)
? EN_SOUND_GSOUND_NC_len
: CN_BT_GSOUND_NC_len;
: CN_SOUND_GSOUND_NC_len;
break;
case AUD_ID_LANGUAGE_SWITCH:
g_app_audio_data = (g_language == MEDIA_DEFAULT_LANGUAGE)
? (U8 *)EN_SOUND_LANGUAGE_SWITCH
: (U8 *)CN_LANGUAGE_SWITCH;
: (U8 *)CN_SOUND_LANGUAGE_SWITCH;
g_app_audio_length = (g_language == MEDIA_DEFAULT_LANGUAGE)
? EN_SOUND_LANGUAGE_SWITCH_len
: CN_LANGUAGE_SWITCH_len;
: CN_SOUND_LANGUAGE_SWITCH_len;
break;
case AUDIO_ID_BT_MUTE:
g_app_audio_data = (U8 *)BT_MUTE;
@ -745,10 +745,10 @@ void media_runtime_audio_prompt_update(uint16_t id, uint8_t **ptr,
case AUD_ID_BT_FINDME:
g_app_audio_data = (g_language == MEDIA_DEFAULT_LANGUAGE)
? (U8 *)EN_SOUND_FINDME
: (U8 *)CN_BT_FINDME;
: (U8 *)CN_SOUND_FINDME;
g_app_audio_length = (g_language == MEDIA_DEFAULT_LANGUAGE)
? EN_SOUND_FINDME_len
: CN_BT_FINDME_len;
: CN_SOUND_FINDME_len;
break;
#endif
case AUDIO_ID_BT_DUDU:

88
services/bt_app/res_audio_data_cn.h
View File

@ -14,9 +14,9 @@
*
****************************************************************************/
extern const uint8_t CN_POWER_ON [];
extern const uint8_t CN_SOUND_POWER_ON [];
extern const uint8_t CN_POWER_OFF [];
extern const uint8_t CN_SOUND_POWER_OFF [];
extern const uint8_t CN_SOUND_ZERO[];
@ -38,50 +38,50 @@ extern const uint8_t CN_SOUND_EIGHT[];
extern const uint8_t CN_SOUND_NINE[];
extern const uint8_t CN_BT_PAIR_ENABLE[];
extern const uint8_t CN_SOUND_PAIR_ENABLE[];
extern const uint8_t CN_BT_PAIRING [];
extern const uint8_t CN_SOUND_PAIRING [];
extern const uint8_t CN_BT_PAIRING_FAIL[];
extern const uint8_t CN_SOUND_PAIRING_FAIL[];
extern const uint8_t CN_BT_PAIRING_SUCCESS[];
extern const uint8_t CN_SOUND_PAIRING_SUCCESS[];
extern const uint8_t CN_BT_REFUSE[];
extern const uint8_t CN_SOUND_REFUSE[];
extern const uint8_t CN_BT_OVER[];
extern const uint8_t CN_SOUND_OVER[];
extern const uint8_t CN_BT_ANSWER[];
extern const uint8_t CN_SOUND_ANSWER[];
extern const uint8_t CN_BT_HUNG_UP[];
extern const uint8_t CN_SOUND_HUNG_UP[];
extern const uint8_t CN_BT_INCOMING_CALL [];
extern const uint8_t CN_SOUND_INCOMING_CALL [];
extern const uint8_t CN_BT_CONNECTED [];
extern const uint8_t CN_SOUND_CONNECTED [];
extern const uint8_t CN_BT_DIS_CONNECT [];
extern const uint8_t CN_SOUND_DIS_CONNECT [];
extern const uint8_t CN_CHARGE_PLEASE[] ;
extern const uint8_t CN_SOUND_CHARGE_PLEASE[] ;
extern const uint8_t CN_CHARGE_FINISH[];
extern const uint8_t CN_SOUND_CHARGE_FINISH[];
extern const uint8_t CN_LANGUAGE_SWITCH[];
extern const uint8_t CN_SOUND_LANGUAGE_SWITCH[];
extern const uint8_t CN_BT_WARNING[];
extern const uint8_t CN_SOUND_WARNING[];
extern const uint8_t CN_BT_ALEXA_START[];
extern const uint8_t CN_SOUND_ALEXA_START[];
extern const uint8_t CN_BT_ALEXA_STOP[];
extern const uint8_t CN_SOUND_ALEXA_STOP[];
extern const uint8_t CN_BT_GSOUND_MIC_OPEN[];
extern const uint8_t CN_SOUND_GSOUND_MIC_OPEN[];
extern const uint8_t CN_BT_GSOUND_MIC_CLOSE[];
extern const uint8_t CN_SOUND_GSOUND_MIC_CLOSE[];
extern const uint8_t CN_BT_GSOUND_NC[];
extern const uint8_t CN_SOUND_GSOUND_NC[];
extern unsigned int CN_POWER_ON_len;
extern unsigned int CN_SOUND_POWER_ON_len;
extern unsigned int CN_POWER_OFF_len;
extern unsigned int CN_SOUND_POWER_OFF_len;
extern unsigned int CN_SOUND_ZERO_len;
@ -103,45 +103,45 @@ extern unsigned int CN_SOUND_EIGHT_len;
extern unsigned int CN_SOUND_NINE_len;
extern unsigned int CN_BT_PAIR_ENABLE_len;
extern unsigned int CN_SOUND_PAIR_ENABLE_len;
extern unsigned int CN_BT_PAIRING_len;
extern unsigned int CN_SOUND_PAIRING_len;
extern unsigned int CN_BT_PAIRING_FAIL_len;
extern unsigned int CN_SOUND_PAIRING_FAIL_len;
extern unsigned int CN_BT_PAIRING_SUCCESS_len;
extern unsigned int CN_SOUND_PAIRING_SUCCESS_len;
extern unsigned int CN_BT_REFUSE_len;
extern unsigned int CN_SOUND_REFUSE_len;
extern unsigned int CN_BT_OVER_len;
extern unsigned int CN_SOUND_OVER_len;
extern unsigned int CN_BT_ANSWER_len;
extern unsigned int CN_SOUND_ANSWER_len;
extern unsigned int CN_BT_HUNG_UP_len;
extern unsigned int CN_SOUND_HUNG_UP_len;
extern unsigned int CN_BT_INCOMING_CALL_len;
extern unsigned int CN_SOUND_INCOMING_CALL_len;
extern unsigned int CN_BT_CONNECTED_len;
extern unsigned int CN_SOUND_CONNECTED_len;
extern unsigned int CN_BT_DIS_CONNECT_len;
extern unsigned int CN_SOUND_DIS_CONNECT_len;
extern unsigned int CN_CHARGE_PLEASE_len ;
extern unsigned int CN_SOUND_CHARGE_PLEASE_len ;
extern unsigned int CN_CHARGE_FINISH_len;
extern unsigned int CN_SOUND_CHARGE_FINISH_len;
extern unsigned int CN_LANGUAGE_SWITCH_len;
extern unsigned int CN_SOUND_LANGUAGE_SWITCH_len;
extern unsigned int CN_BT_WARNING_len;
extern unsigned int CN_SOUND_WARNING_len;
extern unsigned int CN_BT_ALEXA_START_len;
extern unsigned int CN_SOUND_ALEXA_START_len;
extern unsigned int CN_BT_ALEXA_STOP_len;
extern unsigned int CN_SOUND_ALEXA_STOP_len;
extern unsigned int CN_BT_GSOUND_MIC_OPEN_len;
extern unsigned int CN_SOUND_GSOUND_MIC_OPEN_len;
extern unsigned int CN_BT_GSOUND_MIC_CLOSE_len;
extern unsigned int CN_SOUND_GSOUND_MIC_CLOSE_len;
extern unsigned int CN_BT_GSOUND_NC_len;
extern unsigned int CN_SOUND_GSOUND_NC_len;
#ifdef __INTERACTION__