mirror of https://github.com/odrling/Aegisub
Fix gcc build errors introduced in r4702
Originally committed to SVN as r4704.
This commit is contained in:
parent
de1588cd1d
commit
da0fb8cde7
|
@ -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;
|
||||
|
|
|
@ -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);
|
||||
|
|
Loading…
Reference in New Issue