mirrors/QtScrcpy
0
0
Fork 0
mirror of https://github.com/barry-ran/QtScrcpy.git synced 2025-09-28 20:29:12 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'barry-ran:dev' into dev

Browse source
This commit is contained in:
Re*Index. (ot_inc) 2025-07-23 16:21:38 +09:00 • committed by GitHub
commit c32dd7a553
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
6 changed files with 13 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

8
.github/workflows/windows.yml vendored
View file

@ -16,10 +16,10 @@ on:
jobs: jobs:
build: build:
name: Build name: Build
# windows-latest目前是windows server 2019 # windows-latest目前是windows server 2022
# windows server 2019安装的是vs2019，windows server 2016安装的是vs2017 # windows server 2019安装的是vs2019，windows server 2016安装的是vs2017
# https://help.github.com/en/actions/reference/workflow-syntax-for-github-actions#jobsjob_idruns-on # https://help.github.com/en/actions/reference/workflow-syntax-for-github-actions#jobsjob_idruns-on
runs-on: windows-2019 runs-on: windows-latest
# 矩阵配置 https://help.github.com/en/actions/reference/workflow-syntax-for-github-actions#jobsjob_idstrategymatrix # 矩阵配置 https://help.github.com/en/actions/reference/workflow-syntax-for-github-actions#jobsjob_idstrategymatrix
strategy: strategy:
@ -39,8 +39,8 @@ jobs:
# 使用表达式语法${{}}访问上下文 https://help.github.com/en/actions/reference/context-and-expression-syntax-for-github-actions # 使用表达式语法${{}}访问上下文 https://help.github.com/en/actions/reference/context-and-expression-syntax-for-github-actions
env: env:
target-name: QtScrcpy target-name: QtScrcpy
vcvarsall-path: 'C:\Program Files (x86)\Microsoft Visual Studio\2019\Enterprise\VC\Auxiliary\Build\vcvarsall.bat' vcvarsall-path: 'C:\Program Files (x86)\Microsoft Visual Studio\2022\Enterprise\VC\Auxiliary\Build\vcvarsall.bat'
vcinstall-path: 'C:\Program Files (x86)\Microsoft Visual Studio\2019\Enterprise\VC' vcinstall-path: 'C:\Program Files (x86)\Microsoft Visual Studio\2022\Enterprise\VC'
qt-install-path: ${{ github.workspace }}/${{ matrix.qt-ver }} qt-install-path: ${{ github.workspace }}/${{ matrix.qt-ver }}
plantform-des: win plantform-des: win
# 步骤 # 步骤

2
QtScrcpy/QtScrcpyCore

@ -1 +1 @@
Subproject commit b118082a176c051b327622a5fd11dabd731a2a2b Subproject commit fd3cfa521b3e9c407f7afe9117089b51e5e07dd8

8
QtScrcpy/audio/audiooutput.cpp
View file

@ -1,8 +1,9 @@
#include <QTcpSocket>
#include <QHostAddress>
#include <QAudioOutput> #include <QAudioOutput>
#include <QTime> #include <QCoreApplication>
#include <QElapsedTimer> #include <QElapsedTimer>
#include <QHostAddress>
#include <QTcpSocket>
#include <QTime>
#if (QT_VERSION >= QT_VERSION_CHECK(6, 0, 0)) #if (QT_VERSION >= QT_VERSION_CHECK(6, 0, 0))
#include <QAudioSink> #include <QAudioSink>
@ -85,6 +86,7 @@ bool AudioOutput::runSndcpyProcess(const QString &serial, int port, bool wait)
m_sndcpy.start("sndcpy.bat", params); m_sndcpy.start("sndcpy.bat", params);
#else #else
QStringList params{"sndcpy.sh", serial, QString::number(port)}; QStringList params{"sndcpy.sh", serial, QString::number(port)};
m_sndcpy.setWorkingDirectory(QCoreApplication::applicationDirPath());
m_sndcpy.start("bash", params); m_sndcpy.start("bash", params);
#endif #endif

2
QtScrcpy/util/config.cpp
View file

@ -21,7 +21,7 @@
#define COMMON_PUSHFILE_DEF "/sdcard/" #define COMMON_PUSHFILE_DEF "/sdcard/"
#define COMMON_SERVER_VERSION_KEY "ServerVersion" #define COMMON_SERVER_VERSION_KEY "ServerVersion"
#define COMMON_SERVER_VERSION_DEF "3.2" #define COMMON_SERVER_VERSION_DEF "3.3.1"
#define COMMON_SERVER_PATH_KEY "ServerPath" #define COMMON_SERVER_PATH_KEY "ServerPath"
#define COMMON_SERVER_PATH_DEF "/data/local/tmp/scrcpy-server.jar" #define COMMON_SERVER_PATH_DEF "/data/local/tmp/scrcpy-server.jar"

2
ci/win/build_for_win.bat
View file

@ -86,7 +86,7 @@ if exist %temp_path% (
md %temp_path% md %temp_path%
cd %temp_path% cd %temp_path%
set cmake_params=-DCMAKE_PREFIX_PATH=%qt_cmake_path% -DCMAKE_BUILD_TYPE=%build_mode% -G "Visual Studio 16 2019" -A %cmake_vs_build_mode% set cmake_params=-DCMAKE_PREFIX_PATH=%qt_cmake_path% -DCMAKE_BUILD_TYPE=%build_mode% -G "Visual Studio 17 2022" -A %cmake_vs_build_mode%
echo cmake params: %cmake_params% echo cmake params: %cmake_params%
cmake %cmake_params% ../.. cmake %cmake_params% ../..

2
config/config.ini
View file

@ -12,7 +12,7 @@ RenderExpiredFrames=0
# 视频解码方式：-1 自动，0 软解，1 dx硬解，2 opengl硬解 # 视频解码方式：-1 自动，0 软解，1 dx硬解，2 opengl硬解
UseDesktopOpenGL=-1 UseDesktopOpenGL=-1
# scrcpy-server的版本号（不要修改） # scrcpy-server的版本号（不要修改）
ServerVersion=3.2 ServerVersion=3.3.1
# scrcpy-server推送到安卓设备的路径 # scrcpy-server推送到安卓设备的路径
ServerPath=/data/local/tmp/scrcpy-server.jar ServerPath=/data/local/tmp/scrcpy-server.jar
# 自定义adb路径，例如D:/android/tools/adb.exe # 自定义adb路径，例如D:/android/tools/adb.exe