Initial commit

CompileHowto.md

@@ -40,7 +40,7 @@ wget -qN https://raw.github.com/hyperion-project/hyperion.ng/master/bin/scripts/
 
 ```
 sudo apt-get update
-sudo apt-get install git cmake build-essential qtbase5-dev libqt5serialport5-dev libusb-1.0-0-dev python3-dev libxcb-util0-dev libxcb-randr0-dev libxrandr-dev libxrender-dev libavahi-core-dev libavahi-compat-libdnssd-dev libjpeg-dev libturbojpeg0-dev libqt5sql5-sqlite libssl-dev zlib1g-dev
+sudo apt-get install git cmake build-essential qtbase5-dev libqt5serialport5-dev libusb-1.0-0-dev python3-dev libcec-dev libxcb-util0-dev libxcb-randr0-dev libxrandr-dev libxrender-dev libavahi-core-dev libavahi-compat-libdnssd-dev libjpeg-dev libturbojpeg0-dev libqt5sql5-sqlite libssl-dev zlib1g-dev
 ```
 
 **on RPI you need the videocore IV headers**

CrossCompileHowto.md

@@ -4,14 +4,14 @@ Use a clean Raspbian Stretch Lite (on target) and Ubuntu 18/19 (on host) to exec
 ## On the Target system (here Raspberry Pi)
 Install required additional packages.
 ```
-sudo apt-get install qtbase5-dev libqt5serialport5-dev libusb-1.0-0-dev python3-dev libxcb-util0-dev libxcb-randr0-dev libxrandr-dev libxrender-dev libavahi-core-dev libavahi-compat-libdnssd-dev libjpeg-dev libturbojpeg0-dev libqt5sql5-sqlite aptitude qt5-default rsync libssl-dev zlib1g-dev
+sudo apt-get install qtbase5-dev libqt5serialport5-dev libusb-1.0-0-dev python3-dev libcec-dev libxcb-util0-dev libxcb-randr0-dev libxrandr-dev libxrender-dev libavahi-core-dev libavahi-compat-libdnssd-dev libjpeg-dev libturbojpeg0-dev libqt5sql5-sqlite aptitude qt5-default rsync libssl-dev zlib1g-dev
 ```
 ## On the Host system (here Ubuntu)
 Update the Ubuntu environment to the latest stage and install required additional packages.
 ```
 sudo apt-get update
 sudo apt-get upgrade
-sudo apt-get -qq -y install git rsync cmake build-essential qtbase5-dev libqt5serialport5-dev libusb-1.0-0-dev python3-dev libxcb-util0-dev libxcb-randr0-dev libxrandr-dev libxrender-dev libavahi-core-dev libavahi-compat-libdnssd-dev libjpeg-dev libturbojpeg0-dev libqt5sql5-sqlite libssl-dev zlib1g-dev
+sudo apt-get -qq -y install git rsync cmake build-essential qtbase5-dev libqt5serialport5-dev libusb-1.0-0-dev python3-dev libcec-dev libxcb-util0-dev libxcb-randr0-dev libxrandr-dev libxrender-dev libavahi-core-dev libavahi-compat-libdnssd-dev libjpeg-dev libturbojpeg0-dev libqt5sql5-sqlite libssl-dev zlib1g-dev
 ```
 
 Refine the target IP or hostname, plus userID as required and set-up cross-compilation environment:

assets/webconfig/js/content_grabber.js

@@ -331,10 +331,5 @@ $(document).ready( function() {
       hideEl(["pixelDecimation"]);
   });
 
-  $(window.hyperion).on("cmd-scan", function(event) {
-    console.log(event.response);
-  });
-  requestCecScan();
-
   removeOverlay();
 });

assets/webconfig/js/hyperion.js

@@ -448,11 +448,6 @@ function requestAdjustment(type, value, complete)
 		sendToHyperion("adjustment", "", '"adjustment": {"'+type+'": '+value+'}');
 }
 
-async function requestCecScan()
-{
-	return sendAsyncToHyperion("cec", "scan", "", Math.floor(Math.random() * 1000));
-}
-
 async function requestLedDeviceDiscovery(type)
 {
 	let data = { ledDeviceType: type };

bin/compile.sh

@@ -5,7 +5,7 @@ CFG="${2:-Release}"
 INST="$( [ "${3:-}" = "install" ] && echo true || echo false )"
 
 sudo apt-get update
-sudo apt-get install git cmake build-essential qtbase5-dev libqt5serialport5-dev libusb-1.0-0-dev libturbojpeg0-dev python3-dev libxcb-util0-dev libxcb-randr0-dev libxrandr-dev libxrender-dev libavahi-core-dev libavahi-compat-libdnssd-dev libssl-dev libjpeg-dev libqt5sql5-sqlite zlib1g-dev || exit 1
+sudo apt-get install git cmake build-essential qtbase5-dev libqt5serialport5-dev libusb-1.0-0-dev libturbojpeg0-dev python3-dev libcec-dev libxcb-util0-dev libxcb-randr0-dev libxrandr-dev libxrender-dev libavahi-core-dev libavahi-compat-libdnssd-dev libssl-dev libjpeg-dev libqt5sql5-sqlite zlib1g-dev || exit 1
 
 if [ -e /dev/vc-cma -a -e /dev/vc-mem ]
 then

bin/create_release.sh

@@ -14,7 +14,7 @@ if ! [ -d "$builddir" ]; then
 	echo "Could not find build director"
 	exit 1
 fi
-	
+
 outfile="$repodir/deploy/hyperion_$buildid.tar.gz"
 echo create $outfile
 

cmake/Dependencies.cmake

@@ -24,7 +24,6 @@ macro(DeployUnix TARGET)
 			"libusb-1"
 			"libutil"
 			"libX11"
-			"libz"
 		)
 
 		if (APPLE)

cmake/FindCEC.cmake

@@ -0,0 +1,19 @@
+# - Try to find CEC
+# Once done this will define
+#
+# CEC_FOUND - system has libcec
+# CEC_INCLUDE_DIRS - the libcec include directory
+# CEC_LIBRARIES - The libcec libraries
+
+if(PKG_CONFIG_FOUND)
+  pkg_check_modules (CEC libcec>=3.0.0)
+else()
+  find_path(CEC_INCLUDE_DIRS libcec/cec.h)
+  find_library(CEC_LIBRARIES cec)
+endif()
+
+include(FindPackageHandleStandardArgs)
+find_package_handle_standard_args(CEC DEFAULT_MSG CEC_INCLUDE_DIRS CEC_LIBRARIES)
+
+list(APPEND CEC_DEFINITIONS -DHAVE_LIBCEC=1)
+mark_as_advanced(CEC_INCLUDE_DIRS CEC_LIBRARIES CEC_DEFINITIONS)

include/api/API.h

@@ -341,12 +341,6 @@ class API : public QObject
     ///
     bool hasHyperionDefaultPw();
 
-    ///
-    /// @brief Scan HDMI bus for available CEC devices
-    /// @return Scan results
-    ///
-    QString scanCec();
-
     ///
     /// @brief Logout revokes all authorizations
     ///

include/api/JsonAPI.h

@@ -277,12 +277,6 @@ private slots:
 	///
 	void handleLedDeviceCommand(const QJsonObject &message, const QString &command, const int tan);
 
-	/// Handle an incoming JSON Led Device message
-	///
-	/// @param message the incoming message
-	///
-	void handleCecCommand(const QJsonObject &message, const QString &command, const int tan);
-
 	///
 	/// Handle an incoming JSON message of unknown type
 	///

include/cec/CECHandler.h

@@ -1,7 +1,6 @@
 #pragma once
 
 #include <QObject>
-#include <QMutex>
 #include <QVector>
 
 #include <iostream>
@@ -19,35 +18,29 @@ using CECCommand           = CEC::cec_command;
 using CECLogicalAddress    = CEC::cec_logical_address;
 using CECLogicalAddresses  = CEC::cec_logical_addresses;
 using CECMenuState         = CEC::cec_menu_state;
+using CECPowerStatus       = CEC::cec_power_status;
+using CECVendorId          = CEC::cec_vendor_id;
 using CECParameter         = CEC::libcec_parameter;
 using CECConfig            = CEC::libcec_configuration;
 using CECAlert             = CEC::libcec_alert;
-using CECPowerStatus       = CEC::cec_power_status;
-using CECVendorId          = CEC::cec_vendor_id;
 
 class CECHandler : public QObject
 {
 	Q_OBJECT
 public:
+	CECHandler();
 	~CECHandler() override;
 
-	static CECHandler * getInstance()
-	{
-		static CECHandler instance;
-		return &instance;
-	}
+	QString scan() const;
 
+public slots:
 	bool start();
 	void stop();
-	bool running() const { return _cecAdapter != nullptr; }
-	QString scan() const;
 
 signals:
 	void cecEvent(CECEvent event);
 
 private:
-	CECHandler();
-
 	/* CEC Callbacks */
 	static void onCecLogMessage           (void * context, const CECLogMessage * message);
 	static void onCecKeyPress             (void * context, const CECKeyPress * key);
@@ -69,6 +62,4 @@ class CECHandler : public QObject
 	CECAdapter * _cecAdapter   {};
 	CECCallbacks _cecCallbacks {};
 	CECConfig    _cecConfig    {};
-
-	mutable QMutex _lock { QMutex::Recursive };
 };

libsrc/api/API.cpp

@@ -15,7 +15,6 @@
 #include <QTimer>
 
 // hyperion includes
-#include <cec/CECHandler.h>
 #include <leddevice/LedDeviceWrapper.h>
 #include <hyperion/GrabberWrapper.h>
 #include <utils/jsonschema/QJsonFactory.h>
@@ -528,10 +527,3 @@ void API::checkTokenResponse(const bool &success, QObject *caller, const QString
 void API::stopDataConnectionss()
 {
 }
-
-QString API::scanCec()
-{
-    if (!_adminAuthorized)
-        return {};
-    return CECHandler::getInstance()->scan();
-}

libsrc/api/CMakeLists.txt

@@ -19,7 +19,3 @@ target_link_libraries(hyperion-api
 	Qt5::Gui
 	Qt5::Network
 )
-
-if (ENABLE_CEC)
-        target_link_libraries(hyperion-api cechandler)
-endif ()

libsrc/api/JSONRPC_schema/schema.json

@@ -5,7 +5,7 @@
 		"command": {
 			"type" : "string",
 			"required" : true,
-			"enum" : ["cec" , "color", "image", "effect", "create-effect", "delete-effect", "serverinfo", "clear", "clearall", "adjustment", "sourceselect", "config", "componentstate", "ledcolors", "logging", "processing", "sysinfo", "videomode", "authorize", "instance", "leddevice", "transform", "correction" , "temperature"]
+			"enum" : ["color", "image", "effect", "create-effect", "delete-effect", "serverinfo", "clear", "clearall", "adjustment", "sourceselect", "config", "componentstate", "ledcolors", "logging", "processing", "sysinfo", "videomode", "authorize", "instance", "leddevice", "transform", "correction" , "temperature"]
 		}
 	}
 }

libsrc/api/JSONRPC_schemas.qrc

@@ -1,7 +1,6 @@
 <RCC>
     <qresource prefix="/">
         <file alias="schema">JSONRPC_schema/schema.json</file>
-        <file alias="schema-cec">JSONRPC_schema/schema-cec.json</file>
         <file alias="schema-color">JSONRPC_schema/schema-color.json</file>
         <file alias="schema-image">JSONRPC_schema/schema-image.json</file>
         <file alias="schema-serverinfo">JSONRPC_schema/schema-serverinfo.json</file>

libsrc/api/JsonAPI.cpp

@@ -198,8 +198,6 @@ void JsonAPI::handleMessage(const QString &messageString, const QString &httpAut
 		handleInstanceCommand(message, command, tan);
 	else if (command == "leddevice")
 		handleLedDeviceCommand(message, command, tan);
-	else if (command == "cec")
-		handleCecCommand(message, command, tan);
 
 	// BEGIN | The following commands are derecated but used to ensure backward compatibility with hyperion Classic remote control
 	else if (command == "clearall")
@@ -1466,30 +1464,6 @@ void JsonAPI::handleLedDeviceCommand(const QJsonObject &message, const QString &
 	}
 }
 
-
-void JsonAPI::handleCecCommand(const QJsonObject &message, const QString &command, const int tan)
-{
-	Debug(_log, "message: [%s]", QString(QJsonDocument(message).toJson(QJsonDocument::Compact)).toUtf8().constData());
-
-	const QString &subcommand = message["subcommand"].toString().trimmed();
-
-	QString full_command = command + "-" + subcommand;
-
-	if (subcommand == "scan")
-	{
-		QJsonObject devices;
-		devices.insert("devices", API::scanCec());
-		QJsonDocument document(devices);
-
-                Debug(_log, "response: [%s]", QString(document.toJson(QJsonDocument::Compact)).toUtf8().constData());
-		sendSuccessDataReply(document, full_command, tan);
-	}
-	else
-	{
-		sendErrorReply("Unknown or missing subcommand", full_command, tan);
-	}
-}
-
 void JsonAPI::handleNotImplemented()
 {
 	sendErrorReply("Command not implemented");