projects
/
ardour.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Don't allow aux sends from MIDI tracks for the time
[ardour.git]
/
gtk2_ardour
/
editor_cursors.cc
diff --git
a/gtk2_ardour/editor_cursors.cc
b/gtk2_ardour/editor_cursors.cc
index bedff567011139ddb742a7f1ece4b53074fa258a..ccacda210f01484f5342e381e7248e34aeb0e423 100644
(file)
--- a/
gtk2_ardour/editor_cursors.cc
+++ b/
gtk2_ardour/editor_cursors.cc
@@
-1,5
+1,5
@@
/*
/*
- Copyright (C) 2000 Paul Davis
+ Copyright (C) 2000 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
@@
-23,9
+23,9
@@
#include <libgnomecanvas/libgnomecanvas.h>
#include "utils.h"
#include <libgnomecanvas/libgnomecanvas.h>
#include "utils.h"
+#include "editor_cursors.h"
#include "editor.h"
#include "editor.h"
-using namespace sigc;
using namespace ARDOUR;
using namespace PBD;
using namespace Gtk;
using namespace ARDOUR;
using namespace PBD;
using namespace Gtk;
@@
-47,7
+47,7
@@
EditorCursor::EditorCursor (Editor& ed, bool (Editor::*callbck)(GdkEvent*,Ardour
canvas_item.property_arrow_shape_c() = 9.0;
canvas_item.set_data ("cursor", this);
canvas_item.property_arrow_shape_c() = 9.0;
canvas_item.set_data ("cursor", this);
- canvas_item.signal_event().connect (
bind (
mem_fun (ed, callbck), &canvas_item));
+ canvas_item.signal_event().connect (
sigc::bind (sigc::
mem_fun (ed, callbck), &canvas_item));
current_frame = 1; /* force redraw at 0 */
}
current_frame = 1; /* force redraw at 0 */
}
@@
-57,10
+57,10
@@
EditorCursor::~EditorCursor ()
}
void
}
void
-EditorCursor::set_position (
nframes64
_t frame)
+EditorCursor::set_position (
framepos
_t frame)
{
PositionChanged (frame);
{
PositionChanged (frame);
-
+
double new_pos = editor.frame_to_unit (frame);
if (new_pos != points.front().get_x()) {
double new_pos = editor.frame_to_unit (frame);
if (new_pos != points.front().get_x()) {
@@
-76,15
+76,15
@@
EditorCursor::set_position (nframes64_t frame)
void
EditorCursor::set_length (double units)
{
void
EditorCursor::set_length (double units)
{
- length = units;
+ length = units;
points.back().set_y (points.front().get_y() + length);
canvas_item.property_points() = points;
}
points.back().set_y (points.front().get_y() + length);
canvas_item.property_points() = points;
}
-void
+void
EditorCursor::set_y_axis (double position)
{
EditorCursor::set_y_axis (double position)
{
-
points.front().set_y (position);
+ points.front().set_y (position);
points.back().set_y (position + length);
canvas_item.property_points() = points;
}
points.back().set_y (position + length);
canvas_item.property_points() = points;
}