0.7.0 Release RC1

proconsule · Sep 5, 2023 · 10fba9d · 10fba9d
1 parent 38df944
commit 10fba9d
Show file tree

Hide file tree

Showing 79 changed files with 2,608 additions and 8,934 deletions.
diff --git a/Makefile b/Makefile
@@ -39,16 +39,16 @@ include $(DEVKITPRO)/libnx/switch_rules
 #---------------------------------------------------------------------------------
 TARGET		:=	$(notdir $(CURDIR))
 BUILD		:=	build
-SOURCES		:=	libs/imgui libs/imgui/opengl3 libs/imgui/misc/freetype source source/updater source/curldownloader source/touchcontrols source/playlist source/shadermania source/eqpreset source/database source/UI source/remotefs/UPNP source/remotefs/nfsDir source/remotefs/smb2 source/remotefs/sshDir source/remotefs/Enigma2 source/localfs source/localfs/usb source/remotefs/ftplib source/remotefs/HTTPDir source/themes
+SOURCES		:=	source/logger source/stats libs/imgui libs/imgui/opengl3 libs/imgui/misc/freetype source source/updater source/curldownloader source/touchcontrols source/playlist source/shadermania source/eqpreset source/database source/UI source/remotefs/UPNP source/remotefs/nfsDir source/remotefs/smb2 source/remotefs/sshDir source/remotefs/Enigma2 source/localfs source/localfs/usb source/remotefs/ftplib source/remotefs/HTTPDir source/themes
 DATA		:=	data
-INCLUDES	:=	libs/simpleini libs/imgui libs/imgui/opengl3 include source/curldownloader source/updater source/touchcontrols source/playlist source/shadermania source/eqpreset source/database source/remotefs/UPNP source/remotefs/nfsDir source/remotefs/smb2 source/remotefs/sshDir source/remotefs/Enigma2 source/localfs source/localfs/usb source/remotefs/ftplib source/remotefs/HTTPDir source/themes
+INCLUDES	:=	source/logger source/stats libs/simpleini libs/imgui libs/imgui/opengl3 include source/curldownloader source/updater source/touchcontrols source/playlist source/shadermania source/eqpreset source/database source/remotefs/UPNP source/remotefs/nfsDir source/remotefs/smb2 source/remotefs/sshDir source/remotefs/Enigma2 source/localfs source/localfs/usb source/remotefs/ftplib source/remotefs/HTTPDir source/themes
 ROMFS		:=	romfs
 
 GITREV:= -D'GITREV="$(shell git rev-parse --short HEAD)"'
 
 VERSION_MAJOR := 0
-VERSION_MINOR := 6
-VERSION_MICRO := 3
+VERSION_MINOR := 7
+VERSION_MICRO := 0
 
 APP_TITLE     := NXMP
 APP_AUTHOR    := proconsule and darkxex
@@ -60,22 +60,22 @@ APP_VERSION   := ${VERSION_MAJOR}.${VERSION_MINOR}.${VERSION_MICRO}
 #---------------------------------------------------------------------------------
 ARCH	:=	-march=armv8-a+crc+crypto -mtune=cortex-a57 -mtp=soft -fPIE
 
-CFLAGS	:=	-g -Wall -Wno-sign-compare -O2 -ffunction-sections \
+CFLAGS	:=	-g -ggdb -Wall -Wno-sign-compare -O2 -ffunction-sections \
 			$(ARCH) $(DEFINES) \
                 $(GITREV)
-CFLAGS  +=      `sdl2-config --cflags` `freetype-config --cflags` -fpermissive -DIMGUI_USE_WCHAR32 -I${PORTLIBS}/include/upnp/
+CFLAGS  +=      `sdl2-config --cflags` `freetype-config --cflags` -I${PORTLIBS}/include/upnp/
 
 CFLAGS	+=	$(INCLUDE) -D__SWITCH__ $(BUILD_TYPE)
 
-CFLAGS  +=      -DVERSION_MAJOR=$(VERSION_MAJOR) -DVERSION_MINOR=$(VERSION_MINOR) -DVERSION_MICRO=$(VERSION_MICRO) -gdwarf-2 -gstrict-dwarf
+CFLAGS  +=      -DVERSION_MAJOR=$(VERSION_MAJOR) -DVERSION_MINOR=$(VERSION_MINOR) -DVERSION_MICRO=$(VERSION_MICRO) 
 
-CXXFLAGS	:= $(CFLAGS) -fno-rtti -fexceptions -DIMGUI_IMPL_OPENGL_LOADER_GLAD \
-		-DIMGUI_DISABLE_OBSOLETE_FUNCTIONS -DIMGUI_ENABLE_FREETYPE
+CXXFLAGS	:= $(CFLAGS) -std=gnu++17 -fno-rtti -fexceptions -fpermissive -DIMGUI_IMPL_OPENGL_LOADER_GLAD \
+		  -DIMGUI_IMPL_OPENGL_LOADER_CUSTOM -DIMGUI_DISABLE_OBSOLETE_FUNCTIONS
 
 ASFLAGS	:=	-g $(ARCH)
 LDFLAGS	=	-specs=$(DEVKITPRO)/libnx/switch.specs -g $(ARCH) -Wl,-Map,$(notdir $*.map)
 
-LIBS	:= `curl-config --libs` `sdl2-config --libs` `freetype-config --libs` -lmpv -lssh2 -lswscale -lswresample -lavformat -lavfilter -lavcodec -lavutil -llzma -lopus -lvpx -lass -lharfbuzz -lfreetype -lfribidi -lpng -lbz2 -lusbhsfs -lntfs-3g -llwext4 -lglad -lEGL -lglapi -ldrm_nouveau -ltinyxml2 -lturbojpeg -llua -lmbedcrypto -lmbedx509 -lmbedtls -lmbedcrypto -lmbedx509 -lmbedtls -lsqlite3 -lsmb2 -lnfs -lnx -ljansson -lz
+LIBS	:=  `curl-config --libs` `sdl2-config --libs` `freetype-config --libs` -lssh2 -lmpv -lswscale -lswresample -lavformat -lavfilter -lpostproc -lavcodec -lavutil -llzma -lopus -lvpx -lass -lharfbuzz -lfreetype -lfribidi  -lstdc++ -ldav1d -lpng -lbz2 -lusbhsfs -lntfs-3g -llwext4 -lglad -lEGL -lglapi -ldrm_nouveau -ltinyxml2 -lturbojpeg -llua -lmbedcrypto -lmbedx509 -lmbedtls -lmbedcrypto -lmbedx509 -lmbedtls -lsqlite3 -lsmb2 -lnfs -lopenal -lnx -ljansson -lc -lz
 
 
 

diff --git a/Makefile.win32 b/Makefile.win32
diff --git a/include/SwitchSys.h b/include/SwitchSys.h
@@ -3,17 +3,14 @@
 // Created by cpasjuste on 26/11/18.
 //
 
-#ifndef CROSS2D_SWITCH_CLOCKS_H
-#define CROSS2D_SWITCH_CLOCKS_H
+#ifndef NXMP_SWITCH_CLOCKS_H
+#define NXMP_SWITCH_CLOCKS_H
 
-#include "platforms.h"
-
-#ifdef NXMP_SWITCH
 
 #include <stdio.h>
 #include <switch.h>
 
-namespace c2d {
+#include "logger.h"
 
     class SwitchSys {
 
@@ -55,6 +52,6 @@ namespace c2d {
         static int stock_gpu_clock;
         static int stock_emc_clock;
     };
-}
-#endif
+
+
 #endif //CROSS2D_SWITCH_CLOCKS_H
diff --git a/include/UIHelpers.h b/include/UIHelpers.h
@@ -0,0 +1,16 @@
+#ifndef NXMP_UIHELPERS_H
+#define NXMP_UIHELPERS_H
+
+namespace GUI{
+	void newbatteryIcon(ImVec2 pos,bool absolute,uint32_t batlevel, float w, float h,bool showperc);
+
+}
+
+namespace Windows {
+	std::string InputSwitchKeyboard(std::string uuid,std::string label,std::string data);
+	void newbatteryIcon(ImVec2 pos,bool absolute,uint32_t batlevel, float w, float h,bool showperc);
+}
+
+
+
+#endif
diff --git a/include/apppopups.h b/include/apppopups.h
@@ -16,8 +16,9 @@ namespace Popups {
     };
 
     inline void ExitPopup(void) {
-        ImGui::EndPopup();
         ImGui::PopStyleVar();
+		ImGui::EndPopup();
+
     };
 
 	void SaveSettingsPopup(void);
@@ -26,6 +27,8 @@ namespace Popups {
     void SubBorderColorPopup(void);
 	void PlaylistStartPlaylist(void);
 	void DBUpdatedPopup(void);
+	void NetMenuPopup(void);
+
 }
 
 #endif
diff --git a/include/appwindows.h b/include/appwindows.h
@@ -2,13 +2,17 @@
 #define NXMP_WINDOWS_H
 
 #include "imgui.h"
-#include "platforms.h"
+#include "UIHelpers.h"
 
 extern int newResW;
 extern int newResH;
 extern float multiplyRes;
 extern bool isHandheld;
+
+
 namespace Windows {
+
+	extern int netwinselected;
 
 	inline void SetupMainWindow(void) {
         ImGui::SetNextWindowPos(ImVec2(0.0f, 0.0f), ImGuiCond_Once);
@@ -34,31 +38,28 @@ namespace Windows {
     };
 
     void FileBrowserWindow(bool *focus, bool *first_item);
-#ifdef NXMP_USBSUPPORT
 	void USBBrowserWindow(bool *focus, bool *first_item);
-#endif
-#ifdef NXMP_ENIGMASUPPORT
 	void EnigmaWindow(bool *focus, bool *first_item);
-#endif
 	void MainMenuWindow(bool *focus, bool *first_item);
-#ifdef NXMP_NETWORKSUPPORT
+	void ShareAddWindow(bool *focus, bool *first_item);
 	void FtpWindow(bool *focus, bool *first_item);
 	void HttpWindow(bool *focus, bool *first_item);
 	void SSHWindow(bool *focus, bool *first_item);
 	void SambaWindow(bool *focus, bool *first_item);
 	void NFSWindow(bool *focus, bool *first_item);
 	void NetworkWindow(bool *focus, bool *first_item);
-#endif
-#ifdef NXMP_UPNPSUPPORT
+
 	void UPNPBrowserWindow(bool *focus, bool *first_item);
-#endif
+
 	void InfoMenuWindow(bool *focus, bool *first_item);
 	void VideoWindow(bool *focus, bool *first_item);
 	void SettingsMenuWindow(bool *focus, bool *first_item);
 
 	void PlaylistWindow(bool *focus, bool *first_item);
-
+	void MTPServerWindow(bool *focus, bool *first_item);
 
+
+
 }
 
 

diff --git a/include/config.h b/include/config.h
@@ -4,7 +4,6 @@
 #include <string>
 #include <vector>
 
-#include "platforms.h" 
 
 #include "SimpleIni.h"
 
@@ -20,6 +19,7 @@ typedef struct{
 	bool useslang;
 	int slang;
     bool useoc;
+	bool hwdec = true;
 	int subfontsize;
 	float subfontscale;
 	int deint;
@@ -73,6 +73,9 @@ class Config{
 
 	bool getUseOc(bool tmpvalue);
 	void setUseOc(bool _val);
+
+	bool getHWDec(bool tmpvalue);
+	void setHWDec(bool _val);
 
 	int getSubFontSize(bool tmpvalue);
 	void setSubFontSize(int val);
@@ -111,6 +114,9 @@ class Config{
 	std::string getThemeName(bool tmpvalue);
 	void setThemeName(std::string value);
 
+	void addNetworkShare(networkSource netshare);
+	void RefreshNetworkShare(std::vector<networkSource> newnetsources);
+
 
 private: