From 37029c2d0dd9941aaa277209c656df58b04ebed7 Mon Sep 17 00:00:00 2001 From: Glenn Maynard Date: Wed, 19 Oct 2005 23:52:16 +0000 Subject: [PATCH] cleanup --- stepmania/src/RageDisplay_OGL.cpp | 4 ++-- .../src/arch/MovieTexture/MovieTexture_FFMpeg.cpp | 12 ++++++------ 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/stepmania/src/RageDisplay_OGL.cpp b/stepmania/src/RageDisplay_OGL.cpp index 277f7a3c7e..e3dcce1101 100644 --- a/stepmania/src/RageDisplay_OGL.cpp +++ b/stepmania/src/RageDisplay_OGL.cpp @@ -1926,12 +1926,12 @@ bool RageDisplay_OGL::SupportsSurfaceFormat( PixelFormat pixfmt ) } -bool RageDisplay_OGL::SupportsTextureFormat( PixelFormat pixfmt, bool realtime ) +bool RageDisplay_OGL::SupportsTextureFormat( PixelFormat pixfmt, bool bRealtime ) { /* If we support a pixfmt for texture formats but not for surface formats, then * we'll have to convert the texture to a supported surface format before uploading. * This is too slow for dynamic textures. */ - if( realtime && !SupportsSurfaceFormat( pixfmt ) ) + if( bRealtime && !SupportsSurfaceFormat(pixfmt) ) return false; switch( g_GLPixFmtInfo[pixfmt].format ) diff --git a/stepmania/src/arch/MovieTexture/MovieTexture_FFMpeg.cpp b/stepmania/src/arch/MovieTexture/MovieTexture_FFMpeg.cpp index 1156c0d122..83f9d2d0ec 100644 --- a/stepmania/src/arch/MovieTexture/MovieTexture_FFMpeg.cpp +++ b/stepmania/src/arch/MovieTexture/MovieTexture_FFMpeg.cpp @@ -34,8 +34,8 @@ struct AVPixelFormat_t int bpp; int masks[4]; avcodec::PixelFormat pf; - bool HighColor; - bool ByteSwapOnLittleEndian; + bool bHighColor; + bool bByteSwapOnLittleEndian; } AVPixelFormats[] = { { /* This format is really ARGB, and is affected by endianness, unlike PIX_FMT_RGB24 @@ -94,7 +94,7 @@ static void FixLilEndian() { AVPixelFormat_t &pf = AVPixelFormats[i]; - if( !pf.ByteSwapOnLittleEndian ) + if( !pf.bByteSwapOnLittleEndian ) continue; for( int mask = 0; mask < 4; ++mask) @@ -112,12 +112,12 @@ static void FixLilEndian() #endif } -static int FindCompatibleAVFormat( PixelFormat &pixfmt, bool HighColor ) +static int FindCompatibleAVFormat( PixelFormat &pixfmt, bool bHighColor ) { for( int i = 0; AVPixelFormats[i].bpp; ++i ) { AVPixelFormat_t &fmt = AVPixelFormats[i]; - if( fmt.HighColor != HighColor ) + if( fmt.bHighColor != bHighColor ) continue; pixfmt = DISPLAY->FindPixelFormat( fmt.bpp, @@ -688,7 +688,7 @@ void MovieTexture_FFMpeg::CreateTexture() /* No dice. Use the first avcodec format of the preferred bit depth, * and let the display system convert. */ for( m_AVTexfmt = 0; AVPixelFormats[m_AVTexfmt].bpp; ++m_AVTexfmt ) - if( AVPixelFormats[m_AVTexfmt].HighColor == bPreferHighColor ) + if( AVPixelFormats[m_AVTexfmt].bHighColor == bPreferHighColor ) break; ASSERT( AVPixelFormats[m_AVTexfmt].bpp );