ardour/livetrax
13
0
Fork 0
Code

show values on faders (fixes bug in 55c6165)

Browse Source
This commit is contained in:
Robin Gareus 2014-11-29 14:49:03 +01:00
parent 58663db374
commit 48bb90eb88
2 changed files with 35 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
gtk2_ardour/automation_controller.cc
View File

@ -40,6 +40,27 @@
using namespace ARDOUR; using namespace ARDOUR;
using namespace Gtk; using namespace Gtk;
AutomationBarController::AutomationBarController (
boost::shared_ptr<Automatable> printer,
boost::shared_ptr<AutomationControl> ac,
Adjustment* adj)
: Gtkmm2ext::BarController(*adj, ac)
, _printer(printer)
, _controllable(ac)
{
}
std::string
AutomationBarController::get_label (double& xpos)
{
xpos = 0.5;
return _printer->value_as_string (_controllable);
}
AutomationBarController::~AutomationBarController()
{
}
AutomationController::AutomationController(boost::shared_ptr<Automatable> printer, AutomationController::AutomationController(boost::shared_ptr<Automatable> printer,
boost::shared_ptr<AutomationControl> ac, boost::shared_ptr<AutomationControl> ac,
Adjustment* adj) Adjustment* adj)
@ -67,7 +88,7 @@ AutomationController::AutomationController(boost::shared_ptr<Automatable>
_widget = but; _widget = but;
} else { } else {
Gtkmm2ext::BarController* bar = manage(new Gtkmm2ext::BarController(*adj, ac)); AutomationBarController* bar = manage(new AutomationBarController(_printer, ac, adj));
bar->set_name(X_("ProcessorControlSlider")); bar->set_name(X_("ProcessorControlSlider"));
bar->StartGesture.connect( bar->StartGesture.connect(
@ -124,13 +145,6 @@ AutomationController::create(boost::shared_ptr<Automatable> printer,
return boost::shared_ptr<AutomationController>(new AutomationController(printer, ac, adjustment)); return boost::shared_ptr<AutomationController>(new AutomationController(printer, ac, adjustment));
} }
std::string
AutomationController::get_label (double& xpos)
{
xpos = 0.5;
return _printer->value_as_string (_controllable);
}
void void
AutomationController::display_effective_value() AutomationController::display_effective_value()
{ {
@ -314,7 +328,7 @@ AutomationController::stop_updating ()
void void
AutomationController::disable_vertical_scroll () AutomationController::disable_vertical_scroll ()
{ {
Gtkmm2ext::BarController* bar = dynamic_cast<Gtkmm2ext::BarController*>(_widget); AutomationBarController* bar = dynamic_cast<AutomationBarController*>(_widget);
if (bar) { if (bar) {
bar->set_tweaks ( bar->set_tweaks (
Gtkmm2ext::PixFader::Tweaks(bar->tweaks() | Gtkmm2ext::PixFader::Tweaks(bar->tweaks() |

13
gtk2_ardour/automation_controller.h
View File

@ -42,6 +42,18 @@ namespace ARDOUR {
class Automatable; class Automatable;
} }
class AutomationBarController : public Gtkmm2ext::BarController {
public:
AutomationBarController(boost::shared_ptr<ARDOUR::Automatable> printer,
boost::shared_ptr<ARDOUR::AutomationControl> ac,
Gtk::Adjustment* adj);
~AutomationBarController();
private:
std::string get_label (double&);
boost::shared_ptr<ARDOUR::Automatable> _printer;
boost::shared_ptr<ARDOUR::AutomationControl> _controllable;
};
/** A BarController which displays the value and allows control of an AutomationControl */ /** A BarController which displays the value and allows control of an AutomationControl */
class AutomationController : public Gtk::Alignment { class AutomationController : public Gtk::Alignment {
public: public:
@ -72,7 +84,6 @@ private:
AutomationController (boost::shared_ptr<ARDOUR::Automatable> printer, AutomationController (boost::shared_ptr<ARDOUR::Automatable> printer,
boost::shared_ptr<ARDOUR::AutomationControl> ac, boost::shared_ptr<ARDOUR::AutomationControl> ac,
Gtk::Adjustment* adj); Gtk::Adjustment* adj);
std::string get_label (double&);
void start_touch(); void start_touch();
void end_touch(); void end_touch();