Merge branch 'master' into windows

[ardour.git] / libs / audiographer / tests / sndfile / tmp_file_test.cc

diff --git a/libs/audiographer/tests/sndfile/tmp_file_test.cc b/libs/audiographer/tests/sndfile/tmp_file_test.cc
index d2d1b3581edd59e85dc3b0197362c8302ef3f85e..9ce8af7a5c478ed63162f82ee608a87f0fbbe4ed 100644 (file)
--- a/libs/audiographer/tests/sndfile/tmp_file_test.cc
+++ b/libs/audiographer/tests/sndfile/tmp_file_test.cc
@@ -23,7 +23,7 @@ class TmpFileTest : public CppUnit::TestFixture
 
        void testProcess()
        {
-               uint channels = 2;
+               uint32_t channels = 2;
                file.reset (new TmpFile<float>(SF_FORMAT_WAV | SF_FORMAT_FLOAT, channels, 44100));
                AllocatingProcessContext<float> c (random_data, frames, channels);
                c.set_flag (ProcessContext<float>::EndOfInput);
@@ -40,7 +40,7 @@ class TmpFileTest : public CppUnit::TestFixture
        boost::shared_ptr<TmpFile<float> > file;
 
        float * random_data;
-       nframes_t frames;
+       framecnt_t frames;
 };
 
 CPPUNIT_TEST_SUITE_REGISTRATION (TmpFileTest);