verbosity--

git-svn-id: svn://localhost/ardour2/branches/3.0@4534 d708f5d6-7413-0410-9779-e7cbd77b26cf

4 files changed, 11 insertions, 10 deletions

diff --git a/libs/evoral/src/ControlList.cpp b/libs/evoral/src/ControlList.cpp
index db6d6a9562..22517e68a0 100644
--- a/libs/evoral/src/ControlList.cpp
+++ b/libs/evoral/src/ControlList.cpp
@@ -993,7 +993,8 @@ ControlList::rt_safe_earliest_event_discrete_unlocked (double start, double end,
 bool
 ControlList::rt_safe_earliest_event_linear_unlocked (double start, double end, double& x, double& y, bool inclusive) const
 {
-	cerr << "earliest_event(start: " << start << ", end: " << end << ", x: " << x << ", y: " << y << ", inclusive: " << inclusive <<  ")" << endl;
+	//cerr << "earliest_event(start: " << start << ", end: " << end
+	//<< ", x: " << x << ", y: " << y << ", inclusive: " << inclusive <<  ")" << endl;
 
 	const_iterator length_check_iter = _events.begin();
 	if (_events.empty()) // 0 events
diff --git a/libs/evoral/test/SMFTest.cpp b/libs/evoral/test/SMFTest.cpp
index 49233101cb..fcfa6ef1dd 100644
--- a/libs/evoral/test/SMFTest.cpp
+++ b/libs/evoral/test/SMFTest.cpp
@@ -28,7 +28,7 @@ SMFTest::takeFiveTest ()
 		time += delta_t;
 		
 		if (ret > 0) { // didn't skip (meta) event
-			cerr << "read smf event type " << hex << int(buf[0]) << endl;
+			//cerr << "read smf event type " << hex << int(buf[0]) << endl;
 			// make ev.time absolute time in frames
 			ev.time() = time * frames_per_beat / (double)smf.ppqn();
 			ev.set_event_type(type_map->midi_event_type(buf[0]));
diff --git a/libs/evoral/test/SequenceTest.cpp b/libs/evoral/test/SequenceTest.cpp
index 9c5a2000a7..ba261cdd87 100644
--- a/libs/evoral/test/SequenceTest.cpp
+++ b/libs/evoral/test/SequenceTest.cpp
@@ -1,23 +1,23 @@
 #include "SequenceTest.hpp"
 #include <cassert>
 
-CPPUNIT_TEST_SUITE_REGISTRATION( SequenceTest );
+CPPUNIT_TEST_SUITE_REGISTRATION(SequenceTest);
 
 using namespace std;
 
 void 
 SequenceTest::createTest (void)
 {
-       	CPPUNIT_ASSERT_EQUAL(size_t(0), seq->sysexes().size());
-       	CPPUNIT_ASSERT_EQUAL(size_t(0), seq->notes().size());
-       	CPPUNIT_ASSERT(seq->notes().begin() == seq->notes().end());
+	CPPUNIT_ASSERT_EQUAL(size_t(0), seq->sysexes().size());
+	CPPUNIT_ASSERT_EQUAL(size_t(0), seq->notes().size());
+	CPPUNIT_ASSERT(seq->notes().begin() == seq->notes().end());
 }
 
 
 void 
 SequenceTest::preserveEventOrderingTest (void)
 {
-	vector<boost::shared_ptr<Event<Time> > > inserted_events;
+	vector< boost::shared_ptr< Event<Time> > > inserted_events;
 	
 	seq->start_write();
 	
@@ -52,7 +52,7 @@ SequenceTest::preserveEventOrderingTest (void)
 	seq->end_write();
 
 	TestSink<Time> sink;
-	sink.writing.connect(sigc::mem_fun(&sink, &TestSink<Time>::assertLastEventTimeLessOrEqualEventTime));
+	sink.writing.connect(sigc::mem_fun(&sink, &TestSink<Time>::assertLastEventTimeEarlier));
 
 	seq->read(sink, timestamp_t(0), timedur_t(1200), timestamp_t(0));
 	
diff --git a/libs/evoral/test/SequenceTest.hpp b/libs/evoral/test/SequenceTest.hpp
index 7800438456..c28c8617f5 100644
--- a/libs/evoral/test/SequenceTest.hpp
+++ b/libs/evoral/test/SequenceTest.hpp
@@ -78,13 +78,13 @@ public:
 	sigc::signal<uint32_t, Time, EventType, uint32_t, const uint8_t*> writing;
 	
 	virtual uint32_t write(Time time, EventType type, uint32_t size, const uint8_t* buf) {
-		std::cerr << "last event time: " << _last_event_time << " time: " << time << std::endl;
+		//std::cerr << "last event time: " << _last_event_time << " time: " << time << std::endl;
 		uint32_t result = writing(time, type, size, buf);
 		_last_event_time = time;
 		return result;
 	}
 	
-   	uint32_t assertLastEventTimeLessOrEqualEventTime(
+   	uint32_t assertLastEventTimeEarlier(
    		Time time, EventType type, uint32_t size, const uint8_t* buf) {
    		CPPUNIT_ASSERT(_last_event_time <= time);
 		return 0;