[droid] add CTimer class

diff --git a/xbmc/threads/Makefile b/xbmc/threads/Makefile
index 2853248..d0bd295 100644 (file)
--- a/xbmc/threads/Makefile
+++ b/xbmc/threads/Makefile
@@ -2,6 +2,7 @@ SRCS=Atomics.cpp \
      Event.cpp \
      LockFree.cpp \
      Thread.cpp \
+     Timer.cpp \
      SystemClock.cpp \
      platform/Implementation.cpp
 

diff --git a/xbmc/threads/Thread.cpp b/xbmc/threads/Thread.cpp
index 0fe8dae..9faac80 100644 (file)
--- a/xbmc/threads/Thread.cpp
+++ b/xbmc/threads/Thread.cpp
@@ -97,7 +97,7 @@ void CThread::Create(bool bAutoDelete, unsigned stacksize)
   SpawnThread(stacksize);
 }
 
-bool CThread::IsRunning()
+bool CThread::IsRunning() const
 {
   return m_ThreadId ? true : false;
 }

diff --git a/xbmc/threads/Thread.h b/xbmc/threads/Thread.h
index c44e880..e071a88 100644 (file)
--- a/xbmc/threads/Thread.h
+++ b/xbmc/threads/Thread.h
@@ -64,7 +64,7 @@ public:
   bool SetPrioritySched_RR(int iPriority);
   bool IsAutoDelete() const;
   virtual void StopThread(bool bWait = true);
-  bool IsRunning();
+  bool IsRunning() const;
 
   // -----------------------------------------------------------------------------------
   // These are platform specific and can be found in ./platform/[platform]/ThreadImpl.cpp

diff --git a/xbmc/threads/Timer.cpp b/xbmc/threads/Timer.cpp
new file mode 100644 (file)
index 0000000..4709ee1
--- /dev/null
+++ b/xbmc/threads/Timer.cpp
@@ -0,0 +1,110 @@
+/*
+ *      Copyright (C) 2012 Team XBMC
+ *      http://www.xbmc.org
+ *
+ *  This Program is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation; either version 2, or (at your option)
+ *  any later version.
+ *
+ *  This Program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+  *  along with XBMC; see the file COPYING.  If not, see
+ *  <http://www.gnu.org/licenses/>.
+ *
+ */
+
+#include <algorithm>
+
+#include "Timer.h"
+#include "SystemClock.h"
+#include "utils/log.h"
+
+CTimer::CTimer(ITimerCallback *callback)
+  : CThread("CTimer"),
+    m_callback(callback),
+    m_timeout(0),
+    m_interval(false),
+    m_endTime(0)
+{ }
+
+CTimer::~CTimer()
+{
+  Stop(true);
+}
+
+bool CTimer::Start(uint32_t timeout, bool interval /* = false */)
+{
+  if (m_callback == NULL || timeout == 0 || IsRunning())
+  {
+    CLog::Log(LOGWARNING, "CTimer: can't start timer");
+    return false;
+  }
+
+  m_timeout = timeout;
+  m_interval = interval;
+
+  CLog::Log(LOGDEBUG, "CTimer: starting for %d ms %s", m_timeout, m_interval ? "(interval)" : "");
+  Create();
+  return true;
+}
+
+bool CTimer::Stop(bool wait /* = false */)
+{
+  if (!IsRunning())
+    return false;
+
+  CLog::Log(LOGDEBUG, "CTimer: stopping %s", wait ? "(wait)" : "");
+  m_bStop = true;
+  m_eventTimeout.Set();
+  StopThread(wait);
+
+  return true;
+}
+
+float CTimer::GetElapsedSeconds() const
+{
+  return GetElapsedMilliseconds() / 1000.0f;
+}
+
+float CTimer::GetElapsedMilliseconds() const
+{
+  if (!IsRunning())
+    return 0.0f;
+
+  return (float)(XbmcThreads::SystemClockMillis() - (m_endTime - m_timeout));
+}
+
+void CTimer::Process()
+{
+  uint32_t currentTime = XbmcThreads::SystemClockMillis();
+  m_endTime = currentTime + m_timeout;
+
+  while (!m_bStop)
+  {
+    // wait the necessary time
+    if (!m_eventTimeout.WaitMSec(m_endTime - currentTime))
+    {
+      currentTime = XbmcThreads::SystemClockMillis();
+      if (m_endTime <= currentTime)
+      {
+        CLog::Log(LOGDEBUG, "CTimer: timeout");
+        // execute OnTimeout() callback
+        m_callback->OnTimeout();
+
+        // stop if this is not an interval timer
+        if (!m_interval)
+          break;
+
+        CLog::Log(LOGDEBUG, "CTimer: restart");
+        m_endTime = currentTime + m_timeout;
+      }
+    }
+  }
+
+  CLog::Log(LOGDEBUG, "CTimer: finished");
+}
\ No newline at end of file

diff --git a/xbmc/threads/Timer.h b/xbmc/threads/Timer.h
new file mode 100644 (file)
index 0000000..e6c98b9
--- /dev/null
+++ b/xbmc/threads/Timer.h
@@ -0,0 +1,56 @@
+#pragma once
+/*
+ *      Copyright (C) 2012 Team XBMC
+ *      http://www.xbmc.org
+ *
+ *  This Program is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation; either version 2, or (at your option)
+ *  any later version.
+ *
+ *  This Program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with XBMC; see the file COPYING.  If not, see
+ *  <http://www.gnu.org/licenses/>.
+ *
+ */
+
+#include "Event.h"
+#include "Thread.h"
+
+class ITimerCallback
+{
+public:
+  virtual ~ITimerCallback() { }
+  
+  virtual void OnTimeout() = 0;
+};
+
+class CTimer : protected CThread
+{
+public:
+  CTimer(ITimerCallback *callback);
+  virtual ~CTimer();
+
+  bool Start(uint32_t timeout, bool interval = false);
+  bool Stop(bool wait = false);
+
+  bool IsRunning() const { return CThread::IsRunning(); }
+
+  float GetElapsedSeconds() const;
+  float GetElapsedMilliseconds() const;
+  
+protected:
+  virtual void Process();
+  
+private:
+  ITimerCallback *m_callback;
+  uint32_t m_timeout;
+  bool m_interval;
+  uint32_t m_endTime;
+  CEvent m_eventTimeout;
+};