From 964c04eec5f01a4d2a487dc6380173a01fd94aaa Mon Sep 17 00:00:00 2001 From: Tim Mayberry Date: Sun, 15 Feb 2015 13:48:53 +1000 Subject: Move TestReceiver class in libardour tests into own header file --- libs/ardour/test/test_receiver.h | 63 ++++++++++++++++++++++++++++++++++++++++ libs/ardour/test/test_util.cc | 38 +----------------------- 2 files changed, 64 insertions(+), 37 deletions(-) create mode 100644 libs/ardour/test/test_receiver.h diff --git a/libs/ardour/test/test_receiver.h b/libs/ardour/test/test_receiver.h new file mode 100644 index 0000000000..e221c64ad4 --- /dev/null +++ b/libs/ardour/test/test_receiver.h @@ -0,0 +1,63 @@ +/* + Copyright (C) 2011 Paul Davis + Copyright (C) 2011 Tim Mayberry + + This program is free software; you can redistribute it and/or modify it + under the terms of the GNU General Public License as published by the Free + Software Foundation; either version 2 of the License, or (at your option) + any later version. + + This program is distributed in the hope that it will be useful, but WITHOUT + ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or + FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License + for more details. + + You should have received a copy of the GNU General Public License along + with this program; if not, write to the Free Software Foundation, Inc., + 675 Mass Ave, Cambridge, MA 02139, USA. +*/ + +#ifndef ARDOUR_TEST_RECEIVER_H +#define ARDOUR_TEST_RECEIVER_H + +#include + +#include "pbd/textreceiver.h" + +class TestReceiver : public Receiver +{ +protected: + void receive (Transmitter::Channel chn, const char * str) { + const char *prefix = ""; + + switch (chn) { + case Transmitter::Error: + prefix = ": [ERROR]: "; + break; + case Transmitter::Info: + /* ignore */ + return; + case Transmitter::Warning: + prefix = ": [WARNING]: "; + break; + case Transmitter::Fatal: + prefix = ": [FATAL]: "; + break; + case Transmitter::Throw: + /* this isn't supposed to happen */ + abort (); + } + + /* note: iostreams are already thread-safe: no external + lock required. + */ + + std::cout << prefix << str << std::endl; + + if (chn == Transmitter::Fatal) { + exit (9); + } + } +}; + +#endif // ARDOUR_TEST_RECEIVER_H diff --git a/libs/ardour/test/test_util.cc b/libs/ardour/test/test_util.cc index cedb7fa849..3b95d1b708 100644 --- a/libs/ardour/test/test_util.cc +++ b/libs/ardour/test/test_util.cc @@ -23,13 +23,13 @@ #include #include "pbd/xml++.h" -#include "pbd/textreceiver.h" #include "pbd/file_utils.h" #include "ardour/session.h" #include "ardour/audioengine.h" #include "test_util.h" +#include "test_receiver.h" #include @@ -97,42 +97,6 @@ write_ref (XMLNode* node, string ref_file) return rv; } -class TestReceiver : public Receiver -{ -protected: - void receive (Transmitter::Channel chn, const char * str) { - const char *prefix = ""; - - switch (chn) { - case Transmitter::Error: - prefix = ": [ERROR]: "; - break; - case Transmitter::Info: - /* ignore */ - return; - case Transmitter::Warning: - prefix = ": [WARNING]: "; - break; - case Transmitter::Fatal: - prefix = ": [FATAL]: "; - break; - case Transmitter::Throw: - /* this isn't supposed to happen */ - abort (); - } - - /* note: iostreams are already thread-safe: no external - lock required. - */ - - cout << prefix << str << endl; - - if (chn == Transmitter::Fatal) { - exit (9); - } - } -}; - TestReceiver test_receiver; bool -- cgit v1.2.3