diff options
Diffstat (limited to 'src/plugins/Output')
| -rw-r--r-- | src/plugins/Output/alsa/settingsdialog.cpp | 4 | ||||
| -rw-r--r-- | src/plugins/Output/jack/outputjack.cpp | 11 | ||||
| -rw-r--r-- | src/plugins/Output/jack/outputjack.h | 2 |
3 files changed, 9 insertions, 8 deletions
diff --git a/src/plugins/Output/alsa/settingsdialog.cpp b/src/plugins/Output/alsa/settingsdialog.cpp index d4b008b0c..e60715b3d 100644 --- a/src/plugins/Output/alsa/settingsdialog.cpp +++ b/src/plugins/Output/alsa/settingsdialog.cpp @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (C) 2006-2016 by Ilya Kotov * + * Copyright (C) 2006-2017 by Ilya Kotov * * forkotov02@ya.ru * * * * This program is free software; you can redistribute it and/or modify * @@ -98,7 +98,7 @@ void SettingsDialog::getSoftDevices() if(snd_device_name_hint(-1, "pcm", &hints) < 0) return; - while(hints[i]) + while(hints && hints[i]) { char *type = snd_device_name_get_hint (hints[i], "IOID"); if (!type || !strcmp (type, "Output")) diff --git a/src/plugins/Output/jack/outputjack.cpp b/src/plugins/Output/jack/outputjack.cpp index 9672c7e72..948d98536 100644 --- a/src/plugins/Output/jack/outputjack.cpp +++ b/src/plugins/Output/jack/outputjack.cpp @@ -51,6 +51,7 @@ bool OutputJACK::initialize(quint32 freq, ChannelMap map, Qmmp::AudioFormat form { qDebug("OutputJACK: initialize"); int bits = 0; + unsigned long f = freq; Qmmp::AudioFormat input_format = Qmmp::PCM_S8; switch(format) { @@ -64,13 +65,13 @@ bool OutputJACK::initialize(quint32 freq, ChannelMap map, Qmmp::AudioFormat form } - if(JACK_Open(&jack_device, bits, (unsigned long *)&freq, map.count())) + if(JACK_Open(&jack_device, bits, &f, map.count())) { m_inited = false; return false; } m_inited = true; - configure(freq, map, input_format); + configure(f, map, input_format); return true; } @@ -83,7 +84,7 @@ qint64 OutputJACK::writeAudio(unsigned char *data, qint64 maxSize) { if(!m_inited) return -1; - m = JACK_Write(jack_device, (unsigned char*)data, maxSize); + qint64 l = JACK_Write(jack_device, (unsigned char*)data, maxSize); if(JACK_GetState(jack_device) != PLAYING && JACK_GetState(jack_device) != RESET) { @@ -91,7 +92,7 @@ qint64 OutputJACK::writeAudio(unsigned char *data, qint64 maxSize) return -1; } - if (m == 0) + if (l == 0) { usleep(2000); m_wait_time += 2000; @@ -104,7 +105,7 @@ qint64 OutputJACK::writeAudio(unsigned char *data, qint64 maxSize) } else m_wait_time = 0; - return m; + return l; } void OutputJACK::reset() diff --git a/src/plugins/Output/jack/outputjack.h b/src/plugins/Output/jack/outputjack.h index 50d61faa6..c812cc6f3 100644 --- a/src/plugins/Output/jack/outputjack.h +++ b/src/plugins/Output/jack/outputjack.h @@ -48,7 +48,7 @@ public: private: // helper functions void uninitialize(); - qint64 m, m_wait_time; + qint64 m_wait_time; bool m_inited; int jack_device; }; |