mia/Aegisub
1
0
Fork 1
Code Issues Pull requests Projects Releases Wiki Activity

Fix gcc build errors introduced in r4702

Browse source 
Originally committed to SVN as r4704.
This commit is contained in:
Thomas Goyne 2010-07-23 06:21:22 +00:00
parent de1588cd1d
commit da0fb8cde7
2 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
aegisub/src/threaded_frame_source.cpp
View file

@ -164,7 +164,7 @@ ThreadedFrameSource::ThreadedFrameSource(wxString videoFileName, wxEvtHandler *p
Run(); Run();
} }
void ThreadedFrameSource::LoadSubtitles(AssFile *subs) { void ThreadedFrameSource::LoadSubtitles(AssFile *subs) throw() {
AssExporter exporter(subs); AssExporter exporter(subs);
exporter.AddAutoFilters(); exporter.AddAutoFilters();
AssFile *exported = exporter.ExportTransform(); AssFile *exported = exporter.ExportTransform();
@ -175,7 +175,7 @@ void ThreadedFrameSource::LoadSubtitles(AssFile *subs) {
nextSubs.reset(exported); nextSubs.reset(exported);
} }
void ThreadedFrameSource::RequestFrame(int frame, double time) { void ThreadedFrameSource::RequestFrame(int frame, double time) throw() {
wxMutexLocker locker(jobMutex); wxMutexLocker locker(jobMutex);
nextTime = time; nextTime = time;
nextFrame = frame; nextFrame = frame;

6
aegisub/src/threaded_frame_source.h
View file

@ -166,6 +166,6 @@ public:
SubtitlesProviderErrorEvent(wxString msg); SubtitlesProviderErrorEvent(wxString msg);
}; };
wxDECLARE_EVENT(EVT_FRAME_READY, FrameReadyEvent) wxDECLARE_EVENT(EVT_FRAME_READY, FrameReadyEvent);
wxDECLARE_EVENT(EVT_VIDEO_ERROR, VideoProviderErrorEvent) wxDECLARE_EVENT(EVT_VIDEO_ERROR, VideoProviderErrorEvent);
wxDECLARE_EVENT(EVT_SUBTITLES_ERROR, SubtitlesProviderErrorEvent) wxDECLARE_EVENT(EVT_SUBTITLES_ERROR, SubtitlesProviderErrorEvent);