smokephil/ardour
1
0
Fork 0
mirror of https://github.com/Ardour/ardour.git synced 2025-12-20 13:46:30 +01:00
Code Issues Projects Releases Wiki Activity

remove unnecessary and unused changes from grygorii

Browse source
This commit is contained in:
Paul Davis 2015-05-11 16:31:14 -04:00
parent fb89ff4643
commit 8488d8f6a5
2 changed files with 3 additions and 20 deletions
Download patch file Download diff file Expand all files Collapse all files

3
libs/ardour/ardour/location.h
View file

@ -124,7 +124,6 @@ class LIBARDOUR_API Location : public SessionHandleRef, public PBD::StatefulDest
*/ */
PBD::Signal0<void> Changed; PBD::Signal0<void> Changed;
void set_block_change_notifications (bool yn) {_block_change_notifications = yn;}
PBD::Signal0<void> NameChanged; PBD::Signal0<void> NameChanged;
PBD::Signal0<void> EndChanged; PBD::Signal0<void> EndChanged;
@ -158,8 +157,6 @@ class LIBARDOUR_API Location : public SessionHandleRef, public PBD::StatefulDest
PositionLockStyle _position_lock_style; PositionLockStyle _position_lock_style;
boost::shared_ptr<SceneChange> _scene_change; boost::shared_ptr<SceneChange> _scene_change;
bool _block_change_notifications; // required for group operations
void set_mark (bool yn); void set_mark (bool yn);
bool set_flag_internal (bool yn, Flags flag); bool set_flag_internal (bool yn, Flags flag);
void recompute_bbt_from_frames (); void recompute_bbt_from_frames ();

20
libs/ardour/location.cc
View file

@ -58,7 +58,6 @@ Location::Location (Session& s)
, _flags (Flags (0)) , _flags (Flags (0))
, _locked (false) , _locked (false)
, _position_lock_style (AudioTime) , _position_lock_style (AudioTime)
, _block_change_notifications (false)
{ {
assert (_start >= 0); assert (_start >= 0);
assert (_end >= 0); assert (_end >= 0);
@ -73,7 +72,6 @@ Location::Location (Session& s, framepos_t sample_start, framepos_t sample_end,
, _flags (bits) , _flags (bits)
, _locked (false) , _locked (false)
, _position_lock_style (s.config.get_glue_new_markers_to_bars_and_beats() ? MusicTime : AudioTime) , _position_lock_style (s.config.get_glue_new_markers_to_bars_and_beats() ? MusicTime : AudioTime)
, _block_change_notifications (false)
{ {
recompute_bbt_from_frames (); recompute_bbt_from_frames ();
@ -92,7 +90,6 @@ Location::Location (const Location& other)
, _bbt_end (other._bbt_end) , _bbt_end (other._bbt_end)
, _flags (other._flags) , _flags (other._flags)
, _position_lock_style (other._position_lock_style) , _position_lock_style (other._position_lock_style)
, _block_change_notifications (false)
{ {
/* copy is not locked even if original was */ /* 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) { if (start_change && end_change) {
changed (this); changed (this);
Changed ();
if (!_block_change_notifications) {
Changed ();
}
} }
return 0; return 0;
@ -436,10 +430,7 @@ Location::move_to (framepos_t pos)
recompute_bbt_from_frames (); recompute_bbt_from_frames ();
changed (this); /* EMIT SIGNAL */ changed (this); /* EMIT SIGNAL */
Changed (); /* EMIT SIGNAL */
if (!_block_change_notifications) {
Changed (); /* EMIT SIGNAL */
}
} }
assert (_start >= 0); assert (_start >= 0);
@ -699,10 +690,7 @@ Location::set_state (const XMLNode& node, int version)
recompute_bbt_from_frames (); recompute_bbt_from_frames ();
changed (this); /* EMIT SIGNAL */ changed (this); /* EMIT SIGNAL */
Changed (); /* EMIT SIGNAL */
if (!_block_change_notifications) {
Changed (); /* EMIT SIGNAL */
}
assert (_start >= 0); assert (_start >= 0);
assert (_end >= 0); assert (_end >= 0);
@ -1085,9 +1073,7 @@ Locations::set_state (const XMLNode& node, int version)
loc = *i; loc = *i;
// changed locations will be updated by Locations::changed signal // changed locations will be updated by Locations::changed signal
loc->set_block_change_notifications (true);
loc->set_state (**niter, version); loc->set_state (**niter, version);
loc->set_block_change_notifications (false);
} else { } else {
loc = new Location (_session, **niter); loc = new Location (_session, **niter);
} }