smokephil/ardour
1
0
Fork 0
mirror of https://github.com/Ardour/ardour.git synced 2025-12-17 04:06:26 +01:00
Code Issues Projects Releases Wiki Activity

Revert "fix indentation from previous commit and previous edits"

Browse source 
This reverts commit 449c9b675d.
This commit is contained in:
Paul Davis 2015-02-18 11:20:20 -05:00
parent 400148b369
commit 2067163f7a
3 changed files with 204 additions and 199 deletions
Download patch file Download diff file Expand all files Collapse all files

2
libs/ardour/location.cc
View file

@ -74,6 +74,7 @@ Location::Location (Session& s, framepos_t sample_start, framepos_t sample_end,
, _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) , _block_change_notifications (false)
{ {
recompute_bbt_from_frames (); recompute_bbt_from_frames ();
@ -92,6 +93,7 @@ Location::Location (const Location& other)
, _flags (other._flags) , _flags (other._flags)
, _position_lock_style (other._position_lock_style) , _position_lock_style (other._position_lock_style)
, _block_change_notifications (false) , _block_change_notifications (false)
{ {
/* copy is not locked even if original was */ /* copy is not locked even if original was */

3
libs/ardour/session.cc
View file

@ -1481,6 +1481,9 @@ Session::_locations_changed (const Locations::LocationList& locations)
We might be re-adding a location here but it doesn't actually matter We might be re-adding a location here but it doesn't actually matter
for all the locations that the Session takes an interest in. for all the locations that the Session takes an interest in.
*/ */
loop_update_connections.drop_connections ();
mark_update_connections.drop_connections ();
skip_update_connections.drop_connections ();
{ {
PBD::Unwinder<bool> protect_ignore_skip_updates (_ignore_skips_updates, true); PBD::Unwinder<bool> protect_ignore_skip_updates (_ignore_skips_updates, true);