output/Thread: use Close() after error in ReopenFilter()

Now that CloseFilter() may be called again, we can reduce code duplication.

output/Thread: use Close() after error in ReopenFilter()
3fea624c · Max Kellermann · 9007dd9a · 3fea624c
Commit 3fea624c authored Sep 04, 2016 by Max Kellermann
Hide whitespace changes
Inline Side-by-side

Showing with 1 addition and 13 deletions

OutputThread.cxx src/output/OutputThread.cxx +1 -13

No files found.
--- a/src/output/OutputThread.cxx
+++ b/src/output/OutputThread.cxx
@@ -302,19 +302,7 @@ AudioOutput::ReopenFilter()
 			    "Failed to open filter for \"%s\" [%s]",
 			    name, plugin.name);

-		/* this is a little code duplication from Close(),
-		   but we cannot call this function because we must
-		   not call filter_close(filter) again */
-
-		pipe = nullptr;
-
-		current_chunk = nullptr;
-		open = false;
-		fail_timer.Update();
-
-		mutex.unlock();
-		ao_plugin_close(this);
-		mutex.lock();
+		Close(false);

 		return;
 	}