hashtags/lmms
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 1 Wiki Activity

Merge branch 'remote-plugin-fixes'

Browse Source 
* remote-plugin-fixes:
  RemotePlugin: sleep in waitForMessage() when actively waiting for data
  RemotePlugin: better code order in sendMessage() + cleanups
  RemotePlugin: coding style fixes + inline keyword reduces
  RemotePlugin: smaller buffers for number to string conversions
  RemotePlugin: added branch prediction hints
This commit is contained in:
Tobias Doerffel
2010-07-26 15:52:14 +02:00
parent 278b70384e 783913e79c
commit b0822212b0
2 changed files with 33 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
src/core/RemotePlugin.cpp
View File

@@ -150,7 +150,7 @@ bool RemotePlugin::process( const sampleFrame * _in_buf,
{
const fpp_t frames = engine::getMixer()->framesPerPeriod();
if( m_failed || !isRunning() )
if( unlikely( m_failed || !isRunning() ) )
{
if( _out_buf != NULL )
{
@@ -160,7 +160,7 @@ bool RemotePlugin::process( const sampleFrame * _in_buf,
return false;
}
if( m_shm == NULL )
if( unlikely( m_shm == NULL ) )
{
// m_shm being zero means we didn't initialize everything so
// far so process one message each time (and hope we get
@@ -227,8 +227,7 @@ bool RemotePlugin::process( const sampleFrame * _in_buf,
waitForMessage( IdProcessingDone );
unlock();
const ch_cnt_t outputs = qMin<ch_cnt_t>( m_outputCount,
DEFAULT_CHANNELS );
const ch_cnt_t outputs = qMin<ch_cnt_t>( m_outputCount, DEFAULT_CHANNELS );
if( m_splitChannels )
{
for( ch_cnt_t ch = 0; ch < outputs; ++ch )
@@ -328,7 +327,7 @@ void RemotePlugin::resizeSharedProcessingMemory()
bool RemotePlugin::processMessage( const message & _m )
{
lock();
message reply_message( _m.id );
message replyMessage( _m.id );
bool reply = false;
switch( _m.id )
{
@@ -341,12 +340,12 @@ bool RemotePlugin::processMessage( const message & _m )
case IdSampleRateInformation:
reply = true;
reply_message.addInt( engine::getMixer()->processingSampleRate() );
replyMessage.addInt( engine::getMixer()->processingSampleRate() );
break;
case IdBufferSizeInformation:
reply = true;
reply_message.addInt( engine::getMixer()->framesPerPeriod() );
replyMessage.addInt( engine::getMixer()->framesPerPeriod() );
break;
case IdChangeInputCount:
@@ -371,7 +370,7 @@ bool RemotePlugin::processMessage( const message & _m )
}
if( reply )
{
sendMessage( reply_message );
sendMessage( replyMessage );
}
unlock();