projects
/
ardour.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Move all sync in / out options out of the menus and into the options dialogue.
[ardour.git]
/
gtk2_ardour
/
axis_view.cc
diff --git
a/gtk2_ardour/axis_view.cc
b/gtk2_ardour/axis_view.cc
index e69fdf0540fe48611585b3b6e661e2ff8797b1db..eb3ef23bc64a05925746f8c824478158e6f94917 100644
(file)
--- a/
gtk2_ardour/axis_view.cc
+++ b/
gtk2_ardour/axis_view.cc
@@
-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,7
+15,6
@@
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$
*/
#include <cstdlib>
*/
#include <cstdlib>
@@
-26,41
+25,42
@@
#include <list>
#include <list>
-#include
<pbd/error.h>
+#include
"pbd/error.h"
#include <gtkmm2ext/utils.h>
#include <gtkmm2ext/selector.h>
#include <gtkmm2ext/gtk_ui.h>
#include <gtkmm2ext/utils.h>
#include <gtkmm2ext/selector.h>
#include <gtkmm2ext/gtk_ui.h>
-#include
<ardour/session.h>
-#include
<ardour/utils.h>
+#include
"ardour/session.h"
+#include
"ardour/utils.h"
#include "public_editor.h"
#include "axis_view.h"
#include "i18n.h"
#include "public_editor.h"
#include "axis_view.h"
#include "i18n.h"
+using namespace std;
using namespace Gtk;
using namespace Gtkmm2ext;
using namespace Gtk;
using namespace Gtkmm2ext;
-
+using namespace ARDOUR;
list<Gdk::Color> AxisView::used_colors;
list<Gdk::Color> AxisView::used_colors;
-AxisView::AxisView (ARDOUR::Session& sess) : _session(sess)
+AxisView::AxisView (ARDOUR::Session* sess)
+ : SessionHandlePtr (sess)
{
_selected = false;
{
_selected = false;
- _marked_for_display =
tru
e;
+ _marked_for_display =
fals
e;
}
AxisView::~AxisView()
{
}
AxisView::~AxisView()
{
-
}
Gdk::Color
AxisView::unique_random_color()
{
Gdk::Color newcolor;
}
Gdk::Color
AxisView::unique_random_color()
{
Gdk::Color newcolor;
-
+
while (1) {
/* avoid neon/glowing tones by limiting them to the
while (1) {
/* avoid neon/glowing tones by limiting them to the
@@
-77,11
+77,11
@@
AxisView::unique_random_color()
used_colors.push_back (newcolor);
return newcolor;
}
used_colors.push_back (newcolor);
return newcolor;
}
-
+
for (list<Gdk::Color>::iterator i = used_colors.begin(); i != used_colors.end(); ++i) {
Gdk::Color c = *i;
float rdelta, bdelta, gdelta;
for (list<Gdk::Color>::iterator i = used_colors.begin(); i != used_colors.end(); ++i) {
Gdk::Color c = *i;
float rdelta, bdelta, gdelta;
-
+
rdelta = newcolor.get_red() - c.get_red();
bdelta = newcolor.get_blue() - c.get_blue();
gdelta = newcolor.get_green() - c.get_green();
rdelta = newcolor.get_red() - c.get_red();
bdelta = newcolor.get_blue() - c.get_blue();
gdelta = newcolor.get_green() - c.get_green();