fix merge conflicts with audioengine

[ardour.git] / libs / ardour / capturing_processor.cc

diff --git a/libs/ardour/capturing_processor.cc b/libs/ardour/capturing_processor.cc
index 2fa83ace81de9cb0cca66a54f427a6b0d9b02404..ce4a546fb417f8503465d5cc2aef3151bcc85f44 100644 (file)
--- a/libs/ardour/capturing_processor.cc
+++ b/libs/ardour/capturing_processor.cc
@@ -22,11 +22,13 @@
 #include "ardour/session.h"
 #include "ardour/audioengine.h"
 
+#include "i18n.h"
+
 namespace ARDOUR {
 
 CapturingProcessor::CapturingProcessor (Session & session)
-  : Processor (session, X_("capture point"))
-  , block_size (session.engine().frames_per_cycle())
+       : Processor (session, X_("capture point"))
+       , block_size (AudioEngine::instance()->samples_per_cycle())
 {
        realloc_buffers ();
 }
@@ -60,7 +62,7 @@ CapturingProcessor::configure_io (ChanCount in, ChanCount out)
 }
 
 bool
-CapturingProcessor::can_support_io_configuration (const ChanCount& in, ChanCount& out) const
+CapturingProcessor::can_support_io_configuration (const ChanCount& in, ChanCount& out)
 {
        out = in;
        return true;
@@ -72,4 +74,13 @@ CapturingProcessor::realloc_buffers()
        capture_buffers.ensure_buffers (_configured_input, block_size);
 }
 
+XMLNode &
+CapturingProcessor::state (bool full)
+{
+       XMLNode& node = Processor::state (full);
+
+       node.add_property (X_("type"), X_("capture"));
+       return node;
+}
+
 } // namespace ARDOUR