diff options
| author | Rémi Verschelde <rverschelde@gmail.com> | 2017-08-22 00:58:12 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-08-22 00:58:12 +0200 |
| commit | df590fc2d33c1ba715a4ce58f71d83e0ed9f5693 (patch) | |
| tree | 8bfdc3e033aaf4dc9a5de5e8040e4f99afa0c540 /platform/android | |
| parent | 13f879587dd9bce59528e44b0faaf6e062f6d918 (diff) | |
| parent | 738d2ab96997faa1e13b91e38cf8a0000d829f70 (diff) | |
Merge pull request #10340 from Rubonnek/remove-unnecessary-assignments
Removed unnecessary assignments
Diffstat (limited to 'platform/android')
| -rw-r--r-- | platform/android/audio_driver_jandroid.cpp | 1 | ||||
| -rw-r--r-- | platform/android/export/export.cpp | 4 |
2 files changed, 2 insertions, 3 deletions
diff --git a/platform/android/audio_driver_jandroid.cpp b/platform/android/audio_driver_jandroid.cpp index 763eff2863..ec09fda429 100644 --- a/platform/android/audio_driver_jandroid.cpp +++ b/platform/android/audio_driver_jandroid.cpp @@ -80,7 +80,6 @@ Error AudioDriverAndroid::init() { int mix_rate = GLOBAL_DEF("audio/mix_rate", 44100); int latency = GLOBAL_DEF("audio/output_latency", 25); - latency = 50; unsigned int buffer_size = next_power_of_2(latency * mix_rate / 1000); if (OS::get_singleton()->is_stdout_verbose()) { print_line("audio buffer size: " + itos(buffer_size)); diff --git a/platform/android/export/export.cpp b/platform/android/export/export.cpp index ee93c29577..ada7df887c 100644 --- a/platform/android/export/export.cpp +++ b/platform/android/export/export.cpp @@ -3024,7 +3024,7 @@ public: args.push_back(devices[p_device].id); args.push_back("reverse"); args.push_back("--remove-all"); - err = OS::get_singleton()->execute(adb, args, true, NULL, NULL, &rv); + OS::get_singleton()->execute(adb, args, true, NULL, NULL, &rv); int dbg_port = EditorSettings::get_singleton()->get("network/debug/remote_port"); args.clear(); @@ -3034,7 +3034,7 @@ public: args.push_back("tcp:" + itos(dbg_port)); args.push_back("tcp:" + itos(dbg_port)); - err = OS::get_singleton()->execute(adb, args, true, NULL, NULL, &rv); + OS::get_singleton()->execute(adb, args, true, NULL, NULL, &rv); print_line("Reverse result: " + itos(rv)); int fs_port = EditorSettings::get_singleton()->get("filesystem/file_server/port"); |