From bc54e18e4898b41562da5d9cab4beffa2ffa8191 Mon Sep 17 00:00:00 2001 From: Adam Honse Date: Sun, 16 Aug 2026 18:41:23 -0500 Subject: [PATCH] Clean up Creative Sound Blaster controllers --- .../CreativeSoundBlasterAE5ControllerBase.h | 0 ...oundBlasterAE5ControllerDetect_Windows.cpp | 3 --- ...ativeSoundBlasterAE5Controller_Windows.cpp | 0 ...reativeSoundBlasterAE5Controller_Windows.h | 0 ...roller_CreativeSoundBlasterAE5_Windows.cpp | 0 ...ntroller_CreativeSoundBlasterAE5_Windows.h | 0 .../CreativeSoundBlasterXG6Controller.cpp | 0 .../CreativeSoundBlasterXG6Controller.h | 0 ...eativeSoundBlasterXG6ControllerDetect.cpp} | 20 +++++++++---------- .../RGBController_CreativeSoundBlasterXG6.cpp | 0 .../RGBController_CreativeSoundBlasterXG6.h | 0 11 files changed, 10 insertions(+), 13 deletions(-) rename Controllers/CreativeController/{ => CreativeSoundBlasterAE5Controller}/CreativeSoundBlasterAE5ControllerBase.h (100%) rename Controllers/CreativeController/{ => CreativeSoundBlasterAE5Controller}/CreativeSoundBlasterAE5ControllerDetect_Windows.cpp (87%) rename Controllers/CreativeController/{ => CreativeSoundBlasterAE5Controller}/CreativeSoundBlasterAE5Controller_Windows.cpp (100%) rename Controllers/CreativeController/{ => CreativeSoundBlasterAE5Controller}/CreativeSoundBlasterAE5Controller_Windows.h (100%) rename Controllers/CreativeController/{ => CreativeSoundBlasterAE5Controller}/RGBController_CreativeSoundBlasterAE5_Windows.cpp (100%) rename Controllers/CreativeController/{ => CreativeSoundBlasterAE5Controller}/RGBController_CreativeSoundBlasterAE5_Windows.h (100%) rename Controllers/CreativeController/{ => CreativeSoundBlasterXG6Controller}/CreativeSoundBlasterXG6Controller.cpp (100%) rename Controllers/CreativeController/{ => CreativeSoundBlasterXG6Controller}/CreativeSoundBlasterXG6Controller.h (100%) rename Controllers/CreativeController/{CreativeControllerDetect.cpp => CreativeSoundBlasterXG6Controller/CreativeSoundBlasterXG6ControllerDetect.cpp} (56%) rename Controllers/CreativeController/{ => CreativeSoundBlasterXG6Controller}/RGBController_CreativeSoundBlasterXG6.cpp (100%) rename Controllers/CreativeController/{ => CreativeSoundBlasterXG6Controller}/RGBController_CreativeSoundBlasterXG6.h (100%) diff --git a/Controllers/CreativeController/CreativeSoundBlasterAE5ControllerBase.h b/Controllers/CreativeController/CreativeSoundBlasterAE5Controller/CreativeSoundBlasterAE5ControllerBase.h similarity index 100% rename from Controllers/CreativeController/CreativeSoundBlasterAE5ControllerBase.h rename to Controllers/CreativeController/CreativeSoundBlasterAE5Controller/CreativeSoundBlasterAE5ControllerBase.h diff --git a/Controllers/CreativeController/CreativeSoundBlasterAE5ControllerDetect_Windows.cpp b/Controllers/CreativeController/CreativeSoundBlasterAE5Controller/CreativeSoundBlasterAE5ControllerDetect_Windows.cpp similarity index 87% rename from Controllers/CreativeController/CreativeSoundBlasterAE5ControllerDetect_Windows.cpp rename to Controllers/CreativeController/CreativeSoundBlasterAE5Controller/CreativeSoundBlasterAE5ControllerDetect_Windows.cpp index 2bc67e8cd..e8a0e5e3d 100644 --- a/Controllers/CreativeController/CreativeSoundBlasterAE5ControllerDetect_Windows.cpp +++ b/Controllers/CreativeController/CreativeSoundBlasterAE5Controller/CreativeSoundBlasterAE5ControllerDetect_Windows.cpp @@ -16,13 +16,10 @@ DetectedControllers DetectCreativeAE5Device() { DetectedControllers detected_controllers; - LOG_INFO("[Creative SoundBlaster AE-5] Windows detection function called"); - CreativeSoundBlasterAE5Controller_Windows* controller = new CreativeSoundBlasterAE5Controller_Windows(); if(controller->Initialize()) { - LOG_INFO("[Creative SoundBlaster AE-5] Device initialized successfully, registering controller"); RGBController_CreativeSoundBlasterAE5* rgb_controller = new RGBController_CreativeSoundBlasterAE5(controller); detected_controllers.push_back(rgb_controller); diff --git a/Controllers/CreativeController/CreativeSoundBlasterAE5Controller_Windows.cpp b/Controllers/CreativeController/CreativeSoundBlasterAE5Controller/CreativeSoundBlasterAE5Controller_Windows.cpp similarity index 100% rename from Controllers/CreativeController/CreativeSoundBlasterAE5Controller_Windows.cpp rename to Controllers/CreativeController/CreativeSoundBlasterAE5Controller/CreativeSoundBlasterAE5Controller_Windows.cpp diff --git a/Controllers/CreativeController/CreativeSoundBlasterAE5Controller_Windows.h b/Controllers/CreativeController/CreativeSoundBlasterAE5Controller/CreativeSoundBlasterAE5Controller_Windows.h similarity index 100% rename from Controllers/CreativeController/CreativeSoundBlasterAE5Controller_Windows.h rename to Controllers/CreativeController/CreativeSoundBlasterAE5Controller/CreativeSoundBlasterAE5Controller_Windows.h diff --git a/Controllers/CreativeController/RGBController_CreativeSoundBlasterAE5_Windows.cpp b/Controllers/CreativeController/CreativeSoundBlasterAE5Controller/RGBController_CreativeSoundBlasterAE5_Windows.cpp similarity index 100% rename from Controllers/CreativeController/RGBController_CreativeSoundBlasterAE5_Windows.cpp rename to Controllers/CreativeController/CreativeSoundBlasterAE5Controller/RGBController_CreativeSoundBlasterAE5_Windows.cpp diff --git a/Controllers/CreativeController/RGBController_CreativeSoundBlasterAE5_Windows.h b/Controllers/CreativeController/CreativeSoundBlasterAE5Controller/RGBController_CreativeSoundBlasterAE5_Windows.h similarity index 100% rename from Controllers/CreativeController/RGBController_CreativeSoundBlasterAE5_Windows.h rename to Controllers/CreativeController/CreativeSoundBlasterAE5Controller/RGBController_CreativeSoundBlasterAE5_Windows.h diff --git a/Controllers/CreativeController/CreativeSoundBlasterXG6Controller.cpp b/Controllers/CreativeController/CreativeSoundBlasterXG6Controller/CreativeSoundBlasterXG6Controller.cpp similarity index 100% rename from Controllers/CreativeController/CreativeSoundBlasterXG6Controller.cpp rename to Controllers/CreativeController/CreativeSoundBlasterXG6Controller/CreativeSoundBlasterXG6Controller.cpp diff --git a/Controllers/CreativeController/CreativeSoundBlasterXG6Controller.h b/Controllers/CreativeController/CreativeSoundBlasterXG6Controller/CreativeSoundBlasterXG6Controller.h similarity index 100% rename from Controllers/CreativeController/CreativeSoundBlasterXG6Controller.h rename to Controllers/CreativeController/CreativeSoundBlasterXG6Controller/CreativeSoundBlasterXG6Controller.h diff --git a/Controllers/CreativeController/CreativeControllerDetect.cpp b/Controllers/CreativeController/CreativeSoundBlasterXG6Controller/CreativeSoundBlasterXG6ControllerDetect.cpp similarity index 56% rename from Controllers/CreativeController/CreativeControllerDetect.cpp rename to Controllers/CreativeController/CreativeSoundBlasterXG6Controller/CreativeSoundBlasterXG6ControllerDetect.cpp index 550c1060e..9a019f3f2 100644 --- a/Controllers/CreativeController/CreativeControllerDetect.cpp +++ b/Controllers/CreativeController/CreativeSoundBlasterXG6Controller/CreativeSoundBlasterXG6ControllerDetect.cpp @@ -1,7 +1,7 @@ /*---------------------------------------------------------*\ -| CreativeControllerDetect.cpp | +| CreativeSoundBlasterXG6ControllerDetect.cpp | | | -| Detector for Creative devices | +| Detector for Creative Sound Blaster XG6 devices | | | | This file is part of the OpenRGB project | | SPDX-License-Identifier: GPL-2.0-or-later | @@ -15,14 +15,14 @@ /*---------------------------------------------------------*\ | Creative vendor ID | \*---------------------------------------------------------*/ -#define CREATIVE_VID 0x041E +#define CREATIVE_VID 0x041E /*---------------------------------------------------------*\ -| SoundCards | +| Creative Sound Blaster XG6 product ID | \*---------------------------------------------------------*/ -#define CREATIVE_SOUNDBLASTERX_G6_PID 0x3256 +#define CREATIVE_SOUNDBLASTERX_G6_PID 0x3256 -DetectedControllers DetectCreativeDevice(hid_device_info* info, const std::string& name) +DetectedControllers DetectCreativeSoundBlasterXG6Device(hid_device_info* info, const std::string& name) { DetectedControllers detected_controllers; hid_device* dev; @@ -40,7 +40,7 @@ DetectedControllers DetectCreativeDevice(hid_device_info* info, const std::strin return(detected_controllers); } -/*-------------------------------------------------------------------------------------------------------------------------------------------------*\ -| Sound Cards | -\*-------------------------------------------------------------------------------------------------------------------------------------------------*/ -REGISTER_HID_DETECTOR_I("Creative SoundBlasterX G6", DetectCreativeDevice, CREATIVE_VID, CREATIVE_SOUNDBLASTERX_G6_PID, 4); +/*---------------------------------------------------------*\ +| Sound Cards | +\*---------------------------------------------------------*/ +REGISTER_HID_DETECTOR_I("Creative SoundBlasterX G6", DetectCreativeSoundBlasterXG6Device, CREATIVE_VID, CREATIVE_SOUNDBLASTERX_G6_PID, 4); diff --git a/Controllers/CreativeController/RGBController_CreativeSoundBlasterXG6.cpp b/Controllers/CreativeController/CreativeSoundBlasterXG6Controller/RGBController_CreativeSoundBlasterXG6.cpp similarity index 100% rename from Controllers/CreativeController/RGBController_CreativeSoundBlasterXG6.cpp rename to Controllers/CreativeController/CreativeSoundBlasterXG6Controller/RGBController_CreativeSoundBlasterXG6.cpp diff --git a/Controllers/CreativeController/RGBController_CreativeSoundBlasterXG6.h b/Controllers/CreativeController/CreativeSoundBlasterXG6Controller/RGBController_CreativeSoundBlasterXG6.h similarity index 100% rename from Controllers/CreativeController/RGBController_CreativeSoundBlasterXG6.h rename to Controllers/CreativeController/CreativeSoundBlasterXG6Controller/RGBController_CreativeSoundBlasterXG6.h