-
Notifications
You must be signed in to change notification settings - Fork 63
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #134 from AlwinEsch/Matrix-change
[Matrix] API change update / cleanups
- Loading branch information
Showing
29 changed files
with
750 additions
and
1,081 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,94 +1,81 @@ | ||
| /* | ||
| * Copyright (C) 2015, 2016 Jamal Edey | ||
| * | ||
| * 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 | ||
| * of the License, 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 Kodi; if not, write to the Free Software | ||
| * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. | ||
| * | ||
| * http://www.gnu.org/licenses/old-licenses/gpl-2.0.html | ||
| * | ||
| */ | ||
|
|
||
| #include "CWatchdog.h" | ||
|
|
||
| #include "client.h" | ||
|
|
||
| #if defined(_WIN32) || defined(_WIN64) | ||
| #include <windows.h> | ||
| #define usleep(usec) Sleep((DWORD)(usec)/1000) | ||
| #else | ||
| #include <unistd.h> | ||
| #endif | ||
|
|
||
| using namespace ADDON; | ||
| using namespace SC; | ||
|
|
||
| CWatchdog::CWatchdog(uint32_t interval, SAPI *api, std::function<void(SError)> errorCallback) | ||
| : m_interval(interval), m_api(api), m_errorCallback(errorCallback), m_threadActive(false) { | ||
| } | ||
|
|
||
| CWatchdog::~CWatchdog() { | ||
| Stop(); | ||
| } | ||
|
|
||
| void CWatchdog::Start() { | ||
| m_threadActive = true; | ||
| m_thread = std::thread([this] { | ||
| Process(); | ||
| }); | ||
| } | ||
|
|
||
| void CWatchdog::Stop() { | ||
| m_threadActive = false; | ||
| if (m_thread.joinable()) | ||
| m_thread.join(); | ||
| } | ||
|
|
||
| void CWatchdog::Process() { | ||
| XBMC->Log(LOG_DEBUG, "%s: start", __FUNCTION__); | ||
|
|
||
| int curPlayType; | ||
| int eventActiveId; | ||
| Json::Value parsed; | ||
| SError ret; | ||
| unsigned int target(m_interval * 1000); | ||
| unsigned int count; | ||
|
|
||
| while (m_threadActive) { | ||
| // hardcode values for now | ||
| curPlayType = 1; // tv | ||
| eventActiveId = 0; | ||
|
|
||
| ret = m_api->WatchdogGetEvents(curPlayType, eventActiveId, parsed); | ||
| if (ret != SERROR_OK) { | ||
| XBMC->Log(LOG_ERROR, "%s: WatchdogGetEvents failed", __FUNCTION__); | ||
|
|
||
| if (m_errorCallback != nullptr) | ||
| m_errorCallback(ret); | ||
| } | ||
|
|
||
| // ignore the result. don't confirm events (yet) | ||
|
|
||
| parsed.clear(); | ||
|
|
||
| count = 0; | ||
| while (count < target) { | ||
| usleep(100000); | ||
| if (!m_threadActive) | ||
| break; | ||
| count += 100; | ||
| } | ||
| } | ||
|
|
||
| XBMC->Log(LOG_DEBUG, "%s: stop", __FUNCTION__); | ||
| } | ||
| /* | ||
| * Copyright (C) 2015-2020 Team Kodi (https://kodi.tv) | ||
| * Copyright (C) 2015, 2016 Jamal Edey | ||
| * | ||
| * SPDX-License-Identifier: GPL-2.0-or-later | ||
| * See LICENSE.md for more information. | ||
| */ | ||
|
|
||
| #include "CWatchdog.h" | ||
|
|
||
| #include "client.h" | ||
|
|
||
| #if defined(_WIN32) || defined(_WIN64) | ||
| #include <windows.h> | ||
| #define usleep(usec) Sleep((DWORD)(usec)/1000) | ||
| #else | ||
| #include <unistd.h> | ||
| #endif | ||
|
|
||
| using namespace ADDON; | ||
| using namespace SC; | ||
|
|
||
| CWatchdog::CWatchdog(uint32_t interval, SAPI *api, std::function<void(SError)> errorCallback) | ||
| : m_interval(interval), m_api(api), m_errorCallback(errorCallback), m_threadActive(false) { | ||
| } | ||
|
|
||
| CWatchdog::~CWatchdog() { | ||
| Stop(); | ||
| } | ||
|
|
||
| void CWatchdog::Start() { | ||
| m_threadActive = true; | ||
| m_thread = std::thread([this] { | ||
| Process(); | ||
| }); | ||
| } | ||
|
|
||
| void CWatchdog::Stop() { | ||
| m_threadActive = false; | ||
| if (m_thread.joinable()) | ||
| m_thread.join(); | ||
| } | ||
|
|
||
| void CWatchdog::Process() { | ||
| XBMC->Log(LOG_DEBUG, "%s: start", __FUNCTION__); | ||
|
|
||
| int curPlayType; | ||
| int eventActiveId; | ||
| Json::Value parsed; | ||
| SError ret; | ||
| unsigned int target(m_interval * 1000); | ||
| unsigned int count; | ||
|
|
||
| while (m_threadActive) { | ||
| // hardcode values for now | ||
| curPlayType = 1; // tv | ||
| eventActiveId = 0; | ||
|
|
||
| ret = m_api->WatchdogGetEvents(curPlayType, eventActiveId, parsed); | ||
| if (ret != SERROR_OK) { | ||
| XBMC->Log(LOG_ERROR, "%s: WatchdogGetEvents failed", __FUNCTION__); | ||
|
|
||
| if (m_errorCallback != nullptr) | ||
| m_errorCallback(ret); | ||
| } | ||
|
|
||
| // ignore the result. don't confirm events (yet) | ||
|
|
||
| parsed.clear(); | ||
|
|
||
| count = 0; | ||
| while (count < target) { | ||
| usleep(100000); | ||
| if (!m_threadActive) | ||
| break; | ||
| count += 100; | ||
| } | ||
| } | ||
|
|
||
| XBMC->Log(LOG_DEBUG, "%s: stop", __FUNCTION__); | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,49 +1,37 @@ | ||
| #pragma once | ||
|
|
||
| /* | ||
| * Copyright (C) 2015, 2016 Jamal Edey | ||
| * | ||
| * 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 | ||
| * of the License, 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 Kodi; if not, write to the Free Software | ||
| * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. | ||
| * | ||
| * http://www.gnu.org/licenses/old-licenses/gpl-2.0.html | ||
| * | ||
| */ | ||
|
|
||
| #include <thread> | ||
| #include <functional> | ||
|
|
||
| #include "SAPI.h" | ||
|
|
||
| namespace SC { | ||
| class CWatchdog { | ||
| public: | ||
| CWatchdog(unsigned int interval, SAPI *api, std::function<void(SError)> errorCallback); | ||
|
|
||
| virtual ~CWatchdog(); | ||
|
|
||
| virtual void Start(); | ||
|
|
||
| virtual void Stop(); | ||
|
|
||
| private: | ||
| void Process(); | ||
|
|
||
| unsigned int m_interval; | ||
| SAPI *m_api; | ||
| std::function<void(SError)> m_errorCallback; | ||
| bool m_threadActive; | ||
| std::thread m_thread; | ||
| }; | ||
| } | ||
| /* | ||
| * Copyright (C) 2015-2020 Team Kodi (https://kodi.tv) | ||
| * Copyright (C) 1015, 2016 Jamal Edey | ||
| * | ||
| * SPDX-License-Identifier: GPL-2.0-or-later | ||
| * See LICENSE.md for more information. | ||
| */ | ||
|
|
||
| #pragma once | ||
|
|
||
| #include <thread> | ||
| #include <functional> | ||
|
|
||
| #include "SAPI.h" | ||
|
|
||
| namespace SC { | ||
| class CWatchdog { | ||
| public: | ||
| CWatchdog(unsigned int interval, SAPI *api, std::function<void(SError)> errorCallback); | ||
|
|
||
| virtual ~CWatchdog(); | ||
|
|
||
| virtual void Start(); | ||
|
|
||
| virtual void Stop(); | ||
|
|
||
| private: | ||
| void Process(); | ||
|
|
||
| unsigned int m_interval; | ||
| SAPI *m_api; | ||
| std::function<void(SError)> m_errorCallback; | ||
| bool m_threadActive; | ||
| std::thread m_thread; | ||
| }; | ||
| } | ||
|
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.