summaryrefslogtreecommitdiff
path: root/gtk2_ardour/mixer_strip.cc
diff options
context:
space:
mode:
authorPaul Davis <paul@linuxaudiosystems.com>2008-02-12 02:51:51 +0000
committerPaul Davis <paul@linuxaudiosystems.com>2008-02-12 02:51:51 +0000
commita1955a82e81816161f5b7dbf460a694e902237b0 (patch)
tree3c576a733aed52ff02a8fdc9786838bdea7758d2 /gtk2_ardour/mixer_strip.cc
parent7999372faccab884b4e652da83702d7ec252e14b (diff)
AU GUIs basically working, though unfinished; push up dialog for massive split operations (still in progress); fix problem where peakfile is slightly older than audio data even though it is ready to use (debugging output still present); move sync-menu code to libs/gtkmm2ext for linkage reasons; prevent flush_pending() calls from "top menu" items on OS X from locking the GUI; try to make adding lots of regions (e.g. from split-at-points) scale a bit better; SAE version has no timecode mode for audio clocks
git-svn-id: svn://localhost/ardour2/branches/2.0-ongoing@3038 d708f5d6-7413-0410-9779-e7cbd77b26cf
Diffstat (limited to 'gtk2_ardour/mixer_strip.cc')
-rw-r--r--gtk2_ardour/mixer_strip.cc13
1 files changed, 6 insertions, 7 deletions
diff --git a/gtk2_ardour/mixer_strip.cc b/gtk2_ardour/mixer_strip.cc
index dc9c27c842..d140cc159e 100644
--- a/gtk2_ardour/mixer_strip.cc
+++ b/gtk2_ardour/mixer_strip.cc
@@ -87,6 +87,7 @@ MixerStrip::MixerStrip (Mixer_UI& mx, Session& sess, boost::shared_ptr<Route> rt
: AxisView(sess),
RouteUI (rt, sess, _("Mute"), _("Solo"), _("Record")),
_mixer(mx),
+ _mixer_owned (in_mixer),
pre_redirect_box (PreFader, sess, rt, mx.plugin_selector(), mx.selection(), in_mixer),
post_redirect_box (PostFader, sess, rt, mx.plugin_selector(), mx.selection(), in_mixer),
gpm (_route, sess),
@@ -661,11 +662,10 @@ MixerStrip::add_connection_to_output_menu (ARDOUR::Connection* c)
void
MixerStrip::update_diskstream_display ()
{
- if (is_audio_track()) {
-
- map_frozen ();
+ map_frozen ();
+ update_input_display ();
- update_input_display ();
+ if (is_audio_track()) {
if (input_selector) {
input_selector->hide_all ();
@@ -675,9 +675,6 @@ MixerStrip::update_diskstream_display ()
} else {
- map_frozen ();
-
- update_input_display ();
show_passthru_color ();
}
}
@@ -1144,9 +1141,11 @@ MixerStrip::map_frozen ()
pre_redirect_box.set_sensitive (true);
post_redirect_box.set_sensitive (true);
speed_spinner.set_sensitive (true);
+ // XXX need some way, maybe, to retoggle redirect editors
break;
}
}
+
_route->foreach_redirect (this, &MixerStrip::hide_redirect_editor);
}