summaryrefslogtreecommitdiff
path: root/gtk2_ardour
diff options
context:
space:
mode:
authorCarl Hetherington <carl@carlh.net>2011-02-02 02:06:30 +0000
committerCarl Hetherington <carl@carlh.net>2011-02-02 02:06:30 +0000
commit1b0b7849eea034f8809dea31419159724386c2db (patch)
tree4feb6145b3cb88e6dce3b1391c23e8aafb7c2149 /gtk2_ardour
parent04724c21b66fd6e81fd0fbf0ac7cae9c7d9b3b8a (diff)
Remove per-track mono option, as it seems somewhat useless now that we have a mix mono button in the monitor section.
git-svn-id: svn://localhost/ardour2/branches/3.0@8675 d708f5d6-7413-0410-9779-e7cbd77b26cf
Diffstat (limited to 'gtk2_ardour')
-rw-r--r--gtk2_ardour/mixer_strip.cc8
-rw-r--r--gtk2_ardour/mixer_strip.h2
-rw-r--r--gtk2_ardour/panner_ui.cc9
-rw-r--r--gtk2_ardour/panner_ui.h1
4 files changed, 1 insertions, 19 deletions
diff --git a/gtk2_ardour/mixer_strip.cc b/gtk2_ardour/mixer_strip.cc
index b5597da664..4bd50e9d37 100644
--- a/gtk2_ardour/mixer_strip.cc
+++ b/gtk2_ardour/mixer_strip.cc
@@ -1358,8 +1358,6 @@ MixerStrip::build_route_ops_menu ()
MenuList& items = route_ops_menu->items();
- items.push_back (CheckMenuElem (_("Mono"), sigc::mem_fun (*this, &MixerStrip::toggle_mono)));
- _mono_menu_item = dynamic_cast<CheckMenuItem*> (&items.back ());
items.push_back (CheckMenuElem (_("Comments..."), sigc::mem_fun (*this, &MixerStrip::toggle_comment)));
_comment_menu_item = dynamic_cast<CheckMenuItem*> (&items.back ());
items.push_back (MenuElem (_("Save As Template..."), sigc::mem_fun(*this, &RouteUI::save_as_template)));
@@ -1893,12 +1891,6 @@ MixerStrip::on_leave_notify_event (GdkEventCrossing* ev)
return false;
}
-void
-MixerStrip::toggle_mono ()
-{
- panners.set_mono (_mono_menu_item->get_active ());
-}
-
PluginSelector*
MixerStrip::plugin_selector()
{
diff --git a/gtk2_ardour/mixer_strip.h b/gtk2_ardour/mixer_strip.h
index 45e0fce52d..f6d5f0cec0 100644
--- a/gtk2_ardour/mixer_strip.h
+++ b/gtk2_ardour/mixer_strip.h
@@ -191,7 +191,6 @@ class MixerStrip : public RouteUI, public Gtk::EventBox
void comment_editor_done_editing ();
void setup_comment_editor ();
void toggle_comment ();
- void toggle_mono ();
Gtk::Button group_button;
Gtk::Label group_label;
@@ -217,7 +216,6 @@ class MixerStrip : public RouteUI, public Gtk::EventBox
void diskstream_changed ();
Gtk::Menu *send_action_menu;
- Gtk::CheckMenuItem* _mono_menu_item;
Gtk::CheckMenuItem* _comment_menu_item;
Gtk::MenuItem* rename_menu_item;
void build_send_action_menu ();
diff --git a/gtk2_ardour/panner_ui.cc b/gtk2_ardour/panner_ui.cc
index 79a7259b32..af207c20c1 100644
--- a/gtk2_ardour/panner_ui.cc
+++ b/gtk2_ardour/panner_ui.cc
@@ -424,7 +424,7 @@ PannerUI::effective_pan_display ()
void
PannerUI::update_pan_sensitive ()
{
- bool const sensitive = !(_panner->is_mono()) && !(_panner->pannable()->automation_state() & Play);
+ bool const sensitive = !(_panner->pannable()->automation_state() & Play);
#ifdef PANNER_HACKS
pan_vbox.set_sensitive (sensitive);
@@ -585,13 +585,6 @@ PannerUI::_astyle_string (AutoStyle style, bool shrt)
}
void
-PannerUI::set_mono (bool yn)
-{
- _panner->set_mono (yn);
- update_pan_sensitive ();
-}
-
-void
PannerUI::show_width ()
{
}
diff --git a/gtk2_ardour/panner_ui.h b/gtk2_ardour/panner_ui.h
index e64419b457..3d714d9253 100644
--- a/gtk2_ardour/panner_ui.h
+++ b/gtk2_ardour/panner_ui.h
@@ -79,7 +79,6 @@ class PannerUI : public Gtk::HBox, public ARDOUR::SessionHandlePtr
void set_meter_strip_name (std::string name);
boost::shared_ptr<PBD::Controllable> get_controllable();
- void set_mono (bool);
void on_size_allocate (Gtk::Allocation &);
static void setup_slider_pix ();