|
@@ -779,7 +779,15 @@ void CardReader::getfilename_sorted(const uint16_t nr, uint8_t sdSort) {
|
|
if (nr < sort_count)
|
|
if (nr < sort_count)
|
|
getfilename_simple(sort_entries[(sdSort == SD_SORT_ALPHA) ? (sort_count - nr - 1) : nr]);
|
|
getfilename_simple(sort_entries[(sdSort == SD_SORT_ALPHA) ? (sort_count - nr - 1) : nr]);
|
|
else
|
|
else
|
|
- getfilename(nr);
|
|
|
|
|
|
+ getfilename_afterMaxSorting(nr);
|
|
|
|
+}
|
|
|
|
+
|
|
|
|
+void CardReader::getfilename_afterMaxSorting(uint16_t entry, const char * const match/*=NULL*/)
|
|
|
|
+{
|
|
|
|
+ curDir = &workDir;
|
|
|
|
+ nrFiles = entry - sort_count + 1;
|
|
|
|
+ curDir->seekSet(lastSortedFilePosition << 5);
|
|
|
|
+ lsDive("", *curDir, match, LS_GetFilename);
|
|
}
|
|
}
|
|
|
|
|
|
/**
|
|
/**
|
|
@@ -830,6 +838,7 @@ void CardReader::presort() {
|
|
LongTimer sortingSpeedtestTimer;
|
|
LongTimer sortingSpeedtestTimer;
|
|
sortingSpeedtestTimer.start();
|
|
sortingSpeedtestTimer.start();
|
|
#endif //SORTING_SPEEDTEST
|
|
#endif //SORTING_SPEEDTEST
|
|
|
|
+ lastSortedFilePosition = position >> 5;
|
|
|
|
|
|
// By default re-read the names from SD for every compare
|
|
// By default re-read the names from SD for every compare
|
|
// retaining only two filenames at a time. This is very
|
|
// retaining only two filenames at a time. This is very
|
|
@@ -989,6 +998,7 @@ void CardReader::presort() {
|
|
|
|
|
|
void CardReader::flush_presort() {
|
|
void CardReader::flush_presort() {
|
|
sort_count = 0;
|
|
sort_count = 0;
|
|
|
|
+ lastSortedFilePosition = 0;
|
|
}
|
|
}
|
|
|
|
|
|
#endif // SDCARD_SORT_ALPHA
|
|
#endif // SDCARD_SORT_ALPHA
|