AxioDL
/
amuse
mirror of https://github.com/AxioDL/amuse.git
2
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Windows command-line argument fix

This commit is contained in:
Jack Andersen 2018-05-28 10:26:55 -10:00
parent 77c7daa67c
commit d7011f0e77
2 changed files with 35 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
driver/amuseplay.cpp
View File

@ -644,14 +644,14 @@ struct AppCallback : boo::IApplicationCallback
if (m_argc < 2) if (m_argc < 2)
{ {
Log.report(logvisor::Error, "needs group path argument"); Log.report(logvisor::Error, "needs group path argument");
exit(1); return 1;
} }
amuse::ContainerRegistry::Type cType = amuse::ContainerRegistry::DetectContainerType(m_argv[1]); amuse::ContainerRegistry::Type cType = amuse::ContainerRegistry::DetectContainerType(m_argv[1]);
if (cType == amuse::ContainerRegistry::Type::Invalid) if (cType == amuse::ContainerRegistry::Type::Invalid)
{ {
Log.report(logvisor::Error, "invalid/no data at path argument"); Log.report(logvisor::Error, "invalid/no data at path argument");
exit(1); return 1;
} }
Log.report(logvisor::Info, _S("Found '%s' Audio Group data"), amuse::ContainerRegistry::TypeToName(cType)); Log.report(logvisor::Info, _S("Found '%s' Audio Group data"), amuse::ContainerRegistry::TypeToName(cType));
@ -660,7 +660,7 @@ struct AppCallback : boo::IApplicationCallback
if (data.empty()) if (data.empty())
{ {
Log.report(logvisor::Error, "invalid/no data at path argument"); Log.report(logvisor::Error, "invalid/no data at path argument");
exit(1); return 1;
} }
std::list<amuse::AudioGroupProject> m_projs; std::list<amuse::AudioGroupProject> m_projs;
@ -764,7 +764,7 @@ struct AppCallback : boo::IApplicationCallback
if (scanf("%d", &userSel) <= 0) if (scanf("%d", &userSel) <= 0)
{ {
Log.report(logvisor::Error, "unable to parse prompt"); Log.report(logvisor::Error, "unable to parse prompt");
exit(1); return 1;
} }
if (userSel < songs.size()) if (userSel < songs.size())
@ -776,7 +776,7 @@ struct AppCallback : boo::IApplicationCallback
else else
{ {
Log.report(logvisor::Error, "unable to find Song %d", userSel); Log.report(logvisor::Error, "unable to find Song %d", userSel);
exit(1); return 1;
} }
} }
else if (songs.size() == 1) else if (songs.size() == 1)
@ -816,7 +816,7 @@ struct AppCallback : boo::IApplicationCallback
else else
{ {
Log.report(logvisor::Error, "unable to find Group %d", m_groupId); Log.report(logvisor::Error, "unable to find Group %d", m_groupId);
exit(1); return 1;
} }
} }
else if (totalGroups > 1) else if (totalGroups > 1)
@ -841,7 +841,7 @@ struct AppCallback : boo::IApplicationCallback
if (scanf("%d", &userSel) <= 0) if (scanf("%d", &userSel) <= 0)
{ {
Log.report(logvisor::Error, "unable to parse prompt"); Log.report(logvisor::Error, "unable to parse prompt");
exit(1); return 1;
} }
if (allSongGroups.find(userSel) != allSongGroups.end()) if (allSongGroups.find(userSel) != allSongGroups.end())
@ -857,7 +857,7 @@ struct AppCallback : boo::IApplicationCallback
else else
{ {
Log.report(logvisor::Error, "unable to find Group %d", userSel); Log.report(logvisor::Error, "unable to find Group %d", userSel);
exit(1); return 1;
} }
} }
else if (totalGroups == 1) else if (totalGroups == 1)
@ -879,7 +879,7 @@ struct AppCallback : boo::IApplicationCallback
else else
{ {
Log.report(logvisor::Error, "empty project"); Log.report(logvisor::Error, "empty project");
exit(1); return 1;
} }
/* Make final group selection */ /* Make final group selection */
@ -905,7 +905,7 @@ struct AppCallback : boo::IApplicationCallback
if (!selData) if (!selData)
{ {
Log.report(logvisor::Error, "unable to select audio group data"); Log.report(logvisor::Error, "unable to select audio group data");
exit(1); return 1;
} }
/* Build voice engine */ /* Build voice engine */
@ -918,7 +918,7 @@ struct AppCallback : boo::IApplicationCallback
if (!group) if (!group)
{ {
Log.report(logvisor::Error, "unable to add audio group"); Log.report(logvisor::Error, "unable to add audio group");
exit(1); return 1;
} }
/* Enter playback loop */ /* Enter playback loop */
@ -1045,13 +1045,15 @@ int main(int argc, const boo::SystemChar** argv)
int APIENTRY wWinMain(HINSTANCE hInstance, HINSTANCE, LPWSTR lpCmdLine, int) int APIENTRY wWinMain(HINSTANCE hInstance, HINSTANCE, LPWSTR lpCmdLine, int)
{ {
int argc = 0; int argc = 0;
const boo::SystemChar** argv = (const wchar_t**)(CommandLineToArgvW(lpCmdLine, &argc)); const boo::SystemChar** argv;
if (lpCmdLine[0])
argv = (const wchar_t**)(CommandLineToArgvW(lpCmdLine, &argc));
static boo::SystemChar selfPath[1024]; static boo::SystemChar selfPath[1024];
GetModuleFileNameW(nullptr, selfPath, 1024); GetModuleFileNameW(nullptr, selfPath, 1024);
static const boo::SystemChar* booArgv[32] = {}; static const boo::SystemChar* booArgv[32] = {};
booArgv[0] = selfPath; booArgv[0] = selfPath;
for (int i = 0; i < argc; ++i) for (int i=0 ; i<argc ; ++i)
booArgv[i + 1] = argv[i]; booArgv[i+1] = argv[i];
logvisor::CreateWin32Console(); logvisor::CreateWin32Console();
SetConsoleOutputCP(65001); SetConsoleOutputCP(65001);

36
driver/amuserender.cpp
View File

@ -135,14 +135,14 @@ int main(int argc, const boo::SystemChar** argv)
if (m_args.size() < 1) if (m_args.size() < 1)
{ {
Log.report(logvisor::Error, "Usage: amuserender <group-file> [<songs-file>] [-r <sample-rate>]"); Log.report(logvisor::Error, "Usage: amuserender <group-file> [<songs-file>] [-r <sample-rate>]");
exit(1); return 1;
} }
amuse::ContainerRegistry::Type cType = amuse::ContainerRegistry::DetectContainerType(m_args[0].c_str()); amuse::ContainerRegistry::Type cType = amuse::ContainerRegistry::DetectContainerType(m_args[0].c_str());
if (cType == amuse::ContainerRegistry::Type::Invalid) if (cType == amuse::ContainerRegistry::Type::Invalid)
{ {
Log.report(logvisor::Error, "invalid/no data at path argument"); Log.report(logvisor::Error, "invalid/no data at path argument");
exit(1); return 1;
} }
Log.report(logvisor::Info, _S("Found '%s' Audio Group data"), amuse::ContainerRegistry::TypeToName(cType)); Log.report(logvisor::Info, _S("Found '%s' Audio Group data"), amuse::ContainerRegistry::TypeToName(cType));
@ -151,7 +151,7 @@ int main(int argc, const boo::SystemChar** argv)
if (data.empty()) if (data.empty())
{ {
Log.report(logvisor::Error, "invalid/no data at path argument"); Log.report(logvisor::Error, "invalid/no data at path argument");
exit(1); return 1;
} }
int m_groupId = -1; int m_groupId = -1;
@ -256,7 +256,7 @@ int main(int argc, const boo::SystemChar** argv)
if (scanf("%d", &userSel) <= 0) if (scanf("%d", &userSel) <= 0)
{ {
Log.report(logvisor::Error, "unable to parse prompt"); Log.report(logvisor::Error, "unable to parse prompt");
exit(1); return 1;
} }
if (userSel < songs.size()) if (userSel < songs.size())
@ -269,7 +269,7 @@ int main(int argc, const boo::SystemChar** argv)
else else
{ {
Log.report(logvisor::Error, "unable to find Song %d", userSel); Log.report(logvisor::Error, "unable to find Song %d", userSel);
exit(1); return 1;
} }
} }
else if (songs.size() == 1) else if (songs.size() == 1)
@ -319,7 +319,7 @@ int main(int argc, const boo::SystemChar** argv)
else else
{ {
Log.report(logvisor::Error, "unable to find Group %d", m_groupId); Log.report(logvisor::Error, "unable to find Group %d", m_groupId);
exit(1); return 1;
} }
} }
else if (totalGroups > 1) else if (totalGroups > 1)
@ -344,7 +344,7 @@ int main(int argc, const boo::SystemChar** argv)
if (scanf("%d", &userSel) <= 0) if (scanf("%d", &userSel) <= 0)
{ {
Log.report(logvisor::Error, "unable to parse prompt"); Log.report(logvisor::Error, "unable to parse prompt");
exit(1); return 1;
} }
auto songSearch = allSongGroups.find(userSel); auto songSearch = allSongGroups.find(userSel);
@ -364,7 +364,7 @@ int main(int argc, const boo::SystemChar** argv)
else else
{ {
Log.report(logvisor::Error, "unable to find Group %d", userSel); Log.report(logvisor::Error, "unable to find Group %d", userSel);
exit(1); return 1;
} }
} }
else if (totalGroups == 1) else if (totalGroups == 1)
@ -388,7 +388,7 @@ int main(int argc, const boo::SystemChar** argv)
else else
{ {
Log.report(logvisor::Error, "empty project"); Log.report(logvisor::Error, "empty project");
exit(1); return 1;
} }
/* Make final group selection */ /* Make final group selection */
@ -414,14 +414,14 @@ int main(int argc, const boo::SystemChar** argv)
if (scanf("%d", &userSel) <= 0) if (scanf("%d", &userSel) <= 0)
{ {
Log.report(logvisor::Error, "unable to parse prompt"); Log.report(logvisor::Error, "unable to parse prompt");
exit(1); return 1;
} }
m_setupId = userSel; m_setupId = userSel;
} }
if (sortSetups.find(m_setupId) == sortSetups.cend()) if (sortSetups.find(m_setupId) == sortSetups.cend())
{ {
Log.report(logvisor::Error, "unable to find setup %d", m_setupId); Log.report(logvisor::Error, "unable to find setup %d", m_setupId);
exit(1); return 1;
} }
} }
else else
@ -437,13 +437,13 @@ int main(int argc, const boo::SystemChar** argv)
if (!selData) if (!selData)
{ {
Log.report(logvisor::Error, "unable to select audio group data"); Log.report(logvisor::Error, "unable to select audio group data");
exit(1); return 1;
} }
if (m_sfxGroup) if (m_sfxGroup)
{ {
Log.report(logvisor::Error, "amuserender is currently only able to render SongGroups"); Log.report(logvisor::Error, "amuserender is currently only able to render SongGroups");
exit(1); return 1;
} }
/* WAV out path */ /* WAV out path */
@ -461,7 +461,7 @@ int main(int argc, const boo::SystemChar** argv)
if (!group) if (!group)
{ {
Log.report(logvisor::Error, "unable to add audio group"); Log.report(logvisor::Error, "unable to add audio group");
exit(1); return 1;
} }
/* Enter playback loop */ /* Enter playback loop */
@ -490,13 +490,15 @@ int APIENTRY wWinMain(HINSTANCE hInstance, HINSTANCE, LPWSTR lpCmdLine, int)
signal(SIGFPE, abortHandler); signal(SIGFPE, abortHandler);
int argc = 0; int argc = 0;
const boo::SystemChar** argv = (const wchar_t**)(CommandLineToArgvW(lpCmdLine, &argc)); const boo::SystemChar** argv;
if (lpCmdLine[0])
argv = (const wchar_t**)(CommandLineToArgvW(lpCmdLine, &argc));
static boo::SystemChar selfPath[1024]; static boo::SystemChar selfPath[1024];
GetModuleFileNameW(nullptr, selfPath, 1024); GetModuleFileNameW(nullptr, selfPath, 1024);
static const boo::SystemChar* booArgv[32] = {}; static const boo::SystemChar* booArgv[32] = {};
booArgv[0] = selfPath; booArgv[0] = selfPath;
for (int i = 0; i < argc; ++i) for (int i=0 ; i<argc ; ++i)
booArgv[i + 1] = argv[i]; booArgv[i+1] = argv[i];
logvisor::CreateWin32Console(); logvisor::CreateWin32Console();
SetConsoleOutputCP(65001); SetConsoleOutputCP(65001);