X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=libs%2Fardour%2Fdiskstream.cc;h=49d9d62ec4ade7aabf707ea787ec9b55aa5f3b57;hb=1fdb3560e85e3f16944568005365b4482643ac02;hp=e24e67895936fe03c2be6d3c0312de0ba1e54da6;hpb=ad017365f7a73f8ba57f667cc1aa36478b48c50e;p=ardour.git

diff --git a/libs/ardour/diskstream.cc b/libs/ardour/diskstream.cc
index e24e678959..49d9d62ec4 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;
@@ -462,7 +458,7 @@ Diskstream::get_state ()
 {
 	XMLNode* node = new XMLNode ("Diskstream");
         char buf[64];
-	LocaleGuard lg (X_("POSIX"));
+	LocaleGuard lg (X_("C"));
 
 	node->add_property ("flags", enum_2_string (_flags));
 	node->add_property ("playlist", _playlist->name());
@@ -700,16 +696,16 @@ Diskstream::calculate_record_range (Evoral::OverlapType ot, framepos_t transport
 
 	case Evoral::OverlapInternal:
 		/*     ----------    recrange
-		         |---|       transrange
-		*/
+		 *       |---|       transrange
+		 */
 		rec_nframes = nframes;
 		rec_offset = 0;
 		break;
 
 	case Evoral::OverlapStart:
 		/*    |--------|    recrange
-	        -----|          transrange
-		*/
+		 *  -----|          transrange
+		 */
 		rec_nframes = transport_frame + nframes - first_recordable_frame;
 		if (rec_nframes) {
 			rec_offset = first_recordable_frame - transport_frame;
@@ -718,16 +714,16 @@ Diskstream::calculate_record_range (Evoral::OverlapType ot, framepos_t transport
 
 	case Evoral::OverlapEnd:
 		/*    |--------|    recrange
-		         |--------  transrange
-		*/
+		 *       |--------  transrange
+		 */
 		rec_nframes = last_recordable_frame - transport_frame;
 		rec_offset = 0;
 		break;
 
 	case Evoral::OverlapExternal:
 		/*    |--------|    recrange
-		    --------------  transrange
-		*/
+		 *  --------------  transrange
+		 */
 		rec_nframes = last_recordable_frame - first_recordable_frame;
 		rec_offset = first_recordable_frame - transport_frame;
 		break;
@@ -772,3 +768,15 @@ Diskstream::disengage_record_enable ()
 {
 	g_atomic_int_set (&_record_enabled, 0);
 }
+
+framecnt_t
+Diskstream::default_disk_read_chunk_frames()
+{
+	return 65536;
+}	
+
+framecnt_t
+Diskstream::default_disk_write_chunk_frames ()
+{
+	return 65536;
+}