support specifying output filename (#380)

k2-fsa · Oct 21, 2023 · b582f6c · b582f6c
1 parent 1937717
commit b582f6c
Show file tree

Hide file tree

Showing 4 changed files with 18 additions and 9 deletions.
diff --git a/mfc-examples/NonStreamingTextToSpeech/NonStreamingTextToSpeech.rc b/mfc-examples/NonStreamingTextToSpeech/NonStreamingTextToSpeech.rc
diff --git a/mfc-examples/NonStreamingTextToSpeech/NonStreamingTextToSpeechDlg.cpp b/mfc-examples/NonStreamingTextToSpeech/NonStreamingTextToSpeechDlg.cpp
@@ -146,6 +146,7 @@ void CNonStreamingTextToSpeechDlg::DoDataExchange(CDataExchange* pDX)
         DDX_Control(pDX, IDC_SPEED, speed_);
         DDX_Control(pDX, IDOK, generate_btn_);
         DDX_Control(pDX, IDC_TEXT, my_text_);
+        DDX_Control(pDX, IDC_OUTPUT_FILENAME, output_filename_);
 }
 
 BEGIN_MESSAGE_MAP(CNonStreamingTextToSpeechDlg, CDialogEx)
@@ -251,6 +252,7 @@ void CNonStreamingTextToSpeechDlg::Init() {
     InitHint();
     speaker_id_.SetWindowText(Utf8ToUtf16("0").c_str());
     speed_.SetWindowText(Utf8ToUtf16("1.0").c_str());
+    output_filename_.SetWindowText(Utf8ToUtf16("./generated.wav").c_str());
 
 	bool ok = true;
     std::string error_message = "--------------------";
@@ -313,6 +315,10 @@ void CNonStreamingTextToSpeechDlg::Init() {
  }
 
 
+ static std::string ToString(const CString &s) {
+    CT2CA pszConvertedAnsiString( s);
+    return std::string(pszConvertedAnsiString);
+ }
 
 void CNonStreamingTextToSpeechDlg::OnBnClickedOk() {
   // TODO: Add your control notification handler code here
@@ -325,32 +331,32 @@ void CNonStreamingTextToSpeechDlg::OnBnClickedOk() {
   }
 
   speed_.GetWindowText(s);
-  float speed = _ttof(s); 
+  float speed = static_cast<float>(_ttof(s)); 
   if (speed < 0) {
     AfxMessageBox(Utf8ToUtf16("Please input a valid speed").c_str(), MB_OK);
     return;
   }
 
   my_text_.GetWindowText(s);
-  CT2CA pszConvertedAnsiString(s);
-  std::string ss(pszConvertedAnsiString);
+  std::string ss = ToString(s);
   if (ss.empty()) {
     AfxMessageBox(Utf8ToUtf16("Please input your text").c_str(), MB_OK);
     return;
   }
 
-const SherpaOnnxGeneratedAudio *audio =
+  const SherpaOnnxGeneratedAudio *audio =
       SherpaOnnxOfflineTtsGenerate(tts_, ss.c_str(), speaker_id, speed);
-  std::string filename = "./generated.wav";
-int ok = SherpaOnnxWriteWave(audio->samples, audio->n, audio->sample_rate,
+  output_filename_.GetWindowText(s);
+  std::string filename = ToString(s);
+  int ok = SherpaOnnxWriteWave(audio->samples, audio->n, audio->sample_rate,
                     filename.c_str());
 
   SherpaOnnxDestroyOfflineTtsGeneratedAudio(audio);
 
   if (ok) {
-    AfxMessageBox(Utf8ToUtf16("Saved to ./generated.wav successfully").c_str(), MB_OK);
+    AfxMessageBox(Utf8ToUtf16(std::string("Saved to ") + filename + " successfully").c_str(), MB_OK);
   } else {
-    AfxMessageBox(Utf8ToUtf16("Failed to save to ./generated.wav").c_str(), MB_OK);
+    AfxMessageBox(Utf8ToUtf16(std::string("Failed to save to ") + filename).c_str(), MB_OK);
   }
 
   //CDialogEx::OnOK();

diff --git a/mfc-examples/NonStreamingTextToSpeech/NonStreamingTextToSpeechDlg.h b/mfc-examples/NonStreamingTextToSpeech/NonStreamingTextToSpeechDlg.h
@@ -45,4 +45,5 @@ class CNonStreamingTextToSpeechDlg : public CDialogEx
 
 		SherpaOnnxOfflineTts *tts_;
         CEdit my_text_;
+                CEdit output_filename_;
 };
diff --git a/mfc-examples/NonStreamingTextToSpeech/Resource.h b/mfc-examples/NonStreamingTextToSpeech/Resource.h
@@ -11,14 +11,16 @@
 #define IDC_SPEED                       1003
 #define IDC_TEXT                        1004
 #define IDC_HINT                        1005
+#define IDC_EDIT1                       1006
+#define IDC_OUTPUT_FILENAME             1006
 
 // Next default values for new objects
 // 
 #ifdef APSTUDIO_INVOKED
 #ifndef APSTUDIO_READONLY_SYMBOLS
 #define _APS_NEXT_RESOURCE_VALUE        130
 #define _APS_NEXT_COMMAND_VALUE         32771
-#define _APS_NEXT_CONTROL_VALUE         1006
+#define _APS_NEXT_CONTROL_VALUE         1007
 #define _APS_NEXT_SYMED_VALUE           101
 #endif
 #endif