From c1910351a5379553da6d062fe40f3d8da90910f4 Mon Sep 17 00:00:00 2001 From: Robin Gareus Date: Tue, 16 Feb 2016 15:13:12 +0100 Subject: [PATCH] Revert "proper debug prints for Analyser" This reverts commit 9a281963e143d1191d701f6f248a956bdaf9200d. audiographer cannot use symbols from libardour (cyclic dependency) (only headers only are ok) "DebugBits ExportAnalysis" symbol break windows and unit-test builds. --- libs/ardour/ardour/debug.h | 1 - libs/ardour/debug.cc | 1 - libs/audiographer/src/general/analyser.cc | 8 ++------ 3 files changed, 2 insertions(+), 8 deletions(-) diff --git a/libs/ardour/ardour/debug.h b/libs/ardour/ardour/debug.h index e46c84c3c8..6ebf21a958 100644 --- a/libs/ardour/ardour/debug.h +++ b/libs/ardour/ardour/debug.h @@ -77,7 +77,6 @@ namespace PBD { LIBARDOUR_API extern DebugBits BackendPorts; LIBARDOUR_API extern DebugBits VSTCallbacks; LIBARDOUR_API extern DebugBits FaderPort; - LIBARDOUR_API extern DebugBits ExportAnalysis; } } diff --git a/libs/ardour/debug.cc b/libs/ardour/debug.cc index 7c46ec7853..86afaf6917 100644 --- a/libs/ardour/debug.cc +++ b/libs/ardour/debug.cc @@ -74,4 +74,3 @@ PBD::DebugBits PBD::DEBUG::BackendThreads = PBD::new_debug_bit ("backendthreads" PBD::DebugBits PBD::DEBUG::BackendPorts = PBD::new_debug_bit ("backendports"); PBD::DebugBits PBD::DEBUG::VSTCallbacks = PBD::new_debug_bit ("vstcallbacks"); PBD::DebugBits PBD::DEBUG::FaderPort = PBD::new_debug_bit ("faderport"); -PBD::DebugBits PBD::DEBUG::ExportAnalysis = PBD::new_debug_bit ("ExportAnalysis"); diff --git a/libs/audiographer/src/general/analyser.cc b/libs/audiographer/src/general/analyser.cc index b6a3e1bbde..459cd6a506 100644 --- a/libs/audiographer/src/general/analyser.cc +++ b/libs/audiographer/src/general/analyser.cc @@ -18,8 +18,6 @@ #include "audiographer/general/analyser.h" #include "pbd/fastlog.h" -#include "pbd/compose.h" -#include "ardour/debug.h" using namespace AudioGrapher; @@ -34,11 +32,9 @@ Analyser::Analyser (float sample_rate, unsigned int channels, framecnt_t bufsize , _n_samples (n_samples) , _pos (0) { - DEBUG_TRACE (PBD::DEBUG::ExportAnalysis, string_compose ("Analyser r:%1 c:%2 f:%3 d:%4\n", sample_rate, channels, bufsize, n_samples)); - + //printf ("NEW ANALYSER %p r:%.1f c:%d f:%ld l%ld\n", this, sample_rate, channels, bufsize, n_samples); assert (bufsize % channels == 0); assert (bufsize > 1); - if (channels > 0 && channels <= 2) { using namespace Vamp::HostExt; PluginLoader* loader (PluginLoader::getInstance ()); @@ -241,7 +237,7 @@ Analyser::process (ProcessContext const & ctx) ARDOUR::ExportAnalysisPtr Analyser::result () { - DEBUG_TRACE (PBD::DEBUG::ExportAnalysis, string_compose ("Processed %1 / %2 samples\n", _pos, _n_samples)); + //printf ("PROCESSED %ld / %ld samples\n", _pos, _n_samples); if (_pos == 0 || _pos > _n_samples + 1) { return ARDOUR::ExportAnalysisPtr (); }