remove useless lock

rbuf allocation/use is protected by process_lock

diff --git a/libs/ardour/ardour/disk_reader.h b/libs/ardour/ardour/disk_reader.h
index 64ee662e681a8b5815295296f9f1ffbc7978845b..fd437e57ea0191d02b6d418c4866e1a5104ed115 100644 (file)
--- a/libs/ardour/ardour/disk_reader.h
+++ b/libs/ardour/ardour/disk_reader.h
@@ -115,8 +115,6 @@ public:
        static void reset_loop_declick (Location*, samplecnt_t sample_rate);
        static void alloc_loop_declick (samplecnt_t sample_rate);
 
-       Glib::Threads::Mutex rbuf_lock;
-
 protected:
        friend class Track;
        friend class MidiTrack;

diff --git a/libs/ardour/disk_reader.cc b/libs/ardour/disk_reader.cc
index 22e035835a9e693fbbbe332e4ca00d08de352b34..e3cd75f5a16a24bae5550f0da75ab6283706f2c3 100644 (file)
--- a/libs/ardour/disk_reader.cc
+++ b/libs/ardour/disk_reader.cc
@@ -78,8 +78,6 @@ DiskReader::~DiskReader ()
 void
 DiskReader::ReaderChannelInfo::resize (samplecnt_t bufsize)
 {
-       /* caller must hold rbuf lock */
-
        delete rbuf; rbuf = 0;
 
        rbuf = new PlaybackBuffer<Sample> (bufsize);
@@ -225,7 +223,6 @@ DiskReader::buffer_load () const
 void
 DiskReader::adjust_buffering ()
 {
-       Glib::Threads::Mutex::Lock lm (rbuf_lock);
        boost::shared_ptr<ChannelList> c = channels.reader();
 
        for (ChannelList::iterator chan = c->begin(); chan != c->end(); ++chan) {