godotengine/godot
1
0
Fork 0
mirror of https://github.com/godotengine/godot.git synced 2025-11-06 12:20:30 +00:00
Code Releases Wiki Activity

Validate audio/video driver command-line arguments

Browse Source 
This will exit early if the audio/video driver specified doesn't exist.
This commit is contained in:
Hugo Locurcio
2019-09-27 15:06:15 +02:00
parent daf4a9f9be
commit ca268dfecd
1 changed files with 52 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

58
main/main.cpp
View File

@@ -444,6 +444,32 @@ Error Main::setup(const char *execpath, int argc, char *argv[], bool p_second_ph
if (I->next()) { if (I->next()) {
audio_driver = I->next()->get(); audio_driver = I->next()->get();
bool found = false;
for (int i = 0; i < OS::get_singleton()->get_audio_driver_count(); i++) {
if (audio_driver == OS::get_singleton()->get_audio_driver_name(i)) {
found = true;
}
}
if (!found) {
OS::get_singleton()->print("Unknown audio driver '%s', aborting.\nValid options are ", audio_driver.utf8().get_data());
for (int i = 0; i < OS::get_singleton()->get_audio_driver_count(); i++) {
if (i == OS::get_singleton()->get_audio_driver_count() - 1) {
OS::get_singleton()->print(" and ");
} else if (i != 0) {
OS::get_singleton()->print(", ");
}
OS::get_singleton()->print("'%s'", OS::get_singleton()->get_audio_driver_name(i));
}
OS::get_singleton()->print(".\n");
goto error;
}
N = I->next()->next(); N = I->next()->next();
} else { } else {
OS::get_singleton()->print("Missing audio driver argument, aborting.\n"); OS::get_singleton()->print("Missing audio driver argument, aborting.\n");
@@ -455,6 +481,32 @@ Error Main::setup(const char *execpath, int argc, char *argv[], bool p_second_ph
if (I->next()) { if (I->next()) {
video_driver = I->next()->get(); video_driver = I->next()->get();
bool found = false;
for (int i = 0; i < OS::get_singleton()->get_video_driver_count(); i++) {
if (video_driver == OS::get_singleton()->get_video_driver_name(i)) {
found = true;
}
}
if (!found) {
OS::get_singleton()->print("Unknown video driver '%s', aborting.\nValid options are ", video_driver.utf8().get_data());
for (int i = 0; i < OS::get_singleton()->get_video_driver_count(); i++) {
if (i == OS::get_singleton()->get_video_driver_count() - 1) {
OS::get_singleton()->print(" and ");
} else if (i != 0) {
OS::get_singleton()->print(", ");
}
OS::get_singleton()->print("'%s'", OS::get_singleton()->get_video_driver_name(i));
}
OS::get_singleton()->print(".\n");
goto error;
}
N = I->next()->next(); N = I->next()->next();
} else { } else {
OS::get_singleton()->print("Missing video driver argument, aborting.\n"); OS::get_singleton()->print("Missing video driver argument, aborting.\n");
@@ -989,10 +1041,7 @@ Error Main::setup(const char *execpath, int argc, char *argv[], bool p_second_ph
} }
if (video_driver_idx < 0) { if (video_driver_idx < 0) {
//OS::get_singleton()->alert("Invalid Video Driver: " + video_driver);
video_driver_idx = 0; video_driver_idx = 0;
//goto error;
} }
if (audio_driver == "") { // specified in project.godot if (audio_driver == "") { // specified in project.godot
@@ -1009,10 +1058,7 @@ Error Main::setup(const char *execpath, int argc, char *argv[], bool p_second_ph
} }
if (audio_driver_idx < 0) { if (audio_driver_idx < 0) {
OS::get_singleton()->alert("Invalid Audio Driver: " + audio_driver);
audio_driver_idx = 0; audio_driver_idx = 0;
//goto error;
} }
{ {