Skip to content

Fix various bugs when using JACK #4005

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
PhysSong merged 3 commits into from
Dec 3, 2017
Merged

Fix various bugs when using JACK #4005

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
7e140e1
Fix JACK crashes and freezings
PhysSong Nov 23, 2017
554c272
Fixup: retain past logic with a correction
PhysSong Nov 24, 2017
3f22073
Add logic for thread safety
PhysSong Dec 1, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions include/AudioJack.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,7 @@
#include <QtCore/QVector>
#include <QtCore/QList>
#include <QtCore/QMap>
#include <QMutexLocker>

#include "AudioDevice.h"
#include "AudioDeviceSetupWidget.h"
Expand Down Expand Up @@ -107,6 +108,7 @@ private slots:

bool m_active;
bool m_stopped;
QMutex m_processingMutex;

MidiJack *m_midiClient;
QVector<jack_port_t *> m_outputPorts;
Expand Down
12 changes: 9 additions & 3 deletions src/core/audio/AudioJack.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -71,6 +71,7 @@ AudioJack::AudioJack( bool & _success_ful, Mixer* _mixer ) :

AudioJack::~AudioJack()
{
stopProcessing();
#ifdef AUDIO_PORT_SUPPORT
while( m_portMap.size() )
{
Expand Down Expand Up @@ -200,6 +201,7 @@ bool AudioJack::initJackClient()

void AudioJack::startProcessing()
{
QMutexLocker m( &m_processingMutex );
m_stopped = false;

if( m_active || m_client == NULL )
Expand Down Expand Up @@ -252,6 +254,8 @@ void AudioJack::startProcessing()

void AudioJack::stopProcessing()
{
QMutexLocker m( &m_processingMutex );
m_stopped = true;
}


Expand Down Expand Up @@ -338,6 +342,8 @@ void AudioJack::renamePort( AudioPort * _port )

int AudioJack::processCallback( jack_nframes_t _nframes, void * _udata )
{
QMutexLocker m( &m_processingMutex );

// do midi processing first so that midi input can
// add to the following sound processing
if( m_midiClient && _nframes > 0 )
Expand Down Expand Up @@ -397,15 +403,15 @@ int AudioJack::processCallback( jack_nframes_t _nframes, void * _udata )
if( m_framesDoneInCurBuf == m_framesToDoInCurBuf )
{
m_framesToDoInCurBuf = getNextBuffer( m_outBuf );
m_framesDoneInCurBuf = 0;
if( !m_framesToDoInCurBuf )
{
m_stopped = true;
break;
}
m_framesDoneInCurBuf = 0;
}
}

if( m_stopped == true )
if( _nframes != done )
{
for( int c = 0; c < channels(); ++c )
{
Expand Down