Browse Source

Make getfilename_sorted standard for listings

Scott Lahteine 5 years ago
parent
commit
f9b80e7217

+ 1
- 5
Marlin/src/lcd/extensible_ui/ui_api.cpp View File

@@ -570,11 +570,7 @@ namespace UI {
570 570
         #endif
571 571
       pos;
572 572
 
573
-      #if ENABLED(SDCARD_SORT_ALPHA)
574
-        card.getfilename_sorted(nr);
575
-      #else
576
-        card.getfilename(nr);
577
-      #endif
573
+      card.getfilename_sorted(nr);
578 574
       return card.filename && card.filename[0] != '\0';
579 575
     #endif
580 576
   }

+ 1
- 5
Marlin/src/lcd/menu/menu_sdcard.cpp View File

@@ -116,11 +116,7 @@ void menu_sdcard() {
116 116
         #endif
117 117
       i;
118 118
 
119
-      #if ENABLED(SDCARD_SORT_ALPHA)
120
-        card.getfilename_sorted(nr);
121
-      #else
122
-        card.getfilename(nr);
123
-      #endif
119
+      card.getfilename_sorted(nr);
124 120
 
125 121
       if (card.filenameIsDir)
126 122
         MENU_ITEM(sddirectory, MSG_CARD_MENU, card);

+ 2
- 0
Marlin/src/sd/cardreader.h View File

@@ -103,6 +103,8 @@ public:
103 103
       FORCE_INLINE void setSortFolders(int i) { sort_folders = i; presort(); }
104 104
       //FORCE_INLINE void setSortReverse(bool b) { sort_reverse = b; }
105 105
     #endif
106
+  #else
107
+    FORCE_INLINE void getfilename_sorted(const uint16_t nr) { getfilename(nr); }
106 108
   #endif
107 109
 
108 110
   #if ENABLED(POWER_LOSS_RECOVERY)

Loading…
Cancel
Save