fix build issues with background streams

clementine-player · Nov 27, 2021 · bbc5f94 · bbc5f94
1 parent 9e345c5
commit bbc5f94
Show file tree

Hide file tree

Showing 5 changed files with 12 additions and 10 deletions.
diff --git a/include/clementine-config.h.in b/include/clementine-config.h.in
@@ -48,6 +48,7 @@
 #cmakedefine HAVE_OPENGL
 #cmakedefine HAVE_TRANSLATIONS
 #cmakedefine HAVE_SPOTIFY
+#cmakedefine HAVE_BACKGROUND_STREAMS
 #cmakedefine TAGLIB_HAS_OPUS
 #cmakedefine USE_INSTALL_PREFIX
 #cmakedefine USE_SYSTEM_PROJECTM

diff --git a/src/engines/gstengine.cpp b/src/engines/gstengine.cpp
@@ -102,7 +102,7 @@ const char* GstEngine::kHypnotoadPipeline =
 const char* GstEngine::kEnterprisePipeline =
     "audiotestsrc wave=5 ! "
     "audiocheblimit mode=0 cutoff=120";
-#endif
+#endif // HAVE_BACKGROUND_STREAMS
 
 GstEngine::GstEngine(Application* app)
     : Engine::Base(),
@@ -865,7 +865,7 @@ shared_ptr<GstEnginePipeline> GstEngine::CreatePipeline(
       ret.reset();
     }
   } else 
-#endif
+#endif // HAVE_BACKGROUND_STREAMS
   {
     if (!ret->InitFromReq(req, end_nanosec)) ret.reset();
   }
@@ -938,7 +938,7 @@ void GstEngine::SetBackgroundStreamVolume(int id, int volume) {
   pipeline->SetVolume(volume);
 }
 
-#endif
+#endif // HAVE_BACKGROUND_STREAMS
 
 void GstEngine::BufferingStarted() {
   if (buffering_task_id_ != -1) {

diff --git a/src/engines/gstengine.h b/src/engines/gstengine.h
@@ -32,6 +32,7 @@
 #include <QTimerEvent>
 #include <memory>
 
+#include "config.h"
 #include "bufferconsumer.h"
 #include "core/timeconstants.h"
 #include "enginebase.h"

diff --git a/src/ui/mainwindow.cpp b/src/ui/mainwindow.cpp
@@ -401,10 +401,10 @@ MainWindow::MainWindow(Application* app, SystemTrayIcon* tray_icon, OSD* osd,
       IconLoader::Load("weather-showers-scattered", IconLoader::Base));
   ui_->action_hypnotoad->setIcon(
       IconLoader::Load("hypnotoad", IconLoader::Base));
-  ui_->action_kittens->setIcon(IconLoader::Load("kittens", IconLoader::Base));
-#endif
   ui_->action_enterprise->setIcon(
-      IconLoader::Load("enterprise", IconLoader::Base));
+    IconLoader::Load("enterprise", IconLoader::Base));
+#endif
+  ui_->action_kittens->setIcon(IconLoader::Load("kittens", IconLoader::Base));
   ui_->action_love->setIcon(IconLoader::Load("love", IconLoader::Lastfm));
 
   // File view connections
@@ -509,7 +509,7 @@ MainWindow::MainWindow(Application* app, SystemTrayIcon* tray_icon, OSD* osd,
   ui_->action_rain->setVisible(false);
   ui_->action_hypnotoad->setVisible(false);
   ui_->action_enterprise->setVisible(false);
-#endif
+#endif // HAVE_BACKGROUND_STREAMS
 
   // Playlist view actions
   ui_->action_next_playlist->setShortcuts(

diff --git a/src/widgets/nowplayingwidget.cpp b/src/widgets/nowplayingwidget.cpp
@@ -153,7 +153,7 @@ NowPlayingWidget::NowPlayingWidget(QWidget* parent)
       menu_->addAction(tr("ALL GLORY TO THE HYPNOTOAD"));
   bask_in_his_glory_action_->setVisible(false);
   connect(bask_in_his_glory_action_, SIGNAL(triggered()), SLOT(Bask()));
-#endif
+#endif // HAVE_BACKGROUND_STREAMS
 
   // Animations
   connect(show_hide_animation_, SIGNAL(frameChanged(int)),
@@ -631,7 +631,7 @@ void NowPlayingWidget::AllHail(bool hypnotoad) {
   }
 }
 
-#endif
+#endif // HAVE_BACKGROUND_STREAMS
 
 void NowPlayingWidget::EnableKittens(bool aww) {
   if (!kittens_ && aww) {
@@ -696,7 +696,7 @@ void NowPlayingWidget::Bask() {
   big_hypnotoad_->showFullScreen();
 }
 
-#endif
+#endif // HAVE_BACKGROUND_STREAMS
 
 void NowPlayingWidget::dragEnterEvent(QDragEnterEvent* e) {
   if (AlbumCoverChoiceController::CanAcceptDrag(e)) {