Skip to content

Commit

Permalink
Merge branch 'main' into main
Browse files Browse the repository at this point in the history
bobseamon authored Mar 8, 2021
2 parents 2b4598d + c9fe86e commit ffb85d4
Showing 250 changed files with 24,434 additions and 6,040 deletions.
8 changes: 6 additions & 2 deletions AVInput/AVInput.cpp
Original file line number Diff line number Diff line change
@@ -210,9 +210,13 @@ namespace WPEFramework {
// Thunder plugins communication
std::shared_ptr<WPEFramework::JSONRPC::LinkType<WPEFramework::Core::JSON::IElement> > AVInput::getThunderControllerClient()
{
string token;
Utils::SecurityToken::getSecurityToken(token);
string query = "token=" + token;

// making function local static to be thread safe
Core::SystemInfo::SetEnvironment(_T("THUNDER_ACCESS"), (_T(SERVER_DETAILS)));
static std::shared_ptr<WPEFramework::JSONRPC::LinkType<WPEFramework::Core::JSON::IElement> > thunderClient = make_shared<WPEFramework::JSONRPC::LinkType<WPEFramework::Core::JSON::IElement> >("", "");
static std::shared_ptr<WPEFramework::JSONRPC::LinkType<WPEFramework::Core::JSON::IElement> > thunderClient = make_shared<WPEFramework::JSONRPC::LinkType<WPEFramework::Core::JSON::IElement> >("", "", false, query);
return thunderClient;
}

@@ -259,7 +263,7 @@ namespace WPEFramework {
{
if (p != m_activatedPlugins.end())
{
LOGWARN("Previoulsly active plugin %s appers to be deactivated, removing from the list", callSign);
LOGWARN("Previously active plugin %s appers to be deactivated, removing from the list", callSign);
m_activatedPlugins.erase(p);
}
} else {
2 changes: 2 additions & 0 deletions AVInput/CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -25,6 +25,7 @@ add_library(${MODULE_NAME} SHARED
AVInput.cpp
Module.cpp
../helpers/tptimer.cpp
../helpers/utils.cpp
)

set_target_properties(${MODULE_NAME} PROPERTIES
@@ -36,6 +37,7 @@ target_include_directories(${MODULE_NAME} PRIVATE ../helpers)
target_link_libraries(${MODULE_NAME}
PRIVATE
${NAMESPACE}Protocols::${NAMESPACE}Protocols
${NAMESPACE}SecurityUtil
)
find_package(DS)
find_package(IARMBus)
1 change: 1 addition & 0 deletions AVInput/doc/AVInput.md
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
[AVInput Docs](https://wiki.rdkcentral.com/display/RDK/AV+Input)
1 change: 1 addition & 0 deletions ActivityMonitor/doc/ActivityMonitor.md
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
[Activity Monitor docs](https://wiki.rdkcentral.com/display/RDK/ActivityMonitor)
2 changes: 2 additions & 0 deletions Bluetooth/doc/Bluetooth.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
[Bluetooth](https://wiki.rdkcentral.com/display/RDK/Bluetooth)

Loading

0 comments on commit ffb85d4

Please sign in to comment.