projects
/
ardour.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Remove internal edit mode and add "content" tool.
[ardour.git]
/
gtk2_ardour
/
stereo_panner.h
diff --git
a/gtk2_ardour/stereo_panner.h
b/gtk2_ardour/stereo_panner.h
index 86a53eccf70c54aa08d0b7e4a46324d4be834f91..2f37e5f1b72d5df6a35e7c63979a37e8790bd051 100644
(file)
--- a/
gtk2_ardour/stereo_panner.h
+++ b/
gtk2_ardour/stereo_panner.h
@@
-21,22
+21,30
@@
#define __gtk_ardour_stereo_panner_h__
#include "pbd/signals.h"
#define __gtk_ardour_stereo_panner_h__
#include "pbd/signals.h"
-
-#include <gtkmm/drawingarea.h>
-#include <boost/shared_ptr.hpp>
-
#include "gtkmm2ext/binding_proxy.h"
#include "gtkmm2ext/binding_proxy.h"
+#include "panner_interface.h"
+
+namespace ARDOUR {
+ class PannerShell;
+}
namespace PBD {
class Controllable;
}
namespace PBD {
class Controllable;
}
-class StereoPanner : public Gtk::DrawingArea
+namespace ARDOUR {
+ class Panner;
+}
+
+class StereoPanner : public PannerInterface
{
public:
{
public:
- StereoPanner (boost::shared_ptr<
PBD::Controllable> pos, boost::shared_ptr<PBD::Controllable> width
);
+ StereoPanner (boost::shared_ptr<
ARDOUR::PannerShell>
);
~StereoPanner ();
~StereoPanner ();
+ boost::shared_ptr<PBD::Controllable> get_position_controllable() const { return position_control; }
+ boost::shared_ptr<PBD::Controllable> get_width_controllable() const { return width_control; }
+
sigc::signal<void> StartPositionGesture;
sigc::signal<void> StopPositionGesture;
sigc::signal<void> StartWidthGesture;
sigc::signal<void> StartPositionGesture;
sigc::signal<void> StopPositionGesture;
sigc::signal<void> StartWidthGesture;
@@
-49,15
+57,15
@@
class StereoPanner : public Gtk::DrawingArea
bool on_motion_notify_event (GdkEventMotion*);
bool on_scroll_event (GdkEventScroll*);
bool on_key_press_event (GdkEventKey*);
bool on_motion_notify_event (GdkEventMotion*);
bool on_scroll_event (GdkEventScroll*);
bool on_key_press_event (GdkEventKey*);
- bool on_key_release_event (GdkEventKey*);
- bool on_enter_notify_event (GdkEventCrossing* ev);
- bool on_leave_notify_event (GdkEventCrossing* ev);
private:
private:
+ PannerEditor* editor ();
+ boost::shared_ptr<ARDOUR::PannerShell> _panner_shell;
+
boost::shared_ptr<PBD::Controllable> position_control;
boost::shared_ptr<PBD::Controllable> width_control;
boost::shared_ptr<PBD::Controllable> position_control;
boost::shared_ptr<PBD::Controllable> width_control;
- PBD::ScopedConnectionList connections;
-
bool dragging
;
+ PBD::ScopedConnectionList
panvalue_
connections;
+
PBD::ScopedConnectionList panshell_connections
;
bool dragging_position;
bool dragging_left;
bool dragging_right;
bool dragging_position;
bool dragging_left;
bool dragging_right;
@@
-66,16
+74,12
@@
class StereoPanner : public Gtk::DrawingArea
double accumulated_delta;
bool detented;
double accumulated_delta;
bool detented;
- Gtk::Window* drag_data_window;
- Gtk::Label* drag_data_label;
-
BindingProxy position_binder;
BindingProxy width_binder;
BindingProxy position_binder;
BindingProxy width_binder;
- void value_change ();
- void set_drag_data ();
+ void set_tooltip ();
- struct ColorScheme {
+ struct ColorScheme {
uint32_t outline;
uint32_t fill;
uint32_t text;
uint32_t outline;
uint32_t fill;
uint32_t text;
@@
-83,16
+87,23
@@
class StereoPanner : public Gtk::DrawingArea
uint32_t rule;
};
uint32_t rule;
};
- enum State {
+ enum State {
Normal,
Mono,
Inverted
};
Normal,
Mono,
Inverted
};
+ bool _dragging;
+
+ static Pango::AttrList panner_font_attributes;
+ static bool have_font;
+
static ColorScheme colors[3];
static void set_colors ();
static bool have_colors;
static ColorScheme colors[3];
static void set_colors ();
static bool have_colors;
- void color_handler ();
+ void color_handler ();
+ void bypass_handler ();
+ void pannable_handler ();
};
#endif /* __gtk_ardour_stereo_panner_h__ */
};
#endif /* __gtk_ardour_stereo_panner_h__ */