projects
/
ardour.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Move object+range button up with the rest of the tool buttons (bringing edit toolbar...
[ardour.git]
/
gtk2_ardour
/
axis_view.h
diff --git
a/gtk2_ardour/axis_view.h
b/gtk2_ardour/axis_view.h
index e0ad68e5c9e183ba30a3881162bbda87fc379f9b..108d14c1f12f7fb358a5fcedf6bb8e1a89f2d5e5 100644
(file)
--- a/
gtk2_ardour/axis_view.h
+++ b/
gtk2_ardour/axis_view.h
@@
-1,5
+1,5
@@
/*
/*
- Copyright (C) 2003 Paul Davis
+ Copyright (C) 2003 Paul Davis
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
@@
-15,16
+15,23
@@
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_axis_view_h__
#define __ardour_gtk_axis_view_h__
#include <list>
*/
#ifndef __ardour_gtk_axis_view_h__
#define __ardour_gtk_axis_view_h__
#include <list>
-#include <gtkmm.h>
-#include <pbd/xml++.h>
+
+#include <gtkmm/label.h>
+#include <gdkmm/color.h>
+
+#include "pbd/xml++.h"
+#include "pbd/signals.h"
+
+#include "ardour/session_handle.h"
+
#include "prompter.h"
#include "prompter.h"
+#include "selectable.h"
namespace ARDOUR {
class Session;
namespace ARDOUR {
class Session;
@@
-34,7
+41,7
@@
namespace ARDOUR {
* AxisView defines the abstract base class for time-axis trackviews and routes.
*
*/
* AxisView defines the abstract base class for time-axis trackviews and routes.
*
*/
-class AxisView : public virtual
sigc::trackable
+class AxisView : public virtual
Selectable, public PBD::ScopedConnectionList, public ARDOUR::SessionHandlePtr
{
public:
/**
{
public:
/**
@@
-44,33
+51,24
@@
class AxisView : public virtual sigc::trackable
*/
Gdk::Color color() const { return _color; }
*/
Gdk::Color color() const { return _color; }
- ARDOUR::Session
&
session() const { return _session; }
+ ARDOUR::Session
*
session() const { return _session; }
- virtual string name() const = 0;
+ virtual st
d::st
ring name() const = 0;
- virtual void set_selected (bool yn) {
- if (yn != _selected) {
- _selected = yn;
- }
- }
-
virtual bool marked_for_display() const { return _marked_for_display; }
virtual bool marked_for_display() const { return _marked_for_display; }
-
virtual void set_marked_for_display (bool yn) {
virtual void set_marked_for_display (bool yn) {
- if (yn != _marked_for_display) {
- _marked_for_display = yn;
- }
+ _marked_for_display = yn;
}
}
- virtual bool selected() const { return _selected; }
sigc::signal<void> Hiding;
sigc::signal<void> Hiding;
- sigc::signal<void> GoingAway;
+
+ void set_old_order_key (uint32_t ok) { _old_order_key = ok; }
+ uint32_t old_order_key() const { return _old_order_key; }
protected:
protected:
- AxisView (ARDOUR::Session
&
sess);
+ AxisView (ARDOUR::Session
*
sess);
virtual ~AxisView();
virtual ~AxisView();
-
/**
* Generate a new random TrackView color, unique from those colors already used.
/**
* Generate a new random TrackView color, unique from those colors already used.
@@
-80,17
+78,15
@@
class AxisView : public virtual sigc::trackable
static Gdk::Color unique_random_color();
static Gdk::Color unique_random_color();
- ARDOUR::Session& _session;
Gdk::Color _color;
Gdk::Color _color;
- static list<Gdk::Color> used_colors;
+ static
std::
list<Gdk::Color> used_colors;
Gtk::Label name_label;
Gtk::Label name_label;
- bool _selected;
-
bool _marked_for_display;
bool _marked_for_display;
-
+ uint32_t _old_order_key;
+
}; /* class AxisView */
#endif /* __ardour_gtk_axis_view_h__ */
}; /* class AxisView */
#endif /* __ardour_gtk_axis_view_h__ */