V0.9.8

1、修改了VideoPlayer的一些问题，可以编译通过使用

CMakeLists.txt

@@ -124,7 +124,7 @@ add_compile_definitions(SPDLOG_COMPILED_LIB)
 #给spdlog添加宏定义，使其支持%#等源文件相关的标志
 add_compile_definitions(SPDLOG_ACTIVE_LEVEL=SPDLOG_LEVEL_TRACE)
 #使用spdlog的静态库
-option(ENABLE_SPDLOG_STATIC_LIB "Enable spdlog static library" OFF)
+option(ENABLE_SPDLOG_STATIC_LIB "Enable spdlog static library" ON)
 
 
 #=========================================================
@@ -194,11 +194,11 @@ file(GLOB GLOBAL_SRC
 # add_subdirectory(${CMAKE_SOURCE_DIR}/demo/time)
 # add_subdirectory(${CMAKE_SOURCE_DIR}/demo/VideoPlayer)
 # add_subdirectory(${CMAKE_SOURCE_DIR}/demo/xlsx)
-add_subdirectory(${CMAKE_SOURCE_DIR}/demo/DesignerPattern)
+# add_subdirectory(${CMAKE_SOURCE_DIR}/demo/DesignerPattern)
 # add_subdirectory(${CMAKE_SOURCE_DIR}/demo/ViewModel)
-# add_subdirectory(${CMAKE_SOURCE_DIR}/demo/OpenGLWidgetLibrary)
+add_subdirectory(${CMAKE_SOURCE_DIR}/demo/OpenGLWidgetLibrary)
 # add_subdirectory(${CMAKE_SOURCE_DIR}/demo/VideoPlayerGL)
-# add_subdirectory(${CMAKE_SOURCE_DIR}/demo/OpenGLWidgetTest)
-# add_subdirectory(${CMAKE_SOURCE_DIR}/demo/VideoPlayerLibrary)
+add_subdirectory(${CMAKE_SOURCE_DIR}/demo/OpenGLWidgetTest)
+add_subdirectory(${CMAKE_SOURCE_DIR}/demo/VideoPlayerLibrary)
 # add_subdirectory(${CMAKE_SOURCE_DIR}/demo/RecordAudio)
 

External

@@ -1 +1 @@
-Subproject commit e2c30fbd4fb5fa893a776e74676d7d38f1b9a685
+Subproject commit 05f813609e9d5828554e0f29ed1dbb8070faec3a

demo/OpenGLWidgetLibrary/CMakeLists.txt

@@ -47,7 +47,7 @@ target_include_directories(${libName} PRIVATE
     
     # ${CURL_INCLUDE_DIR}
     # ${FFMPEG_INCLUDE_DIR}
-    ${spdlog_INCLUDE_DIR}
+    # ${spdlog_INCLUDE_DIR}
 )
 
 
@@ -60,8 +60,8 @@ target_link_libraries(${libName} PRIVATE
 target_link_libraries(${libName} PRIVATE
     # ${CURL_LIBRARY}
     ${FFMPEG_LIBRARY}
-    ${spdlog_LIBRARY}
-
+    # ${spdlog_LIBRARY}
+    External::spdlog
 )
 
 if(QT_VERSION_MAJOR EQUAL 5)

demo/OpenGLWidgetTest/CMakeLists.txt

@@ -16,7 +16,7 @@ file(GLOB LOCAL_SRC
 
     ${CMAKE_SOURCE_DIR}/External/module/Logs/*.cpp
     ${CMAKE_SOURCE_DIR}/External/module/ThreadPool/*.cpp
-    ${VideoPlayer_SOURCE_DIR}/*.cpp
+    ${VideoPlayer_SOURCES}
 )
 
 
@@ -46,7 +46,7 @@ target_include_directories(${this_exe} PRIVATE
     ${CMAKE_SOURCE_DIR}/External/module/ThreadPool
     ${CMAKE_SOURCE_DIR}/External/module/RingQueue
     
-    ${spdlog_INCLUDE_DIR}
+    # ${spdlog_INCLUDE_DIR}
     ${FFMPEG_INCLUDE_DIR}
     ${VideoPlayer_INCLUDE_DIR}
 )
@@ -62,7 +62,7 @@ target_link_libraries(${this_exe} PRIVATE
 
 target_link_libraries(${this_exe} PRIVATE
     ${FFMPEG_LIBRARY}
-    ${spdlog_LIBRARY}
+    External::spdlog
 
 )
 

demo/OpenGLWidgetTest/main.cpp

@@ -1,7 +1,7 @@
 #include "widget.h"
 
 #include <QApplication>
-#include "Logs/loginit.h"
+#include "loginit.h"
 #include "spdlog/spdlog.h"
 #include <QDebug>
 #include <qwidget.h>

demo/VideoPlayerLibrary/CMakeLists.txt

@@ -46,7 +46,7 @@ target_include_directories(${libName} PRIVATE
     # ${CMAKE_SOURCE_DIR}/External/module/ThreadPool
     ${CMAKE_SOURCE_DIR}/External/module/RingQueue
     
-    ${spdlog_INCLUDE_DIR}
+    # ${spdlog_INCLUDE_DIR}
     ${FFMPEG_INCLUDE_DIR}
     ${OpenGLWidget_INCLUDE_DIR}
 )
@@ -63,7 +63,8 @@ target_link_libraries(${libName} PRIVATE
 target_link_libraries(${libName} PRIVATE
     # ${CURL_LIBRARY}
     ${FFMPEG_LIBRARY}
-    ${spdlog_LIBRARY}
+    # ${spdlog_LIBRARY}
+    External::spdlog
 
 )