Renaming WPEFramework to Thunder (#788)

* Renaming WPEFramework to Thunder

* NOTICE file update

* Remove Thunder from PLUGIN Config

AVS/AVS.cpp

@@ -19,7 +19,7 @@
 
 #include "AVS.h"
 
-namespace WPEFramework {
+namespace Thunder {
 namespace Plugin {
 
      namespace {
@@ -172,4 +172,4 @@ namespace Plugin {
     }
 
 } // namespace Plugin
-} // namespace WPEFramework
+} // namespace Thunder

AVS/AVS.h

@@ -30,7 +30,7 @@
 #include "SmartScreen/SmartScreen.h"
 #endif
 
-namespace WPEFramework {
+namespace Thunder {
 namespace Plugin {
 
     class AVS
@@ -242,4 +242,4 @@ namespace Plugin {
     };
 
 } // namespace Plugin
-} // namespace WPEFramework
+} // namespace Thunder

AVS/AVSPlugin.json

@@ -4,7 +4,7 @@
     "class": "AVS",
     "title": "AVS Plugin",
     "callsign": "AVS",
-    "locator": "libWPEFrameworkAVS.so",
+    "locator": "libThunderAVS.so",
     "status": "alpha",
     "description": "The Alexa Voice Service Headless Client serves as a personal assistant",
     "version": "1.0"
@@ -17,15 +17,15 @@
         "properties": {
           "alexaclientconfig": {
             "type": "string",
-            "description": "The path to the AlexaClientSDKConfig.json (e.g /usr/share/WPEFramework/AVS/AlexaClientSDKConfig.json)"
+            "description": "The path to the AlexaClientSDKConfig.json (e.g /usr/share/Thunder/AVS/AlexaClientSDKConfig.json)"
           },
           "smartscreenconfig": {
             "type": "string",
-            "description": "The path to the SmartScreenSDKConfig.json (e.g /usr/share/WPEFramework/AVS/SmartScreenSDKConfig.json). This config will be used only when SmartScreen functionality is enabled"
+            "description": "The path to the SmartScreenSDKConfig.json (e.g /usr/share/Thunder/AVS/SmartScreenSDKConfig.json). This config will be used only when SmartScreen functionality is enabled"
           },
           "kwdmodelspath": {
             "type": "string",
-            "description": "Path to the Keyword Detection models (e.g /usr/share/WPEFramework/AVS/models). The path mus contain the localeToModels.json file"
+            "description": "Path to the Keyword Detection models (e.g /usr/share/Thunder/AVS/models). The path mus contain the localeToModels.json file"
           },
           "loglevel": {
             "type": "string",

AVS/CMakeLists.txt

@@ -19,7 +19,7 @@ project(AVS)
 
 cmake_minimum_required(VERSION 3.3 FATAL_ERROR)
 
-find_package(WPEFramework REQUIRED)
+find_package(Thunder REQUIRED)
 
 project_version(1.0.0)
 
@@ -46,7 +46,7 @@ set(PLUGIN_AVS_NAME "AVS" CACHE STRING "The plugin name")
 set(PLUGIN_AVS_STARTMODE "Deactivated" CACHE STRING "Automatically start plugin")
 set(PLUGIN_AVS_MODE "Off" CACHE STRING "Controls if the plugin should run in its own process, in process or remote")
 set(PLUGIN_AVS_PLATFORM "rpi3" CACHE STRING "Platform name (currently only rpi3)")
-set(PLUGIN_AVS_DATA_PATH "/usr/share/WPEFramework/" CACHE STRING "Path were AVS data will be stored")
+set(PLUGIN_AVS_DATA_PATH "/usr/share/Thunder/" CACHE STRING "Path were AVS data will be stored")
 set(PLUGIN_AVS_ALEXA_CLIENT_CONFIG "${PLUGIN_AVS_DATA_PATH}/${PLUGIN_AVS_NAME}/AlexaClientSDKConfig.json" CACHE STRING "Path to AlexaClientSDKConfig")
 set(PLUGIN_AVS_SMART_SCREEN_CONFIG "${PLUGIN_AVS_DATA_PATH}/${PLUGIN_AVS_NAME}/SmartScreenSDKConfig.json" CACHE STRING "Path to SmartScreenSDKConfig")
 set(PLUGIN_AVS_LOG_LEVEL "DEBUG0" CACHE STRING "Default log level for the SDK")

AVS/Impl/AVSDevice/AVSDevice.cpp

@@ -64,7 +64,7 @@
 #include <cctype>
 #include <fstream>
 
-namespace WPEFramework {
+namespace Thunder {
 namespace Plugin {
 
     SERVICE_REGISTRATION(AVSDevice, 1, 0)

AVS/Impl/AVSDevice/AVSDevice.h

@@ -33,7 +33,7 @@
 
 #include <vector>
 
-namespace WPEFramework {
+namespace Thunder {
 namespace Plugin {
 
     class AVSDevice

AVS/Impl/AVSDevice/CMakeLists.txt

@@ -21,22 +21,22 @@ find_package(AlexaClientSDK REQUIRED)
 find_package(GStreamer REQUIRED)
 find_package(PortAudio)
 find_package(PryonLite)
-find_package(WPEFramework REQUIRED)
+find_package(Thunder REQUIRED)
 
-set(WPEFRAMEWORK_PLUGIN_AVS_AVSDEVICE_SOURCES)
-list(APPEND WPEFRAMEWORK_PLUGIN_AVS_AVSDEVICE_SOURCES
+set(PLUGIN_AVS_AVSDEVICE_SOURCES)
+list(APPEND PLUGIN_AVS_AVSDEVICE_SOURCES
     AVSDevice.cpp
     ThunderInputManager.cpp
     ../Module.cpp
     ../ThunderLogger.cpp
 )
 set_source_files_properties(AVSDevice.cpp  PROPERTIES COMPILE_FLAGS "-fexceptions")
 if(PLUGIN_AVS_ENABLE_KWD_SUPPORT)
-    list(APPEND WPEFRAMEWORK_PLUGIN_AVS_AVSDEVICE_SOURCES ../PryonKeywordDetector.cpp)
+    list(APPEND PLUGIN_AVS_AVSDEVICE_SOURCES ../PryonKeywordDetector.cpp)
     add_definitions(-DKWD_PRYON)
 endif()
 
-add_library(${MODULE_NAME} ${WPEFRAMEWORK_PLUGIN_AVS_AVSDEVICE_SOURCES})
+add_library(${MODULE_NAME} ${PLUGIN_AVS_AVSDEVICE_SOURCES})
 
 set_target_properties(${MODULE_NAME} PROPERTIES
         CXX_STANDARD 11

AVS/Impl/AVSDevice/ThunderInputManager.cpp

@@ -19,7 +19,7 @@
 
 #include "ThunderInputManager.h"
 
-namespace WPEFramework {
+namespace Thunder {
 namespace Plugin {
 
     using namespace alexaClientSDK::avsCommon::sdkInterfaces;
@@ -175,4 +175,4 @@ namespace Plugin {
     }
 
 } // namespace Plugin
-} // namespace WPEFramework
+} // namespace Thunder

AVS/Impl/AVSDevice/ThunderInputManager.h

@@ -26,7 +26,7 @@
 
 #include <atomic>
 
-namespace WPEFramework {
+namespace Thunder {
 namespace Plugin {
 
     /// Observes user input from the console and notifies the interaction manager of the user's intentions.
@@ -83,4 +83,4 @@ namespace Plugin {
     };
 
 } // namespace Plugin
-} // namespace WPEFramework
+} // namespace Thunder

AVS/Impl/CompatibleAudioFormat.h

@@ -23,7 +23,7 @@
 
 #include <AVSCommon/Utils/AudioFormat.h>
 
-namespace WPEFramework {
+namespace Thunder {
 namespace Plugin {
 
     namespace AudioFormatCompatibility {
@@ -63,4 +63,4 @@ namespace Plugin {
 
     } // namespace AudioFormatCompatibility
 } // namespace Plugin
-} // namespace WPEFramework
+} // namespace Thunder

AVS/Impl/PryonKeywordDetector.cpp

@@ -26,7 +26,7 @@
 
 #include <memory>
 
-namespace WPEFramework {
+namespace Thunder {
 namespace Plugin {
 
     using namespace alexaClientSDK;
@@ -254,4 +254,4 @@ namespace Plugin {
     }
 
 } // namespace Plugin
-} // namespace WPEFramework
+} // namespace Thunder

AVS/Impl/PryonKeywordDetector.h

@@ -32,7 +32,7 @@
 #include <thread>
 #include <unordered_set>
 
-namespace WPEFramework {
+namespace Thunder {
 namespace Plugin {
 
     class PryonKeywordDetector : public alexaClientSDK::acsdkKWDImplementations::AbstractKeywordDetector {
@@ -73,4 +73,4 @@ namespace Plugin {
     };
 
 } // namespace Plugin
-} // namespace WPEFramework
+} // namespace Thunder

AVS/Impl/SmartScreen/CMakeLists.txt

@@ -17,7 +17,7 @@
 
 set(MODULE_NAME SmartScreen)
 
-find_package(WPEFramework REQUIRED)
+find_package(Thunder REQUIRED)
 find_package(AlexaClientSDK REQUIRED)
 find_package(AlexaSmartScreenSDK REQUIRED)
 
@@ -26,8 +26,8 @@ find_package(PortAudio)
 find_package(Asio REQUIRED)
 find_package(PryonLite)
 
-set(WPEFRAMEWORK_PLUGIN_AVS_SMARTSCREEN_SOURCES)
-list(APPEND WPEFRAMEWORK_PLUGIN_AVS_SMARTSCREEN_SOURCES
+set(PLUGIN_AVS_SMARTSCREEN_SOURCES)
+list(APPEND PLUGIN_AVS_SMARTSCREEN_SOURCES
     SmartScreen.cpp
     ../Module.cpp
     ../ThunderLogger.cpp
@@ -36,12 +36,12 @@ list(APPEND WPEFRAMEWORK_PLUGIN_AVS_SMARTSCREEN_SOURCES
 add_definitions(-DENABLE_SMART_SCREEN_SUPPORT)
 
 if(PLUGIN_AVS_ENABLE_KWD_SUPPORT)
-    list(APPEND WPEFRAMEWORK_PLUGIN_AVS_SMARTSCREEN_SOURCES ../PryonKeywordDetector.cpp)
+    list(APPEND PLUGIN_AVS_SMARTSCREEN_SOURCES ../PryonKeywordDetector.cpp)
     add_definitions(-DKWD_PRYON)
 endif()
 
 set_source_files_properties(SmartScreen.cpp PROPERTIES COMPILE_FLAGS "-fexceptions" )
-add_library(${MODULE_NAME} ${WPEFRAMEWORK_PLUGIN_AVS_SMARTSCREEN_SOURCES})
+add_library(${MODULE_NAME} ${PLUGIN_AVS_SMARTSCREEN_SOURCES})
 
 set_target_properties(${MODULE_NAME}
     PROPERTIES

AVS/Impl/SmartScreen/SmartScreen.cpp

@@ -74,7 +74,7 @@
 #include <cctype>
 #include <fstream>
 
-namespace WPEFramework {
+namespace Thunder {
 namespace Plugin {
 
     SERVICE_REGISTRATION(SmartScreen, 1, 0)

AVS/Impl/SmartScreen/SmartScreen.h

@@ -28,7 +28,7 @@
 
 #include <vector>
 
-namespace WPEFramework {
+namespace Thunder {
 namespace Plugin {
 
     class SmartScreen

AVS/Impl/ThunderLogger.cpp

@@ -21,10 +21,10 @@
 
 #include "TraceCategories.h"
 
-namespace WPEFramework {
+namespace Thunder {
 namespace Plugin {
 
-    // using namespace WPEFramework;
+    // using namespace Thunder;
     using namespace alexaClientSDK::avsCommon::utils;
     using namespace alexaClientSDK::avsCommon::utils::logger;
 
@@ -67,7 +67,7 @@ namespace Plugin {
     }
 
 } // namespace Plugin
-} // namespace WPEFramework
+} // namespace Thunder
 
 namespace alexaClientSDK {
 namespace avsCommon {
@@ -76,7 +76,7 @@ namespace avsCommon {
 
             std::shared_ptr<alexaClientSDK::avsCommon::utils::logger::Logger> getThunderLogger()
             {
-                return WPEFramework::Plugin::ThunderLogger::instance();
+                return Thunder::Plugin::ThunderLogger::instance();
             }
 
         } // namespace logger

AVS/Impl/ThunderLogger.h

@@ -24,7 +24,7 @@
 #include <mutex>
 #include <string>
 
-namespace WPEFramework {
+namespace Thunder {
 namespace Plugin {
 
     /**
@@ -50,7 +50,7 @@ namespace Plugin {
     };
 
 } // namespace Plugin
-} // namespace WPEFramework
+} // namespace Thunder
 
 namespace alexaClientSDK {
 namespace avsCommon {

AVS/Impl/ThunderVoiceHandler.h

@@ -33,7 +33,7 @@
 #include <mutex>
 #include <thread>
 
-namespace WPEFramework {
+namespace Thunder {
 namespace Plugin {
 
     /// Responsible for making an interaction on audio data
@@ -342,4 +342,4 @@ namespace Plugin {
     };
 
 } // namespace Plugin
-} // namespace WPEFramework
+} // namespace Thunder

AVS/Impl/TraceCategories.h

@@ -21,7 +21,7 @@
 
 #include "Module.h"
 
-namespace WPEFramework {
+namespace Thunder {
 namespace Plugin {
 
     /**

AVS/cmake/FindGStreamer.cmake

@@ -0,0 +1,62 @@
+# - Try to find gstreamer.
+# Once done, this will define
+#
+#  GSTREAMER_FOUND - the gstreamer is available
+#  GSTREAMER::GSTREAMER - The gstreamer library and all its dependecies
+#
+# Copyright (C) 2019 Metrological B.V
+#
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions
+# are met:
+# 1.  Redistributions of source code must retain the above copyright
+#     notice, this list of conditions and the following disclaimer.
+# 2.  Redistributions in binary form must reproduce the above copyright
+#     notice, this list of conditions and the following disclaimer in the
+#     documentation and/or other materials provided with the distribution.
+#
+# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDER AND ITS CONTRIBUTORS ``AS
+# IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
+# THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+# PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR ITS
+# CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+# EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
+# OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+# OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+if(GStreamer_FIND_QUIETLY)
+    set(_GSTREAMER_MODE QUIET)
+elseif(GStreamer_FIND_REQUIRED)
+    set(_GSTREAMER_MODE REQUIRED)
+endif()
+
+find_package(PkgConfig)
+pkg_check_modules(PC_GSTREAMER ${_GSTREAMER_MODE} gstreamer-1.0)
+
+include(FindPackageHandleStandardArgs)
+find_package_handle_standard_args(GStreamer DEFAULT_MSG PC_GSTREAMER_FOUND PC_GSTREAMER_INCLUDE_DIRS PC_GSTREAMER_LIBRARIES)
+mark_as_advanced(PC_GSTREAMER_INCLUDE_DIRS PC_GSTREAMER_LIBRARIES PC_GSTREAMER_LIBRARY_DIRS)
+
+if(GStreamer_FOUND)
+    set(GSTREAMER_LIBRARIES ${PC_GSTREAMER_LIBRARIES})
+    set(GSTREAMER_INCLUDES ${PC_GSTREAMER_INCLUDE_DIRS})
+    set(GSTREAMER_FOUND ${GStreamer_FOUND})
+    find_library(GSTREAMER_LIBRARY gstreamer-1.0 HINTS ${PC_GSTREAMER_LIBDIR} ${PC_GSTREAMER_LIBRARY_DIRS})
+
+    if(NOT TARGET GStreamer::GStreamer)
+        add_library(GStreamer::GStreamer UNKNOWN IMPORTED)
+
+        set_target_properties(GStreamer::GStreamer
+                PROPERTIES
+                IMPORTED_LINK_INTERFACE_LANGUAGES "C"
+                IMPORTED_LOCATION "${GSTREAMER_LIBRARY}"
+                INTERFACE_COMPILE_DEFINITIONS "GSTREAMER"
+                INTERFACE_COMPILE_OPTIONS "${PC_GSTREAMER_CFLAGS_OTHER}"
+                INTERFACE_INCLUDE_DIRECTORIES "${GSTREAMER_INCLUDES}"
+                INTERFACE_LINK_LIBRARIES "${GSTREAMER_LIBRARIES}"
+                )
+    endif()
+endif()