-
Notifications
You must be signed in to change notification settings - Fork 4
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
[功能更新与优化] 统一跨平台播放器控件实现,并新增基于 Qt 的 QPlayer 示例。
- 更新了`.github/actions/install-dependencies/action.yml`文件,将Qt版本从`6.8.0`升级到`6.8.1`。 - 在`CMakeLists.txt`中添加了`include(cmake/build_info.cmake)`,以便构建时包含构建信息。 - 更新了`README.en.md`和`README.md`文件,修改了字幕处理函数的名称,并添加了QPlayer的参考链接。 - 修改了`cmake/qt.cmake`文件,更新了Qt的安装路径,以匹配新版本的Qt。 - 添加了新目录`examples/qplayer`,用于构建基于Qt的媒体播放器示例。 - 在`examples/CMakeLists.txt`中添加了对`qplayer`目录的支持。 - 在`examples/ffmpegplayer`和`examples/ffmpegtranscoder`目录中,更新了CMakeLists.txt文件,添加了对`commonstr.hpp`的引用,并更新了Qt模块的引用。 - 在`examples/mpvplayer`目录中,更新了CMakeLists.txt和相关源文件,以使用新的Qt模块引用。 - 在`src/3rdparty/`、`src/dump/`、`src/ffmpeg/`、`src/mediaconfig/`、`src/mpv/`、`src/utils/`目录中,更新了CMakeLists.txt文件,将Qt6的模块引用更新为Qt的模块引用。 - 更新了`scripts/windows/setVsDev.ps1`脚本,以支持不同架构的Visual Studio开发环境设置。 - 更新了`vcpkg.json`文件,调整了FFmpeg的特征配置。
- Loading branch information
Showing
45 changed files
with
1,172 additions
and
307 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,7 +1,9 @@ | ||
if(CMAKE_HOST_WIN32) | ||
list(APPEND CMAKE_PREFIX_PATH "C:\\Qt\\6.8.0\\msvc2022_64") | ||
list(APPEND CMAKE_PREFIX_PATH "C:\\Qt\\6.8.1\\msvc2022_64") | ||
elseif(CMAKE_HOST_APPLE) | ||
|
||
elseif(CMAKE_HOST_LINUX) | ||
list(APPEND CMAKE_PREFIX_PATH "/opt/Qt/6.8.0/gcc_64") | ||
list(APPEND CMAKE_PREFIX_PATH "/opt/Qt/6.8.1/gcc_64") | ||
endif() | ||
|
||
add_definitions(-DQT_DEPRECATED_WARNINGS) |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,12 @@ | ||
#pragma once | ||
|
||
#include <QCoreApplication> | ||
|
||
namespace Common { | ||
|
||
struct Tr | ||
{ | ||
Q_DECLARE_TR_FUNCTIONS(Common) | ||
}; | ||
|
||
} // namespace Common |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.