diff --git a/CMakeLists.txt b/CMakeLists.txt index d39cf9e98..a3d0d39d3 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -21,7 +21,7 @@ cmake_minimum_required(VERSION 3.0.0) project(TTKMusicPlayer) set(TTK_MAJOR_VERSION 4) -set(TTK_MINOR_VERSION 0) +set(TTK_MINOR_VERSION 1) set(TTK_PATCH_VERSION 0) set(TTK_VERSION "${TTK_MAJOR_VERSION}.${TTK_MINOR_VERSION}.${TTK_PATCH_VERSION}.0") diff --git a/ChangeLog b/ChangeLog index fce23733a..91f06e1fb 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,9 +1,10 @@ -v4.1.0.0 Final 2024.10.XX +v4.1.0.0 Final 2024.10.16 支持导出全部列表 支持拖拽文件夹导入列表 修复播放列表重名 修复某些情况下异常退出 优化简洁模式 +优化DLNA模块 优化部分交互逻辑 优化歌曲元数据解析 优化平台网络模块 diff --git a/Doxyfile b/Doxyfile index 5e6b8a184..eeb5d3a0a 100644 --- a/Doxyfile +++ b/Doxyfile @@ -5,7 +5,7 @@ #--------------------------------------------------------------------------- DOXYFILE_ENCODING = UTF-8 PROJECT_NAME = TTKMusicPlayer -PROJECT_NUMBER = 4.0.0.0 +PROJECT_NUMBER = 4.1.0.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 07892cc33..1418862a9 100644 --- a/TTKCommon/ttkversion.h +++ b/TTKCommon/ttkversion.h @@ -162,16 +162,16 @@ * with this program; If not, see . ***************************************************************************/ -//update time 2024.06.18 +//update time 2024.10.16 #define TTK_MAJOR_VERSION 4 -#define TTK_MINOR_VERSION 0 +#define TTK_MINOR_VERSION 1 #define TTK_PATCH_VERSION 0 #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/06/18)" +#define TTK_VERSION_TIME_STR "(2024/10/16)" #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 d779d5794..bb682f6fd 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.0.0.0:$LD_LIBRARY_PATH +export LD_LIBRARY_PATH=$dirpath:$dirpath/lib:$dirpath/4.1.0.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 aaee04815..e92863b62 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.0.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.0.0/TTKService.exe" \ No newline at end of file diff --git a/TTKUtils/deploy/make_desktop.sh b/TTKUtils/deploy/make_desktop.sh index d1da0bcc5..53b614dd9 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.0.0.0 +Version=4.1.0.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 8ec4df3e5..62b443fba 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 362908517..fc9d3c7b3 100755 --- a/TTKUtils/linux_time.sh +++ b/TTKUtils/linux_time.sh @@ -1,2 +1,2 @@ #!/bin/sh -find . -exec touch -c -m -d "2024-06-18 12:00" {} \; +find . -exec touch -c -m -d "2024-10-16 12:00" {} \; diff --git a/TTKUtils/ttk.iss b/TTKUtils/ttk.iss index e78138a95..cf124cd00 100644 --- a/TTKUtils/ttk.iss +++ b/TTKUtils/ttk.iss @@ -2,7 +2,7 @@ #define MyAppNameZh "" #define MyAppNameEN "TTKMusicPlayer" -#define MyAppVersion "4.0.0.0" +#define MyAppVersion "4.1.0.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 65edc4f35..2c2524135 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.06.18 -TTK_VERSION = 4.0.0.0 +# update time 2024.10.16 +TTK_VERSION = 4.1.0.0