eepp: Updated mojoal, dr_mp3, dr_flac. Fixed various mojoal bugs. Added SoundFileFactory::isKnownFileExtension. SoundFileFactory::isValidAudio, SoundFileFactory::isValidAudioFile.

ecode: Added audio player support (SpartanJ/ecode#96).

Author: SpartanJ

.ecode/project_build.json

@@ -306,6 +306,12 @@
         "command": "${project_root}/bin/eterm-debug",
         "name": "eterm-debug",
         "working_dir": "${project_root}/bin"
+      },
+      {
+        "args": "",
+        "command": "${project_root}/bin/eepp-sound-debug",
+        "name": "eepp-sound-debug",
+        "working_dir": "${project_root}/bin"
       }
     ],
     "var": {

include/eepp/audio/soundfilefactory.hpp

@@ -22,6 +22,15 @@ class SoundFileWriter;
 ////////////////////////////////////////////////////////////
 class EE_API SoundFileFactory {
   public:
+  	// @return True if the file path or extension passed is a known sound file extension
+  	static bool isKnownFileExtension( const std::string& pathOrExtension );
+
+  	// @return True if the file path contains a valid sound file
+  	static bool isValidAudioFile( const std::string& path );
+
+  	// @return True if the stream contains a valid sound file
+  	static bool isValidAudio( IOStream& stream );
+
 	/// \brief Register a new reader
 	/// \see unregisterReader
 	template <typename T> static void registerReader();
@@ -100,6 +109,7 @@ class EE_API SoundFileFactory {
   private:
 	struct ReaderFactory {
 		bool ( *check )( IOStream& );
+		bool ( *usesFileExtension )( std::string_view );
 		SoundFileReader* ( *create )();
 	};
 	typedef std::vector<ReaderFactory> ReaderFactoryArray;

include/eepp/audio/soundfilefactory.inl

@@ -16,6 +16,7 @@ void SoundFileFactory::registerReader()
 	// Create a new factory with the functions provided by the class
 	ReaderFactory factory;
 	factory.check = &T::check;
+	factory.usesFileExtension = &T::usesFileExtension;
 	factory.create = &priv::createReader<T>;
 
 	// Add it

include/eepp/ui.hpp

@@ -73,9 +73,11 @@
 #include <eepp/ui/doc/textdocument.hpp>
 
 #include <eepp/ui/tools/textureatlaseditor.hpp>
+#include <eepp/ui/tools/uiaudioplayer.hpp>
 #include <eepp/ui/tools/uicodeeditorsplitter.hpp>
 #include <eepp/ui/tools/uicolorpicker.hpp>
 #include <eepp/ui/tools/uidocfindreplace.hpp>
+#include <eepp/ui/tools/uiimageviewer.hpp>
 #include <eepp/ui/tools/uiwidgetinspector.hpp>
 
 #include <eepp/ui/models/csspropertiesmodel.hpp>

include/eepp/ui/tools/uiaudioplayer.hpp

@@ -0,0 +1,65 @@
+#ifndef EE_UI_TOOLS_UIAUDIOPLAYER_HPP
+#define EE_UI_TOOLS_UIAUDIOPLAYER_HPP
+
+#include <eepp/ui/uirelativelayout.hpp>
+
+namespace EE::Audio {
+class Music;
+}
+
+namespace EE::UI {
+class UIProgressBar;
+class UITextView;
+} // namespace EE::UI
+
+using namespace EE::UI;
+using namespace EE::Audio;
+
+namespace EE::UI::Tools {
+
+class EE_API UIAudioPlayer : public UIRelativeLayout {
+  public:
+	static UIAudioPlayer* New();
+
+	virtual ~UIAudioPlayer();
+
+	virtual Uint32 getType() const override;
+
+	virtual bool isType( const Uint32& type ) const override;
+
+	Music* getAudio() const;
+
+	virtual void scheduledUpdate( const Time& time ) override;
+
+	void loadFromPath( const std::string& path, bool autoPlay = true );
+
+	const std::string& getFilePath() const;
+
+	void play();
+
+	void pause();
+
+	void stop();
+
+	UIProgressBar* getProgressBar() const { return mProgressBar; }
+
+	UIWidget* getStatusBtn() const { return mStatusBtn; }
+
+	UIWidget* getVolumeBtn() const { return mVolumeBtn; }
+
+	UITextView* getTimeView() const { return mTimeView; }
+
+  protected:
+	UIAudioPlayer();
+
+	Music* mMusic{ nullptr };
+	UIProgressBar* mProgressBar{ nullptr };
+	UIWidget* mStatusBtn{ nullptr };
+	UIWidget* mVolumeBtn{ nullptr };
+	UITextView* mTimeView{ nullptr };
+	std::string mFilePath;
+};
+
+} // namespace EE::UI::Tools
+
+#endif

include/eepp/ui/tools/uiimageviewer.hpp

@@ -34,8 +34,6 @@ class EE_API UIImageViewer : public UIWidget {
 
 	static UIImageViewer* New();
 
-	UIImageViewer();
-
 	virtual ~UIImageViewer();
 
 	virtual Uint32 getType() const override;
@@ -97,6 +95,8 @@ class EE_API UIImageViewer : public UIWidget {
 	Image::Format mCurFileType;
 	Uint32 mDisplayOptions{ 0 };
 
+	UIImageViewer();
+
 	virtual void onSizeChange() override;
 
 	virtual Uint32 onMessage( const NodeMessage* ) override;
@@ -110,4 +110,4 @@ class EE_API UIImageViewer : public UIWidget {
 
 } // namespace EE::UI::Tools
 
-#endif
+#endif

include/eepp/ui/uihelper.hpp

@@ -104,6 +104,7 @@ enum UINodeType {
 	UI_TYPE_CONSOLE,
 	UI_TYPE_STACK_LAYOUT,
 	UI_TYPE_IMAGE_VIEWER,
+	UI_TYPE_AUDIO_PLAYER,
 	UI_TYPE_MODULES = 10000,
 	UI_TYPE_TERMINAL = 10001,
 	UI_TYPE_USER = 200000

include/eepp/ui/uiprogressbar.hpp

@@ -7,7 +7,19 @@
 
 namespace EE { namespace UI {
 
-class UIProgressBarFiller;
+class UIProgressBar;
+
+class EE_API UIProgressBarFiller : public UIWidget {
+  public:
+	static UIProgressBarFiller* New( UIProgressBar* parent );
+
+	UIProgressBarFiller( UIProgressBar* parent );
+
+	void draw() override;
+
+	UIProgressBar* mProgressBar;
+	UISkin* mFillerSkin;
+};
 
 class EE_API UIProgressBar : public UIWidget {
   public:
@@ -63,6 +75,8 @@ class EE_API UIProgressBar : public UIWidget {
 
 	const StyleConfig& getStyleConfig() const;
 
+	UIProgressBarFiller* getFiller() const;
+
   protected:
 	friend class UIProgressBarFiller;
 	StyleConfig mStyleConfig;

premake4.lua

@@ -960,7 +960,7 @@ function build_eepp( build_name )
 	defines { "PCRE2_STATIC", "PCRE2_CODE_UNIT_WIDTH=8", "ONIG_STATIC" }
 
 	if not _OPTIONS["without-mojoal"] then
-		defines( "AL_LIBTYPE_STATIC" )
+		defines { "AL_LIBTYPE_STATIC", "EE_MOJOAL" }
 		includedirs { "src/thirdparty/mojoAL" }
 	end
 
@@ -1291,7 +1291,7 @@ solution "eepp"
 		project "mojoal-static"
 			kind "StaticLib"
 			language "C"
-			defines( "AL_LIBTYPE_STATIC" )
+			defines {"AL_LIBTYPE_STATIC", "EE_MOJOAL" }
 			set_targetdir("libs/" .. os.get_real() .. "/thirdparty/")
 			includedirs { "include/eepp/thirdparty/mojoAL" }
 			files { "src/thirdparty/mojoAL/*.c" }

premake5.lua

@@ -814,7 +814,7 @@ function build_eepp( build_name )
 		files { "src/eepp/network/platform/unix/*.cpp" }
 
 	filter "options:not without-mojoal"
-		defines( "AL_LIBTYPE_STATIC" )
+		defines { "AL_LIBTYPE_STATIC", "EE_MOJOAL" }
 		incdirs { "src/thirdparty/mojoAL" }
 
 	filter "options:windows-vc-build"
@@ -1159,7 +1159,7 @@ workspace "eepp"
 		kind "StaticLib"
 		language "C"
 		incdirs { "include/eepp/thirdparty/mojoAL" }
-		defines( "AL_LIBTYPE_STATIC" )
+		defines { "AL_LIBTYPE_STATIC", "EE_MOJOAL" }
 		files { "src/thirdparty/mojoAL/*.c" }
 		build_base_cpp_configuration( "mojoal" )
 		target_dir_thirdparty()