diff --git a/aegisub/src/threaded_frame_source.cpp b/aegisub/src/threaded_frame_source.cpp index 9e2dd7661..a21ccf7a6 100644 --- a/aegisub/src/threaded_frame_source.cpp +++ b/aegisub/src/threaded_frame_source.cpp @@ -164,7 +164,7 @@ ThreadedFrameSource::ThreadedFrameSource(wxString videoFileName, wxEvtHandler *p Run(); } -void ThreadedFrameSource::LoadSubtitles(AssFile *subs) { +void ThreadedFrameSource::LoadSubtitles(AssFile *subs) throw() { AssExporter exporter(subs); exporter.AddAutoFilters(); AssFile *exported = exporter.ExportTransform(); @@ -175,7 +175,7 @@ void ThreadedFrameSource::LoadSubtitles(AssFile *subs) { nextSubs.reset(exported); } -void ThreadedFrameSource::RequestFrame(int frame, double time) { +void ThreadedFrameSource::RequestFrame(int frame, double time) throw() { wxMutexLocker locker(jobMutex); nextTime = time; nextFrame = frame; diff --git a/aegisub/src/threaded_frame_source.h b/aegisub/src/threaded_frame_source.h index cf139a5ae..a7b84ffdd 100644 --- a/aegisub/src/threaded_frame_source.h +++ b/aegisub/src/threaded_frame_source.h @@ -166,6 +166,6 @@ public: SubtitlesProviderErrorEvent(wxString msg); }; -wxDECLARE_EVENT(EVT_FRAME_READY, FrameReadyEvent) -wxDECLARE_EVENT(EVT_VIDEO_ERROR, VideoProviderErrorEvent) -wxDECLARE_EVENT(EVT_SUBTITLES_ERROR, SubtitlesProviderErrorEvent) +wxDECLARE_EVENT(EVT_FRAME_READY, FrameReadyEvent); +wxDECLARE_EVENT(EVT_VIDEO_ERROR, VideoProviderErrorEvent); +wxDECLARE_EVENT(EVT_SUBTITLES_ERROR, SubtitlesProviderErrorEvent);