diff --git a/README.md b/README.md index bcba4ad..32357c5 100644 --- a/README.md +++ b/README.md @@ -1,13 +1,13 @@ -## m3u8d 一款m3u8下载工具 -* 提供windows图形界面(Qt), mac、linux命令行, linux支持arm和386 -* 使用gomedia转换、合并ts格式为mp4 -* windows自带GUI界面的版本下载: [m3u8d_qt_v1.4.2_windows_amd64.exe](https://github.com/orestonce/m3u8d/releases/download/v1.4.2/m3u8d_qt_v1.4.2_windows_amd64.exe): +## m3u8视频下载工具 +* 提供windows图形界面(Qt), mac、linux命令行, linux支持arm、386、mipsle +* 程序会自动将下载的ts文件合并转换格式为mp4 +* windows自带GUI界面的版本下载: [m3u8d_qt_v1.4.3_windows_amd64.exe](https://github.com/orestonce/m3u8d/releases/download/v1.4.3/m3u8d_qt_v1.4.3_windows_amd64.exe): ![](m3u8d-qt/screenshot.png) * 全部版本下载, 包括windows图形界面/linux命令行/mac命令行: https://github.com/orestonce/m3u8d/releases ## 实现说明 * download.go 大部分抄自 https://github.com/llychao/m3u8-downloader -* 使用 https://github.com/yapingcat/gomedia 代替ffmpeg进行格式转换 +* 使用[gomedia](https://github.com/yapingcat/gomedia) 代替ffmpeg进行格式转换 * 支持跳过前面几个ts文件(一般是广告, 嘿嘿) * 程序会在下载保存目录创建: * downloading/ 目录, 用于存放正在下载的分段ts视频, 按照m3u8的url进行划分 diff --git a/m3u8d-qt/favicon.ico b/m3u8d-qt/favicon.ico new file mode 100644 index 0000000..efeb393 Binary files /dev/null and b/m3u8d-qt/favicon.ico differ diff --git a/m3u8d-qt/m3u8d-qt.pro b/m3u8d-qt/m3u8d-qt.pro index a2bba14..7c6109d 100644 --- a/m3u8d-qt/m3u8d-qt.pro +++ b/m3u8d-qt/m3u8d-qt.pro @@ -22,7 +22,7 @@ DEFINES += QT_DEPRECATED_WARNINGS # You can also select to disable deprecated APIs only up to a certain version of Qt. #DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0x060000 # disables all the APIs deprecated before Qt 6.0.0 - +RC_FILE += version.rc SOURCES += \ main.cpp \ mainwindow.cpp \ diff --git a/m3u8d-qt/mainwindow.cpp b/m3u8d-qt/mainwindow.cpp index 5c1e4f8..abf3f5e 100644 --- a/m3u8d-qt/mainwindow.cpp +++ b/m3u8d-qt/mainwindow.cpp @@ -11,7 +11,7 @@ MainWindow::MainWindow(QWidget *parent) : { ui->setupUi(this); - QIntValidator* vd = new QIntValidator; + QIntValidator* vd = new QIntValidator(this); vd->setRange(0, 9999); ui->lineEdit_SkipTsCountFromHead->setValidator(vd); ui->lineEdit_SkipTsCountFromHead->setPlaceholderText("[0,9999]"); diff --git a/m3u8d-qt/version.rc b/m3u8d-qt/version.rc new file mode 100644 index 0000000..9446f11 --- /dev/null +++ b/m3u8d-qt/version.rc @@ -0,0 +1,37 @@ +IDI_ICON1 ICON "favicon.ico" + +#if defined(UNDER_CE) +#include +#else +#include +#endif + +VS_VERSION_INFO VERSIONINFO + FILEVERSION 1,4,3,0 + PRODUCTVERSION 1,4,3,0 + FILEFLAGSMASK 0x3fL +#ifdef _DEBUG + FILEFLAGS VS_FF_DEBUG +#else + FILEFLAGS 0x0L +#endif + FILEOS VOS__WINDOWS32 + FILETYPE VFT_DLL + FILESUBTYPE 0x0L + BEGIN + BLOCK "StringFileInfo" + BEGIN + BLOCK "080404b0" + BEGIN + VALUE "ProductVersion", "1.4.3.0\0" + VALUE "ProductName", "m3u8Ƶع\0" + VALUE "LegalCopyright", "https://github.com/orestonce/m3u8d\0" + VALUE "FileDescription", "m3u8Ƶع\0" + END + END + + BLOCK "VarFileInfo" + BEGIN + VALUE "Translation", 0x804, 1200 + END + END \ No newline at end of file