unbroke compilation of the directshow video provider, broke with last commit. Patch by Harukalover.

Originally committed to SVN as r2253.
This commit is contained in:
Karl Blomster 2008-07-15 12:44:53 +00:00
parent 893ff2f78a
commit cdb2227024

View file

@ -53,6 +53,8 @@
#include "include/aegisub/video_provider.h" #include "include/aegisub/video_provider.h"
#include "videosink.h" #include "videosink.h"
#include "vfr.h" #include "vfr.h"
#include "vfw_wrap.h"
#include "mkv_wrap.h"
/////////////////////////////////// ///////////////////////////////////
@ -82,6 +84,7 @@ private:
wxArrayInt KeyFrames; wxArrayInt KeyFrames;
bool keyFramesLoaded; bool keyFramesLoaded;
bool isVfr; bool isVfr;
FrameRate trueFrameRate;
HRESULT OpenVideo(wxString _filename); HRESULT OpenVideo(wxString _filename);
void CloseVideo(); void CloseVideo();
@ -118,7 +121,7 @@ public:
bool AreKeyFramesLoaded() { return keyFramesLoaded; }; bool AreKeyFramesLoaded() { return keyFramesLoaded; };
wxArrayInt GetKeyFrames() { return KeyFrames; }; wxArrayInt GetKeyFrames() { return KeyFrames; };
bool IsVFR() { return isVfr; }; bool IsVFR() { return isVfr; };
FrameRate GetTrueFrameRate() { return isVfr? trueFrameRate: FrameRate() }; FrameRate GetTrueFrameRate() { return isVfr ? trueFrameRate : FrameRate(); };
Aegisub::String GetDecoderName() { return L"DirectShow"; } Aegisub::String GetDecoderName() { return L"DirectShow"; }
bool IsNativelyByFrames() { return false; } bool IsNativelyByFrames() { return false; }