projects
/
ardour.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Remove duplicate menubarstyle property.
[ardour.git]
/
gtk2_ardour
/
editor_cursors.cc
diff --git
a/gtk2_ardour/editor_cursors.cc
b/gtk2_ardour/editor_cursors.cc
index c6551095c81a824643ad2b4e722ddfcbd80a5bfa..0f5c414408c31b8b1ee2293d949a10e84b56f786 100644
(file)
--- a/
gtk2_ardour/editor_cursors.cc
+++ b/
gtk2_ardour/editor_cursors.cc
@@
-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>
@@
-28,24
+27,21
@@
using namespace sigc;
using namespace ARDOUR;
using namespace sigc;
using namespace ARDOUR;
+using namespace PBD;
using namespace Gtk;
using namespace Gtk;
-Editor::Cursor::Cursor (Editor& ed,
const string& color,
bool (Editor::*callbck)(GdkEvent*,ArdourCanvas::Item*))
+Editor::Cursor::Cursor (Editor& ed, bool (Editor::*callbck)(GdkEvent*,ArdourCanvas::Item*))
: editor (ed),
: editor (ed),
- points (2),
canvas_item (*editor.cursor_group),
length(1.0)
{
/* "randomly" initialize coords */
canvas_item (*editor.cursor_group),
length(1.0)
{
/* "randomly" initialize coords */
-
- points.push_back(Gnome::Art::Point(-9383839.0, 0.0));
+
points.push_back(Gnome::Art::Point(1.0, 0.0));
points.push_back(Gnome::Art::Point(1.0, 0.0));
-
- // cerr << "set cursor points, nc = " << points->num_points << endl;
+ points.push_back(Gnome::Art::Point(1.0, 1.0));
canvas_item.property_points() = points;
canvas_item.property_points() = points;
- canvas_item.property_fill_color() = color; //.c_str());
canvas_item.property_width_pixels() = 1;
canvas_item.property_first_arrowhead() = TRUE;
canvas_item.property_last_arrowhead() = TRUE;
canvas_item.property_width_pixels() = 1;
canvas_item.property_first_arrowhead() = TRUE;
canvas_item.property_last_arrowhead() = TRUE;
@@
-53,11
+49,8
@@
Editor::Cursor::Cursor (Editor& ed, const string& color, bool (Editor::*callbck)
canvas_item.property_arrow_shape_b() = 0.0;
canvas_item.property_arrow_shape_c() = 9.0;
canvas_item.property_arrow_shape_b() = 0.0;
canvas_item.property_arrow_shape_c() = 9.0;
- // cerr << "cursor line @ " << canvas_item << endl;
-
canvas_item.set_data ("cursor", this);
canvas_item.signal_event().connect (bind (mem_fun (ed, callbck), &canvas_item));
canvas_item.set_data ("cursor", this);
canvas_item.signal_event().connect (bind (mem_fun (ed, callbck), &canvas_item));
-
current_frame = 1; /* force redraw at 0 */
}
current_frame = 1; /* force redraw at 0 */
}
@@
-67,33
+60,18
@@
Editor::Cursor::~Cursor ()
}
void
}
void
-Editor::Cursor::set_position (
jack_nframes
_t frame)
+Editor::Cursor::set_position (
nframes64
_t frame)
{
double new_pos = editor.frame_to_unit (frame);
{
double new_pos = editor.frame_to_unit (frame);
- if (editor.session == 0) {
- canvas_item.hide();
- } else {
- canvas_item.show();
- }
-
- current_frame = frame;
-
if (new_pos != points.front().get_x()) {
points.front().set_x (new_pos);
points.back().set_x (new_pos);
if (new_pos != points.front().get_x()) {
points.front().set_x (new_pos);
points.back().set_x (new_pos);
-
- cerr << "new cursor points = "
- << points.front().get_x() << ',' << points.front().get_y()
- << " .. "
- << points.back().get_x() << ',' << points.back().get_y()
- << endl;
-
+
canvas_item.property_points() = points;
}
canvas_item.property_points() = points;
}
-
- canvas_item.raise_to_top();
+ current_frame = frame;
}
void
}
void