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

AudioJack: more optional code for AudioPort support

Browse Source 
There's been some more code that is only required if AUDIO_PORT_SUPPORT
is set. Added according #ifdefs and fixed a typo in AudioPort support
code.
(cherry picked from commit e98726ae992c77fb2dfdb6668319b5521ff8aaef)
This commit is contained in:
Tobias Doerffel
2010-01-04 14:14:28 +01:00
parent b0822212b0
commit 31b099d74e
2 changed files with 5 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
include/AudioJack.h
View File

@@ -109,6 +109,7 @@ private:
f_cnt_t m_framesToDoInCurBuf;
#ifdef AUDIO_PORT_SUPPORT
struct StereoPort
{
jack_port_t * ports[2];
@@ -117,6 +118,7 @@ private:
typedef QMap<AudioPort *, StereoPort> JackPortMap;
JackPortMap m_portMap;
#endif
#endif
signals:
void zombified();

4
src/core/audio/AudioJack.cpp
View File

@@ -75,10 +75,12 @@ AudioJack::~AudioJack()
{
m_stopSemaphore.release();
#ifdef AUDIO_PORT_SUPPORT
while( m_portMap.size() )
{
unregisterPort( m_portMap.begin().key() );
}
#endif
if( m_client != NULL )
{
@@ -342,7 +344,7 @@ int AudioJack::processCallback( jack_nframes_t _nframes, void * _udata )
#ifdef AUDIO_PORT_SUPPORT
const Uint32 frames = qMin<Uint32>( _nframes,
mixer()->framesPerPeriod() );
for( jackPortMap::iterator it = m_portMap.begin();
for( JackPortMap::Iterator it = m_portMap.begin();
it != m_portMap.end(); ++it )
{
for( ch_cnt_t ch = 0; ch < channels(); ++ch )