From 3894419b14a54459c4da7e0c16787d732d5ef765 Mon Sep 17 00:00:00 2001
From: Jonas Kvinge <jonas@jkvinge.net>
Date: Sun, 1 Jul 2018 15:30:53 +0200
Subject: [PATCH] More engine fixes

---
 src/engine/phononengine.cpp          | 2 +-
 src/engine/vlcengine.h               | 2 +-
 src/engine/xineengine.cpp            | 2 +-
 src/settings/backendsettingspage.cpp | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/engine/phononengine.cpp b/src/engine/phononengine.cpp
index 2bb9c0c22..1ab772eb9 100644
--- a/src/engine/phononengine.cpp
+++ b/src/engine/phononengine.cpp
@@ -181,7 +181,7 @@ EngineBase::OutputDetailsList PhononEngine::GetOutputsList() const {
 
 bool PhononEngine::ValidOutput(const QString &output) {
 
-  return (output == "auto" || output == "" || output == DefaultOutput);
+  return (output == "auto" || output == "" || output == DefaultOutput());
   return(false);
 
 }
diff --git a/src/engine/vlcengine.h b/src/engine/vlcengine.h
index ae49cc518..2a9eee358 100644
--- a/src/engine/vlcengine.h
+++ b/src/engine/vlcengine.h
@@ -65,7 +65,7 @@ class VLCEngine : public Engine::Base {
   OutputDetailsList GetOutputsList() const;
   bool ValidOutput(const QString &output);
   QString DefaultOutput() { return ""; }
-  bool CustomDeviceSupport(const QString &value);
+  bool CustomDeviceSupport(const QString &output);
 
  private:
   libvlc_instance_t *instance_;
diff --git a/src/engine/xineengine.cpp b/src/engine/xineengine.cpp
index d23b4649d..79f4b7bc3 100644
--- a/src/engine/xineengine.cpp
+++ b/src/engine/xineengine.cpp
@@ -428,7 +428,7 @@ void XineEngine::SetEnvironment() {
 #ifdef Q_OS_DARWIN
   setenv("XINE_PLUGIN_PATH", QString(QCoreApplication::applicationDirPath() + "/../PlugIns/xine").toLatin1().constData(), 1);
 #endif
-  
+
 }
 
 uint XineEngine::length() const {
diff --git a/src/settings/backendsettingspage.cpp b/src/settings/backendsettingspage.cpp
index 61b787981..c3969ec77 100644
--- a/src/settings/backendsettingspage.cpp
+++ b/src/settings/backendsettingspage.cpp
@@ -195,7 +195,7 @@ void BackendSettingsPage::Load_Output(QString output, QVariant device) {
     i++;
     ui_->combobox_output->addItem(IconLoader::Load(o.iconname), o.description, QVariant::fromValue(o));
   }
-  if (i > 0) ui_->combobox_output->setEnabled(true);
+  if (i > 1) ui_->combobox_output->setEnabled(true);
 
   bool found(false);
   for (int i = 0; i < ui_->combobox_output->count(); ++i) {