merge from 2.0-ongoing @ 3581

git-svn-id: svn://localhost/ardour2/branches/3.0@3711 d708f5d6-7413-0410-9779-e7cbd77b26cf
This commit is contained in:
Paul Davis 2008-09-10 15:03:30 +00:00
parent e4372df05b
commit 68e943265e
283 changed files with 8269 additions and 3942 deletions

View file

@ -210,7 +210,7 @@ Editor::draw_measures ()
}
void
Editor::mouse_add_new_tempo_event (nframes_t frame)
Editor::mouse_add_new_tempo_event (nframes64_t frame)
{
if (session == 0) {
return;
@ -252,7 +252,7 @@ Editor::mouse_add_new_tempo_event (nframes_t frame)
}
void
Editor::mouse_add_new_meter_event (nframes_t frame)
Editor::mouse_add_new_meter_event (nframes64_t frame)
{
if (session == 0) {
return;