diff options
Diffstat (limited to 'src/plugins/Ui')
| -rw-r--r-- | src/plugins/Ui/qsui/mainwindow.cpp | 7 | ||||
| -rw-r--r-- | src/plugins/Ui/skinned/display.cpp | 15 | ||||
| -rw-r--r-- | src/plugins/Ui/skinned/display.h | 5 |
3 files changed, 15 insertions, 12 deletions
diff --git a/src/plugins/Ui/qsui/mainwindow.cpp b/src/plugins/Ui/qsui/mainwindow.cpp index e92ed21a3..56f5622ca 100644 --- a/src/plugins/Ui/qsui/mainwindow.cpp +++ b/src/plugins/Ui/qsui/mainwindow.cpp @@ -369,11 +369,12 @@ void MainWindow::updateStatus() if(m_core->state() == Qmmp::Playing || m_core->state() == Qmmp::Paused) { + AudioParameters ap = m_core->audioParameters(); m_statusLabel->setText(tr("<b>%1</b>|%2 bit|%3 ch|%4 Hz|tracks: %5|total time: %6|%7 kbps|") .arg(m_core->state() == Qmmp::Playing ? tr("Playing") : tr("Paused")) - .arg(m_core->sampleSize()) - .arg(m_core->channels()) - .arg(m_core->frequency()) + .arg(ap.validBitsPerSample()) + .arg(ap.channels()) + .arg(ap.sampleRate()) .arg(tracks) .arg(MetaDataFormatter::formatLength(length, false)) .arg(m_core->bitrate())); 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) { diff --git a/src/plugins/Ui/skinned/display.h b/src/plugins/Ui/skinned/display.h index b11374b7b..95781eb94 100644 --- a/src/plugins/Ui/skinned/display.h +++ b/src/plugins/Ui/skinned/display.h @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (C) 2006-2013 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 * @@ -22,6 +22,7 @@ #include <QPixmap> #include <qmmp/statehandler.h> +#include <qmmp/audioparameters.h> #include "pixmapwidget.h" class TimeIndicator; @@ -81,9 +82,9 @@ private slots: void displayVolume(); void showPosition(); void updatePosition(); - void setSampleRate(quint32 rate); void setTime(qint64); void setState(Qmmp::State state); + void onAudioPatametersChanged(const AudioParameters &p); private: void updatePositions(); |