projects
/
ardour.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
fix crash when copy'ing latent plugins
[ardour.git]
/
gtk2_ardour
/
mixer_group_tabs.cc
diff --git
a/gtk2_ardour/mixer_group_tabs.cc
b/gtk2_ardour/mixer_group_tabs.cc
index bccf649b42df9f08220d1c28dfd7dbfe5e8ae621..63bb1a091f5f6cda414a797d3056977a3438c38d 100644
(file)
--- a/
gtk2_ardour/mixer_group_tabs.cc
+++ b/
gtk2_ardour/mixer_group_tabs.cc
@@
-33,7
+33,7
@@
#include "ui_config.h"
#include "utils.h"
#include "ui_config.h"
#include "utils.h"
-#include "i18n.h"
+#include "
pbd/
i18n.h"
using namespace std;
using namespace Gtk;
using namespace std;
using namespace Gtk;
@@
-61,7
+61,8
@@
MixerGroupTabs::compute_tabs () const
TreeModel::Children rows = _mixer->track_model->children ();
for (TreeModel::Children::iterator i = rows.begin(); i != rows.end(); ++i) {
TreeModel::Children rows = _mixer->track_model->children ();
for (TreeModel::Children::iterator i = rows.begin(); i != rows.end(); ++i) {
- MixerStrip* s = (*i)[_mixer->track_columns.strip];
+ AxisView* av = (*i)[_mixer->stripable_columns.strip];
+ MixerStrip* s = dynamic_cast<MixerStrip*> (av);
if (!s) {
continue;
if (!s) {
continue;
@@
-153,7
+154,8
@@
MixerGroupTabs::routes_for_tab (Tab const * t) const
TreeModel::Children rows = _mixer->track_model->children ();
for (TreeModel::Children::iterator i = rows.begin(); i != rows.end(); ++i) {
TreeModel::Children rows = _mixer->track_model->children ();
for (TreeModel::Children::iterator i = rows.begin(); i != rows.end(); ++i) {
- MixerStrip* s = (*i)[_mixer->track_columns.strip];
+ AxisView* av = (*i)[_mixer->stripable_columns.strip];
+ MixerStrip* s = dynamic_cast<MixerStrip*> (av);
if (!s) {
continue;
if (!s) {
continue;
@@
-184,8
+186,8
@@
RouteList
MixerGroupTabs::selected_routes () const
{
RouteList rl;
MixerGroupTabs::selected_routes () const
{
RouteList rl;
- BOOST_FOREACH (
RouteUI* r, _mixer->selection().rout
es) {
- boost::shared_ptr<Route> rp =
r->route(
);
+ BOOST_FOREACH (
AxisView* r, _mixer->selection().ax
es) {
+ boost::shared_ptr<Route> rp =
boost::dynamic_pointer_cast<Route> (r->stripable()
);
if (rp) {
rl.push_back (rp);
}
if (rp) {
rl.push_back (rp);
}
@@
-193,8
+195,3
@@
MixerGroupTabs::selected_routes () const
return rl;
}
return rl;
}
-void
-MixerGroupTabs::sync_order_keys ()
-{
- _mixer->sync_order_keys_from_treeview ();
-}