ardour/livetrax
13
0
Fork 0
Code

Fix a few dialogues which don't reset their session pointer correctly on a new session. Fixes #3342.

Browse Source 
git-svn-id: svn://localhost/ardour2/branches/3.0@7451 d708f5d6-7413-0410-9779-e7cbd77b26cf
This commit is contained in:
Carl Hetherington 2010-07-20 17:56:02 +00:00
parent 2aaec8beeb
commit 12e3fb4541
4 changed files with 23 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
gtk2_ardour/ardour_ui_dialogs.cc
View File

@ -40,6 +40,7 @@
#include "keyeditor.h"
#include "gui_thread.h"
#include "midi_tracer.h"
#include "add_route_dialog.h"
#include "i18n.h"
@ -66,6 +67,14 @@ ARDOUR_UI::set_session (Session *s)
route_params->set_session (s);
}
if (add_route_dialog) {
add_route_dialog->set_session (s);
}
if (session_option_editor) {
session_option_editor->set_session (s);
}
primary_clock.set_session (s);
secondary_clock.set_session (s);
big_clock.set_session (s);

6
gtk2_ardour/editor.cc
View File

@ -1076,6 +1076,12 @@ Editor::set_session (Session *t)
sfbrowser->set_session (_session);
}
for (ARDOUR::DataType::iterator i = ARDOUR::DataType::begin(); i != ARDOUR::DataType::end(); ++i) {
if (_global_port_matrix[*i]) {
_global_port_matrix[*i]->set_session (_session);
}
}
compute_fixed_ruler_scale ();
/* there are never any selected regions at startup */

6
gtk2_ardour/global_port_matrix.cc
View File

@ -166,6 +166,12 @@ GlobalPortMatrixWindow::on_show ()
resize_window_to_proportion_of_monitor (this, pm_max.first, pm_max.second);
}
void
GlobalPortMatrixWindow::set_session (ARDOUR::Session* s)
{
_port_matrix.set_session (s);
}
string
GlobalPortMatrix::disassociation_verb () const
{

2
gtk2_ardour/global_port_matrix.h
View File

@ -56,6 +56,8 @@ class GlobalPortMatrixWindow : public Gtk::Window
public:
GlobalPortMatrixWindow (ARDOUR::Session *, ARDOUR::DataType);
void set_session (ARDOUR::Session *);
private:
void on_show ();