diff --git a/CMakeLists.txt b/CMakeLists.txt index a3d0d39d3..75a264474 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 0) +set(TTK_PATCH_VERSION 1) 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 e6b3cb2e0..96d7d020d 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,8 @@ -v4.1.1.0 Final 2024.12.XX +v4.1.1.0 Final 2024.10.22 修复歌单恢复异常 +优化部分交互逻辑 +优化平台网络模块 +优化播放列表备份 优化其他一些细节 v4.1.0.0 Final 2024.10.16 diff --git a/Doxyfile b/Doxyfile index eeb5d3a0a..10b8f4435 100644 --- a/Doxyfile +++ b/Doxyfile @@ -5,7 +5,7 @@ #--------------------------------------------------------------------------- DOXYFILE_ENCODING = UTF-8 PROJECT_NAME = TTKMusicPlayer -PROJECT_NUMBER = 4.1.0.0 +PROJECT_NUMBER = 4.1.1.0 PROJECT_BRIEF = "TTKMusicPlayer imitates Kugou UI, the music player uses of qmmp core library based on Qt for windows and linux" PROJECT_LOGO = TTKResource/lb_app_logo.png OUTPUT_DIRECTORY = TTKDocs diff --git a/TTKCommon/ttkversion.h b/TTKCommon/ttkversion.h index 1418862a9..f18e6edfa 100644 --- a/TTKCommon/ttkversion.h +++ b/TTKCommon/ttkversion.h @@ -162,16 +162,16 @@ * with this program; If not, see . ***************************************************************************/ -//update time 2024.10.16 +//update time 2024.10.22 #define TTK_MAJOR_VERSION 4 #define TTK_MINOR_VERSION 1 -#define TTK_PATCH_VERSION 0 +#define TTK_PATCH_VERSION 1 #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/10/16)" +#define TTK_VERSION_TIME_STR "(2024/10/22)" #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 bb682f6fd..c3791ec6d 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.0.0:$LD_LIBRARY_PATH +export LD_LIBRARY_PATH=$dirpath:$dirpath/lib:$dirpath/4.1.1.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 e92863b62..7b52702e9 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.0.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.1.0/TTKService.exe" \ No newline at end of file diff --git a/TTKUtils/deploy/make_desktop.sh b/TTKUtils/deploy/make_desktop.sh index 53b614dd9..4c8f5eb30 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.0.0 +Version=4.1.1.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 62b443fba..bd77fd97e 100644 --- a/TTKUtils/deploy/share/appdata/ttkmusicplayer.appdata.xml +++ b/TTKUtils/deploy/share/appdata/ttkmusicplayer.appdata.xml @@ -29,6 +29,7 @@ https://github.com/Greedysky/TTKMusicPlayer Greedysky Studio + diff --git a/TTKUtils/linux_time.sh b/TTKUtils/linux_time.sh index fc9d3c7b3..b7c132dbc 100755 --- a/TTKUtils/linux_time.sh +++ b/TTKUtils/linux_time.sh @@ -1,2 +1,2 @@ #!/bin/sh -find . -exec touch -c -m -d "2024-10-16 12:00" {} \; +find . -exec touch -c -m -d "2024-10-22 12:00" {} \; diff --git a/TTKUtils/ttk.iss b/TTKUtils/ttk.iss index cf124cd00..90515a0a0 100644 --- a/TTKUtils/ttk.iss +++ b/TTKUtils/ttk.iss @@ -2,7 +2,7 @@ #define MyAppNameZh "" #define MyAppNameEN "TTKMusicPlayer" -#define MyAppVersion "4.1.0.0" +#define MyAppVersion "4.1.1.0" #define MyAppPublisher "Greedysky Studio" #define MyAppCopyright "Copyright (C) 2015 - 2024 Greedysky Studio" #define MyAppURL "http://download.csdn.net/album/detail/3094" diff --git a/TTKVersion.pri b/TTKVersion.pri index 2c2524135..416da92f5 100644 --- a/TTKVersion.pri +++ b/TTKVersion.pri @@ -21,5 +21,5 @@ MOC_DIR = ./.build/moc OBJECTS_DIR = ./.build/obj RCC_DIR = ./.build/rcc -# update time 2024.10.16 -TTK_VERSION = 4.1.0.0 +# update time 2024.10.22 +TTK_VERSION = 4.1.1.0