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

AudioJack: fixed lockup when getting zombified

Browse Source 
This commit fixes lockup of the whole audio engine as soon as LMMS'
JACK backend got zombified due to longer delays (e.g. when audio engine
is blocked while loading a project). Restart JACK backend in such cases
and show an according message to the user.

Furthermore this commit includes various cleanups and improvements.
This commit is contained in:
Tobias Doerffel
2009-04-07 00:07:19 +02:00
parent f42fee37c3
commit b4e38e3978
2 changed files with 178 additions and 141 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
include/audio_jack.h
View File

@@ -1,7 +1,7 @@
/*
* audio_jack.h - support for JACK-transport
*
* Copyright (c) 2005-2008 Tobias Doerffel <tobydox/at/users.sourceforge.net>
* Copyright (c) 2005-2009 Tobias Doerffel <tobydox/at/users.sourceforge.net>
*
* This file is part of Linux MultiMedia Studio - http://lmms.sourceforge.net
*
@@ -29,9 +29,8 @@
#include "lmmsconfig.h"
#ifdef LMMS_HAVE_JACK
#include <jack/jack.h>
#endif
#include <QtCore/QVector>
#include <QtCore/QList>
@@ -45,16 +44,17 @@ class QLineEdit;
class lcdSpinBox;
class audioJACK : public audioDevice
class audioJACK : public QObject, public audioDevice
{
Q_OBJECT
public:
audioJACK( bool & _success_ful, mixer * _mixer );
virtual ~audioJACK();
inline static QString name( void )
{
return( QT_TRANSLATE_NOOP( "setupWidget",
"JACK (JACK Audio Connection Kit)" ) );
return QT_TRANSLATE_NOOP( "setupWidget",
"JACK (JACK Audio Connection Kit)" );
}
@@ -73,7 +73,14 @@ public:
} ;
private slots:
void restartAfterZombified( void );
#ifdef LMMS_HAVE_JACK
private:
bool initJackClient( void );
virtual void startProcessing( void );
virtual void stopProcessing( void );
virtual void applyQualitySettings( void );
@@ -82,7 +89,10 @@ private:
virtual void unregisterPort( audioPort * _port );
virtual void renamePort( audioPort * _port );
static int processCallback( jack_nframes_t _nframes, void * _udata );
int processCallback( jack_nframes_t _nframes, void * _udata );
static int staticProcessCallback( jack_nframes_t _nframes,
void * _udata );
static void shutdownCallback( void * _udata );
@@ -91,7 +101,7 @@ private:
bool m_active;
bool m_stopped;
QSemaphore m_stop_semaphore;
QSemaphore m_stopSemaphore;
QVector<jack_port_t *> m_outputPorts;
sampleFrameA * m_outBuf;
@@ -108,9 +118,11 @@ private:
typedef QMap<audioPort *, stereoPort> jackPortMap;
jackPortMap m_portMap;
#endif
signals:
void zombified( void );
} ;
#endif
#endif