Skip to content

Commit 695038a

Browse files
season4675season4675
committed
Update VERSION 3.2.1b
 Added the function of passing parameters in sendFlush(). Fixed the issue that when setSyncCallTimeout enabled synchronization call, it would run normally but return an error because it was not initialized
1 parent a03059f commit 695038a

31 files changed

+282
-228
lines changed

‎demo/Linux/CMakeLists.txt‎

100644100755
File mode changed.

‎demo/Linux/dialogAssistantDemo.cpp‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -881,7 +881,7 @@ int dialogAssistantMultFile(const char* appkey, int threads) {
881881
return 0;
882882
}
883883

884-
int invalied_argv(int index, int argc) {
884+
int invalid_argv(int index, int argc) {
885885
if (index >= argc) {
886886
std::cout << "invalid params..." << std::endl;
887887
return 1;
@@ -894,31 +894,31 @@ int parse_argv(int argc, char* argv[]) {
894894
while (index < argc) {
895895
if (!strcmp(argv[index], "--appkey")) {
896896
index++;
897-
if (invalied_argv(index, argc)) return 1;
897+
if (invalid_argv(index, argc)) return 1;
898898
g_appkey = argv[index];
899899
} else if (!strcmp(argv[index], "--akId")) {
900900
index++;
901-
if (invalied_argv(index, argc)) return 1;
901+
if (invalid_argv(index, argc)) return 1;
902902
g_akId = argv[index];
903903
} else if (!strcmp(argv[index], "--akSecret")) {
904904
index++;
905-
if (invalied_argv(index, argc)) return 1;
905+
if (invalid_argv(index, argc)) return 1;
906906
g_akSecret = argv[index];
907907
} else if (!strcmp(argv[index], "--token")) {
908908
index++;
909-
if (invalied_argv(index, argc)) return 1;
909+
if (invalid_argv(index, argc)) return 1;
910910
g_token = argv[index];
911911
} else if (!strcmp(argv[index], "--url")) {
912912
index++;
913-
if (invalied_argv(index, argc)) return 1;
913+
if (invalid_argv(index, argc)) return 1;
914914
g_url = argv[index];
915915
} else if (!strcmp(argv[index], "--threads")) {
916916
index++;
917-
if (invalied_argv(index, argc)) return 1;
917+
if (invalid_argv(index, argc)) return 1;
918918
g_threads = atoi(argv[index]);
919919
} else if (!strcmp(argv[index], "--time")) {
920920
index++;
921-
if (invalied_argv(index, argc)) return 1;
921+
if (invalid_argv(index, argc)) return 1;
922922
loop_timeout = atoi(argv[index]);
923923
}
924924
index++;

‎demo/Linux/fileTransferDemo.cpp‎

100644100755
Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ void signal_handler_quit(int signo) {
5151
std::cout << "\nget quit mesg\n" << std::endl;
5252
}
5353

54-
int invalied_argv(int index, int argc) {
54+
int invalid_argv(int index, int argc) {
5555
if (index >= argc) {
5656
std::cout << "invalid params..." << std::endl;
5757
return 1;
@@ -64,43 +64,43 @@ int parse_argv(int argc, char *argv[]) {
6464
while (index < argc) {
6565
if (!strcmp(argv[index], "--appkey")) {
6666
index++;
67-
if (invalied_argv(index, argc)) return 1;
67+
if (invalid_argv(index, argc)) return 1;
6868
g_appkey = argv[index];
6969
} else if (!strcmp(argv[index], "--akId")) {
7070
index++;
71-
if (invalied_argv(index, argc)) return 1;
71+
if (invalid_argv(index, argc)) return 1;
7272
g_akId = argv[index];
7373
} else if (!strcmp(argv[index], "--akSecret")) {
7474
index++;
75-
if (invalied_argv(index, argc)) return 1;
75+
if (invalid_argv(index, argc)) return 1;
7676
g_akSecret = argv[index];
7777
} else if (!strcmp(argv[index], "--stsToken")) {
7878
index++;
79-
if (invalied_argv(index, argc)) return 1;
79+
if (invalid_argv(index, argc)) return 1;
8080
g_stsToken = argv[index];
8181
} else if (!strcmp(argv[index], "--fileLinkUrl")) {
8282
index++;
83-
if (invalied_argv(index, argc)) return 1;
83+
if (invalid_argv(index, argc)) return 1;
8484
g_fileLinkUrl = argv[index];
8585
} else if (!strcmp(argv[index], "--sync")) {
8686
index++;
87-
if (invalied_argv(index, argc)) return 1;
87+
if (invalid_argv(index, argc)) return 1;
8888
if (atoi(argv[index])) {
8989
g_sync = true;
9090
} else {
9191
g_sync = false;
9292
}
9393
} else if (!strcmp(argv[index], "--threads")) {
9494
index++;
95-
if (invalied_argv(index, argc)) return 1;
95+
if (invalid_argv(index, argc)) return 1;
9696
g_threads = atoi(argv[index]);
9797
} else if (!strcmp(argv[index], "--logFile")) {
9898
index++;
99-
if (invalied_argv(index, argc)) return 1;
99+
if (invalid_argv(index, argc)) return 1;
100100
g_log_file = argv[index];
101101
} else if (!strcmp(argv[index], "--logFileCount")) {
102102
index++;
103-
if (invalied_argv(index, argc)) return 1;
103+
if (invalid_argv(index, argc)) return 1;
104104
g_log_count = atoi(argv[index]);
105105
}
106106
index++;

‎demo/Linux/flowingSynthesizerDemo.cpp‎

Lines changed: 47 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -210,6 +210,7 @@ static bool longConnection = false;
210210
static bool sysAddrinfo = false;
211211
static bool enableSubtitle = false;
212212
static bool sendFlushFlag = false;
213+
static bool enableLongSilence = false;
213214

214215
void signal_handler_int(int signo) {
215216
std::cout << "\nget interrupt mesg\n" << std::endl;
@@ -1139,7 +1140,11 @@ void* pthreadFunc(void* arg) {
11391140
break;
11401141
}
11411142
if (sendFlushFlag) {
1142-
request->sendFlush();
1143+
if (enableLongSilence) {
1144+
request->sendFlush("{\"enable_long_silence\":true}");
1145+
} else {
1146+
request->sendFlush();
1147+
}
11431148
}
11441149
usleep(500 * 1000);
11451150

@@ -1476,7 +1481,11 @@ void* pthreadLongConnectionFunc(void* arg) {
14761481
break;
14771482
}
14781483
if (sendFlushFlag) {
1479-
request->sendFlush();
1484+
if (enableLongSilence) {
1485+
request->sendFlush("{\"enable_long_silence\":true}");
1486+
} else {
1487+
request->sendFlush();
1488+
}
14801489
}
14811490
usleep(500 * 1000);
14821491

@@ -1883,7 +1892,7 @@ int flowingSynthesizerMultFile(const char* appkey, int threads) {
18831892
return 0;
18841893
}
18851894

1886-
int invalied_argv(int index, int argc) {
1895+
int invalid_argv(int index, int argc) {
18871896
if (index >= argc) {
18881897
std::cout << "invalid params..." << std::endl;
18891898
return 1;
@@ -1896,134 +1905,142 @@ int parse_argv(int argc, char* argv[]) {
18961905
while (index < argc) {
18971906
if (!strcmp(argv[index], "--appkey")) {
18981907
index++;
1899-
if (invalied_argv(index, argc)) return 1;
1908+
if (invalid_argv(index, argc)) return 1;
19001909
g_appkey = argv[index];
19011910
} else if (!strcmp(argv[index], "--akId")) {
19021911
index++;
1903-
if (invalied_argv(index, argc)) return 1;
1912+
if (invalid_argv(index, argc)) return 1;
19041913
g_akId = argv[index];
19051914
} else if (!strcmp(argv[index], "--akSecret")) {
19061915
index++;
1907-
if (invalied_argv(index, argc)) return 1;
1916+
if (invalid_argv(index, argc)) return 1;
19081917
g_akSecret = argv[index];
19091918
} else if (!strcmp(argv[index], "--token")) {
19101919
index++;
1911-
if (invalied_argv(index, argc)) return 1;
1920+
if (invalid_argv(index, argc)) return 1;
19121921
g_token = argv[index];
19131922
} else if (!strcmp(argv[index], "--tokenDomain")) {
19141923
index++;
1915-
if (invalied_argv(index, argc)) return 1;
1924+
if (invalid_argv(index, argc)) return 1;
19161925
g_domain = argv[index];
19171926
} else if (!strcmp(argv[index], "--tokenApiVersion")) {
19181927
index++;
1919-
if (invalied_argv(index, argc)) return 1;
1928+
if (invalid_argv(index, argc)) return 1;
19201929
g_api_version = argv[index];
19211930
} else if (!strcmp(argv[index], "--url")) {
19221931
index++;
1923-
if (invalied_argv(index, argc)) return 1;
1932+
if (invalid_argv(index, argc)) return 1;
19241933
g_url = argv[index];
19251934
} else if (!strcmp(argv[index], "--vipServerDomain")) {
19261935
index++;
1927-
if (invalied_argv(index, argc)) return 1;
1936+
if (invalid_argv(index, argc)) return 1;
19281937
g_vipServerDomain = argv[index];
19291938
} else if (!strcmp(argv[index], "--vipServerTargetDomain")) {
19301939
index++;
1931-
if (invalied_argv(index, argc)) return 1;
1940+
if (invalid_argv(index, argc)) return 1;
19321941
g_vipServerTargetDomain = argv[index];
19331942
} else if (!strcmp(argv[index], "--threads")) {
19341943
index++;
1935-
if (invalied_argv(index, argc)) return 1;
1944+
if (invalid_argv(index, argc)) return 1;
19361945
g_threads = atoi(argv[index]);
19371946
if (g_threads < 1) {
19381947
g_threads = 1;
19391948
}
19401949
} else if (!strcmp(argv[index], "--cpu")) {
19411950
index++;
1942-
if (invalied_argv(index, argc)) return 1;
1951+
if (invalid_argv(index, argc)) return 1;
19431952
g_cpu = atoi(argv[index]);
19441953
} else if (!strcmp(argv[index], "--time")) {
19451954
index++;
1946-
if (invalied_argv(index, argc)) return 1;
1955+
if (invalid_argv(index, argc)) return 1;
19471956
loop_timeout = atoi(argv[index]);
19481957
} else if (!strcmp(argv[index], "--loop")) {
19491958
index++;
1950-
if (invalied_argv(index, argc)) return 1;
1959+
if (invalid_argv(index, argc)) return 1;
19511960
loop_count = atoi(argv[index]);
19521961
} else if (!strcmp(argv[index], "--NlsScan")) {
19531962
index++;
1954-
if (invalied_argv(index, argc)) return 1;
1963+
if (invalid_argv(index, argc)) return 1;
19551964
profile_scan = atoi(argv[index]);
19561965
} else if (!strcmp(argv[index], "--long")) {
19571966
index++;
1958-
if (invalied_argv(index, argc)) return 1;
1967+
if (invalid_argv(index, argc)) return 1;
19591968
if (atoi(argv[index])) {
19601969
longConnection = true;
19611970
} else {
19621971
longConnection = false;
19631972
}
19641973
} else if (!strcmp(argv[index], "--sys")) {
19651974
index++;
1966-
if (invalied_argv(index, argc)) return 1;
1975+
if (invalid_argv(index, argc)) return 1;
19671976
if (atoi(argv[index])) {
19681977
sysAddrinfo = true;
19691978
} else {
19701979
sysAddrinfo = false;
19711980
}
19721981
} else if (!strcmp(argv[index], "--sampleRate")) {
19731982
index++;
1974-
if (invalied_argv(index, argc)) return 1;
1983+
if (invalid_argv(index, argc)) return 1;
19751984
sample_rate = atoi(argv[index]);
19761985
} else if (!strcmp(argv[index], "--format")) {
19771986
index++;
1978-
if (invalied_argv(index, argc)) return 1;
1987+
if (invalid_argv(index, argc)) return 1;
19791988
g_format = argv[index];
19801989
} else if (!strcmp(argv[index], "--save")) {
19811990
index++;
1982-
if (invalied_argv(index, argc)) return 1;
1991+
if (invalid_argv(index, argc)) return 1;
19831992
if (atoi(argv[index])) {
19841993
g_save_audio = true;
19851994
} else {
19861995
g_save_audio = false;
19871996
}
19881997
} else if (!strcmp(argv[index], "--text")) {
19891998
index++;
1990-
if (invalied_argv(index, argc)) return 1;
1999+
if (invalid_argv(index, argc)) return 1;
19912000
g_text = argv[index];
19922001
} else if (!strcmp(argv[index], "--textFile")) {
19932002
index++;
1994-
if (invalied_argv(index, argc)) return 1;
2003+
if (invalid_argv(index, argc)) return 1;
19952004
g_text_file = argv[index];
19962005
} else if (!strcmp(argv[index], "--subtitle")) {
19972006
index++;
1998-
if (invalied_argv(index, argc)) return 1;
2007+
if (invalid_argv(index, argc)) return 1;
19992008
if (atoi(argv[index])) {
20002009
enableSubtitle = true;
20012010
} else {
20022011
enableSubtitle = false;
20032012
}
20042013
} else if (!strcmp(argv[index], "--sync_timeout")) {
20052014
index++;
2006-
if (invalied_argv(index, argc)) return 1;
2015+
if (invalid_argv(index, argc)) return 1;
20072016
g_sync_timeout = atoi(argv[index]);
20082017
} else if (!strcmp(argv[index], "--voice")) {
20092018
index++;
2010-
if (invalied_argv(index, argc)) return 1;
2019+
if (invalid_argv(index, argc)) return 1;
20112020
g_voice = argv[index];
20122021
} else if (!strcmp(argv[index], "--flush")) {
20132022
index++;
2014-
if (invalied_argv(index, argc)) return 1;
2023+
if (invalid_argv(index, argc)) return 1;
20152024
if (atoi(argv[index])) {
20162025
sendFlushFlag = true;
20172026
} else {
20182027
sendFlushFlag = false;
20192028
}
2029+
} else if (!strcmp(argv[index], "--enable_long_silence")) {
2030+
index++;
2031+
if (invalid_argv(index, argc)) return 1;
2032+
if (atoi(argv[index])) {
2033+
enableLongSilence = true;
2034+
} else {
2035+
enableLongSilence = false;
2036+
}
20202037
} else if (!strcmp(argv[index], "--logFile")) {
20212038
index++;
2022-
if (invalied_argv(index, argc)) return 1;
2039+
if (invalid_argv(index, argc)) return 1;
20232040
g_log_file = argv[index];
20242041
} else if (!strcmp(argv[index], "--logFileCount")) {
20252042
index++;
2026-
if (invalied_argv(index, argc)) return 1;
2043+
if (invalid_argv(index, argc)) return 1;
20272044
g_log_count = atoi(argv[index]);
20282045
}
20292046
index++;

‎demo/Linux/generateTokenDemo.cpp‎

100644100755
Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ void signal_handler_quit(int signo) {
4545
std::cout << "\nget quit mesg\n" << std::endl;
4646
}
4747

48-
int invalied_argv(int index, int argc) {
48+
int invalid_argv(int index, int argc) {
4949
if (index >= argc) {
5050
std::cout << "invalid params..." << std::endl;
5151
return 1;
@@ -58,19 +58,19 @@ int parse_argv(int argc, char* argv[]) {
5858
while (index < argc) {
5959
if (!strcmp(argv[index], "--akId")) {
6060
index++;
61-
if (invalied_argv(index, argc)) return 1;
61+
if (invalid_argv(index, argc)) return 1;
6262
g_akId = argv[index];
6363
} else if (!strcmp(argv[index], "--akSecret")) {
6464
index++;
65-
if (invalied_argv(index, argc)) return 1;
65+
if (invalid_argv(index, argc)) return 1;
6666
g_akSecret = argv[index];
6767
} else if (!strcmp(argv[index], "--domain")) {
6868
index++;
69-
if (invalied_argv(index, argc)) return 1;
69+
if (invalid_argv(index, argc)) return 1;
7070
g_domain = argv[index];
7171
} else if (!strcmp(argv[index], "--apiVersion")) {
7272
index++;
73-
if (invalied_argv(index, argc)) return 1;
73+
if (invalid_argv(index, argc)) return 1;
7474
g_api_version = argv[index];
7575
}
7676
index++;

‎demo/Linux/log4cppUnitTest.cpp‎

100644100755
Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -167,7 +167,7 @@ void onExternalLogCallback(const char* timestamp, int level,
167167
std::cout << " log message:" << message << std::endl;
168168
}
169169

170-
int invalied_argv(int index, int argc) {
170+
int invalid_argv(int index, int argc) {
171171
if (index >= argc) {
172172
std::cout << "invalid params..." << std::endl;
173173
return 1;
@@ -180,19 +180,19 @@ int parse_argv(int argc, char* argv[]) {
180180
while (index < argc) {
181181
if (!strcmp(argv[index], "--threads")) {
182182
index++;
183-
if (invalied_argv(index, argc)) return 1;
183+
if (invalid_argv(index, argc)) return 1;
184184
g_threads = atoi(argv[index]);
185185
} else if (!strcmp(argv[index], "--time")) {
186186
index++;
187-
if (invalied_argv(index, argc)) return 1;
187+
if (invalid_argv(index, argc)) return 1;
188188
loop_timeout = atoi(argv[index]);
189189
} else if (!strcmp(argv[index], "--loop")) {
190190
index++;
191-
if (invalied_argv(index, argc)) return 1;
191+
if (invalid_argv(index, argc)) return 1;
192192
loop_count = atoi(argv[index]);
193193
} else if (!strcmp(argv[index], "--vocabFile")) {
194194
index++;
195-
if (invalied_argv(index, argc)) return 1;
195+
if (invalid_argv(index, argc)) return 1;
196196
g_vocab_path = argv[index];
197197
}
198198
index++;

‎demo/Linux/log4cppUnitTestVocab.txt‎

100644100755
File mode changed.

‎demo/Linux/profile_scan.cpp‎

100644100755
File mode changed.

‎demo/Linux/profile_scan.h‎

100644100755
File mode changed.

0 commit comments

Comments
 (0)