diff --git a/Build/wallitor-cmd.exe b/Build/wallitor-cmd.exe new file mode 100644 index 0000000..0786c8c Binary files /dev/null and b/Build/wallitor-cmd.exe differ diff --git a/Build/wallitor-core.dll b/Build/wallitor-core.dll new file mode 100644 index 0000000..ac9fe12 Binary files /dev/null and b/Build/wallitor-core.dll differ diff --git a/Build/wallitor-core.exp b/Build/wallitor-core.exp new file mode 100644 index 0000000..ef36f08 Binary files /dev/null and b/Build/wallitor-core.exp differ diff --git a/Build/wallitor-core.lib b/Build/wallitor-core.lib new file mode 100644 index 0000000..ab7d441 Binary files /dev/null and b/Build/wallitor-core.lib differ diff --git a/dllmain.cpp b/dllmain.cpp index 67fdab4..45b0740 100644 --- a/dllmain.cpp +++ b/dllmain.cpp @@ -25,7 +25,7 @@ playerInstance* player_instance = NULL; player_instance->generate(); } - extern "C" __declspec(dllexport) void destory() { + extern "C" __declspec(dllexport) void destroy() { player_instance->exit(); delete player_instance; } diff --git a/playerInstance.cpp b/playerInstance.cpp index 690ed91..37b52e6 100644 --- a/playerInstance.cpp +++ b/playerInstance.cpp @@ -25,7 +25,7 @@ BOOL playerInstance::showWindow(LPCWSTR lpParameter) { system(strCmd); } STARTUPINFO si{ 0 }; - //si.dwFlags = STARTF_USESHOWWINDOW; + si.dwFlags = STARTF_USESHOWWINDOW; si.wShowWindow = SW_HIDE; PROCESS_INFORMATION pi{ 0 }; if (CreateProcess(this->config.ffpath.c_str(), (LPWSTR)lpParameter, 0, 0, 0, CREATE_NO_WINDOW, 0, 0, &si, &pi)) { @@ -41,7 +41,7 @@ BOOL playerInstance::showWindow(LPCWSTR lpParameter) { //if (horw) { int width = cRct.right - cRct.left; int x = (systemWidth - width) / 2; - MoveWindow(hFfplay, x, 0, cRct.right - cRct.left, cRct.bottom - cRct.top, 1); + MoveWindow(hFfplay, 0, 0, systemWidth, systemHeight, 1); /* } else { int height = cRct.bottom - cRct.top; diff --git a/wallitor-core.sln b/wallitor-core.sln index 4497a46..eea2d07 100644 --- a/wallitor-core.sln +++ b/wallitor-core.sln @@ -5,6 +5,8 @@ VisualStudioVersion = 17.9.34622.214 MinimumVisualStudioVersion = 10.0.40219.1 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "wallitor-core", "wallitor-core.vcxproj", "{36591862-6F9C-4A1D-BBAD-4B1CBB1EC24B}" EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "wallitor-cmd", "..\wallitor-cmd\wallitor-cmd.vcxproj", "{5675A6E4-1AEF-4AA3-A366-0D975C311AAF}" +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|x64 = Debug|x64 @@ -21,6 +23,14 @@ Global {36591862-6F9C-4A1D-BBAD-4B1CBB1EC24B}.Release|x64.Build.0 = Release|x64 {36591862-6F9C-4A1D-BBAD-4B1CBB1EC24B}.Release|x86.ActiveCfg = Release|Win32 {36591862-6F9C-4A1D-BBAD-4B1CBB1EC24B}.Release|x86.Build.0 = Release|Win32 + {5675A6E4-1AEF-4AA3-A366-0D975C311AAF}.Debug|x64.ActiveCfg = Debug|x64 + {5675A6E4-1AEF-4AA3-A366-0D975C311AAF}.Debug|x64.Build.0 = Debug|x64 + {5675A6E4-1AEF-4AA3-A366-0D975C311AAF}.Debug|x86.ActiveCfg = Debug|Win32 + {5675A6E4-1AEF-4AA3-A366-0D975C311AAF}.Debug|x86.Build.0 = Debug|Win32 + {5675A6E4-1AEF-4AA3-A366-0D975C311AAF}.Release|x64.ActiveCfg = Release|x64 + {5675A6E4-1AEF-4AA3-A366-0D975C311AAF}.Release|x64.Build.0 = Release|x64 + {5675A6E4-1AEF-4AA3-A366-0D975C311AAF}.Release|x86.ActiveCfg = Release|Win32 + {5675A6E4-1AEF-4AA3-A366-0D975C311AAF}.Release|x86.Build.0 = Release|Win32 EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE diff --git a/wallitor-core.vcxproj b/wallitor-core.vcxproj index a40ccaf..ab31324 100644 --- a/wallitor-core.vcxproj +++ b/wallitor-core.vcxproj @@ -70,6 +70,9 @@ + + $(SolutionDir)\Build + Level3