llama-tts : add -o option

* arg.cpp : refactored default output fname if/else block

* codestyle alignments in this PR (#12042)

Author: marcoStocchi

common/arg.cpp

@@ -1868,24 +1868,21 @@ common_params_context common_params_parser_init(common_params & params, llama_ex
 
     // retrieving the right default output filename,
     // depending on the example program...
-    std::string * out_file_ptr;
+    const char * default_out_file;
 
     if (ex == LLAMA_EXAMPLE_EXPORT_LORA)
-        out_file_ptr = & params.lora_outfile;
-
+        default_out_file = params.lora_outfile.c_str();
     else if (ex == LLAMA_EXAMPLE_CVECTOR_GENERATOR)
-        out_file_ptr = & params.cvector_outfile;
-
+        default_out_file = params.cvector_outfile.c_str();
     else if (ex == LLAMA_EXAMPLE_TTS)
-        out_file_ptr = & params.ttss_outfile;
-
+        default_out_file = params.ttss_outfile.c_str();
     else // currently coded as "imatrix.dat", see common.h
-        out_file_ptr = & params.out_file;
+        default_out_file = params.out_file.c_str();
 
     add_opt(common_arg(
         {"-o", "--output", "--output-file"}, "FNAME",
         string_format("output file (default: '%s')",
-            out_file_ptr->c_str()),
+            default_out_file),
         [](common_params & params, const std::string & value) {
             params.out_file = value;
             params.cvector_outfile = value;

common/common.h

@@ -427,9 +427,8 @@ struct common_params {
     bool spm_infill = false; // suffix/prefix/middle pattern for infill
 
     // default output filenames
-    std::string
-        lora_outfile = "ggml-lora-merged-f16.gguf",
-        ttss_outfile = "output.wav";
+    std::string lora_outfile = "ggml-lora-merged-f16.gguf";
+    std::string ttss_outfile = "output.wav";
 
     // batched-bench params
     bool batched_bench_output_jsonl = false;

examples/tts/tts.cpp

@@ -1073,13 +1073,11 @@ lovely<|t_0.56|><|code_start|><|634|><|596|><|1766|><|1556|><|1306|><|1285|><|14
     LOG_INF("%s: time for spectral ops: %.3f ms\n", __func__, (ggml_time_us() - t_spec_start) / 1000.0f);
     LOG_INF("%s: total time:            %.3f ms\n", __func__, (ggml_time_us() - t_main_start) / 1000.0f);
 
-    int retval(0);
+    int retval = 0;
 
     if (save_wav16(params.out_file, audio, n_sr)) {
         LOG_INF("%s: audio written to file '%s'\n", __func__, params.out_file.c_str());
-    }
-
-    else {
+    } else {
         retval=ENOENT;
         LOG_ERR("Check path exists, directory write permissions, free disk space.\n");
     }