From a7ffc85404d1510d0325043a59fcfca7df439111 Mon Sep 17 00:00:00 2001
From: Andrey <a.bychkov@itelma.su>
Date: Tue, 26 Apr 2022 14:09:59 +0300
Subject: [PATCH] piminsleep bug and PIIODevice splitFullPath optimization

---
 libs/main/core/pibase.h             |  4 ++--
 libs/main/io_devices/piiodevice.cpp | 16 ++++++++--------
 2 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/libs/main/core/pibase.h b/libs/main/core/pibase.h
index 3cc2961a..5531fd43 100644
--- a/libs/main/core/pibase.h
+++ b/libs/main/core/pibase.h
@@ -387,12 +387,12 @@
 //! \~\brief
 //! \~english Macro used for infinite wait
 //! \~russian Макрос для бесконечного ожидания
-#define FOREVER_WAIT FOREVER piMinSleep;
+#define FOREVER_WAIT FOREVER piMinSleep();
 
 //! \~\brief
 //! \~english Macro used for infinite wait
 //! \~russian Макрос для бесконечного ожидания
-#define WAIT_FOREVER FOREVER piMinSleep;
+#define WAIT_FOREVER FOREVER piMinSleep();
 
 
 //! \~\brief
diff --git a/libs/main/io_devices/piiodevice.cpp b/libs/main/io_devices/piiodevice.cpp
index 087d7913..ba540439 100644
--- a/libs/main/io_devices/piiodevice.cpp
+++ b/libs/main/io_devices/piiodevice.cpp
@@ -462,23 +462,23 @@ void PIIODevice::configureFromVariant(const PIVariantTypes::IODevice & d) {
 void PIIODevice::splitFullPath(PIString fpwm, PIString * full_path, DeviceMode * mode, DeviceOptions * opts) {
 	int dm = 0;
 	DeviceOptions op = 0;
-	if (fpwm.find("(") > 0 && fpwm.find(")") > 0) {
-		PIString dms(fpwm.right(fpwm.length() - fpwm.findLast("(")).takeRange("(", ")").trim().toLowerCase().removeAll(' '));
+	if (fpwm.find('(') > 0 && fpwm.find(')') > 0) {
+		PIString dms(fpwm.right(fpwm.length() - fpwm.findLast('(')).takeRange('(', ')').trim().toLowerCase().removeAll(' '));
 		PIStringList opts(dms.split(","));
 		piForeachC (PIString & o, opts) {
 			//piCout << dms;
-			if (o == "r" || o == "ro" || o == "read" || o == "readonly")
+			if (o == PIStringAscii("r") || o == PIStringAscii("ro") || o == PIStringAscii("read") || o == PIStringAscii("readonly"))
 				dm |= ReadOnly;
-			if (o == "w" || o == "wo" || o == "write" || o == "writeonly")
+			if (o == PIStringAscii("w") || o == PIStringAscii("wo") || o == PIStringAscii("write") || o == PIStringAscii("writeonly"))
 				dm |= WriteOnly;
-			if (o == "br" || o == "blockr" || o == "blockread" || o == "blockingread")
+			if (o == PIStringAscii("br") || o == PIStringAscii("blockr") || o == PIStringAscii("blockread") || o == PIStringAscii("blockingread"))
 				op |= BlockingRead;
-			if (o == "bw" || o == "blockw" || o == "blockwrite" || o == "blockingwrite")
+			if (o == PIStringAscii("bw") || o == PIStringAscii("blockw") || o == PIStringAscii("blockwrite") || o == PIStringAscii("blockingwrite"))
 				op |= BlockingWrite;
-			if (o == "brw" || o == "bwr" || o == "blockrw" || o == "blockwr" || o == "blockreadrite" || o == "blockingreadwrite")
+			if (o == PIStringAscii("brw") || o == PIStringAscii("bwr") || o == PIStringAscii("blockrw") || o == PIStringAscii("blockwr") || o == PIStringAscii("blockreadrite") || o == PIStringAscii("blockingreadwrite"))
 				op |= BlockingRead | BlockingWrite;
 		}
-		fpwm.cutRight(fpwm.length() - fpwm.findLast("(")).trim();
+		fpwm.cutRight(fpwm.length() - fpwm.findLast('(')).trim();
 	}
 	if (dm == 0) dm = ReadWrite;
 	if (full_path) *full_path = fpwm;