remove unnecessary and unused changes from grygorii

diff --git a/libs/ardour/ardour/location.h b/libs/ardour/ardour/location.h
index b2517832846f853d521d9ec13810552bfa2d98ac..7a6832eb2d5721c1357574f604c36d3e7317ffc1 100644 (file)
--- a/libs/ardour/ardour/location.h
+++ b/libs/ardour/ardour/location.h
@@ -124,7 +124,6 @@ class LIBARDOUR_API Location : public SessionHandleRef, public PBD::StatefulDest
        */
 
        PBD::Signal0<void> Changed;
-       void set_block_change_notifications (bool yn) {_block_change_notifications = yn;}
     
        PBD::Signal0<void> NameChanged;
        PBD::Signal0<void> EndChanged;
@@ -158,8 +157,6 @@ class LIBARDOUR_API Location : public SessionHandleRef, public PBD::StatefulDest
        PositionLockStyle  _position_lock_style;
        boost::shared_ptr<SceneChange> _scene_change;
     
-       bool _block_change_notifications; // required for group operations
-
        void set_mark (bool yn);
        bool set_flag_internal (bool yn, Flags flag);
        void recompute_bbt_from_frames ();

diff --git a/libs/ardour/location.cc b/libs/ardour/location.cc
index 0758642336bdb441bb7202c6e7493f2158d531b1..e8909112250b0e391f9eecfe8c78c2fc814b2dde 100644 (file)
--- a/libs/ardour/location.cc
+++ b/libs/ardour/location.cc
@@ -58,7 +58,6 @@ Location::Location (Session& s)
        , _flags (Flags (0))
        , _locked (false)
        , _position_lock_style (AudioTime)
-       , _block_change_notifications (false)
 {
        assert (_start >= 0);
        assert (_end >= 0);
@@ -73,7 +72,6 @@ Location::Location (Session& s, framepos_t sample_start, framepos_t sample_end,
        , _flags (bits)
        , _locked (false)
        , _position_lock_style (s.config.get_glue_new_markers_to_bars_and_beats() ? MusicTime : AudioTime)
-       , _block_change_notifications (false)
 
 {
        recompute_bbt_from_frames ();
@@ -92,7 +90,6 @@ Location::Location (const Location& other)
        , _bbt_end (other._bbt_end)
        , _flags (other._flags)
        , _position_lock_style (other._position_lock_style)
-       , _block_change_notifications (false)
 
 {
        /* copy is not locked even if original was */
@@ -410,10 +407,7 @@ Location::set (framepos_t s, framepos_t e, bool allow_bbt_recompute)
 
        if (start_change && end_change) {
                changed (this);
-            
-               if (!_block_change_notifications) {
-                       Changed ();
-               }
+               Changed ();
        }
 
        return 0;
@@ -436,10 +430,7 @@ Location::move_to (framepos_t pos)
                recompute_bbt_from_frames ();
 
                changed (this); /* EMIT SIGNAL */
-        
-               if (!_block_change_notifications) {
-                       Changed (); /* EMIT SIGNAL */
-               }
+               Changed (); /* EMIT SIGNAL */
        }
 
        assert (_start >= 0);
@@ -699,10 +690,7 @@ Location::set_state (const XMLNode& node, int version)
        recompute_bbt_from_frames ();
 
        changed (this); /* EMIT SIGNAL */
-    
-       if (!_block_change_notifications) {
-               Changed (); /* EMIT SIGNAL */
-       }
+       Changed (); /* EMIT SIGNAL */
 
        assert (_start >= 0);
        assert (_end >= 0);
@@ -1085,9 +1073,7 @@ Locations::set_state (const XMLNode& node, int version)
                                        loc = *i;
                     
                                        // changed locations will be updated by Locations::changed signal
-                                       loc->set_block_change_notifications (true);
                                        loc->set_state (**niter, version);
-                                       loc->set_block_change_notifications (false);
                                } else {
                                        loc = new Location (_session, **niter);
                                }