|
a/GUI/mainw/mw_controls.cpp |
|
b/GUI/mainw/mw_controls.cpp |
|
... |
|
... |
| 24 |
#include "trayicon.h"
|
24 |
#include "trayicon.h"
|
| 25 |
|
25 |
|
| 26 |
/** Slots connected to player or trayicon signals **/
|
26 |
/** Slots connected to player or trayicon signals **/
|
| 27 |
void GUI_Player::playClicked()
|
27 |
void GUI_Player::playClicked()
|
| 28 |
{
|
28 |
{
|
| 29 |
if (!m_metadata_available) {
|
29 |
// We don't know which control caused this, so make sure all ui are setup
|
| 30 |
emit play();
|
30 |
m_trayIcon->setPlaying(true);
|
| 31 |
return;
|
31 |
ui->player_w->playctl()->onPlaying();
|
| 32 |
}
|
|
|
| 33 |
|
32 |
|
| 34 |
if (m_playing) {
|
|
|
| 35 |
emit pause();
|
|
|
| 36 |
} else {
|
|
|
| 37 |
emit play();
|
33 |
emit play();
|
| 38 |
}
|
34 |
}
|
| 39 |
|
35 |
|
| 40 |
m_playing = !m_playing;
|
36 |
void GUI_Player::pauseClicked()
|
|
|
37 |
{
|
|
|
38 |
// We don't know which control caused this, so make sure all ui are setup
|
| 41 |
m_trayIcon->setPlaying(m_playing);
|
39 |
m_trayIcon->setPlaying(false);
|
| 42 |
ui->player_w->playctl()->onPlaying();
|
40 |
ui->player_w->playctl()->onPaused();
|
|
|
41 |
|
|
|
42 |
emit pause();
|
| 43 |
}
|
43 |
}
|
| 44 |
|
44 |
|
| 45 |
void GUI_Player::stopClicked()
|
45 |
void GUI_Player::stopClicked()
|
| 46 |
{
|
46 |
{
|
| 47 |
m_trayIcon->setPlaying(false);
|
47 |
m_trayIcon->setPlaying(false);
|
| 48 |
m_trayIcon->stop();
|
48 |
m_trayIcon->stop();
|
| 49 |
m_playing = false;
|
|
|
| 50 |
|
49 |
|
| 51 |
ui->player_w->playctl()->onStopped();
|
50 |
ui->player_w->playctl()->onStopped();
|
| 52 |
|
51 |
|
|
|
52 |
idleDisplay();
|
|
|
53 |
emit stop();
|
|
|
54 |
}
|
|
|
55 |
|
|
|
56 |
void GUI_Player::onMuteChanged(bool mute)
|
|
|
57 |
{
|
|
|
58 |
m_trayIcon->setMute(mute);
|
|
|
59 |
ui->player_w->volume()->setMuteUi(mute);
|
|
|
60 |
|
|
|
61 |
emit sig_mute(mute);
|
|
|
62 |
}
|
|
|
63 |
|
|
|
64 |
void GUI_Player::idleDisplay()
|
|
|
65 |
{
|
| 53 |
MetaData md;
|
66 |
MetaData md;
|
| 54 |
md.title = QString::fromUtf8("Upplay ") + m_settings->getVersion();
|
67 |
md.title = QString::fromUtf8("Upplay ") + m_settings->getVersion();
|
| 55 |
md.artist = m_renderer_friendly_name.isEmpty() ?
|
68 |
md.artist = m_renderer_friendly_name.isEmpty() ?
|
| 56 |
"No renderer connected" :
|
69 |
"No renderer connected" :
|
| 57 |
tr("Renderer: ") + m_renderer_friendly_name;
|
70 |
tr("Renderer: ") + m_renderer_friendly_name;
|
|
... |
|
... |
| 60 |
this->setWindowTitle("Upplay");
|
73 |
this->setWindowTitle("Upplay");
|
| 61 |
ui->player_w->progress()->setUi(0);
|
74 |
ui->player_w->progress()->setUi(0);
|
| 62 |
|
75 |
|
| 63 |
ui->player_w->albumCover->setIcon(QIcon(Helper::getIconPath() +
|
76 |
ui->player_w->albumCover->setIcon(QIcon(Helper::getIconPath() +
|
| 64 |
"logo.png"));
|
77 |
"logo.png"));
|
| 65 |
emit stop();
|
|
|
| 66 |
}
|
78 |
}
|
| 67 |
|
79 |
|
| 68 |
void GUI_Player::backwardClicked(bool)
|
80 |
void GUI_Player::backwardClicked()
|
| 69 |
{
|
81 |
{
|
| 70 |
// ui->albumCover->setFocus();
|
82 |
// ui->albumCover->setFocus();
|
| 71 |
int cur_pos_sec =
|
83 |
int cur_pos_sec =
|
| 72 |
(m_completeLength_ms * ui->player_w->progress()->currentValuePc())
|
84 |
(m_completeLength_ms * ui->player_w->progress()->currentValuePc())
|
| 73 |
/ 100000;
|
85 |
/ 100000;
|
|
... |
|
... |
| 76 |
} else {
|
88 |
} else {
|
| 77 |
emit backward();
|
89 |
emit backward();
|
| 78 |
}
|
90 |
}
|
| 79 |
}
|
91 |
}
|
| 80 |
|
92 |
|
| 81 |
void GUI_Player::forwardClicked(bool)
|
93 |
void GUI_Player::forwardClicked()
|
| 82 |
{
|
94 |
{
|
| 83 |
//ui->albumCover->setFocus();
|
95 |
//ui->albumCover->setFocus();
|
| 84 |
emit forward();
|
96 |
emit forward();
|
| 85 |
}
|
97 |
}
|
| 86 |
|
98 |
|
|
... |
|
... |
| 124 |
}
|
136 |
}
|
| 125 |
|
137 |
|
| 126 |
// Called from audio when volume has been changed by another player.
|
138 |
// Called from audio when volume has been changed by another player.
|
| 127 |
void GUI_Player::setVolumeUi(int pc)
|
139 |
void GUI_Player::setVolumeUi(int pc)
|
| 128 |
{
|
140 |
{
|
| 129 |
if (!m_mute)
|
|
|
| 130 |
ui->player_w->volume()->setUi(pc);
|
141 |
ui->player_w->volume()->setUi(pc);
|
| 131 |
}
|
142 |
}
|
| 132 |
|
143 |
|
| 133 |
void GUI_Player::setMuteUi(bool ismute)
|
144 |
void GUI_Player::setMuteUi(bool ismute)
|
| 134 |
{
|
145 |
{
|
| 135 |
m_mute = ismute;
|
|
|
| 136 |
ui->player_w->volume()->setMuteUi(ismute);
|
146 |
ui->player_w->volume()->setMuteUi(ismute);
|
| 137 |
}
|
147 |
}
|
| 138 |
|
148 |
|
| 139 |
void GUI_Player::volumeChangedByTick(int val)
|
149 |
void GUI_Player::volumeChangedByTick(int val)
|
| 140 |
{
|
150 |
{
|