Packman Build Service PMBS

Changes of Revision 14

_service Changed

_service:obs_scm:sview-26.obscpio/.github/workflows/build_sview_android_ffmpeg.yml Changed

_service:obs_scm:sview-26.obscpio/.github/workflows/build_sview_macos_ffmpeg.yml Changed

_service:obs_scm:sview-26.obscpio/.github/workflows/build_sview_mingw_ffmpeg.yml Changed

_service:obs_scm:sview-26.obscpio/.github/workflows/build_sview_windows.yml Changed

_service:obs_scm:sview-26.obscpio/CHANGELOG.md Changed

@@ -4,6 +4,20 @@
 
 Not all changes are documented here - please check git log for complete list.
 
+sView 26.09 (2026-09-13)
+-----------------------------------------------------------------------------------------------------------------------
+
+- Image Viewer now detects *VR180* (hemispherical panorama) format based on
+  `GPano:FullPanoWidthPixels` to `GPano:CroppedAreaImageWidthPixels` ratio within *JPEG* file.
+- Added option to save *JPEG*/*PNG* image as parallel pair instead of cross-eyed pair.
+- Option *'Stick at panorama 360°'* has been renamed to *'Persist panorama mode'*
+  and now persists the last panorama mode selection instead of forcing spherical panorama;
+  the option now also overrides panorama mode information retrieved from file's metadata.
+- GUI, double tap on an element within properties table now copies text into clipboard.
+- Fixed a crash on saving some *JPEG* images in *YUV420P* format with odd dimensions.
+- *Internals: refactored the half of the code to replace custom template classes*
+  *with `std::vector` and `std::shared_ptr` from standard templates.*
+
 sView 26.07 (2026-07-13)
 -----------------------------------------------------------------------------------------------------------------------

_service:obs_scm:sview-26.obscpio/CMakeLists.txt Changed

_service:obs_scm:sview-26.obscpio/README.md Changed

_service:obs_scm:sview-26.obscpio/StCore/StAndroidGlue.cpp Changed

@@ -296,7 +296,7 @@
 }
 
 void StAndroidGlue::start() {
-    myThread = new StThread(threadEntryWrapper, this, "StAndroidGlue");
+    myThread = std::make_shared<StThread>(threadEntryWrapper, this, "StAndroidGlue");
 
     // Wait for thread to start
     pthread_mutex_lock(&myMutex);
@@ -320,7 +320,7 @@
     writeCommand(CommandId_Destroy);
     pthread_mutex_unlock(&myMutex);
 
-    if(!myThread.isNull()) {
+    if (myThread.get() != nullptr) {
         myThread->wait();
     }
 
@@ -500,26 +500,26 @@
 
     for(;;) {
         createApplication();
-        if(myApp.isNull()) {
+        if (myApp.get() == nullptr) {
             stError("Error: no application to execute!");
             break;
-        } else if(!myApp->open()) {
+        } else if (!myApp->open()) {
             stError("Error: application can not be executed!");
             break;
         }
         myApp->exec();
 
-        StHandle<StOpenInfo> anOther = myApp->getOpenFileInOtherDrawer();
-        if(anOther.isNull()) {
+        std::shared_ptr<StOpenInfo> anOther = myApp->getOpenFileInOtherDrawer();
+        if (anOther.get() == nullptr) {
             break;
         }
 
-        myApp.nullify();
+        myApp.reset();
         StArgument aDrawerArg = anOther->getArgumentsMap()"in";
         myDndPath = anOther->getPath();
         myStAppClass = aDrawerArg.getValue();
     }
-    myApp.nullify();
+    myApp.reset();
 
     // application is done but we are waiting for destroying event...
     bool isFirstWait = true;

_service:obs_scm:sview-26.obscpio/StCore/StApplication.cpp Changed

@@ -25,10 +25,10 @@
 
 namespace {
 
-    static const StCString ST_SETTING_RENDERER_AUTO = stCString("rendererPluginAuto");
-    static const StCString ST_SETTING_RENDERER      = stCString("rendererPlugin");
-    static const StCString ST_SETTING_AUTO_VALUE    = stCString("Auto");
-    static const StCString ST_SETTING_DEF_DRAWER    = stCString("defaultDrawer");
+    static constexpr StCString ST_SETTING_RENDERER_AUTO = stCString("rendererPluginAuto");
+    static constexpr StCString ST_SETTING_RENDERER      = stCString("rendererPlugin");
+    static constexpr StCString ST_SETTING_AUTO_VALUE    = stCString("Auto");
+    static constexpr StCString ST_SETTING_DEF_DRAWER    = stCString("defaultDrawer");
 
     /**
      * Auxiliary parameter.
@@ -55,7 +55,7 @@
 
             private:
 
-        const StApplication* myApp;
+        const StApplication* myApp = nullptr;
         StString myAppName;
 
     };
@@ -63,16 +63,16 @@
 }
 
 void StApplication::doChangeDevice(const int32_t theValue) {
-    if(myWindow.isNull() || !myIsOpened
-    || theValue < 0
-    || size_t(theValue) >= myDevices.size()) {
+    if (myWindow.get() == nullptr || !myIsOpened
+     || theValue < 0
+     || size_t(theValue) >= myDevices.size()) {
         return;
     }
 
-    mySwitchTo.nullify();
-    const StHandle<StOutDevice>& aDev = myDevicestheValue;
+    mySwitchTo.reset();
+    const std::shared_ptr<StOutDevice>& aDev = myDevicestheValue;
     for(size_t aRendIter = 0; aRendIter < myRenderers.size(); ++aRendIter) {
-        StHandle<StWindow>& aRend = myRenderersaRendIter;
+        std::shared_ptr<StWindow>& aRend = myRenderersaRendIter;
         if(aDev->PluginId == aRend->getRendererId()) {
             if(aRend->setDevice(aDev->DeviceId)
             || aRend != myWindow) {
@@ -83,11 +83,11 @@
     }
 }
 
-StApplication::StApplication(const StHandle<StResourceManager>& theResMgr,
-                             const StNativeWin_t                theParentWin,
-                             const StHandle<StOpenInfo>&        theOpenInfo)
+StApplication::StApplication(const std::shared_ptr<StResourceManager>& theResMgr,
+                             const StNativeWin_t theParentWin,
+                             const std::shared_ptr<StOpenInfo>& theOpenInfo)
 : myResMgr(theResMgr),
-  myMsgQueue(new StMsgQueue()),
+  myMsgQueue(std::make_shared<StMsgQueue>()),
   myEventsBuffer(new StEventsBuffer()),
   myWinParent(theParentWin),
   myRendId(ST_SETTING_AUTO_VALUE),
@@ -99,9 +99,9 @@
     stApplicationInit(theOpenInfo);
 }
 
-void StApplication::stApplicationInit(const StHandle<StOpenInfo>& theOpenInfo) {
-    if(myResMgr.isNull()) {
-        myResMgr = new StResourceManager();
+void StApplication::stApplicationInit(const std::shared_ptr<StOpenInfo>& theOpenInfo) {
+    if (myResMgr.get() == nullptr) {
+        myResMgr = std::make_shared<StResourceManager>();
     }
 #ifdef ST_DEBUG_GL
     myGlDebug = true;
@@ -111,9 +111,9 @@
     params.ActiveDevice->signals.onChanged.connect(this, &StApplication::doChangeDevice);
 
     params.VSyncMode = new StEnumParam(0, stCString("vsyncMode"), stCString("VSync mode"));
-    params.VSyncMode->changeValues().add("Off");
-    params.VSyncMode->changeValues().add("On");
-    params.VSyncMode->changeValues().add("Mixed");
+    params.VSyncMode->changeValues().push_back("Off");
+    params.VSyncMode->changeValues().push_back("On");
+    params.VSyncMode->changeValues().push_back("Mixed");
 
     bool isOutModeAuto = true; // AUTO by default
     aGlobalSettings.loadBool(ST_SETTING_RENDERER_AUTO, isOutModeAuto);
@@ -128,11 +128,11 @@
     SetDllDirectoryW(aStCoreFolder.toCString());
 #endif
     myOpenFileInfo = theOpenInfo;
-    if(myOpenFileInfo.isNull()) {
+    if (myOpenFileInfo.get() == nullptr) {
         myOpenFileInfo = parseProcessArguments();
     }
-    if(myOpenFileInfo.isNull()) {
-        myOpenFileInfo = new StOpenInfo();
+    if (myOpenFileInfo.get() == nullptr) {
+        myOpenFileInfo = std::make_shared<StOpenInfo>();
     }
 
     const StArgumentsMap anArgs = myOpenFileInfo->getArgumentsMap();
@@ -171,27 +171,27 @@
 }
 
 bool StApplication::open() {
-    if(!myWindow.isNull()) {
+    if (myWindow.get() != nullptr) {
         return true;
     }
 
     StSettings aGlobalSettings(myResMgr, "sview");
-    if(!mySwitchTo.isNull()) {
+    if (mySwitchTo.get() != nullptr) {
         myRendId = mySwitchTo->getRendererId();
         myWindow = mySwitchTo;
-        mySwitchTo.nullify();
+        mySwitchTo.reset();
         aGlobalSettings.saveString(ST_SETTING_RENDERER,      myRendId);
         aGlobalSettings.saveBool  (ST_SETTING_RENDERER_AUTO, false);
     } else {
-        if(myRenderers.isEmpty()) {
-            myWindow = new StWindow(myResMgr, myWinParent);
+        if (myRenderers.empty()) {
+            myWindow = std::make_shared<StWindow>(myResMgr, myWinParent);
             myWindow->setMessagesQueue(myMsgQueue);
             myWindow->params.VSyncMode = params.VSyncMode;
         } else {
             bool isAuto = myRendId.isEqualsIgnoreCase(ST_SETTING_AUTO_VALUE);
             if(!isAuto) {
                 for(size_t anIter = 0; anIter < myRenderers.size(); ++anIter) {
-                    StHandle<StWindow> aWin = myRenderersanIter;
+                    std::shared_ptr<StWindow> aWin = myRenderersanIter;
                     if(myRendId == aWin->getRendererId()) {
                         myWindow = aWin;
                         aGlobalSettings.saveString(ST_SETTING_RENDERER,      myRendId);
@@ -200,7 +200,7 @@
                     }
                 }
 
-                if(myWindow.isNull()) {
+                if (myWindow.get() == nullptr) {
                     stError(StString("Output with id '" + myRendId + "' is not found."));
                     isAuto = true;
                 }
@@ -211,17 +211,17 @@
                 aGlobalSettings.saveString(ST_SETTING_RENDERER,      ST_SETTING_AUTO_VALUE);
                 aGlobalSettings.saveBool  (ST_SETTING_RENDERER_AUTO, isAuto);
                 myWindow = myRenderers0;
-                if(!myDevices.isEmpty()) {
-                    StHandle<StOutDevice> aBestDev = myDevices0;
-                    for(size_t aDevIter = 0; aDevIter < myDevices.size(); ++aDevIter) {
-                        const StHandle<StOutDevice>& aDev = myDevicesaDevIter;
+                if (!myDevices.empty()) {
+                    std::shared_ptr<StOutDevice> aBestDev = myDevices0;
+                    for (size_t aDevIter = 0; aDevIter < myDevices.size(); ++aDevIter) {
+                        const std::shared_ptr<StOutDevice>& aDev = myDevicesaDevIter;
                         if(aDev->Priority > aBestDev->Priority) {
                             aBestDev = aDev;
                         }
                     }
-                    for(size_t anIter = 0; anIter < myRenderers.size(); ++anIter) {
-                        const StHandle<StWindow>& aWin = myRenderersanIter;
-                        if(aBestDev->PluginId == aWin->getRendererId()) {
+                    for (size_t anIter = 0; anIter < myRenderers.size(); ++anIter) {
+                        const std::shared_ptr<StWindow>& aWin = myRenderersanIter;
+                        if (aBestDev->PluginId == aWin->getRendererId()) {
                             myWindow = aWin;
                             myWindow->setDevice(aBestDev->DeviceId);
                             break;
@@ -236,10 +236,10 @@
     // synchronize devices enumeration
     const StString aPluginId = myWindow->getRendererId();
     const StString aDeviceId = myWindow->getDeviceId();
-    for(size_t aDevIter = 0; aDevIter < myDevices.size(); ++aDevIter) {
-        const StHandle<StOutDevice>& aDev = myDevicesaDevIter;
-        if(aPluginId == aDev->PluginId
-        && aDeviceId == aDev->DeviceId) {
+    for (size_t aDevIter = 0; aDevIter < myDevices.size(); ++aDevIter) {
+        const std::shared_ptr<StOutDevice>& aDev = myDevicesaDevIter;
+        if (aPluginId == aDev->PluginId
+         && aDeviceId == aDev->DeviceId) {
             params.ActiveDevice->setValue((int32_t )aDevIter);
             break;
         }
@@ -275,19 +275,19 @@
     return myIsOpened;
 }
 
-void StApplication::addRenderer(const StHandle<StWindow>& theRenderer) {
-    if(theRenderer.isNull()) {
+void StApplication::addRenderer(const std::shared_ptr<StWindow>& theRenderer) {
+    if (theRenderer.get() == nullptr) {
         return;
     }
 
-    StHandle<StWindow> aRenderer = theRenderer;
+    std::shared_ptr<StWindow> aRenderer = theRenderer;
     aRenderer->params.VSyncMode = params.VSyncMode; // share VSync mode between renderers
     aRenderer->setMessagesQueue(myMsgQueue);
-    myRenderers.add(aRenderer);
+    myRenderers.push_back(aRenderer);
     size_t aDevIter = myDevices.size();
     aRenderer->getDevices(myDevices);
-    for(; aDevIter < myDevices.size(); ++aDevIter) {
-        params.ActiveDevice->changeValues().add(myDevicesaDevIter->Name);
+    for (; aDevIter < myDevices.size(); ++aDevIter) {
+        params.ActiveDevice->changeValues().push_back(myDevicesaDevIter->Name);
     }
 }
 
@@ -296,42 +296,42 @@
 }
 
 void StApplication::doDrawProxy(unsigned int theView) {
-    stglDraw(!myWindow.isNull() && myWindow->isStereoOutput() ? theView : (unsigned int)ST_DRAW_MONO);
+    stglDraw(myWindow.get() != nullptr && myWindow->isStereoOutput() ? theView : (unsigned int)ST_DRAW_MONO);
 }
 
 void StApplication::stglDraw(unsigned int ) {
     //
 }
 
-const StHandle<StWindow>& StApplication::getMainWindow() const {
+const std::shared_ptr<StWindow>& StApplication::getMainWindow() const {
     return myWindow;
 }
 
 bool StApplication::isActive() const {
-    return !myWindow.isNull()
+    return myWindow.get() != nullptr
         && myWindow->isActive();
 }
 
-const StHandle<StMsgQueue>& StApplication::getMessagesQueue() const {
+const std::shared_ptr<StMsgQueue>& StApplication::getMessagesQueue() const {
     return myMsgQueue;
 }
 
 int StApplication::exec() {
-    if(!myIsOpened) {
-        if(!open()) {
+    if (!myIsOpened) {
+        if (!open()) {
             return 1;
         }
     }
 
-    if(!myWindow.isNull()) {
+    if (myWindow.get() != nullptr) {
         // just debug output Monitors' configuration
         const StSearchMonitors& aMonitors = myWindow->getMonitors();
-        for(size_t aMonIter = 0; aMonIter < aMonitors.size(); ++aMonIter) {
+        for (size_t aMonIter = 0; aMonIter < aMonitors.size(); ++aMonIter) {
             ST_DEBUG_LOG(aMonitorsaMonIter.toString());
         }
     }
 
-    for(; !myWindow.isNull() && myIsOpened;) {
+    for (; myWindow.get() != nullptr && myIsOpened;) {
         processEvents();
     }
     return myExitCode;
@@ -351,7 +351,7 @@
 }
 
 void StApplication::doPause(const StPauseEvent& ) {
-    if(!myWindow.isNull()) {
+    if (myWindow.get() != nullptr) {
         myWindow->beforeClose();
     }
 }
@@ -400,8 +400,8 @@
 
 void StApplication::registerHotKeys() {
     myKeyActions.clear();
-    StKeysState* aKeysState = !myWindow.isNull() ? &myWindow->changeKeysState() : NULL;
-    if(aKeysState != NULL) {
+    StKeysState* aKeysState = myWindow.get() != nullptr ? &myWindow->changeKeysState() : nullptr;
+    if (aKeysState != nullptr) {
         aKeysState->resetRegisteredKeys();
     }
     for(std::map< int, StHandle<StAction> >::iterator anIter = myActions.begin();
@@ -474,11 +474,11 @@
 void StApplication::doNavigate (const StNavigEvent&  ) {}
 
 void StApplication::processEvents() {
-    if(myWindow.isNull() || !myIsOpened) {
+    if (myWindow.get() == nullptr || !myIsOpened) {
         return; // nothing to do
     }
 
-    if(myToQuit) {
+    if (myToQuit) {
         // force Render to quit
         myWindow->beforeClose();
         myWindow->close();
@@ -492,9 +492,9 @@
 
     // application-specific queued events
     myEventsBuffer->swapBuffers();
-    for(size_t anEventIter = 0; anEventIter < myEventsBuffer->getSize(); ++anEventIter) {
+    for (size_t anEventIter = 0; anEventIter < myEventsBuffer->getSize(); ++anEventIter) {
         StEvent& anEvent = myEventsBuffer->changeEvent(anEventIter);
-        if(anEvent.Type == stEvent_Action) {
+        if (anEvent.Type == stEvent_Action) {
             doAction(anEvent.Action);
         }
     }
@@ -505,26 +505,26 @@
 
     const StString aDevice = myWindow->getDeviceId();
     const int32_t  aDevNum = params.ActiveDevice->getValue();
-    if(!mySwitchTo.isNull()) {
-        if(!resetDevice()) {
+    if (mySwitchTo.get() != nullptr) {
+        if (!resetDevice()) {
             myToQuit = true;
         }
-        mySwitchTo.nullify();
-    } else if(myWindow->isLostDevice()) {
+        mySwitchTo.reset();
+    } else if (myWindow->isLostDevice()) {
         mySwitchTo = myWindow;
-        if(!resetDevice()) {
+        if (!resetDevice()) {
             myToQuit = true;
         }
-        mySwitchTo.nullify();
-    } else if(aDevNum >= 0
-           && size_t(aDevNum) < myDevices.size()
-           && aDevice != myDevicesaDevNum->DeviceId) {
+        mySwitchTo.reset();
+    } else if (aDevNum >= 0
+            && size_t(aDevNum) < myDevices.size()
+            && aDevice != myDevicesaDevNum->DeviceId) {
         // device was changed by renderer itself - synchronize value
         const StString aPlugin = myWindow->getRendererId();
-        for(size_t aDevIter = 0; aDevIter < myDevices.size(); ++aDevIter) {
-            const StHandle<StOutDevice>& anOutDev = myDevicesaDevIter;
-            if(aPlugin == anOutDev->PluginId
-            && aDevice == anOutDev->DeviceId) {
+        for (size_t aDevIter = 0; aDevIter < myDevices.size(); ++aDevIter) {
+            const std::shared_ptr<StOutDevice>& anOutDev = myDevicesaDevIter;
+            if (aPlugin == anOutDev->PluginId
+             && aDevice == anOutDev->DeviceId) {
                 params.ActiveDevice->setValue((int32_t )aDevIter);
                 break;
             }
@@ -532,10 +532,10 @@
     }
 }
 
-StHandle<StOpenInfo> StApplication::parseProcessArguments() {
-    StHandle<StOpenInfo> anInfo = new StOpenInfo();
+std::shared_ptr<StOpenInfo> StApplication::parseProcessArguments() {
+    std::shared_ptr<StOpenInfo> anInfo = std::make_shared<StOpenInfo>();
 
-    StArrayList<StString> anArguments = StProcess::getArguments();
+    std::vector<StString> anArguments = StProcess::getArguments();
     StArgumentsMap anOpenFileArgs;
     size_t aFilesCount = 0;
     bool isFilesSection = false;
@@ -635,8 +635,8 @@
     aGlobalSettings.saveString(ST_SETTING_DEF_DRAWER, theDrawer);
 }
 
-bool StApplication::readDefaultDrawer(StHandle<StOpenInfo>& theInfo) {
-    StHandle<StResourceManager> aResMgr = new StResourceManager();
+bool StApplication::readDefaultDrawer(std::shared_ptr<StOpenInfo>& theInfo) {
+    std::shared_ptr<StResourceManager> aResMgr = std::make_shared<StResourceManager>();
     StSettings aGlobalSettings(aResMgr, "sview");
     StString aDefDrawer;
     aGlobalSettings.loadString(ST_SETTING_DEF_DRAWER, aDefDrawer);
@@ -644,8 +644,8 @@
         return false;
     }
 
-    if(theInfo.isNull()) {
-        theInfo = new StOpenInfo();
+    if (theInfo.get() == nullptr) {
+        theInfo = std::make_shared<StOpenInfo>();
     }
     StArgumentsMap anArgs = theInfo->getArgumentsMap();
     anArgs.add(StArgument("in", aDefDrawer));
@@ -662,12 +662,12 @@
     myToRecreateMenu = true;
     myLangMap->resetReloaded();
 
-    for(size_t aRendIter = 0; aRendIter < myRenderers.size(); ++aRendIter) {
-        StHandle<StWindow>& aRend = myRenderersaRendIter;
+    for (size_t aRendIter = 0; aRendIter < myRenderers.size(); ++aRendIter) {
+        std::shared_ptr<StWindow>& aRend = myRenderersaRendIter;
         aRend->doChangeLanguage();
     }
 
-    for(size_t aDevIter = 0; aDevIter < myDevices.size(); ++aDevIter) {
+    for (size_t aDevIter = 0; aDevIter < myDevices.size(); ++aDevIter) {
         params.ActiveDevice->defineOption((int32_t )aDevIter, myDevicesaDevIter->Name);
     }
 }

_service:obs_scm:sview-26.obscpio/StCore/StSearchMonitors.ObjC.mm Changed

_service:obs_scm:sview-26.obscpio/StCore/StSearchMonitors.cpp Changed

@@ -29,9 +29,8 @@
 #endif
 
 StSearchMonitors::StSearchMonitors()
-: StArrayList<StMonitor>(2),
-  myIsUpdater(false) {
-    //
+: myIsUpdater(false) {
+    myMonitors.reserve(2);
 }
 
 StSearchMonitors::~StSearchMonitors() {
@@ -41,21 +40,21 @@
 }
 
 StMonitor& StSearchMonitors::operator(const StPointI_t& thePoint) {
-    for(size_t id = 0; id < size(); ++id) {
-        if(getValue(id).getVRect().isPointIn(thePoint)) {
-            return changeValue(id);
+    for (size_t id = 0; id < myMonitors.size(); ++id) {
+        if (myMonitorsid.getVRect().isPointIn(thePoint)) {
+            return myMonitorsid;
         }
     }
-    return changeValue(0); // return first anyway...
+    return myMonitors0; // return first anyway...
 }
 
 const StMonitor& StSearchMonitors::operator(const StPointI_t& thePoint) const {
-    for(size_t id = 0; id < size(); ++id) {
-        if(getValue(id).getVRect().isPointIn(thePoint)) {
-            return getValue(id);
+    for (size_t id = 0; id < myMonitors.size(); ++id) {
+        if (myMonitorsid.getVRect().isPointIn(thePoint)) {
+            return myMonitorsid;
         }
     }
-    return getValue(0); // return first anyway...
+    return myMonitors0; // return first anyway...
 }
 
 /**
@@ -92,15 +91,15 @@
         StMonitor stMon2;
         stMon1.setVRect(rect0); stMon1.setId(0);
         stMon2.setVRect(rect1); stMon2.setId(1);
-        add(stMon1);
-        add(stMon2);
+        myMonitors.push_back(stMon1);
+        myMonitors.push_back(stMon2);
     } else {
         // setup just one display
         StMonitor stMon;
         rect0.setValues(0, rootY, 0, rootX);
         stMon.setVRect(rect0);
         stMon.setId(0);
-        add(stMon);
+        myMonitors.push_back(stMon);
     }
 }
 
@@ -113,7 +112,7 @@
         public:
 
     /** Main constructor. */
-    WinMonDevInfo(StArrayList<StEDIDParser>& theEdids)
+    WinMonDevInfo(std::vector<StEDIDParser>& theEdids)
     : myEdids(&theEdids), myDevInfoH(nullptr), myDevRegKeyH(nullptr) {
         const GUID GUID_CLASS_MONITOR =
           {0x4d36e96e, 0xe325, 0x11ce, 0xbf, 0xc1, 0x08, 0x00, 0x2b, 0xe1, 0x03, 0x18};
@@ -174,7 +173,7 @@
                         break;
                     }
 
-                    myEdids->add(anEdid);
+                    myEdids->push_back(anEdid);
                     break;
                 }
             }
@@ -199,7 +198,7 @@
 
         private:
 
-    StArrayList<StEDIDParser>* myEdids;
+    std::vector<StEDIDParser>* myEdids;
 
     HDEVINFO myDevInfoH;
     HKEY     myDevRegKeyH;
@@ -209,7 +208,7 @@
 }
 
 void StSearchMonitors::findMonitorsWinAPI() {
-    StArrayList<StEDIDParser> anEdidList;
+    std::vector<StEDIDParser> anEdidList;
     {
         WinMonDevInfo aWinEditReader(anEdidList);
     }
@@ -218,10 +217,10 @@
 
     // retrieve global scale factor (deprecated since Win 8.1)
     float aScale = 1.0f;
-    HDC aDeskCtx = GetDC(NULL);
-    if(aDeskCtx != NULL) {
+    HDC aDeskCtx = GetDC(nullptr);
+    if (aDeskCtx != nullptr) {
         const int aDpiX = GetDeviceCaps(aDeskCtx, LOGPIXELSX);
-        ReleaseDC(NULL, aDeskCtx);
+        ReleaseDC(nullptr, aDeskCtx);
         aScale = float(aDpiX) / 96.0f; // 96 is 100% in Windows
     }
 
@@ -234,9 +233,9 @@
     //typedef HRESULT (WINAPI *RegisterScaleChangeEvent_t)(HANDLE theEvent, DWORD_PTR* theCookie);
     //typedef HRESULT (WINAPI *UnregisterScaleChangeEvent_t)(DWORD_PTR theCookie);
     HMODULE aShcoreLib = GetModuleHandleW(L"Shcore");
-    GetDpiForMonitor_t         aMonDpiFunc   = NULL;
-    //GetScaleFactorForMonitor_t aMonScaleFunc = NULL;
-    if(aShcoreLib != NULL) {
+    GetDpiForMonitor_t         aMonDpiFunc   = nullptr;
+    //GetScaleFactorForMonitor_t aMonScaleFunc = nullptr;
+    if (aShcoreLib != nullptr) {
         aMonDpiFunc   = (GetDpiForMonitor_t         )GetProcAddress(aShcoreLib, "GetDpiForMonitor");
         //aMonScaleFunc = (GetScaleFactorForMonitor_t )GetProcAddress(aShcoreLib, "GetScaleFactorForMonitor");
     }
@@ -245,7 +244,7 @@
     DISPLAY_DEVICEW dispDevice; dispDevice.cb = sizeof(dispDevice);
     DWORD dev = 0;  // device index
     int monId = 1;  // monitor number, as used by Display Properties > Settings
-    for(; EnumDisplayDevicesW(NULL, dev, &dispDevice, 0); ++dev, ++monId) {
+    for(; EnumDisplayDevicesW(nullptr, dev, &dispDevice, 0); ++dev, ++monId) {
         if((dispDevice.StateFlags & DISPLAY_DEVICE_MIRRORING_DRIVER)) {
             // ignore virtual mirror displays
             continue;
@@ -279,23 +278,23 @@
         }
 
         // get the monitor handle and workspace
-        HMONITOR hMonitor = NULL;
+        HMONITOR hMonitor = nullptr;
         MONITORINFO monInfo; ZeroMemory(&monInfo, sizeof(monInfo)); monInfo.cbSize = sizeof(monInfo);
         if(dispDevice.StateFlags & DISPLAY_DEVICE_ATTACHED_TO_DESKTOP) {
             // display is enabled, only enabled displays have a monitor handle
             POINT pt = {dm.dmPosition.x, dm.dmPosition.y};
             hMonitor = MonitorFromPoint(pt, MONITOR_DEFAULTTONULL);
-            if(hMonitor != NULL) {
+            if (hMonitor != nullptr) {
                 GetMonitorInfo(hMonitor, &monInfo);
             }
         }
 
-        if(hMonitor == NULL) {
+        if (hMonitor == nullptr) {
             continue;
         }
         StMonitor aMon;
 
-        if(aMonDpiFunc != NULL) {
+        if (aMonDpiFunc != nullptr) {
             // theDpiType = MDT_Default = MDT_Effective_DPI = 0
             UINT aDpiX = 96;
             UINT aDpiY = 96;
@@ -331,10 +330,10 @@
 
         // NOTE: we get wrong id here for second monitor on WinXP x64
         StString aPnpId;
-        const stUtfWide_t* aStart = NULL;
-        for(StUtfWideIter anIter = StUtfWideIter(ddMon.DeviceID); *anIter != 0; ++anIter) {
+        const stUtfWide_t* aStart = nullptr;
+        for (StUtfWideIter anIter = StUtfWideIter(ddMon.DeviceID); *anIter != 0; ++anIter) {
             if(*anIter == stUtf32_t('\\')) {
-                if(aStart == NULL) {
+                if (aStart == nullptr) {
                     aStart = anIter.getBufferNext();
                 } else {
                     // PnPId is always ASCII chars
@@ -343,7 +342,7 @@
                 }
             }
         }
-        if(aPnpId.isEmpty()) {
+        if (aPnpId.isEmpty()) {
             aPnpId = StString(ddMon.DeviceID);
         }
         aMon.setPnPId(aPnpId);
@@ -355,29 +354,29 @@
                 break;
             }
         }
-        add(aMon);
+        myMonitors.push_back(aMon);
 
         // make primary display first in our list
-        if(isPrimary && monCount != 0) {
-            StMonitor aCopy = getFirst();
-            changeFirst() = getLast();
-            changeFirst().setId(0);
-            changeLast()  = aCopy;
-            changeLast().setId(monCount);
+        if (isPrimary && monCount != 0) {
+            const StMonitor aCopy = myMonitors.front();
+            myMonitors.front() = myMonitors.back();
+            myMonitors.front().setId(0);
+            myMonitors.back()  = aCopy;
+            myMonitors.back().setId(monCount);
         }
         ++monCount;
     }
 
     // group monitors by GPU
-    for(size_t m = 1; m < size(); ++m) {
-        if(getValue(m).getGpuName() != getFirst().getGpuName()) {
-            for(size_t mm = m + 1; mm < size(); ++mm) {
-                if(getValue(mm).getGpuName() == getFirst().getGpuName()) {
-                    StMonitor aCopy = getValue(m);
-                    changeValue(m) = getValue(mm);
-                    changeValue(m) .setId((int )m);
-                    changeValue(mm) = aCopy;
-                    changeValue(mm).setId((int )mm);
+    for (size_t m = 1; m < myMonitors.size(); ++m) {
+        if (myMonitorsm.getGpuName() != myMonitors.front().getGpuName()) {
+            for (size_t mm = m + 1; mm < myMonitors.size(); ++mm) {
+                if (myMonitorsmm.getGpuName() == myMonitors.front().getGpuName()) {
+                    const StMonitor aCopy = myMonitorsm;
+                    myMonitorsm = myMonitorsmm;
+                    myMonitorsm .setId((int )m);
+                    myMonitorsmm = aCopy;
+                    myMonitorsmm.setId((int )mm);
                 }
             }
         }
@@ -387,8 +386,8 @@
 
 #if defined(__linux__) && !defined(__ANDROID__)
 bool StSearchMonitors::getXRootSize(int& theSizeX, int& theSizeY) {
-    Display* aDisplay = XOpenDisplay(NULL); // get first display on server from DISPLAY in env
-    if(aDisplay == NULL) {
+    Display* aDisplay = XOpenDisplay(nullptr); // get first display on server from DISPLAY in env
+    if (aDisplay == nullptr) {
         ST_ERROR_LOG("StSearchMonitors, X: could not open display");
         return false;
     }
@@ -408,7 +407,7 @@
     static StEDIDParser readXPropertyEDID(Display* theDisplay,
                                           RROutput theOutput,
                                           Atom     theAtom) {
-        unsigned char* aPropData      = NULL;
+        unsigned char* aPropData      = nullptr;
         int            anActualFormat = 0;
         unsigned long  anItemsNb      = 0;
         unsigned long  aBytesAfter    = 0;
@@ -429,8 +428,8 @@
         return anEDID;
     }
 
-    static const int THE_XLIB_DEF_DPI = 96;
-    static const StCString THE_XFTDPI = stCString("Xft.dpi:");
+    static constexpr int THE_XLIB_DEF_DPI = 96;
+    static constexpr StCString THE_XFTDPI = stCString("Xft.dpi:");
 
     /**
      * Auxiliary function to retrieve Xft.dpi propetry.
@@ -438,15 +437,15 @@
     static int readXftDpi(Display* theDisplay) {
 
         char* aXResMgr = XResourceManagerString(theDisplay);
-        if(aXResMgr == NULL) {
+        if (aXResMgr == nullptr) {
             return THE_XLIB_DEF_DPI;
         }
 
         const StString aFullStr(aXResMgr);
         const StHandle <StArrayList<StString> > aList = aFullStr.split(stUtf32_t('\n'));
-        for(size_t anIter = 0; anIter < aList->size(); ++anIter) {
+        for (size_t anIter = 0; anIter < aList->size(); ++anIter) {
             const StString& anEntry = aList->getValue(anIter);
-            if(!anEntry.isStartsWith(THE_XFTDPI)) {
+            if (!anEntry.isStartsWith(THE_XFTDPI)) {
                 continue;
             }
 
@@ -458,11 +457,11 @@
         return THE_XLIB_DEF_DPI;
     }
 
-};
+}
 
 void StSearchMonitors::findMonitorsXRandr() {
-    Display* aDisplay = XOpenDisplay(NULL); // get first display on server from DISPLAY in env
-    if(aDisplay == NULL) {
+    Display* aDisplay = XOpenDisplay(nullptr); // get first display on server from DISPLAY in env
+    if (aDisplay == nullptr) {
         ST_ERROR_LOG("StSearchMonitors, X: could not open display");
         return;
     }
@@ -477,17 +476,17 @@
         XCloseDisplay(aDisplay);
         return;
     }
-    ///X11DRV_expect_error(aDisplay, XRandRErrorHandler, NULL); // TODO
+    ///X11DRV_expect_error(aDisplay, XRandRErrorHandler, nullptr); // TODO
     isOK = XRRQueryVersion(aDisplay, &anXRandrMajor, &anXRandrMinor);
     ///if (X11DRV_check_error()) { isOK = false; }
-    if(!isOK || anXRandrMajor < 1 || (anXRandrMajor == 1 && anXRandrMinor < 2)) {
+    if (!isOK || anXRandrMajor < 1 || (anXRandrMajor == 1 && anXRandrMinor < 2)) {
         XCloseDisplay(aDisplay);
         return;
     }
 
     Window aRootWin = RootWindow(aDisplay, 0);
-    XRRScreenResources* aScrResources = NULL;
-    if(anXRandrMajor > 1 || (anXRandrMajor == 1 && anXRandrMinor >= 3)) {
+    XRRScreenResources* aScrResources = nullptr;
+    if (anXRandrMajor > 1 || (anXRandrMajor == 1 && anXRandrMinor >= 3)) {
         // for XRandr 1.3+; works much faster
         aScrResources = XRRGetScreenResourcesCurrent(aDisplay, aRootWin);
     } else {
@@ -505,11 +504,11 @@
         0
     };
 
-    for(int aCrtcId = 0; aCrtcId < aScrResources->ncrtc; ++aCrtcId) {
+    for (int aCrtcId = 0; aCrtcId < aScrResources->ncrtc; ++aCrtcId) {
         StMonitor aMonitor;
         // CRTC is a CRT Controller (this is X terminology)
         XRRCrtcInfo* aCrtcInfo = XRRGetCrtcInfo(aDisplay, aScrResources, aScrResources->crtcsaCrtcId);
-        if(aCrtcInfo->noutput == 0) {
+        if (aCrtcInfo->noutput == 0) {
             XRRFreeCrtcInfo(aCrtcInfo);
             continue;
         }
@@ -522,11 +521,11 @@
         aMonitor.setScale(aScale);
 
         // detect active refresh rate
-        for(int aModeIter = 0; aModeIter < aScrResources->nmode; ++aModeIter) {
+        for (int aModeIter = 0; aModeIter < aScrResources->nmode; ++aModeIter) {
             const XRRModeInfo& aMode = aScrResources->modesaModeIter;
-            if(aMode.id != aCrtcInfo->mode) {
+            if (aMode.id != aCrtcInfo->mode) {
                 continue;
-            } else if(aMode.hTotal == 0 || aMode.vTotal == 0) {
+            } else if (aMode.hTotal == 0 || aMode.vTotal == 0) {
                 break;
             }
             double aRate = std::floor(double(aMode.dotClock) / (double(aMode.hTotal) * double(aMode.vTotal)) + 0.5);
@@ -538,14 +537,14 @@
         XRROutputInfo* anOutputInfo = XRRGetOutputInfo(aDisplay, aScrResources, anOutput);
 
         // read EDID
-        for(size_t anIter = 0; anAtomsEdidanIter != 0; ++anIter) {
+        for (size_t anIter = 0; anAtomsEdidanIter != 0; ++anIter) {
             aMonitor.changeEdid() = readXPropertyEDID(aDisplay, anOutput, anAtomsEdidanIter);
-            if(aMonitor.getEdid().isValid()) {
+            if (aMonitor.getEdid().isValid()) {
                 break;
             }
         }
 
-        if(aMonitor.getEdid().isValid()) {
+        if (aMonitor.getEdid().isValid()) {
             aMonitor.setPnPId(aMonitor.getEdid().getPnPId());
             aMonitor.setName(aMonitor.getEdid().getName());
         } else {
@@ -556,11 +555,11 @@
         // detect max refresh rate
         double aMaxRate = 0.0;
         double aRate = 0.0;
-        for(int aModeInOutputIter = 0; aModeInOutputIter < anOutputInfo->nmode; ++aModeInOutputIter) {
+        for (int aModeInOutputIter = 0; aModeInOutputIter < anOutputInfo->nmode; ++aModeInOutputIter) {
             RRMode aModeId = anOutputInfo->modesaModeInOutputIter;
-            for(int aModeIter = 0; aModeIter < aScrResources->nmode; ++aModeIter) {
+            for (int aModeIter = 0; aModeIter < aScrResources->nmode; ++aModeIter) {
                 const XRRModeInfo& aMode = aScrResources->modesaModeIter;
-                if(aMode.id != aModeId) {
+                if (aMode.id != aModeId) {
                     continue;
                 }
                 aRate = std::floor(double(aMode.dotClock) / (double(aMode.hTotal) * double(aMode.vTotal)) + 0.5);
@@ -571,7 +570,7 @@
         XRRFreeOutputInfo(anOutputInfo);
 
         XRRFreeCrtcInfo(aCrtcInfo);
-        add(aMonitor);
+        myMonitors.push_back(aMonitor);
     }
 
     XRRFreeScreenResources(aScrResources);
@@ -579,11 +578,11 @@
 }
 #endif // __linux__
 
-void StSearchMonitors::listEDID(StArrayList<StEDIDParser>& theEdids) {
+void StSearchMonitors::listEDID(std::vector<StEDIDParser>& theEdids) {
     theEdids.clear();
 #if defined(_WIN32)
     WinMonDevInfo aWinEditReader(theEdids);
-    if (!theEdids.isEmpty())
+    if (!theEdids.empty())
         return;
 #endif
 }
@@ -601,7 +600,7 @@
 }
 
 void StSearchMonitors::initGlobal() {
-    clear();
+    myMonitors.clear();
     initFromSystem();
 #if !defined(__ANDROID__)
     initFromConfig();
@@ -611,8 +610,8 @@
 #if defined(__ANDROID__)
 void StSearchMonitors::setupGlobalDisplay(const StMonitor& theDisplay) {
     StMutexAuto aLock(THE_MON_MUTEX);
-    THE_MONS_CACHED.clear();
-    THE_MONS_CACHED.add(theDisplay);
+    THE_MONS_CACHED.myMonitors.clear();
+    THE_MONS_CACHED.myMonitors.push_back(theDisplay);
 }
 #endif
 
@@ -633,7 +632,7 @@
 }
 
 void StSearchMonitors::init(const bool theForced) {
-    clear();
+    myMonitors.clear();
     StMutexAuto aLock(THE_MON_MUTEX);
 #if !defined(__ANDROID__)
     bool toUpdate = THE_MON_IS_FIRST_CALL;
@@ -656,9 +655,7 @@
     (void)theForced;
 #endif
 
-    for(size_t aMonIter = 0; aMonIter < THE_MONS_CACHED.size(); ++aMonIter) {
-        add(THE_MONS_CACHED.getValue(aMonIter));
-    }
+    myMonitors = THE_MONS_CACHED.myMonitors;
 }
 
 static void readMonitor(const StString& thePrefix,
@@ -679,14 +676,14 @@
     const StString ST_GLOBAL_SETTINGS_GROUP("sview");
     const StString ST_GLOBAL_SETTINGS_MONITORS("monitors");
 
-    StSettings aGlobalSettings(new StResourceManager(), ST_GLOBAL_SETTINGS_GROUP);
+    StSettings aGlobalSettings(std::make_shared<StResourceManager>(), ST_GLOBAL_SETTINGS_GROUP);
     StMonitor aMonDummy;
-    for(size_t aParamIter = 0; aParamIter < 256; ++aParamIter) {
+    for (size_t aParamIter = 0; aParamIter < 256; ++aParamIter) {
         const StString aPrefix     = ST_GLOBAL_SETTINGS_MONITORS + stCString(".") + aParamIter;
         const StString anActiveKey = aPrefix + stCString(".active");
         bool isActive = false;
         aGlobalSettings.loadBool(anActiveKey, isActive);
-        if(!isActive) {
+        if (!isActive) {
             break;
         }
 
@@ -697,26 +694,26 @@
         StString aPnpId;
         aGlobalSettings.loadInt32 (anIdKey,   aMonId);
         aGlobalSettings.loadString(aPnpIdKey, aPnpId);
-        if(aPnpId.getLength() == 7) {
-            for(size_t aMonIter = 0; aMonIter < size(); ++aMonIter) {
-                StMonitor& aMon = changeValue(aMonIter);
-                if(aMon.getPnPId() == aPnpId) {
+        if (aPnpId.getLength() == 7) {
+            for (size_t aMonIter = 0; aMonIter < myMonitors.size(); ++aMonIter) {
+                StMonitor& aMon = myMonitorsaMonIter;
+                if (aMon.getPnPId() == aPnpId) {
                     readMonitor(aPrefix, aGlobalSettings, aMon);
                 }
             }
-        } else if(aMonId >= 0) {
-            for(int aMonAddIter = (int )size(); aMonAddIter <= aMonId; ++aMonAddIter) {
+        } else if (aMonId >= 0) {
+            for (int aMonAddIter = (int )myMonitors.size(); aMonAddIter <= aMonId; ++aMonAddIter) {
                 aMonDummy.setId(aMonAddIter);
-                add(aMonDummy);
+                myMonitors.push_back(aMonDummy);
             }
-            readMonitor(aPrefix, aGlobalSettings, changeValue((size_t )aMonId));
+            readMonitor(aPrefix, aGlobalSettings, myMonitors(size_t )aMonId);
         }
     }
 
     // save sample configuration to simplify manual edition
     const StString anActiveKey = ST_GLOBAL_SETTINGS_MONITORS + stCString(".999.active");
     bool isActive = false;
-    if(aGlobalSettings.loadBool(anActiveKey, isActive)) {
+    if (aGlobalSettings.loadBool(anActiveKey, isActive)) {
         return;
     }
 
@@ -728,7 +725,7 @@
 }
 
 void StSearchMonitors::initFromSystem() {
-    clear();
+    myMonitors.clear();
 #ifdef _WIN32
     findMonitorsWinAPI();
 #elif defined(__APPLE__)
@@ -737,9 +734,9 @@
     findMonitorsBlind(1280, 720);
 #elif defined(__linux__)
     findMonitorsXRandr();
-    if(isEmpty()) {
+    if (myMonitors.empty()) {
         int aRootX(0), aRootY(0);
-        if(!getXRootSize(aRootX, aRootY)) {
+        if (!getXRootSize(aRootX, aRootY)) {
             ST_DEBUG_ASSERT(aRootX > 0 && aRootY > 0);
             aRootX = aRootY = 800;
         }

_service:obs_scm:sview-26.obscpio/StCore/StWindow.cpp Changed

@@ -12,9 +12,9 @@
 
 void StWindow::copySignals() {
     params.VSyncMode = new StEnumParam(0, stCString("vsyncMode"), stCString("VSync mode"));
-    params.VSyncMode->changeValues().add("Off");
-    params.VSyncMode->changeValues().add("On");
-    params.VSyncMode->changeValues().add("Mixed");
+    params.VSyncMode->changeValues().push_back("Off");
+    params.VSyncMode->changeValues().push_back("On");
+    params.VSyncMode->changeValues().push_back("Mixed");
 
     myWin->signals.onClose     = &signals.onClose;
     myWin->signals.onPause     = &signals.onPause;
@@ -34,15 +34,15 @@
 }
 
 StWindow::StWindow()
-: myWin(new StWindowImpl(new StResourceManager(), (StNativeWin_t )NULL)),
+: myWin(new StWindowImpl(std::make_shared<StResourceManager>(), (StNativeWin_t )nullptr)),
   myTargetFps(0.0),
   myWasUsed(false),
   myIsForcedStereo(false) {
     copySignals();
 }
 
-StWindow::StWindow(const StHandle<StResourceManager>& theResMgr,
-                   const StNativeWin_t                theParentWindow)
+StWindow::StWindow(const std::shared_ptr<StResourceManager>& theResMgr,
+                   const StNativeWin_t theParentWindow)
 : myWin(new StWindowImpl(theResMgr, theParentWindow)),
   myTargetFps(0.0),
   myWasUsed(false),
@@ -243,7 +243,7 @@
 
 bool StWindow::stglMakeCurrent() {
     const bool isBound = myWin->stglMakeCurrent(ST_WIN_MASTER);
-    if(!myWin->myGlContext.isNull()) {
+    if (myWin->myGlContext.get() != nullptr) {
         myWin->myGlContext->setBound(isBound);
     }
     return isBound;
@@ -251,14 +251,14 @@
 
 bool StWindow::stglMakeCurrent(const int theWinEnum) {
     const bool isBound = myWin->stglMakeCurrent(theWinEnum);
-    if(!myWin->myGlContext.isNull()) {
+    if (myWin->myGlContext.get() != nullptr) {
         myWin->myGlContext->setBound(isBound);
     }
     return isBound;
 }
 
 void StWindow::stglDraw() {
-    if(myWin->myGlContext.isNull()) {
+    if (myWin->myGlContext.get() == nullptr) {
         return;
     }
 
@@ -287,15 +287,15 @@
     return myWin->myIsMouseMoved;
 }
 
-const StHandle<StResourceManager>& StWindow::getResourceManager() const {
+const std::shared_ptr<StResourceManager>& StWindow::getResourceManager() const {
     return myWin->myResMgr;
 }
 
-const StHandle<StMsgQueue>& StWindow::getMessagesQueue() const {
+const std::shared_ptr<StMsgQueue>& StWindow::getMessagesQueue() const {
     return myMsgQueue;
 }
 
-void StWindow::setMessagesQueue(const StHandle<StMsgQueue>& theQueue) {
+void StWindow::setMessagesQueue(const std::shared_ptr<StMsgQueue>& theQueue) {
     myMsgQueue = theQueue;
 }
 
@@ -323,7 +323,7 @@
     return myWin->getScaleFactor();
 }
 
-const StHandle<StGLContext>& StWindow::getContext() const {
+const std::shared_ptr<StGLContext>& StWindow::getContext() const {
     return myWin->myGlContext;
 }

_service:obs_scm:sview-26.obscpio/StCore/StWindowImpl.cpp Changed

@@ -39,8 +39,8 @@
 // shared counter for fullscreen windows to detect inactive state
 StAtomic<int32_t> StWindowImpl::myFullScreenWinNb(0);
 
-StWindowImpl::StWindowImpl(const StHandle<StResourceManager>& theResMgr,
-                           const StNativeWin_t                theParentWindow)
+StWindowImpl::StWindowImpl(const std::shared_ptr<StResourceManager>& theResMgr,
+                           const StNativeWin_t theParentWindow)
 : myResMgr(theResMgr),
   myParentWin(theParentWindow),
   myWindowTitle(WINDOW_TITLE_DEFAULT),
@@ -255,7 +255,7 @@
     hide(ST_WIN_SLAVE);
 
     // close GL contexts
-    myGlContext.nullify();
+    myGlContext.reset();
     mySlave.close();
     myMaster.close();
 #ifdef _WIN32
@@ -271,7 +271,7 @@
             break;
         }
     }
-    myMsgThread.nullify();
+    myMsgThread.reset();
 #elif defined(__ANDROID__)
     if(myParentWin != NULL) {
         myParentWin->signals.onInputEvent -= stSlot(this, &StWindowImpl::onAndroidInput);
@@ -1060,15 +1060,15 @@
 bool StWindowImpl::stglMakeCurrent(const int winNum){
     switch(winNum) {
           case ST_WIN_MASTER: {
-            if(myMaster.glMakeCurrent()) {
-                if(!myGlContext.isNull()) {
+            if (myMaster.glMakeCurrent()) {
+                if (myGlContext.get() != nullptr) {
                     myGlContext->stglResetErrors();
                 }
                 return true;
             }
             return false;
         } case ST_WIN_SLAVE: {
-            if(myTiledCfg == TiledCfg_Separate) {
+            if (myTiledCfg == TiledCfg_Separate) {
                 return mySlave.glMakeCurrent();
             } else {
                 return myMaster.glMakeCurrent();

_service:obs_scm:sview-26.obscpio/StCore/StWindowImpl.h Changed

@@ -44,8 +44,8 @@
 
         public: //! @name main interface
 
-    ST_LOCAL StWindowImpl(const StHandle<StResourceManager>& theResMgr,
-                          const StNativeWin_t                theParentWindow);
+    ST_LOCAL StWindowImpl(const std::shared_ptr<StResourceManager>& theResMgr,
+                          const StNativeWin_t theParentWindow);
     ST_LOCAL ~StWindowImpl();
     ST_LOCAL void close();
     ST_LOCAL const StString& getTitle() const { return myWindowTitle; }
@@ -274,8 +274,8 @@
 
     static StAtomic<int32_t> myFullScreenWinNb; //!< shared counter for fullscreen windows to detect inactive state
 
-    StHandle<StResourceManager> myResMgr; //!< file resources manager
-    StHandle<StGLContext> myGlContext;
+    std::shared_ptr<StResourceManager> myResMgr; //!< file resources manager
+    std::shared_ptr<StGLContext> myGlContext;
     StWinHandles       myMaster;          //!< master window
     StWinHandles       mySlave;           //!< slave  window (optional)
     StNativeWin_t      myParentWin;       //!< parent window (optional, for embedding)
@@ -331,7 +331,7 @@
 
     StSearchMonitors   myMsgMonitors;     //!< available monitors, accessed from message thread
     POINT              myPointTest;       //!< temporary point object to verify cached window position
-    StHandle<StThread> myMsgThread;       //!< dedicated thread for window message loop
+    std::shared_ptr<StThread> myMsgThread;//!< dedicated thread for window message loop
     StCondition        myEventInitWin;    //!< special event waited from createWindows() thread
     StCondition        myEventInitGl;
     StCondition        myEventQuit;       //!< quit message thread event

_service:obs_scm:sview-26.obscpio/StCore/StWindowImplAnd.cpp Changed

_service:obs_scm:sview-26.obscpio/StCore/StWindowImplLin.cpp Changed

_service:obs_scm:sview-26.obscpio/StCore/StWindowImplMac.mm Changed

_service:obs_scm:sview-26.obscpio/StCore/StWindowImplWin.cpp Changed

_service:obs_scm:sview-26.obscpio/StCore/stvkeysandroid.h Changed

_service:obs_scm:sview-26.obscpio/StCore/stvkeyscarbon.h Changed

_service:obs_scm:sview-26.obscpio/StCore/stvkeysxarray.h Changed

_service:obs_scm:sview-26.obscpio/StDiagnostics/StDiagnostics.cpp Changed

@@ -33,27 +33,27 @@
 
 const StString StDiagnostics::ST_DRAWER_PLUGIN_NAME("StDiagnostics");
 
-StDiagnostics::StDiagnostics(const StHandle<StResourceManager>& theResMgr,
-                             const StNativeWin_t                theParentWin,
-                             const StHandle<StOpenInfo>&        theOpenInfo)
+StDiagnostics::StDiagnostics(const std::shared_ptr<StResourceManager>& theResMgr,
+                             const StNativeWin_t theParentWin,
+                             const std::shared_ptr<StOpenInfo>& theOpenInfo)
 : StApplication(theResMgr, theParentWin, theOpenInfo) {
     myTitle = "sView - Stereoscopic Device Diagnostics";
     params.IsFullscreen = new StBoolParam(false);
     params.IsFullscreen->signals.onChanged.connect(this, &StDiagnostics::doFullscreen);
 
-    myGUI = new StDiagnosticsGUI(this);
+    myGUI = std::make_shared<StDiagnosticsGUI>(this);
 
 #if defined(__ANDROID__)
-    addRenderer(new StOutInterlace  (myResMgr, theParentWin));
-    addRenderer(new StOutAnaglyph   (myResMgr, theParentWin));
-    addRenderer(new StOutDistorted  (myResMgr, theParentWin));
+    addRenderer(std::make_shared<StOutInterlace>  (myResMgr, theParentWin));
+    addRenderer(std::make_shared<StOutAnaglyph>   (myResMgr, theParentWin));
+    addRenderer(std::make_shared<StOutDistorted>  (myResMgr, theParentWin));
 #else
-    addRenderer(new StOutAnaglyph   (myResMgr, theParentWin));
-    addRenderer(new StOutDual       (myResMgr, theParentWin));
-    addRenderer(new StOutIZ3D       (myResMgr, theParentWin));
-    addRenderer(new StOutInterlace  (myResMgr, theParentWin));
-    addRenderer(new StOutDistorted  (myResMgr, theParentWin));
-    addRenderer(new StOutPageFlipExt(myResMgr, theParentWin));
+    addRenderer(std::make_shared<StOutAnaglyph>   (myResMgr, theParentWin));
+    addRenderer(std::make_shared<StOutDual>       (myResMgr, theParentWin));
+    addRenderer(std::make_shared<StOutIZ3D>       (myResMgr, theParentWin));
+    addRenderer(std::make_shared<StOutInterlace>  (myResMgr, theParentWin));
+    addRenderer(std::make_shared<StOutDistorted>  (myResMgr, theParentWin));
+    addRenderer(std::make_shared<StOutPageFlipExt>(myResMgr, theParentWin));
 #endif
 
     // create actions
@@ -74,7 +74,7 @@
 }
 
 StDiagnostics::~StDiagnostics() {
-    myGUI.nullify();
+    myGUI.reset();
 }
 
 bool StDiagnostics::open() {
@@ -99,7 +99,7 @@
     if(!myGUI->stglInit()) {
         myMsgQueue->pushError(stCString("StDiagnostics - critical error:\nGUI initialization failed!"));
         myMsgQueue->popAll();
-        myGUI.nullify();
+        myGUI.reset();
         return false;
     }
 
@@ -116,7 +116,7 @@
 }
 
 void StDiagnostics::doResize(const StSizeEvent& ) {
-    if(myGUI.isNull()) {
+    if (myGUI.get() == nullptr) {
         return;
     }
 
@@ -130,7 +130,7 @@
 }
 
 void StDiagnostics::doMouseDown(const StClickEvent& theEvent) {
-    if(myGUI.isNull()) {
+    if (myGUI.get() == nullptr) {
         return;
     }
 
@@ -138,7 +138,7 @@
 }
 
 void StDiagnostics::doMouseUp(const StClickEvent& theEvent) {
-    if(myGUI.isNull()) {
+    if (myGUI.get() == nullptr) {
         return;
     }
 
@@ -149,7 +149,7 @@
 }
 
 void StDiagnostics::doKeyDown(const StKeyEvent& theEvent) {
-    if(myGUI.isNull()) {
+    if (myGUI.get() == nullptr) {
         return;
     }
 
@@ -169,21 +169,19 @@
 }
 
 void StDiagnostics::doKeyHold(const StKeyEvent& theEvent) {
-    if(!myGUI.isNull()
-    && myGUI->getFocus() != NULL) {
+    if (myGUI.get() != nullptr && myGUI->getFocus() != nullptr) {
         myGUI->doKeyHold(theEvent);
     }
 }
 
 void StDiagnostics::doKeyUp(const StKeyEvent& theEvent) {
-    if(!myGUI.isNull()
-    && myGUI->getFocus() != NULL) {
+    if (myGUI.get() != nullptr && myGUI->getFocus() != nullptr) {
         myGUI->doKeyUp(theEvent);
     }
 }
 
 void StDiagnostics::beforeDraw() {
-    if(myGUI.isNull()) {
+    if (myGUI.get() == nullptr) {
         return;
     }
 
@@ -191,13 +189,12 @@
 }
 
 void StDiagnostics::stglDraw(unsigned int theView) {
-    if(!myContext.isNull()
-    && myContext->core20fwd != NULL) {
+    if (myContext.get() != nullptr && myContext->core20fwd != nullptr) {
         // clear the screen and the depth buffer
         myContext->core20fwd->glClear(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT);
     }
 
-    if(myGUI.isNull()) {
+    if (myGUI.get() == nullptr) {
         return;
     }
 
@@ -212,13 +209,13 @@
 }
 
 void StDiagnostics::doFullscreen(const bool theIsFullscreen) {
-    if(!myWindow.isNull()) {
+    if (myWindow.get() != nullptr) {
         myWindow->setFullScreen(theIsFullscreen);
     }
 }
 
 void StDiagnostics::doStereoMode(const size_t theMode) {
-    if(!myWindow.isNull()) {
+    if (myWindow.get() != nullptr) {
         myWindow->setStereoOutput(theMode != 0);
     }
 }

_service:obs_scm:sview-26.obscpio/StDiagnostics/StDiagnostics.h Changed

@@ -32,9 +32,9 @@
 
     static const StString ST_DRAWER_PLUGIN_NAME;
 
-    ST_CPPEXPORT StDiagnostics(const StHandle<StResourceManager>& theResMgr,
-                               const StNativeWin_t                theParentWin = (StNativeWin_t )NULL,
-                               const StHandle<StOpenInfo>&        theOpenInfo  = NULL);
+    ST_CPPEXPORT StDiagnostics(const std::shared_ptr<StResourceManager>& theResMgr,
+                               const StNativeWin_t theParentWin = (StNativeWin_t )nullptr,
+                               const std::shared_ptr<StOpenInfo>& theOpenInfo  = std::shared_ptr<StOpenInfo>());
     ST_CPPEXPORT virtual ~StDiagnostics();
 
     ST_CPPEXPORT virtual bool open() ST_ATTR_OVERRIDE;
@@ -77,9 +77,9 @@
 
         private:
 
-    StHandle<StGLContext>      myContext;
-    StHandle<StSettings>       mySettings; //!< settings manager for Diagnostics plugin
-    StHandle<StDiagnosticsGUI> myGUI;      //!< GUI root widget
+    std::shared_ptr<StGLContext>      myContext;
+    std::shared_ptr<StSettings>       mySettings; //!< settings manager for Diagnostics plugin
+    std::shared_ptr<StDiagnosticsGUI> myGUI;      //!< GUI root widget
 
         private:

_service:obs_scm:sview-26.obscpio/StDiagnostics/StGeometryTest.cpp Changed

@@ -61,8 +61,9 @@
     myCellSize.x() = 2.0f * GLfloat(cellSizePx) / GLfloat(winRectPx.width());
     myCellSize.y() = 2.0f * GLfloat(cellSizePx) / GLfloat(winRectPx.height());
 
-    size_t vertixesCount = (linesCountH + linesCountV) * 2;
-    StArray<StGLVec4> vertArray(vertixesCount);
+    const size_t vertixesCount = (linesCountH + linesCountV) * 2;
+    std::vector<StGLVec4> vertArray;
+    vertArray.resize(vertixesCount);
 
     // insert black gap to make quads
     StGLVec2 blackGap(GLfloat(winRectPx.width()  - cellSizePx * (linesCountV - 1)) / GLfloat(winRectPx.width()),
@@ -88,7 +89,7 @@
     myGrid.changeVBO(ST_VBO_VERTEX)->init(aCtx, vertArray);
 
     // white color
-    StArray<StGLVec4> lColorsArray(vertixesCount, StGLVec4(1.0f));
+    std::vector<StGLVec4> lColorsArray(vertixesCount, StGLVec4(1.0f));
     myGrid.changeVBO(ST_VBO_COLORS)->init(aCtx, lColorsArray);
 
     // bottom left circle
@@ -118,7 +119,7 @@
 /**
  * Simple function to setup common values in the array.
  */
-static inline void setValues(StArray<StGLVec4>& stVec4Array, const StGLVec4& value,
+static inline void setValues(std::vector<StGLVec4>& stVec4Array, const StGLVec4& value,
                              const size_t fromId, const size_t count) {
     for(size_t anId = fromId; anId < (fromId + count); ++anId) {
         stVec4ArrayanId = value;
@@ -139,7 +140,8 @@
     GLfloat anYTop    = bottomLeft.y() + rectSize.y() - 4.0f * myPixelSize.x();
 
     // setup vertices
-    StArray<StGLVec4> aVertArray(COLOR_QUADS * VERT_PER_QUAD);
+    std::vector<StGLVec4> aVertArray;
+    aVertArray.resize(COLOR_QUADS * VERT_PER_QUAD);
     for(size_t quadId = 0; quadId < COLOR_QUADS; ++quadId) {
         GLfloat anXLeft  = bottomLeft.x() + GLfloat(quadId + 0) * rectSize.x() + 4.0f * myPixelSize.x();
         GLfloat anXRight = bottomLeft.x() + GLfloat(quadId + 1) * rectSize.x() - 4.0f * myPixelSize.x();
@@ -153,7 +155,8 @@
     myColors.changeVBO(ST_VBO_VERTEX)->init(aCtx, aVertArray);
 
     // setup color
-    StArray<StGLVec4> aColorsArray(COLOR_QUADS * VERT_PER_QUAD);
+    std::vector<StGLVec4> aColorsArray;
+    aColorsArray.resize(COLOR_QUADS * VERT_PER_QUAD);
     setValues(aColorsArray, StGLVec4(0.0f, 0.0f, 1.0f, 1.0f), 0 * VERT_PER_QUAD, VERT_PER_QUAD); // blue
     setValues(aColorsArray, StGLVec4(0.0f, 1.0f, 1.0f, 1.0f), 1 * VERT_PER_QUAD, VERT_PER_QUAD); // aqua
     setValues(aColorsArray, StGLVec4(1.0f, 0.0f, 1.0f, 1.0f), 2 * VERT_PER_QUAD, VERT_PER_QUAD); // fuchsia
@@ -179,7 +182,8 @@
     GLfloat anYTop    = bottomLeft.y() + rectSize.y() - 4.0f * myPixelSize.x();
 
     // setup vertices
-    StArray<StGLVec4> aVertArray(BR_QUADS * VERT_PER_QUAD);
+    std::vector<StGLVec4> aVertArray;
+    aVertArray.resize(BR_QUADS * VERT_PER_QUAD);
     for(size_t quadId = 0; quadId < BR_QUADS; ++quadId) {
         GLfloat anXLeft  = bottomLeft.x() + GLfloat(quadId + 0) * rectSize.x() + 4.0f * myPixelSize.x();
         GLfloat anXRight = bottomLeft.x() + GLfloat(quadId + 1) * rectSize.x() - 4.0f * myPixelSize.x();
@@ -193,7 +197,8 @@
     myBrightness.changeVBO(ST_VBO_VERTEX)->init(aCtx, aVertArray);
 
     // setup color (increased brightness): 3% 10% 20% 30% ... 100%
-    StArray<StGLVec4> aColorsArray(BR_QUADS * VERT_PER_QUAD);
+    std::vector<StGLVec4> aColorsArray;
+    aColorsArray.resize(BR_QUADS * VERT_PER_QUAD);
     StGLVec4 aColor(0.03f, 0.03f, 0.03f, 1.0f);
     StGLVec4 aColorDelta(0.1f, 0.1f, 0.1f, 1.0f);
     for(size_t quadId = 0; quadId < BR_QUADS; ++quadId) {

_service:obs_scm:sview-26.obscpio/StGLWidgets/StGLCheckbox.cpp Changed

@@ -41,32 +41,33 @@
     changeRectPx().bottom() = getRectPx().top()  + theParent->getRoot()->scale(16);
 
     myTextures = myRoot->getCheckboxIcon();
-    if(myTextures.isNull()) {
+    if (myTextures.get() == nullptr) {
         const StString& anIcon0 = myRoot->getIcon(StGLRootWidget::IconImage_CheckboxOff);
         const StString& anIcon1 = myRoot->getIcon(StGLRootWidget::IconImage_CheckboxOn);
-        if(!anIcon0.isEmpty()
-        && !anIcon1.isEmpty()) {
-            myTextures = new StGLTextureArray(2);
-            myTextures->changeValue(0).setName(anIcon0);
-            myTextures->changeValue(1).setName(anIcon1);
+        if (!anIcon0.isEmpty()
+         && !anIcon1.isEmpty()) {
+            myTextures = std::make_shared<StGLTextureArray>(2);
+            myTextures->at(0).setName(anIcon0);
+            myTextures->at(1).setName(anIcon1);
             myRoot->getCheckboxIcon() = myTextures;
         }
     }
 }
 
 StGLCheckbox::~StGLCheckbox() {
-    myTextures.nullify(); // will be released by StGLRootWidget
+    myTextures.reset(); // will be released by StGLRootWidget
     myVertBuf.release(getContext());
 }
 
 void StGLCheckbox::stglResize() {
-    if(!myTextures.isNull()) {
+    if (myTextures.get() != nullptr) {
         StGLTextureButton::stglResize();
         return;
     }
 
     // outer vertices
-    StArray<StGLVec2> aVertices(8);
+    std::vector<StGLVec2> aVertices;
+    aVertices.resize(8);
     StGLContext& aCtx = getContext();
 
     StRectI_t aRectPx = getRectPxAbsolute();
@@ -87,21 +88,22 @@
 }
 
 bool StGLCheckbox::stglInit() {
-    if(!myTextures.isNull()
-    &&  StGLTextureButton::stglInit()) {
+    if (myTextures.get() != nullptr
+     && StGLTextureButton::stglInit()) {
         return true;
     }
 
     // already initialized?
-    myTextures.nullify();
-    if(myVertBuf.isValid()) {
+    myTextures.reset();
+    if (myVertBuf.isValid()) {
         return true;
     }
 
     // initialize GLSL program
     StGLContext& aCtx = getContext();
-    StArray<StGLVec2> aDummyVert(8);
-    if(!myVertBuf.init(aCtx, aDummyVert)) {
+    std::vector<StGLVec2> aDummyVert;
+    aDummyVert.resize(8);
+    if (!myVertBuf.init(aCtx, aDummyVert)) {
         return false;
     }
 
@@ -110,19 +112,19 @@
 }
 
 void StGLCheckbox::stglDraw(unsigned int theView) {
-    if(!isVisible()) {
+    if (!isVisible()) {
         return;
     }
 
     myFaceId = myTrackValue->getValue() ? 1 : 0;
-    if(!myTextures.isNull()) {
+    if (myTextures.get() != nullptr) {
         StGLTextureButton::stglDraw(theView);
         return;
     }
 
     StGLContext&     aCtx     = getContext();
     StGLMenuProgram& aProgram = myRoot->getMenuProgram();
-    if(myIsResized) {
+    if (myIsResized) {
         stglResize();
     }

_service:obs_scm:sview-26.obscpio/StGLWidgets/StGLCombobox.cpp Changed

_service:obs_scm:sview-26.obscpio/StGLWidgets/StGLImageProgram.cpp Changed

_service:obs_scm:sview-26.obscpio/StGLWidgets/StGLImageRegion.cpp Changed

@@ -27,19 +27,17 @@
         : StBoolParamNamed(false, stCString("swapLR"), stCString("SwapLR")), myWidget(theWidget) {}
 
         void invalidateWidget() {
-            myWidget = NULL;
+            myWidget = nullptr;
         }
 
         virtual bool getValue() const ST_ATTR_OVERRIDE {
-            const StHandle<StStereoParams>& aParams = myWidget->params.stereoFile;
-            return !aParams.isNull()
-                 && aParams->ToSwapLR;
+            const std::shared_ptr<StStereoParams>& aParams = myWidget->params.stereoFile;
+            return aParams.get() != nullptr && aParams->ToSwapLR;
         }
 
         virtual bool setValue(const bool theValue) ST_ATTR_OVERRIDE {
-            const StHandle<StStereoParams>& aParams = myWidget->params.stereoFile;
-            if(aParams.isNull()
-            || aParams->ToSwapLR == theValue) {
+            const std::shared_ptr<StStereoParams>& aParams = myWidget->params.stereoFile;
+            if (aParams.get() == nullptr || aParams->ToSwapLR == theValue) {
                 return false;
             }
             aParams->setSwapLR(theValue);
@@ -48,7 +46,7 @@
 
             private:
 
-        StGLImageRegion* myWidget;  //!< parent widget holding image parameters
+        StGLImageRegion* myWidget = nullptr; //!< parent widget holding image parameters
 
     };
 
@@ -60,18 +58,17 @@
         : StInt32ParamNamed(0, stCString("viewMode"), stCString("View Mode")), myWidget(theWidget) {}
 
         void invalidateWidget() {
-            myWidget = NULL;
+            myWidget = nullptr;
         }
 
         virtual int32_t getValue() const ST_ATTR_OVERRIDE {
-            const StHandle<StStereoParams>& aParams = myWidget->params.stereoFile;
-            return aParams.isNull() ? 0 : aParams->ViewingMode;
+            const std::shared_ptr<StStereoParams>& aParams = myWidget->params.stereoFile;
+            return aParams.get() == nullptr ? 0 : aParams->ViewingMode;
         }
 
         virtual bool setValue(const int32_t theValue) ST_ATTR_OVERRIDE {
-            const StHandle<StStereoParams>& aParams = myWidget->params.stereoFile;
-            if(aParams.isNull()
-            || aParams->ViewingMode == theValue) {
+            const std::shared_ptr<StStereoParams>& aParams = myWidget->params.stereoFile;
+            if (aParams.get() == nullptr || aParams->ViewingMode == theValue) {
                 return false;
             }
             aParams->ViewingMode = (StViewSurface )theValue;
@@ -81,7 +78,7 @@
 
             private:
 
-        StGLImageRegion* myWidget;  //!< parent widget holding image parameters
+        StGLImageRegion* myWidget = nullptr; //!< parent widget holding image parameters
 
     };
 
@@ -186,40 +183,29 @@
     };
 
     // we use negative scale factor to show sphere inside out!
-    static const float THE_SPHERE_RADIUS     = -10.0f;
-    static const float THE_PANORAMA_DEF_ZOOM = 0.45f; // circa 85 degrees FOV
+    static constexpr float THE_SPHERE_RADIUS     = -10.0f;
+    static constexpr float THE_PANORAMA_DEF_ZOOM = 0.45f; // circa 85 degrees FOV
 
     static const float THE_THEATER_ANGLE = float(M_PI * 0.5);
     static const float THE_THEATER_FROM  = float(M_PI) - THE_THEATER_ANGLE * 0.5f;
 }
 
 StGLImageRegion::StGLImageRegion(StGLWidget* theParent,
-                                 const StHandle<StGLTextureQueue>& theTextureQueue,
+                                 const std::shared_ptr<StGLTextureQueue>& theTextureQueue,
                                  bool theUsePanningKeys)
 : StGLWidget(theParent, 0, 0, StGLCorner(ST_VCORNER_TOP, ST_HCORNER_LEFT)),
-  myIconPrev(NULL),
-  myIconNext(NULL),
   myCube(GL_TRIANGLES),
-  myCubePano(StPanorama_OFF),
   myUVSphere  (StGLVec3(0.0f, 0.0f, 0.0f), 1.0f, 64, false),
   myHemisphere(StGLVec3(0.0f, 0.0f, 0.0f), 1.0f, 64, true),
   myCylinder  (StGLVec3(0.0f, 0.0f, 0.0f), 1.0f, 1.0f, 64),
   myTheater   (StGLVec3(0.0f, 0.0f, 0.0f), 1.0f, 1.0f, THE_THEATER_FROM, THE_THEATER_FROM + THE_THEATER_ANGLE, 64),
   myTextureQueue(theTextureQueue),
-  myClickPntZo(0.0, 0.0),
-  myKeyFlags(ST_VF_NONE),
-  myDragDelayMs(0.0),
-  myDragDelayTmpMs(0.0),
-  mySampleRatio(1.0f),
-  myRotAngle(0.0f),
-  myIsClickAborted(false),
+  myClickPntZo(0.0, 0.0)
+{
 #ifdef ST_EXTRA_CONTROLS
-  myToRightRotate(true),
-#else
-  myToRightRotate(false),
+    myToRightRotate = true;
 #endif
-  myIsInitialized(false),
-  myHasVideoStream(false) {
+
     myIconPrev = new StGLIcon(this,  getRoot()->scale(48), 0, StGLCorner(ST_VCORNER_CENTER, ST_HCORNER_LEFT),  1);
     myIconPrev->setOpacity(0.0f, false);
     myIconNext = new StGLIcon(this, -getRoot()->scale(48), 0, StGLCorner(ST_VCORNER_CENTER, ST_HCORNER_RIGHT), 1);
@@ -262,28 +248,29 @@
 #endif
 
     // create actions
+    myActions.reserve(25);
     {
         StHandle<StActionIntSlot> anAction = new StActionIntSlot(stCString("DoParamsReset"), 0);
         anAction->setSlot(stSlot(this, &StGLImageRegion::doParamsReset));
         anAction->setDefaultHotKey1(ST_VK_BACK);
-        myActions.add(anAction);
+        myActions.push_back(anAction);
     }
     {
         StHandle<StAction> anAction = new StActionBool(stCString("DoParamsSwapLR"), params.SwapLR);
         anAction->setDefaultHotKey1(ST_VK_W);
-        myActions.add(anAction);
+        myActions.push_back(anAction);
     }
     {
         StHandle<StActionIntSlot> anAction = new StActionIntSlot(stCString("DoParamsGammaDec"), (size_t )-1);
         anAction->setSlot(stSlot(this, &StGLImageRegion::doParamsGamma));
         anAction->setDefaultHotKey1(ST_VK_G | ST_VF_CONTROL);
-        myActions.add(anAction);
+        myActions.push_back(anAction);
     }
     {
         StHandle<StActionIntSlot> anAction = new StActionIntSlot(stCString("DoParamsGammaInc"), 1);
         anAction->setSlot(stSlot(this, &StGLImageRegion::doParamsGamma));
         anAction->setDefaultHotKey1(ST_VK_G | ST_VF_SHIFT);
-        myActions.add(anAction);
+        myActions.push_back(anAction);
     }
     {
         StHandle<StActionIntSlot> anAction = new StActionIntSlot(stCString("DoParamsSepXDec"), (size_t )-1);
@@ -293,7 +280,7 @@
     #ifdef ST_EXTRA_CONTROLS
         anAction->setDefaultHotKey1(ST_VK_Q);
     #endif
-        myActions.add(anAction);
+        myActions.push_back(anAction);
     }
     {
         StHandle<StActionIntSlot> anAction = new StActionIntSlot(stCString("DoParamsSepXInc"), 1);
@@ -303,7 +290,7 @@
     #ifdef ST_EXTRA_CONTROLS
         anAction->setDefaultHotKey1(ST_VK_E);
     #endif
-        myActions.add(anAction);
+        myActions.push_back(anAction);
     }
     {
         StHandle<StActionIntSlot> anAction = new StActionIntSlot(stCString("DoParamsSepYDec"), (size_t )-1);
@@ -313,7 +300,7 @@
     #ifdef ST_EXTRA_CONTROLS
         anAction->setDefaultHotKey1(ST_VK_Q      | ST_VF_CONTROL);
     #endif
-        myActions.add(anAction);
+        myActions.push_back(anAction);
     }
     {
         StHandle<StActionIntSlot> anAction = new StActionIntSlot(stCString("DoParamsSepYInc"), 1);
@@ -323,86 +310,86 @@
     #ifdef ST_EXTRA_CONTROLS
         anAction->setDefaultHotKey1(ST_VK_E        | ST_VF_CONTROL);
     #endif
-        myActions.add(anAction);
+        myActions.push_back(anAction);
     }
     {
         StHandle<StActionHoldSlot> anAction = new StActionHoldSlot(stCString("DoParamsSepRotDec"));
         anAction->setSlot(stSlot(this, &StGLImageRegion::doParamsSepZDec));
         anAction->setDefaultHotKey1(ST_VK_APOSTROPHE | ST_VF_CONTROL);
-        myActions.add(anAction);
+        myActions.push_back(anAction);
     }
     {
         StHandle<StActionHoldSlot> anAction = new StActionHoldSlot(stCString("DoParamsSepRotInc"));
         anAction->setSlot(stSlot(this, &StGLImageRegion::doParamsSepZInc));
         anAction->setDefaultHotKey1(ST_VK_SEMICOLON | ST_VF_CONTROL);
-        myActions.add(anAction);
+        myActions.push_back(anAction);
     }
     {
         StHandle<StActionIntSlot> anAction = new StActionIntSlot(stCString("DoParamsRotZ90Dec"), (size_t )-1);
         anAction->setSlot(stSlot(this, &StGLImageRegion::doParamsRotZ90));
         anAction->setDefaultHotKey1(ST_VK_BRACKETLEFT);
-        myActions.add(anAction);
+        myActions.push_back(anAction);
     }
     {
         StHandle<StActionIntSlot> anAction = new StActionIntSlot(stCString("DoParamsRotZ90Inc"), 1);
         anAction->setSlot(stSlot(this, &StGLImageRegion::doParamsRotZ90));
         anAction->setDefaultHotKey1(ST_VK_BRACKETRIGHT);
-        myActions.add(anAction);
+        myActions.push_back(anAction);
     }
     {
         StHandle<StActionHoldSlot> anAction = new StActionHoldSlot(stCString("DoParamsRotZDec"));
         anAction->setSlot(stSlot(this, &StGLImageRegion::doParamsRotZLeft));
         anAction->setDefaultHotKey1(ST_VK_BRACKETLEFT | ST_VF_CONTROL);
-        myActions.add(anAction);
+        myActions.push_back(anAction);
     }
     {
         StHandle<StActionHoldSlot> anAction = new StActionHoldSlot(stCString("DoParamsRotZInc"));
         anAction->setSlot(stSlot(this, &StGLImageRegion::doParamsRotZRight));
         anAction->setDefaultHotKey1(ST_VK_BRACKETRIGHT | ST_VF_CONTROL);
-        myActions.add(anAction);
+        myActions.push_back(anAction);
     }
     {
         StHandle<StActionIntSlot> anAction = new StActionIntSlot(stCString("DoParamsModeNext"), 0);
         anAction->setSlot(stSlot(this, &StGLImageRegion::doParamsModeNext));
-        myActions.add(anAction);
+        myActions.push_back(anAction);
     }
     {
         StHandle<StActionHoldSlot> anAction = new StActionHoldSlot(stCString("DoParamsPanLeft"));
         anAction->setSlot(stSlot(this, &StGLImageRegion::doParamsPanLeft));
         anAction->setDefaultHotKey1(theUsePanningKeys ? ST_VK_LEFT : 0);
-        myActions.add(anAction);
+        myActions.push_back(anAction);
     }
     {
         StHandle<StActionHoldSlot> anAction = new StActionHoldSlot(stCString("DoParamsPanRight"));
         anAction->setSlot(stSlot(this, &StGLImageRegion::doParamsPanRight));
         anAction->setDefaultHotKey1(theUsePanningKeys ? ST_VK_RIGHT : 0);
-        myActions.add(anAction);
+        myActions.push_back(anAction);
     }
     {
         StHandle<StActionHoldSlot> anAction = new StActionHoldSlot(stCString("DoParamsPanUp"));
         anAction->setSlot(stSlot(this, &StGLImageRegion::doParamsPanUp));
         anAction->setDefaultHotKey1(theUsePanningKeys ? ST_VK_UP : 0);
-        myActions.add(anAction);
+        myActions.push_back(anAction);
     }
     {
         StHandle<StActionHoldSlot> anAction = new StActionHoldSlot(stCString("DoParamsPanDown"));
         anAction->setSlot(stSlot(this, &StGLImageRegion::doParamsPanDown));
         anAction->setDefaultHotKey1(theUsePanningKeys ? ST_VK_DOWN : 0);
-        myActions.add(anAction);
+        myActions.push_back(anAction);
     }
     {
         StHandle<StActionHoldSlot> anAction = new StActionHoldSlot(stCString("DoParamsScaleIn"));
         anAction->setSlot(stSlot(this, &StGLImageRegion::doParamsScaleIn));
         anAction->setDefaultHotKey1(ST_VK_ADD);
         anAction->setDefaultHotKey2(ST_VK_OEM_PLUS);
-        myActions.add(anAction);
+        myActions.push_back(anAction);
     }
     {
         StHandle<StActionHoldSlot> anAction = new StActionHoldSlot(stCString("DoParamsScaleOut"));
         anAction->setSlot(stSlot(this, &StGLImageRegion::doParamsScaleOut));
         anAction->setDefaultHotKey1(ST_VK_SUBTRACT);
         anAction->setDefaultHotKey2(ST_VK_OEM_MINUS);
-        myActions.add(anAction);
+        myActions.push_back(anAction);
     }
     {
         StHandle<StActionHoldSlot> anAction = new StActionHoldSlot(stCString("DoParamsRotYLeft"));
@@ -410,7 +397,7 @@
     #ifdef ST_EXTRA_CONTROLS
         anAction->setDefaultHotKey1(ST_VK_LEFT);
     #endif
-        myActions.add(anAction);
+        myActions.push_back(anAction);
     }
     {
         StHandle<StActionHoldSlot> anAction = new StActionHoldSlot(stCString("DoParamsRotYRight"));
@@ -418,7 +405,7 @@
     #ifdef ST_EXTRA_CONTROLS
         anAction->setDefaultHotKey1(ST_VK_RIGHT);
     #endif
-        myActions.add(anAction);
+        myActions.push_back(anAction);
     }
     {
         StHandle<StActionHoldSlot> anAction = new StActionHoldSlot(stCString("DoParamsRotXUp"));
@@ -426,7 +413,7 @@
     #ifdef ST_EXTRA_CONTROLS
         anAction->setDefaultHotKey1(ST_VK_UP);
     #endif
-        myActions.add(anAction);
+        myActions.push_back(anAction);
     }
     {
         StHandle<StActionHoldSlot> anAction = new StActionHoldSlot(stCString("DoParamsRotXDown"));
@@ -434,7 +421,7 @@
     #ifdef ST_EXTRA_CONTROLS
         anAction->setDefaultHotKey1(ST_VK_DOWN);
     #endif
-        myActions.add(anAction);
+        myActions.push_back(anAction);
     }
 }
 
@@ -458,7 +445,7 @@
     ((StFloat32StereoParam* )params.SeparationRot.access())->invalidateWidget();
 }
 
-StHandle<StStereoParams> StGLImageRegion::getSource() {
+std::shared_ptr<StStereoParams> StGLImageRegion::getSource() {
     return params.stereoFile;
 }
 
@@ -471,7 +458,7 @@
     StGLWidget::stglUpdate(thePointZo, theIsPreciseInput);
     if(myIsInitialized) {
         myHasVideoStream = myTextureQueue->stglUpdateStTextures(getContext()) || myTextureQueue->hasConnectedStream();
-        StHandle<StStereoParams> aFileParams = myTextureQueue->getQTexture().getFront(StGLQuadTexture::LEFT_TEXTURE).getSource();
+        std::shared_ptr<StStereoParams> aFileParams = myTextureQueue->getQTexture().getFront(StGLQuadTexture::LEFT_TEXTURE).getSource();
         if(params.stereoFile != aFileParams) {
             params.stereoFile = aFileParams;
             myFadeTimer.stop();
@@ -532,7 +519,7 @@
     myCubePano = thePano;
 
     // a unit cube for cubemap rendering
-    const StGLVec3 THE_VERTS8 = {
+    constexpr StGLVec3 THE_VERTS8 = {
         StGLVec3(-1.0f,-1.0f, 1.0f),
         StGLVec3( 1.0f,-1.0f, 1.0f),
         StGLVec3(-1.0f, 1.0f, 1.0f),
@@ -543,7 +530,7 @@
         StGLVec3( 1.0f, 1.0f,-1.0f)
     };
 
-    const StIVec4 THE_SIDES6 = {
+    constexpr StIVec4 THE_SIDES6 = {
         StIVec4(3, 7, 5, 1), // px
         StIVec4(6, 2, 0, 4), // nx
         StIVec4(2, 3, 7, 6), // py
@@ -552,12 +539,12 @@
         StIVec4(5, 4, 6, 7), // nz
     };
 
-    StArrayList<StGLVec3>& aVertArr  = myCube.changeVertices();
-    StArrayList<StGLVec3>& aCoordArr = myCube.changeNormals();
-    StArrayList<StGLVec4>& aClampArr = myCube.changeColors();
-    aVertArr.initArray(6 * 6);
-    aCoordArr.initArray(aVertArr.size());
-    aClampArr.initArray(aVertArr.size());
+    std::vector<StGLVec3>& aVertArr  = myCube.changeVertices();
+    std::vector<StGLVec3>& aCoordArr = myCube.changeNormals();
+    std::vector<StGLVec4>& aClampArr = myCube.changeColors();
+    aVertArr.resize(6 * 6);
+    aCoordArr.resize(aVertArr.size());
+    aClampArr.resize(aVertArr.size());
     int aVert = 0;
     for(int aSideIter = 0; aSideIter < 6; ++aSideIter, aVert += 6) {
         StIVec4 aSide = THE_SIDESaSideIter;
@@ -651,13 +638,13 @@
     }
 
     // triangle strip initialization
-    /*aCubeVerts.initArray(8);
+    /*aCubeVerts.resize(8);
     for(int aVertIter = 0; aVertIter < 8; ++aVertIter) {
       aCubeVertsaVertIter = THE_VERTSaVertIter;
     }
     const GLuint THE_BOX_TRISTRIP14 = { 0, 1, 2, 3, 7, 1, 5, 4, 7, 6, 2, 4, 0, 1 };
-    StArrayList<GLuint>& aCubeInd = myCube.changeIndices();
-    aCubeInd.initArray(14);
+    std::vector<GLuint>& aCubeInd = myCube.changeIndices();
+    aCubeInd.resize(14);
     for(unsigned int aVertIter = 0; aVertIter < 14; ++aVertIter) {
         aCubeIndaVertIter = THE_BOX_TRISTRIPaVertIter;
     }*/
@@ -701,9 +688,8 @@
 bool StGLImageRegion::getHeadOrientation(StGLQuaternion& theOrient,
                                          unsigned int theView,
                                          const bool theToApplyDefShift) const {
-    StHandle<StStereoParams> aParams = params.stereoFile;
-    if(aParams.isNull()
-    || aParams->ViewingMode == StViewSurface_Plain) {
+    std::shared_ptr<StStereoParams> aParams = params.stereoFile;
+    if (aParams.get() == nullptr || aParams->ViewingMode == StViewSurface_Plain) {
         theOrient = StGLQuaternion();
         return false;
     }
@@ -743,10 +729,10 @@
 void StGLImageRegion::stglDraw(unsigned int theView) {
     myIconPrev->setOpacity(0.0f, false);
     myIconNext->setOpacity(0.0f, false);
-    StHandle<StStereoParams> aParams = getSource();
-    if(!myIsInitialized || !isVisible() || aParams.isNull()
-    || !myTextureQueue->getQTexture().getFront(StGLQuadTexture::LEFT_TEXTURE).isValid()
-    || !myHasVideoStream) {
+    std::shared_ptr<StStereoParams> aParams = getSource();
+    if (!myIsInitialized || !isVisible() || aParams.get() == nullptr
+     || !myTextureQueue->getQTexture().getFront(StGLQuadTexture::LEFT_TEXTURE).isValid()
+     || !myHasVideoStream) {
         StGLWidget::stglDraw(theView);
         return;
     }
@@ -783,10 +769,10 @@
 
 void StGLImageRegion::stglDrawView(unsigned int theView) {
     StGLQuadTexture::LeftOrRight aLeftOrRight = StGLQuadTexture::LEFT_TEXTURE;
-    StHandle<StStereoParams> aParams = getSource();
+    std::shared_ptr<StStereoParams> aParams = getSource();
     mySampleRatio = 1.0f;
     myFrameSize = StVec2<int>(0, 0);
-    if(!myIsInitialized || aParams.isNull()) {
+    if (!myIsInitialized || aParams.get() == nullptr) {
         return;
     }
 
@@ -1015,7 +1001,7 @@
                         aParams->scaleIn(aScaleSteps);
                         aParams->moveFlat(aVec, aRectRatio);
                     }
-                } else if(!myList.isNull()) {
+                } else if (myList.get() != nullptr) {
                     // previous / next swipe gesture
                     const double anIntensMult = toDragImageInSwipe ? 1.0 : 3.0;
                     const StPlayList::CurrentPosition aPos = myList->getCurrentPosition();
@@ -1337,9 +1323,9 @@
 }
 
 void StGLImageRegion::doRightUnclick(const StPointD_t& theCursorZo) {
-    StHandle<StStereoParams> aParams = getSource();
-    if(!myIsInitialized || aParams.isNull()
-     || aParams->ViewingMode != StViewSurface_Plain) {
+    std::shared_ptr<StStereoParams> aParams = getSource();
+    if (!myIsInitialized || aParams.get() == nullptr
+      || aParams->ViewingMode != StViewSurface_Plain) {
         return;
     }
 
@@ -1363,15 +1349,15 @@
 
 bool StGLImageRegion::tryClick(const StClickEvent& theEvent,
                                bool&               theIsItemClicked) {
-    StHandle<StStereoParams> aParams = getSource();
-    const bool hasImage = !aParams.isNull()
-                        && myHasVideoStream
-                        && myTextureQueue->getQTexture().getFront(StGLQuadTexture::LEFT_TEXTURE).isValid();
-    if(!myIsInitialized || !hasImage) {
+    std::shared_ptr<StStereoParams> aParams = getSource();
+    const bool hasImage = aParams.get() != nullptr
+                       && myHasVideoStream
+                       && myTextureQueue->getQTexture().getFront(StGLQuadTexture::LEFT_TEXTURE).isValid();
+    if (!myIsInitialized || !hasImage) {
         return false;
     }
 
-    if(StGLWidget::tryClick(theEvent, theIsItemClicked)) {
+    if (StGLWidget::tryClick(theEvent, theIsItemClicked)) {
         if(theEvent.Button == ST_MOUSE_RIGHT
         && (myToRightRotate || (myKeyFlags & ST_VF_CONTROL) == ST_VF_CONTROL)) {
             myClickPntZo = StPointD_t(theEvent.PointX, theEvent.PointY);
@@ -1397,12 +1383,12 @@
 
 bool StGLImageRegion::tryUnClick(const StClickEvent& theEvent,
                                  bool&               theIsItemUnclicked) {
-    StHandle<StStereoParams> aParams = getSource();
-    const bool hasImage = !aParams.isNull()
-                        && myHasVideoStream
-                        && myTextureQueue->getQTexture().getFront(StGLQuadTexture::LEFT_TEXTURE).isValid();
-    if(!myIsInitialized || !hasImage) {
-        if(isClicked(theEvent.Button)) {
+    std::shared_ptr<StStereoParams> aParams = getSource();
+    const bool hasImage = aParams.get() != nullptr
+                       && myHasVideoStream
+                       && myTextureQueue->getQTexture().getFront(StGLQuadTexture::LEFT_TEXTURE).isValid();
+    if (!myIsInitialized || !hasImage) {
+        if (isClicked(theEvent.Button)) {
             theIsItemUnclicked = true;
             setClicked(theEvent.Button, false);
             return true;
@@ -1421,7 +1407,7 @@
             case StViewSurface_Plain: {
                 if(!myIsClickAborted) { // && theEvent.Type != stEvent_MouseCancel
                     aParams->moveFlat(getMouseMoveFlat(myClickPntZo, aCursor), GLfloat(getRectPx().ratio()));
-                } else if(!myList.isNull()) {
+                } else if (myList.get() != nullptr) {
                     // previous / next swipe gesture
                     StPlayList::CurrentPosition aPos = myList->getCurrentPosition();
                     const double aMouseDX = myClickPntZo.x() - getRoot()->getCursorZo().x();
@@ -1467,11 +1453,11 @@
 }
 
 bool StGLImageRegion::doScroll(const StScrollEvent& theEvent) {
-    StHandle<StStereoParams> aParams = getSource();
+    std::shared_ptr<StStereoParams> aParams = getSource();
     StPointD_t aCursor(theEvent.PointX, theEvent.PointY);
-    if(!myIsInitialized
-    ||  aParams.isNull()
-    ||  theEvent.IsFromMultiTouch) {
+    if (!myIsInitialized
+     || aParams.get() == nullptr
+     || theEvent.IsFromMultiTouch) {
         return false;
     }
 
@@ -1508,9 +1494,9 @@
 
 void StGLImageRegion::scaleAt(const StPointD_t& thePoint,
                               const float       theStep) {
-    StHandle<StStereoParams> aParams = getSource();
-    if(!myIsInitialized
-    ||  aParams.isNull()) {
+    std::shared_ptr<StStereoParams> aParams = getSource();
+    if (!myIsInitialized
+     || aParams.get() == nullptr) {
         return;
     }
 
@@ -1555,12 +1541,12 @@
 }
 
 bool StGLImageRegion::doGesture(const StGestureEvent& theEvent) {
-    StHandle<StStereoParams> aParams = getSource();
-    if(!myIsInitialized || aParams.isNull()) {
+    std::shared_ptr<StStereoParams> aParams = getSource();
+    if (!myIsInitialized || aParams.get() == nullptr) {
         return false;
     }
 
-    switch(theEvent.Type) {
+    switch (theEvent.Type) {
         case stEvent_GestureCancel: {
             myRotAngle = 0.0f;
             return false;
@@ -1646,52 +1632,52 @@
 }
 
 void StGLImageRegion::doParamsRotYLeft(const double ) {
-    if(params.stereoFile.isNull()
-    || params.stereoFile->ViewingMode != StViewSurface_Plain) {
+    if (params.stereoFile.get() == nullptr
+     || params.stereoFile->ViewingMode != StViewSurface_Plain) {
         return;
     }
 
     GLfloat anYRotate = params.stereoFile->getYRotate() + 1.0f;
-    for(; anYRotate > 360.0f;) {
+    for (; anYRotate > 360.0f;) {
         anYRotate -= 360.0f;
     }
     params.stereoFile->setYRotate(anYRotate);
 }
 
 void StGLImageRegion::doParamsRotYRight(const double ) {
-    if(params.stereoFile.isNull()
-    || params.stereoFile->ViewingMode != StViewSurface_Plain) {
+    if (params.stereoFile.get() == nullptr
+     || params.stereoFile->ViewingMode != StViewSurface_Plain) {
         return;
     }
 
     GLfloat anYRotate = params.stereoFile->getYRotate() - 1.0f;
-    for(; anYRotate < 0.0f;) {
+    for (; anYRotate < 0.0f;) {
         anYRotate += 360.0f;
     }
     params.stereoFile->setYRotate(anYRotate);
 }
 
 void StGLImageRegion::doParamsRotXUp(const double ) {
-    if(params.stereoFile.isNull()
-    || params.stereoFile->ViewingMode != StViewSurface_Plain) {
+    if (params.stereoFile.get() == nullptr
+     || params.stereoFile->ViewingMode != StViewSurface_Plain) {
         return;
     }
 
     GLfloat anXRotate = params.stereoFile->getXRotate() + 1.0f;
-    for(; anXRotate > 360.0f;) {
+    for (; anXRotate > 360.0f;) {
         anXRotate -= 360.0f;
     }
     params.stereoFile->setXRotate(anXRotate);
 }
 
 void StGLImageRegion::doParamsRotXDown(const double ) {
-    if(params.stereoFile.isNull()
-    || params.stereoFile->ViewingMode != StViewSurface_Plain) {
+    if (params.stereoFile.get() == nullptr
+     || params.stereoFile->ViewingMode != StViewSurface_Plain) {
         return;
     }
 
     GLfloat anXRotate = params.stereoFile->getXRotate() - 1.0f;
-    for(; anXRotate < 0.0f;) {
+    for (; anXRotate < 0.0f;) {
         anXRotate += 360.0f;
     }
     params.stereoFile->setXRotate(anXRotate);
@@ -1702,7 +1688,7 @@
     hasChanges = params.SeparationDX->reset() || hasChanges;
     hasChanges = params.SeparationDY->reset() || hasChanges;
     hasChanges = params.SeparationRot->reset() || hasChanges;
-    if(!params.stereoFile.isNull()) {
+    if (params.stereoFile.get() != nullptr) {
         hasChanges = params.stereoFile->reset() || hasChanges;
     }
     if (hasChanges) {

_service:obs_scm:sview-26.obscpio/StGLWidgets/StGLMenu.cpp Changed

_service:obs_scm:sview-26.obscpio/StGLWidgets/StGLMenuItem.cpp Changed

_service:obs_scm:sview-26.obscpio/StGLWidgets/StGLMessageBox.cpp Changed

_service:obs_scm:sview-26.obscpio/StGLWidgets/StGLMsgStack.cpp Changed

_service:obs_scm:sview-26.obscpio/StGLWidgets/StGLOpenFile.cpp Changed

@@ -380,17 +380,17 @@
 
 StGLOpenFile::~StGLOpenFile() {
     StGLContext& aCtx = getContext();
-    if(!myTextureFolder.isNull()) {
-        for(size_t aTexIter = 0; aTexIter < myTextureFolder->size(); ++aTexIter) {
-            myTextureFolder->changeValue(aTexIter).release(aCtx);
+    if (myTextureFolder.get() != nullptr) {
+        for (size_t aTexIter = 0; aTexIter < myTextureFolder->size(); ++aTexIter) {
+            myTextureFolder->at(aTexIter).release(aCtx);
         }
-        myTextureFolder.nullify();
+        myTextureFolder.reset();
     }
-    if(!myTextureFile.isNull()) {
-        for(size_t aTexIter = 0; aTexIter < myTextureFile->size(); ++aTexIter) {
-            myTextureFile->changeValue(aTexIter).release(aCtx);
+    if (myTextureFile.get() != nullptr) {
+        for (size_t aTexIter = 0; aTexIter < myTextureFile->size(); ++aTexIter) {
+            myTextureFile->at(aTexIter).release(aCtx);
         }
-        myTextureFile.nullify();
+        myTextureFile.reset();
     }
 }
 
@@ -434,15 +434,15 @@
 
 void StGLOpenFile::initExtensions() {
     myExtensions.clear();
-    StArrayList<StString> aList1 = myToShowMainFilter ->getValue() ? myFilter.getExtensionsList()      : StArrayList<StString>(1);
-    StArrayList<StString> aList2 = myToShowExtraFilter->getValue() ? myExtraFilter.getExtensionsList() : StArrayList<StString>(1);
-    size_t anExtent = aList1.size() + aList2.size();
-    myExtensions.initList(anExtent);
+    const std::vector<StString> aList1 = myToShowMainFilter ->getValue() ? myFilter.getExtensionsList()      : std::vector<StString>();
+    const std::vector<StString> aList2 = myToShowExtraFilter->getValue() ? myExtraFilter.getExtensionsList() : std::vector<StString>();
+    const size_t anExtent = aList1.size() + aList2.size();
+    myExtensions.reserve(anExtent);
     for(size_t anExtIter = 0; anExtIter < aList1.size(); ++anExtIter) {
-        myExtensions.add(aList1anExtIter);
+        myExtensions.push_back(aList1anExtIter);
     }
     for(size_t anExtIter = 0; anExtIter < aList2.size(); ++anExtIter) {
-        myExtensions.add(aList2anExtIter);
+        myExtensions.push_back(aList2anExtIter);
     }
 }
 
@@ -507,7 +507,7 @@
     || !StFileNode::isFileExists(theTarget)) {
         return;
     }
-    myHotPaths.add(theTarget);
+    myHotPaths.push_back(theTarget);
 
     StGLMenuItem* anItem = new StGLPassiveMenuItem(myHotList);
     setItemIcon(anItem, myHotColor, true);
@@ -537,15 +537,15 @@
     }
 
     theItem->changeMargins().left = myMarginX + myIconSizeX + myMarginX;
-    if(myTextureFolder.isNull()) {
+    if (myTextureFolder.get() == nullptr) {
         const StString& anIcon0 = myRoot->getIcon(StGLRootWidget::IconImage_Folder);
         const StString& anIcon1 = myRoot->getIcon(StGLRootWidget::IconImage_File);
         if(!anIcon0.isEmpty()
         && !anIcon1.isEmpty()) {
-            myTextureFolder = new StGLTextureArray(1);
-            myTextureFile   = new StGLTextureArray(1);
-            myTextureFolder->changeValue(0).setName(anIcon0);
-            myTextureFile  ->changeValue(0).setName(anIcon1);
+            myTextureFolder = std::make_shared<StGLTextureArray>(1);
+            myTextureFile   = std::make_shared<StGLTextureArray>(1);
+            myTextureFolder->at(0).setName(anIcon0);
+            myTextureFile  ->at(0).setName(anIcon1);
         } else {
             return;
         }

_service:obs_scm:sview-26.obscpio/StGLWidgets/StGLPlayList.cpp Changed

@@ -15,8 +15,8 @@
 #include <StGL/StGLContext.h>
 #include <StGLCore/StGLCore20.h>
 
-StGLPlayList::StGLPlayList(StGLWidget*                 theParent,
-                           const StHandle<StPlayList>& theList)
+StGLPlayList::StGLPlayList(StGLWidget* theParent,
+                           const std::shared_ptr<StPlayList>& theList)
 : StGLWidget(theParent, -theParent->getRoot()->scale(32), 0),
   myMenu(NULL),
   myBarColor(getRoot()->getColorForElement(StGLRootWidget::Color_ScrollBar)),
@@ -250,7 +250,8 @@
         const int    aScrollSizeY = stMax(int(aScaleY * (double )aSizeY), myRoot->scale(4));
         const double aPosY        = double(myFromId * myMenu->getItemHeight()) / double(aContSizeY - aSizeY);
 
-        StArray<StGLVec2> aVertices(4);
+        std::vector<StGLVec2> aVertices;
+        aVertices.resize(4);
         StRectI_t aRectPx = getRectPxAbsolute();
         aRectPx.left()   =  aRectPx.right() - myRoot->scale(2);
         aRectPx.top()    += int(aPosY * double(aSizeY - aScrollSizeY));

_service:obs_scm:sview-26.obscpio/StGLWidgets/StGLRadioButton.cpp Changed

@@ -44,26 +44,26 @@
     changeRectPx().bottom() = getRectPx().top()  + myRoot->scale(16);
 
     myTextures = myRoot->getRadioIcon();
-    if(myTextures.isNull()) {
+    if (myTextures.get() == nullptr) {
         const StString& anIcon0 = myRoot->getIcon(StGLRootWidget::IconImage_RadioButtonOff);
         const StString& anIcon1 = myRoot->getIcon(StGLRootWidget::IconImage_RadioButtonOn);
         if(!anIcon0.isEmpty()
         && !anIcon1.isEmpty()) {
-            myTextures = new StGLTextureArray(2);
-            myTextures->changeValue(0).setName(anIcon0);
-            myTextures->changeValue(1).setName(anIcon1);
+            myTextures = std::make_shared<StGLTextureArray>(2);
+            myTextures->at(0).setName(anIcon0);
+            myTextures->at(1).setName(anIcon1);
             myRoot->getRadioIcon() = myTextures;
         }
     }
 }
 
 StGLRadioButton::~StGLRadioButton() {
-    myTextures.nullify(); // will be released by StGLRootWidget
+    myTextures.reset(); // will be released by StGLRootWidget
     myVertBuf.release(getContext());
 }
 
 void StGLRadioButton::stglResize() {
-    if(!myTextures.isNull()) {
+    if (myTextures.get() != nullptr) {
         StGLTextureButton::stglResize();
         return;
     }
@@ -72,7 +72,8 @@
 
     // outer vertices
     StRectI_t aRectPx = getRectPxAbsolute();
-    StArray<StGLVec2> aVertices(8);
+    std::vector<StGLVec2> aVertices;
+    aVertices.resize(8);
     getRoot()->getRectGl(aRectPx, aVertices, 0);
 
     // inner vertices
@@ -86,21 +87,21 @@
 }
 
 bool StGLRadioButton::stglInit() {
-    if(!myTextures.isNull()
-     && StGLTextureButton::stglInit()) {
+    if (myTextures.get() != nullptr && StGLTextureButton::stglInit()) {
         return true;
     }
 
     // already initialized?
-    if(myVertBuf.isValid()) {
+    if (myVertBuf.isValid()) {
         return true;
     }
 
     // initialize GLSL program
-    myTextures.nullify();
+    myTextures.reset();
     StGLContext& aCtx = getContext();
-    StArray<StGLVec2> aDummyVert(8);
-    if(!myVertBuf.init(aCtx, aDummyVert)) {
+    std::vector<StGLVec2> aDummyVert;
+    aDummyVert.resize(8);
+    if (!myVertBuf.init(aCtx, aDummyVert)) {
         return false;
     }
 
@@ -118,7 +119,7 @@
     }
 
     myFaceId = isActiveState() ? 1 : 0;
-    if(!myTextures.isNull()) {
+    if (myTextures.get() != nullptr) {
         StGLTextureButton::stglDraw(theView);
         return;
     }

_service:obs_scm:sview-26.obscpio/StGLWidgets/StGLRootWidget.cpp Changed

@@ -22,7 +22,7 @@
     // we do not use StAtomic<> template here to avoid static classes initialization ambiguity
     static volatile size_t ST_WIDGET_RES_COUNTER = 0;
 
-    static const int THE_ICON_SIZESStGLRootWidget::IconSizeNb + 1 = {
+    static constexpr int THE_ICON_SIZESStGLRootWidget::IconSizeNb + 1 = {
         16,
         24,
         32,
@@ -43,28 +43,15 @@
     return StAtomicOp::Increment(ST_WIDGET_RES_COUNTER);
 }
 
-StGLRootWidget::StGLRootWidget(const StHandle<StResourceManager>& theResMgr)
+StGLRootWidget::StGLRootWidget(const std::shared_ptr<StResourceManager>& theResMgr)
 : StGLWidget(NULL, 0, 0, StGLCorner(ST_VCORNER_TOP, ST_HCORNER_LEFT)),
   myShareArray(new StGLSharePointer*10),
   myShareSize(10),
   myResMgr(theResMgr),
-  myScrDispX(0.0f),
-  myLensDist(0.0f),
-  myScrDispXPx(0),
-  myMenuProgram(new StGLMenuProgram()),
-  myTextProgram(new StGLTextProgram()),
-  myTextBorderProgram(new StGLTextBorderProgram()),
-  myIsMobile(false),
-  myScaleGlX(1.0),
-  myScaleGlY(1.0),
-  myScaleGUI(1.0f),
-  myResolution(72),
-  myCursorZo(0.0, 0.0),
-  myFocusWidget(NULL),
-  myModalDialog(NULL),
-  myIsMenuPressed(false),
-  myMenuIconSize(IconSize_16),
-  myClickThreshold(3) {
+  myMenuProgram(std::make_shared<StGLMenuProgram>()),
+  myTextProgram(std::make_shared<StGLTextProgram>()),
+  myTextBorderProgram(std::make_shared<StGLTextBorderProgram>()),
+  myCursorZo(0.0, 0.0) {
     myRectPxFull = getRectPx();
 
     // unify access
@@ -75,10 +62,10 @@
     myViewport3 = 1;
 
     // allocate shared resources array
-    for(size_t aResId = 0; aResId < myShareSize; ++aResId) {
+    for (size_t aResId = 0; aResId < myShareSize; ++aResId) {
         myShareArrayaResId = new StGLSharePointer();
     }
-    myGlFontMgr = new StGLFontManager(myResolution);
+    myGlFontMgr = std::make_shared<StGLFontManager>(myResolution);
 
     myColorsColor_Menu            = StGLVec4(0.855f, 0.855f, 0.855f, 1.0f);
     myColorsColor_MenuHighlighted = StGLVec4(0.765f, 0.765f, 0.765f, 1.0f);
@@ -102,27 +89,27 @@
         delete myShareArrayaResId;
     }
     delete myShareArray;
-    if(!myGlCtx.isNull()) {
+    if (myGlCtx.get() != nullptr) {
         myMenuProgram->release(*myGlCtx);
-        myMenuProgram.nullify();
+        myMenuProgram.reset();
         myTextProgram->release(*myGlCtx);
-        myTextProgram.nullify();
+        myTextProgram.reset();
         myTextBorderProgram->release(*myGlCtx);
-        myTextBorderProgram.nullify();
-        if(!myCheckboxIcon.isNull()) {
-            for(size_t aTexIter = 0; aTexIter < myCheckboxIcon->size(); ++aTexIter) {
-                myCheckboxIcon->changeValue(aTexIter).release(*myGlCtx);
+        myTextBorderProgram.reset();
+        if (myCheckboxIcon.get() != nullptr) {
+            for (size_t aTexIter = 0; aTexIter < myCheckboxIcon->size(); ++aTexIter) {
+                myCheckboxIcon->at(aTexIter).release(*myGlCtx);
             }
-            myCheckboxIcon.nullify();
+            myCheckboxIcon.reset();
         }
-        if(!myRadioIcon.isNull()) {
-            for(size_t aTexIter = 0; aTexIter < myRadioIcon->size(); ++aTexIter) {
-                myRadioIcon->changeValue(aTexIter).release(*myGlCtx);
+        if (myRadioIcon.get() != nullptr) {
+            for (size_t aTexIter = 0; aTexIter < myRadioIcon->size(); ++aTexIter) {
+                myRadioIcon->at(aTexIter).release(*myGlCtx);
             }
-            myRadioIcon.nullify();
+            myRadioIcon.reset();
         }
         myGlFontMgr->release(*myGlCtx);
-        myGlFontMgr.nullify();
+        myGlFontMgr.reset();
     }
 }
 
@@ -130,11 +117,11 @@
     return *myGlCtx;
 }
 
-const StHandle<StGLContext>& StGLRootWidget::getContextHandle() const {
+const std::shared_ptr<StGLContext>& StGLRootWidget::getContextHandle() const {
     return myGlCtx;
 }
 
-void StGLRootWidget::setContext(const StHandle<StGLContext>& theCtx) {
+void StGLRootWidget::setContext(const std::shared_ptr<StGLContext>& theCtx) {
     myGlCtx = theCtx;
 }
 
@@ -236,9 +223,9 @@
 }
 
 bool StGLRootWidget::stglInit() {
-    if(myGlCtx.isNull()) {
-        myGlCtx = new StGLContext(myResMgr);
-        if(!myGlCtx->stglInit()) {
+    if (myGlCtx.get() == nullptr) {
+        myGlCtx = std::make_shared<StGLContext>(myResMgr);
+        if (!myGlCtx->stglInit()) {
             return false;
         }
     }
@@ -393,13 +380,22 @@
 }
 
 void StGLRootWidget::getRectGl(const StRectI_t& theRectPx,
-                               StArray<StGLVec2>& theVertices,
+                               std::array<StGLVec2, 4>& theVertices) const {
+    StRectD_t aRectGl = getRectGl(theRectPx);
+    theVertices0 = StGLVec2(GLfloat(aRectGl.right()), GLfloat(aRectGl.top()));
+    theVertices1 = StGLVec2(GLfloat(aRectGl.right()), GLfloat(aRectGl.bottom()));
+    theVertices2 = StGLVec2(GLfloat(aRectGl.left()),  GLfloat(aRectGl.top()));
+    theVertices3 = StGLVec2(GLfloat(aRectGl.left()),  GLfloat(aRectGl.bottom()));
+}
+
+void StGLRootWidget::getRectGl(const StRectI_t& theRectPx,
+                               std::vector<StGLVec2>& theVertices,
                                const size_t theFromId) const {
     StRectD_t aRectGl = getRectGl(theRectPx);
-    theVerticestheFromId + 0 = StGLVec2(GLfloat(aRectGl.right()), GLfloat(aRectGl.top()));
-    theVerticestheFromId + 1 = StGLVec2(GLfloat(aRectGl.right()), GLfloat(aRectGl.bottom()));
-    theVerticestheFromId + 2 = StGLVec2(GLfloat(aRectGl.left()),  GLfloat(aRectGl.top()));
-    theVerticestheFromId + 3 = StGLVec2(GLfloat(aRectGl.left()),  GLfloat(aRectGl.bottom()));
+    theVertices.at(theFromId + 0) = StGLVec2(GLfloat(aRectGl.right()), GLfloat(aRectGl.top()));
+    theVertices.at(theFromId + 1) = StGLVec2(GLfloat(aRectGl.right()), GLfloat(aRectGl.bottom()));
+    theVertices.at(theFromId + 2) = StGLVec2(GLfloat(aRectGl.left()),  GLfloat(aRectGl.top()));
+    theVertices.at(theFromId + 3) = StGLVec2(GLfloat(aRectGl.left()),  GLfloat(aRectGl.bottom()));
 }
 
 bool StGLRootWidget::tryClick(const StClickEvent& theEvent,
@@ -490,7 +486,7 @@
             return; // already appended
         }
     }
-    myDestroyList.add(theWidget);
+    myDestroyList.push_back(theWidget);
 }
 
 void StGLRootWidget::clearDestroyList() {

_service:obs_scm:sview-26.obscpio/StGLWidgets/StGLScrollArea.cpp Changed

_service:obs_scm:sview-26.obscpio/StGLWidgets/StGLSeekBar.cpp Changed

_service:obs_scm:sview-26.obscpio/StGLWidgets/StGLSubtitles.cpp Changed

@@ -87,7 +87,7 @@
 };
 
 StGLSubtitles::StSubShowItems::StSubShowItems()
-: StArrayList<StHandle <StSubItem> >(8), Scale (1.0f) {
+: StArrayList<std::shared_ptr <StSubItem> >(8), Scale (1.0f) {
     //
 }
 
@@ -95,7 +95,7 @@
     bool isChanged = false;
     for(size_t anId = size() - 1; anId < size_t(-1); --anId) {
         // filter outdated and forward items
-        const StHandle<StSubItem>& anItem = getValue(anId);
+        const std::shared_ptr<StSubItem>& anItem = getValue(anId);
         if(anItem->TimeEnd < thePTS || anItem->TimeStart > thePTS) {
             remove(anId);
             isChanged = true;
@@ -112,7 +112,7 @@
     // update active text
     Text = getFirst()->Text;
     for(size_t anId = 1; anId < size(); ++anId) {
-        const StHandle<StSubItem>& anItem = getValue(anId);
+        const std::shared_ptr<StSubItem>& anItem = getValue(anId);
         Text += StString('\n');
         Text += anItem->Text;
     }
@@ -130,7 +130,7 @@
     return isChanged;
 }
 
-void StGLSubtitles::StSubShowItems::add(const StHandle<StSubItem>& theItem) {
+void StGLSubtitles::StSubShowItems::add(const std::shared_ptr<StSubItem>& theItem) {
     if(!Text.isEmpty()) {
         Text += StString('\n');
     }
@@ -142,11 +142,11 @@
         Scale = theItem->Scale;
     }
 
-    StArrayList<StHandle <StSubItem> >::add(theItem);
+    StArrayList<std::shared_ptr <StSubItem> >::add(theItem);
 }
 
 StGLSubtitles::StGLSubtitles(StGLImageRegion* theParent,
-                             const StHandle<StSubQueue>&     theSubQueue,
+                             const std::shared_ptr<StSubQueue>& theSubQueue,
                              const StHandle<StInt32Param>&   thePlace,
                              const StHandle<StFloat32Param>& theFontSize)
 : StGLTextArea(theParent,
@@ -164,8 +164,8 @@
     params.Parser   = new StEnumParam(1, stCString("subsParser"));
     params.ToApplyStereo = new StBoolParamNamed(true, stCString("subsApplyStereo"));
 
-    if(myQueue.isNull()) {
-        myQueue = new StSubQueue();
+    if (myQueue.get() == nullptr) {
+        myQueue = std::make_shared<StSubQueue>();
     }
 
     myToDrawShadow = true;
@@ -175,30 +175,30 @@
     myFormatter.setupAlignment(StGLTextFormatter::ST_ALIGN_X_CENTER,
                                StGLTextFormatter::ST_ALIGN_Y_BOTTOM);
 
-    StHandle<StGLFont> aFontNew = new StGLFont();
-    StHandle<StFTLibrary> aLib = getRoot()->getFontManager()->getLibrary();
+    std::shared_ptr<StGLFont> aFontNew = std::make_shared<StGLFont>();
+    std::shared_ptr<StFTLibrary> aLib = getRoot()->getFontManager()->getLibrary();
     const FontSize     aSize       = (FontSize )(int )params.FontSize->getValue();
     const unsigned int aResolution = getRoot()->getFontManager()->getResolution();
-    for(size_t anIter = 0; anIter < StFTFont::SubsetsNB; ++anIter) {
-        StHandle<StGLFontEntry>& aFontGlSrc = myFont->changeFont((StFTFont::Subset )anIter);
-        if(aFontGlSrc.isNull()) {
+    for (size_t anIter = 0; anIter < StFTFont::SubsetsNB; ++anIter) {
+        std::shared_ptr<StGLFontEntry>& aFontGlSrc = myFont->changeFont((StFTFont::Subset )anIter);
+        if (aFontGlSrc.get() == nullptr) {
             continue;
         }
 
-        StHandle<StFTFont> aFontFt = new StFTFont(aLib);
+        std::shared_ptr<StFTFont> aFontFt = std::make_shared<StFTFont>(aLib);
         if (aFontGlSrc->getFont()->getFilePath(StFTFont::Style_Regular) == StGLFontManager::getFallbackFontPath()) {
             // handle fallback font specifically
-            StHandle<StGLFontEntry> aFallBack = getRoot()->getFontManager()->findCreateFallback(aSize);
-            aFontFt = !aFallBack.isNull() ? aFallBack->getFont() : StHandle<StFTFont>();
+            std::shared_ptr<StGLFontEntry> aFallBack = getRoot()->getFontManager()->findCreateFallback(aSize);
+            aFontFt = aFallBack.get() != nullptr ? aFallBack->getFont() : std::shared_ptr<StFTFont>();
         } else {
-            for(int aStyleIt = 0; aStyleIt < StFTFont::StylesNB; ++aStyleIt) {
+            for (int aStyleIt = 0; aStyleIt < StFTFont::StylesNB; ++aStyleIt) {
                 aFontFt->load(aFontGlSrc->getFont()->getFilePath((StFTFont::Style )aStyleIt),
                               aFontGlSrc->getFont()->getFaceIndex((StFTFont::Style )aStyleIt),
                               (StFTFont::Style )aStyleIt);
             }
         }
         aFontFt->init(aSize, aResolution);
-        aFontNew->changeFont((StFTFont::Subset )anIter) = new StGLFontEntry(aFontFt);
+        aFontNew->changeFont((StFTFont::Subset )anIter) = std::make_shared<StGLFontEntry>(aFontFt);
     }
     mySize = aSize;
     myFont = aFontNew;
@@ -207,7 +207,7 @@
 StGLSubtitles::~StGLSubtitles() {
     StGLContext& aCtx = getContext();
     myFont->release(aCtx);
-    myFont.nullify();
+    myFont.reset();
     myTexture.release(aCtx);
     myVertBuf.release(aCtx);
     myTCrdBuf.release(aCtx);
@@ -215,7 +215,8 @@
 
 bool StGLSubtitles::stglInit() {
     if(!myVertBuf.isValid()) {
-        StArray<StGLVec2> aDummyVert(4);
+        std::vector<StGLVec2> aDummyVert;
+        aDummyVert.resize(4);
 
         StGLContext& aCtx = getContext();
         myVertBuf.init(aCtx, aDummyVert);
@@ -232,7 +233,7 @@
 void StGLSubtitles::stglUpdate(const StPointD_t& ,
                                bool ) {
     bool isChanged = myShowItems.pop(myPTS);
-    for(StHandle<StSubItem> aNewSubItem = myQueue->pop(myPTS); !aNewSubItem.isNull(); aNewSubItem = myQueue->pop(myPTS)) {
+    for (std::shared_ptr<StSubItem> aNewSubItem = myQueue->pop(myPTS); aNewSubItem.get() != nullptr; aNewSubItem = myQueue->pop(myPTS)) {
         isChanged = true;
         myShowItems.add(aNewSubItem);
     }
@@ -335,7 +336,7 @@
         return;
     }
 
-    StHandle<StStereoParams> aParams;
+    std::shared_ptr<StStereoParams> aParams;
     StFormat aStFormat = StFormat_Mono;
     unsigned int aView = theView;
     float aSampleRatio = 1.0f;
@@ -344,7 +345,7 @@
                                     ? dynamic_cast<StGLImageRegion*>(myParent)
                                     : NULL) {
         aParams = anImgRegion->getSource();
-        if(!aParams.isNull()) {
+        if (aParams.get() != nullptr) {
             aStFormat = aParams->StereoFormat;
             aSampleRatio = anImgRegion->getSampleRatio();
             aFrameDims   = anImgRegion->getFrameSize();
@@ -384,11 +385,14 @@
 
     // update vertices
     StVec2<int> anImgSize (myTexture.getSizeX(), myTexture.getSizeY()), anOffset (0, 0);
-    StArray<StGLVec2> aVertices(4), aTexCoords(4);
-    aTexCoords0 = StGLVec2(1.0f, 0.0f);
-    aTexCoords1 = StGLVec2(1.0f, 1.0f);
-    aTexCoords2 = StGLVec2(0.0f, 0.0f);
-    aTexCoords3 = StGLVec2(0.0f, 1.0f);
+    std::vector<StGLVec2> aVertices;
+    aVertices.resize(4);
+    std::vector<StGLVec2> aTexCoords = {
+        StGLVec2(1.0f, 0.0f),
+        StGLVec2(1.0f, 1.0f),
+        StGLVec2(0.0f, 0.0f),
+        StGLVec2(0.0f, 1.0f)
+    };
     if(aSampleRatio >= 1.0f) {
         anImgSize.x() = int(double(anImgSize.x()) * aSampleRatio);
     } else {
@@ -479,7 +483,7 @@
     }
 }
 
-const StHandle<StSubQueue>& StGLSubtitles::getQueue() const {
+const std::shared_ptr<StSubQueue>& StGLSubtitles::getQueue() const {
     return myQueue;
 }

_service:obs_scm:sview-26.obscpio/StGLWidgets/StGLSwitchTextured.cpp Changed

@@ -10,6 +10,8 @@
 #include <StGLWidgets/StGLRadioButtonTextured.h>
 #include <StCore/StEvent.h>
 
+#include <algorithm>
+
 StGLSwitchTextured::StGLSwitchTextured(StGLWidget* theParent,
                                        const StHandle<StInt32Param>& theTrackedValue,
                                        const int theLeft, const int theTop,
@@ -98,7 +100,7 @@
                 // switch to next
                 while(aChild != NULL) {
                     aRadioBtn = (StGLRadioButtonTextured* )aChild;
-                    if(!mySkipValues.contains(aRadioBtn->getValueOn())) {
+                    if (std::find(mySkipValues.cbegin(), mySkipValues.cend(), aRadioBtn->getValueOn()) == mySkipValues.cend()) {
                         myTrackValue->setValue(aRadioBtn->getValueOn());
                         break;
                     }
@@ -123,6 +125,6 @@
     StGLRadioButtonTextured* aNewItem = new StGLRadioButtonTextured(this, myTrackValue, theValueOn, theTexturePath, 0, 0);
     aNewItem->changeMargins() = myMargins;
     if(theToSkip) {
-        mySkipValues.add(theValueOn);
+        mySkipValues.push_back(theValueOn);
     }
 }

_service:obs_scm:sview-26.obscpio/StGLWidgets/StGLTable.cpp Changed

@@ -60,28 +60,28 @@
 void StGLTable::setupTable(const int theNbRows,
                            const int theNbColumns) {
     // destroy old content
-    for(size_t aRowIter = 0; aRowIter < myTable.size(); ++aRowIter) {
-        StArrayList<StGLTableItem*>& aRow = myTable.changeValue(aRowIter);
-        for(size_t aColIter = 0; aColIter < aRow.size(); ++aColIter) {
-            StGLTableItem* anItem = aRow.changeValue(aColIter);
+    for (size_t aRowIter = 0; aRowIter < myTable.size(); ++aRowIter) {
+        std::vector<StGLTableItem*>& aRow = myTableaRowIter;
+        for (size_t aColIter = 0; aColIter < aRow.size(); ++aColIter) {
+            StGLTableItem* anItem = aRowaColIter;
             delete anItem;
         }
     }
     myTable.clear();
+    myRowBottoms.clear();
+    myColRights.clear();
 
     // initialize new empty content
-    for(int aRowIter = 0; aRowIter < theNbRows; ++aRowIter) {
-        myTable.add(StArrayList<StGLTableItem*>());
-        StArrayList<StGLTableItem*>& aRow = myTable.changeLast();
-        aRow.initArray(theNbColumns);
-        for(size_t aColIter = 0; aColIter < aRow.size(); ++aColIter) {
-            aRow.changeValue(aColIter) = new StGLTableItem(this);
+    myTable.resize(theNbRows);
+    myRowBottoms.resize(theNbRows, 0);
+    myColRights .resize(theNbColumns, 0);
+    for (size_t aRowIter = 0; aRowIter < myTable.size(); ++aRowIter) {
+        std::vector<StGLTableItem*>& aRow = myTableaRowIter;
+        aRow.resize(theNbColumns);
+        for (size_t aColIter = 0; aColIter < aRow.size(); ++aColIter) {
+            aRowaColIter = new StGLTableItem(this);
         }
     }
-    myRowBottoms.initArray(theNbRows);
-    myColRights .initArray(theNbColumns);
-    stMemZero(&myRowBottoms.changeFirst(), sizeof(int) * myRowBottoms.size());
-    stMemZero(&myColRights .changeFirst(), sizeof(int) * myColRights .size());
 }
 
 void StGLTable::fillFromMap(const StDictionary& theMap,
@@ -191,7 +191,7 @@
             aButton->setHeight(myRoot->scale(24));
 
             aCol2Width = stMax(aCol2Width, aButton->getRectPx().width());
-            const StArrayList<StString>& aValues = anEnum->getValues();
+            const std::vector<StString>& aValues = anEnum->getValues();
             for(size_t aValIter = 0; aValIter < aValues.size(); ++aValIter) {
                 aCol2Width = stMax(aCol2Width, aButton->computeWidth(aValuesaValIter));
             }
@@ -377,73 +377,73 @@
 }
 
 void StGLTable::updateLayout() {
-    if(myRowBottoms.isEmpty()
-    || myColRights .isEmpty()) {
+    if (myRowBottoms.empty()
+     || myColRights .empty()) {
         return;
     }
 
     // determine rows heights
     int aBottomPrev = 0;
-    for(size_t aRowIter = 0; aRowIter < myRowBottoms.size(); ++aRowIter) {
-        StArrayList<StGLTableItem*>& aRow = myTable.changeValue(aRowIter);
-        for(size_t aColIter = 0; aColIter < myColRights.size(); ++aColIter) {
-            StGLTableItem* anItem = aRow.changeValue(aColIter);
-            if(anItem->getItem() == NULL) {
+    for (size_t aRowIter = 0; aRowIter < myRowBottoms.size(); ++aRowIter) {
+        std::vector<StGLTableItem*>& aRow = myTable.at(aRowIter);
+        for (size_t aColIter = 0; aColIter < myColRights.size(); ++aColIter) {
+            StGLTableItem* anItem = aRow.at(aColIter);
+            if (anItem->getItem() == nullptr) {
                 continue;
             }
 
             const int aBefore = aRowIter != 0
-                              ? myRowBottoms.changeValue(aRowIter - 1)
+                              ? myRowBottoms.at(aRowIter - 1)
                               : 0;
             size_t aBotRowId = aRowIter + anItem->getRowSpan() - 1;
-            int&   aBottom   = myRowBottoms.changeValue(aBotRowId);
+            int&   aBottom   = myRowBottoms.at(aBotRowId);
             aBottom = stMax(aBottom,
                             aBefore + anItem->getItem()->getRectPx().height()
                           + myItemMargins.top + myItemMargins.bottom);
         }
-        int& aBottom = myRowBottoms.changeValue(aRowIter);
+        int& aBottom = myRowBottoms.at(aRowIter);
         aBottom      = stMax(aBottom, aBottomPrev);
         aBottomPrev  = aBottom;
     }
 
     // determine columns widths
     int aRightPrev = 0;
-    for(size_t aColIter = 0; aColIter < myColRights.size(); ++aColIter) {
-        for(size_t aRowIter = 0; aRowIter < myRowBottoms.size(); ++aRowIter) {
-            StGLTableItem* anItem = myTable.changeValue(aRowIter).changeValue(aColIter);
-            if(anItem->getItem() == NULL) {
+    for (size_t aColIter = 0; aColIter < myColRights.size(); ++aColIter) {
+        for (size_t aRowIter = 0; aRowIter < myRowBottoms.size(); ++aRowIter) {
+            StGLTableItem* anItem = myTable.at(aRowIter).at(aColIter);
+            if (anItem->getItem() == NULL) {
                 continue;
             }
 
             const int aBefore = aColIter != 0
-                              ? myColRights.changeValue(aColIter - 1)
+                              ? myColRights.at(aColIter - 1)
                               : 0;
             size_t aRightColId = aColIter + anItem->getColSpan() - 1;
-            int&   aRight      = myColRights.changeValue(aRightColId);
+            int&   aRight      = myColRights.at(aRightColId);
             aRight = stMax(aRight,
                            aBefore + anItem->getItem()->getRectPx().width()
                          + myItemMargins.left + myItemMargins.right);
         }
-        int& aRight = myColRights.changeValue(aColIter);
+        int& aRight = myColRights.at(aColIter);
         aRight      = stMax(aRight, aRightPrev);
         aRightPrev  = aRight;
     }
-    changeRectPx().right()  = getRectPx().left() + myColRights.getLast();
-    changeRectPx().bottom() = getRectPx().top()  + myRowBottoms.getLast();
+    changeRectPx().right()  = getRectPx().left() + myColRights.back();
+    changeRectPx().bottom() = getRectPx().top()  + myRowBottoms.back();
 
     // adjust table elements positions
     int aTop = 0;
-    for(size_t aRowIter = 0; aRowIter < myRowBottoms.size(); aTop = myRowBottoms.getValue(aRowIter++)) {
-        StArrayList<StGLTableItem*>& aRow = myTable.changeValue(aRowIter);
+    for (size_t aRowIter = 0; aRowIter < myRowBottoms.size(); aTop = myRowBottoms.at(aRowIter++)) {
+        std::vector<StGLTableItem*>& aRow = myTable.at(aRowIter);
         int aLeft = 0;
-        for(size_t aColIter = 0; aColIter < myColRights.size(); aLeft = myColRights.getValue(aColIter++)) {
-            StGLTableItem* anItem = aRow.changeValue(aColIter);
+        for (size_t aColIter = 0; aColIter < myColRights.size(); aLeft = myColRights.at(aColIter++)) {
+            StGLTableItem* anItem = aRow.at(aColIter);
             const size_t aBotRowId   = aRowIter + anItem->getRowSpan() - 1;
             const size_t aRightColId = aColIter + anItem->getColSpan() - 1;
             anItem->changeRectPx().top()    = aTop  + myItemMargins.top;
             anItem->changeRectPx().left()   = aLeft + myItemMargins.left;
-            anItem->changeRectPx().bottom() = myRowBottoms.changeValue(aBotRowId)   - myItemMargins.bottom;
-            anItem->changeRectPx().right()  = myColRights .changeValue(aRightColId) - myItemMargins.right;
+            anItem->changeRectPx().bottom() = myRowBottoms.at(aBotRowId)   - myItemMargins.bottom;
+            anItem->changeRectPx().right()  = myColRights .at(aRightColId) - myItemMargins.right;
         }
     }
 }

_service:obs_scm:sview-26.obscpio/StGLWidgets/StGLTextArea.cpp Changed

@@ -28,13 +28,7 @@
   myTextColor(0.0f, 0.0f, 0.0f, 1.0f),
   myShadowColor(0.0f, 0.0f, 0.0f, 1.0f),
   myBackColor(0.365f, 0.722f, 1.0f, 1.0f),
-  myBorderColor(0.0f, 0.0f, 0.0f, 1.0f),
-  myTextDX(0.0f),
-  myTextWidth(-1.0f),
-  myToRecompute(true),
-  myToShowBorder(false),
-  myToDrawShadow(false),
-  myIsInitialized(false) {
+  myBorderColor(0.0f, 0.0f, 0.0f, 1.0f) {
     myFont = myRoot->getFontManager()->findCreate(StFTFont::Typeface_SansSerif, getFontSize());
 }
 
@@ -79,17 +73,17 @@
                                     const GLfloat   theWidthMax,
                                     int&            theWidth,
                                     int&            theHeight) {
-    if(myFont.isNull()) {
+    if (myFont.get() == nullptr) {
         computeTextWidthFake(theText, theWidth, theHeight);
         return;
     }
-    StHandle<StGLFontEntry>& aFontGenEntry = myFont->changeFont();
-    if(aFontGenEntry.isNull()) {
+    std::shared_ptr<StGLFontEntry>& aFontGenEntry = myFont->changeFont();
+    if (aFontGenEntry.get() == nullptr) {
         computeTextWidthFake(theText, theWidth, theHeight);
         return;
     }
-    StHandle<StFTFont>& aFontGen = aFontGenEntry->getFont();
-    if(aFontGen.isNull() || !aFontGen->isValid()) {
+    std::shared_ptr<StFTFont>& aFontGen = aFontGenEntry->getFont();
+    if (aFontGen.get() == nullptr || !aFontGen->isValid()) {
         computeTextWidthFake(theText, theWidth, theHeight);
         return;
     }
@@ -116,10 +110,10 @@
             continue;
         }
 
-        const StFTFont::Subset   aSubset = StFTFont::subset(aCharThis);
-        StHandle<StGLFontEntry>& anEntry = myFont->changeFont(aSubset);
+        const StFTFont::Subset          aSubset = StFTFont::subset(aCharThis);
+        std::shared_ptr<StGLFontEntry>& anEntry = myFont->changeFont(aSubset);
         GLfloat anAdvance = 0.0f;
-        if(!anEntry.isNull() && !anEntry->getFont().isNull()) {
+        if (anEntry.get() != nullptr && anEntry->getFont().get() != nullptr) {
             anAdvance = anEntry->getFont()->getAdvanceX(aCharThis, aCharNext);
         } else {
             anAdvance = aFontGen->getAdvanceX(aCharThis, aCharNext);
@@ -169,11 +163,11 @@
     }
 
     // initialize GL resources for the font
-    if(myFont.isNull()) {
+    if (myFont.get() == nullptr) {
         return false; // critical error
     } else if(!myFont->wasInitialized()) {
-        if( myFont->changeFont().isNull()
-        ||  myFont->changeFont()->getFont().isNull()
+        if( myFont->changeFont().get() == nullptr
+        ||  myFont->changeFont()->getFont().get() == nullptr
         || !myFont->changeFont()->getFont()->isValid()) {
             return false; // critical error
         } else if(!myFont->stglInit(aCtx)) {

_service:obs_scm:sview-26.obscpio/StGLWidgets/StGLTextureButton.cpp Changed

@@ -142,7 +142,7 @@
     /**
      * Access program.
      */
-    StHandle<StGLTextureButton::Program>& getProgram(const StGLTextureButton::ProgramIndex theIndex) { return myProgramstheIndex; }
+    std::shared_ptr<StGLTextureButton::Program>& getProgram(const StGLTextureButton::ProgramIndex theIndex) { return myProgramstheIndex; }
 
     /**
      * Main constructor.
@@ -155,7 +155,7 @@
             "    return texture2D(uTexture, theTexCoord);\n"
             "}\n\n");
 
-        const char VERT_SHADER =
+        constexpr char VERT_SHADER =
            "uniform mat4  uProjMat;\n"
            "uniform vec4  uDisp;\n"
            "uniform float uTime;\n"
@@ -177,7 +177,7 @@
            "    gl_Position = uProjMat * v;\n"
            "}\n";
 
-        const char FRAG_SHADER =
+        constexpr char FRAG_SHADER =
            "uniform vec3 uParams;\n"
            "varying vec2 fTexCoord;\n"
            "vec4 getColor(in vec2 theTexCoord);\n"
@@ -208,10 +208,10 @@
     ST_LOCAL virtual void release(StGLContext& theCtx) ST_ATTR_OVERRIDE {
         StGLProgramMatrix<1, 2, StGLTextureButton::Program>::release(theCtx);
         for(int aProgIter = 0; aProgIter < StGLTextureButton::ProgramIndex_NB; ++aProgIter) {
-            StHandle<StGLTextureButton::Program>& aProgram = myProgramsaProgIter;
-            if(!aProgram.isNull()) {
+            std::shared_ptr<StGLTextureButton::Program>& aProgram = myProgramsaProgIter;
+            if (aProgram.get() != nullptr) {
                 aProgram->release(theCtx);
-                aProgram.nullify();
+                aProgram.reset();
             }
         }
     }
@@ -241,7 +241,7 @@
             return false;
         }
         myProgramsStGLTextureButton::ProgramIndex_WaveRGB = myActiveProgram;
-        myActiveProgram.nullify();
+        myActiveProgram.reset();
 
         setFragmentShaderPart(theCtx, FragSection_GetColor, FragGetColor_Alpha);
         if(!initProgram(theCtx)) {
@@ -254,7 +254,7 @@
 
         private:
 
-    StHandle<StGLTextureButton::Program> myProgramsStGLTextureButton::ProgramIndex_NB;
+    std::shared_ptr<StGLTextureButton::Program> myProgramsStGLTextureButton::ProgramIndex_NB;
 
 };
 
@@ -281,7 +281,7 @@
   myAnim(Anim_Wave),
   myToDrawShadow(false) {
     if(theFacesCount != 0) {
-        myTextures = new StGLTextureArray(theFacesCount);
+        myTextures = std::make_shared<StGLTextureArray>(theFacesCount);
     }
     StGLWidget::signals.onMouseUnclick = stSlot(this, &StGLTextureButton::doMouseUnclick);
 }
@@ -290,9 +290,9 @@
     StGLContext& aCtx = getContext();
     myVertBuf.release(aCtx);
     myTCrdBuf.release(aCtx);
-    if(!myTextures.isNull()) {
+    if (myTextures.get() != nullptr) {
         for(size_t anIter = 0; anIter < myTextures->size(); ++anIter) {
-            myTextures->changeValue(anIter).release(aCtx);
+            myTextures->at(anIter).release(aCtx);
         }
     }
 }
@@ -303,9 +303,9 @@
 
 void StGLTextureButton::setTexturePath(const StString* theTexturesPaths,
                                        const size_t    theCount) {
-    if(myTextures.isNull()) {
-        if(theCount != 0) {
-            myTextures = new StGLTextureArray(theCount);
+    if (myTextures.get() == nullptr) {
+        if (theCount != 0) {
+            myTextures = std::make_shared<StGLTextureArray>(theCount);
         } else {
         #ifdef ST_DEBUG
             ST_DEBUG_LOG_AT("WARNING, Attempt to set an empty list of textures to StGLTextureButton!");
@@ -315,23 +315,23 @@
     }
     const size_t aNbTextures = (theCount > myTextures->size()) ? myTextures->size() : theCount;
 #ifdef ST_DEBUG
-    if(theCount != myTextures->size()) {
+    if (theCount != myTextures->size()) {
         ST_DEBUG_LOG_AT("WARNING, Not enough textures paths for StGLTextureButton!");
     }
 #endif
-    for(size_t aTexIter = 0; aTexIter < aNbTextures; ++aTexIter) {
-        myTextures->changeValue(aTexIter).setName(theTexturesPathsaTexIter);
+    for (size_t aTexIter = 0; aTexIter < aNbTextures; ++aTexIter) {
+        myTextures->at(aTexIter).setName(theTexturesPathsaTexIter);
     }
 }
 
 void StGLTextureButton::setFaceId(const size_t theId) {
-    if(myFaceId == theId
-    || theId >= myTextures->size()) {
+    if (myFaceId == theId
+     || theId >= myTextures->size()) {
         return;
     }
 
     myFaceId = theId;
-    const StGLNamedTexture& aTexture = myTextures->getValue(myFaceId);
+    const StGLNamedTexture& aTexture = myTextures->at(myFaceId);
     myProgramIndex = StGLTexture::isAlphaFormat(aTexture.getTextureFormat())
                    ? StGLTextureButton::ProgramIndex_WaveAlpha
                    : StGLTextureButton::ProgramIndex_WaveRGB;
@@ -342,7 +342,8 @@
     StGLContext& aCtx = getContext();
 
     // update vertices
-    StArray<StGLVec2> aVertices(myToDrawShadow ? 8 : 4);
+    std::vector<StGLVec2> aVertices;
+    aVertices.resize(myToDrawShadow ? 8 : 4);
     StRectI_t aRect = getRectPxAbsolute();
     aRect.left()   += myMargins.left;
     aRect.right()  -= myMargins.right;
@@ -356,12 +357,12 @@
     myVertBuf.init(aCtx, aVertices);
 
     // update projection matrix
-    if(myProgram.isNull()) {
+    if (myProgram.isNull()) {
         return;
     }
 
-    StHandle<StGLTextureButton::Program>& aProgram = myProgram->getProgram(myProgramIndex);
-    if(aProgram.isNull()) {
+    std::shared_ptr<StGLTextureButton::Program>& aProgram = myProgram->getProgram(myProgramIndex);
+    if (aProgram.get() == nullptr) {
         return;
     }
 
@@ -371,25 +372,25 @@
 }
 
 bool StGLTextureButton::stglInit() {
-    if(myTextures.isNull()) {
+    if (myTextures.get() == nullptr) {
         return false;
     }
 
     StGLContext& aCtx = getContext();
-    const StHandle<StResourceManager>& aResMgr = getRoot()->getResourceManager();
-    for(size_t aFaceIter = 0; aFaceIter < myTextures->size(); ++aFaceIter) {
-        StGLNamedTexture& aTexture = myTextures->changeValue(aFaceIter);
-        if(aTexture.isValid()) {
+    const std::shared_ptr<StResourceManager>& aResMgr = getRoot()->getResourceManager();
+    for (size_t aFaceIter = 0; aFaceIter < myTextures->size(); ++aFaceIter) {
+        StGLNamedTexture& aTexture = myTextures->at(aFaceIter);
+        if (aTexture.isValid()) {
             continue;
         }
 
-        if(aTexture.getName().isEmpty()) {
+        if (aTexture.getName().isEmpty()) {
             ST_DEBUG_LOG("StGLTextureButton, texture for face " + aFaceIter + " not set");
             continue;
         }
 
-        StHandle<StResource> aRes = aResMgr->getResource(aTexture.getName());
-        if(aRes.isNull()) {
+        std::shared_ptr<StResource> aRes = aResMgr->getResource(aTexture.getName());
+        if (aRes.get() == nullptr) {
             ST_DEBUG_LOG("StGLTextureButton, texture '" + aTexture.getName() + "' not found");
             continue;
         }
@@ -418,7 +419,7 @@
         aTexture.init(aCtx, anImage.getPlane());
     }
 
-    const StGLNamedTexture& aTexture = myTextures->getValue(myFaceId);
+    const StGLNamedTexture& aTexture = myTextures->at(myFaceId);
     if(aTexture.isValid()) {
         changeRectPx().right()  = getRectPx().left() + aTexture.getSizeX() + myMargins.left + myMargins.right;
         changeRectPx().bottom() = getRectPx().top()  + aTexture.getSizeY() + myMargins.top  + myMargins.bottom;
@@ -436,8 +437,10 @@
         return false;
     }
 
-    StArray<StGLVec2> aDummyVert(myToDrawShadow ? 8 : 4);
-    StArray<StGLVec2> aTexCoords(myToDrawShadow ? 8 : 4);
+    std::vector<StGLVec2> aDummyVert;
+    std::vector<StGLVec2> aTexCoords;
+    aDummyVert.resize(myToDrawShadow ? 8 : 4);
+    aTexCoords.resize(myToDrawShadow ? 8 : 4);
     aTexCoords0 = StGLVec2(1.0f, 0.0f);
     aTexCoords1 = StGLVec2(1.0f, 1.0f);
     aTexCoords2 = StGLVec2(0.0f, 0.0f);
@@ -494,12 +497,11 @@
         return;
     }
 
-    StHandle<StGLTextureButton::Program>& aProgram = myProgram->getProgram(myProgramIndex);
-    StGLNamedTexture& aTexture = myTextures->changeValue(myFaceId);
+    std::shared_ptr<StGLTextureButton::Program>& aProgram = myProgram->getProgram(myProgramIndex);
+    StGLNamedTexture& aTexture = myTextures->at(myFaceId);
     const bool hasShadow = myToDrawShadow
                         && myProgramIndex == ProgramIndex_WaveAlpha;
-    if( aProgram.isNull()
-    || !aTexture.isValid()) {
+    if (aProgram.get() == nullptr || !aTexture.isValid()) {
         return;
     }
 
@@ -581,7 +583,7 @@
 
 StGLIcon::~StGLIcon() {
     if(myIsExternalTexture) {
-        myTextures.nullify();
+        myTextures.reset();
     }
 }

_service:obs_scm:sview-26.obscpio/StGLWidgets/StGLWidget.cpp Changed

_service:obs_scm:sview-26.obscpio/StGLWidgets/StSubQueue.cpp Changed

@@ -7,15 +7,12 @@
 
 #include <StGLWidgets/StSubQueue.h>
 
-StSubQueue::StSubQueue()
-: myFront(NULL),
-  myBack(NULL),
-  myMutex() {
+StSubQueue::StSubQueue() {
     //
 }
 
 StSubQueue::~StSubQueue() {
-    for(QueueItem* anItem = myFront; anItem != NULL; anItem = myFront) {
+    for (QueueItem* anItem = myFront; anItem != nullptr; anItem = myFront) {
         myFront = myFront->myNext;
         delete anItem;
     }
@@ -23,31 +20,31 @@
 
 bool StSubQueue::isEmpty() {
     myMutex.lock();
-    bool aResult = myFront == NULL;
+    bool aResult = myFront == nullptr;
     myMutex.unlock();
     return aResult;
 }
 
 void StSubQueue::clear() {
     myMutex.lock();
-    for(QueueItem* anItem = myFront; anItem != NULL; anItem = myFront) {
+    for (QueueItem* anItem = myFront; anItem != nullptr; anItem = myFront) {
         myFront = myFront->myNext;
         delete anItem;
     }
     myMutex.unlock();
 }
 
-StHandle<StSubItem> StSubQueue::pop(const double thePTS) {
+std::shared_ptr<StSubItem> StSubQueue::pop(const double thePTS) {
     myMutex.lock();
-    for(QueueItem* anItem = myFront; anItem != NULL;) {
-        if(anItem->myItem->TimeEnd < thePTS) {
+    for (QueueItem* anItem = myFront; anItem != nullptr;) {
+        if (anItem->myItem->TimeEnd < thePTS) {
             // remove outdated items
             myFront = myFront->myNext;
             delete anItem;
             anItem = myFront;
-        } else if(anItem->myItem->TimeStart <= thePTS) {
+        } else if (anItem->myItem->TimeStart <= thePTS) {
             // pop the item
-            StHandle<StSubItem> aSubItem = anItem->myItem;
+            std::shared_ptr<StSubItem> aSubItem = anItem->myItem;
             myFront = myFront->myNext;
             delete anItem;
             myMutex.unlock();
@@ -55,17 +52,17 @@
         } else {
             // no more items to show
             myMutex.unlock();
-            return StHandle<StSubItem>();
+            return std::shared_ptr<StSubItem>();
         }
     }
     myMutex.unlock();
-    return StHandle<StSubItem>();
+    return std::shared_ptr<StSubItem>();
 }
 
-void StSubQueue::push(const StHandle<StSubItem>& theSubItem) {
+void StSubQueue::push(const std::shared_ptr<StSubItem>& theSubItem) {
     myMutex.lock();
     QueueItem* anItem = new QueueItem(theSubItem);
-    if(myFront == NULL) {
+    if (myFront == nullptr) {
         myFront = myBack = anItem;
     } else {
         myBack->myNext = anItem;

_service:obs_scm:sview-26.obscpio/StImageViewer/StImageLoader.cpp Changed

@@ -49,13 +49,13 @@
 
 }
 
-StImageLoader::StImageLoader(const StImageFile::ImageClass      theImageLib,
-                             const StHandle<StResourceManager>& theResMgr,
-                             const StHandle<StMsgQueue>&        theMsgQueue,
-                             const StHandle<StLangMap>&         theLangMap,
-                             const StHandle<StPlayList>&        thePlayList,
-                             const StHandle<StGLTextureQueue>&  theTextureQueue,
-                             const GLint                        theMaxTexDim)
+StImageLoader::StImageLoader(const StImageFile::ImageClass             theImageLib,
+                             const std::shared_ptr<StResourceManager>& theResMgr,
+                             const std::shared_ptr<StMsgQueue>&        theMsgQueue,
+                             const std::shared_ptr<StLangMap>&         theLangMap,
+                             const std::shared_ptr<StPlayList>&        thePlayList,
+                             const std::shared_ptr<StGLTextureQueue>&  theTextureQueue,
+                             const GLint                               theMaxTexDim)
 : myMimeList(ST_IMAGES_MIME_STRING),
   myVideoMimeList(ST_VIDEOS_MIME_STRING),
   myResMgr(theResMgr),
@@ -68,20 +68,16 @@
   myMsgQueue(theMsgQueue),
   myImageLib(theImageLib),
   myAction(Action_NONE),
-  myIsTheaterMode(false),
-  myToStickPano360(false),
-  myToFlipCubeZ6x1(false),
-  myToFlipCubeZ3x2(false),
-  myToSwapJps(false) {
+  myIsTheaterMode(false) {
       myPlayList->setExtensions(myMimeList.getExtensionsList());
-      myThread = new StThread(threadFunction, (void* )this, "StImageLoader");
+      myThread = std::make_shared<StThread>(threadFunction, (void* )this, "StImageLoader");
 }
 
 StImageLoader::~StImageLoader() {
     myAction = Action_Quit;
     myLoadNextEvent.set(); // stop the thread
     myThread->wait();
-    myThread.nullify();
+    myThread.reset();
 }
 
 void StImageLoader::setCompressMemory(const bool theToCompress) {
@@ -94,9 +90,9 @@
     myTextureQueue->clear();
 }
 
-void StImageLoader::metadataFromExif(const StHandle<StExifDir>& theDir,
-                                     StHandle<StImageInfo>&     theInfo) {
-    if(theDir.isNull()) {
+void StImageLoader::metadataFromExif(const std::shared_ptr<StExifDir>& theDir,
+                                     std::shared_ptr<StImageInfo>&     theInfo) {
+    if (theDir.get() == nullptr) {
         return;
     }
 
@@ -118,14 +114,14 @@
     }
 }
 
-inline StHandle<StImage> scaledImage(StHandle<StImageFile>& theRef,
-                                     const StGLDeviceCaps&  theCaps,
-                                     const size_t           theMaxSizeX,
-                                     const size_t           theMaxSizeY,
-                                     StCubemap              theCubemap,
-                                     const size_t*          theCubeCoeffs,
-                                     StPairRatio            thePairRatio) {
-    if(theRef->isNull()) {
+inline std::shared_ptr<StImage> scaledImage(std::shared_ptr<StImageFile>& theRef,
+                                            const StGLDeviceCaps&  theCaps,
+                                            const size_t           theMaxSizeX,
+                                            const size_t           theMaxSizeY,
+                                            StCubemap              theCubemap,
+                                            const size_t*          theCubeCoeffs,
+                                            StPairRatio            thePairRatio) {
+    if (theRef->isNull()) {
         return theRef;
     }
 
@@ -166,7 +162,7 @@
             return theRef;
         }
 
-        StHandle<StImage> anImage = new StImage();
+        std::shared_ptr<StImage> anImage = std::make_shared<StImage>();
         if(toConvertRgb) {
             anImage->setColorModelPacked(anRgbImgFormat);
             anImage->setColorScale(StImage::ImgScale_Full);
@@ -223,7 +219,7 @@
         return theRef;
     }
 
-    StHandle<StImage> anImage = new StImage();
+    std::shared_ptr<StImage> anImage = std::make_shared<StImage>();
     const size_t aSizeX = stMin(theRef->getSizeX(), theMaxSizeX);
     const size_t aSizeY = stMin(theRef->getSizeY(), theMaxSizeY);
     if(toConvertRgb) {
@@ -260,15 +256,15 @@
     return aText;
 }
 
-bool StImageLoader::loadImage(const StHandle<StFileNode>& theSource,
-                              StHandle<StStereoParams>&   theParams) {
+bool StImageLoader::loadImage(const std::shared_ptr<StFileNode>& theSource,
+                              std::shared_ptr<StStereoParams>& theParams) {
     const StString               aFilePath = theSource->getPath();
     const StImageFile::ImageType anImgType = StImageFile::guessImageType(aFilePath, theSource->getMIME());
 
-    StHandle<StImageFile> anImageFileL = StImageFile::create(myImageLib, anImgType);
-    StHandle<StImageFile> anImageFileR = StImageFile::create(myImageLib, anImgType);
-    if(anImageFileL.isNull()
-    || anImageFileR.isNull()) {
+    std::shared_ptr<StImageFile> anImageFileL = StImageFile::create(myImageLib, anImgType);
+    std::shared_ptr<StImageFile> anImageFileR = StImageFile::create(myImageLib, anImgType);
+    if (anImageFileL.get() == nullptr
+     || anImageFileR.get() == nullptr) {
         processLoadFail("No any image library was found!");
         return false;
     }
@@ -276,14 +272,14 @@
     // clear active
     myTextureQueue->clear();
 
-    StHandle<StImageInfo> anImgInfo = new StImageInfo();
+    std::shared_ptr<StImageInfo> anImgInfo = std::make_shared<StImageInfo>();
     anImgInfo->Id        = theParams;
     anImgInfo->Path      = aFilePath;
     anImgInfo->ImageType = anImgType;
     anImgInfo->IsSavable = false;
 
     StString aTitleString, aFolder;
-    if(theSource->size() >= 2) {
+    if (theSource->size() >= 2) {
         StString aTitleString2;
         StFileNode::getFolderAndFile(theSource->getValue(0)->getPath(), aFolder, aTitleString);
         StFileNode::getFolderAndFile(theSource->getValue(1)->getPath(), aFolder, aTitleString2);
@@ -298,11 +294,11 @@
     StTimer aLoadTimer(true);
     StFormat  aSrcFormatCurr = myStFormatByUser;
     StPanorama aSrcPanorama = StPanorama_OFF;
-    if(anImgType == StImageFile::ST_TYPE_MPO
-    || anImgType == StImageFile::ST_TYPE_JPEG
-    || anImgType == StImageFile::ST_TYPE_JPS) {
+    if (anImgType == StImageFile::ST_TYPE_MPO
+     || anImgType == StImageFile::ST_TYPE_JPEG
+     || anImgType == StImageFile::ST_TYPE_JPS) {
         int aFileDescriptor = -1;
-        if(StFileNode::isContentProtocolPath(aFilePath)) {
+        if (StFileNode::isContentProtocolPath(aFilePath)) {
             aFileDescriptor = myResMgr->openFileDescriptor(aFilePath);
         }
 
@@ -311,24 +307,24 @@
         double anHParallax = 0.0; // parallax in percents
         const bool isParsed = aParser.readFile(aFilePath, aFileDescriptor);
 
-        StHandle<StJpegParser::Image> anImg1, anImg2;
+        std::shared_ptr<StJpegParser::Image> anImg1, anImg2;
         size_t aMaxSizeX = 0;
         size_t aMaxSizeY = 0;
-        for(StHandle<StJpegParser::Image> anImgIter = aParser.getImage(0); !anImgIter.isNull();
-            anImgIter = anImgIter->Next) {
+        for (std::shared_ptr<StJpegParser::Image> anImgIter = aParser.getImage(0); anImgIter.get() != nullptr;
+             anImgIter = anImgIter->Next) {
             aMaxSizeX = stMax(aMaxSizeX, anImgIter->SizeX);
             aMaxSizeY = stMax(aMaxSizeY, anImgIter->SizeY);
         }
 
         int anImgCounter = 1;
-        for(StHandle<StJpegParser::Image> anImgIter = aParser.getImage(0); !anImgIter.isNull();
-            anImgIter = anImgIter->Next, ++anImgCounter) {
-            if(anImgIter->SizeX == aMaxSizeX
-            && anImgIter->SizeY == aMaxSizeY) {
-                if(anImg1.isNull()) {
+        for (std::shared_ptr<StJpegParser::Image> anImgIter = aParser.getImage(0); anImgIter.get() != nullptr;
+             anImgIter = anImgIter->Next, ++anImgCounter) {
+            if (anImgIter->SizeX == aMaxSizeX
+             && anImgIter->SizeY == aMaxSizeY) {
+                if (anImg1.get() == nullptr) {
                     anImg1 = anImgIter;
                     continue;
-                } else if(anImg2.isNull()) {
+                } else if (anImg2.get() == nullptr) {
                     anImg2 = anImgIter;
                     continue;
                 }
@@ -336,43 +332,43 @@
             anImgInfo->Info.add(StArgument(tr(INFO_DIMENSIONS) + (" (") + anImgCounter + ")",
                                            StString() + anImgIter->SizeX + " x " + anImgIter->SizeY));
         }
-        if (anImg1.isNull()) {
+        if (anImg1.get() == nullptr) {
             // handle broken or unknown JPEG files / issues in JPEG parser
             ST_DEBUG_LOG("Warning, StJpegParser returned inconclusive list of sub-images");
             anImg1 = aParser.getImage(0);
         }
-        if (anImg1.isNull()) {
+        if (anImg1.get() == nullptr) {
             processLoadFail(StString("StJpegParser failed on \"") + aFilePath + '\"');
             return false;
         }
 
         // copy metadata
-        if(!aParser.getComment().isEmpty()) {
+        if (!aParser.getComment().isEmpty()) {
             StDictEntry& anEntry  = anImgInfo->Info.addChange("Jpeg.Comment");
             anEntry.changeValue() = aParser.getComment();
         }
-        if(!aParser.getJpsComment().isEmpty()) {
+        if (!aParser.getJpsComment().isEmpty()) {
             StDictEntry& anEntry  = anImgInfo->Info.addChange("Jpeg.JpsComment");
             anEntry.changeValue() = aParser.getJpsComment();
         }
-        if(!aParser.getXMP().isEmpty()) {
+        if (!aParser.getXMP().isEmpty()) {
             StDictEntry& anEntry  = anImgInfo->Info.addChange("Jpeg.XMP");
             anEntry.changeValue() = aParser.getXMP();
         }
-        if(!anImg1.isNull()) {
-            for(size_t anExifId = 0; anExifId < anImg1->Exif.size(); ++anExifId) {
+        if (anImg1.get() != nullptr) {
+            for (size_t anExifId = 0; anExifId < anImg1->Exif.size(); ++anExifId) {
                 metadataFromExif(anImg1->ExifanExifId, anImgInfo);
             }
             const StString aTime = anImg1->getDateTime();
-            if(!aTime.isEmpty()) {
+            if (!aTime.isEmpty()) {
                 StDictEntry& anEntry  = anImgInfo->Info.addChange("Exif.Image.DateTime");
                 anEntry.changeValue() = aTime;
             }
         }
-        if(myStFormatByUser == StFormat_AUTO) {
-            if(aParser.getSrcFormat() != StFormat_AUTO) {
+        if (myStFormatByUser == StFormat_AUTO) {
+            if (aParser.getSrcFormat() != StFormat_AUTO) {
                 aSrcFormatCurr = aParser.getSrcFormat();
-            } else if(!anImg1.isNull() && anImg2.isNull()
+            } else if (anImg1.get() != nullptr && anImg2.get() == nullptr
                     && anImg1->getQooCamMakerNote(aSrcFormatCurr)) {
                 //
             }
@@ -380,14 +376,14 @@
         aSrcPanorama = aParser.getPanorama();
 
         //aParser.fillDictionary(anImgInfo->Info, true);
-        if(!isParsed) {
+        if (!isParsed) {
             processLoadFail(StString("Can not read the file \"") + aFilePath + '\"');
             return false;
         }
 
-        anImgInfo->IsSavable = anImg2.isNull();
+        anImgInfo->IsSavable = anImg2.get() == nullptr;
         anImgInfo->StInfoStream = aParser.getSrcFormat();
-        if(anImgInfo->StInfoStream != StFormat_AUTO) {
+        if (anImgInfo->StInfoStream != StFormat_AUTO) {
             StDictEntry& anEntry  = anImgInfo->Info.addChange("Jpeg.JpsStereo");
             anEntry.changeValue() = tr(StImageViewerGUI::trSrcFormatId(anImgInfo->StInfoStream));
         }
@@ -396,44 +392,44 @@
         const StJpegParser::Orient anOrient = anImg1->getOrientation();
         theParams->setZRotateZero((GLfloat )StJpegParser::getRotationAngle(anOrient));
         anImg1->getParallax(anHParallax);
-        if(!anImageFileL->load(aFilePath, StImageFile::ST_TYPE_JPEG,
-                               (uint8_t* )anImg1->Data, (int )anImg1->Length)
-        && !anImageFileL->load(aFilePath, StImageFile::ST_TYPE_JPEG,
-                               (uint8_t* )aParser.getBuffer(), (int )aParser.getSize())) {
+        if (!anImageFileL->load(aFilePath, StImageFile::ST_TYPE_JPEG,
+                                (uint8_t* )anImg1->Data, (int )anImg1->Length)
+         && !anImageFileL->load(aFilePath, StImageFile::ST_TYPE_JPEG,
+                                (uint8_t* )aParser.getBuffer(), (int )aParser.getSize())) {
             processLoadFail(formatError(aFilePath, anImageFileL->getState()));
             return false;
         }
 
-        if(!anImg2.isNull()) {
+        if (anImg2.get() != nullptr) {
             // read image from memory
             anImg2->getParallax(anHParallax); // in MPO parallax generally stored ONLY in second frame
-            if(!anImageFileR->load(aFilePath, StImageFile::ST_TYPE_JPEG,
-                                   (uint8_t* )anImg2->Data, (int )anImg2->Length)) {
+            if (!anImageFileR->load(aFilePath, StImageFile::ST_TYPE_JPEG,
+                                    (uint8_t* )anImg2->Data, (int )anImg2->Length)) {
                 processLoadFail(formatError(aFilePath, anImageFileR->getState()));
                 return false;
             }
 
             // convert percents to pixels
             const GLint aParallaxPx = GLint(anHParallax * anImageFileR->getSizeX() * 0.01);
-            if(aParallaxPx != 0) {
+            if (aParallaxPx != 0) {
                 StDictEntry& anEntry  = anImgInfo->Info.addChange("Exif.Fujifilm.Parallax");
                 anEntry.changeValue() = StString(anHParallax);
             }
             theParams->setSeparationNeutral(aParallaxPx);
-        } else if(anImgType == StImageFile::ST_TYPE_MPO) {
+        } else if (anImgType == StImageFile::ST_TYPE_MPO) {
             ST_DEBUG_LOG("MPO image \"" + aFilePath + "\" is invalid!");
         }
-    } else if(theSource->size() >= 2) {
+    } else if (theSource->size() >= 2) {
         const StString aFilePathLeft  = theSource->getValue(0)->getPath();
         const StString aFilePathRight = theSource->getValue(1)->getPath();
 
         // loading image with format autodetection
         StRawFile aRawFileL;
-        if(StFileNode::isContentProtocolPath(aFilePathLeft)) {
+        if (StFileNode::isContentProtocolPath(aFilePathLeft)) {
             int aFileDescriptor = myResMgr->openFileDescriptor(aFilePathLeft);
             aRawFileL.readFile(aFilePathLeft, aFileDescriptor);
         }
-        if(!anImageFileL->load(aFilePathLeft, anImgType, (uint8_t* )aRawFileL.getBuffer(), (int )aRawFileL.getSize())) {
+        if (!anImageFileL->load(aFilePathLeft, anImgType, (uint8_t* )aRawFileL.getBuffer(), (int )aRawFileL.getSize())) {
             processLoadFail(formatError(aFilePathLeft, anImageFileL->getState()));
             return false;
         }
@@ -441,44 +437,43 @@
         aSrcPanorama = anImageFileL->getPanoramaFormat();
 
         StRawFile aRawFileR;
-        if(StFileNode::isContentProtocolPath(aFilePathRight)) {
+        if (StFileNode::isContentProtocolPath(aFilePathRight)) {
             int aFileDescriptor = myResMgr->openFileDescriptor(aFilePathRight);
             aRawFileR.readFile(aFilePathRight, aFileDescriptor);
         }
-        if(!anImageFileR->load(aFilePathRight, anImgType, (uint8_t* )aRawFileR.getBuffer(), (int )aRawFileR.getSize())) {
+        if (!anImageFileR->load(aFilePathRight, anImgType, (uint8_t* )aRawFileR.getBuffer(), (int )aRawFileR.getSize())) {
             processLoadFail(formatError(aFilePathRight, anImageFileR->getState()));
             return false;
         }
     } else {
         StRawFile aRawFile;
-        if(StFileNode::isContentProtocolPath(aFilePath)) {
+        if (StFileNode::isContentProtocolPath(aFilePath)) {
             int aFileDescriptor = myResMgr->openFileDescriptor(aFilePath);
             aRawFile.readFile(aFilePath, aFileDescriptor);
         }
-        if(!anImageFileL->load(aFilePath, anImgType, (uint8_t* )aRawFile.getBuffer(), (int )aRawFile.getSize())) {
+        if (!anImageFileL->load(aFilePath, anImgType, (uint8_t* )aRawFile.getBuffer(), (int )aRawFile.getSize())) {
             processLoadFail(formatError(aFilePath, anImageFileL->getState()));
             return false;
         }
 
         aSrcPanorama = anImageFileL->getPanoramaFormat();
         anImgInfo->StInfoStream = anImageFileL->getFormat();
-        if(myStFormatByUser == StFormat_AUTO) {
+        if (myStFormatByUser == StFormat_AUTO) {
             aSrcFormatCurr = anImgInfo->StInfoStream;
         }
     }
     const double aLoadTimeMSec = aLoadTimer.getElapsedTimeInMilliSec();
 
     // copy metadata
-    for(size_t aTagIter = 0; aTagIter < anImageFileL->getMetadata().size(); ++aTagIter) {
+    for (size_t aTagIter = 0; aTagIter < anImageFileL->getMetadata().size(); ++aTagIter) {
         const StDictEntry& aTag = anImageFileL->getMetadata().getFromIndex(aTagIter);
         anImgInfo->Info.add(aTag);
     }
 
     // detect information from file name
     bool isAnamorphByName = false;
-    anImgInfo->StInfoFileName = st::formatFromName(aTitleString, myToSwapJps, isAnamorphByName);
-    if(aSrcFormatCurr == StFormat_AUTO
-    && anImgInfo->StInfoFileName != StFormat_AUTO) {
+    anImgInfo->StInfoFileName = st::formatFromName(aTitleString, params.ToSwapJPS->getValue(), isAnamorphByName);
+    if (aSrcFormatCurr == StFormat_AUTO && anImgInfo->StInfoFileName != StFormat_AUTO) {
         aSrcFormatCurr = anImgInfo->StInfoFileName;
     }
 
@@ -494,80 +489,76 @@
     theParams->Src2SizeX = aSizeX2;
     theParams->Src2SizeY = aSizeY2;
     StPairRatio aPairRatio = StPairRatio_1;
-    if(anImageFileR->isNull()) {
+    if (anImageFileR->isNull()) {
         aPairRatio = st::formatToPairRatio(aSrcFormatCurr);
-        if(aPairRatio == StPairRatio_HalfWidth) {
+        if (aPairRatio == StPairRatio_HalfWidth) {
             aSizeXLim *= 2;
             aSizeX1   /= 2;
-        } else if(aPairRatio == StPairRatio_HalfHeight) {
+        } else if (aPairRatio == StPairRatio_HalfHeight) {
             aSizeYLim *= 2;
             aSizeY1   /= 2;
         }
     }
 
-    if(!anImageFileR->isNull()) {
+    if (!anImageFileR->isNull()) {
         aSrcFormatCurr = StFormat_SeparateFrames;
     }
 
-    if(aSrcPanorama != StPanorama_OFF) {
+    if (aSrcPanorama != StPanorama_OFF) {
         theParams->ViewingMode = StStereoParams::getViewSurfaceForPanoramaSource(aSrcPanorama, true);
     }
-    if(myIsTheaterMode && theParams->ViewingMode == StViewSurface_Plain) {
+    if (myIsTheaterMode && theParams->ViewingMode == StViewSurface_Plain) {
         theParams->ViewingMode = StViewSurface_Theater;
-    } else if(!myIsTheaterMode && theParams->ViewingMode == StViewSurface_Theater) {
+    } else if (!myIsTheaterMode && theParams->ViewingMode == StViewSurface_Theater) {
         theParams->ViewingMode = StViewSurface_Plain;
     }
 
-    if(myToStickPano360
-    && theParams->ViewingMode == StViewSurface_Plain) {
-        StPanorama aPano = st::probePanorama(aSrcFormatCurr,
-                                             theParams->Src1SizeX, theParams->Src1SizeY,
-                                             theParams->Src2SizeX, theParams->Src2SizeY);
-        theParams->ViewingMode = StStereoParams::getViewSurfaceForPanoramaSource(aPano, true);
+    if (params.ToStickPanorama->getValue()) {
+        theParams->ViewingMode = (StViewSurface)params.LastPanoramaMode->getValue();
     }
     StCubemap aSrcCubemap = StCubemap_OFF;
-    if(theParams->ViewingMode == StViewSurface_Cubemap) {
+    if (theParams->ViewingMode == StViewSurface_Cubemap) {
         aSrcCubemap = StCubemap_Packed;
-    } else if(theParams->ViewingMode == StViewSurface_CubemapEAC) {
+    } else if (theParams->ViewingMode == StViewSurface_CubemapEAC) {
         aSrcCubemap = StCubemap_PackedEAC;
     }
 
     size_t aCubeCoeffs2 = {0, 0};
-    if(aSrcCubemap == StCubemap_Packed
-    || aSrcCubemap == StCubemap_PackedEAC) {
-        if(aSizeX1 / 6 == aSizeY1) {
+    if (aSrcCubemap == StCubemap_Packed
+     || aSrcCubemap == StCubemap_PackedEAC) {
+        if (aSizeX1 / 6 == aSizeY1) {
             aCubeCoeffs0 = 6;
             aCubeCoeffs1 = 1;
-            theParams->ToFlipCubeZ = myToFlipCubeZ6x1;
-        } else if(aSizeY1 / 6 == aSizeX1) {
+            theParams->ToFlipCubeZ = params.ToFlipCubeZ6x1->getValue();
+        } else if (aSizeY1 / 6 == aSizeX1) {
             aCubeCoeffs0 = 1;
             aCubeCoeffs1 = 6;
-            theParams->ToFlipCubeZ = myToFlipCubeZ6x1;
-        } else if(aSizeX1 / 3 == aSizeY1 / 2) {
+            theParams->ToFlipCubeZ = params.ToFlipCubeZ6x1->getValue();
+        } else if (aSizeX1 / 3 == aSizeY1 / 2) {
             aCubeCoeffs0 = 3;
             aCubeCoeffs1 = 2;
-            theParams->ToFlipCubeZ = myToFlipCubeZ3x2;
-        } else if(aSizeX1 / 2 == aSizeY1 / 3) {
+            theParams->ToFlipCubeZ = params.ToFlipCubeZ3x2->getValue();
+        } else if (aSizeX1 / 2 == aSizeY1 / 3) {
             aCubeCoeffs0 = 2;
             aCubeCoeffs1 = 3;
-            theParams->ToFlipCubeZ = myToFlipCubeZ3x2;
-        } else if(aSrcCubemap == StCubemap_PackedEAC) {
+            theParams->ToFlipCubeZ = params.ToFlipCubeZ3x2->getValue();
+        } else if (aSrcCubemap == StCubemap_PackedEAC) {
             // EAC on ytb is so cruel, that they don't use squared cube sides!
-            if(aSizeX1 > aSizeY1) {
+            if (aSizeX1 > aSizeY1) {
                 aCubeCoeffs0 = 3;
                 aCubeCoeffs1 = 2;
-                theParams->ToFlipCubeZ = myToFlipCubeZ3x2;
+                theParams->ToFlipCubeZ = params.ToFlipCubeZ3x2->getValue();
             } else {
                 aCubeCoeffs0 = 2;
                 aCubeCoeffs1 = 3;
-                theParams->ToFlipCubeZ = myToFlipCubeZ3x2;
+                theParams->ToFlipCubeZ = params.ToFlipCubeZ3x2->getValue();
             }
         }
-        if(!anImageFileR->isNull()
-        && (aSizeX1 != aSizeX2 || aSizeY1 != aSizeY2)) {
+        if (!anImageFileR->isNull()
+         && (aSizeX1 != aSizeX2 || aSizeY1 != aSizeY2)) {
             aCubeCoeffs0 = 0;
         }
-        if(aCubeCoeffs0 == 0) {
+        if (aCubeCoeffs0 == 0) {
             myMsgQueue->pushError(StString("Image(s) has unexpected dimensions: {0}x{1} ({2}x{3})\n"
                                            "Cubemap should has 6 squared images in configuration 6:1 (single row) or 3:2 (two rows).")
                        .format(aSizeX1, aSizeY1, anImageFileL->getSizeX(), anImageFileL->getSizeY()));
@@ -578,22 +569,22 @@
         }
     }
 
-    StHandle<StImage> anImageL = scaledImage(anImageFileL, myTextureQueue->getDeviceCaps(), aSizeXLim, aSizeYLim,
+    std::shared_ptr<StImage> anImageL = scaledImage(anImageFileL, myTextureQueue->getDeviceCaps(), aSizeXLim, aSizeYLim,
                                              aSrcCubemap, aCubeCoeffs, aPairRatio);
-    StHandle<StImage> anImageR = scaledImage(anImageFileR, myTextureQueue->getDeviceCaps(), aSizeXLim, aSizeYLim,
+    std::shared_ptr<StImage> anImageR = scaledImage(anImageFileR, myTextureQueue->getDeviceCaps(), aSizeXLim, aSizeYLim,
                                              aSrcCubemap, aCubeCoeffs, aPairRatio);
 #ifdef ST_DEBUG
     const double aScaleTimeMSec = aLoadTimer.getElapsedTimeInMilliSec() - aLoadTimeMSec;
-    if(anImageL != anImageFileL) {
+    if (anImageL != anImageFileL) {
         ST_DEBUG_LOG("Image is downscaled to fit texture limits in " + aScaleTimeMSec + " ms!");
     }
 #endif
 
 #ifdef ST_DEBUG
-    if(!anImageFileL->isNull()) {
+    if (!anImageFileL->isNull()) {
         ST_DEBUG_LOG(anImageFileL->getState());
     }
-    if(!anImageFileR->isNull()) {
+    if (!anImageFileR->isNull()) {
         ST_DEBUG_LOG(anImageFileR->getState());
     }
 #endif
@@ -605,7 +596,7 @@
         StImage anImageRefL, anImageRefR;
         StHandle<StBufferCounter> aRefL = new StImageFileCounter(anImageL);
         anImageRefL.initReference(*anImageL, aRefL);
-        if(!anImageR->isNull()) {
+        if (!anImageR->isNull()) {
             StHandle<StBufferCounter> aRefR = new StImageFileCounter(anImageR);
             anImageRefR.initReference(*anImageR, aRefR);
         }
@@ -613,19 +604,19 @@
         myTextureQueue->push(anImageRefL, anImageRefR, theParams, aSrcFormatCurr, aSrcCubemap, 0.0);
     }
 
-    if(!stAreEqual(anImageFileL->getPixelRatio(), 1.0f, 0.001f)) {
+    if (!stAreEqual(anImageFileL->getPixelRatio(), 1.0f, 0.001f)) {
         anImgInfo->Info.add(StArgument(tr(INFO_PIXEL_RATIO),
                                        StString(anImageFileL->getPixelRatio())));
     }
     const StString aFormatL = anImageFileL->formatImgPixelFormat();
-    if(!anImageFileR->isNull()) {
+    if (!anImageFileR->isNull()) {
         anImgInfo->Info.add(StArgument(tr(INFO_DIMENSIONS),
                                        formatSize(anImageL->getSizeX(), anImageL->getSizeY(),
                                                   theParams->Src1SizeX, theParams->Src1SizeY) + " " + tr(INFO_LEFT) + "\n"
                                      + formatSize(anImageR->getSizeX(), anImageR->getSizeY(),
                                                   theParams->Src2SizeX, theParams->Src2SizeY) + " " + tr(INFO_RIGHT)));
         const StString aFormatR = anImageFileR->formatImgPixelFormat();
-        if(aFormatL == aFormatR) {
+        if (aFormatL == aFormatR) {
             anImgInfo->Info.add(StArgument(tr(INFO_PIXEL_FORMAT), aFormatL));
         } else {
             anImgInfo->Info.add(StArgument(tr(INFO_PIXEL_FORMAT),
@@ -645,10 +636,10 @@
     myLock.unlock();
 
     // clean up - close opened files and reset memory
-    anImageL.nullify();
-    anImageR.nullify();
-    anImageFileL.nullify();
-    anImageFileR.nullify();
+    anImageL.reset();
+    anImageR.reset();
+    anImageFileL.reset();
+    anImageFileR.reset();
 
     myTextureQueue->stglSwapFB(0);
 
@@ -657,11 +648,11 @@
     return true;
 }
 
-bool StImageLoader::saveImage(const StHandle<StFileNode>&     theSource,
-                              const StHandle<StStereoParams>& theParams,
-                              StImageFile::ImageType          theImgType) {
-    if(theParams.isNull()
-    || theImgType == StImageFile::ST_TYPE_NONE) {
+bool StImageLoader::saveImage(const std::shared_ptr<StFileNode>& theSource,
+                              const std::shared_ptr<StStereoParams>& theParams,
+                              StImageFile::ImageType theImgType) {
+    if (theParams.get() == nullptr
+     || theImgType == StImageFile::ST_TYPE_NONE) {
         myMsgQueue->pushError(tr(DIALOG_NOTHING_TO_SAVE));
         return false;
     }
@@ -679,17 +670,19 @@
         myMsgQueue->pushInfo(tr(DIALOG_NO_SNAPSHOT));
         return false;
     }
-    StHandle<StImageFile> aDataResult = StImageFile::create(myImageLib);
-    if(aDataResult.isNull()) {
+    std::shared_ptr<StImageFile> aDataResult = StImageFile::create(myImageLib);
+    if (aDataResult.get() == nullptr) {
         myMsgQueue->pushError(stCString("No any image library was found!"));
         return false;
     }
 
     const bool toSaveStereo = !aDataRight.isNull();
+    const bool isCrossEyed = params.ToSaveCrossEyed->getValue();
     if(toSaveStereo
-    && aDataResult->initSideBySide(aDataLeft, aDataRight,
-                                   theParams->getSeparationDx(),
-                                   theParams->getSeparationDy())) {
+    && aDataResult->initSideBySide(isCrossEyed ? aDataLeft : aDataRight,
+                                   isCrossEyed ? aDataRight : aDataLeft,
+                                   isCrossEyed ? theParams->getSeparationDx() : -theParams->getSeparationDx(),
+                                   isCrossEyed ? theParams->getSeparationDy() : -theParams->getSeparationDy())) {
         aDataLeft.nullify();
         aDataRight.nullify();
     } else {
@@ -753,7 +746,7 @@
             StString strSaveState;
             StImageFile::SaveImageParams aSaveParams;
             aSaveParams.SaveImageType = theImgType;
-            aSaveParams.StereoFormat = toSaveStereo ? StFormat_SideBySide_RL : StFormat_AUTO;
+            aSaveParams.StereoFormat = toSaveStereo ? (isCrossEyed ? StFormat_SideBySide_RL : StFormat_SideBySide_LR) : StFormat_AUTO;
             if(!aDataResult->save(aFileToSave, aSaveParams)) {
                 // TODO (Kirill Gavrilov#7)
                 myMsgQueue->pushError(aDataResult->getState());
@@ -768,13 +761,13 @@
     return true;
 }
 
-bool StImageLoader::saveImageInfo(const StHandle<StImageInfo>& theInfo) {
-    if(theInfo.isNull()
-    || theInfo->Path.isEmpty()) {
+bool StImageLoader::saveImageInfo(const std::shared_ptr<StImageInfo>& theInfo) {
+    if (theInfo.get() == nullptr
+     || theInfo->Path.isEmpty()) {
         myMsgQueue->pushError(tr(DIALOG_NOTHING_TO_SAVE));
         return false;
-    } else if(theInfo->ImageType != StImageFile::ST_TYPE_JPEG
-           && theInfo->ImageType != StImageFile::ST_TYPE_JPS) {
+    } else if (theInfo->ImageType != StImageFile::ST_TYPE_JPEG
+            && theInfo->ImageType != StImageFile::ST_TYPE_JPS) {
         myMsgQueue->pushError(stCString("Operation is unavailable for this image type"));
         return false;
     }
@@ -799,8 +792,8 @@
 }
 
 void StImageLoader::mainLoop() {
-    StHandle<StFileNode>     aFileToLoad;
-    StHandle<StStereoParams> aFileParams;
+    std::shared_ptr<StFileNode>     aFileToLoad;
+    std::shared_ptr<StStereoParams> aFileParams;
     for(;;) {
         myLoadNextEvent.wait();
         switch(myAction) {
@@ -823,8 +816,8 @@
             }
             case Action_SaveInfo: {
                 myLock.lock();
-                StHandle<StImageInfo> anInfo = myInfoToSave;
-                myInfoToSave.nullify();
+                std::shared_ptr<StImageInfo> anInfo = myInfoToSave;
+                myInfoToSave.reset();
                 myAction = Action_NONE;
                 myLock.unlock();
                 myLoadNextEvent.reset();

_service:obs_scm:sview-26.obscpio/StImageViewer/StImageLoader.h Changed

@@ -19,6 +19,7 @@
 #ifndef __StImageLoader_h_
 #define __StImageLoader_h_
 
+#include <StSettings/StParam.h>
 #include <StStrings/StMsgQueue.h>
 #include <StFile/StMIMEList.h>
 #include <StGL/StPlayList.h>
@@ -34,7 +35,8 @@
 
 struct StImageInfo {
 
-    StHandle<StStereoParams> Id;
+    std::shared_ptr<StStereoParams> Id;
+
     StArgumentsMap           Info;
     StString                 Path;           //!< file path
     StImageFile::ImageType   ImageType;      //!< image type
@@ -72,16 +74,16 @@
 
     ST_LOCAL const StMIMEList& getMimeListVideo() const { return myVideoMimeList; }
 
-    ST_LOCAL StImageLoader(const StImageFile::ImageClass      theImageLib,
-                           const StHandle<StResourceManager>& theResMgr,
-                           const StHandle<StMsgQueue>&        theMsgQueue,
-                           const StHandle<StLangMap>&         theLangMap,
-                           const StHandle<StPlayList>&        thePlayList,
-                           const StHandle<StGLTextureQueue>&  theTextureQueue,
-                           const GLint                        theMaxTexDim);
+    ST_LOCAL StImageLoader(const StImageFile::ImageClass             theImageLib,
+                           const std::shared_ptr<StResourceManager>& theResMgr,
+                           const std::shared_ptr<StMsgQueue>&        theMsgQueue,
+                           const std::shared_ptr<StLangMap>&         theLangMap,
+                           const std::shared_ptr<StPlayList>&        thePlayList,
+                           const std::shared_ptr<StGLTextureQueue>&  theTextureQueue,
+                           const GLint                               theMaxTexDim);
     ST_LOCAL ~StImageLoader();
 
-    ST_LOCAL inline const StHandle<StGLTextureQueue>& getTextureQueue() const {
+    ST_LOCAL const std::shared_ptr<StGLTextureQueue>& getTextureQueue() const {
         return myTextureQueue;
     }
 
@@ -107,7 +109,7 @@
         myLoadNextEvent.set();
     }
 
-    ST_LOCAL void doSaveInfo(const StHandle<StImageInfo>& theInfo) {
+    ST_LOCAL void doSaveInfo(const std::shared_ptr<StImageInfo>& theInfo) {
         myLock.lock();
         myInfoToSave = theInfo;
         myAction     = Action_SaveInfo;
@@ -115,11 +117,11 @@
         myLoadNextEvent.set();
     }
 
-    ST_LOCAL StHandle<StImageInfo> getFileInfo(const StHandle<StStereoParams>& theParams) const {
+    ST_LOCAL std::shared_ptr<StImageInfo> getFileInfo(const std::shared_ptr<StStereoParams>& theParams) const {
         myLock.lock();
-        StHandle<StImageInfo> anInfo = myImgInfo;
+        std::shared_ptr<StImageInfo> anInfo = myImgInfo;
         myLock.unlock();
-        return (!anInfo.isNull() && anInfo->Id == theParams) ? anInfo : NULL;
+        return (anInfo.get() != nullptr && anInfo->Id == theParams) ? anInfo : std::shared_ptr<StImageInfo>();
     }
 
     ST_LOCAL void setStereoFormat(const StFormat theSrcFormat) {
@@ -147,31 +149,18 @@
         myIsTheaterMode = theIsTheater;
     }
 
-    /**
-     * Stick to panorama 360 mode.
-     */
-    ST_LOCAL void setStickPano360(bool theToStick) {
-        myToStickPano360 = theToStick;
-    }
+        public: //! @name Properties
 
-    /**
-     * Flip Z within 6x1 cubemap input.
-     */
-    ST_LOCAL void setFlipCubeZ6x1(bool theToFlip) {
-        myToFlipCubeZ6x1 = theToFlip;
-    }
+    struct {
 
-    /**
-     * Flip Z within 3x2 cubemap input.
-     */
-    ST_LOCAL void setFlipCubeZ3x2(bool theToFlip) {
-        myToFlipCubeZ3x2 = theToFlip;
-    }
+        StHandle<StBoolParam>  ToSwapJPS;        //!< swap JPS views order
+        StHandle<StBoolParam>  ToSaveCrossEyed;  //!< save JPS views as cross-eyed or parallel pair
+        StHandle<StBoolParam>  ToStickPanorama;  //!< persist last selected panorama mode
+        StHandle<StInt32Param> LastPanoramaMode; //!< last selected panorama mode
+        StHandle<StBoolParam>  ToFlipCubeZ6x1;   //!< flip Z coordinate within Cube map 6x1
+        StHandle<StBoolParam>  ToFlipCubeZ3x2;   //!< flip Z coordinate within Cube map 3x2
 
-    /**
-     * Set if JPS file should be read as Left/Right (TRUE) of as Right/Left (FALSE).
-     */
-    ST_LOCAL void setSwapJPS(bool theToSwap) { myToSwapJps = theToSwap; }
+    } params;
 
         public:  //! @name Signals
 
@@ -185,13 +174,13 @@
 
         private:
 
-    ST_LOCAL bool loadImage(const StHandle<StFileNode>& theSource,
-                            StHandle<StStereoParams>&   theParams);
-    ST_LOCAL bool saveImage(const StHandle<StFileNode>& theSource,
-                            const StHandle<StStereoParams>& theParams,
+    ST_LOCAL bool loadImage(const std::shared_ptr<StFileNode>& theSource,
+                            std::shared_ptr<StStereoParams>&   theParams);
+    ST_LOCAL bool saveImage(const std::shared_ptr<StFileNode>& theSource,
+                            const std::shared_ptr<StStereoParams>& theParams,
                             StImageFile::ImageType theImgType);
 
-    ST_LOCAL bool saveImageInfo(const StHandle<StImageInfo>& theInfo);
+    ST_LOCAL bool saveImageInfo(const std::shared_ptr<StImageInfo>& theInfo);
 
     ST_LOCAL int getSnapshot(StImage* outDataLeft, StImage* outDataRight, bool isForce = false) {
         return myTextureQueue->getSnapshot(outDataLeft, outDataRight, isForce);
@@ -205,8 +194,8 @@
     /**
      * Fill metadata map from EXIF.
      */
-    ST_LOCAL void metadataFromExif(const StHandle<StExifDir>& theDir,
-                                   StHandle<StImageInfo>&     theInfo);
+    ST_LOCAL void metadataFromExif(const std::shared_ptr<StExifDir>& theDir,
+                                   std::shared_ptr<StImageInfo>&     theInfo);
 
     ST_LOCAL const StString& tr(const size_t theId) const {
         return myLangMap->getValue(theId);
@@ -214,28 +203,25 @@
 
         private:
 
-    const StMIMEList            myMimeList;
-    const StMIMEList            myVideoMimeList;
-    StHandle<StThread>          myThread;        //!< main loop thread
-    StHandle<StResourceManager> myResMgr;        //!< resource manager
-    StHandle<StLangMap>         myLangMap;       //!< translations dictionary
-    StHandle<StPlayList>        myPlayList;      //!< play list
-    mutable StMutex             myLock;          //!< lock to access not thread-safe properties
-    StCondition                 myLoadNextEvent;
-    StFormat                    myStFormatByUser;//!< target source format (auto-detect by default)
-    GLint                       myMaxTexDim;     //!< value for GL_MAX_TEXTURE_SIZE
-    StHandle<StGLTextureQueue>  myTextureQueue;  //!< decoded frames queue
-    StHandle<StImageInfo>       myImgInfo;       //!< info about currently loaded image
-    StHandle<StImageInfo>       myInfoToSave;    //!< modified info to be saved
-    StHandle<StMsgQueue>        myMsgQueue;      //!< messages queue
+    const StMIMEList myMimeList;
+    const StMIMEList myVideoMimeList;
+
+    std::shared_ptr<StThread>          myThread;        //!< main loop thread
+    std::shared_ptr<StResourceManager> myResMgr;        //!< resource manager
+    std::shared_ptr<StLangMap>         myLangMap;       //!< translations dictionary
+    std::shared_ptr<StPlayList>        myPlayList;      //!< play list
+    mutable StMutex                    myLock;          //!< lock to access not thread-safe properties
+    StCondition                        myLoadNextEvent;
+    StFormat                           myStFormatByUser;//!< target source format (auto-detect by default)
+    GLint                              myMaxTexDim;     //!< value for GL_MAX_TEXTURE_SIZE
+    std::shared_ptr<StGLTextureQueue>  myTextureQueue;  //!< decoded frames queue
+    std::shared_ptr<StImageInfo>       myImgInfo;       //!< info about currently loaded image
+    std::shared_ptr<StImageInfo>       myInfoToSave;    //!< modified info to be saved
+    std::shared_ptr<StMsgQueue>        myMsgQueue;      //!< messages queue
 
     volatile StImageFile::ImageClass myImageLib;
     volatile Action            myAction;
     volatile bool              myIsTheaterMode;  //!< flag indicating theater mode
-    volatile bool              myToStickPano360; //!< stick to panorama 360 mode
-    volatile bool              myToFlipCubeZ6x1; //!< flip Z within 6x1 cubemap input
-    volatile bool              myToFlipCubeZ3x2; //!< flip Z within 3x2 cubemap input
-    volatile bool              myToSwapJps;      //!< read JPS as Left/Right instead of Right/Left
 
         private: //! @name no copies, please

_service:obs_scm:sview-26.obscpio/StImageViewer/StImageOpenDialog.cpp Changed

_service:obs_scm:sview-26.obscpio/StImageViewer/StImageViewer.cpp Changed

@@ -19,7 +19,6 @@
 #include "StImageViewer.h"
 
 #include "StImageOpenDialog.h"
-#include "StImagePluginInfo.h"
 #include "StImageViewerStrings.h"
 
 #include <StGL/StGLContext.h>
@@ -50,32 +49,32 @@
 
 namespace {
 
-    static const char ST_SETTING_LAST_FOLDER = "lastFolder";
-    static const char ST_SETTING_RECENT_L    = "recentL";
-    static const char ST_SETTING_RECENT_R    = "recentR";
-    static const char ST_SETTING_COMPRESS    = "toCompress";
-    static const char ST_SETTING_ESCAPENOQUIT= "escNoQuit";
+    static constexpr char ST_SETTING_LAST_FOLDER = "lastFolder";
+    static constexpr char ST_SETTING_RECENT_L    = "recentL";
+    static constexpr char ST_SETTING_RECENT_R    = "recentR";
+    static constexpr char ST_SETTING_COMPRESS    = "toCompress";
+    static constexpr char ST_SETTING_ESCAPENOQUIT= "escNoQuit";
 
-    static const char ST_SETTING_SLIDESHOW   = "slideshow";
-    static const char ST_SETTING_VIEWMODE    = "viewMode";
-    static const char ST_SETTING_GAMMA       = "viewGamma";
-    static const char ST_SETTING_BRIGHTNESS  = "viewBrightness";
-    static const char ST_SETTING_SATURATION  = "viewSaturation";
-    static const char ST_SETTING_SEP_DX      = "viewSepDX";
-    static const char ST_SETTING_SEP_DY      = "viewSepDY";
-    static const char ST_SETTING_SEP_ROT     = "viewSepRot";
-    static const char ST_SETTING_IMAGELIB    = "imageLib";
+    static constexpr char ST_SETTING_SLIDESHOW   = "slideshow";
+    static constexpr char ST_SETTING_VIEWMODE    = "viewMode";
+    static constexpr char ST_SETTING_GAMMA       = "viewGamma";
+    static constexpr char ST_SETTING_BRIGHTNESS  = "viewBrightness";
+    static constexpr char ST_SETTING_SATURATION  = "viewSaturation";
+    static constexpr char ST_SETTING_SEP_DX      = "viewSepDX";
+    static constexpr char ST_SETTING_SEP_DY      = "viewSepDY";
+    static constexpr char ST_SETTING_SEP_ROT     = "viewSepRot";
+    static constexpr char ST_SETTING_IMAGELIB    = "imageLib";
 
-    static const char ST_ARGUMENT_FILE_LEFT  = "left";
-    static const char ST_ARGUMENT_FILE_RIGHT = "right";
-    static const char ST_ARGUMENT_FILE_LAST  = "last";
-    static const char ST_ARGUMENT_FILE_DEMO  = "demo";
+    static constexpr char ST_ARGUMENT_FILE_LEFT  = "left";
+    static constexpr char ST_ARGUMENT_FILE_RIGHT = "right";
+    static constexpr char ST_ARGUMENT_FILE_LAST  = "last";
+    static constexpr char ST_ARGUMENT_FILE_DEMO  = "demo";
 
-    static const char ST_ARGUMENT_MONITOR    = "monitorId";
-    static const char ST_ARGUMENT_WINLEFT    = "windowLeft";
-    static const char ST_ARGUMENT_WINTOP     = "windowTop";
-    static const char ST_ARGUMENT_WINWIDTH   = "windowWidth";
-    static const char ST_ARGUMENT_WINHEIGHT  = "windowHeight";
+    static constexpr char ST_ARGUMENT_MONITOR    = "monitorId";
+    static constexpr char ST_ARGUMENT_WINLEFT    = "windowLeft";
+    static constexpr char ST_ARGUMENT_WINTOP     = "windowTop";
+    static constexpr char ST_ARGUMENT_WINWIDTH   = "windowWidth";
+    static constexpr char ST_ARGUMENT_WINHEIGHT  = "windowHeight";
 
 }
 
@@ -106,7 +105,15 @@
     params.ToShowPlayList->setName(tr(PLAYLIST));
     params.ToShowAdjustImage->setName(tr(MENU_VIEW_IMAGE_ADJUST));
     params.ToSwapJPS->setName(tr(OPTION_SWAP_JPS));
+    params.ToSaveCrossEyed->setName(tr(OPTION_SAVE_JPS_CROSSEYED));
     params.ToStickPanorama->setName(tr(MENU_VIEW_STICK_PANORAMA360));
+    params.LastPanoramaMode->defineOption(StViewSurface_Plain,      stCString("plain"));
+    params.LastPanoramaMode->defineOption(StViewSurface_Theater,    stCString("theater"));
+    params.LastPanoramaMode->defineOption(StViewSurface_Cubemap,    stCString("cubemap"));
+    params.LastPanoramaMode->defineOption(StViewSurface_Sphere,     stCString("sphere"));
+    params.LastPanoramaMode->defineOption(StViewSurface_Hemisphere, stCString("hemisphere"));
+    params.LastPanoramaMode->defineOption(StViewSurface_Cylinder,   stCString("cylinder"));
+    params.LastPanoramaMode->defineOption(StViewSurface_CubemapEAC, stCString("cubemapeac"));
     params.ToFlipCubeZ6x1->setName(tr(MENU_VIEW_FLIPZ_CUBE6x1));
     params.ToFlipCubeZ3x2->setName(tr(MENU_VIEW_FLIPZ_CUBE3x2));
     params.ToTrackHead->setName(tr(MENU_VIEW_TRACK_HEAD));
@@ -128,12 +135,12 @@
     myLangMap->params.language->setName(tr(MENU_HELP_LANGS));
 }
 
-StImageViewer::StImageViewer(const StHandle<StResourceManager>& theResMgr,
+StImageViewer::StImageViewer(const std::shared_ptr<StResourceManager>& theResMgr,
                              const StNativeWin_t                theParentWin,
-                             const StHandle<StOpenInfo>&        theOpenInfo,
+                             const std::shared_ptr<StOpenInfo>& theOpenInfo,
                              const StString&                    theAppName)
 : StApplication(theResMgr, theParentWin, theOpenInfo),
-  myPlayList(new StPlayList(1, false)),
+  myPlayList(std::make_shared<StPlayList>(1, false)),
   myAppName(!theAppName.isEmpty() ? theAppName : ST_DRAWER_PLUGIN_NAME),
   myEventLoaded(false),
   //
@@ -143,9 +150,9 @@
   myToSaveSrcFormat(false),
   myEscNoQuit(false),
   myToCheckPoorOrient(true) {
-    mySettings = new StSettings(myResMgr, myAppName);
-    myLangMap  = new StTranslations(myResMgr, StImageViewer::ST_DRAWER_PLUGIN_NAME);
-    myOpenDialog = new StImageOpenDialog(this);
+    mySettings = std::make_shared<StSettings>(myResMgr, myAppName);
+    myLangMap  = std::make_shared<StTranslations>(myResMgr, StImageViewer::ST_DRAWER_PLUGIN_NAME);
+    myOpenDialog = std::make_shared<StImageOpenDialog>(this);
     StImageViewerStrings::loadDefaults(*myLangMap);
     myLangMap->params.language->signals.onChanged += stSlot(this, &StImageViewer::doChangeLanguage);
 
@@ -175,12 +182,12 @@
     params.ToShowAdjustImage->signals.onChanged = stSlot(this, &StImageViewer::doShowAdjustImage);
     params.ToSwapJPS = new StBoolParamNamed(false, stCString("toSwapJPS"));
     params.ToSwapJPS->signals.onChanged = stSlot(this, &StImageViewer::doChangeSwapJPS);
+    params.ToSaveCrossEyed = new StBoolParamNamed(true, stCString("toSaveCrossEyed"));
     params.ToStickPanorama = new StBoolParamNamed(false, stCString("toStickPano360"));
     params.ToStickPanorama->signals.onChanged = stSlot(this, &StImageViewer::doChangeStickPano360);
+    params.LastPanoramaMode = new StEnumParam(StViewSurface_Sphere, stCString("lastPanoMode"));
     params.ToFlipCubeZ6x1= new StBoolParamNamed(true,  stCString("toFlipCube6x1"));
-    params.ToFlipCubeZ6x1->signals.onChanged = stSlot(this, &StImageViewer::doChangeFlipCubeZ);
     params.ToFlipCubeZ3x2= new StBoolParamNamed(false, stCString("toFlipCube3x2"));
-    params.ToFlipCubeZ3x2->signals.onChanged = stSlot(this, &StImageViewer::doChangeFlipCubeZ);
     params.ToTrackHead   = new StBoolParamNamed(true,  stCString("toTrackHead"));
     params.ToShowFps     = new StBoolParamNamed(false, stCString("toShowFps"));
     params.ToShowMenu    = new StBoolParamNamed(true,  stCString("toShowMenu"));
@@ -225,7 +232,9 @@
     mySettings->loadParam (params.LastUpdateDay);
     mySettings->loadParam (params.CheckUpdatesDays);
     mySettings->loadParam (params.ToSwapJPS);
+    mySettings->loadParam (params.ToSaveCrossEyed);
     mySettings->loadParam (params.ToStickPanorama);
+    mySettings->loadParam (params.LastPanoramaMode);
     mySettings->loadParam (params.ToFlipCubeZ6x1);
     mySettings->loadParam (params.ToFlipCubeZ3x2);
     myToCheckPoorOrient = !mySettings->loadParam(params.ToTrackHead);
@@ -245,16 +254,16 @@
     params.IsShuffle->signals.onChanged.connect(this, &StImageViewer::doSwitchShuffle);
 
 #if defined(__ANDROID__)
-    addRenderer(new StOutInterlace  (myResMgr, theParentWin));
-    addRenderer(new StOutAnaglyph   (myResMgr, theParentWin));
-    addRenderer(new StOutDistorted  (myResMgr, theParentWin));
+    addRenderer(std::make_shared<StOutInterlace>  (myResMgr, theParentWin));
+    addRenderer(std::make_shared<StOutAnaglyph>   (myResMgr, theParentWin));
+    addRenderer(std::make_shared<StOutDistorted>  (myResMgr, theParentWin));
 #else
-    addRenderer(new StOutAnaglyph   (myResMgr, theParentWin));
-    addRenderer(new StOutDual       (myResMgr, theParentWin));
-    addRenderer(new StOutIZ3D       (myResMgr, theParentWin));
-    addRenderer(new StOutInterlace  (myResMgr, theParentWin));
-    addRenderer(new StOutDistorted  (myResMgr, theParentWin));
-    addRenderer(new StOutPageFlipExt(myResMgr, theParentWin));
+    addRenderer(std::make_shared<StOutAnaglyph>   (myResMgr, theParentWin));
+    addRenderer(std::make_shared<StOutDual>       (myResMgr, theParentWin));
+    addRenderer(std::make_shared<StOutIZ3D>       (myResMgr, theParentWin));
+    addRenderer(std::make_shared<StOutInterlace>  (myResMgr, theParentWin));
+    addRenderer(std::make_shared<StOutDistorted>  (myResMgr, theParentWin));
+    addRenderer(std::make_shared<StOutPageFlipExt>(myResMgr, theParentWin));
 #endif
 
     // no need in Depth buffer
@@ -264,8 +273,8 @@
         StWinAttr_GlStencilSize, (StWinAttr )0,
         StWinAttr_NULL
     };
-    for(size_t aRendIter = 0; aRendIter < myRenderers.size(); ++aRendIter) {
-        StHandle<StWindow>& aRend = myRenderersaRendIter;
+    for (size_t aRendIter = 0; aRendIter < myRenderers.size(); ++aRendIter) {
+        std::shared_ptr<StWindow>& aRend = myRenderersaRendIter;
         aRend->setAttributes(anAttribs);
     }
 
@@ -404,8 +413,8 @@
 }
 
 bool StImageViewer::resetDevice() {
-    if(myGUI.isNull()
-    || myLoader.isNull()) {
+    if (myGUI.get() == nullptr
+     || myLoader.get() == nullptr) {
         return init();
     }
 
@@ -414,12 +423,12 @@
 
     releaseDevice();
     myWindow->close();
-    myWindow.nullify();
+    myWindow.reset();
     return open();
 }
 
 void StImageViewer::saveGuiParams() {
-    if(myGUI.isNull()) {
+    if (myGUI.get() == nullptr) {
         return;
     }
 
@@ -440,7 +449,7 @@
 
 void StImageViewer::saveAllParams() {
     saveGuiParams();
-    if(!myGUI.isNull()) {
+    if (myGUI.get() != nullptr) {
         mySettings->saveParam (params.ExitOnEscape);
         mySettings->saveParam (params.ScaleAdjust);
         mySettings->saveParam (params.ScaleHiDPI2X);
@@ -449,7 +458,9 @@
         mySettings->saveParam(params.CheckUpdatesDays);
         mySettings->saveString(ST_SETTING_IMAGELIB,  StImageFile::imgLibToString(params.imageLib));
         mySettings->saveParam (params.ToSwapJPS);
+        mySettings->saveParam (params.ToSaveCrossEyed);
         mySettings->saveParam (params.ToStickPanorama);
+        mySettings->saveParam (params.LastPanoramaMode);
         mySettings->saveParam (params.ToFlipCubeZ6x1);
         mySettings->saveParam (params.ToFlipCubeZ3x2);
         mySettings->saveParam (params.ToTrackHead);
@@ -476,9 +487,9 @@
     }
 
     StString aLastL, aLastR;
-    StHandle<StFileNode> aFile = myPlayList->getCurrentFile();
-    if((params.ToSaveRecent->getValue() || params.ToOpenLast->getValue())
-    && !aFile.isNull()) {
+    std::shared_ptr<StFileNode> aFile = myPlayList->getCurrentFile();
+    if ((params.ToSaveRecent->getValue() || params.ToOpenLast->getValue())
+     && aFile.get() != nullptr) {
         if(aFile->isEmpty()) {
             aLastL = aFile->getPath();
         } else if(aFile->size() == 2) {
@@ -488,10 +499,10 @@
     }
 
     // skip temporary URLs
-    if(StFileNode::isContentProtocolPath(aLastL)) {
+    if (StFileNode::isContentProtocolPath(aLastL)) {
         aLastL.clear();
         aLastR.clear();
-    } else if(StFileNode::isContentProtocolPath(aLastR)) {
+    } else if (StFileNode::isContentProtocolPath(aLastR)) {
         aLastR.clear();
     }
 
@@ -505,28 +516,28 @@
 
     // release GUI data and GL resources before closing the window
     myKeyActions.clear();
-    myGUI.nullify();
-    myContext.nullify();
+    myGUI.reset();
+    myContext.reset();
 }
 
 StImageViewer::~StImageViewer() {
-    myUpdates.nullify();
+    myUpdates.reset();
     releaseDevice();
     // wait image loading thread to quit and release resources
-    myLoader.nullify();
+    myLoader.reset();
 }
 
 bool StImageViewer::createGui() {
-    if(!myGUI.isNull()) {
+    if (myGUI.get() != nullptr) {
         saveGuiParams();
-        myGUI.nullify();
+        myGUI.reset();
         myKeyActions.clear();
     }
 
     // create the GUI with default values
     params.ScaleHiDPI->setValue(myWindow->getScaleFactor());
-    myGUI = new StImageViewerGUI(this, myWindow.access(), myLangMap.access(), myPlayList,
-                                 myLoader.isNull() ? NULL : myLoader->getTextureQueue());
+    myGUI = std::make_shared<StImageViewerGUI>(this, myWindow.get(), myLangMap.get(), myPlayList,
+                                               myLoader.get() == nullptr ? nullptr : myLoader->getTextureQueue());
     myGUI->setContext(myContext);
     StGLDeviceCaps aDevCaps = myContext->getDeviceCaps();
     // better slow-down GPU memory copy but avoid extra memory usage
@@ -570,7 +581,7 @@
     if(!myGUI->myImage->stglInit()) {
         myMsgQueue->pushError(stCString("Image Viewer - critical error:\nFrame region initialization failed!"));
         myMsgQueue->popAll();
-        myGUI.nullify();
+        myGUI.reset();
         return false;
     }
     myGUI->stglInit();
@@ -598,9 +609,8 @@
 }
 
 bool StImageViewer::init() {
-    const bool isReset = !myLoader.isNull();
-    if(!myContext.isNull()
-    && !myGUI.isNull()) {
+    const bool isReset = myLoader.get() != nullptr;
+    if (myContext.get() != nullptr && myGUI.get() != nullptr) {
         return true;
     }
 
@@ -625,7 +635,7 @@
     if(!createGui()) {
         myMsgQueue->pushError(stCString("Image Viewer - critical error:\nFrame region initialization failed!"));
         myMsgQueue->popAll();
-        myGUI.nullify();
+        myGUI.reset();
         return false;
     }
 
@@ -641,14 +651,16 @@
     StString anImgLibStr;
     mySettings->loadString(ST_SETTING_IMAGELIB, anImgLibStr);
     params.imageLib = StImageFile::imgLibFromString(anImgLibStr);
-    myLoader = new StImageLoader(params.imageLib, myResMgr, myMsgQueue, myLangMap, myPlayList,
-                                 myGUI->myImage->getTextureQueue(), myContext->getMaxTextureSize());
+    myLoader = std::make_shared<StImageLoader>(params.imageLib, myResMgr, myMsgQueue, myLangMap, myPlayList,
+                                               myGUI->myImage->getTextureQueue(), myContext->getMaxTextureSize());
     myLoader->signals.onLoaded.connect(this, &StImageViewer::doLoaded);
+    myLoader->params.ToSwapJPS = params.ToSwapJPS;
+    myLoader->params.ToSaveCrossEyed = params.ToSaveCrossEyed;
+    myLoader->params.ToStickPanorama = params.ToStickPanorama;
+    myLoader->params.LastPanoramaMode = params.LastPanoramaMode;
+    myLoader->params.ToFlipCubeZ6x1 = params.ToFlipCubeZ6x1;
+    myLoader->params.ToFlipCubeZ3x2 = params.ToFlipCubeZ3x2;
     myLoader->setCompressMemory(myWindow->isMobile());
-    myLoader->setSwapJPS(params.ToSwapJPS->getValue());
-    myLoader->setStickPano360(params.ToStickPanorama->getValue());
-    myLoader->setFlipCubeZ6x1(params.ToFlipCubeZ6x1->getValue());
-    myLoader->setFlipCubeZ3x2(params.ToFlipCubeZ3x2->getValue());
 
     // load this parameter AFTER image thread creation
     mySettings->loadParam(params.SrcStereoFormat);
@@ -663,7 +675,7 @@
     const int aNbDays = StCheckUpdates::getNbDaysFromInterval((StCheckUpdates::UpdateInteval )params.CheckUpdatesDays->getValue());
     if(aNbDays > 0
     && std::abs(aCurrentDayInYear - params.LastUpdateDay->getValue()) > aNbDays) {
-        myUpdates = new StCheckUpdates();
+        myUpdates = std::make_shared<StCheckUpdates>();
         myUpdates->init();
         params.LastUpdateDay->setValue(aCurrentDayInYear);
         mySettings->saveParam(params.LastUpdateDay);
@@ -759,7 +771,7 @@
 }
 
 bool StImageViewer::open() {
-    const bool isReset = !mySwitchTo.isNull();
+    const bool isReset = mySwitchTo.get() != nullptr;
     if(!StApplication::open()
     || !init()) {
         myMsgQueue->popAll();
@@ -844,7 +856,7 @@
 }
 
 void StImageViewer::doResize(const StSizeEvent& ) {
-    if(myGUI.isNull()) {
+    if (myGUI.get() == nullptr) {
         return;
     }
 
@@ -865,7 +877,7 @@
 }
 
 void StImageViewer::doImageAdjustReset(const size_t ) {
-    if(myGUI.isNull()) {
+    if (myGUI.get() == nullptr) {
         return;
     }
 
@@ -875,27 +887,27 @@
 }
 
 void StImageViewer::doSaveImageInfoBegin(const size_t ) {
-    if(!myFileInfo.isNull()) {
+    if (myFileInfo.get() != nullptr) {
         return; // already opened
     }
 
-    StHandle<StFileNode>     aFileNode;
-    StHandle<StStereoParams> aParams;
+    std::shared_ptr<StFileNode>     aFileNode;
+    std::shared_ptr<StStereoParams> aParams;
     if(!getCurrentFile(aFileNode, aParams, myFileInfo)
-    ||  myFileInfo.isNull()) {
+    ||  myFileInfo.get() == nullptr) {
         myMsgQueue->pushInfo(myLangMap->getValue(StImageViewerStrings::DIALOG_FILE_NOINFO));
-        myFileInfo.nullify();
+        myFileInfo.reset();
         return;
     } else if(!myFileInfo->IsSavable) {
         myMsgQueue->pushInfo(myLangMap->getValue(StImageViewerStrings::DIALOG_SAVE_INFO_UNSUPPORTED));
-        myFileInfo.nullify();
+        myFileInfo.reset();
         return;
     }
 
     const StString aText = myLangMap->getValue(StImageViewerStrings::DIALOG_SAVE_INFO_QUESTION)
                          + "\n" + myFileInfo->Path;
 
-    StInfoDialog* aDialog = new StInfoDialog(this, myGUI.access(), myLangMap->getValue(StImageViewerStrings::DIALOG_SAVE_INFO_TITLE),
+    StInfoDialog* aDialog = new StInfoDialog(this, myGUI.get(), myLangMap->getValue(StImageViewerStrings::DIALOG_SAVE_INFO_TITLE),
                                              myGUI->scale(512), myGUI->scale(256));
     aDialog->setText(aText);
 
@@ -915,14 +927,14 @@
 }
 
 void StImageViewer::doDeleteFileBegin(const size_t ) {
-    //if(!myFileToDelete.isNull()) {
+    //if (myFileToDelete.get() != nullptr) {
     //    return;
     //}
 
     myFileToDelete = myPlayList->getCurrentFile();
-    if(myFileToDelete.isNull()
-    || myFileToDelete->size() != 0) {
-        myFileToDelete.nullify();
+    if (myFileToDelete.get() == nullptr
+     || myFileToDelete->size() != 0) {
+        myFileToDelete.reset();
         return;
     }
 
@@ -931,7 +943,7 @@
                          + (isReadOnly ? "\nWARNING! The file is READ ONLY!" : "")
                          + "\n" + myFileToDelete->getPath();
 
-    StGLMessageBox* aDialog = new StGLMessageBox(myGUI.access(), myLangMap->getValue(StImageViewerStrings::DIALOG_DELETE_FILE_TITLE),
+    StGLMessageBox* aDialog = new StGLMessageBox(myGUI.get(), myLangMap->getValue(StImageViewerStrings::DIALOG_DELETE_FILE_TITLE),
                                                  aText, myGUI->scale(512), myGUI->scale(256));
     aDialog->addButton(myLangMap->getValue(StImageViewerStrings::BUTTON_DELETE), true)->signals.onBtnClick += stSlot(this, &StImageViewer::doDeleteFileEnd);
     aDialog->addButton(myLangMap->getValue(StImageViewerStrings::BUTTON_CANCEL), false);
@@ -939,8 +951,8 @@
 }
 
 void StImageViewer::doDeleteFileEnd(const size_t ) {
-    if(myFileToDelete.isNull()
-    || myLoader.isNull()) {
+    if (myFileToDelete.get() == nullptr
+     || myLoader.get() == nullptr) {
         return;
     }
 
@@ -950,11 +962,11 @@
         doUpdateStateLoading();
         myLoader->doLoadNext();
     }
-    myFileToDelete.nullify();
+    myFileToDelete.reset();
 }
 
 void StImageViewer::doKeyDown(const StKeyEvent& theEvent) {
-    if(myGUI.isNull()) {
+    if (myGUI.get() == nullptr) {
         return;
     }
 
@@ -1016,7 +1028,7 @@
 }
 
 void StImageViewer::doKeyHold(const StKeyEvent& theEvent) {
-    if(myGUI.isNull()) {
+    if (myGUI.get() == nullptr) {
         return;
     }
 
@@ -1028,7 +1040,7 @@
 }
 
 void StImageViewer::doKeyUp(const StKeyEvent& theEvent) {
-    if(myGUI.isNull()) {
+    if (myGUI.get() == nullptr) {
         return;
     }
 
@@ -1039,7 +1051,7 @@
 }
 
 void StImageViewer::doMouseDown(const StClickEvent& theEvent) {
-    if(myGUI.isNull()) {
+    if (myGUI.get() == nullptr) {
         return;
     }
 
@@ -1047,7 +1059,7 @@
 }
 
 void StImageViewer::doMouseUp(const StClickEvent& theEvent) {
-    if(myGUI.isNull()) {
+    if (myGUI.get() == nullptr) {
         return;
     }
 
@@ -1058,19 +1070,19 @@
 }
 
 void StImageViewer::doTouch(const StTouchEvent& theEvent) {
-    if(!myGUI.isNull()) {
+    if (myGUI.get() != nullptr) {
         myGUI->doTouch(theEvent);
     }
 }
 
 void StImageViewer::doGesture(const StGestureEvent& theEvent) {
-    if(!myGUI.isNull()) {
+    if (myGUI.get() != nullptr) {
         myGUI->doGesture(theEvent);
     }
 }
 
 void StImageViewer::doScroll(const StScrollEvent& theEvent) {
-    if(myGUI.isNull()) {
+    if (myGUI.get() == nullptr) {
         return;
     }
 
@@ -1091,7 +1103,7 @@
     if(!myPlayList->checkExtension(aFile1)
      && myLoader->getMimeListVideo().checkExtension(StFileNode::getExtension(aFile1))) {
         // redirect to StMoviePlayer
-        myOpenFileOtherApp = new StOpenInfo();
+        myOpenFileOtherApp = std::make_shared<StOpenInfo>();
         StArgumentsMap anArgs;
         anArgs.add(StArgument("in", "video"));
         myOpenFileOtherApp->setArgumentsMap(anArgs);
@@ -1136,7 +1148,7 @@
 }
 
 void StImageViewer::beforeDraw() {
-    if(myGUI.isNull()) {
+    if (myGUI.get() == nullptr) {
         return;
     }
 
@@ -1149,7 +1161,7 @@
             if(!myPlayList->checkExtension(myOpenDialog->getPathLeft())
              && myLoader->getMimeListVideo().checkExtension(StFileNode::getExtension(myOpenDialog->getPathLeft()))) {
                 // redirect to StMoviePlayer
-                myOpenFileOtherApp = new StOpenInfo();
+                myOpenFileOtherApp = std::make_shared<StOpenInfo>();
                 StArgumentsMap anArgs;
                 anArgs.add(StArgument("in", "video"));
                 myOpenFileOtherApp->setArgumentsMap(anArgs);
@@ -1188,7 +1200,7 @@
         doUpdateStateLoaded();
     }
 
-    if(myToCheckUpdates && !myUpdates.isNull() && myUpdates->isInitialized()) {
+    if(myToCheckUpdates && myUpdates.get() != nullptr && myUpdates->isInitialized()) {
         if(myUpdates->isNeedUpdate()) {
             myGUI->showUpdatesNotify();
         }
@@ -1205,7 +1217,7 @@
 }
 
 void StImageViewer::stglDraw(unsigned int theView) {
-    const bool hasCtx = !myContext.isNull() && myContext->isBound();
+    const bool hasCtx = myContext.get() != nullptr && myContext->isBound();
     if(!hasCtx || myWindow->isPaused()) {
         if(theView == ST_DRAW_LEFT
         || theView == ST_DRAW_MONO) {
@@ -1231,7 +1243,7 @@
         myContext->core20fwd->glClear(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT);
     }
 
-    if(myGUI.isNull()) {
+    if (myGUI.get() == nullptr) {
         return;
     }
 
@@ -1247,9 +1259,9 @@
 
         // check for mono state
         bool hasStereoSource = false;
-        StHandle<StStereoParams> aParams = myGUI->myImage->getSource();
-        if(!aParams.isNull()) {
-            hasStereoSource =!aParams->isMono()
+        std::shared_ptr<StStereoParams> aParams = myGUI->myImage->getSource();
+        if (aParams.get() != nullptr) {
+            hasStereoSource = !aParams->isMono()
                            && myGUI->myImage->hasVideoStream()
                            && myGUI->myImage->params.DisplayMode->getValue() == StGLImageRegion::MODE_STEREO;
         }
@@ -1261,7 +1273,7 @@
 }
 
 void StImageViewer::doScaleGui(const int32_t ) {
-    if(myGUI.isNull()) {
+    if (myGUI.get() == nullptr) {
         return;
     }
     myToRecreateMenu = true;
@@ -1272,7 +1284,7 @@
 }
 
 void StImageViewer::doHideSystemBars(const bool ) {
-    if(myWindow.isNull()) {
+    if (myWindow.get() == nullptr) {
         return;
     }
 
@@ -1280,14 +1292,14 @@
 }
 
 void StImageViewer::doScaleHiDPI(const bool ) {
-    if(myGUI.isNull()) {
+    if (myGUI.get() == nullptr) {
         return;
     }
     myToRecreateMenu = true;
 }
 
 void StImageViewer::doSwitchSrcFormat(const int32_t theSrcFormat) {
-    if(myLoader.isNull()) {
+    if (myLoader.get() == nullptr) {
         return;
     }
 
@@ -1299,7 +1311,7 @@
 }
 
 void StImageViewer::doSwitchViewMode(const int32_t theMode) {
-    if(myLoader.isNull()) {
+    if (myLoader.get() == nullptr) {
         return;
     }
 
@@ -1320,112 +1332,104 @@
 }
 
 void StImageViewer::doSetStereoOutput(const size_t theMode) {
-    if(myLoader.isNull()) {
+    if (myLoader.get() == nullptr) {
         return;
     }
     myGUI->myImage->params.DisplayMode->setValue((int32_t )theMode);
 }
 
 void StImageViewer::doTheaterOnOff(const size_t ) {
-    if(myLoader.isNull()) {
+    if (myLoader.get() == nullptr) {
         return;
     }
 
-    myLoader->setTheaterMode(!myLoader->isTheaterMode());
+    const bool newTheaterMode = !myLoader->isTheaterMode();
+    if (params.ToStickPanorama->getValue()) {
+        params.LastPanoramaMode->setValue(newTheaterMode ? StViewSurface_Theater : StViewSurface_Plain);
+    }
+    myLoader->setTheaterMode(newTheaterMode);
     if (!myPlayList->isEmpty()) {
         myLoader->doLoadNext();
     }
 }
 
 void StImageViewer::doPanoramaOnOff(const size_t ) {
-    if(myLoader.isNull()) {
-        return;
-    }
-
-    StHandle<StStereoParams> aParams = myGUI->myImage->getSource();
-    if(aParams.isNull()
-    || aParams->Src1SizeX == 0
-    || aParams->Src1SizeY == 0) {
+    if (myLoader.get() == nullptr) {
         return;
     }
 
-    int aMode = myGUI->myImage->params.ViewMode->getValue();
-    if(aMode != StViewSurface_Plain) {
-        myGUI->myImage->params.ViewMode->setValue(StViewSurface_Plain);
+    std::shared_ptr<StStereoParams> aParams = myGUI->myImage->getSource();
+    if (aParams.get() == nullptr
+     || aParams->Src1SizeX == 0
+     || aParams->Src1SizeY == 0) {
         return;
     }
 
-    StPanorama aPano = st::probePanorama(aParams->StereoFormat,
-                                         aParams->Src1SizeX, aParams->Src1SizeY,
-                                         aParams->Src2SizeX, aParams->Src2SizeY);
-    if(aPano == StPanorama_OFF) {
-        size_t aSizeX = aParams->Src1SizeX;
-        size_t aSizeY = aParams->Src1SizeY;
-        StPairRatio aPairRatio = st::formatToPairRatio(aParams->StereoFormat);
-        if(aPairRatio == StPairRatio_HalfWidth) {
-            aSizeX /= 2;
-        } else if(aPairRatio == StPairRatio_HalfHeight) {
-            aSizeY /= 2;
-        }
-        if(aSizeX > 8 && aSizeY > 8) {
-            if(double(aSizeX)/double(aSizeY) > 3.5) {
-                myGUI->myImage->params.ViewMode->setValue(StViewSurface_Cylinder);
-                return;
+    const int anOldMode = myGUI->myImage->params.ViewMode->getValue();
+    StViewSurface aNewMode = StViewSurface_Plain;
+    if (anOldMode == StViewSurface_Plain) {
+        StPanorama aPano = st::probePanorama(aParams->StereoFormat,
+                                             aParams->Src1SizeX, aParams->Src1SizeY,
+                                             aParams->Src2SizeX, aParams->Src2SizeY);
+        if (aPano == StPanorama_OFF) {
+            size_t aSizeX = aParams->Src1SizeX;
+            size_t aSizeY = aParams->Src1SizeY;
+            StPairRatio aPairRatio = st::formatToPairRatio(aParams->StereoFormat);
+            if (aPairRatio == StPairRatio_HalfWidth) {
+                aSizeX /= 2;
+            } else if (aPairRatio == StPairRatio_HalfHeight) {
+                aSizeY /= 2;
+            }
+            if (aSizeX > 8 && aSizeY > 8) {
+                if (double(aSizeX)/double(aSizeY) > 3.5) {
+                    myGUI->myImage->params.ViewMode->setValue(StViewSurface_Cylinder);
+                    return;
+                }
             }
         }
+        aNewMode = StStereoParams::getViewSurfaceForPanoramaSource(aPano, true);
     }
-    myGUI->myImage->params.ViewMode->setValue(StStereoParams::getViewSurfaceForPanoramaSource(aPano, true));
+    myGUI->myImage->params.ViewMode->setValue(aNewMode);
+    params.LastPanoramaMode->setValue(aNewMode);
 }
 
 void StImageViewer::doChangeSwapJPS(const bool ) {
-    if(!myLoader.isNull()) {
-        myLoader->setSwapJPS(params.ToSwapJPS->getValue());
-        StHandle<StStereoParams> aParams = myGUI->myImage->getSource();
-        if(!aParams.isNull()
-        && !myPlayList->isEmpty()) {
-            StString aCurrFile = myPlayList->getCurrentTitle();
-            aCurrFile.toLowerCase();
-            if(aCurrFile.isEndsWith(stCString(".jps"))
-            || aCurrFile.isEndsWith(stCString(".pps"))) {
-                myLoader->doLoadNext();
-            }
+    if (myLoader.get() == nullptr)
+        return;
+
+    std::shared_ptr<StStereoParams> aParams = myGUI->myImage->getSource();
+    if (aParams.get() != nullptr && !myPlayList->isEmpty()) {
+        StString aCurrFile = myPlayList->getCurrentTitle();
+        aCurrFile.toLowerCase();
+        if(aCurrFile.isEndsWith(stCString(".jps"))
+        || aCurrFile.isEndsWith(stCString(".pps"))) {
+            myLoader->doLoadNext();
         }
     }
 }
 
 void StImageViewer::doChangeStickPano360(const bool ) {
-    if(myLoader.isNull()) {
+    if (myLoader.get() == nullptr)
         return;
-    }
 
-    myLoader->setStickPano360(params.ToStickPanorama->getValue());
-    if(!params.ToStickPanorama->getValue()) {
+    if (!params.ToStickPanorama->getValue()) {
         return;
     }
 
-    StHandle<StStereoParams> aParams = myGUI->myImage->getSource();
-    if(!aParams.isNull()
+    std::shared_ptr<StStereoParams> aParams = myGUI->myImage->getSource();
+    if (aParams.get() != nullptr
     &&  myGUI->myImage->params.ViewMode->getValue() == StViewSurface_Plain
     && !myPlayList->isEmpty()) {
         myLoader->doLoadNext();
     }
 }
 
-void StImageViewer::doChangeFlipCubeZ(const bool ) {
-    if(myLoader.isNull()) {
-        return;
-    }
-
-    myLoader->setFlipCubeZ6x1(params.ToFlipCubeZ6x1->getValue());
-    myLoader->setFlipCubeZ3x2(params.ToFlipCubeZ3x2->getValue());
-}
-
 void StImageViewer::doOpen1FileFromGui(StHandle<StString> thePath) {
     myOpenDialog->setPaths(*thePath, "");
 }
 
 void StImageViewer::doOpen1FileAction(const size_t ) {
-    if(!myGUI.isNull() && (myWindow->isFullScreen() || myGUI->isMobile())) {
+    if (myGUI.get() != nullptr && (myWindow->isFullScreen() || myGUI->isMobile())) {
         myGUI->doOpenFile(0);
         return;
     }
@@ -1456,18 +1460,18 @@
 }
 
 void StImageViewer::doAboutImage(const size_t ) {
-    if(!myGUI.isNull()) {
+    if (myGUI.get() != nullptr) {
         myGUI->doAboutImage(0);
     }
 }
 
 void StImageViewer::doSaveImageInfo(const size_t theToSave) {
-    if(!myGUI.isNull()
-    && !myFileInfo.isNull()
-    &&  theToSave == 1) {
+    if (myGUI.get() != nullptr
+     && myFileInfo.get() != nullptr
+     && theToSave == 1) {
         myLoader->doSaveInfo(myFileInfo);
     }
-    myFileInfo.nullify();
+    myFileInfo.reset();
 }
 
 void StImageViewer::doListFirst(const size_t ) {
@@ -1492,11 +1496,11 @@
 }
 
 void StImageViewer::doShowHideGUI(const size_t ) {
-    const bool toShow = !params.ToShowMenu->getValue() || (!myGUI.isNull() && !myGUI->isVisibleGUI());
+    const bool toShow = !params.ToShowMenu->getValue() || (myGUI.get() != nullptr && !myGUI->isVisibleGUI());
     params.ToShowMenu->setValue(toShow);
     params.ToShowTopbar->setValue(toShow);
     params.ToShowBottom->setValue(toShow);
-    if(toShow && !myGUI.isNull()) {
+    if(toShow && myGUI.get() != nullptr) {
         myGUI->setVisibility(myWindow->getMousePos(), false, true);
     }
 }
@@ -1531,7 +1535,7 @@
 }
 
 void StImageViewer::doFullscreen(const bool theIsFullscreen) {
-    if(!myWindow.isNull()) {
+    if (myWindow.get() != nullptr) {
         myWindow->setAttribute(StWinAttr_ExclusiveFullScreen, params.IsExclusiveFullScreen->getValue());
         myWindow->setFullScreen(theIsFullscreen);
     }
@@ -1542,8 +1546,8 @@
 }
 
 void StImageViewer::doShowPlayList(const bool theToShow) {
-    if(myGUI.isNull()
-    || myGUI->myPlayList == NULL) {
+    if (myGUI.get() == nullptr
+     || myGUI->myPlayList == nullptr) {
         return;
     }
 
@@ -1551,8 +1555,8 @@
 }
 
 void StImageViewer::doShowAdjustImage(const bool theToShow) {
-    if(myGUI.isNull()
-    || myGUI->myAdjustOverlay == NULL) {
+    if (myGUI.get() == nullptr
+     || myGUI->myAdjustOverlay == nullptr) {
         return;
     }
 
@@ -1560,7 +1564,7 @@
 }
 
 void StImageViewer::doFileNext() {
-    if(myLoader.isNull()) {
+    if (myLoader.get() == nullptr) {
         return;
     }
 
@@ -1568,10 +1572,10 @@
     doUpdateStateLoading();
 }
 
-bool StImageViewer::getCurrentFile(StHandle<StFileNode>&     theFileNode,
-                                   StHandle<StStereoParams>& theParams,
-                                   StHandle<StImageInfo>&    theInfo) {
-    theInfo.nullify();
+bool StImageViewer::getCurrentFile(std::shared_ptr<StFileNode>&     theFileNode,
+                                   std::shared_ptr<StStereoParams>& theParams,
+                                   std::shared_ptr<StImageInfo>&    theInfo) {
+    theInfo.reset();
     if(!myPlayList->getCurrentFile(theFileNode, theParams)) {
         return false;
     }

_service:obs_scm:sview-26.obscpio/StImageViewer/StImageViewer.h Changed

@@ -45,9 +45,9 @@
     /**
      * Main constructor.
      */
-    ST_CPPEXPORT StImageViewer(const StHandle<StResourceManager>& theResMgr,
-                               const StNativeWin_t                theParentWin = (StNativeWin_t )NULL,
-                               const StHandle<StOpenInfo>&        theOpenInfo  = NULL,
+    ST_CPPEXPORT StImageViewer(const std::shared_ptr<StResourceManager>& theResMgr,
+                               const StNativeWin_t                theParentWin = (StNativeWin_t )nullptr,
+                               const std::shared_ptr<StOpenInfo>& theOpenInfo  = std::shared_ptr<StOpenInfo>(),
                                const StString&                    theAppName   = "");
 
     /**
@@ -134,7 +134,9 @@
         StHandle<StInt32ParamNamed>   LastUpdateDay;    //!< the last time update has been checked
         StHandle<StInt32ParamNamed>   SrcStereoFormat;  //!< source format
         StHandle<StBoolParamNamed>    ToSwapJPS;        //!< swap JPS views order
-        StHandle<StBoolParamNamed>    ToStickPanorama;  //!< force panorama input for all files
+        StHandle<StBoolParamNamed>    ToSaveCrossEyed;  //!< save JPS views as cross-eyed or parallel pair
+        StHandle<StBoolParamNamed>    ToStickPanorama;  //!< persist last selected panorama mode
+        StHandle<StEnumParam>         LastPanoramaMode; //!< last selected panorama mode
         StHandle<StBoolParamNamed>    ToFlipCubeZ6x1;   //!< flip Z coordinate within Cube map 6x1
         StHandle<StBoolParamNamed>    ToFlipCubeZ3x2;   //!< flip Z coordinate within Cube map 3x2
         StHandle<StBoolParamNamed>    ToTrackHead;      //!< enable/disable head-tracking
@@ -165,7 +167,7 @@
      * Return true if mobile UI should be enabled considering user option and window margins.
      */
     ST_LOCAL bool toUseMobileUI() const {
-        return toUseMobileUI(!myWindow.isNull() ? myWindow->getMargins() : StMarginsI());
+        return toUseMobileUI(myWindow.get() != nullptr ? myWindow->getMargins() : StMarginsI());
     }
 
     /**
@@ -179,9 +181,9 @@
     /**
      * Retrieve current playlist item.
      */
-    ST_LOCAL bool getCurrentFile(StHandle<StFileNode>&     theFileNode,
-                                 StHandle<StStereoParams>& theParams,
-                                 StHandle<StImageInfo>&    theInfo);
+    ST_LOCAL bool getCurrentFile(std::shared_ptr<StFileNode>& theFileNode,
+                                 std::shared_ptr<StStereoParams>& theParams,
+                                 std::shared_ptr<StImageInfo>& theInfo);
 
         private: //! @name private callback Slots
 
@@ -199,7 +201,6 @@
     ST_LOCAL void doTheaterOnOff(const size_t );
     ST_LOCAL void doChangeSwapJPS(const bool );
     ST_LOCAL void doChangeStickPano360(const bool );
-    ST_LOCAL void doChangeFlipCubeZ(const bool );
     ST_LOCAL void doShowPlayList(const bool theToShow);
     ST_LOCAL void doShowAdjustImage(const bool theToShow);
     ST_LOCAL void doSwitchShuffle(const bool theShuffleOn);
@@ -266,15 +267,15 @@
 
         private: //! @name private fields
 
-    StHandle<StGLContext>       myContext;
-    StHandle<StSettings>        mySettings;        //!< settings manager for Image Viewer plugin
-    StHandle<StPlayList>        myPlayList;        //!< play list
-    StHandle<StImageViewerGUI>  myGUI;             //!< GUI root widget
-    StHandle<StImageLoader>     myLoader;          //!< main image loader class
-    StHandle<StCheckUpdates>    myUpdates;         //!< check updates utility
-    StHandle<StFileNode>        myFileToDelete;    //!< file node for removal
-    StHandle<StImageInfo>       myFileInfo;        //!< file info for opened dialog
-    StHandle<StImageOpenDialog> myOpenDialog;      //!< file open dialog
+    std::shared_ptr<StGLContext>       myContext;
+    std::shared_ptr<StSettings>        mySettings;        //!< settings manager for Image Viewer plugin
+    std::shared_ptr<StPlayList>        myPlayList;        //!< play list
+    std::shared_ptr<StImageViewerGUI>  myGUI;             //!< GUI root widget
+    std::shared_ptr<StImageLoader>     myLoader;          //!< main image loader class
+    std::shared_ptr<StCheckUpdates>    myUpdates;         //!< check updates utility
+    std::shared_ptr<StFileNode>        myFileToDelete;    //!< file node for removal
+    std::shared_ptr<StImageInfo>       myFileInfo;        //!< file info for opened dialog
+    std::shared_ptr<StImageOpenDialog> myOpenDialog;      //!< file open dialog
     StString                    myAppName;         //!< name of customized application
 
     StCondition                 myEventLoaded;     //!< indicate that new file was open

_service:obs_scm:sview-26.obscpio/StImageViewer/StImageViewerGUI.cpp Changed

@@ -56,12 +56,12 @@
 
 namespace {
 
-    static const int DISPL_Y_REGION_UPPER = 32;
-    static const int DISPL_X_REGION_UPPER = 32;
+    static constexpr int DISPL_Y_REGION_UPPER = 32;
+    static constexpr int DISPL_X_REGION_UPPER = 32;
 
-    static const StGLVec3 aBlack (0.0f, 0.0f, 0.0f);
-    static const StGLVec3 aGreen (0.0f, 0.6f, 0.4f);
-    static const StGLVec3 aRed   (1.0f, 0.0f, 0.0f);
+    static constexpr StGLVec3 aBlack (0.0f, 0.0f, 0.0f);
+    static constexpr StGLVec3 aGreen (0.0f, 0.6f, 0.4f);
+    static constexpr StGLVec3 aRed   (1.0f, 0.0f, 0.0f);
 
 }
 
@@ -69,7 +69,7 @@
     myPlugin->doSaveImageInfo(0);
 }
 
-void StImageViewerGUI::createDesktopUI(const StHandle<StPlayList>& thePlayList) {
+void StImageViewerGUI::createDesktopUI(const std::shared_ptr<StPlayList>& thePlayList) {
     if(myPlugin->params.ToShowFps->getValue()) {
         myFpsWidget = new StGLFpsLabel(this);
     }
@@ -286,6 +286,7 @@
         ->signals.onItemClick.connect(myPlugin, &StImageViewer::doSaveImageAs);
     menu->addItem("PNG stereo (*.pns)", size_t(StImageFile::ST_TYPE_PNG))
         ->signals.onItemClick.connect(myPlugin, &StImageViewer::doSaveImageAs);
+    menu->addItem(myPlugin->params.ToSaveCrossEyed);
     return menu;
 }
 
@@ -366,7 +367,7 @@
  */
 StGLMenu* StImageViewerGUI::createDisplayModeMenu() {
     StGLMenu* aMenu = new StGLMenu(this, 0, 0, StGLMenu::MENU_VERTICAL);
-    const StArrayList<StString>& aValuesList = myImage->params.DisplayMode->getValues();
+    const std::vector<StString>& aValuesList = myImage->params.DisplayMode->getValues();
     for(size_t aValIter = 0; aValIter < aValuesList.size(); ++aValIter) {
         aMenu->addItem(aValuesListaValIter, myImage->params.DisplayMode, int32_t(aValIter));
     }
@@ -527,7 +528,7 @@
     StGLMenu* aMenuChangeDevice = new StGLMenu(this, 0, 0, StGLMenu::MENU_VERTICAL);
 
     const StHandle<StEnumParam>& aDevicesEnum = myPlugin->StApplication::params.ActiveDevice;
-    const StArrayList<StString>& aValuesList  = aDevicesEnum->getValues();
+    const std::vector<StString>& aValuesList  = aDevicesEnum->getValues();
     for(size_t aValIter = 0; aValIter < aValuesList.size(); ++aValIter) {
         aMenuChangeDevice->addItem(aValuesListaValIter, aDevicesEnum, int32_t(aValIter));
     }
@@ -539,7 +540,7 @@
     aMenu->addItem(myPlugin->params.ToShowFps);
     aMenu->addItem(myPlugin->params.IsVSyncOn);
 
-    const StHandle<StWindow>& aRend = myPlugin->getMainWindow();
+    const std::shared_ptr<StWindow>& aRend = myPlugin->getMainWindow();
     StParamsList aParams;
     aRend->getOptions(aParams);
     StHandle<StBoolParamNamed> aBool;
@@ -550,7 +551,7 @@
             aMenu->addItem(aBool->getName(), aBool);
         } else if(anEnum.downcastFrom(aParam)) {
             StGLMenu* aChildMenu = new StGLMenu(this, 0, 0, StGLMenu::MENU_VERTICAL);
-            const StArrayList<StString>& aValues = anEnum->getValues();
+            const std::vector<StString>& aValues = anEnum->getValues();
             for(size_t aValIter = 0; aValIter < aValues.size(); ++aValIter) {
                 aChildMenu->addItem(aValuesaValIter, anEnum, int32_t(aValIter));
             }
@@ -598,14 +599,14 @@
 }
 
 void StImageViewerGUI::doAboutImage(const size_t ) {
-    StHandle<StImageInfo>& anExtraInfo = myPlugin->myFileInfo;
-    anExtraInfo.nullify();
-
-    StHandle<StFileNode>     aFileNode;
-    StHandle<StStereoParams> aParams;
-    if(!myPlugin->getCurrentFile(aFileNode, aParams, anExtraInfo)
-    ||  anExtraInfo.isNull()) {
-        anExtraInfo.nullify();
+    std::shared_ptr<StImageInfo>& anExtraInfo = myPlugin->myFileInfo;
+    anExtraInfo.reset();
+
+    std::shared_ptr<StFileNode>     aFileNode;
+    std::shared_ptr<StStereoParams> aParams;
+    if (!myPlugin->getCurrentFile(aFileNode, aParams, anExtraInfo)
+    ||  anExtraInfo.get() == nullptr) {
+        anExtraInfo.reset();
         StGLMessageBox* aMsgBox = new StGLMessageBox(this, tr(DIALOG_FILE_INFO), tr(DIALOG_FILE_NOINFO));
         aMsgBox->addButton(tr(BUTTON_CLOSE), true);
         aMsgBox->stglInit();
@@ -752,14 +753,14 @@
 }
 
 void StImageViewerGUI::doListHotKeys(const size_t ) {
-    const StHandle<StWindow>& aRend = myPlugin->getMainWindow();
+    const std::shared_ptr<StWindow>& aRend = myPlugin->getMainWindow();
     StParamsList aParams;
-    aParams.add(myPlugin->StApplication::params.ActiveDevice);
-    aParams.add(myImage->params.DisplayMode);
+    aParams.push_back(myPlugin->StApplication::params.ActiveDevice);
+    aParams.push_back(myImage->params.DisplayMode);
     aRend->getOptions(aParams);
-    aParams.add(myPlugin->params.ToShowFps);
-    aParams.add(myLangMap->params.language);
-    aParams.add(myPlugin->params.IsMobileUI);
+    aParams.push_back(myPlugin->params.ToShowFps);
+    aParams.push_back(myLangMap->params.language);
+    aParams.push_back(myPlugin->params.IsMobileUI);
 
     const StString aTitle  = tr(MENU_HELP_HOTKEYS);
     StInfoDialog*  aDialog = new StInfoDialog(myPlugin, this, aTitle, scale(650), scale(300));
@@ -795,38 +796,38 @@
 }
 
 void StImageViewerGUI::doMobileSettings(const size_t ) {
-    const StHandle<StWindow>& aRend = myPlugin->getMainWindow();
+    const std::shared_ptr<StWindow>& aRend = myPlugin->getMainWindow();
     StParamsList aParams;
-    aParams.add(myPlugin->StApplication::params.ActiveDevice);
-    aParams.add(myImage->params.DisplayMode);
+    aParams.push_back(myPlugin->StApplication::params.ActiveDevice);
+    aParams.push_back(myImage->params.DisplayMode);
     aRend->getOptions(aParams);
-    aParams.add(myPlugin->params.ToStickPanorama);
-    aParams.add(myPlugin->params.ToFlipCubeZ6x1);
-    aParams.add(myPlugin->params.ToFlipCubeZ3x2);
-    aParams.add(myPlugin->params.ToSwapJPS);
-    aParams.add(myPlugin->params.ToShowFps);
-    aParams.add(myPlugin->params.SlideShowDelay);
-    aParams.add(myLangMap->params.language);
-    aParams.add(myPlugin->params.IsMobileUI);
+    aParams.push_back(myPlugin->params.ToStickPanorama);
+    aParams.push_back(myPlugin->params.ToFlipCubeZ6x1);
+    aParams.push_back(myPlugin->params.ToFlipCubeZ3x2);
+    aParams.push_back(myPlugin->params.ToSwapJPS);
+    aParams.push_back(myPlugin->params.ToShowFps);
+    aParams.push_back(myPlugin->params.SlideShowDelay);
+    aParams.push_back(myLangMap->params.language);
+    aParams.push_back(myPlugin->params.IsMobileUI);
 #if defined(_WIN32) || defined(__APPLE__) // implemented only on Windows and macOS
-    aParams.add(myPlugin->params.IsExclusiveFullScreen);
+    aParams.push_back(myPlugin->params.IsExclusiveFullScreen);
 #endif
-    aParams.add(myPlugin->params.ToUseDeepColor);
+    aParams.push_back(myPlugin->params.ToUseDeepColor);
     if(isMobile()) {
-        //aParams.add(myPlugin->params.ToHideStatusBar);
-        aParams.add(myPlugin->params.ToHideNavBar);
+        //aParams.push_back(myPlugin->params.ToHideStatusBar);
+        aParams.push_back(myPlugin->params.ToHideNavBar);
     } else {
-        aParams.add(myPlugin->params.ToOpenLast);
+        aParams.push_back(myPlugin->params.ToOpenLast);
     }
-    aParams.add(myPlugin->params.ExitOnEscape);
+    aParams.push_back(myPlugin->params.ExitOnEscape);
 #if defined(ST_UPDATES_CHECK)
-    aParams.add(myPlugin->params.CheckUpdatesDays);
+    aParams.push_back(myPlugin->params.CheckUpdatesDays);
 #endif
 
     if(!myWindow->isMobile()) {
         StHandle<StBoolParamNamed> aDefDrawerParam = myPlugin->createDefaultDrawerParam(stCString("StImageViewer"),
                                                                                         stCString("sView launcher starts Image Viewer"));
-        aParams.add(aDefDrawerParam);
+        aParams.push_back(aDefDrawerParam);
     }
 
     StInfoDialog* aDialog = new StInfoDialog(myPlugin, this, tr(MENU_HELP_SETTINGS), scale(768), scale(300));
@@ -908,7 +909,7 @@
     return aMenu;
 }
 
-void StImageViewerGUI::createMobileUI(const StHandle<StPlayList>& thePlayList) {
+void StImageViewerGUI::createMobileUI(const std::shared_ptr<StPlayList>& thePlayList) {
     createImageAdjustments();
     createMobileUpperToolbar();
     createMobileBottomToolbar();
@@ -1204,9 +1205,9 @@
     aDialog->setMimeList(myPlugin->myLoader->getMimeListImages(), "Images", false);
     aDialog->setMimeList(myPlugin->myLoader->getMimeListVideo(),  "Videos", true);
 
-    if(myPlugin->params.lastFolder.isEmpty()) {
-        StHandle<StFileNode> aCurrFile = myPlugin->myPlayList->getCurrentFile();
-        if(!aCurrFile.isNull()) {
+    if (myPlugin->params.lastFolder.isEmpty()) {
+        std::shared_ptr<StFileNode> aCurrFile = myPlugin->myPlayList->getCurrentFile();
+        if (aCurrFile.get() != nullptr) {
             myPlugin->params.lastFolder = aCurrFile->isEmpty() ? aCurrFile->getFolderPath() : aCurrFile->getValue(0)->getFolderPath();
         }
     }
@@ -1217,22 +1218,22 @@
 void StImageViewerGUI::doShowMobileExMenu(const size_t ) {
     const int aTop = scale(56);
 
-    StHandle<StImageInfo>&   anExtraInfo = myPlugin->myFileInfo;
-    StHandle<StFileNode>     aFileNode;
-    StHandle<StStereoParams> aParams;
-    if(anExtraInfo.isNull()
-    && !myPlugin->getCurrentFile(aFileNode, aParams, anExtraInfo)) {
-        anExtraInfo.nullify();
+    std::shared_ptr<StImageInfo>&   anExtraInfo = myPlugin->myFileInfo;
+    std::shared_ptr<StFileNode>     aFileNode;
+    std::shared_ptr<StStereoParams> aParams;
+    if (anExtraInfo.get() == nullptr
+     && !myPlugin->getCurrentFile(aFileNode, aParams, anExtraInfo)) {
+        anExtraInfo.reset();
     }
 
     StGLMenu*     aMenu  = new StGLMenu(this, 0, aTop, StGLMenu::MENU_VERTICAL_COMPACT, true);
     StGLMenuItem* anItem = NULL;
     aMenu->setCorner(StGLCorner(ST_VCORNER_TOP, ST_HCORNER_RIGHT));
     aMenu->setContextual(true);
-    if(!anExtraInfo.isNull()) {
+    if (anExtraInfo.get() != nullptr) {
         anItem = aMenu->addItem(tr(BUTTON_DELETE), myPlugin->getAction(StImageViewer::Action_DeleteFile));
         anItem->setIcon(stCMenuIcon("actionDiscard"));
-        anExtraInfo.nullify();
+        anExtraInfo.reset();
     }
     anItem = aMenu->addItem(tr(MENU_HELP_ABOUT));
     anItem->setIcon(stCMenuIcon("actionHelp"));
@@ -1250,8 +1251,8 @@
 StImageViewerGUI::StImageViewerGUI(StImageViewer*  thePlugin,
                                    StWindow*       theWindow,
                                    StTranslations* theLangMap,
-                                   const StHandle<StPlayList>&       thePlayList,
-                                   const StHandle<StGLTextureQueue>& theTextureQueue)
+                                   const std::shared_ptr<StPlayList>& thePlayList,
+                                   const std::shared_ptr<StGLTextureQueue>& theTextureQueue)
 : StGLRootWidget(thePlugin->myResMgr),
   myPlugin(thePlugin),
   myWindow(theWindow),
@@ -1295,9 +1296,9 @@
 
     myPlugin->params.ToShowFps->signals.onChanged.connect(this, &StImageViewerGUI::doShowFPS);
 
-    StHandle<StGLTextureQueue> aTextureQueue = theTextureQueue;
-    if(aTextureQueue.isNull()) {
-        aTextureQueue = new StGLTextureQueue(2);
+    std::shared_ptr<StGLTextureQueue> aTextureQueue = theTextureQueue;
+    if (aTextureQueue.get() == nullptr) {
+        aTextureQueue = std::make_shared<StGLTextureQueue>(2);
     }
 
     myImage = new StGLImageRegion(this, aTextureQueue, true);
@@ -1365,22 +1366,56 @@
     myAnimVisibility.doTouch(theEvent);
 }
 
-void StImageViewerGUI::doGesture(const StGestureEvent& theEvent) {
-    myAnimVisibility.doGesture(theEvent);
-    if(myImage == NULL) {
-        return;
-    }
-
-    for(StGLWidget *aChildIter(getChildren()->getLast()), *aChildActive(NULL); aChildIter != NULL;) {
-        aChildActive = aChildIter;
+// Propagate gesture to main image region
+// and handle double tap to select and copy text from StGLTable to clipboard.
+// TODO move to base interface.
+static bool doGestureChildren(StWindow* theWindow,
+                              StGLImageRegion* theMainImage,
+                              StGLWidget* theStart,
+                              const StGestureEvent& theEvent,
+                              const StPointD_t& theCursor) {
+    static constexpr StGLVec3 aHiColor(0.7f, 0.7f, 0.7f);
+
+    for (StGLWidget* aChildIter = theStart; aChildIter != nullptr;) {
+        StGLWidget* aChildActive = aChildIter;
         aChildIter   = aChildIter->getPrev();
-        if(aChildActive->isVisibleAndPointIn(getCursorZo())) {
-            if(aChildActive == myImage) {
-                myImage->doGesture(theEvent);
-            }
-            return;
+
+        if (!aChildActive->isVisibleAndPointIn(theCursor)) {
+            continue;
+        }
+
+        if (aChildActive == theMainImage) {
+            theMainImage->doGesture(theEvent);
+            return true;
+        }
+        if (theEvent.Type != stEvent_Gesture1DoubleTap) {
+            return false;
         }
+
+        if (StGLMessageBox* aBox = dynamic_cast<StGLMessageBox*>(aChildActive)) {
+            return doGestureChildren(theWindow, nullptr, aBox->getContent()->getChildren()->getLast(), theEvent, theCursor);
+        } else if (StGLTable* aTable = dynamic_cast<StGLTable*>(aChildActive)) {
+            return doGestureChildren(theWindow, nullptr, aTable->getChildren()->getLast(), theEvent, theCursor);
+        } else if (StGLTableItem* anItem = dynamic_cast<StGLTableItem*>(aChildActive)) {
+            aChildActive = anItem->getItem();
+        }
+
+        if (StGLTextArea* aTextItem = dynamic_cast<StGLTextArea*>(aChildActive)) {
+            ST_DEBUG_LOG("Copied text to clipboard: '" + aTextItem->getText() + "'");
+            theWindow->toClipboard(aTextItem->getText());
+            aTextItem->setBorder(!aTextItem->hasBorder());
+            aTextItem->setBackColor(aHiColor);
+            return true;
+        }
+
+        return false;
     }
+    return false;
+}
+
+void StImageViewerGUI::doGesture(const StGestureEvent& theEvent) {
+    myAnimVisibility.doGesture(theEvent);
+    doGestureChildren(myWindow, myImage, getChildren()->getLast(), theEvent, getCursorZo());
 }
 
 bool StImageViewerGUI::tryUnClick(const StClickEvent& theEvent,
@@ -1417,17 +1452,15 @@
                                 || (toShowPlayList && myPlayList != NULL && myPlayList->isPointIn(theCursor))
                                 || (hasMainMenu    && myMenuRoot->isActive()));
 
-    StHandle<StStereoParams> aParams = myImage->getSource();
-    myAnimVisibility.setEmptyImage(aParams.isNull() && !myPlugin->myPlayList->isEmpty());
+    std::shared_ptr<StStereoParams> aParams = myImage->getSource();
+    myAnimVisibility.setEmptyImage(aParams.get() == nullptr && !myPlugin->myPlayList->isEmpty());
     myAnimVisibility.updateVisibility(theToForceHide, theToForceShow);
 
     StFormat aSrcFormat = (StFormat )myPlugin->params.SrcStereoFormat->getValue();
-    if(aSrcFormat == StFormat_AUTO
-    && !aParams.isNull()) {
+    if (aSrcFormat == StFormat_AUTO && aParams.get() != nullptr) {
         aSrcFormat = aParams->StereoFormat;
     }
-    if(!aParams.isNull()
-     && myImage->params.SwapLR->getValue()) {
+    if (aParams.get() != nullptr && myImage->params.SwapLR->getValue()) {
         aSrcFormat = st::formatReversed(aSrcFormat);
     }
 
@@ -1480,12 +1513,11 @@
     }
     setWidgetOpacity(myBtnSwapLR, aSrcFormat != StFormat_Mono ? myPanelUpper->getOpacity() : 0.0f, false);
 
-    const StViewSurface aViewMode = !aParams.isNull()
+    const StViewSurface aViewMode = aParams.get() != nullptr
                                   ? aParams->ViewingMode
                                   : StViewSurface_Plain;
     bool toShowPano = aViewMode != StViewSurface_Plain;
-    if(!toShowPano
-    && !aParams.isNull()
+    if (!toShowPano && aParams.get() != nullptr
     /*&&  st::probePanorama(aParams->StereoFormat,
                           aParams->Src1SizeX, aParams->Src1SizeY,
                           aParams->Src2SizeX, aParams->Src2SizeY) != StPanorama_OFF*/) {

_service:obs_scm:sview-26.obscpio/StImageViewer/StImageViewerGUI.h Changed

@@ -92,8 +92,8 @@
     ST_LOCAL StImageViewerGUI(StImageViewer*  thePlugin,
                               StWindow*       theWindow,
                               StTranslations* theLangMap,
-                              const StHandle<StPlayList>&       thePlayList,
-                              const StHandle<StGLTextureQueue>& theTextureQueue);
+                              const std::shared_ptr<StPlayList>& thePlayList,
+                              const std::shared_ptr<StGLTextureQueue>& theTextureQueue);
     ST_LOCAL virtual ~StImageViewerGUI();
     ST_LOCAL virtual void stglUpdate(const StPointD_t& thePointZo,
                                      bool theIsPreciseInput) ST_ATTR_OVERRIDE;
@@ -150,7 +150,7 @@
     /**
      * Create normal (desktop) interface.
      */
-    ST_LOCAL void createDesktopUI(const StHandle<StPlayList>& thePlayList);
+    ST_LOCAL void createDesktopUI(const std::shared_ptr<StPlayList>& thePlayList);
 
     /**
      * Create upper tool-bar.
@@ -181,7 +181,7 @@
     /**
      * Create mobile interface.
      */
-    ST_LOCAL void      createMobileUI(const StHandle<StPlayList>& thePlayList);
+    ST_LOCAL void      createMobileUI(const std::shared_ptr<StPlayList>& thePlayList);
 
     ST_LOCAL void      createMobileUpperToolbar();
     ST_LOCAL void      createMobileBottomToolbar();

_service:obs_scm:sview-26.obscpio/StImageViewer/StImageViewerStrings.cpp Changed

_service:obs_scm:sview-26.obscpio/StImageViewer/StImageViewerStrings.h Changed

_service:obs_scm:sview-26.obscpio/StImageViewer/lang/chinese/StImageViewer.lng Changed

_service:obs_scm:sview-26.obscpio/StImageViewer/lang/chineset/StImageViewer.lng Changed

_service:obs_scm:sview-26.obscpio/StImageViewer/lang/czech/StImageViewer.lng Changed

_service:obs_scm:sview-26.obscpio/StImageViewer/lang/english/StImageViewer.lng Changed

_service:obs_scm:sview-26.obscpio/StImageViewer/lang/french/StImageViewer.lng Changed

_service:obs_scm:sview-26.obscpio/StImageViewer/lang/german/StImageViewer.lng Changed

_service:obs_scm:sview-26.obscpio/StImageViewer/lang/korean/StImageViewer.lng Changed

_service:obs_scm:sview-26.obscpio/StImageViewer/lang/russian/StImageViewer.lng Changed

_service:obs_scm:sview-26.obscpio/StImageViewer/lang/spanish/StImageViewer.lng Changed

_service:obs_scm:sview-26.obscpio/StMonitorsDump/main.cpp Changed

_service:obs_scm:sview-26.obscpio/StMoviePlayer/StALDeviceParam.cpp Changed

@@ -59,7 +59,7 @@
     #else
         aName.fromUnicode(aDefDevice);
     #endif
-        myDevicesUtf.add(aName);
+        myDevicesUtf.push_back(aName);
         myDevicesLoc.push_back(std::string(aDefDevice));
         return;
     }
@@ -80,13 +80,13 @@
             aName = aName.subString(0, anEnd);
         }
 
-        myDevicesUtf.add(aName);
+        myDevicesUtf.push_back(aName);
         myDevicesLoc.push_back(aCName);
         aDevicesNames += aCName.length() + 1;
     }
-    if(myDevicesUtf.isEmpty()) {
+    if (myDevicesUtf.empty()) {
         // append dummy device
-        myDevicesUtf.add("None");
+        myDevicesUtf.push_back("None");
         myDevicesLoc.push_back("");
     }
 }
@@ -108,7 +108,7 @@
 }
 
 StString StALDeviceParam::getUtfTitle() const {
-    if(myDevicesUtf.isEmpty()) {
+    if (myDevicesUtf.empty()) {
         return StString();
     }
 
@@ -117,7 +117,7 @@
 }
 
 std::string StALDeviceParam::getCTitle() const {
-    if(myDevicesUtf.isEmpty()) {
+    if (myDevicesUtf.empty()) {
         return std::string();
     }

_service:obs_scm:sview-26.obscpio/StMoviePlayer/StALDeviceParam.h Changed

_service:obs_scm:sview-26.obscpio/StMoviePlayer/StMovieOpenDialog.cpp Changed

_service:obs_scm:sview-26.obscpio/StMoviePlayer/StMoviePlayer.cpp Changed

@@ -61,33 +61,33 @@
 
 namespace {
 
-    static const char ST_SETTING_LAST_FOLDER   = "lastFolder";
-    static const char ST_SETTING_RECENT_FILES  = "recent";
+    static constexpr char ST_SETTING_LAST_FOLDER   = "lastFolder";
+    static constexpr char ST_SETTING_RECENT_FILES  = "recent";
 
-    static const char ST_SETTING_VIEWMODE      = "viewMode";
-    static const char ST_SETTING_GAMMA         = "viewGamma";
-    static const char ST_SETTING_BRIGHTNESS    = "viewBrightness";
-    static const char ST_SETTING_SATURATION    = "viewSaturation";
-    static const char ST_SETTING_SEP_DX        = "viewSepDX";
-    static const char ST_SETTING_SEP_DY        = "viewSepDY";
-    static const char ST_SETTING_SEP_ROT       = "viewSepRot";
+    static constexpr char ST_SETTING_VIEWMODE      = "viewMode";
+    static constexpr char ST_SETTING_GAMMA         = "viewGamma";
+    static constexpr char ST_SETTING_BRIGHTNESS    = "viewBrightness";
+    static constexpr char ST_SETTING_SATURATION    = "viewSaturation";
+    static constexpr char ST_SETTING_SEP_DX        = "viewSepDX";
+    static constexpr char ST_SETTING_SEP_DY        = "viewSepDY";
+    static constexpr char ST_SETTING_SEP_ROT       = "viewSepRot";
 
 #ifdef ST_HAVE_MONGOOSE
-    static const char ST_SETTING_WEBUI_CMDPORT = "webuiCmdPort";
+    static constexpr char ST_SETTING_WEBUI_CMDPORT = "webuiCmdPort";
 #endif
 
-    static const char ST_ARGUMENT_FILE_LEFT  = "left";
-    static const char ST_ARGUMENT_FILE_RIGHT = "right";
-    static const char ST_ARGUMENT_FILE_LAST  = "last";
-    static const char ST_ARGUMENT_FILE_DEMO  = "demo";
-    static const char ST_ARGUMENT_FILE_PAUSE = "pause";
-    static const char ST_ARGUMENT_FILE_PAUSED= "paused";
-    static const char ST_ARGUMENT_FILE_SEEK  = "seek";
-    static const char ST_ARGUMENT_MONITOR    = "monitorId";
-    static const char ST_ARGUMENT_WINLEFT    = "windowLeft";
-    static const char ST_ARGUMENT_WINTOP     = "windowTop";
-    static const char ST_ARGUMENT_WINWIDTH   = "windowWidth";
-    static const char ST_ARGUMENT_WINHEIGHT  = "windowHeight";
+    static constexpr char ST_ARGUMENT_FILE_LEFT  = "left";
+    static constexpr char ST_ARGUMENT_FILE_RIGHT = "right";
+    static constexpr char ST_ARGUMENT_FILE_LAST  = "last";
+    static constexpr char ST_ARGUMENT_FILE_DEMO  = "demo";
+    static constexpr char ST_ARGUMENT_FILE_PAUSE = "pause";
+    static constexpr char ST_ARGUMENT_FILE_PAUSED= "paused";
+    static constexpr char ST_ARGUMENT_FILE_SEEK  = "seek";
+    static constexpr char ST_ARGUMENT_MONITOR    = "monitorId";
+    static constexpr char ST_ARGUMENT_WINLEFT    = "windowLeft";
+    static constexpr char ST_ARGUMENT_WINTOP     = "windowTop";
+    static constexpr char ST_ARGUMENT_WINWIDTH   = "windowWidth";
+    static constexpr char ST_ARGUMENT_WINHEIGHT  = "windowHeight";
 
 }
 
@@ -98,8 +98,7 @@
 
 void StMoviePlayer::doPause(const StPauseEvent& theEvent) {
     StApplication::doPause(theEvent);
-    if(!myVideo.isNull()
-    && !myGUI.isNull()) {
+    if (myVideo.get() != nullptr && myGUI.get() != nullptr) {
         // update playback position before saving settings
         double aDuration = 0.0;
         double aPts      = 0.0;
@@ -107,14 +106,14 @@
         myVideo->getPlaybackState(aDuration, aPts, isVideoPlayed, isAudioPlayed);
         if(aPts > 300.0
         && aPts < aDuration - 300.0) {
-            StHandle<StStereoParams> aParams = myGUI->myImage->getSource();
-            if(!aParams.isNull()) {
+            std::shared_ptr<StStereoParams> aParams = myGUI->myImage->getSource();
+            if (aParams.get() != nullptr) {
                 aParams->Timestamp = (GLfloat )aPts;
             }
         }
     }
     saveAllParams();
-    if(myVideo.isNull()) {
+    if (myVideo.get() == nullptr) {
         return;
     }
 
@@ -186,7 +185,15 @@
     params.ToShowPlayList->setName(tr(VIDEO_LIST));
     params.ToShowAdjustImage->setName(tr(MENU_VIEW_IMAGE_ADJUST));
     params.ToSwapJPS->setName(tr(OPTION_SWAP_JPS));
+    params.ToSaveCrossEyed->setName(tr(OPTION_SAVE_JPS_CROSSEYED));
     params.ToStickPanorama->setName(tr(MENU_VIEW_STICK_PANORAMA360));
+    params.LastPanoramaMode->defineOption(StViewSurface_Plain,      stCString("plain"));
+    params.LastPanoramaMode->defineOption(StViewSurface_Theater,    stCString("theater"));
+    params.LastPanoramaMode->defineOption(StViewSurface_Cubemap,    stCString("cubemap"));
+    params.LastPanoramaMode->defineOption(StViewSurface_Sphere,     stCString("sphere"));
+    params.LastPanoramaMode->defineOption(StViewSurface_Hemisphere, stCString("hemisphere"));
+    params.LastPanoramaMode->defineOption(StViewSurface_Cylinder,   stCString("cylinder"));
+    params.LastPanoramaMode->defineOption(StViewSurface_CubemapEAC, stCString("cubemapeac"));
     params.ToTrackHead->setName(tr(MENU_VIEW_TRACK_HEAD));
     params.ToTrackHeadAudio->setName(tr(MENU_VIEW_TRACK_HEAD_AUDIO));
     params.ToForceBFormat->setName(stCString("Force B-Format"));
@@ -236,11 +243,11 @@
     myLangMap->params.language->setName(tr(MENU_HELP_LANGS));
 }
 
-StMoviePlayer::StMoviePlayer(const StHandle<StResourceManager>& theResMgr,
-                             const StNativeWin_t                theParentWin,
-                             const StHandle<StOpenInfo>&        theOpenInfo)
+StMoviePlayer::StMoviePlayer(const std::shared_ptr<StResourceManager>& theResMgr,
+                             const StNativeWin_t                       theParentWin,
+                             const std::shared_ptr<StOpenInfo>&        theOpenInfo)
 : StApplication(theResMgr, theParentWin, theOpenInfo),
-  myPlayList(new StPlayList(4, true)),
+  myPlayList(std::make_shared<StPlayList>(4, true)),
   myEventLoaded(false),
   mySeekOnLoad(-1.0),
   myAudioOnLoad(-1),
@@ -251,9 +258,9 @@
   myToUpdateALList(false),
   myToCheckUpdates(true),
   myToCheckPoorOrient(true) {
-    mySettings = new StSettings(myResMgr, ST_DRAWER_PLUGIN_NAME);
-    myLangMap  = new StTranslations(myResMgr, StMoviePlayer::ST_DRAWER_PLUGIN_NAME);
-    myOpenDialog = new StMovieOpenDialog(this);
+    mySettings = std::make_shared<StSettings>(myResMgr, ST_DRAWER_PLUGIN_NAME);
+    myLangMap  = std::make_shared<StTranslations>(myResMgr, StMoviePlayer::ST_DRAWER_PLUGIN_NAME);
+    myOpenDialog = std::make_shared<StMovieOpenDialog>(this);
     StMoviePlayerStrings::loadDefaults(*myLangMap);
     myLangMap->params.language->signals.onChanged += stSlot(this, &StMoviePlayer::doChangeLanguage);
     myTitle = stCString("sView - Movie Player");
@@ -337,9 +344,9 @@
     params.ToShowAdjustImage = new StBoolParamNamed(false, stCString("showAdjustImage"));
     params.ToShowAdjustImage->signals.onChanged = stSlot(this, &StMoviePlayer::doShowAdjustImage);
     params.ToSwapJPS  = new StBoolParamNamed(false, stCString("toSwapJPS"));
-    params.ToSwapJPS->signals.onChanged = stSlot(this, &StMoviePlayer::doChangeSwapJPS);
+    params.ToSaveCrossEyed = new StBoolParamNamed(true, stCString("toSaveCrossEyed"));
     params.ToStickPanorama  = new StBoolParamNamed(false, stCString("toStickPano360"));
-    params.ToStickPanorama->signals.onChanged = stSlot(this, &StMoviePlayer::doChangeStickPano360);
+    params.LastPanoramaMode = new StEnumParam(StViewSurface_Sphere, stCString("lastPanoMode"));
     params.ToTrackHead      = new StBoolParamNamed(true,  stCString("toTrackHead"));
     params.ToTrackHeadAudio = new StBoolParamNamed(true,  stCString("toTrackHeadAudio"));
     params.ToForceBFormat   = new StBoolParamNamed(false, stCString("toForceBFormat"));
@@ -429,7 +436,9 @@
 
     myToCheckPoorOrient = !mySettings->loadParam(params.ToTrackHead);
     mySettings->loadParam (params.ToSwapJPS);
+    mySettings->loadParam (params.ToSaveCrossEyed);
     mySettings->loadParam (params.ToStickPanorama);
+    mySettings->loadParam (params.LastPanoramaMode);
     mySettings->loadParam (params.ToTrackHeadAudio);
     mySettings->loadParam (params.ToForceBFormat);
     mySettings->loadParam (params.AudioAlOutput);
@@ -471,16 +480,16 @@
     params.ToForceBFormat->signals.onChanged = stSlot(this, &StMoviePlayer::doSetForceBFormat);
 
 #if defined(__ANDROID__)
-    addRenderer(new StOutInterlace  (myResMgr, theParentWin));
-    addRenderer(new StOutAnaglyph   (myResMgr, theParentWin));
-    addRenderer(new StOutDistorted  (myResMgr, theParentWin));
+    addRenderer(std::make_shared<StOutInterlace>  (myResMgr, theParentWin));
+    addRenderer(std::make_shared<StOutAnaglyph>   (myResMgr, theParentWin));
+    addRenderer(std::make_shared<StOutDistorted>  (myResMgr, theParentWin));
 #else
-    addRenderer(new StOutAnaglyph   (myResMgr, theParentWin));
-    addRenderer(new StOutDual       (myResMgr, theParentWin));
-    addRenderer(new StOutIZ3D       (myResMgr, theParentWin));
-    addRenderer(new StOutInterlace  (myResMgr, theParentWin));
-    addRenderer(new StOutDistorted  (myResMgr, theParentWin));
-    addRenderer(new StOutPageFlipExt(myResMgr, theParentWin));
+    addRenderer(std::make_shared<StOutAnaglyph>   (myResMgr, theParentWin));
+    addRenderer(std::make_shared<StOutDual>       (myResMgr, theParentWin));
+    addRenderer(std::make_shared<StOutIZ3D>       (myResMgr, theParentWin));
+    addRenderer(std::make_shared<StOutInterlace>  (myResMgr, theParentWin));
+    addRenderer(std::make_shared<StOutDistorted>  (myResMgr, theParentWin));
+    addRenderer(std::make_shared<StOutPageFlipExt>(myResMgr, theParentWin));
 #endif
 
     // no need in Depth buffer
@@ -490,8 +499,8 @@
         StWinAttr_GlStencilSize, (StWinAttr )0,
         StWinAttr_NULL
     };
-    for(size_t aRendIter = 0; aRendIter < myRenderers.size(); ++aRendIter) {
-        StHandle<StWindow>& aRend = myRenderersaRendIter;
+    for (size_t aRendIter = 0; aRendIter < myRenderers.size(); ++aRendIter) {
+        std::shared_ptr<StWindow>& aRend = myRenderersaRendIter;
         aRend->setAttributes(anAttribs);
     }
 
@@ -716,8 +725,7 @@
 }
 
 bool StMoviePlayer::resetDevice() {
-    if(myGUI.isNull()
-    || myVideo.isNull()) {
+    if (myGUI.get() == nullptr || myVideo.get() == nullptr) {
         return init();
     }
 
@@ -726,12 +734,12 @@
 
     releaseDevice();
     myWindow->close();
-    myWindow.nullify();
+    myWindow.reset();
     return open();
 }
 
 void StMoviePlayer::saveGuiParams() {
-    if(myGUI.isNull()) {
+    if (myGUI.get() == nullptr) {
         return;
     }
 
@@ -752,7 +760,7 @@
 
 void StMoviePlayer::saveAllParams() {
     saveGuiParams();
-    if(!myGUI.isNull()) {
+    if (myGUI.get() != nullptr) {
         mySettings->saveParam (params.ExitOnEscape);
         mySettings->saveParam (params.ScaleAdjust);
         mySettings->saveParam (params.ScaleHiDPI2X);
@@ -783,7 +791,9 @@
         mySettings->saveParam (params.ToShowAdjustImage);
 
         mySettings->saveParam (params.ToSwapJPS);
+        mySettings->saveParam (params.ToSaveCrossEyed);
         mySettings->saveParam (params.ToStickPanorama);
+        mySettings->saveParam (params.LastPanoramaMode);
         mySettings->saveParam (params.ToTrackHead);
         mySettings->saveParam (params.ToTrackHeadAudio);
         mySettings->saveParam (params.ToForceBFormat);
@@ -826,46 +836,46 @@
 
     // release GUI data and GL resources before closing the window
     myKeyActions.clear();
-    myGUI.nullify();
-    myContext.nullify();
+    myGUI.reset();
+    myContext.reset();
 }
 
 StMoviePlayer::~StMoviePlayer() {
     doStopWebUI();
 
-    myUpdates.nullify();
-    if(!myVideo.isNull()) {
+    myUpdates.reset();
+    if (myVideo.get() != nullptr) {
         myVideo->startDestruction();
     }
 
     releaseDevice();
     // wait video playback thread to quit and release resources
-    myVideo.nullify();
+    myVideo.reset();
 }
 
-bool StMoviePlayer::createGui(StHandle<StGLTextureQueue>& theTextureQueue,
-                              StHandle<StSubQueue>&       theSubQueue1,
-                              StHandle<StSubQueue>&       theSubQueue2) {
-    if(!myGUI.isNull()) {
+bool StMoviePlayer::createGui(std::shared_ptr<StGLTextureQueue>& theTextureQueue,
+                              std::shared_ptr<StSubQueue>&       theSubQueue1,
+                              std::shared_ptr<StSubQueue>&       theSubQueue2) {
+    if (myGUI.get() != nullptr) {
         saveGuiParams();
-        myGUI.nullify();
+        myGUI.reset();
         myKeyActions.clear();
     }
 
-    if(!myVideo.isNull()) {
+    if (myVideo.get() != nullptr) {
         theTextureQueue = myVideo->getTextureQueue();
         theSubQueue1    = myVideo->getSubtitlesQueue1();
         theSubQueue2    = myVideo->getSubtitlesQueue2();
     } else {
-        theTextureQueue = new StGLTextureQueue(16);
-        theSubQueue1    = new StSubQueue();
-        theSubQueue2    = new StSubQueue();
+        theTextureQueue = std::make_shared<StGLTextureQueue>(16);
+        theSubQueue1    = std::make_shared<StSubQueue>();
+        theSubQueue2    = std::make_shared<StSubQueue>();
     }
 
     params.ScaleHiDPI->setValue(myWindow->getScaleFactor());
     doChangeMobileUI(params.IsMobileUI->getValue());
-    myGUI = new StMoviePlayerGUI(this, myWindow.access(), myLangMap.access(), myPlayList,
-                                 theTextureQueue, theSubQueue1, theSubQueue2);
+    myGUI = std::make_shared<StMoviePlayerGUI>(this, myWindow.get(), myLangMap.get(), myPlayList,
+                                               theTextureQueue, theSubQueue1, theSubQueue2);
     myGUI->setContext(myContext);
     theTextureQueue->setDeviceCaps(myContext->getDeviceCaps());
 
@@ -930,7 +940,7 @@
 }
 
 void StMoviePlayer::doImageAdjustReset(const size_t ) {
-    if(myGUI.isNull()) {
+    if (myGUI.get() == nullptr) {
         return;
     }
 
@@ -941,14 +951,14 @@
 
 
 void StMoviePlayer::doDeleteFileBegin(const size_t ) {
-    //if(!myFileToDelete.isNull()) {
+    //if (myFileToDelete.get() != nullptr) {
     //    return;
     //}
 
     myFileToDelete = myPlayList->getCurrentFile();
-    if(myFileToDelete.isNull()
-    || myFileToDelete->size() != 0) {
-        myFileToDelete.nullify();
+    if (myFileToDelete.get() == nullptr
+     || myFileToDelete->size() != 0) {
+        myFileToDelete.reset();
         return;
     }
 
@@ -957,7 +967,7 @@
                          + (isReadOnly ? "\nWARNING! The file is READ ONLY!" : "")
                          + "\n" + myFileToDelete->getPath();
 
-    StGLMessageBox* aDialog = new StGLMessageBox(myGUI.access(), myLangMap->getValue(StMoviePlayerStrings::DIALOG_DELETE_FILE_TITLE),
+    StGLMessageBox* aDialog = new StGLMessageBox(myGUI.get(), myLangMap->getValue(StMoviePlayerStrings::DIALOG_DELETE_FILE_TITLE),
                                                  aText, myGUI->scale(512), myGUI->scale(256));
     aDialog->addButton(myLangMap->getValue(StMoviePlayerStrings::BUTTON_DELETE), true)->signals.onBtnClick += stSlot(this, &StMoviePlayer::doDeleteFileEnd);
     aDialog->addButton(myLangMap->getValue(StMoviePlayerStrings::BUTTON_CANCEL), false);
@@ -965,14 +975,14 @@
 }
 
 void StMoviePlayer::doDeleteFileEnd(const size_t ) {
-    if(myFileToDelete.isNull()
-    || myVideo.isNull()) {
+    if (myFileToDelete.get() == nullptr
+     || myVideo.get() == nullptr) {
         return;
     }
 
     StFileNode::removeReadOnlyFlag(myFileToDelete->getPath());
     myVideo->doRemovePhysically(myFileToDelete);
-    myFileToDelete.nullify();
+    myFileToDelete.reset();
 }
 
 void StMoviePlayer::doStopWebUI() {
@@ -1027,9 +1037,9 @@
 }
 
 bool StMoviePlayer::init() {
-    const bool isReset = !myVideo.isNull();
-    if(!myContext.isNull()
-    && !myGUI.isNull()) {
+    const bool isReset = myVideo.get() != nullptr;
+    if (myContext.get() != nullptr
+     && myGUI.get() != nullptr) {
         return true;
     }
 
@@ -1046,7 +1056,7 @@
     if(!isReset) {
     #ifdef ST_HAVE_MONGOOSE
         // handle this argument in advance
-        if(!myOpenFileInfo.isNull()) {
+        if (myOpenFileInfo.get() != nullptr) {
             StArgument anArgWebuiCmd = myOpenFileInfo->getArgumentsMap()ST_SETTING_WEBUI_CMDPORT;
             if(anArgWebuiCmd.isValid()) {
                 params.IsLocalWebUI->setValue(true);
@@ -1063,13 +1073,13 @@
     }
 
     // create the GUI with default values
-    StHandle<StGLTextureQueue> aTextureQueue;
-    StHandle<StSubQueue>       aSubQueue1, aSubQueue2;
+    std::shared_ptr<StGLTextureQueue> aTextureQueue;
+    std::shared_ptr<StSubQueue>       aSubQueue1, aSubQueue2;
     if(!createGui(aTextureQueue, aSubQueue1, aSubQueue2)) {
         myMsgQueue->pushError(stCString("Movie Player - critical error:\n"
                                         "Frame region initialization failed!"));
         myMsgQueue->popAll();
-        myGUI.nullify();
+        myGUI.reset();
         return false;
     }
 
@@ -1079,21 +1089,23 @@
 
     // create the video playback thread
     if(!isReset) {
-        myVideo = new StVideo(params.AudioAlDevice->getCTitle(),
+        myVideo = std::make_shared<StVideo>(params.AudioAlDevice->getCTitle(),
                               (StAudioQueue::StAlHintOutput )params.AudioAlOutput->getValue(),
                               (StAudioQueue::StAlHintHrtf   )params.AudioAlHrtf->getValue(),
                               myResMgr, myLangMap, myPlayList,
                               aTextureQueue, aSubQueue1, aSubQueue2);
-        myVideo->signals.onError  = stSlot(myMsgQueue.access(), &StMsgQueue::doPushError);
-        myVideo->signals.onLoaded = stSlot(this,                &StMoviePlayer::doLoaded);
+        myVideo->signals.onError  = stSlot(myMsgQueue.get(), &StMsgQueue::doPushError);
+        myVideo->signals.onLoaded = stSlot(this,             &StMoviePlayer::doLoaded);
         myVideo->params.UseGpu       = params.UseGpu;
         myVideo->params.UseOpenJpeg  = params.UseOpenJpeg;
         myVideo->params.ToAutoLoadSubs = params.ToAutoLoadSubs;
         myVideo->params.ToSearchSubs = params.ToSearchSubs;
         myVideo->params.ToTrackHeadAudio = params.ToTrackHeadAudio;
         myVideo->params.SlideShowDelay = params.SlideShowDelay;
-        myVideo->setSwapJPS(params.ToSwapJPS->getValue());
-        myVideo->setStickPano360(params.ToStickPanorama->getValue());
+        myVideo->params.ToSaveCrossEyed = params.ToSaveCrossEyed;
+        myVideo->videoParams().ToStickPanorama = params.ToStickPanorama;
+        myVideo->videoParams().LastPanoramaMode = params.LastPanoramaMode;
+        myVideo->videoParams().ToSwapJPS = params.ToSwapJPS;
         myVideo->setForceBFormat(params.ToForceBFormat->getValue());
         doChangeMixImagesVideos(params.ToMixImagesVideos->getValue());
 
@@ -1129,7 +1141,7 @@
     const int aNbDays = StCheckUpdates::getNbDaysFromInterval((StCheckUpdates::UpdateInteval )params.CheckUpdatesDays->getValue());
     if(aNbDays > 0
     && std::abs(aCurrentDayInYear - params.LastUpdateDay->getValue()) > aNbDays) {
-        myUpdates = new StCheckUpdates();
+        myUpdates = std::make_shared<StCheckUpdates>();
         myUpdates->init();
         params.LastUpdateDay->setValue(aCurrentDayInYear);
         mySettings->saveParam(params.LastUpdateDay);
@@ -1218,7 +1230,7 @@
 }
 
 bool StMoviePlayer::open() {
-    const bool isReset = !mySwitchTo.isNull();
+    const bool isReset = mySwitchTo.get() != nullptr;
     if(!StApplication::open()
     || !init()) {
         myMsgQueue->popAll();
@@ -1343,7 +1355,7 @@
 }
 
 void StMoviePlayer::doResize(const StSizeEvent& ) {
-    if(myGUI.isNull()) {
+    if (myGUI.get() == nullptr) {
         return;
     }
 
@@ -1364,7 +1376,7 @@
 }
 
 void StMoviePlayer::doKeyDown(const StKeyEvent& theEvent) {
-    if(myGUI.isNull()) {
+    if (myGUI.get() == nullptr) {
         return;
     }
 
@@ -1398,7 +1410,7 @@
 }
 
 void StMoviePlayer::doKeyHold(const StKeyEvent& theEvent) {
-    if(myGUI.isNull()) {
+    if (myGUI.get() == nullptr) {
         return;
     }
 
@@ -1410,7 +1422,7 @@
 }
 
 void StMoviePlayer::doKeyUp(const StKeyEvent& theEvent) {
-    if(myGUI.isNull()) {
+    if (myGUI.get() == nullptr) {
         return;
     }
 
@@ -1421,7 +1433,7 @@
 }
 
 void StMoviePlayer::doMouseDown(const StClickEvent& theEvent) {
-    if(myGUI.isNull()) {
+    if (myGUI.get() == nullptr) {
         return;
     }
 
@@ -1429,7 +1441,7 @@
 }
 
 void StMoviePlayer::doMouseUp(const StClickEvent& theEvent) {
-    if(myGUI.isNull()) {
+    if (myGUI.get() == nullptr) {
         return;
     }
 
@@ -1454,19 +1466,19 @@
 }
 
 void StMoviePlayer::doTouch(const StTouchEvent& theEvent) {
-    if(!myGUI.isNull()) {
+    if (myGUI.get() != nullptr) {
         myGUI->doTouch(theEvent);
     }
 }
 
 void StMoviePlayer::doGesture(const StGestureEvent& theEvent) {
-    if(!myGUI.isNull()) {
+    if (myGUI.get() != nullptr) {
         myGUI->doGesture(theEvent);
     }
 }
 
 void StMoviePlayer::doScroll(const StScrollEvent& theEvent) {
-    if(myGUI.isNull()) {
+    if (myGUI.get() == nullptr) {
         return;
     }
 
@@ -1492,7 +1504,7 @@
 }
 
 void StMoviePlayer::doAudioVolume(size_t theDirection) {
-    if(myVideo.isNull()) {
+    if (myGUI.get() == nullptr) {
         return;
     }
 
@@ -1504,7 +1516,7 @@
 }
 
 void StMoviePlayer::doAudioNext(size_t theDirection) {
-    if(myVideo.isNull()) {
+    if (myGUI.get() == nullptr) {
         return;
     }
 
@@ -1513,7 +1525,7 @@
 }
 
 void StMoviePlayer::doSubtitlesNext(size_t theDirection) {
-    if(myVideo.isNull()) {
+    if (myGUI.get() == nullptr) {
         return;
     }
 
@@ -1522,9 +1534,9 @@
 }
 
 void StMoviePlayer::doSubtitlesCopy(size_t ) {
-    if(myVideo.isNull()
-    || myGUI.isNull()
-    || myGUI->mySubtitles1 == NULL) {
+    if (myVideo.get() == nullptr
+     || myGUI.get() == nullptr
+     || myGUI->mySubtitles1 == NULL) {
         return;
     }
 
@@ -1536,8 +1548,8 @@
 }
 
 void StMoviePlayer::doFromClipboard(size_t ) {
-    if(myVideo.isNull()
-    || myGUI.isNull()) {
+    if (myVideo.get() == nullptr
+     || myGUI.get() == nullptr) {
         return;
     }
 
@@ -1585,7 +1597,7 @@
 }
 
 void StMoviePlayer::doFileNext() {
-    if(myVideo.isNull()) {
+    if (myVideo.get() == nullptr) {
         return;
     }
 
@@ -1610,8 +1622,8 @@
                 continue;
             }
 
-            StHandle<StFileNode> aCurrFile = myPlayList->getCurrentFile();
-            if(aCurrFile.isNull()) {
+            std::shared_ptr<StFileNode> aCurrFile = myPlayList->getCurrentFile();
+            if (aCurrFile.get() == nullptr) {
                 ST_ERROR_LOG("Can not attach subtitles");
                 return;
             }
@@ -1629,7 +1641,7 @@
         if(!myPlayList->checkExtension(aFile1)
          && myVideo->getMimeListImages().checkExtension(anExt1)) {
             // redirect to StMoviePlayer
-            myOpenFileOtherApp = new StOpenInfo();
+            myOpenFileOtherApp = std::make_shared<StOpenInfo>();
             StArgumentsMap anArgs;
             anArgs.add(StArgument("in", "image"));
             myOpenFileOtherApp->setArgumentsMap(anArgs);
@@ -1702,7 +1714,7 @@
 }
 
 void StMoviePlayer::beforeDraw() {
-    if(myGUI.isNull()) {
+    if (myGUI.get() == nullptr) {
         return;
     }
 
@@ -1724,7 +1736,7 @@
 
     // fetch Open File operation results
     if(myOpenDialog->hasResults()) {
-        StHandle<StFileNode> aCurrFile = myPlayList->getCurrentFile();
+        std::shared_ptr<StFileNode> aCurrFile = myPlayList->getCurrentFile();
         StString aFilePath;
         if(!myOpenDialog->getPathAudio().isEmpty()) {
             aFilePath = myOpenDialog->getPathAudio();
@@ -1747,7 +1759,7 @@
             if(!myPlayList->checkExtension(myOpenDialog->getPathLeft())
              && myVideo->getMimeListImages().checkExtension(StFileNode::getExtension(myOpenDialog->getPathLeft()))) {
                 // redirect to StImageViewer
-                myOpenFileOtherApp = new StOpenInfo();
+                myOpenFileOtherApp = std::make_shared<StOpenInfo>();
                 StArgumentsMap anArgs;
                 anArgs.add(StArgument("in", "image"));
                 myOpenFileOtherApp->setArgumentsMap(anArgs);
@@ -1774,8 +1786,8 @@
     // re-create GUI when necessary
     if(params.ScaleHiDPI->setValue(myWindow->getScaleFactor())
     || myToRecreateMenu) {
-        StHandle<StGLTextureQueue> aTextureQueue;
-        StHandle<StSubQueue>       aSubQueue1, aSubQueue2;
+        std::shared_ptr<StGLTextureQueue> aTextureQueue;
+        std::shared_ptr<StSubQueue>       aSubQueue1, aSubQueue2;
         createGui(aTextureQueue, aSubQueue1, aSubQueue2);
         myToRecreateMenu = false;
     }
@@ -1784,7 +1796,7 @@
         doUpdateStateLoaded();
     }
 
-    if(myToCheckUpdates && !myUpdates.isNull() && myUpdates->isInitialized()) {
+    if (myToCheckUpdates && myUpdates.get() != nullptr && myUpdates->isInitialized()) {
         if(myUpdates->isNeedUpdate()) {
             myGUI->showUpdatesNotify();
         }
@@ -1854,8 +1866,8 @@
 
     // check for mono state
     bool hasStereoSource = false;
-    StHandle<StStereoParams> aParams = myGUI->myImage->getSource();
-    if(!aParams.isNull()) {
+    std::shared_ptr<StStereoParams> aParams = myGUI->myImage->getSource();
+    if (aParams.get() != nullptr) {
         StGLQuaternion aHeadOrient;
         const bool toTrackHead = params.ToTrackHeadAudio->getValue()
                               && myGUI->myImage->getHeadOrientation(aHeadOrient, ST_DRAW_MONO, false);
@@ -1917,9 +1929,9 @@
 }
 
 void StMoviePlayer::stglDraw(unsigned int theView) {
-    const bool hasCtx = !myContext.isNull() && myContext->isBound();
+    const bool hasCtx = myContext.get() != nullptr && myContext->isBound();
     if(!hasCtx || myWindow->isPaused()) {
-        if(!myGUI.isNull()
+        if (myGUI.get() != nullptr
          && myGUI->myImage != NULL) {
             myGUI->myImage->stglSkipFrames();
         }
@@ -1930,8 +1942,8 @@
                 double aDuration = 0.0;
                 double aPts      = 0.0;
                 bool isVideoPlayed = false, isAudioPlayed = false;
-                const bool isPlaying = !myVideo.isNull()
-                                     && myVideo->getPlaybackState(aDuration, aPts, isVideoPlayed, isAudioPlayed);
+                const bool isPlaying = myVideo.get() != nullptr
+                                    && myVideo->getPlaybackState(aDuration, aPts, isVideoPlayed, isAudioPlayed);
                 const double aTimeout = hasCtx ? 300.0 : 60.0;
                 if(!myInactivityTimer.isOn()) {
                     myInactivityTimer.restart();
@@ -1954,7 +1966,7 @@
         myContext->core20fwd->glClear(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT);
     }
 
-    if(myGUI.isNull()) {
+    if (myGUI.get() == nullptr) {
         return;
     }
 
@@ -1963,8 +1975,8 @@
 }
 
 void StMoviePlayer::doShowPlayList(const bool theToShow) {
-    if(myGUI.isNull()
-    || myGUI->myPlayList == NULL) {
+    if (myGUI.get() == nullptr
+     || myGUI->myPlayList == NULL) {
         return;
     }
 
@@ -1972,8 +1984,8 @@
 }
 
 void StMoviePlayer::doShowAdjustImage(const bool theToShow) {
-    if(myGUI.isNull()
-    || myGUI->myAdjustOverlay == NULL) {
+    if (myGUI.get() == nullptr
+     || myGUI->myAdjustOverlay == NULL) {
         return;
     }
 
@@ -1981,7 +1993,7 @@
 }
 
 void StMoviePlayer::doPlayListReverse(const size_t ) {
-    if(myGUI.isNull()) {
+    if (myGUI.get() == nullptr) {
         return;
     }
 
@@ -2001,37 +2013,37 @@
 }
 
 void StMoviePlayer::doSwitchAudioDevice(const int32_t /*theDevId*/) {
-    if(!myVideo.isNull()) {
+    if (myVideo.get() != nullptr) {
         myVideo->switchAudioDevice(params.AudioAlDevice->getCTitle());
     }
 }
 
 bool StMoviePlayer::hasAlHintOutput() const {
-    return !myVideo.isNull()
-         && myVideo->hasAlHintOutput();
+    return myVideo.get() != nullptr
+        && myVideo->hasAlHintOutput();
 }
 
 bool StMoviePlayer::hasAlHintHrtf() const {
-    return !myVideo.isNull()
-         && myVideo->hasAlHintHrtf();
+    return myVideo.get() != nullptr
+        && myVideo->hasAlHintHrtf();
 }
 
 void StMoviePlayer::doSwitchAudioAlHints(const int32_t ) {
-    if(!myVideo.isNull()) {
+    if (myVideo.get() != nullptr) {
         myVideo->setAlHints((StAudioQueue::StAlHintOutput )params.AudioAlOutput->getValue(),
                             (StAudioQueue::StAlHintHrtf )params.AudioAlHrtf->getValue());
     }
 }
 
 void StMoviePlayer::doSetForceBFormat(const bool theValue) {
-    if(!myVideo.isNull()) {
+    if (myVideo.get() != nullptr) {
         myVideo->setForceBFormat(theValue);
     }
 }
 
 void StMoviePlayer::doSetAudioVolume(const float theGaindB) {
-    if(!myVideo.isNull()
-    && !params.AudioMute->getValue()) {
+    if (myVideo.get() != nullptr
+     && !params.AudioMute->getValue()) {
         const GLfloat aGain = params.AudioGain->isMinValue()
                             ? 0.0f
                             : GLfloat(StMoviePlayerGUI::dBellToRatio(theGaindB));
@@ -2040,7 +2052,7 @@
 }
 
 void StMoviePlayer::doSetAudioMute(const bool theToMute) {
-    if(!myVideo.isNull()) {
+    if (myVideo.get() != nullptr) {
         const GLfloat aGain = (theToMute || params.AudioGain->isMinValue())
                             ? 0.0f
                             : GLfloat(StMoviePlayerGUI::dBellToRatio(params.AudioGain->getValue()));
@@ -2049,7 +2061,7 @@
 }
 
 void StMoviePlayer::doSetAudioDelay(const float theDelaySec) {
-    if(!myVideo.isNull()) {
+    if (myVideo.get() != nullptr) {
         myVideo->setAudioDelay(theDelaySec);
     }
 }
@@ -2091,65 +2103,52 @@
 }
 
 void StMoviePlayer::doAboutFile(const size_t ) {
-    if(!myGUI.isNull()) {
+    if (myGUI.get() != nullptr) {
         myGUI->doAboutFile(0);
     }
 }
 
 void StMoviePlayer::doSwitchViewMode(const int32_t theMode) {
-    if(myVideo.isNull()) {
+    if (myVideo.get() == nullptr || myGUI.get() == nullptr)
         return;
-    }
 
+    params.LastPanoramaMode->setValue(theMode);
     myVideo->setTheaterMode(theMode == StViewSurface_Theater);
 }
 
 void StMoviePlayer::doTheaterOnOff(const size_t ) {
-    if(myVideo.isNull()) {
+    if (myVideo.get() == nullptr)
         return;
-    }
 
-    myVideo->setTheaterMode(!myVideo->isTheaterMode());
+    const bool newTheaterMode = !myVideo->isTheaterMode();
+    if (params.ToStickPanorama->getValue()) {
+        params.LastPanoramaMode->setValue(newTheaterMode ? StViewSurface_Theater : StViewSurface_Plain);
+    }
+    myVideo->setTheaterMode(newTheaterMode);
 }
 
 void StMoviePlayer::doPanoramaOnOff(const size_t ) {
-    if(myVideo.isNull()) {
-        return;
-    }
-
-    StHandle<StStereoParams> aParams = myGUI->myImage->getSource();
-    if(aParams.isNull()
-    || aParams->Src1SizeX == 0
-    || aParams->Src1SizeY == 0) {
+    if (myVideo.get() == nullptr)
         return;
-    }
 
-    int aMode = myGUI->myImage->params.ViewMode->getValue();
-    if(aMode != StViewSurface_Plain) {
-        myGUI->myImage->params.ViewMode->setValue(StViewSurface_Plain);
+    std::shared_ptr<StStereoParams> aParams = myGUI->myImage->getSource();
+    if (aParams.get() == nullptr
+     || aParams->Src1SizeX == 0
+     || aParams->Src1SizeY == 0) {
         return;
     }
 
-    StPanorama aPano = st::probePanorama(aParams->StereoFormat,
-                                         aParams->Src1SizeX, aParams->Src1SizeY,
-                                         aParams->Src2SizeX, aParams->Src2SizeY);
-    myGUI->myImage->params.ViewMode->setValue(StStereoParams::getViewSurfaceForPanoramaSource(aPano, true));
-}
-
-void StMoviePlayer::doChangeStickPano360(const bool ) {
-    if(myVideo.isNull()) {
-        return;
-    }
-
-    myVideo->setStickPano360(params.ToStickPanorama->getValue());
-}
-
-void StMoviePlayer::doChangeSwapJPS(const bool ) {
-    if(myVideo.isNull()) {
-        return;
+    const int anOldMode = myGUI->myImage->params.ViewMode->getValue();
+    StViewSurface aNewMode = StViewSurface_Plain;
+    if (anOldMode == StViewSurface_Plain) {
+        StPanorama aPano = st::probePanorama(aParams->StereoFormat,
+                                             aParams->Src1SizeX, aParams->Src1SizeY,
+                                             aParams->Src2SizeX, aParams->Src2SizeY);
+        aNewMode = StStereoParams::getViewSurfaceForPanoramaSource(aPano, true);
     }
 
-    myVideo->setSwapJPS(params.ToSwapJPS->getValue());
+    myGUI->myImage->params.ViewMode->setValue(aNewMode);
+    params.LastPanoramaMode->setValue(aNewMode);
 }
 
 void StMoviePlayer::doSwitchSrcFormat(const int32_t theSrcFormat) {
@@ -2159,21 +2158,21 @@
     bool   isVideoPlayed = false;
     bool   isAudioPlayed = false;
     bool   isPlaying = myVideo->getPlaybackState(aDuration, aPts, isVideoPlayed, isAudioPlayed);
-    StHandle<StStereoParams> aParams = myGUI->myImage->getSource();
-    if(!isPlaying && !aParams.isNull() && myGUI->myImage->hasVideoStream()) {
+    std::shared_ptr<StStereoParams> aParams = myGUI->myImage->getSource();
+    if (!isPlaying && aParams.get() != nullptr && myGUI->myImage->hasVideoStream()) {
         myVideo->pushPlayEvent(ST_PLAYEVENT_SEEK, aPts - 0.01);
     }
 }
 
 void StMoviePlayer::doSetStereoOutput(const size_t theMode) {
-    if(myVideo.isNull()) {
+    if (myVideo.get() == nullptr) {
         return;
     }
     myGUI->myImage->params.DisplayMode->setValue((int32_t )theMode);
 }
 
 void StMoviePlayer::doScaleGui(const int32_t ) {
-    if(myGUI.isNull()) {
+    if (myGUI.get() == nullptr) {
         return;
     }
     myToRecreateMenu = true;
@@ -2184,21 +2183,21 @@
 }
 
 void StMoviePlayer::doScaleHiDPI(const bool ) {
-    if(myGUI.isNull()) {
+    if (myGUI.get() == nullptr) {
         return;
     }
     myToRecreateMenu = true;
 }
 
 void StMoviePlayer::doChangeMixImagesVideos(const bool theToMix) {
-    if(myVideo.isNull()) {
+    if (myVideo.get() == nullptr) {
         return;
     }
     if(theToMix) {
-        StArrayList<StString> aMediaExt = myVideo->getMimeListVideo().getExtensionsList();
-        StArrayList<StString> anImgExt  = myVideo->getMimeListImages().getExtensionsList();
-        for(size_t anExtIter = 0; anExtIter < anImgExt.size(); ++anExtIter) {
-            aMediaExt.add(anImgExt.getValue(anExtIter));
+        std::vector<StString>       aMediaExt = myVideo->getMimeListVideo().getExtensionsList();
+        const std::vector<StString> anImgExt  = myVideo->getMimeListImages().getExtensionsList();
+        for (const StString& anExtIter : anImgExt) {
+            aMediaExt.push_back(anExtIter);
         }
         myPlayList->setExtensions(aMediaExt);
     } else {
@@ -2239,11 +2238,11 @@
 }
 
 void StMoviePlayer::doShowHideGUI(const size_t ) {
-    const bool toShow = !params.ToShowMenu->getValue() || (!myGUI.isNull() && !myGUI->isVisibleGUI());
+    const bool toShow = !params.ToShowMenu->getValue() || (myGUI.get() != nullptr && !myGUI->isVisibleGUI());
     params.ToShowMenu->setValue(toShow);
     params.ToShowTopbar->setValue(toShow);
     params.ToShowBottom->setValue(toShow);
-    if(toShow && !myGUI.isNull()) {
+    if (toShow && myGUI.get() != nullptr) {
         myGUI->setVisibility(myWindow->getMousePos(), false, true);
     }
 }
@@ -2265,7 +2264,7 @@
 }
 
 void StMoviePlayer::doOpen1FileAction(const size_t ) {
-    if(!myGUI.isNull() && (myWindow->isFullScreen() || myGUI->isMobile())) {
+    if (myGUI.get() != nullptr && (myWindow->isFullScreen() || myGUI->isMobile())) {
         myGUI->doOpenFile(StMovieOpenDialog::Dialog_SingleMovie);
         return;
     }
@@ -2273,7 +2272,7 @@
 }
 
 void StMoviePlayer::doOpen2Files(const size_t ) {
-    if(!myGUI.isNull() && (myWindow->isFullScreen() || myGUI->isMobile())) {
+    if (myGUI.get() != nullptr && (myWindow->isFullScreen() || myGUI->isMobile())) {
         //myGUI->doOpenFile(StMovieOpenDialog::Dialog_DoubleMovie);
         //return;
     }
@@ -2281,24 +2280,24 @@
 }
 
 void StMoviePlayer::doSaveFileInfo(const size_t theToSave) {
-    if(!myGUI.isNull()
-    && !myFileInfo.isNull()
-    &&  theToSave == 1) {
+    if (myGUI.get() != nullptr
+     && myFileInfo.get() != nullptr
+     && theToSave == 1) {
         //myLoader->doSaveInfo(myFileInfo);
     }
-    myFileInfo.nullify();
+    myFileInfo.reset();
 }
 
 void StMoviePlayer::doOpenRecent(const size_t theItemId) {
-    if(myVideo.isNull()) {
+    if (myVideo.get() == nullptr) {
         return;
     }
 
-    StHandle<StStereoParams> anOldParams = myPlayList->openRecent(theItemId);
+    std::shared_ptr<StStereoParams> anOldParams = myPlayList->openRecent(theItemId);
     doUpdateStateLoading();
     myVideo->pushPlayEvent(ST_PLAYEVENT_RESUME);
     myVideo->doLoadNext();
-    if(!anOldParams.isNull()) {
+    if (anOldParams.get() != nullptr) {
         mySeekOnLoad = anOldParams->Timestamp;
     }
 }
@@ -2308,7 +2307,7 @@
 }
 
 void StMoviePlayer::doAddAudioStream(const size_t ) {
-    if(!myGUI.isNull() && (myWindow->isFullScreen() || myGUI->isMobile())) {
+    if (myGUI.get() != nullptr && (myWindow->isFullScreen() || myGUI->isMobile())) {
         myGUI->doOpenFile(StMovieOpenDialog::Dialog_Audio);
         return;
     }
@@ -2316,7 +2315,7 @@
 }
 
 void StMoviePlayer::doAddSubtitleStream(const size_t ) {
-    if(!myGUI.isNull() && (myWindow->isFullScreen() || myGUI->isMobile())) {
+    if (myGUI.get() != nullptr && (myWindow->isFullScreen() || myGUI->isMobile())) {
         myGUI->doOpenFile(StMovieOpenDialog::Dialog_Subtitles);
         return;
     }
@@ -2381,7 +2380,7 @@
 }
 
 void StMoviePlayer::doFullscreen(const bool theIsFullscreen) {
-    if(!myWindow.isNull()) {
+    if (myWindow.get() != nullptr) {
         myWindow->setAttribute(StWinAttr_ExclusiveFullScreen, params.IsExclusiveFullScreen->getValue());
         myWindow->setFullScreen(theIsFullscreen);
     }
@@ -2398,7 +2397,7 @@
 }
 
 void StMoviePlayer::doHideSystemBars(const bool ) {
-    if(myWindow.isNull()) {
+    if (myWindow.get() == nullptr) {
         return;
     }
 
@@ -2406,17 +2405,17 @@
 }
 
 void StMoviePlayer::doSetBenchmark(const bool theValue) {
-    if(myVideo.isNull()) {
+    if (myVideo.get() == nullptr) {
         return;
     }
 
     myVideo->setBenchmark(theValue);
 }
 
-bool StMoviePlayer::getCurrentFile(StHandle<StFileNode>&     theFileNode,
-                                   StHandle<StStereoParams>& theParams,
-                                   StHandle<StMovieInfo>&    theInfo) {
-    theInfo.nullify();
+bool StMoviePlayer::getCurrentFile(std::shared_ptr<StFileNode>& theFileNode,
+                                   std::shared_ptr<StStereoParams>& theParams,
+                                   std::shared_ptr<StMovieInfo>& theInfo) {
+    theInfo.reset();
     if(!myPlayList->getCurrentFile(theFileNode, theParams)) {
         return false;
     }
@@ -2437,20 +2436,20 @@
     // process general requests
     if(anURI.isEquals(stCString("/"))) {
         // return index page
-        StHandle<StResource> aRes = myResMgr->getResource(StString("web") + SYS_FS_SPLITTER + "index.htm");
-        mg_send_file(theConnection, !aRes.isNull() ? aRes->getPath().toCString() : "");
+        std::shared_ptr<StResource> aRes = myResMgr->getResource(StString("web") + SYS_FS_SPLITTER + "index.htm");
+        mg_send_file(theConnection, aRes.get() != nullptr ? aRes->getPath().toCString() : "");
         return 1;
     } else if(anURI.isStartsWith(stCString("/web"))) {
         // return Web UI files
         const StString aSubPath = anURI.subString(5, size_t(-1));
-        StHandle<StResource> aRes = myResMgr->getResource(StString("web") + SYS_FS_SPLITTER + aSubPath);
-        mg_send_file(theConnection, !aRes.isNull() ? aRes->getPath().toCString() : "");
+        std::shared_ptr<StResource> aRes = myResMgr->getResource(StString("web") + SYS_FS_SPLITTER + aSubPath);
+        mg_send_file(theConnection, aRes.get() != nullptr ? aRes->getPath().toCString() : "");
         return 1;
     } else if(anURI.isStartsWith(stCString("/textures"))) {
         // return textures images
         const StString aSubPath = anURI.subString(10, size_t(-1));
-        StHandle<StResource> aRes = myResMgr->getResource(StString("textures") + SYS_FS_SPLITTER + aSubPath);
-        mg_send_file(theConnection, !aRes.isNull() ? aRes->getPath().toCString() : "");
+        std::shared_ptr<StResource> aRes = myResMgr->getResource(StString("textures") + SYS_FS_SPLITTER + aSubPath);
+        mg_send_file(theConnection, aRes.get() != nullptr ? aRes->getPath().toCString() : "");
         return 1;
     }

_service:obs_scm:sview-26.obscpio/StMoviePlayer/StMoviePlayer.h Changed

@@ -76,9 +76,9 @@
     /**
      * Main constructor.
      */
-    ST_CPPEXPORT StMoviePlayer(const StHandle<StResourceManager>& theResMgr,
-                               const StNativeWin_t                theParentWin = (StNativeWin_t )NULL,
-                               const StHandle<StOpenInfo>&        theOpenInfo  = NULL);
+    ST_CPPEXPORT StMoviePlayer(const std::shared_ptr<StResourceManager>& theResMgr,
+                               const StNativeWin_t                       theParentWin = (StNativeWin_t )nullptr,
+                               const std::shared_ptr<StOpenInfo>&        theOpenInfo  = std::shared_ptr<StOpenInfo>());
 
     /**
      * Destructor.
@@ -151,9 +151,9 @@
 
         public: //! @name Properties
 
-    ST_LOCAL bool getCurrentFile(StHandle<StFileNode>&     theFileNode,
-                                 StHandle<StStereoParams>& theParams,
-                                 StHandle<StMovieInfo>&    theInfo);
+    ST_LOCAL bool getCurrentFile(std::shared_ptr<StFileNode>&     theFileNode,
+                                 std::shared_ptr<StStereoParams>& theParams,
+                                 std::shared_ptr<StMovieInfo>&    theInfo);
 
     ST_LOCAL void getRecentList(StArrayList<StString>& theList);
 
@@ -161,7 +161,7 @@
      * Return true if mobile UI should be enabled considering user option and window margins.
      */
     ST_LOCAL bool toUseMobileUI() const {
-        return toUseMobileUI(!myWindow.isNull() ? myWindow->getMargins() : StMarginsI());
+        return toUseMobileUI(myWindow.get() != nullptr ? myWindow->getMargins() : StMarginsI());
     }
 
     /**
@@ -216,7 +216,9 @@
         StHandle<StInt32ParamNamed>   LastUpdateDay;     //!< the last time update has been checked
         StHandle<StInt32ParamNamed>   SrcStereoFormat;   //!< source format
         StHandle<StBoolParamNamed>    ToSwapJPS;         //!< swap JPS views order
-        StHandle<StBoolParamNamed>    ToStickPanorama;   //!< force panorama input for all files
+        StHandle<StBoolParamNamed>    ToSaveCrossEyed;   //!< save JPS views as cross-eyed or parallel pair
+        StHandle<StBoolParamNamed>    ToStickPanorama;   //!< persist last selected panorama mode
+        StHandle<StEnumParam>         LastPanoramaMode;  //!< last selected panorama mode
         StHandle<StBoolParamNamed>    ToTrackHead;       //!< enable/disable head-tracking
         StHandle<StBoolParamNamed>    ToTrackHeadAudio;  //!< enable/disable head-tracking for audio listener
         StHandle<StBoolParamNamed>    ToForceBFormat;    //!< force B-Format for any 4-channels audio stream
@@ -281,9 +283,9 @@
     ST_LOCAL void updateStrings();
     ST_LOCAL void saveGuiParams();
     ST_LOCAL void saveAllParams();
-    ST_LOCAL bool createGui(StHandle<StGLTextureQueue>& theTextureQueue,
-                            StHandle<StSubQueue>&       theSubQueue1,
-                            StHandle<StSubQueue>&       theSubQueue2);
+    ST_LOCAL bool createGui(std::shared_ptr<StGLTextureQueue>& theTextureQueue,
+                            std::shared_ptr<StSubQueue>&       theSubQueue1,
+                            std::shared_ptr<StSubQueue>&       theSubQueue2);
 
     /**
      * Parse arguments.
@@ -326,8 +328,6 @@
     ST_LOCAL void doSwitchViewMode(const int32_t theMode);
     ST_LOCAL void doPanoramaOnOff(const size_t );
     ST_LOCAL void doTheaterOnOff(const size_t );
-    ST_LOCAL void doChangeStickPano360(const bool );
-    ST_LOCAL void doChangeSwapJPS(const bool );
     ST_LOCAL void doSwitchAudioStream(const int32_t theStreamId);
     ST_LOCAL void doSwitchSubtitlesStream1(const int32_t theStreamId);
     ST_LOCAL void doSwitchSubtitlesStream2(const int32_t theStreamId);
@@ -405,15 +405,15 @@
 
         private: //! @name private fields
 
-    StHandle<StGLContext>       myContext;
-    StHandle<StSettings>        mySettings;        //!< settings manager for Image Viewer plugin
-    StHandle<StPlayList>        myPlayList;        //!< play list
-    StHandle<StMoviePlayerGUI>  myGUI;             //!< GUI root widget
-    StHandle<StVideo>           myVideo;           //!< main video playback class
-    StHandle<StCheckUpdates>    myUpdates;         //!< check updates utility
-    StHandle<StFileNode>        myFileToDelete;    //!< file node for removal
-    StHandle<StMovieInfo>       myFileInfo;        //!< file info for opened dialog
-    StHandle<StMovieOpenDialog> myOpenDialog;      //!< file open dialog
+    std::shared_ptr<StGLContext>       myContext;
+    std::shared_ptr<StSettings>        mySettings;        //!< settings manager for Image Viewer plugin
+    std::shared_ptr<StPlayList>        myPlayList;        //!< play list
+    std::shared_ptr<StMoviePlayerGUI>  myGUI;             //!< GUI root widget
+    std::shared_ptr<StVideo>           myVideo;           //!< main video playback class
+    std::shared_ptr<StCheckUpdates>    myUpdates;         //!< check updates utility
+    std::shared_ptr<StFileNode>        myFileToDelete;    //!< file node for removal
+    std::shared_ptr<StMovieInfo>       myFileInfo;        //!< file info for opened dialog
+    std::shared_ptr<StMovieOpenDialog> myOpenDialog;      //!< file open dialog
 
     StCondition                 myEventLoaded;     //!< indicate that new file was open
     StTimer                     myInactivityTimer; //!< timer initialized when application goes into paused state

_service:obs_scm:sview-26.obscpio/StMoviePlayer/StMoviePlayerGUI.cpp Changed

@@ -62,17 +62,17 @@
 
 namespace {
 
-    static const int DISPL_Y_REGION_UPPER  = 32;
-    static const int DISPL_X_REGION_UPPER  = 32;
-    static const int DISPL_X_REGION_BOTTOM = 52;
+    static constexpr int DISPL_Y_REGION_UPPER  = 32;
+    static constexpr int DISPL_X_REGION_UPPER  = 32;
+    static constexpr int DISPL_X_REGION_BOTTOM = 52;
 
-    static const StGLVec3 aBlack (0.0f, 0.0f, 0.0f);
-    static const StGLVec3 aGreen (0.0f, 0.6f, 0.4f);
-    static const StGLVec3 aRed   (1.0f, 0.0f, 0.0f);
+    static constexpr StGLVec3 aBlack (0.0f, 0.0f, 0.0f);
+    static constexpr StGLVec3 aGreen (0.0f, 0.6f, 0.4f);
+    static constexpr StGLVec3 aRed   (1.0f, 0.0f, 0.0f);
 
 }
 
-void StMoviePlayerGUI::createDesktopUI(const StHandle<StPlayList>& thePlayList) {
+void StMoviePlayerGUI::createDesktopUI(const std::shared_ptr<StPlayList>& thePlayList) {
     createImageAdjustments();
     createUpperToolbar();
     createBottomToolbar(64, 32);
@@ -407,6 +407,7 @@
          ->signals.onItemClick.connect(myPlugin, &StMoviePlayer::doSnapshot);
     aMenu->addItem("PNG stereo (*.pns)",  size_t(StImageFile::ST_TYPE_PNG))
          ->signals.onItemClick.connect(myPlugin, &StMoviePlayer::doSnapshot);
+    aMenu->addItem(myPlugin->params.ToSaveCrossEyed);
     return aMenu;
 }
 
@@ -462,7 +463,7 @@
 }
 
 void StMoviePlayerGUI::fillOpenALDeviceMenu(StGLMenu* theMenu) {
-    const StArrayList<StString>& aDevList = myPlugin->params.AudioAlDevice->getList();
+    const std::vector<StString>& aDevList = myPlugin->params.AudioAlDevice->getList();
 
     theMenu->addItem("Refresh list...")
            ->signals.onItemClick.connect(myPlugin, &StMoviePlayer::doUpdateOpenALDeviceList);
@@ -586,7 +587,7 @@
  */
 StGLMenu* StMoviePlayerGUI::createDisplayModeMenu() {
     StGLMenu* aMenu = new StGLMenu(this, 0, 0, StGLMenu::MENU_VERTICAL);
-    const StArrayList<StString>& aValuesList = myImage->params.DisplayMode->getValues();
+    const std::vector<StString>& aValuesList = myImage->params.DisplayMode->getValues();
     for(size_t aValIter = 0; aValIter < aValuesList.size(); ++aValIter) {
         aMenu->addItem(aValuesListaValIter, myImage->params.DisplayMode, int32_t(aValIter));
     }
@@ -892,7 +893,7 @@
     StGLMenu* aMenuFpsControl   = createFpsMenu();
 
     const StHandle<StEnumParam>& aDevicesEnum = myPlugin->StApplication::params.ActiveDevice;
-    const StArrayList<StString>& aValuesList  = aDevicesEnum->getValues();
+    const std::vector<StString>& aValuesList  = aDevicesEnum->getValues();
     for(size_t aValIter = 0; aValIter < aValuesList.size(); ++aValIter) {
         aMenuChangeDevice->addItem(aValuesListaValIter, aDevicesEnum, int32_t(aValIter));
     }
@@ -903,7 +904,7 @@
          ->signals.onItemClick.connect(this, &StMoviePlayerGUI::doAboutRenderer);
     aMenu->addItem(tr(MENU_FPS),           aMenuFpsControl);
 
-    const StHandle<StWindow>& aRend = myPlugin->getMainWindow();
+    const std::shared_ptr<StWindow>& aRend = myPlugin->getMainWindow();
     StParamsList aParams;
     aRend->getOptions(aParams);
     StHandle<StBoolParamNamed> aBool;
@@ -914,7 +915,7 @@
             aMenu->addItem(aBool->getName(), aBool);
         } else if(anEnum.downcastFrom(aParam)) {
             StGLMenu* aChildMenu = new StGLMenu(this, 0, 0, StGLMenu::MENU_VERTICAL);
-            const StArrayList<StString>& aValues = anEnum->getValues();
+            const std::vector<StString>& aValues = anEnum->getValues();
             for(size_t aValIter = 0; aValIter < aValues.size(); ++aValIter) {
                 aChildMenu->addItem(aValuesaValIter, anEnum, int32_t(aValIter));
             }
@@ -1006,14 +1007,14 @@
 };
 
 void StMoviePlayerGUI::doAboutFile(const size_t ) {
-    StHandle<StMovieInfo>& anExtraInfo = myPlugin->myFileInfo;
-    anExtraInfo.nullify();
+    std::shared_ptr<StMovieInfo>& anExtraInfo = myPlugin->myFileInfo;
+    anExtraInfo.reset();
 
-    StHandle<StFileNode>     aFileNode;
-    StHandle<StStereoParams> aParams;
+    std::shared_ptr<StFileNode>     aFileNode;
+    std::shared_ptr<StStereoParams> aParams;
     if(!myPlugin->getCurrentFile(aFileNode, aParams, anExtraInfo)
-    ||  anExtraInfo.isNull()) {
-        anExtraInfo.nullify();
+    ||  anExtraInfo.get() == nullptr) {
+        anExtraInfo.reset();
         StGLMessageBox* aMsgBox = new StGLMessageBox(this, tr(DIALOG_FILE_INFO), tr(DIALOG_FILE_NOINFO));
         aMsgBox->addButton(tr(BUTTON_CLOSE), true);
         aMsgBox->stglInit();
@@ -1191,7 +1192,7 @@
     return aMenu;
 }
 
-void StMoviePlayerGUI::createMobileUI(const StHandle<StPlayList>& thePlayList) {
+void StMoviePlayerGUI::createMobileUI(const std::shared_ptr<StPlayList>& thePlayList) {
     createImageAdjustments();
     createMobileUpperToolbar();
     createMobileBottomToolbar();
@@ -1534,8 +1535,8 @@
     }
 
     if(myPlugin->params.lastFolder.isEmpty()) {
-        StHandle<StFileNode> aCurrFile = myPlugin->myPlayList->getCurrentFile();
-        if(!aCurrFile.isNull()) {
+        std::shared_ptr<StFileNode> aCurrFile = myPlugin->myPlayList->getCurrentFile();
+        if (aCurrFile.get() != nullptr) {
             myPlugin->params.lastFolder = aCurrFile->isEmpty() ? aCurrFile->getFolderPath() : aCurrFile->getValue(0)->getFolderPath();
         }
     }
@@ -1546,26 +1547,25 @@
 void StMoviePlayerGUI::doShowMobileExMenu(const size_t ) {
     const int aTop = scale(56);
 
-    StHandle<StMovieInfo>&   anExtraInfo = myPlugin->myFileInfo;
-    StHandle<StFileNode>     aFileNode;
-    StHandle<StStereoParams> aParams;
-    if(anExtraInfo.isNull()
-    && !myPlugin->getCurrentFile(aFileNode, aParams, anExtraInfo)) {
-        anExtraInfo.nullify();
+    std::shared_ptr<StMovieInfo>&   anExtraInfo = myPlugin->myFileInfo;
+    std::shared_ptr<StFileNode>     aFileNode;
+    std::shared_ptr<StStereoParams> aParams;
+    if (anExtraInfo.get() == nullptr
+     && !myPlugin->getCurrentFile(aFileNode, aParams, anExtraInfo)) {
+        anExtraInfo.reset();
     }
 
     StGLMenu*     aMenu  = new StGLMenu(this, 0, aTop, StGLMenu::MENU_VERTICAL_COMPACT, true);
     StGLMenuItem* anItem = NULL;
     aMenu->setCorner(StGLCorner(ST_VCORNER_TOP, ST_HCORNER_RIGHT));
     aMenu->setContextual(true);
-    if(!anExtraInfo.isNull()) {
+    if (anExtraInfo.get() != nullptr) {
         anItem = aMenu->addItem(tr(BUTTON_DELETE), myPlugin->getAction(StMoviePlayer::Action_DeleteFile));
         anItem->setIcon(stCMenuIcon("actionDiscard"));
 
         const bool hasVideo = myPlugin->myVideo->hasVideoStream();
-        const StHandle< StArrayList<StString> >& anAudioStreams = myPlugin->myVideo->params.activeAudio->getList();
-        if(!anAudioStreams.isNull()
-        && !anAudioStreams->isEmpty()) {
+        const std::shared_ptr<std::vector<StString>> anAudioStreams = myPlugin->myVideo->params.activeAudio->getList();
+        if (anAudioStreams.get() != nullptr && !anAudioStreams->empty()) {
             anItem = aMenu->addItem(tr(MENU_AUDIO));
             anItem->setIcon(stCMenuIcon("actionStreamAudio"));
             anItem->signals.onItemClick += stSlot(this, &StMoviePlayerGUI::doAudioStreamsCombo);
@@ -1576,9 +1576,8 @@
             anItem->signals.onItemClick += stSlot(this, &StMoviePlayerGUI::doAudioStreamsCombo);
         }
 
-        const StHandle< StArrayList<StString> >& aSubsStreams1 = myPlugin->myVideo->params.activeSubtitles1->getList();
-        if(!aSubsStreams1.isNull()
-        && !aSubsStreams1->isEmpty()) {
+        const std::shared_ptr<std::vector<StString>> aSubsStreams1 = myPlugin->myVideo->params.activeSubtitles1->getList();
+        if (aSubsStreams1.get() != nullptr && !aSubsStreams1->empty()) {
             anItem = aMenu->addItem(tr(MENU_SUBTITLES));
             anItem->setIcon(stCMenuIcon("actionStreamSubtitles"));
             anItem->signals.onItemClick += stSlot(this, &StMoviePlayerGUI::doSubtitlesStreamsCombo1);
@@ -1604,7 +1603,7 @@
             anItem->signals.onItemClick += stSlot(this, &StMoviePlayerGUI::doDisplayRatioCombo);
         }
 
-        anExtraInfo.nullify();
+        anExtraInfo.reset();
     }
     anItem = aMenu->addItem(tr(MENU_HELP_ABOUT));
     anItem->setIcon(stCMenuIcon("actionHelp"));
@@ -1616,13 +1615,13 @@
     setFocus(aMenu);
 }
 
-StMoviePlayerGUI::StMoviePlayerGUI(StMoviePlayer*  thePlugin,
-                                   StWindow*       theWindow,
+StMoviePlayerGUI::StMoviePlayerGUI(StMoviePlayer* thePlugin,
+                                   StWindow* theWindow,
                                    StTranslations* theLangMap,
-                                   const StHandle<StPlayList>&       thePlayList,
-                                   const StHandle<StGLTextureQueue>& theTextureQueue,
-                                   const StHandle<StSubQueue>&       theSubQueue1,
-                                   const StHandle<StSubQueue>&       theSubQueue2)
+                                   const std::shared_ptr<StPlayList>& thePlayList,
+                                   const std::shared_ptr<StGLTextureQueue>& theTextureQueue,
+                                   const std::shared_ptr<StSubQueue>& theSubQueue1,
+                                   const std::shared_ptr<StSubQueue>& theSubQueue2)
 : StGLRootWidget(thePlugin->myResMgr),
   myPlugin(thePlugin),
   myWindow(theWindow),
@@ -1913,22 +1912,56 @@
     myAnimVisibility.doTouch(theEvent);
 }
 
-void StMoviePlayerGUI::doGesture(const StGestureEvent& theEvent) {
-    myAnimVisibility.doGesture(theEvent);
-    if(myImage == NULL) {
-        return;
-    }
+// Propagate gesture to main image region
+// and handle double tap to select and copy text from StGLTable to clipboard.
+// TODO move to base interface.
+static bool doGestureChildren(StWindow* theWindow,
+                              StGLImageRegion* theMainImage,
+                              StGLWidget* theStart,
+                              const StGestureEvent& theEvent,
+                              const StPointD_t& theCursor) {
+    static constexpr StGLVec3 aHiColor(0.7f, 0.7f, 0.7f);
 
-    for(StGLWidget *aChildIter(getChildren()->getLast()), *aChildActive(NULL); aChildIter != NULL;) {
-        aChildActive = aChildIter;
+    for (StGLWidget* aChildIter = theStart; aChildIter != nullptr;) {
+        StGLWidget* aChildActive = aChildIter;
         aChildIter   = aChildIter->getPrev();
-        if(aChildActive->isVisibleAndPointIn(getCursorZo())) {
-            if(aChildActive == myImage) {
-                myImage->doGesture(theEvent);
-            }
-            return;
+
+        if (!aChildActive->isVisibleAndPointIn(theCursor)) {
+            continue;
+        }
+
+        if (aChildActive == theMainImage) {
+            theMainImage->doGesture(theEvent);
+            return true;
+        }
+        if (theEvent.Type != stEvent_Gesture1DoubleTap) {
+            return false;
         }
+
+        if (StGLMessageBox* aBox = dynamic_cast<StGLMessageBox*>(aChildActive)) {
+            return doGestureChildren(theWindow, nullptr, aBox->getContent()->getChildren()->getLast(), theEvent, theCursor);
+        } else if (StGLTable* aTable = dynamic_cast<StGLTable*>(aChildActive)) {
+            return doGestureChildren(theWindow, nullptr, aTable->getChildren()->getLast(), theEvent, theCursor);
+        } else if (StGLTableItem* anItem = dynamic_cast<StGLTableItem*>(aChildActive)) {
+            aChildActive = anItem->getItem();
+        }
+
+        if (StGLTextArea* aTextItem = dynamic_cast<StGLTextArea*>(aChildActive)) {
+            ST_DEBUG_LOG("Copied text to clipboard: '" + aTextItem->getText() + "'");
+            theWindow->toClipboard(aTextItem->getText());
+            aTextItem->setBorder(!aTextItem->hasBorder());
+            aTextItem->setBackColor(aHiColor);
+            return true;
+        }
+
+        return false;
     }
+    return false;
+}
+
+void StMoviePlayerGUI::doGesture(const StGestureEvent& theEvent) {
+    myAnimVisibility.doGesture(theEvent);
+    doGestureChildren(myWindow, myImage, getChildren()->getLast(), theEvent, getCursorZo());
 }
 
 bool StMoviePlayerGUI::tryUnClick(const StClickEvent& theEvent,
@@ -1971,14 +2004,14 @@
     myAnimVisibility.setEmptyImage(!hasVideo && !myPlugin->myPlayList->isEmpty());
     myAnimVisibility.updateVisibility(theToForceHide, theToForceShow);
 
-    StHandle<StStereoParams> aParams = myImage->getSource();
+    std::shared_ptr<StStereoParams> aParams = myImage->getSource();
     StFormat aSrcFormat = (StFormat )myPlugin->params.SrcStereoFormat->getValue();
-    if( aSrcFormat == StFormat_AUTO
-    && !aParams.isNull()
-    &&  hasVideo) {
+    if (aSrcFormat == StFormat_AUTO
+     && aParams.get() != nullptr
+     && hasVideo) {
         aSrcFormat = aParams->StereoFormat;
     }
-    if(!aParams.isNull()
+    if (aParams.get() != nullptr
      && myImage->params.SwapLR->getValue()
      && hasVideo) {
         aSrcFormat = st::formatReversed(aSrcFormat);
@@ -1988,7 +2021,7 @@
                          && aSrcFormat != StFormat_AUTO;
 
     bool toShowAll = myAnimVisibility.isVisibleGui();
-    if(!toShowAll && aParams.isNull()) {
+    if (!toShowAll && aParams.get() == nullptr) {
         // reveal GUI if nothing is open
         toShowAll = true;
     }
@@ -2056,19 +2089,19 @@
 
     ///
 
-    const StViewSurface aViewMode = hasVideo && !aParams.isNull()
+    const StViewSurface aViewMode = hasVideo && aParams.get() != nullptr
                                   ? aParams->ViewingMode
                                   : StViewSurface_Plain;
     bool toShowPano = aViewMode != StViewSurface_Plain;
-    if(!toShowPano
-    &&  hasVideo
-    && !aParams.isNull()
+    if (!toShowPano
+     && hasVideo
+     && aParams.get() != nullptr
     /*&&  st::probePanorama(aParams->StereoFormat,
                           aParams->Src1SizeX, aParams->Src1SizeY,
                           aParams->Src2SizeX, aParams->Src2SizeY) != StPanorama_OFF*/) {
         toShowPano = true;
     }
-    if(myBtnPanorama != NULL) {
+    if (myBtnPanorama != nullptr) {
         myBtnPanorama->getTrackedValue()->setValue(aViewMode != StViewSurface_Plain);
         setWidgetOpacity(myBtnPanorama, toShowPano ? anOpacity : 0.0f, false);
     }
@@ -2146,17 +2179,17 @@
 }
 
 void StMoviePlayerGUI::doAudioStreamsCombo(const size_t ) {
-    const StHandle< StArrayList<StString> >& aStreams = myPlugin->myVideo->params.activeAudio->getList();
+    const std::shared_ptr<std::vector<StString>> aStreams = myPlugin->myVideo->params.activeAudio->getList();
     const bool hasVideo = myPlugin->myVideo->hasVideoStream();
 
     StGLCombobox::ListBuilder aBuilder(this);
-    if(hasVideo || aStreams.isNull() || aStreams->isEmpty()) {
+    if (hasVideo || aStreams.get() == nullptr || aStreams->empty()) {
         aBuilder.getMenu()->addItem(tr(MENU_AUDIO_NONE), myPlugin->params.AudioStream, -1);
     }
-    if(!aStreams.isNull()) {
+    if (aStreams.get() != nullptr) {
         bool hasQuadAudio = false;
         for(size_t aStreamId = 0; aStreamId < aStreams->size(); ++aStreamId) {
-            const StString& aStreamName = aStreams->getValue(aStreamId);
+            const StString& aStreamName = aStreams->at(aStreamId);
             aBuilder.getMenu()->addItem(aStreamName, myPlugin->params.AudioStream, int32_t(aStreamId));
             hasQuadAudio = hasQuadAudio
                         || aStreamName.isContains(stCString("quad,"))
@@ -2168,11 +2201,10 @@
     }
 
     //aBuilder.getMenu()->addSplitter();
-    StGLMenuItem* aDelayItem = NULL;
-    StGLRangeFieldFloat32* aDelayRange = NULL;
-    if(hasVideo) {
-        if(!aStreams.isNull()
-        && !aStreams->isEmpty()) {
+    StGLMenuItem* aDelayItem = nullptr;
+    StGLRangeFieldFloat32* aDelayRange = nullptr;
+    if (hasVideo) {
+        if (aStreams.get() != nullptr && !aStreams->empty()) {
             aDelayItem = aBuilder.getMenu()->addItem(tr(MENU_AUDIO_DELAY));
             aDelayItem->changeMargins().right = scale(100 + 16);
             aDelayItem->signals.onItemClick.connect(this, &StMoviePlayerGUI::doAudioDelay);
@@ -2252,9 +2284,9 @@
 }
 
 void StMoviePlayerGUI::doSubtitlesStreamsCombo(const size_t theIndex) {
-    const StHandle< StArrayList<StString> >& aStreams = theIndex == 0
-                                                      ? myPlugin->myVideo->params.activeSubtitles1->getList()
-                                                      : myPlugin->myVideo->params.activeSubtitles2->getList();
+    const std::shared_ptr<std::vector<StString>> aStreams = theIndex == 0
+                                                          ? myPlugin->myVideo->params.activeSubtitles1->getList()
+                                                          : myPlugin->myVideo->params.activeSubtitles2->getList();
     const bool hasAudioStream = myPlugin->myVideo->hasAudioStream();
     const bool hasVideoStream = myPlugin->myVideo->hasVideoStream();
 
@@ -2271,14 +2303,13 @@
 
     StHandle<StInt32Param>& aStreamParam = theIndex == 0 ? myPlugin->params.SubtitlesStream1 : myPlugin->params.SubtitlesStream2;
     aBuilder.getMenu()->addItem(tr(MENU_SUBTITLES_NONE), aStreamParam, -1);
-    if(!aStreams.isNull()) {
+    if (aStreams.get() != nullptr) {
         for(size_t aStreamId = 0; aStreamId < aStreams->size(); ++aStreamId) {
-            aBuilder.getMenu()->addItem(aStreams->getValue(aStreamId), aStreamParam, int32_t(aStreamId));
+            aBuilder.getMenu()->addItem(aStreams->at(aStreamId), aStreamParam, int32_t(aStreamId));
         }
     }
 
-    if(!aStreams.isNull()
-    && !aStreams->isEmpty()) {
+    if (aStreams.get() != nullptr && !aStreams->empty()) {
         //myMenuSubtitles->addSplitter();
         if(!myWindow->isMobile()) {
             fillSubtitlesFontSize(aBuilder.getMenu(), theIndex);
@@ -2291,12 +2322,10 @@
         aPlaceItem->signals.onItemClick.connect(this, &StMoviePlayerGUI::doSubtitlesPlacement);
     }
 
-    if(!aStreams.isNull()
-    && !aStreams->isEmpty()
-    && hasVideoStream) {
-        StHandle<StStereoParams> aParams = myImage->getSource();
+    if (aStreams.get() != nullptr && !aStreams->empty() && hasVideoStream) {
+        std::shared_ptr<StStereoParams> aParams = myImage->getSource();
         StFormat aSrcFormat = (StFormat )myPlugin->params.SrcStereoFormat->getValue();
-        if(aSrcFormat == StFormat_AUTO && !aParams.isNull()) {
+        if (aSrcFormat == StFormat_AUTO && aParams.get() != nullptr) {
             aSrcFormat = aParams->StereoFormat;
         }
         if(aSrcFormat == StFormat_SideBySide_LR
@@ -2427,14 +2456,14 @@
 }
 
 void StMoviePlayerGUI::doListHotKeys(const size_t ) {
-    const StHandle<StWindow>& aRend = myPlugin->getMainWindow();
+    const std::shared_ptr<StWindow>& aRend = myPlugin->getMainWindow();
     StParamsList aParams;
-    aParams.add(myPlugin->StApplication::params.ActiveDevice);
-    aParams.add(myImage->params.DisplayMode);
+    aParams.push_back(myPlugin->StApplication::params.ActiveDevice);
+    aParams.push_back(myImage->params.DisplayMode);
     aRend->getOptions(aParams);
-    aParams.add(myPlugin->params.ToShowFps);
-    aParams.add(myLangMap->params.language);
-    aParams.add(myPlugin->params.IsMobileUI);
+    aParams.push_back(myPlugin->params.ToShowFps);
+    aParams.push_back(myLangMap->params.language);
+    aParams.push_back(myPlugin->params.IsMobileUI);
 
     const StString aTitle  = tr(MENU_HELP_HOTKEYS);
     StInfoDialog*  aDialog = new StInfoDialog(myPlugin, this, aTitle, scale(650), scale(300));
@@ -2470,58 +2499,58 @@
 }
 
 void StMoviePlayerGUI::doMobileSettings(const size_t ) {
-    const StHandle<StWindow>& aRend = myPlugin->getMainWindow();
+    const std::shared_ptr<StWindow>& aRend = myPlugin->getMainWindow();
     StParamsList aParams;
-    aParams.add(myPlugin->StApplication::params.ActiveDevice);
-    aParams.add(myImage->params.DisplayMode);
-    aParams.add(myPlugin->params.ToStickPanorama);
-    aParams.add(myPlugin->params.ToSwapJPS);
+    aParams.push_back(myPlugin->StApplication::params.ActiveDevice);
+    aParams.push_back(myImage->params.DisplayMode);
+    aParams.push_back(myPlugin->params.ToStickPanorama);
+    aParams.push_back(myPlugin->params.ToSwapJPS);
     aRend->getOptions(aParams);
-    aParams.add(myPlugin->params.ToShowFps);
-    aParams.add(myPlugin->params.UseGpu);
+    aParams.push_back(myPlugin->params.ToShowFps);
+    aParams.push_back(myPlugin->params.UseGpu);
     if(myPlugin->hasAlHintOutput()) {
-        aParams.add(myPlugin->params.AudioAlOutput);
+        aParams.push_back(myPlugin->params.AudioAlOutput);
         if(myPlugin->params.AudioAlHrtf->getValue() != 0) {
-            aParams.add(myPlugin->params.AudioAlHrtf);
+            aParams.push_back(myPlugin->params.AudioAlHrtf);
         }
     } else if(myPlugin->hasAlHintHrtf()) {
-        aParams.add(myPlugin->params.AudioAlHrtf); // legacy option
+        aParams.push_back(myPlugin->params.AudioAlHrtf); // legacy option
     }
-    aParams.add(myPlugin->params.ToAutoLoadSubs);
+    aParams.push_back(myPlugin->params.ToAutoLoadSubs);
 
     if(avcodec_find_decoder_by_name("libopenjpeg") != NULL) {
-        aParams.add(myPlugin->params.UseOpenJpeg);
+        aParams.push_back(myPlugin->params.UseOpenJpeg);
     }
 
-    aParams.add(myLangMap->params.language);
-    aParams.add(myPlugin->params.ToMixImagesVideos);
-    aParams.add(myPlugin->params.SlideShowDelay);
-    aParams.add(myPlugin->params.IsMobileUI);
+    aParams.push_back(myLangMap->params.language);
+    aParams.push_back(myPlugin->params.ToMixImagesVideos);
+    aParams.push_back(myPlugin->params.SlideShowDelay);
+    aParams.push_back(myPlugin->params.IsMobileUI);
 #if defined(_WIN32) || defined(__APPLE__) // implemented only on Windows and macOS
-    aParams.add(myPlugin->params.IsExclusiveFullScreen);
+    aParams.push_back(myPlugin->params.IsExclusiveFullScreen);
 #endif
-    aParams.add(myPlugin->params.ToUseDeepColor);
-    aParams.add(myPlugin->params.ToSmoothUploads);
+    aParams.push_back(myPlugin->params.ToUseDeepColor);
+    aParams.push_back(myPlugin->params.ToSmoothUploads);
     if(isMobile()) {
-        //aParams.add(myPlugin->params.ToHideStatusBar);
-        aParams.add(myPlugin->params.ToHideNavBar);
+        //aParams.push_back(myPlugin->params.ToHideStatusBar);
+        aParams.push_back(myPlugin->params.ToHideNavBar);
     }
-    aParams.add(myPlugin->params.ExitOnEscape);
+    aParams.push_back(myPlugin->params.ExitOnEscape);
     if(!isMobile()) {
-        aParams.add(myPlugin->params.ToShowExtra);
+        aParams.push_back(myPlugin->params.ToShowExtra);
     }
     if(!isMobile()) {
-        aParams.add(myPlugin->params.BlockSleeping);
-        aParams.add(myPlugin->params.ToOpenLast);
+        aParams.push_back(myPlugin->params.BlockSleeping);
+        aParams.push_back(myPlugin->params.ToOpenLast);
     }
 #if defined(ST_UPDATES_CHECK)
-    aParams.add(myPlugin->params.CheckUpdatesDays);
+    aParams.push_back(myPlugin->params.CheckUpdatesDays);
 #endif
 
     if(!myWindow->isMobile()) {
         StHandle<StBoolParamNamed> aDefDrawerParam = myPlugin->createDefaultDrawerParam(stCString("StMoviePlayer"),
                                                                                         stCString("sView launcher starts Movie Player"));
-        aParams.add(aDefDrawerParam);
+        aParams.push_back(aDefDrawerParam);
     }
 
     StInfoDialog* aDialog = new StInfoDialog(myPlugin, this, tr(MENU_HELP_SETTINGS), scale(768), scale(300));

_service:obs_scm:sview-26.obscpio/StMoviePlayer/StMoviePlayerGUI.h Changed

@@ -94,13 +94,13 @@
 
         public: //! @name StGLRootWidget overrides
 
-    ST_LOCAL StMoviePlayerGUI(StMoviePlayer*  thePlugin,
-                              StWindow*       theWindow,
+    ST_LOCAL StMoviePlayerGUI(StMoviePlayer* thePlugin,
+                              StWindow* theWindow,
                               StTranslations* theLangMap,
-                              const StHandle<StPlayList>&       thePlayList,
-                              const StHandle<StGLTextureQueue>& theTextureQueue,
-                              const StHandle<StSubQueue>&       theSubQueue1,
-                              const StHandle<StSubQueue>&       theSubQueue2);
+                              const std::shared_ptr<StPlayList>& thePlayList,
+                              const std::shared_ptr<StGLTextureQueue>& theTextureQueue,
+                              const std::shared_ptr<StSubQueue>& theSubQueue1,
+                              const std::shared_ptr<StSubQueue>& theSubQueue2);
     ST_LOCAL virtual ~StMoviePlayerGUI();
 
     ST_LOCAL virtual void stglResize(const StGLBoxPx& theViewPort,
@@ -144,7 +144,7 @@
     /**
      * Create normal (desktop) interface.
      */
-    ST_LOCAL void createDesktopUI(const StHandle<StPlayList>& thePlayList);
+    ST_LOCAL void createDesktopUI(const std::shared_ptr<StPlayList>& thePlayList);
     ST_LOCAL void createUpperToolbar();
     ST_LOCAL void createBottomToolbar(const int theIconSize,
                                       const int theIconSizeSmall);
@@ -184,7 +184,7 @@
     /**
      * Create mobile interface.
      */
-    ST_LOCAL void createMobileUI(const StHandle<StPlayList>& thePlayList);
+    ST_LOCAL void createMobileUI(const std::shared_ptr<StPlayList>& thePlayList);
 
     ST_LOCAL void createMobileUpperToolbar();
     ST_LOCAL void createMobileBottomToolbar();

_service:obs_scm:sview-26.obscpio/StMoviePlayer/StMoviePlayerStrings.cpp Changed

_service:obs_scm:sview-26.obscpio/StMoviePlayer/StMoviePlayerStrings.h Changed

_service:obs_scm:sview-26.obscpio/StMoviePlayer/StVideo/StAudioQueue.cpp Changed

_service:obs_scm:sview-26.obscpio/StMoviePlayer/StVideo/StAudioQueue.h Changed

_service:obs_scm:sview-26.obscpio/StMoviePlayer/StVideo/StPCMBuffer.cpp Changed

_service:obs_scm:sview-26.obscpio/StMoviePlayer/StVideo/StPCMBuffer.h Changed

_service:obs_scm:sview-26.obscpio/StMoviePlayer/StVideo/StParamActiveStream.cpp Changed

@@ -20,7 +20,6 @@
 
 StParamActiveStream::StParamActiveStream()
 : StInt32Param(-1),
-  myList(new StArrayList<StString>(1)),
   myMutex(),
   myIsChanged(false) {}
 
@@ -31,22 +30,22 @@
     return aSize;
 }
 
-StHandle< StArrayList<StString> > StParamActiveStream::getList() const {
+std::shared_ptr<std::vector<StString>> StParamActiveStream::getList() const {
     myMutex.lock();
-    StHandle< StArrayList<StString> > aList = myList;
+    std::shared_ptr<std::vector<StString>> aList = myList;
     myMutex.unlock();
     return aList;
 }
 
 void StParamActiveStream::clearList() {
     myMutex.lock();
-    myList  = new StArrayList<StString>(1);
+    myList  = std::make_shared<std::vector<StString>>();
     myValue = -1;
     myIsChanged = false;
     myMutex.unlock();
 }
 
-void StParamActiveStream::setList(const StHandle< StArrayList<StString> >& theList,
+void StParamActiveStream::setList(const std::shared_ptr<std::vector<StString>>& theList,
                                   const int32_t theValue) {
     myMutex.lock();
     myList  = theList;
@@ -80,7 +79,7 @@
 
 int32_t StParamActiveStream::nextValue(const int32_t theIncrement) {
     myMutex.lock();
-    if(myList->isEmpty()) {
+    if(myList->empty()) {
         myMutex.unlock();
         return -1;
     }

_service:obs_scm:sview-26.obscpio/StMoviePlayer/StVideo/StParamActiveStream.h Changed

_service:obs_scm:sview-26.obscpio/StMoviePlayer/StVideo/StSubtitleQueue.cpp Changed

@@ -37,7 +37,7 @@
     return SV_THREAD_RETURN 0;
 }
 
-StSubtitleQueue::StSubtitleQueue(const StHandle<StSubQueue>& theSubtitlesQueue)
+StSubtitleQueue::StSubtitleQueue(const std::shared_ptr<StSubQueue>& theSubtitlesQueue)
 : StAVPacketQueue(512),
   myOutQueue(theSubtitlesQueue),
   myThread(NULL),
@@ -161,7 +161,7 @@
                                 aDuration = 3.0; // duration is always zero here...
                             }
 
-                            StHandle<StSubItem> aNewSubItem = new StSubItem(aPts, aPts + aDuration);
+                            std::shared_ptr<StSubItem> aNewSubItem = std::make_shared<StSubItem>(aPts, aPts + aDuration);
                             aNewSubItem->Image.initTrash(StImagePlane::ImgRGBA, aRect->w, aRect->h);
                             aNewSubItem->Scale = myImageScale;
 
@@ -196,7 +196,7 @@
                             break;
                         }
                         case SUBTITLE_TEXT: {
-                            StHandle<StSubItem> aNewSubItem = new StSubItem(aPts, aPts + aDuration);
+                            std::shared_ptr<StSubItem> aNewSubItem = std::make_shared<StSubItem>(aPts, aPts + aDuration);
                             aNewSubItem->Text = aRect->text;
                             aNewSubItem->Text.replaceFast(ST_CRLF_REDUNDANT, ST_CRLF_REPLACEMENT); // remove redundant CR symbols
                             myOutQueue->push(aNewSubItem);
@@ -204,8 +204,8 @@
                         }
                         case SUBTITLE_ASS: {
                             StString aTextData = aRect->ass;
-                            StHandle<StSubItem> aNewSubItem = myASS.parseEvent(aTextData, aPts, aDuration);
-                            if(!aNewSubItem.isNull()) {
+                            std::shared_ptr<StSubItem> aNewSubItem = myASS.parseEvent(aTextData, aPts, aDuration);
+                            if (aNewSubItem.get() != nullptr) {
                                 myOutQueue->push(aNewSubItem);
                             }
                             break;
@@ -219,7 +219,7 @@
             avsubtitle_free(&aSubtitle);
         } else {
             // just plain text
-            StHandle<StSubItem> aNewSubItem = new StSubItem(aPts, aPts + aDuration);
+            std::shared_ptr<StSubItem> aNewSubItem = std::make_shared<StSubItem>(aPts, aPts + aDuration);
             aNewSubItem->Text = (const char* )aPacket->getData();
             aNewSubItem->Text.replaceFast(ST_CRLF_REDUNDANT, ST_CRLF_REPLACEMENT); // remove redundant CR symbols
             myOutQueue->push(aNewSubItem);

_service:obs_scm:sview-26.obscpio/StMoviePlayer/StVideo/StSubtitleQueue.h Changed

_service:obs_scm:sview-26.obscpio/StMoviePlayer/StVideo/StSubtitlesASS.cpp Changed

@@ -19,6 +19,8 @@
 #include "StSubtitlesASS.h"
 
 #include <StGLWidgets/StSubQueue.h>
+#include <StTemplates/StArrayList.h>
+
 #include <cmath>
 
 namespace {
@@ -246,11 +248,11 @@
     }
 }
 
-StHandle<StSubItem> StSubtitlesASS::parseEvent(const StString& theString,
-                                               double thePts,
-                                               double theDuration) {
+std::shared_ptr<StSubItem> StSubtitlesASS::parseEvent(const StString& theString,
+                                                      double thePts,
+                                                      double theDuration) {
     if(!isValid()) {
-        return StHandle<StSubItem>();
+        return std::shared_ptr<StSubItem>();
     }
 
     double aDuration = theDuration;
@@ -259,7 +261,7 @@
     if(theString.isStartsWithIgnoreCase(HEADER_Dialog)) {
         aList = theString.split(',', size_t(myElementsNb));
         if(aList->size() < size_t(myElementsNb)) {
-            return StHandle<StSubItem>();
+            return std::shared_ptr<StSubItem>();
         }
 
         aDuration = parseTime(aList->getValue(myIdPtsEnd)) - parseTime(aList->getValue(myIdPtsStart));
@@ -274,7 +276,7 @@
         // TODO - where this format is documented?
         aList = theString.split(',', size_t(9));
         if(aList->size() != 9) {
-            return StHandle<StSubItem>();
+            return std::shared_ptr<StSubItem>();
         }
 
         aText = &aList->changeValue(8);
@@ -288,7 +290,7 @@
     }
     if(aText->isEmpty()) {
         // ignore empty strings
-        return StHandle<StSubItem>();
+        return std::shared_ptr<StSubItem>();
     }
 
     // parse style codes
@@ -297,7 +299,7 @@
     aText->replaceFast(ST_CRLF_REDUNDANT, ST_CRLF_REPLACEMENT);
     aText->replaceFast(ST_ASS_NEWLINE,    ST_NEWLINE_REPLACEMENT);
     aText->replaceFast(ST_ASS_NEWLINE2,   ST_NEWLINE_REPLACEMENT);
-    StHandle<StSubItem> aNewSubItem = new StSubItem(thePts, thePts + aDuration);
+    std::shared_ptr<StSubItem> aNewSubItem = std::make_shared<StSubItem>(thePts, thePts + aDuration);
     aNewSubItem->Text = *aText;
     return aNewSubItem;
 }

_service:obs_scm:sview-26.obscpio/StMoviePlayer/StVideo/StSubtitlesASS.h Changed

_service:obs_scm:sview-26.obscpio/StMoviePlayer/StVideo/StVideo.cpp Changed

@@ -28,8 +28,8 @@
 using namespace StMoviePlayerStrings;
 
 namespace {
-    static const char ST_AUDIOS_MIME_STRING = ST_VIDEO_PLUGIN_AUDIO_MIME_CHAR;
-    static const char ST_SUBTIT_MIME_STRING = ST_VIDEO_PLUGIN_SUBTIT_MIME_CHAR;
+    static constexpr char ST_AUDIOS_MIME_STRING = ST_VIDEO_PLUGIN_AUDIO_MIME_CHAR;
+    static constexpr char ST_SUBTIT_MIME_STRING = ST_VIDEO_PLUGIN_SUBTIT_MIME_CHAR;
 
     static SV_THREAD_FUNCTION threadFunction(void* theStVideo) {
         StVideo* aStVideo  = (StVideo* )theStVideo;
@@ -104,15 +104,15 @@
 const char* StVideo::ST_IMAGES_MIME_STRING = ST_IMAGE_PLUGIN_MIME_CHAR;
 const char* StVideo::ST_VIDEOS_MIME_STRING = ST_VIDEO_PLUGIN_MIME_CHAR;
 
-StVideo::StVideo(const std::string&                 theALDeviceName,
-                 StAudioQueue::StAlHintOutput       theAlOutput,
-                 StAudioQueue::StAlHintHrtf         theAlHrtf,
-                 const StHandle<StResourceManager>& theResMgr,
-                 const StHandle<StTranslations>&    theLangMap,
-                 const StHandle<StPlayList>&        thePlayList,
-                 const StHandle<StGLTextureQueue>&  theTextureQueue,
-                 const StHandle<StSubQueue>&        theSubtitlesQueue1,
-                 const StHandle<StSubQueue>&        theSubtitlesQueue2)
+StVideo::StVideo(const std::string& theALDeviceName,
+                 StAudioQueue::StAlHintOutput theAlOutput,
+                 StAudioQueue::StAlHintHrtf theAlHrtf,
+                 const std::shared_ptr<StResourceManager>& theResMgr,
+                 const std::shared_ptr<StTranslations>& theLangMap,
+                 const std::shared_ptr<StPlayList>& thePlayList,
+                 const std::shared_ptr<StGLTextureQueue>& theTextureQueue,
+                 const std::shared_ptr<StSubQueue>& theSubtitlesQueue1,
+                 const std::shared_ptr<StSubQueue>& theSubtitlesQueue2)
 : myMimesVideo(ST_VIDEOS_MIME_STRING),
   myMimesAudio(ST_AUDIOS_MIME_STRING),
   myMimesSubs(ST_SUBTIT_MIME_STRING),
@@ -139,9 +139,9 @@
 
     myPlayList->setExtensions(myMimesVideo.getExtensionsList());
     myTracksExt = myMimesSubs.getExtensionsList();
-    StArrayList<StString> anAudioExt = myMimesAudio.getExtensionsList();
-    for(size_t anExtIter = 0; anExtIter < anAudioExt.size(); ++anExtIter) {
-        myTracksExt.add(anAudioExt.getValue(anExtIter));
+    const std::vector<StString> anAudioExt = myMimesAudio.getExtensionsList();
+    for (const StString& anExtIter : anAudioExt) {
+        myTracksExt.push_back(anExtIter);
     }
 
     params.UseGpu           = new StBoolParam(false);
@@ -150,23 +150,23 @@
     params.activeSubtitles1 = new StParamActiveStream();
     params.activeSubtitles2 = new StParamActiveStream();
 
-    myVideoMaster = new StVideoQueue(myTextureQueue);
+    myVideoMaster = std::make_shared<StVideoQueue>(myTextureQueue);
     myVideoMaster->signals.onError.connect(this, &StVideo::doOnErrorRedirect);
 
-    myVideoSlave  = new StVideoQueue(myTextureQueue, myVideoMaster);
+    myVideoSlave  = std::make_shared<StVideoQueue>(myTextureQueue, myVideoMaster);
     myVideoSlave->signals.onError.connect(this, &StVideo::doOnErrorRedirect);
 
-    myAudio = new StAudioQueue(theALDeviceName, theAlOutput, theAlHrtf);
+    myAudio = std::make_shared<StAudioQueue>(theALDeviceName, theAlOutput, theAlHrtf);
     myAudio->signals.onError.connect(this, &StVideo::doOnErrorRedirect);
 
-    mySubtitles1 = new StSubtitleQueue(theSubtitlesQueue1);
+    mySubtitles1 = std::make_shared<StSubtitleQueue>(theSubtitlesQueue1);
     mySubtitles1->signals.onError.connect(this, &StVideo::doOnErrorRedirect);
 
-    mySubtitles2 = new StSubtitleQueue(theSubtitlesQueue2);
+    mySubtitles2 = std::make_shared<StSubtitleQueue>(theSubtitlesQueue2);
     mySubtitles2->signals.onError.connect(this, &StVideo::doOnErrorRedirect);
 
     // launch working thread
-    myThread = new StThread(threadFunction, (void* )this, "StVideo");
+    myThread = std::make_shared<StThread>(threadFunction, (void* )this, "StVideo");
 }
 
 class ST_LOCAL StHangKiller {
@@ -179,13 +179,13 @@
       myLimitSec(theLimitSec),
       myDoneEvent(false),
       myStageIter(0) {
-        myThread = new StThread(threadWatcher, this, "StHangKiller");
+        myThread = std::make_shared<StThread>(threadWatcher, this, "StHangKiller");
     }
 
     ~StHangKiller() {
         myDoneEvent.set();
         myThread->wait();
-        myThread.nullify();
+        myThread.reset();
     }
 
     void nextStage() {
@@ -226,7 +226,8 @@
 
         private:
 
-    StHandle<StThread> myThread;
+    std::shared_ptr<StThread> myThread;
+
     const char**       myStages;
     const double       myLimitSec;
     StCondition        myDoneEvent;
@@ -262,32 +263,32 @@
 
     StHangKiller aHangKiller(10.0, THE_STATES);
     myThread->wait();
-    myThread.nullify();
-    myVideoTimer.nullify();
+    myThread.reset();
+    myVideoTimer.reset();
 
     // close all decoding threads
     aHangKiller.nextStage();
-    mySubtitles2.nullify();
-    mySubtitles1.nullify();
+    mySubtitles2.reset();
+    mySubtitles1.reset();
     aHangKiller.nextStage();
-    myAudio.nullify();
+    myAudio.reset();
     aHangKiller.nextStage();
-    myVideoSlave.nullify();
+    myVideoSlave.reset();
     aHangKiller.nextStage();
-    myVideoMaster.nullify();
+    myVideoMaster.reset();
     aHangKiller.setDone();
     close(); // we must quit or flush video/audio threads before close()!
 }
 
 void StVideo::close() {
-    if(!myVideoSlave.isNull())  { myVideoSlave->deinit(); }
-    if(!myVideoMaster.isNull()) { myVideoMaster->deinit(); }
-    if(!myAudio.isNull())       { myAudio->deinit(); }
-    if(!mySubtitles1.isNull())  { mySubtitles1->deinit(); }
-    if(!mySubtitles2.isNull())  { mySubtitles2->deinit(); }
-    for(size_t ctxId = 0; ctxId < myCtxList.size(); ++ctxId) {
+    if (myVideoSlave.get() != nullptr)  { myVideoSlave->deinit(); }
+    if (myVideoMaster.get() != nullptr) { myVideoMaster->deinit(); }
+    if (myAudio.get() != nullptr)       { myAudio->deinit(); }
+    if (mySubtitles1.get() != nullptr)  { mySubtitles1->deinit(); }
+    if (mySubtitles2.get() != nullptr)  { mySubtitles2->deinit(); }
+    for (size_t ctxId = 0; ctxId < myCtxList.size(); ++ctxId) {
         AVFormatContext*& formatCtx = myCtxListctxId;
-        if(formatCtx != NULL) {
+        if (formatCtx != NULL) {
             avformat_close_input(&formatCtx);
         }
     }
@@ -301,9 +302,9 @@
     params.activeAudio->clearList();
     params.activeSubtitles1->clearList();
     params.activeSubtitles2->clearList();
-    myCurrNode.nullify();
-    myCurrParams.nullify();
-    myCurrPlsFile.nullify();
+    myCurrNode.reset();
+    myCurrParams.reset();
+    myCurrPlsFile.reset();
 
     myEventMutex.lock();
         myDuration = 0.0;
@@ -320,35 +321,35 @@
 }
 
 bool StVideo::addFile(const StString& theFileToLoad,
-                      const StHandle<StStereoParams>& theNewParams,
+                      const std::shared_ptr<StStereoParams>& theNewParams,
                       StStreamsInfo&  theInfo) {
     // open video file
     StString aFileName, aDummy;
     StFileNode::getFolderAndFile(theFileToLoad, aDummy, aFileName);
 
-    StHandle<StAVIOContext> anIOContext;
-    if(StFileNode::isContentProtocolPath(theFileToLoad)) {
+    std::shared_ptr<StAVIOContext> anIOContext;
+    if (StFileNode::isContentProtocolPath(theFileToLoad)) {
         int aFileDescriptor = myResMgr->openFileDescriptor(theFileToLoad);
-        if(aFileDescriptor != -1) {
-            StHandle<StAVIOFileContext> aFileCtx = new StAVIOFileContext();
-            if(aFileCtx->openFromDescriptor(aFileDescriptor, "rb")) {
+        if (aFileDescriptor != -1) {
+            std::shared_ptr<StAVIOFileContext> aFileCtx = std::make_shared<StAVIOFileContext>();
+            if (aFileCtx->openFromDescriptor(aFileDescriptor, "rb")) {
                 anIOContext = aFileCtx;
             }
         }
     }
 #if defined(__ANDROID__)
-    else if(theFileToLoad.isStartsWith(stCString("https://"))) {
+    else if (theFileToLoad.isStartsWith(stCString("https://"))) {
         static const bool hasHttpsProtocol = stAV::isEnabledInputProtocol("https");
-        if(!hasHttpsProtocol) {
-            StHandle<StAVIOJniHttpContext> aHttpCtx = new StAVIOJniHttpContext();
-            if(aHttpCtx->open(theFileToLoad)) {
+        if (!hasHttpsProtocol) {
+            std::shared_ptr<StAVIOJniHttpContext> aHttpCtx = std::make_shared<StAVIOJniHttpContext>();
+            if (aHttpCtx->open(theFileToLoad)) {
                 anIOContext = aHttpCtx;
             }
         }
     }
 #endif
-    AVFormatContext* aFormatCtx = NULL;
-    if(!anIOContext.isNull()) {
+    AVFormatContext* aFormatCtx = nullptr;
+    if (anIOContext.get() != nullptr) {
         aFormatCtx = avformat_alloc_context();
         aFormatCtx->pb = anIOContext->getAvioContext();
     }
@@ -492,12 +493,12 @@
             }
 
             if( aFormatCtx->nb_streams == 1
-            && !myCtxList.isEmpty()) {
+            && !myCtxList.empty()) {
                 aStreamTitle += (aFileName.getLength() > 24)
                               ? (StString(" ...") + aFileName.subString(aFileName.getLength() - 24, aFileName.getLength()))
                               : (StString(" ") + aFileName);
             }
-            theInfo.AudioList->add(aStreamTitle);
+            theInfo.AudioList->push_back(aStreamTitle);
 
             if(!myAudio->isInitialized()
             && (aPrefLangAudio.isEmpty() || aLang == aPrefLangAudio)
@@ -519,7 +520,7 @@
             if(aFormatCtx->nb_streams == 1) {
                 aStreamTitle += StString(", ") + aFileName;
             }
-            theInfo.SubtitleList->add(aStreamTitle);
+            theInfo.SubtitleList->push_back(aStreamTitle);
 
             if(params.ToAutoLoadSubs->getValue()
             && !mySubtitles1->isInitialized()
@@ -533,7 +534,7 @@
     // load first audio stream if preferred language is unavailable
     if(!myAudio->isInitialized()
     && !aPrefLangAudio.isEmpty()
-    && !theInfo.AudioList->isEmpty()) {
+    && !theInfo.AudioList->empty()) {
         for(unsigned int aStreamId = 0; aStreamId < aFormatCtx->nb_streams; ++aStreamId) {
             AVStream* aStream = aFormatCtx->streamsaStreamId;
             if(stAV::getCodecType(aStream) != AVMEDIA_TYPE_AUDIO) {
@@ -555,7 +556,7 @@
     if(params.ToAutoLoadSubs->getValue()
     && !mySubtitles1->isInitialized()
     && !aPrefLangAudio.isEmpty()
-    && !theInfo.SubtitleList->isEmpty()) {
+    && !theInfo.SubtitleList->empty()) {
         for(unsigned int aStreamId = 0; aStreamId < aFormatCtx->nb_streams; ++aStreamId) {
             AVStream* aStream = aFormatCtx->streamsaStreamId;
             if(stAV::getCodecType(aStream) != AVMEDIA_TYPE_SUBTITLE) {
@@ -573,15 +574,15 @@
         }
     }
 
-    myFileIOList.add(anIOContext);
-    myCtxList.add(aFormatCtx);
-    myFileList.add(theFileToLoad);
+    myFileIOList.push_back(anIOContext);
+    myCtxList.push_back(aFormatCtx);
+    myFileList.push_back(theFileToLoad);
     return true;
 }
 
-bool StVideo::openSource(const StHandle<StFileNode>&     theNewSource,
-                         const StHandle<StStereoParams>& theNewParams,
-                         const StHandle<StFileNode>&     theNewPlsFile) {
+bool StVideo::openSource(const std::shared_ptr<StFileNode>&     theNewSource,
+                         const std::shared_ptr<StStereoParams>& theNewParams,
+                         const std::shared_ptr<StFileNode>&     theNewPlsFile) {
     // just for safe - close previously opened video
     close();
 
@@ -593,11 +594,13 @@
     myVideoSlave ->setUseOpenJpeg(toUseOpenJpeg);
     myAudio->setTrackHeadOrientation(false);
 
-    myFileInfoTmp = new StMovieInfo();
+    myFileInfoTmp = std::make_shared<StMovieInfo>();
 
     StStreamsInfo aStreamsInfo;
-    aStreamsInfo.AudioList    = new StArrayList<StString>(8);
-    aStreamsInfo.SubtitleList = new StArrayList<StString>(8);
+    aStreamsInfo.AudioList    = std::make_shared<std::vector<StString>>();
+    aStreamsInfo.SubtitleList = std::make_shared<std::vector<StString>>();
+    aStreamsInfo.AudioList->reserve(8);
+    aStreamsInfo.SubtitleList->reserve(8);
     if(!theNewSource->isEmpty()) {
         bool isLoaded = false;
         for(size_t aNode = 0; aNode < theNewSource->size(); ++aNode) {
@@ -868,7 +871,7 @@
     return isSeekDone;
 }
 
-bool StVideo::pushPacket(StHandle<StAVPacketQueue>& theAVPacketQueue,
+bool StVideo::pushPacket(const std::shared_ptr<StAVPacketQueue>& theAVPacketQueue,
                          StAVPacket& thePacket) {
     if(theAVPacketQueue->isFull()) {
         return false;
@@ -980,7 +983,7 @@
         && !mySubtitles2 ->isInContext(aFormatCtx)) {
             continue;
         }
-        myPlayCtxList.add(aFormatCtx);
+        myPlayCtxList.push_back(aFormatCtx);
         theAVPackets.push_back(StAVPacket(myCurrParams));
         theQueueIsFull.push_back(false);
     }
@@ -997,7 +1000,7 @@
                                       const int theIndex) {
     double aCurrPts = getPts();
     doFlushSoft();
-    StHandle<StSubtitleQueue>& aSubsQueue = theIndex == 0 ? mySubtitles1 : mySubtitles2;
+    std::shared_ptr<StSubtitleQueue>& aSubsQueue = theIndex == 0 ? mySubtitles1 : mySubtitles2;
     if(aSubsQueue->isInitialized()) {
         aSubsQueue->pushEnd();
         while(!aSubsQueue->isEmpty() || !aSubsQueue->isInDowntime()) {
@@ -1041,7 +1044,7 @@
       && !mySubtitles2 ->isInContext(aFormatCtx)) {
         continue;
       }
-      myPlayCtxList.add(aFormatCtx);
+      myPlayCtxList.push_back(aFormatCtx);
       theAVPackets.push_back(StAVPacket(myCurrParams));
       theQueueIsFull.push_back(false);
     }
@@ -1101,7 +1104,7 @@
             continue;
         }
 
-        myPlayCtxList.add(aFormatCtx);
+        myPlayCtxList.push_back(aFormatCtx);
         anAVPackets.push_back(StAVPacket(myCurrParams));
         aQueueIsFull.push_back(false);
         aQueueIsEmpty.push_back(false);
@@ -1164,7 +1167,7 @@
         // check events
         checkInitVideoStreams();
 
-        if(!myVideoTimer.isNull()) {
+        if (myVideoTimer.get() != nullptr) {
             myVideoTimer->setAudioDelay(myAudioDelayMSec);
             myVideoTimer->setBenchmark(myIsBenchmark);
         }
@@ -1187,7 +1190,7 @@
                     myCurrParams->Timestamp = 0.0f;
                 }
 
-                myPlayList->updateRecent(myCurrPlsFile.isNull() ? myCurrNode : myCurrPlsFile, myCurrParams);
+                myPlayList->updateRecent(myCurrPlsFile.get() == nullptr ? myCurrNode : myCurrPlsFile, myCurrParams);
                 if(toQuit) {
                     myQuitEvent.set();
                 }
@@ -1315,7 +1318,7 @@
 }
 
 bool StVideo::saveSnapshotAs(StImageFile::ImageType theImgType) {
-    if(myCurrParams.isNull() || myCurrNode.isNull()) {
+    if (myCurrParams.get() == nullptr || myCurrNode.get() == nullptr) {
         stInfo(myLangMap->getValue(StMoviePlayerStrings::DIALOG_NOTHING_TO_SAVE));
         return false;
     }
@@ -1335,16 +1338,18 @@
         stInfo(myLangMap->getValue(StMoviePlayerStrings::DIALOG_NO_SNAPSHOT));
         return false;
     }
-    StHandle<StImageFile> dataResult = StImageFile::create();
-    if(dataResult.isNull()) {
+    std::shared_ptr<StImageFile> dataResult = StImageFile::create();
+    if (dataResult.get() == nullptr) {
         signals.onError(stCString("No any image library was found!"));
         return false;
     }
 
-    bool toSaveStereo = !dataRight.isNull();
-    if(toSaveStereo && dataResult->initSideBySide(dataLeft, dataRight,
-                                                  myCurrParams->getSeparationDx(),
-                                                  myCurrParams->getSeparationDy())) {
+    const bool toSaveStereo = !dataRight.isNull();
+    const bool isCrossEyed = params.ToSaveCrossEyed->getValue();
+    if(toSaveStereo && dataResult->initSideBySide(isCrossEyed ? dataLeft : dataRight,
+                                                  isCrossEyed ? dataRight : dataLeft,
+                                                  isCrossEyed ? myCurrParams->getSeparationDx() : -myCurrParams->getSeparationDx(),
+                                                  isCrossEyed ? myCurrParams->getSeparationDy() : -myCurrParams->getSeparationDy())) {
         dataLeft.nullify();
         dataRight.nullify();
     } else {
@@ -1396,7 +1401,7 @@
         ST_DEBUG_LOG("Save snapshot to the path '" + fileToSave + '\'');
         StImageFile::SaveImageParams aSaveParams;
         aSaveParams.SaveImageType = theImgType;
-        aSaveParams.StereoFormat = toSaveStereo ? StFormat_SideBySide_RL : StFormat_AUTO;
+        aSaveParams.StereoFormat = toSaveStereo ? (isCrossEyed ? StFormat_SideBySide_RL : StFormat_SideBySide_LR) : StFormat_AUTO;
         if(!dataResult->save(fileToSave, aSaveParams)) {
             // TODO (Kirill Gavrilov#7)
             signals.onError(dataResult->getState());
@@ -1409,12 +1414,12 @@
     return true;
 }
 
-StHandle<StMovieInfo> StVideo::getFileInfo(const StHandle<StStereoParams>& theParams) const {
+std::shared_ptr<StMovieInfo> StVideo::getFileInfo(const std::shared_ptr<StStereoParams>& theParams) const {
     myEventMutex.lock();
-    StHandle<StMovieInfo> anInfo = myFileInfo;
+    std::shared_ptr<StMovieInfo> anInfo = myFileInfo;
     myEventMutex.unlock();
-    if(anInfo.isNull() || anInfo->Id != theParams) {
-        return NULL;
+    if (anInfo.get() == nullptr || anInfo->Id != theParams) {
+        return nullptr;
     }
 
     // continuously read source format since it can be stored in frame
@@ -1432,65 +1437,65 @@
     return anInfo;
 }
 
-void StVideo::doRemovePhysically(const StHandle<StFileNode>& theFile) {
-    if(theFile.isNull()
-    || theFile->size() != 0) {
+void StVideo::doRemovePhysically(const std::shared_ptr<StFileNode>& theFile) {
+    if (theFile.get() == nullptr
+     || theFile->size() != 0) {
         return;
     }
 
-    const StHandle<StFileNode> aCurrent = myPlayList->getCurrentFile();
-    const bool toPlayNext = !aCurrent.isNull()
+    const std::shared_ptr<StFileNode> aCurrent = myPlayList->getCurrentFile();
+    const bool toPlayNext =  aCurrent.get() != nullptr
                           && aCurrent->size() == 0
                           && aCurrent->getPath().isEquals(theFile->getPath());
 
     myEventMutex.lock();
-    myFilesToDelete.add(theFile);
+    myFilesToDelete.push_back(theFile);
     myEventMutex.unlock();
 
-    if(toPlayNext) {
+    if (toPlayNext) {
         doLoadNext();
     }
 }
 
 void StVideo::mainLoop() {
     bool isOpenSuccess = false;
-    StHandle<StFileNode> aFileToLoad, aPlsFile;
-    StHandle<StStereoParams> aFileParams;
+    std::shared_ptr<StFileNode> aFileToLoad, aPlsFile;
+    std::shared_ptr<StStereoParams> aFileParams;
     double aDummy;
     bool aDummyBool;
-    for(;;) {
+    for (;;) {
         // wait for initial message
         waitEvent();
-        if(toQuit) {
+        if (toQuit) {
             close();
             myQuitEvent.set();
             return;
         }
 
-        if(!myPlayList->getCurrentFile(aFileToLoad, aFileParams, aPlsFile)) {
+        if (!myPlayList->getCurrentFile(aFileToLoad, aFileParams, aPlsFile)) {
             continue;
         }
         isOpenSuccess = openSource(aFileToLoad, aFileParams, aPlsFile);
-        if(isOpenSuccess) {
+        if (isOpenSuccess) {
             break;
         }
     }
 
     // initial play event
-    for(;;) {
+    for (;;) {
 
-        if(myVideoMaster->isInContext(myCtxList0)) {
-            myVideoTimer = new StVideoTimer(myVideoMaster, myAudio,
+        if (myVideoMaster->isInContext(myCtxList0)) {
+            myVideoTimer = std::make_shared<StVideoTimer>(myVideoMaster, myAudio,
                 1000.0 * av_q2d(myVideoMaster->getCodecContext()->time_base));
             myVideoTimer->setAudioDelay(myAudioDelayMSec);
             myVideoTimer->setBenchmark(myIsBenchmark);
-        } else if(myCtxList.size() > 1 && myVideoMaster->isInContext(myCtxList1)) {
-            myVideoTimer = new StVideoTimer(myVideoMaster, myAudio,
+        } else if (myCtxList.size() > 1 && myVideoMaster->isInContext(myCtxList1)) {
+            myVideoTimer = std::make_shared<StVideoTimer>(myVideoMaster, myAudio,
                 1000.0 * av_q2d(myVideoMaster->getCodecContext()->time_base));
             myVideoTimer->setAudioDelay(myAudioDelayMSec);
             myVideoTimer->setBenchmark(myIsBenchmark);
         } else {
-            myVideoTimer.nullify();
+            myVideoTimer.reset();
         }
 
         // decoding processed in other threads
@@ -1498,17 +1503,17 @@
         // and manipulate times
         packetsLoop();
 
-        myVideoTimer.nullify();
+        myVideoTimer.reset();
 
         myEventMutex.lock();
-        if(!myFilesToDelete.isEmpty()) {
-            const StHandle<StFileNode> aCurrent = myPlayList->getCurrentFile();
-            if(!aCurrent.isNull()
+        if (!myFilesToDelete.empty()) {
+            const std::shared_ptr<StFileNode> aCurrent = myPlayList->getCurrentFile();
+            if (aCurrent.get() != nullptr
              && aCurrent->getPath().isEquals(myFilesToDelete0->getPath())) {
                 close();
             }
-            for(size_t anIter = 0; anIter < myFilesToDelete.size(); ++anIter) {
-                const StHandle<StFileNode>& aNode = myFilesToDeleteanIter;
+            for (size_t anIter = 0; anIter < myFilesToDelete.size(); ++anIter) {
+                const std::shared_ptr<StFileNode>& aNode = myFilesToDeleteanIter;
                 if(!myPlayList->removePhysically(aNode)) {
                     signals.onError(StString("File can not be deleted!\n" + aNode->getPath()));
                 }
@@ -1517,11 +1522,11 @@
         }
         myEventMutex.unlock();
 
-        for(;;) {
-            if(popPlayEvent(aDummy, aDummyBool) != ST_PLAYEVENT_NEXT) {
+        for (;;) {
+            if (popPlayEvent(aDummy, aDummyBool) != ST_PLAYEVENT_NEXT) {
                 myPlayList->walkToNext(false);
             }
-            if(toQuit) {
+            if (toQuit) {
                 // make sure to close AVIO contexts from the same working thread,
                 // because some of them can be attached to specific thread (like StAVIOJniHttpContext to JavaVM)
                 close();
@@ -1529,10 +1534,10 @@
                 return;
             }
             isOpenSuccess = false;
-            if(myPlayList->getCurrentFile(aFileToLoad, aFileParams, aPlsFile)) {
+            if (myPlayList->getCurrentFile(aFileToLoad, aFileParams, aPlsFile)) {
                 isOpenSuccess = openSource(aFileToLoad, aFileParams, aPlsFile);
             }
-            if(!isOpenSuccess) {
+            if (!isOpenSuccess) {
                 waitEvent();
             } else {
                 break;

_service:obs_scm:sview-26.obscpio/StMoviePlayer/StVideo/StVideo.h Changed

@@ -40,41 +40,42 @@
 
 struct StMovieInfo {
 
-    StHandle<StStereoParams> Id;
-    StArgumentsMap           Info;
-    StArgumentsMap           Codecs;
-    StString                 Path;           //!< file path
-    StFormat                 StInfoStream;   //!< source format as stored in file metadata
-    StFormat                 StInfoFileName; //!< source format detected from file name
-    bool                     HasVideo;       //!< true if file contains video
-    bool                     IsSavable;      //!< indicate that file can be saved without re-encoding
+    std::shared_ptr<StStereoParams> Id;
+
+    StArgumentsMap Info;
+    StArgumentsMap Codecs;
+    StString       Path;           //!< file path
+    StFormat       StInfoStream;   //!< source format as stored in file metadata
+    StFormat       StInfoFileName; //!< source format detected from file name
+    bool           HasVideo;       //!< true if file contains video
+    bool           IsSavable;      //!< indicate that file can be saved without re-encoding
 
     StMovieInfo() : StInfoStream(StFormat_AUTO), StInfoFileName(StFormat_AUTO), HasVideo(false), IsSavable(false) {}
 
 };
 
-template<> inline void StArray< StHandle<StFileNode> >::sort() {}
-template<> inline void StArray< StHandle<StAVIOContext> >::sort() {}
-
 /**
  * Auxiliary structure.
  */
 struct StStreamsInfo {
 
-    StHandle< StArrayList<StString> > AudioList;
-    StHandle< StArrayList<StString> > SubtitleList;
-    double                            Duration;
-    int32_t                           LoadedAudio;
-    int32_t                           LoadedSubtitles1;
-    int32_t                           LoadedSubtitles2;
+    std::shared_ptr<std::vector<StString>> AudioList;
+    std::shared_ptr<std::vector<StString>> SubtitleList;
+
+    double  Duration;
+    int32_t LoadedAudio;
+    int32_t LoadedSubtitles1;
+    int32_t LoadedSubtitles2;
 
     StStreamsInfo()
     : Duration(0.0),
       LoadedAudio(-1),
       LoadedSubtitles1(-1),
       LoadedSubtitles2(-1) {
-        AudioList    = new StArrayList<StString>(8);
-        SubtitleList = new StArrayList<StString>(8);
+        AudioList    = std::make_shared<std::vector<StString>>();
+        SubtitleList = std::make_shared<std::vector<StString>>();
+        AudioList->reserve(8);
+        SubtitleList->reserve(8);
     }
 
 };
@@ -108,15 +109,15 @@
     /**
      * Main constructor.
      */
-    ST_LOCAL StVideo(const std::string&                 theALDeviceName,
-                     StAudioQueue::StAlHintOutput       theAlOutput,
-                     StAudioQueue::StAlHintHrtf         theAlHrtf,
-                     const StHandle<StResourceManager>& theResMgr,
-                     const StHandle<StTranslations>&    theLangMap,
-                     const StHandle<StPlayList>&        thePlayList,
-                     const StHandle<StGLTextureQueue>&  theTextureQueue,
-                     const StHandle<StSubQueue>&        theSubtitlesQueue1,
-                     const StHandle<StSubQueue>&        theSubtitlesQueue2);
+    ST_LOCAL StVideo(const std::string& theALDeviceName,
+                     StAudioQueue::StAlHintOutput theAlOutput,
+                     StAudioQueue::StAlHintHrtf theAlHrtf,
+                     const std::shared_ptr<StResourceManager>& theResMgr,
+                     const std::shared_ptr<StTranslations>& theLangMap,
+                     const std::shared_ptr<StPlayList>& thePlayList,
+                     const std::shared_ptr<StGLTextureQueue>& theTextureQueue,
+                     const std::shared_ptr<StSubQueue>& theSubtitlesQueue1,
+                     const std::shared_ptr<StSubQueue>& theSubtitlesQueue2);
 
     /**
      * Destructor.
@@ -128,17 +129,17 @@
      */
     ST_LOCAL void startDestruction();
 
-    ST_LOCAL const StHandle<StGLTextureQueue>& getTextureQueue() const { return myTextureQueue; }
+    ST_LOCAL const std::shared_ptr<StGLTextureQueue>& getTextureQueue() const { return myTextureQueue; }
 
     /**
      * Return first subtitles queue.
      */
-    ST_LOCAL const StHandle<StSubQueue>& getSubtitlesQueue1() const { return mySubtitles1->getSubtitlesQueue(); }
+    ST_LOCAL const std::shared_ptr<StSubQueue>& getSubtitlesQueue1() const { return mySubtitles1->getSubtitlesQueue(); }
 
     /**
      * Return secondary subtitles queue.
      */
-    ST_LOCAL const StHandle<StSubQueue>& getSubtitlesQueue2() const { return mySubtitles2->getSubtitlesQueue(); }
+    ST_LOCAL const std::shared_ptr<StSubQueue>& getSubtitlesQueue2() const { return mySubtitles2->getSubtitlesQueue(); }
 
     /**
      * Ignore sync rules and perform swap when ready.
@@ -169,24 +170,19 @@
     ST_LOCAL bool isTheaterMode() const { return myVideoMaster->isTheaterMode(); }
 
     /**
-     * Set theater mode.
-     */
-    ST_LOCAL void setTheaterMode(bool theIsTheater) { myVideoMaster->setTheaterMode(theIsTheater); }
-
-    /**
-     * Stick to panorama 360 mode.
+     * Return video queue parameters.
      */
-    ST_LOCAL void setStickPano360(bool theToStick) { myVideoMaster->setStickPano360(theToStick); }
+    ST_LOCAL StVideoQueue::Params& videoParams() { return myVideoMaster->params; }
 
     /**
-     * Set if JPS file should be read as Left/Right (TRUE) of as Right/Left (FALSE).
+     * Set theater mode.
      */
-    ST_LOCAL void setSwapJPS(bool theToSwap) { myVideoMaster->setSwapJPS(theToSwap); }
+    ST_LOCAL void setTheaterMode(bool theIsTheater) { myVideoMaster->setTheaterMode(theIsTheater); }
 
     /**
      * Retrieve information about currently played file.
      */
-    ST_LOCAL StHandle<StMovieInfo> getFileInfo(const StHandle<StStereoParams>& theParams) const;
+    ST_LOCAL std::shared_ptr<StMovieInfo> getFileInfo(const std::shared_ptr<StStereoParams>& theParams) const;
 
         public: //! @name callback Slots
 
@@ -200,7 +196,7 @@
     /**
      * Add file node for removal.
      */
-    ST_LOCAL void doRemovePhysically(const StHandle<StFileNode>& theFile);
+    ST_LOCAL void doRemovePhysically(const std::shared_ptr<StFileNode>& theFile);
 
     /**
      * Save current displayed frame.
@@ -268,6 +264,7 @@
 
     struct {
 
+        StHandle<StBoolParam>         ToSaveCrossEyed;
         StHandle<StBoolParam>         UseGpu;          //!< use video decoding on GPU when available
         StHandle<StBoolParam>         UseOpenJpeg;     //!< use OpenJPEG (libopenjpeg) instead of built-in jpeg2000 decoder
         StHandle<StBoolParam>         ToAutoLoadSubs;  //!< load subtitles by default
@@ -367,12 +364,12 @@
      * Private method to append one format context (one file).
      */
     ST_LOCAL bool addFile(const StString& theFileToLoad,
-                          const StHandle<StStereoParams>& theNewParams,
+                          const std::shared_ptr<StStereoParams>& theNewParams,
                           StStreamsInfo&  theInfo);
 
-    ST_LOCAL bool openSource(const StHandle<StFileNode>&     theNewSource,
-                             const StHandle<StStereoParams>& theNewParams,
-                             const StHandle<StFileNode>&     theNewPlsFile);
+    ST_LOCAL bool openSource(const std::shared_ptr<StFileNode>&     theNewSource,
+                             const std::shared_ptr<StStereoParams>& theNewParams,
+                             const std::shared_ptr<StFileNode>&     theNewPlsFile);
 
     /**
      * Close active played file(s).
@@ -416,7 +413,7 @@
                                           std::vector<bool>& theQueueIsFull,
                                           size_t& theEmptyQueues,
                                           const int theIndex);
-    ST_LOCAL bool pushPacket(StHandle<StAVPacketQueue>& theAVPacketQueue,
+    ST_LOCAL bool pushPacket(const std::shared_ptr<StAVPacketQueue>& theAVPacketQueue,
                              StAVPacket& thePacket);
 
     /**
@@ -456,42 +453,43 @@
 
         private: //! @name private fields
 
-    StMIMEList                    myMimesVideo;
-    StMIMEList                    myMimesAudio;
-    StMIMEList                    myMimesSubs;
-    StMIMEList                    myMimesImages;
-    StHandle<StThread>            myThread;      //!< main loop thread
-    StHandle<StResourceManager>   myResMgr;      //!< resource manager
-    StHandle<StTranslations>      myLangMap;     //!< translations dictionary
-
-    StArrayList<StString>         myFileList;    //!< file list
-    StArrayList<AVFormatContext*> myCtxList;     //!< format context for each file
-    StArrayList< StHandle<StAVIOContext> >
+    StMIMEList myMimesVideo;
+    StMIMEList myMimesAudio;
+    StMIMEList myMimesSubs;
+    StMIMEList myMimesImages;
+
+    std::shared_ptr<StThread>          myThread;  //!< main loop thread
+    std::shared_ptr<StResourceManager> myResMgr;  //!< resource manager
+    std::shared_ptr<StTranslations>    myLangMap; //!< translations dictionary
+
+    std::vector<StString>         myFileList;    //!< file list
+    std::vector<AVFormatContext*> myCtxList;     //!< format context for each file
+    std::vector< std::shared_ptr<StAVIOContext> >
                                   myFileIOList;  //!< associated IO context
-    StArrayList<AVFormatContext*> myPlayCtxList; //!< currently played contexts
-
-    StHandle<StVideoQueue>        myVideoMaster;  //!< Master video decoding thread
-    StHandle<StVideoQueue>        myVideoSlave;   //!< Slave  video decoding thread
-    StHandle<StAudioQueue>        myAudio;        //!< audio decoding thread
-    StHandle<StSubtitleQueue>     mySubtitles1;   //!< subtitles (first) decoding thread
-    StHandle<StSubtitleQueue>     mySubtitles2;   //!< subtitles (secondary) decoding thread
-    AVFormatContext*              mySlaveCtx;     //!< Slave video format context
-    signed int                    mySlaveStream;  //!< Slave video stream id
-
-    StHandle<StPlayList>          myPlayList;     //!< play list
-    StHandle<StMovieInfo>         myFileInfo;     //!< info about currently loaded file
-    StHandle<StMovieInfo>         myFileInfoTmp;
-    StHandle<StFileNode>          myCurrNode;     //!< active (played) file node
-    StHandle<StStereoParams>      myCurrParams;   //!< parameters for active file node
-    StHandle<StFileNode>          myCurrPlsFile;  //!< active playlist file node
-    StHandle<StGLTextureQueue>    myTextureQueue; //!< decoded frames queue
-
-    StArrayList<StString>         myTracksExt;    //!< extra tracks extensions list
+    std::vector<AVFormatContext*> myPlayCtxList; //!< currently played contexts
+
+    std::shared_ptr<StVideoQueue>        myVideoMaster;  //!< Master video decoding thread
+    std::shared_ptr<StVideoQueue>        myVideoSlave;   //!< Slave  video decoding thread
+    std::shared_ptr<StAudioQueue>        myAudio;        //!< audio decoding thread
+    std::shared_ptr<StSubtitleQueue>     mySubtitles1;   //!< subtitles (first) decoding thread
+    std::shared_ptr<StSubtitleQueue>     mySubtitles2;   //!< subtitles (secondary) decoding thread
+    AVFormatContext*                     mySlaveCtx;     //!< Slave video format context
+    signed int                           mySlaveStream;  //!< Slave video stream id
+
+    std::shared_ptr<StPlayList>          myPlayList;     //!< play list
+    std::shared_ptr<StMovieInfo>         myFileInfo;     //!< info about currently loaded file
+    std::shared_ptr<StMovieInfo>         myFileInfoTmp;
+    std::shared_ptr<StFileNode>          myCurrNode;     //!< active (played) file node
+    std::shared_ptr<StStereoParams>      myCurrParams;   //!< parameters for active file node
+    std::shared_ptr<StFileNode>          myCurrPlsFile;  //!< active playlist file node
+    std::shared_ptr<StGLTextureQueue>    myTextureQueue; //!< decoded frames queue
+
+    std::vector<StString>         myTracksExt;    //!< extra tracks extensions list
     StFolder                      myTracksFolder; //!< cached list of subtitles/audio tracks in the current folder
-    StArrayList< StHandle<StFileNode> >
+    std::vector< std::shared_ptr<StFileNode> >
                                   myFilesToDelete;//!< file nodes for removal
 
-    StHandle<StVideoTimer>        myVideoTimer;   //!< video refresh timer (Audio -> Video sync)
+    std::shared_ptr<StVideoTimer>        myVideoTimer;   //!< video refresh timer (Audio -> Video sync)
     mutable StMutex               myEventMutex;   //!< lock for thread-safety
     double                        myDuration;     //!< active file duration in seconds
     double                        myPtsSeek;      //!< seeking target

_service:obs_scm:sview-26.obscpio/StMoviePlayer/StVideo/StVideoDxva2.cpp Changed

_service:obs_scm:sview-26.obscpio/StMoviePlayer/StVideo/StVideoQueue.cpp Changed

@@ -116,8 +116,8 @@
     int aResult = 0;
     bool isDone = false;
 #if defined(_WIN32)
-    if(theFrame->format == stAV::PIX_FMT::DXVA2_VLD) {
-        if(!myHWAccelCtx.isNull()) {
+    if (theFrame->format == stAV::PIX_FMT::DXVA2_VLD) {
+        if (myHWAccelCtx.get() != nullptr) {
             aResult = myHWAccelCtx->getFrameBuffer(*this, theFrame);
         } else {
             aResult = -1;
@@ -125,8 +125,8 @@
         isDone  = true;
     }
 /*#elif defined(__APPLE__) // standard FFmpeg VideoToolbox wrapper is used - action is not needed
-    if(theFrame->format == stAV::PIX_FMT::VIDEOTOOLBOX_VLD) {
-        if(!myHWAccelCtx.isNull()) {
+    if (theFrame->format == stAV::PIX_FMT::VIDEOTOOLBOX_VLD) {
+        if (myHWAccelCtx.get() != nullptr) {
             aResult = myHWAccelCtx->getFrameBuffer(*this, theFrame);
         } else {
             aResult = -1;
@@ -149,8 +149,8 @@
     return aCodec != NULL ? aCodec->id : AV_CODEC_ID_NONE;
 }
 
-StVideoQueue::StVideoQueue(const StHandle<StGLTextureQueue>& theTextureQueue,
-                           const StHandle<StVideoQueue>&     theMaster)
+StVideoQueue::StVideoQueue(const std::shared_ptr<StGLTextureQueue>& theTextureQueue,
+                           const std::shared_ptr<StVideoQueue>&     theMaster)
 : StAVPacketQueue(512),
   CodecIdH264  (stFindCodecId("h264")),
   CodecIdHEVC  (stFindCodecId("hevc")),
@@ -194,18 +194,16 @@
   myStFormatByUser(StFormat_AUTO),
   myStFormatByName(StFormat_AUTO),
   myStFormatInStream(StFormat_AUTO),
-  myIsTheaterMode(false),
-  myToStickPano360(false),
-  myToSwapJps(false) {
+  myIsTheaterMode(false) {
 #ifdef ST_USE64PTR
     myFrame.Frame->opaque = (void* )stAV::NOPTS_VALUE;
 #else
     myFrame.Frame->opaque = NULL;
 #endif
 
-    myFrameBufRef = new StAVFrameCounter();
+    myFrameBufRef = std::make_shared<StAVFrameCounter>();
 
-    myThread = new StThread(threadFunction, (void* )this, theMaster.isNull() ? "StVideoQueueM" : "StVideoQueueS");
+    myThread = std::make_shared<StThread>(threadFunction, (void* )this, theMaster.get() == nullptr ? "StVideoQueueM" : "StVideoQueueS");
 }
 
 StVideoQueue::~StVideoQueue() {
@@ -215,10 +213,10 @@
     pushQuit();
 
     myThread->wait();
-    myThread.nullify();
+    myThread.reset();
 
     deinit();
-    myHWAccelCtx.nullify();
+    myHWAccelCtx.reset();
 }
 
 namespace {
@@ -228,12 +226,10 @@
         const char* name;
     };
 
-    static const StCString THE_ROTATE_KEY       = stCString("rotate");
+    static constexpr StCString THE_SRC_MODE_KEY     = stCString("STEREO_MODE");
+    static constexpr StCString THE_SRC_MODE_KEY_WMV = stCString("StereoscopicLayout");
 
-    static const StCString THE_SRC_MODE_KEY     = stCString("STEREO_MODE");
-    static const StCString THE_SRC_MODE_KEY_WMV = stCString("StereoscopicLayout");
-
-    static const StFFmpegStereoFormat STEREOFLAGS = {
+    static constexpr StFFmpegStereoFormat STEREOFLAGS = {
         // MKV stereoscopic mode decoded by FFmpeg into STEREO_MODE metadata tag
         {StFormat_Mono,                 "mono"},
         {StFormat_SideBySide_RL,        "right_left"},
@@ -254,7 +250,7 @@
         {StFormat_TopBottom_LR,         "OverUnderLT"},  // Left Top
         {StFormat_TopBottom_RL,         "OverUnderRT"},
         // NULL-terminate array
-        {StFormat_AUTO, NULL}
+        {StFormat_AUTO, nullptr}
     };
 
 }
@@ -305,7 +301,7 @@
 bool StVideoQueue::init(AVFormatContext*   theFormatCtx,
                         const unsigned int theStreamId,
                         const StString&    theFileName,
-                        const StHandle<StStereoParams>& theNewParams) {
+                        const std::shared_ptr<StStereoParams>& theNewParams) {
     if(!StAVPacketQueue::init(theFormatCtx, theStreamId, theFileName)) {
         signals.onError(stCString("FFmpeg: invalid stream"));
         deinit();
@@ -502,7 +498,7 @@
 
     // detect information from file name
     bool isAnamorphByName = false;
-    myStFormatByName = st::formatFromName(myFileName, myToSwapJps, isAnamorphByName);
+    myStFormatByName = st::formatFromName(myFileName, params.ToSwapJPS->getValue(), isAnamorphByName);
     if(myStFormatInStream == StFormat_AUTO
     && isAnamorphByName) {
         if(myStFormatByName == StFormat_SideBySide_LR
@@ -518,11 +514,11 @@
 
 void StVideoQueue::deinit() {
     myIsGpuFailed = false;
-    if(myMaster.isNull()) {
+    if (myMaster.get() == nullptr) {
         myTextureQueue->clear();
         myTextureQueue->setConnectedStream(false);
     }
-    mySlave.nullify();
+    mySlave.reset();
     myPixelRatio = 1.0f;
     myPixelRatioComp = 1.0f;
     myDataAdp.nullify();
@@ -537,7 +533,7 @@
     myCachedFrame.nullify();
 
     StAVPacketQueue::deinit();
-    if(!myHWAccelCtx.isNull()) {
+    if (myHWAccelCtx.get() != nullptr) {
         myHWAccelCtx->decoderDestroy(myCodecCtx);
     }
     if(myCodecCtx != NULL) {
@@ -712,27 +708,27 @@
 
 void StVideoQueue::pushFrame(const StImage&     theSrcDataLeft,
                              const StImage&     theSrcDataRight,
-                             const StHandle<StStereoParams>& theStParams,
+                             const std::shared_ptr<StStereoParams>& theStParams,
                              const StFormat     theSrcFormat,
                              const StCubemap    theCubemapFormat,
                              const double       theSrcPTS) {
-    while(!myToFlush && myTextureQueue->isFull()) {
+    while (!myToFlush && myTextureQueue->isFull()) {
         StThread::sleep(10);
     }
 
-    if(myToFlush) {
+    if (myToFlush) {
         myToFlush = false;
         return;
     }
 
-    if(!theSrcDataLeft.isNull()) {
+    if (!theSrcDataLeft.isNull()) {
         theStParams->Src1SizeX = theSrcDataLeft.getSizeX();
         theStParams->Src1SizeY = theSrcDataLeft.getSizeY();
     } else {
         theStParams->Src1SizeX = 0;
         theStParams->Src1SizeY = 0;
     }
-    if(!theSrcDataRight.isNull()) {
+    if (!theSrcDataRight.isNull()) {
         theStParams->Src2SizeX = theSrcDataRight.getSizeX();
         theStParams->Src2SizeY = theSrcDataRight.getSizeY();
     } else {
@@ -740,22 +736,19 @@
         theStParams->Src2SizeY = 0;
     }
 
-    if(myToStickPano360
-    && theStParams->ViewingMode == StViewSurface_Plain) {
-        StPanorama aPano = st::probePanorama(theSrcFormat,
-                                             theStParams->Src1SizeX, theStParams->Src1SizeY,
-                                             theStParams->Src2SizeX, theStParams->Src2SizeY);
-        theStParams->ViewingMode = StStereoParams::getViewSurfaceForPanoramaSource(aPano, true);
-    }
-    if(myIsTheaterMode && theStParams->ViewingMode == StViewSurface_Plain) {
-        theStParams->ViewingMode = StViewSurface_Theater;
-    } else if(!myIsTheaterMode && theStParams->ViewingMode == StViewSurface_Theater) {
-        theStParams->ViewingMode = StViewSurface_Plain;
+    if (params.ToStickPanorama->getValue()) {
+        theStParams->ViewingMode = (StViewSurface)params.LastPanoramaMode->getValue();
+    } else {
+        if (myIsTheaterMode && theStParams->ViewingMode == StViewSurface_Plain) {
+            theStParams->ViewingMode = StViewSurface_Theater;
+        } else if (!myIsTheaterMode && theStParams->ViewingMode == StViewSurface_Theater) {
+            theStParams->ViewingMode = StViewSurface_Plain;
+        }
     }
 
     myTextureQueue->push(theSrcDataLeft, theSrcDataRight, theStParams, theSrcFormat, theCubemapFormat, theSrcPTS);
     myTextureQueue->setConnectedStream(true);
-    if(myWasFlushed) {
+    if (myWasFlushed) {
         // force frame update after seeking regardless playback timer
         myTextureQueue->stglSwapFB(0);
         myWasFlushed = false;
@@ -788,7 +781,7 @@
                     avcodec_flush_buffers(myCodecCtx);
                 }
                 // now we clear our sttextures buffer
-                if(myMaster.isNull()) {
+                if (myMaster.get() == nullptr) {
                     myTextureQueue->clear();
                 }
                 myCachedFrame.nullify();
@@ -818,15 +811,15 @@
                 // avcodec_send_packet with NULL to initiate draining data followed by avcodec_receive_frame
                 // to recieve last frames.
 
-                if(!myMaster.isNull()) {
-                    while(myHasDataState.check() && !myMaster->isInDowntime()) {
+                if (myMaster.get() != nullptr) {
+                    while (myHasDataState.check() && !myMaster->isInDowntime()) {
                         StThread::sleep(10);
                     }
                     // wake up Master
                     myDataAdp.nullify();
                     myHasDataState.set();
                 } else {
-                    if(!mySlave.isNull()) {
+                    if (mySlave.get() != nullptr) {
                         mySlave->unlockData();
                     }
                     StTimer stTimerWaitEmpty(true);
@@ -846,7 +839,7 @@
         }
 
         // wait master retrieve previous data
-        while(!myMaster.isNull() && myHasDataState.check()) {
+        while (myMaster.get() != nullptr && myHasDataState.check()) {
             //
         }
 
@@ -923,9 +916,9 @@
     thePrevPts = myFramePts;
 
     // do we need to skip frames or not
-    static const double OVERR_LIMIT = 0.2;
-    static const double GREATER_LIMIT = 100.0;
-    if(myMaster.isNull()) {
+    static constexpr double OVERR_LIMIT = 0.2;
+    static constexpr double GREATER_LIMIT = 100.0;
+    if (myMaster.get() == nullptr) {
         const double anAudioClock = getAClock() + double(myAudioDelayMSec) * 0.001;
         double diff = anAudioClock - myFramePts;
         if(diff > OVERR_LIMIT && diff < GREATER_LIMIT) {
@@ -938,7 +931,7 @@
                 myAvDiscard = AVDISCARD_NONREF;
                 ///myCodecCtx->skip_frame = AVDISCARD_NONKEY;
                 myCodecCtx->skip_frame = myAvDiscard;
-                if(!mySlave.isNull()) {
+                if (mySlave.get() != nullptr) {
                     mySlave->myCodecCtx->skip_frame = myAvDiscard;
                 }
             }
@@ -947,7 +940,7 @@
                 ST_DEBUG_LOG("skip frames: AVDISCARD_DEFAULT (off)");
                 myAvDiscard = AVDISCARD_DEFAULT;
                 myCodecCtx->skip_frame = myAvDiscard;
-                if(!mySlave.isNull()) {
+                if (mySlave.get() != nullptr) {
                     mySlave->myCodecCtx->skip_frame = myAvDiscard;
                 }
             }
@@ -955,7 +948,7 @@
     }
 
     // copy frame back from GPU to CPU memory
-    if(!myHWAccelCtx.isNull()) {
+    if (myHWAccelCtx.get() != nullptr) {
         myHWAccelCtx->retrieveFrame(*this, myFrame.Frame);
     }
 
@@ -1035,10 +1028,10 @@
 
     prepareFrame(aSrcFormat);
 
-    if(!mySlave.isNull()) {
+    if (mySlave.get() != nullptr) {
         if(theIsStarted) {
-            StHandle<StStereoParams> aParams = thePacket->getSource();
-            if(!aParams.isNull()) {
+            std::shared_ptr<StStereoParams> aParams = thePacket->getSource();
+            if (aParams.get() != nullptr) {
                 aParams->setSeparationNeutral(myHParallax);
                 aParams->setZRotateZero((float )myRotateDeg);
             }
@@ -1079,13 +1072,13 @@
             }
             break;
         }
-    } else if(!myMaster.isNull()) {
+    } else if (myMaster.get() != nullptr) {
         // push data to Master
         myHasDataState.set();
     } else {
         if(theIsStarted) {
-            StHandle<StStereoParams> aParams = thePacket->getSource();
-            if(!aParams.isNull()) {
+            std::shared_ptr<StStereoParams> aParams = thePacket->getSource();
+            if (aParams.get() != nullptr) {
                 aParams->setSeparationNeutral(myHParallax);
                 aParams->setZRotateZero((float )myRotateDeg);
             }

_service:obs_scm:sview-26.obscpio/StMoviePlayer/StVideo/StVideoQueue.h Changed

@@ -20,6 +20,7 @@
 #define __StVideoQueue_h_
 
 #include <StGLStereo/StGLTextureQueue.h>
+#include <StSettings/StParam.h>
 
 #include "StAVPacketQueue.h"
 #include <StAV/StAVImage.h>
@@ -75,9 +76,6 @@
 
 };
 
-// define StHandle template specialization
-ST_DEFINE_HANDLE(StVideoQueue, StAVPacketQueue);
-
 /**
  * This is Video playback class (filled OpenGL textures)
  * which feeded with packets (StAVPacket),
@@ -130,7 +128,7 @@
         return myDowntimeState.check();
     }
 
-    ST_LOCAL void setSlave(const StHandle<StVideoQueue>& theSlave) {
+    ST_LOCAL void setSlave(const std::shared_ptr<StVideoQueue>& theSlave) {
         mySlave = theSlave;
     }
 
@@ -205,20 +203,8 @@
         myIsTheaterMode = theIsTheater;
     }
 
-    /**
-     * Stick to panorama 360 mode.
-     */
-    ST_LOCAL void setStickPano360(bool theToStick) {
-        myToStickPano360 = theToStick;
-    }
-
-    /**
-     * Set if JPS file should be read as Left/Right (TRUE) of as Right/Left (FALSE).
-     */
-    ST_LOCAL void setSwapJPS(bool theToSwap) { myToSwapJps = theToSwap; }
-
-    ST_LOCAL StVideoQueue(const StHandle<StGLTextureQueue>& theTextureQueue,
-                          const StHandle<StVideoQueue>&     theMaster = StHandle<StVideoQueue>());
+    ST_LOCAL StVideoQueue(const std::shared_ptr<StGLTextureQueue>& theTextureQueue,
+                          const std::shared_ptr<StVideoQueue>&     theMaster = std::shared_ptr<StVideoQueue>());
     ST_LOCAL virtual ~StVideoQueue();
 
     /**
@@ -235,7 +221,7 @@
     ST_LOCAL bool init(AVFormatContext*   theFormatCtx,
                        const unsigned int theStreamId,
                        const StString&    theFileName,
-                       const StHandle<StStereoParams>& theNewParams);
+                       const std::shared_ptr<StStereoParams>& theNewParams);
 
     /**
      * Clean function.
@@ -283,7 +269,7 @@
         return (myCodecCtx != NULL) ? myCodecCtx->coded_height : 0;
     }
 
-    ST_LOCAL StHandle<StGLTextureQueue>& getTextureQueue() {
+    ST_LOCAL std::shared_ptr<StGLTextureQueue>& getTextureQueue() {
         return myTextureQueue;
     }
 
@@ -291,6 +277,16 @@
         return myTextureQueue->getPTSCurr();
     }
 
+        public: //! @name Properties
+
+    struct Params {
+
+        StHandle<StBoolParam>  ToSwapJPS;        //!< swap JPS views order
+        StHandle<StBoolParam>  ToStickPanorama;  //!< persist last selected panorama mode
+        StHandle<StInt32Param> LastPanoramaMode; //!< last selected panorama mode
+
+    } params;
+
         private:
 
     /**
@@ -363,22 +359,22 @@
 
     ST_LOCAL void pushFrame(const StImage&     theSrcDataLeft,
                             const StImage&     theSrcDataRight,
-                            const StHandle<StStereoParams>& theStParams,
+                            const std::shared_ptr<StStereoParams>& theStParams,
                             const StFormat     theSrcFormat,
                             const StCubemap    theCubemapFormat,
                             const double       theSrcPTS);
 
         private:
 
-    StHandle<StThread>         myThread;          //!< decoding loop thread
-    StCondition                myDowntimeState;   //!< event to indicate downtime state
-    StHandle<StGLTextureQueue> myTextureQueue;    //!< decoded frames queue
+    std::shared_ptr<StThread>         myThread;          //!< decoding loop thread
+    StCondition                       myDowntimeState;   //!< event to indicate downtime state
+    std::shared_ptr<StGLTextureQueue> myTextureQueue;    //!< decoded frames queue
 
-    StCondition                myHasDataState;
-    StHandle<StVideoQueue>     myMaster;          //!< handle to Master decoding thread
-    StHandle<StVideoQueue>     mySlave;           //!< handle to Slave  decoding thread
+    StCondition                       myHasDataState;
+    std::shared_ptr<StVideoQueue>     myMaster;          //!< handle to Master decoding thread
+    std::shared_ptr<StVideoQueue>     mySlave;           //!< handle to Slave  decoding thread
 
-    StHandle<StHWAccelContext> myHWAccelCtx;
+    std::shared_ptr<StHWAccelContext> myHWAccelCtx;
 #if defined(__ANDROID__)
     const AVCodec*             myCodecH264HW;     //!< h264 decoder using dedicated hardware (Android Media Codec)
     const AVCodec*             myCodecHevcHW;     //!< hevc decoder using dedicated hardware
@@ -396,7 +392,7 @@
     bool                       myToRgbIsBroken;   //!< indicates broke swscale context - to RGB conversion is impossible
 
     StAVFrame                  myFrame;           //!< original decoded video frame
-    StHandle<StAVFrameCounter> myFrameBufRef;
+    std::shared_ptr<StAVFrameCounter> myFrameBufRef;
     StImage                    myDataAdp;         //!< buffer data adaptor
     AVDiscard                  myAvDiscard;       //!< discard parameter (to skip or not frames)
 
@@ -423,8 +419,6 @@
     volatile StFormat          myStFormatByName;  //!< source format detected from file name
     volatile StFormat          myStFormatInStream;//!< source format information retrieved from stream
     volatile bool              myIsTheaterMode;   //!< flag indicating theater mode
-    volatile bool              myToStickPano360;  //!< stick to panorama 360 mode
-    volatile bool              myToSwapJps;       //!< read JPS as Left/Right instead of Right/Left
 
 };

_service:obs_scm:sview-26.obscpio/StMoviePlayer/StVideo/StVideoTimer.cpp Changed

@@ -29,9 +29,9 @@
     return SV_THREAD_RETURN 0;
 }
 
-StVideoTimer::StVideoTimer(const StHandle<StVideoQueue>& theVideo,
-                           const StHandle<StAudioQueue>& theAudio,
-                           const double                  theDelayVVFixedMs)
+StVideoTimer::StVideoTimer(const std::shared_ptr<StVideoQueue>& theVideo,
+                           const std::shared_ptr<StAudioQueue>& theAudio,
+                           const double theDelayVVFixedMs)
 : myVideo(theVideo),
   myAudio(theAudio),
   myToQuitEv(false),
@@ -54,13 +54,13 @@
   mySpeedSlowRev(1.0 / mySpeedSlow),
   myIsBenchmark(false) {
     stMemZero(mySpeedDesc, sizeof(mySpeedDesc));
-    myThread = new StThread(refreshThread, (void* )this, "StVideoTimer");
+    myThread = std::make_shared<StThread>(refreshThread, (void* )this, "StVideoTimer");
 }
 
 StVideoTimer::~StVideoTimer() {
     myToQuitEv.set();
     myThread->wait();
-    myThread.nullify();
+    myThread.reset();
 }
 
 bool StVideoTimer::isQuitMessage() {

_service:obs_scm:sview-26.obscpio/StMoviePlayer/StVideo/StVideoTimer.h Changed

@@ -36,9 +36,9 @@
      * @param theAudio audio stream to synchronize from
      * @param theDelayVVFixedMs default video frame delay for streams with fixed FPS
      */
-    ST_LOCAL StVideoTimer(const StHandle<StVideoQueue>& theVideo,
-                          const StHandle<StAudioQueue>& theAudio,
-                          const double                  theDelayVVFixedMs = 40.0);
+    ST_LOCAL StVideoTimer(const std::shared_ptr<StVideoQueue>& theVideo,
+                          const std::shared_ptr<StAudioQueue>& theAudio,
+                          const double theDelayVVFixedMs = 40.0);
 
     /**
      * Destructor.
@@ -100,9 +100,10 @@
 
         private:
 
-    StHandle<StThread>     myThread;          //!< timer loop thread
-    StHandle<StVideoQueue> myVideo;           //!< video queue to sync
-    StHandle<StAudioQueue> myAudio;           //!< audio queue to sync from
+    std::shared_ptr<StThread>     myThread;   //!< timer loop thread
+    std::shared_ptr<StVideoQueue> myVideo;    //!< video queue to sync
+    std::shared_ptr<StAudioQueue> myAudio;    //!< audio queue to sync from
+
     mutable StMutex        myInfoLock;        //!< lock to retrieve information from other threads
     StCondition            myToQuitEv;        //!< thread exit event
     StTimer                myTimer;           //!< timer to refresh frames

_service:obs_scm:sview-26.obscpio/StMoviePlayer/StVideo/StVideoToolbox.cpp Changed

_service:obs_scm:sview-26.obscpio/StMoviePlayer/lang/chinese/StMoviePlayer.lng Changed

_service:obs_scm:sview-26.obscpio/StMoviePlayer/lang/chineset/StMoviePlayer.lng Changed

_service:obs_scm:sview-26.obscpio/StMoviePlayer/lang/czech/StMoviePlayer.lng Changed

_service:obs_scm:sview-26.obscpio/StMoviePlayer/lang/english/StMoviePlayer.lng Changed

_service:obs_scm:sview-26.obscpio/StMoviePlayer/lang/french/StMoviePlayer.lng Changed

_service:obs_scm:sview-26.obscpio/StMoviePlayer/lang/german/StMoviePlayer.lng Changed

_service:obs_scm:sview-26.obscpio/StMoviePlayer/lang/korean/StMoviePlayer.lng Changed

_service:obs_scm:sview-26.obscpio/StMoviePlayer/lang/russian/StMoviePlayer.lng Changed

_service:obs_scm:sview-26.obscpio/StMoviePlayer/lang/spanish/StMoviePlayer.lng Changed

_service:obs_scm:sview-26.obscpio/StOutAnaglyph/StOutAnaglyph.cpp Changed

@@ -76,14 +76,14 @@
 
 void StOutAnaglyph::getDevices(StOutDevicesList& theList) const {
     for(size_t anIter = 0; anIter < myDevices.size(); ++anIter) {
-        theList.add(myDevicesanIter);
+        theList.push_back(myDevicesanIter);
     }
 }
 
 void StOutAnaglyph::getOptions(StParamsList& theList) const {
-    theList.add(params.Glasses);
-    theList.add(params.RedCyan);
-    theList.add(params.AmberBlue);
+    theList.push_back(params.Glasses);
+    theList.push_back(params.RedCyan);
+    theList.push_back(params.AmberBlue);
 }
 
 void StOutAnaglyph::updateStrings() {
@@ -116,11 +116,11 @@
             + aDescr.format("2007-2026", "kirill@sview.ru", "www.sview.ru");
 }
 
-StOutAnaglyph::StOutAnaglyph(const StHandle<StResourceManager>& theResMgr,
-                             const StNativeWin_t                theParentWindow)
+StOutAnaglyph::StOutAnaglyph(const std::shared_ptr<StResourceManager>& theResMgr,
+                             const StNativeWin_t theParentWindow)
 : StWindow(theResMgr, theParentWindow),
-  mySettings(new StSettings(theResMgr, ST_OUT_PLUGIN_NAME)),
-  myFrBuffer(new StGLStereoFrameBuffer()),
+  mySettings(std::make_shared<StSettings>(theResMgr, ST_OUT_PLUGIN_NAME)),
+  myFrBuffer(std::make_shared<StGLStereoFrameBuffer>()),
   myStereoProgram(NULL),
   mySimpleAnaglyph("Anaglyph Simple"),
   myGrayAnaglyph("Anaglyph Gray"),
@@ -134,12 +134,12 @@
     myStereoProgram = &mySimpleAnaglyph;
 
     // devices list
-    StHandle<StOutDevice> aDevice = new StOutDevice();
+    std::shared_ptr<StOutDevice> aDevice = std::make_shared<StOutDevice>();
     aDevice->PluginId = ST_OUT_PLUGIN_NAME;
     aDevice->DeviceId = stCString("Anaglyph");
     aDevice->Priority = ST_DEVICE_SUPPORT_LOW; // anaglyph could be run on every display...
     aDevice->Name     = stCString("Anaglyph glasses");
-    myDevices.add(aDevice);
+    myDevices.push_back(aDevice);
 
     // Glasses switch option
     params.Glasses = new StEnumParam(GLASSES_TYPE_REDCYAN, stCString("glasses"), stCString("glasses"));
@@ -171,7 +171,7 @@
 }
 
 void StOutAnaglyph::releaseResources() {
-    if(!myContext.isNull()) {
+    if (myContext.get() != nullptr) {
         StGLContext& aCtx = *myContext;
         mySimpleAnaglyph.release(aCtx);
         myGrayAnaglyph.release(aCtx);
@@ -182,7 +182,7 @@
         myGreenAnaglyph.release(aCtx);
         myFrBuffer->release(aCtx);
     }
-    myContext.nullify();
+    myContext.reset();
 
     // read windowed placement
     StWindow::hide(ST_WIN_MASTER);
@@ -389,7 +389,7 @@
 }
 
 void StOutAnaglyph::doSwitchVSync(const int32_t theValue) {
-    if(myContext.isNull()) {
+    if (myContext.get() == nullptr) {
         return;
     }

_service:obs_scm:sview-26.obscpio/StOutAnaglyph/StOutAnaglyph.h Changed

@@ -25,8 +25,8 @@
     /**
      * Main constructor.
      */
-    ST_CPPEXPORT StOutAnaglyph(const StHandle<StResourceManager>& theResMgr,
-                               const StNativeWin_t                theParentWindow);
+    ST_CPPEXPORT StOutAnaglyph(const std::shared_ptr<StResourceManager>& theResMgr,
+                               const StNativeWin_t theParentWindow);
 
     /**
      * Destructor.
@@ -157,11 +157,12 @@
     typedef StGLStereoFrameBuffer::StGLStereoProgram StStereoProgram_t;
 
     StOutDevicesList                myDevices;
-    StHandle<StSettings>            mySettings;
+    std::shared_ptr<StSettings>     mySettings;
     StString                        myAbout;                //!< about string
 
-    StHandle<StGLContext>           myContext;
-    StHandle<StGLStereoFrameBuffer> myFrBuffer;
+    std::shared_ptr<StGLContext>           myContext;
+    std::shared_ptr<StGLStereoFrameBuffer> myFrBuffer;
+
     StStereoProgram_t*              myStereoProgram;        //!< pointer to current anaglyph program
     StStereoProgram_t               mySimpleAnaglyph;       //!< all available anaglyph programs
     StStereoProgram_t               myGrayAnaglyph;

_service:obs_scm:sview-26.obscpio/StOutDistorted/StOutDistorted.cpp Changed

@@ -31,12 +31,12 @@
 
 namespace {
 
-    static const char ST_OUT_PLUGIN_NAME   = "StOutDistorted";
+    static constexpr char ST_OUT_PLUGIN_NAME   = "StOutDistorted";
 
-    static const char ST_SETTING_DEVICE_ID = "deviceId";
-    static const char ST_SETTING_WINDOWPOS = "windowPos";
-    static const char ST_SETTING_WARP_COEF = "warpCoef";
-    static const char ST_SETTING_CHROME_AB = "chromeAb";
+    static constexpr char ST_SETTING_DEVICE_ID = "deviceId";
+    static constexpr char ST_SETTING_WINDOWPOS = "windowPos";
+    static constexpr char ST_SETTING_WARP_COEF = "warpCoef";
+    static constexpr char ST_SETTING_CHROME_AB = "chromeAb";
 
     // translation resources
     enum {
@@ -166,19 +166,19 @@
 
 void StOutDistorted::getDevices(StOutDevicesList& theList) const {
     for(size_t anIter = 0; anIter < myDevices.size(); ++anIter) {
-        theList.add(myDevicesanIter);
+        theList.push_back(myDevicesanIter);
     }
 }
 
 void StOutDistorted::getOptions(StParamsList& theList) const {
     if (myDevice != DEVICE_HMD
      && myDevice != DEVICE_S3DV) {
-        theList.add(params.Layout);
+        theList.push_back(params.Layout);
     }
     if (myDevice == DEVICE_HMD) {
-        theList.add(params.MirrorWindow);
+        theList.push_back(params.MirrorWindow);
     } else {
-        theList.add(params.MonoClone);
+        theList.push_back(params.MonoClone);
     }
 }
 
@@ -223,16 +223,16 @@
 #endif
 }
 
-StOutDistorted::StOutDistorted(const StHandle<StResourceManager>& theResMgr,
-                               const StNativeWin_t                theParentWindow)
+StOutDistorted::StOutDistorted(const std::shared_ptr<StResourceManager>& theResMgr,
+                               const StNativeWin_t theParentWindow)
 : StWindow(theResMgr, theParentWindow),
-  mySettings(new StSettings(theResMgr, ST_OUT_PLUGIN_NAME)),
+  mySettings(std::make_shared<StSettings>(theResMgr, ST_OUT_PLUGIN_NAME)),
   myDevice(DEVICE_AUTO),
   myToResetDevice(false),
-  myFrBuffer(new StGLFrameBuffer()),
-  myCursor(new StGLTexture(GL_RGBA8)),
-  myProgramFlat(new StProgramFlat()),
-  myProgramBarrel(new StProgramBarrel()),
+  myFrBuffer(std::make_shared<StGLFrameBuffer>()),
+  myCursor(std::make_shared<StGLTexture>(GL_RGBA8)),
+  myProgramFlat(std::make_shared<StProgramFlat>()),
+  myProgramBarrel(std::make_shared<StProgramBarrel>()),
   myBarrelCoef(1.0f, 0.22f, 0.24f, 0.041f), // 7 inches
   //myBarrelCoef(1.0f, 0.18f, 0.115f, 0.0387f),
   myChromAb(0.996f, -0.004f, 1.014f, 0.0f),
@@ -291,27 +291,27 @@
 #endif
 
     // devices list
-    StHandle<StOutDevice> aDevDistorted = new StOutDevice();
+    std::shared_ptr<StOutDevice> aDevDistorted = std::make_shared<StOutDevice>();
     aDevDistorted->PluginId = ST_OUT_PLUGIN_NAME;
     aDevDistorted->DeviceId = stCString("Distorted");
     aDevDistorted->Priority = aSupportParallel;
     aDevDistorted->Name     = stCString("TV (parallel pair)");
-    myDevices.add(aDevDistorted);
+    myDevices.push_back(aDevDistorted);
 
-    StHandle<StOutDevice> aDevVR = new StOutDevice();
+    std::shared_ptr<StOutDevice> aDevVR = std::make_shared<StOutDevice>();
     aDevVR->PluginId = ST_OUT_PLUGIN_NAME;
     aDevVR->DeviceId = stCString("OpenVR");
     aDevVR->Priority = aSupportOpenVr;
     aDevVR->Name     = stCString("OpenVR");
-    myDevices.add(aDevVR);
+    myDevices.push_back(aDevVR);
 
     if(aSupportS3DV != ST_DEVICE_SUPPORT_NONE) {
-        StHandle<StOutDevice> aDevS3dv = new StOutDevice();
+        std::shared_ptr<StOutDevice> aDevS3dv = std::make_shared<StOutDevice>();
         aDevS3dv->PluginId = ST_OUT_PLUGIN_NAME;
         aDevS3dv->DeviceId = stCString("S3DV");
         aDevS3dv->Priority = aSupportS3DV;
         aDevS3dv->Name     = stCString("S3DV");
-        myDevices.add(aDevS3dv);
+        myDevices.push_back(aDevS3dv);
     }
 
     // load device settings
@@ -349,10 +349,10 @@
 }
 
 void StOutDistorted::releaseResources() {
-    if(!myContext.isNull()) {
-        if(!myVrFullscreenMsg.isNull()) {
+    if (myContext.get() != nullptr) {
+        if (myVrFullscreenMsg.get() != nullptr) {
             myVrFullscreenMsg->release(*myContext);
-            myVrFullscreenMsg.nullify();
+            myVrFullscreenMsg.reset();
         }
     #ifdef ST_HAVE_OPENVR
         if(myVrHmd != NULL) {
@@ -370,7 +370,7 @@
         myFrBuffer->release(*myContext);
         myCursor->release(*myContext);
     }
-    myContext.nullify();
+    myContext.reset();
 
     // read windowed placement
     StWindow::hide();
@@ -466,16 +466,14 @@
     // cursor texture
     {
         StAVImage aCursorImg;
-        StHandle<StResource> aCursorRes = getResourceManager()->getResource(StString("textures") + SYS_FS_SPLITTER + "cursor.png");
-        uint8_t* aData     = NULL;
+        std::shared_ptr<StResource> aCursorRes = getResourceManager()->getResource(StString("textures") + SYS_FS_SPLITTER + "cursor.png");
+        uint8_t* aData     = nullptr;
         int      aDataSize = 0;
-        if(!aCursorRes.isNull()
-        && !aCursorRes->isFile()
-        &&  aCursorRes->read()) {
+        if (aCursorRes.get() != nullptr && !aCursorRes->isFile() && aCursorRes->read()) {
             aData     = (uint8_t* )aCursorRes->getData();
             aDataSize = aCursorRes->getSize();
         }
-        if(aCursorImg.load(!aCursorRes.isNull() ? aCursorRes->getPath() : StString(), StImageFile::ST_TYPE_PNG, aData, aDataSize)) {
+        if (aCursorImg.load(aCursorRes.get() != nullptr ? aCursorRes->getPath() : StString(), StImageFile::ST_TYPE_PNG, aData, aDataSize)) {
             myCursor->init(*myContext, aCursorImg.getPlane());
         }
     }
@@ -517,21 +515,19 @@
 
     if(myDevice == DEVICE_HMD) {
         StAVImage anImage;
-        StHandle<StResource> aWarnRes = getResourceManager()->getResource(StString("textures") + SYS_FS_SPLITTER + "hmd_exit_fullscreen.png");
-        uint8_t* aData     = NULL;
+        std::shared_ptr<StResource> aWarnRes = getResourceManager()->getResource(StString("textures") + SYS_FS_SPLITTER + "hmd_exit_fullscreen.png");
+        uint8_t* aData     = nullptr;
         int      aDataSize = 0;
-        if(!aWarnRes.isNull()
-        && !aWarnRes->isFile()
-        &&  aWarnRes->read()) {
+        if (aWarnRes.get() != nullptr && !aWarnRes->isFile() && aWarnRes->read()) {
             aData     = (uint8_t* )aWarnRes->getData();
             aDataSize = aWarnRes->getSize();
         }
-        if(anImage.load(!aWarnRes.isNull() ? aWarnRes->getPath() : StString(), StImageFile::ST_TYPE_PNG, aData, aDataSize)) {
-            myVrFullscreenMsg = new StGLTextureQuad();
-            if(!myVrFullscreenMsg->init(*myContext, anImage.getPlane())) {
+        if (anImage.load(aWarnRes.get() != nullptr ? aWarnRes->getPath() : StString(), StImageFile::ST_TYPE_PNG, aData, aDataSize)) {
+            myVrFullscreenMsg = std::make_shared<StGLTextureQuad>();
+            if (!myVrFullscreenMsg->init(*myContext, anImage.getPlane())) {
                 ST_ERROR_LOG(ST_OUT_PLUGIN_NAME + " Plugin, Texture can not be initialized!");
                 myVrFullscreenMsg->release(*myContext);
-                myVrFullscreenMsg.nullify();
+                myVrFullscreenMsg.reset();
             }
         } else {
             ST_ERROR_LOG(ST_OUT_PLUGIN_NAME + " Plugin, Texture missed: " + anImage.getState());
@@ -677,11 +673,12 @@
         }
     }
 
-    StArray<StGLVec4> aVerts(4);
-    aVerts0 = StGLVec4(aLensDisp + aCurLeft + aCurWidth, aCurTop - aCurHeight, 0.0f, 1.0f);
-    aVerts1 = StGLVec4(aLensDisp + aCurLeft + aCurWidth, aCurTop,              0.0f, 1.0f);
-    aVerts2 = StGLVec4(aLensDisp + aCurLeft,             aCurTop - aCurHeight, 0.0f, 1.0f);
-    aVerts3 = StGLVec4(aLensDisp + aCurLeft,             aCurTop,              0.0f, 1.0f);
+    const std::vector<StGLVec4> aVerts = {
+        StGLVec4(aLensDisp + aCurLeft + aCurWidth, aCurTop - aCurHeight, 0.0f, 1.0f),
+        StGLVec4(aLensDisp + aCurLeft + aCurWidth, aCurTop,              0.0f, 1.0f),
+        StGLVec4(aLensDisp + aCurLeft,             aCurTop - aCurHeight, 0.0f, 1.0f),
+        StGLVec4(aLensDisp + aCurLeft,             aCurTop,              0.0f, 1.0f)
+    };
     myCurVertsBuf.init(*myContext, aVerts);
 
     myContext->core20fwd->glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
@@ -914,11 +911,12 @@
 
         const GLfloat aDX = GLfloat(myFrBuffer->getVPSizeX()) / GLfloat(myFrBuffer->getSizeX());
         const GLfloat aDY = GLfloat(myFrBuffer->getVPSizeY()) / GLfloat(myFrBuffer->getSizeY());
-        StArray<StGLVec2> aTCoords(4);
-        aTCoords0 = StGLVec2(aDX, 0.0f);
-        aTCoords1 = StGLVec2(aDX, aDY);
-        aTCoords2 = StGLVec2(0.0f, 0.0f);
-        aTCoords3 = StGLVec2(0.0f, aDY);
+        const std::vector<StGLVec2> aTCoords = {
+            StGLVec2(aDX, 0.0f),
+            StGLVec2(aDX, aDY),
+            StGLVec2(0.0f, 0.0f),
+            StGLVec2(0.0f, aDY)
+        };
         myFrTCrdsBuf.init(*myContext, aTCoords);
 
         myFrBuffer->bindTexture(*myContext);
@@ -938,14 +936,14 @@
         myContext->stglResizeViewport(aVPBoth);
         myContext->stglResetScissorRect();
         myContext->core20fwd->glClear(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT);
-        if(!myVrFullscreenMsg.isNull()) {
+        if (myVrFullscreenMsg.get() != nullptr) {
             myVrFullscreenMsg->stglDraw(*myContext);
         }
         StWindow::stglSwap(ST_WIN_ALL);
-        if(myVrToDrawMsg) {
+        if (myVrToDrawMsg) {
             myVrToDrawMsg = false;
             myVrMsgTimer.restart();
-        } else if(!hasComposError) {
+        } else if (!hasComposError) {
             myVrMsgTimer.stop();
         }
     }
@@ -1098,11 +1096,12 @@
     // reduce viewport to avoid additional aliasing of narrow lines
     const GLfloat aDX = GLfloat(myFrBuffer->getVPSizeX()) / GLfloat(myFrBuffer->getSizeX());
     const GLfloat aDY = GLfloat(myFrBuffer->getVPSizeY()) / GLfloat(myFrBuffer->getSizeY());
-    StArray<StGLVec2> aTCoords(4);
-    aTCoords0 = StGLVec2(aDX,  0.0f);
-    aTCoords1 = StGLVec2(aDX,  aDY);
-    aTCoords2 = StGLVec2(0.0f, 0.0f);
-    aTCoords3 = StGLVec2(0.0f, aDY);
+    const std::vector<StGLVec2> aTCoords = {
+        StGLVec2(aDX,  0.0f),
+        StGLVec2(aDX,  aDY),
+        StGLVec2(0.0f, 0.0f),
+        StGLVec2(0.0f, aDY)
+    };
     myFrTCrdsBuf.init(*myContext, aTCoords);
 
     const GLfloat aLensDisp = getLensDist() * 0.5f;
@@ -1124,11 +1123,11 @@
     myContext->stglResizeViewport(aViewPortL);
     myContext->stglSetScissorRect(aViewPortL, false);
 
-    StGLProgram*    aProgram   = myProgramFlat.access();
+    StGLProgram*    aProgram   = myProgramFlat.get();
     StGLVarLocation aVertexLoc = myProgramFlat->getVVertexLoc();
     StGLVarLocation aTexCrdLoc = myProgramFlat->getVTexCoordLoc();
     if(myDevice == DEVICE_HMD) {
-        aProgram   = myProgramBarrel.access();
+        aProgram   = myProgramBarrel.get();
         aVertexLoc = myProgramBarrel->getVVertexLoc();
         aTexCrdLoc = myProgramBarrel->getVTexCoordLoc();
         myProgramBarrel->setScaleIn(*myContext, StGLVec2(2.0f / aDX, 2.0f / aDY));
@@ -1136,7 +1135,7 @@
     }
 
     myFrBuffer->bindTexture(*myContext);
-    if(aProgram == myProgramBarrel.access()) {
+    if (aProgram == myProgramBarrel.get()) {
         myProgramBarrel->setLensCenter(*myContext, StGLVec2((0.5f + aLensDisp) * aDX, 0.5f * aDY));
     }
     aProgram->use(*myContext);
@@ -1162,7 +1161,7 @@
     myContext->stglSetScissorRect(aViewPortR, false);
 
     myFrBuffer->bindTexture(*myContext);
-    if(aProgram == myProgramBarrel.access()) {
+    if (aProgram == myProgramBarrel.get()) {
         myProgramBarrel->setLensCenter(*myContext, StGLVec2((0.5f - aLensDisp) * aDX, 0.5f * aDY));
     }
     aProgram->use(*myContext);
@@ -1184,7 +1183,7 @@
 }
 
 void StOutDistorted::doSwitchVSync(const int32_t theValue) {
-    if(myContext.isNull()) {
+    if (myContext.get() == nullptr) {
         return;
     }

_service:obs_scm:sview-26.obscpio/StOutDistorted/StOutDistorted.h Changed

@@ -37,8 +37,8 @@
     /**
      * Main constructor.
      */
-    ST_CPPEXPORT StOutDistorted(const StHandle<StResourceManager>& theResMgr,
-                                const StNativeWin_t                theParentWindow);
+    ST_CPPEXPORT StOutDistorted(const std::shared_ptr<StResourceManager>& theResMgr,
+                                const StNativeWin_t theParentWindow);
 
     /**
      * Destructor.
@@ -274,21 +274,24 @@
 
         private:
 
-    StOutDevicesList          myDevices;
-    StHandle<StSettings>      mySettings;
-    StString                  myAbout;           //!< about string
-    StString                  myAboutTitle;      //!< title for About dialog
-    StString                  myAboutVerString;  //!< version string for About dialog
-    StString                  myAboutDescr;      //!< description for About dialog
-    StString                  myAboutVrDevice;   //!< HMD info for About dialog
-
-    int                       myDevice;          //!< currently active device
-    bool                      myToResetDevice;
-    StHandle<StGLContext>     myContext;
-    StHandle<StGLFrameBuffer> myFrBuffer;        //!< OpenGL frame buffer object
-    StHandle<StGLTexture>     myCursor;          //!< cursor texture - we can not use normal cursor due to distortions
-    StHandle<StProgramFlat>   myProgramFlat;
-    StHandle<StProgramBarrel> myProgramBarrel;
+    StOutDevicesList            myDevices;
+    std::shared_ptr<StSettings> mySettings;
+
+    StString myAbout;           //!< about string
+    StString myAboutTitle;      //!< title for About dialog
+    StString myAboutVerString;  //!< version string for About dialog
+    StString myAboutDescr;      //!< description for About dialog
+    StString myAboutVrDevice;   //!< HMD info for About dialog
+
+    int  myDevice;          //!< currently active device
+    bool myToResetDevice;
+
+    std::shared_ptr<StGLContext>     myContext;
+    std::shared_ptr<StGLFrameBuffer> myFrBuffer;        //!< OpenGL frame buffer object
+    std::shared_ptr<StGLTexture>     myCursor;          //!< cursor texture - we can not use normal cursor due to distortions
+    std::shared_ptr<StProgramFlat>   myProgramFlat;
+    std::shared_ptr<StProgramBarrel> myProgramBarrel;
+
     StFPSControl              myFPSControl;
     StGLVertexBuffer          myFrVertsBuf;      //!< buffers to draw simple fullsreen quad
     StGLVertexBuffer          myFrTCrdsBuf;
@@ -311,7 +314,9 @@
     float                     myVrIOD;           //!< intra-ocular distance in meters
     bool                      myVrTrackOrient;   //!< track orientation flag
     bool                      myVrToDrawMsg;
-    StHandle<StGLTextureQuad> myVrFullscreenMsg;
+
+    std::shared_ptr<StGLTextureQuad> myVrFullscreenMsg;
+
     StTimer                   myVrMsgTimer;
 #ifdef ST_HAVE_OPENVR
     vr::IVRSystem*            myVrHmd;           //!< OpenVR session object

_service:obs_scm:sview-26.obscpio/StOutDual/StOutDual.cpp Changed

@@ -20,10 +20,10 @@
 
 namespace {
 
-    static const char ST_OUT_PLUGIN_NAME   = "StOutDual";
+    static constexpr char ST_OUT_PLUGIN_NAME   = "StOutDual";
 
-    static const char ST_SETTING_DEVICE_ID = "deviceId";
-    static const char ST_SETTING_WINDOWPOS = "windowPos";
+    static constexpr char ST_SETTING_DEVICE_ID = "deviceId";
+    static constexpr char ST_SETTING_WINDOWPOS = "windowPos";
 
     // translation resources
     enum {
@@ -72,7 +72,7 @@
     }
 
     virtual bool init(StGLContext& theCtx) ST_ATTR_OVERRIDE {
-        const char VERTEX_SHADER =
+        constexpr char VERTEX_SHADER =
            "attribute vec4 vVertex; \
             attribute vec2 vTexCoord; \
             varying vec2 fTexCoord; \
@@ -81,7 +81,7 @@
                 gl_Position = vVertex; \
             }";
 
-        const char FRAGMENT_SHADER =
+        constexpr char FRAGMENT_SHADER =
            "uniform sampler2D texR, texL; \
             varying vec2 fTexCoord; \
             void main(void) { \
@@ -156,13 +156,13 @@
 
 void StOutDual::getDevices(StOutDevicesList& theList) const {
     for(size_t anIter = 0; anIter < myDevices.size(); ++anIter) {
-        theList.add(myDevicesanIter);
+        theList.push_back(myDevicesanIter);
     }
 }
 
 void StOutDual::getOptions(StParamsList& theList) const {
-    theList.add(params.SlaveMonId);
-    theList.add(params.MonoClone);
+    theList.push_back(params.SlaveMonId);
+    theList.push_back(params.MonoClone);
 }
 
 void StOutDual::updateStrings() {
@@ -185,12 +185,12 @@
             + aDescr.format("2007-2026", "kirill@sview.ru", "www.sview.ru");
 }
 
-StOutDual::StOutDual(const StHandle<StResourceManager>& theResMgr,
-                     const StNativeWin_t                theParentWindow)
+StOutDual::StOutDual(const std::shared_ptr<StResourceManager>& theResMgr,
+                     const StNativeWin_t theParentWindow)
 : StWindow(theResMgr, theParentWindow),
-  mySettings(new StSettings(theResMgr, ST_OUT_PLUGIN_NAME)),
-  myFrBuffer(new StGLFrameBuffer()),
-  myProgram(new StProgramMM()),
+  mySettings(std::make_shared<StSettings>(theResMgr, ST_OUT_PLUGIN_NAME)),
+  myFrBuffer(std::make_shared<StGLFrameBuffer>()),
+  myProgram(std::make_shared<StProgramMM>()),
   myDevice(DEVICE_AUTO),
   myToCompressMem(myInstancesNb.increment() > 1),
   myIsBroken(false) {
@@ -209,19 +209,19 @@
     }*/
 
     // devices list
-    StHandle<StOutDevice> aDevDual = new StOutDevice();
+    std::shared_ptr<StOutDevice> aDevDual = std::make_shared<StOutDevice>();
     aDevDual->PluginId = ST_OUT_PLUGIN_NAME;
     aDevDual->DeviceId = stCString("Dual");
     aDevDual->Priority = aSupportLevel;
     aDevDual->Name     = stCString("Dual Output");
-    myDevices.add(aDevDual);
+    myDevices.push_back(aDevDual);
 
-    StHandle<StOutDevice> aDevMirr = new StOutDevice();
+    std::shared_ptr<StOutDevice> aDevMirr = std::make_shared<StOutDevice>();
     aDevMirr->PluginId = ST_OUT_PLUGIN_NAME;
     aDevMirr->DeviceId = stCString("Mirror");
     aDevMirr->Priority = aSupportLevel;
     aDevMirr->Name     = stCString("Mirror Output");
-    myDevices.add(aDevMirr);
+    myDevices.push_back(aDevMirr);
 
     // Slave Monitor option
     params.SlaveMonId = new StEnumParam(1, stCString("slaveId"), stCString("slaveId"));
@@ -234,7 +234,7 @@
         } else {
             aName += " (disconnected)";
         }
-        params.SlaveMonId->changeValues().add(aName);
+        params.SlaveMonId->changeValues().push_back(aName);
     }
     params.SlaveMonId->signals.onChanged.connect(this, &StOutDual::doSlaveMon);
 
@@ -271,7 +271,7 @@
 }
 
 void StOutDual::releaseResources() {
-    if(!myContext.isNull()) {
+    if (myContext.get() != nullptr) {
         myProgram->release(*myContext);
         myVertFlatBuf.release(*myContext);
         myVertXMirBuf.release(*myContext);
@@ -279,17 +279,17 @@
         myTexCoordBuf.release(*myContext);
         myFrBuffer->release(*myContext);
     }
-    myContext.nullify();
+    myContext.reset();
 
     // read windowed placement
     StWindow::hide();
-    if(isMovable()) {
+    if (isMovable()) {
         StWindow::setFullScreen(false);
     }
 }
 
 void StOutDual::beforeClose() {
-    if(isMovable() && myWasUsed) {
+    if (isMovable() && myWasUsed) {
         mySettings->saveInt32Rect(ST_SETTING_WINDOWPOS, StWindow::getWindowedPlacement());
     }
     mySettings->saveParam(params.SlaveMonId);
@@ -335,26 +335,26 @@
         return true;
     }
     // create vertices buffers to draw simple textured quad
-    const GLfloat QUAD_VERTICES4 * 4 = {
+    constexpr GLfloat QUAD_VERTICES4 * 4 = {
          1.0f, -1.0f, 0.0f, 1.0f, // top-right
          1.0f,  1.0f, 0.0f, 1.0f, // bottom-right
         -1.0f, -1.0f, 0.0f, 1.0f, // top-left
         -1.0f,  1.0f, 0.0f, 1.0f  // bottom-left
     };
-    const GLfloat QUAD_VERTICES_XMIR4 * 4 = {
+    constexpr GLfloat QUAD_VERTICES_XMIR4 * 4 = {
         -1.0f, -1.0f, 0.0f, 1.0f, // top-right
         -1.0f,  1.0f, 0.0f, 1.0f, // bottom-right
          1.0f, -1.0f, 0.0f, 1.0f, // top-left
          1.0f,  1.0f, 0.0f, 1.0f  // bottom-left
     };
-    const GLfloat QUAD_VERTICES_YMIR4 * 4 = {
+    constexpr GLfloat QUAD_VERTICES_YMIR4 * 4 = {
          1.0f,  1.0f, 0.0f, 1.0f, // top-right
          1.0f, -1.0f, 0.0f, 1.0f, // bottom-right
         -1.0f,  1.0f, 0.0f, 1.0f, // top-left
         -1.0f, -1.0f, 0.0f, 1.0f  // bottom-left
     };
 
-    const GLfloat QUAD_TEXCOORD2 * 4 = {
+    constexpr GLfloat QUAD_TEXCOORD2 * 4 = {
         1.0f, 0.0f,
         1.0f, 1.0f,
         0.0f, 0.0f,
@@ -442,13 +442,14 @@
         }
 
         // reduce viewport to avoid additional aliasing of narrow lines
-        GLfloat aDX = GLfloat(myFrBuffer->getVPSizeX()) / GLfloat(myFrBuffer->getSizeX());
-        GLfloat aDY = GLfloat(myFrBuffer->getVPSizeY()) / GLfloat(myFrBuffer->getSizeY());
-        StArray<StGLVec2> aTCoords(4);
-        aTCoords0 = StGLVec2(aDX,  0.0f);
-        aTCoords1 = StGLVec2(aDX,  aDY);
-        aTCoords2 = StGLVec2(0.0f, 0.0f);
-        aTCoords3 = StGLVec2(0.0f, aDY);
+        const GLfloat aDX = GLfloat(myFrBuffer->getVPSizeX()) / GLfloat(myFrBuffer->getSizeX());
+        const GLfloat aDY = GLfloat(myFrBuffer->getVPSizeY()) / GLfloat(myFrBuffer->getSizeY());
+        const std::vector<StGLVec2> aTCoords = {
+            StGLVec2(aDX,  0.0f),
+            StGLVec2(aDX,  aDY),
+            StGLVec2(0.0f, 0.0f),
+            StGLVec2(0.0f, aDY)
+        };
         myTexCoordBuf.init(*myContext, aTCoords);
 
         // draw Left View into virtual frame buffer
@@ -521,7 +522,7 @@
 }
 
 void StOutDual::doSwitchVSync(const int32_t theValue) {
-    if(myContext.isNull()) {
+    if (myContext.get() == nullptr) {
         return;
     }

_service:obs_scm:sview-26.obscpio/StOutDual/StOutDual.h Changed

@@ -27,8 +27,8 @@
     /**
      * Main constructor.
      */
-    ST_CPPEXPORT StOutDual(const StHandle<StResourceManager>& theResMgr,
-                           const StNativeWin_t                theParentWindow);
+    ST_CPPEXPORT StOutDual(const std::shared_ptr<StResourceManager>& theResMgr,
+                           const StNativeWin_t theParentWindow);
 
     /**
      * Destructor.
@@ -144,13 +144,14 @@
 
         private:
 
-    StOutDevicesList          myDevices;
-    StHandle<StSettings>      mySettings;
-    StString                  myAbout;           //!< about string
+    StOutDevicesList            myDevices;
+    std::shared_ptr<StSettings> mySettings;
+    StString                    myAbout;    //!< about string
+
+    std::shared_ptr<StGLContext>     myContext;
+    std::shared_ptr<StGLFrameBuffer> myFrBuffer; //!< OpenGL frame buffer object
+    std::shared_ptr<StProgramMM>     myProgram;
 
-    StHandle<StGLContext>     myContext;
-    StHandle<StGLFrameBuffer> myFrBuffer;        //!< OpenGL frame buffer object
-    StHandle<StProgramMM>     myProgram;
     StFPSControl              myFPSControl;
     StGLVertexBuffer          myVertFlatBuf;     //!< buffers to draw simple fullsreen quad
     StGLVertexBuffer          myVertXMirBuf;

_service:obs_scm:sview-26.obscpio/StOutIZ3D/StOutIZ3D.cpp Changed

@@ -90,12 +90,12 @@
 
 void StOutIZ3D::getDevices(StOutDevicesList& theList) const {
     for(size_t anIter = 0; anIter < myDevices.size(); ++anIter) {
-        theList.add(myDevicesanIter);
+        theList.push_back(myDevicesanIter);
     }
 }
 
 void StOutIZ3D::getOptions(StParamsList& theList) const {
-    theList.add(params.Glasses);
+    theList.push_back(params.Glasses);
 }
 
 void StOutIZ3D::updateStrings() {
@@ -118,11 +118,11 @@
             + aDescr.format("2009-2026", "kirill@sview.ru", "www.sview.ru");
 }
 
-StOutIZ3D::StOutIZ3D(const StHandle<StResourceManager>& theResMgr,
-                     const StNativeWin_t                theParentWindow)
+StOutIZ3D::StOutIZ3D(const std::shared_ptr<StResourceManager>& theResMgr,
+                     const StNativeWin_t theParentWindow)
 : StWindow(theResMgr, theParentWindow),
-  mySettings(new StSettings(theResMgr, ST_OUT_PLUGIN_NAME)),
-  myFrBuffer(new StGLStereoFrameBuffer()),
+  mySettings(std::make_shared<StSettings>(theResMgr, ST_OUT_PLUGIN_NAME)),
+  myFrBuffer(std::make_shared<StGLStereoFrameBuffer>()),
   myToCompressMem(myInstancesNb.increment() > 1),
   myIsBroken(false) {
     const StSearchMonitors& aMonitors = StWindow::getMonitors();
@@ -142,12 +142,12 @@
     }
 
     // devices list
-    StHandle<StOutDevice> aDevice = new StOutDevice();
+    std::shared_ptr<StOutDevice> aDevice = std::make_shared<StOutDevice>();
     aDevice->PluginId = ST_OUT_PLUGIN_NAME;
     aDevice->DeviceId = stCString("iZ3D");
     aDevice->Priority = aSupportLevel;
     aDevice->Name     = stCString("IZ3D Display");
-    myDevices.add(aDevice);
+    myDevices.push_back(aDevice);
 
     // shader switch option
     params.Glasses = new StEnumParam(myShaders.getMode(), stCString("tableId"), stCString("tableId"));
@@ -173,13 +173,13 @@
 }
 
 void StOutIZ3D::releaseResources() {
-    if(!myContext.isNull()) {
+    if (myContext.get() != nullptr) {
         myShaders.release(*myContext);
         myTexTableOld.release(*myContext);
         myTexTableNew.release(*myContext);
         myFrBuffer->release(*myContext);
     }
-    myContext.nullify();
+    myContext.reset();
 
     // read windowed placement
     StWindow::hide();
@@ -217,7 +217,7 @@
     // initialize GL context
     myContext = StWindow::getContext();
     myContext->setMessagesQueue(myMsgQueue);
-    const StHandle<StResourceManager>& aResMgr = getResourceManager();
+    const std::shared_ptr<StResourceManager>& aResMgr = getResourceManager();
     if(!myContext->isGlGreaterEqual(2, 0)) {
         myMsgQueue->pushError(stCString("OpenGL 2.0 is required by iZ3D Output"));
         myIsBroken = true;
@@ -230,16 +230,14 @@
 
     // INIT iZ3D tables textures
     StAVImage aTableImg;
-    StHandle<StResource> aTableOld = aResMgr->getResource(StString("textures") + SYS_FS_SPLITTER + "iz3dTableOld.png");
-    uint8_t* aData     = NULL;
+    std::shared_ptr<StResource> aTableOld = aResMgr->getResource(StString("textures") + SYS_FS_SPLITTER + "iz3dTableOld.png");
+    uint8_t* aData     = nullptr;
     int      aDataSize = 0;
-    if(!aTableOld.isNull()
-    && !aTableOld->isFile()
-    &&  aTableOld->read()) {
+    if (aTableOld.get() != nullptr && !aTableOld->isFile() && aTableOld->read()) {
         aData     = (uint8_t* )aTableOld->getData();
         aDataSize = aTableOld->getSize();
     }
-    if(!aTableImg.load(!aTableOld.isNull() ? aTableOld->getPath() : StString(), StImageFile::ST_TYPE_PNG, aData, aDataSize)) {
+    if (!aTableImg.load(aTableOld.get() != nullptr ? aTableOld->getPath() : StString(), StImageFile::ST_TYPE_PNG, aData, aDataSize)) {
         myMsgQueue->pushError(StString("iZ3D output - critical error:\n") + aTableImg.getState());
         myIsBroken = true;
         return true;
@@ -251,16 +249,14 @@
         return true;
     }
 
-    StHandle<StResource> aTableNew = aResMgr->getResource(StString("textures") + SYS_FS_SPLITTER + "iz3dTableNew.png");
-    aData     = NULL;
+    std::shared_ptr<StResource> aTableNew = aResMgr->getResource(StString("textures") + SYS_FS_SPLITTER + "iz3dTableNew.png");
+    aData     = nullptr;
     aDataSize = 0;
-    if(!aTableNew.isNull()
-    && !aTableNew->isFile()
-    &&  aTableNew->read()) {
+    if (aTableNew.get() != nullptr && !aTableNew->isFile() && aTableNew->read()) {
         aData     = (uint8_t* )aTableNew->getData();
         aDataSize = aTableNew->getSize();
     }
-    if(!aTableImg.load(!aTableNew.isNull() ? aTableNew->getPath() : StString(), StImageFile::ST_TYPE_PNG, aData, aDataSize)) {
+    if (!aTableImg.load(aTableNew.get() != nullptr ? aTableNew->getPath() : StString(), StImageFile::ST_TYPE_PNG, aData, aDataSize)) {
         myMsgQueue->pushError(StString("iZ3D output - critical error:\n") + aTableImg.getState());
         myIsBroken = true;
         return true;
@@ -397,7 +393,7 @@
 }
 
 void StOutIZ3D::doSwitchVSync(const int32_t theValue) {
-    if(myContext.isNull()) {
+    if (myContext.get() == nullptr) {
         return;
     }

_service:obs_scm:sview-26.obscpio/StOutIZ3D/StOutIZ3D.h Changed

@@ -26,8 +26,8 @@
     /**
      * Main constructor.
      */
-    ST_CPPEXPORT StOutIZ3D(const StHandle<StResourceManager>& theResMgr,
-                           const StNativeWin_t                theParentWindow);
+    ST_CPPEXPORT StOutIZ3D(const std::shared_ptr<StResourceManager>& theResMgr,
+                           const StNativeWin_t theParentWindow);
 
     /**
      * Destructor.
@@ -123,12 +123,13 @@
 
         private:
 
-    StOutDevicesList                myDevices;
-    StHandle<StSettings>            mySettings;
-    StString                        myAbout;           //!< about string
+    StOutDevicesList            myDevices;
+    std::shared_ptr<StSettings> mySettings;
+    StString                    myAbout;    //!< about string
+
+    std::shared_ptr<StGLContext>           myContext;
+    std::shared_ptr<StGLStereoFrameBuffer> myFrBuffer; //!< frame buffer to draw
 
-    StHandle<StGLContext>           myContext;
-    StHandle<StGLStereoFrameBuffer> myFrBuffer;        //!< frame buffer to draw
     StOutIZ3DShaders                myShaders;         //!< IZ3D shaders
     StGLTexture                     myTexTableOld;     //!< table textures
     StGLTexture                     myTexTableNew;

_service:obs_scm:sview-26.obscpio/StOutInterlace/StOutInterlace.cpp Changed

@@ -24,17 +24,17 @@
 
 namespace {
 
-    static const char ST_OUT_PLUGIN_NAME = "StOutInterlace";
+    static constexpr char ST_OUT_PLUGIN_NAME = "StOutInterlace";
 
 #if !defined(__ANDROID__)
     // shaders data files
-    static const char VSHADER_ED              = "vED.shv";
-    static const char FSHADER_EDINTERLACE_ON  = "fEDinterlace.shf";
-    static const char FSHADER_ED_OFF          = "fEDoff.shf";
+    static constexpr char VSHADER_ED              = "vED.shv";
+    static constexpr char FSHADER_EDINTERLACE_ON  = "fEDinterlace.shf";
+    static constexpr char FSHADER_ED_OFF          = "fEDoff.shf";
 #endif
 
-    static const char ST_SETTING_DEVICE_ID    = "deviceId";
-    static const char ST_SETTING_WINDOWPOS    = "windowPos";
+    static constexpr char ST_SETTING_DEVICE_ID    = "deviceId";
+    static constexpr char ST_SETTING_WINDOWPOS    = "windowPos";
 
     struct StMonInterlacedInfo_t {
         const stUtf8_t* pnpid;
@@ -45,7 +45,7 @@
     /**
      * Database of known interlaced monitors.
      */
-    static const StMonInterlacedInfo_t THE_KNOWN_MONITORS = {
+    static constexpr StMonInterlacedInfo_t THE_KNOWN_MONITORS = {
         {"ZMT1900", false, true}, // Zalman Trimon M190S
         {"ZMT2200", false, true}, // Zalman Trimon M220W
         {"ENV2373", true , true}, // Envision
@@ -171,13 +171,13 @@
 
 StAtomic<int32_t> StOutInterlace::myInstancesNb(0);
 
-StHandle<StMonitor> StOutInterlace::getInterlacedMonitor(const StArrayList<StMonitor>& theMonitors,
-                                                         bool& theIsReversed,
-                                                         bool& theIsRowInterlaced) {
+std::shared_ptr<StMonitor> StOutInterlace::getInterlacedMonitor(const StSearchMonitors& theMonitors,
+                                                                bool& theIsReversed,
+                                                                bool& theIsRowInterlaced) {
     for(size_t aMonIter = 0; aMonIter < theMonitors.size(); ++aMonIter) {
         const StMonitor& aMon = theMonitorsaMonIter;
         if(isInterlacedMonitor(aMon, theIsReversed, theIsRowInterlaced)) {
-            return new StMonitor(aMon);
+            return std::make_shared<StMonitor>(aMon);
         }
     }
     return NULL;
@@ -222,17 +222,17 @@
         if(myDevicesanIter->Priority == ST_DEVICE_SUPPORT_IGNORE) {
             continue;
         }
-        theList.add(myDevicesanIter);
+        theList.push_back(myDevicesanIter);
     }
 }
 
 void StOutInterlace::getOptions(StParamsList& theList) const {
-    theList.add(params.ToReverse);
-    theList.add(params.ToSmooth);
+    theList.push_back(params.ToReverse);
+    theList.push_back(params.ToSmooth);
 #if !defined(__ANDROID__)
-    theList.add(params.BindToMon);
+    theList.push_back(params.BindToMon);
 #endif
-    theList.add(params.ToUseMask);
+    theList.push_back(params.ToUseMask);
 }
 
 void StOutInterlace::updateStrings() {
@@ -262,20 +262,20 @@
             + aDescr.format("2009-2026", "kirill@sview.ru", "www.sview.ru");
 }
 
-StOutInterlace::StOutInterlace(const StHandle<StResourceManager>& theResMgr,
-                               const StNativeWin_t                theParentWindow)
+StOutInterlace::StOutInterlace(const std::shared_ptr<StResourceManager>& theResMgr,
+                               const StNativeWin_t theParentWindow)
 : StWindow(theResMgr, theParentWindow),
-  mySettings(new StSettings(theResMgr, ST_OUT_PLUGIN_NAME)),
-  myFrmBuffer(new StGLFrameBuffer()),
-  myTextureMask(new StGLTexture(GL_ALPHA)),
-  myTextureMaskEmpty(new StGLTexture(GL_ALPHA)),
+  mySettings(std::make_shared<StSettings>(theResMgr, ST_OUT_PLUGIN_NAME)),
+  myFrmBuffer(std::make_shared<StGLFrameBuffer>()),
+  myTextureMask(std::make_shared<StGLTexture>(GL_ALPHA)),
+  myTextureMaskEmpty(std::make_shared<StGLTexture>(GL_ALPHA)),
   myTexMaskDevice(DEVICE_AUTO),
   myTexMaskReversed(false),
   myDevice(DEVICE_AUTO),
   myBarrierState(BarrierState_Unknown),
   myEDTimer(true),
-  myEDIntelaceOn(new StGLProgram("ED Interlace On")),
-  myEDOff(new StGLProgram("ED Interlace Off")),
+  myEDIntelaceOn(std::make_shared<StGLProgram>("ED Interlace On")),
+  myEDOff(std::make_shared<StGLProgram>("ED Interlace Off")),
   myVpSizeY(10),
   myIsMonReversed(false),
   myIsMonPortrait(false),
@@ -296,36 +296,36 @@
     StWindow::signals.onAnotherMonitor = stSlot(this, &StOutInterlace::doNewMonitor);
 
     const StSearchMonitors& aMonitors = StWindow::getMonitors();
-    myGlProgramsDEVICE_ROW_INTERLACED       = new StProgramFB("Row Interlace");
-    myGlProgramsDEVICE_COL_INTERLACED       = new StProgramFB("Column Interlace");
-    myGlProgramsDEVICE_CHESSBOARD           = new StProgramFB("Chessboard");
+    myGlProgramsDEVICE_ROW_INTERLACED       = std::make_shared<StProgramFB>("Row Interlace");
+    myGlProgramsDEVICE_COL_INTERLACED       = std::make_shared<StProgramFB>("Column Interlace");
+    myGlProgramsDEVICE_CHESSBOARD           = std::make_shared<StProgramFB>("Chessboard");
     myGlProgramsDEVICE_ROW_INTERLACED_ED    = myGlProgramsDEVICE_ROW_INTERLACED;
     myGlProgramsDEVICE_COL_INTERLACED_MI3D  = myGlProgramsDEVICE_COL_INTERLACED;
 
-    myGlProgramsRevDEVICE_ROW_INTERLACED      = new StProgramFB("Row Interlace Inversed");
-    myGlProgramsRevDEVICE_COL_INTERLACED      = new StProgramFB("Column Interlace Inversed");
-    myGlProgramsRevDEVICE_CHESSBOARD          = new StProgramFB("Chessboard Inversed");
+    myGlProgramsRevDEVICE_ROW_INTERLACED      = std::make_shared<StProgramFB>("Row Interlace Inversed");
+    myGlProgramsRevDEVICE_COL_INTERLACED      = std::make_shared<StProgramFB>("Column Interlace Inversed");
+    myGlProgramsRevDEVICE_CHESSBOARD          = std::make_shared<StProgramFB>("Chessboard Inversed");
     myGlProgramsRevDEVICE_ROW_INTERLACED_ED   = myGlProgramsRevDEVICE_ROW_INTERLACED;
     myGlProgramsRevDEVICE_COL_INTERLACED_MI3D = myGlProgramsRevDEVICE_COL_INTERLACED;
 
-    myGlProgramMask = new StProgramFB("Interlace Mask");
+    myGlProgramMask = std::make_shared<StProgramFB>("Interlace Mask");
 
     // devices list
-    StHandle<StOutDevice> aDevRow = new StOutDevice();
+    std::shared_ptr<StOutDevice> aDevRow = std::make_shared<StOutDevice>();
     aDevRow->PluginId = ST_OUT_PLUGIN_NAME;
     aDevRow->DeviceId = stCString("Row");
     aDevRow->Priority = ST_DEVICE_SUPPORT_NONE;
     aDevRow->Name     = stCString("Row Interlaced");
-    myDevices.add(aDevRow);
+    myDevices.push_back(aDevRow);
 
-    StHandle<StOutDevice> aDevCol = new StOutDevice();
+    std::shared_ptr<StOutDevice> aDevCol = std::make_shared<StOutDevice>();
     aDevCol->PluginId = ST_OUT_PLUGIN_NAME;
     aDevCol->DeviceId = stCString("Col");
     aDevCol->Priority = ST_DEVICE_SUPPORT_NONE;
     aDevCol->Name     = stCString("Column Interlaced");
-    myDevices.add(aDevCol);
+    myDevices.push_back(aDevCol);
 
-    StHandle<StOutDevice> aDevChess = new StOutDevice();
+    std::shared_ptr<StOutDevice> aDevChess = std::make_shared<StOutDevice>();
     aDevChess->PluginId = ST_OUT_PLUGIN_NAME;
     aDevChess->DeviceId = stCString("Chess");
 #if defined(__ANDROID__)
@@ -334,9 +334,9 @@
     aDevChess->Priority = ST_DEVICE_SUPPORT_NONE;
 #endif
     aDevChess->Name     = stCString("DLP TV (chessboard)");
-    myDevices.add(aDevChess);
+    myDevices.push_back(aDevChess);
 
-    StHandle<StOutDevice> aDevED = new StOutDevice();
+    std::shared_ptr<StOutDevice> aDevED = std::make_shared<StOutDevice>();
     aDevED->PluginId = ST_OUT_PLUGIN_NAME;
     aDevED->DeviceId = stCString("RowED");
 #if defined(__ANDROID__)
@@ -345,9 +345,9 @@
     aDevED->Priority = ST_DEVICE_SUPPORT_NONE;
 #endif
     aDevED->Name     = stCString("Interlaced ED");
-    myDevices.add(aDevED);
+    myDevices.push_back(aDevED);
 
-    StHandle<StOutDevice> aDevMI3D = new StOutDevice();
+    std::shared_ptr<StOutDevice> aDevMI3D = std::make_shared<StOutDevice>();
     aDevMI3D->PluginId = ST_OUT_PLUGIN_NAME;
     aDevMI3D->DeviceId = stCString("ColMI3D");
     aDevMI3D->Priority = ST_DEVICE_SUPPORT_IGNORE;
@@ -363,13 +363,13 @@
     }
 #endif
     aDevMI3D->Name = stCString("Interlaced MI3D");
-    myDevices.add(aDevMI3D);
+    myDevices.push_back(aDevMI3D);
 
     // detect connected displays
     bool isDummyReversed = false;
     bool isRowInterlaced = false;
-    StHandle<StMonitor> aMonInterlaced = getInterlacedMonitor(aMonitors, isDummyReversed, isRowInterlaced);
-    if(!aMonInterlaced.isNull()) {
+    std::shared_ptr<StMonitor> aMonInterlaced = getInterlacedMonitor(aMonitors, isDummyReversed, isRowInterlaced);
+    if (aMonInterlaced.get() != nullptr) {
         if(isRowInterlaced) {
             aDevRow->Priority = ST_DEVICE_SUPPORT_PREFER;
         } else {
@@ -401,9 +401,9 @@
                               256, 256 + aDefWidth);
         const bool isLoadedPosition = mySettings->loadInt32Rect(ST_SETTING_WINDOWPOS, aRect);
         StMonitor aMonitor = aMonitorsaRect.center();
-        if(params.BindToMon->getValue()
-        && !aMonInterlaced.isNull()
-        && !isInterlacedMonitor(aMonitor, isDummyReversed, isRowInterlaced)) {
+        if (params.BindToMon->getValue()
+         && aMonInterlaced.get() != nullptr
+         && !isInterlacedMonitor(aMonitor, isDummyReversed, isRowInterlaced)) {
             aMonitor = *aMonInterlaced;
         }
         if(isLoadedPosition) {
@@ -424,7 +424,7 @@
     }
 
     // setup myIsMonReversed value for actual placement
-    if(!aMonInterlaced.isNull()) {
+    if (aMonInterlaced.get() != nullptr) {
         myIsMonReversed = false;
         StMonitor aMonitor = aMonitorsStWindow::getPlacement().center();
         isInterlacedMonitor(aMonitor, myIsMonReversed, isRowInterlaced);
@@ -449,8 +449,8 @@
 }
 
 void StOutInterlace::releaseResources() {
-    if(!myContext.isNull()) {
-        for(size_t anIter = 0; anIter < DEVICE_NB; ++anIter) {
+    if (myContext.get() != nullptr) {
+        for (size_t anIter = 0; anIter < DEVICE_NB; ++anIter) {
             myGlPrograms   anIter->release(*myContext);
             myGlProgramsRevanIter->release(*myContext);
         }
@@ -463,7 +463,7 @@
         myTextureMaskEmpty->release(*myContext);
         myGlProgramMask->release(*myContext);
     }
-    myContext.nullify();
+    myContext.reset();
 
     // read windowed placement
     StWindow::hide();
@@ -560,7 +560,7 @@
     StWindow::params.VSyncMode->signals.onChanged += stSlot(this, &StOutInterlace::doSwitchVSync);
 
     // INIT shaders
-    StCString aShadersError = stCString("Interlace output - critical error:\nShaders initialization failed!");
+    constexpr StCString aShadersError = stCString("Interlace output - critical error:\nShaders initialization failed!");
     StGLVertexShader aVertexShader("Interlace"); // common vertex shader
     StGLAutoRelease aTmp1(*myContext, aVertexShader);
     if(!aVertexShader.init(*myContext,
@@ -799,14 +799,14 @@
 
     // resize ED rectangle
     const StRectI_t aRect = StWindow::getPlacement();
-    if(aRect != myWinRect) {
+    if (aRect != myWinRect) {
         myWinRect = aRect;
         myVpSizeY = aRect.height();
-        if(!StWindow::isFullScreen()) {
+        if (!StWindow::isFullScreen()) {
             const StSearchMonitors& aMonitors = StWindow::getMonitors();
-            if(myMonitor.isNull()) {
-                myMonitor = new StMonitor(aMonitorsaRect.center());
-            } else if(!myMonitor->getVRect().isPointIn(aRect.center())) {
+            if (myMonitor.get() == nullptr) {
+                myMonitor = std::make_shared<StMonitor>(aMonitorsaRect.center());
+            } else if (!myMonitor->getVRect().isPointIn(aRect.center())) {
                 *myMonitor = aMonitorsaRect.center();
             }
             myEDRect.left()   = 0;
@@ -1089,13 +1089,14 @@
     }
 
     // reduce viewport to avoid additional aliasing of narrow lines
-    GLfloat aDX = GLfloat(myFrmBuffer->getVPSizeX()) / GLfloat(myFrmBuffer->getSizeX());
-    GLfloat aDY = GLfloat(myFrmBuffer->getVPSizeY()) / GLfloat(myFrmBuffer->getSizeY());
-    StArray<StGLVec2> aTCoords(4);
-    aTCoords0 = StGLVec2(aDX,  0.0f);
-    aTCoords1 = StGLVec2(aDX,  aDY);
-    aTCoords2 = StGLVec2(0.0f, 0.0f);
-    aTCoords3 = StGLVec2(0.0f, aDY);
+    const GLfloat aDX = GLfloat(myFrmBuffer->getVPSizeX()) / GLfloat(myFrmBuffer->getSizeX());
+    const GLfloat aDY = GLfloat(myFrmBuffer->getVPSizeY()) / GLfloat(myFrmBuffer->getSizeY());
+    const std::vector<StGLVec2> aTCoords = {
+        StGLVec2(aDX,  0.0f),
+        StGLVec2(aDX,  aDY),
+        StGLVec2(0.0f, 0.0f),
+        StGLVec2(0.0f, aDY)
+    };
     myQuadTexCoordBuf.init(*myContext, aTCoords);
 
     for(int anEyeIter = toSmooth ? 0 : 1; anEyeIter < 2; ++anEyeIter) {
@@ -1113,11 +1114,11 @@
 
         myContext->stglResizeViewport(aVPort);
         myFrmBuffer->bindTexture(*myContext);
-        StHandle<StGLTexture>& aTexMask = (anEyeIter == 0) ? myTextureMaskEmpty : myTextureMask;
-        if(toUseTexMask) {
+        std::shared_ptr<StGLTexture>& aTexMask = (anEyeIter == 0) ? myTextureMaskEmpty : myTextureMask;
+        if (toUseTexMask) {
             aTexMask->bind(*myContext, GL_TEXTURE1);
         }
-        const StHandle<StProgramFB>& aProgram = toUseTexMask
+        const std::shared_ptr<StProgramFB>& aProgram = toUseTexMask
                                               ? myGlProgramMask
                                               : (toReverseReverse
                                                 ? myGlProgramsRevaDevice
@@ -1182,7 +1183,7 @@
 }
 
 void StOutInterlace::doSwitchVSync(const int32_t theValue) {
-    if(myContext.isNull()) {
+    if (myContext.get() == nullptr) {
         return;
     }
 
@@ -1205,8 +1206,8 @@
         return;
     }
 
-    StHandle<StMonitor> anInterlacedMon = getInterlacedMonitor(aMonitors, myIsMonReversed, isRowInterlaced);
-    if(anInterlacedMon.isNull()) {
+    std::shared_ptr<StMonitor> anInterlacedMon = getInterlacedMonitor(aMonitors, myIsMonReversed, isRowInterlaced);
+    if (anInterlacedMon.get() == nullptr) {
         return;
     }

_service:obs_scm:sview-26.obscpio/StOutInterlace/StOutInterlace.h Changed

@@ -47,8 +47,8 @@
     /**
      * Main constructor.
      */
-    ST_CPPEXPORT StOutInterlace(const StHandle<StResourceManager>& theResMgr,
-                                const StNativeWin_t                theParentWindow);
+    ST_CPPEXPORT StOutInterlace(const std::shared_ptr<StResourceManager>& theResMgr,
+                                const StNativeWin_t theParentWindow);
 
     /**
      * Destructor.
@@ -139,9 +139,9 @@
     /**
      * Look for interlaced monitors within the given list.
      */
-    ST_LOCAL static StHandle<StMonitor> getInterlacedMonitor(const StArrayList<StMonitor>& theMonitors,
-                                                             bool& theIsReversed,
-                                                             bool& theIsRowInterlaced);
+    ST_LOCAL static std::shared_ptr<StMonitor> getInterlacedMonitor(const StSearchMonitors& theMonitors,
+                                                                    bool& theIsReversed,
+                                                                    bool& theIsRowInterlaced);
 
     ST_LOCAL void stglDrawEDCodes();
 
@@ -210,31 +210,33 @@
 
         private:
 
-    StOutDevicesList          myDevices;
-    StHandle<StSettings>      mySettings;
-    StString                  myAbout;                    //!< about string
-    StHandle<StGLContext>     myContext;
-    StHandle<StGLFrameBuffer> myFrmBuffer;                //!< OpenGL frame buffer object
-    StHandle<StProgramFB>     myGlProgramsDEVICE_NB;    //!< GLSL programs
-    StHandle<StProgramFB>     myGlProgramsRevDEVICE_NB; //!< GLSL programs with reversed left/right condition
-
-    StHandle<StProgramFB>     myGlProgramMask;            //!< universal GLSL program which uses mask texture
-    StHandle<StGLTexture>     myTextureMask;              //!< texture holding mask for discarding pixels
-    StHandle<StGLTexture>     myTextureMaskEmpty;         //!< empty texture (no discard)
-    int                       myTexMaskDevice;            //!< texture mask device
-    bool                      myTexMaskReversed;          //!< texture mask is initialized in reversed state
-
-    StGLVertexBuffer          myQuadVertBuf;
-    StGLVertexBuffer          myQuadTexCoordBuf;
-    int                       myDevice;
-    StHandle<StMonitor>       myMonitor;                  //!< current monitor
-    BarrierState              myBarrierState;
-
-    StRectI_t                 myWinRect;
-    StRectI_t                 myEDRect;
-    StTimer                   myEDTimer;                  //!< EDimensional activator/disactivator timer
-    StHandle<StGLProgram>     myEDIntelaceOn;             //!< ED interlace activate program
-    StHandle<StGLProgram>     myEDOff;                    //!< ED disactivate program
+    StOutDevicesList                 myDevices;
+    std::shared_ptr<StSettings>      mySettings;
+    StString                         myAbout;                    //!< about string
+    std::shared_ptr<StGLContext>     myContext;
+    std::shared_ptr<StGLFrameBuffer> myFrmBuffer;                //!< OpenGL frame buffer object
+    std::shared_ptr<StProgramFB>     myGlProgramsDEVICE_NB;    //!< GLSL programs
+    std::shared_ptr<StProgramFB>     myGlProgramsRevDEVICE_NB; //!< GLSL programs with reversed left/right condition
+
+    std::shared_ptr<StProgramFB>     myGlProgramMask;            //!< universal GLSL program which uses mask texture
+    std::shared_ptr<StGLTexture>     myTextureMask;              //!< texture holding mask for discarding pixels
+    std::shared_ptr<StGLTexture>     myTextureMaskEmpty;         //!< empty texture (no discard)
+
+    int  myTexMaskDevice;            //!< texture mask device
+    bool myTexMaskReversed;          //!< texture mask is initialized in reversed state
+
+    StGLVertexBuffer           myQuadVertBuf;
+    StGLVertexBuffer           myQuadTexCoordBuf;
+    int                        myDevice;
+    std::shared_ptr<StMonitor> myMonitor;                  //!< current monitor
+    BarrierState               myBarrierState;
+
+    StRectI_t                    myWinRect;
+    StRectI_t                    myEDRect;
+    StTimer                      myEDTimer;                  //!< EDimensional activator/disactivator timer
+    std::shared_ptr<StGLProgram> myEDIntelaceOn;             //!< ED interlace activate program
+    std::shared_ptr<StGLProgram> myEDOff;                    //!< ED disactivate program
+
     GLsizei                   myVpSizeY;                  //!< VIewPort Y size
     StGLVarLocation           myVpSizeYOnLoc;             //!< helper shader variables
     StGLVarLocation           myVpSizeYOffLoc;

_service:obs_scm:sview-26.obscpio/StOutPageFlip/StDXNVWindow.cpp Changed

_service:obs_scm:sview-26.obscpio/StOutPageFlip/StDXNVWindow.h Changed

_service:obs_scm:sview-26.obscpio/StOutPageFlip/StOutPageFlip.cpp Changed

@@ -28,10 +28,10 @@
 
 namespace {
 
-    static const char ST_OUT_PLUGIN_NAME = "StOutPageFlip";
+    static constexpr char ST_OUT_PLUGIN_NAME = "StOutPageFlip";
 
-    static const char ST_SETTING_WINDOWPOS  = "windowPos";
-    static const char ST_SETTING_DEVICE_ID  = "deviceId";
+    static constexpr char ST_SETTING_WINDOWPOS  = "windowPos";
+    static constexpr char ST_SETTING_DEVICE_ID  = "deviceId";
 }
 
 StOutPageFlip::StOutDirect3D::StOutDirect3D()
@@ -356,14 +356,14 @@
 static StMonitor getHigestFreqMonitor(const StSearchMonitors& theMonitors) {
     size_t hfreqMon = 0;
     float hfreqMax = 0;
-    for(size_t aMonIter = 0; aMonIter < theMonitors.size(); ++aMonIter) {
+    for (size_t aMonIter = 0; aMonIter < theMonitors.size(); ++aMonIter) {
         const StMonitor& aMon = theMonitorsaMonIter;
-        if(aMon.getFreqMax() > hfreqMax) {
+        if (aMon.getFreqMax() > hfreqMax) {
             hfreqMax = aMon.getFreqMax();
             hfreqMon = aMonIter;
         }
     }
-    return !theMonitors.isEmpty() ? theMonitorshfreqMon : StMonitor();
+    return !theMonitors.empty() ? theMonitorshfreqMon : StMonitor();
 }
 
 StString StOutPageFlip::getRendererAbout() const {
@@ -398,13 +398,13 @@
 
 void StOutPageFlip::getDevices(StOutDevicesList& theList) const {
     for(size_t anIter = 0; anIter < myDevices.size(); ++anIter) {
-        theList.add(myDevicesanIter);
+        theList.push_back(myDevicesanIter);
     }
 }
 
 void StOutPageFlip::getOptions(StParamsList& theList) const {
-    theList.add(params.QuadBuffer);
-    theList.add(params.ToShowExtra);
+    theList.push_back(params.QuadBuffer);
+    theList.push_back(params.ToShowExtra);
 }
 
 namespace {
@@ -485,10 +485,10 @@
             + aDescr.format("2007-2026", "kirill@sview.ru", "www.sview.ru");
 }
 
-StOutPageFlip::StOutPageFlip(const StHandle<StResourceManager>& theResMgr,
-                             const StNativeWin_t                theParentWindow)
+StOutPageFlip::StOutPageFlip(const std::shared_ptr<StResourceManager>& theResMgr,
+                             const StNativeWin_t theParentWindow)
 : StWindow(theResMgr, theParentWindow),
-  mySettings(new StSettings(theResMgr, ST_OUT_PLUGIN_NAME)),
+  mySettings(std::make_shared<StSettings>(theResMgr, ST_OUT_PLUGIN_NAME)),
   myLangMap(theResMgr, ST_OUT_PLUGIN_NAME),
   myDevice(DEVICE_AUTO),
   myToDrawStereo(false),
@@ -526,19 +526,19 @@
     }
 
     // devices list
-    StHandle<StOutDevice> aDevShutters = new StOutDevice();
+    std::shared_ptr<StOutDevice> aDevShutters = std::make_shared<StOutDevice>();
     aDevShutters->PluginId = ST_OUT_PLUGIN_NAME;
     aDevShutters->DeviceId = stCString("Shutters");
     aDevShutters->Priority = aSupportLevelShutters;
     aDevShutters->Name     = stCString("Shutter glasses");
-    myDevices.add(aDevShutters);
+    myDevices.push_back(aDevShutters);
 
-    StHandle<StOutDevice> aDevVuzix = new StOutDevice();
+    std::shared_ptr<StOutDevice> aDevVuzix = std::make_shared<StOutDevice>();
     aDevVuzix->PluginId = ST_OUT_PLUGIN_NAME;
     aDevVuzix->DeviceId = stCString("Vuzix");
     aDevVuzix->Priority = aSupportLevelVuzix;
     aDevVuzix->Name     = stCString("Vuzix HMD");
-    myDevices.add(aDevVuzix);
+    myDevices.push_back(aDevVuzix);
 
     // load window position
     if(isMovable()) {
@@ -598,12 +598,12 @@
 }
 
 void StOutPageFlip::releaseResources() {
-    if(!myWarning.isNull()) {
+    if (myWarning.get() != nullptr) {
         myWarning->release(*myContext);
-        myWarning.nullify();
+        myWarning.reset();
     }
 #ifdef _WIN32
-    if(!myContext.isNull()) {
+    if (myContext.get() != nullptr) {
         myOutD3d.Program->release(*myContext);
         myOutD3d.VertBuf.release(*myContext);
         myOutD3d.TCrdBuf.release(*myContext);
@@ -611,8 +611,8 @@
 #endif
 
     dxRelease();
-    myContext.nullify();
-    myVuzixSDK.nullify();
+    myContext.reset();
+    myVuzixSDK.reset();
 
     // read windowed placement
     StWindow::hide();
@@ -651,7 +651,7 @@
             if(!StVuzixSDK::isConnected(StWindow::getMonitors())) {
                 myMsgQueue->pushError(stCString("PageFlip output - Vuzix HMD Not Found!"));
                 break;
-            } else if(myVuzixSDK.isNull()) {
+            } else if (myVuzixSDK.get() == nullptr) {
                 myMsgQueue->pushError(stCString("PageFlip output - Failed to Load Vuzix VR920 Driver!"));
                 break;
             }
@@ -659,7 +659,7 @@
             break;
         }
         default: {
-            if(!myVuzixSDK.isNull()) {
+            if (myVuzixSDK.get() != nullptr) {
                 myVuzixSDK->setMonoOut();
                 myVuzixSDK->close();
             }
@@ -893,21 +893,19 @@
 
     // load fullscreen-only warning
     StAVImage anImage;
-    StHandle<StResource> aWarnRes = getResourceManager()->getResource(StString("textures") + SYS_FS_SPLITTER + "pageflip_fullscreen.png");
-    uint8_t* aData     = NULL;
+    std::shared_ptr<StResource> aWarnRes = getResourceManager()->getResource(StString("textures") + SYS_FS_SPLITTER + "pageflip_fullscreen.png");
+    uint8_t* aData     = nullptr;
     int      aDataSize = 0;
-    if(!aWarnRes.isNull()
-    && !aWarnRes->isFile()
-    &&  aWarnRes->read()) {
+    if (aWarnRes.get() != nullptr && !aWarnRes->isFile() && aWarnRes->read()) {
         aData     = (uint8_t* )aWarnRes->getData();
         aDataSize = aWarnRes->getSize();
     }
-    if(anImage.load(!aWarnRes.isNull() ? aWarnRes->getPath() : StString(), StImageFile::ST_TYPE_PNG, aData, aDataSize)) {
-        myWarning = new StGLTextureQuad();
-        if(!myWarning->init(*myContext, anImage.getPlane())) {
+    if (anImage.load(aWarnRes.get() != nullptr ? aWarnRes->getPath() : StString(), StImageFile::ST_TYPE_PNG, aData, aDataSize)) {
+        myWarning = std::make_shared<StGLTextureQuad>();
+        if (!myWarning->init(*myContext, anImage.getPlane())) {
             ST_ERROR_LOG(ST_OUT_PLUGIN_NAME + " Plugin, Texture can not be initialized!");
             myWarning->release(*myContext);
-            myWarning.nullify();
+            myWarning.reset();
         }
     } else {
         ST_ERROR_LOG(ST_OUT_PLUGIN_NAME + " Plugin, Texture missed: " + anImage.getState());
@@ -921,9 +919,9 @@
 #endif
 
     // initialize Vuzix library
-    myVuzixSDK = new StVuzixSDK();
+    myVuzixSDK = std::make_shared<StVuzixSDK>();
     if(myVuzixSDK->init() != STERROR_LIBNOERROR) {
-        myVuzixSDK.nullify();
+        myVuzixSDK.reset();
         //ST_DEBUG_LOG(ST_OUT_PLUGIN_NAME + ST_STRING(" Plugin, Failed to Load Vuzix VR920 Driver!"));
     }
 
@@ -1031,14 +1029,14 @@
     const StGLBoxPx aVPort = StWindow::stglViewport(ST_WIN_MASTER);
     myContext->stglResizeViewport(aVPort);
 
-    if(!StWindow::isStereoOutput()) {
+    if (!StWindow::isStereoOutput()) {
         // Vuzix driver control
-        if(myToDrawStereo) {
-            if(myDevice == DEVICE_VUZIX && !myVuzixSDK.isNull()) {
+        if (myToDrawStereo) {
+            if (myDevice == DEVICE_VUZIX && myVuzixSDK.get() != nullptr) {
                 myVuzixSDK->setMonoOut();
             }
 
-            if(params.QuadBuffer->getValue() == QUADBUFFER_SOFT) {
+            if (params.QuadBuffer->getValue() == QUADBUFFER_SOFT) {
                 myContext->stglSetVSync((StGLContext::VSync_Mode )StWindow::params.VSyncMode->getValue());
             }
 
@@ -1049,7 +1047,7 @@
         dxDisactivate();
 
         // setup whole back buffer (left+right) for hardware GL Quad Buffer
-        if(params.QuadBuffer->getValue() == QUADBUFFER_HARD_OPENGL) {
+        if (params.QuadBuffer->getValue() == QUADBUFFER_HARD_OPENGL) {
         #if !defined(GL_ES_VERSION_2_0)
             myContext->core20fwd->glDrawBuffer(GL_BACK);
         #endif
@@ -1057,7 +1055,7 @@
 
         // draw new MONO frame
         StWindow::signals.onRedraw(ST_DRAW_LEFT);
-        if(myDevice != DEVICE_VUZIX) {
+        if (myDevice != DEVICE_VUZIX) {
             stglDrawExtra(ST_DRAW_LEFT, StGLDeviceControl::OUT_MONO);
         }
 
@@ -1066,18 +1064,18 @@
         StWindow::stglSwap(ST_WIN_MASTER);
         ++myFPSControl;
         return;
-    } else if(!myToDrawStereo) {
-        if(myDevice == DEVICE_VUZIX && !myVuzixSDK.isNull()
-        && params.QuadBuffer->getValue() != QUADBUFFER_HARD_OPENGL) {
+    } else if (!myToDrawStereo) {
+        if (myDevice == DEVICE_VUZIX && myVuzixSDK.get() != nullptr
+         && params.QuadBuffer->getValue() != QUADBUFFER_HARD_OPENGL) {
             myVuzixSDK->setStereoOut();
         }
-        if(params.QuadBuffer->getValue() == QUADBUFFER_SOFT) {
+        if (params.QuadBuffer->getValue() == QUADBUFFER_SOFT) {
             myContext->stglSetVSync(StGLContext::VSync_ON);
         }
         myToDrawStereo = true;
     }
 
-    switch(params.QuadBuffer->getValue()) {
+    switch (params.QuadBuffer->getValue()) {
         case QUADBUFFER_HARD_OPENGL: {
             // We check capabilities at runtime to ensure that OpenGL context was created with Quad-Buffer.
             // Also we requires fullscreen for RadeOn cards on Windows 7.
@@ -1097,7 +1095,7 @@
             #endif
                 StWindow::signals.onRedraw(ST_DRAW_RIGHT);
                 StWindow::signals.onRedraw(ST_DRAW_LEFT);
-                if(!myWarning.isNull()) {
+                if (myWarning.get() != nullptr) {
                     myWarning->stglDraw(*myContext);
                 }
             } else {
@@ -1149,11 +1147,12 @@
                     // unfortunately we need extra buffer to flip image - D3D and OpenGL use different coordinate rules
                     const GLfloat aDX = GLfloat(myOutD3d.GlBuffer->getVPSizeX()) / GLfloat(myOutD3d.GlBuffer->getSizeX());
                     const GLfloat aDY = GLfloat(myOutD3d.GlBuffer->getVPSizeY()) / GLfloat(myOutD3d.GlBuffer->getSizeY());
-                    StArray<StGLVec2> aTCoords(4);
-                    aTCoords0 = StGLVec2(aDX,  aDY);
-                    aTCoords1 = StGLVec2(aDX,  0.0f);
-                    aTCoords2 = StGLVec2(0.0f, aDY);
-                    aTCoords3 = StGLVec2(0.0f, 0.0f);
+                    std::vector<StGLVec2> aTCoords = {
+                        StGLVec2(aDX,  aDY),
+                        StGLVec2(aDX,  0.0f),
+                        StGLVec2(0.0f, aDY),
+                        StGLVec2(0.0f, 0.0f)
+                    };
                     myOutD3d.TCrdBuf.init(*myContext, aTCoords);
 
                     myContext->stglResizeViewport(myOutD3d.WglDxBuffer->getSizeX(),
@@ -1222,7 +1221,7 @@
                 StWindow::signals.onRedraw(ST_DRAW_RIGHT); // reverse order to avoid non-smooth mono->stereo transition
                 StWindow::signals.onRedraw(ST_DRAW_LEFT);
 
-                if(!myWarning.isNull()) {
+                if (myWarning.get() != nullptr) {
                     myWarning->stglDraw(*myContext);
                 }
 
@@ -1250,9 +1249,9 @@
     myContext->stglResizeViewport(aVPort);
     StWindow::signals.onRedraw(theView);
 
-    if(myDevice == DEVICE_VUZIX) {
-        if(!myVuzixSDK.isNull()) {
-            if(theView == ST_DRAW_LEFT) { myVuzixSDK->waitAckLeft(); } else { myVuzixSDK->waitAckRight(); }
+    if (myDevice == DEVICE_VUZIX) {
+        if (myVuzixSDK.get() != nullptr) {
+            if (theView == ST_DRAW_LEFT) { myVuzixSDK->waitAckLeft(); } else { myVuzixSDK->waitAckRight(); }
         }
     } else {
         stglDrawExtra(theView, StGLDeviceControl::OUT_STEREO);
@@ -1262,8 +1261,8 @@
     ++myFPSControl;
 
     // Inform VR920 to begin scanning on next vSync, a new right eye frame.
-    if(myDevice == DEVICE_VUZIX && !myVuzixSDK.isNull()) {
-        if(theView == ST_DRAW_LEFT) { myVuzixSDK->setLeft(); } else { myVuzixSDK->setRight(); }
+    if (myDevice == DEVICE_VUZIX && myVuzixSDK.get() != nullptr) {
+        if (theView == ST_DRAW_LEFT) { myVuzixSDK->setLeft(); } else { myVuzixSDK->setRight(); }
     }
 }
 
@@ -1273,23 +1272,24 @@
 
 void StOutPageFlip::doShowExtra(const bool theValue) {
     myToResetDevice = true;
-    if(theValue) {
+    if (theValue) {
         params.QuadBuffer->defineOption(QUADBUFFER_SOFT, myLangMap.changeValueId(STTR_PARAMETER_QB_EMULATED, "OpenGL Emulated"));
     } else {
-        params.QuadBuffer->changeValues().remove(params.QuadBuffer->getValues().size() - 1);
-        if(params.QuadBuffer->getValue() == QUADBUFFER_SOFT) {
+        params.QuadBuffer->changeValues().erase(std::next(params.QuadBuffer->changeValues().begin(),
+                                                          params.QuadBuffer->getValues().size() - 1));
+        if (params.QuadBuffer->getValue() == QUADBUFFER_SOFT) {
             params.QuadBuffer->setValue(QUADBUFFER_HARD_OPENGL);
         }
     }
 }
 
 void StOutPageFlip::doSwitchVSync(const int32_t theValue) {
-    if(myContext.isNull()) {
+    if (myContext.get() == nullptr) {
         return;
     }
 
     StWindow::stglMakeCurrent(ST_WIN_MASTER);
-    if(params.QuadBuffer->getValue() == QUADBUFFER_SOFT) {
+    if (params.QuadBuffer->getValue() == QUADBUFFER_SOFT) {
         //myContext->stglSetVSync(StGLContext::VSync_ON);
     } else {
         myContext->stglSetVSync((StGLContext::VSync_Mode )theValue);

_service:obs_scm:sview-26.obscpio/StOutPageFlip/StOutPageFlip.h Changed

@@ -46,8 +46,8 @@
     /**
      * Main constructor.
      */
-    ST_CPPEXPORT StOutPageFlip(const StHandle<StResourceManager>& theResMgr,
-                               const StNativeWin_t                theParentWindow);
+    ST_CPPEXPORT StOutPageFlip(const std::shared_ptr<StResourceManager>& theResMgr,
+                               const StNativeWin_t theParentWindow);
 
     /**
      * Destructor.
@@ -208,12 +208,14 @@
 
         protected:
 
-    StOutDevicesList      myDevices;
-    StHandle<StSettings>  mySettings;
-    StString              myAbout;      //!< about string
-    StHandle<StGLContext> myContext;
-    StHandle<StVuzixSDK>  myVuzixSDK;   //!< Vuzix HMD control
-    StHandle<StGLTextureQuad> myWarning;
+    StOutDevicesList             myDevices;
+    std::shared_ptr<StSettings>  mySettings;
+    StString                     myAbout;      //!< about string
+    std::shared_ptr<StGLContext> myContext;
+    std::shared_ptr<StVuzixSDK>  myVuzixSDK;   //!< Vuzix HMD control
+
+    std::shared_ptr<StGLTextureQuad> myWarning;
+
     StTranslations        myLangMap;
     DeviceEnum            myDevice;
     StDXInfo              myDxInfo;

_service:obs_scm:sview-26.obscpio/StOutPageFlip/StOutPageFlipExt.cpp Changed

@@ -44,7 +44,7 @@
 void StOutPageFlipExt::getOptions(StParamsList& theList) const {
     StOutPageFlip::getOptions(theList);
     if(StOutPageFlip::params.ToShowExtra->getValue()) {
-        theList.add(params.ControlCode);
+        theList.push_back(params.ControlCode);
     }
 }
 
@@ -56,8 +56,8 @@
     params.ControlCode->defineOption(DEVICE_CONTROL_ED_ON_OFF, myLangMap.changeValueId(STTR_PARAMETER_CONTROL_ED,        "eDimensional auto on/off"));
 }
 
-StOutPageFlipExt::StOutPageFlipExt(const StHandle<StResourceManager>& theResMgr,
-                                   const StNativeWin_t                theParentWindow)
+StOutPageFlipExt::StOutPageFlipExt(const std::shared_ptr<StResourceManager>& theResMgr,
+                                   const StNativeWin_t theParentWindow)
 : StOutPageFlip(theResMgr, theParentWindow),
   myVpSizeY(0),
   myVpSizeX(0),
@@ -82,7 +82,7 @@
 }
 
 void StOutPageFlipExt::releaseResources() {
-    if(!myContext.isNull()) {
+    if (myContext.get() != nullptr) {
         myCodesLine.release(*myContext);
         myCodesEDOnOff.release(*myContext);
     }
@@ -164,8 +164,8 @@
 
         if(!StWindow::isFullScreen()) {
             const StSearchMonitors& aMonitors = StWindow::getMonitors();
-            if(myMonitor.isNull()) {
-                myMonitor = new StMonitor(aMonitorsaRect.center());
+            if (myMonitor.get() == nullptr) {
+                myMonitor = std::make_shared<StMonitor>(aMonitorsaRect.center());
             } else if(!myMonitor->getVRect().isPointIn(aRect.center())) {
                 *myMonitor = aMonitorsaRect.center();
             }

_service:obs_scm:sview-26.obscpio/StOutPageFlip/StOutPageFlipExt.h Changed

_service:obs_scm:sview-26.obscpio/StShared/CMakeLists.txt Changed

_service:obs_scm:sview-26.obscpio/StShared/StAV/StAVFrame.cpp Changed

_service:obs_scm:sview-26.obscpio/StShared/StAV/StAVIOContext.cpp Changed

_service:obs_scm:sview-26.obscpio/StShared/StAV/StAVIOFileContext.cpp Changed

@@ -10,8 +10,7 @@
     #include <libavutil/error.h>
 };
 
-StAVIOFileContext::StAVIOFileContext()
-: myFile(NULL) {
+StAVIOFileContext::StAVIOFileContext() {
     //
 }
 
@@ -20,9 +19,9 @@
 }
 
 void StAVIOFileContext::close() {
-    if(myFile != NULL) {
+    if (myFile != nullptr) {
         fclose(myFile);
-        myFile = NULL;
+        myFile = nullptr;
     }
 }
 
@@ -33,13 +32,13 @@
 #else
     myFile =  ::fdopen(theFD, theMode);
 #endif
-    return myFile != NULL;
+    return myFile != nullptr;
 }
 
 int StAVIOFileContext::read(uint8_t* theBuf,
                             int      theBufSize) {
 
-    if(myFile == NULL) {
+    if (myFile == nullptr) {
         return -1;
     }
 
@@ -54,7 +53,7 @@
 
 int StAVIOFileContext::write(const uint8_t* theBuf,
                              const int      theBufSize) {
-    if(myFile == NULL) {
+    if (myFile == nullptr) {
         return -1;
     }
 
@@ -63,8 +62,8 @@
 
 int64_t StAVIOFileContext::seek(int64_t theOffset,
                                 int     theWhence) {
-    if(theWhence == AVSEEK_SIZE
-    || myFile == NULL) {
+    if (theWhence == AVSEEK_SIZE
+     || myFile == nullptr) {
         return -1;
     }

_service:obs_scm:sview-26.obscpio/StShared/StAV/StAVIOJniHttpContext.cpp Changed

_service:obs_scm:sview-26.obscpio/StShared/StAV/StAVIOMemContext.cpp Changed

_service:obs_scm:sview-26.obscpio/StShared/StAV/StAVImage.cpp Changed

_service:obs_scm:sview-26.obscpio/StShared/StAV/StAVPacket.cpp Changed

_service:obs_scm:sview-26.obscpio/StShared/StAV/StAVVideoMuxer.cpp Changed

@@ -12,8 +12,7 @@
 
 #include <vector>
 
-StAVVideoMuxer::StAVVideoMuxer()
-: myStereoFormat(StFormat_Mono) {
+StAVVideoMuxer::StAVVideoMuxer() {
     //
 }
 
@@ -59,7 +58,7 @@
     av_dump_format(aFormatCtx, 0, theFileToLoad.toCString(), false);
 #endif
 
-    myCtxListSrc.add(aFormatCtx);
+    myCtxListSrc.push_back(aFormatCtx);
     return true;
 }
 
@@ -174,8 +173,8 @@
 }
 
 bool StAVVideoMuxer::save(const StString& theFile) {
-    if(myCtxListSrc.isEmpty()
-    || theFile.isEmpty()) {
+    if (myCtxListSrc.empty()
+     || theFile.isEmpty()) {
         return false;
     }
 
@@ -183,7 +182,6 @@
     const char* aFormatStr = formatToMetadata(myStereoFormat);
 
     std::vector<StRemuxContext> aSrcCtxList;
-    //StArrayList<StRemuxContext> aSrcCtxList;
     unsigned int aStreamCount = 0;
 
     StAVOutContext aCtxOut;
@@ -203,7 +201,7 @@
             av_dict_set(&aCtxOut.Context->metadata, "STEREO_MODE", aFormatStr, 0);
         }
         for(unsigned int aStreamId = 0; aStreamId < aCtxSrc.Context->nb_streams; ++aStreamId) {
-            aCtxSrc.Streams.add((unsigned int )-1);
+            aCtxSrc.Streams.push_back((unsigned int )-1);
             AVStream* aStreamSrc = aCtxSrc.Context->streamsaStreamId;
             if(stAV::getCodecType(aStreamSrc) == AVMEDIA_TYPE_VIDEO) {
                 if(addStream(aCtxOut.Context, aStreamSrc)) {

_service:obs_scm:sview-26.obscpio/StShared/StBndBox.cpp Changed

_service:obs_scm:sview-26.obscpio/StShared/StBndCameraBox.cpp Changed

@@ -28,21 +28,23 @@
 }
 
 void StBndCameraBox::enlarge(const StGLVec3& theNewPnt) {
-    StArray<StGLVec3> aPoints(1);
-    aPoints0 = theNewPnt;
+    const std::vector<StGLVec3> aPoints = {
+        theNewPnt
+    };
     StBndCameraBox::enlarge(aPoints);
 }
 
-void StBndCameraBox::enlarge(const StArray<StGLVec3>& thePoints) {
+void StBndCameraBox::enlarge(const std::vector<StGLVec3>& thePoints) {
     if(thePoints.size() == 0) {
         return;
     }
+
     // translate the points using transformation matrix
-    StArray<StGLVec3> aPoints(thePoints.size());
-    StGLVec4 aPnt;
+    std::vector<StGLVec3> aPoints;
+    aPoints.resize(thePoints.size());
     for(size_t aPntId = 0; aPntId < aPoints.size(); ++aPntId) {
-        aPnt = myTransf * StGLVec4(thePoints.getValue(aPntId), 1.0f);
-        aPoints.changeValue(aPntId) = aPnt.xyz();
+        const StGLVec4 aPnt = myTransf * StGLVec4(thePointsaPntId, 1.0f);
+        aPointsaPntId = aPnt.xyz();
     }
     StBndBox::enlarge(aPoints);
 }

_service:obs_scm:sview-26.obscpio/StShared/StBndSphere.cpp Changed

@@ -6,7 +6,6 @@
  */
 
 #include <StGLMesh/StBndSphere.h>
-#include <StTemplates/StArrayList.h>
 #include <StGL/StGLMatrix.h>
 
 #include <cfloat>
@@ -21,7 +20,7 @@
     //
 }
 
-void StBndSphere::init(const StArray<StGLVec3>& thePoints) {
+void StBndSphere::init(const std::vector<StGLVec3>& thePoints) {
     initWelzl(thePoints);
 }
 
@@ -62,7 +61,7 @@
     }
 }
 
-void StBndSphere::enlarge(const StArray<StGLVec3>& thePoints) {
+void StBndSphere::enlarge(const std::vector<StGLVec3>& thePoints) {
     if(thePoints.size() == 0) {
         return;
     } else if(isVoid()) {
@@ -92,7 +91,7 @@
     StBndContainer::setDefined();
 }
 
-void StBndSphere::initFast(const StArray<StGLVec3>& thePoints) {
+void StBndSphere::initFast(const std::vector<StGLVec3>& thePoints) {
     reset();
     if(thePoints.size() == 0) {
         return;
@@ -100,8 +99,8 @@
 
     // find a large diameter to start with
     // first get the bounding box and extreme points for it
-    StGLVec3 aMin = thePoints.getFirst();
-    StGLVec3 aMax = thePoints.getFirst();
+    StGLVec3 aMin = thePoints.front();
+    StGLVec3 aMax = thePoints.front();
     size_t aPntMinX = 0;
     size_t aPntMinY = 0;
     size_t aPntMinZ = 0;
@@ -190,7 +189,7 @@
         size_t quantity;
         size_t indices4;
 
-        bool isContains(const StArrayList<StGLVec3*>& thePoints, size_t theIndex, GLfloat theSquareEpsilon) {
+        bool isContains(const std::vector<StGLVec3*>& thePoints, size_t theIndex, GLfloat theSquareEpsilon) {
             for(size_t anId = 0; anId < quantity; ++anId) {
                 StGLVec3 dV = *thePointstheIndex - *thePointsindicesanId;
                 if(dV.squareModulus() < theSquareEpsilon) {
@@ -201,7 +200,7 @@
         }
     };
 
-    typedef StSphere (*updateFunction_t)(const StArrayList<StGLVec3*>& thePermuted,
+    typedef StSphere (*updateFunction_t)(const std::vector<StGLVec3*>& thePermuted,
                                          size_t thePntIndex,
                                          StSupport& theSupport);
 
@@ -342,7 +341,7 @@
         }
     }
 
-    StSphere updateSupport1(const StArrayList<StGLVec3*>& thePermuted,
+    StSphere updateSupport1(const std::vector<StGLVec3*>& thePermuted,
                             size_t thePntIndex,
                             StSupport& theSupport) {
         const StGLVec3& aPnt0 = *thePermutedtheSupport.indices0;
@@ -353,7 +352,7 @@
         return aMinSphere;
     }
 
-    StSphere updateSupport2(const StArrayList<StGLVec3*>& thePermuted,
+    StSphere updateSupport2(const std::vector<StGLVec3*>& thePermuted,
                             size_t thePntIndex,
                             StSupport& theSupport) {
         const StGLVec3* point2 = {
@@ -424,7 +423,7 @@
         return aSpheresaSphereMinR;
     }
 
-    StSphere updateSupport3(const StArrayList<StGLVec3*>& thePermuted,
+    StSphere updateSupport3(const std::vector<StGLVec3*>& thePermuted,
                             size_t thePntIndex,
                             StSupport& theSupport) {
         const StGLVec3* point3 = {
@@ -542,7 +541,7 @@
         return aSpheresaSphereMinR;
     }
 
-    StSphere updateSupport4(const StArrayList<StGLVec3*>& thePermuted,
+    StSphere updateSupport4(const std::vector<StGLVec3*>& thePermuted,
                             size_t thePntIndex,
                             StSupport& theSupport) {
         const StGLVec3* point4 = {
@@ -713,7 +712,7 @@
 
 };
 
-void StBndSphere::initWelzl(const StArray<StGLVec3>& thePoints) {
+void StBndSphere::initWelzl(const std::vector<StGLVec3>& thePoints) {
     const GLfloat anEpsilon = 1e-03f;
     reset();
     if(thePoints.size() == 0) {
@@ -728,10 +727,11 @@
     anUpdatesList4 = updateSupport4;
 
     // create identity permutation (0, 1,..., thePoints.size() - 1)
-    StArrayList<StGLVec3*> aPermuted(thePoints.size());
+    std::vector<StGLVec3*> aPermuted;
+    aPermuted.reserve(thePoints.size());
     for(size_t aPntId = 0; aPntId < thePoints.size(); ++aPntId) {
         // actually we will not change the input values
-        aPermuted.add((StGLVec3* )&thePointsaPntId);
+        aPermuted.push_back((StGLVec3* )&thePointsaPntId);
     }
 
     // generate random permutation, this needed for algorithm stability

_service:obs_scm:sview-26.obscpio/StShared/StFT/StFTFont.cpp Changed

@@ -9,20 +9,12 @@
 #include <StFile/StFileNode.h>
 #include <StStrings/StLogger.h>
 
-StFTFont::StFTFont(StHandle<StFTLibrary> theFTLib)
+StFTFont::StFTFont(const std::shared_ptr<StFTLibrary>& theFTLib)
 : myFTLib(theFTLib),
-  myFTFace(NULL),
-  myStyle(StFTFont::Style_Regular),
-  myLoadFlags(FT_LOAD_NO_HINTING | FT_LOAD_TARGET_NORMAL),
-  myGlyphMaxWidth(1),
-  myGlyphMaxHeight(1),
-  myUChar(0) {
-    if(myFTLib.isNull()) {
-        myFTLib = new StFTLibrary();
+  myLoadFlags(FT_LOAD_NO_HINTING | FT_LOAD_TARGET_NORMAL) {
+    if (myFTLib.get() == nullptr) {
+        myFTLib = std::make_shared<StFTLibrary>();
     }
-    stMemZero(mySubsets, sizeof(mySubsets));
-    stMemZero(myFTFaces, sizeof(myFTFaces));
-    stMemZero(myFontFaces, sizeof(myFontFaces));
 }
 
 StFTFont::~StFTFont() {
@@ -31,15 +23,15 @@
 
 void StFTFont::release() {
     myUChar  = 0;
-    myFTFace = NULL;
+    myFTFace = nullptr;
     myGlyphImg.nullify();
     myGlyphMaxWidth  = 1;
     myGlyphMaxHeight = 1;
-    for(size_t aStyleIt = 0; aStyleIt < StylesNB; ++aStyleIt) {
+    for (size_t aStyleIt = 0; aStyleIt < StylesNB; ++aStyleIt) {
         FT_Face& aFace = myFTFacesaStyleIt;
-        if(aFace != NULL) {
+        if (aFace != nullptr) {
             FT_Done_Face(aFace);
-            aFace = NULL;
+            aFace = nullptr;
         }
         myFontPathsaStyleIt.clear();
         myFontFacesaStyleIt = 0;
@@ -47,18 +39,18 @@
 }
 
 bool StFTFont::setActiveStyle(const StFTFont::Style theStyle) {
-    if(myStyle == theStyle) {
+    if (myStyle == theStyle) {
         return true;
     }
 
-    if(myFTFacestheStyle != NULL) {
+    if (myFTFacestheStyle != nullptr) {
         myUChar  = 0;
         myStyle  = theStyle;
         myFTFace = myFTFacestheStyle;
         return true;
     }
-    if(!hasCJK()
-    && !hasKorean()) {
+    if (!hasCJK()
+     && !hasKorean()) {
         // simulate style using transformation
     }
     return false;
@@ -71,15 +63,15 @@
     myGlyphImg.nullify();
     myGlyphMaxWidth  = 1;
     myGlyphMaxHeight = 1;
-    if(myFTFacesStyle_Regular == NULL) {
+    if (myFTFacesStyle_Regular == nullptr) {
         return false;
     }
 
-    for(size_t aStyleIt = 0; aStyleIt < StylesNB; ++aStyleIt) {
+    for (size_t aStyleIt = 0; aStyleIt < StylesNB; ++aStyleIt) {
         FT_Face& aFace = myFTFacesaStyleIt;
-        if(aFace == NULL) {
+        if (aFace == nullptr) {
             continue;
-        } else if(FT_Set_Char_Size(aFace, 0L, thePointSize * 64, theResolution, theResolution) != 0) {
+        } else if (FT_Set_Char_Size(aFace, 0L, thePointSize * 64, theResolution, theResolution) != 0) {
             ST_ERROR_LOG("Font '" + myFontPathsaStyleIt + "' doesn't contain requested size!");
             return false;
         }
@@ -114,24 +106,24 @@
         return false;
     }
     myUChar  = 0;
-    myFTFace = NULL;
+    myFTFace = nullptr;
     myGlyphImg.nullify();
     myFontPathstheStyle = theFontPath;
     myFontFacestheStyle = theFaceId;
 
     FT_Face& aFace = myFTFacestheStyle;
-    if(aFace != NULL) {
+    if (aFace != nullptr) {
         FT_Done_Face(aFace);
     }
     const StString aFontPath = StFileNode::getCompatibleName(theFontPath);
-    if(FT_New_Face(myFTLib->getInstance(), aFontPath.toCString(), (FT_Long )theFaceId, &aFace) != 0) {
+    if (FT_New_Face(myFTLib->getInstance(), aFontPath.toCString(), (FT_Long )theFaceId, &aFace) != 0) {
         ST_DEBUG_LOG("Font '" + aFontPath + "' fail to load!");
         FT_Done_Face(aFace);
-        aFace = NULL;
+        aFace = nullptr;
         return false;
     }
 
-    if(theToSyntItalic) {
+    if (theToSyntItalic) {
         const double THE_SHEAR_ANGLE = 10.0 * M_PI / 180.0;
 
         FT_Matrix aMat;
@@ -160,20 +152,20 @@
         return false;
     }
     myUChar  = 0;
-    myFTFace = NULL;
+    myFTFace = nullptr;
     myGlyphImg.nullify();
     myFontPathstheStyle = theFontName;
     myFontFacestheStyle = 0;
 
     FT_Face& aFace = myFTFacestheStyle;
-    if(aFace != NULL) {
+    if (aFace != nullptr) {
         FT_Done_Face(aFace);
     }
 
-    if(FT_New_Memory_Face(myFTLib->getInstance(), theFontData, theDataLen, 0, &aFace) != 0) {
+    if (FT_New_Memory_Face(myFTLib->getInstance(), theFontData, theDataLen, 0, &aFace) != 0) {
         ST_DEBUG_LOG("Font '" + theFontName + "' fail to load!");
         FT_Done_Face(aFace);
-        aFace = NULL;
+        aFace = nullptr;
         return false;
     }
     return loadCharmap(theFontName, aFace);
@@ -182,10 +174,10 @@
 bool StFTFont::loadCharmap(const StString& theFontName,
                            FT_Face&        theFace) {
     (void )theFontName;
-    if(FT_Select_Charmap(theFace, ft_encoding_unicode) != 0) {
+    if (FT_Select_Charmap(theFace, ft_encoding_unicode) != 0) {
         ST_DEBUG_LOG("Font '" + theFontName + "' doesn't contain Unicode charmap!");
         FT_Done_Face(theFace);
-        theFace = NULL;
+        theFace = nullptr;
         return false;
     }
 
@@ -200,7 +192,7 @@
 }
 
 bool StFTFont::loadGlyph(const stUtf32_t theUChar) {
-    if(myUChar == theUChar) {
+    if (myUChar == theUChar) {
         return myUChar != 0;
     }
 
@@ -208,7 +200,7 @@
     myUChar = 0;
     if(theUChar == 0
     || FT_Load_Char(myFTFace, theUChar, myLoadFlags) != 0
-    || myFTFace->glyph == NULL) {
+    || myFTFace->glyph == nullptr) {
         return false;
     }
 
@@ -220,7 +212,7 @@
                             StImagePlane&    theOutImage) {
     const unsigned int aWidth  = (unsigned int )theBitmap.width;
     const unsigned int aHeight = (unsigned int )theBitmap.rows;
-    if(theBitmap.buffer == NULL
+    if(theBitmap.buffer == nullptr
     || aWidth  == 0
     || aHeight == 0) {
         return false;

_service:obs_scm:sview-26.obscpio/StShared/StFT/StFTFontRegistry.cpp Changed

@@ -22,103 +22,103 @@
 
 StFTFontRegistry::StFTFontRegistry() {
     myFTLib = new StFTLibrary();
-    myExtensions.add("ttf");
-    myExtensions.add("ttc");
-    myExtensions.add("otf");
+    myExtensions.push_back("ttf");
+    myExtensions.push_back("ttc");
+    myExtensions.push_back("otf");
 
     const StString aCustFontDir = StProcess::getStShareFolder() + "fonts" + SYS_FS_SPLITTER;
     if(StFolder::isFolder(aCustFontDir)) {
-        myFolders.add(aCustFontDir);
+        myFolders.push_back(aCustFontDir);
     }
 #ifdef _WIN32
-    myFolders.add(StProcess::getWindowsFolder() + "fonts");
+    myFolders.push_back(StProcess::getWindowsFolder() + "fonts");
 
     // western
-    myFilesMajor.add(stCString("times.ttf"));
-    myFilesMajor.add(stCString("timesbd.ttf"));
-    myFilesMajor.add(stCString("timesi.ttf"));
-    myFilesMajor.add(stCString("timesbi.ttf"));
-    myFilesMajor.add(stCString("trebuc.ttf"));
-    myFilesMajor.add(stCString("trebucbd.ttf"));
-    myFilesMajor.add(stCString("trebucit.ttf"));
-    myFilesMajor.add(stCString("trebucbi.ttf"));
-    myFilesMajor.add(stCString("tahoma.ttf"));
-    myFilesMajor.add(stCString("tahomabd.ttf"));
-    myFilesMajor.add(stCString("micross.ttf"));
+    myFilesMajor.push_back(stCString("times.ttf"));
+    myFilesMajor.push_back(stCString("timesbd.ttf"));
+    myFilesMajor.push_back(stCString("timesi.ttf"));
+    myFilesMajor.push_back(stCString("timesbi.ttf"));
+    myFilesMajor.push_back(stCString("trebuc.ttf"));
+    myFilesMajor.push_back(stCString("trebucbd.ttf"));
+    myFilesMajor.push_back(stCString("trebucit.ttf"));
+    myFilesMajor.push_back(stCString("trebucbi.ttf"));
+    myFilesMajor.push_back(stCString("tahoma.ttf"));
+    myFilesMajor.push_back(stCString("tahomabd.ttf"));
+    myFilesMajor.push_back(stCString("micross.ttf"));
     // korean
-    myFilesMajor.add(stCString("malgun.ttf"));
-    myFilesMajor.add(stCString("malgunbd.ttf"));
-    myFilesMinor.add(stCString("gulim.ttc")); // Win XP
-    myFilesMinor.add(stCString("gulim.ttf"));
+    myFilesMajor.push_back(stCString("malgun.ttf"));
+    myFilesMajor.push_back(stCString("malgunbd.ttf"));
+    myFilesMinor.push_back(stCString("gulim.ttc")); // Win XP
+    myFilesMinor.push_back(stCString("gulim.ttf"));
     // chinese
-    myFilesMajor.add(stCString("simsun.ttc"));
+    myFilesMajor.push_back(stCString("simsun.ttc"));
 #elif defined(__APPLE__)
-    myExtensions.add("dfont");
-    myFolders.add(stCString("/System/Library/Fonts"));
-    myFolders.add(stCString("/Library/Fonts"));
+    myExtensions.push_back("dfont");
+    myFolders.push_back(stCString("/System/Library/Fonts"));
+    myFolders.push_back(stCString("/Library/Fonts"));
 
     // western
-    myFilesMinor.add(stCString("Times.dfont")); // old macOS
-    myFilesMajor.add(stCString("Times.ttc"));
-    myFilesMajor.add(stCString("Times New Roman.ttf"));
-    myFilesMajor.add(stCString("Times New Roman Bold.ttf"));
-    myFilesMajor.add(stCString("Times New Roman Italic.ttf"));
-    myFilesMajor.add(stCString("Times New Roman Bold Italic.ttf"));
-    myFilesMajor.add(stCString("Trebuchet MS.ttf"));
-    myFilesMajor.add(stCString("Trebuchet MS Bold.ttf"));
-    myFilesMajor.add(stCString("Trebuchet MS Italic.ttf"));
-    myFilesMajor.add(stCString("Trebuchet MS Bold Italic.ttf"));
-    myFilesMajor.add(stCString("Tahoma.ttf"));
-    myFilesMajor.add(stCString("Tahoma Bold.ttf"));
-    myFilesMinor.add(stCString("Monaco.dfont")); // old macOS
-    myFilesMajor.add(stCString("Monaco.ttf"));
+    myFilesMinor.push_back(stCString("Times.dfont")); // old macOS
+    myFilesMajor.push_back(stCString("Times.ttc"));
+    myFilesMajor.push_back(stCString("Times New Roman.ttf"));
+    myFilesMajor.push_back(stCString("Times New Roman Bold.ttf"));
+    myFilesMajor.push_back(stCString("Times New Roman Italic.ttf"));
+    myFilesMajor.push_back(stCString("Times New Roman Bold Italic.ttf"));
+    myFilesMajor.push_back(stCString("Trebuchet MS.ttf"));
+    myFilesMajor.push_back(stCString("Trebuchet MS Bold.ttf"));
+    myFilesMajor.push_back(stCString("Trebuchet MS Italic.ttf"));
+    myFilesMajor.push_back(stCString("Trebuchet MS Bold Italic.ttf"));
+    myFilesMajor.push_back(stCString("Tahoma.ttf"));
+    myFilesMajor.push_back(stCString("Tahoma Bold.ttf"));
+    myFilesMinor.push_back(stCString("Monaco.dfont")); // old macOS
+    myFilesMajor.push_back(stCString("Monaco.ttf"));
     // korean
-    //myFilesMajor.add(stCString("AppleMyungjo.ttf"));
-    myFilesMajor.add(stCString("AppleGothic.ttf"));
+    //myFilesMajor.push_back(stCString("AppleMyungjo.ttf"));
+    myFilesMajor.push_back(stCString("AppleGothic.ttf"));
     // chinese
-    myFilesMinor.add(stCString("华文仿宋.ttf")); // old macOS
-    myFilesMajor.add(stCString("Songti.ttc"));
+    myFilesMinor.push_back(stCString("华文仿宋.ttf")); // old macOS
+    myFilesMajor.push_back(stCString("Songti.ttc"));
 #elif defined(__ANDROID__)
-    myFolders.add(stCString("/system/fonts"));
+    myFolders.push_back(stCString("/system/fonts"));
 
     // western
 
     // Android 6
-    myFilesMajor.add(stCString("NotoSerif-Regular.ttf"));
-    myFilesMajor.add(stCString("NotoSerif-Bold.ttf"));
-    myFilesMajor.add(stCString("NotoSerif-Italic.ttf"));
-    myFilesMajor.add(stCString("NotoSerif-BoldItalic.ttf"));
+    myFilesMajor.push_back(stCString("NotoSerif-Regular.ttf"));
+    myFilesMajor.push_back(stCString("NotoSerif-Bold.ttf"));
+    myFilesMajor.push_back(stCString("NotoSerif-Italic.ttf"));
+    myFilesMajor.push_back(stCString("NotoSerif-BoldItalic.ttf"));
 
     // Android 4
-    myFilesMinor.add(stCString("DroidSerif-Regular.ttf"));
-    myFilesMinor.add(stCString("DroidSerif-Bold.ttf"));
-    myFilesMinor.add(stCString("DroidSerif-Italic.ttf"));
-    myFilesMinor.add(stCString("DroidSerif-BoldItalic.ttf"));
+    myFilesMinor.push_back(stCString("DroidSerif-Regular.ttf"));
+    myFilesMinor.push_back(stCString("DroidSerif-Bold.ttf"));
+    myFilesMinor.push_back(stCString("DroidSerif-Italic.ttf"));
+    myFilesMinor.push_back(stCString("DroidSerif-BoldItalic.ttf"));
 
-    myFilesMajor.add(stCString("DroidSans.ttf"));
-    myFilesMajor.add(stCString("DroidSans-Bold.ttf"));
-    myFilesMajor.add(stCString("DroidSansMono.ttf"));
+    myFilesMajor.push_back(stCString("DroidSans.ttf"));
+    myFilesMajor.push_back(stCString("DroidSans-Bold.ttf"));
+    myFilesMajor.push_back(stCString("DroidSansMono.ttf"));
 
     // not all phones have the following fonts
-    myFilesMinor.add(stCString("NotoSansCJK-Regular.ttc"));
+    myFilesMinor.push_back(stCString("NotoSansCJK-Regular.ttc"));
 
     // Korean
-    myFilesMinor.add(stCString("NanumGothic.ttf"));
-    myFilesMinor.add(stCString("NotoSansKR-Regular.otf"));
+    myFilesMinor.push_back(stCString("NanumGothic.ttf"));
+    myFilesMinor.push_back(stCString("NotoSansKR-Regular.otf"));
 
     // Simplified Chinese
-    myFilesMinor.add(stCString("DroidSansFallback.ttf"));
-    myFilesMinor.add(stCString("NotoSansSC-Regular.otf"));
+    myFilesMinor.push_back(stCString("DroidSansFallback.ttf"));
+    myFilesMinor.push_back(stCString("NotoSansSC-Regular.otf"));
 
     // Traditional Chinese
-    //myFilesMinor.add(stCString("NotoSansTC-Regular.otf"));
+    //myFilesMinor.push_back(stCString("NotoSansTC-Regular.otf"));
 
     // Japanese
-    //myFilesMinor.add(stCString("NotoSansJP-Regular.otf"));
+    //myFilesMinor.push_back(stCString("NotoSansJP-Regular.otf"));
 
     // Arabic
-    myFilesMinor.add(stCString("NotoNaskhArabic-Regular.ttf"));
-    //myFilesMinor.add(stCString("NotoNaskhArabic-Bold.ttf"));
+    myFilesMinor.push_back(stCString("NotoNaskhArabic-Regular.ttf"));
+    //myFilesMinor.push_back(stCString("NotoNaskhArabic-Bold.ttf"));
 #else
 
 #if !defined(__EMSCRIPTEN__)
@@ -130,51 +130,51 @@
                     break;
                 }
 
-                myFolders.add(StString((const char* )aFcFolder));
+                myFolders.push_back(StString((const char* )aFcFolder));
             }
             FcStrListDone(aFcFontDir);
         }
         FcConfigDestroy(aFcCfg);
     }
 #endif
-    if(myFolders.isEmpty()) {
+    if (myFolders.empty()) {
     #ifdef APP_PREFIX
-        if(!StString(stCString(APP_PREFIX)).isEquals(stCString("/usr"))) {
-            myFolders.add(stCString(APP_PREFIX"/share/fonts"));
-            myFolders.add(stCString(APP_PREFIX"/local/share/fonts"));
+        if (!StString(stCString(APP_PREFIX)).isEquals(stCString("/usr"))) {
+            myFolders.push_back(stCString(APP_PREFIX"/share/fonts"));
+            myFolders.push_back(stCString(APP_PREFIX"/local/share/fonts"));
         }
     #endif
-        myFolders.add(stCString("/usr/share/fonts"));
-        myFolders.add(stCString("/usr/local/share/fonts"));
+        myFolders.push_back(stCString("/usr/share/fonts"));
+        myFolders.push_back(stCString("/usr/local/share/fonts"));
     }
 
     // western
-    myFilesMajor.add(stCString("DejaVuSerif.ttf"));
-    myFilesMajor.add(stCString("DejaVuSerif-Bold.ttf"));
-    myFilesMajor.add(stCString("DejaVuSans.ttf"));
-    myFilesMajor.add(stCString("DejaVuSans-Bold.ttf"));
-    myFilesMajor.add(stCString("DejaVuSansMono.ttf"));
-    myFilesMajor.add(stCString("DejaVuSansMono-Bold.ttf"));
-
-    myFilesMajor.add(stCString("FreeSerif.ttf"));
-    myFilesMajor.add(stCString("FreeSerifBold.ttf"));
-    myFilesMajor.add(stCString("FreeSerifItalic.ttf"));
-    myFilesMajor.add(stCString("FreeSerifBoldItalic.ttf"));
-    myFilesMajor.add(stCString("FreeSans.ttf"));
-    myFilesMajor.add(stCString("FreeSansBold.ttf"));
-    myFilesMajor.add(stCString("FreeSansOblique.ttf"));
-    myFilesMajor.add(stCString("FreeSansBoldOblique.ttf"));
+    myFilesMajor.push_back(stCString("DejaVuSerif.ttf"));
+    myFilesMajor.push_back(stCString("DejaVuSerif-Bold.ttf"));
+    myFilesMajor.push_back(stCString("DejaVuSans.ttf"));
+    myFilesMajor.push_back(stCString("DejaVuSans-Bold.ttf"));
+    myFilesMajor.push_back(stCString("DejaVuSansMono.ttf"));
+    myFilesMajor.push_back(stCString("DejaVuSansMono-Bold.ttf"));
+
+    myFilesMajor.push_back(stCString("FreeSerif.ttf"));
+    myFilesMajor.push_back(stCString("FreeSerifBold.ttf"));
+    myFilesMajor.push_back(stCString("FreeSerifItalic.ttf"));
+    myFilesMajor.push_back(stCString("FreeSerifBoldItalic.ttf"));
+    myFilesMajor.push_back(stCString("FreeSans.ttf"));
+    myFilesMajor.push_back(stCString("FreeSansBold.ttf"));
+    myFilesMajor.push_back(stCString("FreeSansOblique.ttf"));
+    myFilesMajor.push_back(stCString("FreeSansBoldOblique.ttf"));
 
     // korean
-    myFilesMajor.add(stCString("NanumMyeongjo.ttf"));
-    myFilesMajor.add(stCString("NanumMyeongjoBold.ttf"));
-    myFilesMajor.add(stCString("NanumGothic.ttf"));
-    myFilesMajor.add(stCString("NanumGothicBold.ttf"));
-    myFilesMinor.add(stCString("NotoSerifCJK-Regular.ttc"));
+    myFilesMajor.push_back(stCString("NanumMyeongjo.ttf"));
+    myFilesMajor.push_back(stCString("NanumMyeongjoBold.ttf"));
+    myFilesMajor.push_back(stCString("NanumGothic.ttf"));
+    myFilesMajor.push_back(stCString("NanumGothicBold.ttf"));
+    myFilesMinor.push_back(stCString("NotoSerifCJK-Regular.ttc"));
 
     // chinese
-    //myFilesMajor.add(stCString("DroidSansJapanese.ttf"));
-    myFilesMajor.add(stCString("DroidSansFallbackFull.ttf"));
+    //myFilesMajor.push_back(stCString("DroidSansJapanese.ttf"));
+    myFilesMajor.push_back(stCString("DroidSansFallbackFull.ttf"));
 #endif
 }
 
@@ -183,26 +183,26 @@
 }
 
 void StFTFontRegistry::appendSearchPath(const StString& theFolder) {
-    myFolders.add(theFolder);
+    myFolders.push_back(theFolder);
 }
 
 bool StFTFontRegistry::registerFamily(const StString& theFontPath, int theFaceId) {
     const FT_Long aFaceId = theFaceId != -1 ? theFaceId : 0;
-    FT_Face aFace = NULL;
+    FT_Face aFace = nullptr;
     if(FT_New_Face(myFTLib->getInstance(), theFontPath.toCString(), aFaceId, &aFace) != 0) {
         if(aFace != NULL) {
             FT_Done_Face(aFace);
         }
         return false;
     }
-    if(aFace->family_name == NULL // skip broken fonts (error in FreeType?)
+    if(aFace->family_name == nullptr // skip broken fonts (error in FreeType?)
     || FT_Select_Charmap(aFace, ft_encoding_unicode) != 0) { // handle only UNICODE fonts
         FT_Done_Face(aFace);
         return false;
     }
 
     // generate font family name
-    StString aStyle(aFace->style_name != NULL ? aFace->style_name : "");
+    StString aStyle(aFace->style_name != nullptr ? aFace->style_name : "");
     {
         // remove standard style combinations reflected by style_flags
         // and keep only extra styles like Light, Condensed and similar
@@ -278,10 +278,9 @@
     return true;
 }
 
-void StFTFontRegistry::searchFiles(const StArrayList<StString>& theNames,
+void StFTFontRegistry::searchFiles(const std::vector<StString>& theNames,
                                    const bool                   theIsMajor) {
-    for(size_t aNameIter = 0; aNameIter < theNames.size(); ++aNameIter) {
-        const StString& aName = theNames.getValue(aNameIter);
+    for (const StString& aName : theNames) {
         StString aPath;
         if(StFileNode::isAbsolutePath(aName)) {
             aPath = aName;
@@ -311,8 +310,8 @@
 void StFTFontRegistry::init(const bool theToSearchAll) {
     myFoldersRoot.clear();
     myFonts.clear();
-    for(size_t aFolderIter = 0; aFolderIter < myFolders.size(); ++aFolderIter) {
-        StFolder* aSubFolder = new StFolder(myFolders.getValue(aFolderIter), &myFoldersRoot);
+    for (const StString& aFolderIter : myFolders) {
+        StFolder* aSubFolder = new StFolder(aFolderIter, &myFoldersRoot);
         aSubFolder->init(myExtensions, 4);
         myFoldersRoot.add(aSubFolder);
     }

_service:obs_scm:sview-26.obscpio/StShared/StFile/StFileNode.cpp Changed

_service:obs_scm:sview-26.obscpio/StShared/StFile/StFolder.cpp Changed

_service:obs_scm:sview-26.obscpio/StShared/StFile/StRawFile.cpp Changed

@@ -10,8 +10,8 @@
 #include <StAV/stAV.h>
 #include <StStrings/StLogger.h>
 
-#include <iostream>
 #include <limits>
+#include <vector>
 
 #if defined(_WIN32)
     #define ftell64(a)     _ftelli64(a)
@@ -190,7 +190,7 @@
         }
 
         // stream of unknown size - read until first error
-        StArrayList<stUByte_t*> aChunks;
+        std::vector<stUByte_t*> aChunks;
         aFileLen = 0;
         const size_t aChunkLimit = 4096;
         bool isOk = true;
@@ -213,7 +213,7 @@
             }
 
             aFileLen += aReadBytes;
-            aChunks.add(aChunk);
+            aChunks.push_back(aChunk);
             if(theReadMax != 0
             && aReadLen >= uint64_t(theReadMax)) {
                 break;
@@ -230,7 +230,7 @@
         stUByte_t* aBufferIter = myBuffer;
         size_t     aBytesLeft  = myBuffSize;
         for(size_t aChunkIter = 0; aChunkIter < aChunks.size(); ++aChunkIter) {
-            stUByte_t*   aChunk       = aChunks.changeValue(aChunkIter);
+            stUByte_t*   aChunk       = aChunksaChunkIter;
             const size_t aBytesToCopy = stMin(aBytesLeft, aChunkLimit);
             if(aBufferIter != NULL) {
                 stMemCpy(aBufferIter, aChunk, aBytesToCopy);

_service:obs_scm:sview-26.obscpio/StShared/StFormatEnum.cpp Changed

@@ -9,15 +9,15 @@
 #include <StFile/StFileNode.h>
 
 namespace {
-    static const StCString StFormat_AUTO_STRING          = stCString("auto");
-    static const StCString StFormat_SideBySide_RL_STRING = stCString("crossEyed");
-    static const StCString StFormat_SideBySide_LR_STRING = stCString("parallelPair");
-    static const StCString StFormat_TopBottom_RL_STRING  = stCString("overUnderRL");
-    static const StCString StFormat_TopBottom_LR_STRING  = stCString("overUnderLR");
-    static const StCString StFormat_Rows_STRING          = stCString("interlaceRow");
-    static const StCString StFormat_FrameSequence_STRING = stCString("frameSequential");
-    static const StCString StFormat_Mono_STRING          = stCString("mono");
-};
+    static constexpr StCString StFormat_AUTO_STRING          = stCString("auto");
+    static constexpr StCString StFormat_SideBySide_RL_STRING = stCString("crossEyed");
+    static constexpr StCString StFormat_SideBySide_LR_STRING = stCString("parallelPair");
+    static constexpr StCString StFormat_TopBottom_RL_STRING  = stCString("overUnderRL");
+    static constexpr StCString StFormat_TopBottom_LR_STRING  = stCString("overUnderLR");
+    static constexpr StCString StFormat_Rows_STRING          = stCString("interlaceRow");
+    static constexpr StCString StFormat_FrameSequence_STRING = stCString("frameSequential");
+    static constexpr StCString StFormat_Mono_STRING          = stCString("mono");
+}
 
 StString st::formatToString(StFormat theFormatEnum) {
     switch(theFormatEnum) {

_service:obs_scm:sview-26.obscpio/StShared/StGL/StGLCircle.cpp Changed

@@ -10,8 +10,8 @@
 
 /// TODO (Kirill Gavrilov#9) move to the common header
 namespace {
-    static const GLfloat ST_TWOPI = 6.2831853071795864769252867665590f;
-};
+    static constexpr GLfloat ST_TWOPI = 6.2831853071795864769252867665590f;
+}
 
 StGLCircle::StGLCircle()
 : StGLMesh(GL_LINE_LOOP),
@@ -56,17 +56,17 @@
     // reset current mesh
     clearRAM();
 
-    if(myPointsCount <= 0) {
+    if (myPointsCount <= 0) {
         return false;
     }
 
-    myVertices.initList(myPointsCount);
+    myVertices.reserve(myPointsCount);
     GLfloat theta = 0.0f;
-    for(GLsizei pointId = 0; pointId < myPointsCount; ++pointId) {
+    for (GLsizei pointId = 0; pointId < myPointsCount; ++pointId) {
         theta = GLfloat(pointId) * ST_TWOPI / GLfloat(myPointsCount);
-        myVertices.add(StGLVec3(myCenter.x() + myRadiusX * std::cos(theta),
-                                myCenter.y() + myRadiusY * std::sin(theta),
-                                myCenter.z()));
+        myVertices.push_back(StGLVec3(myCenter.x() + myRadiusX * std::cos(theta),
+                                      myCenter.y() + myRadiusY * std::sin(theta),
+                                      myCenter.z()));
     }
 
     // define the bounding sphere
@@ -75,12 +75,12 @@
 }
 
 bool StGLCircle::initColorsArray(const StGLVec4& theColor) {
-    if(myVertices.isEmpty()) {
+    if (myVertices.empty()) {
         return false;
     }
-    myColors.initList(myVertices.size());
-    for(size_t aPntId = 0; aPntId < myVertices.size(); ++aPntId) {
-        myColors.add(theColor);
+    myColors.reserve(myVertices.size());
+    for (size_t aPntId = 0; aPntId < myVertices.size(); ++aPntId) {
+        myColors.push_back(theColor);
     }
     return true;
 }

_service:obs_scm:sview-26.obscpio/StShared/StGL/StGLContext.cpp Changed

@@ -39,50 +39,17 @@
     #endif
 #endif
 
-StGLContext::StGLContext(const StHandle<StResourceManager>& theResMgr)
-: core11(NULL),
-  core11fwd(NULL),
-  core20(NULL),
-  core20fwd(NULL),
-  core32(NULL),
-  core32back(NULL),
-  core41(NULL),
-  core41back(NULL),
-  core42(NULL),
-  core42back(NULL),
-  core43(NULL),
-  core43back(NULL),
-  core44(NULL),
-  core44back(NULL),
-  arbFbo(NULL),
-  arbNPTW(false),
-  arbTexRG(false),
-  arbTexFloat(false),
-  arbTexClear(false),
-#if defined(GL_ES_VERSION_2_0)
-  hasHighp(false),
-  hasTexRGBA8(false),
-  extTexBGRA8(false),
-  extTexR16(false),
-#else
-  hasHighp(true),
-  hasTexRGBA8(true), // always available on desktop
-  extTexBGRA8(true),
-  extTexR16(true),
+StGLContext::StGLContext(const std::shared_ptr<StResourceManager>& theResMgr)
+: myFuncs(std::make_shared<StGLFunctions>()),
+  myResMgr(theResMgr) {
+
+#if !defined(GL_ES_VERSION_2_0)
+    hasHighp = true;
+    hasTexRGBA8 = true; // always available on desktop
+    extTexBGRA8 = true;
+    extTexR16 = true;
 #endif
-  extAll(NULL),
-  extSwapTear(false),
-  khrFlushControl(false),
-  myFuncs(new StGLFunctions()),
-  myResMgr(theResMgr),
-  myGlVendor(GlVendor_UNKNOWN),
-  myGpuName(GPU_UNKNOWN),
-  myVerMajor(0),
-  myVerMinor(0),
-  myWasInit(false),
-  myFramebufferDraw(0),
-  myFramebufferRead(0),
-  myIsBound(false) {
+
     stMemZero(&(*myFuncs),   sizeof(StGLFunctions));
     extAll = &(*myFuncs);
     stMemZero(&myViewport,   sizeof(StGLBoxPx));
@@ -100,63 +67,8 @@
 }
 
 StGLContext::StGLContext(const bool theToInitialize)
-: core11(NULL),
-  core11fwd(NULL),
-  core20(NULL),
-  core20fwd(NULL),
-  core32(NULL),
-  core32back(NULL),
-  core41(NULL),
-  core41back(NULL),
-  core42(NULL),
-  core42back(NULL),
-  core43(NULL),
-  core43back(NULL),
-  core44(NULL),
-  core44back(NULL),
-  arbFbo(NULL),
-  arbNPTW(false),
-  arbTexRG(false),
-  arbTexFloat(false),
-  arbTexClear(false),
-#if defined(GL_ES_VERSION_2_0)
-  hasHighp(false),
-  hasTexRGBA8(false),
-  extTexBGRA8(false),
-  extTexR16(false),
-#else
-  hasHighp(true),
-  hasTexRGBA8(true),
-  extTexBGRA8(true),
-  extTexR16(true),
-#endif
-  extAll(NULL),
-  extSwapTear(false),
-  khrFlushControl(false),
-  myFuncs(new StGLFunctions()),
-  myGlVendor(GlVendor_UNKNOWN),
-  myGpuName(GPU_UNKNOWN),
-  myVerMajor(0),
-  myVerMinor(0),
-  myWasInit(false),
-  myFramebufferDraw(0),
-  myFramebufferRead(0),
-  myIsBound(false) {
-    stMemZero(&(*myFuncs),   sizeof(StGLFunctions));
-    extAll = &(*myFuncs);
-    stMemZero(&myViewport,   sizeof(StGLBoxPx));
-    stMemZero(&myWindowBits, sizeof(BufferBits));
-    stMemZero(&myFBOBits,    sizeof(BufferBits));
-#ifdef __APPLE__
-    mySysLib.loadSimple("/System/Library/Frameworks/OpenGL.framework/Versions/Current/OpenGL");
-#endif
-
-#if defined(GL_ES_VERSION_2_0)
-    myDevCaps.hasUnpack = false;
-#else
-    myDevCaps.hasUnpack = true; // always available on desktop
-#endif
-    if(theToInitialize) {
+: StGLContext(std::shared_ptr<StResourceManager>()) {
+    if (theToInitialize) {
         stglInit();
     }
 }
@@ -175,8 +87,8 @@
     ((StGLContext* )theUserParam)->stglDebugCallback(theSource, theType, theId, theSeverity, theLength, theMessage);
 }
 
-static const StCString THE_DBGMSG_SOURCE_UNKNOWN = stCString("UNKNOWN");
-static const StCString THE_DBGMSG_SOURCES = {
+static constexpr StCString THE_DBGMSG_SOURCE_UNKNOWN = stCString("UNKNOWN");
+static constexpr StCString THE_DBGMSG_SOURCES = {
     stCString("OpenGL"),          // GL_DEBUG_SOURCE_API
     stCString("Window System"),   // GL_DEBUG_SOURCE_WINDOW_SYSTEM
     stCString("Shader Compiler"), // GL_DEBUG_SOURCE_SHADER_COMPILER
@@ -185,8 +97,8 @@
     stCString("Other"),           // GL_DEBUG_SOURCE_OTHER
 };
 
-static const StCString THE_DBGMSG_TYPE_UNKNOWN = stCString("UNKNOWN");
-static const StCString THE_DBGMSG_TYPES = {
+static constexpr StCString THE_DBGMSG_TYPE_UNKNOWN = stCString("UNKNOWN");
+static constexpr StCString THE_DBGMSG_TYPES = {
     stCString("Error"),              // GL_DEBUG_TYPE_ERROR
     stCString("Deprecated"),         // GL_DEBUG_TYPE_DEPRECATED_BEHAVIOR
     stCString("Undefined behavior"), // GL_DEBUG_TYPE_UNDEFINED_BEHAVIOR
@@ -195,9 +107,9 @@
     stCString("Other"),              // GL_DEBUG_TYPE_OTHER
 };
 
-static const StCString THE_DBGMSG_SEV_HIGH   = stCString("High");   // GL_DEBUG_SEVERITY_HIGH
-static const StCString THE_DBGMSG_SEV_MEDIUM = stCString("Medium"); // GL_DEBUG_SEVERITY_MEDIUM
-static const StCString THE_DBGMSG_SEV_LOW    = stCString("Low");    // GL_DEBUG_SEVERITY_LOW
+static constexpr StCString THE_DBGMSG_SEV_HIGH   = stCString("High");   // GL_DEBUG_SEVERITY_HIGH
+static constexpr StCString THE_DBGMSG_SEV_MEDIUM = stCString("Medium"); // GL_DEBUG_SEVERITY_MEDIUM
+static constexpr StCString THE_DBGMSG_SEV_LOW    = stCString("Low");    // GL_DEBUG_SEVERITY_LOW
 
 void StGLContext::stglDebugCallback(unsigned int theSource,
                                     unsigned int theType,
@@ -242,12 +154,12 @@
     //}
 }
 
-void StGLContext::setMessagesQueue(const StHandle<StMsgQueue>& theQueue) {
+void StGLContext::setMessagesQueue(const std::shared_ptr<StMsgQueue>& theQueue) {
     myMsgQueue = theQueue;
 }
 
 void StGLContext::pushError(const StCString& theMessage) {
-    if(!myMsgQueue.isNull()) {
+    if (myMsgQueue.get() != nullptr) {
         myMsgQueue->pushError(theMessage);
     } else {
         ST_ERROR_LOG(theMessage);

_service:obs_scm:sview-26.obscpio/StShared/StGL/StGLFont.cpp Changed

@@ -10,8 +10,8 @@
     //
 }
 
-StGLFont::StGLFont(const StHandle<StFTFont>& theFtFont) {
-    myFonts0 = new StGLFontEntry(theFtFont);
+StGLFont::StGLFont(const std::shared_ptr<StFTFont>& theFtFont) {
+    myFonts0 = std::make_shared<StGLFontEntry>(theFtFont);
 }
 
 StGLFont::~StGLFont() {
@@ -19,9 +19,9 @@
 }
 
 void StGLFont::release(StGLContext& theCtx) {
-    for(size_t anIter = 0; anIter < StFTFont::SubsetsNB; ++anIter) {
-        StHandle<StGLFontEntry>& aFont = myFontsanIter;
-        if(!aFont.isNull()) {
+    for (size_t anIter = 0; anIter < StFTFont::SubsetsNB; ++anIter) {
+        std::shared_ptr<StGLFontEntry>& aFont = myFontsanIter;
+        if (aFont.get() != nullptr) {
             aFont->release(theCtx);
         }
     }
@@ -30,15 +30,15 @@
 bool StGLFont::stglInit(StGLContext&       theCtx,
                         const unsigned int thePointSize,
                         const unsigned int theResolution) {
-    StHandle<StGLFontEntry>& aFontMain = myFonts0;
-    if(aFontMain.isNull()
+    std::shared_ptr<StGLFontEntry>& aFontMain = myFonts0;
+    if (aFontMain.get() == nullptr
     || !aFontMain->stglInit(theCtx, thePointSize, theResolution)) {
         return false;
     }
 
-    for(size_t anIter = 1; anIter < StFTFont::SubsetsNB; ++anIter) {
-        StHandle<StGLFontEntry>& aFont = myFontsanIter;
-        if(!aFont.isNull()) {
+    for (size_t anIter = 1; anIter < StFTFont::SubsetsNB; ++anIter) {
+        std::shared_ptr<StGLFontEntry>& aFont = myFontsanIter;
+        if (aFont.get() != nullptr) {
             aFont->stglInit(theCtx, thePointSize, theResolution, false);
         }
     }
@@ -46,15 +46,15 @@
 }
 
 bool StGLFont::stglInit(StGLContext& theCtx) {
-    StHandle<StGLFontEntry>& aFontMain = myFonts0;
-    if(aFontMain.isNull()
+    std::shared_ptr<StGLFontEntry>& aFontMain = myFonts0;
+    if (aFontMain.get() == nullptr
     || !aFontMain->stglInit(theCtx)) {
         return false;
     }
 
-    for(size_t anIter = 1; anIter < StFTFont::SubsetsNB; ++anIter) {
-        StHandle<StGLFontEntry>& aFont = myFontsanIter;
-        if(!aFont.isNull()) {
+    for (size_t anIter = 1; anIter < StFTFont::SubsetsNB; ++anIter) {
+        std::shared_ptr<StGLFontEntry>& aFont = myFontsanIter;
+        if (aFont.get() != nullptr) {
             aFont->stglInit(theCtx, false);
         }
     }
@@ -63,9 +63,9 @@
 
 bool StGLFont::setActiveStyle(const StFTFont::Style theStyle) {
     bool hasStyle = false;
-    for(size_t anIter = 0; anIter < StFTFont::SubsetsNB; ++anIter) {
-        StHandle<StGLFontEntry>& aFont = myFontsanIter;
-        if(!aFont.isNull()) {
+    for (size_t anIter = 0; anIter < StFTFont::SubsetsNB; ++anIter) {
+        std::shared_ptr<StGLFontEntry>& aFont = myFontsanIter;
+        if (aFont.get() != nullptr) {
             hasStyle = aFont->setActiveStyle(theStyle) || hasStyle;
         }
     }
@@ -78,10 +78,10 @@
                            StGLTile&       theGlyph,
                            StGLVec2&       thePen) {
     const StFTFont::Subset aSubset = StFTFont::subset(theUChar);
-    StHandle<StGLFontEntry>& aFont = myFontsaSubset;
-    if(!aFont.isNull()
-    && aFont->hasSymbol(theUChar)
-    && aFont->renderGlyph(theCtx, false, theUChar, theUCharNext, theGlyph, thePen)) {
+    std::shared_ptr<StGLFontEntry>& aFont = myFontsaSubset;
+    if (aFont.get() != nullptr
+     && aFont->hasSymbol(theUChar)
+     && aFont->renderGlyph(theCtx, false, theUChar, theUCharNext, theGlyph, thePen)) {
         return;
     }
     myFonts0->renderGlyph(theCtx, true, theUChar, theUCharNext, theGlyph, thePen);

_service:obs_scm:sview-26.obscpio/StShared/StGL/StGLFontEntry.cpp Changed

@@ -13,7 +13,7 @@
 #include <StStrings/StLogger.h>
 #include <stAssert.h>
 
-StGLFontEntry::StGLFontEntry(const StHandle<StFTFont>& theFont)
+StGLFontEntry::StGLFontEntry(const std::shared_ptr<StFTFont>& theFont)
 : myFont(theFont),
   myAscender(0.0f),
   myLineSpacing(0.0f),
@@ -22,26 +22,26 @@
   myLastTileId(size_t(-1)),
   myGlyphMap(NULL) {
     stMemZero(&myLastTilePx, sizeof(myLastTilePx));
-    if(!myFont.isNull()) {
+    if (myFont.get() != nullptr) {
         myFont->setActiveStyle(StFTFont::Style_Regular);
     }
     myGlyphMap = &myGlyphMapsStFTFont::Style_Regular;
 }
 
 StGLFontEntry::~StGLFontEntry() {
-    ST_ASSERT(myTextures.isEmpty(), "~StGLFontEntry() with unreleased GL resources");
+    ST_ASSERT(myTextures.empty(), "~StGLFontEntry() with unreleased GL resources");
 }
 
 void StGLFontEntry::release(StGLContext& theCtx) {
     for(size_t anIter = 0; anIter < myFbos.size(); ++anIter) {
-        StHandle<StGLFrameBuffer>& aFbo = myFbos.changeValue(anIter);
+        std::shared_ptr<StGLFrameBuffer>& aFbo = myFbosanIter;
         aFbo->release(theCtx);
-        aFbo.nullify();
+        aFbo.reset();
     }
     for(size_t anIter = 0; anIter < myTextures.size(); ++anIter) {
-        StHandle<StGLTexture>& aTexture = myTextures.changeValue(anIter);
+        std::shared_ptr<StGLTexture>& aTexture = myTexturesanIter;
         aTexture->release(theCtx);
-        aTexture.nullify();
+        aTexture.reset();
     }
     myTextures.clear();
     myFbos.clear();
@@ -73,7 +73,7 @@
 bool StGLFontEntry::stglInit(StGLContext& theCtx,
                              const bool   theToCreateTexture) {
     release(theCtx);
-    if(myFont.isNull() || !myFont->isValid()) {
+    if (myFont.get() == nullptr || !myFont->isValid()) {
         return false;
     }
 
@@ -114,10 +114,10 @@
     stMemZero(&myLastTilePx, sizeof(myLastTilePx));
     myLastTilePx.bottom() = myTileSizeY;
 
-    myTextures.add(new StGLTexture(theCtx.arbTexRG ? GL_R8 : GL_ALPHA));
-    myFbos.add(new StGLFrameBuffer());
-    StHandle<StGLTexture>&     aTexture = myTexturesmyTextures.size() - 1;
-    StHandle<StGLFrameBuffer>& aFbo     = myFbos    myTextures.size() - 1;
+    myTextures.push_back(std::make_shared<StGLTexture>(theCtx.arbTexRG ? GL_R8 : GL_ALPHA));
+    myFbos.push_back(std::make_shared<StGLFrameBuffer>());
+    std::shared_ptr<StGLTexture>&     aTexture = myTextures.back();
+    std::shared_ptr<StGLFrameBuffer>& aFbo     = myFbos.back();
     if(!aTexture->initTrash(theCtx, aTextureSizeX, aTextureSizeY)) {
         return false;
     }
@@ -156,19 +156,17 @@
 bool StGLFontEntry::renderGlyph(StGLContext&    theCtx,
                                 const stUtf32_t theChar,
                                 const bool      theToForce) {
-    if(!myFont->renderGlyph(theChar)) {
-        if(!theToForce
-        || !myFont->renderGlyphNotdef()) {
+    if (!myFont->renderGlyph(theChar)) {
+        if (!theToForce || !myFont->renderGlyphNotdef()) {
             return false;
         }
     }
 
-    if(myTextures.isEmpty()
-    && !createTexture(theCtx)) {
+    if (myTextures.empty() && !createTexture(theCtx)) {
         return false;
     }
 
-    StHandle<StGLTexture>& aTexture = myTexturesmyTextures.size() - 1;
+    std::shared_ptr<StGLTexture>& aTexture = myTextures.back();
 
     const StImagePlane& anImg = myFont->getGlyphImage();
     const size_t aTileId = myLastTileId + 1;
@@ -210,7 +208,7 @@
     myFont->getGlyphRect(aTile.px);
 
     myLastTileId = aTileId;
-    myTiles.add(aTile);
+    myTiles.push_back(aTile);
     return true;
 }

_service:obs_scm:sview-26.obscpio/StShared/StGL/StGLFontManager.cpp Changed

@@ -17,9 +17,9 @@
 }
 
 StGLFontManager::StGLFontManager(const unsigned int theResolution)
-: myFTLib(new StFTLibrary()),
+: myFTLib(std::make_shared<StFTLibrary>()),
   myResolution(theResolution) {
-    myRegistry = new StFTFontRegistry();
+    myRegistry = std::make_shared<StFTFontRegistry>();
     myRegistry->init(false);
 }
 
@@ -28,9 +28,9 @@
 }
 
 void StGLFontManager::release(StGLContext& theCtx) {
-    for(std::map< StGLFontKey, StHandle<StGLFontEntry> >::iterator anIter = myFonts.begin();
+    for (std::map< StGLFontKey, std::shared_ptr<StGLFontEntry> >::iterator anIter = myFonts.begin();
         anIter != myFonts.end(); ++anIter) {
-        if(!anIter->second.isNull()) {
+        if (anIter->second.get() != nullptr) {
             anIter->second->release(theCtx);
         }
     }
@@ -46,25 +46,25 @@
     myResolution = theResolution;
 }
 
-StHandle<StGLFontEntry> StGLFontManager::find(const StString& theName,
+std::shared_ptr<StGLFontEntry> StGLFontManager::find(const StString& theName,
                                               unsigned int    theSize) const {
-    std::map< StGLFontKey, StHandle<StGLFontEntry> >::const_iterator aFontIter = myFonts.find(StGLFontKey(theName, theSize));
-    return (aFontIter != myFonts.end()) ? aFontIter->second : StHandle<StGLFontEntry>();
+    std::map< StGLFontKey, std::shared_ptr<StGLFontEntry> >::const_iterator aFontIter = myFonts.find(StGLFontKey(theName, theSize));
+    return (aFontIter != myFonts.end()) ? aFontIter->second : std::shared_ptr<StGLFontEntry>();
 }
 
-StHandle<StGLFontEntry> StGLFontManager::findCreate(const StString& theName,
-                                                    unsigned int    theSize) {
-    StHandle<StGLFontEntry>& aFontGl = myFontsStGLFontKey(theName, theSize);
-    if(!aFontGl.isNull()) {
+std::shared_ptr<StGLFontEntry> StGLFontManager::findCreate(const StString& theName,
+                                                           unsigned int    theSize) {
+    std::shared_ptr<StGLFontEntry>& aFontGl = myFontsStGLFontKey(theName, theSize);
+    if (aFontGl.get() != nullptr) {
         return aFontGl;
     }
 
     const StFTFontFamily& aFont = myRegistry->findFont(theName);
-    if(aFont.FamilyName.isEmpty()) {
-        return StHandle<StGLFontEntry>();
+    if (aFont.FamilyName.isEmpty()) {
+        return std::shared_ptr<StGLFontEntry>();
     }
 
-    StHandle<StFTFont> aFontFt = new StFTFont(myFTLib);
+    std::shared_ptr<StFTFont> aFontFt = std::make_shared<StFTFont>(myFTLib);
     const bool hasItalic     = !aFont.Italic.isEmpty();
     const bool hasBoldItalic = !aFont.BoldItalic.isEmpty();
     aFontFt->load(aFont.Regular, aFont.RegularFace,    StFTFont::Style_Regular);
@@ -76,49 +76,52 @@
                   hasBoldItalic ? aFont.BoldItalicFace : aFont.BoldFace,
                   StFTFont::Style_BoldItalic, !hasBoldItalic);
     aFontFt->init(theSize, myResolution);
-    aFontGl = new StGLFontEntry(aFontFt);
+
+    aFontGl = std::make_shared<StGLFontEntry>(aFontFt);
     return aFontGl;
 }
 
-StHandle<StGLFontEntry> StGLFontManager::findCreateFallback(unsigned int theSize) {
+std::shared_ptr<StGLFontEntry> StGLFontManager::findCreateFallback(unsigned int theSize) {
     const StString aName = getFallbackFontName();
-    StHandle<StGLFontEntry>& aFontGl = myFontsStGLFontKey(aName, theSize);
-    if(!aFontGl.isNull()) {
+    std::shared_ptr<StGLFontEntry>& aFontGl = myFontsStGLFontKey(aName, theSize);
+    if (aFontGl.get() != nullptr) {
         return aFontGl;
     }
 
     ST_ERROR_LOG("StGLFontManager, fallback font is used!");
-    StHandle<StFTFont> aFontFt = new StFTFont(myFTLib);
+    std::shared_ptr<StFTFont> aFontFt = std::make_shared<StFTFont>(myFTLib);
     aFontFt->loadInternal(getFallbackFontPath(),
                           THE_DejaVuSerif_ttf_DATA,
                           THE_DejaVuSerif_ttf_LEN,
                           StFTFont::Style_Regular);
     aFontFt->init(theSize, myResolution);
-    aFontGl = new StGLFontEntry(aFontFt);
+
+    aFontGl = std::make_shared<StGLFontEntry>(aFontFt);
     return aFontGl;
 }
 
-const StHandle<StGLFont>& StGLFontManager::findCreate(const StFTFont::Typeface theType,
-                                                      unsigned int             theSize) {
-    StHandle<StGLFont>& aFont = myFontTypesStGLFontTypeKey(theType, theSize);
-    if(!aFont.isNull()) {
+const std::shared_ptr<StGLFont>& StGLFontManager::findCreate(const StFTFont::Typeface theType,
+                                                             unsigned int             theSize) {
+    std::shared_ptr<StGLFont>& aFont = myFontTypesStGLFontTypeKey(theType, theSize);
+    if (aFont.get() != nullptr) {
         return aFont;
     }
 
-    aFont = new StGLFont();
+    aFont = std::make_shared<StGLFont>();
     const StFTFontPack& aPack = myRegistry->getTypeface(theType);
-    StHandle<StGLFontEntry>& aGenFont = aFont->changeFont(StFTFont::Subset_General);
+
+    std::shared_ptr<StGLFontEntry>& aGenFont = aFont->changeFont(StFTFont::Subset_General);
     aGenFont                                    = findCreate(aPack.Western.FamilyName, theSize);
     aFont->changeFont(StFTFont::Subset_CJK)     = findCreate(aPack.CJK    .FamilyName, theSize);
     aFont->changeFont(StFTFont::Subset_Korean)  = findCreate(aPack.Korean .FamilyName, theSize);
-    if(aGenFont.isNull() || !aGenFont->hasSubset(StFTFont::Subset_Arabic)) {
+    if (aGenFont.get() == nullptr || !aGenFont->hasSubset(StFTFont::Subset_Arabic)) {
         aFont->changeFont(StFTFont::Subset_Arabic) = findCreate(aPack.Arabic.FamilyName, theSize);
     }
-    if(aGenFont.isNull() || !aGenFont->hasSubset(StFTFont::Subset_MiscSymbols)) {
+    if (aGenFont.get() == nullptr || !aGenFont->hasSubset(StFTFont::Subset_MiscSymbols)) {
         aFont->changeFont(StFTFont::Subset_MiscSymbols) = findCreate(aPack.MiscSymbols.FamilyName, theSize);
     }
 
-    if(aGenFont.isNull()) {
+    if (aGenFont.get() == nullptr) {
         aGenFont = findCreateFallback(theSize);
     }
     return aFont;

_service:obs_scm:sview-26.obscpio/StShared/StGL/StGLFrameBuffer.cpp Changed

@@ -13,11 +13,7 @@
 #include <StStrings/StLogger.h>
 #include <stAssert.h>
 
-StGLFrameBuffer::StGLFrameBuffer()
-: myGLFBufferId(NO_FRAMEBUFFER),
-  myGLDepthRBId(NO_RENDERBUFFER),
-  myViewPortX(0),
-  myViewPortY(0) {
+StGLFrameBuffer::StGLFrameBuffer() {
     //
 }
 
@@ -27,14 +23,14 @@
 }
 
 void StGLFrameBuffer::release(StGLContext& theCtx) {
-    if(!myTextureColor.isNull()) {
+    if (myTextureColor.get() != nullptr) {
         myTextureColor->release(theCtx);
     }
-    if(isValidDepthBuffer()) {
+    if (isValidDepthBuffer()) {
         theCtx.arbFbo->glDeleteRenderbuffers(1, &myGLDepthRBId);
         myGLDepthRBId = NO_RENDERBUFFER;
     }
-    if(isValidFrameBuffer()) {
+    if (isValidFrameBuffer()) {
         theCtx.arbFbo->glDeleteFramebuffers(1, &myGLFBufferId);
         myGLFBufferId = NO_FRAMEBUFFER;
     }
@@ -94,8 +90,8 @@
                            const GLsizei theSizeY,
                            const bool    theNeedDepthBuffer) {
     // create the texture
-    if(myTextureColor.isNull()) {
-        myTextureColor = new StGLTexture(theTextureFormat);
+    if (myTextureColor.get() == nullptr) {
+        myTextureColor = std::make_shared<StGLTexture>(theTextureFormat);
     }
     if(!myTextureColor->initTrash(theCtx, theSizeX, theSizeY)) {
         release(theCtx);
@@ -104,15 +100,15 @@
     return init(theCtx, myTextureColor, theNeedDepthBuffer);
 }
 
-bool StGLFrameBuffer::init(StGLContext&  theCtx,
-                           const StHandle<StGLTexture>& theColorTexture,
-                           const bool    theNeedDepthBuffer) {
-    if(theColorTexture.isNull()
-    || theCtx.arbFbo == NULL) {
+bool StGLFrameBuffer::init(StGLContext& theCtx,
+                           const std::shared_ptr<StGLTexture>& theColorTexture,
+                           const bool theNeedDepthBuffer) {
+    if (theColorTexture.get() == nullptr
+     || theCtx.arbFbo == nullptr) {
         release(theCtx);
         return false;
-    } else if(myTextureColor != theColorTexture) {
-        if(!myTextureColor.isNull()) {
+    } else if (myTextureColor != theColorTexture) {
+        if (myTextureColor.get() != nullptr) {
             myTextureColor->release(theCtx);
         }
     }
@@ -167,12 +163,12 @@
     return true;
 }
 
-void StGLFrameBuffer::detachColorTexture(StGLContext&                 theCtx,
-                                         const StHandle<StGLTexture>& theTextureColor) {
-    if(myGLFBufferId == NO_FRAMEBUFFER
-    || theTextureColor.isNull()
-    || myTextureColor != theTextureColor
-    || !myTextureColor->isValid()) {
+void StGLFrameBuffer::detachColorTexture(StGLContext& theCtx,
+                                         const std::shared_ptr<StGLTexture>& theTextureColor) {
+    if (myGLFBufferId == NO_FRAMEBUFFER
+     || theTextureColor.get() == nullptr
+     || myTextureColor != theTextureColor
+     || !myTextureColor->isValid()) {
         return;
     }
 
@@ -180,7 +176,7 @@
     theCtx.arbFbo->glFramebufferTexture2D(GL_FRAMEBUFFER, GL_COLOR_ATTACHMENT0, GL_TEXTURE_2D,
                                           0, 0);
     unbindBuffer(theCtx);
-    myTextureColor.nullify();
+    myTextureColor.reset();
 }
 
 void StGLFrameBuffer::clearTexture(StGLContext& theCtx) {
@@ -209,8 +205,8 @@
     }
 }
 
-void StGLFrameBuffer::clearTexture(StGLContext&                 theCtx,
-                                   const StHandle<StGLTexture>& theTexture) {
+void StGLFrameBuffer::clearTexture(StGLContext& theCtx,
+                                   const std::shared_ptr<StGLTexture>& theTexture) {
     StGLFrameBuffer aFbo;
     if(!aFbo.init(theCtx, theTexture, false)) {
         return;

_service:obs_scm:sview-26.obscpio/StShared/StGL/StGLMatrix.cpp Changed

_service:obs_scm:sview-26.obscpio/StShared/StGL/StGLMesh.cpp Changed

@@ -121,11 +121,6 @@
 
 StGLMesh::StGLMesh(const GLenum thePrimitives)
 : myBndSphere(),
-  myVertices(1),
-  myNormals(1),
-  myTCoords(1),
-  myColors(1),
-  myIndices(1),
   myPrimitives(thePrimitives) {
     //
 }
@@ -147,42 +142,41 @@
 bool StGLMesh::computeMesh() {
     // dummy - we can not compute mesh from nowhere
     // however in general alien mesh could be set just as is
-    if(!myVertices.isEmpty()) {
-        if(myBndSphere.isVoid()) {
+    if (!myVertices.empty()) {
+        if (myBndSphere.isVoid()) {
             myBndSphere.enlarge(myVertices);
         }
         return true;
     }
     return false;
-};
+}
 
 bool StGLMesh::initVBOs(StGLContext& theCtx) {
     // reset all current VBOs
     clearVRAM(theCtx);
-    if(myVertices.isEmpty() && !computeMesh()) {
+    if (myVertices.empty() && !computeMesh()) {
         // no vertices - invalid mesh
         return false;
     }
-    if(myVertices.isEmpty()) {
+    if (myVertices.empty()) {
         // no vertices - invalid mesh
         return false;
     }
     bool isOK = myVertexBuf.init(theCtx, myVertices);
-    if(!myNormals.isEmpty() && myNormals.size() == myVertices.size()) {
+    if (!myNormals.empty() && myNormals.size() == myVertices.size()) {
         isOK = isOK && myNormalBuf.init(theCtx, myNormals);
     }
-    if(!myTCoords.isEmpty() && myTCoords.size() == myVertices.size()) {
+    if (!myTCoords.empty() && myTCoords.size() == myVertices.size()) {
         isOK = isOK && myTCoordBuf.init(theCtx, myTCoords);
     }
-    if(!myColors.isEmpty() && myColors.size() == myVertices.size()) {
+    if (!myColors.empty() && myColors.size() == myVertices.size()) {
         isOK = isOK && myColorsBuf.init(theCtx, myColors);
     }
-    if(!myIndices.isEmpty()) {
+    if (!myIndices.empty()) {
         isOK = isOK && myIndexBuf.init(theCtx, myIndices);
     }
     return isOK;
-
-};
+}
 
 bool StGLMesh::check(const StGLMeshProgram& theProgram) const {
     return !(theProgram.getLocation(ST_VBO_VERTEX).isValid() && !myVertexBuf.isValid())
@@ -206,11 +200,11 @@
 
 void StGLMesh::clearRAM() {
     myBndSphere.reset(); // should we?
-    myVertices.initList(1);
-    myNormals.initList(1);
-    myTCoords.initList(1);
-    myColors.initList(1);
-    myIndices.initList(1);
+    myVertices.clear();
+    myNormals.clear();
+    myTCoords.clear();
+    myColors.clear();
+    myIndices.clear();
 }
 
 void StGLMesh::clearVRAM(StGLContext& theCtx) {
@@ -223,8 +217,8 @@
 
 bool StGLMesh::computeNormals(size_t theDelta) {
     ST_ASSERT(theDelta > 0, "StGLMesh::computeNormals() - wrong delta");
-    myNormals.initArray(myVertices.size());
-    if(myVertices.isEmpty()) {
+    myNormals.resize(myVertices.size());
+    if (myVertices.empty()) {
         return false;
     }
 
@@ -244,9 +238,9 @@
             const StGLVec3& aVert2 = myVerticesaV2;
             const StGLVec3& aVert3 = myVerticesaV3;
             aNorm = StGLVec3::cross(aVert2 - aVert1, aVert3 - aVert1);
-            myNormals.changeValue(aV1) += aNorm;
-            myNormals.changeValue(aV2) += aNorm;
-            myNormals.changeValue(aV3) += aNorm;
+            myNormalsaV1 += aNorm;
+            myNormalsaV2 += aNorm;
+            myNormalsaV3 += aNorm;
         }
     } else if(myVertices.size() >= 3) {
         size_t aLimit = myVertices.size() - 3;
@@ -258,17 +252,17 @@
             const StGLVec3& aVert2 = myVerticesaV2;
             const StGLVec3& aVert3 = myVerticesaV3;
             aNorm = StGLVec3::cross(aVert2 - aVert1, aVert3 - aVert1);
-            myNormals.changeValue(aV1) += aNorm;
-            myNormals.changeValue(aV2) += aNorm;
-            myNormals.changeValue(aV3) += aNorm;
+            myNormalsaV1 += aNorm;
+            myNormalsaV2 += aNorm;
+            myNormalsaV3 += aNorm;
         }
     } else {
         return false;
     }
 
     // normalize normals (important for OpenGL)
-    for(size_t aNormId = 0; aNormId < myNormals.size(); ++aNormId) {
-        myNormals.changeValue(aNormId).normalize();
+    for (StGLVec3& aNormIter : myNormals) {
+        aNormIter.normalize();
     }
     return true;
 }

_service:obs_scm:sview-26.obscpio/StShared/StGL/StGLPrism.cpp Changed

@@ -82,56 +82,68 @@
                      const StGLVec3& theX1Y0Z1,
                      const StGLVec3& theX1Y1Z1,
                      const StGLVec3& theX0Y1Z1) {
-    myVertices.initList(12 * 2
+    myVertices.reserve(12 * 2
         + myNbIsosX * 2 * (size_t(myToShowZ0) + size_t(myToShowZ1) + size_t(myToShowY0) + size_t(myToShowY1))
         + myNbIsosY * 2 * (size_t(myToShowZ0) + size_t(myToShowZ1) + size_t(myToShowX0) + size_t(myToShowX1))
         + myNbIsosZ * 2 * (size_t(myToShowX0) + size_t(myToShowX1) + size_t(myToShowY0) + size_t(myToShowY1)));
     // top-left DZ
-    myVertices.add(theX0Y0Z0).add(theX0Y0Z1);
+    myVertices.push_back(theX0Y0Z0);
+    myVertices.push_back(theX0Y0Z1);
     // top-right DZ
-    myVertices.add(theX1Y0Z0).add(theX1Y0Z1);
+    myVertices.push_back(theX1Y0Z0);
+    myVertices.push_back(theX1Y0Z1);
     // bottom-right DZ
-    myVertices.add(theX1Y1Z0).add(theX1Y1Z1);
+    myVertices.push_back(theX1Y1Z0);
+    myVertices.push_back(theX1Y1Z1);
     // bottom-left DZ
-    myVertices.add(theX0Y1Z0).add(theX0Y1Z1);
+    myVertices.push_back(theX0Y1Z0);
+    myVertices.push_back(theX0Y1Z1);
     // far top DX
-    myVertices.add(theX0Y0Z1).add(theX1Y0Z1);
+    myVertices.push_back(theX0Y0Z1);
+    myVertices.push_back(theX1Y0Z1);
     // far bottom DX
-    myVertices.add(theX0Y1Z1).add(theX1Y1Z1);
+    myVertices.push_back(theX0Y1Z1);
+    myVertices.push_back(theX1Y1Z1);
     // far left DY
-    myVertices.add(theX0Y0Z1).add(theX0Y1Z1);
+    myVertices.push_back(theX0Y0Z1);
+    myVertices.push_back(theX0Y1Z1);
     // far right DY
-    myVertices.add(theX1Y0Z1).add(theX1Y1Z1);
+    myVertices.push_back(theX1Y0Z1);
+    myVertices.push_back(theX1Y1Z1);
     // near top DX
-    myVertices.add(theX0Y0Z0).add(theX1Y0Z0);
+    myVertices.push_back(theX0Y0Z0);
+    myVertices.push_back(theX1Y0Z0);
     // near bottom DX
-    myVertices.add(theX0Y1Z0).add(theX1Y1Z0);
+    myVertices.push_back(theX0Y1Z0);
+    myVertices.push_back(theX1Y1Z0);
     // near left DY
-    myVertices.add(theX0Y0Z0).add(theX0Y1Z0);
+    myVertices.push_back(theX0Y0Z0);
+    myVertices.push_back(theX0Y1Z0);
     // near right DY
-    myVertices.add(theX1Y0Z0).add(theX1Y1Z0);
+    myVertices.push_back(theX1Y0Z0);
+    myVertices.push_back(theX1Y1Z0);
 
     // X-isolines
     for(size_t aDX = 1; aDX < (myNbIsosX + 1); ++aDX) {
         // DY lines near
         if(myToShowZ0) {
-            myVertices.add(StGLVec3::getLERP(theX0Y0Z0, theX1Y0Z0, GLfloat(aDX) / GLfloat(myNbIsosX + 1)));
-            myVertices.add(StGLVec3::getLERP(theX0Y1Z0, theX1Y1Z0, GLfloat(aDX) / GLfloat(myNbIsosX + 1)));
+            myVertices.push_back(StGLVec3::getLERP(theX0Y0Z0, theX1Y0Z0, GLfloat(aDX) / GLfloat(myNbIsosX + 1)));
+            myVertices.push_back(StGLVec3::getLERP(theX0Y1Z0, theX1Y1Z0, GLfloat(aDX) / GLfloat(myNbIsosX + 1)));
         }
         // DY lines far
         if(myToShowZ1) {
-            myVertices.add(StGLVec3::getLERP(theX0Y0Z1, theX1Y0Z1, GLfloat(aDX) / GLfloat(myNbIsosX + 1)));
-            myVertices.add(StGLVec3::getLERP(theX0Y1Z1, theX1Y1Z1, GLfloat(aDX) / GLfloat(myNbIsosX + 1)));
+            myVertices.push_back(StGLVec3::getLERP(theX0Y0Z1, theX1Y0Z1, GLfloat(aDX) / GLfloat(myNbIsosX + 1)));
+            myVertices.push_back(StGLVec3::getLERP(theX0Y1Z1, theX1Y1Z1, GLfloat(aDX) / GLfloat(myNbIsosX + 1)));
         }
         // DZ lines left
         if(myToShowY0) {
-            myVertices.add(StGLVec3::getLERP(theX0Y0Z0, theX1Y0Z0, GLfloat(aDX) / GLfloat(myNbIsosX + 1)));
-            myVertices.add(StGLVec3::getLERP(theX0Y0Z1, theX1Y0Z1, GLfloat(aDX) / GLfloat(myNbIsosX + 1)));
+            myVertices.push_back(StGLVec3::getLERP(theX0Y0Z0, theX1Y0Z0, GLfloat(aDX) / GLfloat(myNbIsosX + 1)));
+            myVertices.push_back(StGLVec3::getLERP(theX0Y0Z1, theX1Y0Z1, GLfloat(aDX) / GLfloat(myNbIsosX + 1)));
         }
         // DZ lines right
         if(myToShowY1) {
-            myVertices.add(StGLVec3::getLERP(theX0Y1Z0, theX1Y1Z0, GLfloat(aDX) / GLfloat(myNbIsosX + 1)));
-            myVertices.add(StGLVec3::getLERP(theX0Y1Z1, theX1Y1Z1, GLfloat(aDX) / GLfloat(myNbIsosX + 1)));
+            myVertices.push_back(StGLVec3::getLERP(theX0Y1Z0, theX1Y1Z0, GLfloat(aDX) / GLfloat(myNbIsosX + 1)));
+            myVertices.push_back(StGLVec3::getLERP(theX0Y1Z1, theX1Y1Z1, GLfloat(aDX) / GLfloat(myNbIsosX + 1)));
         }
     }
 
@@ -139,23 +151,23 @@
     for(size_t aDY = 1; aDY < (myNbIsosY + 1); ++aDY) {
         // DX lines near
         if(myToShowZ0) {
-            myVertices.add(StGLVec3::getLERP(theX0Y0Z0, theX0Y1Z0, GLfloat(aDY) / GLfloat(myNbIsosY + 1)));
-            myVertices.add(StGLVec3::getLERP(theX1Y0Z0, theX1Y1Z0, GLfloat(aDY) / GLfloat(myNbIsosY + 1)));
+            myVertices.push_back(StGLVec3::getLERP(theX0Y0Z0, theX0Y1Z0, GLfloat(aDY) / GLfloat(myNbIsosY + 1)));
+            myVertices.push_back(StGLVec3::getLERP(theX1Y0Z0, theX1Y1Z0, GLfloat(aDY) / GLfloat(myNbIsosY + 1)));
         }
         // DX lines far
         if(myToShowZ1) {
-            myVertices.add(StGLVec3::getLERP(theX0Y0Z1, theX0Y1Z1, GLfloat(aDY) / GLfloat(myNbIsosY + 1)));
-            myVertices.add(StGLVec3::getLERP(theX1Y0Z1, theX1Y1Z1, GLfloat(aDY) / GLfloat(myNbIsosY + 1)));
+            myVertices.push_back(StGLVec3::getLERP(theX0Y0Z1, theX0Y1Z1, GLfloat(aDY) / GLfloat(myNbIsosY + 1)));
+            myVertices.push_back(StGLVec3::getLERP(theX1Y0Z1, theX1Y1Z1, GLfloat(aDY) / GLfloat(myNbIsosY + 1)));
         }
         // DZ lines left
         if(myToShowX0) {
-            myVertices.add(StGLVec3::getLERP(theX0Y0Z0, theX0Y1Z0, GLfloat(aDY) / GLfloat(myNbIsosY + 1)));
-            myVertices.add(StGLVec3::getLERP(theX0Y0Z1, theX0Y1Z1, GLfloat(aDY) / GLfloat(myNbIsosY + 1)));
+            myVertices.push_back(StGLVec3::getLERP(theX0Y0Z0, theX0Y1Z0, GLfloat(aDY) / GLfloat(myNbIsosY + 1)));
+            myVertices.push_back(StGLVec3::getLERP(theX0Y0Z1, theX0Y1Z1, GLfloat(aDY) / GLfloat(myNbIsosY + 1)));
         }
         // DZ lines right
         if(myToShowX1) {
-            myVertices.add(StGLVec3::getLERP(theX1Y0Z0, theX1Y1Z0, GLfloat(aDY) / GLfloat(myNbIsosY + 1)));
-            myVertices.add(StGLVec3::getLERP(theX1Y0Z1, theX1Y1Z1, GLfloat(aDY) / GLfloat(myNbIsosY + 1)));
+            myVertices.push_back(StGLVec3::getLERP(theX1Y0Z0, theX1Y1Z0, GLfloat(aDY) / GLfloat(myNbIsosY + 1)));
+            myVertices.push_back(StGLVec3::getLERP(theX1Y0Z1, theX1Y1Z1, GLfloat(aDY) / GLfloat(myNbIsosY + 1)));
         }
     }
 
@@ -163,23 +175,23 @@
     for(size_t aDZ = 1; aDZ < (myNbIsosZ + 1); ++aDZ) {
         // DX lines from near-top to far-top
         if(myToShowY0) {
-            myVertices.add(StGLVec3::getLERP(theX0Y0Z0, theX0Y0Z1, GLfloat(aDZ) / GLfloat(myNbIsosZ + 1)));
-            myVertices.add(StGLVec3::getLERP(theX1Y0Z0, theX1Y0Z1, GLfloat(aDZ) / GLfloat(myNbIsosZ + 1)));
+            myVertices.push_back(StGLVec3::getLERP(theX0Y0Z0, theX0Y0Z1, GLfloat(aDZ) / GLfloat(myNbIsosZ + 1)));
+            myVertices.push_back(StGLVec3::getLERP(theX1Y0Z0, theX1Y0Z1, GLfloat(aDZ) / GLfloat(myNbIsosZ + 1)));
         }
         // DX lines from near-bottom to far-bottom
         if(myToShowY1) {
-            myVertices.add(StGLVec3::getLERP(theX0Y1Z0, theX0Y1Z1, GLfloat(aDZ) / GLfloat(myNbIsosZ + 1)));
-            myVertices.add(StGLVec3::getLERP(theX1Y1Z0, theX1Y1Z1, GLfloat(aDZ) / GLfloat(myNbIsosZ + 1)));
+            myVertices.push_back(StGLVec3::getLERP(theX0Y1Z0, theX0Y1Z1, GLfloat(aDZ) / GLfloat(myNbIsosZ + 1)));
+            myVertices.push_back(StGLVec3::getLERP(theX1Y1Z0, theX1Y1Z1, GLfloat(aDZ) / GLfloat(myNbIsosZ + 1)));
         }
         // DY lines from near-left to far-left
         if(myToShowX0) {
-            myVertices.add(StGLVec3::getLERP(theX0Y0Z0, theX0Y0Z1, GLfloat(aDZ) / GLfloat(myNbIsosZ + 1)));
-            myVertices.add(StGLVec3::getLERP(theX0Y1Z0, theX0Y1Z1, GLfloat(aDZ) / GLfloat(myNbIsosZ + 1)));
+            myVertices.push_back(StGLVec3::getLERP(theX0Y0Z0, theX0Y0Z1, GLfloat(aDZ) / GLfloat(myNbIsosZ + 1)));
+            myVertices.push_back(StGLVec3::getLERP(theX0Y1Z0, theX0Y1Z1, GLfloat(aDZ) / GLfloat(myNbIsosZ + 1)));
         }
         // DY lines from near-right to far-right
         if(myToShowX1) {
-            myVertices.add(StGLVec3::getLERP(theX1Y0Z0, theX1Y0Z1, GLfloat(aDZ) / GLfloat(myNbIsosZ + 1)));
-            myVertices.add(StGLVec3::getLERP(theX1Y1Z0, theX1Y1Z1, GLfloat(aDZ) / GLfloat(myNbIsosZ + 1)));
+            myVertices.push_back(StGLVec3::getLERP(theX1Y0Z0, theX1Y0Z1, GLfloat(aDZ) / GLfloat(myNbIsosZ + 1)));
+            myVertices.push_back(StGLVec3::getLERP(theX1Y1Z0, theX1Y1Z1, GLfloat(aDZ) / GLfloat(myNbIsosZ + 1)));
         }
     }
     return myVertexBuf.init(theCtx, myVertices);

_service:obs_scm:sview-26.obscpio/StShared/StGL/StGLProjCamera.cpp Changed

_service:obs_scm:sview-26.obscpio/StShared/StGL/StGLQuadTexture.cpp Changed

_service:obs_scm:sview-26.obscpio/StShared/StGL/StGLQuads.cpp Changed

_service:obs_scm:sview-26.obscpio/StShared/StGL/StGLShader.cpp Changed

_service:obs_scm:sview-26.obscpio/StShared/StGL/StGLStereoFrameBuffer.cpp Changed

@@ -43,26 +43,16 @@
 
 StGLStereoFrameBuffer::StGLStereoFrameBuffer()
 #if defined(GL_ES_VERSION_2_0)
-: StGLStereoTexture(GL_RGBA),
+: StGLStereoFrameBuffer(GL_RGBA)
 #else
-: StGLStereoTexture(GL_RGBA8),
+: StGLStereoFrameBuffer(GL_RGBA8)
 #endif
-  myVerticesBuf(),
-  myTexCoordBuf(),
-  myViewPortX(0),
-  myViewPortY(0) {
-    myGLFBufferIdsStGLStereoTexture::LEFT_TEXTURE  = StGLFrameBuffer::NO_FRAMEBUFFER;
-    myGLFBufferIdsStGLStereoTexture::RIGHT_TEXTURE = StGLFrameBuffer::NO_FRAMEBUFFER;
-    myGLDepthRBIdsStGLStereoTexture::LEFT_TEXTURE  = StGLFrameBuffer::NO_RENDERBUFFER;
-    myGLDepthRBIdsStGLStereoTexture::RIGHT_TEXTURE = StGLFrameBuffer::NO_RENDERBUFFER;
+{
+    //
 }
 
 StGLStereoFrameBuffer::StGLStereoFrameBuffer(const GLint theTextureFormat)
-: StGLStereoTexture(theTextureFormat),
-  myVerticesBuf(),
-  myTexCoordBuf(),
-  myViewPortX(0),
-  myViewPortY(0) {
+: StGLStereoTexture(theTextureFormat) {
     myGLFBufferIdsStGLStereoTexture::LEFT_TEXTURE  = StGLFrameBuffer::NO_FRAMEBUFFER;
     myGLFBufferIdsStGLStereoTexture::RIGHT_TEXTURE = StGLFrameBuffer::NO_FRAMEBUFFER;
     myGLDepthRBIdsStGLStereoTexture::LEFT_TEXTURE  = StGLFrameBuffer::NO_RENDERBUFFER;
@@ -186,18 +176,20 @@
     ST_DEBUG_LOG("OpenGL, created StFrameBuffer(WxH= " + getSizeX() + 'x' + getSizeY() + ')');
 
     // create vertices buffers to draw simple textured quad
-    StArray<StGLVec4> aQuad(4);
-    aQuad0 = StGLVec4( 1.0f, -1.0f, 0.0f, 1.0f); // top-right
-    aQuad1 = StGLVec4( 1.0f,  1.0f, 0.0f, 1.0f); // bottom-right
-    aQuad2 = StGLVec4(-1.0f, -1.0f, 0.0f, 1.0f); // top-left
-    aQuad3 = StGLVec4(-1.0f,  1.0f, 0.0f, 1.0f); // bottom-left
+    const std::vector<StGLVec4> aQuad = {
+        StGLVec4( 1.0f, -1.0f, 0.0f, 1.0f), // top-right
+        StGLVec4( 1.0f,  1.0f, 0.0f, 1.0f), // bottom-right
+        StGLVec4(-1.0f, -1.0f, 0.0f, 1.0f), // top-left
+        StGLVec4(-1.0f,  1.0f, 0.0f, 1.0f)  // bottom-left
+    };
     myVerticesBuf.init(theCtx, aQuad);
 
-    StArray<StGLVec2> aQuadTC(4);
-    aQuadTC0 = StGLVec2(1.0f, 0.0f);
-    aQuadTC1 = StGLVec2(1.0f, 1.0f);
-    aQuadTC2 = StGLVec2(0.0f, 0.0f);
-    aQuadTC3 = StGLVec2(0.0f, 1.0f);
+    const std::vector<StGLVec2> aQuadTC = {
+        StGLVec2(1.0f, 0.0f),
+        StGLVec2(1.0f, 1.0f),
+        StGLVec2(0.0f, 0.0f),
+        StGLVec2(0.0f, 1.0f)
+    };
     myTexCoordBuf.init(theCtx, aQuadTC);
 
     myViewPortX = theTextureSizeX;
@@ -242,17 +234,18 @@
 void StGLStereoFrameBuffer::setVPDimensions(StGLContext&  theCtx,
                                             const GLsizei theSizeX,
                                             const GLsizei theSizeY) {
-    GLsizei aVPSizeX = stMin(theSizeX, getSizeX());
-    GLsizei aVPSizeY = stMin(theSizeY, getSizeY());
+    const GLsizei aVPSizeX = stMin(theSizeX, getSizeX());
+    const GLsizei aVPSizeY = stMin(theSizeY, getSizeY());
     if(aVPSizeX != myViewPortX
     || aVPSizeY != myViewPortY) {
-        GLfloat aDX = GLfloat(aVPSizeX) / GLfloat(getSizeX());
-        GLfloat aDY = GLfloat(aVPSizeY) / GLfloat(getSizeY());
-        StArray<StGLVec2> aTCoords(4);
-        aTCoords0 = StGLVec2(aDX,  0.0f);
-        aTCoords1 = StGLVec2(aDX,  aDY);
-        aTCoords2 = StGLVec2(0.0f, 0.0f);
-        aTCoords3 = StGLVec2(0.0f, aDY);
+        const GLfloat aDX = GLfloat(aVPSizeX) / GLfloat(getSizeX());
+        const GLfloat aDY = GLfloat(aVPSizeY) / GLfloat(getSizeY());
+        const std::vector<StGLVec2> aTCoords = {
+            StGLVec2(aDX,  0.0f),
+            StGLVec2(aDX,  aDY),
+            StGLVec2(0.0f, 0.0f),
+            StGLVec2(0.0f, aDY)
+        };
         myTexCoordBuf.init(theCtx, aTCoords);
         myViewPortX = aVPSizeX;
         myViewPortY = aVPSizeY;

_service:obs_scm:sview-26.obscpio/StShared/StGL/StGLTextFormatter.cpp Changed

@@ -97,9 +97,9 @@
     return theVec;
 }
 
-void StGLTextFormatter::getResult(std::vector<GLuint>&                               theTextures,
-                                  std::vector< StHandle <std::vector <StGLVec2> > >& theVertsPerTexture,
-                                  std::vector< StHandle <std::vector <StGLVec2> > >& theTCrdsPerTexture) const {
+void StGLTextFormatter::getResult(std::vector<GLuint>& theTextures,
+                                  std::vector< std::shared_ptr <std::vector <StGLVec2> > >& theVertsPerTexture,
+                                  std::vector< std::shared_ptr <std::vector <StGLVec2> > >& theTCrdsPerTexture) const {
     StGLVec2 aVec(0.0f, 0.0f);
     theTextures.clear();
     theVertsPerTexture.clear();
@@ -117,8 +117,8 @@
         }
         if(aListId >= theTextures.size()) {
             theTextures.push_back(aTexture);
-            theVertsPerTexture.push_back(new std::vector<StGLVec2>());
-            theTCrdsPerTexture.push_back(new std::vector<StGLVec2>());
+            theVertsPerTexture.push_back(std::make_shared<std::vector<StGLVec2>>());
+            theTCrdsPerTexture.push_back(std::make_shared<std::vector<StGLVec2>>());
             aNbRectPerTexture.push_back(0);
         }
 
@@ -166,33 +166,33 @@
     }
 }
 
-void StGLTextFormatter::getResult(StGLContext&                                theCtx,
-                                  std::vector<GLuint>&                        theTextures,
-                                  StArrayList< StHandle <StGLVertexBuffer> >& theVertsPerTexture,
-                                  StArrayList< StHandle <StGLVertexBuffer> >& theTCrdsPerTexture) const {
-    std::vector< StHandle < std::vector<StGLVec2> > > aVertsPerTexture;
-    std::vector< StHandle < std::vector<StGLVec2> > > aTCrdsPerTexture;
+void StGLTextFormatter::getResult(StGLContext& theCtx,
+                                  std::vector<GLuint>& theTextures,
+                                  std::vector< std::shared_ptr <StGLVertexBuffer> >& theVertsPerTexture,
+                                  std::vector< std::shared_ptr <StGLVertexBuffer> >& theTCrdsPerTexture) const {
+    std::vector< std::shared_ptr < std::vector<StGLVec2> > > aVertsPerTexture;
+    std::vector< std::shared_ptr < std::vector<StGLVec2> > > aTCrdsPerTexture;
     getResult(theTextures, aVertsPerTexture, aTCrdsPerTexture);
 
-    if(theVertsPerTexture.size() != theTextures.size()) {
-        for(size_t aTextureIter = 0; aTextureIter < theVertsPerTexture.size(); ++aTextureIter) {
+    if (theVertsPerTexture.size() != theTextures.size()) {
+        for (size_t aTextureIter = 0; aTextureIter < theVertsPerTexture.size(); ++aTextureIter) {
             theVertsPerTextureaTextureIter->release(theCtx);
             theTCrdsPerTextureaTextureIter->release(theCtx);
         }
         theVertsPerTexture.clear();
         theTCrdsPerTexture.clear();
 
-        while(theVertsPerTexture.size() < theTextures.size()) {
-            StHandle <StGLVertexBuffer> aVertsVbo = new StGLVertexBuffer();
-            StHandle <StGLVertexBuffer> aTcrdsVbo = new StGLVertexBuffer();
-            theVertsPerTexture.add(aVertsVbo);
-            theTCrdsPerTexture.add(aTcrdsVbo);
+        while (theVertsPerTexture.size() < theTextures.size()) {
+            std::shared_ptr <StGLVertexBuffer> aVertsVbo = std::make_shared<StGLVertexBuffer>();
+            std::shared_ptr <StGLVertexBuffer> aTcrdsVbo = std::make_shared<StGLVertexBuffer>();
+            theVertsPerTexture.push_back(aVertsVbo);
+            theTCrdsPerTexture.push_back(aTcrdsVbo);
             aVertsVbo->init(theCtx);
             aTcrdsVbo->init(theCtx);
         }
     }
 
-    for(size_t aTextureIter = 0; aTextureIter < theTextures.size(); ++aTextureIter) {
+    for (size_t aTextureIter = 0; aTextureIter < theTextures.size(); ++aTextureIter) {
         const std::vector<StGLVec2>& aVerts = *aVertsPerTextureaTextureIter;
         const std::vector<StGLVec2>& aTCrds = *aTCrdsPerTextureaTextureIter;
         theVertsPerTextureaTextureIter->init(theCtx, aVerts);
@@ -214,14 +214,14 @@
                                const StCString&      theString,
                                const StFTFont::Style theStyle,
                                StGLFont&             theFont) {
-    if(theFont.getFont().isNull()) {
+    if (theFont.getFont().get() == nullptr) {
         return;
     }
 
     theFont.setActiveStyle(theStyle);
     myAscender    = stMax(myAscender,    theFont.getFont()->getAscender());
     myLineSpacing = stMax(myLineSpacing, theFont.getFont()->getLineSpacing());
-    if(theString.isEmpty()) {
+    if (theString.isEmpty()) {
         return;
     }
 
@@ -229,16 +229,16 @@
 
     // first pass - render all symbols using associated font on single ZERO baseline
     StGLTile aTile;
-    for(StUtf8Iter anIter = theString.iterator(); *anIter != 0 && anIter.getIndex() < theString.Length;) {
+    for (StUtf8Iter anIter = theString.iterator(); *anIter != 0 && anIter.getIndex() < theString.Length;) {
         const stUtf32_t aCharThis =   *anIter;
         const stUtf32_t aCharNext = *++anIter;
 
-        if(aCharThis == '\x0D') {
+        if (aCharThis == '\x0D') {
             continue; // ignore CR
-        } else if(aCharThis == '\x0A') {
-            /// if(theWidth <= 0.0f) myAlignWidth =
+        } else if (aCharThis == '\x0A') {
+            /// if (theWidth <= 0.0f) myAlignWidth =
             continue; // will be processed on second pass
-        } else if(aCharThis == ' ') {
+        } else if (aCharThis == ' ') {
             myPen.x() += theFont.changeFont()->getAdvanceX(aCharThis, aCharNext);
             continue;
         }
@@ -261,13 +261,13 @@
 void StGLTextFormatter::appendHTML(StGLContext&    theCtx,
                                    const StString& theString,
                                    StGLFont&       theFont) {
-    if(theFont.getFont().isNull()) {
+    if (theFont.getFont().get() == nullptr) {
         return;
     }
 
     myAscender    = stMax(myAscender,    theFont.getFont()->getAscender());
     myLineSpacing = stMax(myLineSpacing, theFont.getFont()->getLineSpacing());
-    if(theString.isEmpty()) {
+    if (theString.isEmpty()) {
         return;
     }
 
@@ -275,27 +275,27 @@
     size_t          aStartId  = anIter.getIndex();
     const stUtf8_t* aStartPtr = anIter.getBufferHere();
     StFTFont::Style aStyle    = myDefStyle;
-    for(; *anIter != 0;) {
+    for (; *anIter != 0;) {
         const stUtf8_t* anEndPtr  =    anIter.getBufferHere();
         const size_t    aCurrId   =    anIter.getIndex();
         const stUtf32_t aCharThis =   *anIter;
         const stUtf32_t aCharNext = *++anIter;
-        if(aCharThis != '<') {
+        if (aCharThis != '<') {
             continue;
         }
         bool isClose = false;
-        if(aCharNext == '/') {
+        if (aCharNext == '/') {
             isClose = true;
             ++anIter;
         }
 
         CtrlTag aTag = CtrlTag_UNKNOWN;
-        if(stAreEqual(anIter.getBufferHere(), "I>", 2)
-        || stAreEqual(anIter.getBufferHere(), "i>", 2)) {
+        if (stAreEqual(anIter.getBufferHere(), "I>", 2)
+         || stAreEqual(anIter.getBufferHere(), "i>", 2)) {
             aTag    = CtrlTag_Italic;
             anIter += 2;
-        } else if(stAreEqual(anIter.getBufferHere(), "B>", 2)
-               || stAreEqual(anIter.getBufferHere(), "b>", 2)) {
+        } else if (stAreEqual(anIter.getBufferHere(), "B>", 2)
+                || stAreEqual(anIter.getBufferHere(), "b>", 2)) {
             aTag    = CtrlTag_Bold;
             anIter += 2;
         } else {
@@ -303,7 +303,7 @@
             continue;
         }
 
-        if(anEndPtr != aStartPtr) {
+        if (anEndPtr != aStartPtr) {
             const size_t    aSubSize   = size_t(anEndPtr - aStartPtr);
             const size_t    aSubLen    = aCurrId - aStartId;
             const StCString aSubString = stStringExtConstr(aStartPtr, aSubSize, aSubLen);
@@ -312,7 +312,7 @@
         aStartId  = anIter.getIndex();
         aStartPtr = anIter.getBufferHere();
 
-        switch(aTag) {
+        switch (aTag) {
             case CtrlTag_Italic: {
                 if(isClose) {
                     if(aStyle == StFTFont::Style_BoldItalic) {

_service:obs_scm:sview-26.obscpio/StShared/StGL/StGLTexture.cpp Changed

_service:obs_scm:sview-26.obscpio/StShared/StGL/StGLTextureData.cpp Changed

@@ -12,18 +12,8 @@
 
 #include <StAV/StAVImage.h>
 
-StGLTextureData::StGLTextureData(const StHandle<StGLTextureUploadParams>& theUploadParams)
-: myPrev(NULL),
-  myNext(NULL),
-  myDataPtr(NULL),
-  myDataSizeBytes(0),
-  myStParams(),
-  myPts(0.0),
-  mySrcFormat(StFormat_AUTO),
-  myCubemapFormat(StCubemap_OFF),
-  myUploadParams(theUploadParams),
-  myFillFromRow(0),
-  myFillRows(0) {
+StGLTextureData::StGLTextureData(const std::shared_ptr<StGLTextureUploadParams>& theUploadParams)
+: myUploadParams(theUploadParams) {
     //
 }
 
@@ -350,21 +340,20 @@
 }
 
 inline bool canCopyReference(const StImage& theData) {
-    if(theData.isNull()) {
+    if (theData.isNull()) {
         return true;
     }
 
-    return !theData.getBufferCounter().isNull()
-        &&  theData.isTopDown();
+    return theData.getBufferCounter().get() != nullptr && theData.isTopDown();
 }
 
-void StGLTextureData::updateData(const StGLDeviceCaps&           theDeviceCaps,
-                                 const StImage&                  theDataL,
-                                 const StImage&                  theDataR,
-                                 const StHandle<StStereoParams>& theStParams,
-                                 const StFormat                  theFormat,
-                                 const StCubemap                 theCubemap,
-                                 const double                    thePts) {
+void StGLTextureData::updateData(const StGLDeviceCaps& theDeviceCaps,
+                                 const StImage& theDataL,
+                                 const StImage& theDataR,
+                                 const std::shared_ptr<StStereoParams>& theStParams,
+                                 const StFormat theFormat,
+                                 const StCubemap theCubemap,
+                                 const double thePts) {
     // setup new stereo source
     myStParams  = theStParams;
     myPts       = thePts;
@@ -886,14 +875,14 @@
                                   StGLQuadTexture& theQTexture) {
 
     // setup rows count to be filled per fillTexture()
-    if(myFillRows == 0 || myFillFromRow == 0) {
+    if (myFillRows == 0 || myFillFromRow == 0) {
         // prepare textures for new data
         prepareTextures(theCtx, myDataL, myCubemapFormat, theQTexture.getBack(StGLQuadTexture::LEFT_TEXTURE));
         prepareTextures(theCtx, myDataR, myCubemapFormat, theQTexture.getBack(StGLQuadTexture::RIGHT_TEXTURE));
 
         // remove links to old stereo parameters
-        theQTexture.getBack(StGLQuadTexture::LEFT_TEXTURE).setSource(StHandle<StStereoParams>());
-        theQTexture.getBack(StGLQuadTexture::RIGHT_TEXTURE).setSource(StHandle<StStereoParams>());
+        theQTexture.getBack(StGLQuadTexture::LEFT_TEXTURE).setSource(std::shared_ptr<StStereoParams>());
+        theQTexture.getBack(StGLQuadTexture::RIGHT_TEXTURE).setSource(std::shared_ptr<StStereoParams>());
 
         const int aNbRowsL = stMin(int(myDataL.getSizeY()), theQTexture.getBack(StGLQuadTexture::LEFT_TEXTURE).getSizeY());
         const int aNbRowsR = !myDataR.isNull()
@@ -904,17 +893,17 @@
         const int aMaxUploadChunkMiB   = myUploadParams->MaxUploadChunkMiB;
         const int aMaxUploadIterations = myUploadParams->MaxUploadIterations;
         int aNbIters = 1;
-        if(aMaxUploadChunkMiB > 0 && aMaxUploadIterations > 1) {
+        if (aMaxUploadChunkMiB > 0 && aMaxUploadIterations > 1) {
             size_t aStride = 0;
-            for(int aPlaneIter = 0; aPlaneIter < 4; ++aPlaneIter) {
+            for (int aPlaneIter = 0; aPlaneIter < 4; ++aPlaneIter) {
                 const StImagePlane& aPlaneL = myDataL.getPlane(aPlaneIter);
-                if(!aPlaneL.isNull()) {
+                if (!aPlaneL.isNull()) {
                     // don't use aPlane.getSizeRowBytes() here since it may contain extra padding for side-by-side input
                     aStride += aPlaneL.getSizeX() * aPlaneL.getSizePixelBytes();
                 }
-                if(!myDataR.isNull()) {
+                if (!myDataR.isNull()) {
                     const StImagePlane& aPlaneR = myDataR.getPlane(aPlaneIter);
-                    if(!aPlaneR.isNull()) {
+                    if (!aPlaneR.isNull()) {
                         aStride += aPlaneR.getSizeX() * aPlaneR.getSizePixelBytes();
                     }
                 }
@@ -924,26 +913,26 @@
             aNbIters = stMin(aMaxUploadIterations, aNbMaxRows / aNbMaxFrameRows);
         }
         myFillRows = (aNbIters > 0) ? (aNbMaxRows / aNbIters) : aNbMaxRows;
-        if(myCubemapFormat == StCubemap_Packed || myCubemapFormat == StCubemap_PackedEAC) {
+        if (myCubemapFormat == StCubemap_Packed || myCubemapFormat == StCubemap_PackedEAC) {
             myFillRows = INT_MAX; /// TODO handle cube maps incremental updates specificall
         }
         myFillFromRow = 0;
     }
 
-    if(myFillRows == 0) {
+    if (myFillRows == 0) {
         // prevent dead loop
         return true;
     }
 
-    if(theQTexture.getBack(StGLQuadTexture::LEFT_TEXTURE).isValid()) {
-        for(size_t aPlaneId = 0; aPlaneId < 4; ++aPlaneId) {
+    if (theQTexture.getBack(StGLQuadTexture::LEFT_TEXTURE).isValid()) {
+        for (size_t aPlaneId = 0; aPlaneId < 4; ++aPlaneId) {
             fillTexture(theCtx,
                         theQTexture.getBack(StGLQuadTexture::LEFT_TEXTURE).getPlane(aPlaneId),
                         myDataL.getPlane(aPlaneId));
         }
     }
-    if(theQTexture.getBack(StGLQuadTexture::RIGHT_TEXTURE).isValid()) {
-        for(size_t aPlaneId = 0; aPlaneId < 4; ++aPlaneId) {
+    if (theQTexture.getBack(StGLQuadTexture::RIGHT_TEXTURE).isValid()) {
+        for (size_t aPlaneId = 0; aPlaneId < 4; ++aPlaneId) {
             fillTexture(theCtx,
                         theQTexture.getBack(StGLQuadTexture::RIGHT_TEXTURE).getPlane(aPlaneId),
                         myDataR.getPlane(aPlaneId));
@@ -952,16 +941,16 @@
     theQTexture.getBack(StGLQuadTexture::LEFT_TEXTURE).unbind(theCtx);
 
     myFillFromRow += myFillRows;
-    if(myFillFromRow >= GLsizei(myDataL.getSizeY())
-    && (myDataR.isNull() || myFillFromRow >= GLsizei(myDataR.getSizeY()))) {
-        if(!myDataL.isNull() && theQTexture.getBack(StGLQuadTexture::LEFT_TEXTURE).isValid()) {
+    if (myFillFromRow >= GLsizei(myDataL.getSizeY())
+     && (myDataR.isNull() || myFillFromRow >= GLsizei(myDataR.getSizeY()))) {
+        if (!myDataL.isNull() && theQTexture.getBack(StGLQuadTexture::LEFT_TEXTURE).isValid()) {
             setupAttributes(theQTexture.getBack(StGLQuadTexture::LEFT_TEXTURE), myDataL);
         }
-        if(!myDataR.isNull() && theQTexture.getBack(StGLQuadTexture::RIGHT_TEXTURE).isValid()) {
+        if (!myDataR.isNull() && theQTexture.getBack(StGLQuadTexture::RIGHT_TEXTURE).isValid()) {
             setupAttributes(theQTexture.getBack(StGLQuadTexture::RIGHT_TEXTURE), myDataR);
         }
 
-        if(!myStParams.isNull()) {
+        if (myStParams.get() != nullptr) {
             myStParams->StereoFormat = mySrcFormat;
         }
         return true;
@@ -972,10 +961,10 @@
 
 void StGLTextureData::getCopy(StImage* theDataL,
                               StImage* theDataR) const {
-    if(theDataL != NULL) {
+    if (theDataL != nullptr) {
         theDataL->initCopy(myDataL, true);
     }
-    if(theDataR != NULL) {
+    if (theDataR != nullptr) {
         theDataR->initCopy(myDataR, true);
     }
 }

_service:obs_scm:sview-26.obscpio/StShared/StGL/StGLTextureQueue.cpp Changed

@@ -9,20 +9,8 @@
 #include <StGL/StGLContext.h>
 
 StGLTextureQueue::StGLTextureQueue(const size_t theQueueSizeMax)
-: myDataFront(NULL),
-  myDataSnap(NULL),
-  myDataBack(NULL),
-  myQueueSize(0),
-  myQueueSizeMax(theQueueSizeMax),
-  mySwapFBCount(0),
-  myCurrSrcFormat(StFormat_Mono),
-  myCurrPts(0.0),
-  myNewShotEvent(false),
-  myIsInUpdTexture(false),
-  myIsReadyToSwap(false),
-  myToCompress(false),
-  myHasStream(false),
-  myUploadParams(new StGLTextureUploadParams()) {
+: myQueueSizeMax(theQueueSizeMax),
+  myUploadParams(std::make_shared<StGLTextureUploadParams>()) {
     ST_ASSERT(myQueueSizeMax >= 2, "StGLTextureQueue() - queue size limit should be >= 2");
     // 1920x1080@YUV420p   ~  3 MiB
     // 1920x1080@RGB8      ~  6 MiB
@@ -56,13 +44,13 @@
 }
 
 // this function called ONLY from image thread
-bool StGLTextureQueue::push(const StImage&     theSrcDataLeft,
-                            const StImage&     theSrcDataRight,
-                            const StHandle<StStereoParams>& theStParams,
-                            const StFormat     theSrcFormat,
-                            const StCubemap    theSrcCubemap,
-                            const double       theSrcPTS) {
-    if(isFull()) {
+bool StGLTextureQueue::push(const StImage& theSrcDataLeft,
+                            const StImage& theSrcDataRight,
+                            const std::shared_ptr<StStereoParams>& theStParams,
+                            const StFormat theSrcFormat,
+                            const StCubemap theSrcCubemap,
+                            const double theSrcPTS) {
+    if (isFull()) {
         return false;
     }

_service:obs_scm:sview-26.obscpio/StShared/StGL/StGLUVCylinder.cpp Changed

@@ -51,23 +51,23 @@
     }
 
     const int aNbVerts = (myNbRings + 1) * 2;
-    myVertices.initArray(aNbVerts);
-    myNormals .initArray(aNbVerts);
-    myTCoords .initArray(aNbVerts);
+    myVertices.resize(aNbVerts);
+    myNormals .resize(aNbVerts);
+    myTCoords .resize(aNbVerts);
 
     const float anAngle = myAngleTo - myAngleFrom;
     for(int aRingIter = 0; aRingIter <= myNbRings; ++aRingIter) {
         const float aPhi    = myAngleFrom + float(aRingIter) * anAngle / float(myNbRings);
         const float aTexCrd = float(aRingIter) / float(myNbRings);
-        myTCoords.changeValue(aRingIter * 2 + 0) = StGLVec2(aTexCrd, 0.0f);
-        myTCoords.changeValue(aRingIter * 2 + 1) = StGLVec2(aTexCrd, 1.0f);
+        myTCoordsaRingIter * 2 + 0 = StGLVec2(aTexCrd, 0.0f);
+        myTCoordsaRingIter * 2 + 1 = StGLVec2(aTexCrd, 1.0f);
 
         const StGLVec3 aNorm(cosf(aPhi), 0.0f, sinf(aPhi));
-        myNormals.changeValue(aRingIter * 2 + 0) = aNorm;
-        myNormals.changeValue(aRingIter * 2 + 1) = aNorm;
+        myNormalsaRingIter * 2 + 0 = aNorm;
+        myNormalsaRingIter * 2 + 1 = aNorm;
 
-        myVertices.changeValue(aRingIter * 2 + 0) = myCenter + aNorm * myRadius - StGLVec3(0.0f, myHeight * 0.5f, 0.0f);
-        myVertices.changeValue(aRingIter * 2 + 1) = myCenter + aNorm * myRadius + StGLVec3(0.0f, myHeight * 0.5f, 0.0f);
+        myVerticesaRingIter * 2 + 0 = myCenter + aNorm * myRadius - StGLVec3(0.0f, myHeight * 0.5f, 0.0f);
+        myVerticesaRingIter * 2 + 1 = myCenter + aNorm * myRadius + StGLVec3(0.0f, myHeight * 0.5f, 0.0f);
     }
     return true;
 }

_service:obs_scm:sview-26.obscpio/StShared/StGL/StGLUVSphere.cpp Changed

@@ -11,9 +11,9 @@
 #include <StGL/StGLContext.h>
 
 namespace {
-    static const GLfloat ST_PI     = 3.1415926535897932384626433832795f;
-    static const GLfloat ST_TWOPI  = 6.2831853071795864769252867665590f;
-    static const GLfloat ST_PIDIV2 = 1.5707963267948966192313216916397f;
+    static constexpr GLfloat ST_PI     = 3.1415926535897932384626433832795f;
+    static constexpr GLfloat ST_TWOPI  = 6.2831853071795864769252867665590f;
+    static constexpr GLfloat ST_PIDIV2 = 1.5707963267948966192313216916397f;
 }
 
 StGLUVSphere::StGLUVSphere(const StGLVec3& theCenter,
@@ -57,15 +57,13 @@
     size_t pointPerRing = myRings;
 
     const size_t aVerticesCount = (aRingsCount + 1) * (pointPerRing + 1);
-    myVertices.initArray(aVerticesCount);
-    myNormals.initArray(aVerticesCount);
-    myTCoords.initArray(aVerticesCount);
+    myVertices.resize(aVerticesCount);
+    myNormals.resize(aVerticesCount);
+    myTCoords.resize(aVerticesCount);
 
     GLfloat theta = 0.0f;
     GLfloat phi = 0.0f;
 
-    StGLVec3* aNorm = NULL;
-    StGLVec3* aVert = NULL;
     StGLVec2 tcrd(0.0f, 0.0f);
 
     for(size_t ringId = 0; ringId <= aRingsCount; ++ringId) {
@@ -81,34 +79,34 @@
 
             tcrd.x() = GLfloat(pointId) / GLfloat(pointPerRing);
 
-            aNorm = &myNormals (pointPerRing + 1) * ringId + pointId;
-            aVert = &myVertices(pointPerRing + 1) * ringId + pointId;
+            StGLVec3& aNorm = myNormals (pointPerRing + 1) * ringId + pointId;
+            StGLVec3& aVert = myVertices(pointPerRing + 1) * ringId + pointId;
 
-            aNorm->x() = cosf(theta) * cosf(phi);
-            aNorm->y() = sinf(theta);
-            aNorm->z() = cosf(theta) * sinf(phi);
-            aVert->x() = myCenter.x() + myRadius * aNorm->x();
-            aVert->y() = myCenter.y() + myRadius * aNorm->y();
-            aVert->z() = myCenter.z() + myRadius * aNorm->z();
+            aNorm.x() = cosf(theta) * cosf(phi);
+            aNorm.y() = sinf(theta);
+            aNorm.z() = cosf(theta) * sinf(phi);
+            aVert.x() = myCenter.x() + myRadius * aNorm.x();
+            aVert.y() = myCenter.y() + myRadius * aNorm.y();
+            aVert.z() = myCenter.z() + myRadius * aNorm.z();
 
             myTCoords(pointPerRing + 1) * ringId + pointId = tcrd;
         }
     }
 
     // create the indices arrays
-    size_t inicesCount = 2 * (pointPerRing + 1) * aRingsCount;
-    myIndices.initList(inicesCount);
-
-    myPrimCounts.initList(aRingsCount);
-    myIndPointers.initList(aRingsCount);
-
-    GLsizei primCount = 2 * GLsizei(pointPerRing + 1);
-    for(size_t ringId = 0; ringId < aRingsCount; ++ringId) {
-        myIndPointers.add((GLvoid* )(ringId * primCount * sizeof(GLuint))); // pointer diff
-        myPrimCounts.add(primCount);
-        for(size_t pointId = 0; pointId <= pointPerRing; ++pointId) {
-            myIndices.add(GLuint((pointPerRing + 1) * (ringId + 1) + pointId));
-            myIndices.add(GLuint((pointPerRing + 1) * ringId + pointId));
+    const size_t inicesCount = 2 * (pointPerRing + 1) * aRingsCount;
+    myIndices.reserve(inicesCount);
+
+    myPrimCounts.reserve(aRingsCount);
+    myIndPointers.reserve(aRingsCount);
+
+    const GLsizei primCount = 2 * GLsizei(pointPerRing + 1);
+    for (size_t ringId = 0; ringId < aRingsCount; ++ringId) {
+        myIndPointers.push_back((GLvoid* )(ringId * primCount * sizeof(GLuint))); // pointer diff
+        myPrimCounts.push_back(primCount);
+        for (size_t pointId = 0; pointId <= pointPerRing; ++pointId) {
+            myIndices.push_back(GLuint((pointPerRing + 1) * (ringId + 1) + pointId));
+            myIndices.push_back(GLuint((pointPerRing + 1) * ringId + pointId));
         }
     }
 
@@ -120,9 +118,9 @@
 void StGLUVSphere::drawKernel(StGLContext& theCtx) const {
     myIndexBuf.bind(theCtx);
     theCtx.core20fwd->glMultiDrawElements(GL_TRIANGLE_STRIP,
-                                           (GLsizei* )&myPrimCounts.getFirst(), // pointer will be used for iteration - data will not be changed
-                                           myIndexBuf.getDataType(),
-                                           (const GLvoid** )&myIndPointers.getFirst(),
-                                           GLsizei(myIndPointers.size()));
+                                          myPrimCounts.data(), // pointer will be used for iteration - data will not be changed
+                                          myIndexBuf.getDataType(),
+                                          myIndPointers.data(),
+                                          GLsizei(myIndPointers.size()));
     myIndexBuf.unbind(theCtx);
 }

_service:obs_scm:sview-26.obscpio/StShared/StGL/StGLVertexBuffer.cpp Changed

_service:obs_scm:sview-26.obscpio/StShared/StImage/StExifDir.cpp Changed

@@ -149,7 +149,7 @@
     }
 
     // add all entries
-    Entries.initList((size_t )anEntriesNb); // reserve space for the list
+    Entries.reserve((size_t )anEntriesNb); // reserve space for the list
     StExifEntry anEntry;
     for(uint16_t anEntryId = 0; anEntryId < anEntriesNb; ++anEntryId) {
         if(!readEntry(getEntryAddress(anEntryId),
@@ -157,7 +157,7 @@
                       anEntry)) {
             continue;
         }
-        Entries.add(anEntry);
+        Entries.push_back(anEntry);
 
         switch(anEntry.Tag) {
             case TAG_EXIF_OFFSET:
@@ -167,11 +167,11 @@
                 || aSubdirStart > theOffsetBase + theExifLength) {
                     ST_DEBUG_LOG("StExifDir, Illegal EXIF or interop offset directory link");
                 } else {
-                    StHandle<StExifDir> aSubDir = new StExifDir();
+                    std::shared_ptr<StExifDir> aSubDir = std::make_shared<StExifDir>();
                     aSubDir->IsFileBE    = IsFileBE;
                     aSubDir->CameraMaker = CameraMaker;
                     aSubDir->CameraModel = CameraModel;
-                    SubDirs.add(aSubDir);
+                    SubDirs.push_back(aSubDir);
                     if(!aSubDir->readDirectory(SubDirs,
                                                aSubdirStart, theOffsetBase,
                                                theExifLength, theNestingLevel + 1)) {
@@ -202,10 +202,10 @@
                 stUByte_t* aSubdirStart  = anEntry.ValuePtr;
                 stUByte_t* anOffsetBase  = theOffsetBase;
                 size_t     anOffsetLimit = theExifLength;
-                StHandle<StExifDir> aSubDir;
+                std::shared_ptr<StExifDir> aSubDir;
                 if(CameraMaker.isEquals(stCString("FUJIFILM"))) {
                     // the Fujifilm maker note appears to be in little endian byte order regardless of the rest of the file
-                    aSubDir = new StExifDir();
+                    aSubDir = std::make_shared<StExifDir>();
                     aSubDir->IsFileBE = false;
                     aSubDir->Type     = DType_MakerFuji;
                     // it seems that Fujifilm maker notes start with an ID string,
@@ -217,7 +217,7 @@
                         anOffsetLimit = theOffsetBase + theExifLength - anOffsetBase;
                     }
                 } else if(CameraMaker.isStartsWith(stCString("OLYMP"))) {
-                    aSubDir = new StExifDir();
+                    aSubDir = std::make_shared<StExifDir>();
                     aSubDir->IsFileBE = IsFileBE;
                     aSubDir->Type     = DType_MakerOlypm;
                     // it seems that Olympus maker notes start with an ID string
@@ -227,15 +227,15 @@
                     }
                 } else if(CameraMaker.isStartsWith(stCString("Canon"))) {
                     // it seems that Canon maker notes is always little endian
-                    aSubDir = new StExifDir();
+                    aSubDir = std::make_shared<StExifDir>();
                     aSubDir->IsFileBE = false;
                     aSubDir->Type     = DType_MakerCanon;
                 } else if(CameraMaker.isStartsWith(stCString("Kandao"))) {
-                    aSubDir = new StExifDir();
+                    aSubDir = std::make_shared<StExifDir>();
                     aSubDir->IsFileBE = IsFileBE;
                     aSubDir->Type     = DType_MakerKandao;
                 }
-                if(!aSubDir.isNull()) {
+                if (aSubDir.get() != nullptr) {
                     ST_DEBUG_LOG("StExifDir, reading " + CameraMaker + " maker notes");
                     aSubDir->CameraMaker = CameraMaker;
                     aSubDir->CameraModel = CameraModel;
@@ -243,7 +243,7 @@
                     || aSubdirStart > theOffsetBase + theExifLength) {
                         ST_DEBUG_LOG("StExifDir, illegal maker notes offset directory link");
                     } else {
-                        SubDirs.add(aSubDir);
+                        SubDirs.push_back(aSubDir);
                         if(!aSubDir->readDirectory(SubDirs,
                                                    aSubdirStart, anOffsetBase,
                                                    anOffsetLimit, theNestingLevel + 1)) {
@@ -296,12 +296,12 @@
             } else {
                 if(aSubdirStart <= theOffsetBase + theExifLength) {
                     // continued directory
-                    StHandle<StExifDir> aSubDir = new StExifDir();
+                    std::shared_ptr<StExifDir> aSubDir = std::make_shared<StExifDir>();
                     aSubDir->Type        = Type;
                     aSubDir->IsFileBE    = IsFileBE;
                     aSubDir->CameraMaker = CameraMaker;
                     aSubDir->CameraModel = CameraModel;
-                    theParentList.add(aSubDir);
+                    theParentList.push_back(aSubDir);
                     if(!aSubDir->readDirectory(theParentList,
                                                aSubdirStart, theOffsetBase,
                                                theExifLength, theNestingLevel)) {
@@ -473,8 +473,8 @@
     }
 
     for(size_t aDirId = 0; aDirId < SubDirs.size(); ++aDirId) {
-        const StHandle<StExifDir>& aDir = SubDirsaDirId;
-        if(!aDir.isNull()) {
+        const std::shared_ptr<StExifDir>& aDir = SubDirsaDirId;
+        if (aDir.get() != nullptr) {
             aDir->fillDictionary(theDict, theToShowUnknown);
         }
     }
@@ -484,8 +484,8 @@
                           StExifDir::Query&      theQuery) {
     // search in subfolders
     for(size_t aDirId = 0; aDirId < theList.size(); ++aDirId) {
-        const StHandle<StExifDir>& aDir = theListaDirId;
-        if(aDir.isNull()) {
+        const std::shared_ptr<StExifDir>& aDir = theListaDirId;
+        if (aDir.get() == nullptr) {
             continue;
         }
 
@@ -495,7 +495,7 @@
                 if(anEntry.Tag == theQuery.Entry.Tag
                 && (anEntry.Format == theQuery.Entry.Format || theQuery.Entry.Format == 0)) {
                     theQuery.Entry  = anEntry;
-                    theQuery.Folder = aDir.access();
+                    theQuery.Folder = aDir.get();
                     return true;
                 }
             }

_service:obs_scm:sview-26.obscpio/StShared/StImage/StImage.cpp Changed

@@ -157,10 +157,7 @@
     return "unknown";
 }
 
-StImage::StImage()
-: myPAR(1.0f),
-  myColorModel(ImgColor_RGB),
-  myColorScale(ImgScale_Full) {
+StImage::StImage() {
     //
 }
 
@@ -205,7 +202,7 @@
 
 bool StImage::initReference(const StImage& theCopy) {
     nullify();
-    if( theCopy.myBufCounter.isNull()
+    if( theCopy.myBufCounter.get() == nullptr
     || !initWrapper(theCopy)) {
         return false;
     }
@@ -327,8 +324,8 @@
         int aValue = (isYUV && aPlaneId != 0) ? 128 : 0;
         if(!changePlane(aPlaneId).initSideBySide(theImageL.getPlane(aPlaneId),
                                                  theImageR.getPlane(aPlaneId),
-                                                 int(aScaleX * theSeparationDx),
-                                                 int(aScaleY * theSeparationDy),
+                                                 int(round(aScaleX * theSeparationDx)),
+                                                 int(round(aScaleY * theSeparationDy)),
                                                  aValue)) {
             nullify();
             return false;
@@ -363,7 +360,7 @@
     myPlanes1.nullify();
     myPlanes2.nullify();
     myPlanes3.nullify();
-    if(!myBufCounter.isNull()) {
+    if (myBufCounter.get() != nullptr) {
         myBufCounter->releaseReference();
     }
     myPAR = 1.0f;

_service:obs_scm:sview-26.obscpio/StShared/StImage/StImageFile.cpp Changed

@@ -62,9 +62,7 @@
     uint32_t Reserved2;
 };
 
-StImageFile::StImageFile()
-: mySrcFormat(StFormat_AUTO),
-  mySrcPanorama(StPanorama_OFF) {
+StImageFile::StImageFile() {
     //
 }
 
@@ -155,60 +153,60 @@
     return StImageFile::ST_TYPE_NONE;
 }
 
-StHandle<StImageFile> StImageFile::create(const StString& thePreferred,
-                                          ImageType       theImgType) {
+std::shared_ptr<StImageFile> StImageFile::create(const StString& thePreferred,
+                                                 ImageType       theImgType) {
     return StImageFile::create(imgLibFromString(thePreferred), theImgType);
 }
 
-StHandle<StImageFile> StImageFile::create(StImageFile::ImageClass thePreferred,
-                                          ImageType               theImgType) {
+std::shared_ptr<StImageFile> StImageFile::create(StImageFile::ImageClass thePreferred,
+                                                 ImageType               theImgType) {
     (void)theImgType;
     // open requested library if it exists
     switch(thePreferred) {
         case ST_FREEIMAGE: {
-            if(StFreeImage::init()) {
-                return new StFreeImage();
+            if (StFreeImage::init()) {
+                return std::make_shared<StFreeImage>();
             }
             break;
         }
         case ST_DEVIL: {
-            if(StDevILImage::init()) {
-                return new StDevILImage();
+            if (StDevILImage::init()) {
+                return std::make_shared<StDevILImage>();
             }
             break;
         }
         case ST_STB: {
-            if(StStbImage::init()) {
-                return new StStbImage();
+            if (StStbImage::init()) {
+                return std::make_shared<StStbImage>();
             }
             break;
         }
         case ST_WIC: {
-            if(StWicImage::init()) {
-                return new StWicImage();
+            if (StWicImage::init()) {
+                return std::make_shared<StWicImage>();
             }
             break;
         }
         case ST_NSIMAGE: {
-            if(StNsImage::init()) {
-                return new StNsImage();
+            if (StNsImage::init()) {
+                return std::make_shared<StNsImage>();
             }
             break;
         }
         default:
         case ST_LIBAV: {
-            if(StAVImage::init()) {
-                return new StAVImage();
+            if (StAVImage::init()) {
+                return std::make_shared<StAVImage>();
             }
             break;
         }
     }
 
     // use default library anyway (that currently always linked)
-    if(StAVImage::init()) {
-        return new StAVImage();
+    if (StAVImage::init()) {
+        return std::make_shared<StAVImage>();
     }
-    return StHandle<StImageFile>();
+    return std::shared_ptr<StImageFile>();
 }
 
 bool StImageFile::load(const StString& theFilePath,
@@ -255,7 +253,7 @@
         StDDSFileHeader* aHeaderTile = (StDDSFileHeader* )&aTileBuffer.changeValue(4);
         aHeaderTile->Caps2 &= ~(StDDSFileHeader::DDSCompleteCubemap);
 
-        StHandle<StImageFile> aTileImage = createEmpty();
+        std::shared_ptr<StImageFile> aTileImage = createEmpty();
 
         memcpy(&aTileBuffer.changeValue(aHeaderSize), &theDataPtraHeaderSize, aTileDataSize);
         if(!aTileImage->loadExtra(theFilePath, theImageType, &aTileBuffer.changeFirst(), (int )aTileBuffer.size(), false)
@@ -318,20 +316,20 @@
 
 StImageFileCounter::StImageFileCounter() {}
 
-StImageFileCounter::StImageFileCounter(const StHandle<StImage>& theImage)
+StImageFileCounter::StImageFileCounter(const std::shared_ptr<StImage>& theImage)
 : myImageFile(theImage) {}
 
 StImageFileCounter::~StImageFileCounter() {}
 
-void StImageFileCounter::createReference(StHandle<StBufferCounter>& theOther) const {
-    StHandle<StImageFileCounter> anImgFileRef = StHandle<StImageFileCounter>::downcast(theOther);
-    if(anImgFileRef.isNull()) {
-        anImgFileRef = new StImageFileCounter();
+void StImageFileCounter::createReference(std::shared_ptr<StBufferCounter>& theOther) const {
+    std::shared_ptr<StImageFileCounter> anImgFileRef = std::dynamic_pointer_cast<StImageFileCounter>(theOther);
+    if (anImgFileRef.get() == nullptr) {
+        anImgFileRef = std::make_shared<StImageFileCounter>();
         theOther = anImgFileRef;
     }
     anImgFileRef->myImageFile = myImageFile;
 }
 
 void StImageFileCounter::releaseReference() {
-    myImageFile.nullify();
+    myImageFile.reset();
 }

_service:obs_scm:sview-26.obscpio/StShared/StImage/StImagePlane.cpp Changed

_service:obs_scm:sview-26.obscpio/StShared/StImage/StJpegParser.cpp Changed

@@ -10,6 +10,7 @@
 #include <StImage/StExifTags.h>
 
 #include <StStrings/StLogger.h>
+#include <StStrings/StStringStream.h>
 
 /**
  * JPEG markers consist of one or more 0xFF bytes, followed by a marker
@@ -137,6 +138,36 @@
     }
 }
 
+static constexpr StCStringUtf8 GPANO_ProjectionType = stCString("GPano:ProjectionType");
+static constexpr StCStringUtf8 GPANO_FullPanoWidth  = stCString("GPano:FullPanoWidthPixels");
+static constexpr StCStringUtf8 GPANO_CropPanoWidth  = stCString("GPano:CroppedAreaImageWidthPixels");
+
+/**
+ * Find properties in forms '<GPano:ProjectionType>equirectangular</GPano:ProjectionType>'
+ * or 'GPano:ProjectionType="equirectangular"'
+ */
+static StString findXmlProp(const StString& theXml, const StCStringUtf8& theName) {
+    StUtf8Iter aStart = theXml.findFirst(theName);
+    if (*aStart == 0)
+        return StString();
+
+    aStart += int(theName.Length);
+
+    if (*aStart == '>') {
+        const StUtf8Iter anEnd = theXml.findFrom('<', ++aStart);
+        return *anEnd != 0 ? StString(aStart.getBufferHere(), anEnd.getIndex() - aStart.getIndex()) : StString();
+    }
+
+    if (*aStart == '=') {
+        ++aStart;
+        if (*aStart == '\"') {
+            const StUtf8Iter anEnd = theXml.findFrom('\"', ++aStart);
+            return *anEnd != 0 ? StString(aStart.getBufferHere(), anEnd.getIndex() - aStart.getIndex()) : StString();
+        }
+    }
+    return StString();
+}
+
 StJpegParser::StJpegParser(const StCString& theFilePath)
 : StRawFile(theFilePath),
   myImages(NULL),
@@ -154,7 +185,7 @@
 
 void StJpegParser::reset() {
     // destroy all images
-    myImages.nullify();
+    myImages.reset();
     myComment.clear();
     myXMP.clear();
     myStFormat = StFormat_AUTO;
@@ -176,32 +207,32 @@
 }
 
 bool StJpegParser::parse() {
-    if(myBuffer == NULL) {
+    if (myBuffer == NULL) {
         return false;
     }
 
     int aCount = 0;
     myImages = parseImage(++aCount, 1, myBuffer, false);
-    if(myImages.isNull()) {
+    if (myImages.get() == nullptr) {
         return false;
     }
 
     // continue reading the file (MPO may contains more than 1 image)
-    for(StHandle<StJpegParser::Image> anImg = myImages;
-        !anImg.isNull(); anImg = anImg->Next) {
+    for (std::shared_ptr<StJpegParser::Image> anImg = myImages;
+         anImg.get() != nullptr; anImg = anImg->Next) {
         anImg->Next = parseImage(++aCount, 1, anImg->Data + anImg->Length, true);
     }
 
     return true;
 }
 
-StHandle<StJpegParser::Image> StJpegParser::parseImage(const int      theImgCount,
-                                                       const int      theDepth,
-                                                       unsigned char* theDataStart,
-                                                       const bool     theToFindSOI) {
+std::shared_ptr<StJpegParser::Image> StJpegParser::parseImage(const int      theImgCount,
+                                                              const int      theDepth,
+                                                              unsigned char* theDataStart,
+                                                              const bool     theToFindSOI) {
     // check out of bounds
     if(theDataStart == NULL) {
-        return StHandle<StJpegParser::Image>();
+        return std::shared_ptr<StJpegParser::Image>();
     }
 
     unsigned char*       aData    = theDataStart;
@@ -220,18 +251,18 @@
 
     // check out of bounds
     if((aData + 2) > aDataEnd) {
-        return StHandle<StJpegParser::Image>();
+        return std::shared_ptr<StJpegParser::Image>();
     }
 
     // check the jpeg identifier
     if(aData0 != 0xFF || aData1 != M_SOI) {
         ST_DEBUG_LOG("StJpegParser, no SOI at position " + size_t(aData - myBuffer) + " / " + myLength);
-        return StHandle<StJpegParser::Image>();
+        return std::shared_ptr<StJpegParser::Image>();
     }
     aData += 2; // skip already read bytes
 
     // parse the data
-    StHandle<StJpegParser::Image> anImg = new StJpegParser::Image();
+    std::shared_ptr<StJpegParser::Image> anImg = std::make_shared<StJpegParser::Image>();
     anImg->Data = aData - 2;
     bool toDetectCubemap = false;
 
@@ -285,7 +316,7 @@
             // here the subimage (thumbnail)...
             //ST_DEBUG_LOG("Jpeg, SOI at position " + size_t(aData - myBuffer) + " / " + myLength);
             anImg->Thumb = StJpegParser::parseImage(theImgCount, theDepth + 1, aData - 2, false);
-            if(!anImg->Thumb.isNull()) {
+            if (anImg->Thumb.get() != nullptr) {
                 //ST_DEBUG_LOG("anImg->Thumb->Length= " + anImg->Thumb->Length);
                 aData += anImg->Thumb->Length - 2;
             }
@@ -294,11 +325,11 @@
 
         if(aData + 2 >= aDataEnd) {
             ST_DEBUG_LOG("Corrupt jpeg file or error in parser");
-            if(myImages.isNull()) {
+            if (myImages.get() == nullptr) {
                 anImg->Data   = myBuffer;
                 anImg->Length = myLength;
             } else {
-                anImg.nullify();
+                anImg.reset();
             }
             return anImg;
         } else if(aSkippedBytes > 10) {
@@ -382,35 +413,45 @@
                 // there can be different section using the same marker
                 if(stAreEqual(aData + 2, "Exif\0\0", 6)) {
                     //ST_DEBUG_LOG("Exif section...");
-                    StHandle<StExifDir> aSubDir = new StExifDir();
-                    anImg->Exif.add(aSubDir);
+                    std::shared_ptr<StExifDir> aSubDir = std::make_shared<StExifDir>();
+                    anImg->Exif.push_back(aSubDir);
                     if(!aSubDir->parseExif(anImg->Exif, aData + 8, anItemLen - 8)) {
                         //
                     }
                 } else if(stAreEqual(aData + 2, "MPF\0", 4)) {
                     // MP Extensions (MPO)
-                    StHandle<StExifDir> aSubDir = new StExifDir();
+                    std::shared_ptr<StExifDir> aSubDir = std::make_shared<StExifDir>();
                     aSubDir->Type = StExifDir::DType_MPO;
-                    anImg->Exif.add(aSubDir);
+                    anImg->Exif.push_back(aSubDir);
                     if(!aSubDir->parseExif(anImg->Exif, aData + 6, anItemLen - 6)) {
                         //
                     }
-                } else if(stAreEqual(aData + 2, "http:", 5)) {
+                } else if (stAreEqual(aData + 2, "http:", 5)) {
                     //ST_DEBUG_LOG("Image cotains XMP section");
-                    if(stAreEqual(aData + 2, "http://ns.adobe.com/xap/1.0/", 28)) { // XMP basic namespace
-                        myXMP = StString((char* )aData + 31, anItemLen - 31);
-                        {
-                          // GPano http://ns.google.com/photos/1.0/panorama/ namespace metadata.
-                          // Note possible cropped panorama parameters are ignored by sView.
-                          if(myXMP.isContains(stCString("<GPano:ProjectionType>equirectangular</GPano:ProjectionType>"))
-                          || myXMP.isContains(stCString("GPano:ProjectionType=\"equirectangular\""))) {
-                              // Google currently supports only equirectangular format
-                              myPanorama = StPanorama_Sphere;
-                          } else if(myXMP.isContains(stCString("<GPano:ProjectionType>cubemap</GPano:ProjectionType>"))
-                                 || myXMP.isContains(stCString("GPano:ProjectionType=\"cubemap\""))) {
-                              // this one doesn't yet exist, but try to support it
-                              toDetectCubemap = true;
-                          }
+                    if (stAreEqual(aData + 2, "http://ns.adobe.com/xap/1.0/", 28)) { // XMP basic namespace
+                        myXMP = StString((char* )aData + 31, anItemLen - 31); // TODO fix string concatenation range
+                        if (myXMP.isContains(stCString("xmlns:GPano"))) {
+                             // GPano http://ns.google.com/photos/1.0/panorama/ namespace metadata.
+                            // Note possible cropped panorama parameters are ignored by sView.
+                            const StString aProjType = findXmlProp(myXMP, GPANO_ProjectionType);
+                            if (aProjType.isEquals(stCString("equirectangular"))) {
+                                // Google currently supports only equirectangular format
+                                myPanorama = StPanorama_Sphere;
+                            } else if (aProjType.isEquals(stCString("cubemap"))) {
+                                // this one doesn't yet exist, but try to support it
+                                toDetectCubemap = true;
+                            }
+
+                            // try detecting VR180 cropped panorama
+                            const StString aPanoWidthFullStr = findXmlProp(myXMP, GPANO_FullPanoWidth);
+                            const StString aPanoWidthCropStr = findXmlProp(myXMP, GPANO_CropPanoWidth);
+
+                            StCLocale aCLocale;
+                            const int aPanoWidthFull = (int )stStringToLong(aPanoWidthFullStr.toCString(), 10, aCLocale);
+                            const int aPanoWidthCrop = (int )stStringToLong(aPanoWidthCropStr.toCString(), 10, aCLocale);
+                            if (aPanoWidthFull != 0 && aPanoWidthCrop == aPanoWidthFull / 2) {
+                                myPanorama = StPanorama_Hemisphere;
+                            }
                         }
                         myXMP.clear();
                     }
@@ -509,10 +550,10 @@
                                  const ptrdiff_t theOffset) {
     const size_t aDiff    = size_t(theSectLen) + 2; // 2 bytes for marker
     const size_t aNewSize = myLength + aDiff;
-    if(aNewSize > myBuffSize) {
+    if (aNewSize > myBuffSize) {
         myBuffSize = aNewSize + 256;
         stUByte_t* aNewData = stMemAllocAligned<stUByte_t*>(myBuffSize);
-        if(aNewData == NULL) {
+        if (aNewData == NULL) {
             return false;
         }
         stMemCpy(aNewData, myBuffer, myLength);
@@ -522,16 +563,16 @@
         myIsOwnData = true;
 
         // update pointers of image(s) data
-        for(StHandle<StJpegParser::Image> anImg = myImages;
-            !anImg.isNull(); anImg = anImg->Next) {
+        for (std::shared_ptr<StJpegParser::Image> anImg = myImages;
+             anImg.get() != nullptr; anImg = anImg->Next) {
             ptrdiff_t anOffset = anImg->Data - myBuffer;
-            if(anOffset >= theOffset) {
+            if (anOffset >= theOffset) {
                 anOffset += aDiff;
             }
             anImg->Data = aNewData + anOffset;
-            if(!anImg->Thumb.isNull()) {
+            if (anImg->Thumb.get() != nullptr) {
                 anOffset = anImg->Thumb->Data - myBuffer;
-                if(anOffset >= theOffset) {
+                if (anOffset >= theOffset) {
                     anOffset += aDiff;
                 }
                 anImg->Thumb->Data = aNewData + anOffset;
@@ -543,8 +584,8 @@
     myLength = aNewSize;
 
     // update offset table
-    for(size_t anIter = 0; anIter < OffsetsNb; ++anIter) {
-        if(myOffsetsanIter >= theOffset) {
+    for (size_t anIter = 0; anIter < OffsetsNb; ++anIter) {
+        if (myOffsetsanIter >= theOffset) {
             myOffsetsanIter += aDiff;
         }
     }
@@ -638,9 +679,9 @@
 
 void StJpegParser::fillDictionary(StDictionary& theDict,
                                   const bool    theToShowUnknown) const {
-    for(StHandle<StJpegParser::Image> anImg = myImages;
-        !anImg.isNull(); anImg = anImg->Next) {
-        for(size_t anExifId = 0; anExifId < anImg->Exif.size(); ++anExifId) {
+    for (std::shared_ptr<StJpegParser::Image> anImg = myImages;
+         anImg.get() != nullptr; anImg = anImg->Next) {
+        for (size_t anExifId = 0; anExifId < anImg->Exif.size(); ++anExifId) {
             anImg->ExifanExifId->fillDictionary(theDict, theToShowUnknown);
         }
     }

_service:obs_scm:sview-26.obscpio/StShared/StJNIEnv.cpp Changed

_service:obs_scm:sview-26.obscpio/StShared/StPlayList.cpp Changed

@@ -21,7 +21,7 @@
   myNextItem(NULL),
   myPosition(0),
   myFileNode(theFileNode),
-  myStParams(new StStereoParams(theDefParams)),
+  myStParams(std::make_shared<StStereoParams>(theDefParams)),
   myPlayFlag(false) {
     //
 }
@@ -169,13 +169,14 @@
     //
 }
 
-void StPlayList::setExtensions(const StArrayList<StString>& theExtensions) {
-    myExtensions = theExtensions;
-    for(size_t anExtId = 0; anExtId < myExtensions.size(); ++anExtId) {
-        if(myExtensionsanExtId.isEqualsIgnoreCase(stCString("m3u"))) {
-            myExtensions.remove(anExtId); // playlist files are treated in special way
-            --anExtId;
+void StPlayList::setExtensions(const std::vector<StString>& theExtensions) {
+    myExtensions.clear();
+    myExtensions.reserve(theExtensions.size());
+    for (const StString& anExtIter : theExtensions) {
+        if (anExtIter.isEqualsIgnoreCase(stCString("m3u"))) {
+            continue; // playlist files are treated in special way
         }
+        myExtensions.push_back(anExtIter);
     }
 }
 
@@ -223,19 +224,19 @@
 
 void StPlayList::clear() {
     StMutexAuto anAutoLock(myMutex);
-    if(myFirst != NULL) {
+    if (myFirst != nullptr) {
         myWasCleared = true;
     }
 
-    if(!myPlsFile.isNull()
-    && myCurrent != NULL) {
-        if(myPlsFile->File->isEmpty()) {
-            myPlsFile->File->add(new StFileNode(myCurrent->getPath(), myPlsFile->File.access()));
+    if (myPlsFile.get() != nullptr
+     && myCurrent != nullptr) {
+        if (myPlsFile->File->isEmpty()) {
+            myPlsFile->File->add(new StFileNode(myCurrent->getPath(), myPlsFile->File.get()));
         } else {
             myPlsFile->File->changeValue(0)->setSubPath(myCurrent->getPath());
         }
     }
-    myPlsFile.nullify();
+    myPlsFile.reset();
 
     // destroy double-linked list content
     for(StPlayItem *anItem(myFirst), *anItemToDel(NULL); anItem != NULL;) {
@@ -473,22 +474,22 @@
     return false;
 }
 
-StHandle<StFileNode> StPlayList::getCurrentFile() {
+std::shared_ptr<StFileNode> StPlayList::getCurrentFile() {
     StMutexAuto anAutoLock(myMutex);
-    if(myCurrent == NULL) {
+    if (myCurrent == nullptr) {
         // empty list
-        return StHandle<StFileNode>();
+        return std::shared_ptr<StFileNode>();
     }
     StFileNode* aFileNode = myCurrent->getFileNode();
-    if(aFileNode == NULL) {
+    if (aFileNode == nullptr) {
         // invalid item
-        return StHandle<StFileNode>();
+        return std::shared_ptr<StFileNode>();
     }
-    return new StFileNode(aFileNode->getPath());
+    return std::make_shared<StFileNode>(aFileNode->getPath());
 }
 
-void StPlayList::setTitle(const StHandle<StStereoParams>& theKey,
-                          const StString&                 theTitle) {
+void StPlayList::setTitle(const std::shared_ptr<StStereoParams>& theKey,
+                          const StString& theTitle) {
     StMutexAuto anAutoLock(myMutex);
     if(myCurrent == NULL) {
         return;
@@ -504,33 +505,33 @@
     signals.onTitleChange(anItemId);
 }
 
-bool StPlayList::getCurrentFile(StHandle<StFileNode>&     theFileNode,
-                                StHandle<StStereoParams>& theParams,
-                                StHandle<StFileNode>&     thePlsFile) {
-    theFileNode.nullify();
-    theParams.nullify();
-    thePlsFile.nullify();
+bool StPlayList::getCurrentFile(std::shared_ptr<StFileNode>& theFileNode,
+                                std::shared_ptr<StStereoParams>& theParams,
+                                std::shared_ptr<StFileNode>& thePlsFile) {
+    theFileNode.reset();
+    theParams.reset();
+    thePlsFile.reset();
     StMutexAuto anAutoLock(myMutex);
-    if(myCurrent == NULL) {
+    if (myCurrent == nullptr) {
         // empty list
         return false;
     }
     StFileNode* aFileNode = myCurrent->getFileNode();
-    if(aFileNode == NULL) {
+    if (aFileNode == nullptr) {
         // invalid item
         return false;
     }
 
     theFileNode = aFileNode->detach();
     theParams   = myCurrent->getParams();
-    if(!myPlsFile.isNull()) {
+    if (myPlsFile.get() != nullptr) {
         thePlsFile = myPlsFile->File;
     }
     return true;
 }
 
-void StPlayList::addToNode(const StHandle<StFileNode>& theFileNode,
-                           const StString&             thePathToAdd) {
+void StPlayList::addToNode(const std::shared_ptr<StFileNode>& theFileNode,
+                           const StString& thePathToAdd) {
     StString aPath = theFileNode->getPath();
     StMutexAuto anAutoLock(myMutex);
     if(myCurrent == NULL) {
@@ -807,7 +808,7 @@
 
     StMutexAuto anAutoLock(myMutex);
     for(size_t anIter = 0; anIter < myRecent.size(); ++anIter) {
-        const StHandle<StRecentItem>& aRecent = myRecentanIter;
+        const std::shared_ptr<StRecentItem>& aRecent = myRecentanIter;
         if(stAreSameRecent(aNode, *aRecent->File)) {
             return anIter;
         }
@@ -815,14 +816,14 @@
     return size_t(-1);
 }
 
-StHandle<StStereoParams> StPlayList::openRecent(const size_t theItemId) {
+std::shared_ptr<StStereoParams> StPlayList::openRecent(const size_t theItemId) {
     StMutexAuto anAutoLock(myMutex);
     if(theItemId >= myRecent.size()) {
-        return StHandle<StStereoParams>();
+        return std::shared_ptr<StStereoParams>();
     }
 
-    const StHandle<StRecentItem> aRecent = myRecenttheItemId;
-    const StHandle<StFileNode>   aFile   = aRecent->File;
+    const std::shared_ptr<StRecentItem> aRecent = myRecenttheItemId;
+    const std::shared_ptr<StFileNode>   aFile   = aRecent->File;
     if(aFile->size() == 2) {
         // stereo pair from two files
         clear();
@@ -838,23 +839,23 @@
     return aRecent->Params;
 }
 
-void StPlayList::updateRecent(const StHandle<StFileNode>&     theFile,
-                              const StHandle<StStereoParams>& theParams) {
-    if(theFile.isNull()) {
+void StPlayList::updateRecent(const std::shared_ptr<StFileNode>& theFile,
+                              const std::shared_ptr<StStereoParams>& theParams) {
+    if (theFile.get() == nullptr) {
         return;
     }
 
     StMutexAuto anAutoLock(myMutex);
-    if(!myPlsFile.isNull()
+    if (myPlsFile.get() != nullptr
      && myPlsFile->File == theFile) {
         // remember properties of last played file
         myPlsFile->Params = theParams;
         return;
     }
 
-    for(size_t anIter = 0; anIter < myRecent.size(); ++anIter) {
-        StHandle<StRecentItem>& aRecent = myRecentanIter;
-        if(stAreSameRecent(*theFile, *aRecent->File)) {
+    for (size_t anIter = 0; anIter < myRecent.size(); ++anIter) {
+        std::shared_ptr<StRecentItem>& aRecent = myRecentanIter;
+        if (stAreSameRecent(*theFile, *aRecent->File)) {
             aRecent->Params = theParams;
             return;
         }
@@ -871,8 +872,8 @@
     theList.clear();
     StMutexAuto anAutoLock(myMutex);
     for(size_t anIter = 0; anIter < myRecent.size(); ++anIter) {
-        const StHandle<StRecentItem>& aRecent = myRecentanIter;
-        const StHandle<StFileNode>&   aFile   = aRecent->File;
+        const std::shared_ptr<StRecentItem>& aRecent = myRecentanIter;
+        const std::shared_ptr<StFileNode>&   aFile   = aRecent->File;
 
         const StString aPath = aFile->size() == 2 ? aFile->getValue(0)->getPath() : aFile->getPath();
         StString aTitleString;
@@ -884,38 +885,39 @@
 
 void StPlayList::currentToRecent() {
     StMutexAuto anAutoLock(myMutex);
-    if( myCurrent == NULL
-    || !myPlsFile.isNull()) {
+    if (myCurrent == nullptr
+     || myPlsFile.get() != nullptr) {
         return;
     }
 
-    StHandle<StPlayList::StRecentItem> aRecent = addRecentFile(*myCurrent->getFileNode());
+    std::shared_ptr<StPlayList::StRecentItem> aRecent = addRecentFile(*myCurrent->getFileNode());
     aRecent->Params = myCurrent->getParams();
 }
 
-const StHandle<StPlayList::StRecentItem>& StPlayList::addRecentFile(const StFileNode& theFile,
-                                                                    const bool        theToFront) {
+const std::shared_ptr<StPlayList::StRecentItem>& StPlayList::addRecentFile(const StFileNode& theFile,
+                                                                           const bool        theToFront) {
     // remove duplicates
-    for(size_t anIter = 0; anIter < myRecent.size(); ++anIter) {
-        const StHandle<StRecentItem>& aRecent = myRecentanIter;
-        if(stAreSameRecent(theFile, *aRecent->File)) {
+    for (size_t anIter = 0; anIter < myRecent.size(); ++anIter) {
+        const std::shared_ptr<StRecentItem>& aRecent = myRecentanIter;
+        if (stAreSameRecent(theFile, *aRecent->File)) {
             myRecent.erase(myRecent.begin() + anIter);
             break;
         }
     }
 
-    if(myRecent.size() > myRecentLimit) {
+    if (myRecent.size() > myRecentLimit) {
         myRecent.pop_back();
     }
 
-    StHandle<StRecentItem> aNewRecent = new StRecentItem();
-    if(StFileNode::isContentProtocolPath(theFile.getPath())) {
+    std::shared_ptr<StRecentItem> aNewRecent = std::make_shared<StRecentItem>();
+    const StString aPath = theFile.getPath();
+    if (StFileNode::isContentProtocolPath(aPath)) {
         // ignore temporary URLs
-        aNewRecent->File = new StFileNode();
+        aNewRecent->File = std::make_shared<StFileNode>();
     } else {
         aNewRecent->File = theFile.detach();
     }
-    if(theToFront) {
+    if (theToFront) {
         myRecent.push_front(aNewRecent);
     } else {
         myRecent.push_back(aNewRecent);
@@ -927,13 +929,13 @@
 StString StPlayList::dumpRecentList() const {
     StMutexAuto anAutoLock(myMutex);
     StArgumentsMap aMap;
-    for(size_t anIter = 0; anIter < myRecent.size(); ++anIter) {
-        const StHandle<StRecentItem>&   aRecent = myRecentanIter;
-        const StHandle<StFileNode>&     aFile   = aRecent->File;
-        const StHandle<StStereoParams>& aParams = aRecent->Params;
-        if(!myPlsFile.isNull()
+    for (size_t anIter = 0; anIter < myRecent.size(); ++anIter) {
+        const std::shared_ptr<StRecentItem>&   aRecent = myRecentanIter;
+        const std::shared_ptr<StFileNode>&     aFile   = aRecent->File;
+        const std::shared_ptr<StStereoParams>& aParams = aRecent->Params;
+        if (myPlsFile.get() != nullptr
          && aFile == myPlsFile->File
-         && myCurrent != NULL) {
+         && myCurrent != nullptr) {
             StArgument anArgFile(StString("file")  + anIter, aFile->getPath());
             StArgument anArgPos (StString("pos")   + anIter, myCurrent->getPath());
             aMap.add(anArgFile);
@@ -952,7 +954,7 @@
             aMap.add(anArgLeft);
             aMap.add(anArgRight);
         }
-        if(!aParams.isNull()) {
+        if (aParams.get() != nullptr) {
             if(aParams->Timestamp > 360.0) {
                 std::stringstream aStream;
                 aStream.imbue(std::locale("C"));
@@ -977,27 +979,27 @@
         const StArgument anArgLeft  = aMapStString("left")  + anIter;
         const StArgument anArgRight = aMapStString("right") + anIter;
         const StArgument anArgTime  = aMapStString("time")  + anIter;
-        StHandle<StRecentItem> aRecent;
+        std::shared_ptr<StRecentItem> aRecent;
         if(anArgLeft.isValid() && anArgRight.isValid()) {
-            StHandle<StFileNode> aFileNode = new StFileNode(StString());
-            aFileNode->add(new StFileNode(anArgLeft.getValue(),  aFileNode.access()));
-            aFileNode->add(new StFileNode(anArgRight.getValue(), aFileNode.access()));
+            std::shared_ptr<StFileNode> aFileNode = std::make_shared<StFileNode>(StString());
+            aFileNode->add(new StFileNode(anArgLeft.getValue(),  aFileNode.get()));
+            aFileNode->add(new StFileNode(anArgRight.getValue(), aFileNode.get()));
             aRecent = addRecentFile(*aFileNode, false);
         } else if(anArgFile.isValid()) {
-            StHandle<StFileNode> aFileNode = new StFileNode(anArgFile.getValue());
+            std::shared_ptr<StFileNode> aFileNode = std::make_shared<StFileNode>(anArgFile.getValue());
             const StArgument anArgPos = aMapStString("pos") + anIter;
             if(anArgPos.isValid()) {
-                aFileNode->add(new StFileNode(anArgPos.getValue(), aFileNode.access()));
+                aFileNode->add(new StFileNode(anArgPos.getValue(), aFileNode.get()));
             }
             aRecent = addRecentFile(*aFileNode, false);
         }
-        if(aRecent.isNull()) {
+        if (aRecent.get() == nullptr) {
             continue;
         }
 
         if(anArgTime.isValid()) {
-            if(aRecent->Params.isNull()) {
-                aRecent->Params = new StStereoParams();
+            if (aRecent->Params.get() == nullptr) {
+                aRecent->Params = std::make_shared<StStereoParams>();
             }
             std::stringstream aStream;
             aStream.imbue(std::locale("C"));
@@ -1026,10 +1028,10 @@
     // check if it is recently played playlist
     bool hasTarget = !theItem.isEmpty();
     StString aTarget = hasTarget ? theItem : thePath;
-    if(!hasTarget) {
-        for(size_t anIter = 0; anIter < myRecent.size(); ++anIter) {
-            const StHandle<StRecentItem>& aRecent = myRecentanIter;
-            const StHandle<StFileNode>&   aFile   = aRecent->File;
+    if (!hasTarget) {
+        for (size_t anIter = 0; anIter < myRecent.size(); ++anIter) {
+            const std::shared_ptr<StRecentItem>& aRecent = myRecentanIter;
+            const std::shared_ptr<StFileNode>&   aFile   = aRecent->File;
             if(aFile->size() != 1) {
                 continue;
             }
@@ -1062,33 +1064,33 @@
         }
 
         // parse m3u playlist
-        if(anExt.isEqualsIgnoreCase(stCString("m3u"))
-        || anExt.isEqualsIgnoreCase(stCString("m3u8"))) {
-            StHandle<StRawFile> aRawFile = new StRawFile(thePath);
-            if(aRawFile->readFile()) {
+        if (anExt.isEqualsIgnoreCase(stCString("m3u"))
+         || anExt.isEqualsIgnoreCase(stCString("m3u8"))) {
+            std::shared_ptr<StRawFile> aRawFile = std::make_shared<StRawFile>(thePath);
+            if (aRawFile->readFile()) {
                 StFolder* aPlsFolder = new StFolder(aFolderPath, &myFoldersRoot);
                 myFoldersRoot.add(aPlsFolder);
 
                 StString aTitle;
-                for(char* anIter = skipBOM((char* )aRawFile->getBuffer()); anIter != NULL;) {
+                for (char* anIter = skipBOM((char* )aRawFile->getBuffer()); anIter != NULL;) {
                     anIter = parseM3UIter(anIter, aPlsFolder, aTitle);
                 }
-                aRawFile.nullify();
+                aRawFile.reset();
 
-                if(myFirst != nullptr
-                && myFirst->getNext() == nullptr) {
+                if (myFirst != nullptr
+                 && myFirst->getNext() == nullptr) {
                     const StString aFirstPath = myFirst->getPath();
                     StString anItemExt = StFileNode::getExtension(aFirstPath);
-                    if(anItemExt.isEqualsIgnoreCase(stCString("m3u"))
-                    || anItemExt.isEqualsIgnoreCase(stCString("m3u8"))) {
-                        aRawFile = new StRawFile(aFirstPath);
-                        if(aRawFile->readFile()) {
-                            for(char* anIter = skipBOM((char* )aRawFile->getBuffer()); anIter != NULL;) {
+                    if (anItemExt.isEqualsIgnoreCase(stCString("m3u"))
+                     || anItemExt.isEqualsIgnoreCase(stCString("m3u8"))) {
+                        aRawFile = std::make_shared<StRawFile>(aFirstPath);
+                        if (aRawFile->readFile()) {
+                            for (char* anIter = skipBOM((char* )aRawFile->getBuffer()); anIter != NULL;) {
                                 anIter = parseM3UIter(anIter, NULL, aTitle);
                             }
                             remove(aFirstPath, false);
                         }
-                        aRawFile.nullify();
+                        aRawFile.reset();
                     }
                 }
 
@@ -1136,12 +1138,12 @@
     addToPlayList(aSubFolder);
 
     myCurrent = myFirst;
-    if(hasTarget || !aFileName.isEmpty()) {
+    if (hasTarget || !aFileName.isEmpty()) {
         // set current item
-        for(StPlayItem* anItem = myFirst; anItem != NULL; anItem = anItem->getNext()) {
-            if(anItem->getPath() == aTarget) {
+        for (StPlayItem* anItem = myFirst; anItem != NULL; anItem = anItem->getNext()) {
+            if (anItem->getPath() == aTarget) {
                 myCurrent = anItem;
-                if(myPlsFile.isNull()) {
+                if (myPlsFile.get() == nullptr) {
                     addRecentFile(*anItem->getFileNode()); // append to recent files list
                 }
                 break;

_service:obs_scm:sview-26.obscpio/StShared/StProcess.cpp Changed

@@ -156,7 +156,7 @@
 }
 
 StString StProcess::getAbsolutePath(const StString& thePath) {
-    static const StCString ST_FILE_PROTOCOL = stCString("file://");
+    static constexpr StCString ST_FILE_PROTOCOL = stCString("file://");
 
     StString aPath;
     if(thePath.isStartsWith(ST_FILE_PROTOCOL)) {
@@ -202,14 +202,14 @@
 
 /** Verify location of shared resources by searching for a texture. */
 static bool isValidStSharePath(const StString& thePath) {
-    static const char TEST_TEXTURE = "textures/actionBack16.png";
+    static constexpr StCString TEST_TEXTURE = stCString("textures/actionBack16.png");
     return !thePath.isEmpty()
         && StFileNode::isFileExists(thePath + TEST_TEXTURE);
 }
 
 /** Find location of shared resources. */
 static StString initStShareFolder() {
-    static const StCString ST_ENV_NAME_STSHARE = stCString("StShare");
+    static constexpr StCString ST_ENV_NAME_STSHARE = stCString("StShare");
 
     StString aShareEnvValue = StProcess::getEnv(ST_ENV_NAME_STSHARE);
 #ifdef _WIN32
@@ -263,9 +263,9 @@
 
 StString StProcess::getStCoreFolder() {
 #if defined(_WIN64) || defined(_LP64) || defined(__LP64__)
-    static const StCString ST_ENV_NAME_STCORE_PATH = stCString("StCore64");
+    static constexpr StCString ST_ENV_NAME_STCORE_PATH = stCString("StCore64");
 #else
-    static const StCString ST_ENV_NAME_STCORE_PATH = stCString("StCore32");
+    static constexpr StCString ST_ENV_NAME_STCORE_PATH = stCString("StCore32");
 #endif
 
     StString aCoreEnvValue = getEnv(ST_ENV_NAME_STCORE_PATH);
@@ -294,16 +294,15 @@
     return StString();
 }
 
-bool StProcess::execProcessAny(const StString&          theExecutablePath,
-                               const StArray<StString>& theArguments,
-                               const bool               theIsAbsolute) {
+bool StProcess::execProcessAny(const StString& theExecutablePath,
+                               const std::vector<StString>& theArguments,
+                               const bool theIsAbsolute) {
     if (theIsAbsolute && !StFileNode::isFileExists(theExecutablePath)) {
         return false;
     }
 #ifdef _WIN32
     // convert to wide strings
     StStringUtfWide anExecutablePathW = theExecutablePath.toUtfWide();
-    StArrayList<StStringUtfWide> anArgumentsW(theArguments.size());
     StStringUtfWide aSplitter = ' ';
     StStringUtfWide aCmdLineW = StStringUtfWide('\"') + anExecutablePathW + StStringUtfWide("\" ");
     for(size_t anElem = 0;;) {
@@ -336,9 +335,9 @@
     char** anArgList = new char*theArguments.size() + 2;
     anArgList0 = (char* )theExecutablePath.toCString();
     for(size_t anArgId = 0; anArgId < theArguments.size(); ++anArgId) {
-        anArgListanArgId + 1 = (char* )theArguments.getValue(anArgId).toCString();
+        anArgListanArgId + 1 = (char* )theArgumentsanArgId.toCString();
     }
-    anArgListtheArguments.size() + 1 = NULL;
+    anArgListtheArguments.size() + 1 = nullptr;
 
     pid_t aChildPid = vfork();
     if(aChildPid == -1) {
@@ -414,8 +413,7 @@
     // http://portland.freedesktop.org/wiki/
     static const char ST_XDG_OPEN = "xdg-open"; // "/usr/bin/xdg-open"
 
-    StArrayList<StString> anArguments(1);
-    anArguments.add(theUrl);
+    std::vector<StString> anArguments = { theUrl };
     if(!StProcess::execProcessInPath(ST_XDG_OPEN, anArguments)) {
         ST_ERROR_LOG(ST_XDG_OPEN + " is not found!");
     }

_service:obs_scm:sview-26.obscpio/StShared/StProcess2.cpp Changed

@@ -15,38 +15,38 @@
 
 // we move this function to another object file
 // to optimize static linkage (avoid unnecessary dependencies)
-StArrayList<StString> StProcess::getArguments() {
-    StArrayList<StString> aList;
+std::vector<StString> StProcess::getArguments() {
+    std::vector<StString> aList;
 #if defined(_WIN32)
     int argc = 0;
     stUtfWide_t** argv = CommandLineToArgvW(GetCommandLineW(), &argc);
-    for(int aParamId = 0; aParamId < argc; ++aParamId) {
-        aList.add(StString(argvaParamId));
+    for (int aParamId = 0; aParamId < argc; ++aParamId) {
+        aList.push_back(StString(argvaParamId));
     }
     // free memory allocated for CommandLineToArgvW arguments.
     LocalFree(argv);
 #elif defined(__APPLE__)
-    if(_NSGetArgc() == NULL || _NSGetArgv() == NULL) {
+    if (_NSGetArgc() == nullptr || _NSGetArgv() == nullptr) {
         return aList; // is it possible?
     }
     int anArgsNb = *_NSGetArgc();
     char** anArgVec = *_NSGetArgv();
-    for(int aParamId = 0; aParamId < anArgsNb; ++aParamId) {
+    for (int aParamId = 0; aParamId < anArgsNb; ++aParamId) {
         // automatically convert filenames from decomposed form used by Mac OS X file systems
-        aList.add(stFromUtf8Mac(anArgVecaParamId));
+        aList.push_back(stFromUtf8Mac(anArgVecaParamId));
     }
 #elif (defined(__linux__) || defined(__linux))
     stUtf8_t aCmdlineInfoFile4096;
     stsprintf(aCmdlineInfoFile, 4096, "/proc/%d/cmdline", getpid());
     std::ifstream iFile;
     iFile.open(aCmdlineInfoFile);
-    if(iFile.is_open()) {
+    if (iFile.is_open()) {
         char aCmdlineInfoBuff4096;
-        while(!iFile.eof()) {
+        while (!iFile.eof()) {
             stMemSet(aCmdlineInfoBuff, 0, sizeof(aCmdlineInfoBuff));
             iFile.getline(aCmdlineInfoBuff, 4096, '\0');
-            if(aCmdlineInfoBuff0 != '\0') {
-                aList.add(StString(aCmdlineInfoBuff));
+            if (aCmdlineInfoBuff0 != '\0') {
+                aList.push_back(StString(aCmdlineInfoBuff));
             }
         }
         iFile.close();

_service:obs_scm:sview-26.obscpio/StShared/StResourceManager.cpp Changed

@@ -277,32 +277,32 @@
     return false;
 }
 
-StHandle<StResource> StResourceManager::getResource(const StString& theName) const {
+std::shared_ptr<StResource> StResourceManager::getResource(const StString& theName) const {
     const StString aPath = myResFolder + theName;
-    if(StFileNode::isFileExists(aPath)) {
-        return new StFileResource(theName, aPath);
+    if (StFileNode::isFileExists(aPath)) {
+        return std::make_shared<StFileResource>(theName, aPath);
     }
 #if defined(__ANDROID__)
     if(myAssetMgr != NULL) {
         AAsset* anAsset = AAssetManager_open(myAssetMgr, aPath.toCString(), AASSET_MODE_UNKNOWN);
-        if(anAsset != NULL) {
-            return new StAssetResource(theName, aPath, anAsset);
+        if (anAsset != nullptr) {
+            return std::make_shared<StAssetResource>(theName, aPath, anAsset);
         }
     }
 #endif
-    return StHandle<StResource>();
+    return std::shared_ptr<StResource>();
 }
 
 void StResourceManager::listSubFolders(const StString&        theFolder,
-                                       StArrayList<StString>& theSubFolders) const {
+                                       std::vector<StString>& theSubFolders) const {
     const StString aPath = myResFolder + theFolder;
     StFolder aFileDir(aPath);
-    StArrayList<StString> anExtensions(1);
+    std::vector<StString> anExtensions;
     aFileDir.init(anExtensions, 1, true);
     for(size_t aNodeId = 0; aNodeId < aFileDir.size(); ++aNodeId) {
         const StFileNode* aFileNode = aFileDir.getValue(aNodeId);
         if(aFileNode->isFolder()) {
-            theSubFolders.add(aFileNode->getSubPath());
+            theSubFolders.push_back(aFileNode->getSubPath());
         }
     }
     if(aFileDir.size() != 0) {

_service:obs_scm:sview-26.obscpio/StShared/StSettings/StConfigImpl.cpp Changed

_service:obs_scm:sview-26.obscpio/StShared/StSettings/StPListImpl.mm Changed

_service:obs_scm:sview-26.obscpio/StShared/StSettings/StRegisterImpl.cpp Changed

_service:obs_scm:sview-26.obscpio/StShared/StSettings/StTranslations.cpp Changed

@@ -12,16 +12,16 @@
 #include <StFile/StRawFile.h>
 #include <StThreads/StProcess.h>
 
+#include <algorithm>
+
 namespace {
-    static const char ST_GLOBAL_SETTINGS_GROUP = "sview";
-    static const char ST_SETTING_LANGUAGE      = "language";
+    static constexpr char ST_GLOBAL_SETTINGS_GROUP = "sview";
+    static constexpr char ST_SETTING_LANGUAGE      = "language";
+    static constexpr StCString ST_LNG_FILE_SUFFIX    = stCString(".lng");
 }
 
-const StString StTranslations::DEFAULT_EXTENSION =  "lng";
-const StString StTranslations::DEFAULT_SUFFIX    = ".lng";
-
-StTranslations::StTranslations(const StHandle<StResourceManager>& theResMgr,
-                               const StString&                    theModuleName)
+StTranslations::StTranslations(const std::shared_ptr<StResourceManager>& theResMgr,
+                               const StString& theModuleName)
 : myResMgr(theResMgr),
   myModuleName(theModuleName),
   myWasReloaded(false) {
@@ -33,126 +33,135 @@
     params.language->changeValues().clear();
 
     // detect available translations
-    StArrayList<StString> aFolders;
+    std::vector<StString> aFolders;
     myResMgr->listSubFolders("lang", aFolders);
     for(size_t aNodeId = 0; aNodeId < aFolders.size(); ++aNodeId) {
-        myLangFolderList.add(aFoldersaNodeId);
+        myLangFolderList.push_back(aFoldersaNodeId);
 
         const StString aNameFile = StString("lang" ST_FILE_SPLITTER) + aFoldersaNodeId + ST_FILE_SPLITTER "language.lng";
-        StHandle<StResource> aRes = myResMgr->getResource(aNameFile);
+        std::shared_ptr<StResource> aRes = myResMgr->getResource(aNameFile);
         StString aName;
-        if(!aRes.isNull()
-        &&  aRes->read()) {
+        if (aRes.get() != nullptr && aRes->read()) {
             const char*  aSrc = (const char* )aRes->getData();
             const size_t aLen = (size_t      )aRes->getSize();
             aName = StString(aSrc, aLen);
         }
-        params.language->changeValues().add(aName.isEmpty() ? aFoldersaNodeId : aName);
+        params.language->changeValues().push_back(aName.isEmpty() ? aFoldersaNodeId : aName);
     }
+
 #if defined(__ANDROID__)
-    if(params.language->getValues().isEmpty()) {
+    if (params.language->getValues().empty()) {
         // no way to list sub-folder on Android - check known translations
-        if(myResMgr->isResourceExist(StString("lang" ST_FILE_SPLITTER "English" ST_FILE_SPLITTER) + myModuleName + StTranslations::DEFAULT_SUFFIX)) {
-            params.language->changeValues().add("English");
-            myLangFolderList.add("English");
+        if (myResMgr->isResourceExist(StString("lang" ST_FILE_SPLITTER "English" ST_FILE_SPLITTER) + myModuleName + ST_LNG_FILE_SUFFIX)) {
+            params.language->changeValues().push_back("English");
+            myLangFolderList.push_back("English");
         }
-        if(myResMgr->isResourceExist(StString("lang" ST_FILE_SPLITTER "Spanish" ST_FILE_SPLITTER) + myModuleName + StTranslations::DEFAULT_SUFFIX)) {
-            params.language->changeValues().add("Español");
-            myLangFolderList.add("Spanish");
+        if (myResMgr->isResourceExist(StString("lang" ST_FILE_SPLITTER "Spanish" ST_FILE_SPLITTER) + myModuleName + ST_LNG_FILE_SUFFIX)) {
+            params.language->changeValues().push_back("Español");
+            myLangFolderList.push_back("Spanish");
         }
-        if(myResMgr->isResourceExist(StString("lang" ST_FILE_SPLITTER "Russian" ST_FILE_SPLITTER) + myModuleName + StTranslations::DEFAULT_SUFFIX)) {
-            params.language->changeValues().add("русский");
-            myLangFolderList.add("Russian");
+        if (myResMgr->isResourceExist(StString("lang" ST_FILE_SPLITTER "Russian" ST_FILE_SPLITTER) + myModuleName + ST_LNG_FILE_SUFFIX)) {
+            params.language->changeValues().push_back("русский");
+            myLangFolderList.push_back("Russian");
         }
-        if(myResMgr->isResourceExist(StString("lang" ST_FILE_SPLITTER "French" ST_FILE_SPLITTER) + myModuleName + StTranslations::DEFAULT_SUFFIX)) {
-            params.language->changeValues().add("français");
-            myLangFolderList.add("French");
+        if (myResMgr->isResourceExist(StString("lang" ST_FILE_SPLITTER "French" ST_FILE_SPLITTER) + myModuleName + ST_LNG_FILE_SUFFIX)) {
+            params.language->changeValues().push_back("français");
+            myLangFolderList.push_back("French");
         }
-        if(myResMgr->isResourceExist(StString("lang" ST_FILE_SPLITTER "German" ST_FILE_SPLITTER) + myModuleName + StTranslations::DEFAULT_SUFFIX)) {
-            params.language->changeValues().add("Deutsch");
-            myLangFolderList.add("German");
+        if (myResMgr->isResourceExist(StString("lang" ST_FILE_SPLITTER "German" ST_FILE_SPLITTER) + myModuleName + ST_LNG_FILE_SUFFIX)) {
+            params.language->changeValues().push_back("Deutsch");
+            myLangFolderList.push_back("German");
         }
-        if(myResMgr->isResourceExist(StString("lang" ST_FILE_SPLITTER "Korean" ST_FILE_SPLITTER) + myModuleName + StTranslations::DEFAULT_SUFFIX)) {
-            params.language->changeValues().add("한국어");
-            myLangFolderList.add("Korean");
+        if (myResMgr->isResourceExist(StString("lang" ST_FILE_SPLITTER "Korean" ST_FILE_SPLITTER) + myModuleName + ST_LNG_FILE_SUFFIX)) {
+            params.language->changeValues().push_back("한국어");
+            myLangFolderList.push_back("Korean");
         }
-        if(myResMgr->isResourceExist(StString("lang" ST_FILE_SPLITTER "ChineseS" ST_FILE_SPLITTER) + myModuleName + StTranslations::DEFAULT_SUFFIX)) {
-            params.language->changeValues().add("简体中文");
-            myLangFolderList.add("ChineseS");
+        if (myResMgr->isResourceExist(StString("lang" ST_FILE_SPLITTER "ChineseS" ST_FILE_SPLITTER) + myModuleName + ST_LNG_FILE_SUFFIX)) {
+            params.language->changeValues().push_back("简体中文");
+            myLangFolderList.push_back("ChineseS");
         }
-        if(myResMgr->isResourceExist(StString("lang" ST_FILE_SPLITTER "ChineseT" ST_FILE_SPLITTER) + myModuleName + StTranslations::DEFAULT_SUFFIX)) {
-            params.language->changeValues().add("正體中文 (臺灣)");
-            myLangFolderList.add("ChineseT");
+        if (myResMgr->isResourceExist(StString("lang" ST_FILE_SPLITTER "ChineseT" ST_FILE_SPLITTER) + myModuleName + ST_LNG_FILE_SUFFIX)) {
+            params.language->changeValues().push_back("正體中文 (臺灣)");
+            myLangFolderList.push_back("ChineseT");
         }
-        if(myResMgr->isResourceExist(StString("lang" ST_FILE_SPLITTER "Czech"  ST_FILE_SPLITTER) + myModuleName + StTranslations::DEFAULT_SUFFIX)) {
-            params.language->changeValues().add("Čeština");
-            myLangFolderList.add("Czech");
+        if (myResMgr->isResourceExist(StString("lang" ST_FILE_SPLITTER "Czech"  ST_FILE_SPLITTER) + myModuleName + ST_LNG_FILE_SUFFIX)) {
+            params.language->changeValues().push_back("Čeština");
+            myLangFolderList.push_back("Czech");
         }
     }
 #endif
 
-    if(params.language->getValues().isEmpty()) {
+    if (params.language->getValues().empty()) {
         // add built-in language
-        params.language->changeValues().add("English");
-        myLangFolderList.add("English");
+        params.language->changeValues().push_back("English");
+        myLangFolderList.push_back("English");
     }
 
+    const auto isInLangFolderList = this(const StString& theLang, size_t& theIndex) -> bool {
+        const auto aPosInList = std::find(myLangFolderList.begin(), myLangFolderList.end(), theLang);
+        if (aPosInList == myLangFolderList.end()) {
+            return false;
+        }
+        theIndex = aPosInList - myLangFolderList.begin();
+        return true;
+    };
+
     size_t     anIdInList = 0;
     StString   aLangParam("English");
     StSettings aGlobalSettings(myResMgr, ST_GLOBAL_SETTINGS_GROUP);
     bool isLangSet = false;
-    if(!aGlobalSettings.loadString(ST_SETTING_LANGUAGE, aLangParam)) {
+    if (!aGlobalSettings.loadString(ST_SETTING_LANGUAGE, aLangParam)) {
         // try to use system-wide language settings
         const StString& aLang = myResMgr->getSystemLanguage();
-        if(aLang.isEqualsIgnoreCase(stCString("ru"))) {
-            if(myLangFolderList.contains(stCString("Russian"),  anIdInList)
-            || myLangFolderList.contains(stCString("русский"),  anIdInList)) {
+        if (aLang.isEqualsIgnoreCase(stCString("ru"))) {
+            if (isInLangFolderList(stCString("Russian"),  anIdInList)
+             || isInLangFolderList(stCString("русский"),  anIdInList)) {
                 params.language->setValue(int32_t(anIdInList));
                 isLangSet = true;
             }
-        } else if(aLang.isEqualsIgnoreCase(stCString("de"))) {
-            if(myLangFolderList.contains(stCString("German"),   anIdInList)
-            || myLangFolderList.contains(stCString("Deutsch"),  anIdInList)) {
+        } else if (aLang.isEqualsIgnoreCase(stCString("de"))) {
+            if (isInLangFolderList(stCString("German"),   anIdInList)
+             || isInLangFolderList(stCString("Deutsch"),  anIdInList)) {
                 params.language->setValue(int32_t(anIdInList));
                 isLangSet = true;
             }
-        } else if(aLang.isEqualsIgnoreCase(stCString("es"))) {
-            if(myLangFolderList.contains(stCString("Spanish"), anIdInList)
-            || myLangFolderList.contains(stCString("Español"), anIdInList)) {
+        } else if (aLang.isEqualsIgnoreCase(stCString("es"))) {
+            if (isInLangFolderList(stCString("Spanish"), anIdInList)
+             || isInLangFolderList(stCString("Español"), anIdInList)) {
                 params.language->setValue(int32_t(anIdInList));
                 isLangSet = true;
             }
-        } else if(aLang.isEqualsIgnoreCase(stCString("fr"))) {
-            if(myLangFolderList.contains(stCString("French"),   anIdInList)
-            || myLangFolderList.contains(stCString("français"), anIdInList)) {
+        } else if (aLang.isEqualsIgnoreCase(stCString("fr"))) {
+            if (isInLangFolderList(stCString("French"),   anIdInList)
+             || isInLangFolderList(stCString("français"), anIdInList)) {
                 params.language->setValue(int32_t(anIdInList));
                 isLangSet = true;
             }
-        } else if(aLang.isEqualsIgnoreCase(stCString("ko"))) {
-            if(myLangFolderList.contains(stCString("Korean"),   anIdInList)) {
+        } else if (aLang.isEqualsIgnoreCase(stCString("ko"))) {
+            if (isInLangFolderList(stCString("Korean"),   anIdInList)) {
                 params.language->setValue(int32_t(anIdInList));
                 isLangSet = true;
             }
-        } else if(aLang.isEqualsIgnoreCase(stCString("zh"))) {
-            if(myLangFolderList.contains(stCString("ChineseS"), anIdInList)) {
+        } else if (aLang.isEqualsIgnoreCase(stCString("zh"))) {
+            if (isInLangFolderList(stCString("ChineseS"), anIdInList)) {
                 params.language->setValue(int32_t(anIdInList));
                 isLangSet = true;
             }
-        } else if(aLang.isEqualsIgnoreCase(stCString("zh-tw"))) {
-            if(myLangFolderList.contains(stCString("ChineseT"), anIdInList)) {
+        } else if (aLang.isEqualsIgnoreCase(stCString("zh-tw"))) {
+            if (isInLangFolderList(stCString("ChineseT"), anIdInList)) {
                 params.language->setValue(int32_t(anIdInList));
                 isLangSet = true;
             }
-        } else if(aLang.isEqualsIgnoreCase(stCString("cs"))) {
-            if(myLangFolderList.contains(stCString("Čeština"), anIdInList)) {
+        } else if (aLang.isEqualsIgnoreCase(stCString("cs"))) {
+            if (isInLangFolderList(stCString("Čeština"), anIdInList)) {
                 params.language->setValue(int32_t(anIdInList));
                 isLangSet = true;
             }
         }
     }
-    if(!isLangSet) {
-        if(myLangFolderList.contains(aLangParam,           anIdInList)
-        || myLangFolderList.contains(stCString("English"), anIdInList)) {
+    if (!isLangSet) {
+        if (isInLangFolderList(aLangParam,           anIdInList)
+         || isInLangFolderList(stCString("English"), anIdInList)) {
             params.language->setValue(int32_t(anIdInList));
         }
     }
@@ -162,10 +171,9 @@
     const StString  aResName    = StString()
                                 + "lang"       + SYS_FS_SPLITTER
                                 + aFolderName  + SYS_FS_SPLITTER
-                                + myModuleName + StTranslations::DEFAULT_SUFFIX;
-    StHandle<StResource> aRes = myResMgr->getResource(aResName);
-    if(!aRes.isNull()
-    &&  aRes->read()) {
+                                + myModuleName + ST_LNG_FILE_SUFFIX;
+    std::shared_ptr<StResource> aRes = myResMgr->getResource(aResName);
+    if (aRes.get() != nullptr && aRes->read()) {
         const char* aSrc = (const char* )aRes->getData();
         const int   aLen = aRes->getSize();
         read(aSrc, aLen);
@@ -226,10 +234,9 @@
     const StString aResName = StString()
                             + "lang" ST_FILE_SPLITTER
                             + aFolderName  + SYS_FS_SPLITTER
-                            + myModuleName + StTranslations::DEFAULT_SUFFIX;
-    StHandle<StResource> aRes = myResMgr->getResource(aResName);
-    if(!aRes.isNull()
-    &&  aRes->read()) {
+                            + myModuleName + ST_LNG_FILE_SUFFIX;
+    std::shared_ptr<StResource> aRes = myResMgr->getResource(aResName);
+    if (aRes.get() != nullptr && aRes->read()) {
         const char* aSrc = (const char* )aRes->getData();
         const int   aLen = aRes->getSize();
         read(aSrc, aLen);

_service:obs_scm:sview-26.obscpio/StTests/StTestEmbed.cpp Changed

_service:obs_scm:sview-26.obscpio/StTests/main.cpp Changed

_service:obs_scm:sview-26.obscpio/StTests/main.mm Changed

_service:obs_scm:sview-26.obscpio/docs/faq.md Added

@@ -0,0 +1,109 @@
+sView - Frequently Asked Questions
+==================================
+
+This article contains answers for most frequently asked questions and troubleshooting.
+
+## <a name="src_auto">Why source format auto-detection doesn't work?</a>
+Because there is no way to automatically determine stereoscopic source format of arbitrary video if it does not contain extra marks.
+In general auto-detection will work for files with two video streams, for *MKV* container with stereo flags or special metadata tags.
+Unfortunately, these tags are still ignored by most content publishers.
+
+If you are confused by stereo format options, please refer to this article(stereoformats.md)
+
+## <a name="codecs">Which video codecs sView supports?</a>
+sView uses *FFmpeg* for audio/video decoding.
+Please refer to FFmpeg documentation(https://ffmpeg.org/general.html) for complete information
+(actual list of enabled decoders and formats also depends on building options).
+
+## <a name="iptv">Does sView support IPTV?</a>
+Yes. Although there are no way to open video *URL* within graphical interface, you can open *M3U* file with channels list
+(usually provided in such cases) or open *URL* directly from command prompt (`sView --in=video http://iptv:8030`).
+
+## <a name="gpu">Is video playback accelerated by GPU?</a>
+Yes and no. Scaling, color conversion (for most popular pixel formats) and color correction are performed on GPU using GLSL programs.
+
+However sView doesn't use video decoding APIs like *DXVA*, *VDPAU* or any other.
+The main reason is that such APIs do not fit well into existing video decoding/playback pipeline, requiring significant redesign.
+With other issues like non-guarantied image quality, strict limitations on video codecs and dimensions,
+and the fact that most modern CPUs are fast enough to decode most popular video formats - there no reason to make these efforts for decoding on GPU (save the low-end PCs).
+
+## <a name="amd_white_screen">I see white window on the screen</a>
+Most likely you have experienced an old issue in AMD Catalyst drivers for Windows 7,
+when only full-screen stereo output worked properly.
+Please update your GPU drivers to solve this problem (it is known that at least *12.6*-*12.10* releases had this problem and *13.4* not).
+If driver update is not option for you, switch off pageflip stereo output using `sView`->`Extras`->`Failsafe` option in start menu.
+
+## <a name="amd_diag">I see diagonal artifacts in full-screen mode</a>
+This problem has been experienced within several AMD Catalyst driver releases.
+Please try to update your GPU drivers.
+
+## <a name="win7_aero">Why Windows 7 Aero is turned off each time I start sView?</a>
+There are two known reasons why drivers decide to switch off Aero interface.
+First of all Aero interface is incompatible with arbitrary technologies like 30-bit color and OpenGL Quad Buffer support (used for shutter glasses).
+You might temporary switch to another stereo output mode to watch non-stereoscopic videos / images with Aero on.
+
+Another reason might be a lack of GPU memory.
+Aero interface itself requires significant amount of memory and driver might decide release these resources in favor of 3D application has been launched by user.
+This is not an issue for modern hardware equipped with gigabytes of dedicated GPU memory,
+but might be an issue for old ones with less than 256 MiB memory.
+Notice that most drivers also switch off Aero when any 3D application goes into full-screen mode regardless of amount of on-board GPU memory.
+
+## <a name="qb_type">I'm using shutter glasses. Which Quad Buffer type should I select?</a>
+In general OpenGL Hardware is most preferable option for you.
+Direct3D and OpenGL Software emulated pageflip should be used only when OpenGL Hardware Quad Buffer is unavailable on your system.
+
+## <a name="soft_pageflip">Why Software Pageflip doesn't work?</a>
+sView provides software emulated pageflip mode for shutter glasses support since it first public prototype.
+Adapted application architecture, advanced techniques and special tricks have been implemented to make this functionality as stable as possible.
+Unfortunately, all these efforts fall down on most modern systems due to many reasons.
+To eliminate negative user experience, this mode is hidden by default under "Show extra options" in new sView releases.
+
+This feature is unable to provide 100% stability for shutter glasses to work properly due to NO any hardware feedback used in this case.
+Also you will need activate/deactivate glasses controller yourself (if manufacture provides that 'button' at all).
+Without synchronization views can be randomly reversed during stereo viewing. Some recommendations to software pageflip users:
+
+- Try to disable composition manager (*Aero* on *Windows Vista* / *Windows 7*).
+- Close any other application before starting sView (especially 3D applications).
+- It was noted that most problems happen during intensive I/O (file operations in background).
+- Software emulation needs as less interfering factors as possible.
+  If your hardware is slow you may try to reduce monitor resolution and/or frequency.
+  Heavy images and videos will load your system stronger.
+- Software emulation uses vertical sync feature provided by OpenGL driver.
+  This means if your driver vendor provide bad implementation of this functionality image may be corrupted (sometimes in particular parts of the screen)!
+- On multi-monitor systems drivers might lock vertical sync to wrong monitor (not for shutter glasses) especially if monitors use different vertical frequency.
+  Software emulation will not work at all in this case. Try to disconnect some monitors or to update the drivers.
+
+## <a name="audio">How can I configure multichannel playback?</a>
+OpenAL soft supports surround playback.
+However it may be disabled by default (especially on Windows Vista+).
+You may need to configure OpenAL soft yourself.
+In sView installer for Windows option *"OpenAL soft - force 5.1 channel output"* can be used to turn on surround layout.
+You need to play multichannel audio in player to these all settings take effect.
+
+## <a name="settings">Where sView stores it's settings?</a>
+On the Windows settings are stored in system registry at path `"HKEY_CURRENT_USER\SOFTWARE\sView\"`.
+Each subpath represents modules in sView and `"sView"` is reserved for global settings (language, stereo output, etc.).
+
+*macOS* stores application settings in *XML* format at `"~/Library/Preferences/sview/"` directory.
+
+On other systems (e.g. *Linux*) sView uses `libconfig+` library and stores all settings at `"~/.config/sview/"`.
+
+## <a name="hidpi">What is HiDPI / DPI aware?</a>
+DPI is a pixels density metric, which describes how many pixels used to construct image on the screen within specified area.
+Higher density naturally improves image quality and eliminate discrete artifacts like aliasing.
+
+For a long time traditional displays have not improved this characteristic and made aliasing artifacts
+and anti-aliasing options (*SSAA*, *MSAA*, *FXAA*) become well-known even for people far away from technical details.
+
+Nowadays 4K displays with traditional dimensions for desktop monitors (up to 27") break through this long time situation providing almost twice higher pixel density (HiDPI).
+However being sticked to low-dpi for a long time, operating systems and applications have not been ready for this change.
+
+In fact, most application developed in the last decade were designed for fixed pixels density in every aspect - icons and bitmaps of fixed size, font sizes, element alignment and so on.
+Such applications being launched on HiDPI displays look just too small and unusable.
+This problem has been managed by different operating systems in different manner:
+
+- *Mac OS X 17* introduced support for Apple's Retina displays.
+  Applications receive virtual resolution of real display (e.g. lower than it actually as!).
+- *Windows 8.1* introduced support for HiDPI displays and combination of such displays within LowDPI displays.
+- *Linux* has incomplete HiDPI support but some progress has been done in Gnome and Wayland projects.
+  For *Xlib* backend *Gnome* supports only single scale factor for all monitors.

_service:obs_scm:sview-26.obscpio/docs/images Added

_service:obs_scm:sview-26.obscpio/docs/images/boxAnaglyph.png Added

_service:obs_scm:sview-26.obscpio/docs/images/boxAnaglyphBig.png Added

_service:obs_scm:sview-26.obscpio/docs/images/boxInterlaced.png Added

_service:obs_scm:sview-26.obscpio/docs/images/boxInterlacedBig.png Added

_service:obs_scm:sview-26.obscpio/docs/images/boxOverUnder.png Added

_service:obs_scm:sview-26.obscpio/docs/images/boxOverUnderBig.png Added

_service:obs_scm:sview-26.obscpio/docs/images/boxSideBySide.png Added

_service:obs_scm:sview-26.obscpio/docs/images/boxSideBySide.pns Added

_service:obs_scm:sview-26.obscpio/docs/images/colba.png Added

_service:obs_scm:sview-26.obscpio/docs/stereoformats.md Added

@@ -0,0 +1,107 @@
+Stereoscopic Formats
+====================
+
+Stereoscopic pair consist of two slightly different images of the same size captured from for left and right eyes (e.g. from two camera positions).
+This pair can be stored in various ways in the file:
+
+- *Mono* - no stereoscopic information, only single view is provided;
+- *Dual Stream* - each view is stored in independent stream or file;
+- *Cross-eyed*, *Parallel pair* - two images packed horizontally, also known as Side-by-Side;
+- *Over/Under* - two images packed vertically, also known as Top-Bottom;
+- (Obsolete) *Interlaced* - row interleaved;
+- (Obsolete) *Anaglyph* - image stored for glasses with color filters;
+- (Obsolete) *Frame-sequential* - views (frames) interleaved in time (first frame Left view, second frame Right view and so on);
+- (Obsolete) 2x720p in 1080p tiled - special layout used by some TV broadcasters in Europe some time ago.
+
+Program will be able to show image properly only when stereoscopic format has been properly selected.
+sView is able to determine stereoscopic format using:
+
+- Multiple streams (`*.mpo`, `*.mkv`, `*.wmv`).
+  Two image / video streams of the same size are automatically detected as stereoscopic pair with Left view in the first stream.
+- *JPEG* image containing `JPS` marker (VRex extension(https://paulbourke.net/stereoscopy/stereoimage/)).
+  *JPS* marker defines stereoscopic format.
+- *PNG* image containing `sTER` chunk (Extensions to the PNG(http://www.libpng.org/pub/png/spec/register/pngext-1.4.0-pdg.html)).
+  Only parallel pair with views order can be defined by `sTER` indicator.
+- *WMV* metadata (`*.wmv`).
+  The following metadata fields will be interpreted by sView:
+  - `StereoscopicLayout` defining one of layouts (`SideBySideRF`, `SideBySideLF`, `OverUnderLT`, `OverUnderRT`)
+  - `StereoscopicHalfHeight` and `StereoscopicHalfWidth` defining anamorphic video
+  - `StereoscopicHorizontalParallax` defining parallax in pixels
+- *MKV* metadata (`*.mkv`, `*.mkv3d`).
+  Matroska specification(https://www.matroska.org/technical/specs/index.html) includes dedicated fields defining stereoscopic layout (`StereoMode`).
+  FFmpeg library converts this data in form of stream metadata with name `STEREO_MODE`
+  (with values `mono`, `right_left`, `left_right`, `bottom_top`, `top_bottom`,
+   `row_interleaved_rl`, `row_interleaved_lr`, `block_lr`, `block_rl`, `anaglyph_cyan_red`, `anaglyph_green_magenta`).
+  Note that detection code in sView is generalized and specified metadata tags will be read from any video file (not only *.mkv).
+- *h264 SEI* messages (per frame side data, `*.mp4`, `*.mkv`).
+  Some codecs stores stereoscopic identification data at every frame.
+  This technically allows to switch from mono to stereo3d within the same stream.
+  *FFmpeg* provides this information in form of `AVStereo3D` structure - thus sView will be able to read this information
+  for all decoders in FFmpeg supporting this feature.
+- File extension (`*.pns`, `*.jps`).
+  Image files with extensions `*.pns` (*PNG* file) and `*.jps` (*JPEG* file) will be interpreted
+  as stereoscopic pair in Side-by-side format with Right view first (cross-eyed).
+- File name. sView supports the following name convention for stereoscopic format identification:
+  - `half-ou`, `-hou`, `-abq` define anamorphic Over/Under pair
+  - `half-sbs`, `-hsbs`, `-lrq`, `-rlq` define anamorphic Side-by-side pair
+  - `-ba`, `-ab` define Over/Under pair
+  - `-sbs`, `-lr`, `-rl` define Side-by-side pair
+
+*Anamorphic* stereo pair with Side-by-side and Over/Under layout is a special format introduced
+for compatibility with build-in TV players and existing hardware players without *HDMI 1.4a+* support.
+Video stored in this format has broken pixel proportions - it identifies itself as normal *16:9* video with *1080p HD* resolution (*1920x1080*).
+Both are important - old hardware players have been unable to decode videos of greater side, and *16:9* proportions
+allow transferring video image through HDMI without extra scaling or cropping which should be normally applied.
+So in general this format has been created as a temporary hack entrenched for much longer time than expected...
+
+<br/>
+
+Normally files should contain appropriate stereoscopic metadata to be properly displayed by players without user involvement.
+Unfortunately, many files still created without this information requiring manual configuration by user.
+
+If your file has been opened wrong you should try to change "source stereo format".
+In most cases this is just layout which defines how left and right views are stored in *single* frame.
+At first step you should select "Mono" format to see the original frame.
+
+<table cellpadding='1' cellspacing='1' width='100%'>
+<tr>
+<td width='20%'><a href='/docs/images/boxSideBySide.png'><img src='/docs/images/boxSideBySide.png' width='125' height='164' border='0' /></a></td>
+<td>
+<h2 class='indent'>Side-by-side</h2>
+<p>Left-eye and right-eye views are stored as a whole horizontally.
+Since views order is not standardized you should try both "Cross-eyed" (Right view at left side, Left view at right side) and "Parallel Pair".
+If image looks correctly but you experience discomfort - you have probably chosen wrong views order.
+Notice that images with extensions "JPS" (JPEG stereo) and "PNS" (PNG stereo) are expected in "Cross-eyed" order whilst movies and other images might be stored in any order.</p>
+</td>
+</tr>
+
+<tr>
+<td width='20%'><a href='/docs/images/boxOverUnderBig.png'><img src='/docs/images/boxOverUnder.png' width='125' height='164' border='0' /></a></td>
+<td>
+<h2 class='indent'>Over/Under</h2>
+<p>Left-eye and right-eye views are stored as wholes and placed vertically.
+If image looks correctly but you experience discomfort - you have probably chosen wrong views order.
+This format is commonly used in videos.</p>
+</td>
+</tr>
+
+<tr>
+<td width='20%'><a href='/docs/images/boxInterlacedBig.png'><img src='/docs/images/boxInterlaced.png' width='125' height='164' border='0' /></a></td>
+<td>
+<h2 class='indent'>Interlaced</h2>
+<p>In this format left and right views are interlaced line by line: each line correspond to each view vertically <i>in turn</i>.
+In expressive stereo-volume, this picture in the source (means played not in stereo-viewer) seen like with "noise".</p>
+</td>
+</tr>
+
+<tr>
+<td width='20%'><a href='/docs/images/boxAnaglyphBig.png'><img src='/docs/images/boxAnaglyph.png' width='125' height='164' border='0' /></a></td>
+<td>
+<h2 class='indent'>Anaglyph</h2>
+<p>This format comes specially for viewing devices - color glasses.
+Views are stored in MIX (meaning each pixel stores both views), separation provided by color filters in glasses (most used and most old - red-blue filters).
+This format is easy-to-recognize by color noise. Unfortunately, materials stored in this format are unusable by most devices (not color-glasses) due to serious color losses.</p>
+</td>
+</tr>
+
+</table>

_service:obs_scm:sview-26.obscpio/docs/usertips.md Added

@@ -0,0 +1,148 @@
+sView - User Manual
+===================
+
+sView combines functionality of Media Player and Image Viewer.
+Being designed for 3D stereoscopic playback, it provides many features unusual to traditional players and viewers.
+This short manual describes key features.
+If you have questions you might find answers in sView FAQ(faq.md).
+
+## <a name="mouse">Mouse actions</a>
+Many actions can be performed with the mouse. Besides main menu and tool-bar icons, there are some more useful tricks:
+
+- File **Drag & Drop**. You can drag file from your file explorer and move it onto the opened sView window, and file will be opened immediately.
+  Make sure you move image to Image Viewer and video file to Movie Player since them have own list of supported formats!
+- **Zooming**. You can scale the image using scrolling wheel on your mouse (or scrolling gestures on your touch-pad). Cursor position defines center of zoom.
+- **Panning**. Hold left mouse button, move image where you want, release the button.
+- **Fullscreen / Windowed**. Press middle button on your mouse. This action can be also performed with keyboard keys 'Enter' and 'F'.
+
+## <a name="short_keys">View short-keys</a>
+All hotkeys can be re-assigned within application settings.
+Following settings are defined individually for each file in playlist:
+
+- **Backspace** - reset view settings (**Delete** on Macbook).
+- **W** - swap Left/Right (will be applied during export!).
+- **F** or **Enter** - switch Fullscreen/Windowed.
+- **P** - turn on/off panorama image view.
+- **+** or **Numpad +** - zoom in.
+- **-** or **Numpad -** - zoom out.
+- **Left** - walk left (Image Viewer), seek backward (Movie Player).
+- **Right** - walk right (Image Viewer), seek forward (Movie Player).
+- **Up** - walk up (only Image Viewer).
+- **Down** - walk down (only Image Viewer).
+- **** - rotate image 90&deg; *counterclockwise*.
+- **** - rotate image 90&deg; *clockwise*.
+- **Ctrl** + **** - rotate image *counterclockwise* (smooth).
+- **Ctrl** + **** - rotate image *clockwise* (smooth).
+
+## <a name="file_navigation">File navigation keys</a>
+sView does not function like media-library automatically filled in from entire filesystem.
+Instead, sView provides playlist implicitly filled in with active folder content - the folder containing opened file
+(or folder content within sub-folders when opening folder).
+It is also possible to open existing .m3u playlist.
+
+The following keys can be used for fast navigation (in addition to buttons on toolbars):
+
+- **Esc** - close the program.
+- **Ctrl** + **O** - open new file.
+- **Ctrl** + **S** - save snapshot.
+- **Shift** + **delete** - physically delete current file without recycle bin (**Fn** + **Shift** + **Delete** on Macbook).
+- **Home** - open first item in playlist (or within current folder).
+- **Page Up** - open previous item in playlist (or within current folder).
+- **Page Down** - open next item in playlist (or within current folder).
+- **End** - open last item in playlist (or within current folder).
+- **Space** - start/stop slideshow in Image Viewer, play/pause in Movie Player.
+- **T** - select next subTitles stream (or **U**).
+- **L** - select next audio (Language) stream (or **H**).
+- **Ctrl** + **L** - show/hide playlist in Movie Player.
+
+## <a name="img_keys">Image adjustment keys</a>
+Following settings will be applied to all files:
+
+- **Shift** + **G** - increase Gamma correction coefficient.
+- **Ctrl** + **G** - decrease Gamma correction coefficient.
+- **Shift** + **B** - increase Brightness.
+- **Ctrl** + **B** - decrease Brightness.
+- **Shift** + **T** - increase Saturation (colorify).
+- **Ctrl** + **T** - decrease Saturation (grayscale).
+
+## Source stereo format short-keys
+Source stereo format is applied to all opened files.
+However due to playback buffering within Movie Player the change will take effect only 16 frames later (e.g. no change in paused state).
+Most popular formats can be activated by hotkeys:
+
+- **A** - use source-format information stored in the file itself (default).
+- **M** - Mono.
+- **S** - Side By Side.
+- **O** - Over/Under.
+
+This article(stereoformats.md) contains description of stereoscopic formats.
+
+## <a name="sep_keys">Separation adjustment keys</a>
+Some defects of stereoscopic pair can be corrected within sView:
+
+- **Numpad /** and __Numpad \*__ - change horizontal separation to adjust zero-parallax point.
+- **Ctrl** + **Numpad /** and **Ctrl** + __Numpad \*__ - change vertical separation to fix vertical alignment issues.
+- **Ctrl** + **;** - rotate *left* view *clockwise*, *right* view *counterclockwise*.
+- **Ctrl** + **'** - rotate *left* view *counterclockwise*, *right* view *clockwise*.
+
+## <a name="aspect_ratio">Aspect ratio</a>
+Aspect ratio defines image proportions between width and height.
+There are to quantities associated to each other - Pixel Aspect Ratio (PAR) and Display Aspect Ratio (DAR).
+Display aspect ratio is more familiar to the users,
+while Pixel Aspect Ratio is more convenient because it is preserved within most image manipulations like cropping and rotation.
+
+The non-square Pixel Aspect Ratio has been popular in era of DVDs,
+but is quite rare thing nowadays since 720p and 1080p with 16/9 Display Aspect Ratio became a new standard.
+Usually there is no need to care about this option, because all necessary information should be stored in the file.
+
+Unfortunately, there is one important exception - anamorphic 1080p stereo-pair (either horizontal or vertical).
+This format has been originated from limitations of hardware existed before 3D stereo has been standardized,
+when FullHD (1920x1080) standard has been already available for a long time.
+
+Most 3D TVs have function to convert vertical or horizontal pair into stereo,
+but being connected to old players the maximum resolution is 1920x1080.
+And this is exactly the reason why anamorphic 1080p format became so popular.
+It does not require more powerful hardware player able to play 2x1080p video
+and supporting new HDMI extensions for stereoscopic image.
+
+The problem, actually, occurs with players respecting aspect ratio information stored in the file.
+Most software encoding anamorphic videos stores incorrect information causing sView to display them distorted.
+
+Display ratio can be overridden from menu in sView to workaround such issues.
+
+## <a name="fps">Playback smoothness</a>
+sView provides several advanced options affecting playback smoothness (fps) and power consumption:
+
+- **VSync** or Vertical Sync - general way to eliminate tearing artifacts and to limit upper bound of FPS to the maximal vertical refresh rate of used display.
+- **Reduce CPU usage** - limit FPS to some sensible value. In case of video playback the limit is set to 2x of average frame rate. Works independent from VSync.
+
+VSync option naturally reduces GPU load to sane limits (e.g. there is no much sense rendering more frames than connected monitor or projector is able to display).
+However this option does not necessarily reduces CPU load - depending on driver CPU load might even increase.
+To solve the problem, the second option activates extra mechanisms reducing overall resources utilized by sView.
+
+Both options are activated by default to reduce system load and allow other applications using more resources.
+However options might impact playback smoothness, so you can disable them to resolve performance issues.
+
+sView also provides option to **keep Display turned on** during playback.
+By default, program blocks sleeping during Video playback - but not within Audio playback nor Video in paused state.
+You may disable this feature at all or turn on more aggressive behavior in settings.
+
+## <a name="advanced">3rd party libraries</a>
+sView uses 3rd-party components. Most of them are dynamically linked and licensed under LGPL.
+
+_**OpenAL**_. sView uses OpenAL soft as handy cross-platform interface for audio playback.
+On *Windows* you may replace OpenAL soft implementation with the library provided by Audio card vendor (from ASUS or Creative).
+Just remove (or rename/backup) *"OpenAL.dll"* library within sView installation folder.
+
+sView might also use non-default audio playback device, which can be changed in settings.
+
+_**Multichannel playback**_. OpenAL soft supports multichannel surround playback.
+However it may be disabled by default (like on *Windows Vista+*).
+You may need to configure OpenAL soft yourself in this case.
+sView Windows installer option *"OpenAL soft - force 5.1 channel output"* is an easy way to turn on most-popular surround layout.
+Af course this setting will take effect only while playing multichannel audio streams.
+
+_**FFmpeg**_. sView uses framework FFmpeg for cross-platform audio/video decoding and encoding.
+FFmpeg involves steadily and you might be interested in new codecs supported by latest update.
+You should take care that only update without ABI changes can be used as transparent replacement for installed sView.
+Otherwise sView should be re-built.

_service:obs_scm:sview-26.obscpio/include/StAV/StAVBufferPool.h Changed

_service:obs_scm:sview-26.obscpio/include/StAV/StAVFrame.h Changed

_service:obs_scm:sview-26.obscpio/include/StAV/StAVIOContext.h Changed

_service:obs_scm:sview-26.obscpio/include/StAV/StAVIOFileContext.h Changed

_service:obs_scm:sview-26.obscpio/include/StAV/StAVIOJniHttpContext.h Changed

_service:obs_scm:sview-26.obscpio/include/StAV/StAVIOMemContext.h Changed

_service:obs_scm:sview-26.obscpio/include/StAV/StAVImage.h Changed

@@ -15,13 +15,6 @@
 struct AVCodecContext;
 struct AVCodec;
 
-// define StHandle template specialization
-class StAVImage;
-ST_DEFINE_HANDLE(StAVImage, StImageFile);
-
-class StAVFrameCounter;
-ST_DEFINE_HANDLE(StAVFrameCounter, StBufferCounter);
-
 /**
  * This class implements image load/save operation using libav* libraries.
  */
@@ -62,7 +55,7 @@
     /**
      * Create new instance.
      */
-    virtual StHandle<StImageFile> createEmpty() const ST_ATTR_OVERRIDE { return new StAVImage(); }
+    virtual std::shared_ptr<StImageFile> createEmpty() const ST_ATTR_OVERRIDE { return std::make_shared<StAVImage>(); }
 
     /**
      * Close currently opened image context and release memory.
@@ -95,9 +88,9 @@
 
         private:
 
-    AVFormatContext* myFormatCtx; //!< file context
-    AVCodecContext*  myCodecCtx;  //!< codec context
-    const AVCodec*   myCodec;     //!< codec
+    AVFormatContext* myFormatCtx = nullptr; //!< file context
+    AVCodecContext*  myCodecCtx = nullptr;  //!< codec context
+    const AVCodec*   myCodec = nullptr;     //!< codec
     StAVFrame        myFrame;
 
 };
@@ -119,17 +112,17 @@
      * If theOther has the same type, than the ref counter will be reused.
      * Otherwise then new counter will be allocated.
      */
-    ST_CPPEXPORT virtual void createReference(StHandle<StBufferCounter>& theOther) const;
+    ST_CPPEXPORT virtual void createReference(std::shared_ptr<StBufferCounter>& theOther) const override;
 
     /**
      * Release current reference.
      */
-    ST_CPPEXPORT virtual void releaseReference();
+    ST_CPPEXPORT virtual void releaseReference() override;
 
     /**
      * Release reference counter.
      */
-    ST_CPPEXPORT virtual ~StAVFrameCounter();
+    ST_CPPEXPORT virtual ~StAVFrameCounter() override;
 
     /**
      * Initialize a proxy reference.
@@ -138,8 +131,8 @@
 
         private:
 
-    AVFrame* myFrame;   //!< frame
-    bool     myIsProxy; //!< proxy reference to be moved, not copied
+    AVFrame* myFrame = nullptr; //!< frame
+    bool     myIsProxy = false; //!< proxy reference to be moved, not copied
 
 };

_service:obs_scm:sview-26.obscpio/include/StAV/StAVPacket.h Changed

@@ -11,6 +11,8 @@
 
 #include <StGL/StParams.h>
 
+#include <memory>
+
 /**
  * This is just a wrapper to AVPacket structure
  * with some useful copy functionality inside.
@@ -42,7 +44,7 @@
      */
     ST_CPPEXPORT StAVPacket();
 
-    ST_CPPEXPORT StAVPacket(const StHandle<StStereoParams>& theStParams,
+    ST_CPPEXPORT StAVPacket(const std::shared_ptr<StStereoParams>& theStParams,
                             const int theType = DATA_PACKET);
 
     ST_CPPEXPORT StAVPacket(const StAVPacket& theCopy);
@@ -54,37 +56,37 @@
      */
     ST_CPPEXPORT void free();
 
-    inline AVPacket* getAVpkt() {
+    ST_LOCAL AVPacket* getAVpkt() {
         return &myPacket;
     }
 
     ST_CPPEXPORT void setAVpkt(const AVPacket& theCopy);
 
-    inline const StHandle<StStereoParams>& getSource() const {
+    ST_LOCAL const std::shared_ptr<StStereoParams>& getSource() const {
         return myStParams;
     }
 
-    inline int getType() const {
+    ST_LOCAL int getType() const {
         return myType;
     }
 
-    inline const uint8_t* getData() const {
+    ST_LOCAL const uint8_t* getData() const {
         return myPacket.data;
     }
 
-    inline uint8_t* changeData() {
+    ST_LOCAL uint8_t* changeData() {
         return myPacket.data;
     }
 
-    inline int getSize() const {
+    ST_LOCAL int getSize() const {
         return myPacket.size;
     }
 
-    inline int64_t getPts() const {
+    ST_LOCAL int64_t getPts() const {
         return myPacket.pts;
     }
 
-    inline int64_t getDts() const {
+    ST_LOCAL int64_t getDts() const {
         return myPacket.dts;
     }
 
@@ -96,46 +98,46 @@
         return myPacket.duration;
     }
 
-    inline double getDurationSeconds() const {
+    ST_LOCAL double getDurationSeconds() const {
         return myDurationSec;
     }
 
-    inline void setDurationSeconds(const double theDurationSec) {
+    ST_LOCAL void setDurationSeconds(const double theDurationSec) {
         myDurationSec = theDurationSec;
     }
 
-    inline int getStreamId() const {
+    ST_LOCAL int getStreamId() const {
         return myPacket.stream_index;
     }
 
-    inline bool isKeyFrame() const {
+    ST_LOCAL bool isKeyFrame() const {
         return myPacket.flags & AV_PKT_FLAG_KEY;
     }
 
-    inline void setKeyFrame() {
+    ST_LOCAL void setKeyFrame() {
         myPacket.flags |= AV_PKT_FLAG_KEY;
     }
 
     // dummy
-    inline bool operator==(const StAVPacket& compare) const {
+    ST_LOCAL bool operator==(const StAVPacket& compare) const {
         return this == &compare;
     }
-    inline bool operator!=(const StAVPacket& compare) const {
+    ST_LOCAL bool operator!=(const StAVPacket& compare) const {
         return this != &compare;
     }
-    inline bool operator>(const StAVPacket& compare) const {
+    ST_LOCAL bool operator>(const StAVPacket& compare) const {
         return this > &compare;
     }
-    inline bool operator<(const StAVPacket& compare) const {
+    ST_LOCAL bool operator<(const StAVPacket& compare) const {
         return this < &compare;
     }
-    inline bool operator>=(const StAVPacket& compare) const {
+    ST_LOCAL bool operator>=(const StAVPacket& compare) const {
         return this >= &compare;
     }
-    inline bool operator<=(const StAVPacket& compare) const {
+    ST_LOCAL bool operator<=(const StAVPacket& compare) const {
         return this <= &compare;
     }
-    inline StString toString() const {
+    ST_LOCAL StString toString() const {
         return StString();
     }
 
@@ -148,11 +150,13 @@
 
         private:
 
-    AVPacket                 myPacket;
-    StHandle<StStereoParams> myStParams;
-    double                   myDurationSec;
-    int                      myType;
-    bool                     myIsOwn;
+    AVPacket myPacket;
+
+    std::shared_ptr<StStereoParams> myStParams;
+
+    double myDurationSec = 0.0;
+    int    myType = DATA_PACKET;
+    bool   myIsOwn = false;
 
 };

_service:obs_scm:sview-26.obscpio/include/StAV/StAVVideoMuxer.h Changed

_service:obs_scm:sview-26.obscpio/include/StCore/StAndroidGlue.h Changed

_service:obs_scm:sview-26.obscpio/include/StCore/StApplication.h Changed

@@ -42,12 +42,12 @@
     /**
      * Parse process arguments.
      */
-    ST_CPPEXPORT static StHandle<StOpenInfo> parseProcessArguments();
+    ST_CPPEXPORT static std::shared_ptr<StOpenInfo> parseProcessArguments();
 
     /**
      * Read default drawer from setting.
      */
-    ST_CPPEXPORT static bool readDefaultDrawer(StHandle<StOpenInfo>& theInfo);
+    ST_CPPEXPORT static bool readDefaultDrawer(std::shared_ptr<StOpenInfo>& theInfo);
 
     /**
      * @return TRUE if specified drawer is set as default in settings.
@@ -70,9 +70,9 @@
     /**
      * Main constructor.
      */
-    ST_CPPEXPORT StApplication(const StHandle<StResourceManager>& theResMgr,
+    ST_CPPEXPORT StApplication(const std::shared_ptr<StResourceManager>& theResMgr,
                                const StNativeWin_t                theParentWin,
-                               const StHandle<StOpenInfo>&        theOpenInfo  = NULL);
+                               const std::shared_ptr<StOpenInfo>& theOpenInfo = std::shared_ptr<StOpenInfo>());
 
     /**
      * Destructor.
@@ -127,12 +127,12 @@
     /**
      * @return file to open in another drawer
      */
-    const StHandle<StOpenInfo>& getOpenFileInOtherDrawer() const { return myOpenFileOtherApp; }
+    const std::shared_ptr<StOpenInfo>& getOpenFileInOtherDrawer() const { return myOpenFileOtherApp; }
 
     /**
      * Return active renderer and main application window.
      */
-    ST_CPPEXPORT const StHandle<StWindow>& getMainWindow() const;
+    ST_CPPEXPORT const std::shared_ptr<StWindow>& getMainWindow() const;
 
     /**
      * @return true if main application window is in active state
@@ -142,7 +142,7 @@
     /**
      * @return default messages queue
      */
-    ST_CPPEXPORT const StHandle<StMsgQueue>& getMessagesQueue() const;
+    ST_CPPEXPORT const std::shared_ptr<StMsgQueue>& getMessagesQueue() const;
 
     /**
      * Register hot keys for specified actions.
@@ -189,7 +189,7 @@
     /**
      * Register renderer.
      */
-    ST_CPPEXPORT void addRenderer(const StHandle<StWindow>& theRenderer);
+    ST_CPPEXPORT void addRenderer(const std::shared_ptr<StWindow>& theRenderer);
 
     /**
      * Modify actions.
@@ -330,26 +330,28 @@
 
         private:
 
-    ST_LOCAL void stApplicationInit(const StHandle<StOpenInfo>& theOpenInfo);
+    ST_LOCAL void stApplicationInit(const std::shared_ptr<StOpenInfo>& theOpenInfo);
     ST_LOCAL void doDrawProxy(unsigned int theView);
 
         protected: //! @name protected fields
 
-    StArrayList< StHandle<StWindow> > myRenderers; //!< list of registered renderers
-    StHandle<StResourceManager>       myResMgr;    //!< resources manager
-    StHandle<StTranslations>          myLangMap;   //!< translated strings map
-    StHandle<StMsgQueue>  myMsgQueue;              //!< messages queue
-    StHandle<StWindow>    myWindow;                //!< active renderer and main application window
-    StHandle<StWindow>    mySwitchTo;              //!< new renderer to switch to
-    StHandle<StOpenInfo>  myOpenFileInfo;          //!< file to open
-    StHandle<StOpenInfo>  myOpenFileOtherApp;      //!< file to open in another drawer
+    std::vector< std::shared_ptr<StWindow> > myRenderers;//!< list of registered renderers
+
+    std::shared_ptr<StResourceManager> myResMgr;   //!< resources manager
+    std::shared_ptr<StTranslations>    myLangMap;  //!< translated strings map
+    std::shared_ptr<StMsgQueue>        myMsgQueue; //!< messages queue
+
+    std::shared_ptr<StWindow>    myWindow;          //!< active renderer and main application window
+    std::shared_ptr<StWindow>    mySwitchTo;        //!< new renderer to switch to
+    std::shared_ptr<StOpenInfo>  myOpenFileInfo;    //!< file to open
+    std::shared_ptr<StOpenInfo>  myOpenFileOtherApp;//!< file to open in another drawer
     std::map< int, StHandle<StAction> >
                           myActions;               //!< ID -> Action map
     std::map< std::string, int >
                           myActionLookup;          //!< lookup map ActionName -> ActionID
     std::map< unsigned int, StHandle<StAction> >
                           myKeyActions;            //!< Hot Key -> Action map
-    StHandle<StEventsBuffer>
+    std::shared_ptr<StEventsBuffer>
                           myEventsBuffer;          //!< extra buffer for application-specific queued events
 
     StNativeWin_t         myWinParent;

_service:obs_scm:sview-26.obscpio/include/StCore/StEvent.h Changed

_service:obs_scm:sview-26.obscpio/include/StCore/StSearchMonitors.h Changed

@@ -10,7 +10,7 @@
 
 #include <StCore/StMonitor.h>
 
-#include <StTemplates/StArrayList.h>
+#include <vector>
 
 /**
  * This class provides:
@@ -18,7 +18,7 @@
  *  - methods to initialize list within current system configuration
  *  - methods to find monitor within specified point
  */
-class StSearchMonitors : public StArrayList<StMonitor> {
+class StSearchMonitors {
 
         public:
 
@@ -48,12 +48,16 @@
      */
     ST_CPPEXPORT void initFromSystem();
 
-    ST_LOCAL inline StMonitor& operator(const size_t theId) {
-        return changeValue((theId < size()) ? theId : 0);
+    ST_LOCAL bool empty() const { return myMonitors.empty(); }
+
+    ST_LOCAL size_t size() const { return myMonitors.size(); }
+
+    ST_LOCAL StMonitor& operator(const size_t theId) {
+        return myMonitors.at((theId < myMonitors.size()) ? theId : 0);
     }
 
-    ST_LOCAL inline const StMonitor& operator(const size_t theId) const {
-        return getValue((theId < size()) ? theId : 0);
+    ST_LOCAL const StMonitor& operator(const size_t theId) const {
+        return myMonitors.at((theId < myMonitors.size()) ? theId : 0);
     }
 
     /**
@@ -100,7 +104,7 @@
 
         public:
 
-    ST_CPPEXPORT static void listEDID(StArrayList<StEDIDParser>& theEdids);
+    ST_CPPEXPORT static void listEDID(std::vector<StEDIDParser>& theEdids);
 
     /**
      * Register this instance as updater of global state
@@ -110,6 +114,7 @@
 
         protected:
 
+    std::vector<StMonitor> myMonitors;
     bool myIsUpdater; //!< flag indicating updating listener
 
 };

_service:obs_scm:sview-26.obscpio/include/StCore/StWindow.h Changed

@@ -51,8 +51,7 @@
     int      Priority; //!< device   priority (ST_DEVICE_SUPPORT_ enumeration)
 
 };
-typedef StArrayList< StHandle<StOutDevice> > StOutDevicesList;
-template<> inline void StArray< StHandle<StOutDevice> >::sort() {}
+typedef std::vector< std::shared_ptr<StOutDevice> > StOutDevicesList;
 
 /**
  * Slave configuration.
@@ -131,8 +130,8 @@
      * @param theResMgr       resources manager
      * @param theParentWindow Parent window
      */
-    ST_CPPEXPORT StWindow(const StHandle<StResourceManager>& theResMgr,
-                          const StNativeWin_t                theParentWindow);
+    ST_CPPEXPORT StWindow(const std::shared_ptr<StResourceManager>& theResMgr,
+                          const StNativeWin_t theParentWindow);
 
     /**
      * Destructor.
@@ -313,14 +312,14 @@
     /**
      * Resources manager.
      */
-    ST_CPPEXPORT const StHandle<StResourceManager>& getResourceManager() const;
+    ST_CPPEXPORT const std::shared_ptr<StResourceManager>& getResourceManager() const;
 
     /**
      * Messages queue.
      */
-    ST_CPPEXPORT const StHandle<StMsgQueue>& getMessagesQueue() const;
+    ST_CPPEXPORT const std::shared_ptr<StMsgQueue>& getMessagesQueue() const;
 
-    ST_CPPEXPORT void setMessagesQueue(const StHandle<StMsgQueue>& theQueue);
+    ST_CPPEXPORT void setMessagesQueue(const std::shared_ptr<StMsgQueue>& theQueue);
 
         public: //! @name OpenGL routines
 
@@ -361,7 +360,7 @@
     /**
      * @return OpenGL context
      */
-    ST_CPPEXPORT const StHandle<StGLContext>& getContext() const;
+    ST_CPPEXPORT const std::shared_ptr<StGLContext>& getContext() const;
 
         public: //! @name renderer properties
 
@@ -624,14 +623,14 @@
 
         private: //! @name private fields
 
-    StWindowImpl*               myWin;            //!< window implementation class - we hide implementation details since them too platform-specific
-    double                      myTargetFps;      //!< user data
+    StWindowImpl*               myWin = nullptr;   //!< window implementation class - we hide implementation details since them too platform-specific
+    double                      myTargetFps = 0.0; //!< user data
 
         protected:
 
-    StHandle<StMsgQueue>        myMsgQueue;       //!< messages queue
-    bool                        myWasUsed;        //!< flag indicates that window has been actually used (created)
-    bool                        myIsForcedStereo; //!< flag to force stereo output for mono sources
+    std::shared_ptr<StMsgQueue> myMsgQueue;               //!< messages queue
+    bool                        myWasUsed = false;        //!< flag indicates that window has been actually used (created)
+    bool                        myIsForcedStereo = false; //!< flag to force stereo output for mono sources
 
         private: //! @name no copies, please
 
@@ -641,6 +640,5 @@
     ST_LOCAL const StWindow& operator=(const StWindow& );
 
 };
-template<> inline void StArray< StHandle<StWindow> >::sort() {}
 
 #endif // __StWindow_h_

_service:obs_scm:sview-26.obscpio/include/StFT/StFTFont.h Changed

@@ -13,6 +13,8 @@
 #include <StTemplates/StVec2.h>
 #include <StTemplates/StRect.h>
 
+#include <memory>
+
 /**
  * Structure holds the paths to font family files.
  */
@@ -25,12 +27,12 @@
     StString BoldItalic;
 
     // face index within font container
-    int RegularFace;
-    int BoldFace;
-    int ItalicFace;
-    int BoldItalicFace;
+    int RegularFace = 0;
+    int BoldFace = 0;
+    int ItalicFace = 0;
+    int BoldItalicFace = 0;
 
-    ST_LOCAL StFTFontFamily() : RegularFace (0), BoldFace (0), ItalicFace (0), BoldItalicFace (0) {}
+    ST_LOCAL StFTFontFamily() {}
 };
 
 struct StFTFontPack {
@@ -162,7 +164,7 @@
     /**
      * Create uninitialized instance.
      */
-    ST_CPPEXPORT StFTFont(StHandle<StFTLibrary> theFTLib = NULL);
+    ST_CPPEXPORT StFTFont(const std::shared_ptr<StFTLibrary>& theFTLib = std::shared_ptr<StFTLibrary>());
 
     /**
      * Destructor.
@@ -172,21 +174,21 @@
     /**
      * @return true if font is loaded.
      */
-    inline bool isValid() const {
-        return myFTFace != NULL;
+    ST_LOCAL bool isValid() const {
+        return myFTFace != nullptr;
     }
 
     /**
      * @return image plane for currently rendered glyph.
      */
-    inline const StImagePlane& getGlyphImage() const {
+    ST_LOCAL const StImagePlane& getGlyphImage() const {
         return myGlyphImg;
     }
 
     /**
      * Compute glyph rectangle.
      */
-    inline void getGlyphRect(StRect<float>& theRect) const {
+    ST_LOCAL void getGlyphRect(StRect<float>& theRect) const {
         const FT_Bitmap& aBitmap = myFTFace->glyph->bitmap;
         theRect.left()   = float(myFTFace->glyph->bitmap_left);
         theRect.top()    = float(myFTFace->glyph->bitmap_top);
@@ -268,14 +270,14 @@
     /**
      * @return vertical distance from the horizontal baseline to the highest character coordinate.
      */
-    inline float getAscender() const {
+    ST_LOCAL float getAscender() const {
         return float(myFTFace->ascender) * (float(myFTFace->size->metrics.y_ppem) / float(myFTFace->units_per_EM));
     }
 
     /**
      * @return default line spacing (the baseline-to-baseline distance).
      */
-    inline float getLineSpacing() const {
+    ST_LOCAL float getLineSpacing() const {
         return float(myFTFace->height) * (float(myFTFace->size->metrics.y_ppem) / float(myFTFace->units_per_EM));
     }
 
@@ -424,19 +426,22 @@
 
         protected:
 
-    StHandle<StFTLibrary> myFTLib;               //!< handle to the FT library object
-    FT_Face               myFTFace;              //!< active FT face object
-    StFTFont::Style       myStyle;               //!< active FT face style
-    FT_Face               myFTFacesStylesNB;   //!< FT face objects
-    StString              myFontPathsStylesNB; //!< font paths
-    int                   myFontFacesStylesNB; //!< font face ids
-    bool                  mySubsetsSubsetsNB;
-    FT_Int32              myLoadFlags;           //!< default load flags
-    unsigned int          myGlyphMaxWidth;       //!< maximum glyph width
-    unsigned int          myGlyphMaxHeight;      //!< maximum glyph height
-
-    StImagePlane          myGlyphImg;            //!< cached glyph plane
-    stUtf32_t             myUChar;               //!< currently loaded unicode character
+    std::shared_ptr<StFTLibrary> myFTLib; //!< handle to the FT library object
+
+    FT_Face         myFTFace = nullptr;      //!< active FT face object
+    StFTFont::Style myStyle = Style_Regular; //!< active FT face style
+
+    FT_Face   myFTFacesStylesNB {};   //!< FT face objects
+    StString  myFontPathsStylesNB;    //!< font paths
+    int       myFontFacesStylesNB {}; //!< font face ids
+    bool      mySubsetsSubsetsNB {};
+    FT_Int32  myLoadFlags = 0;          //!< default load flags
+
+    unsigned int myGlyphMaxWidth = 1;  //!< maximum glyph width
+    unsigned int myGlyphMaxHeight = 1; //!< maximum glyph height
+
+    StImagePlane myGlyphImg;  //!< cached glyph plane
+    stUtf32_t    myUChar = 0; //!< currently loaded unicode character
 
 };

_service:obs_scm:sview-26.obscpio/include/StFT/StFTFontRegistry.h Changed

@@ -11,6 +11,7 @@
 #include <StFile/StFolder.h>
 
 #include <map>
+#include <vector>
 
 /**
  * Class to manage the list of available fonts in the system.
@@ -59,7 +60,7 @@
     /**
      * Search the specified font files.
      */
-    void searchFiles(const StArrayList<StString>& theNames,
+    void searchFiles(const std::vector<StString>& theNames,
                      const bool                   theIsMajor);
 
     /**
@@ -69,10 +70,10 @@
 
         private:
 
-    StArrayList<StString> myExtensions;  //!< list of supported font file extensions
-    StArrayList<StString> myFolders;     //!< font search paths
-    StArrayList<StString> myFilesMajor;  //!< major font file names which should present in the system
-    StArrayList<StString> myFilesMinor;  //!< minor font file names
+    std::vector<StString> myExtensions;  //!< list of supported font file extensions
+    std::vector<StString> myFolders;     //!< font search paths
+    std::vector<StString> myFilesMajor;  //!< major font file names which should present in the system
+    std::vector<StString> myFilesMinor;  //!< minor font file names
 
     StFolder              myFoldersRoot; //!< files tree
     StHandle<StFTLibrary> myFTLib;       //!< handle to the FT library object

_service:obs_scm:sview-26.obscpio/include/StFile/StFileNode.h Changed

_service:obs_scm:sview-26.obscpio/include/StFile/StFolder.h Changed

_service:obs_scm:sview-26.obscpio/include/StFile/StMIMEList.h Changed

_service:obs_scm:sview-26.obscpio/include/StFile/StNode.h Changed

_service:obs_scm:sview-26.obscpio/include/StGL/StGLBrightnessMatrix.h Changed

@@ -23,7 +23,7 @@
     /**
      * Create an identity matrix (brightness 1.0).
      */
-    StGLBrightnessMatrix()
+    ST_LOCAL StGLBrightnessMatrix()
     : StGLMatrix(),
       myBrightness(1.0f) {
         //
@@ -32,7 +32,7 @@
     /**
      * Create the brightness matrix.
      */
-    StGLBrightnessMatrix(const GLfloat theBright)
+    ST_LOCAL StGLBrightnessMatrix(const GLfloat theBright)
     : StGLMatrix(),
       myBrightness(theBright) {
         setBrightness(theBright);
@@ -41,14 +41,14 @@
     /**
      * Returns true if brightness value is 1.0
      */
-    bool isIdentity() const {
+    ST_LOCAL bool isIdentity() const {
         return stAreEqual(myBrightness, 1.0f, 0.0001f);
     }
 
     /**
      * Get the brightness value used on matrix creation.
      */
-    GLfloat getBrightness() const {
+    ST_LOCAL GLfloat getBrightness() const {
         return myBrightness;
     }
 
@@ -57,7 +57,7 @@
      * 1.0 - identity matrix;
      * 0.0 - black matrix;
      */
-    void setBrightness(const GLfloat theBright) {
+    ST_LOCAL void setBrightness(const GLfloat theBright) {
         myBrightness = (theBright > 0.0f) ? theBright : 0.0f;
         initIdentity();
         changeValue(0, 0) = changeValue(1, 1) = changeValue(2, 2) = theBright;

_service:obs_scm:sview-26.obscpio/include/StGL/StGLContext.h Changed

@@ -127,53 +127,53 @@
      * Color + Depth + Stencil buffer bits.
      */
     struct BufferBits {
-        GLint RGB;      //!< red + green + blue bits
-        GLint Alpha;    //!< alpha bits
-        GLint Depth;    //!< depth bits
-        GLint Stencil;  //!< stencil bits
+        GLint RGB = 0;      //!< red + green + blue bits
+        GLint Alpha = 0;    //!< alpha bits
+        GLint Depth = 0;    //!< depth bits
+        GLint Stencil = 0;  //!< stencil bits
 
-        GLint SizeX;
-        GLint SizeY;
+        GLint SizeX = 0;
+        GLint SizeY = 0;
     };
 
         public:    //! @name OpenGL functions - core versions
 
-    StGLCore11*     core11;     //!< OpenGL 1.1 core functionality
-    StGLCore11Fwd*  core11fwd;  //!< OpenGL 1.1 without deprecated entry points
-    StGLCore20*     core20;     //!< OpenGL 2.0 core functionality (includes 1.5)
-    StGLCore20Fwd*  core20fwd;  //!< OpenGL 2.0 without deprecated entry points
-    StGLCore32*     core32;     //!< OpenGL 3.2 core profile
-    StGLCore32Back* core32back; //!< OpenGL 3.2 backward compatibility profile
-    StGLCore41*     core41;     //!< OpenGL 4.1 core profile
-    StGLCore41Back* core41back; //!< OpenGL 4.1 backward compatibility profile
-    StGLCore42*     core42;     //!< OpenGL 4.2 core profile
-    StGLCore42Back* core42back; //!< OpenGL 4.2 backward compatibility profile
-    StGLCore43*     core43;     //!< OpenGL 4.3 core profile
-    StGLCore43Back* core43back; //!< OpenGL 4.3 backward compatibility profile
-    StGLCore44*     core44;     //!< OpenGL 4.4 core profile
-    StGLCore44Back* core44back; //!< OpenGL 4.4 backward compatibility profile
+    StGLCore11*     core11 = nullptr;     //!< OpenGL 1.1 core functionality
+    StGLCore11Fwd*  core11fwd = nullptr;  //!< OpenGL 1.1 without deprecated entry points
+    StGLCore20*     core20 = nullptr;     //!< OpenGL 2.0 core functionality (includes 1.5)
+    StGLCore20Fwd*  core20fwd = nullptr;  //!< OpenGL 2.0 without deprecated entry points
+    StGLCore32*     core32 = nullptr;     //!< OpenGL 3.2 core profile
+    StGLCore32Back* core32back = nullptr; //!< OpenGL 3.2 backward compatibility profile
+    StGLCore41*     core41 = nullptr;     //!< OpenGL 4.1 core profile
+    StGLCore41Back* core41back = nullptr; //!< OpenGL 4.1 backward compatibility profile
+    StGLCore42*     core42 = nullptr;     //!< OpenGL 4.2 core profile
+    StGLCore42Back* core42back = nullptr; //!< OpenGL 4.2 backward compatibility profile
+    StGLCore43*     core43 = nullptr;     //!< OpenGL 4.3 core profile
+    StGLCore43Back* core43back = nullptr; //!< OpenGL 4.3 backward compatibility profile
+    StGLCore44*     core44 = nullptr;     //!< OpenGL 4.4 core profile
+    StGLCore44Back* core44back = nullptr; //!< OpenGL 4.4 backward compatibility profile
 
         public:    //! @name OpenGL functions - extensions
 
-    StGLArbFbo*     arbFbo;     //!< GL_ARB_framebuffer_object
-    bool            arbNPTW;    //!< GL_ARB_texture_non_power_of_two
-    bool            arbTexRG;   //!< GL_ARB_texture_rg
-    bool            arbTexFloat;//!< GL_ARB_texture_float (on desktop OpenGL - since 3.0 or as extension GL_ARB_texture_float; on OpenGL ES - since 3.0)
-    bool            arbTexClear;//!< GL_ARB_clear_texture
-    bool            hasHighp;   //!< highp in GLSL ES fragment shader is supported
-    bool            hasTexRGBA8;//!< always available on desktop; on OpenGL ES - since 3.0 or as extension GL_OES_rgb8_rgba8
-    bool            extTexBGRA8;//!< GL_EXT_texture_format_BGRA8888 for OpenGL ES
-    bool            extTexR16;  //!< GL_EXT_texture_norm16 on OpenGL ES
-    StGLFunctions*  extAll;     //!< access to ALL extensions for advanced users
-    bool            extSwapTear;//!< WGL_EXT_swap_control_tear/GLX_EXT_swap_control_tear
-    bool            khrFlushControl; //!< GL_KHR_context_flush_control / WGL_ARB_context_flush_control / GLX_ARB_context_flush_control / EGL_KHR_context_flush_control
+    StGLArbFbo*     arbFbo = nullptr; //!< GL_ARB_framebuffer_object
+    bool            arbNPTW = false;    //!< GL_ARB_texture_non_power_of_two
+    bool            arbTexRG = false;   //!< GL_ARB_texture_rg
+    bool            arbTexFloat = false;//!< GL_ARB_texture_float (on desktop OpenGL - since 3.0 or as extension GL_ARB_texture_float; on OpenGL ES - since 3.0)
+    bool            arbTexClear = false;//!< GL_ARB_clear_texture
+    bool            hasHighp = false;   //!< highp in GLSL ES fragment shader is supported
+    bool            hasTexRGBA8 = false;//!< always available on desktop; on OpenGL ES - since 3.0 or as extension GL_OES_rgb8_rgba8
+    bool            extTexBGRA8 = false;//!< GL_EXT_texture_format_BGRA8888 for OpenGL ES
+    bool            extTexR16 = false;  //!< GL_EXT_texture_norm16 on OpenGL ES
+    StGLFunctions*  extAll = nullptr; //!< access to ALL extensions for advanced users
+    bool            extSwapTear = false;//!< WGL_EXT_swap_control_tear/GLX_EXT_swap_control_tear
+    bool            khrFlushControl = false; //!< GL_KHR_context_flush_control / WGL_ARB_context_flush_control / GLX_ARB_context_flush_control / EGL_KHR_context_flush_control
 
         public:    //! @name class interface
 
     /**
      * Empty constructor.
      */
-    ST_CPPEXPORT StGLContext(const StHandle<StResourceManager>& theResMgr);
+    ST_CPPEXPORT StGLContext(const std::shared_ptr<StResourceManager>& theResMgr);
 
     /**
      * Default constructor.
@@ -198,12 +198,12 @@
     /**
      * File resources manager.
      */
-    ST_LOCAL const StHandle<StResourceManager>& getResourceManager() const { return myResMgr; }
+    ST_LOCAL const std::shared_ptr<StResourceManager>& getResourceManager() const { return myResMgr; }
 
     /**
      * Setup messages queue.
      */
-    ST_CPPEXPORT void setMessagesQueue(const StHandle<StMsgQueue>& theQueue);
+    ST_CPPEXPORT void setMessagesQueue(const std::shared_ptr<StMsgQueue>& theQueue);
 
     /**
      * Push error message to the messages queue.
@@ -226,8 +226,8 @@
      * You should check extension availability before this!
      */
     template <typename Function_t>
-    inline bool stglFindProc(const char* theName,
-                             Function_t& theFunction) const {
+    ST_LOCAL bool stglFindProc(const char* theName,
+                               Function_t& theFunction) const {
         theFunction = (Function_t )stglFindProc(theName);
         return (theFunction != NULL);
     }
@@ -338,7 +338,7 @@
     /**
      * Setup viewport.
      */
-    inline void stglResizeViewport(const GLsizei theSizeX,
+    ST_LOCAL void stglResizeViewport(const GLsizei theSizeX,
                                    const GLsizei theSizeY) {
         const StGLBoxPx aRect = {{ 0, 0, theSizeX, theSizeY }};
         stglResizeViewport(aRect);
@@ -347,14 +347,14 @@
     /**
      * @return current viewport rectangle
      */
-    inline const StGLBoxPx& stglViewport() const {
+    ST_LOCAL const StGLBoxPx& stglViewport() const {
         return myViewport;
     }
 
     /**
      * Setup viewport.
      */
-    inline void stglResize(const StRect<GLint>& theWinRect) {
+    ST_LOCAL void stglResize(const StRect<GLint>& theWinRect) {
         const StGLBoxPx aRect = {{ 0, 0, theWinRect.width(), theWinRect.height() }};
         stglResizeViewport(aRect);
     }
@@ -362,14 +362,14 @@
     /**
      * @return currently bound FBO for drawing operations
      */
-    inline GLuint stglFramebufferDraw() const {
+    ST_LOCAL GLuint stglFramebufferDraw() const {
         return myFramebufferDraw;
     }
 
     /**
      * @return currently bound FBO for reading operations
      */
-    inline GLuint stglFramebufferRead() const {
+    ST_LOCAL GLuint stglFramebufferRead() const {
         return myFramebufferDraw;
     }
 
@@ -459,32 +459,32 @@
         protected: //! @name class fields
 
 #ifdef __APPLE__
-    StLibrary               mySysLib;             //!< optional handle to system GL library (MacOS X specific)
+    StLibrary mySysLib; //!< optional handle to system GL library (MacOS X specific)
 #endif
-    StHandle<StGLFunctions> myFuncs;              //!< mega structure for all GL functions
-    StHandle<StResourceManager>
-                            myResMgr;             //!< file resources manager
-    StHandle<StMsgQueue>    myMsgQueue;           //!< messages queue
+    std::shared_ptr<StGLFunctions>     myFuncs;    //!< mega structure for all GL functions
+    std::shared_ptr<StResourceManager> myResMgr;   //!< file resources manager
+    std::shared_ptr<StMsgQueue>        myMsgQueue; //!< messages queue
+
     StGLDeviceCaps          myDevCaps;            //!< device caps
-    GlVendor                myGlVendor;           //!< GPU vendor
-    GlVendor                myGlDriverVendor;     //!< driver vendor
-    GPU_Name                myGpuName;            //!< GPU name
-    GLint                   myVerMajor;           //!< cached GL version major number
-    GLint                   myVerMinor;           //!< cached GL version minor number
+    GlVendor                myGlVendor = GlVendor_UNKNOWN; //!< GPU vendor
+    GlVendor                myGlDriverVendor = GlVendor_UNKNOWN; //!< driver vendor
+    GPU_Name                myGpuName = GPU_UNKNOWN; //!< GPU name
+    GLint                   myVerMajor = 0;       //!< cached GL version major number
+    GLint                   myVerMinor = 0;       //!< cached GL version minor number
     BufferBits              myWindowBits;         //!< default buffer (window) bits
     BufferBits              myFBOBits;            //!< FBO bits
-    bool                    myWasInit;            //!< initialization state
+    bool                    myWasInit = false;    //!< initialization state
 
     StImagePlane            myTmpPlane1;          //!< auxiliary temporary image buffer
     StImagePlane            myTmpPlane2;          //!< auxiliary temporary image buffer
 
         protected: //! @name current state
 
-    std::stack<StGLBoxPx>   myScissorStack;       //!< cached stack of scissor rectangles
-    StGLBoxPx               myViewport;           //!< cached viewport rectangle
-    GLuint                  myFramebufferDraw;    //!< bound draw buffer
-    GLuint                  myFramebufferRead;    //!< bound read buffer
-    bool                    myIsBound;            //!< flag indicating make current state
+    std::stack<StGLBoxPx>   myScissorStack;        //!< cached stack of scissor rectangles
+    StGLBoxPx               myViewport;            //!< cached viewport rectangle
+    GLuint                  myFramebufferDraw = 0; //!< bound draw buffer
+    GLuint                  myFramebufferRead = 0; //!< bound read buffer
+    bool                    myIsBound = false;     //!< flag indicating make current state
 
 };

_service:obs_scm:sview-26.obscpio/include/StGL/StGLDeviceCaps.h Changed

@@ -17,35 +17,34 @@
     /**
      * Texture size limits.
      */
-    int maxTexDim;
+    int maxTexDim = 0;
 
     /**
      * Device support data transferring with row unpack size specified.
      * GL_PACK_ROW_LENGTH / GL_UNPACK_ROW_LENGTH can be used - OpenGL ES 3.0+ or any desktop.
      */
-    bool hasUnpack;
+    bool hasUnpack = true;
 
     /**
      * Return TRUE if image format can be uploaded into OpenGL texture.
      */
-    bool isSupportedFormat(StImagePlane::ImgFormat theFormat) const { return mySupportedFormatstheFormat; }
+    ST_LOCAL bool isSupportedFormat(StImagePlane::ImgFormat theFormat) const { return mySupportedFormatstheFormat; }
 
     /**
      * Set if image format can be uploaded into OpenGL texture.
      */
-    void setSupportedFormat(StImagePlane::ImgFormat theFormat, bool theIsSupported) { mySupportedFormatstheFormat = theIsSupported; }
+    ST_LOCAL void setSupportedFormat(StImagePlane::ImgFormat theFormat, bool theIsSupported) { mySupportedFormatstheFormat = theIsSupported; }
 
     /**
      * Empty constructor.
      */
-    ST_LOCAL StGLDeviceCaps()
-    : maxTexDim(0), hasUnpack(true) {
-        stMemZero(mySupportedFormats, sizeof(mySupportedFormats));
+    ST_LOCAL StGLDeviceCaps() {
+        //
     }
 
         private:
 
-    bool mySupportedFormatsStImagePlane::ImgNB;
+    bool mySupportedFormatsStImagePlane::ImgNB {};
 
 };

_service:obs_scm:sview-26.obscpio/include/StGL/StGLFont.h Changed

@@ -24,7 +24,7 @@
     /**
      * Default constructor from FT font.
      */
-    ST_CPPEXPORT StGLFont(const StHandle<StFTFont>& theFtFont);
+    ST_CPPEXPORT StGLFont(const std::shared_ptr<StFTFont>& theFtFont);
 
     /**
      * Destructor - should be called after release()!
@@ -39,14 +39,14 @@
     /**
      * @return textured font instance of specified Unicode subset
      */
-    ST_LOCAL const StHandle<StGLFontEntry>& getFont(const StFTFont::Subset theSubset = StFTFont::Subset_General) const {
+    ST_LOCAL const std::shared_ptr<StGLFontEntry>& getFont(const StFTFont::Subset theSubset = StFTFont::Subset_General) const {
         return myFontstheSubset;
     }
 
     /**
      * @return textured font instance of specified Unicode subset
      */
-    ST_LOCAL StHandle<StGLFontEntry>& changeFont(const StFTFont::Subset theSubset = StFTFont::Subset_General) {
+    ST_LOCAL std::shared_ptr<StGLFontEntry>& changeFont(const StFTFont::Subset theSubset = StFTFont::Subset_General) {
         return myFontstheSubset;
     }
 
@@ -72,9 +72,9 @@
      * Notice that this method doesn't return initialization success state.
      * @return true if initialization was already called.
      */
-    inline bool wasInitialized() const {
-        return !myFonts0.isNull()
-             && myFonts0->wasInitialized();
+    ST_LOCAL bool wasInitialized() const {
+        return myFonts0.get() != nullptr
+            && myFonts0->wasInitialized();
     }
 
     /**
@@ -94,7 +94,7 @@
 
         protected:
 
-    StHandle<StGLFontEntry> myFontsStFTFont::SubsetsNB; //!< textured font instances
+    std::shared_ptr<StGLFontEntry> myFontsStFTFont::SubsetsNB; //!< textured font instances
 
 };

_service:obs_scm:sview-26.obscpio/include/StGL/StGLFontEntry.h Changed

@@ -14,6 +14,7 @@
 #include <StTemplates/StRect.h>
 
 #include <map>
+#include <vector>
 
 typedef StRect<GLfloat> StGLRect;
 
@@ -28,17 +29,12 @@
 
         public: //! compare operators
 
-    bool operator==(const StGLTile& theCompare) const {
+    ST_LOCAL bool operator==(const StGLTile& theCompare) const {
         return uv == theCompare.uv && px == theCompare.px;
     }
 
 };
 
-template<> inline void StArray< StHandle<StGLTexture> >::sort() {}
-template<> inline void StArray< StHandle<StGLFrameBuffer> >::sort() {}
-template<> inline void StArray<StGLTile>::sort() {}
-template<> inline void StArray<StGLRect>::sort() {}
-
 /**
  * Texture font.
  */
@@ -49,7 +45,7 @@
     /**
      * Main constructor.
      */
-    ST_CPPEXPORT StGLFontEntry(const StHandle<StFTFont>& theFont);
+    ST_CPPEXPORT StGLFontEntry(const std::shared_ptr<StFTFont>& theFont);
 
     /**
      * Destructor - should be called after release()!
@@ -64,7 +60,7 @@
     /**
      * @return FreeType font instance specified on construction.
      */
-    inline StHandle<StFTFont>& getFont() {
+    ST_LOCAL std::shared_ptr<StFTFont>& getFont() {
         return myFont;
     }
 
@@ -83,8 +79,8 @@
     /**
      * @return true if font was loaded successfully.
      */
-    inline bool isValid() const {
-        return !myTextures.isEmpty() && myTextures0->isValid();
+    ST_LOCAL bool isValid() const {
+        return !myTextures.empty() && myTextures0->isValid();
     }
 
     /**
@@ -92,8 +88,8 @@
      * Use isValid() instead.
      * @return true if initialization was already called.
      */
-    inline bool wasInitialized() const {
-        return !myTextures.isEmpty();
+    ST_LOCAL bool wasInitialized() const {
+        return !myTextures.empty();
     }
 
     /**
@@ -115,22 +111,22 @@
      * Compute advance to the next character with kerning applied when applicable.
      * Assuming text rendered horizontally.
      */
-    ST_LOCAL inline float getAdvanceX(const stUtf32_t theUChar,
-                                      const stUtf32_t theUCharNext) {
+    ST_LOCAL float getAdvanceX(const stUtf32_t theUChar,
+                               const stUtf32_t theUCharNext) {
         return myFont->getAdvanceX(theUChar, theUCharNext);
     }
 
     /**
      * @return vertical distance from the horizontal baseline to the highest character coordinate.
      */
-    ST_LOCAL inline GLfloat getAscender() const {
+    ST_LOCAL GLfloat getAscender() const {
         return myAscender;
     }
 
     /**
      * @return default line spacing (the baseline-to-baseline distance).
      */
-    ST_LOCAL inline GLfloat getLineSpacing() const {
+    ST_LOCAL GLfloat getLineSpacing() const {
         return myLineSpacing;
     }
 
@@ -138,16 +134,16 @@
      * @return true if font contains specified symbol
      */
     ST_LOCAL bool hasSymbol(const stUtf32_t theUChar) const {
-        return !myFont.isNull()
-             && myFont->hasSymbol(theUChar);
+        return myFont.get() != nullptr
+            && myFont->hasSymbol(theUChar);
     }
 
     /**
      * @return true if this font contains glyphs of specified subset
      */
     ST_LOCAL bool hasSubset(StFTFont::Subset theSubset) const {
-        return !myFont.isNull()
-             && myFont->hasSubset(theSubset);
+        return myFont.get() != nullptr
+            && myFont->hasSubset(theSubset);
     }
 
     /**
@@ -184,17 +180,18 @@
 
         protected:
 
-    StHandle<StFTFont> myFont;                //!< FreeType font instance
-    GLfloat            myAscender;            //!< ascender     provided my FT font
-    GLfloat            myLineSpacing;         //!< line spacing provided my FT font
-    GLsizei            myTileSizeX;           //!< tile width
-    GLsizei            myTileSizeY;           //!< tile height
-    size_t             myLastTileId;          //!< id of last tile
-    StRect<int>        myLastTilePx;
-
-    StArrayList< StHandle<StGLTexture> >     myTextures; //!< texture list
-    StArrayList< StHandle<StGLFrameBuffer> > myFbos;     //!< FBO list
-    StArrayList<StGLTile> myTiles;            //!< tiles list
+    std::shared_ptr<StFTFont> myFont; //!< FreeType font instance
+
+    GLfloat     myAscender;            //!< ascender     provided my FT font
+    GLfloat     myLineSpacing;         //!< line spacing provided my FT font
+    GLsizei     myTileSizeX;           //!< tile width
+    GLsizei     myTileSizeY;           //!< tile height
+    size_t      myLastTileId;          //!< id of last tile
+    StRect<int> myLastTilePx;
+
+    std::vector< std::shared_ptr<StGLTexture> >     myTextures; //!< texture list
+    std::vector< std::shared_ptr<StGLFrameBuffer> > myFbos;     //!< FBO list
+    std::vector<StGLTile> myTiles;            //!< tiles list
 
     std::map<stUtf32_t, size_t>  myGlyphMapsStFTFont::StylesNB;
     std::map<stUtf32_t, size_t>* myGlyphMap;                      //!< glyphs map for active style

_service:obs_scm:sview-26.obscpio/include/StGL/StGLFontManager.h Changed

@@ -16,10 +16,10 @@
     StString     Name; //!< font family name
     unsigned int Size; //!< font size
 
-    StGLFontKey(const StString& theName,
-                unsigned int    theSize) : Name(theName), Size(theSize) {}
+    ST_LOCAL StGLFontKey(const StString& theName,
+                         unsigned int    theSize) : Name(theName), Size(theSize) {}
 
-    inline bool operator<(const StGLFontKey& theOther) const {
+    ST_LOCAL bool operator<(const StGLFontKey& theOther) const {
         return this->Size < theOther.Size
             || (this->Size == theOther.Size
              && this->Name <  theOther.Name);
@@ -30,10 +30,10 @@
     StFTFont::Typeface Type; //!< font typeface
     unsigned int       Size; //!< font size
 
-    StGLFontTypeKey(const StFTFont::Typeface theTypeface,
-                    unsigned int             theSize) : Type(theTypeface), Size(theSize) {}
+    ST_LOCAL StGLFontTypeKey(const StFTFont::Typeface theTypeface,
+                            unsigned int             theSize) : Type(theTypeface), Size(theSize) {}
 
-    inline bool operator<(const StGLFontTypeKey& theOther) const {
+    ST_LOCAL bool operator<(const StGLFontTypeKey& theOther) const {
         return this->Size < theOther.Size
             || (this->Size == theOther.Size
              && this->Type <  theOther.Type);
@@ -48,15 +48,13 @@
         public:
 
     /** Return name of fallback font entry. */
-    ST_LOCAL static const char* getFallbackFontName() {
-        static const char* aName = "ST_DejaVuSerif_ttf";
-        return aName;
+    ST_LOCAL static constexpr const char* getFallbackFontName() {
+        return "ST_DejaVuSerif_ttf";
     }
 
     /** Return path of fallback font. */
-    ST_LOCAL static const char* getFallbackFontPath() {
-        static const char* aName = "internal://DejaVuSerif_internal.ttf";
-        return aName;
+    ST_LOCAL static constexpr const char* getFallbackFontPath() {
+        return "internal://DejaVuSerif_internal.ttf";
     }
 
         public:
@@ -91,42 +89,44 @@
     /**
      * Find font and create it if not already created.
      */
-    ST_CPPEXPORT const StHandle<StGLFont>& findCreate(const StFTFont::Typeface theType,
-                                                      unsigned int             theSize);
+    ST_CPPEXPORT const std::shared_ptr<StGLFont>& findCreate(const StFTFont::Typeface theType,
+                                                             unsigned int             theSize);
 
     /**
      * Find font for specified family name and size.
      */
-    ST_CPPEXPORT StHandle<StGLFontEntry> find(const StString& theName,
-                                              unsigned int    theSize) const;
+    ST_CPPEXPORT std::shared_ptr<StGLFontEntry> find(const StString& theName,
+                                                     unsigned int    theSize) const;
 
     /**
      * Find font for specified family name and size, and create it if not already created.
      */
-    ST_CPPEXPORT StHandle<StGLFontEntry> findCreate(const StString& theName,
-                                                    unsigned int    theSize);
+    ST_CPPEXPORT std::shared_ptr<StGLFontEntry> findCreate(const StString& theName,
+                                                           unsigned int    theSize);
 
     /**
      * Find fallback font for specified size, and create it if not already created.
      */
-    ST_CPPEXPORT StHandle<StGLFontEntry> findCreateFallback(unsigned int theSize);
+    ST_CPPEXPORT std::shared_ptr<StGLFontEntry> findCreateFallback(unsigned int theSize);
 
     /**
      * @return handle to the FT library object
      */
-    ST_LOCAL const StHandle<StFTLibrary>& getLibrary() const {
+    ST_LOCAL const std::shared_ptr<StFTLibrary>& getLibrary() const {
         return myFTLib;
     }
 
         protected:
 
-    StHandle<StFTLibrary>               myFTLib;      //!< handle to the FT library object
-    StHandle<StFTFontRegistry>          myRegistry;   //!< fonts registry
+    std::shared_ptr<StFTLibrary>      myFTLib;    //!< handle to the FT library object
+    std::shared_ptr<StFTFontRegistry> myRegistry; //!< fonts registry
+
     std::map< StGLFontKey,
-              StHandle<StGLFontEntry> > myFonts;      //!< fonts map
+              std::shared_ptr<StGLFontEntry> > myFonts; //!< fonts map
     std::map< StGLFontTypeKey,
-              StHandle<StGLFont> >      myFontTypes;  //!< font typefaces map
-    unsigned int                        myResolution; //!< fonts resolution
+              std::shared_ptr<StGLFont> > myFontTypes;  //!< font typefaces map
+
+    unsigned int myResolution; //!< fonts resolution
 
 };

_service:obs_scm:sview-26.obscpio/include/StGL/StGLFrameBuffer.h Changed

@@ -8,7 +8,8 @@
 #define __StGLFrameBuffer_h_
 
 #include <StGL/StGLTexture.h>
-#include <StTemplates/StHandle.h>
+
+#include <memory>
 
 /**
  * Simple class represents Virtual (texture) stereo Frame buffer object.
@@ -18,8 +19,8 @@
 
         public:
 
-    static const GLuint NO_FRAMEBUFFER  = 0;
-    static const GLuint NO_RENDERBUFFER = 0;
+    static constexpr GLuint NO_FRAMEBUFFER  = 0;
+    static constexpr GLuint NO_RENDERBUFFER = 0;
 
     /**
      * Empty constructor.
@@ -39,9 +40,9 @@
     /**
      * Returns true if FBO was initialized.
      */
-    inline bool isValid() const {
+    ST_LOCAL bool isValid() const {
         return isValidFrameBuffer()
-            && !myTextureColor.isNull()
+            && myTextureColor.get() != nullptr
             && myTextureColor->isValid();
     }
 
@@ -57,9 +58,9 @@
     /**
      * Initialize the FBO with specified color texture.
      */
-    ST_CPPEXPORT bool init(StGLContext&  theCtx,
-                           const StHandle<StGLTexture>& theColorTexture,
-                           const bool    theNeedDepthBuffer);
+    ST_CPPEXPORT bool init(StGLContext& theCtx,
+                           const std::shared_ptr<StGLTexture>& theColorTexture,
+                           const bool theNeedDepthBuffer);
 
     /**
      * (Re)initialize the FBO with specified dimensions.
@@ -79,42 +80,42 @@
     /**
      * @return texture width.
      */
-    inline GLsizei getSizeX() const {
+    ST_LOCAL GLsizei getSizeX() const {
         return myTextureColor->getSizeX();
     }
 
     /**
      * @return texture height.
      */
-    inline GLsizei getSizeY() const {
+    ST_LOCAL GLsizei getSizeY() const {
         return myTextureColor->getSizeY();
     }
 
     /**
      * FBO viewport width.
      */
-    inline GLsizei getVPSizeX() const {
+    ST_LOCAL GLsizei getVPSizeX() const {
         return myViewPortX;
     }
 
     /**
      * FBO viewport height.
      */
-    inline GLsizei getVPSizeY() const {
+    ST_LOCAL GLsizei getVPSizeY() const {
         return myViewPortY;
     }
 
     /**
      * Set new FBO viewport width. Should be <= texture width.
      */
-    inline void setVPSizeX(const GLsizei theSizeX) {
+    ST_LOCAL void setVPSizeX(const GLsizei theSizeX) {
         myViewPortX = theSizeX;
     }
 
     /**
      * Set new FBO viewport height. Should be <= texture height.
      */
-    inline void setVPSizeY(const GLsizei theSizeY) {
+    ST_LOCAL void setVPSizeY(const GLsizei theSizeY) {
         myViewPortY = theSizeY;
     }
 
@@ -131,7 +132,7 @@
     /**
      * Unbind frame buffer.
      */
-    inline void unbindBuffer(StGLContext& theCtx) {
+    ST_LOCAL void unbindBuffer(StGLContext& theCtx) {
         unbindBufferGlobal(theCtx);
     }
 
@@ -143,22 +144,22 @@
     /**
      * Return color texture.
      */
-    ST_LOCAL const StHandle<StGLTexture>& getTextureColor() const {
+    ST_LOCAL const std::shared_ptr<StGLTexture>& getTextureColor() const {
         return myTextureColor;
     }
 
     /**
      * Bind color texture (to render the texture).
      */
-    inline void bindTexture(StGLContext& theCtx,
-                            const GLenum theTextureUnit = GL_TEXTURE0) {
+    ST_LOCAL void bindTexture(StGLContext& theCtx,
+                              const GLenum theTextureUnit = GL_TEXTURE0) {
         myTextureColor->bind(theCtx, theTextureUnit);
     }
 
     /**
      * Unbind color texture.
      */
-    inline void unbindTexture(StGLContext& theCtx) {
+    ST_LOCAL void unbindTexture(StGLContext& theCtx) {
         myTextureColor->unbind(theCtx);
     }
 
@@ -172,8 +173,8 @@
     /**
      * Detach texture from this FBO without destruction.
      */
-    ST_CPPEXPORT void detachColorTexture(StGLContext&                 theCtx,
-                                         const StHandle<StGLTexture>& theTextureColor);
+    ST_CPPEXPORT void detachColorTexture(StGLContext& theCtx,
+                                         const std::shared_ptr<StGLTexture>& theTextureColor);
 
     /**
      * Clear texture using glClear call.
@@ -183,33 +184,34 @@
     /**
      * Create temporary FBO and clear specified texture using glClear call.
      */
-    ST_CPPEXPORT static void clearTexture(StGLContext&                 theCtx,
-                                          const StHandle<StGLTexture>& theTexture);
+    ST_CPPEXPORT static void clearTexture(StGLContext& theCtx,
+                                          const std::shared_ptr<StGLTexture>& theTexture);
 
         private:
 
     /**
      * Validate FrameBuffer id.
      */
-    inline bool isValidFrameBuffer() const {
+    ST_LOCAL bool isValidFrameBuffer() const {
         return myGLFBufferId != NO_FRAMEBUFFER;
     }
 
     /**
      * Validate RenderBuffer id.
      */
-    inline bool isValidDepthBuffer() const {
+    ST_LOCAL bool isValidDepthBuffer() const {
         return myGLDepthRBId != NO_RENDERBUFFER;
     }
 
         private:
 
-    StHandle<StGLTexture> myTextureColor;
+    std::shared_ptr<StGLTexture> myTextureColor;
+
+    GLuint  myGLFBufferId = NO_FRAMEBUFFER;  //!< FrameBuffer  object ID
+    GLuint  myGLDepthRBId = NO_RENDERBUFFER; //!< RenderBuffer object for depth ID
 
-    GLuint  myGLFBufferId; //!< FrameBuffer  object ID
-    GLuint  myGLDepthRBId; //!< RenderBuffer object for depth ID
-    GLsizei myViewPortX;   //!< FBO viewport width  <= texture width
-    GLsizei myViewPortY;   //!< FBO viewport height <= texture height
+    GLsizei myViewPortX = 0; //!< FBO viewport width  <= texture width
+    GLsizei myViewPortY = 0; //!< FBO viewport height <= texture height
 
 };

_service:obs_scm:sview-26.obscpio/include/StGL/StGLMatrix.h Changed

@@ -86,17 +86,17 @@
      */
     ST_CPPEXPORT const StGLMatrix& operator=(const StGLMatrix& copyMat);
 
-    GLfloat getValue(size_t theRow, size_t theCol) const {
+    ST_LOCAL GLfloat getValue(size_t theRow, size_t theCol) const {
         //ST_DEBUG_ASSERT(theRow < 4 && theCol < 4);
         return matrixtheCol * 4 + theRow;
     }
 
-    GLfloat& changeValue(size_t theRow, size_t theCol) {
+    ST_LOCAL GLfloat& changeValue(size_t theRow, size_t theCol) {
         //ST_DEBUG_ASSERT(theRow < 4 && theCol < 4);
         return matrixtheCol * 4 + theRow;
     }
 
-    StGLVec4 getRow(size_t theRowId) const {
+    ST_LOCAL StGLVec4 getRow(size_t theRowId) const {
         //ST_DEBUG_ASSERT(theRowId < 4);
         return StGLVec4(getValue(theRowId, 0),
                         getValue(theRowId, 1),
@@ -104,7 +104,7 @@
                         getValue(theRowId, 3));
     }
 
-    void setRow(const StGLVec4& theRow, size_t theRowId) {
+    ST_LOCAL void setRow(const StGLVec4& theRow, size_t theRowId) {
         //ST_DEBUG_ASSERT(theRowId < 4);
         changeValue(theRowId, 0) = theRow.x();
         changeValue(theRowId, 1) = theRow.y();
@@ -112,18 +112,18 @@
         changeValue(theRowId, 3) = theRow.w();
     }
 
-    void setRow(const StGLVec3& theRow, size_t theRowId) {
+    ST_LOCAL void setRow(const StGLVec3& theRow, size_t theRowId) {
         //ST_DEBUG_ASSERT(theRowId < 4);
         changeValue(theRowId, 0) = theRow.x();
         changeValue(theRowId, 1) = theRow.y();
         changeValue(theRowId, 2) = theRow.z();
     }
 
-    void setRow(size_t theRowId, const StGLVec4& theRow) {
+    ST_LOCAL void setRow(size_t theRowId, const StGLVec4& theRow) {
         setRow(theRow, theRowId);
     }
 
-    StGLVec4 getColumn(size_t theColId) const {
+    ST_LOCAL StGLVec4 getColumn(size_t theColId) const {
         //ST_DEBUG_ASSERT(theColId < 4);
         return StGLVec4(getValue(theColId, 0),
                         getValue(theColId, 1),
@@ -131,7 +131,7 @@
                         getValue(theColId, 3));
     }
 
-    void setColumn(const StGLVec4& theColumn, size_t theColId) {
+    ST_LOCAL void setColumn(const StGLVec4& theColumn, size_t theColId) {
         //ST_DEBUG_ASSERT(theColId < 4);
         changeValue(0, theColId) = theColumn.x();
         changeValue(1, theColId) = theColumn.y();
@@ -139,14 +139,14 @@
         changeValue(3, theColId) = theColumn.w();
     }
 
-    void setColumn(const StGLVec3& theColumn, size_t theColId) {
+    ST_LOCAL void setColumn(const StGLVec3& theColumn, size_t theColId) {
         //ST_DEBUG_ASSERT(theColId < 4);
         changeValue(0, theColId) = theColumn.x();
         changeValue(1, theColId) = theColumn.y();
         changeValue(2, theColId) = theColumn.z();
     }
 
-    void setColumn(size_t theColId, const StGLVec4& theColumn) {
+    ST_LOCAL void setColumn(size_t theColId, const StGLVec4& theColumn) {
         setColumn(theColumn, theColId);
     }
 
@@ -169,7 +169,7 @@
      * Automatically return GLfloat* to be silently used as argument got OpenGL functions.
      * Note that the matrix values are stored as OpenGL need (flat columns instead of flat rows).
      */
-    operator const GLfloat*() const {
+    ST_LOCAL operator const GLfloat*() const {
         return matrix;
     }
 
@@ -177,18 +177,18 @@
      * Automatically return GLfloat* to be silently used as argument got OpenGL functions.
      * Note that the matrix values are stored as OpenGL need (flat columns instead of flat rows).
      */
-    operator GLfloat*() {
+    ST_LOCAL operator GLfloat*() {
         return matrix;
     }
 
-    bool isRowZero(size_t row) const {
+    ST_LOCAL bool isRowZero(size_t row) const {
         return (getValue(row, 0) == 0.0f) &&
                (getValue(row, 1) == 0.0f) &&
                (getValue(row, 2) == 0.0f) &&
                (getValue(row, 3) == 0.0f);
     }
 
-    bool isColumnZero(size_t column) const {
+    ST_LOCAL bool isColumnZero(size_t column) const {
         return (getValue(0, column) == 0.0f) &&
                (getValue(1, column) == 0.0f) &&
                (getValue(2, column) == 0.0f) &&
@@ -237,7 +237,7 @@
                              const StGLVec3& theCenter,
                              const StGLDir3& theUp);
 
-    StString toString() const {
+    ST_LOCAL StString toString() const {
         return StString("{\n")
              + getRow(0).toString() + '\n'
              + getRow(1).toString() + '\n'

_service:obs_scm:sview-26.obscpio/include/StGL/StGLProgram.h Changed

@@ -17,7 +17,7 @@
 
         public:
 
-    static const GLuint NO_PROGRAM = 0;
+    static constexpr GLuint NO_PROGRAM = 0;
 
     enum {
         TEXTURE_SAMPLE_0 = 0, // GL_TEXTURE0
@@ -48,7 +48,7 @@
     /**
      * @return true if program object is valid.
      */
-    inline bool isValid() const {
+    ST_LOCAL bool isValid() const {
         return myProgramId != NO_PROGRAM;
     }
 
@@ -82,9 +82,9 @@
     /**
      * Switch one shader object to another.
      */
-    inline StGLProgram& swapShader(StGLContext&      theCtx,
-                                   const StGLShader& theShaderFrom,
-                                   const StGLShader& theShaderTo) {
+    ST_LOCAL StGLProgram& swapShader(StGLContext&      theCtx,
+                                     const StGLShader& theShaderFrom,
+                                     const StGLShader& theShaderTo) {
         if(&theShaderFrom != &theShaderTo) {
             detachShader(theCtx, theShaderFrom).attachShader(theCtx, theShaderTo).link(theCtx);
         }

_service:obs_scm:sview-26.obscpio/include/StGL/StGLProgramMatrix.h Changed

@@ -9,6 +9,9 @@
 
 #include <StGL/StGLProgram.h>
 
+#include <memory>
+#include <vector>
+
 /**
  * This class re-presents GLSL program which has alternative code paths,
  * dynamically switched depending on context.
@@ -30,10 +33,8 @@
     /**
      * Empty constructor.
      */
-    ST_LOCAL StGLProgramMatrix()
-    : myIsFirstInit(true) {
-        stMemZero(myVShader, sizeof(myVShader));
-        stMemZero(myFShader, sizeof(myFShader));
+    ST_LOCAL StGLProgramMatrix() {
+        //
     }
 
     /**
@@ -49,7 +50,7 @@
     ST_LOCAL virtual void release(StGLContext& theCtx) {
         releaseShaders<StGLVertexShader,   theNbVShaderSections>(theCtx, myVShaderParts);
         releaseShaders<StGLFragmentShader, theNbFShaderSections>(theCtx, myFShaderParts);
-        if(!myActiveProgram.isNull()) {
+        if (myActiveProgram.get() != nullptr) {
             myActiveProgram->release(theCtx);
         }
     }
@@ -61,17 +62,17 @@
     ST_LOCAL void registerVertexShaderPart(const int       theSection,
                                            const int       thePartIndex,
                                            const StString& thePartText) {
-        if(theSection < 0
-        || theSection >= theNbVShaderSections) {
+        if (theSection < 0
+         || theSection >= theNbVShaderSections) {
             return;
         }
 
-        StArrayList<StString>& aParts = myVShaderSrctheSection;
-        while(aParts.size() <= (size_t )thePartIndex) {
-            aParts.add("");
+        std::vector<StString>& aParts = myVShaderSrctheSection;
+        while (aParts.size() <= (size_t )thePartIndex) {
+            aParts.push_back("");
         }
 
-        aParts.changeValue(thePartIndex) = thePartText;
+        aParts.at(thePartIndex) = thePartText;
     }
 
     /**
@@ -81,17 +82,17 @@
     ST_LOCAL void registerFragmentShaderPart(const int       theSection,
                                              const int       thePartIndex,
                                              const StString& thePartText) {
-        if(theSection < 0
-        || theSection >= theNbFShaderSections) {
+        if (theSection < 0
+         || theSection >= theNbFShaderSections) {
             return;
         }
 
-        StArrayList<StString>& aParts = myFShaderSrctheSection;
-        while(aParts.size() <= (size_t )thePartIndex) {
-            aParts.add("");
+        std::vector<StString>& aParts = myFShaderSrctheSection;
+        while (aParts.size() <= (size_t )thePartIndex) {
+            aParts.push_back("");
         }
 
-        aParts.changeValue(thePartIndex) = thePartText;
+        aParts.at(thePartIndex) = thePartText;
     }
 
     /**
@@ -101,18 +102,18 @@
     ST_LOCAL bool setVertexShaderPart(StGLContext& theCtx,
                                       const int    theSection,
                                       const int    thePartIndex) {
-        if(theSection   < 0
-        || theSection   >= theNbVShaderSections
-        || thePartIndex >= (int )myVShaderSrctheSection.size()) {
+        if (theSection   < 0
+         || theSection   >= theNbVShaderSections
+         || thePartIndex >= (int )myVShaderSrctheSection.size()) {
             return false;
-        } else if(myVShadertheSection == thePartIndex) {
+        } else if (myVShadertheSection == thePartIndex) {
             return false;
         }
 
         myVShadertheSection = thePartIndex;
-        if(!myActiveProgram.isNull()) {
+        if (myActiveProgram.get() != nullptr) {
             myActiveProgram->release(theCtx);
-            myActiveProgram.nullify();
+            myActiveProgram.reset();
         }
         return true;
     }
@@ -133,9 +134,9 @@
         }
 
         myFShadertheSection = thePartIndex;
-        if(!myActiveProgram.isNull()) {
+        if (myActiveProgram.get() != nullptr) {
             myActiveProgram->release(theCtx);
-            myActiveProgram.nullify();
+            myActiveProgram.reset();
         }
         return true;
     }
@@ -165,30 +166,30 @@
     /**
      * Return program object for active configuration.
      */
-    StHandle<theProgramClass_t>& getActiveProgram() {
+    ST_LOCAL std::shared_ptr<theProgramClass_t>& getActiveProgram() {
         return myActiveProgram;
     }
 
     /**
      * Return true if active program is valid.
      */
-    bool isValid() const {
-        return !myActiveProgram.isNull()
-            &&  myActiveProgram->isValid()
-            &&  myIsActiveValid;
+    ST_LOCAL bool isValid() const {
+        return myActiveProgram.get() != nullptr
+            && myActiveProgram->isValid()
+            && myIsActiveValid;
     }
 
     /**
      * Initialize program for active configuration.
      */
-    bool initProgram(StGLContext& theCtx) {
+    ST_LOCAL bool initProgram(StGLContext& theCtx) {
         myIsActiveValid = false;
         StString aVertSrc, aFragSrc, aCfg;
         for(int aSectionIter = 0; aSectionIter < theNbVShaderSections; ++aSectionIter) {
-            const StArrayList<StString>& aSources = myVShaderSrcaSectionIter;
-            if(!aSources.isEmpty()) {
+            const std::vector<StString>& aSources = myVShaderSrcaSectionIter;
+            if(!aSources.empty()) {
                 const int anActiveSrc = myVShaderaSectionIter;
-                aVertSrc += aSources.getValue(anActiveSrc);
+                aVertSrc += aSources.at(anActiveSrc);
                 aCfg     += anActiveSrc;
             }
         #if defined(ST_DEBUG_SHADERS) && !defined(ST_HAVE_GLES2) && !defined(__ANDROID__)
@@ -196,26 +197,26 @@
                 continue;
             }
 
-            StArrayList< StHandle<StGLVertexShader> >& aShaders = myVShaderPartsaSectionIter;
+            std::vector< std::shared_ptr<StGLVertexShader> >& aShaders = myVShaderPartsaSectionIter;
             for(size_t aShaderIter = 0; aShaderIter < aSources.size(); ++aShaderIter) {
                 const StString& aSource = aSourcesaShaderIter;
-                StHandle<StGLVertexShader> aShader;
+                std::shared_ptr<StGLVertexShader> aShader;
                 if(aSource.isEmpty()) {
-                    aShaders.add(aShader);
+                    aShaders.push_back(aShader);
                     continue;
                 }
-                aShader = new StGLVertexShader(myTitle + "::VS" + aSectionIter + "::" + aShaderIter);
+                aShader = std::make_shared<StGLVertexShader>(myTitle + "::VS" + aSectionIter + "::" + aShaderIter);
                 aShader->init(theCtx, aSource.toCString());
-                aShaders.add(aShader);
+                aShaders.push_back(aShader);
             }
         #endif
         }
 
         for(int aSectionIter = 0; aSectionIter < theNbFShaderSections; ++aSectionIter) {
-            const StArrayList<StString>& aSources = myFShaderSrcaSectionIter;
-            if(!aSources.isEmpty()) {
+            const std::vector<StString>& aSources = myFShaderSrcaSectionIter;
+            if(!aSources.empty()) {
                 const int anActiveSrc = myFShaderaSectionIter;
-                aFragSrc += aSources.getValue(anActiveSrc);
+                aFragSrc += aSources.at(anActiveSrc);
                 aCfg     += anActiveSrc;
             }
         #if defined(ST_DEBUG_SHADERS) && !defined(ST_HAVE_GLES2) && !defined(__ANDROID__)
@@ -223,32 +224,32 @@
                 continue;
             }
 
-            StArrayList< StHandle<StGLFragmentShader> >& aShaders = myFShaderPartsaSectionIter;
+            std::vector< std::shared_ptr<StGLFragmentShader> >& aShaders = myFShaderPartsaSectionIter;
             for(size_t aShaderIter = 0; aShaderIter < aSources.size(); ++aShaderIter) {
                 const StString& aSource = aSourcesaShaderIter;
-                StHandle<StGLFragmentShader> aShader;
+                std::shared_ptr<StGLFragmentShader> aShader;
                 if(aSource.isEmpty()) {
-                    aShaders.add(aShader);
+                    aShaders.push_back(aShader);
                     continue;
                 }
-                aShader = new StGLFragmentShader(myTitle + "::FS" + aSectionIter + "::" + aShaderIter);
+                aShader = std::make_shared<StGLFragmentShader>(myTitle + "::FS" + aSectionIter + "::" + aShaderIter);
                 aShader->init(theCtx, aSource.toCString());
-                aShaders.add(aShader);
+                aShaders.push_back(aShader);
             }
         #endif
         }
         myIsFirstInit = false;
 
-        if(!myActiveProgram.isNull()) {
+        if (myActiveProgram.get() != nullptr) {
             myActiveProgram->release(theCtx);
-            myActiveProgram.nullify();
+            myActiveProgram.reset();
         }
 
         StGLVertexShader   aVertShader(myTitle + "::" + aCfg + "::VS");
         StGLFragmentShader aFragShader(myTitle + "::" + aCfg + "::FS");
         StGLAutoRelease    aTmp1(theCtx, aVertShader);
         StGLAutoRelease    aTmp2(theCtx, aFragShader);
-        myActiveProgram = new theProgramClass_t(myTitle + "::" + aCfg);
+        myActiveProgram = std::make_shared<theProgramClass_t>(myTitle + "::" + aCfg);
 
         bool isOk = true;
         isOk = aVertShader.init(theCtx, aVertSrc.toCString()) && isOk;
@@ -270,15 +271,15 @@
      * Release array of shaders.
      */
     template<class theShader_t, int theNbSections>
-    ST_LOCAL void releaseShaders(StGLContext&                          theCtx,
-                                 StArrayList< StHandle<theShader_t> >* theArray) {
-        for(int aSectionIter = 0; aSectionIter < theNbSections; ++aSectionIter) {
-            StArrayList< StHandle<theShader_t> >& aShaders = theArrayaSectionIter;
-            for(size_t aVShaderIter = 0; aVShaderIter < aShaders.size(); ++aVShaderIter) {
-                StHandle<theShader_t>& aShader = aShaders.changeValue(aVShaderIter);
-                if(!aShader.isNull()) {
+    ST_LOCAL void releaseShaders(StGLContext& theCtx,
+                                 std::vector< std::shared_ptr<theShader_t> >* theArray) {
+        for (int aSectionIter = 0; aSectionIter < theNbSections; ++aSectionIter) {
+            std::vector< std::shared_ptr<theShader_t> >& aShaders = theArrayaSectionIter;
+            for (size_t aVShaderIter = 0; aVShaderIter < aShaders.size(); ++aVShaderIter) {
+                std::shared_ptr<theShader_t>& aShader = aShaders.at(aVShaderIter);
+                if (aShader.get() != nullptr) {
                     aShader->release(theCtx);
-                    aShader.nullify();
+                    aShader.reset();
                 }
             }
         }
@@ -286,21 +287,21 @@
 
         protected:
 
-    StArrayList<StString>                       myVShaderSrctheNbVShaderSections;   //!< per-section code parts combinations for Vertex   Shader
-    StArrayList<StString>                       myFShaderSrctheNbFShaderSections;   //!< per-section code parts combinations for Fragment Shader
+    std::vector<StString> myVShaderSrctheNbVShaderSections; //!< per-section code parts combinations for Vertex   Shader
+    std::vector<StString> myFShaderSrctheNbFShaderSections; //!< per-section code parts combinations for Fragment Shader
 
-    StArrayList< StHandle<StGLVertexShader> >   myVShaderPartstheNbVShaderSections;
-    StArrayList< StHandle<StGLFragmentShader> > myFShaderPartstheNbFShaderSections;
+    std::vector< std::shared_ptr<StGLVertexShader> >   myVShaderPartstheNbVShaderSections;
+    std::vector< std::shared_ptr<StGLFragmentShader> > myFShaderPartstheNbFShaderSections;
 
-    int                                         myVShadertheNbVShaderSections;      //!< currently activated code parts in each section of Vertex   Shader
-    int                                         myFShadertheNbFShaderSections;      //!< currently activated code parts in each section of Fragment Shader
+    int myVShadertheNbVShaderSections {}; //!< currently activated code parts in each section of Vertex   Shader
+    int myFShadertheNbFShaderSections {}; //!< currently activated code parts in each section of Fragment Shader
 
-    //std::map< int, StHandle<theProgramClass_t> > myPrograms;      //!< map of initialized GLSL programs
-    StHandle<theProgramClass_t>                 myActiveProgram;                      //!< currently active program
-    bool                                        myIsFirstInit;
-    bool                                        myIsActiveValid;
+    //std::map< int, StHandle<theProgramClass_t> > myPrograms; //!< map of initialized GLSL programs
+    std::shared_ptr<theProgramClass_t> myActiveProgram; //!< currently active program
+    bool myIsFirstInit = true;
+    bool myIsActiveValid = false;
 
-    StString                                    myTitle;                              //!< shader program title prefix
+    StString myTitle; //!< shader program title prefix
 
 };

_service:obs_scm:sview-26.obscpio/include/StGL/StGLResource.h Changed

_service:obs_scm:sview-26.obscpio/include/StGL/StGLResources.h Changed

@@ -14,11 +14,11 @@
 
         public:
 
-    static StString getShadersRoot(const StString& theProjectName) {
+    ST_LOCAL static StString getShadersRoot(const StString& theProjectName) {
         return StProcess::getStShareFolder() + "shaders" + SYS_FS_SPLITTER + theProjectName + SYS_FS_SPLITTER;
     }
 
-    static StString getShaderFile(const StString& theProjectName,
+    ST_LOCAL static StString getShaderFile(const StString& theProjectName,
                                   const StString& theShaderName) {
         StGLResources stResources(theProjectName);
         return stResources.getShadersRoot(theShaderName);
@@ -26,10 +26,10 @@
 
         public:
 
-    StGLResources(const StString& theProjectName) : myShadersRoot(getShadersRoot(theProjectName)) {}
-    ~StGLResources() {}
+    ST_LOCAL StGLResources(const StString& theProjectName) : myShadersRoot(getShadersRoot(theProjectName)) {}
+    ST_LOCAL ~StGLResources() {}
 
-    StString getShaderFile(const StString& theShaderName) const {
+    ST_LOCAL StString getShaderFile(const StString& theShaderName) const {
         return myShadersRoot + theShaderName;
     }

_service:obs_scm:sview-26.obscpio/include/StGL/StGLSaturationMatrix.h Changed

@@ -23,7 +23,7 @@
     /**
      * Create an identity matrix (saturation 1.0).
      */
-    StGLSaturationMatrix()
+    ST_LOCAL StGLSaturationMatrix()
     : StGLMatrix(),
       mySaturation(1.0f) {
         //
@@ -32,7 +32,7 @@
     /**
      * Create saturation matrix.
      */
-    StGLSaturationMatrix(const GLfloat theSatur)
+    ST_LOCAL StGLSaturationMatrix(const GLfloat theSatur)
     : StGLMatrix(),
       mySaturation(theSatur) {
         setSaturation(theSatur);
@@ -41,14 +41,14 @@
     /**
      * Returns true if saturation value is 1.0
      */
-    bool isIdentity() const {
+    ST_LOCAL bool isIdentity() const {
         return stAreEqual(mySaturation, 1.0f, 0.0001f);
     }
 
     /**
      * Get the saturation value used on matrix creation.
      */
-    GLfloat getSaturation() const {
+    ST_LOCAL GLfloat getSaturation() const {
         return mySaturation;
     }
 
@@ -59,7 +59,7 @@
      *  0.0..1.0 - interpolated;
      * -1.0 - complement the colors (special usage).
      */
-    void setSaturation(const GLfloat theSatur) {
+    ST_LOCAL void setSaturation(const GLfloat theSatur) {
         static const StGLVec3 LUMEN_VEC(0.3086f, 0.6094f, 0.0820f);
 
         mySaturation = theSatur;

_service:obs_scm:sview-26.obscpio/include/StGL/StGLShader.h Changed

_service:obs_scm:sview-26.obscpio/include/StGL/StGLTextFormatter.h Changed

@@ -13,9 +13,6 @@
 
 class StGLVertexBuffer;
 
-template<> inline void StArray< StHandle <StArrayList <StGLVec2> > >::sort() {}
-template<> inline void StArray< StHandle <StGLVertexBuffer> >::sort() {}
-
 /**
  * This class intended to prepare formatted text.
  */
@@ -125,17 +122,17 @@
     /**
      * Retrieve formatting results.
      */
-    ST_CPPEXPORT void getResult(std::vector<GLuint>&                               theTextures,
-                                std::vector< StHandle < std::vector<StGLVec2> > >& theVertsPerTexture,
-                                std::vector< StHandle < std::vector<StGLVec2> > >& theTCrdsPerTexture) const;
+    ST_CPPEXPORT void getResult(std::vector<GLuint>& theTextures,
+                                std::vector< std::shared_ptr < std::vector<StGLVec2> > >& theVertsPerTexture,
+                                std::vector< std::shared_ptr < std::vector<StGLVec2> > >& theTCrdsPerTexture) const;
 
     /**
      * Retrieve formatting results.
      */
-    ST_CPPEXPORT void getResult(StGLContext&                                theCtx,
-                                std::vector<GLuint>&                        theTextures,
-                                StArrayList< StHandle <StGLVertexBuffer> >& theVertsPerTexture,
-                                StArrayList< StHandle <StGLVertexBuffer> >& theTCrdsPerTexture) const;
+    ST_CPPEXPORT void getResult(StGLContext& theCtx,
+                                std::vector<GLuint>& theTextures,
+                                std::vector< std::shared_ptr <StGLVertexBuffer> >& theVertsPerTexture,
+                                std::vector< std::shared_ptr <StGLVertexBuffer> >& theTCrdsPerTexture) const;
 
     /**
      * @return width of formatted text.

_service:obs_scm:sview-26.obscpio/include/StGL/StGLTexture.h Changed

@@ -23,7 +23,7 @@
 
         public:
 
-    static const GLuint NO_TEXTURE = 0;
+    static constexpr GLuint NO_TEXTURE = 0;
 
     /**
      * Function setup the best internal texture format to fit the image data.
@@ -68,7 +68,7 @@
      */
     ST_CPPEXPORT virtual void release(StGLContext& theCtx) ST_ATTR_OVERRIDE;
 
-    bool operator==(const StGLTexture& theOther) const {
+    ST_LOCAL bool operator==(const StGLTexture& theOther) const {
        return myTextureId == theOther.myTextureId;
     }
 
@@ -147,14 +147,14 @@
     /**
      * @return texture width.
      */
-    inline GLsizei getSizeX() const {
+    ST_LOCAL GLsizei getSizeX() const {
         return mySizeX;
     }
 
     /**
      * @return texture height.
      */
-    inline GLsizei getSizeY() const {
+    ST_LOCAL GLsizei getSizeY() const {
         return mySizeY;
     }
 
@@ -218,7 +218,7 @@
     /**
      * @return GL texture ID.
      */
-    inline GLuint getTextureId() const {
+    ST_LOCAL GLuint getTextureId() const {
         return myTextureId;
     }
 
@@ -239,15 +239,15 @@
 
         protected:
 
-    GLsizei mySizeX;       //!< texture width
-    GLsizei mySizeY;       //!< texture height
-    GLenum  myTarget;      //!< target - GL_TEXTURE_2D, GL_TEXTURE_CUBE_MAP, 2D texture by default
-    GLint   myTextFormat;  //!< texture format - GL_RGB, GL_RGBA,...
-    GLuint  myTextureId;   //!< GL texture ID
-    GLenum  myTextureUnit; //!< texture unit
-    GLenum  myFilterMin;   //!< current minify  texture filter (GL_TEXTURE_MIN_FILTER)
-    GLenum  myFilterMag;   //!< current magnify texture filter (GL_TEXTURE_MAG_FILTER)
-    int     myHasMipMaps;  //!< indicates if mip levels have been generated
+    GLsizei mySizeX = 0;              //!< texture width
+    GLsizei mySizeY = 0;              //!< texture height
+    GLenum  myTarget = 0;             //!< target - GL_TEXTURE_2D, GL_TEXTURE_CUBE_MAP, 2D texture by default
+    GLint   myTextFormat = 0;         //!< texture format - GL_RGB, GL_RGBA,...
+    GLuint  myTextureId = NO_TEXTURE; //!< GL texture ID
+    GLenum  myTextureUnit = 0;        //!< texture unit
+    GLenum  myFilterMin = 0;          //!< current minify  texture filter (GL_TEXTURE_MIN_FILTER)
+    GLenum  myFilterMag = 0;          //!< current magnify texture filter (GL_TEXTURE_MAG_FILTER)
+    int     myHasMipMaps = false;     //!< indicates if mip levels have been generated
 
         private:

_service:obs_scm:sview-26.obscpio/include/StGL/StGLVarLocation.h Changed

@@ -16,7 +16,7 @@
 
         public:
 
-    static const GLint NO_LOC = -1;
+    static constexpr GLint NO_LOC = -1;
 
         private:
 
@@ -27,24 +27,24 @@
     /**
      * Construct a special location which actually means NO location.
      */
-    StGLVarLocation() : myLocation(NO_LOC) {}
+    ST_LOCAL StGLVarLocation() : myLocation(NO_LOC) {}
 
     /**
      * Constructor with initialization.
      */
-    explicit StGLVarLocation(const GLint theLocation) : myLocation(theLocation) {}
+    ST_LOCAL explicit StGLVarLocation(const GLint theLocation) : myLocation(theLocation) {}
 
     /**
      * Note you may safely put invalid location in functions like glUniform*
      * - the data passed in will be silently ignored.
      * @return true if location is not equal to -1.
      */
-    bool isValid() const { return myLocation != NO_LOC; }
+    ST_LOCAL bool isValid() const { return myLocation != NO_LOC; }
 
     /**
      * Convert operators help silently put object to GL functions like glUniform*.
      */
-    operator GLint() const { return myLocation; }
+    ST_LOCAL operator GLint() const { return myLocation; }
 
 };

_service:obs_scm:sview-26.obscpio/include/StGL/StGLVec.h Changed

_service:obs_scm:sview-26.obscpio/include/StGL/StGLVertexBuffer.h Changed

@@ -50,7 +50,7 @@
     /**
      * @return true if this VBO has valid ID (was created but not necessary initialized with valid data!).
      */
-    inline bool isValid() const {
+    ST_LOCAL bool isValid() const {
         return myBufferId != 0;
     }
 
@@ -90,21 +90,6 @@
                               GLsizeiptr     theElemsCount,
                               const GLubyte* theData);
 
-    inline bool init(StGLContext&             theCtx,
-                     const StArray<StGLVec2>& theArray) {
-        return init(theCtx, 2, GLsizeiptr(theArray.size()), theArray.getFirst().getData());
-    }
-
-    inline bool init(StGLContext&             theCtx,
-                     const StArray<StGLVec3>& theArray) {
-        return init(theCtx, 3, GLsizeiptr(theArray.size()), theArray.getFirst().getData());
-    }
-
-    inline bool init(StGLContext&             theCtx,
-                     const StArray<StGLVec4>& theArray) {
-        return init(theCtx, 4, GLsizeiptr(theArray.size()), theArray.getFirst().getData());
-    }
-
     ST_LOCAL bool init(StGLContext& theCtx,
                        const std::vector<StGLVec2>& theArray) {
         return init(theCtx, 2, GLsizeiptr(theArray.size()), theArray.front().getData());
@@ -138,18 +123,18 @@
     /**
      * @return elemSize (GLsizeiptr ) - specifies the number of components per generic vertex attribute. Must be 1, 2, 3, or 4;
      */
-    inline GLsizeiptr getElemSize() const {
+    ST_LOCAL GLsizeiptr getElemSize() const {
         return myElemSize;
     }
 
-    inline GLsizeiptr getElemsCount() const {
+    ST_LOCAL GLsizeiptr getElemsCount() const {
         return myElemsCount;
     }
 
     /**
      * @return the data type of each component in the array.
      */
-    inline GLenum getDataType() const {
+    ST_LOCAL GLenum getDataType() const {
         return myDataType;
     }
 
@@ -161,49 +146,47 @@
     ST_CPPEXPORT void unBindVertexAttrib(StGLContext&    theCtx,
                                          StGLVarLocation theAttribLoc) const;
 
-    inline StString toString() const {
+    ST_LOCAL StString toString() const {
         return StString("OpenGL buffer #") + myBufferId;
     }
 
         public:
 
-    inline bool operator==(const StGLVertexBuffer& compare) const {
+    ST_LOCAL bool operator==(const StGLVertexBuffer& compare) const {
         return myBufferId == compare.myBufferId &&
                getTarget() == compare.getTarget();
     }
 
-    inline bool operator!=(const StGLVertexBuffer& compare) const {
+    ST_LOCAL bool operator!=(const StGLVertexBuffer& compare) const {
         return myBufferId != compare.myBufferId ||
                getTarget() != compare.getTarget();
     }
 
-    inline bool operator>(const StGLVertexBuffer& compare) const {
+    ST_LOCAL bool operator>(const StGLVertexBuffer& compare) const {
         return myBufferId > compare.myBufferId;
     }
 
-    inline bool operator<(const StGLVertexBuffer& compare) const {
+    ST_LOCAL bool operator<(const StGLVertexBuffer& compare) const {
         return myBufferId < compare.myBufferId;
     }
 
-    inline bool operator>=(const StGLVertexBuffer& compare) const {
+    ST_LOCAL bool operator>=(const StGLVertexBuffer& compare) const {
         return myBufferId >= compare.myBufferId;
     }
 
-    inline bool operator<=(const StGLVertexBuffer& compare) const {
+    ST_LOCAL bool operator<=(const StGLVertexBuffer& compare) const {
         return myBufferId <= compare.myBufferId;
     }
 
         private:
 
-    GLuint     myBufferId;
-    GLsizeiptr myElemSize;
-    GLsizeiptr myElemsCount;
-    GLenum     myDataType;
+    GLuint     myBufferId = 0;
+    GLsizeiptr myElemSize = 4;
+    GLsizeiptr myElemsCount = 0;
+    GLenum     myDataType = 0;
 
 };
 
-template<> inline void StArray<GLuint>::sort() {}
-
 class StGLIndexBuffer : public StGLVertexBuffer {
 
         public:
@@ -212,9 +195,9 @@
 
     ST_CPPEXPORT virtual GLenum getTarget() const ST_ATTR_OVERRIDE;
 
-    inline bool init(StGLContext&           theCtx,
-                     const StArray<GLuint>& theArray) {
-        return StGLVertexBuffer::init(theCtx, GLsizeiptr(1), GLsizeiptr(theArray.size()), &theArray.getFirst());
+    ST_LOCAL bool init(StGLContext&               theCtx,
+                       const std::vector<GLuint>& theArray) {
+        return StGLVertexBuffer::init(theCtx, GLsizeiptr(1), GLsizeiptr(theArray.size()), theArray.data());
     }
 
 };

_service:obs_scm:sview-26.obscpio/include/StGL/StParams.h Changed

@@ -32,7 +32,7 @@
 
         public:
 
-    static StString GET_VIEW_MODE_NAME(StViewSurface theViewMode) {
+    ST_LOCAL static StString GET_VIEW_MODE_NAME(StViewSurface theViewMode) {
         switch(theViewMode) {
             case StViewSurface_Cubemap:    return "cubemap";
             case StViewSurface_CubemapEAC: return "eac";
@@ -45,7 +45,7 @@
         return "flat";
     }
 
-    static StViewSurface GET_VIEW_MODE_FROM_STRING(const StString& theViewModeStr) {
+    ST_LOCAL static StViewSurface GET_VIEW_MODE_FROM_STRING(const StString& theViewModeStr) {
         if(theViewModeStr.isStartsWithIgnoreCase(stCString("cubemap"))) {
             return StViewSurface_Cubemap;
         } else if(theViewModeStr.isStartsWithIgnoreCase(stCString("eac"))) {
@@ -66,7 +66,7 @@
     /**
      * Convert panorama mode into surface view.
      */
-    static StViewSurface getViewSurfaceForPanoramaSource(StPanorama thePano, bool theToFallbackSphere) {
+    ST_LOCAL static StViewSurface getViewSurfaceForPanoramaSource(StPanorama thePano, bool theToFallbackSphere) {
         switch(thePano) {
             case StPanorama_Cubemap6_1:
             case StPanorama_Cubemap1_6:
@@ -90,37 +90,15 @@
     /**
      * Main constructor - default parameters.
      */
-    StStereoParams()
-    : Src1SizeX(0),
-      Src1SizeY(0),
-      Src2SizeX(0),
-      Src2SizeY(0),
-      ViewingMode(StViewSurface_Plain),
-      Timestamp(0.0f),
-      StereoFormat(StFormat_Mono),
-      ToSwapLR(false),
-      ToFlipCubeZ(false),
-      PanCenter(0.0f, 0.0f),
-      ScaleFactor(1.0f),
-      mySepDxPx(0),
-      mySepDxZeroPx(0),
-      mySepDyPx(0),
-      mySepRotDegrees(0.0f),
-      myXRotateDegrees(0.0f),
-      myYRotateDegrees(0.0f),
-      myZRotateDegrees(0.0f),
-      myPanYaw(0.0f),
-      myPanPitch(0.0f),
-      myPanYawZero(0.0f),
-      myPanPitchZero(0.0f),
-      myZRotateZero(0.0f) {
+    ST_LOCAL StStereoParams()
+    : PanCenter(0.0f, 0.0f) {
         //
     }
 
     /**
      * @return true if source format is MONO image.
      */
-    bool isMono() const {
+    ST_LOCAL bool isMono() const {
         return StereoFormat == StFormat_Mono;
     }
 
@@ -128,24 +106,24 @@
      * @return horizontal separation in pixels.
      * This number means delta between views.
      */
-    int getSeparationDx() const {
+    ST_LOCAL int getSeparationDx() const {
         return mySepDxZeroPx + mySepDxPx;
     }
 
     /**
      * Set horizontal separation in pixels.
      */
-    void setSeparationDx(int theValue) {
+    ST_LOCAL void setSeparationDx(int theValue) {
         mySepDxPx = theValue - mySepDxZeroPx;
     }
 
     /** Return neutral point. */
-    int getSeparationNeutral() const { return mySepDxZeroPx; }
+    ST_LOCAL int getSeparationNeutral() const { return mySepDxZeroPx; }
 
     /**
      * Setup neutral point.
      */
-    void setSeparationNeutral(int theSepDx = 0) {
+    ST_LOCAL void setSeparationNeutral(int theSepDx = 0) {
         mySepDxZeroPx = theSepDx;
     }
 
@@ -153,91 +131,91 @@
      * @return vertical separation in pixels.
      * This number means delta between views.
      */
-    GLint getSeparationDy() const {
+    ST_LOCAL GLint getSeparationDy() const {
         return mySepDyPx;
     }
 
     /**
      * Set vertical separation in pixels.
      */
-    void setSeparationDy(int theValue) {
+    ST_LOCAL void setSeparationDy(int theValue) {
         mySepDyPx = theValue;
     }
 
     /**
      * @return angular separation between views in degrees.
      */
-    float getSepRotation() const {
+    ST_LOCAL float getSepRotation() const {
         return mySepRotDegrees;
     }
 
     /**
      * @return angular separation between views in degrees.
      */
-    void setSepRotation(float theValue) {
+    ST_LOCAL void setSepRotation(float theValue) {
         mySepRotDegrees = theValue;
     }
 
     /**
      * @return angle for panorama view
      */
-    float getPanYaw() const {
+    ST_LOCAL float getPanYaw() const {
         return myPanYawZero + myPanYaw;
     }
 
     /**
      * @return angle for panorama view
      */
-    float getPanPitch() const {
+    ST_LOCAL float getPanPitch() const {
         return myPanPitchZero + myPanPitch;
     }
 
     /**
      * @return rotation angle in degrees.
      */
-    float getXRotate() const {
+    ST_LOCAL float getXRotate() const {
         return myXRotateDegrees;
     }
 
     /**
      * Change rotation angle in degrees.
      */
-    void setXRotate(float theValue) {
+    ST_LOCAL void setXRotate(float theValue) {
         myXRotateDegrees = theValue;
     }
 
     /**
      * @return rotation angle in degrees.
      */
-    float getYRotate() const {
+    ST_LOCAL float getYRotate() const {
         return myYRotateDegrees;
     }
 
     /**
      * Change rotation angle in degrees.
      */
-    void setYRotate(float theValue) {
+    ST_LOCAL void setYRotate(float theValue) {
         myYRotateDegrees = theValue;
     }
 
     /**
      * @return rotation angle in degrees.
      */
-    float getZRotate() const {
+    ST_LOCAL float getZRotate() const {
         return myZRotateZero + myZRotateDegrees;
     }
 
     /**
      * @param theAngleDegrees - rotation angle in degrees.
      */
-    void setZRotateZero(float theAngleDegrees) {
+    ST_LOCAL void setZRotateZero(float theAngleDegrees) {
         myZRotateZero = theAngleDegrees;
     }
 
     /**
      * Setup default rotation.
      */
-    void setRotateZero(float theYaw, float thePitch, float theRoll) {
+    ST_LOCAL void setRotateZero(float theYaw, float thePitch, float theRoll) {
         myPanYawZero   = theYaw;
         myPanPitchZero = thePitch;
         myZRotateZero  = theRoll;
@@ -246,7 +224,7 @@
     /**
      * @return true if rotation is not modified
      */
-    bool isZeroRotate() const {
+    ST_LOCAL bool isZeroRotate() const {
         return myPanYaw == 0.0f
             && myPanPitch == 0.0f
             && myZRotateDegrees == 0.0f;
@@ -255,35 +233,35 @@
     /**
      * @param toSwapLR set swap Left/Right flag.
      */
-    void setSwapLR(const bool theToSwapLR) {
+    ST_LOCAL void setSwapLR(const bool theToSwapLR) {
         ToSwapLR = theToSwapLR;
     }
 
     /**
      * Reverse swap Left/Right flag.
      */
-    void doSwapLR() {
+    ST_LOCAL void doSwapLR() {
         ToSwapLR = !ToSwapLR;
     }
 
     /**
      * Zoom in.
      */
-    void scaleIn(const GLfloat theDuration = 0.02f) {
+    ST_LOCAL void scaleIn(const GLfloat theDuration = 0.02f) {
         ScaleFactor *= (1.0f + theDuration);
     }
 
     /**
      * Zoom out.
      */
-    void scaleOut(const GLfloat theDuration = 0.02f) {
+    ST_LOCAL void scaleOut(const GLfloat theDuration = 0.02f) {
         ScaleFactor = stMax(ScaleFactor / (1.0f + theDuration), 0.05f);
     }
 
     /**
      * Help method used in StGLImageRegion to fit image into rectangle.
      */
-    static inline StGLVec2 getRatioScale(const GLfloat rectRatio, const GLfloat imageRatio) {
+    ST_LOCAL static inline StGLVec2 getRatioScale(const GLfloat rectRatio, const GLfloat imageRatio) {
         if(rectRatio < imageRatio) {
             return StGLVec2(rectRatio, rectRatio / imageRatio);
         } else {
@@ -291,23 +269,23 @@
         }
     }
 
-    StGLVec2 moveFlatDelta(const StGLVec2& theMoveVec,
-                           const GLfloat   theRectRatio) const {
+    ST_LOCAL StGLVec2 moveFlatDelta(const StGLVec2& theMoveVec,
+                                    const GLfloat   theRectRatio) const {
         return StGLVec2((theMoveVec.x() * theRectRatio) / ScaleFactor,
                          theMoveVec.y() / ScaleFactor);
     }
 
-    void moveFlat(const StGLVec2& theMoveVec,
+    ST_LOCAL void moveFlat(const StGLVec2& theMoveVec,
                   const GLfloat   theRectRatio) {
         PanCenter += moveFlatDelta(theMoveVec, theRectRatio);
     }
 
-    void moveSphere(const StGLVec2& theMoveVec) {
+    ST_LOCAL void moveSphere(const StGLVec2& theMoveVec) {
         myPanYaw += theMoveVec.x();
         myPanPitch = clipPitch(myPanPitch + theMoveVec.y());
     }
 
-    void moveToRight(const float theDuration = 0.02f) {
+    ST_LOCAL void moveToRight(const float theDuration = 0.02f) {
         switch(ViewingMode) {
             case StViewSurface_Sphere:
             case StViewSurface_Hemisphere:
@@ -323,7 +301,7 @@
         }
     }
 
-    void moveToLeft(const float theDuration = 0.02f) {
+    ST_LOCAL void moveToLeft(const float theDuration = 0.02f) {
         switch(ViewingMode) {
             case StViewSurface_Sphere:
             case StViewSurface_Hemisphere:
@@ -342,7 +320,7 @@
     /**
      * Clip pitch angle to the range -90, 90 degrees.
      */
-    static float clipPitch(const float thePitchDeg) {
+    ST_LOCAL static float clipPitch(const float thePitchDeg) {
         if(thePitchDeg <= -90.0f) {
             return -90.0f;
         } else if(thePitchDeg >= 90.0f) {
@@ -351,7 +329,7 @@
         return thePitchDeg;
     }
 
-    void moveToDown(const float theDuration = 0.02f) {
+    ST_LOCAL void moveToDown(const float theDuration = 0.02f) {
         switch(ViewingMode) {
             case StViewSurface_Sphere:
             case StViewSurface_Hemisphere:
@@ -367,7 +345,7 @@
         }
     }
 
-    void moveToUp(const float theDuration = 0.02f) {
+    ST_LOCAL void moveToUp(const float theDuration = 0.02f) {
         switch(ViewingMode) {
             case StViewSurface_Sphere:
             case StViewSurface_Hemisphere:
@@ -383,26 +361,26 @@
         }
     }
 
-    void incZRotate() {
+    ST_LOCAL void incZRotate() {
         myZRotateDegrees -= 90.0f;
     }
 
-    void decZRotate() {
+    ST_LOCAL void decZRotate() {
         myZRotateDegrees += 90.0f;
     }
 
-    void incZRotateL(const GLfloat theDuration = 0.02f) {
+    ST_LOCAL void incZRotateL(const GLfloat theDuration = 0.02f) {
         myZRotateDegrees -= 5.0f * theDuration;
     }
 
-    void decZRotateL(const GLfloat theDuration = 0.02f) {
+    ST_LOCAL void decZRotateL(const GLfloat theDuration = 0.02f) {
         myZRotateDegrees += 5.0f * theDuration;
     }
 
     /**
      * Reset parameters.
      */
-    bool reset() {
+    ST_LOCAL bool reset() {
         if (mySepDxPx == 0
             && mySepDyPx == 0
             && mySepRotDegrees == 0.0f
@@ -434,35 +412,36 @@
 
         public:
 
-    size_t       Src1SizeX;        //!< width  of the 1st original image
-    size_t       Src1SizeY;        //!< height of the 1st original image
-    size_t       Src2SizeX;        //!< width  of the 2nd original image
-    size_t       Src2SizeY;        //!< height of the 2nd original image
+    size_t       Src1SizeX = 0;        //!< width  of the 1st original image
+    size_t       Src1SizeY = 0;        //!< height of the 1st original image
+    size_t       Src2SizeX = 0;        //!< width  of the 2nd original image
+    size_t       Src2SizeY = 0;        //!< height of the 2nd original image
 
-    StViewSurface ViewingMode;     //!< viewing mode - panorama or flat image
-    GLfloat      Timestamp;        //!< playback timestamp
+    StViewSurface ViewingMode = StViewSurface_Plain; //!< viewing mode - panorama or flat image
 
-    StFormat     StereoFormat;     //!< stereoscopic format
-    bool         ToSwapLR;         //!< reverse left/right views
-    bool         ToFlipCubeZ;      //!< reverse Z-coordinate in cubemap
+    GLfloat       Timestamp = 0.0f; //!< playback timestamp
 
-    StGLVec2     PanCenter;        //!< relative position
-    GLfloat      ScaleFactor;      //!< scaling factor
+    StFormat     StereoFormat = StFormat_Mono; //!< stereoscopic format
+    bool         ToSwapLR = false;             //!< reverse left/right views
+    bool         ToFlipCubeZ = false;          //!< reverse Z-coordinate in cubemap
+
+    StGLVec2     PanCenter;          //!< relative position
+    GLfloat      ScaleFactor = 1.0f; //!< scaling factor
 
         private:
 
-    int   mySepDxPx;        //!< horizontal    separation in pixels
-    int   mySepDxZeroPx;    //!< zero-parallax separation in pixels
-    int   mySepDyPx;        //!< vertical      separation in pixels
-    float mySepRotDegrees;  //!< angular separation in degrees
-    float myXRotateDegrees; //!< rotation angle in degrees
-    float myYRotateDegrees; //!< rotation angle in degrees
-    float myZRotateDegrees; //!< rotation angle in degrees
-    float myPanYaw;         //!< angle for panorama view
-    float myPanPitch;       //!< angle for panorama view
-    float myPanYawZero;     //!< zero-rotation angle in degrees
-    float myPanPitchZero;   //!< zero-rotation angle in degrees
-    float myZRotateZero;    //!< zero-rotation angle in degrees
+    int   mySepDxPx = 0;           //!< horizontal    separation in pixels
+    int   mySepDxZeroPx = 0;       //!< zero-parallax separation in pixels
+    int   mySepDyPx = 0;           //!< vertical      separation in pixels
+    float mySepRotDegrees = 0.0f;  //!< angular separation in degrees
+    float myXRotateDegrees = 0.0f; //!< rotation angle in degrees
+    float myYRotateDegrees = 0.0f; //!< rotation angle in degrees
+    float myZRotateDegrees = 0.0f; //!< rotation angle in degrees
+    float myPanYaw = 0.0f;         //!< angle for panorama view
+    float myPanPitch = 0.0f;       //!< angle for panorama view
+    float myPanYawZero = 0.0f;     //!< zero-rotation angle in degrees
+    float myPanPitchZero = 0.0f;   //!< zero-rotation angle in degrees
+    float myZRotateZero = 0.0f;    //!< zero-rotation angle in degrees
 
 };

_service:obs_scm:sview-26.obscpio/include/StGL/StPlayList.h Changed

@@ -78,7 +78,7 @@
         return !myTitle.isEmpty();
     }
 
-    inline StHandle<StStereoParams> getParams() {
+    inline std::shared_ptr<StStereoParams> getParams() {
         return myStParams;
     }
 
@@ -96,7 +96,7 @@
     StPlayItem* myNextItem; //!< next item in list
     size_t      myPosition; //!< position in list
     StFileNode* myFileNode; //!< link to file node
-    StHandle<StStereoParams> myStParams; //!< stereo parameters
+    std::shared_ptr<StStereoParams> myStParams; //!< stereo parameters
     StString    myTitle;    //!< item title
     bool        myPlayFlag; //!< flag for shuffle check
 
@@ -138,7 +138,7 @@
     /**
      * Set extensions list.
      */
-    ST_CPPEXPORT void setExtensions(const StArrayList<StString>& theExtensions);
+    ST_CPPEXPORT void setExtensions(const std::vector<StString>& theExtensions);
 
     /**
      * Clear playlist.
@@ -174,34 +174,34 @@
     /**
      * Returns file node for current playing position.
      */
-    ST_CPPEXPORT StHandle<StFileNode> getCurrentFile();
+    ST_CPPEXPORT std::shared_ptr<StFileNode> getCurrentFile();
 
     /**
      * Set title for specified item.
      */
-    ST_CPPEXPORT void setTitle(const StHandle<StStereoParams>& theKey,
-                               const StString&                 theTitle);
+    ST_CPPEXPORT void setTitle(const std::shared_ptr<StStereoParams>& theKey,
+                               const StString& theTitle);
 
     /**
      * Returns file node and stereo parameters for current playing position.
      * @return true if playlist is not empty.
      */
-    ST_CPPEXPORT bool getCurrentFile(StHandle<StFileNode>&     theFileNode,
-                                     StHandle<StStereoParams>& theParams,
-                                     StHandle<StFileNode>&     thePlsFile);
+    ST_CPPEXPORT bool getCurrentFile(std::shared_ptr<StFileNode>& theFileNode,
+                                     std::shared_ptr<StStereoParams>& theParams,
+                                     std::shared_ptr<StFileNode>& thePlsFile);
 
     /**
      * Returns file node and stereo parameters for current playing position.
      * @return true if playlist is not empty.
      */
-    ST_LOCAL bool getCurrentFile(StHandle<StFileNode>&     theFileNode,
-                                 StHandle<StStereoParams>& theParams) {
-        StHandle<StFileNode> aPlsFile;
+    ST_LOCAL bool getCurrentFile(std::shared_ptr<StFileNode>& theFileNode,
+                                 std::shared_ptr<StStereoParams>& theParams) {
+        std::shared_ptr<StFileNode> aPlsFile;
         return getCurrentFile(theFileNode, theParams, aPlsFile);
     }
 
-    ST_CPPEXPORT void addToNode(const StHandle<StFileNode>& theFileNode,
-                                const StString&             thePathToAdd);
+    ST_CPPEXPORT void addToNode(const std::shared_ptr<StFileNode>& theFileNode,
+                                const StString& thePathToAdd);
 
     /**
      * Remove file from playlist.
@@ -212,7 +212,7 @@
     /**
      * Remove file from playlist and delete it physically.
      */
-    ST_LOCAL bool removePhysically(const StHandle<StFileNode>& theFileNode) {
+    ST_LOCAL bool removePhysically(const std::shared_ptr<StFileNode>& theFileNode) {
         return remove(theFileNode->getPath(), true);
     }
 
@@ -365,7 +365,7 @@
      * @param theItemId Position in recent files list
      * @return saved parameters or NULL
      */
-    ST_CPPEXPORT StHandle<StStereoParams> openRecent(const size_t theItemId);
+    ST_CPPEXPORT std::shared_ptr<StStereoParams> openRecent(const size_t theItemId);
 
     /**
      * Reset list of recently opened files.
@@ -375,8 +375,8 @@
     /**
      * Update parameters of recent item.
      */
-    ST_CPPEXPORT void updateRecent(const StHandle<StFileNode>&     theFile,
-                                   const StHandle<StStereoParams>& theParams);
+    ST_CPPEXPORT void updateRecent(const std::shared_ptr<StFileNode>& theFile,
+                                   const std::shared_ptr<StStereoParams>& theParams);
 
         public: //!< Signals
 
@@ -402,8 +402,8 @@
         private:
 
     struct StRecentItem {
-        StHandle<StFileNode>     File;
-        StHandle<StStereoParams> Params;
+        std::shared_ptr<StFileNode> File;
+        std::shared_ptr<StStereoParams> Params;
     };
 
         private:
@@ -426,8 +426,8 @@
     /**
      * Add file to list of recent files.
      */
-    ST_LOCAL const StHandle<StRecentItem>& addRecentFile(const StFileNode& theFile,
-                                                         const bool        theToFront = true);
+    ST_LOCAL const std::shared_ptr<StRecentItem>& addRecentFile(const StFileNode& theFile,
+                                                                const bool        theToFront = true);
 
     /**
      * M3U parsing stuff.
@@ -451,7 +451,7 @@
     std::deque<StPlayItem*> myStackPrev;     //!< stack of previous items (for shuffle playback)
     std::deque<StPlayItem*> myStackNext;     //!< stack of next     items (for shuffle playback)
     size_t                  myItemsCount;    //!< current playlist size
-    StArrayList<StString>   myExtensions;    //!< extensions list
+    std::vector<StString>   myExtensions;    //!< extensions list
     StStereoParams          myDefStParams;   //!< default stereo parameters
     StMinGen                myRandGen;       //!< random number generator for shuffle playback
     size_t                  myPlayedCount;   //!< played items in current iteration (< myItemsCount)
@@ -460,8 +460,8 @@
     bool                    myToLoopSingle;  //!< play single item in loop
     bool                    myIsLoopFlag;
 
-    StHandle<StRecentItem>  myPlsFile;       //!< current playlist file (if any)
-    std::deque< StHandle<StRecentItem> > myRecent; //!< list of recently opened files
+    std::shared_ptr<StRecentItem>  myPlsFile;       //!< current playlist file (if any)
+    std::deque< std::shared_ptr<StRecentItem> > myRecent; //!< list of recently opened files
     size_t                  myRecentLimit;   //!< the maximum size of list with recently opened files
     mutable bool            myIsNewRecent;   //!< flag indicates modified state of recent files list

_service:obs_scm:sview-26.obscpio/include/StGLMesh/StBndBox.h Changed

@@ -19,11 +19,11 @@
         public: //!< inheritance methods
 
     ST_CPPEXPORT virtual ~StBndBox();
-    ST_CPPEXPORT virtual void reset();
-    ST_CPPEXPORT virtual bool isIn(const StGLVec3& thePnt) const;
-    ST_CPPEXPORT virtual void enlarge(const GLfloat theTolerance);
-    ST_CPPEXPORT virtual void enlarge(const StGLVec3& theNewPnt);
-    ST_CPPEXPORT virtual void enlarge(const StArray<StGLVec3>& thePoints);
+    ST_CPPEXPORT virtual void reset() override;
+    ST_CPPEXPORT virtual bool isIn(const StGLVec3& thePnt) const override;
+    ST_CPPEXPORT virtual void enlarge(const GLfloat theTolerance) override;
+    ST_CPPEXPORT virtual void enlarge(const StGLVec3& theNewPnt) override;
+    ST_CPPEXPORT virtual void enlarge(const std::vector<StGLVec3>& thePoints) override;
 
         public:
 
@@ -41,42 +41,42 @@
     /**
      * Return the x/y/z minimal values.
      */
-    const StGLVec3& getMin() const {
+    ST_LOCAL const StGLVec3& getMin() const {
         return myMin;
     }
 
     /**
      * Return the x/y/z maximal values.
      */
-    const StGLVec3& getMax() const {
+    ST_LOCAL const StGLVec3& getMax() const {
         return myMax;
     }
 
     /**
      * Get width for the boundary box.
      */
-    GLfloat getDX() const {
+    ST_LOCAL GLfloat getDX() const {
         return myMax.x() - myMin.x();
     }
 
     /**
      * Get height for the boundary box.
      */
-    GLfloat getDY() const {
+    ST_LOCAL GLfloat getDY() const {
         return myMax.y() - myMin.y();
     }
 
     /**
      * Get DZ for the boundary box.
      */
-    GLfloat getDZ() const {
+    ST_LOCAL GLfloat getDZ() const {
         return myMax.z() - myMin.z();
     }
 
     /**
      * Compute boundary box center.
      */
-    StGLVec3 getCenter() const {
+    ST_LOCAL StGLVec3 getCenter() const {
         return StGLVec3::getLERP(myMin, myMax, 0.5f);
     }
 
@@ -92,7 +92,7 @@
      * @param theBndBox (const StBndBox& ) - another bounding box;
      * @return true if bounding boxes has intersection.
      */
-    bool areIntersect(const StBndBox& theBndBox) const {
+    ST_LOCAL bool areIntersect(const StBndBox& theBndBox) const {
         return !areDisjoint(theBndBox);
     }

_service:obs_scm:sview-26.obscpio/include/StGLMesh/StBndCameraBox.h Changed

_service:obs_scm:sview-26.obscpio/include/StGLMesh/StBndContainer.h Changed

_service:obs_scm:sview-26.obscpio/include/StGLMesh/StBndSphere.h Changed

@@ -21,29 +21,29 @@
      * for void boundary sphere.
      * @param thePoints the points set
      */
-    ST_CPPEXPORT virtual void init(const StArray<StGLVec3>& thePoints);
+    ST_CPPEXPORT virtual void init(const std::vector<StGLVec3>& thePoints);
 
     /**
      * Find a fast approximation of the bounding sphere for a point set.
      * Computed sphere is NOT the smallest one!
-     * @param thePoints (const StArray<StGLVec3>& ) - the points set.
+     * @param thePoints the points set
      */
-    ST_CPPEXPORT void initFast(const StArray<StGLVec3>& thePoints);
+    ST_CPPEXPORT void initFast(const std::vector<StGLVec3>& thePoints);
 
     /**
      * Compute the minimum volume sphere containing the input set of points using Welzl's algorithm.
-     * @param thePoints (const StArray<StGLVec3>& ) - the points set.
+     * @param thePoints the points set
      */
-    ST_CPPEXPORT void initWelzl(const StArray<StGLVec3>& thePoints);
+    ST_CPPEXPORT void initWelzl(const std::vector<StGLVec3>& thePoints);
 
         public: //!< inheritance methods
 
     ST_CPPEXPORT virtual ~StBndSphere();
-    ST_CPPEXPORT virtual void reset();
-    ST_CPPEXPORT virtual bool isIn(const StGLVec3& thePnt) const;
-    ST_CPPEXPORT virtual void enlarge(const GLfloat theTolerance);
-    ST_CPPEXPORT virtual void enlarge(const StGLVec3& theNewPnt);
-    ST_CPPEXPORT virtual void enlarge(const StArray<StGLVec3>& thePoints);
+    ST_CPPEXPORT virtual void reset() override;
+    ST_CPPEXPORT virtual bool isIn(const StGLVec3& thePnt) const override;
+    ST_CPPEXPORT virtual void enlarge(const GLfloat theTolerance) override;
+    ST_CPPEXPORT virtual void enlarge(const StGLVec3& theNewPnt) override;
+    ST_CPPEXPORT virtual void enlarge(const std::vector<StGLVec3>& thePoints) override;
 
         public:
 
@@ -52,21 +52,21 @@
     /**
      * Return the center of bounding sphere.
      */
-    const StGLVec3& getCenter() const {
+    ST_LOCAL const StGLVec3& getCenter() const {
         return myCenter;
     }
 
     /**
      * Return the radius of bounding sphere.
      */
-    GLfloat getRadius() const {
+    ST_LOCAL GLfloat getRadius() const {
         return myRadius;
     }
 
     /**
      * (Re)define the bounding sphere using known values.
      */
-    void define(const StGLVec3& theCenter, GLfloat theRadius) {
+    ST_LOCAL void define(const StGLVec3& theCenter, GLfloat theRadius) {
         myCenter = theCenter;
         myRadius = theRadius;
         StBndContainer::setDefined();

_service:obs_scm:sview-26.obscpio/include/StGLMesh/StGLMesh.h Changed

@@ -128,7 +128,7 @@
     /**
      * Access to VBO buffer using its enumeration id.
      */
-    inline StGLVertexBuffer* changeVBO(StGLVBOType theVBOType) {
+    ST_LOCAL StGLVertexBuffer* changeVBO(StGLVBOType theVBOType) {
         switch(theVBOType) {
             case ST_VBO_VERTEX: return &myVertexBuf;
             case ST_VBO_NORMAL: return &myNormalBuf;
@@ -163,7 +163,7 @@
     /**
      * Minimal bounding sphere computed for mesh.
      */
-    inline const StBndSphere& getBndSphere() const {
+    ST_LOCAL const StBndSphere& getBndSphere() const {
         return myBndSphere;
     }
 
@@ -173,11 +173,11 @@
      * Notice that this buffer may be empty even for non empty mesh if you force clean up memory
      * after VBO creation to eliminate RAM usage.
      */
-    inline const StArrayList<StGLVec3>& getVertices() const {
+    ST_LOCAL const std::vector<StGLVec3>& getVertices() const {
         return myVertices;
     }
 
-    inline StArrayList<StGLVec3>& changeVertices() {
+    ST_LOCAL std::vector<StGLVec3>& changeVertices() {
         return myVertices;
     }
 
@@ -187,17 +187,17 @@
      * Notice that this buffer may be empty even for non empty mesh if you force clean up memory
      * after VBO creation to eliminate RAM usage.
      */
-    inline const StArrayList<StGLVec3>& getNormals() const {
+    ST_LOCAL const std::vector<StGLVec3>& getNormals() const {
         return myNormals;
     }
 
-    inline StArrayList<StGLVec3>& changeNormals() {
+    ST_LOCAL std::vector<StGLVec3>& changeNormals() {
         return myNormals;
     }
 
-    ST_LOCAL StArrayList<StGLVec4>& changeColors() { return myColors; }
+    ST_LOCAL std::vector<StGLVec4>& changeColors() { return myColors; }
 
-    inline StArrayList<GLuint>& changeIndices() {
+    ST_LOCAL std::vector<GLuint>& changeIndices() {
         return myIndices;
     }
 
@@ -260,11 +260,11 @@
         protected:
 
     StBndSphere           myBndSphere;  //!< minimal boundary sphere computed for mesh
-    StArrayList<StGLVec3> myVertices;   //!< vertices array (stored in RAM)
-    StArrayList<StGLVec3> myNormals;    //!< normals array  (stored in RAM)
-    StArrayList<StGLVec2> myTCoords;    //!< texture coordinates array (stored in RAM)
-    StArrayList<StGLVec4> myColors;     //!< colors array   (stored in RAM)
-    StArrayList<GLuint>   myIndices;    //!< indices array  (stored in RAM)
+    std::vector<StGLVec3> myVertices;   //!< vertices array (stored in RAM)
+    std::vector<StGLVec3> myNormals;    //!< normals array  (stored in RAM)
+    std::vector<StGLVec2> myTCoords;    //!< texture coordinates array (stored in RAM)
+    std::vector<StGLVec4> myColors;     //!< colors array   (stored in RAM)
+    std::vector<GLuint>   myIndices;    //!< indices array  (stored in RAM)
     StGLVertexBuffer      myVertexBuf;  //!< vertices VBO   (stored in VRAM)
     StGLVertexBuffer      myNormalBuf;  //!< normals VBO    (stored in VRAM)
     StGLVertexBuffer      myTCoordBuf;  //!< texture coordinates VBO (stored in VRAM)

_service:obs_scm:sview-26.obscpio/include/StGLMesh/StGLUVSphere.h Changed

_service:obs_scm:sview-26.obscpio/include/StGLStereo/StGLQuadTexture.h Changed

@@ -8,6 +8,7 @@
 #define __StGLQuadTexture_h_
 
 #include "StGLStereoTexture.h"
+
 #include <StImage/StImage.h>
 #include <StGL/StParams.h>
 
@@ -64,10 +65,10 @@
 
         private:
 
-    StGLVec2   myDataSize;     //!< data size in the texture (x()=right and y()=bottom)
-    float      myDisplayRatio; //!< display aspect ratio
-    float      myPAR;          //!< pixel aspect ratio
-    StPanorama myPanorama;     //!< packed panorama format
+    StGLVec2   myDataSize;                  //!< data size in the texture (x()=right and y()=bottom)
+    float      myDisplayRatio = 1.0f;       //!< display aspect ratio
+    float      myPAR = 1.0f;                //!< pixel aspect ratio
+    StPanorama myPanorama = StPanorama_OFF; //!< packed panorama format
 
 };
 
@@ -84,24 +85,24 @@
      */
     ST_CPPEXPORT virtual void release(StGLContext& theCtx) ST_ATTR_OVERRIDE;
 
-    inline StHandle<StStereoParams> getSource() const {
+    ST_LOCAL std::shared_ptr<StStereoParams> getSource() const {
         return myParams;
     }
 
-    inline void setSource(const StHandle<StStereoParams>& theParams) {
+    ST_LOCAL void setSource(const std::shared_ptr<StStereoParams>& theParams) {
         myParams = theParams;
     }
 
-    inline StImage::ImgColorScale getColorScale() const {
+    ST_LOCAL StImage::ImgColorScale getColorScale() const {
         return myImgScale;
     }
 
-    inline StImage::ImgColorModel getColorModel() const {
+    ST_LOCAL StImage::ImgColorModel getColorModel() const {
         return myImgCM;
     }
 
-    inline void setColorModel(const StImage::ImgColorModel theColorModel,
-                              const StImage::ImgColorScale theColorScale) {
+    ST_LOCAL void setColorModel(const StImage::ImgColorModel theColorModel,
+                                const StImage::ImgColorScale theColorScale) {
         myImgCM    = theColorModel;
         myImgScale = theColorScale;
     }
@@ -109,28 +110,28 @@
     /**
      * @return true if main data is valid.
      */
-    inline bool isValid() const {
+    ST_LOCAL bool isValid() const {
         return myTextures0.isValid();
     }
 
     /**
      * @return sizeX (GLsizei ) - main texture width.
      */
-    inline GLsizei getSizeX() const {
+    ST_LOCAL GLsizei getSizeX() const {
         return myTextures0.getSizeX();
     }
 
     /**
      * @return sizeY (GLsizei ) - main texture height.
      */
-    inline GLsizei getSizeY() const {
+    ST_LOCAL GLsizei getSizeY() const {
         return myTextures0.getSizeY();
     }
 
     /**
      * Access to texture plane using id.
      */
-    inline StGLFrameTexture& getPlane(size_t thePlaneId = 0) {
+    ST_LOCAL StGLFrameTexture& getPlane(size_t thePlaneId = 0) {
         ST_ASSERT(thePlaneId < 4, "StGLFrameTextures::getPlane() - out of range access");
         return myTexturesthePlaneId;
     }
@@ -138,8 +139,8 @@
     /**
      * Bind as multitexture.
      */
-    inline void bind(StGLContext& theCtx,
-                     const GLenum theTextureUnit = GL_TEXTURE0) {
+    ST_LOCAL void bind(StGLContext& theCtx,
+                       const GLenum theTextureUnit = GL_TEXTURE0) {
         if(myTextures0.isValid()) { myTextures0.bind(theCtx, theTextureUnit);     }
         if(myTextures1.isValid()) { myTextures1.bind(theCtx, theTextureUnit + 1); }
         if(myTextures2.isValid()) { myTextures2.bind(theCtx, theTextureUnit + 2); }
@@ -149,7 +150,7 @@
     /**
      * Unbind textures.
      */
-    inline void unbind(StGLContext& theCtx) {
+    ST_LOCAL void unbind(StGLContext& theCtx) {
         if(myTextures3.isValid()) { myTextures3.unbind(theCtx); }
         if(myTextures2.isValid()) { myTextures2.unbind(theCtx); }
         if(myTextures1.isValid()) { myTextures1.unbind(theCtx); }
@@ -187,10 +188,11 @@
 
         private:
 
-    StHandle<StStereoParams> myParams;      //!< source pointer
-    StGLFrameTexture         myTextures4; //!< texture planes
-    StImage::ImgColorModel   myImgCM;       //!< color model
-    StImage::ImgColorScale   myImgScale;    //!< color scale
+    std::shared_ptr<StStereoParams> myParams; //!< source pointer
+
+    StGLFrameTexture       myTextures4; //!< texture planes
+    StImage::ImgColorModel myImgCM    = StImage::ImgColor_RGB;  //!< color model
+    StImage::ImgColorScale myImgScale = StImage::ImgScale_Full; //!< color scale
 
 };
 
@@ -228,21 +230,21 @@
     /**
      * @return texture (StGLFrameTextures& ) - texture from front pair (for rendering).
      */
-    inline StGLFrameTextures& getFront(const LeftOrRight theLeftOrRight) {
+    ST_LOCAL StGLFrameTextures& getFront(const LeftOrRight theLeftOrRight) {
         return myTexturesgetFrontId() + theLeftOrRight;
     }
 
     /**
      * @return texture (StGLFrameTextures& ) - texture from back pair (for filling).
      */
-    inline StGLFrameTextures& getBack(const LeftOrRight theLeftOrRight) {
+    ST_LOCAL StGLFrameTextures& getBack(const LeftOrRight theLeftOrRight) {
         return myTexturesgetBackId() + theLeftOrRight;
     }
 
     /**
      * Swap FRONT / BACK.
      */
-    inline void swapFB() {
+    ST_LOCAL void swapFB() {
         myActive = !myActive; // process swap itself
     }
 
@@ -265,18 +267,18 @@
 
         private:
 
-    inline size_t getFrontId() const {
+    ST_LOCAL size_t getFrontId() const {
         return myActive ? FRONT_TEXTURE : BACK_TEXTURE;
     }
 
-    inline size_t getBackId() const {
+    ST_LOCAL size_t getBackId() const {
         return myActive ? BACK_TEXTURE : FRONT_TEXTURE;
     }
 
         private:
 
-    StGLFrameTextures myTextures4; //!< Front and Back stereo textures
-    bool              myActive;      //!< Front/Back flag
+    StGLFrameTextures myTextures4;   //!< Front and Back stereo textures
+    bool              myActive = true; //!< Front/Back flag
 
 };

_service:obs_scm:sview-26.obscpio/include/StGLStereo/StGLStereoFrameBuffer.h Changed

@@ -77,18 +77,18 @@
      */
     ST_CPPEXPORT virtual void release(StGLContext& theCtx) ST_ATTR_OVERRIDE;
 
-    inline const StGLVertexBuffer& getQuadVertices() const {
+    ST_LOCAL const StGLVertexBuffer& getQuadVertices() const {
         return myVerticesBuf;
     }
 
-    inline const StGLVertexBuffer& getQuadTexCoords() const {
+    ST_LOCAL const StGLVertexBuffer& getQuadTexCoords() const {
         return myTexCoordBuf;
     }
 
     /**
      * Returns true if FBO was initialized.
      */
-    inline bool isValid() const {
+    ST_LOCAL bool isValid() const {
         return isValidFrameBuffer() && StGLStereoTexture::isValid();// && isValidDepthBuffer();
     }
 
@@ -117,14 +117,14 @@
     /**
      * FBO viewport width.
      */
-    inline GLsizei getVPSizeX() const {
+    ST_LOCAL GLsizei getVPSizeX() const {
         return myViewPortX;
     }
 
     /**
      * FBO viewport height.
      */
-    inline GLsizei getVPSizeY() const {
+    ST_LOCAL GLsizei getVPSizeY() const {
         return myViewPortY;
     }
 
@@ -140,21 +140,21 @@
      */
     ST_CPPEXPORT void setupViewPort(StGLContext& theCtx);
 
-    inline void bindTextureLeft(StGLContext& theCtx,
-                                const GLenum theTextureUnit = GL_TEXTURE0) {
+    ST_LOCAL void bindTextureLeft(StGLContext& theCtx,
+                                  const GLenum theTextureUnit = GL_TEXTURE0) {
         StGLStereoTexture::bindLeft(theCtx, theTextureUnit);
     }
 
-    inline void unbindTextureLeft(StGLContext& theCtx) {
+    ST_LOCAL void unbindTextureLeft(StGLContext& theCtx) {
         StGLStereoTexture::unbindLeft(theCtx);
     }
 
-    inline void bindTextureRight(StGLContext& theCtx,
-                                 const GLenum theTextureUnit = GL_TEXTURE0) {
+    ST_LOCAL void bindTextureRight(StGLContext& theCtx,
+                                   const GLenum theTextureUnit = GL_TEXTURE0) {
         StGLStereoTexture::bindRight(theCtx, theTextureUnit);
     }
 
-    inline void unbindTextureRight(StGLContext& theCtx) {
+    ST_LOCAL void unbindTextureRight(StGLContext& theCtx) {
         StGLStereoTexture::unbindRight(theCtx);
     }
 
@@ -163,7 +163,7 @@
      */
     ST_CPPEXPORT void bindBufferLeft(StGLContext& theCtx);
 
-    inline void unbindBufferLeft(StGLContext& theCtx) {
+    ST_LOCAL void unbindBufferLeft(StGLContext& theCtx) {
         StGLFrameBuffer::unbindBufferGlobal(theCtx);
     }
 
@@ -172,18 +172,18 @@
      */
     ST_CPPEXPORT void bindBufferRight(StGLContext& theCtx);
 
-    inline void unbindBufferRight(StGLContext& theCtx) {
+    ST_LOCAL void unbindBufferRight(StGLContext& theCtx) {
         StGLFrameBuffer::unbindBufferGlobal(theCtx);
     }
 
-    inline void bindMultiTexture(StGLContext& theCtx,
-                                 const GLenum theTextureUnit0 = GL_TEXTURE0,
-                                 const GLenum theTextureUnit1 = GL_TEXTURE1) {
+    ST_LOCAL void bindMultiTexture(StGLContext& theCtx,
+                                   const GLenum theTextureUnit0 = GL_TEXTURE0,
+                                   const GLenum theTextureUnit1 = GL_TEXTURE1) {
         bindTextureLeft (theCtx, theTextureUnit0);
         bindTextureRight(theCtx, theTextureUnit1);
     }
 
-    inline void unbindMultiTexture(StGLContext& theCtx) {
+    ST_LOCAL void unbindMultiTexture(StGLContext& theCtx) {
         unbindTextureLeft(theCtx);
         unbindTextureRight(theCtx);
     }
@@ -196,7 +196,7 @@
     /**
      * Validate FrameBuffer ids.
      */
-    inline bool isValidFrameBuffer() const {
+    ST_LOCAL bool isValidFrameBuffer() const {
         return myGLFBufferIdsStGLStereoTexture::LEFT_TEXTURE  != StGLFrameBuffer::NO_FRAMEBUFFER
             && myGLFBufferIdsStGLStereoTexture::RIGHT_TEXTURE != StGLFrameBuffer::NO_FRAMEBUFFER;
     }
@@ -204,19 +204,19 @@
     /**
      * Validate RenderBuffer ids.
      */
-    inline bool isValidDepthBuffer() const {
+    ST_LOCAL bool isValidDepthBuffer() const {
         return myGLDepthRBIdsStGLStereoTexture::LEFT_TEXTURE  != StGLFrameBuffer::NO_RENDERBUFFER
             && myGLDepthRBIdsStGLStereoTexture::RIGHT_TEXTURE != StGLFrameBuffer::NO_RENDERBUFFER;
     }
 
         private:
 
-    StGLVertexBuffer myVerticesBuf;     //!< buffers to draw simple fullsreen quad
+    StGLVertexBuffer myVerticesBuf;        //!< buffers to draw simple fullsreen quad
     StGLVertexBuffer myTexCoordBuf;
-    GLuint           myGLFBufferIds2; //!< FrameBuffer objects
-    GLuint           myGLDepthRBIds2; //!< RenderBuffer objects for depth ID
-    GLsizei          myViewPortX;       //!< FBO viewport width  <= texture width
-    GLsizei          myViewPortY;       //!< FBO viewport height <= texture height
+    GLuint           myGLFBufferIds2 {}; //!< FrameBuffer objects
+    GLuint           myGLDepthRBIds2 {}; //!< RenderBuffer objects for depth ID
+    GLsizei          myViewPortX = 0;      //!< FBO viewport width  <= texture width
+    GLsizei          myViewPortY = 0;      //!< FBO viewport height <= texture height
 
 };

_service:obs_scm:sview-26.obscpio/include/StGLStereo/StGLStereoTexture.h Changed

@@ -22,7 +22,7 @@
         RIGHT_TEXTURE = 1,
     };
 
-    inline void setTextureFormat(const GLint theTextureFormat) {
+    ST_LOCAL void setTextureFormat(const GLint theTextureFormat) {
         myTexturesLEFT_TEXTURE .setTextureFormat(theTextureFormat);
         myTexturesRIGHT_TEXTURE.setTextureFormat(theTextureFormat);
     }
@@ -32,7 +32,7 @@
     /**
      * Empty constructor.
      */
-    StGLStereoTexture(const GLint theTextureFormat) {
+    ST_LOCAL StGLStereoTexture(const GLint theTextureFormat) {
         setTextureFormat(theTextureFormat);
     }
 
@@ -52,7 +52,7 @@
         myTexturesRIGHT_TEXTURE.release(theCtx);
     }
 
-    bool isValid() const {
+    ST_LOCAL bool isValid() const {
         return myTexturesLEFT_TEXTURE.isValid() && myTexturesRIGHT_TEXTURE.isValid();
     }
 
@@ -65,19 +65,19 @@
      * @param theDataL
      * @return true on success.
      */
-    bool init(StGLContext&   theCtx,
-              const GLsizei  theTextureSizeX,
-              const GLsizei  theTextureSizeY,
-              const GLenum   theDataFormat,
-              const GLubyte* theDataR,
-              const GLubyte* theDataL) {
+    ST_LOCAL bool init(StGLContext&   theCtx,
+                       const GLsizei  theTextureSizeX,
+                       const GLsizei  theTextureSizeY,
+                       const GLenum   theDataFormat,
+                       const GLubyte* theDataR,
+                       const GLubyte* theDataL) {
         return myTexturesLEFT_TEXTURE .init(theCtx, theTextureSizeX, theTextureSizeY, theDataFormat, theDataL)
             && myTexturesRIGHT_TEXTURE.init(theCtx, theTextureSizeX, theTextureSizeY, theDataFormat, theDataR);
     }
 
-    bool initBlack(StGLContext&  theCtx,
-                   const GLsizei theTextureSizeX,
-                   const GLsizei theTextureSizeY) {
+    ST_LOCAL bool initBlack(StGLContext&  theCtx,
+                            const GLsizei theTextureSizeX,
+                            const GLsizei theTextureSizeY) {
         return myTexturesLEFT_TEXTURE .initBlack(theCtx, theTextureSizeX, theTextureSizeY)
             && myTexturesRIGHT_TEXTURE.initBlack(theCtx, theTextureSizeX, theTextureSizeY);
     }
@@ -86,9 +86,9 @@
      * In GL version 1.1 or greater, pData may be a NULL pointer.
      * However data of the texture will be undefined!
      */
-    bool initTrash(StGLContext&  theCtx,
-                   const GLsizei theTextureSizeX,
-                   const GLsizei theTextureSizeY) {
+    ST_LOCAL bool initTrash(StGLContext&  theCtx,
+                            const GLsizei theTextureSizeX,
+                            const GLsizei theTextureSizeY) {
         return myTexturesLEFT_TEXTURE .initTrash(theCtx, theTextureSizeX, theTextureSizeY)
             && myTexturesRIGHT_TEXTURE.initTrash(theCtx, theTextureSizeX, theTextureSizeY);
     }
@@ -96,38 +96,38 @@
     /**
      * Bind left texture.
      */
-    void bindLeft(StGLContext& theCtx,
-                  const GLenum theTextureUnit = GL_TEXTURE0) {
+    ST_LOCAL void bindLeft(StGLContext& theCtx,
+                           const GLenum theTextureUnit = GL_TEXTURE0) {
         myTexturesLEFT_TEXTURE.bind(theCtx, theTextureUnit);
     }
 
     /**
      * Bind right texture.
      */
-    void bindRight(StGLContext& theCtx,
-                   const GLenum theTextureUnit = GL_TEXTURE0) {
+    ST_LOCAL void bindRight(StGLContext& theCtx,
+                            const GLenum theTextureUnit = GL_TEXTURE0) {
         myTexturesRIGHT_TEXTURE.bind(theCtx, theTextureUnit);
     }
 
-    void unbindLeft(StGLContext& theCtx) {
+    ST_LOCAL void unbindLeft(StGLContext& theCtx) {
         myTexturesLEFT_TEXTURE.unbind(theCtx);
     }
 
-    void unbindRight(StGLContext& theCtx) {
+    ST_LOCAL void unbindRight(StGLContext& theCtx) {
         myTexturesRIGHT_TEXTURE.unbind(theCtx);
     }
 
     /**
      * @return sizeX (GLsizei ) - texture width.
      */
-    GLsizei getSizeX() const {
+    ST_LOCAL GLsizei getSizeX() const {
         return myTexturesLEFT_TEXTURE.getSizeX();
     }
 
     /**
      * @return sizeY (GLsizei ) - texture height.
      */
-    GLsizei getSizeY() const {
+    ST_LOCAL GLsizei getSizeY() const {
         return myTexturesLEFT_TEXTURE.getSizeY();
     }
 
@@ -135,8 +135,8 @@
      * Change Min and Mag filter.
      * After this call current texture will be undefined.
      */
-    void setMinMagFilter(StGLContext& theCtx,
-                         const GLenum theMinMagFilter) {
+    ST_LOCAL void setMinMagFilter(StGLContext& theCtx,
+                                  const GLenum theMinMagFilter) {
         myTexturesLEFT_TEXTURE .setMinMagFilter(theCtx, theMinMagFilter);
         myTexturesRIGHT_TEXTURE.setMinMagFilter(theCtx, theMinMagFilter);
     }
@@ -144,14 +144,14 @@
     /**
      * Return the left texture object.
      */
-    const StGLTexture& getTextureLeft() const {
+    ST_LOCAL const StGLTexture& getTextureLeft() const {
         return myTexturesLEFT_TEXTURE;
     }
 
     /**
      * Return the right texture object.
      */
-    const StGLTexture& getTextureRight() const {
+    ST_LOCAL const StGLTexture& getTextureRight() const {
         return myTexturesRIGHT_TEXTURE;
     }

_service:obs_scm:sview-26.obscpio/include/StGLStereo/StGLTextureData.h Changed

@@ -37,7 +37,7 @@
     /**
      * Default constructor
      */
-    ST_CPPEXPORT StGLTextureData(const StHandle<StGLTextureUploadParams>& theUploadParams);
+    ST_CPPEXPORT StGLTextureData(const std::shared_ptr<StGLTextureUploadParams>& theUploadParams);
 
     /**
      * Destructor.
@@ -47,15 +47,15 @@
     /**
      * @return stereo parameters for current data
      */
-    inline const StHandle<StStereoParams>& getSource() const {
+    ST_LOCAL const std::shared_ptr<StStereoParams>& getSource() const {
         return myStParams;
     }
 
     ST_LOCAL void resetStParams() {
-        myStParams.nullify();
-        if(!myDataPair.getBufferCounter().isNull()
-        || !myDataL.getBufferCounter().isNull()
-        || !myDataR.getBufferCounter().isNull()) {
+        myStParams.reset();
+        if (myDataPair.getBufferCounter().get() != nullptr
+         || myDataL.getBufferCounter().get() != nullptr
+         || myDataR.getBufferCounter().get() != nullptr) {
             reset();
         }
     }
@@ -63,7 +63,7 @@
     /**
      * @return presentation timestamp
      */
-    inline double getPTS() {
+    ST_LOCAL double getPTS() {
         return myPts;
     }
 
@@ -85,7 +85,7 @@
      * Iterator's function.
      * @return previous item
      */
-    inline StGLTextureData* getPrev() {
+    ST_LOCAL StGLTextureData* getPrev() {
         return myPrev;
     }
 
@@ -93,7 +93,7 @@
      * Iterator's function, communicate queue.
      * @param textureData setted previous item
      */
-    inline void setPrev(StGLTextureData* theTextureData) {
+    ST_LOCAL void setPrev(StGLTextureData* theTextureData) {
         myPrev = theTextureData;
         if(theTextureData != NULL) {
             theTextureData->myNext = this;
@@ -104,7 +104,7 @@
      * Iterator's function.
      * @return next item
      */
-    inline StGLTextureData* getNext() {
+    ST_LOCAL StGLTextureData* getNext() {
         return myNext;
     }
 
@@ -112,7 +112,7 @@
      * Iterator's function, communicate queue.
      * @param textureData setted next item
      */
-    inline void setNext(StGLTextureData* theTextureData) {
+    ST_LOCAL void setNext(StGLTextureData* theTextureData) {
         myNext = theTextureData;
         if(theTextureData != NULL) {
             theTextureData->myPrev = this;
@@ -129,13 +129,13 @@
      * @param theCubemap  cubemap format
      * @param thePts      presentation timestamp
      */
-    ST_CPPEXPORT void updateData(const StGLDeviceCaps&           theDevCaps,
-                                 const StImage&                  theDataL,
-                                 const StImage&                  theDataR,
-                                 const StHandle<StStereoParams>& theStParams,
-                                 const StFormat                  theFormat,
-                                 const StCubemap                 theCubemap,
-                                 const double                    thePts);
+    ST_CPPEXPORT void updateData(const StGLDeviceCaps& theDevCaps,
+                                 const StImage& theDataL,
+                                 const StImage& theDataR,
+                                 const std::shared_ptr<StStereoParams>& theStParams,
+                                 const StFormat theFormat,
+                                 const StCubemap theCubemap,
+                                 const double thePts);
 
     /**
      * Perform texture update with current data.
@@ -180,23 +180,23 @@
 
         private:
 
-    StGLTextureData*         myPrev;          //!< pointer to previous item in the list
-    StGLTextureData*         myNext;          //!< pointer to next item
+    StGLTextureData* myPrev = nullptr; //!< pointer to previous item in the list
+    StGLTextureData* myNext = nullptr; //!< pointer to next item
 
-    GLubyte*                 myDataPtr;       //!< data for left and right views
-    size_t                   myDataSizeBytes; //!< allocated data size in bytes
-    StImage                  myDataPair;
-    StImage                  myDataL;
-    StImage                  myDataR;
+    GLubyte* myDataPtr = nullptr; //!< data for left and right views
+    size_t   myDataSizeBytes = 0; //!< allocated data size in bytes
+    StImage  myDataPair;
+    StImage  myDataL;
+    StImage  myDataR;
 
-    StHandle<StStereoParams> myStParams;
-    double                   myPts;           //!< presentation timestamp
-    StFormat                 mySrcFormat;
-    StCubemap                myCubemapFormat;
+    std::shared_ptr<StStereoParams> myStParams;
+    double                   myPts = 0.0; //!< presentation timestamp
+    StFormat                 mySrcFormat = StFormat_AUTO;
+    StCubemap                myCubemapFormat = StCubemap_OFF;
 
-    StHandle<StGLTextureUploadParams> myUploadParams; //!< texture streaming parameters
-    GLsizei                  myFillFromRow;
-    GLsizei                  myFillRows;
+    std::shared_ptr<StGLTextureUploadParams> myUploadParams; //!< texture streaming parameters
+    GLsizei myFillFromRow = 0;
+    GLsizei myFillRows = 0;
 
 };

_service:obs_scm:sview-26.obscpio/include/StGLStereo/StGLTextureQueue.h Changed

@@ -90,12 +90,12 @@
      * @param theSrcPTS       PTS (presentation timestamp)
      * @return true on success
      */
-    ST_CPPEXPORT bool push(const StImage&     theSrcDataLeft,
-                           const StImage&     theSrcDataRight,
-                           const StHandle<StStereoParams>& theStParams,
-                           const StFormat     theSrcFormat,
-                           const StCubemap    theSrcCubemap,
-                           const double       theSrcPTS);
+    ST_CPPEXPORT bool push(const StImage& theSrcDataLeft,
+                           const StImage& theSrcDataRight,
+                           const std::shared_ptr<StStereoParams>& theStParams,
+                           const StFormat theSrcFormat,
+                           const StCubemap theSrcCubemap,
+                           const double theSrcPTS);
 
     /**
      * Retrieve queue statistics.
@@ -256,36 +256,37 @@
         private:
 
     StMutex          myMutexPop;
-    StGLTextureData* myDataFront;      //!< queue pointer
-    StGLTextureData* myDataSnap;       //!< snapshot pointer
+    StGLTextureData* myDataFront = nullptr; //!< queue pointer
+    StGLTextureData* myDataSnap = nullptr;  //!< snapshot pointer
     StMutex          myMutexPush;
-    StGLTextureData* myDataBack;       //!< queue pointer
+    StGLTextureData* myDataBack = nullptr;  //!< queue pointer
 
     mutable StMutex  myMutexSize;
-    size_t           myQueueSize;
-    size_t           myQueueSizeMax;
+    size_t           myQueueSize = 0;
+    size_t           myQueueSizeMax = 0;
 
     StGLQuadTexture  myQTexture;       //!< quad stereo texture
 
     StMutex          mySwapFBMutex;
-    size_t           mySwapFBCount;
+    size_t           mySwapFBCount = 0;
 
     StMutex          myMeterMutex;
     StFPSMeter       myFPSMeter;
 
     StMutex          myMutexSrcFormat;
-    int              myCurrSrcFormat;  //!< current source format
+    int              myCurrSrcFormat = StFormat_Mono; //!< current source format
 
-    double           myCurrPts;
+    double           myCurrPts = 0.0;
 
     StCondition      myNewShotEvent;
-    bool             myIsInUpdTexture; //!< private bools for plugin thread
-    bool             myIsReadyToSwap;
-    bool             myToCompress;     //!< release unused memory as fast as possible
-    volatile bool    myHasStream;      //!< flag indicates that some stream connected to this queue
+    bool             myIsInUpdTexture = false; //!< private bools for plugin thread
+    bool             myIsReadyToSwap = false;
+    bool             myToCompress = false;     //!< release unused memory as fast as possible
+    volatile bool    myHasStream = false;      //!< flag indicates that some stream connected to this queue
 
-    StGLDeviceCaps   myDeviceCaps;     //!< device capabilities
-    StHandle<StGLTextureUploadParams> myUploadParams; //!< texture streaming parameters
+    StGLDeviceCaps   myDeviceCaps; //!< device capabilities
+
+    std::shared_ptr<StGLTextureUploadParams> myUploadParams; //!< texture streaming parameters
 
 };

_service:obs_scm:sview-26.obscpio/include/StGLWidgets/StGLImageRegion.h Changed

@@ -84,32 +84,32 @@
      * Default constructor.
      */
     ST_CPPEXPORT StGLImageRegion(StGLWidget* theParent,
-                                 const StHandle<StGLTextureQueue>& theTextureQueue,
-                                 const bool  theUsePanningKeys);
+                                 const std::shared_ptr<StGLTextureQueue>& theTextureQueue,
+                                 const bool theUsePanningKeys);
 
     /**
      * Return playlist.
      */
-    ST_LOCAL const StHandle<StPlayList>& getPlayList() const {
+    ST_LOCAL const std::shared_ptr<StPlayList>& getPlayList() const {
         return myList;
     }
 
     /**
      * Set playlist.
      */
-    ST_LOCAL void setPlayList(const StHandle<StPlayList>& theList) {
+    ST_LOCAL void setPlayList(const std::shared_ptr<StPlayList>& theList) {
         myList = theList;
     }
 
     /**
      * Return icon widget displayed on swipe gesture.
      */
-    StGLIcon* changeIconPrev() { return myIconPrev; }
+    ST_LOCAL StGLIcon* changeIconPrev() { return myIconPrev; }
 
     /**
      * Return icon widget displayed on swipe gesture.
      */
-    StGLIcon* changeIconNext() { return myIconNext; }
+    ST_LOCAL StGLIcon* changeIconNext() { return myIconNext; }
 
     /**
      * Setup device orientation.
@@ -119,22 +119,22 @@
     /**
      * Dragging delay in milliseconds, 0.0 by default.
      */
-    ST_LOCAL inline double getDragDelayMs() const {
+    ST_LOCAL double getDragDelayMs() const {
         return myDragDelayMs;
     }
 
     /**
      * Setup dragging delay in milliseconds.
      */
-    ST_LOCAL inline void setDragDelayMs(const double theValue) {
+    ST_LOCAL void setDragDelayMs(const double theValue) {
         myDragDelayMs = theValue;
     }
 
-    ST_LOCAL inline StHandle<StGLTextureQueue>& getTextureQueue() {
+    ST_LOCAL std::shared_ptr<StGLTextureQueue>& getTextureQueue() {
         return myTextureQueue;
     }
 
-    ST_CPPEXPORT StHandle<StStereoParams> getSource();
+    ST_CPPEXPORT std::shared_ptr<StStereoParams> getSource();
 
     /**
      * Compute the head orientation.
@@ -162,13 +162,8 @@
      */
     ST_LOCAL bool hasVideoStream() { return myHasVideoStream; }
 
-    const StArrayList< StHandle<StAction> >& getActions() const {
-        return myActions;
-    }
-
-    StArrayList< StHandle<StAction> >& changeActions() {
-        return myActions;
-    }
+    ST_LOCAL const std::vector< StHandle<StAction> >& getActions() const { return myActions; }
+    ST_LOCAL std::vector< StHandle<StAction> >& changeActions() { return myActions; }
 
     ST_CPPEXPORT virtual ~StGLImageRegion();
     ST_CPPEXPORT virtual void stglUpdate(const StPointD_t& thePointZo,
@@ -212,7 +207,7 @@
         StHandle<StFloat32Param>      Saturation;            //!< saturation value
 
         // per file parameters
-        StHandle<StStereoParams>      stereoFile;
+        std::shared_ptr<StStereoParams> stereoFile;
         StHandle<StBoolParamNamed>    SwapLR;                //!< reversion flag
         StHandle<StInt32ParamNamed>   ViewMode;              //!< StStereoParams::ViewMode
         StHandle<StFloat32Param>      SeparationDX;          //!< DX separation
@@ -240,37 +235,37 @@
     ST_LOCAL void doParamsReset(const size_t ) { resetParams(); }
 
     ST_LOCAL void doParamsGamma(const size_t theDir) {
-        if(!params.stereoFile.isNull()) {
+        if (params.stereoFile.get() != nullptr) {
             theDir == 1 ? params.Gamma->increment() : params.Gamma->decrement();
         }
     }
 
     ST_LOCAL void doParamsSepX(const size_t theDir) {
-        if(!params.stereoFile.isNull()) {
+        if (params.stereoFile.get() != nullptr) {
             theDir == 1 ? params.SeparationDX->increment() : params.SeparationDX->decrement();
         }
     }
 
     ST_LOCAL void doParamsSepY(const size_t theDir) {
-        if(!params.stereoFile.isNull()) {
+        if (params.stereoFile.get() != nullptr) {
             theDir == 1 ? params.SeparationDY->increment() : params.SeparationDY->decrement();
         }
     }
 
     ST_LOCAL void doParamsRotZ90(const size_t theDir) {
-        if(!params.stereoFile.isNull()) {
+        if (params.stereoFile.get() != nullptr) {
             theDir == 1 ? params.stereoFile->incZRotate() : params.stereoFile->decZRotate();
         }
     }
 
     ST_LOCAL void doParamsRotZLeft(const double theValue) {
-        if(!params.stereoFile.isNull()) {
+        if (params.stereoFile.get() != nullptr) {
             params.stereoFile->decZRotateL((GLfloat )theValue);
         }
     }
 
     ST_LOCAL void doParamsRotZRight(const double theValue) {
-        if(!params.stereoFile.isNull()) {
+        if (params.stereoFile.get() != nullptr) {
             params.stereoFile->incZRotateL((GLfloat )theValue);
         }
     }
@@ -304,27 +299,27 @@
     }
 
     ST_LOCAL void doParamsPanLeft(const double theValue) {
-        if(!params.stereoFile.isNull()) { params.stereoFile->moveToRight((GLfloat )theValue); }
+        if (params.stereoFile.get() != nullptr) { params.stereoFile->moveToRight((GLfloat )theValue); }
     }
 
     ST_LOCAL void doParamsPanRight(const double theValue) {
-        if(!params.stereoFile.isNull()) { params.stereoFile->moveToLeft((GLfloat )theValue); }
+        if (params.stereoFile.get() != nullptr) { params.stereoFile->moveToLeft((GLfloat )theValue); }
     }
 
     ST_LOCAL void doParamsPanUp(const double theValue) {
-        if(!params.stereoFile.isNull()) { params.stereoFile->moveToDown((GLfloat )theValue); }
+        if (params.stereoFile.get() != nullptr) { params.stereoFile->moveToDown((GLfloat )theValue); }
     }
 
     ST_LOCAL void doParamsPanDown(const double theValue) {
-        if(!params.stereoFile.isNull()) { params.stereoFile->moveToUp((GLfloat )theValue); }
+        if (params.stereoFile.get() != nullptr) { params.stereoFile->moveToUp((GLfloat )theValue); }
     }
 
     ST_LOCAL void doParamsScaleIn(const double theValue) {
-        if(!params.stereoFile.isNull()) { params.stereoFile->scaleIn((GLfloat )theValue); }
+        if (params.stereoFile.get() != nullptr) { params.stereoFile->scaleIn((GLfloat )theValue); }
     }
 
     ST_LOCAL void doParamsScaleOut(const double theValue) {
-        if(!params.stereoFile.isNull()) { params.stereoFile->scaleOut((GLfloat )theValue); }
+        if (params.stereoFile.get() != nullptr) { params.stereoFile->scaleOut((GLfloat )theValue); }
     }
 
     ST_LOCAL void doParamsRotYLeft (const double theValue);
@@ -353,39 +348,40 @@
 
         private: //! @name private fields
 
-    StArrayList< StHandle<StAction> >
-                               myActions;        //!< actions list
-    StHandle<StPlayList>       myList;           //!< handle to playlist
+    std::vector< StHandle<StAction> > myActions; //!< actions list
+    std::shared_ptr<StPlayList> myList;          //!< handle to playlist
 
-    StGLIcon*                  myIconPrev;       //!< icon displayed on swipe gesture
-    StGLIcon*                  myIconNext;       //!< icon displayed on swipe gesture
+    StGLIcon* myIconPrev = nullptr; //!< icon displayed on swipe gesture
+    StGLIcon* myIconNext = nullptr; //!< icon displayed on swipe gesture
 
     StGLQuads                  myQuad;           //!< flat quad
     StGLMesh                   myCube;           //!< cube for drawing cubemap
     StGLVec4                   myCubeClamp;      //!< cubemap clamping vector
-    StPanorama                 myCubePano;       //!< cubemap panorama format
+    StPanorama                 myCubePano = StPanorama_OFF; //!< cubemap panorama format
     StGLUVSphere               myUVSphere;       //!< sphere mesh object
     StGLUVSphere               myHemisphere;     //!< hemisphere mesh object
     StGLUVCylinder             myCylinder;       //!< cylinder mesh object
     StGLUVCylinder             myTheater;        //!< theater cylinder mesh object
     StGLProjCamera             myProjCam;        //!< copy of projection camera
     StGLImageProgram           myProgram;        //!< GL program to draw flat image
-    StHandle<StGLTextureQueue> myTextureQueue;   //!< shared texture queue
+
+    std::shared_ptr<StGLTextureQueue> myTextureQueue; //!< shared texture queue
+
     StPointD_t                 myClickPntZo;     //!< remembered mouse click position
     StTimer                    myClickTimer;     //!< timer to delay dragging action
     StTimer                    myFadeTimer;      //!< timer for transition to the next file
     StPointD_t                 myFadeFrom;       //!< fade starting delta
     StGLQuaternion             myDeviceQuat;     //!< device orientation
-    StVirtFlags                myKeyFlags;       //!< active key flags
-    double                     myDragDelayMs;    //!< dragging delay in milliseconds
-    double                     myDragDelayTmpMs; //!< temporary dragging delay
+    StVirtFlags                myKeyFlags = ST_VF_NONE; //!< active key flags
+    double                     myDragDelayMs = 0.0;    //!< dragging delay in milliseconds
+    double                     myDragDelayTmpMs = 0.0; //!< temporary dragging delay
     StVec2<int>                myFrameSize;      //!< frame dimensions
-    float                      mySampleRatio;    //!< sample aspect ratio
-    float                      myRotAngle;       //!< rotation angle gesture progress
-    bool                       myIsClickAborted;
-    bool                       myToRightRotate;
-    bool                       myIsInitialized;  //!< initialization state
-    bool                       myHasVideoStream; //!< should be initialized for each new stream
+    float                      mySampleRatio = 1.0f;    //!< sample aspect ratio
+    float                      myRotAngle = 0.0f;       //!< rotation angle gesture progress
+    bool                       myIsClickAborted = false;
+    bool                       myToRightRotate = false;
+    bool                       myIsInitialized = false;  //!< initialization state
+    bool                       myHasVideoStream = false; //!< should be initialized for each new stream
 
 };

_service:obs_scm:sview-26.obscpio/include/StGLWidgets/StGLMsgStack.h Changed

_service:obs_scm:sview-26.obscpio/include/StGLWidgets/StGLOpenFile.h Changed

@@ -123,8 +123,9 @@
 
         protected: //! @name class fields
 
-    StHandle<StGLTextureArray> myTextureFolder;
-    StHandle<StGLTextureArray> myTextureFile;
+    std::shared_ptr<StGLTextureArray> myTextureFolder;
+    std::shared_ptr<StGLTextureArray> myTextureFile;
+
     StGLTextArea*              myCurrentPath;
     StGLScrollArea*            myHotListContent;
     StGLMenu*                  myHotList;       //!< widget containing the list of predefined libraries
@@ -133,11 +134,11 @@
     StGLMenuCheckbox*          myExtraFilterCheck; //!< extra file filter checkbox
     StHandle<StBoolParam>      myToShowMainFilter;
     StHandle<StBoolParam>      myToShowExtraFilter;
-    StArrayList<StString>      myHotPaths;      //!< array of hot-links
+    std::vector<StString>      myHotPaths;      //!< array of hot-links
     StHandle<StFolder>         myFolder;        //!< currently opened folder
     StMIMEList                 myFilter;        //!< file filter
     StMIMEList                 myExtraFilter;   //!< extra file filter
-    StArrayList<StString>      myExtensions;    //!< extensions filter
+    std::vector<StString>      myExtensions;    //!< extensions filter
     StString                   myItemToLoad;    //!< new item to open
 
         protected: //! @name main file list settings

_service:obs_scm:sview-26.obscpio/include/StGLWidgets/StGLPlayList.h Changed

_service:obs_scm:sview-26.obscpio/include/StGLWidgets/StGLRootWidget.h Changed

@@ -14,8 +14,10 @@
 #include <StGL/StGLTexture.h>
 #include <StThreads/StResourceManager.h>
 
-template<> inline void StArray<StGLNamedTexture>::sort() {}
-typedef StArray<StGLNamedTexture> StGLTextureArray;
+#include <array>
+#include <vector>
+
+typedef std::vector<StGLNamedTexture> StGLTextureArray;
 class StGLMenuProgram;
 class StGLMessageBox;
 class StGLTextProgram;
@@ -86,7 +88,7 @@
     /**
      * Main constructor.
      */
-    ST_CPPEXPORT StGLRootWidget(const StHandle<StResourceManager>& theResMgr);
+    ST_CPPEXPORT StGLRootWidget(const std::shared_ptr<StResourceManager>& theResMgr);
 
     /**
      * Destructor.
@@ -130,8 +132,8 @@
      */
     ST_LOCAL const StString& getIcon(const StGLRootWidget::IconImage theIcon) const { return myIconstheIcon; }
 
-    ST_LOCAL StHandle<StGLTextureArray>& getCheckboxIcon() { return myCheckboxIcon; }
-    ST_LOCAL StHandle<StGLTextureArray>& getRadioIcon()    { return myRadioIcon; }
+    ST_LOCAL std::shared_ptr<StGLTextureArray>& getCheckboxIcon() { return myCheckboxIcon; }
+    ST_LOCAL std::shared_ptr<StGLTextureArray>& getRadioIcon()    { return myRadioIcon; }
 
     /**
      * Function iterate children and self to change clicking state.
@@ -317,9 +319,16 @@
      * Convert pixel coordinates (absolute) into GL coordinates.
      * Array should be 4 items length or you will got an exception!
      */
-    ST_CPPEXPORT void getRectGl(const StRectI_t&   theRectPx,
-                                StArray<StGLVec2>& theVertices,
-                                const size_t       theFromId = 0) const;
+    ST_CPPEXPORT void getRectGl(const StRectI_t& theRectPx,
+                                std::array<StGLVec2, 4>& theVertices) const;
+
+    /**
+     * Convert pixel coordinates (absolute) into GL coordinates.
+     * Array should be 4 items length or you will got an exception!
+     */
+    ST_CPPEXPORT void getRectGl(const StRectI_t& theRectPx,
+                                std::vector<StGLVec2>& theVertices,
+                                const size_t theFromId = 0) const;
 
     /**
      * Access the shared resource by unique id.
@@ -375,24 +384,24 @@
     /**
      * @return OpenGL context.
      */
-    ST_CPPEXPORT const StHandle<StGLContext>& getContextHandle() const;
+    ST_CPPEXPORT const std::shared_ptr<StGLContext>& getContextHandle() const;
 
     /**
      * Setup OpenGL context.
      */
-    ST_CPPEXPORT void setContext(const StHandle<StGLContext>& theCtx);
+    ST_CPPEXPORT void setContext(const std::shared_ptr<StGLContext>& theCtx);
 
     /**
      * Access resource manager.
      */
-    ST_LOCAL const StHandle<StResourceManager>& getResourceManager() const {
+    ST_LOCAL const std::shared_ptr<StResourceManager>& getResourceManager() const {
         return myResMgr;
     }
 
     /**
      * @return reference to shared font manager
      */
-    ST_LOCAL StHandle<StGLFontManager>& getFontManager() {
+    ST_LOCAL std::shared_ptr<StGLFontManager>& getFontManager() {
         return myGlFontMgr;
     }
 
@@ -503,48 +512,52 @@
 
         private:
 
-    StGLSharePointer**        myShareArray;    //!< resources shared within GL context (commonly used)
-    size_t                    myShareSize;
-    StHandle<StResourceManager> myResMgr;      //!< resources manager
-    StGLProjCamera            myProjCamera;    //!< projection camera
-    StGLMatrix                myScrProjMat;    //!< projection matrix within translation to the screen
-    StHandle<StGLFontManager> myGlFontMgr;     //!< shared font manager
-    StHandle<StGLContext>     myGlCtx;         //!< OpenGL context
-    GLfloat                   myScrDispX;
-    GLfloat                   myLensDist;
-    int                       myScrDispXPx;
-
-    StGLVec4                  myColorsColor_NB; //!< colors of standard elements
-    StString                  myIconsIconImage_NB;
-
-    StHandle<StGLTextureArray> myCheckboxIcon;
-    StHandle<StGLTextureArray> myRadioIcon;
-    StHandle<StGLMenuProgram>  myMenuProgram;
-    StHandle<StGLTextProgram>  myTextProgram;
-    StHandle<StGLTextBorderProgram> myTextBorderProgram;
-
-    bool                      myIsMobile;      //!< flag indicating mobile device
-    StMarginsI                myMarginsPx;     //!< active area margins in pixels
-    StRectD_t                 myRectGl;        //!< rectangle in GL coordinates
-    StRectD_t                 myRectWorkGl;    //!< rectangle of working area in GL coordinates
-    StRectI_t                 myRectPxFull;    //!< full rectangle (including non-working area)
-    GLdouble                  myScaleGlX;      //!< scale factor to optimize convertion from Pixels -> GL coordinates
-    GLdouble                  myScaleGlY;      //!< scale factor to optimize convertion from Pixels -> GL coordinates
-    GLfloat                   myScaleGUI;      //!< scale factor for GUI elements (text, icons), 1.0 by default
-    unsigned int              myResolution;    //!< resolution in DPI (for text rendering), 72 by default, stored with myScaleGUI applied
-    StPointD_t                myCursorZo;      //!< mouse cursor position
-    GLint                     myViewport4;   //!< cached GL viewport
-
-    StArrayList<StGLWidget*>  myDestroyList;   //!< list of widgets to be destroyed
-    StGLWidget*               myFocusWidget;   //!< widget currently in focus
-    StGLMessageBox*           myModalDialog;   //!< active dialog
-
-    bool                      myIsMenuPressed; //!< global flag to perform navigation in menu after first item clicked
+    StGLSharePointer** myShareArray = nullptr; //!< resources shared within GL context (commonly used)
+    size_t             myShareSize = 0;
+
+    std::shared_ptr<StResourceManager> myResMgr; //!< resources manager
+
+    StGLProjCamera            myProjCamera; //!< projection camera
+    StGLMatrix                myScrProjMat; //!< projection matrix within translation to the screen
+
+    std::shared_ptr<StGLFontManager> myGlFontMgr; //!< shared font manager
+    std::shared_ptr<StGLContext>     myGlCtx;     //!< OpenGL context
+
+    GLfloat myScrDispX = 0.0f;
+    GLfloat myLensDist = 0.0f;
+    int     myScrDispXPx = 0;
+
+    StGLVec4 myColorsColor_NB; //!< colors of standard elements
+    StString myIconsIconImage_NB;
+
+    std::shared_ptr<StGLTextureArray> myCheckboxIcon;
+    std::shared_ptr<StGLTextureArray> myRadioIcon;
+    std::shared_ptr<StGLMenuProgram>  myMenuProgram;
+    std::shared_ptr<StGLTextProgram>  myTextProgram;
+    std::shared_ptr<StGLTextBorderProgram> myTextBorderProgram;
+
+    bool         myIsMobile = false; //!< flag indicating mobile device
+    StMarginsI   myMarginsPx;        //!< active area margins in pixels
+    StRectD_t    myRectGl;           //!< rectangle in GL coordinates
+    StRectD_t    myRectWorkGl;       //!< rectangle of working area in GL coordinates
+    StRectI_t    myRectPxFull;       //!< full rectangle (including non-working area)
+    GLdouble     myScaleGlX = 1.0;   //!< scale factor to optimize convertion from Pixels -> GL coordinates
+    GLdouble     myScaleGlY = 1.0;   //!< scale factor to optimize convertion from Pixels -> GL coordinates
+    GLfloat      myScaleGUI = 1.0f;  //!< scale factor for GUI elements (text, icons), 1.0 by default
+    unsigned int myResolution = 72u; //!< resolution in DPI (for text rendering), 72 by default, stored with myScaleGUI applied
+    StPointD_t   myCursorZo;         //!< mouse cursor position
+    GLint        myViewport4 {};   //!< cached GL viewport
+
+    std::vector<StGLWidget*>  myDestroyList;           //!< list of widgets to be destroyed
+    StGLWidget*               myFocusWidget = nullptr; //!< widget currently in focus
+    StGLMessageBox*           myModalDialog = nullptr; //!< active dialog
+
+    bool myIsMenuPressed = false; //!< global flag to perform navigation in menu after first item clicked
 
         protected:
 
-    IconSize                  myMenuIconSize;  //!< scaled size of menu icon
-    int                       myClickThreshold;//!< cursor distance between click/unclick events to determine as clicking
+    IconSize myMenuIconSize   = IconSize_16; //!< scaled size of menu icon
+    int      myClickThreshold = 3;           //!< cursor distance between click/unclick events to determine as clicking
 
 };

_service:obs_scm:sview-26.obscpio/include/StGLWidgets/StGLShare.h Changed

@@ -25,16 +25,15 @@
      * Empty constructor
      */
     StGLSharePointer()
-    : myPointer(NULL),
-      myCounter(0) {
+    : myCounter(0) {
         //
     }
 
         public:
 
-    void*                 myPointer;
-    StAtomic<ptrdiff_t>   myCounter;
-    StHandle<StGLContext> myCtx;
+    void* myPointer = nullptr;
+    StAtomic<ptrdiff_t> myCounter;
+    std::shared_ptr<StGLContext> myCtx;
 
 };
 
@@ -64,29 +63,29 @@
      * Destructor
      */
     ~StGLShare() {
-        if(myEntity->myCounter.decrement() == 0) {
+        if (myEntity->myCounter.decrement() == 0) {
             Type* aPtr = (Type* )myEntity->myPointer;
-            if(aPtr != NULL) {
-                if(!myEntity->myCtx.isNull()) {
+            if (aPtr != nullptr) {
+                if (myEntity->myCtx.get() != nullptr) {
                     aPtr->release(*myEntity->myCtx);
                 }
                 delete aPtr;
             }
-            myEntity->myPointer = NULL;
-            myEntity->myCtx.nullify();
+            myEntity->myPointer = nullptr;
+            myEntity->myCtx.reset();
         }
     }
 
     /**
      * Create (assign) new instance
      */
-    void create(const StHandle<StGLContext>& theCtx,
-                Type*                        theValue) {
+    void create(const std::shared_ptr<StGLContext>& theCtx,
+                Type* theValue) {
         myEntity->myPointer = theValue;
         myEntity->myCtx     = theCtx;
     }
 
-    void setContext(const StHandle<StGLContext>& theCtx) {
+    void setContext(const std::shared_ptr<StGLContext>& theCtx) {
         myEntity->myCtx = theCtx;
     }
 
@@ -95,7 +94,7 @@
      */
     bool isNull() const
     {
-        return myEntity->myPointer == NULL;
+        return myEntity->myPointer == nullptr;
     }
 
     /**
@@ -128,7 +127,7 @@
 
         private:
 
-    StGLSharePointer*     myEntity;
+    StGLSharePointer* myEntity = nullptr;
 
 };

_service:obs_scm:sview-26.obscpio/include/StGLWidgets/StGLSubtitles.h Changed

@@ -14,10 +14,6 @@
 #include <StSettings/StEnumParam.h>
 #include <StSettings/StFloat32Param.h>
 
-// dummy
-template<>
-inline void StArray<StHandle <StSubItem> >::sort() {}
-
 class StGLImageRegion;
 
 /**
@@ -31,13 +27,13 @@
      * This class groups active subtitle items (with interleaved show time).
      * In most cases will contain just one item.
      */
-    class StSubShowItems : public StArrayList<StHandle <StSubItem> > {
+    class StSubShowItems : public StArrayList<std::shared_ptr <StSubItem> > {
 
             public:
 
-        StString     Text;  //!< active string representation
-        StImagePlane Image; //!< active image  representation
-        float        Scale; //!< image scale factor
+        StString     Text;         //!< active string representation
+        StImagePlane Image;        //!< active image  representation
+        float        Scale = 1.0f; //!< image scale factor
 
             public:
 
@@ -56,7 +52,7 @@
         /**
          * Append subtitle item.
          */
-        ST_LOCAL void add(const StHandle<StSubItem>& theItem);
+        ST_LOCAL void add(const std::shared_ptr<StSubItem>& theItem);
 
     };
 
@@ -66,7 +62,7 @@
      * Main constructor.
      */
     ST_CPPEXPORT StGLSubtitles(StGLImageRegion* theParent,
-                               const StHandle<StSubQueue>&     theSubQueue,
+                               const std::shared_ptr<StSubQueue>& theSubQueue,
                                const StHandle<StInt32Param>&   thePlace,
                                const StHandle<StFloat32Param>& theFontSize);
 
@@ -83,7 +79,7 @@
     /**
      * Retrieve handle to the queue.
      */
-    ST_CPPEXPORT const StHandle<StSubQueue>& getQueue() const;
+    ST_CPPEXPORT const std::shared_ptr<StSubQueue>& getQueue() const;
 
     /**
      * Update PTS.
@@ -106,15 +102,17 @@
 
         private:
 
-    StGLTexture              myTexture;   //!< texture for image-based subtitles
-    StGLVertexBuffer         myVertBuf;   //!< vertex buffer for image-based subtitles
-    StGLVertexBuffer         myTCrdBuf;   //!< texture coordinates buffer for image-based subtitles
-    StHandle<StSubQueue>     myQueue;     //!< thread-safe subtitles queue
-    StSubShowItems           myShowItems; //!< active (shown) subtitle items
-    double                   myPTS;       //!< active PTS
+    StGLTexture      myTexture;   //!< texture for image-based subtitles
+    StGLVertexBuffer myVertBuf;   //!< vertex buffer for image-based subtitles
+    StGLVertexBuffer myTCrdBuf;   //!< texture coordinates buffer for image-based subtitles
+
+    std::shared_ptr<StSubQueue> myQueue; //!< thread-safe subtitles queue
+
+    StSubShowItems myShowItems; //!< active (shown) subtitle items
+    double         myPTS = 0.0; //!< active PTS
 
     class StImgProgram;
-    StGLShare<StImgProgram>  myImgProgram;
+    StGLShare<StImgProgram> myImgProgram;
 
 };

_service:obs_scm:sview-26.obscpio/include/StGLWidgets/StGLSwitchTextured.h Changed

_service:obs_scm:sview-26.obscpio/include/StGLWidgets/StGLTable.h Changed

@@ -14,6 +14,8 @@
 #include <StSlots/StAction.h>
 #include <StStrings/StLangMap.h>
 
+#include <vector>
+
 class StGLTable;
 
 /**
@@ -54,10 +56,6 @@
 
 };
 
-// dummy
-template<> inline void StArray<             StGLTableItem*  >::sort() {}
-template<> inline void StArray< StArrayList<StGLTableItem*> >::sort() {}
-
 class StDictionary;
 
 /**
@@ -96,7 +94,7 @@
      */
     ST_LOCAL const StGLTableItem& getElement(const int theRowId,
                                              const int theColId) const {
-        return *myTable.getValue(theRowId).getValue(theColId);
+        return *myTable.at(theRowId).at(theColId);
     }
 
     /**
@@ -104,7 +102,7 @@
      */
     ST_LOCAL StGLTableItem& changeElement(const int theRowId,
                                           const int theColId) {
-        return *myTable.changeValue(theRowId).changeValue(theColId);
+        return *myTable.at(theRowId).at(theColId);
     }
 
     /**
@@ -183,11 +181,11 @@
 
         protected: //! @name protected fields
 
-    StArrayList< StArrayList<StGLTableItem*> >
+    std::vector< std::vector<StGLTableItem*> >
                      myTable;         //!< table content
 
-    StArrayList<int> myRowBottoms;    //!< array of rows    bottoms
-    StArrayList<int> myColRights;     //!< array of columns rights
+    std::vector<int> myRowBottoms;    //!< array of rows    bottoms
+    std::vector<int> myColRights;     //!< array of columns rights
 
     StMarginsI       myItemMargins;   //!< margins for all table elements

_service:obs_scm:sview-26.obscpio/include/StGLWidgets/StGLTextArea.h Changed

@@ -81,16 +81,23 @@
     }
 
     /**
+     * Return TRUE to show border with background.
+     */
+    ST_LOCAL bool hasBorder() const {
+        return myToShowBorder;
+    }
+
+    /**
      * @param theToShow - to show border with background or not
      */
-    inline void setBorder(const bool theToShow) {
+    ST_LOCAL void setBorder(const bool theToShow) {
         myToShowBorder = theToShow;
     }
 
     /**
      * @param theColor- border color
      */
-    inline void setBorderColor(const StGLVec3& theColor) {
+    ST_LOCAL void setBorderColor(const StGLVec3& theColor) {
         myBorderColor.r() = theColor.r();
         myBorderColor.g() = theColor.g();
         myBorderColor.b() = theColor.b();
@@ -232,33 +239,36 @@
 
         private:
 
-    std::vector<GLuint>                       myTexturesList;
-    StArrayList< StHandle<StGLVertexBuffer> > myTextVertBuf;
-    StArrayList< StHandle<StGLVertexBuffer> > myTextTCrdBuf;
+    std::vector<GLuint> myTexturesList;
 
-    StGLVertexBuffer     myBorderIVertBuf;
-    StGLVertexBuffer     myBorderOVertBuf;
+    std::vector< std::shared_ptr<StGLVertexBuffer> > myTextVertBuf;
+    std::vector< std::shared_ptr<StGLVertexBuffer> > myTextTCrdBuf;
+
+    StGLVertexBuffer myBorderIVertBuf;
+    StGLVertexBuffer myBorderOVertBuf;
 
         protected:
 
-    StHandle<StGLFont>   myFont;          //!< used font
-    StGLTextFormatter    myFormatter;     //!< text formatter
-    StString             myText;          //!< text
-    FontSize             mySize;          //!< font size
-    StGLVec4             myTextColor;     //!< text   color
-    StGLVec4             myShadowColor;   //!< shadow color
-    StGLVec4             myBackColor;     //!< text area color
-    StGLVec4             myBorderColor;   //!< text area border color
+    std::shared_ptr<StGLFont> myFont; //!< used font
+
+    StGLTextFormatter myFormatter;//!< text formatter
+
+    StString myText;              //!< text
+    FontSize mySize = SIZE_NORMAL; //!< font size
+    StGLVec4 myTextColor;     //!< text   color
+    StGLVec4 myShadowColor;   //!< shadow color
+    StGLVec4 myBackColor;     //!< text area color
+    StGLVec4 myBorderColor;   //!< text area border color
 
-    GLfloat              myTextDX;        //!< extra displacement
-    StGLRect             myTextBndBox;    //!< text boundary box
+    GLfloat  myTextDX = 0.0f; //!< extra displacement
+    StGLRect myTextBndBox;    //!< text boundary box
 
-    GLfloat              myTextWidth;     //!< text width limit
+    GLfloat myTextWidth = -1.0f; //!< text width limit
 
-    bool                 myToRecompute;   //!< flag indicates that text VBOs should be recomputed
-    bool                 myToShowBorder;  //!< to show text area border
-    bool                 myToDrawShadow;  //!< to render text shadow
-    bool                 myIsInitialized;
+    bool myToRecompute   = true;  //!< flag indicates that text VBOs should be recomputed
+    bool myToShowBorder  = false; //!< to show text area border
+    bool myToDrawShadow  = false; //!< to render text shadow
+    bool myIsInitialized = false;
 
 };

_service:obs_scm:sview-26.obscpio/include/StGLWidgets/StGLTextureButton.h Changed

@@ -166,7 +166,7 @@
     StGLVertexBuffer           myTCrdBuf;      //!< texture coordinates VBO
     StGLVec4                   myColor;        //!< button color for alpha-textures
     StGLVec4                   myShadowColor;  //!< shadow color for alpha-textures
-    StHandle<StGLTextureArray> myTextures;     //!< list of textures (button faces)
+    std::shared_ptr<StGLTextureArray> myTextures; //!< list of textures (button faces)
     size_t                     myFaceId;       //!< active button face
     float                      myOpacityScale; //!< scale factor to be applied to the widget opacity
 
@@ -203,14 +203,14 @@
     /**
      * Define externally managed textures.
      */
-    ST_LOCAL void setExternalTextures(const StHandle<StGLTextureArray>& theTextures) {
+    ST_LOCAL void setExternalTextures(const std::shared_ptr<StGLTextureArray>& theTextures) {
         myTextures          = theTextures;
         myIsExternalTexture = true;
     }
 
         protected:
 
-    bool myIsExternalTexture; //!< flag indicating that assigned texture should not be released
+    bool myIsExternalTexture = false; //!< flag indicating that assigned texture should not be released
 
 };

_service:obs_scm:sview-26.obscpio/include/StGLWidgets/StGLWidget.h Changed

_service:obs_scm:sview-26.obscpio/include/StGLWidgets/StGLWidgetList.h Changed

_service:obs_scm:sview-26.obscpio/include/StGLWidgets/StSubQueue.h Changed

@@ -8,11 +8,11 @@
 #ifndef __StSubQueue_h_
 #define __StSubQueue_h_
 
-#include <StTemplates/StHandle.h>
-#include <StTemplates/StArrayList.h>
 #include <StThreads/StMutex.h>
 #include <StImage/StImagePlane.h>
 
+#include <memory>
+
 /**
  * Subtitle primitive (Text that bound to one time interval).
  */
@@ -20,19 +20,18 @@
 
         public:
 
-    StString     Text;      //!< subtitle textual representation
-    StImagePlane Image;     //!< subtitle image   representation
-    double       TimeStart; //!< PTS to show subtitle item
-    double       TimeEnd;   //!< PTS to hide subtitle item
-    float        Scale;     //!< image scale factor
+    StString     Text;             //!< subtitle textual representation
+    StImagePlane Image;            //!< subtitle image   representation
+    double       TimeStart = 0.0;  //!< PTS to show subtitle item
+    double       TimeEnd   = 0.0;  //!< PTS to hide subtitle item
+    float        Scale     = 1.0f; //!< image scale factor
 
         public:
 
     ST_LOCAL StSubItem(double theTimeStart,
                        double theTimeEnd)
     : TimeStart(theTimeStart),
-      TimeEnd(theTimeEnd),
-      Scale(1.0f) {
+      TimeEnd(theTimeEnd) {
         //
     }
 
@@ -71,32 +70,32 @@
      * @param thePTS current presentation timestamp
      * @return new subtitle item to show or NULL handle
      */
-    ST_CPPEXPORT StHandle<StSubItem> pop(const double thePTS);
+    ST_CPPEXPORT std::shared_ptr<StSubItem> pop(const double thePTS);
 
     /**
      * Append subtitle item to the queue.
      * @param theSubItem item to add
      */
-    ST_CPPEXPORT void push(const StHandle<StSubItem>& theSubItem);
+    ST_CPPEXPORT void push(const std::shared_ptr<StSubItem>& theSubItem);
 
         private:
 
     struct QueueItem {
 
-        StHandle<StSubItem> myItem;
-        QueueItem* myNext;
+        std::shared_ptr<StSubItem> myItem;
+        QueueItem* myNext = nullptr;
 
-        ST_LOCAL QueueItem(const StHandle<StSubItem>& theItem)
+        ST_LOCAL QueueItem(const std::shared_ptr<StSubItem>& theItem)
         : myItem(theItem),
-          myNext(NULL) {}
+          myNext(nullptr) {}
 
     };
 
         private: //! @name private fields
 
-    QueueItem* myFront; //!< queue front item
-    QueueItem* myBack;  //!< queue back item
-    StMutex    myMutex; //!< lock for thread safety
+    QueueItem* myFront = nullptr; //!< queue front item
+    QueueItem* myBack  = nullptr; //!< queue back item
+    StMutex    myMutex;           //!< lock for thread safety
 
 };

_service:obs_scm:sview-26.obscpio/include/StImage/StDevILImage.h Changed

_service:obs_scm:sview-26.obscpio/include/StImage/StExifDir.h Changed

@@ -10,9 +10,10 @@
 #include "StExifEntry.h"
 
 #include <StAlienData.h>
+#include <StStrings/StString.h>
 
-#include <StTemplates/StHandle.h>
-#include <StTemplates/StArrayList.h>
+#include <memory>
+#include <vector>
 
 class StDictionary;
 
@@ -36,7 +37,7 @@
         DType_MPO,        //!< MP extensions
     };
 
-    typedef StArrayList< StHandle<StExifDir> > List;
+    typedef std::vector< std::shared_ptr<StExifDir> > List;
 
     /**
      * Structure for search request.
@@ -65,7 +66,7 @@
         public:
 
     StExifDir::List           SubDirs; //!< subdirectories list
-    StArrayList<StExifEntry>  Entries; //!< entries list
+    std::vector<StExifEntry>  Entries; //!< entries list
 
     DirType  Type;        //!< tags from different vendors/extensions may has overlapped ids
     bool     IsFileBE;    //!< indicate that data in this EXIF directory stored in Big-Endian order
@@ -146,7 +147,4 @@
 
 };
 
-template<>
-inline void StArray< StHandle<StExifDir> >::sort() {}
-
 #endif // __StExifDir_h_

_service:obs_scm:sview-26.obscpio/include/StImage/StFreeImage.h Changed

_service:obs_scm:sview-26.obscpio/include/StImage/StImage.h Changed

@@ -9,6 +9,8 @@
 
 #include "StImagePlane.h"
 
+#include <memory>
+
 /**
  * Interface to share arbitrary memory buffer using reference counter.
  */
@@ -26,7 +28,7 @@
      * If theOther has the same type, than the ref counter will be reused.
      * Otherwise then new counter will be allocated.
      */
-    virtual void createReference(StHandle<StBufferCounter>& theOther) const = 0;
+    virtual void createReference(std::shared_ptr<StBufferCounter>& theOther) const = 0;
 
     /**
      * Release current reference.
@@ -142,42 +144,42 @@
     /**
      * @return true if all color components are stored in one plane (thus - interleaved).
      */
-    inline bool isPacked() const {
+    ST_LOCAL bool isPacked() const {
         return myPlanes1.isNull();
     }
 
     /**
      * @return true if color components are stored in separate image planes.
      */
-    inline bool isPlanar() const {
+    ST_LOCAL bool isPlanar() const {
         return !myPlanes1.isNull();
     }
 
     /**
      * @return color model
      */
-    inline ImgColorModel getColorModel() const {
+    ST_LOCAL ImgColorModel getColorModel() const {
         return myColorModel;
     }
 
     /**
      * Setup color model.
      */
-    inline void setColorModel(const ImgColorModel theColorModel) {
+    ST_LOCAL void setColorModel(const ImgColorModel theColorModel) {
         myColorModel = theColorModel;
     }
 
     /**
      * @return color scale (range)
      */
-    inline ImgColorScale getColorScale() const {
+    ST_LOCAL ImgColorScale getColorScale() const {
         return myColorScale;
     }
 
     /**
      * Setup color scale (range).
      */
-    inline void setColorScale(const ImgColorScale theColorScale) {
+    ST_LOCAL void setColorScale(const ImgColorScale theColorScale) {
         myColorScale = theColorScale;
     }
 
@@ -185,7 +187,7 @@
      * Determine the color model from image plane.
      * Valid only for packed image.
      */
-    inline void setColorModelPacked(const StImagePlane::ImgFormat theImgFormat) {
+    ST_LOCAL void setColorModelPacked(const StImagePlane::ImgFormat theImgFormat) {
         switch(theImgFormat) {
             case StImagePlane::ImgGray:
             case StImagePlane::ImgGrayF:
@@ -208,7 +210,7 @@
     /**
      * @return width / height.
      */
-    inline GLfloat getRatio() const {
+    ST_LOCAL GLfloat getRatio() const {
         size_t aSizeY = getSizeY();
         return (aSizeY > 0) ? (GLfloat(getSizeX()) / GLfloat(aSizeY)) : 1.0f;
     }
@@ -223,21 +225,21 @@
     /**
      * @return image width in pixels.
      */
-    inline size_t getSizeX() const {
+    ST_LOCAL size_t getSizeX() const {
         return myPlanes0.getSizeX();
     }
 
     /**
      * @return image height in pixels.
      */
-    inline size_t getSizeY() const {
+    ST_LOCAL size_t getSizeY() const {
         return myPlanes0.getSizeY();
     }
 
     /**
      * Access to the image plane by ID (from 0 to 3).
      */
-    inline const StImagePlane& getPlane(const size_t theId = 0) const {
+    ST_LOCAL const StImagePlane& getPlane(const size_t theId = 0) const {
         ST_ASSERT(theId < 4, "StImage::getPlane() - Out of range access");
         return myPlanestheId;
     }
@@ -245,7 +247,7 @@
     /**
      * Access to the image plane by ID (from 0 to 3).
      */
-    inline StImagePlane& changePlane(const size_t theId = 0) {
+    ST_LOCAL StImagePlane& changePlane(const size_t theId = 0) {
         ST_ASSERT(theId < 4, "StImage::changePlane() - Out of range access");
         return myPlanestheId;
     }
@@ -255,11 +257,11 @@
      * If pixels are quads than PAR = 1.0 (normal case).
      * PAR should be used to compute correct DAR (Display Aspect Ratio).
      */
-    inline GLfloat getPixelRatio() const {
+    ST_LOCAL GLfloat getPixelRatio() const {
         return myPAR;
     }
 
-    inline void setPixelRatio(const GLfloat thePAR) {
+    ST_LOCAL void setPixelRatio(const GLfloat thePAR) {
         myPAR = thePAR;
     }
 
@@ -276,16 +278,16 @@
     /**
      * Return reference counter for shared memory buffer.
      */
-    ST_LOCAL const StHandle<StBufferCounter>& getBufferCounter() const { return myBufCounter; }
+    ST_LOCAL const std::shared_ptr<StBufferCounter>& getBufferCounter() const { return myBufCounter; }
 
     /**
      * Dangerous method to assign reference counter for shared memory buffer.
      */
-    ST_LOCAL void setBufferCounter(const StHandle<StBufferCounter>& theCounter) { myBufCounter = theCounter; }
+    ST_LOCAL void setBufferCounter(const std::shared_ptr<StBufferCounter>& theCounter) { myBufCounter = theCounter; }
 
         protected:
 
-    ST_LOCAL inline StString getDescription() const {
+    ST_LOCAL StString getDescription() const {
        return StString() + getSizeX() + " x " + getSizeY()
             + ", " + formatImgColorModel()
             + ", " + getPlane().formatImgFormat();
@@ -299,26 +301,26 @@
     ST_CPPEXPORT StPixelRGB getRGBFromYUV(const size_t theRow,
                                           const size_t theCol) const;
 
-    inline float getScaleFactorX(const size_t thePlane) const {
+    ST_LOCAL float getScaleFactorX(const size_t thePlane) const {
         return float(getPlane(thePlane).getSizeX()) / float(getPlane(0).getSizeX());
     }
 
-    inline float getScaleFactorY(const size_t thePlane) const {
+    ST_LOCAL float getScaleFactorY(const size_t thePlane) const {
         return float(getPlane(thePlane).getSizeY()) / float(getPlane(0).getSizeY());
     }
 
-    inline size_t getScaledCol(const size_t thePlane,
-                               const size_t theCol) const {
+    ST_LOCAL size_t getScaledCol(const size_t thePlane,
+                                 const size_t theCol) const {
         return size_t(getScaleFactorX(thePlane) * float(theCol));
     }
 
-    inline size_t getScaledRow(const size_t thePlane,
-                               const size_t theRow) const {
+    ST_LOCAL size_t getScaledRow(const size_t thePlane,
+                                 const size_t theRow) const {
         return size_t(getScaleFactorY(thePlane) * float(theRow));
     }
 
     template<typename Type>
-    static inline uint8_t clamp(const Type x) {
+    static ST_LOCAL uint8_t clamp(const Type x) {
         return x < 0x00 ? 0x00 : (x > 0xff ? 0xff : uint8_t(x));
     }
 
@@ -330,11 +332,12 @@
         private:
 
     StImagePlane  myPlanes4;  //!< color planes (only 1 used for packed formats)
-    GLfloat       myPAR;        //!< pixel aspect ratio
-    ImgColorModel myColorModel; //!< color model (RGB/YUV...)
-    ImgColorScale myColorScale; //!< color scale (range)
-    StHandle<StBufferCounter>
-                  myBufCounter; //!< reference counter for shared memory buffer
+    GLfloat       myPAR = 1.0f; //!< pixel aspect ratio
+
+    ImgColorModel myColorModel = ImgColor_RGB;  //!< color model (RGB/YUV...)
+    ImgColorScale myColorScale = ImgScale_Full; //!< color scale (range)
+
+    std::shared_ptr<StBufferCounter> myBufCounter; //!< reference counter for shared memory buffer
 
 };

_service:obs_scm:sview-26.obscpio/include/StImage/StImageFile.h Changed

@@ -7,20 +7,14 @@
 #ifndef __StImageFile_h_
 #define __StImageFile_h_
 
-#include <StTemplates/StHandle.h>
 #include <StStrings/StDictionary.h>
 #include <StGLStereo/StFormatEnum.h>
 
 #include "StImage.h"
 
-class StMIME;
-
-// define StHandle template specialization
-class StImageFile;
-ST_DEFINE_HANDLE(StImageFile, StImage);
+#include <memory>
 
-class StImageFileCounter;
-ST_DEFINE_HANDLE(StImageFileCounter, StBufferCounter);
+class StMIME;
 
 /**
  * Interface extending StImage with load/save capabilities.
@@ -57,13 +51,13 @@
     /** Structure for passing parameters to image saving. */
     struct SaveImageParams {
         /** Image type. */
-        ImageType  SaveImageType;
+        ImageType SaveImageType = ST_TYPE_NONE;
         /** Stereo format to be stored as metadata. */
-        StFormat   StereoFormat;
+        StFormat  StereoFormat = StFormat_AUTO;
         /** Compression level within 0..1 range (0 minimal compression, 1 maximum, -1 default). */
-        float      Compression;
+        float     Compression = -1.0f;
 
-        SaveImageParams() : SaveImageType(ST_TYPE_NONE), StereoFormat(StFormat_AUTO), Compression(-1.0) {}
+        SaveImageParams() {}
     };
 
         public:
@@ -80,10 +74,10 @@
     ST_CPPEXPORT static ImageType guessImageType(const StString& theFileName,
                                                  const StMIME&   theMIMEType);
 
-    ST_CPPEXPORT static StHandle<StImageFile> create(const StString& thePreferred,
-                                                     ImageType       theImgType = ST_TYPE_NONE);
-    ST_CPPEXPORT static StHandle<StImageFile> create(ImageClass      thePreferred = ST_LIBAV,
-                                                     ImageType       theImgType = ST_TYPE_NONE);
+    ST_CPPEXPORT static std::shared_ptr<StImageFile> create(const StString& thePreferred,
+                                                            ImageType       theImgType = ST_TYPE_NONE);
+    ST_CPPEXPORT static std::shared_ptr<StImageFile> create(ImageClass      thePreferred = ST_LIBAV,
+                                                            ImageType       theImgType = ST_TYPE_NONE);
 
         public:
 
@@ -185,14 +179,14 @@
     /**
      * Create new instance of this class.
      */
-    virtual StHandle<StImageFile> createEmpty() const = 0;
+    virtual std::shared_ptr<StImageFile> createEmpty() const = 0;
 
         protected:
 
     StDictionary myMetadata;
     StString     myStateDescr;
-    StFormat     mySrcFormat;
-    StPanorama   mySrcPanorama;
+    StFormat     mySrcFormat = StFormat_AUTO;
+    StPanorama   mySrcPanorama = StPanorama_OFF;
 
 };
 
@@ -211,14 +205,14 @@
     /**
      * Main constructor.
      */
-    ST_CPPEXPORT StImageFileCounter(const StHandle<StImage>& theImage);
+    ST_CPPEXPORT StImageFileCounter(const std::shared_ptr<StImage>& theImage);
 
     /**
      * Create the new reference (e.g. increment counter).
      * If theOther has the same type, than the ref counter will be reused.
      * Otherwise then new counter will be allocated.
      */
-    ST_CPPEXPORT virtual void createReference(StHandle<StBufferCounter>& theOther) const ST_ATTR_OVERRIDE;
+    ST_CPPEXPORT virtual void createReference(std::shared_ptr<StBufferCounter>& theOther) const ST_ATTR_OVERRIDE;
 
     /**
      * Release current reference.
@@ -232,7 +226,7 @@
 
         private:
 
-    StHandle<StImage> myImageFile;
+    std::shared_ptr<StImage> myImageFile;
 
 };

_service:obs_scm:sview-26.obscpio/include/StImage/StJpegParser.h Changed

@@ -55,10 +55,12 @@
     struct Image {
         unsigned char*  Data;     //!< pointer to the data
         size_t          Length;   //!< data length
-        StArrayList< StHandle<StExifDir> >
+
+        std::vector< std::shared_ptr<StExifDir> >
                         Exif;     //!< EXIF sections
-        StHandle<Image> Thumb;    //!< optional thumbnail
-        StHandle<Image> Next;     //!< link to the next image in file (if any)
+        std::shared_ptr<Image> Thumb; //!< optional thumbnail
+        std::shared_ptr<Image> Next;  //!< link to the next image in file (if any)
+
         size_t          SizeX;    //!< image width  in pixels
         size_t          SizeY;    //!< image height in pixels
         uint16_t        ParX;     //!< Pixel Aspect Ratio
@@ -135,8 +137,8 @@
      */
     inline size_t getNbImages() const {
         size_t aCount = 0;
-        for(StHandle<StJpegParser::Image> anImg = myImages;
-            !anImg.isNull(); anImg = anImg->Next) {
+        for (std::shared_ptr<StJpegParser::Image> anImg = myImages;
+             anImg.get() != nullptr; anImg = anImg->Next) {
             ++aCount;
         }
         return aCount;
@@ -145,16 +147,16 @@
     /**
      * Access image with specified index
      */
-    inline StHandle<StJpegParser::Image> getImage(size_t theImgId) const {
+    inline std::shared_ptr<StJpegParser::Image> getImage(size_t theImgId) const {
         size_t aCount = 0;
-        for(StHandle<StJpegParser::Image> anImg = myImages;
-            !anImg.isNull(); anImg = anImg->Next) {
-            if(aCount == theImgId) {
+        for (std::shared_ptr<StJpegParser::Image> anImg = myImages;
+             anImg.get() != nullptr; anImg = anImg->Next) {
+            if (aCount == theImgId) {
                 return anImg;
             }
             ++aCount;
         }
-        return StHandle<StJpegParser::Image>();
+        return std::shared_ptr<StJpegParser::Image>();
     }
 
     /**
@@ -224,10 +226,10 @@
     /**
      * Parse one image in data.
      */
-    ST_CPPEXPORT StHandle<StJpegParser::Image> parseImage(const int      theImgCount,
-                                                          const int      theDepth,
-                                                          unsigned char* theDataStart,
-                                                          const bool     theToFindSOI);
+    ST_CPPEXPORT std::shared_ptr<StJpegParser::Image> parseImage(const int      theImgCount,
+                                                                 const int      theDepth,
+                                                                 unsigned char* theDataStart,
+                                                                 const bool     theToFindSOI);
 
     /**
      * Create new section at specified offset.
@@ -241,7 +243,8 @@
 
         protected:
 
-    StHandle<Image> myImages;     //!< images list
+    std::shared_ptr<Image> myImages; //!< images list
+
     ptrdiff_t       myOffsetsOffsetsNb;
                                   //!< array of offsets in image data, starting from session lenght (zero offset is invalid)
     StString        myComment;    //!< string stored in COM segment (directly in JPEG, NOT inside EXIF)

_service:obs_scm:sview-26.obscpio/include/StImage/StNsImage.h Changed

_service:obs_scm:sview-26.obscpio/include/StImage/StStbImage.h Changed

_service:obs_scm:sview-26.obscpio/include/StImage/StWicImage.h Changed

_service:obs_scm:sview-26.obscpio/include/StJNI/StJNIEnv.h Changed

_service:obs_scm:sview-26.obscpio/include/StLibrary.h Changed

@@ -11,18 +11,18 @@
 #include "StVersion.h" // header for version structure
 #if defined(_WIN32)
     #include <windows.h> // needed for mingw
-    static const stUtf8_t ST_DLIB_SUFFIX   = ".dll";
-    static const stUtf8_t ST_DLIB_EXTENSION = "dll";
+    constexpr stUtf8_t ST_DLIB_SUFFIX   = ".dll";
+    constexpr stUtf8_t ST_DLIB_EXTENSION = "dll";
 #elif defined(__APPLE__)
     #include <dlfcn.h>
     #define HMODULE void*
-    static const stUtf8_t ST_DLIB_SUFFIX   = ".dylib";
-    static const stUtf8_t ST_DLIB_EXTENSION = "dylib";
+    constexpr stUtf8_t ST_DLIB_SUFFIX   = ".dylib";
+    constexpr stUtf8_t ST_DLIB_EXTENSION = "dylib";
 #else
     #include <dlfcn.h>
     #define HMODULE void*
-    static const stUtf8_t ST_DLIB_SUFFIX   = ".so";
-    static const stUtf8_t ST_DLIB_EXTENSION = "so";
+    constexpr stUtf8_t ST_DLIB_SUFFIX   = ".so";
+    constexpr stUtf8_t ST_DLIB_EXTENSION = "so";
 #endif
 
 // std error code, returned by sView libraries
@@ -34,12 +34,12 @@
     STERROR_LIBFUNCTIONNOTFOUND = -100,
 };
 
-static const stUtf8_t STERROR_LIBNOERROR_STR              = "No library errors";
-static const stUtf8_t STERROR_LIBLOADFAILED_STR           = "Library not found";
-static const stUtf8_t STERROR_LIBFUNCTIONNOTFOUND_VER_STR = "Library testVersion function not found (bad library?)";
-static const stUtf8_t STERROR_LIBVERSIONMISSMATCH_STR     = "Library version check failed";
-static const stUtf8_t STERROR_LIBFUNCTIONNOTFOUND_STR     = "Library functions not found (maybe internal library error)!";
-static const stUtf8_t STERROR_LIBUNKNOWN_STR              = "Library error not recognized (reserved?)";
+constexpr stUtf8_t STERROR_LIBNOERROR_STR              = "No library errors";
+constexpr stUtf8_t STERROR_LIBLOADFAILED_STR           = "Library not found";
+constexpr stUtf8_t STERROR_LIBFUNCTIONNOTFOUND_VER_STR = "Library testVersion function not found (bad library?)";
+constexpr stUtf8_t STERROR_LIBVERSIONMISSMATCH_STR     = "Library version check failed";
+constexpr stUtf8_t STERROR_LIBFUNCTIONNOTFOUND_STR     = "Library functions not found (maybe internal library error)!";
+constexpr stUtf8_t STERROR_LIBUNKNOWN_STR              = "Library error not recognized (reserved?)";
 
 /**
  * Function return error description.

_service:obs_scm:sview-26.obscpio/include/StSettings/StEnumParam.h Changed

@@ -51,7 +51,7 @@
      * Returns title for active value.
      */
     ST_LOCAL StString getActiveValue() const {
-        if(myList.isEmpty()) {
+        if (myList.empty()) {
             return "";
         }
         const int32_t anActive = getValue();
@@ -61,14 +61,14 @@
     /**
      * Return the list of available options.
      */
-    ST_LOCAL const StArrayList<StString>& getValues() const {
+    ST_LOCAL const std::vector<StString>& getValues() const {
         return myList;
     }
 
     /**
      * Modify the list of available options.
      */
-    ST_LOCAL StArrayList<StString>& changeValues() {
+    ST_LOCAL std::vector<StString>& changeValues() {
         return myList;
     }
 
@@ -76,7 +76,7 @@
      * Return option label.
      */
     ST_LOCAL const StString& getOptionLabel(const int32_t theValue) const {
-        return myList.getValue(theValue);
+        return myList.at(theValue);
     }
 
     /**
@@ -89,14 +89,14 @@
         }
 
         while(myList.size() <= (size_t )theValue) {
-            myList.add(stCString(""));
+            myList.push_back(stCString(""));
         }
-        myList.changeValue(theValue) = theName;
+        myListtheValue = theName;
     }
 
         protected:
 
-    StArrayList<StString> myList;
+    std::vector<StString> myList;
 
 };

_service:obs_scm:sview-26.obscpio/include/StSettings/StParam.h Changed

@@ -8,7 +8,9 @@
 #define __StParam_h_
 
 #include <StSlots/StSignal.h>
-#include <StTemplates/StArrayList.h>
+#include <StStrings/StString.h>
+
+#include <vector>
 
 /**
  * Base class for all parameters.
@@ -22,8 +24,7 @@
 
 };
 
-template<> inline void StArray< StHandle<StParamBase> >::sort() {}
-typedef StArrayList< StHandle<StParamBase> > StParamsList;
+typedef std::vector< StHandle<StParamBase> > StParamsList;
 
 /**
  * This is a special template class that represent wrapped primitive parameter.
@@ -35,21 +36,22 @@
 
         protected:
 
-    Type myValue; //!< primitive parameter
+    // TODO switch to std::atomic<Type> after checking performance
+    volatile Type myValue; //!< primitive parameter
 
         public:
 
     /**
      * Main constructor.
      */
-    inline StParam(const Type theValue)
+    StParam(const Type theValue)
     : myValue(theValue) {}
 
     /**
      * Just retrieve the current value.
      * @return current value.
      */
-    inline virtual Type getValue() const {
+    virtual Type getValue() const {
         return myValue;
     }
 
@@ -58,7 +60,7 @@
      * @param theValue (const Type ) - new value;
      * @return true if value was changed.
      */
-    inline virtual bool setValue(const Type theValue) {
+    virtual bool setValue(const Type theValue) {
         if(getValue() != theValue) {
             myValue = theValue;
             signals.onChanged(theValue);
@@ -115,7 +117,7 @@
      * Reverse current value.
      * @return new value.
      */
-    inline bool reverse() {
+    ST_LOCAL bool reverse() {
         bool aNewValue = !getValue();
         setValue(aNewValue);
         return aNewValue;
@@ -124,7 +126,7 @@
     /**
      * Slot method for compatibility with some widgets.
      */
-    inline void doReverse(const size_t ) {
+    ST_LOCAL void doReverse(const size_t ) {
         reverse();
     }

_service:obs_scm:sview-26.obscpio/include/StSettings/StSettings.h Changed

_service:obs_scm:sview-26.obscpio/include/StSettings/StTranslations.h Changed

@@ -25,8 +25,8 @@
      * @param theResMgr     file resources manager
      * @param theModuleName module name, the subfolder where translations files should be placed
      */
-    ST_CPPEXPORT StTranslations(const StHandle<StResourceManager>& theResMgr,
-                                const StString&                    theModuleName);
+    ST_CPPEXPORT StTranslations(const std::shared_ptr<StResourceManager>& theResMgr,
+                                const StString& theModuleName);
 
     /**
      * Destructor.
@@ -53,7 +53,7 @@
     /**
      * Return list of available translations.
      */
-    const StArrayList<StString>& getLanguagesList() const {
+    const std::vector<StString>& getLanguagesList() const {
         return params.language->getValues();
     }
 
@@ -92,15 +92,10 @@
 
         private:
 
-    ST_LOCAL static const StString DEFAULT_EXTENSION;
-    ST_LOCAL static const StString DEFAULT_SUFFIX;
+    std::shared_ptr<StResourceManager> myResMgr; //!< file resource manager
 
-        private:
-
-    StHandle<StResourceManager>
-                          myResMgr;         //!< file resource manager
     StString              myModuleName;     //!< module name like 'StImageViewer'
-    StArrayList<StString> myLangFolderList; //!< translation files
+    std::vector<StString> myLangFolderList; //!< translation files
     StString              myLangCode;       //!< active language code
     bool                  myWasReloaded;    //!< flag indicates that translation was reloaded

_service:obs_scm:sview-26.obscpio/include/StSlots/StAction.h Changed

_service:obs_scm:sview-26.obscpio/include/StSlots/StSlotProxy.h Changed

_service:obs_scm:sview-26.obscpio/include/StStrings/StString.h Changed

_service:obs_scm:sview-26.obscpio/include/StStrings/StStringUnicode.h Changed

@@ -12,6 +12,16 @@
 
 #include <iostream>
 
+#ifndef ST_DEBUG
+    #define ST_DEBUG_ASSERT(expression);
+#else
+    #include <assert.h>
+    #define ST_DEBUG_ASSERT(expression); assert(expression);
+#endif
+
+template<typename Element_Type>
+class StArrayList;
+
 /**
  * This template of POD structure for constant UTF-* string.
  */
@@ -20,23 +30,17 @@
 
         public:
 
-    inline StUtfIterator<Type> iterator() const {
-        return StUtfIterator<Type>(this->String);
-    }
+    StUtfIterator<Type> iterator() const { return StUtfIterator<Type>(this->String); }
 
     /**
      * Returns the size of the buffer, excluding NULL-termination symbol
      */
-    inline size_t getSize() const {
-        return this->Size;
-    }
+    size_t getSize() const { return this->Size; }
 
     /**
      * Returns the length of the string in Unicode symbols.
      */
-    inline size_t getLength() const {
-        return this->Length;
-    }
+    size_t getLength() const { return this->Length; }
 
     /**
      * Retrieve Unicode symbol at specified position.
@@ -50,25 +54,19 @@
      * Retrieve Unicode symbol at specified position.
      * Warning! This is a slow access. Iterator should be used for consecutive parsing.
      */
-    inline stUtf32_t operator(const size_t theCharIndex) const {
-        return getChar(theCharIndex);
-    }
+    stUtf32_t operator(const size_t theCharIndex) const { return getChar(theCharIndex); }
 
     /**
      * Returns NULL-terminated Unicode string.
-     * Should not be modifed or deleted!
+     * Should not be modified or deleted!
      * @return pointer to the string
      */
-    inline const Type* toCString() const {
-        return this->String;
-    }
+    const Type* toCString() const { return this->String; }
 
     /**
      * @return true if string is empty
      */
-    inline bool isEmpty() const {
-        return this->String0 == Type(0);
-    }
+    bool isEmpty() const { return this->String0 == Type(0); }
 
     /**
      * Compares this string with another one.
@@ -81,30 +79,59 @@
     bool isEqualsIgnoreCase(const StConstStringUnicode& theCompare) const;
 
     bool isStartsWith(const StConstStringUnicode& theStartString) const;
+    bool isStartsWith(const StConstStringUnicode& theStartString, const StUtfIterator<Type>& theFrom) const;
     bool isEndsWith  (const StConstStringUnicode& theEndString)   const;
 
     bool isStartsWith(const Type theStartChar) const;
     bool isEndsWith  (const Type theEndChar)   const;
 
     /**
+     * Returns first occurrence of requested Unicode symbol or NULL if not found.
+     */
+    StUtfIterator<Type> findFirst(const stUtf32_t theSubChar) const {
+        return findFrom(theSubChar, StUtfIterator<Type>(this->String));
+    }
+
+    /**
+     * Returns first occurrence of requested Unicode symbol or NULL if not found.
+     */
+    StUtfIterator<Type> findFirst(const StConstStringUnicode& theSubString) const {
+        return findFrom(theSubString, StUtfIterator<Type>(this->String));
+    }
+
+    /**
+     * Returns next occurrence of requested Unicode symbol or NULL if not found.
+     */
+    StUtfIterator<Type> findFrom(const stUtf32_t theSubChar, const StUtfIterator<Type>& theFrom) const;
+
+    /**
+     * Returns next occurrence of requested Unicode symbol or NULL if not found.
+     */
+    StUtfIterator<Type> findFrom(const StConstStringUnicode& theSubString, const StUtfIterator<Type>& theFrom) const;
+
+    /**
      * Returns true if string contains requested Unicode symbol.
      */
-    bool isContains(const stUtf32_t theSubChar) const;
+    bool isContains(const stUtf32_t theSubChar) const {
+        return *findFirst(theSubChar) != 0;
+    }
 
     /**
      * Returns true if string contains requested substring.
      */
-    bool isContains(const StConstStringUnicode& theSubString) const;
+    bool isContains(const StConstStringUnicode& theSubString) const {
+        return theSubString.isEmpty() || *findFirst(theSubString) != 0;
+    }
 
         protected:
 
     /**
      * Compare two Unicode strings per-byte.
      */
-    static inline bool stStrAreEqual(const Type*  theString1,
-                                     const size_t theSizeBytes1,
-                                     const Type*  theString2,
-                                     const size_t theSizeBytes2) {
+    static bool stStrAreEqual(const Type*  theString1,
+                              const size_t theSizeBytes1,
+                              const Type*  theString2,
+                              const size_t theSizeBytes2) {
         return (theSizeBytes1 == theSizeBytes2)
             && stAreEqual(theString1, theString2, theSizeBytes1);
     }
@@ -121,23 +148,25 @@
 typedef StConstStringUnicode<stUtf16_t>   StCStringUtf16;
 typedef StConstStringUnicode<stUtf32_t>   StCStringUtf32;
 typedef StConstStringUnicode<stUtfWide_t> StCStringUtfWide;
+typedef StCStringUtf8 StCString; // POD structure for constant string
 
 /**
  * External constructor for StConstStringUnicode POD structure.
  */
 template<typename Type>
-inline const StConstStringUnicode<Type> stStringExtConstr(const Type*  theString,
-                                                          const size_t theSize,
-                                                          const size_t theLength) {
-    const StConstStringUnicode<Type> aStr = {theString, theSize, theLength};
-    return aStr;
+constexpr const StConstStringUnicode<Type> stStringExtConstr(const Type*  theString,
+                                                             const size_t theSize,
+                                                             const size_t theLength) {
+    return StConstStringUnicode<Type>{theString, theSize, theLength};
 }
 
 /**
  * Initialize constant string without Unicode symbols (only ASCII).
  */
-#define stCString(theString) stStringExtConstr(theString, sizeof(theString) - sizeof(*theString), sizeof(theString) / sizeof(*theString) - 1)
-//#define stCString(theString) {theString, sizeof(theString) - sizeof(*theString), sizeof(theString) / sizeof(*theString) - 1}
+template<typename Type, int N>
+constexpr const StConstStringUnicode<Type> stCString(const Type (&theString)N) {
+     return StConstStringUnicode<Type>{theString, (N - 1) * sizeof(Type), N - 1};
+}
 
 //static_assert(std::is_pod<StCStringUtf8>::value,
 //              "StCStringUtf8 is not POD structure!");
@@ -176,11 +205,22 @@
     StStringUnicode(const StStringUnicode& theCopy);
 
     /**
+     * Move constructor.
+     * @param theCopy string to move
+     */
+    StStringUnicode(StStringUnicode&& theCopy);
+
+    /**
      * Copy constructor.
      */
     StStringUnicode(const StConstStringUnicode<Type>& theCopy);
 
     /**
+     * Move constructor.
+     */
+    StStringUnicode(StConstStringUnicode<Type>&& theCopy);
+
+    /**
      * Copy constructor from NULL-terminated UTF-8 string.
      * @param theCopy   NULL-terminated UTF-8 string to copy
      * @param theLength the length limit in Unicode symbols (NOT bytes!)
@@ -429,6 +469,21 @@
     const StStringUnicode& operator=(const StStringUnicode& theOther);
 
     /**
+     * Move from another string.
+     */
+    const StStringUnicode& operator=(StStringUnicode&& theOther);
+
+    /**
+     * Copy from another string.
+     */
+    const StStringUnicode& operator=(const StConstStringUnicode<Type>& theOther);
+
+    /**
+     * Move from another string.
+     */
+    const StStringUnicode& operator=(StConstStringUnicode<Type>&& theOther);
+
+    /**
      * Copy from UTF-8 NULL-terminated string.
      */
     const StStringUnicode& operator=(const char* theStringUtf8);
@@ -476,7 +531,7 @@
     bool operator>=(const StStringUnicode& theCompare) const;
     bool operator<=(const StStringUnicode& theCompare) const;
 
-        private: //!< low-level methods
+        private: //! @name low-level methods
 
     /**
      * Compute advance for specified string.
@@ -549,12 +604,988 @@
 typedef StStringUnicode<stUtf16_t>   StStringUtf16;
 typedef StStringUnicode<stUtf32_t>   StStringUtf32;
 typedef StStringUnicode<stUtfWide_t> StStringUtfWide;
+typedef StStringUtf8  StString;  // dynamically allocated string class
 
 // make sure StStringUnicode could be casted to StConstStringUnicode
-//static_assert(std::is_standard_layout<StStringUtf8>::value,
-//              "StStringUtf8 is not standard layout class!");
+static_assert(std::is_standard_layout<StStringUtf8>::value,
+              "StStringUtf8 is not standard layout class!");
+
+/**
+ * Compute advance for specified string.
+ */
+template<typename TypeTo> template<typename TypeFrom> inline
+void StStringUnicode<TypeTo>::strGetAdvance(const TypeFrom* theStringUtf,
+                                            const size_t    theLengthMax,
+                                            size_t&         theSizeBytes,
+                                            size_t&         theLength) {
+    theSizeBytes = 0;
+    theLength = 0;
+    StUtfIterator<TypeFrom> anIter(theStringUtf);
+    switch (sizeof(TypeTo)) {
+        case sizeof(stUtf8_t): {
+            for (; *anIter != 0 && anIter.getIndex() < theLengthMax; ++anIter) {
+                theSizeBytes += anIter.getAdvanceBytesUtf8();
+            }
+            theLength = anIter.getIndex();
+            return;
+        }
+        case sizeof(stUtf16_t): {
+            for (; *anIter != 0 && anIter.getIndex() < theLengthMax; ++anIter) {
+                theSizeBytes += anIter.getAdvanceBytesUtf16();
+            }
+            theLength = anIter.getIndex();
+            return;
+        }
+        case sizeof(stUtf32_t): {
+            for (; *anIter != 0 && anIter.getIndex() < theLengthMax; ++anIter) {
+                theSizeBytes += anIter.getAdvanceBytesUtf32();
+            }
+            theLength = anIter.getIndex();
+            return;
+        }
+        default: return;
+    }
+}
+
+template<typename Type>
+stUtf32_t StConstStringUnicode<Type>::getChar(const size_t theCharIndex) const {
+    ST_DEBUG_ASSERT(theCharIndex < this->Length);
+    StUtfIterator<Type> anIter(this->String);
+    for (; *anIter != 0; ++anIter) {
+        if (anIter.getIndex() == theCharIndex) {
+            return *anIter;
+        }
+    }
+    return 0;
+}
+
+template<typename Type>
+const Type* StStringUnicode<Type>::getCharBuffer(const size_t theCharIndex) const {
+    ST_DEBUG_ASSERT(theCharIndex < this->Length);
+    StUtfIterator<Type> anIter(this->String);
+    for (; *anIter != 0; ++anIter) {
+        if (anIter.getIndex() == theCharIndex) {
+            return anIter.getBufferHere();
+        }
+    }
+    return NULL;
+}
+
+template<typename Type> inline
+void StStringUnicode<Type>::clear() {
+    stStrFree(this->String);
+    this->Size   = 0;
+    this->Length = 0;
+    this->String = stStrAlloc(this->Size);
+}
+
+template<typename Type> inline
+StStringUnicode<Type>::StStringUnicode() {
+    this->String = stStrAlloc(0);
+    this->Size   = 0;
+    this->Length = 0;
+}
+
+template<typename Type> inline
+StStringUnicode<Type>::StStringUnicode(const StStringUnicode& theCopy) {
+    this->String = stStrAlloc(theCopy.Size);
+    this->Size   = theCopy.Size;
+    this->Length = theCopy.Length;
+    stStrCopy((stUByte_t* )this->String, (const stUByte_t* )theCopy.String, this->Size);
+}
+
+template<typename Type> inline
+StStringUnicode<Type>::StStringUnicode(StStringUnicode&& theCopy) {
+    this->String = theCopy.String;
+    this->Size   = theCopy.Size;
+    this->Length = theCopy.Length;
+    theCopy.String = nullptr;
+}
+
+template<typename Type> inline
+StStringUnicode<Type>::StStringUnicode(const StConstStringUnicode<Type>& theCopy) {
+    this->String = stStrAlloc(theCopy.Size);
+    this->Size   = theCopy.Size;
+    this->Length = theCopy.Length;
+    stStrCopy((stUByte_t* )this->String, (const stUByte_t* )theCopy.String, this->Size);
+}
+
+template<typename Type> inline
+StStringUnicode<Type>::StStringUnicode(StConstStringUnicode<Type>&& theCopy) {
+    // force copy from consant string as it cannot be moved
+    this->String = stStrAlloc(theCopy.Size);
+    this->Size   = theCopy.Size;
+    this->Length = theCopy.Length;
+    stStrCopy((stUByte_t* )this->String, (const stUByte_t* )theCopy.String, this->Size);
+}
+
+template<typename Type> inline
+StStringUnicode<Type>::StStringUnicode(const char*  theCopyUtf8,
+                                       const size_t theLength) {
+    this->String = NULL;
+    this->Size   = 0;
+    this->Length = 0;
+    fromUnicode(theCopyUtf8, theLength);
+}
+
+template<typename Type> inline
+StStringUnicode<Type>::StStringUnicode(const stUtf16_t* theCopyUtf16,
+                                       const size_t     theLength) {
+    this->String = NULL;
+    this->Size   = 0;
+    this->Length = 0;
+    fromUnicode(theCopyUtf16, theLength);
+}
+
+template<typename Type> inline
+StStringUnicode<Type>::StStringUnicode(const stUtf32_t* theCopyUtf32,
+                                       const size_t     theLength) {
+    this->String = NULL;
+    this->Size   = 0;
+    this->Length = 0;
+    fromUnicode(theCopyUtf32, theLength);
+}
+
+template<typename Type> inline
+StStringUnicode<Type>::StStringUnicode(const stUtfWide_t* theCopyUtfWide,
+                                       const size_t       theLength) {
+    this->String = NULL;
+    this->Size   = 0;
+    this->Length = 0;
+    fromUnicode(theCopyUtfWide, theLength);
+}
+
+template<typename Type> inline
+StStringUnicode<Type>::StStringUnicode(const char theChar) {
+    this->String = NULL;
+    this->Size   = 0;
+    this->Length = 0;
+    if (theChar == '\0') {
+        // empty string
+        this->Size   = 0;
+        this->Length = 0;
+        this->String = stStrAlloc(this->Size);
+        return;
+    }
+    this->Size   = sizeof(Type);
+    this->Length = 1;
+    this->String = stStrAlloc(this->Size);
+    ((Type* )this->String)0 = Type(theChar);
+}
+
+template<typename Type> inline
+StStringUnicode<Type>::StStringUnicode(const int32_t theInt32) {
+    this->String = NULL;
+    this->Size   = 0;
+    this->Length = 0;
+    char aBuff16;
+    stsprintf(aBuff, 16, "%d", theInt32);
+    fromUnicode(aBuff);
+}
+
+template<typename Type> inline
+StStringUnicode<Type>::StStringUnicode(const uint32_t theUInt32) {
+    this->String = NULL;
+    this->Size   = 0;
+    this->Length = 0;
+    char aBuff16;
+    stsprintf(aBuff, 16, "%u", theUInt32);
+    fromUnicode(aBuff);
+}
+
+template<typename Type> inline
+StStringUnicode<Type>::StStringUnicode(const int64_t theInt64) {
+    this->String = NULL;
+    this->Size   = 0;
+    this->Length = 0;
+    char aBuff32;
+    stsprintf(aBuff, 32, "%" PRId64, theInt64);
+    fromUnicode(aBuff);
+}
+
+template<typename Type> inline
+StStringUnicode<Type>::StStringUnicode(const uint64_t theUInt64) {
+    this->String = NULL;
+    this->Size   = 0;
+    this->Length = 0;
+    char aBuff32;
+    stsprintf(aBuff, 32, "%" PRIu64, theUInt64);
+    fromUnicode(aBuff);
+}
+
+#ifdef ST_HAS_INT64_EXT
+template<typename Type> inline
+StStringUnicode<Type>::StStringUnicode(const stInt64ext_t theInt64) {
+    this->String = NULL;
+    this->Size   = 0;
+    this->Length = 0;
+    char aBuff32;
+    stsprintf(aBuff, 32, "%" PRId64,  (int64_t )theInt64);
+    fromUnicode(aBuff);
+}
+
+template<typename Type> inline
+StStringUnicode<Type>::StStringUnicode(const stUInt64ext_t theUInt64) {
+    this->String = NULL;
+    this->Size   = 0;
+    this->Length = 0;
+    char aBuff32;
+    stsprintf(aBuff, 32, "%" PRIu64, (uint64_t )theUInt64);
+    fromUnicode(aBuff);
+}
+#endif
+
+template<typename Type> inline
+StStringUnicode<Type>::StStringUnicode(const double theFloat) {
+    this->String = NULL;
+    this->Size   = 0;
+    this->Length = 0;
+    char aBuff256;
+    stsprintf(aBuff, 256, "%f", theFloat);
+    fromUnicode(aBuff);
+}
+
+template<typename Type> inline
+StStringUnicode<Type>::~StStringUnicode() {
+    stStrFree(this->String);
+}
+
+template<typename Type> inline
+const StStringUnicode<Type>& StStringUnicode<Type>::operator=(const StStringUnicode<Type>& theOther) {
+    if (this == &theOther) {
+        return (*this);
+    }
+    stStrFree(this->String);
+    this->Size   = theOther.Size;
+    this->Length = theOther.Length;
+    this->String = stStrAlloc(this->Size);
+    stStrCopy((stUByte_t* )this->String, (const stUByte_t* )theOther.String, this->Size);
+    return (*this);
+}
+
+template<typename Type> inline
+const StStringUnicode<Type>& StStringUnicode<Type>::operator=(StStringUnicode<Type>&& theOther) {
+    stStrFree(this->String);
+    this->String = theOther.String;
+    this->Size   = theOther.Size;
+    this->Length = theOther.Length;
+    theOther.String = nullptr;
+    return (*this);
+}
+
+template<typename Type> inline
+const StStringUnicode<Type>& StStringUnicode<Type>::operator=(const StConstStringUnicode<Type>& theOther) {
+    if (this == &theOther) {
+        return (*this);
+    }
+    stStrFree(this->String);
+    this->Size   = theOther.Size;
+    this->Length = theOther.Length;
+    this->String = stStrAlloc(this->Size);
+    stStrCopy((stUByte_t* )this->String, (const stUByte_t* )theOther.String, this->Size);
+    return (*this);
+}
+
+template<typename Type> inline
+const StStringUnicode<Type>& StStringUnicode<Type>::operator=(StConstStringUnicode<Type>&& theOther) {
+    if (this == &theOther) {
+        return (*this);
+    }
+    // force copy from consant string as it cannot be moved
+    stStrFree(this->String);
+    this->Size   = theOther.Size;
+    this->Length = theOther.Length;
+    this->String = stStrAlloc(this->Size);
+    stStrCopy((stUByte_t* )this->String, (const stUByte_t* )theOther.String, this->Size);
+    return (*this);
+}
+
+template<typename Type> template<typename TypeFrom>
+void StStringUnicode<Type>::fromUnicode(const StConstStringUnicode<TypeFrom>& theString) {
+    fromUnicode(theString.toCString());
+}
+
+template<typename Type> template<typename TypeFrom>
+void StStringUnicode<Type>::fromUnicode(const TypeFrom* theStringUtf,
+                                        const size_t    theLength) {
+    const Type* anOldBuffer = this->String; // necessary in case of self-copying
+    StUtfIterator<TypeFrom> anIterRead(theStringUtf);
+    if (*anIterRead == 0) {
+        // special case
+        clear();
+        return;
+    }
+
+    switch (sizeof(TypeFrom)) { // use switch() rather than if() to shut up msvc compiler
+        case sizeof(Type): {
+            if (theLength != size_t(-1)) {
+                // optimized copy
+                for (; *anIterRead != 0 && anIterRead.getIndex() < theLength; ++anIterRead) {}
+
+                this->Size   = size_t((stUByte_t* )anIterRead.getBufferHere() - (stUByte_t* )theStringUtf);
+                this->Length = anIterRead.getIndex();
+                this->String = stStrAlloc(this->Size);
+                stStrCopy((stUByte_t* )this->String, (const stUByte_t* )theStringUtf, this->Size);
+                stStrFree(anOldBuffer);
+                return;
+            }
+        }
+        default: break;
+    }
+
+    strGetAdvance(theStringUtf, theLength, this->Size, this->Length);
+    this->String = stStrAlloc(this->Size);
+    // reset iterator
+    anIterRead.init(theStringUtf);
+    const Type* anIterWrite = this->String;
+    for (; *anIterRead != 0 && anIterRead.getIndex() < theLength; ++anIterRead) {
+        anIterWrite = anIterRead.getUtf(anIterWrite);
+    }
+    stStrFree(anOldBuffer);
+}
+
+template<typename Type> inline
+void StStringUnicode<Type>::fromLocale(const char*  theString,
+                                       const size_t theLength) {
+#ifdef _WIN32
+    // use WinAPI
+    int aWideSize = MultiByteToWideChar(CP_ACP, MB_PRECOMPOSED, theString, -1, NULL, 0);
+    if (aWideSize <= 0) {
+        clear();
+        return;
+    }
+    wchar_t* aWideBuffer = new wchar_taWideSize + 1;
+    MultiByteToWideChar(CP_ACP, MB_PRECOMPOSED, theString, -1, aWideBuffer, aWideSize);
+    aWideBufferaWideSize = L'\0';
+    fromUnicode(aWideBuffer, theLength);
+    delete aWideBuffer;
+#else
+    // this is size in bytes but should probably be enough to store string in wide chars
+    // notice that these functions are sensitive to locale set by application!
+    int aMbLen = mblen(theString, MB_CUR_MAX);
+    if (aMbLen <= 0) {
+        clear();
+        return;
+    }
+    wchar_t* aWideBuffer = new wchar_taMbLen + 1;
+    mbstowcs(aWideBuffer, theString, aMbLen);
+    aWideBufferaMbLen = L'\0';
+    fromUnicode(aWideBuffer, theLength);
+    delete aWideBuffer;
+#endif
+}
+
+template<typename Type> inline
+bool StStringUnicode<Type>::toLocale(char*     theBuffer,
+                                     const int theSizeBytes) const {
+    StStringUnicode<wchar_t> aWideCopy(this->String, this->Length);
+#ifdef _WIN32
+    int aMbBytes = WideCharToMultiByte(CP_ACP, 0, aWideCopy.toCString(), -1, theBuffer, theSizeBytes, NULL, NULL);
+#else
+    int aMbBytes = wcstombs(theBuffer, aWideCopy.toCString(), theSizeBytes);
+#endif
+    if (aMbBytes <= 0) {
+        *theBuffer = '\0';
+        return false;
+    }
+    return true;
+}
+
+template<typename Type> inline
+const StStringUnicode<Type>& StStringUnicode<Type>::operator=(const char* theStringUtf8) {
+    fromUnicode(theStringUtf8);
+    return (*this);
+}
+
+template<typename Type> inline
+const StStringUnicode<Type>& StStringUnicode<Type>::operator=(const stUtfWide_t* theStringUtfWide) {
+    fromUnicode(theStringUtfWide);
+    return (*this);
+}
+
+template<typename Type> inline
+bool StConstStringUnicode<Type>::isEquals(const StConstStringUnicode& theCompare) const {
+    return this == &theCompare
+        || stStrAreEqual(this->String, this->Size, theCompare.String, theCompare.Size);
+}
+
+namespace {
+// TODO (Kirill Gavrilov#9) case ignored only for ANSI symbols
+template<typename Type> inline
+bool isEqualsIgnoreCase(const StConstStringUnicode<Type>& theStr1,
+                        const StConstStringUnicode<Type>& theStr2) {
+    if (&theStr1 == &theStr2) {
+        return true;
+    } else if (theStr1.Size != theStr2.Size) {
+        return false;
+    }
+    StUtfIterator<Type> anIter1(theStr1.String);
+    StUtfIterator<Type> anIter2(theStr2.String);
+    for (;; ++anIter1, ++anIter2) {
+        if ( *anIter2 > 64 && *anIter2 < 91         // ANSI big case
+         && (*anIter2 == *anIter1 || (*anIter2 + 32) == *anIter1)) {
+            continue;
+        } else if ( *anIter2 > 96 && *anIter2 < 123 // ANSI little case
+                && (*anIter2 == *anIter1 || (*anIter2 - 32) == *anIter1)) {
+            continue;
+        } else if (*anIter2 != *anIter1) {
+            return false;
+        } else if (*anIter1 == 0) {
+            return true;
+        }
+    }
+}
+};
+
+template<typename Type> inline
+bool StConstStringUnicode<Type>::isEqualsIgnoreCase(const StConstStringUnicode& theCompare) const {
+    return ::isEqualsIgnoreCase(*this, theCompare);
+}
+
+template<typename Type> inline
+bool StStringUnicode<Type>::operator!=(const StStringUnicode& theCompare) const {
+    return (!StStringUnicode::operator==(theCompare));
+}
+
+template<typename Type> inline
+bool StStringUnicode<Type>::operator>(const StStringUnicode& theCompare) const {
+    if (&theCompare == this) {
+        return false;
+    }
+    StUtfIterator<Type> anIterMe(this->String);
+    StUtfIterator<Type> anIterOther(theCompare.String);
+    for (;; ++anIterMe, ++anIterOther) {
+        if (*anIterMe == 0) {
+            return *anIterOther != 0;
+        } else if (*anIterOther == 0) {
+            return true;
+        } else if (*anIterMe == *anIterOther) {
+            continue;
+        } else {
+            return *anIterMe > *anIterOther;
+        }
+    }
+}
+
+template<typename Type> inline
+bool StStringUnicode<Type>::operator<(const StStringUnicode& theCompare) const {
+    if (&theCompare == this) {
+        return false;
+    }
+    StUtfIterator<Type> anIterMe(this->String);
+    StUtfIterator<Type> anIterOther(theCompare.String);
+    for (;; ++anIterMe, ++anIterOther) {
+        if (*anIterMe == 0) {
+            return *anIterOther != 0;
+        } else if (*anIterOther == 0) {
+            return false;
+        } else if (*anIterMe == *anIterOther) {
+            continue;
+        } else {
+            return *anIterMe < *anIterOther;
+        }
+    }
+}
+
+template<typename Type> inline
+bool StStringUnicode<Type>::operator>=(const StStringUnicode& theCompare) const {
+    if (&theCompare == this) {
+        return true;
+    }
+    StUtfIterator<Type> anIterMe(this->String);
+    StUtfIterator<Type> anIterOther(theCompare.String);
+    bool isLastMe, isLastOther;
+    for (;; ++anIterMe, ++anIterOther) {
+        isLastMe    = (*anIterMe    == 0);
+        isLastOther = (*anIterOther == 0);
+        if (isLastMe && isLastOther) {
+            return true;
+        } else if (isLastMe) {
+            return false;
+        } else if (isLastOther) {
+            return true;
+        } else if (*anIterMe == *anIterOther) {
+            continue;
+        } else {
+            return *anIterMe > *anIterOther;
+        }
+    }
+}
+
+template<typename Type> inline
+bool StStringUnicode<Type>::operator<=(const StStringUnicode& theCompare) const {
+    if (&theCompare == this) {
+        return true;
+    }
+    StUtfIterator<Type> anIterMe(this->String);
+    StUtfIterator<Type> anIterOther(theCompare.String);
+    bool isLastMe, isLastOther;
+    for (;; ++anIterMe, ++anIterOther) {
+        isLastMe    = (*anIterMe    == 0);
+        isLastOther = (*anIterOther == 0);
+        if (isLastMe && isLastOther) {
+            return true;
+        } else if (isLastMe) {
+            return false;
+        } else if (isLastOther) {
+            return true;
+        } else if (*anIterMe == *anIterOther) {
+            continue;
+        } else {
+            return *anIterMe < *anIterOther;
+        }
+    }
+}
+
+template<typename Type> inline
+StStringUnicode<Type>& StStringUnicode<Type>::operator+=(const StStringUnicode<Type>& theAppend) {
+    if (theAppend.isEmpty()) {
+        return (*this);
+    }
+    // create new string
+    const size_t aSize = this->Size + theAppend.Size;
+    Type* aString = stStrAlloc(aSize);
+    stStrCopy((stUByte_t* )aString,              (const stUByte_t* )this->String,     this->Size);
+    stStrCopy((stUByte_t* )aString + this->Size, (const stUByte_t* )theAppend.String, theAppend.Size);
+
+    stStrFree(this->String);
+    this->Size   = aSize;
+    this->String = aString;
+    this->Length += theAppend.Length;
+    return (*this);
+}
+
+template<typename Type> inline
+StStringUnicode<Type> StStringUnicode<Type>::subString(const size_t theStart,
+                                                       const size_t theEnd) const {
+    if (theStart >= theEnd) {
+        return StStringUnicode<Type>();
+    }
+    for (StUtfIterator<Type> anIter(this->String); *anIter != 0; ++anIter) {
+        if (anIter.getIndex() >= theStart) {
+            return StStringUnicode<Type>(anIter.getBufferHere(), theEnd - theStart);
+        }
+    }
+    return StStringUnicode<Type>();
+}
+
+template<typename Type> inline
+const StStringUnicode<stUtf8_t> StStringUnicode<Type>::toUtf8() const {
+    StStringUnicode<stUtf8_t> aCopy;
+    aCopy.fromUnicode(this->String);
+    return aCopy;
+}
+
+template<typename Type> inline
+const StStringUnicode<stUtf16_t> StStringUnicode<Type>::toUtf16() const {
+    StStringUnicode<stUtf16_t> aCopy;
+    aCopy.fromUnicode(this->String);
+    return aCopy;
+}
+
+template<typename Type> inline
+const StStringUnicode<stUtf32_t> StStringUnicode<Type>::toUtf32() const {
+    StStringUnicode<stUtf32_t> aCopy;
+    aCopy.fromUnicode(this->String);
+    return aCopy;
+}
+
+template<typename Type> inline
+const StStringUnicode<stUtfWide_t> StStringUnicode<Type>::toUtfWide() const {
+    StStringUnicode<stUtfWide_t> aCopy;
+    aCopy.fromUnicode(this->String);
+    return aCopy;
+}
+
+template<typename Type> inline
+const StStringUnicode<stUtf8_t> StStringUnicode<Type>::toDump() const {
+    StStringUnicode<stUtf8_t> aDump;
+    aDump += StStringUnicode<stUtf8_t>("StStringUnicode<") + sizeof(Type) + ">, size= " + this->Size + ", length= " + this->Length + ", text= '";
+    switch (sizeof(Type)) {
+        case sizeof(stUtf8_t): {
+            aDump += (const stUtf8_t* )this->String;
+            break;
+        }
+        default: {
+            aDump += toUtf8();
+            break;
+        }
+    }
+    return aDump + "'";
+}
+
+template<typename Type> inline
+bool StConstStringUnicode<Type>::isStartsWith(const Type theStartChar) const {
+    return this->Length != 0
+        && this->String0 == theStartChar;
+}
+
+template<typename Type> inline
+bool StConstStringUnicode<Type>::isEndsWith(const Type theEndChar) const {
+    return this->Length != 0
+        && *(Type* )((stUByte_t* )this->String + this->Size - sizeof(Type)) == theEndChar;
+}
+
+template<typename Type> inline
+bool StConstStringUnicode<Type>::isStartsWith(const StConstStringUnicode<Type>& theStartString) const {
+    if (this->Size < theStartString.Size) {
+        return false;
+    } else if (this->String == theStartString.String) {
+        return true; // self-comparison
+    }
+    return stStrAreEqual((const char* )this->String,          theStartString.Size,
+                         (const char* )theStartString.String, theStartString.Size);
+}
+
+template<typename Type> inline
+bool StConstStringUnicode<Type>::isStartsWith(const StConstStringUnicode<Type>& theStartString, const StUtfIterator<Type>& theFrom) const {
+    if (*theFrom == 0) {
+        return false;
+    }
+    const size_t aSize = theStartString.Size - (theFrom.getBufferHere() - this->String);
+
+    if (aSize < theStartString.Size) {
+        return false;
+    } else if (theFrom.getBufferHere() == theStartString.String) {
+        return true; // self-comparison
+    }
+    return stStrAreEqual((const char* )theFrom.getBufferHere(), theStartString.Size,
+                         (const char* )theStartString.String,   theStartString.Size);
+}
+
+
+template<typename Type> inline
+bool StStringUnicode<Type>::isStartsWithIgnoreCase(const StConstStringUnicode<Type>& theStartString) const {
+    return (this == &theStartString)
+        || subString(0, theStartString.getLength()).isEqualsIgnoreCase(theStartString);
+}
+
+template<typename Type> inline
+bool StConstStringUnicode<Type>::isEndsWith(const StConstStringUnicode<Type>& theEndString) const {
+    if (this->Size < theEndString.Size) {
+        return false;
+    } else if (this == &theEndString) {
+        return true;
+    }
+
+    return stStrAreEqual((const char* )this->String + this->Size - theEndString.Size, theEndString.Size,
+                         (const char* )theEndString.String, theEndString.Size);
+}
+
+template<typename Type> inline
+bool StStringUnicode<Type>::isEndsWithIgnoreCase(const StConstStringUnicode<Type>& theEndString) const {
+    if (this == &theEndString) {
+        return true;
+    }
+    return (this->Length >= theEndString.Length)
+        && subString(this->Length - theEndString.Length, this->Length).isEqualsIgnoreCase(theEndString);
+}
+
+template<typename Type> inline
+StHandle <StArrayList< StStringUnicode<Type> > > StStringUnicode<Type>::split(const stUtf32_t theDelimeter,
+                                                                              const size_t    theLimitNb) const {
+    StHandle< StArrayList< StStringUnicode<Type> > > aSplitList
+        = new StArrayList< StStringUnicode<Type> >((theLimitNb < size_t(-1)) ? theLimitNb : 16);
+
+    size_t aStart = 0;
+    size_t aSplitCount = 1; // set to 1, that is
+    for (StUtfIterator<Type> anIter(this->String);; ++anIter) {
+        if (*anIter == 0) {
+            StStringUnicode<Type> aSplit = subString(aStart, anIter.getIndex());
+            if (!aSplit.isEmpty()) {
+                aSplitList->add(aSplit);
+            }
+            break;
+        } else if (*anIter == theDelimeter) {
+            aSplitList->add(subString(aStart, anIter.getIndex()));
+            aStart = anIter.getIndex() + 1;
+            if (++aSplitCount >= theLimitNb) {
+                if (this->Length > aStart) {
+                    aSplitList->add(subString(aStart, this->Length));
+                }
+                break;
+            }
+        }
+    }
+    return aSplitList;
+}
+
+template<typename Type> inline
+StUtfIterator<Type> StConstStringUnicode<Type>::findFrom(const stUtf32_t theSubChar, const StUtfIterator<Type>& theFrom) const {
+    for (StUtfIterator<Type> anIter = theFrom; *anIter != 0; ++anIter) {
+        if (stUtf32_t(*anIter) == theSubChar) {
+            return anIter;
+        }
+    }
+    return StUtfIterator<Type>(nullptr);
+}
+
+template<typename Type> inline
+StUtfIterator<Type> StConstStringUnicode<Type>::findFrom(const StConstStringUnicode<Type>& theSubString, const StUtfIterator<Type>& theFrom) const {
+    if (theSubString.isEmpty()) {
+        return StUtfIterator<Type>(nullptr);
+    }
+
+    StUtfIterator<Type> anIterMe = theFrom;
+    StUtfIterator<Type> anIterSub(theSubString.String);
+    StUtfIterator<Type> aStartMe(nullptr);
+    for (;; ++anIterMe) {
+        if (*anIterSub == 0) {
+            return aStartMe;
+        } else if (*anIterMe == 0) {
+            return StUtfIterator<Type>(nullptr);
+        } else if (*anIterMe == *anIterSub) {
+            if (anIterSub.getIndex() == 0) {
+                aStartMe = anIterMe;
+            }
+            ++anIterSub;
+        } else {
+            anIterSub.init(theSubString.String);
+        }
+    }
+}
 
-// template implementation (inline methods)
-#include <StStrings/StStringUnicode.inl>
+template<typename Type> inline
+StStringUnicode<Type> StStringUnicode<Type>::unquoted() const {
+    if (this->Length < 2) {
+        return *this;
+    }
+    const Type* aLastSymbol = getCharBuffer(this->Length - 1);
+    if ((aLastSymbol != this->String)
+     && ((*this->String == Type('\"') && *aLastSymbol == Type('\"'))
+      || (*this->String == Type('\'') && *aLastSymbol == Type('\'')))) {
+        return subString(1, this->Length - 1);
+    }
+    return *this;
+}
+
+template<typename Type> inline
+StStringUnicode<Type> StStringUnicode<Type>::replace(const StStringUnicode<Type>& theSubString,
+                                                     const StStringUnicode<Type>& theReplacer) const {
+    if (theSubString.isEmpty() || this->isEmpty() || theSubString.Size > this->Size) {
+        // just make a copy
+        return *this;
+    } else if (theSubString.Size == this->Size) {
+        if (theSubString.isEquals(*this)) {
+            return theReplacer;
+        }
+    }
+    StUtfIterator<Type> anIter(this->String);
+    StStringUnicode<Type> aResult;
+    size_t aStart = 0;
+    for (size_t aCharId = 0; *anIter != 0;) {
+        if (stAreEqual(anIter.getBufferHere(), theSubString.String, theSubString.Size)) {
+            aResult += subString(aStart, aCharId);
+            aResult += theReplacer;
+            aStart  = aCharId + theSubString.Length;
+            aCharId = aStart;
+            anIter.init(anIter.getBufferHere() + theSubString.Size);
+            continue;
+        }
+        ++anIter;
+        ++aCharId;
+    }
+    if (aStart < this->Length) {
+        aResult += subString(aStart, this->Length);
+    }
+    return aResult;
+}
+
+template<typename Type> inline
+void StStringUnicode<Type>::replaceFast(const StStringUnicode<Type>& theSubString,
+                                        const StStringUnicode<Type>& theReplacer) {
+    if (theSubString.isEmpty() || this->isEmpty() || theSubString.Size >= this->Size) {
+        // just make a copy
+        return;
+    } else if (theSubString.Size != theReplacer.Size) {
+        // invalid method usage
+        ST_DEBUG_ASSERT(theSubString.Size == theReplacer.Size);
+        ///*this = replace(theSubString, theReplacer);
+        return;
+    }
+    for (StUtfIterator<Type> anIter(this->String); *anIter != 0;) {
+        if (stAreEqual(anIter.getBufferHere(), theSubString.String, theSubString.Size)) {
+            stStrCopy((stUByte_t* )anIter.changeBufferHere(), (const stUByte_t* )theReplacer.String, theReplacer.Size);
+            anIter.init(anIter.getBufferHere() + theSubString.Size);
+            continue;
+        }
+        ++anIter;
+    }
+}
+
+template<typename Type> inline
+void StStringUnicode<Type>::leftAdjust() {
+    if (this->Length == 0) {
+        return;
+    }
+    for (size_t anIter = 0; anIter < this->Size / sizeof(Type); ++anIter) {
+      if (this->StringanIter != (Type )' '
+       && this->StringanIter != (Type )'\t') {
+          if (anIter != 0) {
+              StStringUnicode<Type> aCopy(&this->StringanIter);
+              *this = aCopy;
+          }
+          return;
+      }
+    }
+}
+
+template<typename Type> inline
+void StStringUnicode<Type>::rightAdjust() {
+    if (this->Length == 0) {
+        return;
+    }
+    for (size_t anIter = this->Size / sizeof(Type) - 1; anIter != 0; --anIter) {
+      if (this->StringanIter == (Type )' '
+       || this->StringanIter == (Type )'\t') {
+          ((Type* )this->String)anIter = (Type )'\0';
+          this->Size -= sizeof(Type);
+          --this->Length;
+      } else {
+          return;
+      }
+    }
+}
+
+template<typename Type> inline
+void StStringUnicode<Type>::toLowerCase() {
+    for (StUtfIterator<Type> anIter(this->String); *anIter != 0; ++anIter) {
+        if (*anIter > 64 && *anIter < 91) {
+            *anIter.changeBufferHere() = Type(*anIter + 32);
+        }
+    }
+}
+
+template<typename Type> inline
+StStringUnicode<Type> StStringUnicode<Type>::lowerCased() const {
+    StStringUnicode<Type> aCopy(*this);
+    aCopy.toLowerCase();
+    return aCopy;
+}
+
+template<typename Type> inline
+int StStringUnicode<Type>::hexPairValue(const Type* theCode) {
+    int aValue = 0;
+    int aDigit;
+    for (const Type* anIter = theCode;;) {
+        aDigit = *anIter++;
+        if (aDigit >= '0' && aDigit <= '9') {
+            aValue += aDigit - '0';
+        } else if (aDigit >= 'A' && aDigit <= 'F') {
+            aValue += aDigit - 'A' + 10;
+        } else if (aDigit >= 'a' && aDigit <= 'f') {
+            aValue += aDigit - 'a' + 10;
+        } else {
+            return -1;
+        }
+        if (anIter == theCode + 2) {
+            return aValue;
+        }
+        aValue <<= 4;
+    }
+}
+
+template<typename Type> inline
+size_t StStringUnicode<Type>::urlDecode(const Type* theSrcUrl,
+                                        stUtf8_t*   theOut) {
+    const stUtf8_t* aStart = theOut;
+    for (StUtfIterator<Type> anIter(theSrcUrl); *anIter != 0; ++anIter) {
+        switch (*anIter) {
+            /*case stUtf32_t('+'):
+                // old-style space-symbol replacement (in current standard %20 = ' ')
+                *(theOut++) = ' ';
+                break;*/
+            case stUtf32_t('%'):
+                if (anIter.getBufferHere()1 != Type('\0')
+                 && anIter.getBufferHere()2 != Type('\0')) {
+                    // coded symbol: %XX
+                    int aValue = hexPairValue(anIter.getBufferHere() + 1);
+                    if (aValue >= 0) {
+                        *(theOut++) = (stUtf8_t )aValue;
+                        ++anIter;
+                        ++anIter;
+                    } else {
+                        *theOut++ = '?';
+                    }
+                } else {
+                    *theOut++ = '?';
+                }
+                break;
+            default:
+                theOut = anIter.getUtf(theOut);
+        }
+    }
+    // remove trailing CR symbol
+    if (theOut > aStart && *--theOut != stUtf8_t(13)) {
+        ++theOut;
+    }
+    *theOut = '\0';
+    return theOut - aStart;
+}
+
+/**
+ * Define function for standard output (UTF-8 string).
+ */
+inline std::ostream& operator<<(std::ostream& theStream,
+                                const StStringUnicode<stUtf8_t>& theString) {
+    theStream << theString.toCString();
+    return theStream;
+}
+
+/**
+ * Define function for standard output (UTF-16 string).
+ */
+inline std::ostream& operator<<(std::ostream& theStream,
+                                const StStringUnicode<stUtf16_t>& theString) {
+    theStream << theString.toUtf8();
+    return theStream;
+}
+
+/**
+ * Define function for standard output (UTF-32 string).
+ */
+inline std::ostream& operator<<(std::ostream& theStream,
+                                const StStringUnicode<stUtf32_t>& theString) {
+    theStream << theString.toUtf8();
+    return theStream;
+}
+
+#ifdef _WIN32
+/**
+ * Define function for wide standard output.
+ */
+inline std::wostream& operator<<(std::wostream& theStream,
+                                 const StStringUnicode<stUtfWide_t>& theString) {
+    theStream << theString.toCString();
+    return theStream;
+}
+
+/**
+ * Define function for wide standard output (UTF-8 string).
+ */
+inline std::wostream& operator<<(std::wostream& theStream,
+                                 const StStringUnicode<stUtf8_t>& theString) {
+    theStream << theString.toUtfWide();
+    return theStream;
+}
+
+/**
+ * Define function for wide standard output (UTF-16 string).
+ */
+inline std::wostream& operator<<(std::wostream& theStream,
+                                 const StStringUnicode<stUtf16_t>& theString) {
+    theStream << theString.toUtfWide();
+    return theStream;
+}
+
+/**
+ * Define function for wide standard output (UTF-32 string).
+ */
+inline std::wostream& operator<<(std::wostream& theStream,
+                                 const StStringUnicode<stUtf32_t>& theString) {
+    theStream << theString.toUtfWide();
+    return theStream;
+}
+#endif
 
 #endif // __StStringUnicode_h__

_service:obs_scm:sview-26.obscpio/include/StStrings/StStringUnicode.inl Deleted

@@ -1,912 +0,0 @@
-/**
- * Copyright © 2011-2014 Kirill Gavrilov <kirill@sview.ru>
- *
- * This code is licensed under MIT license (see docs/license-mit.txt for details).
- */
-
-#ifndef __StStringUnicode_inl__
-#define __StStringUnicode_inl__
-
-/**
- * Compute advance for specified string.
- */
-template<typename TypeTo> template<typename TypeFrom> inline
-void StStringUnicode<TypeTo>::strGetAdvance(const TypeFrom* theStringUtf,
-                                            const size_t    theLengthMax,
-                                            size_t&         theSizeBytes,
-                                            size_t&         theLength) {
-    theSizeBytes = 0;
-    theLength = 0;
-    StUtfIterator<TypeFrom> anIter(theStringUtf);
-    switch(sizeof(TypeTo)) {
-        case sizeof(stUtf8_t): {
-            for(; *anIter != 0 && anIter.getIndex() < theLengthMax; ++anIter) {
-                theSizeBytes += anIter.getAdvanceBytesUtf8();
-            }
-            theLength = anIter.getIndex();
-            return;
-        }
-        case sizeof(stUtf16_t): {
-            for(; *anIter != 0 && anIter.getIndex() < theLengthMax; ++anIter) {
-                theSizeBytes += anIter.getAdvanceBytesUtf16();
-            }
-            theLength = anIter.getIndex();
-            return;
-        }
-        case sizeof(stUtf32_t): {
-            for(; *anIter != 0 && anIter.getIndex() < theLengthMax; ++anIter) {
-                theSizeBytes += anIter.getAdvanceBytesUtf32();
-            }
-            theLength = anIter.getIndex();
-            return;
-        }
-        default: return;
-    }
-}
-
-template<typename Type>
-stUtf32_t StConstStringUnicode<Type>::getChar(const size_t theCharIndex) const {
-    ST_DEBUG_ASSERT(theCharIndex < this->Length);
-    StUtfIterator<Type> anIter(this->String);
-    for(; *anIter != 0; ++anIter) {
-        if(anIter.getIndex() == theCharIndex) {
-            return *anIter;
-        }
-    }
-    return 0;
-}
-
-template<typename Type>
-const Type* StStringUnicode<Type>::getCharBuffer(const size_t theCharIndex) const {
-    ST_DEBUG_ASSERT(theCharIndex < this->Length);
-    StUtfIterator<Type> anIter(this->String);
-    for(; *anIter != 0; ++anIter) {
-        if(anIter.getIndex() == theCharIndex) {
-            return anIter.getBufferHere();
-        }
-    }
-    return NULL;
-}
-
-template<typename Type> inline
-void StStringUnicode<Type>::clear() {
-    stStrFree(this->String);
-    this->Size   = 0;
-    this->Length = 0;
-    this->String = stStrAlloc(this->Size);
-}
-
-template<typename Type> inline
-StStringUnicode<Type>::StStringUnicode() {
-    this->String = stStrAlloc(0);
-    this->Size   = 0;
-    this->Length = 0;
-}
-
-template<typename Type> inline
-StStringUnicode<Type>::StStringUnicode(const StStringUnicode& theCopy) {
-    this->String = stStrAlloc(theCopy.Size);
-    this->Size   = theCopy.Size;
-    this->Length = theCopy.Length;
-    stStrCopy((stUByte_t* )this->String, (const stUByte_t* )theCopy.String, this->Size);
-}
-
-template<typename Type> inline
-StStringUnicode<Type>::StStringUnicode(const StConstStringUnicode<Type>& theCopy) {
-    this->String = stStrAlloc(theCopy.Size);
-    this->Size   = theCopy.Size;
-    this->Length = theCopy.Length;
-    stStrCopy((stUByte_t* )this->String, (const stUByte_t* )theCopy.String, this->Size);
-}
-
-template<typename Type> inline
-StStringUnicode<Type>::StStringUnicode(const char*  theCopyUtf8,
-                                       const size_t theLength) {
-    this->String = NULL;
-    this->Size   = 0;
-    this->Length = 0;
-    fromUnicode(theCopyUtf8, theLength);
-}
-
-template<typename Type> inline
-StStringUnicode<Type>::StStringUnicode(const stUtf16_t* theCopyUtf16,
-                                       const size_t     theLength) {
-    this->String = NULL;
-    this->Size   = 0;
-    this->Length = 0;
-    fromUnicode(theCopyUtf16, theLength);
-}
-
-template<typename Type> inline
-StStringUnicode<Type>::StStringUnicode(const stUtf32_t* theCopyUtf32,
-                                       const size_t     theLength) {
-    this->String = NULL;
-    this->Size   = 0;
-    this->Length = 0;
-    fromUnicode(theCopyUtf32, theLength);
-}
-
-template<typename Type> inline
-StStringUnicode<Type>::StStringUnicode(const stUtfWide_t* theCopyUtfWide,
-                                       const size_t       theLength) {
-    this->String = NULL;
-    this->Size   = 0;
-    this->Length = 0;
-    fromUnicode(theCopyUtfWide, theLength);
-}
-
-template<typename Type> inline
-StStringUnicode<Type>::StStringUnicode(const char theChar) {
-    this->String = NULL;
-    this->Size   = 0;
-    this->Length = 0;
-    if(theChar == '\0') {
-        // empty string
-        this->Size   = 0;
-        this->Length = 0;
-        this->String = stStrAlloc(this->Size);
-        return;
-    }
-    this->Size   = sizeof(Type);
-    this->Length = 1;
-    this->String = stStrAlloc(this->Size);
-    ((Type* )this->String)0 = Type(theChar);
-}
-
-template<typename Type> inline
-StStringUnicode<Type>::StStringUnicode(const int32_t theInt32) {
-    this->String = NULL;
-    this->Size   = 0;
-    this->Length = 0;
-    char aBuff16;
-    stsprintf(aBuff, 16, "%d", theInt32);
-    fromUnicode(aBuff);
-}
-
-template<typename Type> inline
-StStringUnicode<Type>::StStringUnicode(const uint32_t theUInt32) {
-    this->String = NULL;
-    this->Size   = 0;
-    this->Length = 0;
-    char aBuff16;
-    stsprintf(aBuff, 16, "%u", theUInt32);
-    fromUnicode(aBuff);
-}
-
-template<typename Type> inline
-StStringUnicode<Type>::StStringUnicode(const int64_t theInt64) {
-    this->String = NULL;
-    this->Size   = 0;
-    this->Length = 0;
-    char aBuff32;
-    stsprintf(aBuff, 32, "%" PRId64, theInt64);
-    fromUnicode(aBuff);
-}
-
-template<typename Type> inline
-StStringUnicode<Type>::StStringUnicode(const uint64_t theUInt64) {
-    this->String = NULL;
-    this->Size   = 0;
-    this->Length = 0;
-    char aBuff32;
-    stsprintf(aBuff, 32, "%" PRIu64, theUInt64);
-    fromUnicode(aBuff);
-}
-
-#ifdef ST_HAS_INT64_EXT
-template<typename Type> inline
-StStringUnicode<Type>::StStringUnicode(const stInt64ext_t theInt64) {
-    this->String = NULL;
-    this->Size   = 0;
-    this->Length = 0;
-    char aBuff32;
-    stsprintf(aBuff, 32, "%" PRId64,  (int64_t )theInt64);
-    fromUnicode(aBuff);
-}
-
-template<typename Type> inline
-StStringUnicode<Type>::StStringUnicode(const stUInt64ext_t theUInt64) {
-    this->String = NULL;
-    this->Size   = 0;
-    this->Length = 0;
-    char aBuff32;
-    stsprintf(aBuff, 32, "%" PRIu64, (uint64_t )theUInt64);
-    fromUnicode(aBuff);
-}
-#endif
-
-template<typename Type> inline
-StStringUnicode<Type>::StStringUnicode(const double theFloat) {
-    this->String = NULL;
-    this->Size   = 0;
-    this->Length = 0;
-    char aBuff256;
-    stsprintf(aBuff, 256, "%f", theFloat);
-    fromUnicode(aBuff);
-}
-
-template<typename Type> inline
-StStringUnicode<Type>::~StStringUnicode() {
-    stStrFree(this->String);
-}
-
-template<typename Type> inline
-const StStringUnicode<Type>& StStringUnicode<Type>::operator=(const StStringUnicode<Type>& theOther) {
-    if(this == &theOther) {
-        return (*this);
-    }
-    stStrFree(this->String);
-    this->Size   = theOther.Size;
-    this->Length = theOther.Length;
-    this->String = stStrAlloc(this->Size);
-    stStrCopy((stUByte_t* )this->String, (const stUByte_t* )theOther.String, this->Size);
-    return (*this);
-}
-
-template<typename Type> template<typename TypeFrom>
-void StStringUnicode<Type>::fromUnicode(const StConstStringUnicode<TypeFrom>& theString) {
-    fromUnicode(theString.toCString());
-}
-
-template<typename Type> template<typename TypeFrom>
-void StStringUnicode<Type>::fromUnicode(const TypeFrom* theStringUtf,
-                                        const size_t    theLength) {
-    const Type* anOldBuffer = this->String; // necessary in case of self-copying
-    StUtfIterator<TypeFrom> anIterRead(theStringUtf);
-    if(*anIterRead == 0) {
-        // special case
-        clear();
-        return;
-    }
-
-    switch(sizeof(TypeFrom)) { // use switch() rather than if() to shut up msvc compiler
-        case sizeof(Type): {
-            if(theLength != size_t(-1)) {
-                // optimized copy
-                for(; *anIterRead != 0 && anIterRead.getIndex() < theLength; ++anIterRead) {}
-
-                this->Size   = size_t((stUByte_t* )anIterRead.getBufferHere() - (stUByte_t* )theStringUtf);
-                this->Length = anIterRead.getIndex();
-                this->String = stStrAlloc(this->Size);
-                stStrCopy((stUByte_t* )this->String, (const stUByte_t* )theStringUtf, this->Size);
-                stStrFree(anOldBuffer);
-                return;
-            }
-        }
-        default: break;
-    }
-
-    strGetAdvance(theStringUtf, theLength, this->Size, this->Length);
-    this->String = stStrAlloc(this->Size);
-    // reset iterator
-    anIterRead.init(theStringUtf);
-    const Type* anIterWrite = this->String;
-    for(; *anIterRead != 0 && anIterRead.getIndex() < theLength; ++anIterRead) {
-        anIterWrite = anIterRead.getUtf(anIterWrite);
-    }
-    stStrFree(anOldBuffer);
-}
-
-template<typename Type> inline
-void StStringUnicode<Type>::fromLocale(const char*  theString,
-                                       const size_t theLength) {
-#ifdef _WIN32
-    // use WinAPI
-    int aWideSize = MultiByteToWideChar(CP_ACP, MB_PRECOMPOSED, theString, -1, NULL, 0);
-    if(aWideSize <= 0) {
-        clear();
-        return;
-    }
-    wchar_t* aWideBuffer = new wchar_taWideSize + 1;
-    MultiByteToWideChar(CP_ACP, MB_PRECOMPOSED, theString, -1, aWideBuffer, aWideSize);
-    aWideBufferaWideSize = L'\0';
-    fromUnicode(aWideBuffer, theLength);
-    delete aWideBuffer;
-#else
-    // this is size in bytes but should probably be enough to store string in wide chars
-    // notice that these functions are sensitive to locale set by application!
-    int aMbLen = mblen(theString, MB_CUR_MAX);
-    if(aMbLen <= 0) {
-        clear();
-        return;
-    }
-    wchar_t* aWideBuffer = new wchar_taMbLen + 1;
-    mbstowcs(aWideBuffer, theString, aMbLen);
-    aWideBufferaMbLen = L'\0';
-    fromUnicode(aWideBuffer, theLength);
-    delete aWideBuffer;
-#endif
-}
-
-template<typename Type> inline
-bool StStringUnicode<Type>::toLocale(char*     theBuffer,
-                                     const int theSizeBytes) const {
-    StStringUnicode<wchar_t> aWideCopy(this->String, this->Length);
-#ifdef _WIN32
-    int aMbBytes = WideCharToMultiByte(CP_ACP, 0, aWideCopy.toCString(), -1, theBuffer, theSizeBytes, NULL, NULL);
-#else
-    int aMbBytes = wcstombs(theBuffer, aWideCopy.toCString(), theSizeBytes);
-#endif
-    if(aMbBytes <= 0) {
-        *theBuffer = '\0';
-        return false;
-    }
-    return true;
-}
-
-template<typename Type> inline
-const StStringUnicode<Type>& StStringUnicode<Type>::operator=(const char* theStringUtf8) {
-    fromUnicode(theStringUtf8);
-    return (*this);
-}
-
-template<typename Type> inline
-const StStringUnicode<Type>& StStringUnicode<Type>::operator=(const stUtfWide_t* theStringUtfWide) {
-    fromUnicode(theStringUtfWide);
-    return (*this);
-}
-
-template<typename Type> inline
-bool StConstStringUnicode<Type>::isEquals(const StConstStringUnicode& theCompare) const {
-    return this == &theCompare
-        || stStrAreEqual(this->String, this->Size, theCompare.String, theCompare.Size);
-}
-
-namespace {
-// TODO (Kirill Gavrilov#9) case ignored only for ANSI symbols
-template<typename Type> inline
-bool isEqualsIgnoreCase(const StConstStringUnicode<Type>& theStr1,
-                        const StConstStringUnicode<Type>& theStr2) {
-    if(&theStr1 == &theStr2) {
-        return true;
-    } else if(theStr1.Size != theStr2.Size) {
-        return false;
-    }
-    StUtfIterator<Type> anIter1(theStr1.String);
-    StUtfIterator<Type> anIter2(theStr2.String);
-    for(;; ++anIter1, ++anIter2) {
-        if( *anIter2 > 64 && *anIter2 < 91         // ANSI big case
-        && (*anIter2 == *anIter1 || (*anIter2 + 32) == *anIter1)) {
-            continue;
-        } else if( *anIter2 > 96 && *anIter2 < 123 // ANSI little case
-               && (*anIter2 == *anIter1 || (*anIter2 - 32) == *anIter1)) {
-            continue;
-        } else if(*anIter2 != *anIter1) {
-            return false;
-        } else if(*anIter1 == 0) {
-            return true;
-        }
-    }
-}
-};
-
-template<typename Type> inline
-bool StConstStringUnicode<Type>::isEqualsIgnoreCase(const StConstStringUnicode& theCompare) const {
-    return ::isEqualsIgnoreCase(*this, theCompare);
-}
-
-template<typename Type> inline
-bool StStringUnicode<Type>::operator!=(const StStringUnicode& theCompare) const {
-    return (!StStringUnicode::operator==(theCompare));
-}
-
-template<typename Type> inline
-bool StStringUnicode<Type>::operator>(const StStringUnicode& theCompare) const {
-    if(&theCompare == this) {
-        return false;
-    }
-    StUtfIterator<Type> anIterMe(this->String);
-    StUtfIterator<Type> anIterOther(theCompare.String);
-    for(;; ++anIterMe, ++anIterOther) {
-        if(*anIterMe == 0) {
-            return *anIterOther != 0;
-        } else if(*anIterOther == 0) {
-            return true;
-        } else if(*anIterMe == *anIterOther) {
-            continue;
-        } else {
-            return *anIterMe > *anIterOther;
-        }
-    }
-}
-
-template<typename Type> inline
-bool StStringUnicode<Type>::operator<(const StStringUnicode& theCompare) const {
-    if(&theCompare == this) {
-        return false;
-    }
-    StUtfIterator<Type> anIterMe(this->String);
-    StUtfIterator<Type> anIterOther(theCompare.String);
-    for(;; ++anIterMe, ++anIterOther) {
-        if(*anIterMe == 0) {
-            return *anIterOther != 0;
-        } else if(*anIterOther == 0) {
-            return false;
-        } else if(*anIterMe == *anIterOther) {
-            continue;
-        } else {
-            return *anIterMe < *anIterOther;
-        }
-    }
-}
-
-template<typename Type> inline
-bool StStringUnicode<Type>::operator>=(const StStringUnicode& theCompare) const {
-    if(&theCompare == this) {
-        return true;
-    }
-    StUtfIterator<Type> anIterMe(this->String);
-    StUtfIterator<Type> anIterOther(theCompare.String);
-    bool isLastMe, isLastOther;
-    for(;; ++anIterMe, ++anIterOther) {
-        isLastMe    = (*anIterMe    == 0);
-        isLastOther = (*anIterOther == 0);
-        if(isLastMe && isLastOther) {
-            return true;
-        } else if(isLastMe) {
-            return false;
-        } else if(isLastOther) {
-            return true;
-        } else if(*anIterMe == *anIterOther) {
-            continue;
-        } else {
-            return *anIterMe > *anIterOther;
-        }
-    }
-}
-
-template<typename Type> inline
-bool StStringUnicode<Type>::operator<=(const StStringUnicode& theCompare) const {
-    if(&theCompare == this) {
-        return true;
-    }
-    StUtfIterator<Type> anIterMe(this->String);
-    StUtfIterator<Type> anIterOther(theCompare.String);
-    bool isLastMe, isLastOther;
-    for(;; ++anIterMe, ++anIterOther) {
-        isLastMe    = (*anIterMe    == 0);
-        isLastOther = (*anIterOther == 0);
-        if(isLastMe && isLastOther) {
-            return true;
-        } else if(isLastMe) {
-            return false;
-        } else if(isLastOther) {
-            return true;
-        } else if(*anIterMe == *anIterOther) {
-            continue;
-        } else {
-            return *anIterMe < *anIterOther;
-        }
-    }
-}
-
-template<typename Type> inline
-StStringUnicode<Type>& StStringUnicode<Type>::operator+=(const StStringUnicode<Type>& theAppend) {
-    if(theAppend.isEmpty()) {
-        return (*this);
-    }
-    // create new string
-    const size_t aSize = this->Size + theAppend.Size;
-    Type* aString = stStrAlloc(aSize);
-    stStrCopy((stUByte_t* )aString,              (const stUByte_t* )this->String,     this->Size);
-    stStrCopy((stUByte_t* )aString + this->Size, (const stUByte_t* )theAppend.String, theAppend.Size);
-
-    stStrFree(this->String);
-    this->Size   = aSize;
-    this->String = aString;
-    this->Length += theAppend.Length;
-    return (*this);
-}
-
-template<typename Type> inline
-StStringUnicode<Type> StStringUnicode<Type>::subString(const size_t theStart,
-                                                       const size_t theEnd) const {
-    if(theStart >= theEnd) {
-        return StStringUnicode<Type>();
-    }
-    for(StUtfIterator<Type> anIter(this->String); *anIter != 0; ++anIter) {
-        if(anIter.getIndex() >= theStart) {
-            return StStringUnicode<Type>(anIter.getBufferHere(), theEnd - theStart);
-        }
-    }
-    return StStringUnicode<Type>();
-}
-
-template<typename Type> inline
-const StStringUnicode<stUtf8_t> StStringUnicode<Type>::toUtf8() const {
-    StStringUnicode<stUtf8_t> aCopy;
-    aCopy.fromUnicode(this->String);
-    return aCopy;
-}
-
-template<typename Type> inline
-const StStringUnicode<stUtf16_t> StStringUnicode<Type>::toUtf16() const {
-    StStringUnicode<stUtf16_t> aCopy;
-    aCopy.fromUnicode(this->String);
-    return aCopy;
-}
-
-template<typename Type> inline
-const StStringUnicode<stUtf32_t> StStringUnicode<Type>::toUtf32() const {
-    StStringUnicode<stUtf32_t> aCopy;
-    aCopy.fromUnicode(this->String);
-    return aCopy;
-}
-
-template<typename Type> inline
-const StStringUnicode<stUtfWide_t> StStringUnicode<Type>::toUtfWide() const {
-    StStringUnicode<stUtfWide_t> aCopy;
-    aCopy.fromUnicode(this->String);
-    return aCopy;
-}
-
-template<typename Type> inline
-const StStringUnicode<stUtf8_t> StStringUnicode<Type>::toDump() const {
-    StStringUnicode<stUtf8_t> aDump;
-    aDump += StStringUnicode<stUtf8_t>("StStringUnicode<") + sizeof(Type) + ">, size= " + this->Size + ", length= " + this->Length + ", text= '";
-    switch(sizeof(Type)) {
-        case sizeof(stUtf8_t): {
-            aDump += (const stUtf8_t* )this->String;
-            break;
-        }
-        default: {
-            aDump += toUtf8();
-            break;
-        }
-    }
-    return aDump + "'";
-}
-
-template<typename Type> inline
-bool StConstStringUnicode<Type>::isStartsWith(const Type theStartChar) const {
-    return this->Length != 0
-        && this->String0 == theStartChar;
-}
-
-template<typename Type> inline
-bool StConstStringUnicode<Type>::isEndsWith(const Type theEndChar) const {
-    return this->Length != 0
-        && *(Type* )((stUByte_t* )this->String + this->Size - sizeof(Type)) == theEndChar;
-}
-
-template<typename Type> inline
-bool StConstStringUnicode<Type>::isStartsWith(const StConstStringUnicode<Type>& theStartString) const {
-    if(this->Size < theStartString.Size) {
-        return false;
-    } else if(this == &theStartString) {
-        return true;
-    }
-    return stStrAreEqual((const char* )this->String,          theStartString.Size,
-                         (const char* )theStartString.String, theStartString.Size);
-}
-
-template<typename Type> inline
-bool StStringUnicode<Type>::isStartsWithIgnoreCase(const StConstStringUnicode<Type>& theStartString) const {
-    return (this == &theStartString)
-        || subString(0, theStartString.getLength()).isEqualsIgnoreCase(theStartString);
-}
-
-template<typename Type> inline
-bool StConstStringUnicode<Type>::isEndsWith(const StConstStringUnicode<Type>& theEndString) const {
-    if(this->Size < theEndString.Size) {
-        return false;
-    } else if(this == &theEndString) {
-        return true;
-    }
-
-    return stStrAreEqual((const char* )this->String + this->Size - theEndString.Size, theEndString.Size,
-                         (const char* )theEndString.String, theEndString.Size);
-}
-
-template<typename Type> inline
-bool StStringUnicode<Type>::isEndsWithIgnoreCase(const StConstStringUnicode<Type>& theEndString) const {
-    if(this == &theEndString) {
-        return true;
-    }
-    return (this->Length >= theEndString.Length)
-        && subString(this->Length - theEndString.Length, this->Length).isEqualsIgnoreCase(theEndString);
-}
-
-template<typename Type> inline
-StHandle <StArrayList< StStringUnicode<Type> > > StStringUnicode<Type>::split(const stUtf32_t theDelimeter,
-                                                                              const size_t    theLimitNb) const {
-    StHandle< StArrayList< StStringUnicode<Type> > > aSplitList
-        = new StArrayList< StStringUnicode<Type> >((theLimitNb < size_t(-1)) ? theLimitNb : 16);
-
-    size_t aStart = 0;
-    size_t aSplitCount = 1; // set to 1, that is
-    for(StUtfIterator<Type> anIter(this->String);; ++anIter) {
-        if(*anIter == 0) {
-            StStringUnicode<Type> aSplit = subString(aStart, anIter.getIndex());
-            if(!aSplit.isEmpty()) {
-                aSplitList->add(aSplit);
-            }
-            break;
-        } else if(*anIter == theDelimeter) {
-            aSplitList->add(subString(aStart, anIter.getIndex()));
-            aStart = anIter.getIndex() + 1;
-            if(++aSplitCount >= theLimitNb) {
-                if(this->Length > aStart) {
-                    aSplitList->add(subString(aStart, this->Length));
-                }
-                break;
-            }
-        }
-    }
-    return aSplitList;
-}
-
-template<typename Type> inline
-bool StConstStringUnicode<Type>::isContains(const stUtf32_t theSubChar) const {
-    for(StUtfIterator<Type> anIter(this->String); *anIter != 0; ++anIter) {
-        if(stUtf32_t(*anIter) == theSubChar) {
-            return true;
-        }
-    }
-    return false;
-}
-
-template<typename Type> inline
-bool StConstStringUnicode<Type>::isContains(const StConstStringUnicode<Type>& theSubString) const {
-    if(theSubString.isEmpty()) {
-        return true;
-    }
-    StUtfIterator<Type> anIterMe(this->String);
-    StUtfIterator<Type> anIterSub(theSubString.String);
-    for(;; ++anIterMe) {
-        if(*anIterMe == 0) {
-            return *anIterSub == 0;
-        } else if(*anIterSub == 0) {
-            return true;
-        } else if(*anIterMe == *anIterSub) {
-            ++anIterSub;
-        } else {
-            anIterSub.init(theSubString.String);
-        }
-    }
-}
-
-template<typename Type> inline
-StStringUnicode<Type> StStringUnicode<Type>::unquoted() const {
-    if(this->Length < 2) {
-        return *this;
-    }
-    const Type* aLastSymbol = getCharBuffer(this->Length - 1);
-    if((aLastSymbol != this->String)
-    && ((*this->String == Type('\"') && *aLastSymbol == Type('\"'))
-     || (*this->String == Type('\'') && *aLastSymbol == Type('\'')))) {
-        return subString(1, this->Length - 1);
-    }
-    return *this;
-}
-
-template<typename Type> inline
-StStringUnicode<Type> StStringUnicode<Type>::replace(const StStringUnicode<Type>& theSubString,
-                                                     const StStringUnicode<Type>& theReplacer) const {
-    if(theSubString.isEmpty() || this->isEmpty() || theSubString.Size > this->Size) {
-        // just make a copy
-        return *this;
-    } else if(theSubString.Size == this->Size) {
-        if(theSubString.isEquals(*this)) {
-            return theReplacer;
-        }
-    }
-    StUtfIterator<Type> anIter(this->String);
-    StStringUnicode<Type> aResult;
-    size_t aStart = 0;
-    for(size_t aCharId = 0; *anIter != 0;) {
-        if(stAreEqual(anIter.getBufferHere(), theSubString.String, theSubString.Size)) {
-            aResult += subString(aStart, aCharId);
-            aResult += theReplacer;
-            aStart  = aCharId + theSubString.Length;
-            aCharId = aStart;
-            anIter.init(anIter.getBufferHere() + theSubString.Size);
-            continue;
-        }
-        ++anIter;
-        ++aCharId;
-    }
-    if(aStart < this->Length) {
-        aResult += subString(aStart, this->Length);
-    }
-    return aResult;
-}
-
-template<typename Type> inline
-void StStringUnicode<Type>::replaceFast(const StStringUnicode<Type>& theSubString,
-                                        const StStringUnicode<Type>& theReplacer) {
-    if(theSubString.isEmpty() || this->isEmpty() || theSubString.Size >= this->Size) {
-        // just make a copy
-        return;
-    } else if(theSubString.Size != theReplacer.Size) {
-        // invalid method usage
-        ST_DEBUG_ASSERT(theSubString.Size == theReplacer.Size);
-        ///*this = replace(theSubString, theReplacer);
-        return;
-    }
-    for(StUtfIterator<Type> anIter(this->String); *anIter != 0;) {
-        if(stAreEqual(anIter.getBufferHere(), theSubString.String, theSubString.Size)) {
-            stStrCopy((stUByte_t* )anIter.changeBufferHere(), (const stUByte_t* )theReplacer.String, theReplacer.Size);
-            anIter.init(anIter.getBufferHere() + theSubString.Size);
-            continue;
-        }
-        ++anIter;
-    }
-}
-
-template<typename Type> inline
-void StStringUnicode<Type>::leftAdjust() {
-    if(this->Length == 0) {
-        return;
-    }
-    for(size_t anIter = 0; anIter < this->Size / sizeof(Type); ++anIter) {
-      if(this->StringanIter != (Type )' '
-      && this->StringanIter != (Type )'\t') {
-          if(anIter != 0) {
-              StStringUnicode<Type> aCopy(&this->StringanIter);
-              *this = aCopy;
-          }
-          return;
-      }
-    }
-}
-
-template<typename Type> inline
-void StStringUnicode<Type>::rightAdjust() {
-    if(this->Length == 0) {
-        return;
-    }
-    for(size_t anIter = this->Size / sizeof(Type) - 1; anIter != 0; --anIter) {
-      if(this->StringanIter == (Type )' '
-      || this->StringanIter == (Type )'\t') {
-          ((Type* )this->String)anIter = (Type )'\0';
-          this->Size -= sizeof(Type);
-          --this->Length;
-      } else {
-          return;
-      }
-    }
-}
-
-template<typename Type> inline
-void StStringUnicode<Type>::toLowerCase() {
-    for(StUtfIterator<Type> anIter(this->String); *anIter != 0; ++anIter) {
-        if(*anIter > 64 && *anIter < 91) {
-            *anIter.changeBufferHere() = Type(*anIter + 32);
-        }
-    }
-}
-
-template<typename Type> inline
-StStringUnicode<Type> StStringUnicode<Type>::lowerCased() const {
-    StStringUnicode<Type> aCopy(*this);
-    aCopy.toLowerCase();
-    return aCopy;
-}
-
-template<typename Type> inline
-int StStringUnicode<Type>::hexPairValue(const Type* theCode) {
-    int aValue = 0;
-    int aDigit;
-    for(const Type* anIter = theCode;;) {
-        aDigit = *anIter++;
-        if(aDigit >= '0' && aDigit <= '9') {
-            aValue += aDigit - '0';
-        } else if (aDigit >= 'A' && aDigit <= 'F') {
-            aValue += aDigit - 'A' + 10;
-        } else if (aDigit >= 'a' && aDigit <= 'f') {
-            aValue += aDigit - 'a' + 10;
-        } else {
-            return -1;
-        }
-        if(anIter == theCode + 2) {
-            return aValue;
-        }
-        aValue <<= 4;
-    }
-}
-
-template<typename Type> inline
-size_t StStringUnicode<Type>::urlDecode(const Type* theSrcUrl,
-                                        stUtf8_t*   theOut) {
-    const stUtf8_t* aStart = theOut;
-    for(StUtfIterator<Type> anIter(theSrcUrl); *anIter != 0; ++anIter) {
-        switch(*anIter) {
-            /*case stUtf32_t('+'):
-                // old-style space-symbol replacement (in current standard %20 = ' ')
-                *(theOut++) = ' ';
-                break;*/
-            case stUtf32_t('%'):
-                if(anIter.getBufferHere()1 != Type('\0')
-                && anIter.getBufferHere()2 != Type('\0')) {
-                    // coded symbol: %XX
-                    int aValue = hexPairValue(anIter.getBufferHere() + 1);
-                    if(aValue >= 0) {
-                        *(theOut++) = (stUtf8_t )aValue;
-                        ++anIter;
-                        ++anIter;
-                    } else {
-                        *theOut++ = '?';
-                    }
-                } else {
-                    *theOut++ = '?';
-                }
-                break;
-            default:
-                theOut = anIter.getUtf(theOut);
-        }
-    }
-    // remove trailing CR symbol
-    if(theOut > aStart && *--theOut != stUtf8_t(13)) {
-        ++theOut;
-    }
-    *theOut = '\0';
-    return theOut - aStart;
-}
-
-/**
- * Define function for standard output (UTF-8 string).
- */
-inline std::ostream& operator<<(std::ostream& theStream,
-                                const StStringUnicode<stUtf8_t>& theString) {
-    theStream << theString.toCString();
-    return theStream;
-}
-
-/**
- * Define function for standard output (UTF-16 string).
- */
-inline std::ostream& operator<<(std::ostream& theStream,
-                                const StStringUnicode<stUtf16_t>& theString) {
-    theStream << theString.toUtf8();
-    return theStream;
-}
-
-/**
- * Define function for standard output (UTF-32 string).
- */
-inline std::ostream& operator<<(std::ostream& theStream,
-                                const StStringUnicode<stUtf32_t>& theString) {
-    theStream << theString.toUtf8();
-    return theStream;
-}
-
-#ifdef _WIN32
-/**
- * Define function for wide standard output.
- */
-inline std::wostream& operator<<(std::wostream& theStream,
-                                 const StStringUnicode<stUtfWide_t>& theString) {
-    theStream << theString.toCString();
-    return theStream;
-}
-
-/**
- * Define function for wide standard output (UTF-8 string).
- */
-inline std::wostream& operator<<(std::wostream& theStream,
-                                 const StStringUnicode<stUtf8_t>& theString) {
-    theStream << theString.toUtfWide();
-    return theStream;
-}
-
-/**
- * Define function for wide standard output (UTF-16 string).
- */
-inline std::wostream& operator<<(std::wostream& theStream,
-                                 const StStringUnicode<stUtf16_t>& theString) {
-    theStream << theString.toUtfWide();
-    return theStream;
-}
-
-/**
- * Define function for wide standard output (UTF-32 string).
- */
-inline std::wostream& operator<<(std::wostream& theStream,
-                                 const StStringUnicode<stUtf32_t>& theString) {
-    theStream << theString.toUtfWide();
-    return theStream;
-}
-#endif
-
-#endif // __StStringUnicode_inl__

_service:obs_scm:sview-26.obscpio/include/StStrings/StUtfIterator.h Changed

@@ -1,24 +1,40 @@
 /**
  * Copyright © 2008 Daniel Remenak <dtremenak@users.sourceforge.net>
- * Copyright © 2001-2004 Unicode, Inc.
+ * Copyright © 1991-2026 Unicode, Inc.
  *
- * Disclaimer
+ * NOTICE TO USER: Carefully read the following legal agreement. BY
+ * DOWNLOADING, INSTALLING, COPYING OR OTHERWISE USING DATA FILES, AND/OR
+ * SOFTWARE, YOU UNEQUIVOCALLY ACCEPT, AND AGREE TO BE BOUND BY, ALL OF THE
+ * TERMS AND CONDITIONS OF THIS AGREEMENT. IF YOU DO NOT AGREE, DO NOT
+ * DOWNLOAD, INSTALL, COPY, DISTRIBUTE OR USE THE DATA FILES OR SOFTWARE.
  *
- * This source code is provided as is by Unicode, Inc. No claims are
- * made as to fitness for any particular purpose. No warranties of any
- * kind are expressed or implied. The recipient agrees to determine
- * applicability of information provided. If this file has been
- * purchased on magnetic or optical media from Unicode, Inc., the
- * sole remedy for any claim will be exchange of defective media
- * within 90 days of receipt.
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of data files and any associated documentation (the "Data Files") or
+ * software and any associated documentation (the "Software") to deal in the
+ * Data Files or Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, and/or sell
+ * copies of the Data Files or Software, and to permit persons to whom the
+ * Data Files or Software are furnished to do so, provided that either (a)
+ * this copyright and permission notice appear with all copies of the Data
+ * Files or Software, or (b) this copyright and permission notice appear in
+ * associated Documentation.
  *
- * Limitations on Rights to Redistribute This Code
+ * THE DATA FILES AND SOFTWARE ARE PROVIDED "AS IS", WITHOUT WARRANTY OF ANY
+ * KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT OF
+ * THIRD PARTY RIGHTS.
  *
- * Unicode, Inc. hereby grants the right to freely use the information
- * supplied in this file in the creation of products supporting the
- * Unicode Standard, and to make copies of this file in any form
- * for internal or external distribution as long as this notice
- * remains attached.
+ * IN NO EVENT SHALL THE COPYRIGHT HOLDER OR HOLDERS INCLUDED IN THIS NOTICE
+ * BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL INDIRECT OR CONSEQUENTIAL DAMAGES,
+ * OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS,
+ * WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION,
+ * ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THE DATA
+ * FILES OR SOFTWARE.
+ *
+ * Except as contained in this notice, the name of a copyright holder shall
+ * not be used in advertising or otherwise to promote the sale, use or other
+ * dealings in these Data Files or Software without prior written
+ * authorization of the copyright holder.
  *
  * Copyright © 2009-2014 Kirill Gavrilov <kirill@sview.ru>
  *
@@ -46,34 +62,34 @@
 
     const Type* myPosition;  //!< buffer position of the first element in the current character
     const Type* myPosNext;   //!< buffer position of the first element in the next character
-    size_t      myCharIndex; //!< index displacement from iterator intialization
+    size_t      myCharIndex; //!< index displacement from iterator initialization
     stUtf32_t   myCharUtf32; //!< character stored at the current buffer position
 
         public:
 
     /**
      * Constructor.
-     * @param theString (const Type* ) - buffer to iterate.
+     * @paramin theString buffer to iterate
      */
-    inline StUtfIterator(const Type* theString)
+    StUtfIterator(const Type* theString)
     : myPosition(theString),
       myPosNext(theString),
       myCharIndex(0),
       myCharUtf32(0) {
-        if(theString != NULL) {
+        if (theString != nullptr) {
             ++(*this);
             myCharIndex = 0;
         }
-    };
+    }
 
     /**
      * Initialize iterator within specified string.
      */
-    inline void init(const Type* theString) {
+    void init(const Type* theString) {
         myPosition  = theString;
         myPosNext   = theString;
         myCharUtf32 = 0;
-        if(theString != NULL) {
+        if (theString != nullptr) {
             ++(*this);
         }
         myCharIndex = 0;
@@ -83,10 +99,10 @@
      * Pre-increment operator. Reads the next unicode character.
      * Note - not protected against overruns.
      */
-    inline StUtfIterator& operator++() {
+    StUtfIterator& operator++() {
         myPosition = myPosNext;
         ++myCharIndex;
-        switch(sizeof(Type)) {
+        switch (sizeof(Type)) {
             case 1: readUTF8();  break;
             case 2: readUTF16(); break;
             case 4: // UTF-32
@@ -100,7 +116,7 @@
      * Post-increment operator.
      * Note - not protected against overruns.
      */
-    inline StUtfIterator operator++(int ) {
+    StUtfIterator operator++(int ) {
         StUtfIterator aCopy = *this;
         ++*this;
         return aCopy;
@@ -109,8 +125,8 @@
     /**
      * Several characters forward.
      */
-    inline StUtfIterator& operator+=(int theIncrement) {
-        for(; theIncrement > 0; --theIncrement) {
+    StUtfIterator& operator+=(int theIncrement) {
+        for (; theIncrement > 0; --theIncrement) {
             ++*this;
         }
         return *this;
@@ -119,7 +135,7 @@
     /**
      * Equality operator.
      */
-    inline bool operator==(const StUtfIterator& theRight) const {
+    bool operator==(const StUtfIterator& theRight) const {
         return myPosition == theRight.myPosition;
     }
 
@@ -127,31 +143,27 @@
      * Dereference operator.
      * @return the UTF-32 codepoint of the character currently pointed by iterator.
      */
-    inline stUtf32_t operator*() const {
-        return myCharUtf32;
-    }
+    stUtf32_t operator*() const { return myCharUtf32; }
 
     /**
      * Buffer-fetching getter.
      */
-    inline const Type* getBufferHere() const { return myPosition; }
+    const Type* getBufferHere() const { return myPosition; }
 
     /**
      * Buffer-fetching getter. Dangerous! Iterator should be reinitialized on buffer change.
      */
-    inline Type* changeBufferHere() { return (Type* )myPosition; }
+    Type* changeBufferHere() { return (Type* )myPosition; }
 
     /**
      * Buffer-fetching getter.
      */
-    inline const Type* getBufferNext() const { return myPosNext; }
+    const Type* getBufferNext() const { return myPosNext; }
 
     /**
      * Return the index displacement from iterator initialization.
      */
-    inline size_t getIndex() const {
-        return myCharIndex;
-    }
+    size_t getIndex() const { return myCharIndex; }
 
     /**
      * @return the advance in bytes to store current symbol in UTF-8.
@@ -172,9 +184,7 @@
      * @return the advance in bytes to store current symbol in UTF-32.
      * Always 4 bytes (method for consistency).
      */
-    inline size_t getAdvanceBytesUtf32() const {
-        return sizeof(stUtf32_t);
-    }
+    size_t getAdvanceBytesUtf32() const { return sizeof(stUtf32_t); }
 
     /**
      * Fill the UTF-8 buffer within current Unicode symbol.
@@ -230,22 +240,50 @@
      */
     void readUTF16();
 
-        private: //!< unicode magic numbers
-
-    static const unsigned char UTF8_BYTES_MINUS_ONE256;
-    static const unsigned long offsetsFromUTF86;
-    static const unsigned char UTF8_FIRST_BYTE_MARK7;
-    static const unsigned long UTF8_BYTE_MASK;
-    static const unsigned long UTF8_BYTE_MARK;
-    static const unsigned long UTF16_SURROGATE_HIGH_START;
-    static const unsigned long UTF16_SURROGATE_HIGH_END;
-    static const unsigned long UTF16_SURROGATE_LOW_START;
-    static const unsigned long UTF16_SURROGATE_LOW_END;
-    static const unsigned long UTF16_SURROGATE_HIGH_SHIFT;
-    static const unsigned long UTF16_SURROGATE_LOW_BASE;
-    static const unsigned long UTF16_SURROGATE_LOW_MASK;
-    static const unsigned long UTF32_MAX_BMP;
-    static const unsigned long UTF32_MAX_LEGAL;
+        private: //! @name unicode magic numbers
+
+    /**
+     * The first character in a UTF-8 sequence indicates how many bytes
+     * to read (among other things).
+     */
+    static constexpr unsigned char UTF8_BYTES_MINUS_ONE256 = {
+        0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+        0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+        0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+        0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+        0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+        0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+        1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1, 1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,
+        2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2, 3,3,3,3,3,3,3,3,4,4,4,4,5,5,5,5
+    };
+
+    /**
+     * Magic values subtracted from a buffer value during UTF-8 conversion.
+     * This table contains as many values as there might be trailing bytes
+     * in a UTF-8 sequence.
+     */
+    static constexpr stUtf32_t offsetsFromUTF86 = {
+        0x00000000UL, 0x00003080UL, 0x000E2080UL,
+        0x03C82080UL, 0xFA082080UL, 0x82082080UL
+    };
+
+    /**
+     * The first character in a UTF-8 sequence indicates how many bytes to read.
+     */
+    static constexpr unsigned char UTF8_FIRST_BYTE_MARK7 = { 0x00, 0x00, 0xC0, 0xE0, 0xF0, 0xF8, 0xFC };
+
+    // magic numbers
+    static constexpr stUtf32_t UTF8_BYTE_MASK = 0xBF;
+    static constexpr stUtf32_t UTF8_BYTE_MARK = 0x80;
+    static constexpr stUtf32_t UTF16_SURROGATE_HIGH_START = 0xD800;
+    static constexpr stUtf32_t UTF16_SURROGATE_HIGH_END   = 0xDBFF;
+    static constexpr stUtf32_t UTF16_SURROGATE_LOW_START  = 0xDC00;
+    static constexpr stUtf32_t UTF16_SURROGATE_LOW_END    = 0xDFFF;
+    static constexpr stUtf32_t UTF16_SURROGATE_HIGH_SHIFT = 10;
+    static constexpr stUtf32_t UTF16_SURROGATE_LOW_BASE   = 0x0010000UL;
+    static constexpr stUtf32_t UTF16_SURROGATE_LOW_MASK   = 0x3FFUL;
+    static constexpr stUtf32_t UTF32_MAX_BMP   = 0x0000FFFFUL;
+    static constexpr stUtf32_t UTF32_MAX_LEGAL = 0x0010FFFFUL;
 
 };
 
@@ -255,6 +293,196 @@
 typedef StUtfIterator<stUtfWide_t> StUtfWideIter;
 
 // template implementation
-#include "StUtfIterator.inl"
+
+template<typename Type>
+constexpr unsigned char StUtfIterator<Type>::UTF8_BYTES_MINUS_ONE256;
+
+template<typename Type>
+constexpr stUtf32_t StUtfIterator<Type>::offsetsFromUTF86;
+
+/**
+ * Get a UTF-8 character; leave the tracking pointer at the start of the next character.
+ * Not protected against invalid UTF-8.
+ */
+template<typename Type>
+inline void StUtfIterator<Type>::readUTF8() {
+    // unsigned arithmetic used
+    stUtf8u_t* aPos = (stUtf8u_t* )myPosNext;
+    const unsigned char aBytesToRead = UTF8_BYTES_MINUS_ONE*aPos;
+    myCharUtf32 = 0;
+    switch (aBytesToRead) {
+        case 5:
+            myCharUtf32 += *aPos++;
+            myCharUtf32 <<= 6; // remember, illegal UTF-8
+            ST_FALLTHROUGH
+        case 4:
+            myCharUtf32 += *aPos++;
+            myCharUtf32 <<= 6; // remember, illegal UTF-8
+            ST_FALLTHROUGH
+        case 3:
+            myCharUtf32 += *aPos++;
+            myCharUtf32 <<= 6;
+            ST_FALLTHROUGH
+        case 2:
+            myCharUtf32 += *aPos++;
+            myCharUtf32 <<= 6;
+            ST_FALLTHROUGH
+        case 1:
+            myCharUtf32 += *aPos++;
+            myCharUtf32 <<= 6;
+            ST_FALLTHROUGH
+        case 0:
+            myCharUtf32 += *aPos++;
+            break;
+    }
+    myCharUtf32 -= offsetsFromUTF8aBytesToRead;
+    myPosNext = (Type* )aPos;
+}
+
+template<typename Type> inline
+void StUtfIterator<Type>::readUTF16() {
+    stUtf32_t aChar = *myPosNext++;
+    // if we have the first half of the surrogate pair
+    if (aChar >= UTF16_SURROGATE_HIGH_START
+     && aChar <= UTF16_SURROGATE_HIGH_END) {
+        const stUtf32_t aChar2 = *myPosNext;
+        // complete the surrogate pair
+        if (aChar2 >= UTF16_SURROGATE_LOW_START
+         && aChar2 <= UTF16_SURROGATE_LOW_END) {
+            aChar = ((aChar - UTF16_SURROGATE_HIGH_START) << UTF16_SURROGATE_HIGH_SHIFT)
+                  + (aChar2 - UTF16_SURROGATE_LOW_START)   + UTF16_SURROGATE_LOW_BASE;
+            ++myPosNext;
+        }
+    }
+    myCharUtf32 = aChar;
+}
+
+template<typename Type> inline
+size_t StUtfIterator<Type>::getAdvanceBytesUtf8() const {
+    if (myCharUtf32 >= UTF16_SURROGATE_HIGH_START
+     && myCharUtf32 <= UTF16_SURROGATE_LOW_END) {
+        // UTF-16 surrogate values are illegal in UTF-32
+        return 0;
+    } else if (myCharUtf32 < stUtf32_t(0x80)) {
+        return 1;
+    } else if (myCharUtf32 < stUtf32_t(0x800)) {
+        return 2;
+    } else if (myCharUtf32 < stUtf32_t(0x10000)) {
+        return 3;
+    } else if (myCharUtf32 <= UTF32_MAX_LEGAL) {
+        return 4;
+    } else {
+        // illegal
+        return 0;
+    }
+}
+
+template<typename Type> inline
+stUtf8_t* StUtfIterator<Type>::getUtf8(stUtf8_t* theBuffer) const {
+    // unsigned arithmetic used
+    return (stUtf8_t* )getUtf8((stUtf8u_t* )theBuffer);
+}
+
+template<typename Type> inline
+stUtf8u_t* StUtfIterator<Type>::getUtf8(stUtf8u_t* theBuffer) const {
+    stUtf32_t aChar = myCharUtf32;
+    if (myCharUtf32 >= UTF16_SURROGATE_HIGH_START
+     && myCharUtf32 <= UTF16_SURROGATE_LOW_END) {
+        // UTF-16 surrogate values are illegal in UTF-32
+        return theBuffer;
+    } else if (myCharUtf32 < stUtf32_t(0x80)) {
+        *theBuffer++ = stUtf8u_t (aChar | UTF8_FIRST_BYTE_MARK1);
+        return theBuffer;
+    } else if (myCharUtf32 < stUtf32_t(0x800)) {
+        *++theBuffer = stUtf8u_t((aChar | UTF8_BYTE_MARK) & UTF8_BYTE_MASK); aChar >>= 6;
+        *--theBuffer = stUtf8u_t (aChar | UTF8_FIRST_BYTE_MARK2);
+        return theBuffer + 2;
+    } else if (myCharUtf32 < stUtf32_t(0x10000)) {
+        theBuffer += 3;
+        *--theBuffer = stUtf8u_t((aChar | UTF8_BYTE_MARK) & UTF8_BYTE_MASK); aChar >>= 6;
+        *--theBuffer = stUtf8u_t((aChar | UTF8_BYTE_MARK) & UTF8_BYTE_MASK); aChar >>= 6;
+        *--theBuffer = stUtf8u_t (aChar | UTF8_FIRST_BYTE_MARK3);
+        return theBuffer + 3;
+    } else if (myCharUtf32 <= UTF32_MAX_LEGAL) {
+        theBuffer += 4;
+        *--theBuffer = stUtf8u_t((aChar | UTF8_BYTE_MARK) & UTF8_BYTE_MASK); aChar >>= 6;
+        *--theBuffer = stUtf8u_t((aChar | UTF8_BYTE_MARK) & UTF8_BYTE_MASK); aChar >>= 6;
+        *--theBuffer = stUtf8u_t((aChar | UTF8_BYTE_MARK) & UTF8_BYTE_MASK); aChar >>= 6;
+        *--theBuffer = stUtf8u_t (aChar | UTF8_FIRST_BYTE_MARK4);
+        return theBuffer + 4;
+    } else {
+        // illegal
+        return theBuffer;
+    }
+}
+
+template<typename Type> inline
+size_t StUtfIterator<Type>::getAdvanceBytesUtf16() const {
+    if (myCharUtf32 <= UTF32_MAX_BMP) { // target is a character <= 0xFFFF
+        // UTF-16 surrogate values are illegal in UTF-32; 0xffff or 0xfffe are both reserved values
+        if (myCharUtf32 >= UTF16_SURROGATE_HIGH_START
+         && myCharUtf32 <= UTF16_SURROGATE_LOW_END) {
+            return 0;
+        } else {
+            return sizeof(stUtf16_t);
+        }
+    } else if (myCharUtf32 > UTF32_MAX_LEGAL) {
+        // illegal
+        return 0;
+    } else {
+        // target is a character in range 0xFFFF - 0x10FFFF
+        // surrogate pair
+        return sizeof(stUtf16_t) * 2;
+    }
+}
+
+template<typename Type> inline
+stUtf16_t* StUtfIterator<Type>::getUtf16(stUtf16_t* theBuffer) const {
+    if (myCharUtf32 <= UTF32_MAX_BMP) { // target is a character <= 0xFFFF
+        // UTF-16 surrogate values are illegal in UTF-32; 0xffff or 0xfffe are both reserved values
+        if (myCharUtf32 >= UTF16_SURROGATE_HIGH_START
+         && myCharUtf32 <= UTF16_SURROGATE_LOW_END) {
+            return theBuffer;
+        } else {
+            *theBuffer++ = stUtf16_t(myCharUtf32);
+            return theBuffer;
+        }
+    } else if (myCharUtf32 > UTF32_MAX_LEGAL) {
+        // illegal
+        return theBuffer;
+    } else {
+        // surrogate pair
+        stUtf32_t aChar = myCharUtf32 - UTF16_SURROGATE_LOW_BASE;
+        *theBuffer++ = stUtf16_t((aChar >> UTF16_SURROGATE_HIGH_SHIFT) + UTF16_SURROGATE_HIGH_START);
+        *theBuffer++ = stUtf16_t((aChar &  UTF16_SURROGATE_LOW_MASK)   + UTF16_SURROGATE_LOW_START);
+        return theBuffer;
+    }
+}
+
+template<typename Type> inline
+stUtf32_t* StUtfIterator<Type>::getUtf32(stUtf32_t* theBuffer) const {
+    *theBuffer++ = myCharUtf32;
+    return theBuffer;
+}
+
+template<typename Type> template<typename TypeWrite> inline
+size_t StUtfIterator<Type>::getAdvanceBytesUtf() const {
+    switch (sizeof(TypeWrite)) {
+        case sizeof(stUtf8_t):  return getAdvanceBytesUtf8();
+        case sizeof(stUtf16_t): return getAdvanceBytesUtf16();
+        case sizeof(stUtf32_t): return getAdvanceBytesUtf32();
+        default:                return 0; // invalid case
+    }
+}
+
+template<typename Type> template<typename TypeWrite> inline
+TypeWrite* StUtfIterator<Type>::getUtf(TypeWrite* theBuffer) const {
+    switch (sizeof(TypeWrite)) {
+        case sizeof(stUtf8_t):  return (TypeWrite* )getUtf8 ((stUtf8u_t* )theBuffer);
+        case sizeof(stUtf16_t): return (TypeWrite* )getUtf16((stUtf16_t* )theBuffer);
+        case sizeof(stUtf32_t): return (TypeWrite* )getUtf32((stUtf32_t* )theBuffer);
+        default:                return nullptr; // invalid case
+    }
+}
 
 #endif //__StUtfIterator_h_

_service:obs_scm:sview-26.obscpio/include/StStrings/StUtfIterator.inl Deleted

@@ -1,262 +0,0 @@
-/**
- * Copyright © 2008 Daniel Remenak <dtremenak@users.sourceforge.net>
- * Copyright © 2001-2004 Unicode, Inc.
- *
- * Disclaimer
- *
- * This source code is provided as is by Unicode, Inc. No claims are
- * made as to fitness for any particular purpose. No warranties of any
- * kind are expressed or implied. The recipient agrees to determine
- * applicability of information provided. If this file has been
- * purchased on magnetic or optical media from Unicode, Inc., the
- * sole remedy for any claim will be exchange of defective media
- * within 90 days of receipt.
- *
- * Limitations on Rights to Redistribute This Code
- *
- * Unicode, Inc. hereby grants the right to freely use the information
- * supplied in this file in the creation of products supporting the
- * Unicode Standard, and to make copies of this file in any form
- * for internal or external distribution as long as this notice
- * remains attached.
- *
- * Copyright © 2009-2011 Kirill Gavrilov <kirill@sview.ru>
- *
- * This code is licensed under MIT license (see docs/license-mit.txt for details).
- */
-
-#ifndef __StUtfIterator_inl_
-#define __StUtfIterator_inl_
-
-/**
- * The first character in a UTF-8 sequence indicates how many bytes
- * to read (among other things).
- */
-template<typename Type>
-const unsigned char StUtfIterator<Type>::UTF8_BYTES_MINUS_ONE256 = {
-    0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-    0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-    0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-    0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-    0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-    0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-    1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1, 1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,
-    2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2, 3,3,3,3,3,3,3,3,4,4,4,4,5,5,5,5
-};
-
-/**
- * Magic values subtracted from a buffer value during UTF-8 conversion.
- * This table contains as many values as there might be trailing bytes
- * in a UTF-8 sequence.
- */
-template<typename Type>
-const unsigned long StUtfIterator<Type>::offsetsFromUTF86 = {
-    0x00000000UL, 0x00003080UL, 0x000E2080UL,
-    0x03C82080UL, 0xFA082080UL, 0x82082080UL
-};
-
-/**
- * The first character in a UTF-8 sequence indicates how many bytes to read.
- */
-template<typename Type>
-const unsigned char StUtfIterator<Type>::UTF8_FIRST_BYTE_MARK7 = { 0x00, 0x00, 0xC0, 0xE0, 0xF0, 0xF8, 0xFC };
-
-/**
- * Get a UTF-8 character; leave the tracking pointer at the start of the next character.
- * Not protected against invalid UTF-8.
- */
-template<typename Type>
-inline void StUtfIterator<Type>::readUTF8() {
-    // unsigned arithmetic used
-    stUtf8u_t* aPos = (stUtf8u_t* )myPosNext;
-    const unsigned char aBytesToRead = UTF8_BYTES_MINUS_ONE*aPos;
-    myCharUtf32 = 0;
-    switch(aBytesToRead) {
-        case 5:
-            myCharUtf32 += *aPos++;
-            myCharUtf32 <<= 6; // remember, illegal UTF-8
-            ST_FALLTHROUGH
-        case 4:
-            myCharUtf32 += *aPos++;
-            myCharUtf32 <<= 6; // remember, illegal UTF-8
-            ST_FALLTHROUGH
-        case 3:
-            myCharUtf32 += *aPos++;
-            myCharUtf32 <<= 6;
-            ST_FALLTHROUGH
-        case 2:
-            myCharUtf32 += *aPos++;
-            myCharUtf32 <<= 6;
-            ST_FALLTHROUGH
-        case 1:
-            myCharUtf32 += *aPos++;
-            myCharUtf32 <<= 6;
-            ST_FALLTHROUGH
-        case 0:
-            myCharUtf32 += *aPos++;
-            break;
-    }
-    myCharUtf32 -= offsetsFromUTF8aBytesToRead;
-    myPosNext = (Type* )aPos;
-}
-
-// magic numbers
-template<typename Type> const unsigned long StUtfIterator<Type>::UTF8_BYTE_MASK = 0xBF;
-template<typename Type> const unsigned long StUtfIterator<Type>::UTF8_BYTE_MARK = 0x80;
-template<typename Type> const unsigned long StUtfIterator<Type>::UTF16_SURROGATE_HIGH_START = 0xD800;
-template<typename Type> const unsigned long StUtfIterator<Type>::UTF16_SURROGATE_HIGH_END   = 0xDBFF;
-template<typename Type> const unsigned long StUtfIterator<Type>::UTF16_SURROGATE_LOW_START  = 0xDC00;
-template<typename Type> const unsigned long StUtfIterator<Type>::UTF16_SURROGATE_LOW_END    = 0xDFFF;
-template<typename Type> const unsigned long StUtfIterator<Type>::UTF16_SURROGATE_HIGH_SHIFT = 10;
-template<typename Type> const unsigned long StUtfIterator<Type>::UTF16_SURROGATE_LOW_BASE   = 0x0010000UL;
-template<typename Type> const unsigned long StUtfIterator<Type>::UTF16_SURROGATE_LOW_MASK   = 0x3FFUL;
-template<typename Type> const unsigned long StUtfIterator<Type>::UTF32_MAX_BMP   = 0x0000FFFFUL;
-template<typename Type> const unsigned long StUtfIterator<Type>::UTF32_MAX_LEGAL = 0x0010FFFFUL;
-
-template<typename Type> inline
-void StUtfIterator<Type>::readUTF16() {
-    stUtf32_t aChar = *myPosNext++;
-    // if we have the first half of the surrogate pair
-    if(aChar >= UTF16_SURROGATE_HIGH_START
-    && aChar <= UTF16_SURROGATE_HIGH_END) {
-        const stUtf32_t aChar2 = *myPosNext;
-        // complete the surrogate pair
-        if(aChar2 >= UTF16_SURROGATE_LOW_START
-        && aChar2 <= UTF16_SURROGATE_LOW_END) {
-            aChar = ((aChar - UTF16_SURROGATE_HIGH_START) << UTF16_SURROGATE_HIGH_SHIFT)
-                  + (aChar2 - UTF16_SURROGATE_LOW_START)   + UTF16_SURROGATE_LOW_BASE;
-            ++myPosNext;
-        }
-    }
-    myCharUtf32 = aChar;
-}
-
-template<typename Type> inline
-size_t StUtfIterator<Type>::getAdvanceBytesUtf8() const {
-    if(myCharUtf32 >= UTF16_SURROGATE_HIGH_START
-    && myCharUtf32 <= UTF16_SURROGATE_LOW_END) {
-        // UTF-16 surrogate values are illegal in UTF-32
-        return 0;
-    } else if(myCharUtf32 < stUtf32_t(0x80)) {
-        return 1;
-    } else if(myCharUtf32 < stUtf32_t(0x800)) {
-        return 2;
-    } else if(myCharUtf32 < stUtf32_t(0x10000)) {
-        return 3;
-    } else if(myCharUtf32 <= UTF32_MAX_LEGAL) {
-        return 4;
-    } else {
-        // illegal
-        return 0;
-    }
-}
-
-template<typename Type> inline
-stUtf8_t* StUtfIterator<Type>::getUtf8(stUtf8_t* theBuffer) const {
-    // unsigned arithmetic used
-    return (stUtf8_t* )getUtf8((stUtf8u_t* )theBuffer);
-}
-
-template<typename Type> inline
-stUtf8u_t* StUtfIterator<Type>::getUtf8(stUtf8u_t* theBuffer) const {
-    stUtf32_t aChar = myCharUtf32;
-    if(myCharUtf32 >= UTF16_SURROGATE_HIGH_START
-    && myCharUtf32 <= UTF16_SURROGATE_LOW_END) {
-        // UTF-16 surrogate values are illegal in UTF-32
-        return theBuffer;
-    } else if(myCharUtf32 < stUtf32_t(0x80)) {
-        *theBuffer++ = stUtf8u_t (aChar | UTF8_FIRST_BYTE_MARK1);
-        return theBuffer;
-    } else if(myCharUtf32 < stUtf32_t(0x800)) {
-        *++theBuffer = stUtf8u_t((aChar | UTF8_BYTE_MARK) & UTF8_BYTE_MASK); aChar >>= 6;
-        *--theBuffer = stUtf8u_t (aChar | UTF8_FIRST_BYTE_MARK2);
-        return theBuffer + 2;
-    } else if(myCharUtf32 < stUtf32_t(0x10000)) {
-        theBuffer += 3;
-        *--theBuffer = stUtf8u_t((aChar | UTF8_BYTE_MARK) & UTF8_BYTE_MASK); aChar >>= 6;
-        *--theBuffer = stUtf8u_t((aChar | UTF8_BYTE_MARK) & UTF8_BYTE_MASK); aChar >>= 6;
-        *--theBuffer = stUtf8u_t (aChar | UTF8_FIRST_BYTE_MARK3);
-        return theBuffer + 3;
-    } else if(myCharUtf32 <= UTF32_MAX_LEGAL) {
-        theBuffer += 4;
-        *--theBuffer = stUtf8u_t((aChar | UTF8_BYTE_MARK) & UTF8_BYTE_MASK); aChar >>= 6;
-        *--theBuffer = stUtf8u_t((aChar | UTF8_BYTE_MARK) & UTF8_BYTE_MASK); aChar >>= 6;
-        *--theBuffer = stUtf8u_t((aChar | UTF8_BYTE_MARK) & UTF8_BYTE_MASK); aChar >>= 6;
-        *--theBuffer = stUtf8u_t (aChar | UTF8_FIRST_BYTE_MARK4);
-        return theBuffer + 4;
-    } else {
-        // illegal
-        return theBuffer;
-    }
-}
-
-template<typename Type> inline
-size_t StUtfIterator<Type>::getAdvanceBytesUtf16() const {
-    if(myCharUtf32 <= UTF32_MAX_BMP) { // target is a character <= 0xFFFF
-        // UTF-16 surrogate values are illegal in UTF-32; 0xffff or 0xfffe are both reserved values
-        if(myCharUtf32 >= UTF16_SURROGATE_HIGH_START
-        && myCharUtf32 <= UTF16_SURROGATE_LOW_END) {
-            return 0;
-        } else {
-            return sizeof(stUtf16_t);
-        }
-    } else if(myCharUtf32 > UTF32_MAX_LEGAL) {
-        // illegal
-        return 0;
-    } else {
-        // target is a character in range 0xFFFF - 0x10FFFF
-        // surrogate pair
-        return sizeof(stUtf16_t) * 2;
-    }
-}
-
-template<typename Type> inline
-stUtf16_t* StUtfIterator<Type>::getUtf16(stUtf16_t* theBuffer) const {
-    if(myCharUtf32 <= UTF32_MAX_BMP) { // target is a character <= 0xFFFF
-        // UTF-16 surrogate values are illegal in UTF-32; 0xffff or 0xfffe are both reserved values
-        if(myCharUtf32 >= UTF16_SURROGATE_HIGH_START
-        && myCharUtf32 <= UTF16_SURROGATE_LOW_END) {
-            return theBuffer;
-        } else {
-            *theBuffer++ = stUtf16_t(myCharUtf32);
-            return theBuffer;
-        }
-    } else if(myCharUtf32 > UTF32_MAX_LEGAL) {
-        // illegal
-        return theBuffer;
-    } else {
-        // surrogate pair
-        stUtf32_t aChar = myCharUtf32 - UTF16_SURROGATE_LOW_BASE;
-        *theBuffer++ = stUtf16_t((aChar >> UTF16_SURROGATE_HIGH_SHIFT) + UTF16_SURROGATE_HIGH_START);
-        *theBuffer++ = stUtf16_t((aChar &  UTF16_SURROGATE_LOW_MASK)   + UTF16_SURROGATE_LOW_START);
-        return theBuffer;
-    }
-}
-
-template<typename Type> inline
-stUtf32_t* StUtfIterator<Type>::getUtf32(stUtf32_t* theBuffer) const {
-    *theBuffer++ = myCharUtf32;
-    return theBuffer;
-}
-
-template<typename Type> template<typename TypeWrite> inline
-size_t StUtfIterator<Type>::getAdvanceBytesUtf() const {
-    switch(sizeof(TypeWrite)) {
-        case sizeof(stUtf8_t):  return getAdvanceBytesUtf8();
-        case sizeof(stUtf16_t): return getAdvanceBytesUtf16();
-        case sizeof(stUtf32_t): return getAdvanceBytesUtf32();
-        default:                return 0; // invalid case
-    }
-}
-
-template<typename Type> template<typename TypeWrite> inline
-TypeWrite* StUtfIterator<Type>::getUtf(TypeWrite* theBuffer) const {
-    switch(sizeof(TypeWrite)) {
-        case sizeof(stUtf8_t):  return (TypeWrite* )getUtf8 ((stUtf8u_t* )theBuffer);
-        case sizeof(stUtf16_t): return (TypeWrite* )getUtf16((stUtf16_t* )theBuffer);
-        case sizeof(stUtf32_t): return (TypeWrite* )getUtf32((stUtf32_t* )theBuffer);
-        default:                return NULL; // invalid case
-    }
-}
-
-#endif //__StUtfIterator_inl_

_service:obs_scm:sview-26.obscpio/include/StSys/StSys.h Changed

_service:obs_scm:sview-26.obscpio/include/StTemplates/StArray.h Changed

_service:obs_scm:sview-26.obscpio/include/StTemplates/StQuaternion.h Changed

@@ -17,12 +17,12 @@
     /**
      * Construct identity quaternion.
      */
-    StQuaternion() : myV((Element_t )0, (Element_t )0, (Element_t )0, (Element_t )1) {}
+    constexpr StQuaternion() noexcept : myV((Element_t )0, (Element_t )0, (Element_t )0, (Element_t )1) {}
 
     /**
      * Construct quaternion from component values.
      */
-    StQuaternion(const Element_t theX, const Element_t theY, const Element_t theZ, const Element_t theW)
+    constexpr StQuaternion(const Element_t theX, const Element_t theY, const Element_t theZ, const Element_t theW) noexcept
     : myV(theX, theY, theZ, theW) {}
 
     /**
@@ -55,22 +55,22 @@
     /**
      * Get x component.
      */
-    Element_t x() const { return myV.x(); }
+    constexpr Element_t x() const noexcept { return myV.x(); }
 
     /**
      * Get y component.
      */
-    Element_t y() const { return myV.y(); }
+    constexpr Element_t y() const noexcept { return myV.y(); }
 
     /**
      * Get z component.
      */
-    Element_t z() const { return myV.z(); }
+    constexpr Element_t z() const noexcept { return myV.z(); }
 
     /**
      * Get w component.
      */
-    Element_t w() const { return myV.w(); }
+    constexpr Element_t w() const noexcept { return myV.w(); }
 
     /**
      * Rotate vector by quaternion as rotation operator.

_service:obs_scm:sview-26.obscpio/include/StTemplates/StQuickPointersSort.h Changed

_service:obs_scm:sview-26.obscpio/include/StTemplates/StQuickSort.h Deleted

@@ -1,56 +0,0 @@
-/**
- * Copyright © 2009-2010 Kirill Gavrilov <kirill@sview.ru>
- *
- * This code is licensed under MIT license (see docs/license-mit.txt for details).
- */
-
-#ifndef __StQuickSort_H__
-#define __StQuickSort_H__
-
-#include <StTemplates/StTemplates.h>
-
-/**
- * Perform sorting of plain array with QuickSort algorithm.
- */
-template<typename Type>
-class StQuickSort {
-
-        private:
-
-    static size_t partition(Type* array, const size_t idLow, const size_t idHigh) {
-        size_t idLeft(idLow), idRight(idHigh);
-        Type pivot = arrayidLow;
-
-        while(idLeft < idRight) {
-            while(arrayidRight > pivot){
-                --idRight;
-            }
-            while((idLeft < idRight) && (arrayidLeft <= pivot)) {
-                ++idLeft;
-            }
-
-            if(idLeft < idRight) {
-                stSwap(arrayidLeft, arrayidRight);
-            }
-        }
-
-        arrayidLow = arrayidRight;
-        arrayidRight = pivot;
-        return idRight;
-    }
-
-        public:
-
-    static void perform(Type* array, size_t low, size_t high) {
-        if(low < high) {
-            size_t pivotPosition = partition(array, low, high);
-            if(pivotPosition > 1) {
-                perform(array, low, pivotPosition - 1);
-            }
-            perform(array, pivotPosition + 1, high);
-        }
-    }
-
-};
-
-#endif //__StQuickSort_H__

_service:obs_scm:sview-26.obscpio/include/StTemplates/StRect.h Changed

@@ -22,23 +22,19 @@
 
         public:
 
-    StRect() {
-        top()    = 0;
-        bottom() = 0;
-        left()   = 0;
-        right()  = 0;
+    constexpr StRect() noexcept : tblr{} {
+        //
     }
 
-    StRect(const Element_t theTop,  const Element_t theBottom,
-           const Element_t theLeft, const Element_t theRight) {
-        top()    = theTop;
-        bottom() = theBottom;
-        left()   = theLeft;
-        right()  = theRight;
+    constexpr StRect(const Element_t theTop,  const Element_t theBottom,
+                     const Element_t theLeft, const Element_t theRight) noexcept
+    : tblr{theTop, theBottom, theLeft, theRight} {
+        //
     }
 
-    StRect(const StRect& theCopy) {
-        stMemCpy(tblr, theCopy.tblr, sizeof(tblr));
+    constexpr StRect(const StRect& theCopy) noexcept
+    : tblr{theCopy.tblr0, theCopy.tblr1, theCopy.tblr2, theCopy.tblr3} {
+        //
     }
 
     const StRect& operator=(const StRect& theCopy) {
@@ -54,10 +50,10 @@
         right()  = theRight;
     }
 
-    Element_t top()    const { return tblr0; }
-    Element_t bottom() const { return tblr1; }
-    Element_t left()   const { return tblr2; }
-    Element_t right()  const { return tblr3; }
+    constexpr Element_t top()    const noexcept { return tblr0; }
+    constexpr Element_t bottom() const noexcept { return tblr1; }
+    constexpr Element_t left()   const noexcept { return tblr2; }
+    constexpr Element_t right()  const noexcept { return tblr3; }
 
     Element_t& top()    { return tblr0; }
     Element_t& bottom() { return tblr1; }
@@ -67,28 +63,28 @@
     /**
      * @return 2D vector with top-left rectangle corner coordinates.
      */
-    StVec2<Element_t> topLeft() const {
+    constexpr StVec2<Element_t> topLeft() const noexcept {
         return StVec2<Element_t>(left(), top());
     }
 
     /**
      * @return 2D vector with top-right rectangle corner coordinates.
      */
-    StVec2<Element_t> topRight() const {
+    constexpr StVec2<Element_t> topRight() const noexcept {
         return StVec2<Element_t>(right(), top());
     }
 
     /**
      * @return 2D vector with bottom-left rectangle corner coordinates.
      */
-    StVec2<Element_t> bottomLeft() const {
+    constexpr StVec2<Element_t> bottomLeft() const noexcept {
         return StVec2<Element_t>(left(), bottom());
     }
 
     /**
      * @return 2D vector with bottom-right rectangle corner coordinates.
      */
-    StVec2<Element_t> bottomRight() const {
+    constexpr StVec2<Element_t> bottomRight() const noexcept {
         return StVec2<Element_t>(right(), bottom());
     }
 
@@ -306,7 +302,7 @@
     /**
      * Setup zero-margin.
      */
-    StMarginsI() : left(0), right(0), top(0), bottom(0) {}
+    constexpr StMarginsI() noexcept : left(0), right(0), top(0), bottom(0) {}
 
     /**
      * Setup margin to specified value for all boundaries.

_service:obs_scm:sview-26.obscpio/include/StTemplates/StTemplates.h Deleted

@@ -1,89 +0,0 @@
-/**
- * Copyright © 2009-2011 Kirill Gavrilov <kirill@sview.ru>
- *
- * This code is licensed under MIT license (see docs/license-mit.txt for details).
- */
-
-#ifndef __StTemplates_H__
-#define __StTemplates_H__
-
-/**
- * Redefine memory allocation functions as templates
- * (just to improve readability).
- */
-template<typename TypePtr>
-inline TypePtr stMemAlloc(const size_t& bytesCount) {
-    return (TypePtr )::stMemAlloc(bytesCount);
-}
-
-template<typename TypePtr>
-inline TypePtr stMemRealloc(TypePtr thePtr,
-                            const size_t& bytesCount) {
-    return (TypePtr )::stMemRealloc(thePtr, bytesCount);
-}
-
-template<typename TypePtr>
-inline TypePtr stMemAllocAligned(const size_t& bytesCount,
-                                 const size_t& align = ST_ALIGNMENT) {
-    return (TypePtr )::stMemAllocAligned(bytesCount, align);
-}
-
-template<typename TypePtr>
-inline TypePtr stMemAllocZeroAligned(const size_t& bytesCount,
-                                     const size_t& align = ST_ALIGNMENT) {
-    return (TypePtr )::stMemAllocZeroAligned(bytesCount, align);
-}
-
-/**
- * Auxiliary functions.
- */
-template<typename Type>
-void stSwap(Type& x, Type& y) {
-    Type temp = x;
-    x = y;
-    y = temp;
-}
-
-template<typename Type>
-inline Type stMin(const Type value1, const Type value2) {
-    return (value1 < value2) ? value1 : value2;
-}
-
-template<typename Type>
-inline Type stMin(const Type value1, const Type value2, const Type value3) {
-    return stMin(stMin(value1, value2), value3);
-}
-
-template<typename Type>
-inline Type stMax(const Type value1, const Type value2) {
-    return (value1 > value2) ? value1 : value2;
-}
-
-template<typename Type>
-inline Type stMax(const Type value1, const Type value2, const Type value3) {
-    return stMax(stMax(value1, value2), value3);
-}
-
-template<typename Type>
-inline Type stClamp(const Type theValue,
-                    const Type theMin,
-                    const Type theMax) {
-    if(theValue < theMin) {
-        return theMin;
-    } else if(theValue > theMax) {
-        return theMax;
-    }
-    return theValue;
-}
-
-/**
- * Compute linear interpolation between two values.
- * @param theT interpolation coefficient 0..1
- * @return interpolation result
- */
-template<typename Type, typename ElemType>
-inline Type stLerp(const Type& theFrom, const Type& theTo, const ElemType theT) {
-    return theFrom * (ElemType(1) - theT) + theTo * theT;
-}
-
-#endif //__StTemplates_H__

_service:obs_scm:sview-26.obscpio/include/StTemplates/StVec2.h Changed

@@ -12,8 +12,8 @@
 #ifdef __cplusplus
 
 #define ST_VEC_COMPONENTS_2D(theX, theY) \
-    const StVec2<Element_t> theX##theY() const { return StVec2<Element_t>(theX(), theY()); } \
-    const StVec2<Element_t> theY##theX() const { return StVec2<Element_t>(theY(), theX()); }
+    constexpr const StVec2<Element_t> theX##theY() const noexcept { return StVec2<Element_t>(theX(), theY()); } \
+    constexpr const StVec2<Element_t> theY##theX() const noexcept { return StVec2<Element_t>(theY(), theX()); }
 
 /**
  * Defines the 2D-vector template.
@@ -30,36 +30,36 @@
     /**
      * Returns the number of components.
      */
-    static size_t length() {
+    static constexpr size_t length() noexcept {
         return 2;
     }
 
     /**
      * Empty constructor. Construct the zero vector.
      */
-    StVec2() {
-        v0 = v1 = Element_t(0);
+    constexpr StVec2() noexcept : v{} {
+        //
     }
 
     /**
      * Initialize ALL components of vector within specified value.
      */
-    explicit StVec2(Element_t xy) {
-        v0 = v1 = xy;
+    explicit constexpr StVec2(Element_t xy) noexcept : v{xy, xy} {
+        //
     }
 
     /**
      * Per-component constructor.
      */
-    explicit StVec2(Element_t x, Element_t y) {
-        v0 = x; v1 = y;
+    explicit constexpr StVec2(Element_t x, Element_t y) noexcept : v{x, y} {
+        //
     }
 
     /**
      * Copy constructor.
      */
-    StVec2(const StVec2& vec2) {
-        v0 = vec20; v1 = vec21;
+    constexpr StVec2(const StVec2& vec2) noexcept : v{vec2.v0, vec2.v1} {
+        //
     }
 
     /**
@@ -73,8 +73,8 @@
     /**
      * Per-component access.
      */
-    Element_t x() const { return v0; }
-    Element_t y() const { return v1; }
+    constexpr Element_t x() const noexcept { return v0; }
+    constexpr Element_t y() const noexcept { return v1; }
 
     ST_VEC_COMPONENTS_2D(x, y);
 
@@ -84,12 +84,20 @@
     Element_t& x() { return v0; }
     Element_t& y() { return v1; }
 
+#if defined(_MSC_VER) && (_MSC_VER < 1930)
+    //! Access element by index within 0,1 range - workaround for old msvc.
+    const Element_t& operator(int theIndex) const { return vtheIndex; }
+          Element_t& operator(int theIndex)       { return vtheIndex; }
+#endif
+
+    typedef Element_t CArray_t2;
+
     /**
      * Row access to the data (to simplify OpenGL exchange).
      */
-    const Element_t* getData() const { return v; }
-    operator const Element_t*() const { return v; }
-    operator Element_t*() { return v; }
+    const CArray_t&  getData() const { return v; }
+    operator const CArray_t&() const { return v; }
+    operator       CArray_t&()       { return v; }
 
     /**
      * Check this vector with another vector for equality (without tolerance!).
@@ -258,14 +266,14 @@
     /**
      * Compute maximum component of the vector.
      */
-    Element_t maxComp() const {
+    constexpr Element_t maxComp() const noexcept {
         return v0 > v1 ? v0 : v1;
     }
 
     /**
      * Compute minimum component of the vector.
      */
-    Element_t minComp() const {
+    constexpr Element_t minComp() const noexcept {
         return v0 < v1 ? v0 : v1;
     }

_service:obs_scm:sview-26.obscpio/include/StTemplates/StVec3.h Changed

@@ -14,12 +14,12 @@
  * Access to the components as vector methods.
  */
 #define ST_VEC_COMPONENTS_3D(theX, theY, theZ) \
-    const StVec3<Element_t> theX##theY##theZ() const { return StVec3<Element_t>(theX(), theY(), theZ()); } \
-    const StVec3<Element_t> theX##theZ##theY() const { return StVec3<Element_t>(theX(), theZ(), theY()); } \
-    const StVec3<Element_t> theY##theX##theZ() const { return StVec3<Element_t>(theY(), theX(), theZ()); } \
-    const StVec3<Element_t> theY##theZ##theX() const { return StVec3<Element_t>(theY(), theZ(), theX()); } \
-    const StVec3<Element_t> theZ##theY##theX() const { return StVec3<Element_t>(theZ(), theY(), theX()); } \
-    const StVec3<Element_t> theZ##theX##theY() const { return StVec3<Element_t>(theZ(), theX(), theY()); }
+    constexpr const StVec3<Element_t> theX##theY##theZ() const noexcept { return StVec3<Element_t>(theX(), theY(), theZ()); } \
+    constexpr const StVec3<Element_t> theX##theZ##theY() const noexcept { return StVec3<Element_t>(theX(), theZ(), theY()); } \
+    constexpr const StVec3<Element_t> theY##theX##theZ() const noexcept { return StVec3<Element_t>(theY(), theX(), theZ()); } \
+    constexpr const StVec3<Element_t> theY##theZ##theX() const noexcept { return StVec3<Element_t>(theY(), theZ(), theX()); } \
+    constexpr const StVec3<Element_t> theZ##theY##theX() const noexcept { return StVec3<Element_t>(theZ(), theY(), theX()); } \
+    constexpr const StVec3<Element_t> theZ##theX##theY() const noexcept { return StVec3<Element_t>(theZ(), theX(), theY()); }
 
 /**
  * Generic 3-components vector.
@@ -37,43 +37,43 @@
     /**
      * Returns the number of components.
      */
-    static size_t length() {
+    static constexpr size_t length() noexcept {
         return 3;
     }
 
     /**
      * Empty constructor. Construct the zero vector.
      */
-    StVec3() {
-        stMemSet(this, 0, sizeof(StVec3));
+    constexpr StVec3() noexcept : v{} {
+        //
     }
 
     /**
      * Initialize ALL components of vector within specified value.
      */
-    explicit StVec3(Element_t xyz) {
-        v0 = v1 = v2 = xyz;
+    explicit constexpr StVec3(Element_t xyz) noexcept : v{xyz, xyz, xyz} {
+        //
     }
 
     /**
      * Per-component constructor.
      */
-    explicit StVec3(Element_t x, Element_t y, Element_t z) {
-        v0 = x; v1 = y; v2 = z;
+    explicit constexpr StVec3(Element_t x, Element_t y, Element_t z) noexcept : v{x, y, z} {
+        //
     }
 
     /**
      * Constructor from 2-components vector.
      */
-    explicit StVec3(const StVec2<Element_t>& vec2) {
-        v0 = vec20; v1 = vec21; v2 = 0.0f;
+    explicit constexpr StVec3(const StVec2<Element_t>& vec2) noexcept : v{vec2.x(), vec2.y(), Element_t()} {
+        //
     }
 
     /**
      * Copy constructor.
      */
-    StVec3(const StVec3& vec3) {
-        stMemCpy(this, &vec3, sizeof(StVec3));
+    constexpr StVec3(const StVec3& vec3) noexcept : v{vec3.v0, vec3.v1, vec3.v2} {
+        //
     }
 
     /**
@@ -84,14 +84,14 @@
         return *this;
     }
 
-    Element_t x() const { return v0; }
-    Element_t r() const { return v0; } // Red color
+    constexpr Element_t x() const noexcept { return v0; }
+    constexpr Element_t r() const noexcept { return v0; } // Red color
 
-    Element_t y() const { return v1; }
-    Element_t g() const { return v1; } // Green color
+    constexpr Element_t y() const noexcept { return v1; }
+    constexpr Element_t g() const noexcept { return v1; } // Green color
 
-    Element_t z() const { return v2; }
-    Element_t b() const { return v2; } // Blue color
+    constexpr Element_t z() const noexcept { return v2; }
+    constexpr Element_t b() const noexcept { return v2; } // Blue color
 
     ST_VEC_COMPONENTS_2D(x, y);
     ST_VEC_COMPONENTS_2D(x, z);
@@ -109,12 +109,20 @@
     Element_t& z() { return v2; }
     Element_t& b() { return v2; } // Blue color
 
+#if defined(_MSC_VER) && (_MSC_VER < 1930)
+    //! Access element by index within 0,2 range - workaround for old msvc.
+    const Element_t& operator(int theIndex) const { return vtheIndex; }
+          Element_t& operator(int theIndex)       { return vtheIndex; }
+#endif
+
+    typedef Element_t CArray_t3;
+
     /**
-     * Row access to the data (for OpenGL exchange).
+     * Row access to the data (to simplify OpenGL exchange).
      */
-    const Element_t* getData() const { return v; }
-    operator const Element_t*() const { return v; }
-    operator Element_t*() { return v; }
+    const CArray_t&  getData() const { return v; }
+    operator const CArray_t&() const { return v; }
+    operator       CArray_t&()       { return v; }
 
     /**
      * Check this vector with another vector for equality (without tolerance!).

_service:obs_scm:sview-26.obscpio/include/StTemplates/StVec4.h Changed

@@ -25,57 +25,58 @@
 
         public:
 
-    static size_t length() {
+    static constexpr size_t length() noexcept {
         return 4;
     }
 
     /**
      * Empty constructor. Construct the zero vector.
      */
-    StVec4() {
-        stMemSet(this, 0, sizeof(StVec4));
+    constexpr StVec4() noexcept : v{} {
+        //
     }
 
     /**
      * Initialize ALL components of vector within specified value.
      */
-    explicit StVec4(Element_t xyzw) {
-        v0 = v1 = v2 = v3 = xyzw;
+    explicit constexpr StVec4(Element_t xyzw) noexcept : v{xyzw, xyzw, xyzw, xyzw} {
+        //
     }
 
     /**
      * Per-component constructor.
      */
-    explicit StVec4(Element_t x, Element_t y, Element_t z, Element_t w) {
-        v0 = x; v1 = y; v2 = z; v3 = w;
+    explicit constexpr StVec4(Element_t x, Element_t y, Element_t z, Element_t w) noexcept : v{x, y, z, w} {
+        //
     }
 
     /**
      * Constructor from 2-components vector.
      */
-    explicit StVec4(const StVec2<Element_t>& vec2) {
-        v0 = vec20; v1 = vec21; v2 = v3 = 0.0f;
+    explicit constexpr StVec4(const StVec2<Element_t>& vec2) noexcept : v{vec2.x(), vec2.y(), Element_t(), Element_t()} {
+        //
     }
 
     /**
      * Constructor from 3-components vector.
      */
-    explicit StVec4(const StVec3<Element_t>& vec3) {
-        stMemCpy(this, &vec3, sizeof(StVec3<Element_t>)); v3 = 0.0f;
+    explicit constexpr StVec4(const StVec3<Element_t>& vec3) noexcept : v{vec3.x(), vec3.y(), vec3.z(), Element_t()} {
+        //
     }
 
     /**
      * Constructor from 3-components vector + alpha value.
      */
-    explicit StVec4(const StVec3<Element_t>& vec3, const Element_t alpha) {
-        stMemCpy(this, &vec3, sizeof(StVec3<Element_t>)); v3 = alpha;
+    explicit constexpr StVec4(const StVec3<Element_t>& vec3, const Element_t alpha) noexcept
+    : v{vec3.x(), vec3.y(), vec3.z(), alpha}  {
+        //
     }
 
     /**
      * Copy constructor.
      */
-    StVec4(const StVec4& vec4) {
-        stMemCpy(this, &vec4, sizeof(StVec4));
+    constexpr StVec4(const StVec4& vec4) noexcept : v{vec4.v0, vec4.v1, vec4.v2, vec4.v3} {
+        //
     }
 
     /**
@@ -86,17 +87,17 @@
         return *this;
     }
 
-    Element_t x() const { return v0; }
-    Element_t r() const { return v0; } // Red color
+    constexpr Element_t x() const noexcept { return v0; }
+    constexpr Element_t r() const noexcept { return v0; } // Red color
 
-    Element_t y() const { return v1; }
-    Element_t g() const { return v1; } // Green color
+    constexpr Element_t y() const noexcept { return v1; }
+    constexpr Element_t g() const noexcept { return v1; } // Green color
 
-    Element_t z() const { return v2; }
-    Element_t b() const { return v2; } // Blue color
+    constexpr Element_t z() const noexcept { return v2; }
+    constexpr Element_t b() const noexcept { return v2; } // Blue color
 
-    Element_t w() const { return v3; }
-    Element_t a() const { return v3; } // Alpha color
+    constexpr Element_t w() const noexcept { return v3; }
+    constexpr Element_t a() const noexcept { return v3; } // Alpha color
 
     ST_VEC_COMPONENTS_2D(x, y);
     ST_VEC_COMPONENTS_2D(x, z);
@@ -131,12 +132,21 @@
     StVec3<Element_t>& yzw() { return *((StVec3<Element_t>* )&v1); }
     StVec3<Element_t>& rgb() { return *((StVec3<Element_t>* )&v0); }
 
+
+#if defined(_MSC_VER) && (_MSC_VER < 1930)
+    //! Access element by index within 0,3 range - workaround for old msvc.
+    const Element_t& operator(int theIndex) const { return vtheIndex; }
+          Element_t& operator(int theIndex)       { return vtheIndex; }
+#endif
+
+    typedef Element_t CArray_t4;
+
     /**
-     * Row access to the data (for OpenGL exchange).
+     * Row access to the data (to simplify OpenGL exchange).
      */
-    const Element_t* getData() const { return v; }
-    operator const Element_t*() const { return v; }
-    operator Element_t*() { return v; }
+    const CArray_t&  getData() const { return v; }
+    operator const CArray_t&() const { return v; }
+    operator       CArray_t&()       { return v; }
 
     /**
      * Check this vector with another vector for equality (without tolerance!).

_service:obs_scm:sview-26.obscpio/include/StThreads/StProcess.h Changed

@@ -9,7 +9,7 @@
 
 #include <StStrings/StDictionary.h>
 
-#include "StMutex.h"
+#include <vector>
 
 // compatibility with old definitions
 typedef StDictEntry  StArgument;
@@ -69,7 +69,7 @@
     /**
      * @return command line arguments as flat list
      */
-    ST_CPPEXPORT static StArrayList<StString> getArguments();
+    ST_CPPEXPORT static std::vector<StString> getArguments();
 
     /**
      * @return command line arguments list as map of key+value
@@ -128,8 +128,8 @@
      * @param theArguments      arguments list
      * @return true if executable has been launched
      */
-    ST_LOCAL static bool execProcess(const StString&          theExecutablePath,
-                                     const StArray<StString>& theArguments) {
+    ST_LOCAL static bool execProcess(const StString&              theExecutablePath,
+                                     const std::vector<StString>& theArguments) {
         return execProcessAny(theExecutablePath, theArguments, true);
     }
 
@@ -139,8 +139,8 @@
      * @param theArguments      arguments list
      * @return true if executable has been launched
      */
-    ST_LOCAL static bool execProcessInPath(const StString&          theExecutableName,
-                                           const StArray<StString>& theArguments) {
+    ST_LOCAL static bool execProcessInPath(const StString&              theExecutableName,
+                                           const std::vector<StString>& theArguments) {
         return execProcessAny(theExecutableName, theArguments, false);
     }
 
@@ -170,9 +170,9 @@
      * @param theIsAbsolute check if the given executable exists
      * @return true if executable has been launched
      */
-    ST_CPPEXPORT static bool execProcessAny(const StString&          theExecutable,
-                                            const StArray<StString>& theArguments,
-                                            const bool               theIsAbsolute);
+    ST_CPPEXPORT static bool execProcessAny(const StString& theExecutable,
+                                            const std::vector<StString>& theArguments,
+                                            const bool theIsAbsolute);
 };
 
 #endif // __StProcess_h_

_service:obs_scm:sview-26.obscpio/include/StThreads/StResourceManager.h Changed

_service:obs_scm:sview-26.obscpio/include/StVersion.h Changed

_service:obs_scm:sview-26.obscpio/include/stTypes.h Changed

@@ -153,8 +153,8 @@
 
 #ifdef __cplusplus
     typedef bool stBool_t;
-    static const stBool_t ST_TRUE  = true;
-    static const stBool_t ST_FALSE = false;
+    constexpr stBool_t ST_TRUE  = true;
+    constexpr stBool_t ST_FALSE = false;
 #else
     // C-consistent bool type (C doesn't have true 'bool' type)
     typedef unsigned char stBool_t;
@@ -606,8 +606,6 @@
     }
 }
 
-#include <StTemplates/StTemplates.h> // include commonly-used templates
-
 /**
  * Convert degrees to radians.
  */
@@ -624,4 +622,83 @@
     return Type(180.0) * theRadians / Type(3.14159265358979323846);
 }
 
+/**
+ * Redefine memory allocation functions as templates
+ * (just to improve readability).
+ */
+template<typename TypePtr>
+inline TypePtr stMemAlloc(const size_t& bytesCount) {
+    return (TypePtr )::stMemAlloc(bytesCount);
+}
+
+template<typename TypePtr>
+inline TypePtr stMemRealloc(TypePtr thePtr,
+                            const size_t& bytesCount) {
+    return (TypePtr )::stMemRealloc(thePtr, bytesCount);
+}
+
+template<typename TypePtr>
+inline TypePtr stMemAllocAligned(const size_t& bytesCount,
+                                 const size_t& align = ST_ALIGNMENT) {
+    return (TypePtr )::stMemAllocAligned(bytesCount, align);
+}
+
+template<typename TypePtr>
+inline TypePtr stMemAllocZeroAligned(const size_t& bytesCount,
+                                     const size_t& align = ST_ALIGNMENT) {
+    return (TypePtr )::stMemAllocZeroAligned(bytesCount, align);
+}
+
+/**
+ * Auxiliary functions.
+ */
+template<typename Type>
+void stSwap(Type& x, Type& y) {
+    Type temp = x;
+    x = y;
+    y = temp;
+}
+
+template<typename Type>
+inline Type stMin(const Type value1, const Type value2) {
+    return (value1 < value2) ? value1 : value2;
+}
+
+template<typename Type>
+inline Type stMin(const Type value1, const Type value2, const Type value3) {
+    return stMin(stMin(value1, value2), value3);
+}
+
+template<typename Type>
+inline Type stMax(const Type value1, const Type value2) {
+    return (value1 > value2) ? value1 : value2;
+}
+
+template<typename Type>
+inline Type stMax(const Type value1, const Type value2, const Type value3) {
+    return stMax(stMax(value1, value2), value3);
+}
+
+template<typename Type>
+inline Type stClamp(const Type theValue,
+                    const Type theMin,
+                    const Type theMax) {
+    if(theValue < theMin) {
+        return theMin;
+    } else if(theValue > theMax) {
+        return theMax;
+    }
+    return theValue;
+}
+
+/**
+ * Compute linear interpolation between two values.
+ * @param theT interpolation coefficient 0..1
+ * @return interpolation result
+ */
+template<typename Type, typename ElemType>
+inline Type stLerp(const Type& theFrom, const Type& theTo, const ElemType theT) {
+    return theFrom * (ElemType(1) - theT) + theTo * theT;
+}
+
 #endif //__stTypes_h_

_service:obs_scm:sview-26.obscpio/sview/StAppResponder.h Changed

_service:obs_scm:sview-26.obscpio/sview/StMultiApp.cpp Changed

@@ -65,19 +65,19 @@
     return anAboutString;
 }
 
-StHandle<StApplication> StMultiApp::getInstance(const StHandle<StResourceManager>& theResMgr,
-                                                const StHandle<StOpenInfo>&        theInfo) {
-    StHandle<StOpenInfo> anInfo = theInfo;
-    if(anInfo.isNull()
-    || (!anInfo->hasPath() && !anInfo->hasArgs())) {
+std::shared_ptr<StApplication> StMultiApp::getInstance(const std::shared_ptr<StResourceManager>& theResMgr,
+                                                       const std::shared_ptr<StOpenInfo>&        theInfo) {
+    std::shared_ptr<StOpenInfo> anInfo = theInfo;
+    if (anInfo.get() == nullptr
+     || (!anInfo->hasPath() && !anInfo->hasArgs())) {
         anInfo = StApplication::parseProcessArguments();
     }
-    if(anInfo.isNull()) {
+    if (anInfo.get() == nullptr) {
         // show help
         StString aShowHelpString = getAbout();
         st::cout << aShowHelpString;
         stInfo(aShowHelpString);
-        return NULL;
+        return nullptr;
     }
 
     // command interface
@@ -137,7 +137,7 @@
             anAction = StString("action?") + anAction;
         }
     }
-    if(!anAction.isEmpty()) {
+    if (!anAction.isEmpty()) {
         StArgument anArgCmdPort = anArgs"webuiCmdPort";
         StString   aPort        = "8080";
         if(anArgCmdPort.isValid()) {
@@ -146,32 +146,32 @@
         StString anUrl     = StString("http://localhost:") + aPort + "/" + anAction;
         StString aResponse = StRawFile::readTextFile(anUrl);
         st::cout << aResponse << "\n";
-        return NULL;
+        return nullptr;
     }
 
     // select application
     const StString ARGUMENT_DRAWER = "in";
     StArgument anArgDrawer = anArgsARGUMENT_DRAWER;
-    if(!anInfo->hasPath() && !anArgDrawer.isValid()) {
+    if (!anInfo->hasPath() && !anArgDrawer.isValid()) {
         StApplication::readDefaultDrawer(anInfo);
         anArgDrawer = anInfo->getArgumentsMap()ARGUMENT_DRAWER;
     }
-    if(anArgDrawer.isValid()) {
-        if(anArgDrawer.getValue() == "image"
-        || anArgDrawer.getValue() == "StImageViewer") {
-            return new StImageViewer(theResMgr, NULL, anInfo);
-        } else if(anArgDrawer.getValue() == "video"
-               || anArgDrawer.getValue() == "StMoviePlayer") {
-            return new StMoviePlayer(theResMgr, NULL, anInfo);
-        } else if(anArgDrawer.getValue() == "diag"
-               || anArgDrawer.getValue() == "StDiagnostics") {
-            return new StDiagnostics(theResMgr, NULL, anInfo);
+    if (anArgDrawer.isValid()) {
+        if (anArgDrawer.getValue() == "image"
+         || anArgDrawer.getValue() == "StImageViewer") {
+            return std::make_shared<StImageViewer>(theResMgr, nullptr, anInfo);
+        } else if (anArgDrawer.getValue() == "video"
+                || anArgDrawer.getValue() == "StMoviePlayer") {
+            return std::make_shared<StMoviePlayer>(theResMgr, nullptr, anInfo);
+        } else if (anArgDrawer.getValue() == "diag"
+                || anArgDrawer.getValue() == "StDiagnostics") {
+            return std::make_shared<StDiagnostics>(theResMgr, nullptr, anInfo);
         } else {
             // show help
             StString aShowHelpString = getAbout();
             st::cout << aShowHelpString;
             stInfo(aShowHelpString);
-            return NULL;
+            return nullptr;
         }
     }
 
@@ -179,11 +179,11 @@
     const StString aFileExtension = StFileNode::getExtension(aPath);
 
     const StMIMEList aMimeImg(ST_IMAGE_PLUGIN_MIME_CHAR);
-    for(size_t aMimeIter = 0; aMimeIter < aMimeImg.size(); ++aMimeIter) {
-        if(aFileExtension.isEqualsIgnoreCase(aMimeImgaMimeIter.getExtension())) {
-            return new StImageViewer(theResMgr, NULL, anInfo);
+    for (size_t aMimeIter = 0; aMimeIter < aMimeImg.size(); ++aMimeIter) {
+        if (aFileExtension.isEqualsIgnoreCase(aMimeImgaMimeIter.getExtension())) {
+            return std::make_shared<StImageViewer>(theResMgr, nullptr, anInfo);
         }
     }
 
-    return new StMoviePlayer(theResMgr, NULL, anInfo);
+    return std::make_shared<StMoviePlayer>(theResMgr, nullptr, anInfo);
 }

_service:obs_scm:sview-26.obscpio/sview/StMultiApp.h Changed

_service:obs_scm:sview-26.obscpio/sview/jni/main.cpp Changed

@@ -52,11 +52,11 @@
         StMutexAuto aLock(myFetchLock);
         const StString aFileExtension = StFileNode::getExtension(myCreatePath);
 
-        StHandle<StOpenInfo> anInfo = new StOpenInfo();
+        std::shared_ptr<StOpenInfo> anInfo = std::make_shared<StOpenInfo>();
         anInfo->setPath(myDndPath);
         myDndPath.clear();
 
-        StHandle<StResourceManager> aResMgr = new StAndroidResourceManager(this);
+        std::shared_ptr<StResourceManager> aResMgr = std::make_shared<StAndroidResourceManager>(this);
         aResMgr->setFolder(StResourceManager::FolderId_SdCard,
                            getStoragePath(myThJniEnv, "sdcard"));
         aResMgr->setFolder(StResourceManager::FolderId_Downloads,
@@ -81,7 +81,7 @@
             }
             anArgs.set(StDictEntry("toSaveRecent","true"));
             anInfo->setArgumentsMap(anArgs);
-            myApp = new StImageViewer(aResMgr, this, anInfo);
+            myApp = std::make_shared<StImageViewer>(aResMgr, this, anInfo);
             return;
         }
 
@@ -93,7 +93,7 @@
             anInfo->setArgumentsMap(anArgs);
         }
 
-        myApp = new StMoviePlayer(aResMgr, this, anInfo);
+        myApp = std::make_shared<StMoviePlayer>(aResMgr, this, anInfo);
     }
 
 };

_service:obs_scm:sview-26.obscpio/sview/main.ObjC.mm Changed

@@ -15,9 +15,9 @@
 
 namespace {
 
-    static StAppResponder*      TheAppResponder = NULL;
-    static StHandle<StOpenInfo> TheOpenInfo = new StOpenInfo();
-    static volatile bool        TheToQuit = false;
+    static StAppResponder* TheAppResponder = nullptr;
+    static std::shared_ptr<StOpenInfo> TheOpenInfo = std::make_shared<StOpenInfo>();
+    static volatile bool   TheToQuit = false;
 
     static SV_THREAD_FUNCTION anAppThreadFunc(void* theResponder) {
         StCocoaLocalPool aPool;
@@ -54,7 +54,7 @@
 @implementation StAppResponder
 
     - (id ) init {
-        if(TheAppResponder != NULL) {
+        if(TheAppResponder != nullptr) {
             if(self != TheAppResponder) {
                 // should never happens
                 self release;
@@ -63,11 +63,11 @@
         }
 
         self = super init;
-        if(self == NULL) {
-            return NULL;
+        if(self == nullptr) {
+            return nullptr;
         }
-        myStApp.nullify();
-        myTimer = NULL;
+        myStApp.reset();
+        myTimer = nullptr;
 
         // latest macOS versions cause sView crashes with background OpenGL thread
         myIsThreaded = false;
@@ -77,8 +77,8 @@
     }
 
     + (StAppResponder* ) sharedInstance {
-        if(TheAppResponder == NULL) {
-            TheAppResponder = super allocWithZone: NULL init;
+        if(TheAppResponder == nullptr) {
+            TheAppResponder = super allocWithZone: nullptr init;
         }
         return TheAppResponder;
     }
@@ -144,21 +144,19 @@
             return YES;
         }
 
-        if(myStApp.isNull()) {
+        if (myStApp.get() == nullptr) {
             TheOpenInfo->setPath(aFilePath);
-            self launchSelf: NULL;
+            self launchSelf: nullptr;
             return YES;
         }
 
-        StArrayList<StString> anArguments(2);
-        anArguments.add("-");
-        anArguments.add(aFilePath);
+        std::vector<StString> anArguments = { "-", aFilePath };
         StProcess::execProcess(StProcess::getProcessFullPath(), anArguments);
         return YES;
     }
 
     - (void ) applicationDidFinishLaunching: (NSNotification* ) theNotification {
-        StArrayList<StString> anArgs = StProcess::getArguments();
+        std::vector<StString> anArgs = StProcess::getArguments();
         size_t anArgsNb = anArgs.size();
         // open path set by Cocoa mechanisms
         const StString aCocoaOpenPath = TheOpenInfo->getPath();
@@ -198,27 +196,27 @@
 
     - (void ) applicationWillTerminate: (NSNotification* ) theNotification {
         TheToQuit = true; // needed if sView closed by Cocoa call rather than from StDrawer
-        if(!myThread.isNull()) {
+        if (myThread.get() != nullptr) {
             myThread->wait();
-            myThread.nullify();
+            myThread.reset();
         } else {
-            if(!myStApp.isNull() && !myStApp->closingDown()) {
+            if (myStApp.get() != nullptr && !myStApp->closingDown()) {
                 myStApp->exit(0);
             }
-            myStApp.nullify();
+            myStApp.reset();
         }
     }
 
     - (void ) launchSelf: (id ) theSender {
-        if(!myStApp.isNull()
-        || !myThread.isNull()) {
+        if (myStApp.get() != nullptr
+         || myThread.get() != nullptr) {
             return; // already launched - invalid call
         }
 
         if(myIsThreaded) {
             // start StApplication instance in dedicated thread
             ST_DEBUG_LOG("StAppResponder, application started in dedicated thread");
-            myThread = new StThread(anAppThreadFunc, self, "StApplication");
+            myThread = std::make_shared<StThread>(anAppThreadFunc, self, "StApplication");
         } else {
             // process StApplication rendering iterations by timer
             ST_DEBUG_LOG("StAppResponder, application started in main thread!");
@@ -234,21 +232,21 @@
     }
 
     - (bool ) startStApp: (id ) theSender {
-        if(!myStApp.isNull()) {
+        if (myStApp.get() != nullptr) {
             return false;
         }
 
-        StHandle<StResourceManager> aResMgr = new StResourceManager();
+        std::shared_ptr<StResourceManager> aResMgr = std::make_shared<StResourceManager>();
         myStApp = StMultiApp::getInstance(aResMgr, TheOpenInfo);
-        if(!myStApp->open()) {
-            myStApp.nullify();
+        if (!myStApp->open()) {
+            myStApp.reset();
             return false;
         }
 
-        if(!myStApp->getMainWindow().isNull()) {
+        if (myStApp->getMainWindow().get() != nullptr) {
             // just debug output Monitors' configuration - for consistency with StApplication::exec()
             const StSearchMonitors& aMonitors = myStApp->getMainWindow()->getMonitors();
-            for(size_t aMonIter = 0; aMonIter < aMonitors.size(); ++aMonIter) {
+            for (size_t aMonIter = 0; aMonIter < aMonitors.size(); ++aMonIter) {
                 ST_DEBUG_LOG(aMonitorsaMonIter.toString());
             }
         }
@@ -257,7 +255,7 @@
     }
 
     - (bool ) loopIter: (id ) theSender {
-        if(myStApp.isNull()) {
+        if (myStApp.get() == nullptr) {
             return false;
         }
 
@@ -266,17 +264,17 @@
         }
 
         if(myStApp->closingDown()) {
-            StHandle<StOpenInfo> anOther = myStApp->getOpenFileInOtherDrawer();
-            if(!anOther.isNull()) {
-                myStApp.nullify();
-                StHandle<StResourceManager> aResMgr = new StResourceManager();
+            std::shared_ptr<StOpenInfo> anOther = myStApp->getOpenFileInOtherDrawer();
+            if (anOther.get() != nullptr) {
+                myStApp.reset();
+                std::shared_ptr<StResourceManager> aResMgr = std::make_shared<StResourceManager>();
                 myStApp = StMultiApp::getInstance(aResMgr, anOther);
-                if(!myStApp.isNull() && myStApp->open()) {
+                if (myStApp.get() != nullptr && myStApp->open()) {
                     return true;
                 }
             }
 
-            myStApp.nullify();
+            myStApp.reset();
 
             // this will call exit(), so code below has no effect
             NSApp terminate: nil;
@@ -287,7 +285,7 @@
     }
 
     - (void ) launchImageViewer: (id ) theSender {
-        if(myStApp.isNull()) {
+        if (myStApp.get() == nullptr) {
             StArgumentsMap anArgs;
             anArgs.add(StArgument("in", "image"));
             TheOpenInfo->setArgumentsMap(anArgs);
@@ -296,13 +294,12 @@
             return;
         }
 
-        StArrayList<StString> anArguments(1);
-        anArguments.add("--in=image");
+        std::vector<StString> anArguments = { "--in=image" };
         StProcess::execProcess(StProcess::getProcessFullPath(), anArguments);
     }
 
     - (void ) launchMoviePlayer: (id ) theSender {
-        if(myStApp.isNull()) {
+        if (myStApp.get() == nullptr) {
             StArgumentsMap anArgs;
             anArgs.add(StArgument("in", "video"));
             TheOpenInfo->setArgumentsMap(anArgs);
@@ -311,13 +308,12 @@
             return;
         }
 
-        StArrayList<StString> anArguments(1);
-        anArguments.add("--in=video");
+        std::vector<StString> anArguments = { "--in=video" };
         StProcess::execProcess(StProcess::getProcessFullPath(), anArguments);
     }
 
     - (void ) launchDiagnostics: (id ) theSender {
-        if(myStApp.isNull()) {
+        if (myStApp.get() == nullptr) {
             StArgumentsMap anArgs;
             anArgs.add(StArgument("in", "StDiagnostics"));
             TheOpenInfo->setArgumentsMap(anArgs);
@@ -326,8 +322,7 @@
             return;
         }
 
-        StArrayList<StString> anArguments(1);
-        anArguments.add("--in=StDiagnostics");
+        std::vector<StString> anArguments = { "--in=StDiagnostics" };
         StProcess::execProcess(StProcess::getProcessFullPath(), anArguments);
     }

_service:obs_scm:sview-26.obscpio/sview/main.cpp Changed

_service:obs_scm:sview.obsinfo Changed