MainWindow: Only pass progress to UpdateTaskbarProgress
This commit is contained in:
parent
ac0926d40b
commit
147fd87d8c
|
@ -1727,7 +1727,7 @@ void MainWindow::Seeked(const qint64 microseconds) {
|
||||||
|
|
||||||
#ifdef HAVE_DBUS
|
#ifdef HAVE_DBUS
|
||||||
if (taskbar_progress_) {
|
if (taskbar_progress_) {
|
||||||
UpdateTaskbarProgress(true, position, length);
|
UpdateTaskbarProgress(true, static_cast<double>(position) / static_cast<double>(length));
|
||||||
}
|
}
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
@ -1747,7 +1747,7 @@ void MainWindow::UpdateTrackPosition() {
|
||||||
|
|
||||||
#ifdef HAVE_DBUS
|
#ifdef HAVE_DBUS
|
||||||
if (taskbar_progress_) {
|
if (taskbar_progress_) {
|
||||||
UpdateTaskbarProgress(true, position, length);
|
UpdateTaskbarProgress(true, static_cast<double>(position) / static_cast<double>(length));
|
||||||
}
|
}
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
@ -1778,13 +1778,13 @@ void MainWindow::UpdateTrackSliderPosition() {
|
||||||
}
|
}
|
||||||
|
|
||||||
#ifdef HAVE_DBUS
|
#ifdef HAVE_DBUS
|
||||||
void MainWindow::UpdateTaskbarProgress(const bool visible, const double position, const double length) {
|
void MainWindow::UpdateTaskbarProgress(const bool visible, const double progress) {
|
||||||
|
|
||||||
QVariantMap map;
|
QVariantMap map;
|
||||||
QDBusMessage msg = QDBusMessage::createSignal(QStringLiteral("/org/strawberrymusicplayer/strawberry"), QStringLiteral("com.canonical.Unity.LauncherEntry"), QStringLiteral("Update"));
|
QDBusMessage msg = QDBusMessage::createSignal(QStringLiteral("/org/strawberrymusicplayer/strawberry"), QStringLiteral("com.canonical.Unity.LauncherEntry"), QStringLiteral("Update"));
|
||||||
|
|
||||||
map.insert(QStringLiteral("progress-visible"), visible);
|
map.insert(QStringLiteral("progress-visible"), visible);
|
||||||
map.insert(QStringLiteral("progress"), position / length);
|
map.insert(QStringLiteral("progress"), progress);
|
||||||
msg << QStringLiteral("application://org.strawberrymusicplayer.strawberry.desktop") << map;
|
msg << QStringLiteral("application://org.strawberrymusicplayer.strawberry.desktop") << map;
|
||||||
|
|
||||||
QDBusConnection::sessionBus().send(msg);
|
QDBusConnection::sessionBus().send(msg);
|
||||||
|
|
|
@ -294,7 +294,7 @@ class MainWindow : public QMainWindow, public PlatformInterface {
|
||||||
void SetToggleScrobblingIcon(const bool value);
|
void SetToggleScrobblingIcon(const bool value);
|
||||||
|
|
||||||
#ifdef HAVE_DBUS
|
#ifdef HAVE_DBUS
|
||||||
void UpdateTaskbarProgress(const bool visible, const double position = 0, const double length = 0);
|
void UpdateTaskbarProgress(const bool visible, const double progress = 0);
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
private:
|
private:
|
||||||
|
|
Loading…
Reference in New Issue