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

dammit jim, it's a stack not a queue

Browse source
This commit is contained in:
Paul Davis 2024-06-07 10:04:42 -06:00
parent 280fdb6e62
commit f2e1697058
3 changed files with 4 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

4
gtk2_ardour/editing_context.cc
View file

@ -63,7 +63,7 @@ using std::string;
sigc::signal<void> EditingContext::DropDownKeys; sigc::signal<void> EditingContext::DropDownKeys;
Gtkmm2ext::Bindings* EditingContext::button_bindings = nullptr; Gtkmm2ext::Bindings* EditingContext::button_bindings = nullptr;
Glib::RefPtr<Gtk::ActionGroup> EditingContext::_midi_actions; Glib::RefPtr<Gtk::ActionGroup> EditingContext::_midi_actions;
std::queue<EditingContext*> EditingContext::ec_stack; std::stack<EditingContext*> EditingContext::ec_stack;
std::vector<std::string> EditingContext::grid_type_strings; std::vector<std::string> EditingContext::grid_type_strings;
MouseCursors* EditingContext::_cursors = nullptr; MouseCursors* EditingContext::_cursors = nullptr;
@ -1979,7 +1979,7 @@ EditingContext*
EditingContext::current_editing_context() EditingContext::current_editing_context()
{ {
if (!ec_stack.empty()) { if (!ec_stack.empty()) {
return ec_stack.front (); return ec_stack.top ();
} }
return nullptr; return nullptr;

4
gtk2_ardour/editing_context.h
View file

@ -33,7 +33,7 @@
#ifndef __ardour_midi_editing_context_h__ #ifndef __ardour_midi_editing_context_h__
#define __ardour_midi_editing_context_h__ #define __ardour_midi_editing_context_h__
#include <queue> #include <stack>
#include "pbd/signals.h" #include "pbd/signals.h"
@ -625,7 +625,7 @@ public:
ArdourCanvas::Rect autoscroll_boundary; ArdourCanvas::Rect autoscroll_boundary;
private: private:
static std::queue<EditingContext*> ec_stack; static std::stack<EditingContext*> ec_stack;
}; };

4
gtk2_ardour/editor.cc
View file

@ -764,10 +764,6 @@ Editor::Editor ()
BasicUI::AccessAction.connect (*this, invalidator (*this), boost::bind (&Editor::access_action, this, _1, _2), gui_context()); BasicUI::AccessAction.connect (*this, invalidator (*this), boost::bind (&Editor::access_action, this, _1, _2), gui_context());
/* handle escape */
ARDOUR_UI::instance()->Escape.connect (*this, invalidator (*this), boost::bind (&Editor::escape, this), gui_context());
/* problematic: has to return a value and thus cannot be x-thread */ /* problematic: has to return a value and thus cannot be x-thread */
Session::AskAboutPlaylistDeletion.connect_same_thread (*this, boost::bind (&Editor::playlist_deletion_dialog, this, _1)); Session::AskAboutPlaylistDeletion.connect_same_thread (*this, boost::bind (&Editor::playlist_deletion_dialog, this, _1));