*/
#include <cmath>
-#include <glib.h>
#include <sigc++/bind.h>
+#include <pbd/convert.h>
+
#include <gtkmm2ext/gtk_ui.h>
#include <gtkmm2ext/utils.h>
#include <gtkmm2ext/choice.h>
#include "ardour_ui.h"
#include "ardour_dialog.h"
-#include "ardour_message.h"
#include "mixer_strip.h"
#include "mixer_ui.h"
#include "keyboard.h"
using namespace Gtk;
using namespace Gtkmm2ext;
-/* XPM */
-static const gchar * small_x_xpm[] = {
-"11 11 2 1",
-" c None",
-". c #cccc99",
-" ",
-" ",
-" . . ",
-" . . ",
-" . . ",
-" . ",
-" . . ",
-" . . ",
-" . . ",
-" ",
-" "};
-
-/* XPM */
-static const gchar * lr_xpm[] = {
-"11 11 2 1",
-" c None",
-". c #cccc99",
-" ",
-" ",
-" . . ",
-" . . ",
-" . . ",
-"...........",
-" . . ",
-" . . ",
-" . . ",
-" ",
-" "};
-
+#ifdef VARISPEED_IN_MIXER_STRIP
static void
speed_printer (char buf[32], Gtk::Adjustment& adj, void* arg)
{
snprintf (buf, 32, "%.3f", val);
}
}
+#endif
MixerStrip::MixerStrip (Mixer_UI& mx, Session& sess, Route& rt, bool in_mixer)
: AxisView(sess),
post_redirect_box (PostFader, sess, rt, mx.plugin_selector(), mx.selection(), in_mixer),
gpm (_route, sess),
panners (_route, sess),
- button_table (8, 2),
+ button_table (6, 2),
gain_automation_style_button (""),
gain_automation_state_button (""),
pan_automation_style_button (""),
pan_automation_state_button (""),
- polarity_button (_("polarity")),
- comment_button (_("comments")),
+ comment_button (_("Comments")),
speed_adjustment (1.0, 0.001, 4.0, 0.001, 0.1),
speed_spinner (&speed_adjustment, "MixerStripSpeedBase", true)
ignore_toggle = false;
ignore_speed_adjustment = false;
comment_window = 0;
+ comment_area = 0;
- width_button.add (*(manage (new Gtk::Image (lr_xpm))));
- hide_button.add (*(manage (new Gtk::Image (small_x_xpm))));
+ width_button.add (*(manage (new Gtk::Image (get_xpm("lr.xpm")))));
+ hide_button.add (*(manage (new Gtk::Image (get_xpm("small_x.xpm")))));
input_label.set_text (_("INPUT"));
gain_automation_state_button.set_name ("MixerAutomationPlaybackButton");
pan_automation_style_button.set_name ("MixerAutomationModeButton");
pan_automation_state_button.set_name ("MixerAutomationPlaybackButton");
- polarity_button.set_name ("MixerPhaseInvertButton");
ARDOUR_UI::instance()->tooltips().set_tip (pan_automation_state_button, _("Pan automation mode"));
ARDOUR_UI::instance()->tooltips().set_tip (gain_automation_state_button, _("Gain automation mode"));
ARDOUR_UI::instance()->tooltips().set_tip (pan_automation_style_button, _("Pan automation type"));
ARDOUR_UI::instance()->tooltips().set_tip (gain_automation_style_button, _("Gain automation type"));
- hide_button.set_events (hide_button.get_events() & ~(GDK_ENTER_NOTIFY_MASK|GDK_LEAVE_NOTIFY_MASK));
+ hide_button.set_events (hide_button.get_events() & ~(Gdk::ENTER_NOTIFY_MASK|Gdk::LEAVE_NOTIFY_MASK));
width_button.unset_flags (Gtk::CAN_FOCUS);
hide_button.unset_flags (Gtk::CAN_FOCUS);
gain_automation_state_button.unset_flags (Gtk::CAN_FOCUS);
pan_automation_style_button.unset_flags (Gtk::CAN_FOCUS);
pan_automation_state_button.unset_flags (Gtk::CAN_FOCUS);
- polarity_button.unset_flags (Gtk::CAN_FOCUS);
button_table.set_homogeneous (true);
+ button_table.set_spacings (0);
button_table.attach (name_button, 0, 2, 0, 1);
button_table.attach (group_button, 0, 2, 1, 2);
button_table.attach (input_button, 0, 2, 2, 3);
- button_table.attach (polarity_button, 0, 2, 3, 4);
-
- button_table.attach (*solo_button, 0, 1, 4, 5);
- button_table.attach (*mute_button, 1, 2, 4, 5);
+ button_table.attach (*solo_button, 0, 1, 3, 4);
+ button_table.attach (*mute_button, 1, 2, 3, 4);
- // button_table.attach (gain_automation_style_button, 0, 1, 5, 6);
- button_table.attach (gain_automation_state_button, 0, 1, 5, 6);
- // button_table.attach (pan_automation_style_button, 0, 1, 6, 7);
- button_table.attach (pan_automation_state_button, 1, 2, 5, 6);
+ button_table.attach (gain_automation_state_button, 0, 1, 4, 5);
+ button_table.attach (pan_automation_state_button, 1, 2, 4, 5);
using namespace Menu_Helpers;
gain_astate_menu.items().push_back (MenuElem (_("off"),
- bind (slot (_route, &IO::set_gain_automation_state), (AutoState) Off)));
+ bind (mem_fun (_route, &IO::set_gain_automation_state), (AutoState) Off)));
gain_astate_menu.items().push_back (MenuElem (_("play"),
- bind (slot (_route, &IO::set_gain_automation_state), (AutoState) Play)));
+ bind (mem_fun (_route, &IO::set_gain_automation_state), (AutoState) Play)));
gain_astate_menu.items().push_back (MenuElem (_("write"),
- bind (slot (_route, &IO::set_gain_automation_state), (AutoState) Write)));
+ bind (mem_fun (_route, &IO::set_gain_automation_state), (AutoState) Write)));
gain_astate_menu.items().push_back (MenuElem (_("touch"),
- bind (slot (_route, &IO::set_gain_automation_state), (AutoState) Touch)));
+ bind (mem_fun (_route, &IO::set_gain_automation_state), (AutoState) Touch)));
gain_astyle_menu.items().push_back (MenuElem (_("trim")));
gain_astyle_menu.items().push_back (MenuElem (_("abs")));
pan_astate_menu.items().push_back (MenuElem (_("off"),
- bind (slot (_route.panner(), &Panner::set_automation_state), (AutoState) Off)));
+ bind (mem_fun (_route.panner(), &Panner::set_automation_state), (AutoState) Off)));
pan_astate_menu.items().push_back (MenuElem (_("play"),
- bind (slot (_route.panner(), &Panner::set_automation_state), (AutoState) Play)));
+ bind (mem_fun (_route.panner(), &Panner::set_automation_state), (AutoState) Play)));
pan_astate_menu.items().push_back (MenuElem (_("write"),
- bind (slot (_route.panner(), &Panner::set_automation_state), (AutoState) Write)));
+ bind (mem_fun (_route.panner(), &Panner::set_automation_state), (AutoState) Write)));
pan_astate_menu.items().push_back (MenuElem (_("touch"),
- bind (slot (_route.panner(), &Panner::set_automation_state), (AutoState) Touch)));
+ bind (mem_fun (_route.panner(), &Panner::set_automation_state), (AutoState) Touch)));
pan_astyle_menu.items().push_back (MenuElem (_("trim")));
pan_astyle_menu.items().push_back (MenuElem (_("abs")));
AudioTrack* at = dynamic_cast<AudioTrack*>(&_route);
- at->FreezeChange.connect (slot (*this, &MixerStrip::map_frozen));
+ at->FreezeChange.connect (mem_fun(*this, &MixerStrip::map_frozen));
- speed_adjustment.value_changed.connect (slot (*this, &MixerStrip::speed_adjustment_changed));
+#ifdef VARISPEED_IN_MIXER_STRIP
+ speed_adjustment.signal_value_changed().connect (mem_fun(*this, &MixerStrip::speed_adjustment_changed));
speed_frame.set_name ("BaseFrame");
speed_frame.set_shadow_type (Gtk::SHADOW_IN);
ARDOUR_UI::instance()->tooltips().set_tip (speed_spinner, _("varispeed"));
- speed_spinner.show ();
- speed_frame.show ();
+ button_table.attach (speed_frame, 0, 2, 5, 6);
+#endif /* VARISPEED_IN_MIXER_STRIP */
- button_table.attach (speed_frame, 0, 2, 6, 7);
- button_table.attach (*rec_enable_button, 0, 2, 7, 8);
+ button_table.attach (*rec_enable_button, 0, 2, 5, 6);
}
-
+
name_button.add (name_label);
name_button.set_name ("MixerNameButton");
Gtkmm2ext::set_size_request_to_display_given_text (name_button, "longest label", 2, 2);
group_label.set_name ("MixerGroupButtonLabel");
comment_button.set_name ("MixerCommentButton");
+
ARDOUR_UI::instance()->tooltips().set_tip (comment_button, _route.comment()=="" ?
- _("click to add/edit comments"):
+ _("Click to Add/Edit Comments"):
_route.comment());
- comment_button.signal_clicked().connect (slot (*this, &MixerStrip::comment_button_clicked));
+
+ comment_button.signal_clicked().connect (mem_fun(*this, &MixerStrip::comment_button_clicked));
- global_vpacker.set_border_width (4);
- global_vpacker.set_spacing (4);
+ global_vpacker.set_border_width (0);
+ global_vpacker.set_spacing (0);
Gtk::VBox *whvbox = manage (new Gtk::VBox);
width_button.set_name ("MixerWidthButton");
hide_button.set_name ("MixerHideButton");
- width_button.signal_clicked().connect (slot (*this, &MixerStrip::width_clicked));
- hide_button.signal_clicked().connect (slot (*this, &MixerStrip::hide_clicked));
+ width_button.signal_clicked().connect (mem_fun(*this, &MixerStrip::width_clicked));
+ hide_button.signal_clicked().connect (mem_fun(*this, &MixerStrip::hide_clicked));
width_hide_box.pack_start (width_button, false, true);
width_hide_box.pack_end (hide_button, false, true);
whvbox->pack_start (width_hide_box, true, true);
- global_vpacker.pack_start (*whvbox, false, false);
- global_vpacker.pack_start (button_table, false, false);
+ global_vpacker.pack_start (*whvbox, Gtk::PACK_SHRINK);
+ global_vpacker.pack_start (button_table,Gtk::PACK_SHRINK);
global_vpacker.pack_start (pre_redirect_box, true, true);
- global_vpacker.pack_start (gpm, false, false);
+ global_vpacker.pack_start (gpm, Gtk::PACK_SHRINK, 4);
global_vpacker.pack_start (post_redirect_box, true, true);
- global_vpacker.pack_start (panners, false, false);
- global_vpacker.pack_start (output_button, false, false);
- global_vpacker.pack_start (comment_button, false, false);
+ global_vpacker.pack_start (panners, Gtk::PACK_SHRINK);
+ global_vpacker.pack_start (output_button, Gtk::PACK_SHRINK);
+ global_vpacker.pack_start (comment_button, Gtk::PACK_SHRINK);
global_frame.add (global_vpacker);
global_frame.set_shadow_type (Gtk::SHADOW_IN);
_selected = true;
set_selected (false);
- whvbox->show_all ();
- name_label.show ();
- group_label.show();
- input_label.show ();
- output_label.show ();
- pre_redirect_box.show_all ();
- post_redirect_box.show_all ();
- button_table.show ();
- comment_button.show ();
- name_button.show ();
- input_button.show ();
- group_button.show ();
- output_button.show ();
- rec_enable_button->show ();
- solo_button->show ();
- mute_button->show ();
- gain_automation_style_button.show ();
- gain_automation_state_button.show ();
- pan_automation_style_button.show ();
- pan_automation_state_button.show ();
- polarity_button.show ();
- global_vpacker.show ();
- global_frame.show ();
-
_packed = false;
_embedded = false;
- _route.input_changed.connect (slot (*this, &MixerStrip::input_changed));
- _route.output_changed.connect (slot (*this, &MixerStrip::output_changed));
- _route.mute_changed.connect (slot (*this, &RouteUI::mute_changed));
- _route.solo_changed.connect (slot (*this, &RouteUI::solo_changed));
- _route.solo_safe_changed.connect (slot (*this, &RouteUI::solo_changed));
- _route.mix_group_changed.connect (slot (*this, &MixerStrip::mix_group_changed));
- _route.gain_automation_curve().automation_state_changed.connect (slot (*this, &MixerStrip::gain_automation_state_changed));
- _route.gain_automation_curve().automation_style_changed.connect (slot (*this, &MixerStrip::gain_automation_style_changed));
- _route.panner().Changed.connect (slot (*this, &MixerStrip::connect_to_pan));
+ _route.input_changed.connect (mem_fun(*this, &MixerStrip::input_changed));
+ _route.output_changed.connect (mem_fun(*this, &MixerStrip::output_changed));
+ _route.mute_changed.connect (mem_fun(*this, &RouteUI::mute_changed));
+ _route.solo_changed.connect (mem_fun(*this, &RouteUI::solo_changed));
+ _route.solo_safe_changed.connect (mem_fun(*this, &RouteUI::solo_changed));
+ _route.mix_group_changed.connect (mem_fun(*this, &MixerStrip::mix_group_changed));
+ _route.gain_automation_curve().automation_state_changed.connect (mem_fun(*this, &MixerStrip::gain_automation_state_changed));
+ _route.gain_automation_curve().automation_style_changed.connect (mem_fun(*this, &MixerStrip::gain_automation_style_changed));
+ _route.panner().Changed.connect (mem_fun(*this, &MixerStrip::connect_to_pan));
if (is_audio_track()) {
- audio_track()->diskstream_changed.connect (slot (*this, &MixerStrip::diskstream_changed));
- get_diskstream()->speed_changed.connect (slot (*this, &MixerStrip::speed_changed));
+ audio_track()->diskstream_changed.connect (mem_fun(*this, &MixerStrip::diskstream_changed));
+ get_diskstream()->speed_changed.connect (mem_fun(*this, &MixerStrip::speed_changed));
}
- _route.name_changed.connect (slot (*this, &RouteUI::name_changed));
- _route.comment_changed.connect (slot (*this, &MixerStrip::comment_changed));
- _route.gui_changed.connect (slot (*this, &MixerStrip::route_gui_changed));
-
- input_button.button_release_event.connect (slot (*this, &MixerStrip::input_press));
- output_button.button_release_event.connect (slot (*this, &MixerStrip::output_press));
-
- rec_enable_button->button_press_event.connect (slot (*this, &RouteUI::rec_enable_press));
- solo_button->button_press_event.connect (slot (*this, &RouteUI::solo_press));
- solo_button->button_release_event.connect (slot (*this, &RouteUI::solo_release));
- mute_button->button_press_event.connect (slot (*this, &RouteUI::mute_press));
- mute_button->button_release_event.connect (slot (*this, &RouteUI::mute_release));
+ _route.name_changed.connect (mem_fun(*this, &RouteUI::name_changed));
+ _route.comment_changed.connect (mem_fun(*this, &MixerStrip::comment_changed));
+ _route.gui_changed.connect (mem_fun(*this, &MixerStrip::route_gui_changed));
- gain_automation_style_button.button_press_event.connect_after (slot (do_not_propagate));
- pan_automation_style_button.button_press_event.connect_after (slot (do_not_propagate));
- gain_automation_state_button.button_press_event.connect_after (slot (do_not_propagate));
- pan_automation_state_button.button_press_event.connect_after (slot (do_not_propagate));
+ input_button.signal_button_press_event().connect (mem_fun(*this, &MixerStrip::input_press), false);
+ output_button.signal_button_press_event().connect (mem_fun(*this, &MixerStrip::output_press), false);
- gain_automation_style_button.button_press_event.connect (slot (*this, &MixerStrip::gain_automation_style_button_event));
- gain_automation_style_button.button_release_event.connect (slot (*this, &MixerStrip::gain_automation_style_button_event));
- pan_automation_style_button.button_press_event.connect (slot (*this, &MixerStrip::pan_automation_style_button_event));
- pan_automation_style_button.button_release_event.connect (slot (*this, &MixerStrip::pan_automation_style_button_event));
+ rec_enable_button->signal_button_press_event().connect (mem_fun(*this, &RouteUI::rec_enable_press));
+ solo_button->signal_button_press_event().connect (mem_fun(*this, &RouteUI::solo_press), false);
+ solo_button->signal_button_release_event().connect (mem_fun(*this, &RouteUI::solo_release), false);
+ mute_button->signal_button_press_event().connect (mem_fun(*this, &RouteUI::mute_press), false);
+ mute_button->signal_button_release_event().connect (mem_fun(*this, &RouteUI::mute_release), false);
- gain_automation_state_button.button_press_event.connect (slot (*this, &MixerStrip::gain_automation_state_button_event));
- gain_automation_state_button.button_release_event.connect (slot (*this, &MixerStrip::gain_automation_state_button_event));
- pan_automation_state_button.button_press_event.connect (slot (*this, &MixerStrip::pan_automation_state_button_event));
- pan_automation_state_button.button_release_event.connect (slot (*this, &MixerStrip::pan_automation_state_button_event));
+ gain_automation_style_button.signal_button_press_event().connect (mem_fun(*this, &MixerStrip::gain_automation_style_button_event), false);
+ gain_automation_style_button.signal_button_release_event().connect (mem_fun(*this, &MixerStrip::gain_automation_style_button_event), false);
+ pan_automation_style_button.signal_button_press_event().connect (mem_fun(*this, &MixerStrip::pan_automation_style_button_event), false);
+ pan_automation_style_button.signal_button_release_event().connect (mem_fun(*this, &MixerStrip::pan_automation_style_button_event), false);
- polarity_button.toggled.connect (slot (*this, &MixerStrip::polarity_toggled));
+ gain_automation_state_button.signal_button_press_event().connect (mem_fun(*this, &MixerStrip::gain_automation_state_button_event), false);
+ pan_automation_state_button.signal_button_press_event().connect (mem_fun(*this, &MixerStrip::pan_automation_state_button_event), false);
- name_button.button_release_event.connect (slot (*this, &MixerStrip::name_button_button_release));
+ name_button.signal_button_press_event().connect (mem_fun(*this, &MixerStrip::name_button_button_press), false);
- group_button.button_press_event.connect (slot (*this, &MixerStrip::select_mix_group));
+ group_button.signal_button_press_event().connect (mem_fun(*this, &MixerStrip::select_mix_group), false);
_width = (Width) -1;
set_stuff_from_route ();
speed_changed ();
}
- /* XXX hack: no phase invert changed signal */
-
- polarity_button.set_active (_route.phase_invert());
-
update_diskstream_display ();
update_input_display ();
update_output_display ();
set_width (Narrow);
}
else {
- error << compose(_("unknown strip width \"%1\" in XML GUI information"), prop->value()) << endmsg;
+ error << string_compose(_("unknown strip width \"%1\" in XML GUI information"), prop->value()) << endmsg;
set_width (Wide);
}
}
set_size_request (-1, -1);
xml_node->add_property ("strip_width", "wide");
- static_cast<Gtk::Label*> (rec_enable_button->get_child())->set_text (_("RECORD"));
- static_cast<Gtk::Label*> (mute_button->get_child())->set_text (_("mute"));
- static_cast<Gtk::Label*> (solo_button->get_child())->set_text (_("solo"));
- static_cast<Gtk::Label*> (comment_button.get_child())->set_text (_("comments"));
- static_cast<Gtk::Label*> (gain_automation_style_button.get_child())->set_text (astyle_string(_route.gain_automation_curve().automation_style()));
- static_cast<Gtk::Label*> (gain_automation_state_button.get_child())->set_text (astate_string(_route.gain_automation_curve().automation_state()));
- static_cast<Gtk::Label*> (pan_automation_style_button.get_child())->set_text (astyle_string(_route.panner().automation_style()));
- static_cast<Gtk::Label*> (pan_automation_state_button.get_child())->set_text (astate_string(_route.panner().automation_state()));
- static_cast<Gtk::Label*> (polarity_button.get_child())->set_text (_("polarity"));
+ rec_enable_button->set_label (_("RECORD"));
+ mute_button->set_label (_("mute"));
+ solo_button->set_label (_("solo"));
+
+ if (_route.comment() == "") {
+ comment_button.set_label (_("Comments"));
+ } else {
+ comment_button.set_label (_("*Comments*"));
+ }
+
+ gain_automation_style_button.set_label (astyle_string(_route.gain_automation_curve().automation_style()));
+ gain_automation_state_button.set_label (astate_string(_route.gain_automation_curve().automation_state()));
+ pan_automation_style_button.set_label (astyle_string(_route.panner().automation_style()));
+ pan_automation_state_button.set_label (astate_string(_route.panner().automation_state()));
Gtkmm2ext::set_size_request_to_display_given_text (name_button, "long", 2, 2);
break;
set_size_request (50, -1);
xml_node->add_property ("strip_width", "narrow");
- static_cast<Gtk::Label*> (rec_enable_button->get_child())->set_text (_("REC"));
- static_cast<Gtk::Label*> (mute_button->get_child())->set_text (_("m"));
- static_cast<Gtk::Label*> (solo_button->get_child())->set_text (_("s"));
- static_cast<Gtk::Label*> (comment_button.get_child())->set_text (_("cmt"));
- static_cast<Gtk::Label*> (gain_automation_style_button.get_child())->set_text (short_astyle_string(_route.gain_automation_curve().automation_style()));
- static_cast<Gtk::Label*> (gain_automation_state_button.get_child())->set_text (short_astate_string(_route.gain_automation_curve().automation_state()));
- static_cast<Gtk::Label*> (pan_automation_style_button.get_child())->set_text (short_astyle_string(_route.panner().automation_style()));
- static_cast<Gtk::Label*> (pan_automation_state_button.get_child())->set_text (short_astate_string(_route.panner().automation_state()));
- static_cast<Gtk::Label*> (polarity_button.get_child())->set_text (_("pol"));
+ rec_enable_button->set_label (_("REC"));
+ mute_button->set_label (_("m"));
+ solo_button->set_label (_("s"));
+
+ if (_route.comment() == "") {
+ comment_button.set_label (_("Cmt"));
+ } else {
+ comment_button.set_label (_("*Cmt*"));
+ }
+
+ gain_automation_style_button.set_label (short_astyle_string(_route.gain_automation_curve().automation_style()));
+ gain_automation_state_button.set_label (short_astate_string(_route.gain_automation_curve().automation_state()));
+ pan_automation_style_button.set_label (short_astyle_string(_route.panner().automation_style()));
+ pan_automation_state_button.set_label (short_astate_string(_route.panner().automation_state()));
Gtkmm2ext::set_size_request_to_display_given_text (name_button, "longest label", 2, 2);
break;
}
update_output_display ();
mix_group_changed (0);
name_changed (0);
+
}
void
using namespace Menu_Helpers;
if (!_session.engine().connected()) {
- ArdourMessage msg (NULL, "nojackdialog", _("Not connected to JACK - no I/O changes are possible"));
- return TRUE;
+ MessageDialog msg (_("Not connected to JACK - no I/O changes are possible"));
+ msg.run ();
+ return true;
}
MenuList& citems = output_menu.items();
output_menu.set_name ("ArdourContextMenu");
citems.clear();
- citems.push_back (MenuElem (_("Edit"), slot (*this, &MixerStrip::edit_output_configuration)));
+ citems.push_back (MenuElem (_("Edit"), mem_fun(*this, &MixerStrip::edit_output_configuration)));
citems.push_back (SeparatorElem());
- citems.push_back (MenuElem (_("Disconnect"), slot (*(static_cast<RouteUI*>(this)), &RouteUI::disconnect_output)));
+ citems.push_back (MenuElem (_("Disconnect"), mem_fun (*(static_cast<RouteUI*>(this)), &RouteUI::disconnect_output)));
citems.push_back (SeparatorElem());
_session.foreach_connection (this, &MixerStrip::add_connection_to_output_menu);
}
if (output_selector->is_visible()) {
- output_selector->get_toplevel()->get_window().raise();
+ output_selector->get_toplevel()->get_window()->raise();
} else {
output_selector->show_all ();
}
}
if (input_selector->is_visible()) {
- input_selector->get_toplevel()->get_window().raise();
+ input_selector->get_toplevel()->get_window()->raise();
} else {
input_selector->show_all ();
}
citems.clear();
if (!_session.engine().connected()) {
- ArdourMessage msg (NULL, "nojackdialog", _("Not connected to JACK - no I/O changes are possible"));
- return TRUE;
+ MessageDialog msg (_("Not connected to JACK - no I/O changes are possible"));
+ msg.run ();
+ return true;
}
#if ADVANCED_ROUTE_DISKSTREAM_CONNECTIVITY
if (is_audio_track()) {
- citems.push_back (MenuElem (_("Track"), slot (*this, &MixerStrip::select_stream_input)));
+ citems.push_back (MenuElem (_("Track"), mem_fun(*this, &MixerStrip::select_stream_input)));
}
#endif
- citems.push_back (MenuElem (_("Edit"), slot (*this, &MixerStrip::edit_input_configuration)));
+ citems.push_back (MenuElem (_("Edit"), mem_fun(*this, &MixerStrip::edit_input_configuration)));
citems.push_back (SeparatorElem());
- citems.push_back (MenuElem (_("Disconnect"), slot (*(static_cast<RouteUI*>(this)), &RouteUI::disconnect_input)));
+ citems.push_back (MenuElem (_("Disconnect"), mem_fun (*(static_cast<RouteUI*>(this)), &RouteUI::disconnect_input)));
citems.push_back (SeparatorElem());
_session.foreach_connection (this, &MixerStrip::add_connection_to_input_menu);
-
input_menu.popup (1, ev->time);
return TRUE;
if (c->nports() == _route.n_inputs()) {
- citems.push_back (CheckMenuElem (c->name(), bind (slot (*this, &MixerStrip::connection_input_chosen), c)));
+ citems.push_back (CheckMenuElem (c->name(), bind (mem_fun(*this, &MixerStrip::connection_input_chosen), c)));
ARDOUR::Connection *current = _route.input_connection();
if (current == c) {
ignore_toggle = true;
- dynamic_cast<CheckMenuItem *> (citems.back())->set_active (true);
+ dynamic_cast<CheckMenuItem *> (&citems.back())->set_active (true);
ignore_toggle = false;
}
}
if (c->nports() == _route.n_outputs()) {
MenuList& citems = output_menu.items();
- citems.push_back (CheckMenuElem (c->name(), bind (slot (*this, &MixerStrip::connection_output_chosen), c)));
+ citems.push_back (CheckMenuElem (c->name(), bind (mem_fun(*this, &MixerStrip::connection_output_chosen), c)));
ARDOUR::Connection *current = _route.output_connection();
if (current == c) {
ignore_toggle = true;
- dynamic_cast<CheckMenuItem *> (citems.back())->set_active (true);
+ dynamic_cast<CheckMenuItem *> (&citems.back())->set_active (true);
ignore_toggle = false;
}
}
if (!(*i)->hidden()) {
- items.push_back (CheckMenuElem ((*i)->name(), bind (slot (*this, &MixerStrip::stream_input_chosen), *i)));
+ items.push_back (CheckMenuElem ((*i)->name(), bind (mem_fun(*this, &MixerStrip::stream_input_chosen), *i)));
if (get_diskstream() == *i) {
ignore_toggle = true;
- static_cast<CheckMenuItem *> (items.back())->set_active (true);
+ static_cast<CheckMenuItem *> (&items.back())->set_active (true);
ignore_toggle = false;
}
}
void
MixerStrip::connect_to_pan ()
{
- ENSURE_GUI_THREAD(slot (*this, &MixerStrip::connect_to_pan));
+ ENSURE_GUI_THREAD(mem_fun(*this, &MixerStrip::connect_to_pan));
panstate_connection.disconnect ();
panstyle_connection.disconnect ();
if (!_route.panner().empty()) {
StreamPanner* sp = _route.panner().front();
- panstate_connection = sp->automation().automation_state_changed.connect (slot (*this, &MixerStrip::pan_automation_state_changed));
- panstyle_connection = sp->automation().automation_style_changed.connect (slot (*this, &MixerStrip::pan_automation_style_changed));
+ panstate_connection = sp->automation().automation_state_changed.connect (mem_fun(*this, &MixerStrip::pan_automation_state_changed));
+ panstyle_connection = sp->automation().automation_style_changed.connect (mem_fun(*this, &MixerStrip::pan_automation_style_changed));
}
panners.pan_changed (this);
panners.setup_pan ();
}
-void
-MixerStrip::update ()
-{
- gpm.update_meters ();
-}
-
void
MixerStrip::fast_update ()
{
- if (_session.meter_falloff() > 0.0f) {
- gpm.update_meters_falloff ();
- }
+ gpm.update_meters ();
}
gint
MixerStrip::gain_automation_state_button_event (GdkEventButton *ev)
{
- if (ev->type == GDK_BUTTON_PRESS || ev->type == GDK_2BUTTON_PRESS) {
+ if (ev->type == GDK_BUTTON_RELEASE) {
return TRUE;
}
{
using namespace Menu_Helpers;
- if (ev->type == GDK_BUTTON_PRESS || ev->type == GDK_2BUTTON_PRESS) {
+ if (ev->type == GDK_BUTTON_RELEASE) {
return TRUE;
}
void
MixerStrip::diskstream_changed (void *src)
{
- Gtkmm2ext::UI::instance()->call_slot (slot (*this, &MixerStrip::update_diskstream_display));
+ Gtkmm2ext::UI::instance()->call_slot (mem_fun(*this, &MixerStrip::update_diskstream_display));
}
void
{
switch (_width) {
case Wide:
- static_cast<Gtk::Label*> (gain_automation_style_button.get_child())->set_text (astyle_string(_route.gain_automation_curve().automation_style()));
+ gain_automation_style_button.set_label (astyle_string(_route.gain_automation_curve().automation_style()));
break;
case Narrow:
- static_cast<Gtk::Label*> (gain_automation_style_button.get_child())->set_text (short_astyle_string(_route.gain_automation_curve().automation_style()));
+ gain_automation_style_button.set_label (short_astyle_string(_route.gain_automation_curve().automation_style()));
break;
}
}
void
MixerStrip::gain_automation_state_changed ()
{
- ENSURE_GUI_THREAD(slot (*this, &MixerStrip::gain_automation_state_changed));
+ ENSURE_GUI_THREAD(mem_fun(*this, &MixerStrip::gain_automation_state_changed));
bool x;
switch (_width) {
case Wide:
- static_cast<Gtk::Label*> (gain_automation_state_button.get_child())->set_text (astate_string(_route.gain_automation_curve().automation_state()));
+ gain_automation_state_button.set_label (astate_string(_route.gain_automation_curve().automation_state()));
break;
case Narrow:
- static_cast<Gtk::Label*> (gain_automation_state_button.get_child())->set_text (short_astate_string(_route.gain_automation_curve().automation_state()));
+ gain_automation_state_button.set_label (short_astate_string(_route.gain_automation_curve().automation_state()));
break;
}
gain_watching.disconnect();
if (x) {
- gain_watching = ARDOUR_UI::RapidScreenUpdate.connect (slot (gpm, &GainMeter::effective_gain_display));
+ gain_watching = ARDOUR_UI::RapidScreenUpdate.connect (mem_fun (gpm, &GainMeter::effective_gain_display));
}
}
void
MixerStrip::pan_automation_style_changed ()
{
- ENSURE_GUI_THREAD(slot (*this, &MixerStrip::pan_automation_style_changed));
+ ENSURE_GUI_THREAD(mem_fun(*this, &MixerStrip::pan_automation_style_changed));
switch (_width) {
case Wide:
- static_cast<Gtk::Label*> (pan_automation_style_button.get_child())->set_text (astyle_string(_route.panner().automation_style()));
+ pan_automation_style_button.set_label (astyle_string(_route.panner().automation_style()));
break;
case Narrow:
- static_cast<Gtk::Label*> (pan_automation_style_button.get_child())->set_text (short_astyle_string(_route.panner().automation_style()));
+ pan_automation_style_button.set_label (short_astyle_string(_route.panner().automation_style()));
break;
}
}
void
MixerStrip::pan_automation_state_changed ()
{
- ENSURE_GUI_THREAD(slot (*this, &MixerStrip::pan_automation_state_changed));
+ ENSURE_GUI_THREAD(mem_fun(*this, &MixerStrip::pan_automation_state_changed));
bool x;
switch (_width) {
case Wide:
- static_cast<Gtk::Label*> (pan_automation_state_button.get_child())->set_text (astate_string(_route.panner().automation_state()));
+ pan_automation_state_button.set_label (astate_string(_route.panner().automation_state()));
break;
case Narrow:
- static_cast<Gtk::Label*> (pan_automation_state_button.get_child())->set_text (short_astate_string(_route.panner().automation_state()));
+ pan_automation_state_button.set_label (short_astate_string(_route.panner().automation_state()));
break;
}
pan_watching.disconnect();
if (x) {
- pan_watching = ARDOUR_UI::RapidScreenUpdate.connect (slot (panners, &PannerUI::effective_pan_display));
+ pan_watching = ARDOUR_UI::RapidScreenUpdate.connect (mem_fun (panners, &PannerUI::effective_pan_display));
}
}
void
MixerStrip::input_changed (IOChange change, void *src)
{
- Gtkmm2ext::UI::instance()->call_slot (slot (*this, &MixerStrip::update_input_display));
+ Gtkmm2ext::UI::instance()->call_slot (mem_fun(*this, &MixerStrip::update_input_display));
}
void
MixerStrip::output_changed (IOChange change, void *src)
{
- Gtkmm2ext::UI::instance()->call_slot (slot (*this, &MixerStrip::update_output_display));
+ Gtkmm2ext::UI::instance()->call_slot (mem_fun(*this, &MixerStrip::update_output_display));
}
void
setup_comment_editor ();
}
+ int x, y, cw_width, cw_height;
+
if (comment_window->is_visible()) {
- comment_window->hide ();
- } else {
- comment_window->set_position (Gtk::WIN_POS_MOUSE);
- comment_window->show_all ();
- }
+ string str = comment_area->get_buffer()->get_text();
+ if (_route.comment() != str) {
+ _route.set_comment (str, this);
+
+ switch (_width) {
+
+ case Wide:
+ if (! str.empty()) {
+ comment_button.set_label (_("*Comments*"));
+ } else {
+ comment_button.set_label (_("Comments"));
+ }
+ break;
+
+ case Narrow:
+ if (! str.empty()) {
+ comment_button.set_label (_("*Cmt*"));
+ } else {
+ comment_button.set_label (_("Cmt"));
+ }
+ break;
+ }
+
+ ARDOUR_UI::instance()->tooltips().set_tip (comment_button,
+ str.empty() ? _("Click to Add/Edit Comments") : str);
+ }
+ comment_window->hide ();
+ return;
+ }
+ comment_window->get_size (cw_width, cw_height);
+ comment_window->get_position(x, y);
+ comment_window->move(x, y - (cw_height / 2) - 45);
+ /*
+ half the dialog height minus the comments button height
+ with some window decoration fudge thrown in.
+ */
+
+ comment_window->show();
+ comment_window->present();
+
}
void
MixerStrip::setup_comment_editor ()
{
- comment_window = new Window (GTK_WINDOW_TOPLEVEL);
-
- string str;
- str = _route.name();
- str += _(": comment editor");
- comment_window->set_title (str);
-
- comment_area.set_name ("MixerTrackCommentArea");
- comment_area.set_editable (true);
- comment_area.signal_focus_in_event().connect (slot (ARDOUR_UI::generic_focus_in_event));
- comment_area.signal_focus_out_event().connect (slot (ARDOUR_UI::generic_focus_out_event));
- comment_area.changed.connect (slot (*this, &MixerStrip::comment_edited));
- comment_area.button_release_event.connect_after (slot (do_not_propagate));
- comment_area.show ();
-
- comment_window->add (comment_area);
- comment_window->delete_event.connect (bind (slot (just_hide_it), comment_window));
+ string title;
+ title = _route.name();
+ title += _(": comment editor");
+
+ comment_window = new ArdourDialog (title, false);
+ comment_window->set_position (Gtk::WIN_POS_MOUSE);
+ comment_window->set_skip_taskbar_hint (true);
+
+ comment_area = manage (new TextView());
+ comment_area->set_name ("MixerTrackCommentArea");
+ comment_area->set_size_request (110, 178);
+ comment_area->set_wrap_mode (WRAP_WORD);
+ comment_area->set_editable (true);
+ comment_area->get_buffer()->set_text (_route.comment());
+ comment_area->show ();
+
+ comment_window->get_vbox()->pack_start (*comment_area);
+ comment_window->get_action_area()->hide();
}
void
MixerStrip::comment_changed (void *src)
{
- ENSURE_GUI_THREAD(bind (slot (*this, &MixerStrip::comment_changed), src));
+ ENSURE_GUI_THREAD(bind (mem_fun(*this, &MixerStrip::comment_changed), src));
if (src != this) {
ignore_comment_edit = true;
- comment_area.freeze ();
- comment_area.delete_text (0, -1);
- comment_area.set_point (0);
- comment_area.insert (_route.comment());
- comment_area.thaw ();
+ if (comment_area) {
+ comment_area->get_buffer()->set_text (_route.comment());
+ }
ignore_comment_edit = false;
}
}
-void
-MixerStrip::comment_edited ()
-{
- ENSURE_GUI_THREAD(slot (*this, &MixerStrip::comment_edited));
-
- if (!ignore_comment_edit) {
- string str = comment_area.get_chars(0,-1);
- _route.set_comment (str, this);
- ARDOUR_UI::instance()->tooltips().set_tip (comment_button,
- str.empty() ? _("click to add/edit comments") : str);
- }
-}
-
void
MixerStrip::set_mix_group (RouteGroup *rg)
-
{
_route.set_mix_group (rg, this);
- delete group_menu;
- group_menu = 0;
}
void
-MixerStrip::add_mix_group_to_menu (RouteGroup *rg)
+MixerStrip::add_mix_group_to_menu (RouteGroup *rg, RadioMenuItem::Group* group)
{
using namespace Menu_Helpers;
MenuList& items = group_menu->items();
- items.push_back (MenuElem (rg->name(), bind (slot (*this, &MixerStrip::set_mix_group), rg)));
+
+ items.push_back (RadioMenuElem (*group, rg->name(), bind (mem_fun(*this, &MixerStrip::set_mix_group), rg)));
+
+ if (_route.mix_group() == rg) {
+ static_cast<RadioMenuItem*>(&items.back())->set_active ();
+ }
}
-gint
+bool
MixerStrip::select_mix_group (GdkEventButton *ev)
{
using namespace Menu_Helpers;
- group_menu = new Menu;
+ if (group_menu == 0) {
+ group_menu = new Menu;
+ }
group_menu->set_name ("ArdourContextMenu");
MenuList& items = group_menu->items();
+ RadioMenuItem::Group group;
+
+ items.clear ();
+ items.push_back (RadioMenuElem (group, _("no group"), bind (mem_fun(*this, &MixerStrip::set_mix_group), (RouteGroup *) 0)));
- items.push_back (MenuElem (_("no group"), bind (slot (*this, &MixerStrip::set_mix_group), (RouteGroup *) 0)));
- _session.foreach_mix_group (this, &MixerStrip::add_mix_group_to_menu);
+ _session.foreach_mix_group (bind (mem_fun (*this, &MixerStrip::add_mix_group_to_menu), &group));
+
+ group_menu->popup (1, ev->time);
- group_menu->popup (ev->button, 0);
- return stop_signal (group_button, "button_press_event");
+ return true;
}
void
MixerStrip::mix_group_changed (void *ignored)
{
- ENSURE_GUI_THREAD(bind (slot (*this, &MixerStrip::mix_group_changed), ignored));
+ ENSURE_GUI_THREAD(bind (mem_fun(*this, &MixerStrip::mix_group_changed), ignored));
RouteGroup *rg = _route.mix_group();
}
}
-void
-MixerStrip::polarity_toggled ()
-{
- bool x;
-
- if ((x = polarity_button.get_active()) != _route.phase_invert()) {
- _route.set_phase_invert (x, this);
- }
-}
-
void
MixerStrip::route_gui_changed (string what_changed, void* ignored)
{
- ENSURE_GUI_THREAD(bind (slot (*this, &MixerStrip::route_gui_changed), what_changed, ignored));
+ ENSURE_GUI_THREAD(bind (mem_fun(*this, &MixerStrip::route_gui_changed), what_changed, ignored));
if (what_changed == "color") {
if (set_color_from_route () == 0) {
void
MixerStrip::show_route_color ()
{
- Gtk::Style *style;
-
- name_button.ensure_style ();
- style = name_button.get_style()->copy();
- style->set_bg (Gtk::STATE_NORMAL, color());
- name_button.set_style (*style);
- style->unref();
-
+ name_button.modify_bg (STATE_NORMAL, color());
route_active_changed ();
}
{
using namespace Menu_Helpers;
- route_ops_menu = new Menu;
+ route_ops_menu = manage (new Menu);
route_ops_menu->set_name ("ArdourContextMenu");
MenuList& items = route_ops_menu->items();
- items.push_back (MenuElem (_("Rename"), slot (*this, &RouteUI::route_rename)));
+ items.push_back (MenuElem (_("Rename"), mem_fun(*this, &RouteUI::route_rename)));
items.push_back (SeparatorElem());
- items.push_back (CheckMenuElem (_("Active"), slot (*this, &RouteUI::toggle_route_active)));
- route_active_menu_item = dynamic_cast<CheckMenuItem *> (items.back());
+ items.push_back (CheckMenuElem (_("Active"), mem_fun (*this, &RouteUI::toggle_route_active)));
+ route_active_menu_item = dynamic_cast<CheckMenuItem *> (&items.back());
route_active_menu_item->set_active (_route.active());
+ items.push_back (SeparatorElem());
+ items.push_back (CheckMenuElem (_("Invert Polarity"), mem_fun (*this, &RouteUI::toggle_polarity)));
+ polarity_menu_item = dynamic_cast<CheckMenuItem *> (&items.back());
+ polarity_menu_item->set_active (_route.phase_invert());
+ build_remote_control_menu ();
+
items.push_back (SeparatorElem());
- items.push_back (MenuElem (_("Remove"), slot (*this, &RouteUI::remove_this_route)));
+ items.push_back (MenuElem (_("Remote Control ID"), *remote_control_menu));
+
+ items.push_back (SeparatorElem());
+ items.push_back (MenuElem (_("Remove"), mem_fun(*this, &RouteUI::remove_this_route)));
}
gint
-MixerStrip::name_button_button_release (GdkEventButton* ev)
+MixerStrip::name_button_button_press (GdkEventButton* ev)
{
- if (ev->button == 3) {
+ if (ev->button == 1) {
list_route_operations ();
+ route_ops_menu->popup (1, ev->time);
}
return FALSE;
}
if (route_ops_menu == 0) {
build_route_ops_menu ();
}
-
- route_ops_menu->popup (1, 0);
+
+ refresh_remote_control_menu();
}
void
MixerStrip::speed_changed ()
{
- Gtkmm2ext::UI::instance()->call_slot (slot (*this, &MixerStrip::update_speed_display));
+ Gtkmm2ext::UI::instance()->call_slot (mem_fun(*this, &MixerStrip::update_speed_display));
}
void
{
AxisView::set_selected (yn);
if (_selected) {
- global_frame.set_shadow_type (GTK_SHADOW_ETCHED_OUT);
+ global_frame.set_shadow_type (Gtk::SHADOW_ETCHED_OUT);
global_frame.set_name ("MixerStripSelectedFrame");
} else {
global_frame.set_shadow_type (Gtk::SHADOW_IN);
RouteUI::name_changed (src);
break;
case Narrow:
- name_label.set_text (short_version (_route.name(), 5));
+ name_label.set_text (PBD::short_version (_route.name(), 5));
break;
}
}
if (_embedded) {
Hiding(); /* EMIT_SIGNAL */
} else {
- _mixer.unselect_strip_in_display (this);
+ _mixer.hide_strip (this);
}
}
void
MixerStrip::map_frozen ()
{
- ENSURE_GUI_THREAD (slot (*this, &MixerStrip::map_frozen));
+ ENSURE_GUI_THREAD (mem_fun(*this, &MixerStrip::map_frozen));
AudioTrack* at = dynamic_cast<AudioTrack*>(&_route);
gpm.set_fader_name ("AudioBusFader");
}
}
+
+RouteGroup*
+MixerStrip::mix_group() const
+{
+ return _route.mix_group();
+}
projects / ardour.git / blobdiff