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 0f5c414408c31b8b1ee2293d949a10e84b56f786..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,22
+23,19
@@
#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;
-Editor
::Cursor::
Cursor (Editor& ed, bool (Editor::*callbck)(GdkEvent*,ArdourCanvas::Item*))
+Editor
Cursor::Editor
Cursor (Editor& ed, bool (Editor::*callbck)(GdkEvent*,ArdourCanvas::Item*))
: editor (ed),
canvas_item (*editor.cursor_group),
length(1.0)
{
: editor (ed),
canvas_item (*editor.cursor_group),
length(1.0)
{
-
- /* "randomly" initialize coords */
-
- points.push_back(Gnome::Art::Point(1.0, 0.0));
+ points.push_back(Gnome::Art::Point(-1.0, 0.0)); // first x-coord needs to be a non-normal value
points.push_back(Gnome::Art::Point(1.0, 1.0));
canvas_item.property_points() = points;
points.push_back(Gnome::Art::Point(1.0, 1.0));
canvas_item.property_points() = points;
@@
-50,18
+47,20
@@
Editor::Cursor::Cursor (Editor& ed, bool (Editor::*callbck)(GdkEvent*,ArdourCanv
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 */
}
-Editor
::Cursor::~
Cursor ()
+Editor
Cursor::~Editor
Cursor ()
{
}
void
{
}
void
-Editor
::Cursor::set_position (nframes64
_t frame)
+Editor
Cursor::set_position (framepos
_t 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()) {
@@
-75,17
+74,17
@@
Editor::Cursor::set_position (nframes64_t frame)
}
void
}
void
-Editor
::
Cursor::set_length (double units)
+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
-Editor
::
Cursor::set_y_axis (double position)
+void
+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;
}