projects
/
ardour.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
move assignments out of assert() in editor_drag (thanks lincoln); change mouse mode...
[ardour.git]
/
gtk2_ardour
/
panner_ui.h
diff --git
a/gtk2_ardour/panner_ui.h
b/gtk2_ardour/panner_ui.h
index 78fc86885d143acc2c44e2878a482e0249d86d87..95e1e6c688e565dbfbcf1a30657151c5ffa845f0 100644
(file)
--- a/
gtk2_ardour/panner_ui.h
+++ b/
gtk2_ardour/panner_ui.h
@@
-15,7
+15,6
@@
along with this program; if not, write to the Free Software
Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
along with this program; if not, write to the Free Software
Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
- $Id$
*/
#ifndef __ardour_gtk_panner_ui_h__
*/
#ifndef __ardour_gtk_panner_ui_h__
@@
-31,20
+30,22
@@
#include <gtkmm/togglebutton.h>
#include <gtkmm/button.h>
#include <gtkmm/togglebutton.h>
#include <gtkmm/button.h>
-#include <gtkmm2ext/slider_controller.h>
#include <gtkmm2ext/click_box.h>
#include <gtkmm2ext/click_box.h>
+#include <gtkmm2ext/slider_controller.h>
#include "enums.h"
class Panner2d;
#include "enums.h"
class Panner2d;
+class PannerBar;
+class Panner2dWindow;
namespace ARDOUR {
namespace ARDOUR {
- class IO;
class Session;
class Session;
+ class Panner;
+ class Delivery;
}
namespace Gtkmm2ext {
class FastMeter;
}
namespace Gtkmm2ext {
class FastMeter;
- class BarController;
}
namespace Gtk {
}
namespace Gtk {
@@
-55,9
+56,11
@@
namespace Gtk {
class PannerUI : public Gtk::HBox
{
public:
class PannerUI : public Gtk::HBox
{
public:
- PannerUI (ARDOUR::
IO&, ARDOUR::
Session&);
+ PannerUI (ARDOUR::Session&);
~PannerUI ();
~PannerUI ();
+ virtual void set_panner (boost::shared_ptr<ARDOUR::Panner>);
+
void pan_changed (void *);
void update_pan_sensitive ();
void pan_changed (void *);
void update_pan_sensitive ();
@@
-68,17
+71,23
@@
class PannerUI : public Gtk::HBox
void effective_pan_display ();
void effective_pan_display ();
- void set_meter_strip_name (string name);
+ void set_meter_strip_name (std::string name);
+ boost::shared_ptr<PBD::Controllable> get_controllable();
private:
friend class MixerStrip;
private:
friend class MixerStrip;
- ARDOUR::IO& _io;
+
+ boost::shared_ptr<ARDOUR::Panner> _panner;
ARDOUR::Session& _session;
ARDOUR::Session& _session;
+ std::vector<sigc::connection> connections;
bool ignore_toggle;
bool in_pan_update;
bool ignore_toggle;
bool in_pan_update;
- Panner2d* panner;
+ static const int pan_bar_height;
+
+ Panner2d* panner;
+ Panner2dWindow* big_window;
Gtk::VBox pan_bar_packer;
Gtk::Adjustment hAdjustment;
Gtk::VBox pan_bar_packer;
Gtk::Adjustment hAdjustment;
@@
-90,33
+99,32
@@
class PannerUI : public Gtk::HBox
Gtk::Arrow panning_down_arrow;
Gtk::VBox pan_vbox;
Width _width;
Gtk::Arrow panning_down_arrow;
Gtk::VBox pan_vbox;
Width _width;
- gint panning_scroll_button_press_event (GdkEventButton*, int32_t dir);
- gint panning_scroll_button_release_event (GdkEventButton*, int32_t dir);
-
+
Gtk::ToggleButton panning_link_button;
Gtk::Button panning_link_direction_button;
Gtk::HBox panning_link_box;
Gtk::ToggleButton panning_link_button;
Gtk::Button panning_link_direction_button;
Gtk::HBox panning_link_box;
- Gtk::Menu pan_astate_menu;
- Gtk::Menu pan_astyle_menu;
+ bool panning_link_button_press (GdkEventButton*);
+ bool panning_link_button_release (GdkEventButton*);
+
+ Gtk::Menu* pan_astate_menu;
+ Gtk::Menu* pan_astyle_menu;
Gtk::Button pan_automation_style_button;
Gtk::ToggleButton pan_automation_state_button;
Gtk::Button pan_automation_style_button;
Gtk::ToggleButton pan_automation_state_button;
-
- gint panning_link_button_press (GdkEventButton*);
- gint panning_link_button_release (GdkEventButton*);
void panning_link_direction_clicked ();
void panning_link_direction_clicked ();
- vector<Gtk::Adjustment*> pan_adjustments;
-
vector<Gtkmm2ext::BarControlle
r*> pan_bars;
+
std::
vector<Gtk::Adjustment*> pan_adjustments;
+
std::vector<PannerBa
r*> pan_bars;
void pan_adjustment_changed (uint32_t which);
void pan_value_changed (uint32_t which);
void pan_adjustment_changed (uint32_t which);
void pan_value_changed (uint32_t which);
- void pan_printer (char* buf, uint32_t, Gtk::Adjustment*);
void update_pan_bars (bool only_if_aplay);
void update_pan_linkage ();
void update_pan_state ();
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 panner_changed ();
void panner_changed ();
@@
-128,12
+136,14
@@
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*);
- gint pan_button_event (GdkEventButton*, uint32_t which);
+ bool pan_button_event (GdkEventButton*, uint32_t which);
+
Gtk::Menu* pan_menu;
Gtk::CheckMenuItem* bypass_menu_item;
void build_pan_menu (uint32_t which);
void pan_mute (uint32_t which);
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 ();
+ void pan_reset (uint32_t);
+ void pan_reset_all ();
void pan_bypass_toggle ();
void pan_automation_state_changed();
void pan_bypass_toggle ();
void pan_automation_state_changed();