merge -r12436:12545 from 3.0

git-svn-id: svn://localhost/ardour2/branches/3.0-SG@12546 d708f5d6-7413-0410-9779-e7cbd77b26cf
This commit is contained in:
Paul Davis 2012-06-02 16:21:08 +00:00
parent 4f9eb9862c
commit 8e1db53556
131 changed files with 2056 additions and 996 deletions

View file

@ -140,6 +140,7 @@ protected:
virtual void setup_visuals ();
static Glib::RefPtr<Gdk::Pixbuf> _slider_pixbuf;
static Glib::RefPtr<Gdk::Pixbuf> _slider_pixbuf_desensitised;
private:
void led_clicked();
@ -157,7 +158,7 @@ private:
class Control {
public:
Control (Glib::RefPtr<Gdk::Pixbuf>, boost::shared_ptr<ARDOUR::AutomationControl>, std::string const &);
Control (Glib::RefPtr<Gdk::Pixbuf>, Glib::RefPtr<Gdk::Pixbuf>, boost::shared_ptr<ARDOUR::AutomationControl>, std::string const &);
void set_pixel_width (int);
void set_visible (bool);