From cfa6965004b73f26b7385e08db797e6af638f04c Mon Sep 17 00:00:00 2001
From: David Robillard <d@drobilla.net>
Date: Sun, 29 Nov 2020 00:51:09 +0100
Subject: Reduce preprocessor gunk

Now that the ALSA driver is only used through the base class, the pointer can
always be there, even if AlsaDriver isn't actually compiled in.
---
 src/Patchage.cpp | 15 ++++++---------
 src/Patchage.hpp |  2 --
 2 files changed, 6 insertions(+), 11 deletions(-)

diff --git a/src/Patchage.cpp b/src/Patchage.cpp
index 3d2853c..cc746b7 100644
--- a/src/Patchage.cpp
+++ b/src/Patchage.cpp
@@ -528,11 +528,9 @@ Patchage::refresh()
 		}
 #endif
 
-#ifdef HAVE_ALSA
 		if (_alsa_driver) {
 			_alsa_driver->refresh(sink);
 		}
-#endif
 	}
 }
 
@@ -631,22 +629,21 @@ Patchage::process_events()
 	}
 }
 
-#ifdef HAVE_ALSA
 void
 Patchage::menu_alsa_connect()
 {
-	_alsa_driver->attach(false);
-	_alsa_driver->refresh(
-	    [this](const PatchageEvent& event) { handle_event(*this, event); });
+	if (_alsa_driver) {
+		_alsa_driver->attach(false);
+	}
 }
 
 void
 Patchage::menu_alsa_disconnect()
 {
-	_alsa_driver->detach();
-	refresh();
+	if (_alsa_driver) {
+		_alsa_driver->detach();
+	}
 }
-#endif
 
 void
 Patchage::on_arrange()
diff --git a/src/Patchage.hpp b/src/Patchage.hpp
index c55953c..b0c2630 100644
--- a/src/Patchage.hpp
+++ b/src/Patchage.hpp
@@ -152,12 +152,10 @@ protected:
 	std::mutex                _events_mutex;
 	std::queue<PatchageEvent> _driver_events;
 
-#ifdef HAVE_ALSA
 	std::unique_ptr<Driver> _alsa_driver;
 
 	void menu_alsa_connect();
 	void menu_alsa_disconnect();
-#endif
 
 	std::shared_ptr<PatchageCanvas> _canvas;
 
-- 
cgit v1.2.1