From 3c8b506ace03c150c72cc62d1c83e49c3bffe91f Mon Sep 17 00:00:00 2001 From: Paul Davis Date: Thu, 12 Dec 2019 11:31:43 -0700 Subject: [PATCH] remove useless lock rbuf allocation/use is protected by process_lock --- libs/ardour/ardour/disk_reader.h | 2 -- libs/ardour/disk_reader.cc | 3 --- 2 files changed, 5 deletions(-) diff --git a/libs/ardour/ardour/disk_reader.h b/libs/ardour/ardour/disk_reader.h index 64ee662e68..fd437e57ea 100644 --- 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 22e035835a..e3cd75f5a1 100644 --- 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 (bufsize); @@ -225,7 +223,6 @@ DiskReader::buffer_load () const void DiskReader::adjust_buffering () { - Glib::Threads::Mutex::Lock lm (rbuf_lock); boost::shared_ptr c = channels.reader(); for (ChannelList::iterator chan = c->begin(); chan != c->end(); ++chan) {