diff --git a/android/jni/com/mapswithme/maps/Framework.cpp b/android/jni/com/mapswithme/maps/Framework.cpp index 4a78c3c780..ca505d182b 100644 --- a/android/jni/com/mapswithme/maps/Framework.cpp +++ b/android/jni/com/mapswithme/maps/Framework.cpp @@ -288,4 +288,9 @@ namespace android { m_work.SaveState(); } + + void Framework::Invalidate() + { + m_work.Invalidate(); + } } diff --git a/android/jni/com/mapswithme/maps/Framework.hpp b/android/jni/com/mapswithme/maps/Framework.hpp index 9c34a269b7..f2befcefab 100644 --- a/android/jni/com/mapswithme/maps/Framework.hpp +++ b/android/jni/com/mapswithme/maps/Framework.hpp @@ -47,6 +47,8 @@ namespace android storage::Storage & Storage(); + void Invalidate(); + void InitRenderPolicy(); void DeleteRenderPolicy(); diff --git a/android/jni/com/mapswithme/maps/VideoTimer.cpp b/android/jni/com/mapswithme/maps/VideoTimer.cpp index 6b318a4e29..f12f3c2c70 100644 --- a/android/jni/com/mapswithme/maps/VideoTimer.cpp +++ b/android/jni/com/mapswithme/maps/VideoTimer.cpp @@ -8,6 +8,7 @@ #include "../core/jni_helper.hpp" #include "VideoTimer.hpp" #include "../../../../../base/assert.hpp" +#include "../../../../../base/logging.hpp" android::VideoTimer * g_timer = 0; @@ -33,39 +34,39 @@ namespace android void VideoTimer::start() { -/* JNIEnv * env; + JNIEnv * env; m_javaVM->AttachCurrentThread(&env, NULL); env->CallVoidMethod(m_videoTimer, jni::GetJavaMethodID(env, m_videoTimer, "start", "()V")); - m_state = ERunning;*/ + m_state = ERunning; } void VideoTimer::resume() { -/* JNIEnv * env; + JNIEnv * env; m_javaVM->AttachCurrentThread(&env, NULL); env->CallVoidMethod(m_videoTimer, jni::GetJavaMethodID(env, m_videoTimer, "resume", "()V")); - m_state = ERunning;*/ + m_state = ERunning; } void VideoTimer::pause() { -/* JNIEnv * env; + JNIEnv * env; m_javaVM->AttachCurrentThread(&env, NULL); env->CallVoidMethod(m_videoTimer, jni::GetJavaMethodID(env, m_videoTimer, "pause", "()V")); - m_state = EPaused;*/ + m_state = EPaused; } void VideoTimer::stop() { -/* JNIEnv * env; + JNIEnv * env; m_javaVM->AttachCurrentThread(&env, NULL); env->CallVoidMethod(m_videoTimer, jni::GetJavaMethodID(env, m_videoTimer, "stop", "()V")); - m_state = EStopped;*/ + m_state = EStopped; } void VideoTimer::perform() { - //m_frameFn(); + m_frameFn(); } }