From 716c2eae0d0e0a6532346122bbf5ae08e3eb6903 Mon Sep 17 00:00:00 2001
From: wangqr <wangqr@wangqr.tk>
Date: Wed, 24 Jul 2019 09:11:17 -0400
Subject: [PATCH] Remove the usage of dummy wxTimerEvent

---
 src/audio_karaoke.cpp | 9 ++++++---
 src/audio_karaoke.h   | 3 ++-
 2 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/src/audio_karaoke.cpp b/src/audio_karaoke.cpp
index 6d3d16fa9..2abeb79d8 100644
--- a/src/audio_karaoke.cpp
+++ b/src/audio_karaoke.cpp
@@ -280,8 +280,7 @@ void AudioKaraoke::OnMouse(wxMouseEvent &event) {
 			split_area->Refresh(false);
 			scroll_timer.Start(50);
 			split_area->CaptureMouse();
-			wxTimerEvent evt;
-			OnScrollTimer(evt);
+			OnScrollTimer();
 		}
 		return;
 	}
@@ -317,7 +316,7 @@ void AudioKaraoke::OnMouse(wxMouseEvent &event) {
 	split_area->Refresh(false);
 }
 
-void AudioKaraoke::OnScrollTimer(wxTimerEvent &) {
+void AudioKaraoke::OnScrollTimer() {
 	scroll_x += scroll_dir * char_width * 3;
 
 	int max_scroll = rendered_line.GetWidth() + 20 - split_area->GetClientSize().GetWidth();
@@ -329,6 +328,10 @@ void AudioKaraoke::OnScrollTimer(wxTimerEvent &) {
 	split_area->Refresh(false);
 }
 
+void AudioKaraoke::OnScrollTimer(wxTimerEvent&) {
+	OnScrollTimer();
+}
+
 void AudioKaraoke::LoadFromLine() {
 	scroll_x = 0;
 	scroll_timer.Stop();
diff --git a/src/audio_karaoke.h b/src/audio_karaoke.h
index 2d14207d0..520f48682 100644
--- a/src/audio_karaoke.h
+++ b/src/audio_karaoke.h
@@ -142,7 +142,8 @@ class AudioKaraoke final : public wxWindow {
 	void OnPaint(wxPaintEvent &event);
 	void OnSize(wxSizeEvent &event);
 	void OnAudioOpened(agi::AudioProvider *provider);
-	void OnScrollTimer(wxTimerEvent &event);
+	void OnScrollTimer();
+	void OnScrollTimer(wxTimerEvent& event);
 
 public:
 	/// Constructor