Project restructuring (fixes macOS builds) (#198)

- Create `Include/` folder for all main projects - Fix some issues here and there (found while moving things) - All includes are now in `Tactility/` subfolder and must be included with that prefix. This fixes issues with clashing POSIX headers (e.g. `<semaphore.h>` versus Tactility's `Semaphore.h`)
2025-02-01 18:13:20 +01:00
parent 7856827ecf
commit c87200a80d
350 changed files with 967 additions and 870 deletions
@@ -1,12 +1,13 @@
-#include "TactilityConfig.h"
+#include <Tactility/TactilityConfig.h>

 #if TT_FEATURE_SCREENSHOT_ENABLED

-#include "Screenshot.h"
-#include <memory>
+#include "Tactility/service/screenshot/Screenshot.h"

-#include "service/ServiceContext.h"
-#include "service/ServiceRegistry.h"
+#include <Tactility/service/ServiceContext.h>
+#include <Tactility/service/ServiceRegistry.h>
+
+#include <memory>

 namespace tt::service::screenshot {

@@ -1,55 +0,0 @@
-#pragma once
-
-#include "TactilityConfig.h"
-
-#if TT_FEATURE_SCREENSHOT_ENABLED
-
-#include "Mutex.h"
-#include "ScreenshotTask.h"
-#include "service/Service.h"
-#include <cstdint>
-
-namespace tt::service::screenshot {
-
-enum class Mode {
-    None,
-    Timed,
-    Apps
-};
-
-class ScreenshotService final : public Service {
-
-private:
-
-    Mutex mutex;
-    std::unique_ptr<ScreenshotTask> task;
-    Mode mode = Mode::None;
-
-public:
-
-    bool isTaskStarted();
-
-    /** The state of the service. */
-    Mode getMode() const;
-
-    /** @brief Start taking screenshot whenever an app is started
-     * @param[in] path the path to store the screenshots at
-     */
-    void startApps(const std::string& path);
-
-    /** @brief Start taking screenshots after a certain delay
-     * @param[in] path the path to store the screenshots at
-     * @param[in] delayInSeconds the delay before starting (and between successive screenshots)
-     * @param[in] amount 0 = indefinite, >0 for a specific
-     */
-    void startTimed(const std::string& path, uint8_t delayInSeconds, uint8_t amount);
-
-    /** @brief Stop taking screenshots */
-    void stop();
-};
-
-std::shared_ptr<ScreenshotService> _Nullable optScreenshotService();
-
-} // namespace
-
-#endif
@@ -1,14 +1,16 @@
-#include "TactilityConfig.h"
+#include "Tactility/TactilityConfig.h"

 #if TT_FEATURE_SCREENSHOT_ENABLED

-#include "ScreenshotTask.h"
-#include "lv_screenshot.h"
-#include <format>
+#include "Tactility/service/screenshot/ScreenshotTask.h"

-#include "TactilityCore.h"
-#include "service/loader/Loader.h"
-#include "lvgl/LvglSync.h"
+#include "Tactility/service/loader/Loader.h"
+#include "Tactility/lvgl/LvglSync.h"
+
+#include <lv_screenshot.h>
+#include <Tactility/TactilityCore.h>
+
+#include <format>

 namespace tt::service::screenshot {

@@ -1,63 +0,0 @@
-#include "TactilityConfig.h"
-
-#if TT_FEATURE_SCREENSHOT_ENABLED
-
-#pragma once
-
-#include <cstdint>
-#include <Thread.h>
-#include <Mutex.h>
-
-namespace tt::service::screenshot {
-
-#define TASK_WORK_TYPE_DELAY 1
-#define TASK_WORK_TYPE_APPS 2
-
-class ScreenshotTask {
-
-    struct ScreenshotTaskWork {
-        int type = TASK_WORK_TYPE_DELAY ;
-        uint8_t delay_in_seconds = 0;
-        uint8_t amount = 0;
-        std::string path;
-    };
-
-    Thread* thread = nullptr;
-    Mutex mutex = Mutex(Mutex::Type::Recursive);
-    bool interrupted = false;
-    bool finished = false;
-    ScreenshotTaskWork work;
-
-public:
-    ScreenshotTask() = default;
-    ~ScreenshotTask();
-
-    /** @brief Start taking screenshots after a certain delay
-     * @param[in] path the path to store the screenshots at
-     * @param[in] delayInSeconds the delay before starting (and between successive screenshots)
-     * @param[in] amount 0 = indefinite, >0 for a specific
-     */
-    void startTimed(const std::string& path, uint8_t delayInSeconds, uint8_t amount);
-
-    /** @brief Start taking screenshot whenever an app is started
-     * @param[in] path the path to store the screenshots at
-     */
-    void startApps(const std::string& path);
-
-    /** @brief Stop taking screenshots */
-    void stop();
-
-    void taskMain();
-
-    bool isFinished();
-
-private:
-
-    bool isInterrupted();
-    void setFinished();
-    void taskStart();
-};
-
-}
-
-#endif