diff --git a/dictsource/ru_rules b/dictsource/ru_rules index 3d97f99f..2842d65b 100755 --- a/dictsource/ru_rules +++ b/dictsource/ru_rules @@ -365,6 +365,7 @@ .group р _) р (_ E* + р (ь RI^ р (Y R; р (B R; р R diff --git a/phsource/compile_report b/phsource/compile_report index e33396a0..9c44c13e 100644 --- a/phsource/compile_report +++ b/phsource/compile_report @@ -576,7 +576,7 @@ 1 vwl_no/u#2 no 1 vwl_no/y# no 1 vwl_no/y#y no - 2 vwl_ro/ii- ru ro + 1 vwl_ro/ii- ro 1 vwl_ro/li ro 2 vwl_ro/mi ru ro 1 vwl_ro/ni ro @@ -590,6 +590,7 @@ 1 vwl_ru/i ru 1 vwl_ru/i# ru 3 vwl_ru/ii ru + 1 vwl_ru/ii- ru 1 vwl_ru/ii# ru 1 vwl_ru/ja ru 1 vwl_ru/ju ru diff --git a/phsource/ph_russian b/phsource/ph_russian index 94546d37..fb133eb1 100755 --- a/phsource/ph_russian +++ b/phsource/ph_russian @@ -121,7 +121,7 @@ phoneme I^ // "silent i", palatilizes the preceding consonant vowel starttype (i) endtype (i) length 70 unstressed nonsyllabic - formants vwl_ro/ii- + formants vwl_ru/ii- beforevowel ; after m; vwl_ro/mi endphoneme diff --git a/src/synthdata.cpp b/src/synthdata.cpp index 4b85ecf9..a445ff9e 100755 --- a/src/synthdata.cpp +++ b/src/synthdata.cpp @@ -35,7 +35,7 @@ #include "translate.h" #include "wave.h" -const char *version_string = "1.28 16.Jul.07"; +const char *version_string = "1.28.01 17.Jul.07"; const int version_phdata = 0x012801; int option_device_number = -1; diff --git a/src/wave.cpp b/src/wave.cpp index c6e6468f..f1de836e 100755 --- a/src/wave.cpp +++ b/src/wave.cpp @@ -1027,10 +1027,11 @@ int wave_is_busy(void* theHandler) {return 0;} void wave_terminate() {} uint32_t wave_get_read_position(void* theHandler) {return 0;} uint32_t wave_get_write_position(void* theHandler) {return 0;} -uint32_t wave_get_remaining_time(uint32_t sample) {return 0;} +int wave_get_remaining_time(uint32_t sample, uint32_t* time) {return 0;} +void wave_flush(void* theHandler) {} typedef int (t_wave_callback)(void); void wave_set_callback_is_output_enabled(t_wave_callback* cb) {} -extern uint32_t wave_test_get_write_buffer() {return 0;} +extern void* wave_test_get_write_buffer() {return 0;} #endif // of USE_PORTAUDIO