[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    extragear/multimedia/amarok/src/analyzers
From:       Martin Aumüller <aumuell () reserv ! at>
Date:       2006-12-20 22:29:11
Message-ID: 1166653751.013946.1321.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 615291 by aumuell:

compile fixes for native mac window system


 M  +2 -2      glanalyzer2.cpp  
 M  +5 -5      glanalyzer2.h  
 M  +2 -2      glanalyzer3.cpp  
 M  +4 -4      glanalyzer3.h  


--- trunk/extragear/multimedia/amarok/src/analyzers/glanalyzer2.cpp #615290:615291
@@ -297,7 +297,7 @@
     glMatrixMode( GL_MODELVIEW );
 }
 
-bool GLAnalyzer2::loadTexture( QString fileName, unsigned int & textureID )
+bool GLAnalyzer2::loadTexture( QString fileName, GLuint& textureID )
 {
     //reset texture ID to the default EMPTY value
     textureID = 0;
@@ -323,7 +323,7 @@
 }
 
 
-void GLAnalyzer2::freeTexture( unsigned int & textureID )
+void GLAnalyzer2::freeTexture( GLuint & textureID )
 {
     if ( textureID > 0 )
         glDeleteTextures( 1, &textureID );
--- trunk/extragear/multimedia/amarok/src/analyzers/glanalyzer2.h #615290:615291
@@ -56,17 +56,17 @@
     bool silence;
     } frame;
 
-    unsigned int dotTexture;
-    unsigned int w1Texture;
-    unsigned int w2Texture;
+    GLuint dotTexture;
+    GLuint w1Texture;
+    GLuint w2Texture;
     float unitX, unitY;
 
     void drawDot( float x, float y, float size );
     void drawFullDot( float r, float g, float b, float a );
     void setTextureMatrix( float rot, float scale );
 
-    bool loadTexture(QString file, unsigned int & textureID);
-    void freeTexture(unsigned int & textureID);
+    bool loadTexture(QString file, GLuint& textureID);
+    void freeTexture(GLuint& textureID);
 };
 
 #endif
--- trunk/extragear/multimedia/amarok/src/analyzers/glanalyzer3.cpp #615290:615291
@@ -445,7 +445,7 @@
     glMatrixMode( GL_MODELVIEW );
 }
 
-bool GLAnalyzer3::loadTexture( QString fileName, unsigned int & textureID )
+bool GLAnalyzer3::loadTexture( QString fileName, GLuint& textureID )
 {
     //reset texture ID to the default EMPTY value
     textureID = 0;
@@ -470,7 +470,7 @@
     return true;
 }
 
-void GLAnalyzer3::freeTexture( unsigned int & textureID )
+void GLAnalyzer3::freeTexture( GLuint& textureID )
 {
     if ( textureID > 0 )
     glDeleteTextures( 1, &textureID );
--- trunk/extragear/multimedia/amarok/src/analyzers/glanalyzer3.h #615290:615291
@@ -65,15 +65,15 @@
     QPtrList<Ball> balls;
     Paddle * leftPaddle, * rightPaddle;
     float unitX, unitY;
-    unsigned int ballTexture;
-    unsigned int gridTexture;
+    GLuint ballTexture;
+    GLuint gridTexture;
 
     void drawDot3s( float x, float y, float z, float size );
     void drawHFace( float y );
     void drawScrollGrid( float scroll, float color[4] );
 
-    bool loadTexture(QString file, unsigned int & textureID);
-    void freeTexture(unsigned int & textureID);
+    bool loadTexture(QString file, GLuint& textureID);
+    void freeTexture(GLuint& textureID);
 };
 
 #endif
[prev in list] [next in list] [prev in thread] [next in thread]