change directory

Author: litongmacos

CMakeLists.txt

@@ -38,22 +38,22 @@ elseif (${CMAKE_SYSTEM_NAME} MATCHES "Windows")
 endif ()
 
 
-add_executable(sdl_version sdl_version.cpp)
+add_executable(sdl_version examples/sdl_version.cpp)
 target_link_libraries(sdl_version ${SDL2_LIBRARIES})
 
-add_executable(simplest simplest.cpp common.cpp)
+add_executable(simplest examples/simplest.cpp common/common.cpp)
 target_link_libraries(simplest whisper)
 
-add_executable(stream_local stream_local.cpp common.cpp common-sdl.cpp
-        stream_components_service.cpp stream_components_audio.cpp
-        stream_components_output.cpp
+add_executable(stream_local examples/stream_local.cpp common/common.cpp common/common-sdl.cpp
+        stream/stream_components_service.cpp stream/stream_components_audio.cpp
+        stream/stream_components_output.cpp
 )
 target_link_libraries(stream_local whisper ${SDL2_LIBRARIES})
 
-add_executable(whisper_http_server_base_httplib whisper_http_server_base_httplib.cpp common.cpp httplib.h nlohmann/json.hpp inference_handler.cpp whisper_params.cpp)
+add_executable(whisper_http_server_base_httplib whisper_http_server_base_httplib.cpp common/common.cpp httplib/httplib.h nlohmann/json.hpp handler/inference_handler.cpp params/whisper_params.cpp)
 target_link_libraries(whisper_http_server_base_httplib whisper)
 
-add_executable(whisper_server_base_on_uwebsockets whisper_server_base_on_uwebsockets.cpp stream_components_service.cpp)
+add_executable(whisper_server_base_on_uwebsockets whisper_server_base_on_uwebsockets.cpp stream/stream_components_service.cpp)
 #添加头文件
 target_include_directories(whisper_server_base_on_uwebsockets PRIVATE ${UWEBSOCKETS_INCLUDE_DIRS})
 # 链接 uWebSockets、zlib、libuv 和 uSockets 库

common-ggml.cpp renamed to common/common-ggml.cpp

@@ -1,7 +1,7 @@
 #pragma once
 
-#include <SDL.h>
-#include <SDL_audio.h>
+#include "SDL2/SDL.h"
+#include "SDL2/SDL_audio.h"
 
 #include <atomic>
 #include <cstdint>

common-ggml.h renamed to common/common-ggml.h

@@ -6,7 +6,7 @@
 // use your favorite implementations
 #define DR_WAV_IMPLEMENTATION
 
-#include "dr_wav.h"
+#include "../dr_libs/dr_wav.h"
 
 #include <cmath>
 #include <cstring>

common-sdl.cpp renamed to common/common-sdl.cpp

@@ -5,15 +5,15 @@ int main(int argc, char *argv[]) {
   SDL_version compiled;
   SDL_version linked;
 
-  SDL_VERSION(&compiled); // 获取编译时的SDL版本
-  SDL_GetVersion(&linked); // 获取链接时的SDL版本
+  SDL_VERSION(&compiled); // get compiled SDL version
+  SDL_GetVersion(&linked); // get linked SDL version
 
   std::cout << "We compiled against SDL version "
             << static_cast<int>(compiled.major) << "."
             << static_cast<int>(compiled.minor) << "."
             << static_cast<int>(compiled.patch) << std::endl;
 
-  std::cout << "But we are linking against SDL version "
+  std::cout << "We are linking against SDL version "
             << static_cast<int>(linked.major) << "."
             << static_cast<int>(linked.minor) << "."
             << static_cast<int>(linked.patch) << std::endl;

common-sdl.h renamed to common/common-sdl.h

@@ -1,4 +1,4 @@
-#include "common.h"
+#include "../common/common.h"
 
 #include "whisper.h"