diff options
Diffstat (limited to 'src/plugins/Output')
| -rw-r--r-- | src/plugins/Output/alsa/outputalsa.cpp | 5 | ||||
| -rw-r--r-- | src/plugins/Output/alsa/outputalsa.h | 5 |
2 files changed, 6 insertions, 4 deletions
diff --git a/src/plugins/Output/alsa/outputalsa.cpp b/src/plugins/Output/alsa/outputalsa.cpp index 35e37b301..08ce660f8 100644 --- a/src/plugins/Output/alsa/outputalsa.cpp +++ b/src/plugins/Output/alsa/outputalsa.cpp @@ -40,8 +40,9 @@ OutputALSA::OutputALSA(QObject * parent, bool useVolume) : Output(parent), m_inited(FALSE), m_pause(FALSE), m_play(FALSE), m_userStop(FALSE), m_totalWritten(0), m_currentSeconds(-1), - m_bps(-1), m_frequency(-1), m_channels(-1), m_precision(-1) + m_bps(-1), m_channels(-1), m_precision(-1) { + m_frequency = 0; QSettings settings(QDir::homePath()+"/.qmmp/qmmprc", QSettings::IniFormat); QString dev_name = settings.value("ALSA/device","default").toString(); m_use_mmap = settings.value("ALSA/use_mmap", FALSE).toBool(); @@ -96,7 +97,7 @@ void OutputALSA::seek(long pos) m_currentSeconds = -1; } -void OutputALSA::configure(qint64 freq, int chan, int prec) +void OutputALSA::configure(quint32 freq, int chan, int prec) { // we need to configure if (freq != m_frequency || chan != m_channels || prec != m_precision) diff --git a/src/plugins/Output/alsa/outputalsa.h b/src/plugins/Output/alsa/outputalsa.h index 333600b1d..7289a1ccd 100644 --- a/src/plugins/Output/alsa/outputalsa.h +++ b/src/plugins/Output/alsa/outputalsa.h @@ -42,7 +42,7 @@ public: bool initialize(); bool isInitialized() const { return m_inited; } void uninitialize(); - void configure(qint64, int, int); + void configure(quint32, int, int); void stop(); void pause(); qint64 written(); @@ -62,7 +62,8 @@ private: bool m_inited, m_pause, m_play, m_userStop; long m_totalWritten, m_currentSeconds, m_bps; - int m_rate, m_frequency, m_channels, m_precision; + int m_rate, m_channels, m_precision; + quint32 m_frequency; //alsa snd_pcm_t *pcm_handle; char *pcm_name; |