aboutsummaryrefslogtreecommitdiff
path: root/src/plugins/Output
diff options
context:
space:
mode:
Diffstat (limited to 'src/plugins/Output')
-rw-r--r--src/plugins/Output/alsa/outputalsa.cpp26
-rw-r--r--src/plugins/Output/alsa/settingsdialog.cpp6
-rw-r--r--src/plugins/Output/alsa/settingsdialog.h2
-rw-r--r--src/plugins/Output/jack/outputjackfactory.cpp2
-rw-r--r--src/plugins/Output/null/outputnullfactory.cpp2
-rw-r--r--src/plugins/Output/oss/settingsdialog.h2
-rw-r--r--src/plugins/Output/oss4/outputoss4.cpp10
-rw-r--r--src/plugins/Output/pulseaudio/outputpulseaudio.cpp40
-rw-r--r--src/plugins/Output/shout/outputshoutfactory.cpp4
-rw-r--r--src/plugins/Output/shout/settingsdialog.h2
-rw-r--r--src/plugins/Output/shout/shoutoutput.cpp20
-rw-r--r--src/plugins/Output/wasapi/settingsdialog.h2
12 files changed, 59 insertions, 59 deletions
diff --git a/src/plugins/Output/alsa/outputalsa.cpp b/src/plugins/Output/alsa/outputalsa.cpp
index 92f3ede32..3499097ea 100644
--- a/src/plugins/Output/alsa/outputalsa.cpp
+++ b/src/plugins/Output/alsa/outputalsa.cpp
@@ -39,8 +39,8 @@ OutputALSA::OutputALSA() : m_inited(false)
QString dev_name = settings.value("ALSA/device","default").toString();
m_use_mmap = settings.value("ALSA/use_mmap", false).toBool();
pcm_name = strdup(dev_name.toLatin1().data());
- pcm_handle = 0;
- m_prebuf = 0;
+ pcm_handle = nullptr;
+ m_prebuf = nullptr;
m_prebuf_size = 0;
m_prebuf_fill = 0;
m_can_pause = false;
@@ -90,8 +90,8 @@ bool OutputALSA::initialize(quint32 freq, ChannelMap map, Qmmp::AudioFormat form
bool use_pause = settings.value("use_snd_pcm_pause", false).toBool();
settings.endGroup();
- snd_pcm_hw_params_t *hwparams = 0;
- snd_pcm_sw_params_t *swparams = 0;
+ snd_pcm_hw_params_t *hwparams = nullptr;
+ snd_pcm_sw_params_t *swparams = nullptr;
int err; //alsa error code
//hw params
@@ -143,7 +143,7 @@ bool OutputALSA::initialize(quint32 freq, ChannelMap map, Qmmp::AudioFormat form
}
exact_rate = rate;
- if ((err = snd_pcm_hw_params_set_rate_near(pcm_handle, hwparams, &exact_rate, 0)) < 0)
+ if ((err = snd_pcm_hw_params_set_rate_near(pcm_handle, hwparams, &exact_rate, nullptr)) < 0)
{
qWarning("OutputALSA: Error setting rate: %s", snd_strerror(err));
return false;
@@ -164,12 +164,12 @@ bool OutputALSA::initialize(quint32 freq, ChannelMap map, Qmmp::AudioFormat form
qWarning("OutputALSA: The channel number %d is not supported by your hardware", map.count());
qWarning("==> Using %d instead.", c);
}
- if ((err = snd_pcm_hw_params_set_period_time_near(pcm_handle, hwparams, &period_time ,0)) < 0)
+ if ((err = snd_pcm_hw_params_set_period_time_near(pcm_handle, hwparams, &period_time, nullptr)) < 0)
{
qWarning("OutputALSA: Error setting period time: %s", snd_strerror(err));
return false;
}
- if ((err = snd_pcm_hw_params_set_buffer_time_near(pcm_handle, hwparams, &buffer_time ,0)) < 0)
+ if ((err = snd_pcm_hw_params_set_buffer_time_near(pcm_handle, hwparams, &buffer_time, nullptr)) < 0)
{
qWarning("OutputALSA: Error setting buffer time: %s", snd_strerror(err));
return false;
@@ -187,7 +187,7 @@ bool OutputALSA::initialize(quint32 freq, ChannelMap map, Qmmp::AudioFormat form
qWarning("OutputALSA: Error reading buffer size: %s", snd_strerror(err));
return false;
}
- if ((err = snd_pcm_hw_params_get_period_size(hwparams, &period_size, 0)) < 0)
+ if ((err = snd_pcm_hw_params_get_period_size(hwparams, &period_size, nullptr)) < 0)
{
qWarning("OutputALSA: Error reading period size: %s", snd_strerror(err));
return false;
@@ -389,18 +389,18 @@ void OutputALSA::uninitialize()
snd_pcm_drop(pcm_handle);
qDebug("OutputALSA: closing pcm_handle");
snd_pcm_close(pcm_handle);
- pcm_handle = 0;
+ pcm_handle = nullptr;
}
if (m_prebuf)
free(m_prebuf);
- m_prebuf = 0;
+ m_prebuf = nullptr;
}
/* ****** MIXER ******* */
VolumeALSA::VolumeALSA()
{
//alsa mixer
- m_mixer = 0;
+ m_mixer = nullptr;
QSettings settings(Qmmp::configFile(), QSettings::IniFormat);
QString card = settings.value("ALSA/mixer_card","hw:0").toString();
QString dev = settings.value("ALSA/mixer_device", "PCM").toString();
@@ -443,7 +443,7 @@ int VolumeALSA::setupMixer(QString card, QString device)
{
char *name;
int err, index;
- pcm_element = 0;
+ pcm_element = nullptr;
qDebug("OutputALSA: setupMixer()");
@@ -543,7 +543,7 @@ int VolumeALSA::getMixer(snd_mixer_t **mixer, QString card)
qPrintable(card), snd_strerror(-err));
return -1;
}
- if ((err = snd_mixer_selem_register(*mixer, NULL, NULL)) < 0)
+ if ((err = snd_mixer_selem_register(*mixer, nullptr, nullptr)) < 0)
{
qWarning("OutputALSA: Failed to register mixer: %s",
snd_strerror(-err));
diff --git a/src/plugins/Output/alsa/settingsdialog.cpp b/src/plugins/Output/alsa/settingsdialog.cpp
index df46925f3..c6e9a82e7 100644
--- a/src/plugins/Output/alsa/settingsdialog.cpp
+++ b/src/plugins/Output/alsa/settingsdialog.cpp
@@ -90,7 +90,7 @@ void SettingsDialog::getCards()
void SettingsDialog::getSoftDevices()
{
- void **hints = 0;
+ void **hints = nullptr;
int i = 0;
if(snd_device_name_hint(-1, "pcm", &hints) < 0)
@@ -247,7 +247,7 @@ int SettingsDialog::getMixer(snd_mixer_t **mixer, QString card)
"Attaching to mixer %s failed: %s", qPrintable(card), snd_strerror(-err));
return -1;
}
- if ((err = snd_mixer_selem_register(*mixer, NULL, NULL)) < 0)
+ if ((err = snd_mixer_selem_register(*mixer, nullptr, nullptr)) < 0)
{
qWarning("SettingsDialog (ALSA): alsa_get_mixer(): "
"Failed to register mixer: %s", snd_strerror(-err));
@@ -260,7 +260,7 @@ int SettingsDialog::getMixer(snd_mixer_t **mixer, QString card)
return -1;
}
- return (*mixer != NULL);
+ return (*mixer != nullptr);
}
void SettingsDialog::showMixerDevices(int d)
diff --git a/src/plugins/Output/alsa/settingsdialog.h b/src/plugins/Output/alsa/settingsdialog.h
index f71912599..60b85d99c 100644
--- a/src/plugins/Output/alsa/settingsdialog.h
+++ b/src/plugins/Output/alsa/settingsdialog.h
@@ -35,7 +35,7 @@ class SettingsDialog : public QDialog
{
Q_OBJECT
public:
- SettingsDialog(QWidget *parent = 0);
+ SettingsDialog(QWidget *parent = nullptr);
~SettingsDialog();
diff --git a/src/plugins/Output/jack/outputjackfactory.cpp b/src/plugins/Output/jack/outputjackfactory.cpp
index 2995e4290..a388980ea 100644
--- a/src/plugins/Output/jack/outputjackfactory.cpp
+++ b/src/plugins/Output/jack/outputjackfactory.cpp
@@ -41,7 +41,7 @@ Output* OutputJACKFactory::create()
Volume *OutputJACKFactory::createVolume()
{
- return 0;
+ return nullptr;
}
void OutputJACKFactory::showSettings(QWidget*)
diff --git a/src/plugins/Output/null/outputnullfactory.cpp b/src/plugins/Output/null/outputnullfactory.cpp
index b7a96921b..9f2e8a9ac 100644
--- a/src/plugins/Output/null/outputnullfactory.cpp
+++ b/src/plugins/Output/null/outputnullfactory.cpp
@@ -41,7 +41,7 @@ Output* OutputNullFactory::create()
Volume *OutputNullFactory::createVolume()
{
- return 0;
+ return nullptr;
}
void OutputNullFactory::showSettings(QWidget* parent)
diff --git a/src/plugins/Output/oss/settingsdialog.h b/src/plugins/Output/oss/settingsdialog.h
index b68767f46..36f088f1e 100644
--- a/src/plugins/Output/oss/settingsdialog.h
+++ b/src/plugins/Output/oss/settingsdialog.h
@@ -30,7 +30,7 @@ class SettingsDialog : public QDialog
{
Q_OBJECT
public:
- SettingsDialog(QWidget *parent = 0);
+ SettingsDialog(QWidget *parent = nullptr);
~SettingsDialog();
diff --git a/src/plugins/Output/oss4/outputoss4.cpp b/src/plugins/Output/oss4/outputoss4.cpp
index b353e16b5..291243d68 100644
--- a/src/plugins/Output/oss4/outputoss4.cpp
+++ b/src/plugins/Output/oss4/outputoss4.cpp
@@ -44,8 +44,8 @@ extern "C"
#include <qmmp/visual.h>
#include "outputoss4.h"
-OutputOSS4 *OutputOSS4::m_instance = 0;
-VolumeOSS4 *OutputOSS4::m_vc = 0;
+OutputOSS4 *OutputOSS4::m_instance = nullptr;
+VolumeOSS4 *OutputOSS4::m_vc = nullptr;
Qmmp::ChannelPosition OutputOSS4::m_oss_pos[16] =
{
Qmmp::CHAN_NULL, //0 = null
@@ -83,7 +83,7 @@ OutputOSS4::~OutputOSS4()
close(m_audio_fd);
m_audio_fd = -1;
}
- m_instance = 0;
+ m_instance = nullptr;
}
int OutputOSS4::fd()
@@ -108,7 +108,7 @@ void OutputOSS4::sync()
bool OutputOSS4::initialize(quint32 freq, ChannelMap map, Qmmp::AudioFormat format)
{
- m_audio_fd = open(m_audio_device.toLatin1(), O_WRONLY);
+ m_audio_fd = open(m_audio_device.toLatin1().constData(), O_WRONLY);
if (m_audio_fd < 0)
{
@@ -209,7 +209,7 @@ VolumeOSS4::~VolumeOSS4()
{
VolumeSettings vol = volume();
m_volume = (vol.right << 8) | vol.left;
- OutputOSS4::m_vc = 0;
+ OutputOSS4::m_vc = nullptr;
QSettings settings(Qmmp::configFile(), QSettings::IniFormat);
settings.setValue("OSS4/volume", m_volume);
}
diff --git a/src/plugins/Output/pulseaudio/outputpulseaudio.cpp b/src/plugins/Output/pulseaudio/outputpulseaudio.cpp
index a243ca877..938b49caf 100644
--- a/src/plugins/Output/pulseaudio/outputpulseaudio.cpp
+++ b/src/plugins/Output/pulseaudio/outputpulseaudio.cpp
@@ -25,14 +25,14 @@ extern "C"{
#include <QSettings>
#include "outputpulseaudio.h"
-OutputPulseAudio *OutputPulseAudio::instance = 0;
-VolumePulseAudio *OutputPulseAudio::volumeControl = 0;
+OutputPulseAudio *OutputPulseAudio::instance = nullptr;
+VolumePulseAudio *OutputPulseAudio::volumeControl = nullptr;
OutputPulseAudio::OutputPulseAudio(): Output()
{
- m_loop = 0;
- m_ctx = 0;
- m_stream = 0;
+ m_loop = nullptr;
+ m_ctx = nullptr;
+ m_stream = nullptr;
m_pa_channels[Qmmp::CHAN_NULL] = PA_CHANNEL_POSITION_INVALID;
m_pa_channels[Qmmp::CHAN_FRONT_CENTER] = PA_CHANNEL_POSITION_MONO;
@@ -52,7 +52,7 @@ OutputPulseAudio::OutputPulseAudio(): Output()
OutputPulseAudio::~OutputPulseAudio()
{
uninitialize();
- instance = 0;
+ instance = nullptr;
}
bool OutputPulseAudio::initialize(quint32 freq, ChannelMap map, Qmmp::AudioFormat format)
@@ -69,7 +69,7 @@ bool OutputPulseAudio::initialize(quint32 freq, ChannelMap map, Qmmp::AudioForma
return false;
}
- if(pa_context_connect(m_ctx, 0, (pa_context_flags_t)0, 0) < 0)
+ if(pa_context_connect(m_ctx, nullptr, (pa_context_flags_t)0, nullptr) < 0)
{
qWarning("OutputPulseAudio: unable to connect the context: %s", pa_strerror(pa_context_errno(m_ctx)));
return false;
@@ -129,14 +129,14 @@ bool OutputPulseAudio::initialize(quint32 freq, ChannelMap map, Qmmp::AudioForma
attr.fragsize = attr.tlength;
pa_stream_flags_t flags = pa_stream_flags_t(PA_STREAM_INTERPOLATE_TIMING | PA_STREAM_AUTO_TIMING_UPDATE);
- pa_cvolume *pvol = 0;
+ pa_cvolume *pvol = nullptr;
pa_cvolume vol;
if(volumeControl)
{
vol = VolumePulseAudio::volumeSettingsToCvolume(volumeControl->volume(), map.count());
pvol = &vol;
}
- if(pa_stream_connect_playback(m_stream, 0, &attr, flags, pvol, 0) < 0)
+ if(pa_stream_connect_playback(m_stream, nullptr, &attr, flags, pvol, nullptr) < 0)
{
qWarning("OutputPulseAudio: unable to connect playback: %s", pa_strerror(pa_context_errno(m_ctx)));
return false;
@@ -191,7 +191,7 @@ qint64 OutputPulseAudio::writeAudio(unsigned char *data, qint64 maxSize)
}
size_t length = qMin(size_t(maxSize), pa_stream_writable_size(m_stream));
- if(pa_stream_write(m_stream, data, length, 0, 0, PA_SEEK_RELATIVE) < 0)
+ if(pa_stream_write(m_stream, data, length, nullptr, 0, PA_SEEK_RELATIVE) < 0)
{
qWarning("OutputPulseAudio: pa_stream_write failed: %s", pa_strerror(pa_context_errno(m_ctx)));
return -1;
@@ -201,25 +201,25 @@ qint64 OutputPulseAudio::writeAudio(unsigned char *data, qint64 maxSize)
void OutputPulseAudio::drain()
{
- pa_operation *op = pa_stream_drain(m_stream, OutputPulseAudio::stream_success_cb, 0);
+ pa_operation *op = pa_stream_drain(m_stream, OutputPulseAudio::stream_success_cb, nullptr);
process(op);
}
void OutputPulseAudio::reset()
{
- pa_operation *op = pa_stream_flush(m_stream, OutputPulseAudio::stream_success_cb, 0);
+ pa_operation *op = pa_stream_flush(m_stream, OutputPulseAudio::stream_success_cb, nullptr);
process(op);
}
void OutputPulseAudio::suspend()
{
- pa_operation *op = pa_stream_cork(m_stream, 1, OutputPulseAudio::stream_success_cb, 0);
+ pa_operation *op = pa_stream_cork(m_stream, 1, OutputPulseAudio::stream_success_cb, nullptr);
process(op);
}
void OutputPulseAudio::resume()
{
- pa_operation *op = pa_stream_cork(m_stream, 0, OutputPulseAudio::stream_success_cb, 0);
+ pa_operation *op = pa_stream_cork(m_stream, 0, OutputPulseAudio::stream_success_cb, nullptr);
process(op);
}
@@ -227,7 +227,7 @@ void OutputPulseAudio::setVolume(const VolumeSettings &v)
{
pa_cvolume volume = VolumePulseAudio::volumeSettingsToCvolume(v, audioParameters().channels());
pa_operation *op = pa_context_set_sink_input_volume(m_ctx, pa_stream_get_index(m_stream), &volume,
- OutputPulseAudio::context_success_cb, 0);
+ OutputPulseAudio::context_success_cb, nullptr);
pa_operation_unref(op);
}
@@ -237,20 +237,20 @@ void OutputPulseAudio::uninitialize()
{
pa_stream_disconnect(m_stream);
pa_stream_unref(m_stream);
- m_stream = 0;
+ m_stream = nullptr;
}
if(m_ctx)
{
pa_context_disconnect(m_ctx);
pa_context_unref(m_ctx);
- m_ctx = 0;
+ m_ctx = nullptr;
}
if(m_loop)
{
pa_mainloop_free(m_loop);
- m_loop = 0;
+ m_loop = nullptr;
}
}
@@ -291,7 +291,7 @@ void OutputPulseAudio::subscribe_cb(pa_context *ctx, pa_subscription_event_type
t != (PA_SUBSCRIPTION_EVENT_SINK_INPUT | PA_SUBSCRIPTION_EVENT_CHANGE)))
return;
- if(!(op = pa_context_get_sink_input_info (ctx, index, OutputPulseAudio::info_cb, 0)))
+ if(!(op = pa_context_get_sink_input_info (ctx, index, OutputPulseAudio::info_cb, nullptr)))
{
qWarning("OutputPulseAudio: pa_context_get_sink_input_info failed: %s", pa_strerror(pa_context_errno(ctx)));
return;
@@ -338,7 +338,7 @@ VolumePulseAudio::~VolumePulseAudio()
QSettings settings(Qmmp::configFile(), QSettings::IniFormat);
settings.setValue("PulseAudio/left_volume", m_volume.left);
settings.setValue("PulseAudio/right_volume", m_volume.right);
- OutputPulseAudio::volumeControl = 0;
+ OutputPulseAudio::volumeControl = nullptr;
}
void VolumePulseAudio::updateVolume(const pa_cvolume &v)
diff --git a/src/plugins/Output/shout/outputshoutfactory.cpp b/src/plugins/Output/shout/outputshoutfactory.cpp
index 47937a7a9..07d3e44e8 100644
--- a/src/plugins/Output/shout/outputshoutfactory.cpp
+++ b/src/plugins/Output/shout/outputshoutfactory.cpp
@@ -50,7 +50,7 @@ Output* OutputShoutFactory::create()
Volume *OutputShoutFactory::createVolume()
{
- return 0;
+ return nullptr;
}
void OutputShoutFactory::showSettings(QWidget* parent)
@@ -63,7 +63,7 @@ void OutputShoutFactory::showAbout(QWidget *parent)
{
QMessageBox::about (parent, tr("About Icecast Output Plugin"),
tr("Qmmp Icecast Output Plugin")+"\n"+
- tr("Compiled against libshout-%1").arg(shout_version(0,0,0))+"\n"+
+ tr("Compiled against libshout-%1").arg(shout_version(nullptr,nullptr,nullptr))+"\n"+
tr("Written by: Ilya Kotov <forkotov02@ya.ru>"));
}
diff --git a/src/plugins/Output/shout/settingsdialog.h b/src/plugins/Output/shout/settingsdialog.h
index 0228a4abf..4e44cfd2a 100644
--- a/src/plugins/Output/shout/settingsdialog.h
+++ b/src/plugins/Output/shout/settingsdialog.h
@@ -32,7 +32,7 @@ class SettingsDialog : public QDialog
Q_OBJECT
public:
- explicit SettingsDialog(QWidget *parent = 0);
+ explicit SettingsDialog(QWidget *parent = nullptr);
~SettingsDialog();
public slots:
diff --git a/src/plugins/Output/shout/shoutoutput.cpp b/src/plugins/Output/shout/shoutoutput.cpp
index 6be627357..9ca6e9a95 100644
--- a/src/plugins/Output/shout/shoutoutput.cpp
+++ b/src/plugins/Output/shout/shoutoutput.cpp
@@ -28,11 +28,11 @@
ShoutOutput::ShoutOutput(ShoutClient *m)
{
m_client = m;
- m_soxr = 0;
+ m_soxr = nullptr;
m_ratio = 0;
- m_soxr_buf = 0;
+ m_soxr_buf = nullptr;
m_soxr_buf_frames = 0;
- qsrand(time(NULL));
+ qsrand(time(nullptr));
}
ShoutOutput::~ShoutOutput()
@@ -46,12 +46,12 @@ ShoutOutput::~ShoutOutput()
if(m_soxr)
{
soxr_delete(m_soxr);
- m_soxr = 0;
+ m_soxr = nullptr;
}
if(m_soxr_buf)
{
free(m_soxr_buf);
- m_soxr_buf = 0;
+ m_soxr_buf = nullptr;
}
}
@@ -63,7 +63,7 @@ bool ShoutOutput::initialize(quint32 freq, ChannelMap map, Qmmp::AudioFormat)
if(freq != outFreq)
{
- m_soxr = soxr_create(freq, outFreq, map.size(), 0, 0, 0, 0);
+ m_soxr = soxr_create(freq, outFreq, map.size(), nullptr, nullptr, nullptr, nullptr);
m_ratio = (double)outFreq/freq;
}
@@ -90,7 +90,7 @@ qint64 ShoutOutput::writeAudio(unsigned char *data, qint64 maxSize)
{
int chan = channels();
int frames = maxSize / chan / sizeof(float);
- float *input_data = 0;
+ float *input_data = nullptr;
if(m_soxr)
{
@@ -102,7 +102,7 @@ qint64 ShoutOutput::writeAudio(unsigned char *data, qint64 maxSize)
}
size_t done = 0;
- soxr_process(m_soxr, data, frames, 0, m_soxr_buf, m_soxr_buf_frames, &done);
+ soxr_process(m_soxr, data, frames, nullptr, m_soxr_buf, m_soxr_buf_frames, &done);
input_data = m_soxr_buf;
if(done == 0) //soxr requires more data
return maxSize;
@@ -136,7 +136,7 @@ qint64 ShoutOutput::writeAudio(unsigned char *data, qint64 maxSize)
while(ok && vorbis_analysis_blockout(&m_vd, &m_vb) == 1)
{
// analysis, assume we want to use bitrate management
- vorbis_analysis(&m_vb, NULL);
+ vorbis_analysis(&m_vb, nullptr);
vorbis_bitrate_addblock(&m_vb);
while(ok && vorbis_bitrate_flushpacket(&m_vd, &m_op))
@@ -214,7 +214,7 @@ void ShoutOutput::setTrackInfo(const QMap<Qmmp::MetaData, QString> &metaData)
{ Qmmp::YEAR, "date"},
{ Qmmp::COMPOSER, "composer"},
{ Qmmp::DISCNUMBER, "discnumber"},
- { Qmmp::UNKNOWN, 0}
+ { Qmmp::UNKNOWN, nullptr}
};
int i = 0;
diff --git a/src/plugins/Output/wasapi/settingsdialog.h b/src/plugins/Output/wasapi/settingsdialog.h
index 491f7e917..61dadeebb 100644
--- a/src/plugins/Output/wasapi/settingsdialog.h
+++ b/src/plugins/Output/wasapi/settingsdialog.h
@@ -28,7 +28,7 @@ class SettingsDialog : public QDialog
{
Q_OBJECT
public:
- explicit SettingsDialog(QWidget *parent = 0);
+ explicit SettingsDialog(QWidget *parent = nullptr);
public slots:
void accept();
generated by cgit v1.2.3-13-gbd6f (git 2.30.0) at 2025-12-15 21:35:30 +0000