Subtitles: Use std::sort instead qsort.

It is a lot faster.

1 files changed, 8 insertions, 6 deletions

diff --git a/src/Subtitles/RTS.cpp b/src/Subtitles/RTS.cpp
index b062e16e4..f03141f1f 100644
--- a/src/Subtitles/RTS.cpp
+++ b/src/Subtitles/RTS.cpp
@@ -2939,6 +2939,10 @@ STDMETHODIMP_(bool) CRenderedTextSubtitle::IsAnimated(POSITION pos)
 

 struct LSub {

     int idx, layer, readorder;

+

+    bool operator <(const LSub& rhs) const {

+        return (layer == rhs.layer) ? readorder < rhs.readorder : layer < rhs.layer;

+    }

 };

 

 static int lscomp(const void* ls1, const void* ls2)

@@ -2985,14 +2989,12 @@ STDMETHODIMP CRenderedTextSubtitle::Render(SubPicDesc& spd, REFERENCE_TIME rt, d
     CAtlArray<LSub> subs;

 

     for (ptrdiff_t i = 0, j = stss->subs.GetCount(); i < j; i++) {

-        LSub ls;

-        ls.idx = stss->subs[i];

-        ls.layer = GetAt(stss->subs[i]).layer;

-        ls.readorder = GetAt(stss->subs[i]).readorder;

-        subs.Add(ls);

+        const auto idx = stss->subs[i];

+        const auto& sts_entry = GetAt(idx);

+        subs.Add({ idx, sts_entry.layer, sts_entry.readorder });

     }

 

-    qsort(subs.GetData(), subs.GetCount(), sizeof(LSub), lscomp);

+    std::sort(subs.GetData(), subs.GetData() + subs.GetCount());

 

     for (ptrdiff_t i = 0, j = subs.GetCount(); i < j; i++) {

         int entry = subs[i].idx;