diff options
Diffstat (limited to 'decoder')
| -rw-r--r-- | decoder/cdec.cc | 3 | ||||
| -rw-r--r-- | decoder/decoder.cc | 8 |
2 files changed, 7 insertions, 4 deletions
diff --git a/decoder/cdec.cc b/decoder/cdec.cc index 5b930c69..b47ab380 100644 --- a/decoder/cdec.cc +++ b/decoder/cdec.cc @@ -3,6 +3,7 @@ #include "filelib.h" #include "decoder.h" #include "ff_register.h" +#include "verbose.h" using namespace std; @@ -11,7 +12,7 @@ int main(int argc, char** argv) { Decoder decoder(argc, argv); const string input = decoder.GetConf()["input"].as<string>(); - cerr << "Reading input from " << ((input == "-") ? "STDIN" : input.c_str()) << endl; + if (!SILENT) cerr << "Reading input from " << ((input == "-") ? "STDIN" : input.c_str()) << endl; ReadFile in_read(input); istream *in = in_read.stream(); assert(*in); diff --git a/decoder/decoder.cc b/decoder/decoder.cc index 478a1cf3..3d818429 100644 --- a/decoder/decoder.cc +++ b/decoder/decoder.cc @@ -453,7 +453,9 @@ DecoderImpl::DecoderImpl(po::variables_map& conf, int argc, char** argv, istream cout << endl; exit(0); } - ShowBanner(); + if (conf.count("quiet")) + SetSilent(true); + if (!SILENT) ShowBanner(); } if (conf.count("show_config")) // special handling needed because we only want to notify() once. show_config=true; @@ -467,6 +469,8 @@ DecoderImpl::DecoderImpl(po::variables_map& conf, int argc, char** argv, istream po::store(po::parse_config_file(*conff, dconfig_options), conf); } } + if (conf.count("quiet")) + SetSilent(true); if (cfg) po::store(po::parse_config_file(*cfg, dconfig_options), conf); po::notify(conf); if (show_config && !cfg_files.empty()) { @@ -482,8 +486,6 @@ DecoderImpl::DecoderImpl(po::variables_map& conf, int argc, char** argv, istream cerr<<" "<<argv[i]; cerr << "\n\n"; } - if (conf.count("quiet")) - SetSilent(true); if (conf.count("list_feature_functions")) { cerr << "Available feature functions (specify with -F; describe with -u FeatureName):\n"; |