Skip to content

Commit

Permalink
Merge pull request #14 from BensonLaur/lyric-download
Browse files Browse the repository at this point in the history 
Lyric download
  • Loading branch information
@BensonLaur
BensonLaur authored Sep 10, 2017
2 parents c42e0e3 + dc0fdc4 commit 7a07de8
Show file tree
Hide file tree
Showing 74 changed files with 7,468 additions and 844 deletions.
Binary file modified BesLyric/BesLyric.aps
View file
Binary file not shown.
Binary file modified BesLyric/BesLyric.cpp
View file
Binary file not shown.
Binary file modified BesLyric/BesLyric.rc
View file
Binary file not shown.
41 changes: 33 additions & 8 deletions BesLyric/BesLyric.vcxproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -63,8 +63,8 @@
<Link>
<GenerateDebugInformation>true</GenerateDebugInformation>
<SuppressStartupBanner>true</SuppressStartupBanner>
<AdditionalLibraryDirectories>$(SOUIPATH)\bin;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<AdditionalDependencies>utilitiesd.lib;souid.lib;%(AdditionalDependencies)</AdditionalDependencies>
<AdditionalLibraryDirectories>$(ProjectDir)lib\json\;$(SOUIPATH)\bin;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<AdditionalDependencies>utilitiesd.lib;souid.lib;%(AdditionalDependencies);lib_json_debug.lib</AdditionalDependencies>
</Link>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
Expand All @@ -81,8 +81,8 @@
<Link>
<GenerateDebugInformation>true</GenerateDebugInformation>
<SuppressStartupBanner>true</SuppressStartupBanner>
<AdditionalLibraryDirectories>$(SOUIPATH)\bin;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<AdditionalDependencies>utilities.lib;soui.lib;%(AdditionalDependencies)</AdditionalDependencies>
<AdditionalLibraryDirectories>$(ProjectDir)lib\json\;$(SOUIPATH)\bin;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<AdditionalDependencies>utilities.lib;soui.lib;%(AdditionalDependencies);lib_json_release.lib</AdditionalDependencies>
</Link>
</ItemDefinitionGroup>
<ItemGroup>
Expand Down Expand Up @@ -120,19 +120,24 @@
<ClCompile Include="DlgCheckIntegrity.cpp" />
<ClCompile Include="entity\AutoUpdateThread.cpp" />
<ClCompile Include="entity\CheckIntegrityThread.cpp" />
<ClCompile Include="entity\LrcHandler.cpp" />
<ClCompile Include="entity\LyricMaker.cpp" />
<ClCompile Include="entity\LyricPlayer.cpp" />
<ClCompile Include="entity\MusicPlayer.cpp" />
<ClCompile Include="lib\tinyxml2.cpp" />
<ClCompile Include="entity\SearcherGecimi.cpp" />
<ClCompile Include="entity\SearchLyricThread.cpp" />
<ClCompile Include="lib\xml\tinyxml2.cpp" />
<ClCompile Include="MainDlg.cpp" />
<ClCompile Include="PageMaking.cpp" />
<ClCompile Include="PageResult.cpp" />
<ClCompile Include="PageSearchLyric.cpp" />
<ClCompile Include="PageSetting.cpp" />
<ClCompile Include="stdafx.cpp">
<PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Create</PrecompiledHeader>
<PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">Create</PrecompiledHeader>
</ClCompile>
<ClCompile Include="utility\FileHelper.cpp" />
<ClCompile Include="utility\StringHelper.cpp" />
<ClCompile Include="utility\WinDialog.cpp" />
<ClCompile Include="utility\SplitFile.cpp" />
<ClCompile Include="utility\WinFile.cpp" />
</ItemGroup>
Expand All @@ -141,22 +146,42 @@
</ItemGroup>
<ItemGroup>
<ClInclude Include="BSMessageBox.h" />
<ClInclude Include="controlEx\LyricListView.h" />
<ClInclude Include="Define.h" />
<ClInclude Include="DlgCheckIntegrity.h" />
<ClInclude Include="entity\AutoUpdateThread.h" />
<ClInclude Include="entity\CheckIntegrityThread.h" />
<ClInclude Include="entity\FileDroper.h" />
<ClInclude Include="entity\ISearcher.h" />
<ClInclude Include="entity\LrcHandler.h" />
<ClInclude Include="entity\LyricMaker.h" />
<ClInclude Include="entity\LyricPlayer.h" />
<ClInclude Include="entity\LyricSearcherFactory.h" />
<ClInclude Include="entity\MusicPlayer.h" />
<ClInclude Include="lib\tinyxml2.h" />
<ClInclude Include="entity\SearcherGecimi.h" />
<ClInclude Include="entity\SearchLyricThread.h" />
<ClInclude Include="lib\json\allocator.h" />
<ClInclude Include="lib\json\assertions.h" />
<ClInclude Include="lib\json\autolink.h" />
<ClInclude Include="lib\json\config.h" />
<ClInclude Include="lib\json\features.h" />
<ClInclude Include="lib\json\forwards.h" />
<ClInclude Include="lib\json\json.h" />
<ClInclude Include="lib\json\reader.h" />
<ClInclude Include="lib\json\value.h" />
<ClInclude Include="lib\json\version.h" />
<ClInclude Include="lib\json\writer.h" />
<ClInclude Include="lib\xml\tinyxml2.h" />
<ClInclude Include="MainDlg.h" />
<ClInclude Include="PageMaking.h" />
<ClInclude Include="PageResult.h" />
<ClInclude Include="PageSearchLyric.h" />
<ClInclude Include="PageSetting.h" />
<ClInclude Include="resource.h" />
<ClInclude Include="stdafx.h" />
<ClInclude Include="utility\FileHelper.h" />
<ClInclude Include="utility\Downloader.h" />
<ClInclude Include="utility\StringHelper.h" />
<ClInclude Include="utility\WinDialog.h" />
<ClInclude Include="utility\SplitFile.h" />
<ClInclude Include="utility\SSingleton.h" />
<ClInclude Include="utility\WinFile.h" />
Expand Down
108 changes: 96 additions & 12 deletions BesLyric/BesLyric.vcxproj.filters
View file
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,15 @@
<Filter Include="Header Files\entity">
<UniqueIdentifier>{5345c7b8-25c5-4189-ae9a-3fd69e8f909d}</UniqueIdentifier>
</Filter>
<Filter Include="Header Files\controlEx">
<UniqueIdentifier>{e123a482-fc25-4f65-b2ed-b36da37f0cf5}</UniqueIdentifier>
</Filter>
<Filter Include="Header Files\lib\json">
<UniqueIdentifier>{64f17359-9002-4c68-a13f-040a6e3eccbd}</UniqueIdentifier>
</Filter>
<Filter Include="Header Files\lib\xml">
<UniqueIdentifier>{3031c9a7-6496-42cc-ac04-b5ff5b1286e0}</UniqueIdentifier>
</Filter>
</ItemGroup>
<ItemGroup>
<None Include="res\soui_res.rc2">
Expand Down Expand Up @@ -76,9 +85,6 @@
<ClCompile Include="BSMessageBox.cpp">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="lib\tinyxml2.cpp">
<Filter>Header Files\lib</Filter>
</ClCompile>
<ClCompile Include="entity\LyricMaker.cpp">
<Filter>Source Files\entity</Filter>
</ClCompile>
Expand All @@ -88,9 +94,6 @@
<ClCompile Include="entity\MusicPlayer.cpp">
<Filter>Source Files\entity</Filter>
</ClCompile>
<ClCompile Include="utility\FileHelper.cpp">
<Filter>Source Files\utility</Filter>
</ClCompile>
<ClCompile Include="utility\WinFile.cpp">
<Filter>Source Files\utility</Filter>
</ClCompile>
Expand All @@ -112,6 +115,27 @@
<ClCompile Include="DlgCheckIntegrity.cpp">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="PageSearchLyric.cpp">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="entity\LrcHandler.cpp">
<Filter>Source Files\entity</Filter>
</ClCompile>
<ClCompile Include="utility\WinDialog.cpp">
<Filter>Source Files\utility</Filter>
</ClCompile>
<ClCompile Include="lib\xml\tinyxml2.cpp">
<Filter>Header Files\lib\xml</Filter>
</ClCompile>
<ClCompile Include="utility\StringHelper.cpp">
<Filter>Source Files\utility</Filter>
</ClCompile>
<ClCompile Include="entity\SearcherGecimi.cpp">
<Filter>Source Files\entity</Filter>
</ClCompile>
<ClCompile Include="entity\SearchLyricThread.cpp">
<Filter>Source Files\entity</Filter>
</ClCompile>
</ItemGroup>
<ItemGroup>
<ResourceCompile Include="BesLyric.rc">
Expand All @@ -137,9 +161,6 @@
<ClInclude Include="PageSetting.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="lib\tinyxml2.h">
<Filter>Header Files\lib</Filter>
</ClInclude>
<ClInclude Include="entity\LyricMaker.h">
<Filter>Header Files\entity</Filter>
</ClInclude>
Expand All @@ -149,9 +170,6 @@
<ClInclude Include="entity\MusicPlayer.h">
<Filter>Header Files\entity</Filter>
</ClInclude>
<ClInclude Include="utility\FileHelper.h">
<Filter>Header Files\utility</Filter>
</ClInclude>
<ClInclude Include="utility\SSingleton.h">
<Filter>Header Files\utility</Filter>
</ClInclude>
Expand Down Expand Up @@ -179,6 +197,72 @@
<ClInclude Include="entity\FileDroper.h">
<Filter>Header Files\entity</Filter>
</ClInclude>
<ClInclude Include="PageSearchLyric.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="utility\Downloader.h">
<Filter>Header Files\utility</Filter>
</ClInclude>
<ClInclude Include="controlEx\LyricListView.h">
<Filter>Header Files\controlEx</Filter>
</ClInclude>
<ClInclude Include="entity\LyricSearcherFactory.h">
<Filter>Header Files\entity</Filter>
</ClInclude>
<ClInclude Include="entity\ISearcher.h">
<Filter>Header Files\entity</Filter>
</ClInclude>
<ClInclude Include="entity\LrcHandler.h">
<Filter>Header Files\entity</Filter>
</ClInclude>
<ClInclude Include="entity\SearcherGecimi.h">
<Filter>Header Files\entity</Filter>
</ClInclude>
<ClInclude Include="utility\WinDialog.h">
<Filter>Header Files\utility</Filter>
</ClInclude>
<ClInclude Include="utility\StringHelper.h">
<Filter>Header Files\utility</Filter>
</ClInclude>
<ClInclude Include="lib\xml\tinyxml2.h">
<Filter>Header Files\lib\xml</Filter>
</ClInclude>
<ClInclude Include="lib\json\allocator.h">
<Filter>Header Files\lib\json</Filter>
</ClInclude>
<ClInclude Include="lib\json\assertions.h">
<Filter>Header Files\lib\json</Filter>
</ClInclude>
<ClInclude Include="lib\json\autolink.h">
<Filter>Header Files\lib\json</Filter>
</ClInclude>
<ClInclude Include="lib\json\config.h">
<Filter>Header Files\lib\json</Filter>
</ClInclude>
<ClInclude Include="lib\json\features.h">
<Filter>Header Files\lib\json</Filter>
</ClInclude>
<ClInclude Include="lib\json\forwards.h">
<Filter>Header Files\lib\json</Filter>
</ClInclude>
<ClInclude Include="lib\json\json.h">
<Filter>Header Files\lib\json</Filter>
</ClInclude>
<ClInclude Include="lib\json\reader.h">
<Filter>Header Files\lib\json</Filter>
</ClInclude>
<ClInclude Include="lib\json\value.h">
<Filter>Header Files\lib\json</Filter>
</ClInclude>
<ClInclude Include="lib\json\version.h">
<Filter>Header Files\lib\json</Filter>
</ClInclude>
<ClInclude Include="lib\json\writer.h">
<Filter>Header Files\lib\json</Filter>
</ClInclude>
<ClInclude Include="entity\SearchLyricThread.h">
<Filter>Header Files\entity</Filter>
</ClInclude>
</ItemGroup>
<ItemGroup>
<CustomBuild Include="uires\uires.idx">
Expand Down
22 changes: 21 additions & 1 deletion BesLyric/Define.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,7 @@

#pragma once
#include "stdafx.h"
#include <vector>
#include <string>
using namespace std;

Expand All @@ -51,6 +52,8 @@ using namespace std;

#define MSG_USER_DROP_FILE WM_USER+5

#define MSG_USER_SHOW_LYRIC_RESULT WM_USER+6

/* 结构定义 */

//在制作歌词页面 和 滚动预览 页面中，需要选择音乐路径，歌词路径，输出路径等信息
Expand All @@ -71,14 +74,31 @@ typedef struct _PATH_STATE
OTHER
};

//储存获取的单个歌词信息
struct LyricInfo
{
wstring strPlaneText;
wstring strLabelText;
wstring strSong;
wstring strArtist;
wstring strLyricFrom;
};

struct LyricSearchResult
{
vector<LyricInfo> vecLyricInfoTotal; //所有获得的歌词
bool bShowUnexpectedResultTip; //是否显示意外结果的提示
SStringW strUnexpectedResultTip; //意外结果的提示
};


/* 全局变量定义 */
/* 版本格式说明：X.Y.Z
X表示主版本，架构性修改时更新
Y表示次版本，较大修改时更新
Z表示修改号，小问题时更新
*/
static const wstring VERSION_NUMBER = L"2.1.2"; //版本号（注意每次更改版本号时需要更改2处，1处是这里，1处是 BesLyric.rc 中的Version）
static const wstring VERSION_NUMBER = L"2.1.3"; //版本号（注意每次更改版本号时需要更改2处，1处是这里，1处是 BesLyric.rc 中的Version）

static const wstring LINK_VERSION_LOG= L"http://files.cnblogs.com/files/BensonLaur/versionLog.zip"; //链接，指向版本日志文件
static const wstring LINK_LAST_VERSION_INFO= L"http://files.cnblogs.com/files/BensonLaur/lastVersion.zip"; //链接，指向最后版本信息的文件
Expand Down
Loading

0 comments on commit 7a07de8

Please sign in to comment.