mantarimay/Aegisub
1
0
Fork 0
forked from mia/Aegisub
Code Pull requests Activity

Remove some members of VideoContext that are no longer used with the rewritten video display.

Browse source 
Originally committed to SVN as r3633.
This commit is contained in:
Thomas Goyne 2009-10-06 16:19:36 +00:00
parent bead7360c4
commit 1f27582b50
2 changed files with 0 additions and 58 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
aegisub/src/video_context.cpp
View file

@ -100,8 +100,6 @@ VideoContext::VideoContext() {
// Set GL context // Set GL context
glContext = NULL; glContext = NULL;
ownGlContext = false; ownGlContext = false;
lastTex = 0;
lastFrame = -1;
// Set options // Set options
audio = NULL; audio = NULL;
@ -179,9 +177,6 @@ void VideoContext::Reset() {
// Update displays // Update displays
UpdateDisplays(true); UpdateDisplays(true);
// Remove textures
UnloadTexture();
// Clean up video data // Clean up video data
wxRemoveFile(tempfile); wxRemoveFile(tempfile);
tempfile = _T(""); 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 /// @brief Sets video filename
/// @param filename /// @param filename
/// ///
@ -345,9 +329,6 @@ void VideoContext::UpdateDisplays(bool full) {
/// @param subtitles /// @param subtitles
/// ///
void VideoContext::Refresh (bool video, bool subtitles) { void VideoContext::Refresh (bool video, bool subtitles) {
// Reset frame
lastFrame = -1;
// Update subtitles // Update subtitles
if (subtitles && subsProvider) { if (subtitles && subsProvider) {
// Re-export // Re-export

39
aegisub/src/video_context.h
View file

@ -90,21 +90,12 @@ private:
/// DOCME /// DOCME
std::list<VideoDisplay*> displayList; std::list<VideoDisplay*> displayList;
/// DOCME
GLuint lastTex;
/// DOCME
int lastFrame;
/// DOCME /// DOCME
bool ownGlContext; bool ownGlContext;
/// DOCME /// DOCME
wxGLContext *glContext; wxGLContext *glContext;
/// DOCME
VideoFrameFormat vidFormat;
/// DOCME /// DOCME
AegiVideoFrame tempFrame; AegiVideoFrame tempFrame;
@ -118,7 +109,6 @@ private:
/// DOCME /// DOCME
SubtitlesProvider *subsProvider; SubtitlesProvider *subsProvider;
/// DOCME /// DOCME
bool keyFramesLoaded; bool keyFramesLoaded;
@ -134,7 +124,6 @@ private:
/// DOCME /// DOCME
wxString keyFramesFilename; wxString keyFramesFilename;
/// DOCME /// DOCME
wxMutex playMutex; wxMutex playMutex;
@ -159,21 +148,12 @@ private:
/// DOCME /// DOCME
bool loaded; bool loaded;
/// DOCME
bool isInverted;
/// DOCME /// DOCME
bool isPlaying; bool isPlaying;
/// DOCME /// DOCME
bool keepAudioSync; bool keepAudioSync;
/// DOCME
/// DOCME
float texW,texH;
/// DOCME /// DOCME
/// DOCME /// DOCME
@ -188,18 +168,15 @@ private:
/// DOCME /// DOCME
double fps; double fps;
/// DOCME /// DOCME
double arValue; double arValue;
/// DOCME /// DOCME
int arType; int arType;
void UnloadTexture();
void OnPlayTimer(wxTimerEvent &event); void OnPlayTimer(wxTimerEvent &event);
public: public:
/// DOCME /// DOCME
SubtitlesGrid *grid; SubtitlesGrid *grid;
@ -230,18 +207,6 @@ public:
wxGLContext *GetGLContext(wxGLCanvas *canvas); 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 /// @brief DOCME
/// @return /// @return
bool IsLoaded() { return loaded; } bool IsLoaded() { return loaded; }
@ -250,10 +215,6 @@ public:
/// @return /// @return
bool IsPlaying() { return isPlaying; } bool IsPlaying() { return isPlaying; }
/// @brief DOCME
/// @return
bool IsInverted() { return isInverted; }
/// @brief DOCME /// @brief DOCME
/// @param sync /// @param sync
/// @return /// @return