From 8f74d7987b070ba55ae30a87d751f41d39ac4de0 Mon Sep 17 00:00:00 2001
From: Glenn Maynard <gmaynard@users.sourceforge.net>
Date: Sun, 23 Mar 2003 23:06:49 +0000
Subject: [PATCH] revert unused change

---
 .../arch/MovieTexture/MovieTexture_DShow.cpp  | 22 ++++++-------------
 .../arch/MovieTexture/MovieTexture_DShow.h    |  3 +--
 2 files changed, 8 insertions(+), 17 deletions(-)

diff --git a/stepmania/src/arch/MovieTexture/MovieTexture_DShow.cpp b/stepmania/src/arch/MovieTexture/MovieTexture_DShow.cpp
index 7c751e88e7..1cd8663853 100644
--- a/stepmania/src/arch/MovieTexture/MovieTexture_DShow.cpp
+++ b/stepmania/src/arch/MovieTexture/MovieTexture_DShow.cpp
@@ -129,7 +129,7 @@ void MovieTexture_DShow::Update(float fDeltaTime)
 		return;
 
 	/* Just in case we were invalidated: */
-	CreateTextures();
+	CreateTexture();
 
 	glBindTexture( GL_TEXTURE_2D, m_uGLTextureID );
 
@@ -246,7 +246,7 @@ void MovieTexture_DShow::Create()
 
 	/* We've set up the movie, so we know the dimensions we need.  Set
 	 * up the texture. */
-	CreateTextures();
+	CreateTexture();
 
 	// Start the graph running
     if( !PlayMovie() )
@@ -276,19 +276,13 @@ void MovieTexture_DShow::NewData(const char *data)
 }
 
 
-
-void MovieTexture_DShow::CreateTextures()
+void MovieTexture_DShow::CreateTexture()
 {
-	if(!m_uGLTextureID)
-		m_uGLTextureID = CreateTexture();
-}
+	if(m_uGLTextureID)
+		return;
 
-unsigned MovieTexture_DShow::CreateTexture()
-{
-	unsigned TextureID;
-
-	glGenTextures(1, &TextureID);
-	glBindTexture( GL_TEXTURE_2D, TextureID );
+	glGenTextures(1, &m_uGLTextureID);
+	glBindTexture( GL_TEXTURE_2D, m_uGLTextureID );
 
 	/* Initialize the texture and set it to black. */
 	string buf(m_iTextureWidth*m_iTextureHeight*3, 0);
@@ -310,8 +304,6 @@ unsigned MovieTexture_DShow::CreateTexture()
 
 	glTexImage2D(GL_TEXTURE_2D, 0, internalformat,
 		m_iTextureWidth, m_iTextureHeight, 0, GL_BGR, GL_UNSIGNED_BYTE, buf.data());
-
-	return TextureID;
 }
 
 bool MovieTexture_DShow::PlayMovie()
diff --git a/stepmania/src/arch/MovieTexture/MovieTexture_DShow.h b/stepmania/src/arch/MovieTexture/MovieTexture_DShow.h
index 79d291d942..980583e979 100644
--- a/stepmania/src/arch/MovieTexture/MovieTexture_DShow.h
+++ b/stepmania/src/arch/MovieTexture/MovieTexture_DShow.h
@@ -68,8 +68,7 @@ private:
 
 	void Create();
 
-	unsigned CreateTexture();
-	void CreateTextures();
+	void CreateTexture();
 	bool PlayMovie();
 	void SkipUpdates();
 	void StopSkippingUpdates();