[Traverso-commit] traverso/src/traverso/dialogs MarkerDialog.cpp

[Nicola Doebelin]

CVSROOT:        /sources/traverso
Module name:    traverso
Changes by:     Nicola Doebelin <n_doebelin>    07/11/22 20:49:41

Modified files:
        src/traverso/dialogs: MarkerDialog.cpp 

Log message:
        Export of the TOC to HTML could end up with an unsorted list of tracks. 
This is fixed now.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/traverso/src/traverso/dialogs/MarkerDialog.cpp?cvsroot=traverso&r1=1.16&r2=1.17

Patches:
Index: MarkerDialog.cpp
===================================================================
RCS file: /sources/traverso/traverso/src/traverso/dialogs/MarkerDialog.cpp,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -b -r1.16 -r1.17
--- MarkerDialog.cpp    22 Nov 2007 20:28:11 -0000      1.16
+++ MarkerDialog.cpp    22 Nov 2007 20:49:41 -0000      1.17
@@ -37,6 +37,7 @@
 #include <QFileDialog>
 #include <QDateTime>
 #include <AddRemove.h>
+#include <QMap>
 
 MarkerDialog::MarkerDialog(QWidget * parent)
        : QDialog(parent)
@@ -523,8 +524,18 @@
        Song *song = m_songlist.at(i);
 
        TimeLine* tl = song->get_timeline();
+       QMap<TimeRef, Marker*> markerMap;
                
+       // convert the list into a map, because the list is not sorted, but the
+       // map is sorted automatically
        foreach(Marker* marker, tl->get_markers()) {
+               markerMap.insert(marker->get_when(), marker);
+       }
+
+       QMapIterator<TimeRef, Marker*> iter(markerMap);
+       while (iter.hasNext()) {
+               iter.next();
+               Marker *marker = iter.value();
                QString name = marker->get_description();
                QString pos = timeref_to_cd(marker->get_when());