diff --git a/CMakeLists.txt b/CMakeLists.txt index e91b625d1..c9765749a 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -22,7 +22,7 @@ project(TTKMusicPlayer) set(TTK_MAJOR_VERSION 4) set(TTK_MINOR_VERSION 1) -set(TTK_PATCH_VERSION 2) +set(TTK_PATCH_VERSION 3) set(TTK_VERSION "${TTK_MAJOR_VERSION}.${TTK_MINOR_VERSION}.${TTK_PATCH_VERSION}.0") # Find includes in the build directories diff --git a/ChangeLog b/ChangeLog index 389a9aba2..c18aef454 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,4 +1,4 @@ -v4.1.3.0 Final 2025.01.XX +v4.1.3.0 Final 2025.01.20 修复ac3格式解析 修复在线模式解析异常 优化Web模块 diff --git a/Doxyfile b/Doxyfile index da8f4038a..51c8e9297 100644 --- a/Doxyfile +++ b/Doxyfile @@ -5,7 +5,7 @@ #--------------------------------------------------------------------------- DOXYFILE_ENCODING = UTF-8 PROJECT_NAME = TTKMusicPlayer -PROJECT_NUMBER = 4.1.2.0 +PROJECT_NUMBER = 4.1.3.0 PROJECT_BRIEF = "TTKMusicPlayer imitates Kugou UI, the music player uses of qmmp core library based on Qt for windows and linux" PROJECT_LOGO = TTKUtils/resource/qicon.dll OUTPUT_DIRECTORY = TTKDocs diff --git a/TTKCommon/ttkversion.h b/TTKCommon/ttkversion.h index 1c8978d52..f4f626dfa 100644 --- a/TTKCommon/ttkversion.h +++ b/TTKCommon/ttkversion.h @@ -164,16 +164,16 @@ * with this program; If not, see . ***************************************************************************/ -//update time 2024.12.06 +//update time 2025.01.20 #define TTK_MAJOR_VERSION 4 #define TTK_MINOR_VERSION 1 -#define TTK_PATCH_VERSION 2 +#define TTK_PATCH_VERSION 3 #define TTK_CONFIG_VERSION_STR "1.0.2" #define TTK_VERSION TTK_VERSION_CHECK(TTK_MAJOR_VERSION, TTK_MINOR_VERSION, TTK_PATCH_VERSION, 0) #define TTK_VERSION_STR TTK_VERSION_CHECK_STR(TTK_MAJOR_VERSION, TTK_MINOR_VERSION, TTK_PATCH_VERSION, 0) -#define TTK_VERSION_TIME_STR "(2024/12/06)" +#define TTK_VERSION_TIME_STR "(2025/01/20)" #define TTK_RC_FILEVERSION TTK_MAJOR_VERSION, TTK_MINOR_VERSION, TTK_PATCH_VERSION, 0 #define TTK_RC_PRODUCTVERSION TTK_VERSION_STR diff --git a/TTKResource/_extras/TTKRoutine.sh b/TTKResource/_extras/TTKRoutine.sh index 0d5d2c5e4..5e6908766 100644 --- a/TTKResource/_extras/TTKRoutine.sh +++ b/TTKResource/_extras/TTKRoutine.sh @@ -15,7 +15,7 @@ if [ "${dirpath%$tmp}" != "/" ]; then fi LD_LIBRARY_PATH=$dirpath -export LD_LIBRARY_PATH=$dirpath:$dirpath/lib:$dirpath/4.1.2.0:$LD_LIBRARY_PATH +export LD_LIBRARY_PATH=$dirpath:$dirpath/lib:$dirpath/4.1.3.0:$LD_LIBRARY_PATH export QT_PLUGIN_PATH=$dirpath/plugins:$QT_PLUGIN_PATH $appname "$@" diff --git a/TTKUtils/auc/make_auc.bat b/TTKUtils/auc/make_auc.bat index 6ce050d7b..ebfcc00e6 100644 --- a/TTKUtils/auc/make_auc.bat +++ b/TTKUtils/auc/make_auc.bat @@ -1,4 +1,4 @@ "C:\Program Files (x86)\Windows Kits\8.1\bin\x86\mt.exe" -manifest "manifest" -outputresource:"TTKInit.exe" "C:\Program Files (x86)\Windows Kits\8.1\bin\x86\mt.exe" -manifest "manifest" -outputresource:"TTKMusicPlayer.exe" "C:\Program Files (x86)\Windows Kits\8.1\bin\x86\mt.exe" -manifest "manifest" -outputresource:"TKConsole.exe" -"C:\Program Files (x86)\Windows Kits\8.1\bin\x86\mt.exe" -manifest "manifest" -outputresource:"4.1.2.0/TTKService.exe" \ No newline at end of file +"C:\Program Files (x86)\Windows Kits\8.1\bin\x86\mt.exe" -manifest "manifest" -outputresource:"4.1.3.0/TTKService.exe" \ No newline at end of file diff --git a/TTKUtils/deploy/make_desktop.sh b/TTKUtils/deploy/make_desktop.sh index 3535ce8d0..2312190ad 100644 --- a/TTKUtils/deploy/make_desktop.sh +++ b/TTKUtils/deploy/make_desktop.sh @@ -13,7 +13,7 @@ execpath="$PWD/../TTKMusicPlayer" echo -n "[Desktop Entry] Type=Application -Version=4.1.2.0 +Version=4.1.3.0 Name=TTKMusicPlayer Name[zh_CN]=天天酷音 Name[zh_TW]=天天酷音 diff --git a/TTKUtils/deploy/share/appdata/ttkmusicplayer.appdata.xml b/TTKUtils/deploy/share/appdata/ttkmusicplayer.appdata.xml index 947f9748c..bb5fb6301 100644 --- a/TTKUtils/deploy/share/appdata/ttkmusicplayer.appdata.xml +++ b/TTKUtils/deploy/share/appdata/ttkmusicplayer.appdata.xml @@ -69,6 +69,7 @@ + diff --git a/TTKUtils/linux_time.sh b/TTKUtils/linux_time.sh index 2c251ff8a..f15bdff25 100755 --- a/TTKUtils/linux_time.sh +++ b/TTKUtils/linux_time.sh @@ -1,2 +1,2 @@ #!/bin/sh -find . -exec touch -c -m -d "2024-12-06 12:00" {} \; +find . -exec touch -c -m -d "2025-01-20 12:00" {} \; diff --git a/TTKUtils/ttk.iss b/TTKUtils/ttk.iss index a08e147ee..842aaf86d 100644 --- a/TTKUtils/ttk.iss +++ b/TTKUtils/ttk.iss @@ -2,7 +2,7 @@ #define MyAppNameZh "" #define MyAppNameEN "TTKMusicPlayer" -#define MyAppVersion "4.1.2.0" +#define MyAppVersion "4.1.3.0" #define MyAppPublisher "Greedysky Studio" #define MyAppCopyright "Copyright (C) 2015 - 2025 Greedysky Studio" #define MyAppURL "http://download.csdn.net/album/detail/3094" diff --git a/TTKVersion.pri b/TTKVersion.pri index 3036f2c42..eb674b964 100644 --- a/TTKVersion.pri +++ b/TTKVersion.pri @@ -23,5 +23,5 @@ RCC_DIR = ./.build/rcc greaterThan(QT_MAJOR_VERSION, 4): DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0x050400 QT_DEPRECATED_WARNINGS -# update time 2024.12.06 -TTK_VERSION = 4.1.2.0 +# update time 2025.01.20 +TTK_VERSION = 4.1.3.0