ardour/ardour
ardour
/
ardour
13
1
Fork 0
Code Pull Requests Releases Activity

fix merge error

This commit is contained in:
Ben Loftis 2022-11-10 11:03:35 -06:00
parent 01c7e14c6e
commit 162a8c00b3
1 changed files with 1 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
libs/ardour/session.cc
View File

@ -198,13 +198,9 @@ Session::Session (AudioEngine &eng,
, _session_range_is_free (true)
, _silent (false)
, _remaining_latency_preroll (0)
<<<<<<< HEAD
, _last_touched_mixer_scene_idx (std::numeric_limits<size_t>::max())
=======
, _mixer_scene_undo_idx (0)
, _mixer_scene_undo (0)
, _last_touched_mixer_scene_idx (999)
>>>>>>> c0379f7432 (MixerScenes: implement 'undo' function for mixer scene recalls (libardour))
, _last_touched_mixer_scene_idx (std::numeric_limits<size_t>::max())
, _engine_speed (1.0)
, _signalled_varispeed (0)
, auto_play_legal (false)