From 065387600c5d8e3b045802d82c5d4ab12b208e2a Mon Sep 17 00:00:00 2001 From: trialuser02 Date: Sun, 22 Oct 2017 13:05:01 +0000 Subject: changed SoundCore API, fixed displaying bits per sample (#926) git-svn-id: http://svn.code.sf.net/p/qmmp-dev/code/trunk/qmmp@7613 90c681e8-e032-0410-971d-27865f9a5e38 --- src/plugins/Ui/skinned/display.cpp | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) (limited to 'src/plugins/Ui/skinned/display.cpp') diff --git a/src/plugins/Ui/skinned/display.cpp b/src/plugins/Ui/skinned/display.cpp index 9c98b50cb..d4fd519a4 100644 --- a/src/plugins/Ui/skinned/display.cpp +++ b/src/plugins/Ui/skinned/display.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 * @@ -122,8 +122,7 @@ MainDisplay::MainDisplay (MainWindow *parent) m_core = SoundCore::instance(); connect(m_core, SIGNAL(elapsedChanged(qint64)), SLOT(setTime(qint64))); connect(m_core, SIGNAL(bitrateChanged(int)), m_kbps, SLOT(display(int))); - connect(m_core, SIGNAL(frequencyChanged(quint32)), SLOT(setSampleRate(quint32))); - connect(m_core, SIGNAL(channelsChanged(int)), m_monoster, SLOT(setChannels(int))); + connect(m_core, SIGNAL(audioParametersChanged(AudioParameters)), SLOT(onAudioPatametersChanged(AudioParameters))); connect(m_core, SIGNAL(stateChanged(Qmmp::State)), SLOT(setState(Qmmp::State))); connect(m_core, SIGNAL(volumeChanged(int)), m_volumeBar, SLOT(setValue(int))); connect(m_core, SIGNAL(balanceChanged(int)), m_balanceBar, SLOT(setValue(int))); @@ -205,6 +204,12 @@ void MainDisplay::setState(Qmmp::State state) } } +void MainDisplay::onAudioPatametersChanged(const AudioParameters &p) +{ + m_monoster->setChannels(p.channels()); + m_freq->display(int(p.sampleRate()) / 1000); +} + void MainDisplay::updateSkin() { setPixmap (m_skin->getMain()); @@ -240,10 +245,6 @@ void MainDisplay::setActive(bool b) m_titlebar->setActive(b); } -void MainDisplay::setSampleRate(quint32 rate) -{ - m_freq->display((int) rate/1000); -} //TODO optimize this connections void MainDisplay::setEQ (QWidget* w) { -- cgit v1.2.3-13-gbd6f