|
a/GUI/player/GUI_PlayerControls.cpp |
|
b/GUI/player/GUI_PlayerControls.cpp |
|
... |
|
... |
| 49 |
ui->btn_play->setIcon(QIcon(Helper::getIconPath() + "play.png"));
|
49 |
ui->btn_play->setIcon(QIcon(Helper::getIconPath() + "play.png"));
|
| 50 |
m_trayIcon->setPlaying(false);
|
50 |
m_trayIcon->setPlaying(false);
|
| 51 |
m_trayIcon->stop();
|
51 |
m_trayIcon->stop();
|
| 52 |
m_playing = false;
|
52 |
m_playing = false;
|
| 53 |
|
53 |
|
| 54 |
ui->lab_title->hide();
|
54 |
ui->lab_title->setText(tr("Upplay ") + m_settings->getVersion());
|
| 55 |
ui->lab_sayonara->show();
|
55 |
ui->lab_artist->setText(tr("Based on Sayonara, by") + " Lucio Carreras");
|
| 56 |
|
56 |
ui->lab_album->setText(tr("Copyright 2011-2013"));
|
| 57 |
ui->lab_artist->hide();
|
|
|
| 58 |
ui->lab_writtenby->show();
|
|
|
| 59 |
|
|
|
| 60 |
ui->lab_album->hide();
|
|
|
| 61 |
ui->lab_version->show();
|
57 |
ui->lab_version->show();
|
| 62 |
|
|
|
| 63 |
ui->lab_rating->hide();
|
58 |
ui->lab_rating->hide();
|
| 64 |
ui->lab_copyright->show();
|
|
|
| 65 |
|
59 |
|
| 66 |
this->setWindowTitle("Upplay");
|
60 |
this->setWindowTitle("Upplay");
|
| 67 |
ui->songProgress->setValue(0);
|
61 |
ui->songProgress->setValueNoSigs(0);
|
| 68 |
ui->curTime->setText("0:00");
|
62 |
ui->curTime->setText("0:00");
|
| 69 |
ui->maxTime->setText("0:00");
|
63 |
ui->maxTime->setText("0:00");
|
| 70 |
|
64 |
|
| 71 |
ui->albumCover->setIcon(QIcon(Helper::getIconPath() + "logo.png"));
|
65 |
ui->albumCover->setIcon(QIcon(Helper::getIconPath() + "logo.png"));
|
| 72 |
|
66 |
|
|
... |
|
... |
| 139 |
{
|
133 |
{
|
| 140 |
//qDebug() << "GUI_Player::setCurrentPosition: " << pos_sec << " S" <<
|
134 |
//qDebug() << "GUI_Player::setCurrentPosition: " << pos_sec << " S" <<
|
| 141 |
// "song len " << m_completeLength_ms << " mS";
|
135 |
// "song len " << m_completeLength_ms << " mS";
|
| 142 |
if (m_completeLength_ms != 0) {
|
136 |
if (m_completeLength_ms != 0) {
|
| 143 |
int newSliderVal = (pos_sec * 100000) / (m_completeLength_ms);
|
137 |
int newSliderVal = (pos_sec * 100000) / (m_completeLength_ms);
|
| 144 |
ui->songProgress->blockSignals(true);
|
|
|
| 145 |
ui->songProgress->setValue(newSliderVal);
|
138 |
ui->songProgress->setValueNoSigs(newSliderVal);
|
| 146 |
ui->songProgress->blockSignals(false);
|
|
|
| 147 |
}
|
139 |
}
|
| 148 |
QString curPosString = Helper::cvtMsecs2TitleLengthString(pos_sec * 1000);
|
140 |
QString curPosString = Helper::cvtMsecs2TitleLengthString(pos_sec * 1000);
|
| 149 |
ui->curTime->setText(curPosString);
|
141 |
ui->curTime->setText(curPosString);
|
| 150 |
}
|
142 |
}
|
| 151 |
|
143 |
|
|
... |
|
... |
| 196 |
|
188 |
|
| 197 |
void GUI_Player::setVolume(int volume_percent, bool dostore, bool doemit)
|
189 |
void GUI_Player::setVolume(int volume_percent, bool dostore, bool doemit)
|
| 198 |
{
|
190 |
{
|
| 199 |
//qDebug() << "GUI_PLayer::setVolume " << volume_percent;
|
191 |
//qDebug() << "GUI_PLayer::setVolume " << volume_percent;
|
| 200 |
setupVolButton(volume_percent);
|
192 |
setupVolButton(volume_percent);
|
| 201 |
ui->songProgress->blockSignals(true);
|
|
|
| 202 |
ui->volumeSlider->setValue(volume_percent);
|
193 |
ui->volumeSlider->setValueNoSigs(volume_percent);
|
| 203 |
ui->songProgress->blockSignals(false);
|
|
|
| 204 |
if (doemit) {
|
194 |
if (doemit) {
|
| 205 |
emit sig_volume_changed(volume_percent);
|
195 |
emit sig_volume_changed(volume_percent);
|
| 206 |
}
|
196 |
}
|
| 207 |
if (dostore) {
|
197 |
if (dostore) {
|
| 208 |
m_settings->setVolume(volume_percent);
|
198 |
m_settings->setVolume(volume_percent);
|