projects
/
ardour.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
rework panning -- Squashed commit of the following:
[ardour.git]
/
gtk2_ardour
/
mono_panner.h
diff --git
a/gtk2_ardour/mono_panner.h
b/gtk2_ardour/mono_panner.h
index ec47aa309d3eac9b06a80c1a56d283d49dbf8591..523f9731dee890140d1bad7207fb322c2380fe02 100644
(file)
--- a/
gtk2_ardour/mono_panner.h
+++ b/
gtk2_ardour/mono_panner.h
@@
-28,6
+28,10
@@
#include "panner_interface.h"
#include "panner_interface.h"
+namespace ARDOUR {
+ class PannerShell;
+}
+
namespace PBD {
class Controllable;
}
namespace PBD {
class Controllable;
}
@@
-35,7
+39,7
@@
namespace PBD {
class MonoPanner : public PannerInterface
{
public:
class MonoPanner : public PannerInterface
{
public:
- MonoPanner (boost::shared_ptr<ARDOUR::Panner>);
+ MonoPanner (boost::shared_ptr<ARDOUR::Panner
Shell
>);
~MonoPanner ();
boost::shared_ptr<PBD::Controllable> get_controllable() const { return position_control; }
~MonoPanner ();
boost::shared_ptr<PBD::Controllable> get_controllable() const { return position_control; }
@@
-52,6
+56,9
@@
class MonoPanner : public PannerInterface
bool on_key_press_event (GdkEventKey*);
private:
bool on_key_press_event (GdkEventKey*);
private:
+ PannerEditor* editor ();
+ boost::shared_ptr<ARDOUR::PannerShell> _panner_shell;
+
boost::shared_ptr<PBD::Controllable> position_control;
PBD::ScopedConnectionList connections;
int drag_start_x;
boost::shared_ptr<PBD::Controllable> position_control;
PBD::ScopedConnectionList connections;
int drag_start_x;
@@
-61,7
+68,7
@@
class MonoPanner : public PannerInterface
BindingProxy position_binder;
BindingProxy position_binder;
- void set_
drag_data
();
+ void set_
tooltip
();
struct ColorScheme {
uint32_t outline;
struct ColorScheme {
uint32_t outline;
@@
-72,10
+79,13
@@
class MonoPanner : public PannerInterface
uint32_t pos_fill;
};
uint32_t pos_fill;
};
+ bool _dragging;
+
static ColorScheme colors;
static void set_colors ();
static bool have_colors;
void color_handler ();
static ColorScheme colors;
static void set_colors ();
static bool have_colors;
void color_handler ();
+ void bypass_handler ();
};
#endif /* __gtk_ardour_mono_panner_h__ */
};
#endif /* __gtk_ardour_mono_panner_h__ */