dryark/strawberry
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix macos build

Browse Source
This commit is contained in:
Jonas Kvinge
2018-07-01 22:26:46 +02:00
parent c4e75dea65
commit ada7325a04
51 changed files with 453 additions and 399 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/widgets/osd.cpp
View File

@@ -220,7 +220,7 @@ void OSD::ShowMessage(const QString &summary, const QString &message, const QStr
}
break;
#ifndef Q_OS_DARWIN
#ifndef Q_OS_MACOS
case TrayPopup:
tray_icon_->ShowPopup(summary, message, timeout_msec_);
break;
@@ -324,7 +324,7 @@ QString OSD::ReplaceVariable(const QString &variable, const Song &song) {
// We need different strings depending on notification type
switch (behaviour_) {
case Native:
#ifdef Q_OS_DARWIN
#ifdef Q_OS_MACOS
return "\n";
#endif
#ifdef Q_OS_LINUX

5
src/widgets/statusview.cpp
View File

@@ -297,7 +297,6 @@ void StatusView::UpdateSong() {
const QueryOptions opt;
CollectionBackend::AlbumList albumlist;
Engine::EngineType enginetype = app_->player()->engine()->type();
label_playing_top_->setText("");
label_playing_text_->setText("");
@@ -314,9 +313,9 @@ void StatusView::UpdateSong() {
html += QString("Bitrate: %1 kbps<br />\n").arg(metadata_.bitrate());
html += QString("Samplerate: %1 hz / %2 bit<br />\n").arg(metadata_.samplerate()).arg(metadata_.bitdepth());
if (enginetype != Engine::EngineType::None) {
if (app_->player()->engine() && app_->player()->engine()->type() != Engine::EngineType::None) {
html += QString("<br />");
html += QString("Engine: %1<br />").arg(EngineName(enginetype));
html += QString("Engine: %1<br />").arg(EngineDescription(app_->player()->engine()->type()));
}
html += QString("<br />");