Finish bass implementation

Author: user-grinch

PyLoader/CSoundSystem.cpp

@@ -0,0 +1,118 @@
+/*
+* Credits:
+* This part of the source is taken from the CLEO4 Project
+* https://github.com/cleolibrary/CLEO4
+*/
+#pragma once
+#include "pch.h"
+#include <set>
+#include "depend/bass.h"
+
+class CAudioStream;
+class C3DAudioStream;
+
+class CSoundSystem
+{
+    friend class CAudioStream;
+    friend class C3DAudioStream;
+
+    std::set<CAudioStream *> streams;
+    BASS_INFO SoundDevice;
+    bool initialized;
+    int forceDevice;
+    bool paused;
+    bool bUseFPAudio;
+    HWND hwnd;
+
+public:
+    virtual void Inject();
+    bool Init(HWND hwnd);
+    inline bool Initialized() { return initialized; }
+
+    CSoundSystem() : initialized(false), forceDevice(-1), paused(false), bUseFPAudio(false)
+    {
+        // TODO: give to user an ability to force a sound device to use (ini-file or cmd-lineflog << "
+
+    }
+
+    ~CSoundSystem()
+    {
+        flog << "Closing SoundSystem..." << std::endl;
+        UnloadAllStreams();
+        if (initialized)
+        {
+            flog << "Freeing BASS library" << std::endl;
+            BASS_Free();
+            initialized = false;
+        }
+        flog << "SoundSystem closed!" << std::endl;
+    }
+
+    CAudioStream * LoadStream(const char *filename, bool in3d = false);
+    void PauseStreams();
+    void ResumeStreams();
+    void UnloadStream(CAudioStream *stream);
+    void UnloadAllStreams();
+    void Update();
+};
+
+class CAudioStream
+{
+    friend class CSoundSystem;
+
+    CAudioStream(const CAudioStream&);
+
+protected:
+    HSTREAM streamInternal;
+    enum eStreamState
+    {
+        no,
+        playing,
+        paused,
+        stopped,
+    } state;
+    bool OK;
+    CAudioStream();
+
+public:
+    CAudioStream(const char *src);
+    virtual ~CAudioStream();
+
+    // actions on streams
+    void Play();
+    void Pause(bool change_state = true);
+    void Stop();
+    void Resume();
+    DWORD GetLength();
+    DWORD GetState();
+    float GetVolume();
+    void SetVolume(float val);
+    void Loop(bool enable);
+	HSTREAM GetInternal();
+
+    // overloadable actions
+    virtual void Set3dPosition(const CVector& pos);
+    virtual void Link(CPlaceable *placable = nullptr);
+    virtual void Process();
+};
+
+class C3DAudioStream : public CAudioStream
+{
+    friend class CSoundSystem;
+
+    C3DAudioStream(const C3DAudioStream&);
+
+protected:
+    CPlaceable	*	link;
+    BASS_3DVECTOR	position;
+public:
+    C3DAudioStream(const char *src);
+    virtual ~C3DAudioStream();
+
+    // overloaded actions
+    virtual void Set3dPosition(const CVector& pos);
+    virtual void Link(CPlaceable *placable = nullptr);
+    virtual void Process();
+};
+
+extern CSoundSystem SoundSystem;

PyLoader/CSoundSystem.h

@@ -12,9 +12,11 @@
 #include "sdk/PyInternal.h"
 #include "sdk/PyBass.h"
 #include "PyEvents.h"
+#include "CSoundSystem.h"
 
 std::ofstream flog("PyLoader.log");
 size_t game_ticks = 0;
+CSoundSystem SoundSystem;
 
 void PyLoader::LoadPlugins(std::string&& dir_name)
 {
@@ -96,7 +98,7 @@ void PyLoader::PluginThread(void* param)
     };
 
     flog << "------------------------------\nStarting PyLoader v" << plugin_ver
-        << "\nAuthor: Grinch_\nMore info: https:///github.com/user-grinch/PyLoaderSA/" << std::endl;
+        << "\nAuthor: Grinch_\nThanks: CLEO4 & PluginSDK devs\nMore info: https:///github.com/user-grinch/PyLoaderSA/" << std::endl;
 
     CheckUpdate();
 
@@ -125,6 +127,8 @@ void PyLoader::PluginThread(void* param)
     PyEval_ReleaseLock();
 
     PyEvents::InitAllEvents();
+    SoundSystem.Inject();
+    SoundSystem.Init(RsGlobal.ps->window);
 
     // load scripts
     if (dir != INVALID_HANDLE_VALUE)

PyLoader/PyLoader.cpp

@@ -97,6 +97,7 @@
   <ItemGroup>
     <ClCompile Include="depend\jute.cpp" />
     <ClCompile Include="DllMain.cpp" />
+    <ClCompile Include="CSoundSystem.cpp" />
     <ClCompile Include="sdk\PyBass.cpp" />
     <ClCompile Include="PyEvents.cpp" />
     <ClCompile Include="sdk\PyInternal.cpp" />
@@ -111,6 +112,7 @@
   <ItemGroup>
     <ClInclude Include="depend\bass.h" />
     <ClInclude Include="depend\jute.h" />
+    <ClInclude Include="CSoundSystem.h" />
     <ClInclude Include="sdk\PyBass.h" />
     <ClInclude Include="PyEvents.h" />
     <ClInclude Include="PyEventsInternal.h" />

PyLoader/PyLoader.vcxproj

@@ -13,6 +13,7 @@
     <ClCompile Include="PyEvents.cpp" />
     <ClCompile Include="depend\jute.cpp" />
     <ClCompile Include="sdk\PyBass.cpp" />
+    <ClCompile Include="CSoundSystem.cpp" />
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="pch.h" />
@@ -30,6 +31,7 @@
     <ClInclude Include="PyEventsInternal.h" />
     <ClInclude Include="sdk\PyBass.h" />
     <ClInclude Include="depend\bass.h" />
+    <ClInclude Include="CSoundSystem.h" />
   </ItemGroup>
   <ItemGroup>
     <Library Include="depend\bass.lib" />

PyLoader/PyLoader.vcxproj.filters

@@ -10,6 +10,6 @@
 #include <filesystem>
 
 namespace fs = std::filesystem;
-constexpr const char* plugin_ver = "0.03";
+constexpr const char* plugin_ver = "0.05";
 extern size_t game_ticks;
 extern std::ofstream flog;