enough with umpteen "i18n.h" files. Consolidate on pbd/i18n.h

[ardour.git] / libs / ardour / diskstream.cc

diff --git a/libs/ardour/diskstream.cc b/libs/ardour/diskstream.cc
index 5a8f26f17d696ded6808f9731573f7a86981fac8..ebd11a1887d1e9c71991908e0fa23ee23561ffb8 100644 (file)
--- a/libs/ardour/diskstream.cc
+++ b/libs/ardour/diskstream.cc
@@ -17,7 +17,6 @@
 
 */
 
-#include <fstream>
 #include <cassert>
 #include <cstdio>
 #include <unistd.h>
@@ -47,7 +46,7 @@
 #include "ardour/session.h"
 #include "ardour/track.h"
 
-#include "i18n.h"
+#include "pbd/i18n.h"
 #include <locale.h>
 
 using namespace std;
@@ -381,11 +380,12 @@ Diskstream::use_playlist (boost::shared_ptr<Playlist> playlist)
                _playlist = playlist;
                _playlist->use();
 
-               if (!in_set_state && recordable()) {
+               if (!in_set_state && destructive() && recordable()) {
                        reset_write_sources (false);
                }
 
                _playlist->ContentsChanged.connect_same_thread (playlist_connections, boost::bind (&Diskstream::playlist_modified, this));
+               _playlist->LayeringChanged.connect_same_thread (playlist_connections, boost::bind (&Diskstream::playlist_modified, this));
                _playlist->DropReferences.connect_same_thread (playlist_connections, boost::bind (&Diskstream::playlist_deleted, this, boost::weak_ptr<Playlist>(_playlist)));
                _playlist->RangesMoved.connect_same_thread (playlist_connections, boost::bind (&Diskstream::playlist_ranges_moved, this, _1, _2));
        }
@@ -461,7 +461,7 @@ Diskstream::get_state ()
 {
        XMLNode* node = new XMLNode ("Diskstream");
         char buf[64];
-       LocaleGuard lg (X_("C"));
+       LocaleGuard lg;
 
        node->add_property ("flags", enum_2_string (_flags));
        node->add_property ("playlist", _playlist->name());
@@ -483,7 +483,7 @@ Diskstream::get_state ()
 int
 Diskstream::set_state (const XMLNode& node, int /*version*/)
 {
-       const XMLProperty* prop;
+       XMLProperty const * prop;
 
        if ((prop = node.property ("name")) != 0) {
                _name = prop->value();
@@ -503,7 +503,7 @@ Diskstream::set_state (const XMLNode& node, int /*version*/)
                error << string_compose (_("%1: this session uses destructive tracks, which are not supported"), PROGRAM_NAME) << endmsg;
                return -1;
        }
-       
+
         if ((prop = node.property (X_("capture-alignment"))) != 0) {
                 set_align_choice (AlignChoice (string_2_enum (prop->value(), _alignment_choice)), true);
         } else {
@@ -525,7 +525,7 @@ Diskstream::set_state (const XMLNode& node, int /*version*/)
                        non_realtime_set_speed ();
                }
        }
-       
+
        if ((prop = node.property ("record-safe")) != 0) {
            _record_safe = PBD::string_is_affirmative (prop->value()) ? 1 : 0;
        }
@@ -568,7 +568,9 @@ Diskstream::playlist_ranges_moved (list< Evoral::RangeMove<framepos_t> > const &
                         continue;
                 }
                 boost::shared_ptr<AutomationList> alist = ac->alist();
-
+               if (!alist->size()) {
+                       continue;
+               }
                 XMLNode & before = alist->get_state ();
                 bool const things_moved = alist->move_ranges (movements);
                 if (things_moved) {
@@ -598,6 +600,9 @@ Diskstream::move_processor_automation (boost::weak_ptr<Processor> p, list< Evora
 
        for (set<Evoral::Parameter>::const_iterator i = a.begin (); i != a.end (); ++i) {
                boost::shared_ptr<AutomationList> al = processor->automation_control(*i)->alist();
+               if (!al->size()) {
+                       continue;
+               }
                XMLNode & before = al->get_state ();
                bool const things_moved = al->move_ranges (movements);
                if (things_moved) {
@@ -798,10 +803,69 @@ framecnt_t
 Diskstream::default_disk_read_chunk_frames()
 {
        return 65536;
-}      
+}
 
 framecnt_t
 Diskstream::default_disk_write_chunk_frames ()
 {
        return 65536;
 }
+
+void
+Diskstream::set_buffering_parameters (BufferingPreset bp)
+{
+       framecnt_t read_chunk_size;
+       framecnt_t read_buffer_size;
+       framecnt_t write_chunk_size;
+       framecnt_t write_buffer_size;
+
+       if (!get_buffering_presets (bp, read_chunk_size, read_buffer_size, write_chunk_size, write_buffer_size)) {
+               return;
+       }
+
+       disk_read_chunk_frames = read_chunk_size;
+       disk_write_chunk_frames = write_chunk_size;
+       Config->set_audio_capture_buffer_seconds (write_buffer_size);
+       Config->set_audio_playback_buffer_seconds (read_buffer_size);
+
+       cerr << "Set buffering params to " << disk_read_chunk_frames << '|' << disk_write_chunk_frames << '|'
+            << Config->get_audio_playback_buffer_seconds() << '|'
+            << Config->get_audio_capture_buffer_seconds ()
+            << endl;
+}
+
+bool
+Diskstream::get_buffering_presets (BufferingPreset bp,
+                                   framecnt_t& read_chunk_size,
+                                   framecnt_t& read_buffer_size,
+                                   framecnt_t& write_chunk_size,
+                                   framecnt_t& write_buffer_size)
+{
+       switch (bp) {
+       case Small:
+               read_chunk_size = 65536;  /* samples */
+               write_chunk_size = 65536; /* samples */
+               read_buffer_size = 5;  /* seconds */
+               write_buffer_size = 5; /* seconds */
+               break;
+
+       case Medium:
+               read_chunk_size = 262144;  /* samples */
+               write_chunk_size = 131072; /* samples */
+               read_buffer_size = 10;  /* seconds */
+               write_buffer_size = 10; /* seconds */
+               break;
+
+       case Large:
+               read_chunk_size = 524288; /* samples */
+               write_chunk_size = 131072; /* samples */
+               read_buffer_size = 20; /* seconds */
+               write_buffer_size = 20; /* seconds */
+               break;
+
+       default:
+               return false;
+       }
+
+       return true;
+}