ardour/ardour
ardour
/
ardour
13
1
Fork 0
Code Pull Requests Releases Activity

more editor*.cc fixes 

git-svn-id: svn://localhost/trunk/ardour2@100 d708f5d6-7413-0410-9779-e7cbd77b26cf
This commit is contained in:
Paul Davis 2005-11-16 03:09:36 +00:00
parent f16caf535c
commit 077b5779b9
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
gtk2_ardour/editor.h
View File

@ -610,7 +610,7 @@ class Editor : public PublicEditor
jack_nframes_t current_frame;
double length;
Cursor (Editor&, const string& color, bool (Editor::*)(GdkEvent*));
Cursor (Editor&, const string& color, bool (Editor::*)(GdkEvent*,ArdourCanvas::Item*));
~Cursor ();
void set_position (jack_nframes_t);
@ -1184,8 +1184,8 @@ class Editor : public PublicEditor
/* non-public event handlers */
bool canvas_playhead_cursor_event (GdkEvent* event);
bool canvas_edit_cursor_event (GdkEvent* event);
bool canvas_playhead_cursor_event (GdkEvent* event, ArdourCanvas::Item*);
bool canvas_edit_cursor_event (GdkEvent* event, ArdourCanvas::Item*);
bool track_canvas_event (GdkEvent* event, ArdourCanvas::Item*);
bool track_canvas_button_press_event (GdkEventButton *);

4
gtk2_ardour/editor_cursors.cc
View File

@ -30,7 +30,7 @@ using namespace sigc;
using namespace ARDOUR;
using namespace Gtk;
Editor::Cursor::Cursor (Editor& ed, const string& color, bool (Editor::*callbck)(GdkEvent*))
Editor::Cursor::Cursor (Editor& ed, const string& color, bool (Editor::*callbck)(GdkEvent*,ArdourCanvas::Item*))
: editor (ed), length(1.0)
{
@ -54,7 +54,7 @@ Editor::Cursor::Cursor (Editor& ed, const string& color, bool (Editor::*callbck)
// cerr << "cursor line @ " << canvas_item << endl;
canvas_item->set_data ("cursor", this);
canvas_item->signal_event().connect (mem_fun (ed, callbck));
canvas_item->signal_event().connect (bind (mem_fun (ed, callbck), canvas_item));
current_frame = 1; /* force redraw at 0 */
}