input/Stream: remove attribute "cond", replace with handler interface
This adds a bit of overhead, but also adds flexibility to the API, because arbitrary triggers may be invoked from that virtual method implementation, not just Cond::signal(). The motivation for this is to make the handlers more dynamic, for the upcoming buffering class utilizing ProxyInputStream.
This commit is contained in:
		@@ -27,7 +27,6 @@
 | 
			
		||||
#include "decoder/DecoderPlugin.hxx"
 | 
			
		||||
#include "input/InputStream.hxx"
 | 
			
		||||
#include "input/LocalOpen.hxx"
 | 
			
		||||
#include "thread/Cond.hxx"
 | 
			
		||||
 | 
			
		||||
#include <exception>
 | 
			
		||||
 | 
			
		||||
@@ -41,7 +40,6 @@ class TagFileScan {
 | 
			
		||||
	void *handler_ctx;
 | 
			
		||||
 | 
			
		||||
	Mutex mutex;
 | 
			
		||||
	Cond cond;
 | 
			
		||||
	InputStreamPtr is;
 | 
			
		||||
 | 
			
		||||
public:
 | 
			
		||||
@@ -62,8 +60,7 @@ public:
 | 
			
		||||
		/* open the InputStream (if not already open) */
 | 
			
		||||
		if (is == nullptr) {
 | 
			
		||||
			try {
 | 
			
		||||
				is = OpenLocalInputStream(path_fs,
 | 
			
		||||
							  mutex, cond);
 | 
			
		||||
				is = OpenLocalInputStream(path_fs, mutex);
 | 
			
		||||
			} catch (...) {
 | 
			
		||||
				return false;
 | 
			
		||||
			}
 | 
			
		||||
 
 | 
			
		||||
		Reference in New Issue
	
	Block a user