split apart read and write chunk size and offer platform-dependent sizes for reading. Write chunk size should remain unchanged from before.

1 files changed, 20 insertions, 6 deletions

diff --git a/libs/ardour/diskstream.cc b/libs/ardour/diskstream.cc
index 427063c3a2..0e4b5fcc49 100644
--- a/libs/ardour/diskstream.cc
+++ b/libs/ardour/diskstream.cc
@@ -53,12 +53,8 @@ using namespace std;
 using namespace ARDOUR;
 using namespace PBD;
 
-/* XXX This goes uninitialized when there is no ~/.config/ardour3 directory.
- * I can't figure out why, so this will do for now (just stole the
- * default from configuration_vars.h).  0 is not a good value for
- * allocating buffer sizes..
- */
-ARDOUR::framecnt_t Diskstream::disk_io_chunk_frames = 1024 * 256 / sizeof (Sample);
+ARDOUR::framecnt_t Diskstream::disk_read_chunk_frames = default_disk_read_chunk_frames ();
+ARDOUR::framecnt_t Diskstream::disk_write_chunk_frames = default_disk_write_chunk_frames ();
 
 PBD::Signal0<void>                Diskstream::DiskOverrun;
 PBD::Signal0<void>                Diskstream::DiskUnderrun;
@@ -772,3 +768,21 @@ Diskstream::disengage_record_enable ()
 {
 	g_atomic_int_set (&_record_enabled, 0);
 }
+
+framecnt_t
+Diskstream::default_disk_read_chunk_frames()
+{
+#ifdef PLATFORM_WINDOWS
+	return (2 * 1048576) / sizeof (Sample);
+#elif defined __APPLE__
+	return (4 * 1048576) / sizeof (Sample);
+#else
+	return 65536;
+#endif
+}	
+
+framecnt_t
+Diskstream::default_disk_write_chunk_frames ()
+{
+	return 65536;
+}