13
0

add trim control to mixer-strip.

This commit is contained in:
Robin Gareus 2015-04-24 22:16:34 +02:00
parent 57e80c2c8f
commit de80782f05
3 changed files with 24 additions and 0 deletions

View File

@ -464,6 +464,9 @@
<ColorAlias name="transport recenable button: led active" alias="color 4"/>
<ColorAlias name="trim handle" alias="color 18"/>
<ColorAlias name="trim handle locked" alias="color 86"/>
<ColorAlias name="trim knob" alias="color 60"/>
<ColorAlias name="trim knob: arc end" alias="color 70"/>
<ColorAlias name="trim knob: arc start" alias="color 16"/>
<ColorAlias name="verbose canvas cursor" alias="color 32"/>
<ColorAlias name="vestigial frame" alias="color 4"/>
<ColorAlias name="video timeline bar" alias="color 46"/>

View File

@ -34,6 +34,7 @@
#include <gtkmm2ext/slider_controller.h>
#include <gtkmm2ext/bindable_button.h>
#include "ardour/amp.h"
#include "ardour/audio_track.h"
#include "ardour/audioengine.h"
#include "ardour/internal_send.h"
@ -255,6 +256,14 @@ MixerStrip::init ()
_comment_button.set_name (X_("mixer strip button"));
_comment_button.signal_clicked.connect (sigc::mem_fun (*this, &RouteUI::toggle_comment_editor));
#define PX_SCALE(px) std::max((float)px, rintf((float)px * ARDOUR_UI::ui_scale))
trim_control.set_size_request (PX_SCALE(20), PX_SCALE(20));
#undef PX_SCALE
trim_control.set_tooltip_prefix ("Trim: ");
trim_control.set_name ("trim knob");
trim_control.set_no_show_all (true);
input_button_box.pack_start (trim_control, false, false);
global_vpacker.set_border_width (1);
global_vpacker.set_spacing (0);
@ -516,6 +525,15 @@ MixerStrip::set_route (boost::shared_ptr<Route> rt)
monitor_disk_button->hide ();
}
if (route()->trim() && route()->trim()->active()) {
trim_control.show ();
trim_control.set_controllable (route()->trim()->gain_control());
} else {
trim_control.hide ();
boost::shared_ptr<Controllable> none;
trim_control.set_controllable (none);
}
if (is_midi_track()) {
if (midi_input_enable_button == 0) {
midi_input_enable_button = manage (new ArdourButton);

View File

@ -47,6 +47,7 @@
#include "pbd/fastlog.h"
#include "ardour_knob.h"
#include "route_ui.h"
#include "gain_meter.h"
#include "panner_ui.h"
@ -202,6 +203,8 @@ class MixerStrip : public RouteUI, public Gtk::EventBox
ArdourButton _comment_button;
ArdourKnob trim_control;
void setup_comment_button ();
ArdourButton group_button;