review ADLFile

sdl2-hyper-sonic-drivers/sdl2-hyper-sonic-drivers.cpp

@@ -36,6 +36,7 @@
 #include <HyperSonicDrivers/utils/sound.hpp>
 #include <HyperSonicDrivers/drivers/PCMDriver.hpp>
 #include <HyperSonicDrivers/audio/PCMSound.hpp>
+#include <HyperSonicDrivers/files/VOCFile.hpp>
 
 
 using namespace std;
@@ -130,7 +131,7 @@
 
 
     // TODO try with channels.
-    Mix_HookMusic(pcSpeaker.callback, &pcSpeaker);
+    Mix_Hook(pcSpeaker.callback, &pcSpeaker);
 
     cout << "SQUARE" << endl;
     playNotes(&pcSpeaker, PCSpeaker::eWaveForm::SQUARE, 440, 300);
@@ -355,57 +356,115 @@
     }
 }
 
-//void adldune2filestest()
-//{
-//    auto mixer = audio::make_mixer<audio::sdl2::Mixer>(8, 44100, 1024);
-//    mixer->init();
-//
-//    auto device = devices::make_device<devices::Adlib, devices::Opl>(mixer);
-//    drivers::westwood::ADLDriver drv(device, audio::mixer::eChannelGroup::Music);
-//    
-//    SDL_InitSubSystem(SDL_INIT_EVENTS);
-//    SDL_InitSubSystem(SDL_INIT_VIDEO);
-//
-//    auto window = SDL_CreateWindow("a", 0, 0, 320, 200, 0);
-//    
-//    for (int f = 0; f <= 0; f++)
-//    {
-//        const std::string fn = "adl/DUNE" + std::to_string(f) + ".ADL";
-//        utils::ILogger::instance->info(std::format("opening file: {}", fn), utils::ILogger::eCategory::Application);
-//        auto adlf = std::make_shared<files::westwood::ADLFile>(fn);
-//        drv.setADLFile(adlf);
-//        for (int i = 0; i < adlf->getNumTracks(); i++)
-//        {
-//            utils::ILogger::instance->info(std::format("playing track: {}", i), utils::ILogger::eCategory::Application);
-//            drv.play(i);
-//            while (drv.isPlaying())
-//            {
-//                utils::delayMillis(200);
-//                SDL_Event e;
-//                while (SDL_PollEvent(&e))
-//                    switch (e.type)
-//                    {
-//                    case SDL_QUIT:
-//                        goto QUIT;
-//                    case SDL_KEYDOWN:
-//                    //case SDL_KEYUP:
-//                        if (e.key.keysym.sym == SDLK_ESCAPE)
-//                            goto QUIT;
-//                        if (e.key.keysym.sym == SDLK_RETURN)
-//                            drv.stop();
-//                        break;
-//
-//                    default:
-//                        std::cout << "event: " << e.type << std::endl;
-//                    }
-//            }
-//            drv.stopAllChannels();
-//            utils::delayMillis(1000);
-//        }
-//    }
-//QUIT:
-//    SDL_DestroyWindow(window);
-//}
+void adldune2filestest()
+{
+    auto mixer = audio::make_mixer<audio::sdl2::Mixer>(8, 44100, 1024);
+    mixer->init();
+    //utils::ILogger::instance->setLevelAll(utils::ILogger::eLevel::Debug);
+    auto device = devices::make_device<devices::Adlib, devices::Opl>(mixer);
+    drivers::westwood::ADLDriver drv(device, audio::mixer::eChannelGroup::Music);
+
+    SDL_InitSubSystem(SDL_INIT_EVENTS);
+    SDL_InitSubSystem(SDL_INIT_VIDEO);
+
+    auto window = SDL_CreateWindow("a", 0, 0, 320, 200, 0);
+
+    for (int f = 0; f <= 0; f++)
+    {
+        //const std::string fn = "adl/DUNE" + std::to_string(f) + ".ADL";
+        const std::string fn = "adl/KYRA1A.ADL";
+        utils::ILogger::instance->info(std::format("opening file: {}", fn), utils::ILogger::eCategory::Application);
+        auto adlf = std::make_shared<files::westwood::ADLFile>(fn);
+        drv.setADLFile(adlf);
+        for (int i = 1; i < adlf->getNumTracks(); i++)
+        {
+            utils::ILogger::instance->info(std::format("playing track: {}", i), utils::ILogger::eCategory::Application);
+            for (int j = 0; j < 3; j++)
+            {
+                utils::ILogger::instance->info(std::format("times: {}", j), utils::ILogger::eCategory::Application);
+
+                drv.play(i);
+                while (drv.isPlaying())
+                {
+                    utils::delayMillis(200);
+                    SDL_Event e;
+                    while (SDL_PollEvent(&e))
+                        switch (e.type)
+                        {
+                        case SDL_QUIT:
+                            goto QUIT;
+                        case SDL_KEYDOWN:
+                            //case SDL_KEYUP:
+                            if (e.key.keysym.sym == SDLK_ESCAPE)
+                                goto QUIT;
+                            if (e.key.keysym.sym == SDLK_RETURN)
+                                drv.stop();
+                            break;
+
+                        default:
+                            std::cout << "event: " << e.type << std::endl;
+                        }
+                }
+            }
+            drv.stopAllChannels();
+            utils::delayMillis(1000);
+        }
+    }
+QUIT:
+    SDL_DestroyWindow(window);
+}
+
+void vocdune2filestest()
+{
+    auto mixer = audio::make_mixer<audio::sdl2::Mixer>(8, 44100, 1024);
+    mixer->init();
+
+    auto device = devices::make_device<devices::Adlib, devices::Opl>(mixer);
+    drivers::PCMDriver drv(mixer);
+
+    SDL_InitSubSystem(SDL_INIT_EVENTS);
+    SDL_InitSubSystem(SDL_INIT_VIDEO);
+
+    auto window = SDL_CreateWindow("a", 0, 0, 320, 200, 0);
+
+    for (auto const& dir_entry : std::filesystem::directory_iterator{ "voc/" })
+    {
+        const std::string fn = dir_entry.path().string();
+        utils::ILogger::instance->info(std::format("opening file: {}", fn), utils::ILogger::eCategory::Application);
+        auto vocf = std::make_shared<files::VOCFile>(fn);
+
+        for (int j = 0; j < 10; j++)
+        {
+            utils::ILogger::instance->info(std::format("times: {}", j), utils::ILogger::eCategory::Application);
+
+            drv.play(vocf->getSound());
+            while (drv.isPlaying())
+            {
+                //utils::delayMillis(200);
+                SDL_Event e;
+                while (SDL_PollEvent(&e))
+                    switch (e.type)
+                    {
+                    case SDL_QUIT:
+                        goto QUIT;
+                    case SDL_KEYDOWN:
+                        //case SDL_KEYUP:
+                        if (e.key.keysym.sym == SDLK_ESCAPE)
+                            goto QUIT;
+                        if (e.key.keysym.sym == SDLK_RETURN)
+                            drv.stop();
+                        break;
+
+                    default:
+                        std::cout << "event: " << e.type << std::endl;
+                    }
+            }
+        }
+        utils::delayMillis(1000);
+    }
+QUIT:
+    SDL_DestroyWindow(window);
+}
 
 int main(int argc, char* argv[])
 {
@@ -417,7 +476,8 @@
     //testMT32();
 
     //pcm_sound_append();
-    //adldune2filestest();
+    adldune2filestest();
+    //vocdune2filestest();
     //return 0;
     //sdlMixer();
     //SDL_Delay(100);

sdl2-hyper-sonic-drivers/src/HyperSonicDrivers/drivers/midi/IMidiChannelVoice.cpp

@@ -1,6 +1,6 @@
 #include <HyperSonicDrivers/drivers/midi/IMidiChannelVoice.hpp>
 #include <HyperSonicDrivers/drivers/midi/IMidiChannel.hpp>
-#include <cmath>
+#include <algorithm>
 
 namespace HyperSonicDrivers::drivers::midi
 {

sdl2-hyper-sonic-drivers/src/HyperSonicDrivers/files/westwood/ADLFile.cpp

@@ -111,6 +111,7 @@ namespace HyperSonicDrivers::files::westwood
 
         readDataFromFile_(m_meta_version.data_offset, m_meta_version.data_header_size);
 
+        // TODO: count_loop_ for version 3 is wrong to be 8 bit i think
         m_num_tracks = count_loop_<uint8_t>(0, m_header);
         m_num_track_offsets = count_loop_<uint16_t>(m_meta_version.offset_start, m_track_offsets);
         m_num_instrument_offsets = count_loop_<uint16_t>(m_meta_version.offset_start, m_instrument_offsets);
@@ -262,6 +263,8 @@ namespace HyperSonicDrivers::files::westwood
     void ADLFile::readHeaderFromFile_(const int header_size, std::function<uint16_t()> read)
     {
         m_header.resize(header_size);
+        // TODO: pass the byte size instead of a function read and read at once,
+        //       and do read in LE when is greter than 1, basically if version 3
         for (int i = 0; i < header_size; i++)
         {
             m_header[i] = read();

sdl2-hyper-sonic-drivers/src/HyperSonicDrivers/files/westwood/ADLFile.hpp

@@ -16,7 +16,8 @@ namespace HyperSonicDrivers::files::westwood
     public:
         enum class PROG_TYPE
         {
-            Track, Instrument
+            Track,
+            Instrument
         };
 
         typedef struct meta_version_t

sdl2-hyper-sonic-drivers/test/HyperSonicDrivers/files/westwood/TestADLFile.cpp

@@ -56,7 +56,7 @@ namespace HyperSonicDrivers::files::westwood
         ADLFileMock f("../fixtures/DUNE0.ADL");
 
         EXPECT_EQ(f.getVersion(), 2);
-        EXPECT_EQ(f.getNumTracks(), 18);
+        EXPECT_EQ(f.getNumTracks(), 200);
         EXPECT_EQ(f.getNumTrackOffsets(), 52);
         EXPECT_EQ(f.getNumInstrumentOffsets(), 63);
         EXPECT_EQ(f.parentSize(), 14473);