1 files changed, 17 insertions, 38 deletions

diff --git a/platform/bb10/os_bb10.cpp b/platform/bb10/os_bb10.cpp
index ed40355eb5..728707628b 100644
--- a/platform/bb10/os_bb10.cpp
+++ b/platform/bb10/os_bb10.cpp
@@ -31,22 +31,21 @@
 #include "drivers/gles2/rasterizer_gles2.h"
 #include "servers/visual/visual_server_raster.h"
 #include "core/os/dir_access.h"
-
-#include "core/globals.h"
+#include "core/global_config.h"
 #include "main/main.h"
 #include "bbutil.h"
+#include "core/os/keyboard.h"
+
 #include <stdlib.h>
 #include <stdbool.h>
 #include <assert.h>
-#include "core/os/keyboard.h"
-
-#include "bps/bps.h"
-#include "bps/screen.h"
-#include "bps/navigator.h"
-#include "bps/accelerometer.h"
-#include "bps/orientation.h"
-#include "bps/virtualkeyboard.h"
-#include "bps/audiodevice.h"
+#include <bps/bps.h>
+#include <bps/screen.h>
+#include <bps/navigator.h>
+#include <bps/accelerometer.h>
+#include <bps/orientation.h>
+#include <bps/virtualkeyboard.h>
+#include <bps/audiodevice.h>
 
 #ifdef BB10_SCORELOOP_ENABLED
 #include "modules/scoreloop/scoreloop_bb10.h"
@@ -141,18 +140,6 @@ void OSBB10::initialize(const VideoMode& p_desired,int p_video_driver,int p_audi
 	audio_driver->set_singleton();
 	audio_driver->init(NULL);
 
-	sample_manager = memnew( SampleManagerMallocSW );
-	audio_server = memnew( AudioServerSW(sample_manager) );
-	audio_server->set_mixer_params(AudioMixerSW::INTERPOLATION_LINEAR,false);
-	audio_server->init();
-
-	spatial_sound_server = memnew( SpatialSoundServerSW );
-	spatial_sound_server->init();
-
-	spatial_sound_2d_server = memnew( SpatialSound2DServerSW );
-	spatial_sound_2d_server->init();
-
-	//
 	physics_server = memnew( PhysicsServerSW );
 	physics_server->init();
 	physics_2d_server = memnew( Physics2DServerSW );
@@ -185,19 +172,11 @@ void OSBB10::finalize() {
 		memdelete(main_loop);
 	main_loop=NULL;
 
-	spatial_sound_server->finish();
-	memdelete(spatial_sound_server);
-	spatial_sound_2d_server->finish();
-	memdelete(spatial_sound_2d_server);
-
-	//if (debugger_connection_console) {
-//		memdelete(debugger_connection_console);
-//}
-
-	memdelete(sample_manager);
-
-	audio_server->finish();
-	memdelete(audio_server);
+	/*
+	if (debugger_connection_console) {
+		memdelete(debugger_connection_console);
+	}
+	*/
 
 	visual_server->finish();
 	memdelete(visual_server);
@@ -376,8 +355,8 @@ void OSBB10::handle_screen_event(bps_event_t *event) {
 			ievent.mouse_motion.x = ievent.mouse_motion.global_x = mpos.x;
 			ievent.mouse_motion.y = ievent.mouse_motion.global_y = mpos.y;
 			input->set_mouse_pos(Point2(ievent.mouse_motion.x,ievent.mouse_motion.y));
-			ievent.mouse_motion.speed_x=input->get_mouse_speed().x;
-			ievent.mouse_motion.speed_y=input->get_mouse_speed().y;
+			ievent.mouse_motion.speed_x=input->get_last_mouse_speed().x;
+			ievent.mouse_motion.speed_y=input->get_last_mouse_speed().y;
 			ievent.mouse_motion.relative_x = mrel.x;
 			ievent.mouse_motion.relative_y = mrel.y;
 			ievent.mouse_motion.button_mask = 1; // pressed