Remove global "using namespace std;" declarations, use "std::" prefixes on all std elements
Fix whitespace changes
This commit is contained in:
committed by
Martin Natano
parent
f0680a29fc
commit
0cba3579de
@@ -214,7 +214,7 @@ struct madlib_t
|
||||
}
|
||||
};
|
||||
|
||||
typedef map<mad_timer_t, int, mad_timer_compare_lt> tocmap_t;
|
||||
typedef std::map<mad_timer_t, int, mad_timer_compare_lt> tocmap_t;
|
||||
tocmap_t tocmap;
|
||||
|
||||
/* Position in the file of inbuf: */
|
||||
@@ -296,7 +296,7 @@ bool RageSoundReader_MP3::handle_first_frame()
|
||||
if( mad->xingtag.type == xing::INFO )
|
||||
return false;
|
||||
|
||||
mad->header_bytes = max( mad->header_bytes, get_this_frame_byte(mad) );
|
||||
mad->header_bytes = std::max( mad->header_bytes, get_this_frame_byte(mad) );
|
||||
|
||||
mad->has_xing = true;
|
||||
|
||||
@@ -563,7 +563,7 @@ int RageSoundReader_MP3::resync()
|
||||
|
||||
/* Seek backwards up to 4k. */
|
||||
const int origpos = mad->inbuf_filepos;
|
||||
const int seekpos = max( 0, origpos - 1024*4 );
|
||||
const int seekpos = std::max( 0, origpos - 1024*4 );
|
||||
seek_stream_to_byte( seekpos );
|
||||
|
||||
/* Agh. This is annoying. We want to decode enough so that the next frame
|
||||
@@ -700,7 +700,7 @@ int RageSoundReader_MP3::Read( float *buf, int iFrames )
|
||||
{
|
||||
if( mad->outleft > 0 )
|
||||
{
|
||||
int iFramesToCopy = min( iFrames, int(mad->outleft / GetNumChannels()) );
|
||||
int iFramesToCopy = std::min( iFrames, int(mad->outleft / GetNumChannels()) );
|
||||
const int iSamplesToCopy = iFramesToCopy * GetNumChannels();
|
||||
const int iBytesToCopy = iSamplesToCopy * sizeof(float);
|
||||
|
||||
@@ -822,7 +822,7 @@ int RageSoundReader_MP3::SetPosition_toc( int iFrame, bool Xing )
|
||||
if( bytepos != -1 )
|
||||
{
|
||||
/* Seek backwards up to 4k. */
|
||||
const int seekpos = max( 0, bytepos - 1024*4 );
|
||||
const int seekpos = std::max( 0, bytepos - 1024*4 );
|
||||
seek_stream_to_byte( seekpos );
|
||||
|
||||
do
|
||||
|
||||
Reference in New Issue
Block a user