fixed compiler warnings
git-svn-id: https://lmms.svn.sf.net/svnroot/lmms/trunk/lmms@1680 0778d3d1-df1d-0410-868b-ea421aaaa00d
This commit is contained in:
@@ -35,11 +35,11 @@
|
||||
|
||||
|
||||
audioDevice::audioDevice( const ch_cnt_t _channels, mixer * _mixer ) :
|
||||
m_supportsCapture( false ),
|
||||
m_sampleRate( _mixer->processingSampleRate() ),
|
||||
m_channels( _channels ),
|
||||
m_mixer( _mixer ),
|
||||
m_buffer( new surroundSampleFrame[getMixer()->framesPerPeriod()] ),
|
||||
m_supportsCapture( false )
|
||||
m_buffer( new surroundSampleFrame[getMixer()->framesPerPeriod()] )
|
||||
{
|
||||
int error;
|
||||
if( ( m_srcState = src_new(
|
||||
|
||||
@@ -314,7 +314,10 @@ void audioOSS::run( void )
|
||||
int bytes = convertToS16( temp, frames,
|
||||
getMixer()->masterGain(), outbuf,
|
||||
m_convertEndian );
|
||||
write( m_audioFD, outbuf, bytes );
|
||||
if( write( m_audioFD, outbuf, bytes ) != bytes )
|
||||
{
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
||||
delete[] temp;
|
||||
|
||||
@@ -121,7 +121,7 @@ void DrumSynth::GetEnv(int env, const char *sec, const char *key, const char *in
|
||||
char en[256], s[8];
|
||||
int i=0, o=0, ep=0;
|
||||
GetPrivateProfileString(sec, key, "0,0 100,0", en, sizeof(en), ini);
|
||||
en[256]=0; //be safe!
|
||||
en[255]=0; //be safe!
|
||||
|
||||
while(en[i]!=0)
|
||||
{
|
||||
@@ -261,17 +261,16 @@ int DrumSynth::GetDSFileSamples(const char *dsfile, int16_t *&wave, int channels
|
||||
char sec[32];
|
||||
char ver[32];
|
||||
char comment[256];
|
||||
char percent[16];
|
||||
int commentLen=0;
|
||||
|
||||
//generation
|
||||
long Length, pos=0, tpos=0, tplus, totmp, t, i, j;
|
||||
long Length, tpos=0, tplus, totmp, t, i, j;
|
||||
float x[3] = {0.f, 0.f, 0.f};
|
||||
float MasterTune, randmax, randmax2;
|
||||
int MainFilter, HighPass;
|
||||
|
||||
long NON, NT, TON, DiON, TDroop=0, DStep;
|
||||
float a, b=0.f, c=0.f, d=0.f, g, TT=0.f, TTT=0.f, TL, NL, F1, F2, Fsync;
|
||||
float a, b=0.f, c=0.f, d=0.f, g, TT=0.f, TL, NL, F1, F2, Fsync;
|
||||
float TphiStart=0.f, Tphi, TDroopRate, ddF, DAtten, DGain;
|
||||
|
||||
long BON, BON2, BFStep, BFStep2, botmp;
|
||||
|
||||
@@ -87,10 +87,10 @@ int main( int argc, char * * argv )
|
||||
|
||||
for( int i = 1; i < argc; ++i )
|
||||
{
|
||||
if( argc > i && ( QString( argv[i] ) == "--render" ||
|
||||
if( argc > i && ( ( QString( argv[i] ) == "--render" ||
|
||||
QString( argv[i] ) == "-r" ) ||
|
||||
( QString( argv[i] ) == "--help" ||
|
||||
QString( argv[i] ) == "-h" ) )
|
||||
QString( argv[i] ) == "-h" ) ) )
|
||||
{
|
||||
core_only = TRUE;
|
||||
break;
|
||||
|
||||
@@ -276,6 +276,8 @@ private:
|
||||
mixer::mixer( void ) :
|
||||
m_framesPerPeriod( DEFAULT_BUFFER_SIZE ),
|
||||
m_workingBuf( NULL ),
|
||||
m_inputBufferRead( 0 ),
|
||||
m_inputBufferWrite( 1 ),
|
||||
m_readBuf( NULL ),
|
||||
m_writeBuf( NULL ),
|
||||
m_cpuLoad( 0 ),
|
||||
@@ -288,9 +290,7 @@ mixer::mixer( void ) :
|
||||
m_masterGain( 1.0f ),
|
||||
m_audioDev( NULL ),
|
||||
m_oldAudioDev( NULL ),
|
||||
m_globalMutex( QMutex::Recursive ),
|
||||
m_inputBufferRead( 0 ),
|
||||
m_inputBufferWrite( 1 )
|
||||
m_globalMutex( QMutex::Recursive )
|
||||
{
|
||||
for( int i = 0; i < 2; ++i )
|
||||
{
|
||||
|
||||
@@ -37,11 +37,11 @@
|
||||
|
||||
sampleRecordHandle::sampleRecordHandle( sampleTCO * _tco ) :
|
||||
playHandle( SamplePlayHandle ),
|
||||
m_framesRecorded( 0 ),
|
||||
m_minLength( _tco->length() ),
|
||||
m_track( _tco->getTrack() ),
|
||||
m_bbTrack( NULL ),
|
||||
m_tco( _tco ),
|
||||
m_framesRecorded( 0 ),
|
||||
m_minLength( _tco->length() )
|
||||
m_tco( _tco )
|
||||
{
|
||||
}
|
||||
|
||||
|
||||
@@ -37,8 +37,8 @@
|
||||
trackContainer::trackContainer( void ) :
|
||||
model( NULL ),
|
||||
journallingObject(),
|
||||
m_tracks(),
|
||||
m_tracksMutex()
|
||||
m_tracksMutex(),
|
||||
m_tracks()
|
||||
{
|
||||
}
|
||||
|
||||
|
||||
@@ -114,7 +114,7 @@ void lcdSpinBox::paintEvent( QPaintEvent * _me )
|
||||
QRect cellRect( 0, 0, m_cellWidth, m_cellHeight );
|
||||
|
||||
int margin = 1; // QStyle::PM_DefaultFrameWidth;
|
||||
int lcdWidth = m_cellWidth * m_numDigits + (margin*m_marginWidth)*2;
|
||||
//int lcdWidth = m_cellWidth * m_numDigits + (margin*m_marginWidth)*2;
|
||||
|
||||
// p.translate( width() / 2 - lcdWidth / 2, 0 );
|
||||
p.save();
|
||||
|
||||
Reference in New Issue
Block a user