Bump version and make minor adjustments

joel16 · Jul 5, 2019 · c93c3e2 · c93c3e2
1 parent 5d0de7c
commit c93c3e2
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 9 deletions.
diff --git a/Makefile b/Makefile
@@ -38,8 +38,8 @@ INCLUDES      := include include/audio include/ftp include/gif include/menus lib
 EXEFS_SRC     := exefs_src
 ROMFS         := romfs
 
-VERSION_MAJOR := 1
-VERSION_MINOR := 2
+VERSION_MAJOR := 2
+VERSION_MINOR := 0
 VERSION_MICRO := 0
 GITVERSION    := $(shell git log -1 --pretty='%h')
 

diff --git a/source/menus/menu_gallery.c b/source/menus/menu_gallery.c
@@ -29,9 +29,10 @@ static Result Gallery_GetImageList(void) {
 			qsort(entries, entryCount, sizeof(FsDirectoryEntry), Utils_Alphasort);
 
 			for (u32 i = 0; i < entryCount; i++) {
-				if ((!strncasecmp(FS_GetFileExt(entries[i].name), "png", 3)) || (!strncasecmp(FS_GetFileExt(entries[i].name), "jpg", 3)) || 
-					(!strncasecmp(FS_GetFileExt(entries[i].name), "bmp", 3)) || (!strncasecmp(FS_GetFileExt(entries[i].name), "gif", 3)) ||
-					(!strncasecmp(FS_GetFileExt(entries[i].name), "webp", 4))) {
+				const char *ext = FS_GetFileExt(entries[i].name);
+
+				if ((!strncasecmp(ext, "png", 3)) || (!strncasecmp(ext, "jpg", 3)) || (!strncasecmp(ext, "bmp", 3))
+					|| (!strncasecmp(ext, "gif", 3)) || (!strncasecmp(ext, "webp", 4))) {
 					strcpy(album[count], cwd);
 					strcpy(album[count] + strlen(album[count]), entries[i].name);
 					count++;

diff --git a/source/menus/menu_music.c b/source/menus/menu_music.c
@@ -39,9 +39,11 @@ static Result Menu_GetMusicList(void) {
 			qsort(entries, entryCount, sizeof(FsDirectoryEntry), Utils_Alphasort);
 
 			for (u32 i = 0; i < entryCount; i++) {
-				if ((!strncasecmp(FS_GetFileExt(entries[i].name), "flac", 4)) || (!strncasecmp(FS_GetFileExt(entries[i].name), "mp3", 3)) 
-					|| (!strncasecmp(FS_GetFileExt(entries[i].name), "ogg", 3)) || (!strncasecmp(FS_GetFileExt(entries[i].name), "wav", 3))
-					|| (!strncasecmp(FS_GetFileExt(entries[i].name), "xm", 2))) {
+				const char *ext = FS_GetFileExt(entries[i].name);
+
+				if ((!strncasecmp(ext, "flac", 4)) || (!strncasecmp(ext, "it", 2)) || (!strncasecmp(ext, "mod", 3))
+					|| (!strncasecmp(ext, "mp3", 3)) || (!strncasecmp(ext, "ogg", 3)) || (!strncasecmp(ext, "opus", 4))
+					|| (!strncasecmp(ext, "s3m", 3)) || (!strncasecmp(ext, "wav", 3)) || (!strncasecmp(ext, "xm", 2))) {
 					strcpy(playlist[count], cwd);
 					strcpy(playlist[count] + strlen(playlist[count]), entries[i].name);
 					count++;

diff --git a/source/menus/menu_settings.c b/source/menus/menu_settings.c
@@ -132,7 +132,7 @@ static void Menu_ControlAboutDialog(u64 input, TouchInfo touchInfo) {
 }
 
 static void Menu_DisplayAboutDialog(void) {
-	u32 text1_width = 0, text2_width = 0, text3_width = 0, text4_width = 0, text5_width = 0;
+	u32 text1_width = 0, text2_width = 0, text3_width = 0, text4_width = 0;
 	SDL_GetTextDimensions(20, "NX Shell vX.X.X", &text1_width, NULL);
 	SDL_GetTextDimensions(20, "Author: Joel16", &text2_width, NULL);
 	SDL_GetTextDimensions(20, "Graphics: Preetisketch and CyanogenMod/LineageOS contributors", &text3_width, NULL);