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

Revert "MixerScenes: implement 'undo' function for mixer scene recalls (libardour)"

Browse source 
This reverts commit a40c8d8e9a.
This reverts commit 01c7e14c6e.
This reverts commit 162a8c00b3.
This commit is contained in:
Robin Gareus 2022-11-10 20:52:50 +01:00
parent 162a8c00b3
commit 235d51a723
No known key found for this signature in database
GPG key ID: A090BCE02CF57F04
4 changed files with 12 additions and 46 deletions
Download patch file Download diff file Expand all files Collapse all files

7
libs/ardour/ardour/session.h
View file

@ -1219,7 +1219,6 @@ public:
void store_nth_mixer_scene (size_t);
bool nth_mixer_scene_valid (size_t) const;
size_t last_touched_mixer_scene_idx () {return _last_touched_mixer_scene_idx;}
void apply_mixer_scene_undo ();
boost::shared_ptr<MixerScene> nth_mixer_scene (size_t, bool create_if_missing = false);
std::vector<boost::shared_ptr<MixerScene>> mixer_scenes () const;
@ -1439,11 +1438,7 @@ private:
bool _session_range_is_free;
bool _silent;
samplecnt_t _remaining_latency_preroll;
void stash_mixer_scene_undo ();
ARDOUR::MixerScene* _mixer_scene_undo;
size_t _mixer_scene_undo_idx;
size_t _last_touched_mixer_scene_idx;
size_t _last_touched_mixer_scene_idx;
// varispeed playback -- TODO: move out of session to backend.
double _engine_speed;

29
libs/ardour/session.cc
View file

@ -198,8 +198,6 @@ Session::Session (AudioEngine &eng,
, _session_range_is_free (true)
, _silent (false)
, _remaining_latency_preroll (0)
, _mixer_scene_undo_idx (0)
, _mixer_scene_undo (0)
, _last_touched_mixer_scene_idx (std::numeric_limits<size_t>::max())
, _engine_speed (1.0)
, _signalled_varispeed (0)
@ -818,8 +816,6 @@ Session::destroy ()
delete midi_clock;
delete _mixer_scene_undo;
/* clear event queue, the session is gone, nobody is interested in
* those anymore, but they do leak memory if not removed
*/
@ -7527,32 +7523,9 @@ Session::nth_mixer_scene_valid (size_t nth) const
return !_mixer_scenes[nth]->empty ();
}
void
Session::stash_mixer_scene_undo ()
{
delete _mixer_scene_undo; // .. or keep existing?
_mixer_scene_undo = new MixerScene (*this);
_mixer_scene_undo->snapshot ();
_mixer_scene_undo_idx = _last_touched_mixer_scene_idx;
}
void
Session::apply_mixer_scene_undo ()
{
if (_mixer_scene_undo) {
_mixer_scene_undo->apply ();
delete _mixer_scene_undo;
_mixer_scene_undo = 0;
_last_touched_mixer_scene_idx = _mixer_scene_undo_idx;
}
MixerScene::Change();
}
bool
Session::apply_nth_mixer_scene (size_t nth)
{
stash_mixer_scene_undo();
boost::shared_ptr<MixerScene> scene;
{
Glib::Threads::RWLock::ReaderLock lm (_mixer_scenes_lock);
@ -7573,8 +7546,6 @@ Session::apply_nth_mixer_scene (size_t nth)
bool
Session::apply_nth_mixer_scene (size_t nth, RouteList const& rl)
{
stash_mixer_scene_undo();
boost::shared_ptr<MixerScene> scene;
{
Glib::Threads::RWLock::ReaderLock lm (_mixer_scenes_lock);