X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=libs%2Fardour%2Ftest%2Fcombine_regions_test.cc;h=0202fe8873ce65b23c5d6ba8cb15b0cc9310c66e;hb=541705e1ee473f8e80afc81206d0ab9c3f4c9911;hp=7c4d5f0e68b570a1859cab04607ad70735cc6e81;hpb=9e4fc0e57f84207c28cd2f2ea78a4e5660c112a6;p=ardour.git

diff --git a/libs/ardour/test/combine_regions_test.cc b/libs/ardour/test/combine_regions_test.cc
index 7c4d5f0e68..0202fe8873 100644
--- a/libs/ardour/test/combine_regions_test.cc
+++ b/libs/ardour/test/combine_regions_test.cc
@@ -76,8 +76,6 @@ CombineRegionsTest::check_crossfade1 ()
 		r0 *= fade_out[i - 128];
 		
 		float const r1 = (i - 128) * fade_in[i - 128];
-		cout << setprecision(12);
-		cout << "\t\ti=" << i << " fade_out=" << fade_out[i - 128] << " r1=" << r1 << " r0=" << r0 << "\n";
 		CPPUNIT_ASSERT_DOUBLES_EQUAL (r0 + r1, buf[i], 1e-16);
 	}
 
@@ -115,11 +113,13 @@ CombineRegionsTest::crossfadeTest1 ()
 	CPPUNIT_ASSERT_EQUAL (layer_t (0), _r[0]->layer ());
 	CPPUNIT_ASSERT_EQUAL (layer_t (1), _r[1]->layer ());
 
+#if 0
 	/* Check that the right fades have been set up */
 	CPPUNIT_ASSERT_EQUAL (false, _ar[0]->fade_in_is_xfade ());
 	CPPUNIT_ASSERT_EQUAL (false, _ar[0]->fade_out_is_xfade ());
 	CPPUNIT_ASSERT_EQUAL (true, _ar[1]->fade_in_is_xfade ());
 	CPPUNIT_ASSERT_EQUAL (false, _ar[1]->fade_out_is_xfade ());
+#endif
 
 	/* Check that the read comes back correctly */
 	check_crossfade1 ();
@@ -180,8 +180,6 @@ CombineRegionsTest::check_crossfade2 ()
 		float r1 = (i - 128) * region_fade_in;
 		r1 *= fade_in[i - 128];
 		
-		cout << setprecision(12);
-		cout << "\t\ti=" << i << " fade_out=" << fade_out[i - 128] << " r1=" << r1 << " r0=" << r0 << "\n";
 		CPPUNIT_ASSERT_DOUBLES_EQUAL (r0 + r1, buf[i], 1e-16);
 	}
 
@@ -203,8 +201,6 @@ CombineRegionsTest::check_crossfade2 ()
 void
 CombineRegionsTest::crossfadeTest2 ()
 {
-	cout << "\n\n\nCOMBINE\n";
-
 	/* Two regions, both 256 frames in length, overlapping by 128 frames in the middle */
 
 	_ar[0]->set_default_fade_in ();
@@ -223,15 +219,15 @@ CombineRegionsTest::crossfadeTest2 ()
 	CPPUNIT_ASSERT_EQUAL (layer_t (1), _r[0]->layer ());
 	CPPUNIT_ASSERT_EQUAL (layer_t (0), _r[1]->layer ());
 
+#if 0
 	/* Check that the right fades have been set up */
-
 	CPPUNIT_ASSERT_EQUAL (false, _ar[0]->fade_in_is_xfade ());
 	CPPUNIT_ASSERT_EQUAL (true, _ar[0]->fade_out_is_xfade ());
 	CPPUNIT_ASSERT_EQUAL (false, _ar[1]->fade_in_is_xfade ());
 	CPPUNIT_ASSERT_EQUAL (false, _ar[1]->fade_out_is_xfade ());
+#endif
 
 	/* Check that the read comes back correctly */
-	cout << "\n\n\nFIRST READ\n";
 	check_crossfade2 ();
 
 	/* Combine the two regions */