add finite state machine to control/manage transport state

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

diff --git a/libs/ardour/session_butler.cc b/libs/ardour/session_butler.cc
index 3e7c2226ccb4d9c56b5cbf9e78e742b365f98291..1f472b710b20fa6d8dfe9f0e173a4f63ed50789e 100644 (file)
--- a/libs/ardour/session_butler.cc
+++ b/libs/ardour/session_butler.cc
@@ -1,53 +1,43 @@
 /*
-    Copyright (C) 1999-2002 Paul Davis
-
-    This program is free software; you can redistribute it and/or modify
-    it under the terms of the GNU General Public License as published by
-    the Free Software Foundation; either version 2 of the License, or
-    (at your option) any later version.
-
-    This program is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with this program; if not, write to the Free Software
-    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-
-*/
+ * Copyright (C) 1999-2019 Paul Davis <paul@linuxaudiosystems.com>
+ * Copyright (C) 2005-2006 Taybin Rutkin <taybin@taybin.com>
+ * Copyright (C) 2006-2014 David Robillard <d@drobilla.net>
+ * Copyright (C) 2006 Jesse Chappell <jesse@essej.net>
+ * Copyright (C) 2010-2012 Carl Hetherington <carl@carlh.net>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program; if not, write to the Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ */
 
 #include "pbd/error.h"
 #include "pbd/pthread_utils.h"
 #include "pbd/stacktrace.h"
 
 #include "ardour/butler.h"
+#include "ardour/disk_reader.h"
 #include "ardour/route.h"
 #include "ardour/session.h"
 #include "ardour/session_event.h"
 #include "ardour/track.h"
 #include "ardour/types.h"
 
-#include "i18n.h"
+#include "pbd/i18n.h"
 
 using namespace std;
 using namespace ARDOUR;
 using namespace PBD;
 
-/* XXX put this in the right place */
-
-static inline uint32_t next_power_of_two (uint32_t n)
-{
-       --n;
-       n |= n >> 16;
-       n |= n >> 8;
-       n |= n >> 4;
-       n |= n >> 2;
-       n |= n >> 1;
-       ++n;
-       return n;
-}
-
 /*---------------------------------------------------------------------------
  BUTLER THREAD
  ---------------------------------------------------------------------------*/
@@ -72,6 +62,7 @@ void
 Session::schedule_playback_buffering_adjustment ()
 {
        add_post_transport_work (PostTransportAdjustPlaybackBuffering);
+       DiskReader::inc_no_disk_output ();
        _butler->schedule_transport_work ();
 }
 
@@ -83,17 +74,15 @@ Session::schedule_capture_buffering_adjustment ()
 }
 
 void
-Session::schedule_curve_reallocation ()
+Session::request_overwrite_buffer (boost::shared_ptr<Route> r)
 {
-       add_post_transport_work (PostTransportCurveRealloc);
-       _butler->schedule_transport_work ();
-}
+       boost::shared_ptr<Track> t = boost::dynamic_pointer_cast<Track> (r);
+       if (!t) {
+               return;
+       }
 
-void
-Session::request_overwrite_buffer (Track* t)
-{
        SessionEvent *ev = new SessionEvent (SessionEvent::Overwrite, SessionEvent::Add, SessionEvent::Immediate, 0, 0, 0.0);
-       ev->set_ptr (t);
+       ev->set_ptr (t.get());
        queue_event (ev);
 }
 
@@ -107,7 +96,7 @@ Session::overwrite_some_buffers (Track* t)
 
        if (t) {
 
-               t->set_pending_overwrite (true);
+               t->set_pending_overwrite ();
 
        } else {
 
@@ -115,12 +104,13 @@ Session::overwrite_some_buffers (Track* t)
                for (RouteList::iterator i = rl->begin(); i != rl->end(); ++i) {
                        boost::shared_ptr<Track> tr = boost::dynamic_pointer_cast<Track> (*i);
                        if (tr) {
-                               tr->set_pending_overwrite (true);
+                               tr->set_pending_overwrite ();
                        }
                }
        }
 
        add_post_transport_work (PostTransportOverWrite);
+
        _butler->schedule_transport_work ();
 }