code rev

Author: Raffaello

sdl2-hyper-sonic-drivers/examples/adl-play.cpp

@@ -12,6 +12,7 @@
 #include <spdlog/spdlog.h>
 #include <fmt/color.h>
 
+
 #include <SDL2/SDL.h>
 
 #include <memory>
@@ -52,7 +53,7 @@ void adl_play(const OplEmulator emu, const OplType type, std::shared_ptr<audio::
 
     }
 
-    uint8_t track = 5; // starting from 2
+    uint8_t track = 0;
 
     ADLDriver adlDrv(device, audio::mixer::eChannelGroup::Music);
     adlDrv.setADLFile(adlFile);
@@ -67,13 +68,18 @@ void adl_play(const OplEmulator emu, const OplType type, std::shared_ptr<audio::
         if (!adlDrv.isPlaying())
         {
             adlDrv.play(track);
-            ILogger::instance->info(std::format("Playing track: {}/{}", static_cast<int>(track), adlFile->getNumTracks()), ILogger::eCategory::Application);
+            ILogger::instance->info(fmt::format("Playing track: {}/{}", static_cast<int>(track), adlFile->getNumTracks()), ILogger::eCategory::Application);
         }
         //delayMillis(1000);
         SDL_Event e;
-        while (SDL_PollEvent(&e))
+        while (SDL_WaitEventTimeout(&e, 100))
         {
-            if (e.type == SDL_KEYDOWN)
+            if (e.type == SDL_QUIT)
+            {
+                adlDrv.stopAllChannels();
+                return;
+            }
+            else if (e.type == SDL_KEYDOWN)
             {
                 switch (e.key.keysym.sym)
                 {
@@ -98,6 +104,8 @@ void adl_play(const OplEmulator emu, const OplType type, std::shared_ptr<audio::
                         track--;
                     else
                         track = adlFile->getNumTracks() - 1;
+
+                    break;
                 }
                 }
             }
@@ -108,10 +116,10 @@ void adl_play(const OplEmulator emu, const OplType type, std::shared_ptr<audio::
 
 int main(int argc, char* argv[])
 {
-    if (SDL_Init(SDL_INIT_VIDEO) != 0)
+    if (SDL_Init(SDL_INIT_VIDEO | SDL_INIT_EVENTS) != 0)
         return -1;
 
-    auto pWin = SDL_CreateWindow("", 0, 0, 100, 100, 0);
+    auto pWin = SDL_CreateWindow("for Keyboard Input...", 0, 0, 320, 200, 0);
     if (!pWin)
     {
         SDL_Quit();
@@ -123,6 +131,8 @@ int main(int argc, char* argv[])
     if (!mixer->init())
     {
         spdlog::error("can't init mixer");
+        SDL_DestroyWindow(pWin);
+        SDL_Quit();
         return 1;
     }
 

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

@@ -1,8 +1,10 @@
 // sdl2-hyper-sonic-drivers.cpp : Defines the entry point for the application.
-// TODO: delete this file and its target, this is kinda scratch pad
+// TODO: delete this file and its target, this is kind of scratch pad
 
 #include <iostream>
 #include <memory>
+#include <format>
+#include <filesystem>
 
 #include <SDL2/SDL.h>
 
@@ -131,7 +133,7 @@ int pcspkr(const int freq, const uint16_t audio, const int channels,const int ch
     
 
     // TODO try with channels.
-    Mix_Hook(pcSpeaker.callback, &pcSpeaker);
+    Mix_HookMusic(pcSpeaker.callback, &pcSpeaker);
     
     cout << "SQUARE" << endl;
     playNotes(&pcSpeaker, PCSpeaker::eWaveForm::SQUARE, 440, 300);
@@ -412,6 +414,8 @@ void adldune2filestest()
     }
 QUIT:
     SDL_DestroyWindow(window);
+    SDL_QuitSubSystem(SDL_INIT_VIDEO);
+    SDL_QuitSubSystem(SDL_INIT_EVENTS);
 }
 
 void vocdune2filestest()

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

@@ -111,15 +111,6 @@ namespace HyperSonicDrivers::files::westwood
 
         readDataFromFile_(m_meta_version.data_offset, m_meta_version.data_header_size);
 
-        // TODO: m_header is wrong for v3s
-        /*for (int i = m_meta_version.num_headers - 1; i >= 0; --i)
-        {
-            if (m_header[i] < m_meta_version.num_track_offsets)
-            {
-                m_num_tracks = i;
-                break;
-            }
-        }*/
         m_num_tracks = m_meta_version.num_headers;
         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);
@@ -140,19 +131,6 @@ namespace HyperSonicDrivers::files::westwood
     int ADLFile::getNumTracks() const noexcept
     {
         return m_num_tracks;
-
-        // find last subsong
-        //int numSubSongs = 0;
-        /*for (int i = m_meta_version.num_headers - 1; i >= 0; --i)
-        {
-            if (m_header[i] < m_meta_version.num_track_offsets)
-            {
-                numSubSongs = i;
-                break;
-            }
-        }*/
-
-        //return numSubSongs;
     }
 
     int ADLFile::getNumTrackOffsets() const noexcept
@@ -285,7 +263,7 @@ namespace HyperSonicDrivers::files::westwood
     {
         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
+        //       and do read in LE when is greater than 1, basically if version 3
         for (int i = 0; i < header_size; i++)
         {
             m_header[i] = read();
@@ -304,14 +282,14 @@ namespace HyperSonicDrivers::files::westwood
         assertValid_(vec.size() == num_offsets);
     }
 
-    void ADLFile::readDataFromFile_(const int data_offsets, const int data_heder_size)
+    void ADLFile::readDataFromFile_(const int data_offsets, const int data_header_size)
     {
         m_dataSize = size() - data_offsets;
         assertValid_(m_dataSize > 0);
         assertValid_(tell() == data_offsets);
         m_data.reset(new uint8_t[m_dataSize]);
         read(m_data.get(), m_dataSize);
-        m_dataHeaderSize = data_heder_size;
+        m_dataHeaderSize = data_header_size;
     }
 
     void ADLFile::adjust_offsets_(std::vector<uint16_t>& vec)