NO-OP: clarify internal API, prepare for overwrite queue

diff --git a/libs/ardour/ardour/disk_reader.h b/libs/ardour/ardour/disk_reader.h
index 91fcf74d2fe208852cd1a8964c4479d54f7cf77f..e7f527b0642752ddea3f2b055bcd97a8d7b6fcd0 100644 (file)
--- a/libs/ardour/ardour/disk_reader.h
+++ b/libs/ardour/ardour/disk_reader.h
@@ -49,8 +49,8 @@ public:
        void run (BufferSet& /*bufs*/, samplepos_t /*start_sample*/, samplepos_t /*end_sample*/, double speed, pframes_t /*nframes*/, bool /*result_required*/);
        void realtime_handle_transport_stopped ();
        void realtime_locate ();
-       int overwrite_existing_buffers ();
-       void set_pending_overwrite (bool yn);
+       bool overwrite_existing_buffers ();
+       void set_pending_overwrite ();
 
        int set_state (const XMLNode&, int version);
 

diff --git a/libs/ardour/ardour/track.h b/libs/ardour/ardour/track.h
index e9d9a603804904ffa51fdc66d3b983e948119ba3..f15f5bd329d025ab0e7615b9010909de01c5ad9d 100644 (file)
--- a/libs/ardour/ardour/track.h
+++ b/libs/ardour/ardour/track.h
@@ -135,13 +135,13 @@ public:
        float capture_buffer_load () const;
        int do_refill ();
        int do_flush (RunContext, bool force = false);
-       void set_pending_overwrite (bool);
+       void set_pending_overwrite ();
        int seek (samplepos_t, bool complete_refill = false);
        bool can_internal_playback_seek (samplecnt_t);
        void internal_playback_seek (samplecnt_t);
        void non_realtime_locate (samplepos_t);
        void realtime_handle_transport_stopped ();
-       int overwrite_existing_buffers ();
+       bool overwrite_existing_buffers ();
        samplecnt_t get_captured_samples (uint32_t n = 0) const;
        void transport_looped (samplepos_t);
        void transport_stopped_wallclock (struct tm &, time_t, bool);

diff --git a/libs/ardour/disk_reader.cc b/libs/ardour/disk_reader.cc
index cf404e3bbbd5076914ee1c4fc23f942cff1a319c..70c35318cb6cde74845f54c7ba9dedd7e933be06 100644 (file)
--- a/libs/ardour/disk_reader.cc
+++ b/libs/ardour/disk_reader.cc
@@ -464,12 +464,13 @@ DiskReader::run (BufferSet& bufs, samplepos_t start_sample, samplepos_t end_samp
 }
 
 void
-DiskReader::set_pending_overwrite (bool yn)
+DiskReader::set_pending_overwrite ()
 {
        /* called from audio thread, so we can use the read ptr and playback sample as we wish */
 
-       _pending_overwrite = yn;
+       assert (!_pending_overwrite);
 
+       _pending_overwrite = true;
        overwrite_sample = playback_sample;
 
        boost::shared_ptr<ChannelList> c = channels.reader ();
@@ -478,11 +479,9 @@ DiskReader::set_pending_overwrite (bool yn)
        }
 }
 
-int
+bool
 DiskReader::overwrite_existing_buffers ()
 {
-       int ret = -1;
-
        boost::shared_ptr<ChannelList> c = channels.reader();
 
        overwrite_queued = false;
@@ -520,8 +519,6 @@ DiskReader::overwrite_existing_buffers ()
                                goto midi;
                        }
                }
-
-               ret = 0;
        }
 
   midi:
@@ -550,7 +547,7 @@ DiskReader::overwrite_existing_buffers ()
 
        _pending_overwrite = false;
 
-       return ret;
+       return true;
 }
 
 int

diff --git a/libs/ardour/session_butler.cc b/libs/ardour/session_butler.cc
index 262444c4358cab5fd7b8eec23787df64240d4687..a520f430f26c9dba24959221cbc11e7f42694a13 100644 (file)
--- a/libs/ardour/session_butler.cc
+++ b/libs/ardour/session_butler.cc
@@ -98,7 +98,7 @@ Session::overwrite_some_buffers (Track* t)
 
        if (t) {
 
-               t->set_pending_overwrite (true);
+               t->set_pending_overwrite ();
 
        } else {
 
@@ -106,7 +106,7 @@ 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 ();
                        }
                }
        }

diff --git a/libs/ardour/track.cc b/libs/ardour/track.cc
index f4161ebb063492d0a161fa54a583d9bd1fae054b..045f8297a0630a9761f800f2893e24a1636e7830 100644 (file)
--- a/libs/ardour/track.cc
+++ b/libs/ardour/track.cc
@@ -492,9 +492,9 @@ Track::do_flush (RunContext c, bool force)
 }
 
 void
-Track::set_pending_overwrite (bool o)
+Track::set_pending_overwrite ()
 {
-       _disk_reader->set_pending_overwrite (o);
+       _disk_reader->set_pending_overwrite ();
 }
 
 int
@@ -524,7 +524,7 @@ Track::non_realtime_locate (samplepos_t p)
        Route::non_realtime_locate (p);
 }
 
-int
+bool
 Track::overwrite_existing_buffers ()
 {
        return _disk_reader->overwrite_existing_buffers ();