projects
/
ardour.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
update drobilla's fascistic dir-locals.el to force emacs users into whitespace submis...
[ardour.git]
/
gtk2_ardour
/
panner_ui.h
diff --git
a/gtk2_ardour/panner_ui.h
b/gtk2_ardour/panner_ui.h
index 724b8b86e7d8d36b010475c883b87f71a45e1aa0..a18e22ec5630f36d936ab4d7a060ec14a2e632b5 100644
(file)
--- a/
gtk2_ardour/panner_ui.h
+++ b/
gtk2_ardour/panner_ui.h
@@
-24,7
+24,6
@@
#include <gtkmm/box.h>
#include <gtkmm/adjustment.h>
#include <gtkmm/box.h>
#include <gtkmm/adjustment.h>
-#include <gtkmm/viewport.h>
#include <gtkmm/eventbox.h>
#include <gtkmm/arrow.h>
#include <gtkmm/togglebutton.h>
#include <gtkmm/eventbox.h>
#include <gtkmm/arrow.h>
#include <gtkmm/togglebutton.h>
@@
-33,17
+32,23
@@
#include <gtkmm2ext/click_box.h>
#include <gtkmm2ext/slider_controller.h>
#include <gtkmm2ext/click_box.h>
#include <gtkmm2ext/slider_controller.h>
+#include "ardour/session_handle.h"
+
#include "enums.h"
class Panner2d;
#include "enums.h"
class Panner2d;
-class PannerBar;
class Panner2dWindow;
class Panner2dWindow;
+class StereoPanner;
+class MonoPanner;
namespace ARDOUR {
class Session;
class Panner;
namespace ARDOUR {
class Session;
class Panner;
+ class PannerShell;
class Delivery;
class Delivery;
+ class AutomationControl;
}
}
+
namespace Gtkmm2ext {
class FastMeter;
}
namespace Gtkmm2ext {
class FastMeter;
}
@@
-53,15
+58,15
@@
namespace Gtk {
class Menuitem;
}
class Menuitem;
}
-class PannerUI : public Gtk::HBox
+class PannerUI : public Gtk::HBox
, public ARDOUR::SessionHandlePtr
{
public:
{
public:
- PannerUI (ARDOUR::Session
&
);
+ PannerUI (ARDOUR::Session
*
);
~PannerUI ();
~PannerUI ();
- virtual void set_panner (boost::shared_ptr<ARDOUR::Panner>);
+ virtual void set_panner (boost::shared_ptr<ARDOUR::Panner
Shell>, boost::shared_ptr<ARDOUR::Panner
>);
- void pan
_changed (void *
);
+ void pan
shell_changed (
);
void update_pan_sensitive ();
void update_gain_sensitive ();
void update_pan_sensitive ();
void update_gain_sensitive ();
@@
-74,40
+79,40
@@
class PannerUI : public Gtk::HBox
void set_meter_strip_name (std::string name);
boost::shared_ptr<PBD::Controllable> get_controllable();
void set_meter_strip_name (std::string name);
boost::shared_ptr<PBD::Controllable> get_controllable();
+ void on_size_allocate (Gtk::Allocation &);
+
+ static void setup_slider_pix ();
+
private:
friend class MixerStrip;
private:
friend class MixerStrip;
+ boost::shared_ptr<ARDOUR::PannerShell> _panshell;
boost::shared_ptr<ARDOUR::Panner> _panner;
boost::shared_ptr<ARDOUR::Panner> _panner;
-
ARDOUR::Session& _session
;
-
std::vector<sigc::connection>
connections;
+
PBD::ScopedConnectionList connections
;
+
PBD::ScopedConnectionList _pan_control_
connections;
bool ignore_toggle;
bool in_pan_update;
int _current_nouts;
bool ignore_toggle;
bool in_pan_update;
int _current_nouts;
- int _current_n
pa
ns;
+ int _current_n
i
ns;
static const int pan_bar_height;
static const int pan_bar_height;
- Panner2d*
panner;
+ Panner2d*
twod_panner; ///< 2D panner, or 0
Panner2dWindow* big_window;
Gtk::VBox pan_bar_packer;
Panner2dWindow* big_window;
Gtk::VBox pan_bar_packer;
- Gtk::Adjustment hAdjustment;
- Gtk::Adjustment vAdjustment;
- Gtk::Viewport panning_viewport;
- Gtk::EventBox panning_up;
- Gtk::Arrow panning_up_arrow;
- Gtk::EventBox panning_down;
- Gtk::Arrow panning_down_arrow;
Gtk::VBox pan_vbox;
Gtk::VBox pan_vbox;
+ Gtk::VBox poswidth_box;
Width _width;
Width _width;
- Gtk::ToggleButton panning_link_button;
- Gtk::Button panning_link_direction_button;
- Gtk::HBox panning_link_box;
-
- bool panning_link_button_press (GdkEventButton*);
- bool panning_link_button_release (GdkEventButton*);
+ StereoPanner* _stereo_panner;
+ bool _ignore_width_change;
+ bool _ignore_position_change;
+ void width_adjusted ();
+ void show_width ();
+ void position_adjusted ();
+ void show_position ();
Gtk::Menu* pan_astate_menu;
Gtk::Menu* pan_astyle_menu;
Gtk::Menu* pan_astate_menu;
Gtk::Menu* pan_astyle_menu;
@@
-115,21
+120,13
@@
class PannerUI : public Gtk::HBox
Gtk::Button pan_automation_style_button;
Gtk::ToggleButton pan_automation_state_button;
Gtk::Button pan_automation_style_button;
Gtk::ToggleButton pan_automation_state_button;
-
void panning_link_direction_clicked ()
;
+
std::vector<MonoPanner*> pan_bars
;
- std::vector<Gtk::Adjustment*> pan_adjustments;
- std::vector<PannerBar*> pan_bars;
-
- void pan_adjustment_changed (uint32_t which);
void pan_value_changed (uint32_t which);
void pan_value_changed (uint32_t which);
- void update_pan_bars (bool only_if_aplay);
- void update_pan_linkage ();
void update_pan_state ();
void build_astate_menu ();
void build_astyle_menu ();
void update_pan_state ();
void build_astate_menu ();
void build_astyle_menu ();
- void panner_changed ();
-
void hide_pans ();
void panner_moved (int which);
void hide_pans ();
void panner_moved (int which);
@@
-138,14
+135,12
@@
class PannerUI : public Gtk::HBox
gint start_pan_touch (GdkEventButton*);
gint end_pan_touch (GdkEventButton*);
gint start_pan_touch (GdkEventButton*);
gint end_pan_touch (GdkEventButton*);
- bool pan_button_event (GdkEventButton*
, uint32_t which
);
+ bool pan_button_event (GdkEventButton*);
Gtk::Menu* pan_menu;
Gtk::CheckMenuItem* bypass_menu_item;
Gtk::Menu* pan_menu;
Gtk::CheckMenuItem* bypass_menu_item;
- void build_pan_menu (uint32_t which);
- void pan_mute (uint32_t which);
- void pan_reset (uint32_t);
- void pan_reset_all ();
+ void build_pan_menu ();
+ void pan_reset ();
void pan_bypass_toggle ();
void pan_automation_state_changed();
void pan_bypass_toggle ();
void pan_automation_state_changed();
@@
-161,6
+156,9
@@
class PannerUI : public Gtk::HBox
std::string astyle_string (ARDOUR::AutoStyle);
std::string short_astyle_string (ARDOUR::AutoStyle);
std::string _astyle_string (ARDOUR::AutoStyle, bool);
std::string astyle_string (ARDOUR::AutoStyle);
std::string short_astyle_string (ARDOUR::AutoStyle);
std::string _astyle_string (ARDOUR::AutoStyle, bool);
+
+ void start_touch (boost::weak_ptr<ARDOUR::AutomationControl>);
+ void stop_touch (boost::weak_ptr<ARDOUR::AutomationControl>);
};
#endif /* __ardour_gtk_panner_ui_h__ */
};
#endif /* __ardour_gtk_panner_ui_h__ */