Merge with 2.0-ongoing R3071.

git-svn-id: svn://localhost/ardour2/branches/3.0@3073 d708f5d6-7413-0410-9779-e7cbd77b26cf
This commit is contained in:
David Robillard 2008-02-16 22:43:18 +00:00
parent 1b65758557
commit 8aa9508c82
67 changed files with 2417 additions and 2421 deletions

View file

@ -27,8 +27,10 @@
#include <gtkmm/menuitem.h>
#include <gtkmm/radiomenuitem.h>
#include <gtkmm/checkmenuitem.h>
#include <gtkmm/adjustment.h>
#include <gtkmm2ext/selector.h>
#include <gtkmm2ext/slider_controller.h>
#include <list>
#include <ardour/types.h>
@ -132,6 +134,7 @@ public:
void clear_meter ();
void io_changed (ARDOUR::IOChange, void *);
void meter_changed (void *);
void effective_gain_display ();
protected:
friend class StreamView;
@ -307,6 +310,16 @@ protected:
UnderlayList _underlay_streams;
typedef list<RouteTimeAxisView*> UnderlayMirrorList;
UnderlayMirrorList _underlay_mirrors;
Gtkmm2ext::HSliderController *gain_slider;
Gtk::Adjustment gain_adjustment;
static Glib::RefPtr<Gdk::Pixbuf> slider;
static int setup_slider_pix ();
void gain_adjusted();
gint start_gain_touch (GdkEventButton*);
gint end_gain_touch (GdkEventButton*);
void gain_changed ();
};
#endif /* __ardour_route_time_axis_h__ */