Merge branch 'diskstreaming_review_chaot' into diskstreaming

3 files changed, 8 insertions, 4 deletions

diff --git a/test/audiocachefiletest.cc b/test/audiocachefiletest.cc
index 98b7ab5..b7839b7 100644
--- a/test/audiocachefiletest.cc
+++ b/test/audiocachefiletest.cc
@@ -92,7 +92,9 @@ public:
 			ref_file[c]->load();
 		}
 
-		AudioCacheFile file(filename);
+		std::vector<sample_t> read_buffer;
+
+		AudioCacheFile file(filename, read_buffer);
 		CPPUNIT_ASSERT_EQUAL(filename, file.getFilename());
 		CPPUNIT_ASSERT_EQUAL(13, (int)file.getChannelCount()); // Sanity check
 
@@ -188,7 +190,9 @@ public:
 		size_t buffer_size = 64;
 		std::string filename = "kits/no-such-file.wav";
 
-		AudioCacheFile file(filename);
+		std::vector<sample_t> read_buffer;
+
+		AudioCacheFile file(filename, read_buffer);
 		CPPUNIT_ASSERT_EQUAL(filename, file.getFilename());
 		CPPUNIT_ASSERT_EQUAL(0u, (unsigned int)file.getSize());
 		CPPUNIT_ASSERT_EQUAL(0u, (unsigned int)file.getChannelCount());
diff --git a/test/audiocacheidmanagertest.cc b/test/audiocacheidmanagertest.cc
index a9cc878..eff7e78 100644
--- a/test/audiocacheidmanagertest.cc
+++ b/test/audiocacheidmanagertest.cc
@@ -34,7 +34,7 @@ class TestableAudioCacheIDManager
 public:
 	int getAvailableIDs()
 	{
-		return availableids.size();
+		return available_ids.size();
 	}
 };
 
diff --git a/test/audiocachetest.cc b/test/audiocachetest.cc
index 5db5940..3ac63bf 100644
--- a/test/audiocachetest.cc
+++ b/test/audiocachetest.cc
@@ -81,7 +81,7 @@ public:
 
 			printf("open: initial_samples_needed: %d\n", (int)initial_samples_needed);
 			sample_t *samples =
-				audio_cache.open(&audio_file, initial_samples_needed, channel, id);
+				audio_cache.open(audio_file, initial_samples_needed, channel, id);
 			size_t size = initial_samples_needed;
 			size_t offset = 0;