projects
/
ardour.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
add variant of Rect::expand() that allows different amounts in each direction
[ardour.git]
/
gtk2_ardour
/
mixer_strip.h
diff --git
a/gtk2_ardour/mixer_strip.h
b/gtk2_ardour/mixer_strip.h
index 517cab08583959c25b98cdd2149b12793d8501e5..c7a39393aa00646f99566158ab7f528fab5a9744 100644
(file)
--- a/
gtk2_ardour/mixer_strip.h
+++ b/
gtk2_ardour/mixer_strip.h
@@
-47,6
+47,9
@@
#include "pbd/fastlog.h"
#include "pbd/fastlog.h"
+#include "axis_view.h"
+#include "control_slave_ui.h"
+#include "ardour_knob.h"
#include "route_ui.h"
#include "gain_meter.h"
#include "panner_ui.h"
#include "route_ui.h"
#include "gain_meter.h"
#include "panner_ui.h"
@@
-69,18
+72,24
@@
namespace Gtk {
}
class Mixer_UI;
}
class Mixer_UI;
-class IOSelectorWindow;
class MotionController;
class RouteGroupMenu;
class ArdourWindow;
class MotionController;
class RouteGroupMenu;
class ArdourWindow;
-class MixerStrip : public RouteUI, public Gtk::EventBox
+class MixerStrip : public
AxisView, public
RouteUI, public Gtk::EventBox
{
public:
MixerStrip (Mixer_UI&, ARDOUR::Session*, boost::shared_ptr<ARDOUR::Route>, bool in_mixer = true);
MixerStrip (Mixer_UI&, ARDOUR::Session*, bool in_mixer = true);
~MixerStrip ();
{
public:
MixerStrip (Mixer_UI&, ARDOUR::Session*, boost::shared_ptr<ARDOUR::Route>, bool in_mixer = true);
MixerStrip (Mixer_UI&, ARDOUR::Session*, bool in_mixer = true);
~MixerStrip ();
+ std::string name() const;
+ Gdk::Color color () const;
+ bool marked_for_display () const;
+ bool set_marked_for_display (bool);
+
+ boost::shared_ptr<ARDOUR::Stripable> stripable() const { return RouteUI::stripable(); }
+
void set_width_enum (Width, void* owner);
Width get_width_enum () const { return _width; }
void* width_owner () const { return _width_owner; }
void set_width_enum (Width, void* owner);
Width get_width_enum () const { return _width; }
void* width_owner () const { return _width_owner; }
@@
-131,8
+140,7
@@
class MixerStrip : public RouteUI, public Gtk::EventBox
void toggle_processors ();
void ab_plugins ();
void toggle_processors ();
void ab_plugins ();
- void set_selected(bool yn);
- bool is_selected() {return _selected;}
+ void set_selected (bool yn);
static MixerStrip* entered_mixer_strip() { return _entered_mixer_strip; }
static MixerStrip* entered_mixer_strip() { return _entered_mixer_strip; }
@@
-172,7
+180,6
@@
class MixerStrip : public RouteUI, public Gtk::EventBox
Glib::RefPtr<Gtk::SizeGroup> button_size_group;
Glib::RefPtr<Gtk::SizeGroup> button_size_group;
- Gtk::Table button_table;
Gtk::Table rec_mon_table;
Gtk::Table solo_iso_table;
Gtk::Table mute_solo_table;
Gtk::Table rec_mon_table;
Gtk::Table solo_iso_table;
Gtk::Table mute_solo_table;
@@
-181,10
+188,17
@@
class MixerStrip : public RouteUI, public Gtk::EventBox
ArdourButton meter_point_button;
void meter_changed ();
ArdourButton meter_point_button;
void meter_changed ();
+ void monitor_changed ();
ArdourButton input_button;
ArdourButton output_button;
ArdourButton input_button;
ArdourButton output_button;
+ ArdourButton* monitor_section_button;
+
+ void input_button_resized (Gtk::Allocation&);
+ void output_button_resized (Gtk::Allocation&);
+ void comment_button_resized (Gtk::Allocation&);
+
ArdourButton* midi_input_enable_button;
Gtk::HBox input_button_box;
ArdourButton* midi_input_enable_button;
Gtk::HBox input_button_box;
@@
-194,6
+208,9
@@
class MixerStrip : public RouteUI, public Gtk::EventBox
bool input_active_button_press (GdkEventButton*);
bool input_active_button_release (GdkEventButton*);
bool input_active_button_press (GdkEventButton*);
bool input_active_button_release (GdkEventButton*);
+ void help_count_plugins (boost::weak_ptr<ARDOUR::Processor>);
+ uint32_t _plugin_insert_cnt;
+
gint mark_update_safe ();
guint32 mode_switch_in_progress;
gint mark_update_safe ();
guint32 mode_switch_in_progress;
@@
-201,13
+218,18
@@
class MixerStrip : public RouteUI, public Gtk::EventBox
ArdourButton _comment_button;
ArdourButton _comment_button;
+ ArdourKnob trim_control;
+
void setup_comment_button ();
ArdourButton group_button;
RouteGroupMenu *group_menu;
gint input_press (GdkEventButton *);
void setup_comment_button ();
ArdourButton group_button;
RouteGroupMenu *group_menu;
gint input_press (GdkEventButton *);
+ gint input_release (GdkEventButton *);
+
gint output_press (GdkEventButton *);
gint output_press (GdkEventButton *);
+ gint output_release (GdkEventButton *);
Gtk::Menu input_menu;
std::list<boost::shared_ptr<ARDOUR::Bundle> > input_menu_bundles;
Gtk::Menu input_menu;
std::list<boost::shared_ptr<ARDOUR::Bundle> > input_menu_bundles;
@@
-220,9
+242,6
@@
class MixerStrip : public RouteUI, public Gtk::EventBox
void bundle_input_chosen (boost::shared_ptr<ARDOUR::Bundle>);
void bundle_output_chosen (boost::shared_ptr<ARDOUR::Bundle>);
void bundle_input_chosen (boost::shared_ptr<ARDOUR::Bundle>);
void bundle_output_chosen (boost::shared_ptr<ARDOUR::Bundle>);
- void edit_input_configuration ();
- void edit_output_configuration ();
-
void diskstream_changed ();
void io_changed_proxy ();
void diskstream_changed ();
void io_changed_proxy ();
@@
-230,13
+249,11
@@
class MixerStrip : public RouteUI, public Gtk::EventBox
Gtk::MenuItem* rename_menu_item;
void build_send_action_menu ();
Gtk::MenuItem* rename_menu_item;
void build_send_action_menu ();
- void new_send ();
- void show_send_controls ();
-
PBD::ScopedConnection panstate_connection;
PBD::ScopedConnection panstyle_connection;
void connect_to_pan ();
void update_panner_choices ();
PBD::ScopedConnection panstate_connection;
PBD::ScopedConnection panstyle_connection;
void connect_to_pan ();
void update_panner_choices ();
+ void update_trim_control ();
void update_diskstream_display ();
void update_input_display ();
void update_diskstream_display ();
void update_input_display ();
@@
-253,15
+270,12
@@
class MixerStrip : public RouteUI, public Gtk::EventBox
bool select_route_group (GdkEventButton *);
void route_group_changed ();
bool select_route_group (GdkEventButton *);
void route_group_changed ();
- IOSelectorWindow *input_selector;
- IOSelectorWindow *output_selector;
-
Gtk::Style *passthru_style;
void route_color_changed ();
void show_passthru_color ();
Gtk::Style *passthru_style;
void route_color_changed ();
void show_passthru_color ();
- void property_changed (const PBD::PropertyChange&);
+ void
route_
property_changed (const PBD::PropertyChange&);
void name_button_resized (Gtk::Allocation&);
void name_changed ();
void update_speed_display ();
void name_button_resized (Gtk::Allocation&);
void name_changed ();
void update_speed_display ();
@@
-279,7
+293,6
@@
class MixerStrip : public RouteUI, public Gtk::EventBox
virtual void bus_send_display_changed (boost::shared_ptr<ARDOUR::Route>);
void set_current_delivery (boost::shared_ptr<ARDOUR::Delivery>);
virtual void bus_send_display_changed (boost::shared_ptr<ARDOUR::Route>);
void set_current_delivery (boost::shared_ptr<ARDOUR::Delivery>);
- boost::shared_ptr<ARDOUR::Delivery> _current_delivery;
void drop_send ();
PBD::ScopedConnection send_gone_connection;
void drop_send ();
PBD::ScopedConnection send_gone_connection;
@@
-317,6
+330,10
@@
class MixerStrip : public RouteUI, public Gtk::EventBox
PBD::ScopedConnection _level_meter_connection;
std::string meter_point_string (ARDOUR::MeterPoint);
PBD::ScopedConnection _level_meter_connection;
std::string meter_point_string (ARDOUR::MeterPoint);
+
+ void update_track_number_visibility ();
+
+ ControlSlaveUI control_slave_ui;
};
#endif /* __ardour_mixer_strip__ */
};
#endif /* __ardour_mixer_strip__ */