diff --git a/aegisub/src/video_context.cpp b/aegisub/src/video_context.cpp index fc7ed8914..59f2056db 100644 --- a/aegisub/src/video_context.cpp +++ b/aegisub/src/video_context.cpp @@ -100,8 +100,6 @@ VideoContext::VideoContext() { // Set GL context glContext = NULL; ownGlContext = false; - lastTex = 0; - lastFrame = -1; // Set options audio = NULL; @@ -179,9 +177,6 @@ void VideoContext::Reset() { // Update displays UpdateDisplays(true); - // Remove textures - UnloadTexture(); - // Clean up video data wxRemoveFile(tempfile); tempfile = _T(""); @@ -209,17 +204,6 @@ void VideoContext::Reload() { } } -/// @brief Unload texture -/// -void VideoContext::UnloadTexture() { - // Remove textures - if (lastTex != 0) { - glDeleteTextures(1,&lastTex); - lastTex = 0; - } - lastFrame = -1; -} - /// @brief Sets video filename /// @param filename /// @@ -345,9 +329,6 @@ void VideoContext::UpdateDisplays(bool full) { /// @param subtitles /// void VideoContext::Refresh (bool video, bool subtitles) { - // Reset frame - lastFrame = -1; - // Update subtitles if (subtitles && subsProvider) { // Re-export diff --git a/aegisub/src/video_context.h b/aegisub/src/video_context.h index 9a51c125f..c55f5711c 100644 --- a/aegisub/src/video_context.h +++ b/aegisub/src/video_context.h @@ -90,21 +90,12 @@ private: /// DOCME std::list displayList; - /// DOCME - GLuint lastTex; - - /// DOCME - int lastFrame; - /// DOCME bool ownGlContext; /// DOCME wxGLContext *glContext; - /// DOCME - VideoFrameFormat vidFormat; - /// DOCME AegiVideoFrame tempFrame; @@ -118,7 +109,6 @@ private: /// DOCME SubtitlesProvider *subsProvider; - /// DOCME bool keyFramesLoaded; @@ -134,7 +124,6 @@ private: /// DOCME wxString keyFramesFilename; - /// DOCME wxMutex playMutex; @@ -159,21 +148,12 @@ private: /// DOCME bool loaded; - /// DOCME - bool isInverted; - /// DOCME bool isPlaying; /// DOCME bool keepAudioSync; - - /// DOCME - - /// DOCME - float texW,texH; - /// DOCME /// DOCME @@ -188,18 +168,15 @@ private: /// DOCME double fps; - /// DOCME double arValue; /// DOCME int arType; - void UnloadTexture(); void OnPlayTimer(wxTimerEvent &event); public: - /// DOCME SubtitlesGrid *grid; @@ -230,18 +207,6 @@ public: wxGLContext *GetGLContext(wxGLCanvas *canvas); - /// @brief DOCME - /// @return - float GetTexW() { return texW; } - - /// @brief DOCME - /// @return - float GetTexH() { return texH; } - - /// @brief DOCME - /// @return - VideoFrameFormat GetFormat() { return vidFormat; } - /// @brief DOCME /// @return bool IsLoaded() { return loaded; } @@ -250,10 +215,6 @@ public: /// @return bool IsPlaying() { return isPlaying; } - /// @brief DOCME - /// @return - bool IsInverted() { return isInverted; } - /// @brief DOCME /// @param sync /// @return