ardour/livetrax
13
0
Fork 0
Code

Two patches from Brian Ahr. Thanks!

Browse Source 
*Fixed zooming on edit cursor.
*Fixed play-from-edit-cursor.


git-svn-id: svn://localhost/ardour2/trunk@1078 d708f5d6-7413-0410-9779-e7cbd77b26cf
This commit is contained in:
Taybin Rutkin 2006-11-06 17:59:03 +00:00
parent 4f5af6d062
commit d4eacffb26
3 changed files with 10 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
gtk2_ardour/editor.cc
View File

@ -1865,7 +1865,7 @@ Editor::add_dstream_context_items (Menu_Helpers::MenuList& edit_items)
MenuList& play_items = play_menu->items();
play_menu->set_name ("ArdourContextMenu");
play_items.push_back (MenuElem (_("Play from edit cursor")));
play_items.push_back (MenuElem (_("Play from edit cursor"), mem_fun(*this, &Editor::play_from_edit_cursor)));
play_items.push_back (MenuElem (_("Play from start"), mem_fun(*this, &Editor::play_from_start)));
play_items.push_back (MenuElem (_("Play region"), mem_fun(*this, &Editor::play_selected_region)));
play_items.push_back (SeparatorElem());
@ -1950,7 +1950,7 @@ Editor::add_bus_context_items (Menu_Helpers::MenuList& edit_items)
MenuList& play_items = play_menu->items();
play_menu->set_name ("ArdourContextMenu");
play_items.push_back (MenuElem (_("Play from edit cursor")));
play_items.push_back (MenuElem (_("Play from edit cursor"), mem_fun(*this, &Editor::play_from_edit_cursor)));
play_items.push_back (MenuElem (_("Play from start"), mem_fun(*this, &Editor::play_from_start)));
edit_items.push_back (MenuElem (_("Play"), *play_menu));

1
gtk2_ardour/editor.h
View File

@ -893,6 +893,7 @@ class Editor : public PublicEditor
void rename_region_finished (bool);
void play_from_start ();
void play_from_edit_cursor ();
void play_selected_region ();
void audition_selected_region ();
void loop_selected_region ();

8
gtk2_ardour/editor_ops.cc
View File

@ -1088,7 +1088,7 @@ Editor::temporal_zoom (gdouble fpu)
case ZoomFocusEdit:
/* try to keep the edit cursor in the center */
if (edit_cursor->current_frame > leftmost_frame + (new_page/2)) {
if (edit_cursor->current_frame > new_page/2) {
leftmost_after_zoom = edit_cursor->current_frame - (new_page/2);
} else {
leftmost_after_zoom = 0;
@ -1854,6 +1854,12 @@ Editor::play_from_start ()
session->request_locate (session->current_start_frame(), true);
}
void
Editor::play_from_edit_cursor ()
{
session->request_locate (edit_cursor->current_frame, true);
}
void
Editor::play_selection ()
{