From 892ac2f0fb23423171f2413044166f43ed7a86e3 Mon Sep 17 00:00:00 2001 From: Erik Faye-Lund Date: Tue, 17 Nov 2009 11:22:46 +0000 Subject: [PATCH] allow moving left/right when playing back There's no point in disallowing left/right motion when playing back. This patch re-allows that (and allows swapping tracks while playing back as well). --- editor/trackview.cpp | 52 ++++++++++++++++++++++++++++++++-------------------- 1 file changed, 32 insertions(+), 20 deletions(-) diff --git a/editor/trackview.cpp b/editor/trackview.cpp index 2a45d5f..8b47ec1 100644 --- a/editor/trackview.cpp +++ b/editor/trackview.cpp @@ -942,6 +942,38 @@ LRESULT TrackView::onKeyDown(UINT keyCode, UINT /*flags*/) } } + if (editString.empty()) + { + switch (keyCode) + { + case VK_LEFT: + if (GetKeyState(VK_CONTROL) < 0) { + if (0 < editTrack) + doc->swapTrackOrder(editTrack, editTrack - 1); + else + MessageBeep(-1); + } + if (0 != getTrackCount()) + setEditTrack(editTrack - 1); + else + MessageBeep(-1); + break; + + case VK_RIGHT: + if (GetKeyState(VK_CONTROL) < 0) { + if (int(getTrackCount()) > editTrack + 1) + doc->swapTrackOrder(editTrack, editTrack + 1); + else + MessageBeep(-1); + } + if (0 != getTrackCount()) + setEditTrack(editTrack + 1); + else + MessageBeep(-1); + break; + } + } + if (editString.empty() && doc->clientPaused) { switch (keyCode) @@ -968,26 +1000,6 @@ LRESULT TrackView::onKeyDown(UINT keyCode, UINT /*flags*/) else setEditRow(editRow + 1); break; - case VK_LEFT: - if (GetKeyState(VK_CONTROL) < 0) - { - if (0 < editTrack) doc->swapTrackOrder(editTrack, editTrack - 1); - else MessageBeep(-1); - } - if (0 != getTrackCount()) setEditTrack(editTrack - 1); - else MessageBeep(-1); - break; - - case VK_RIGHT: - if (GetKeyState(VK_CONTROL) < 0) - { - if (int(getTrackCount()) > editTrack + 1) doc->swapTrackOrder(editTrack, editTrack + 1); - else MessageBeep(-1); - } - if (0 != getTrackCount()) setEditTrack(editTrack + 1); - else MessageBeep(-1); - break; - case VK_PRIOR: if (GetKeyState(VK_CONTROL) < 0) {