cafe: logging cleanup

Author: TurtleP

platform/cafe/include/modules/joystick/kpad/Joystick.hpp

@@ -21,7 +21,7 @@ namespace love
 
             ~Joystick();
 
-            virtual void update();
+            virtual void update() override;
 
             virtual bool open(int64_t deviceId) override;
 

platform/cafe/source/driver/audio/DigitalSound.cpp

@@ -32,27 +32,14 @@ namespace love
         };
         // clang-format on
 
-        OSEvent s_Event;
         volatile bool s_Init = false;
 
-        static void audioCallback()
-        {
-            if (!s_Init)
-                return;
-
-            OSSignalEvent(&s_Event);
-        }
-
         // # region Device
 
         bool Device::open()
         {
             AXInitWithParams(&AX_INIT_PARAMS);
             s_Init = AXIsInit();
-
-            // OSInitEvent(&s_Event, false, OS_EVENT_MODE_AUTO);
-            // AXRegisterAppFrameCallback(audioCallback);
-
             return s_Init;
         }
 
@@ -122,7 +109,7 @@ namespace love
 
             void update()
             {
-                if (this->currentBuffer && !this->currentBuffer->isFinished())
+                if (!this->currentBuffer)
                     return;
 
                 if (this->buffers.empty())
@@ -148,10 +135,10 @@ namespace love
 
             void addBuffer(Buffer* buffer)
             {
-                this->buffers.push(buffer);
-
                 buffer->setSampleRate(this->samplerate);
                 buffer->setVolume(this->volume);
+
+                this->buffers.push(buffer);
             }
 
             bool isPaused() const
@@ -192,9 +179,6 @@ namespace love
 
         void Device::update()
         {
-            if (!s_Init)
-                return;
-
             for (auto& channel : s_Channels)
                 channel.update();
 
@@ -206,7 +190,6 @@ namespace love
             if (!s_Init)
                 return;
 
-            // AXDeregisterAppFrameCallback(audioCallback);
             s_Init = false;
             AXQuit();
         }
@@ -263,6 +246,8 @@ namespace love
             for (int channel = 0; channel < channels; channel++)
             {
                 this->buffer.voices[channel] = AXAcquireVoice(0x1F, nullptr, nullptr);
+                if (!this->buffer.voices[channel])
+                    throw love::Exception("Failed to acquire AXVoice!");
 
                 UniqueVoiceScope scope(this->buffer.voices[channel]);
                 AXSetVoiceType(this->buffer.voices[channel], AX_VOICE_TYPE_UNKNOWN);
@@ -290,7 +275,7 @@ namespace love
             AXGetVoiceOffsets(this->buffer.voices[0], &offsets);
             const auto running = AXIsVoiceRunning(this->buffer.voices[0]);
 
-            return offsets.currentOffset == offsets.endOffset || (!running && offsets.currentOffset == 0);
+            return (offsets.currentOffset == offsets.endOffset) || (!running && offsets.currentOffset == 0);
         }
 
         void Buffer::prepare(const void* data, size_t size, int samples, bool own)

source/modules/joystick/JoystickModule.cpp

@@ -12,13 +12,11 @@ namespace love
     void extensionCallback(WPADChan channel, WPADExtensionType extension)
     {
         auto* instance = Module::getInstance<JoystickModule>(Module::M_JOYSTICK);
-        LOG("ExtensionCallback: channel=%d, extension=%d", channel, extension);
         instance->addJoystick(channel + 1);
     }
 
     void connectCallback(WPADChan channel, WPADError error)
     {
-        LOG("ConnectCallback: channel=%d, error=%d", channel, error);
         EventQueue::getInstance().sendJoystickStatus(false, channel + 1);
     }
 #endif
@@ -102,8 +100,6 @@ namespace love
                 break;
             }
         }
-        LOG("addJoystick: deviceId=%lld, guid=%s, reused=%d", deviceId, guid.c_str(), reused);
-        LOG("addJoystick: %p", joystick);
         if (!joystick)
         {
             joystick = love::joystick::openJoystick(this->joysticks.size());
@@ -114,7 +110,7 @@ namespace love
 
         if (!joystick->open(deviceId))
             return nullptr;
-        LOG("addJoystick: open success, handle=%p", (void*)joystick->getHandle());
+
         for (auto* activeStick : this->activeSticks)
         {
             if (joystick->getHandle() == activeStick->getHandle())
@@ -125,14 +121,13 @@ namespace love
                     this->joysticks.remove(joystick);
                     joystick->release();
                 }
-                LOG("addJoystick: handle conflict, returning active stick");
                 return activeStick;
             }
         }
 
         if (joystick->isGamepad())
             this->recentGamepadGUIDs[joystick->getGUID()] = true;
-        LOG("addJoystick: new joystick, handle=%p", (void*)joystick->getHandle());
+
         this->activeSticks.push_back(joystick);
         return joystick;
     }