remove duplicated (in heirarchy) loop location from DiskReader

diff --git a/libs/ardour/ardour/disk_reader.h b/libs/ardour/ardour/disk_reader.h
index 4f1c47ae8eb6c70ab8fda54fc94be0640a9cf556..6a50594dc4a92f1530e56dfec088ee8957c34987 100644 (file)
--- a/libs/ardour/ardour/disk_reader.h
+++ b/libs/ardour/ardour/disk_reader.h
@@ -71,8 +71,6 @@ class LIBARDOUR_API DiskReader : public DiskIOProcessor
        PBD::Signal1<void,DataType>   PlaylistChanged;
        PBD::Signal0<void>            AlignmentStyleChanged;
 
-       int set_loop (Location *loc);
-
        float buffer_load() const;
 
        void move_processor_automation (boost::weak_ptr<Processor>, std::list<Evoral::RangeMove<framepos_t> > const &);
@@ -124,7 +122,6 @@ class LIBARDOUR_API DiskReader : public DiskIOProcessor
            with respect to the transport frame.  This is used for latency compensation.
        */
        framecnt_t   _roll_delay;
-       Location*     loop_location;
        framepos_t    overwrite_frame;
        off_t         overwrite_offset;
        bool          _pending_overwrite;

diff --git a/libs/ardour/disk_reader.cc b/libs/ardour/disk_reader.cc
index 1a390afdb34a4efad90f6e5801650e76792e6e35..73d905b4c89c703f39e7f1824a155f28268bc3a7 100644 (file)
--- a/libs/ardour/disk_reader.cc
+++ b/libs/ardour/disk_reader.cc
@@ -42,7 +42,6 @@ ARDOUR::framecnt_t DiskReader::_chunk_frames = default_chunk_frames ();
 DiskReader::DiskReader (Session& s, string const & str, DiskIOProcessor::Flag f)
        : DiskIOProcessor (s, str, f)
        , _roll_delay (0)
-       , loop_location (0)
        , overwrite_frame (0)
         , overwrite_offset (0)
         , _pending_overwrite (false)
@@ -214,22 +213,6 @@ DiskReader::realtime_locate ()
 {
 }
 
-int
-DiskReader::set_loop (Location *location)
-{
-       if (location) {
-               if (location->start() >= location->end()) {
-                       error << string_compose(_("Location \"%1\" not valid for track loop (start >= end)"), location->name()) << endl;
-                       return -1;
-               }
-       }
-
-       loop_location = location;
-
-       LoopSet (location); /* EMIT SIGNAL */
-       return 0;
-}
-
 float
 DiskReader::buffer_load () const
 {