diff --git a/CMakeLists.txt b/CMakeLists.txt index 6aa43b3b96..3f744e0810 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -3,7 +3,7 @@ cmake_minimum_required(VERSION 2.8.11) add_definitions(-DTTK_LIBRARY) add_definitions(-DQMMP_LIBRARY) -set(TTK_MAJOR_VERSION "2.15.8") +set(TTK_MAJOR_VERSION "2.15.9") set(TTK_VERSION ${TTK_MAJOR_VERSION}.0) # Find includes in the build directories diff --git a/ChangeLog b/ChangeLog index acf3cb7fac..e2f5f595cf 100644 --- a/ChangeLog +++ b/ChangeLog @@ -403,4 +403,3 @@ v2.15.10.0 Final 2022.06.XX 支持多通道视觉效果。 修复相似搜索错误。 优化其他一些细节。 - diff --git a/Doxyfile b/Doxyfile index 5cb226ffea..f4166db73d 100644 --- a/Doxyfile +++ b/Doxyfile @@ -5,7 +5,7 @@ #--------------------------------------------------------------------------- DOXYFILE_ENCODING = UTF-8 PROJECT_NAME = TTKMusicplayer -PROJECT_NUMBER = 2.15.8.0 +PROJECT_NUMBER = 2.15.9.0 PROJECT_BRIEF = "TTKMusicPlayer that imitation Kugou music, the music player use of qmmp core library based on Qt for windows and linux" PROJECT_LOGO = TTKResource/lb_app_logo.png OUTPUT_DIRECTORY = TTKDocs diff --git a/README.md b/README.md index 7470b4f713..234acbdd4a 100644 --- a/README.md +++ b/README.md @@ -2,7 +2,7 @@ [简体中文 Chinese](./README_cn.md) | [繁体中文 Chinese](./README_tc.md) ![TTKMusicplayer](https://img.shields.io/badge/Greedysky-TTKMusicPlayer-green.svg?style=flat-square) -![Version](https://img.shields.io/badge/Version-2.15.8.0-blue.svg?style=flat-square) +![Version](https://img.shields.io/badge/Version-2.15.9.0-blue.svg?style=flat-square) ![License](https://img.shields.io/badge/License-GPL%20V3-yellowgreen.svg?style=flat-square) ![LOGO](https://github.com/Greedysky/Resource/blob/master/Screen/logo_pic.png?raw=true) diff --git a/README_cn.md b/README_cn.md index 9d5dfa81f1..470e8d1c33 100644 --- a/README_cn.md +++ b/README_cn.md @@ -2,7 +2,7 @@ [英文 English](./README.md) | [繁体中文 Chinese](./README_tc.md) ![TTKMusicplayer](https://img.shields.io/badge/Greedysky-TTKMusicPlayer-green.svg?style=flat-square) -![版本](https://img.shields.io/badge/Version-2.15.8.0-blue.svg?style=flat-square) +![版本](https://img.shields.io/badge/Version-2.15.9.0-blue.svg?style=flat-square) ![许可](https://img.shields.io/badge/License-GPL%20V3-yellowgreen.svg?style=flat-square) ![徽标](https://github.com/Greedysky/Resource/blob/master/Screen/logo_pic.png?raw=true) diff --git a/README_tc.md b/README_tc.md index c943acef85..cb5bb2ba78 100644 --- a/README_tc.md +++ b/README_tc.md @@ -2,7 +2,7 @@ [简体中文 Chinese](./README_cn.md) | [英文 English](./README.md) ![TTKMusicplayer](https://img.shields.io/badge/Greedysky-TTKMusicPlayer-green.svg?style=flat-square) -![版本](https://img.shields.io/badge/Version-2.15.8.0-blue.svg?style=flat-square) +![版本](https://img.shields.io/badge/Version-2.15.9.0-blue.svg?style=flat-square) ![許可](https://img.shields.io/badge/License-GPL%20V3-yellowgreen.svg?style=flat-square) ![徽標](https://github.com/Greedysky/Resource/blob/master/Screen/logo_pic.png?raw=true) diff --git a/TTKCommon/ttkversion.h b/TTKCommon/ttkversion.h index 1de80925b2..7adc1a28a2 100644 --- a/TTKCommon/ttkversion.h +++ b/TTKCommon/ttkversion.h @@ -152,16 +152,16 @@ * with this program; If not, see . ***************************************************************************/ -//update time 2022.03.05 -#define TTK_VERSION_STR "2.15.8.0" -#define TTK_VER_TIME_STR "(2022/03/05)" +//update time 2022.04.30 +#define TTK_VERSION_STR "2.15.9.0" +#define TTK_VER_TIME_STR "(2022/04/30)" #define TTK_MAJOR_VERSION 2 #define TTK_MIDLE_VERSION 15 -#define TTK_MINOR_VERSION 8 +#define TTK_MINOR_VERSION 9 #define TTK_PATCH_VERSION 0 -#define TTK_VERSION 0x02F80 +#define TTK_VERSION 0x02F90 #define TTK_CONFIG_VERSION_STR "1.0.1" diff --git a/TTKConfig/TTKConfig.rc b/TTKConfig/TTKConfig.rc index ebbedb3d7c..4bd359e0dc 100644 --- a/TTKConfig/TTKConfig.rc +++ b/TTKConfig/TTKConfig.rc @@ -6,8 +6,8 @@ IDI_ICON1 ICON DISCARDABLE "../TTKResource/lb_app_logo.ico" -#define TTK_FILEVERSION 2,15,8,0 -#define TTK_PRODUCTVERSION "2.15.8.0" +#define TTK_FILEVERSION 2,15,9,0 +#define TTK_PRODUCTVERSION "2.15.9.0" VS_VERSION_INFO VERSIONINFO FILEVERSION TTK_FILEVERSION diff --git a/TTKModule/TTKCore.rc b/TTKModule/TTKCore.rc index daa79e7450..720a78ed59 100644 --- a/TTKModule/TTKCore.rc +++ b/TTKModule/TTKCore.rc @@ -4,8 +4,8 @@ #include #endif -#define TTK_FILEVERSION 2,15,8,0 -#define TTK_PRODUCTVERSION "2.15.8.0" +#define TTK_FILEVERSION 2,15,9,0 +#define TTK_PRODUCTVERSION "2.15.9.0" VS_VERSION_INFO VERSIONINFO FILEVERSION TTK_FILEVERSION diff --git a/TTKResource/_extras/TTKRoutine.sh b/TTKResource/_extras/TTKRoutine.sh index 86eba38f7d..ef8740caba 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/2.15.8.0:$LD_LIBRARY_PATH +export LD_LIBRARY_PATH=$dirpath:$dirpath/lib:$dirpath/2.15.9.0:$LD_LIBRARY_PATH export QT_PLUGIN_PATH=$dirpath/plugins:$QT_PLUGIN_PATH $appname "$@" diff --git a/TTKRun/TTKApp/TTKApp.rc b/TTKRun/TTKApp/TTKApp.rc index fa4dda3123..91ce5db33a 100644 --- a/TTKRun/TTKApp/TTKApp.rc +++ b/TTKRun/TTKApp/TTKApp.rc @@ -6,8 +6,8 @@ IDI_ICON1 ICON DISCARDABLE "../../TTKResource/lb_app_logo.ico" -#define TTK_FILEVERSION 2,15,8,0 -#define TTK_PRODUCTVERSION "2.15.8.0" +#define TTK_FILEVERSION 2,15,9,0 +#define TTK_PRODUCTVERSION "2.15.9.0" VS_VERSION_INFO VERSIONINFO FILEVERSION TTK_FILEVERSION diff --git a/TTKScript/auc/make_auc.bat b/TTKScript/auc/make_auc.bat index 2de215c87a..33a0995330 100644 --- a/TTKScript/auc/make_auc.bat +++ b/TTKScript/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:"2.15.8.0/TTKService.exe" \ No newline at end of file +"C:\Program Files (x86)\Windows Kits\8.1\bin\x86\mt.exe" -manifest "manifest" -outputresource:"2.15.9.0/TTKService.exe" \ No newline at end of file diff --git a/TTKScript/deploy/package.sh b/TTKScript/deploy/package.sh index cb8280df48..1f776056a9 100755 --- a/TTKScript/deploy/package.sh +++ b/TTKScript/deploy/package.sh @@ -8,7 +8,7 @@ execpath="$PWD/../TTKMusicPlayer" echo -n "[Desktop Entry] Type=Application -Version=2.15.8.0 +Version=2.15.9.0 Name=TTKMusicPlayer Comment=天天酷音 Icon=$iconpath diff --git a/TTKScript/deploy/share/appdata/ttkmusicplayer.appdata.xml b/TTKScript/deploy/share/appdata/ttkmusicplayer.appdata.xml index b93cc459c2..ff447f6e16 100644 --- a/TTKScript/deploy/share/appdata/ttkmusicplayer.appdata.xml +++ b/TTKScript/deploy/share/appdata/ttkmusicplayer.appdata.xml @@ -18,7 +18,7 @@ Greedysky Studio - + diff --git a/TTKScript/linux_time.sh b/TTKScript/linux_time.sh index ebdc38b0f0..5f603c9434 100755 --- a/TTKScript/linux_time.sh +++ b/TTKScript/linux_time.sh @@ -1,2 +1,2 @@ #!/bin/sh -find . -exec touch -c -m -d "2022-03-05 12:00" {} \; +find . -exec touch -c -m -d "2022-04-30 12:00" {} \; diff --git a/TTKScript/ttk.iss b/TTKScript/ttk.iss index 9b7dcfa1f4..15102dd60d 100755 --- a/TTKScript/ttk.iss +++ b/TTKScript/ttk.iss @@ -2,7 +2,7 @@ #define MyAppNameZh "" #define MyAppNameEN "TTKMusicPlayer" -#define MyAppVersion "2.15.8.0" +#define MyAppVersion "2.15.9.0" #define MyAppPublisher "Greedysky Studio" #define MyAppCopyright "Copyright (C) 2015 - 2022 Greedysky Studio" #define MyAppURL "http://download.csdn.net/album/detail/3094" diff --git a/TTKService/TTKService.rc b/TTKService/TTKService.rc index 13670f2cf0..7af928ddec 100644 --- a/TTKService/TTKService.rc +++ b/TTKService/TTKService.rc @@ -7,8 +7,8 @@ IDI_ICON1 ICON DISCARDABLE "../TTKResource/lb_app_logo.ico" IDI_ICON2 ICON DISCARDABLE "../TTKResource/fileIcon/fileIcon.ico" -#define TTK_FILEVERSION 2,15,8,0 -#define TTK_PRODUCTVERSION "2.15.8.0" +#define TTK_FILEVERSION 2,15,9,0 +#define TTK_PRODUCTVERSION "2.15.9.0" VS_VERSION_INFO VERSIONINFO FILEVERSION TTK_FILEVERSION diff --git a/TTKThirdParty/TTKExtras/TTKExtras.rc b/TTKThirdParty/TTKExtras/TTKExtras.rc index 8e148084f7..0b52c0d7e2 100644 --- a/TTKThirdParty/TTKExtras/TTKExtras.rc +++ b/TTKThirdParty/TTKExtras/TTKExtras.rc @@ -4,8 +4,8 @@ #include #endif -#define TTK_FILEVERSION 2,15,8,0 -#define TTK_PRODUCTVERSION "2.15.8.0" +#define TTK_FILEVERSION 2,15,9,0 +#define TTK_PRODUCTVERSION "2.15.9.0" VS_VERSION_INFO VERSIONINFO FILEVERSION TTK_FILEVERSION diff --git a/TTKUi/TTKUi.rc b/TTKUi/TTKUi.rc index 35afa6dd74..87e30c579c 100644 --- a/TTKUi/TTKUi.rc +++ b/TTKUi/TTKUi.rc @@ -4,8 +4,8 @@ #include #endif -#define TTK_FILEVERSION 2,15,8,0 -#define TTK_PRODUCTVERSION "2.15.8.0" +#define TTK_FILEVERSION 2,15,9,0 +#define TTK_PRODUCTVERSION "2.15.9.0" VS_VERSION_INFO VERSIONINFO FILEVERSION TTK_FILEVERSION diff --git a/TTKVersion.pri b/TTKVersion.pri index e94db6b9d8..1f4a0b7667 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 2022.03.05 -TTKMusicPlayer = 2.15.8.0 +# update time 2022.04.30 +TTKMusicPlayer = 2.15.9.0