Skip to content
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

Fix a Jack audio segfault #6912

Merged
merged 3 commits into from
Oct 31, 2023
Merged

Fix a Jack audio segfault #6912

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
dd03b02
AudioJack: Fix segfault for some bufsizes
JohannesLorenz Oct 1, 2023
96ecb51
AudioJack: Style fixes
JohannesLorenz Oct 1, 2023
84b3931
Use "jack_free" instead of "free" (#5954?)
JohannesLorenz Oct 22, 2023
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
57 changes: 24 additions & 33 deletions include/AudioJack.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,88 +57,79 @@ class AudioJack : public QObject, public AudioDevice
{
Q_OBJECT
public:
AudioJack( bool & _success_ful, AudioEngine* audioEngine );
AudioJack(bool& successful, AudioEngine* audioEngine);
~AudioJack() override;

// this is to allow the jack midi connection to use the same jack client connection
// the jack callback is handled here, we call the midi client so that it can read
// it's midi data during the callback
AudioJack * addMidiClient(MidiJack *midiClient);
AudioJack* addMidiClient(MidiJack* midiClient);
void removeMidiClient() { m_midiClient = nullptr; }
jack_client_t * jackClient() {return m_client;};
jack_client_t* jackClient() { return m_client; };

inline static QString name()
{
return QT_TRANSLATE_NOOP( "AudioDeviceSetupWidget",
"JACK (JACK Audio Connection Kit)" );
return QT_TRANSLATE_NOOP("AudioDeviceSetupWidget", "JACK (JACK Audio Connection Kit)");
}


class setupWidget : public gui::AudioDeviceSetupWidget
class setupWidget : public gui::AudioDeviceSetupWidget
{
public:
setupWidget( QWidget * _parent );
setupWidget(QWidget* parent);
~setupWidget() override;

void saveSettings() override;

private:
QLineEdit * m_clientName;
gui::LcdSpinBox * m_channels;

} ;

QLineEdit* m_clientName;
gui::LcdSpinBox* m_channels;
};

private slots:
void restartAfterZombified();


private:
bool initJackClient();

void startProcessing() override;
void stopProcessing() override;
void applyQualitySettings() override;

void registerPort( AudioPort * _port ) override;
void unregisterPort( AudioPort * _port ) override;
void renamePort( AudioPort * _port ) override;
void registerPort(AudioPort* port) override;
void unregisterPort(AudioPort* port) override;
void renamePort(AudioPort* port) override;

int processCallback( jack_nframes_t _nframes, void * _udata );
int processCallback(jack_nframes_t nframes);

static int staticProcessCallback( jack_nframes_t _nframes,
void * _udata );
static void shutdownCallback( void * _udata );
static int staticProcessCallback(jack_nframes_t nframes, void* udata);
static void shutdownCallback(void* _udata);


jack_client_t * m_client;
jack_client_t* m_client;

bool m_active;
std::atomic<bool> m_stopped;

std::atomic<MidiJack *> m_midiClient;
std::vector<jack_port_t *> m_outputPorts;
jack_default_audio_sample_t * * m_tempOutBufs;
surroundSampleFrame * m_outBuf;
std::atomic<MidiJack*> m_midiClient;
std::vector<jack_port_t*> m_outputPorts;
jack_default_audio_sample_t** m_tempOutBufs;
surroundSampleFrame* m_outBuf;

f_cnt_t m_framesDoneInCurBuf;
f_cnt_t m_framesToDoInCurBuf;


#ifdef AUDIO_PORT_SUPPORT
struct StereoPort
{
jack_port_t * ports[2];
} ;
jack_port_t* ports[2];
};

using JackPortMap = QMap<AudioPort *, StereoPort>;
using JackPortMap = QMap<AudioPort*, StereoPort>;
JackPortMap m_portMap;
#endif

signals:
void zombified();

} ;
};

} // namespace lmms

Expand Down
Loading