From b892e56fe0253e7c181c21591d6afce55fa3a75e Mon Sep 17 00:00:00 2001 From: Viktor Govako Date: Thu, 20 Jun 2024 00:40:21 -0300 Subject: [PATCH] [android] Removed obsolete VideoTimer. Signed-off-by: Viktor Govako --- .../main/cpp/app/organicmaps/VideoTimer.cpp | 84 ------------------- .../main/cpp/app/organicmaps/VideoTimer.hpp | 33 -------- 2 files changed, 117 deletions(-) delete mode 100644 android/app/src/main/cpp/app/organicmaps/VideoTimer.cpp delete mode 100644 android/app/src/main/cpp/app/organicmaps/VideoTimer.hpp diff --git a/android/app/src/main/cpp/app/organicmaps/VideoTimer.cpp b/android/app/src/main/cpp/app/organicmaps/VideoTimer.cpp deleted file mode 100644 index 8a0d78107f..0000000000 --- a/android/app/src/main/cpp/app/organicmaps/VideoTimer.cpp +++ /dev/null @@ -1,84 +0,0 @@ -#include "VideoTimer.hpp" - -#include "app/organicmaps/core/jni_helper.hpp" - -#include "base/assert.hpp" -#include "base/logging.hpp" - - -android::VideoTimer * g_timer = 0; - -namespace android -{ - VideoTimer::VideoTimer(TFrameFn frameFn) - : ::VideoTimer(frameFn) - { - ASSERT(g_timer == 0, ()); - g_timer = this; - } - - VideoTimer::~VideoTimer() - { - stop(); - g_timer = 0; - } - - void VideoTimer::SetParentObject(jobject videoTimer) - { - m_videoTimer = videoTimer; - } - - void VideoTimer::start() - { - /*JNIEnv * env; - m_javaVM->AttachCurrentThread(&env, NULL); - env->CallVoidMethod(m_videoTimer, jni::GetJavaMethodID(env, m_videoTimer, "start", "()V"));*/ - m_state = ERunning; - } - - void VideoTimer::resume() - { - /*JNIEnv * env; - m_javaVM->AttachCurrentThread(&env, NULL); - env->CallVoidMethod(m_videoTimer, jni::GetJavaMethodID(env, m_videoTimer, "resume", "()V"));*/ - m_state = ERunning; - } - - void VideoTimer::pause() - { - /*JNIEnv * env; - m_javaVM->AttachCurrentThread(&env, NULL); - env->CallVoidMethod(m_videoTimer, jni::GetJavaMethodID(env, m_videoTimer, "pause", "()V"));*/ - m_state = EPaused; - } - - void VideoTimer::stop() - { - /*JNIEnv * env; - m_javaVM->AttachCurrentThread(&env, NULL); - env->CallVoidMethod(m_videoTimer, jni::GetJavaMethodID(env, m_videoTimer, "stop", "()V"));*/ - m_state = EStopped; - } - - void VideoTimer::perform() - { - //m_frameFn(); - } -} - -extern "C" -{ - JNIEXPORT void JNICALL - Java_app_organicmaps_VideoTimer_nativeRun(JNIEnv * env, jobject thiz) - { - ASSERT ( g_timer, ()); - g_timer->perform(); - } - - JNIEXPORT void JNICALL - Java_app_organicmaps_VideoTimer_nativeInit(JNIEnv * env, jobject thiz) - { - ASSERT ( g_timer, ()); - g_timer->SetParentObject(thiz); - } -} diff --git a/android/app/src/main/cpp/app/organicmaps/VideoTimer.hpp b/android/app/src/main/cpp/app/organicmaps/VideoTimer.hpp deleted file mode 100644 index 439954329a..0000000000 --- a/android/app/src/main/cpp/app/organicmaps/VideoTimer.hpp +++ /dev/null @@ -1,33 +0,0 @@ -#pragma once - -#include - -#include "platform/video_timer.hpp" - -namespace android -{ - class VideoTimer : public ::VideoTimer - { - private: - jobject m_videoTimer; - - public: - - explicit VideoTimer(TFrameFn frameFn); - ~VideoTimer(); - - void SetParentObject(jobject videoTimer); - - void start(); - - void stop(); - - void resume(); - - void pause(); - - void perform(); - }; -} - -extern android::VideoTimer * g_timer;