Unhandled keypresses in grid will now be sent to the audio display.

Originally committed to SVN as r200.

core/base_grid.cpp

@@ -50,6 +50,7 @@
 #include "frame_main.h"
 #include "video_display.h"
 #include "video_slider.h"
+#include "audio_display.h"
 
 
 ///////////////
@@ -1006,10 +1007,15 @@ void BaseGrid::OnKeyPress(wxKeyEvent &event) {
 			}
 
 			MakeCellVisible(extendRow,0,false);
+			return;
 		}
 	}
 
-	event.Skip();
+	// Other events, send to audio display
+	if (video->audio->loaded) {
+		video->audio->AddPendingEvent(event);
+	}
+	else event.Skip();
 }
 
 

core/changelog.txt

@@ -30,6 +30,7 @@ Please visit http://aegisub.net to download latest version
    o Alt+Click on grid will activate the clicked line, without modifying selection.
    o Actor and effect columns are now only visible if they are being used.
    o Double clicking a row will jump video to it, regardless of auto go to option.
+   o Unhandled keypresses in grid will now be sent to the audio display.
 - Toolbar will now properly disable the Jump To buttons if more than one line is selected. (AMZ)
 - Fixed the toolbar "grey area" glitch (was actually a wxWidgets issue). (AMZ)
 - Default video zoom can now be set in config.dat and is defaulted to 100%. (AMZ)

core/frame_main_events.cpp

@@ -1072,6 +1072,7 @@ void FrameMain::OnStatusClear(wxTimerEvent &event) {
 ////////////
 // Key down
 void FrameMain::OnKeyDown(wxKeyEvent &event) {
+	audioBox->audioDisplay->AddPendingEvent(event);
 	event.Skip();
 }
 

core/main.cpp

@@ -339,6 +339,7 @@ void AegisubApp::OnMouseWheel(wxMouseEvent &event) {
 ///////////////
 // Key pressed
 void AegisubApp::OnKey(wxKeyEvent &event) {
+	//frame->audioBox->audioDisplay->AddPendingEvent(event);
 	if (!event.GetSkipped()) {
 		event.Skip();
 	}