Skip to content

Commit

Permalink
Run clang-format on all files (LMMS#4690)
Browse files Browse the repository at this point in the history
This commit was created by solely running

```
clang-format -style=file -i $(git ls-files '*.cpp' '*.h')
git commit -a
```

No functional changes.
  • Loading branch information
JohannesLorenz committed Mar 5, 2022
1 parent 935a338 commit 6a2d6fb
Show file tree
Hide file tree
Showing 765 changed files with 50,299 additions and 88,614 deletions.
12 changes: 3 additions & 9 deletions include/AboutDialog.h
Original file line number Diff line number Diff line change
Expand Up @@ -22,22 +22,16 @@
*
*/


#ifndef ABOUT_DIALOG_H
#define ABOUT_DIALOG_H

#include <QDialog>

#include "ui_about_dialog.h"


class AboutDialog : public QDialog, public Ui::AboutDialog
{
class AboutDialog : public QDialog, public Ui::AboutDialog {
public:
AboutDialog(QWidget* parent=0);

} ;

AboutDialog(QWidget* parent = 0);
};

#endif

10 changes: 4 additions & 6 deletions include/ActionGroup.h
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,6 @@
*
*/


#ifndef ACTION_GROUP_H
#define ACTION_GROUP_H

Expand All @@ -33,15 +32,14 @@
/// This class provides the same functionality as QActionGroup, but in addition
/// has the actionTriggered(int) signal.
/// It also sets every added action's checkable property to true.
class ActionGroup : public QActionGroup
{
class ActionGroup : public QActionGroup {
Q_OBJECT
public:
ActionGroup(QObject* parent);

QAction* addAction(QAction *a);
QAction* addAction(const QString &text);
QAction* addAction(const QIcon &icon, const QString &text);
QAction* addAction(QAction* a);
QAction* addAction(const QString& text);
QAction* addAction(const QIcon& icon, const QString& text);

signals:
/// This signal is emitted when the action at the given index is triggered.
Expand Down
43 changes: 17 additions & 26 deletions include/AudioAlsa.h
Original file line number Diff line number Diff line change
Expand Up @@ -32,47 +32,40 @@
// older ALSA-versions might require this
#define ALSA_PCM_NEW_HW_PARAMS_API

#include <alsa/asoundlib.h>
#include <QThread>
#include <alsa/asoundlib.h>

#include "AudioDevice.h"


class AudioAlsa : public QThread, public AudioDevice
{
class AudioAlsa : public QThread, public AudioDevice {
Q_OBJECT
public:
/**
* @brief Contains the relevant information about available ALSA devices
*/
class DeviceInfo
{
class DeviceInfo {
public:
DeviceInfo(QString const & deviceName, QString const & deviceDescription) :
m_deviceName(deviceName),
m_deviceDescription(deviceDescription)
{}
DeviceInfo(QString const& deviceName, QString const& deviceDescription)
: m_deviceName(deviceName)
, m_deviceDescription(deviceDescription) {}
~DeviceInfo() {}

QString const & getDeviceName() const { return m_deviceName; }
QString const & getDeviceDescription() const { return m_deviceDescription; }
QString const& getDeviceName() const { return m_deviceName; }
QString const& getDeviceDescription() const { return m_deviceDescription; }

private:
QString m_deviceName;
QString m_deviceDescription;

};

typedef std::vector<DeviceInfo> DeviceInfoCollection;

public:
AudioAlsa( bool & _success_ful, AudioEngine* audioEngine );
AudioAlsa(bool& _success_ful, AudioEngine* audioEngine);
virtual ~AudioAlsa();

inline static QString name()
{
return QT_TRANSLATE_NOOP( "AudioDeviceSetupWidget",
"ALSA (Advanced Linux Sound Architecture)" );
inline static QString name() {
return QT_TRANSLATE_NOOP("AudioDeviceSetupWidget", "ALSA (Advanced Linux Sound Architecture)");
}

static QString probeDevice();
Expand All @@ -85,22 +78,20 @@ class AudioAlsa : public QThread, public AudioDevice
void applyQualitySettings() override;
void run() override;

int setHWParams( const ch_cnt_t _channels, snd_pcm_access_t _access );
int setHWParams(const ch_cnt_t _channels, snd_pcm_access_t _access);
int setSWParams();
int handleError( int _err );

int handleError(int _err);

snd_pcm_t * m_handle;
snd_pcm_t* m_handle;

snd_pcm_uframes_t m_bufferSize;
snd_pcm_uframes_t m_periodSize;

snd_pcm_hw_params_t * m_hwParams;
snd_pcm_sw_params_t * m_swParams;
snd_pcm_hw_params_t* m_hwParams;
snd_pcm_sw_params_t* m_swParams;

bool m_convertEndian;

} ;
};

#endif

Expand Down
14 changes: 5 additions & 9 deletions include/AudioAlsaSetupWidget.h
Original file line number Diff line number Diff line change
Expand Up @@ -29,21 +29,17 @@

#ifdef LMMS_HAVE_ALSA

#include "AudioDeviceSetupWidget.h"

#include "AudioAlsa.h"

#include "AudioDeviceSetupWidget.h"

class QComboBox;
class LcdSpinBox;


class AudioAlsaSetupWidget : public AudioDeviceSetupWidget
{
class AudioAlsaSetupWidget : public AudioDeviceSetupWidget {
Q_OBJECT

public:
AudioAlsaSetupWidget( QWidget * _parent );
AudioAlsaSetupWidget(QWidget* _parent);
virtual ~AudioAlsaSetupWidget();

void saveSettings() override;
Expand All @@ -52,8 +48,8 @@ public slots:
void onCurrentIndexChanged(int index);

private:
QComboBox * m_deviceComboBox;
LcdSpinBox * m_channels;
QComboBox* m_deviceComboBox;
LcdSpinBox* m_channels;

int m_selectedDevice;
AudioAlsa::DeviceInfoCollection m_deviceInfos;
Expand Down
99 changes: 27 additions & 72 deletions include/AudioDevice.h
Original file line number Diff line number Diff line change
Expand Up @@ -30,116 +30,73 @@

#include "lmms_basics.h"


class AudioEngine;
class AudioPort;
class QThread;


class AudioDevice
{
class AudioDevice {
public:
AudioDevice( const ch_cnt_t _channels, AudioEngine* audioEngine );
AudioDevice(const ch_cnt_t _channels, AudioEngine* audioEngine);
virtual ~AudioDevice();

inline void lock()
{
m_devMutex.lock();
}

inline void unlock()
{
m_devMutex.unlock();
}
inline void lock() { m_devMutex.lock(); }

inline void unlock() { m_devMutex.unlock(); }

// if audio-driver supports ports, classes inherting AudioPort
// (e.g. channel-tracks) can register themselves for making
// audio-driver able to collect their individual output and provide
// them at a specific port - currently only supported by JACK
virtual void registerPort( AudioPort * _port );
virtual void unregisterPort( AudioPort * _port );
virtual void renamePort( AudioPort * _port );
virtual void registerPort(AudioPort* _port);
virtual void unregisterPort(AudioPort* _port);
virtual void renamePort(AudioPort* _port);

inline bool supportsCapture() const { return m_supportsCapture; }

inline bool supportsCapture() const
{
return m_supportsCapture;
}
inline sample_rate_t sampleRate() const { return m_sampleRate; }

inline sample_rate_t sampleRate() const
{
return m_sampleRate;
}

ch_cnt_t channels() const
{
return m_channels;
}
ch_cnt_t channels() const { return m_channels; }

void processNextBuffer();

virtual void startProcessing()
{
m_inProcess = true;
}
virtual void startProcessing() { m_inProcess = true; }

virtual void stopProcessing();

virtual void applyQualitySettings();



protected:
// subclasses can re-implement this for being used in conjunction with
// processNextBuffer()
virtual void writeBuffer( const surroundSampleFrame * /* _buf*/,
const fpp_t /*_frames*/,
const float /*_master_gain*/ )
{
}
virtual void writeBuffer(
const surroundSampleFrame* /* _buf*/, const fpp_t /*_frames*/, const float /*_master_gain*/) {}

// called by according driver for fetching new sound-data
fpp_t getNextBuffer( surroundSampleFrame * _ab );
fpp_t getNextBuffer(surroundSampleFrame* _ab);

// convert a given audio-buffer to a buffer in signed 16-bit samples
// returns num of bytes in outbuf
int convertToS16( const surroundSampleFrame * _ab,
const fpp_t _frames,
const float _master_gain,
int_sample_t * _output_buffer,
const bool _convert_endian = false );
int convertToS16(const surroundSampleFrame* _ab, const fpp_t _frames, const float _master_gain,
int_sample_t* _output_buffer, const bool _convert_endian = false);

// clear given signed-int-16-buffer
void clearS16Buffer( int_sample_t * _outbuf,
const fpp_t _frames );
void clearS16Buffer(int_sample_t* _outbuf, const fpp_t _frames);

// resample given buffer from samplerate _src_sr to samplerate _dst_sr
fpp_t resample( const surroundSampleFrame * _src,
const fpp_t _frames,
surroundSampleFrame * _dst,
const sample_rate_t _src_sr,
const sample_rate_t _dst_sr );

inline void setSampleRate( const sample_rate_t _new_sr )
{
m_sampleRate = _new_sr;
}

AudioEngine* audioEngine()
{
return m_audioEngine;
}
fpp_t resample(const surroundSampleFrame* _src, const fpp_t _frames, surroundSampleFrame* _dst,
const sample_rate_t _src_sr, const sample_rate_t _dst_sr);

bool hqAudio() const;
inline void setSampleRate(const sample_rate_t _new_sr) { m_sampleRate = _new_sr; }

AudioEngine* audioEngine() { return m_audioEngine; }

static void stopProcessingThread( QThread * thread );
bool hqAudio() const;

static void stopProcessingThread(QThread* thread);

protected:
bool m_supportsCapture;


private:
sample_rate_t m_sampleRate;
ch_cnt_t m_channels;
Expand All @@ -149,11 +106,9 @@ class AudioDevice
QMutex m_devMutex;

SRC_DATA m_srcData;
SRC_STATE * m_srcState;

surroundSampleFrame * m_buffer;

} ;
SRC_STATE* m_srcState;

surroundSampleFrame* m_buffer;
};

#endif
9 changes: 3 additions & 6 deletions include/AudioDeviceSetupWidget.h
Original file line number Diff line number Diff line change
Expand Up @@ -27,12 +27,10 @@

#include "TabWidget.h"


class AudioDeviceSetupWidget : public TabWidget
{
Q_OBJECT
class AudioDeviceSetupWidget : public TabWidget {
Q_OBJECT
public:
AudioDeviceSetupWidget( const QString & _caption, QWidget * _parent );
AudioDeviceSetupWidget(const QString& _caption, QWidget* _parent);

virtual ~AudioDeviceSetupWidget();

Expand All @@ -41,5 +39,4 @@ class AudioDeviceSetupWidget : public TabWidget
virtual void show();
};


#endif
Loading

0 comments on commit 6a2d6fb

Please sign in to comment.