Rename VERBOSE to SSR_VERBOSE

Author: Chris Hold

src/aaprenderer.h

@@ -55,7 +55,7 @@ class AapRenderer : public SourceToOutput<AapRenderer, LoudspeakerRenderer>
       , _ambisonics_order(params.get("ambisonics_order", 0))
       , _in_phase_rendering(params.get("in_phase", true))
     {
-      VERBOSE((_in_phase_rendering ? "U" : "Not u")
+      SSR_VERBOSE((_in_phase_rendering ? "U" : "Not u")
           << "sing in-phase rendering.");
     }
 
@@ -205,7 +205,7 @@ AapRenderer::load_reproduction_setup()
 
   assert(_ambisonics_order > 0);
 
-  VERBOSE("Using Ambisonics order " << _ambisonics_order << ".");
+  SSR_VERBOSE("Using Ambisonics order " << _ambisonics_order << ".");
 
   // TODO: more things?
 }

src/audioplayer.cpp

@@ -46,11 +46,11 @@ AudioPlayer::~AudioPlayer()
   if (!_file_map.empty())
   {
     maptools::purge(_file_map);
-    VERBOSE2("AudioPlayer dtor: file map deleted.");
+    SSR_VERBOSE2("AudioPlayer dtor: file map deleted.");
   }
   else
   {
-    VERBOSE2("AudioPlayer dtor.");
+    SSR_VERBOSE2("AudioPlayer dtor.");
   }
 }
 
@@ -71,7 +71,7 @@ std::string AudioPlayer::get_port_name(const std::string& audio_file_name,
   auto registered_file = get_item(_file_map, audio_file_name);
   if (registered_file != nullptr)
   {
-    VERBOSE2("AudioPlayer: Input file '" + audio_file_name
+    SSR_VERBOSE2("AudioPlayer: Input file '" + audio_file_name
         + "' already registered.");
     if (channel > registered_file->get_channels())
     {
@@ -285,7 +285,7 @@ AudioPlayer::Soundfile::Soundfile(const std::string& filename, bool loop,
   // This is a little ugly, but I don't know a better way to do it.
   // If you know one, tell me, please!
   std::this_thread::sleep_for(std::chrono::microseconds(ssr::usleeptime));
-  VERBOSE2("Added '" + _filename
+  SSR_VERBOSE2("Added '" + _filename
       + "', format: '" + apf::str::A2S(_sample_format)
       + "', channels: " + apf::str::A2S(_channels)
       + ", sample rate: " + apf::str::A2S(_sample_rate) + ".");
@@ -296,7 +296,7 @@ AudioPlayer::Soundfile::~Soundfile()
 {
   // TODO: check if ecasound is really running.
   _eca.command("cs-disconnect"); // implies "stop" and "engine-halt"
-  VERBOSE2("AudioPlayer::Soundfile: '" + _filename + "' disconnected.");
+  SSR_VERBOSE2("AudioPlayer::Soundfile: '" + _filename + "' disconnected.");
 }
 
 AudioPlayer::Soundfile::ptr_t AudioPlayer::Soundfile::create(

src/audiorecorder.cpp

@@ -81,17 +81,17 @@ AudioRecorder::AudioRecorder(const std::string& audio_file_name,
   }
   // use JACK transport (only receive), and set client name
   _eca.command("-G:jack," + this->client_name + ",recv");
-  VERBOSE_NOLF("AudioRecorder ('" + this->client_name
+  SSR_VERBOSE_NOLF("AudioRecorder ('" + this->client_name
       + "'): Trying to activate ... ");
   _eca.command("cs-connect");
   if (_eca.error())
   {
-    VERBOSE("failed!");
+    SSR_VERBOSE("failed!");
     SSR_ERROR("File must be writable and needs an extension recognized by "
         "ecasound, e.g. \".wav\".");
     throw audiorecorder_error("ecasound: " + _eca.last_error());
   }
-  VERBOSE("done.");
+  SSR_VERBOSE("done.");
 
   if (!this->enable())
   {
@@ -109,7 +109,7 @@ AudioRecorder::AudioRecorder(const std::string& audio_file_name,
 AudioRecorder::~AudioRecorder()
 {
   _eca.command("cs-disconnect"); // implies "stop" and "engine-halt"
-  VERBOSE2("AudioRecorder dtor ('" + client_name + "').");
+  SSR_VERBOSE2("AudioRecorder dtor ('" + client_name + "').");
 }
 
 bool AudioRecorder::enable()

src/configuration.cpp

@@ -593,10 +593,10 @@ ssr::conf_struct ssr::configuration(int& argc, char* argv[])
     conf.renderer_params.set("system_output_prefix", conf.output_port_prefix);
   }
 
-  VERBOSE2("Requested renderer settings:");
+  SSR_VERBOSE2("Requested renderer settings:");
   for (const auto& entry: conf.renderer_params)
   {
-    VERBOSE2(entry.first << " = " << entry.second);
+    SSR_VERBOSE2(entry.first << " = " << entry.second);
   }
 
   return conf;
@@ -729,7 +729,7 @@ int ssr::load_config_file(const char *filename, conf_struct& conf){
         break;
     }//switch
 
-    VERBOSE2(key << " = " << value);
+    SSR_VERBOSE2(key << " = " << value);
 
     if (!strcmp(key, "NAME"))
     {

src/controller.h

@@ -508,7 +508,7 @@ Controller<Renderer>::Controller(int argc, char* argv[])
   if (_conf.ip_server)
   {
 
-    VERBOSE("Starting IP Server with port " << _conf.server_port
+    SSR_VERBOSE("Starting IP Server with port " << _conf.server_port
         << " and with end-of-message character with ASCII code " <<
         _conf.end_of_message_character << ".");
 
@@ -521,7 +521,7 @@ Controller<Renderer>::Controller(int argc, char* argv[])
 #ifdef ENABLE_WEBSOCKET_INTERFACE
   if (_conf.websocket_server)
   {
-    VERBOSE("Starting WebSocket server with port " << _conf.websocket_port);
+    SSR_VERBOSE("Starting WebSocket server with port " << _conf.websocket_port);
     _websocket_interface = std::make_unique<ws::Server>(*this
         , _conf.websocket_port, _conf.websocket_resource_directory);
   }
@@ -938,11 +938,11 @@ class Controller<Renderer>::CommonInterface
       if (auto_rotate)
       {
         _controller._orient_all_sources_toward_reference();
-        VERBOSE("Auto-rotation of sound sources is enabled.");
+        SSR_VERBOSE("Auto-rotation of sound sources is enabled.");
       }
       else
       {
-        VERBOSE("Auto-rotation of sound sources is disabled.");
+        SSR_VERBOSE("Auto-rotation of sound sources is disabled.");
       }
     }
   }
@@ -989,7 +989,7 @@ class Controller<Renderer>::CommonInterface
     {
       if (_controller._scene.get_auto_rotation())
       {
-        VERBOSE2("Ignoring update of source rotation."
+        SSR_VERBOSE2("Ignoring update of source rotation."
             << " Auto-rotation is enabled.");
         return;
       }
@@ -1498,7 +1498,7 @@ Controller<Renderer>::_load_scene(const std::string& scene_file_name)
 
   if (scene_file_name == "")
   {
-    VERBOSE("No scene file specified. Opening empty scene ...");
+    SSR_VERBOSE("No scene file specified. Opening empty scene ...");
     return true;
   }
 
@@ -1527,7 +1527,7 @@ Controller<Renderer>::_load_scene(const std::string& scene_file_name)
     }
     else if (scene_file->validate(_conf.xml_schema))
     {
-      VERBOSE("Valid scene setup (" << scene_file_name << ").");
+      SSR_VERBOSE("Valid scene setup (" << scene_file_name << ").");
     }
     else
     {
@@ -1550,7 +1550,7 @@ Controller<Renderer>::_load_scene(const std::string& scene_file_name)
       master_volume = 0.0f;
     }
 
-    VERBOSE("Setting master volume to " << master_volume << " dB.");
+    SSR_VERBOSE("Setting master volume to " << master_volume << " dB.");
     _publish(&api::SceneControlEvents::master_volume
         , apf::math::dB2linear(master_volume));
 
@@ -1567,7 +1567,7 @@ Controller<Renderer>::_load_scene(const std::string& scene_file_name)
     }
 
     // always use default value when nothing is specified
-    VERBOSE("Setting amplitude decay exponent to " << exponent << ".");
+    SSR_VERBOSE("Setting amplitude decay exponent to " << exponent << ".");
     _publish(&api::SceneControlEvents::decay_exponent, exponent);
 
     // GET AMPLITUDE REFERENCE DISTANCE
@@ -1586,7 +1586,7 @@ Controller<Renderer>::_load_scene(const std::string& scene_file_name)
     }
 
     // always use default value when nothing is specified
-    VERBOSE("Setting amplitude reference distance to "
+    SSR_VERBOSE("Setting amplitude reference distance to "
         << ref_dist << " meters.");
     _publish(&api::SceneControlEvents::amplitude_reference_distance, ref_dist);
 
@@ -1609,7 +1609,7 @@ Controller<Renderer>::_load_scene(const std::string& scene_file_name)
     }
     else
     {
-      VERBOSE("No reference point given in XML file. "
+      SSR_VERBOSE("No reference point given in XML file. "
           "Using standard (= origin).");
     }
     if (!pos_ptr) pos_ptr.reset(new internal::PositionPlusBool());
@@ -1645,7 +1645,7 @@ Controller<Renderer>::_load_scene(const std::string& scene_file_name)
 
         if (model == "")
         {
-          VERBOSE("Source model not defined!" << id_str << name_str
+          SSR_VERBOSE("Source model not defined!" << id_str << name_str
               << " Using default (= point source).");
           model = "point";
         }
@@ -1756,7 +1756,7 @@ Controller<Renderer>::_create_spontaneous_scene(
     case 1: // mono file
       {
         Pos pos{0, default_source_distance};
-        VERBOSE("Creating point source at x = " << pos.x
+        SSR_VERBOSE("Creating point source at x = " << pos.x
             << " mtrs, y = " << pos.y << " mtrs.");
         assert(pos.z == 0);
         _new_source("", source_name, "point", audio_file_name, 1
@@ -1772,7 +1772,7 @@ Controller<Renderer>::_create_spontaneous_scene(
         const float pos_y = default_source_distance * std::sin(pi/3.0f);
 
         Pos pos{-pos_x, pos_y};
-        VERBOSE("Creating plane wave at x = " << pos.x
+        SSR_VERBOSE("Creating plane wave at x = " << pos.x
             << " mtrs, y = " << pos.y << " mtrs.");
         assert(pos.z == 0);
 
@@ -1781,7 +1781,7 @@ Controller<Renderer>::_create_spontaneous_scene(
             , false, 1.0f, false, "");
 
         pos = Pos{pos_x, pos_y};
-        VERBOSE("Creating plane wave at x = " << pos.x
+        SSR_VERBOSE("Creating plane wave at x = " << pos.x
             << " mtrs, y = " << pos.y << " mtrs.");
         assert(pos.z == 0);
 
@@ -1809,7 +1809,7 @@ Controller<Renderer>::_create_spontaneous_scene(
 
         Pos pos{pos_x, pos_y};
 
-        VERBOSE("Creating point source at x = " << pos.x
+        SSR_VERBOSE("Creating point source at x = " << pos.x
             << " mtrs, y = " << pos.y << " mtrs.");
         assert(pos.z == 0);
 
@@ -2036,7 +2036,7 @@ Controller<Renderer>::_new_source(id_t requested_id, const std::string& name
 
   if (port_name == "")
   {
-    VERBOSE("No audio file or port specified for source");
+    SSR_VERBOSE("No audio file or port specified for source");
   }
 
   apf::parameter_map p;

src/gui/quserinterface.cpp

@@ -240,7 +240,7 @@ ssr::QUserInterface::QUserInterface(api::Publisher& controller
   _deselect_all_sources(); // no source selected
 
   // scene menu is not shown if floating control panel is used
-  VERBOSE("Floating control panel is used, scene menu will not be shown.");
+  SSR_VERBOSE("Floating control panel is used, scene menu will not be shown.");
   (void)path_to_scene_menu;
 
   // update screen with update_frequency
@@ -456,7 +456,7 @@ void ssr::QUserInterface::_create_scene_menu(const std::string& path_to_scene_me
     return;
   }
 
-  VERBOSE("Creating scene menu from file '" << path_to_scene_menu << "'.");
+  SSR_VERBOSE("Creating scene menu from file '" << path_to_scene_menu << "'.");
 
   std::string line;
   std::string::size_type index;
@@ -556,7 +556,7 @@ void ssr::QUserInterface::_save_file_as()
   // if aborted
   if ( file_name.isEmpty() )
   {
-    VERBOSE("Scene not saved.");
+    SSR_VERBOSE("Scene not saved.");
   }
   else
   {
@@ -570,7 +570,7 @@ void ssr::QUserInterface::_save_file_as()
     }
 
     _controller.take_control()->save_scene(file_name_std);
-    VERBOSE("Scene saved in '" << file_name_std << "'.");
+    SSR_VERBOSE("Scene saved in '" << file_name_std << "'.");
   }
 
 }
@@ -1259,7 +1259,7 @@ void ssr::QUserInterface::dropEvent(QDropEvent *event)
 
     QUrl url(urlList.at(0));
 
-    VERBOSE("Dropped file: " <<
+    SSR_VERBOSE("Dropped file: " <<
       std::string(url.toString().toStdString()));
 
     // Remove "file://"
@@ -1451,7 +1451,7 @@ void ssr::QUserInterface::_set_source_model(const int index)
       model = LegacySource::point;
       break;
   }
-  VERBOSE("index: " << index);
+  SSR_VERBOSE("index: " << index);
 
   unsigned int id = _id_of_last_clicked_source;
   auto control = _controller.take_control();