Commit b537102
committed
[功能更新与优化] 统一跨平台播放器控件实现,并新增基于 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的特征配置。1 parent 14df42c commit b537102
File tree
45 files changed
+1172
-307
lines changed- .github/actions/install-dependencies
- cmake
- examples
- common
- ffmpegplayer
- ffmpegtranscoder
- mpvplayer
- qplayer
- scripts/windows
- src
- 3rdparty
- qtlockedfile
- qtsingleapplication
- dump
- ffmpeg
- audiorender
- mediaconfig
- mpv
- utils
- tests/subtitle_unittest
Some content is hidden
Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.
45 files changed
+1172
-307
lines changed| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
23 | 23 | | |
24 | 24 | | |
25 | 25 | | |
26 | | - | |
| 26 | + | |
27 | 27 | | |
28 | 28 | | |
29 | 29 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
111 | 111 | | |
112 | 112 | | |
113 | 113 | | |
| 114 | + | |
| 115 | + | |
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
110 | 110 | | |
111 | 111 | | |
112 | 112 | | |
113 | | - | |
114 | | - | |
115 | | - | |
116 | | - | |
117 | | - | |
118 | 113 | | |
119 | 114 | | |
120 | 115 | | |
| |||
125 | 120 | | |
126 | 121 | | |
127 | 122 | | |
| 123 | + | |
| 124 | + | |
| 125 | + | |
| 126 | + | |
128 | 127 | | |
129 | 128 | | |
130 | 129 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
1 | 1 | | |
2 | | - | |
| 2 | + | |
3 | 3 | | |
4 | 4 | | |
5 | 5 | | |
6 | | - | |
| 6 | + | |
7 | 7 | | |
| 8 | + | |
| 9 | + | |
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
1 | 1 | | |
2 | 2 | | |
| 3 | + | |
3 | 4 | | |
4 | 5 | | |
5 | 6 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
| 1 | + | |
| 2 | + | |
| 3 | + | |
| 4 | + | |
| 5 | + | |
| 6 | + | |
| 7 | + | |
| 8 | + | |
| 9 | + | |
| 10 | + | |
| 11 | + | |
| 12 | + | |
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
131 | 131 | | |
132 | 132 | | |
133 | 133 | | |
134 | | - | |
135 | | - | |
136 | | - | |
137 | 134 | | |
138 | 135 | | |
139 | 136 | | |
| |||
213 | 210 | | |
214 | 211 | | |
215 | 212 | | |
216 | | - | |
| 213 | + | |
217 | 214 | | |
218 | 215 | | |
219 | 216 | | |
| |||
222 | 219 | | |
223 | 220 | | |
224 | 221 | | |
225 | | - | |
| 222 | + | |
226 | 223 | | |
227 | 224 | | |
228 | 225 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
1 | 1 | | |
2 | 2 | | |
3 | 3 | | |
4 | | - | |
| 4 | + | |
5 | 5 | | |
6 | | - | |
| 6 | + | |
7 | 7 | | |
8 | 8 | | |
9 | 9 | | |
| |||
21 | 21 | | |
22 | 22 | | |
23 | 23 | | |
24 | | - | |
| 24 | + | |
25 | 25 | | |
26 | | - | |
| 26 | + | |
27 | 27 | | |
28 | 28 | | |
29 | 29 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
25 | 25 | | |
26 | 26 | | |
27 | 27 | | |
28 | | - | |
29 | | - | |
30 | 28 | | |
31 | 29 | | |
32 | 30 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
3 | 3 | | |
4 | 4 | | |
5 | 5 | | |
6 | | - | |
| 6 | + | |
| 7 | + | |
7 | 8 | | |
8 | 9 | | |
9 | 10 | | |
| |||
0 commit comments