projects
/
ardour.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
introduce the notion that note additions and property changes can cause the removal...
[ardour.git]
/
gtk2_ardour
/
panner_ui.h
diff --git
a/gtk2_ardour/panner_ui.h
b/gtk2_ardour/panner_ui.h
index bebffec6c00d532501d1d7b80a2b43e0bb2ddff4..4ed8767fb1258f30e7ba964b059a9461eb8d1c62 100644
(file)
--- a/
gtk2_ardour/panner_ui.h
+++ b/
gtk2_ardour/panner_ui.h
@@
-33,6
+33,8
@@
#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;
@@
-53,10
+55,10
@@
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 ();
virtual void set_panner (boost::shared_ptr<ARDOUR::Panner>);
~PannerUI ();
virtual void set_panner (boost::shared_ptr<ARDOUR::Panner>);
@@
-80,8
+82,8
@@
class PannerUI : public Gtk::HBox
friend class MixerStrip;
boost::shared_ptr<ARDOUR::Panner> _panner;
friend class MixerStrip;
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;
bool ignore_toggle;
bool in_pan_update;
@@
-90,7
+92,7
@@
class PannerUI : public Gtk::HBox
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;
@@
-142,6
+144,8
@@
class PannerUI : public Gtk::HBox
bool pan_button_event (GdkEventButton*, uint32_t which);
bool pan_button_event (GdkEventButton*, uint32_t which);
+ void connect_to_pan_control (uint32_t);
+
Gtk::Menu* pan_menu;
Gtk::CheckMenuItem* bypass_menu_item;
void build_pan_menu (uint32_t which);
Gtk::Menu* pan_menu;
Gtk::CheckMenuItem* bypass_menu_item;
void build_pan_menu (uint32_t which);