- correction of waitForEvent, it was not waiting anymore

Author: thomasjammet

include/RTMFP.h

@@ -35,7 +35,7 @@ along with Librtmfp.  If not, see <http://www.gnu.org/licenses/>.
 #include "Base/Logs.h"
 #include <map>
 
-#define RTMFP_LIB_VERSION	0x020E0002	// (2.14.2)
+#define RTMFP_LIB_VERSION	0x020E0002	// (2.14.3)
 
 #define RTMFP_DEFAULT_KEY	(Base::UInt8*)"Adobe Systems 02"
 #define RTMFP_KEY_SIZE		0x10

sources/Invoker.cpp

@@ -715,9 +715,7 @@ int Invoker::addStream(UInt32 RTMFPcontext, UInt8 mask, const char* streamName,
 }
 
 int Invoker::waitForEvent(UInt32 RTMFPcontext, UInt8 mask) {
-	int handled = 0;
-
-	while (!handled) {
+	for (;;) {
 		if (!Thread::running())
 			return ERROR_APP_INTERRUPT;
 
@@ -730,13 +728,14 @@ int Invoker::waitForEvent(UInt32 RTMFPcontext, UInt8 mask) {
 			if (interrupted || it->second->status >= RTMFP::NEAR_CLOSED) {
 				removeConnection(it, interrupted);
 				return _mapConnections.empty() ? ERROR_LAST_INTERRUPT : ERROR_CONN_INTERRUPT;
-			} else if (it->second->flags & mask) // Event handled?
-				handled = 1;
+			}
+			else if (it->second->flags & mask) // Event handled?
+				break;
 		}
-		return 0;
+		_waitSignal.wait(DELAY_BLOCKING_SIGNALS);
 	}
 
-	return handled;
+	return 1;
 }
 
 bool Invoker::closePublication(UInt32 RTMFPcontext, const char* streamName) {

sources/librtmfp.cpp

@@ -243,7 +243,9 @@ LIBRTMFP_API char RTMFP_WaitForEvent(unsigned int RTMFPcontext, RTMFPMask mask)
 	}
 
 	int res = GlobalInvoker->waitForEvent(RTMFPcontext, mask);
-	return (res <= 0) ? HandleError(res) : 1;
+	if (res < 0)
+		return HandleError(res);
+	return (char)res;
 }
 
 void RTMFP_LogSetCallback(void(* onLog)(unsigned int, const char*, long, const char*)) {