iqbalrifai
/
Aegisub
mirror of https://github.com/odrling/Aegisub
1
0
Fork 0
Code Issues Releases Wiki Activity

Disabled DSS error message, which was causing Aegisub to crash when a DSS video file was dropped on it 

Originally committed to SVN as r581.
This commit is contained in:
Rodrigo Braz Monteiro 2006-12-19 02:59:03 +00:00
parent d4e2b2ce4f
commit 091226bb4b
2 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
core/video_display.cpp
View File

@ -267,7 +267,7 @@ void VideoDisplay::OnPaint(wxPaintEvent& event) {
// Draw frame // Draw frame
dc.BeginDrawing(); dc.BeginDrawing();
dc.DrawBitmap(GetFrame(frame_n),0,0); if (provider) dc.DrawBitmap(GetFrame(frame_n),0,0);
dc.EndDrawing(); dc.EndDrawing();
} }
@ -794,7 +794,6 @@ void VideoDisplay::DrawText( wxPoint Pos, wxString text ) {
// Requests a new frame // Requests a new frame
wxBitmap VideoDisplay::GetFrame(int n) { wxBitmap VideoDisplay::GetFrame(int n) {
frame_n = n; frame_n = n;
return provider->GetFrame(n); return provider->GetFrame(n);
RefreshVideo(); RefreshVideo();
} }

2
core/video_provider_avs.cpp
View File

@ -200,7 +200,7 @@ PClip AvisynthVideoProvider::OpenVideo(wxString _filename, bool mpeg2dec3_priori
AVSTRACE(_T("AvisynthVideoProvider::OpenVideo: Converted to RGB32")); AVSTRACE(_T("AvisynthVideoProvider::OpenVideo: Converted to RGB32"));
// Directshow // Directshow
if (usedDirectshow) wxMessageBox(_T("Warning! The file is being opened using Avisynth's DirectShowSource, which has unreliable seeking. Frame numbers might not match the real number. PROCEED AT YOUR OWN RISK!"),_T("DirectShowSource warning"),wxICON_EXCLAMATION); //if (usedDirectshow) wxMessageBox(_T("Warning! The file is being opened using Avisynth's DirectShowSource, which has unreliable seeking. Frame numbers might not match the real number. PROCEED AT YOUR OWN RISK!"),_T("DirectShowSource warning"),wxICON_EXCLAMATION);
// Cache // Cache
AVSTRACE(_T("AvisynthVideoProvider::OpenVideo: Finished opening video, AVS mutex will be released now")); AVSTRACE(_T("AvisynthVideoProvider::OpenVideo: Finished opening video, AVS mutex will be released now"));