projects
/
ardour.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
merge robin gareus' libltc into ardour source tree for convenience
[ardour.git]
/
gtk2_ardour
/
panner2d.h
diff --git
a/gtk2_ardour/panner2d.h
b/gtk2_ardour/panner2d.h
index 6726d5f7cf04f93d38701c77edbc411794ae701b..881638856f9f8ee5279b88bc0d28a310905e0fd4 100644
(file)
--- a/
gtk2_ardour/panner2d.h
+++ b/
gtk2_ardour/panner2d.h
@@
-34,10
+34,10
@@
#include "pbd/cartesian.h"
#include "pbd/cartesian.h"
-#include "ardour_
dialog
.h"
+#include "ardour_
window
.h"
namespace ARDOUR {
namespace ARDOUR {
- class Panner;
+ class Panner
Shell
;
}
namespace Gtk {
}
namespace Gtk {
@@
-54,7
+54,7
@@
class Panner2dWindow;
class Panner2d : public Gtk::DrawingArea
{
public:
class Panner2d : public Gtk::DrawingArea
{
public:
- Panner2d (boost::shared_ptr<ARDOUR::Panner>, int32_t height);
+ Panner2d (boost::shared_ptr<ARDOUR::Panner
Shell
>, int32_t height);
~Panner2d ();
void allow_target_motion (bool);
~Panner2d ();
void allow_target_motion (bool);
@@
-64,7
+64,7
@@
class Panner2d : public Gtk::DrawingArea
void move_signal (int which, const PBD::AngularVector&);
void reset (uint32_t n_inputs);
void move_signal (int which, const PBD::AngularVector&);
void reset (uint32_t n_inputs);
- boost::shared_ptr<ARDOUR::Panner
> get_panner() const { return panner
; }
+ boost::shared_ptr<ARDOUR::Panner
Shell> get_panner_shell() const { return panner_shell
; }
sigc::signal<void,int> PuckMoved;
sigc::signal<void,int> TargetMoved;
sigc::signal<void,int> PuckMoved;
sigc::signal<void,int> TargetMoved;
@@
-102,7
+102,7
@@
class Panner2d : public Gtk::DrawingArea
bool _selected;
};
bool _selected;
};
- boost::shared_ptr<ARDOUR::Panner
> panner
;
+ boost::shared_ptr<ARDOUR::Panner
Shell> panner_shell
;
Glib::RefPtr<Pango::Layout> layout;
typedef std::vector<Target*> Targets;
Glib::RefPtr<Pango::Layout> layout;
typedef std::vector<Target*> Targets;
@@
-143,10
+143,10
@@
class Panner2d : public Gtk::DrawingArea
void clamp_to_circle (double& x, double& y);
};
void clamp_to_circle (double& x, double& y);
};
-class Panner2dWindow : public Ardour
Dialog
+class Panner2dWindow : public Ardour
Window
{
public:
{
public:
- Panner2dWindow (boost::shared_ptr<ARDOUR::Panner>, int32_t height, uint32_t inputs);
+ Panner2dWindow (boost::shared_ptr<ARDOUR::Panner
Shell
>, int32_t height, uint32_t inputs);
void reset (uint32_t n_inputs);
void reset (uint32_t n_inputs);