Support separate path for custom TFs. Reference DataFile entries by f…

…ull path.

ear-production-suite-plugins/plugins/binaural_monitoring/src/bear_data_files.cpp

@@ -19,22 +19,44 @@ juce::File getBearDataFileDirectory() {
   return vstPath;
 };
 
+juce::File getCustomDataFileDirectory() {
+  auto vstPath = juce::File::getSpecialLocation(
+      juce::File::SpecialLocationType::currentExecutableFile);
+  vstPath = vstPath.getParentDirectory();
+#ifdef __APPLE__
+  vstPath = vstPath.getParentDirectory();
+  vstPath = vstPath.getParentDirectory();
+#endif
+  return vstPath;
+};
+
 }
 
 namespace ear {
 namespace plugin {
 
 DataFileManager::DataFileManager() {
+  bearReleaseFiles_.add(
+      getBearDataFileDirectory().getChildFile(BEAR_DATA_FILE));
   updateAvailableFiles();
 }
 
 void DataFileManager::updateAvailableFiles() {
   // Start a new vec and copy existing shared_ptrs of unchanged files 
   // This retains shared_ptrs unlike clear() and rebuild
   std::vector<std::shared_ptr<DataFileManager::DataFile>> dfs;
-  auto files = getBearDataFileDirectory().findChildFiles(
+  // Lookup tfs where we expect to find custom files
+  auto files = getCustomDataFileDirectory().findChildFiles(
       juce::File::TypesOfFileToFind::findFiles,
                                     false, "*.tf");
+  // add our expected released files
+  for(auto const& bearReleaseFile : bearReleaseFiles_) {
+    if (bearReleaseFile.existsAsFile()) {
+      // note that in win, the released bear dir is the same as the custom
+      // dir, so we might have already found this with findChildFiles
+      files.addIfNotAlreadyThere(bearReleaseFile);
+    }
+  }
   for (const auto& file : files) {
     auto newDf = std::make_shared<DataFile>();
     newDf->fullPath = file;
@@ -74,8 +96,12 @@ int DataFileManager::getAvailableDataFilesCount() {
   return availableDataFiles_.size();
 }
 
-bool DataFileManager::setSelectedDataFile(const juce::String& filename) {
-  auto found = getDataFileInfo(filename);
+bool DataFileManager::setSelectedDataFile(const juce::String& fullPath) {
+  return setSelectedDataFile(juce::File(fullPath));
+}
+
+bool DataFileManager::setSelectedDataFile(const juce::File& fullPath) {
+  auto found = getDataFileInfo(fullPath);
   if (found == nullptr) return false;
   if (found != selectedDataFile_) {
     selectedDataFile_ = found;
@@ -88,24 +114,25 @@ bool DataFileManager::setSelectedDataFile(const juce::String& filename) {
 
 bool DataFileManager::setSelectedDataFileDefault() { 
   updateAvailableFiles();
-  // try look for expected file first
-  auto defaultFileInfo = getDataFileInfo(BEAR_DATA_FILE);
-  if (defaultFileInfo && setSelectedDataFile(defaultFileInfo->filename)) {
-    return true;
-  }
-  // else look for any released (may have been renamed)
-  for (auto const& df : availableDataFiles_) {
-    if (df->isBearRelease && setSelectedDataFile(df->filename)) {
+  // look for any released by order
+  for (auto const& bearReleaseFile : bearReleaseFiles_) {
+    if (setSelectedDataFile(bearReleaseFile)) {
       return true;
     }
   }
   return false;
 }
 
-std::shared_ptr<DataFileManager::DataFile> DataFileManager::getDataFileInfo(const juce::String& filename) {
+std::shared_ptr<DataFileManager::DataFile> DataFileManager::getDataFileInfo(
+    const juce::String& fullPath) {
+  return getDataFileInfo(juce::File(fullPath));
+}
+
+std::shared_ptr<DataFileManager::DataFile> DataFileManager::getDataFileInfo(
+    const juce::File& fullPath) {
   auto it = std::find_if(availableDataFiles_.begin(), availableDataFiles_.end(),
-                         [&filename](const std::shared_ptr<DataFile>& elm) {
-                           return elm->filename == filename;
+                         [&fullPath](const std::shared_ptr<DataFile>& elm) {
+                           return elm->fullPath == fullPath;
                          });
 
   return it == availableDataFiles_.end() ? nullptr : *it;

ear-production-suite-plugins/plugins/binaural_monitoring/src/bear_data_files.hpp

@@ -22,13 +22,16 @@ class DataFileManager {
   std::shared_ptr<DataFile> getSelectedDataFileInfo();
   std::vector<std::shared_ptr<DataFile>> getAvailableDataFiles();
   int getAvailableDataFilesCount();
-  bool setSelectedDataFile(const juce::String& filename);
+  bool setSelectedDataFile(const juce::String& fullPath);
+  bool setSelectedDataFile(const juce::File& fullPath);
   bool setSelectedDataFileDefault();
-  std::shared_ptr<DataFile> getDataFileInfo(const juce::String& filename);
+  std::shared_ptr<DataFile> getDataFileInfo(const juce::String& fullPath);
+  std::shared_ptr<DataFile> getDataFileInfo(const juce::File& fullPath);
   void onSelectedDataFileChange(
       std::function<void(std::shared_ptr<DataFile>)> callback);
 
  private:
+  juce::Array<juce::File> bearReleaseFiles_;
   std::shared_ptr<DataFile> selectedDataFile_;
   std::vector<std::shared_ptr<DataFile>> availableDataFiles_;
   std::function<void(std::shared_ptr<DataFile>)> selectedDataFileChangeCallback_;

ear-production-suite-plugins/plugins/binaural_monitoring/src/binaural_monitoring_frontend_connector.cpp

@@ -226,7 +226,7 @@ void BinauralMonitoringJuceFrontendConnector::setDataFileComboBox(
       txt += df->label;
       txt += "   (" + df->filename + ")";
     }
-    auto entry = comboBox->addTextEntry(txt, df->filename);
+    auto entry = comboBox->addTextEntry(txt, df->fullPath.getFullPathName());
     entry->setLightFont(!df->isBearRelease);
   }
   if (auto df = p_->dataFileManager.getSelectedDataFileInfo()) {

ear-production-suite-plugins/plugins/binaural_monitoring/src/binaural_monitoring_plugin_processor.cpp

@@ -273,7 +273,7 @@ bool EarBinauralMonitoringAudioProcessor::writeConfigFile()
   props.setValue("oscInvertQuatY", (bool)*oscInvertQuatY_);
   props.setValue("oscInvertQuatZ", (bool)*oscInvertQuatZ_);
   if (auto selectedDataFile = dataFileManager.getSelectedDataFileInfo()) {
-    props.setValue("bearPreferredDataFile", selectedDataFile->filename);
+    props.setValue("bearPreferredDataFile", selectedDataFile->fullPath.getFullPathName());
   }
   return props.save();
 }