Mirror/opentx
1
0
Fork 0
mirror of https://github.com/opentx/opentx.git synced 2025-07-20 06:45:10 +03:00
Code Issues Wiki Activity

VOICE definition removed (always used)

Browse source
This commit is contained in:
Bertrand Songis 2018-08-03 08:33:33 +02:00
parent 298f41fc76
commit cdfdcf6d13
25 changed files with 8 additions and 100 deletions
Download patch file Download diff file Expand all files Collapse all files

5
radio/src/audio_arm.h
View file

@ -532,13 +532,8 @@ void audioTask(void * pdata);
#define AUDIO_BUZZER(a, b) b #define AUDIO_BUZZER(a, b) b
#endif #endif
#if defined(VOICE)
#define AUDIO_ERROR_MESSAGE(e) audioEvent(e) #define AUDIO_ERROR_MESSAGE(e) audioEvent(e)
#define AUDIO_TIMER_MINUTE(t) playDuration(t, 0, 0) #define AUDIO_TIMER_MINUTE(t) playDuration(t, 0, 0)
#else
#define AUDIO_ERROR_MESSAGE(e) audioEvent(AU_ERROR)
#define AUDIO_TIMER_MINUTE(t) audioDefevent(AU_WARNING1)
#endif
void audioKeyPress(); void audioKeyPress();
void audioKeyError(); void audioKeyError();

12
radio/src/buzzer.h
View file

@ -55,7 +55,6 @@ inline void beep(uint8_t) { }
#if !defined(AUDIO) #if !defined(AUDIO)
#if defined(BUZZER) #if defined(BUZZER)
#if defined(VOICE)
#define AUDIO_HELLO() PUSH_SYSTEM_PROMPT(AUDIO_HELLO) #define AUDIO_HELLO() PUSH_SYSTEM_PROMPT(AUDIO_HELLO)
#define AUDIO_BYE() #define AUDIO_BYE()
#define AUDIO_TX_BATTERY_LOW() PUSH_SYSTEM_PROMPT(AU_TX_BATTERY_LOW) #define AUDIO_TX_BATTERY_LOW() PUSH_SYSTEM_PROMPT(AU_TX_BATTERY_LOW)
@ -65,17 +64,6 @@ inline void beep(uint8_t) { }
// TODO // TODO
#define AUDIO_TIMER_30() PUSH_SYSTEM_PROMPT(AU_TIMER_30) #define AUDIO_TIMER_30() PUSH_SYSTEM_PROMPT(AU_TIMER_30)
#define AUDIO_TIMER_20() PUSH_SYSTEM_PROMPT(AU_TIMER_20) #define AUDIO_TIMER_20() PUSH_SYSTEM_PROMPT(AU_TIMER_20)
#else
#define AUDIO_HELLO()
#define AUDIO_BYE()
#define AUDIO_TX_BATTERY_LOW() beep(4)
#define AUDIO_INACTIVITY() beep(3)
#define AUDIO_ERROR_MESSAGE(e) beep(4)
#define AUDIO_TIMER_MINUTE(t) beep(2)
// TODO
#define AUDIO_TIMER_30() { beepAgain=2; beep(2); }
#define AUDIO_TIMER_20() { beepAgain=1; beep(2); }
#endif
#define AUDIO_KEY_PRESS() beep(0) #define AUDIO_KEY_PRESS() beep(0)
#define AUDIO_KEY_ERROR() beep(2) #define AUDIO_KEY_ERROR() beep(2)

15
radio/src/functions.cpp
View file

@ -36,7 +36,6 @@ void testFunc()
} }
#endif #endif
#if defined(VOICE)
PLAY_FUNCTION(playValue, source_t idx) PLAY_FUNCTION(playValue, source_t idx)
{ {
if (IS_FAI_FORBIDDEN(idx)) if (IS_FAI_FORBIDDEN(idx))
@ -87,7 +86,6 @@ PLAY_FUNCTION(playValue, source_t idx)
PLAY_NUMBER(val, 0, 0); PLAY_NUMBER(val, 0, 0);
} }
} }
#endif
void playCustomFunctionFile(const CustomFunctionData * sd, uint8_t id) void playCustomFunctionFile(const CustomFunctionData * sd, uint8_t id)
{ {
@ -328,7 +326,7 @@ void evalFunctions(const CustomFunctionData * functions, CustomFunctionsContext
newActiveFunctions |= (1 << FUNCTION_BACKGND_MUSIC_PAUSE); newActiveFunctions |= (1 << FUNCTION_BACKGND_MUSIC_PAUSE);
break; break;
#elif defined(VOICE) #else
case FUNC_PLAY_SOUND: case FUNC_PLAY_SOUND:
case FUNC_PLAY_TRACK: case FUNC_PLAY_TRACK:
case FUNC_PLAY_BOTH: case FUNC_PLAY_BOTH:
@ -359,17 +357,6 @@ void evalFunctions(const CustomFunctionData * functions, CustomFunctionsContext
} }
break; break;
} }
#else
case FUNC_PLAY_SOUND:
{
tmr10ms_t tmr10ms = get_tmr10ms();
uint8_t repeatParam = CFN_PLAY_REPEAT(cfn);
if (!functionsContext.lastFunctionTime[i] || (repeatParam && (signed)(tmr10ms-functionsContext.lastFunctionTime[i])>=1000*repeatParam)) {
functionsContext.lastFunctionTime[i] = tmr10ms;
AUDIO_PLAY(AU_SPECIAL_SOUND_FIRST+CFN_PARAM(cfn));
}
break;
}
#endif #endif
#if defined(TELEMETRY_FRSKY) && defined(VARIO) #if defined(TELEMETRY_FRSKY) && defined(VARIO)

8
radio/src/gui/128x64/gui.h
View file

@ -379,13 +379,7 @@ void drawVerticalScrollbar(coord_t x, coord_t y, coord_t h, uint16_t offset, uin
void drawAlertBox(const pm_char * title, const pm_char * text, const char * action); void drawAlertBox(const pm_char * title, const pm_char * text, const char * action);
#endif #endif
#if defined(VOICE) void showAlertBox(const pm_char * title, const pm_char * text, const char * action , uint8_t sound);
#define ALERT_SOUND_ARG , uint8_t sound
#else
#define ALERT_SOUND_ARG
#endif
void showAlertBox(const pm_char * title, const pm_char * text, const char * action ALERT_SOUND_ARG);
#define SET_SCROLLBAR_X(x) #define SET_SCROLLBAR_X(x)
#define LOAD_MODEL_BITMAP() #define LOAD_MODEL_BITMAP()

2
radio/src/gui/128x64/popups.cpp
View file

@ -77,7 +77,7 @@ void drawAlertBox(const pm_char * title, const pm_char * text, const char * acti
#undef MESSAGE_LCD_OFFSET #undef MESSAGE_LCD_OFFSET
} }
void showAlertBox(const pm_char * title, const pm_char * text, const char * action ALERT_SOUND_ARG) void showAlertBox(const pm_char * title, const pm_char * text, const char * action , uint8_t sound)
{ {
drawAlertBox(title, text, action); drawAlertBox(title, text, action);

4
radio/src/gui/128x64/radio_setup.cpp
View file

@ -55,7 +55,7 @@ enum MenuRadioSetupItems {
ITEM_SETUP_SOUND_LABEL, ITEM_SETUP_SOUND_LABEL,
CASE_AUDIO(ITEM_SETUP_BEEP_MODE) CASE_AUDIO(ITEM_SETUP_BEEP_MODE)
CASE_BUZZER(ITEM_SETUP_BUZZER_MODE) CASE_BUZZER(ITEM_SETUP_BUZZER_MODE)
CASE_VOICE(ITEM_SETUP_SPEAKER_VOLUME) ITEM_SETUP_SPEAKER_VOLUME,
ITEM_SETUP_BEEP_VOLUME, ITEM_SETUP_BEEP_VOLUME,
ITEM_SETUP_BEEP_LENGTH, ITEM_SETUP_BEEP_LENGTH,
CASE_AUDIO(ITEM_SETUP_SPEAKER_PITCH) CASE_AUDIO(ITEM_SETUP_SPEAKER_PITCH)
@ -131,7 +131,7 @@ void menuRadioSetup(event_t event)
} }
#endif #endif
MENU(STR_MENURADIOSETUP, menuTabGeneral, MENU_RADIO_SETUP, HEADER_LINE+ITEM_SETUP_MAX, { HEADER_LINE_COLUMNS CASE_RTCLOCK(2) CASE_RTCLOCK(2) CASE_BATTGRAPH(1) LABEL(SOUND), CASE_AUDIO(0) CASE_BUZZER(0) CASE_VOICE(0) 0, 0, 0, 0, CASE_AUDIO(0) CASE_VARIO(LABEL(VARIO)) CASE_VARIO(0) CASE_VARIO(0) CASE_VARIO(0) CASE_VARIO(0) CASE_HAPTIC(LABEL(HAPTIC)) CASE_HAPTIC(0) CASE_HAPTIC(0) CASE_HAPTIC(0) 0, LABEL(ALARMS), 0, CASE_CAPACITY(0) CASE_PCBSKY9X(0) 0, 0, 0, 0, IF_ROTARY_ENCODERS(0) LABEL(BACKLIGHT), 0, 0, 0, CASE_PWM_BACKLIGHT(0) CASE_PWM_BACKLIGHT(0) 0, CASE_SPLASH_PARAM(0) CASE_GPS(0) 0, CASE_GPS(0) CASE_PXX(0) 0, 0, IF_FAI_CHOICE(0) 0, CASE_STM32(0) 0, COL_TX_MODE, 0, 1/*to force edit mode*/}); MENU(STR_MENURADIOSETUP, menuTabGeneral, MENU_RADIO_SETUP, HEADER_LINE+ITEM_SETUP_MAX, { HEADER_LINE_COLUMNS CASE_RTCLOCK(2) CASE_RTCLOCK(2) CASE_BATTGRAPH(1) LABEL(SOUND), CASE_AUDIO(0) CASE_BUZZER(0) 0, 0, 0, 0, 0, CASE_AUDIO(0) CASE_VARIO(LABEL(VARIO)) CASE_VARIO(0) CASE_VARIO(0) CASE_VARIO(0) CASE_VARIO(0) CASE_HAPTIC(LABEL(HAPTIC)) CASE_HAPTIC(0) CASE_HAPTIC(0) CASE_HAPTIC(0) 0, LABEL(ALARMS), 0, CASE_CAPACITY(0) CASE_PCBSKY9X(0) 0, 0, 0, 0, IF_ROTARY_ENCODERS(0) LABEL(BACKLIGHT), 0, 0, 0, CASE_PWM_BACKLIGHT(0) CASE_PWM_BACKLIGHT(0) 0, CASE_SPLASH_PARAM(0) CASE_GPS(0) 0, CASE_GPS(0) CASE_PXX(0) 0, 0, IF_FAI_CHOICE(0) 0, CASE_STM32(0) 0, COL_TX_MODE, 0, 1/*to force edit mode*/});
if (event == EVT_ENTRY) { if (event == EVT_ENTRY) {
reusableBuffer.generalSettings.stickMode = g_eeGeneral.stickMode; reusableBuffer.generalSettings.stickMode = g_eeGeneral.stickMode;

1
radio/src/gui/212x64/gui.h
View file

@ -78,7 +78,6 @@ void drawColumnHeader(const char * const * headers, uint8_t index);
void drawStick(coord_t centrex, int16_t xval, int16_t yval); void drawStick(coord_t centrex, int16_t xval, int16_t yval);
void drawAlertBox(const char * title, const char * text, const char * action); void drawAlertBox(const char * title, const char * text, const char * action);
#define ALERT_SOUND_ARG , uint8_t sound
void showAlertBox(const char * title, const char * text, const char * action, uint8_t sound); void showAlertBox(const char * title, const char * text, const char * action, uint8_t sound);
void doMainScreenGraphics(); void doMainScreenGraphics();

2
radio/src/gui/480x272/gui.h
View file

@ -81,8 +81,6 @@ FlightModesType editFlightModes(coord_t x, coord_t y, event_t event, FlightModes
#define displayFlightModes(...) #define displayFlightModes(...)
#endif #endif
#define ALERT_SOUND_ARG , uint8_t sound
// Curve functions // Curve functions
coord_t getCurveYCoord(FnFuncP fn, int x, int width); coord_t getCurveYCoord(FnFuncP fn, int x, int width);
void drawFunction(FnFuncP fn, int offset); void drawFunction(FnFuncP fn, int offset);

4
radio/src/myeeprom.h
View file

@ -53,11 +53,7 @@
#define IS_TRAINER_EXTERNAL_MODULE() false #define IS_TRAINER_EXTERNAL_MODULE() false
#endif #endif
#if defined(VOICE)
#define IS_PLAY_FUNC(func) ((func) >= FUNC_PLAY_SOUND && func <= FUNC_PLAY_VALUE) #define IS_PLAY_FUNC(func) ((func) >= FUNC_PLAY_SOUND && func <= FUNC_PLAY_VALUE)
#else
#define IS_PLAY_FUNC(func) ((func) == FUNC_PLAY_SOUND)
#endif
#define IS_PLAY_BOTH_FUNC(func) (0) #define IS_PLAY_BOTH_FUNC(func) (0)
#define IS_VOLUME_FUNC(func) ((func) == FUNC_VOLUME) #define IS_VOLUME_FUNC(func) ((func) == FUNC_VOLUME)

4
radio/src/opentx.cpp
View file

@ -1062,7 +1062,7 @@ void checkAlarm() // added by Gohst
} }
} }
void alert(const pm_char * title, const pm_char * msg ALERT_SOUND_ARG) void alert(const pm_char * title, const pm_char * msg , uint8_t sound)
{ {
LED_ERROR_BEGIN(); LED_ERROR_BEGIN();
@ -2048,12 +2048,10 @@ void opentxInit(OPENTX_INIT_ARGS)
} }
#endif #endif
#if defined(VOICE)
currentSpeakerVolume = requiredSpeakerVolume = g_eeGeneral.speakerVolume + VOLUME_LEVEL_DEF; currentSpeakerVolume = requiredSpeakerVolume = g_eeGeneral.speakerVolume + VOLUME_LEVEL_DEF;
#if !defined(SOFTWARE_VOLUME) #if !defined(SOFTWARE_VOLUME)
setScaledVolume(currentSpeakerVolume); setScaledVolume(currentSpeakerVolume);
#endif #endif
#endif
referenceSystemAudioFiles(); referenceSystemAudioFiles();
audioQueue.start(); audioQueue.start();

15
radio/src/opentx.h
View file

@ -81,12 +81,6 @@
#define CASE_AUDIO(x) #define CASE_AUDIO(x)
#endif #endif
#if defined(VOICE)
#define CASE_VOICE(x) x,
#else
#define CASE_VOICE(x)
#endif
#if defined(PWM_BACKLIGHT) #if defined(PWM_BACKLIGHT)
#define CASE_PWM_BACKLIGHT(x) x, #define CASE_PWM_BACKLIGHT(x) x,
#else #else
@ -557,15 +551,12 @@ uint16_t evalChkSum();
#if !defined(GUI) #if !defined(GUI)
#define RAISE_ALERT(...) #define RAISE_ALERT(...)
#define ALERT(...) #define ALERT(...)
#elif defined(VOICE) #else
#define RAISE_ALERT(title, msg, info, sound) showAlertBox(title, msg, info, sound) #define RAISE_ALERT(title, msg, info, sound) showAlertBox(title, msg, info, sound)
#define ALERT(title, msg, sound) alert(title, msg, sound) #define ALERT(title, msg, sound) alert(title, msg, sound)
#else
#define RAISE_ALERT(title, msg, info, sound) showAlertBox(title, msg, info)
#define ALERT(title, msg, sound) alert(title, msg)
#endif #endif
void alert(const pm_char * t, const pm_char * s ALERT_SOUND_ARG); void alert(const pm_char * t, const pm_char * s , uint8_t sound);
enum PerOutMode { enum PerOutMode {
e_perout_mode_normal = 0, e_perout_mode_normal = 0,
@ -1090,11 +1081,9 @@ uint16_t crc16(const uint8_t * ptr, uint32_t len);
enum AUDIO_SOUNDS { enum AUDIO_SOUNDS {
AUDIO_HELLO, AUDIO_HELLO,
AU_BYE, AU_BYE,
#if defined(VOICE)
AU_THROTTLE_ALERT, AU_THROTTLE_ALERT,
AU_SWITCH_ALERT, AU_SWITCH_ALERT,
AU_BAD_RADIODATA, AU_BAD_RADIODATA,
#endif
AU_TX_BATTERY_LOW, AU_TX_BATTERY_LOW,
AU_INACTIVITY, AU_INACTIVITY,
AU_RSSI_ORANGE, AU_RSSI_ORANGE,

10
radio/src/translations.h
View file

@ -757,7 +757,6 @@ extern const pm_char STR_CONFIRMRESET[];
extern const pm_char STR_TOO_MANY_LUA_SCRIPTS[]; extern const pm_char STR_TOO_MANY_LUA_SCRIPTS[];
extern const pm_char STR_BLCOLOR[]; extern const pm_char STR_BLCOLOR[];
#if defined(VOICE)
struct LanguagePack { struct LanguagePack {
const char * id; const char * id;
const char * name; const char * name;
@ -807,15 +806,6 @@ extern const pm_char STR_BLCOLOR[];
#define LANGUAGE_PACK_DECLARE_DEFAULT(lng, name) LANGUAGE_PACK_DECLARE(lng, name); const LanguagePack * currentLanguagePack = & lng ## LanguagePack; uint8_t currentLanguagePackIdx #define LANGUAGE_PACK_DECLARE_DEFAULT(lng, name) LANGUAGE_PACK_DECLARE(lng, name); const LanguagePack * currentLanguagePack = & lng ## LanguagePack; uint8_t currentLanguagePackIdx
inline PLAY_FUNCTION(playNumber, getvalue_t number, uint8_t unit, uint8_t flags) { currentLanguagePack->playNumber(number, unit, flags, id); } inline PLAY_FUNCTION(playNumber, getvalue_t number, uint8_t unit, uint8_t flags) { currentLanguagePack->playNumber(number, unit, flags, id); }
inline PLAY_FUNCTION(playDuration, int seconds, uint8_t flags) { currentLanguagePack->playDuration(seconds, flags, id); } inline PLAY_FUNCTION(playDuration, int seconds, uint8_t flags) { currentLanguagePack->playDuration(seconds, flags, id); }
#elif defined(VOICE)
PLAY_FUNCTION(playNumber, getvalue_t number, uint8_t unit, uint8_t att);
PLAY_FUNCTION(playDuration, int seconds);
#define LANGUAGE_PACK_DECLARE(lng, name)
#define LANGUAGE_PACK_DECLARE_DEFAULT(lng, name)
#else
#define LANGUAGE_PACK_DECLARE(lng, name)
#define LANGUAGE_PACK_DECLARE_DEFAULT(lng, name)
#endif
extern const pm_char STR_MODELNAME[]; extern const pm_char STR_MODELNAME[];
extern const pm_char STR_PHASENAME[]; extern const pm_char STR_PHASENAME[];

2
radio/src/translations/tts_cz.cpp
View file

@ -39,7 +39,6 @@ enum CzechPrompts {
CZ_PROMPT_UNITS_BASE = 118, // (jeden)volt,(dva)volty,(pet)voltu,(desetina)voltu CZ_PROMPT_UNITS_BASE = 118, // (jeden)volt,(dva)volty,(pet)voltu,(desetina)voltu
}; };
#if defined(VOICE)
#define CZ_PUSH_UNIT_PROMPT(u, p) cz_pushUnitPrompt((u), (p), id) #define CZ_PUSH_UNIT_PROMPT(u, p) cz_pushUnitPrompt((u), (p), id)
@ -184,4 +183,3 @@ I18N_PLAY_FUNCTION(cz, playDuration, int seconds PLAY_DURATION_ATT)
LANGUAGE_PACK_DECLARE(cz, "Czech"); LANGUAGE_PACK_DECLARE(cz, "Czech");
#endif

2
radio/src/translations/tts_de.cpp
View file

@ -68,7 +68,6 @@ enum GermanPrompts {
}; };
#if defined(VOICE)
#define DE_PUSH_UNIT_PROMPT(u) de_pushUnitPrompt((u), id) #define DE_PUSH_UNIT_PROMPT(u) de_pushUnitPrompt((u), id)
I18N_PLAY_FUNCTION(de, pushUnitPrompt, uint8_t unitprompt) I18N_PLAY_FUNCTION(de, pushUnitPrompt, uint8_t unitprompt)
@ -214,4 +213,3 @@ I18N_PLAY_FUNCTION(de, playDuration, int seconds PLAY_DURATION_ATT)
LANGUAGE_PACK_DECLARE(de, "Deutsch"); LANGUAGE_PACK_DECLARE(de, "Deutsch");
#endif

2
radio/src/translations/tts_en.cpp
View file

@ -48,7 +48,6 @@ enum EnglishPrompts {
EN_PROMPT_POINT_BASE = 167, //.0 - .9 EN_PROMPT_POINT_BASE = 167, //.0 - .9
}; };
#if defined(VOICE)
#define EN_PUSH_UNIT_PROMPT(u, p) en_pushUnitPrompt((u), (p), id) #define EN_PUSH_UNIT_PROMPT(u, p) en_pushUnitPrompt((u), (p), id)
@ -141,4 +140,3 @@ I18N_PLAY_FUNCTION(en, playDuration, int seconds PLAY_DURATION_ATT)
LANGUAGE_PACK_DECLARE_DEFAULT(en, "English"); LANGUAGE_PACK_DECLARE_DEFAULT(en, "English");
#endif

2
radio/src/translations/tts_es.cpp
View file

@ -87,7 +87,6 @@ enum SpanishPrompts {
}; };
#if defined(VOICE)
#define ES_PUSH_UNIT_PROMPT(u) es_pushUnitPrompt((u), id) #define ES_PUSH_UNIT_PROMPT(u) es_pushUnitPrompt((u), id)
I18N_PLAY_FUNCTION(es, pushUnitPrompt, uint8_t unitprompt) I18N_PLAY_FUNCTION(es, pushUnitPrompt, uint8_t unitprompt)
@ -210,4 +209,3 @@ I18N_PLAY_FUNCTION(es, playDuration, int seconds PLAY_DURATION_ATT)
LANGUAGE_PACK_DECLARE(es, "Espanol"); LANGUAGE_PACK_DECLARE(es, "Espanol");
#endif

2
radio/src/translations/tts_fr.cpp
View file

@ -52,7 +52,6 @@ enum FrenchPrompts {
FR_PROMPT_VIRGULE_BASE = 180, //,0 - ,9 FR_PROMPT_VIRGULE_BASE = 180, //,0 - ,9
}; };
#if defined(VOICE)
#define FR_PUSH_UNIT_PROMPT(u) fr_pushUnitPrompt((u), id) #define FR_PUSH_UNIT_PROMPT(u) fr_pushUnitPrompt((u), id)
@ -169,4 +168,3 @@ I18N_PLAY_FUNCTION(fr, playDuration, int seconds PLAY_DURATION_ATT)
LANGUAGE_PACK_DECLARE(fr, "Francais"); LANGUAGE_PACK_DECLARE(fr, "Francais");
#endif

2
radio/src/translations/tts_hu.cpp
View file

@ -48,7 +48,6 @@ enum HungarianPrompts {
HU_PROMPT_POINT_BASE = 165, //.0 - .9 HU_PROMPT_POINT_BASE = 165, //.0 - .9
}; };
#if defined(VOICE)
#define HU_PUSH_UNIT_PROMPT(u, p) hu_pushUnitPrompt((u), (p), id) #define HU_PUSH_UNIT_PROMPT(u, p) hu_pushUnitPrompt((u), (p), id)
@ -142,4 +141,3 @@ I18N_PLAY_FUNCTION(hu, playDuration, int seconds PLAY_DURATION_ATT)
LANGUAGE_PACK_DECLARE(hu, "Hungarian"); LANGUAGE_PACK_DECLARE(hu, "Hungarian");
#endif

2
radio/src/translations/tts_it.cpp
View file

@ -59,7 +59,6 @@ enum ItalianPrompts {
}; };
#if defined(VOICE)
#define IT_PUSH_UNIT_PROMPT(u, p) it_pushUnitPrompt((u), (p), id) #define IT_PUSH_UNIT_PROMPT(u, p) it_pushUnitPrompt((u), (p), id)
I18N_PLAY_FUNCTION(it, pushUnitPrompt, uint8_t unitprompt, int16_t number) I18N_PLAY_FUNCTION(it, pushUnitPrompt, uint8_t unitprompt, int16_t number)
@ -177,4 +176,3 @@ I18N_PLAY_FUNCTION(it, playDuration, int seconds PLAY_DURATION_ATT)
LANGUAGE_PACK_DECLARE(it, "Italiano"); LANGUAGE_PACK_DECLARE(it, "Italiano");
#endif

2
radio/src/translations/tts_nl.cpp
View file

@ -35,7 +35,6 @@ enum DutchPrompts {
NL_PROMPT_POINT_BASE = 165, //.0 - .9 NL_PROMPT_POINT_BASE = 165, //.0 - .9
}; };
#if defined(VOICE)
#define NL_PUSH_UNIT_PROMPT(u, p) nl_pushUnitPrompt((u), (p), id) #define NL_PUSH_UNIT_PROMPT(u, p) nl_pushUnitPrompt((u), (p), id)
@ -128,4 +127,3 @@ I18N_PLAY_FUNCTION(nl, playDuration, int seconds PLAY_DURATION_ATT)
LANGUAGE_PACK_DECLARE(nl, "Nederlands"); LANGUAGE_PACK_DECLARE(nl, "Nederlands");
#endif

2
radio/src/translations/tts_pl.cpp
View file

@ -63,7 +63,6 @@ enum PolishPrompts {
PL_PROMPT_FEET_PER_SECOND = PL_PROMPT_UNITS_BASE+(UNIT_FEET_PER_SECOND*4), PL_PROMPT_FEET_PER_SECOND = PL_PROMPT_UNITS_BASE+(UNIT_FEET_PER_SECOND*4),
}; };
#if defined(VOICE)
#define PL_PUSH_UNIT_PROMPT(u, p) pl_pushUnitPrompt((u), (p), id) #define PL_PUSH_UNIT_PROMPT(u, p) pl_pushUnitPrompt((u), (p), id)
@ -232,4 +231,3 @@ I18N_PLAY_FUNCTION(pl, playDuration, int seconds PLAY_DURATION_ATT)
LANGUAGE_PACK_DECLARE(pl, "Polish"); LANGUAGE_PACK_DECLARE(pl, "Polish");
#endif

2
radio/src/translations/tts_pt.cpp
View file

@ -81,7 +81,6 @@ enum PortuguesePrompts {
PT_PROMPT_FEET_PER_SECOND = PT_PROMPT_UNITS_BASE+UNIT_FEET_PER_SECOND, PT_PROMPT_FEET_PER_SECOND = PT_PROMPT_UNITS_BASE+UNIT_FEET_PER_SECOND,
}; };
#if defined(VOICE)
#define PT_PUSH_UNIT_PROMPT(u) pt_pushUnitPrompt((u), id) #define PT_PUSH_UNIT_PROMPT(u) pt_pushUnitPrompt((u), id)
@ -189,4 +188,3 @@ I18N_PLAY_FUNCTION(pt, playDuration, int seconds PLAY_DURATION_ATT)
LANGUAGE_PACK_DECLARE(pt, "Portugues"); LANGUAGE_PACK_DECLARE(pt, "Portugues");
#endif

2
radio/src/translations/tts_ru.cpp
View file

@ -43,7 +43,6 @@ enum RusPrompts {
#define FEMALE 0x01 #define FEMALE 0x01
#define RU_FEMALE_UNIT 0xFF #define RU_FEMALE_UNIT 0xFF
#if defined(VOICE)
#define RU_PUSH_UNIT_PROMPT(u, p) ru_pushUnitPrompt((u), (p), id) #define RU_PUSH_UNIT_PROMPT(u, p) ru_pushUnitPrompt((u), (p), id)
@ -186,4 +185,3 @@ I18N_PLAY_FUNCTION(ru, playDuration, int seconds PLAY_DURATION_ATT)
LANGUAGE_PACK_DECLARE(ru, "Russian"); LANGUAGE_PACK_DECLARE(ru, "Russian");
#endif

2
radio/src/translations/tts_se.cpp
View file

@ -49,7 +49,6 @@ enum SwedishPrompts {
SE_PROMPT_POINT_BASE = 165, //.0 - .9 SE_PROMPT_POINT_BASE = 165, //.0 - .9
}; };
#if defined(VOICE)
#define SE_PUSH_UNIT_PROMPT(u, p) se_pushUnitPrompt((u), (p), id) #define SE_PUSH_UNIT_PROMPT(u, p) se_pushUnitPrompt((u), (p), id)
@ -137,4 +136,3 @@ I18N_PLAY_FUNCTION(se, playDuration, int seconds PLAY_DURATION_ATT)
LANGUAGE_PACK_DECLARE(se, "Swedish"); LANGUAGE_PACK_DECLARE(se, "Swedish");
#endif

2
radio/src/translations/tts_sk.cpp
View file

@ -55,7 +55,6 @@ enum SlovakPrompts {
}; };
#if defined(VOICE)
#define SK_PUSH_UNIT_PROMPT(u, p) sk_pushUnitPrompt((u), (p), id) #define SK_PUSH_UNIT_PROMPT(u, p) sk_pushUnitPrompt((u), (p), id)
@ -197,4 +196,3 @@ I18N_PLAY_FUNCTION(sk, playDuration, int seconds PLAY_DURATION_ATT)
LANGUAGE_PACK_DECLARE(sk, "Slovak"); LANGUAGE_PACK_DECLARE(sk, "Slovak");
#endif