Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

o Errmsg: print short name of filter.

  • Loading branch information...
commit e296ede82d30e5e149d11dbdc521f76ef47a1721 1 parent 39fece1
@hzeller authored
Showing with 8 additions and 4 deletions.
  1. +1 −0  folve-filesystem.h
  2. +3 −2 processor-pool.cc
  3. +4 −2 status-server.cc
View
1  folve-filesystem.h
@@ -47,6 +47,7 @@ class FolveFilesystem {
void SetBaseConfigDir(const std::string &config_dir) {
base_config_dir_ = config_dir;
}
+ const std::string &base_config_dir() const { return base_config_dir_; }
// Return a set of available named configurations. Essentially the names
// of subdirectories in the configuration dir.
View
5 processor-pool.cc
@@ -16,6 +16,7 @@
#include "processor-pool.h"
+#include <string.h>
#include <sys/stat.h>
#include <sys/types.h>
#include <syslog.h>
@@ -61,9 +62,9 @@ SoundProcessor *ProcessorPool::GetOrCreate(const std::string &base_dir,
std::string config_path;
if (!FindFirstAccessiblePath(path_choices, &config_path)) {
+ const char *short_dir = strrchr(base_dir.c_str(), '/') + 1;
*errmsg = StringPrintf("No filter in %s for %.1fkHz/%d ch/%d bits",
- base_dir.c_str(), sampling_rate / 1000.0,
- channels, bits);
+ short_dir, sampling_rate / 1000.0, channels, bits);
return NULL;
}
SoundProcessor *result;
View
6 status-server.cc
@@ -337,8 +337,10 @@ const std::string &StatusServer::CreatePage() {
"<a href='https://github.com/hzeller/folve#readme'>Folve</a> "
FOLVE_VERSION "</center>\n");
if (show_details()) {
- Appendf(&content_, "Convolving audio files from <code>%s</code>\n",
- filesystem_->underlying_dir().c_str());
+ Appendf(&content_, "Convolving audio files from <code>%s</code>; "
+ "Filter base directory <code>%s</code>\n",
+ filesystem_->underlying_dir().c_str(),
+ filesystem_->base_config_dir().c_str());
}
AppendSettingsForm();
Please sign in to comment.
Something went wrong with that request. Please try again.