third-party-mirrors/spek
1
0
Fork 0
mirror of https://github.com/alexkay/spek.git synced 2025-06-06 02:13:31 +03:00
Code Issues Packages Projects Releases Wiki Activity

Process all pending events before re-starting, fixes #31

Browse Source
This commit is contained in:
Alexander Kojevnikov 2012-09-20 10:16:51 -07:00
parent f073eec154
commit 08f651eada
3 changed files with 4 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/spek-spectrogram.cc
View File

@ -36,7 +36,6 @@ extern "C" {
BEGIN_EVENT_TABLE(SpekSpectrogram, wxWindow) BEGIN_EVENT_TABLE(SpekSpectrogram, wxWindow)
EVT_CHAR(SpekSpectrogram::on_char) EVT_CHAR(SpekSpectrogram::on_char)
EVT_IDLE(SpekSpectrogram::on_idle)
EVT_PAINT(SpekSpectrogram::on_paint) EVT_PAINT(SpekSpectrogram::on_paint)
EVT_SIZE(SpekSpectrogram::on_size) EVT_SIZE(SpekSpectrogram::on_size)
SPEK_EVT_HAVE_SAMPLE(SpekSpectrogram::on_have_sample) SPEK_EVT_HAVE_SAMPLE(SpekSpectrogram::on_have_sample)
@ -136,12 +135,6 @@ void SpekSpectrogram::on_char(wxKeyEvent& evt)
Refresh(); Refresh();
} }
void SpekSpectrogram::on_idle(wxIdleEvent& evt)
{
// TODO: remove?
Update();
}
void SpekSpectrogram::on_paint(wxPaintEvent& evt) void SpekSpectrogram::on_paint(wxPaintEvent& evt)
{ {
wxAutoBufferedPaintDC dc(this); wxAutoBufferedPaintDC dc(this);
@ -393,6 +386,9 @@ void SpekSpectrogram::stop()
if (this->pipeline) { if (this->pipeline) {
spek_pipeline_close(this->pipeline); spek_pipeline_close(this->pipeline);
this->pipeline = NULL; this->pipeline = NULL;
// Make sure all have_sample events are processed before returning.
wxApp::GetInstance()->ProcessPendingEvents();
} }
} }

1
src/spek-spectrogram.hh
View File

@ -35,7 +35,6 @@ public:
private: private:
void on_char(wxKeyEvent& evt); void on_char(wxKeyEvent& evt);
void on_idle(wxIdleEvent& evt);
void on_paint(wxPaintEvent& evt); void on_paint(wxPaintEvent& evt);
void on_size(wxSizeEvent& evt); void on_size(wxSizeEvent& evt);
void on_have_sample(SpekHaveSampleEvent& evt); void on_have_sample(SpekHaveSampleEvent& evt);

2
src/spek-window.cc
View File

@ -104,7 +104,7 @@ SpekWindow::SpekWindow(const wxString& path) :
wxMenu *menu_help = new wxMenu(); wxMenu *menu_help = new wxMenu();
wxMenuItem *menu_help_contents = new wxMenuItem( wxMenuItem *menu_help_contents = new wxMenuItem(
menu_help, wxID_HELP, _("&Help") + wxT("\tF1")); menu_help, wxID_HELP, wxString(_("&Help")) + wxT("\tF1"));
menu_help->Append(menu_help_contents); menu_help->Append(menu_help_contents);
wxMenuItem *menu_help_about = new wxMenuItem(menu_help, wxID_ABOUT); wxMenuItem *menu_help_about = new wxMenuItem(menu_help, wxID_ABOUT);
menu_help_about->SetItemLabel(menu_help_about->GetItemLabelText() + wxT("\tShift-F1")); menu_help_about->SetItemLabel(menu_help_about->GetItemLabelText() + wxT("\tShift-F1"));