X-Git-Url: https://git.piment-noir.org/?a=blobdiff_plain;f=include%2Fcec.h;h=b159117fe7def9a42a21a7716a3b049b0dd5ce27;hb=3efda01ac7b070e09012a5725112eb44c17001b4;hp=cbc83463e6d327d2c953310e9cf54c3c7d1f1cca;hpb=566a8c68bb4c34031b6f61b2afdcb05c9f1d755c;p=deb_libcec.git

diff --git a/include/cec.h b/include/cec.h
index cbc8346..b159117 100644
--- a/include/cec.h
+++ b/include/cec.h
@@ -88,42 +88,6 @@ namespace CEC
     virtual bool StartBootloader(void) = 0;
     //@}
 
-    /*!
-     * @return Get the minimal version of libcec that this version of libcec can interface with.
-     */
-    virtual int8_t GetMinLibVersion(void) const = 0;
-
-    /*!
-     * @return Get the major version of libcec.
-     */
-    virtual int8_t GetLibVersionMajor(void) const = 0;
-
-    /*!
-     * @return Get the minor version of libcec.
-     */
-    virtual int8_t GetLibVersionMinor(void) const = 0;
-
-    /*!
-     * @brief Get the next log message in the queue, if there is one.
-     * @param message The next message.
-     * @return True if a message was passed, false otherwise.
-     */
-    virtual bool GetNextLogMessage(cec_log_message *message) = 0;
-
-    /*!
-     * @brief Get the next keypress in the queue, if there is one.
-     * @param key The next keypress.
-     * @return True if a key was passed, false otherwise.
-     */
-    virtual bool GetNextKeypress(cec_keypress *key) = 0;
-
-    /*!
-     * @brief Get the next CEC command that was received by the adapter.
-     * @param action The next command.
-     * @return True when a command was passed, false otherwise.
-     */
-    virtual bool GetNextCommand(cec_command *command) = 0;
-
     /*!
      * @brief Transmit a command over the CEC line.
      * @param data The command to send.
@@ -145,13 +109,6 @@ namespace CEC
      */
     virtual bool SetPhysicalAddress(uint16_t iPhysicalAddress = CEC_DEFAULT_PHYSICAL_ADDRESS) = 0;
 
-    /*!
-     * @deprecated Use libcec_configuration instead.
-     * @brief Enable physical address detection (if the connected adapter supports this).
-     * @return True when physical address detection was enabled, false otherwise.
-     */
-    virtual bool EnablePhysicalAddressDetection(void) = 0;
-
     /*!
      * @brief Changes the active HDMI port.
      * @param iBaseDevice The device to which this libcec is connected.
@@ -181,11 +138,6 @@ namespace CEC
      */
     virtual bool SetActiveSource(cec_device_type type = CEC_DEVICE_TYPE_RESERVED) = 0;
 
-    /*!
-     * @deprecated Use SetActiveSource() instead
-     */
-    virtual bool SetActiveView(void) = 0;
-
     /*!
      * @brief Change the deck control mode, if this adapter is registered as playback device.
      * @param mode The new control mode.
@@ -279,6 +231,11 @@ namespace CEC
      */
     virtual cec_logical_addresses GetActiveDevices(void) = 0;
 
+		/*!
+     * @brief Tell libCEC to poll for active devices on the bus.
+     */
+    virtual void RescanActiveDevices(void) = 0;
+
     /*!
      * @brief Check whether a device is active on the bus.
      * @param iAddress The address to check.
@@ -407,6 +364,64 @@ namespace CEC
     virtual const char *ToString(const cec_audio_status status) = 0;
     virtual const char *ToString(const cec_vendor_id vendor) = 0;
     virtual const char *ToString(const cec_client_version version) = 0;
+    virtual const char *ToString(const cec_server_version version) = 0;
+
+    ////// deprecated methods, may be removed in a future version //////
+
+    /*!
+     * @deprecated Use libcec_configuration instead.
+     * @brief Enable physical address detection (if the connected adapter supports this).
+     * @return True when physical address detection was enabled, false otherwise.
+     */
+    virtual bool EnablePhysicalAddressDetection(void) = 0;
+
+    /*!
+     * @deprecated Use SetActiveSource() instead
+     */
+    virtual bool SetActiveView(void) = 0;
+
+        /*!
+     * @deprecated Use libcec_configuration instead
+     * @return Get the minimal version of libcec that this version of libcec can interface with.
+     */
+    virtual int8_t GetMinLibVersion(void) const = 0;
+
+    /*!
+     * @deprecated Use libcec_configuration instead
+     * @return Get the major version of libcec.
+     */
+    virtual int8_t GetLibVersionMajor(void) const = 0;
+
+    /*!
+     * @deprecated Use libcec_configuration instead
+     * @return Get the minor version of libcec.
+     */
+    virtual int8_t GetLibVersionMinor(void) const = 0;
+
+    /*!
+     * @deprecated Use callback methods instead
+     * @brief Get the next log message in the queue, if there is one.
+     * @param message The next message.
+     * @return True if a message was passed, false otherwise.
+     */
+    virtual bool GetNextLogMessage(cec_log_message *message) = 0;
+
+    /*!
+     * @deprecated Use callback methods instead
+     * @brief Get the next keypress in the queue, if there is one.
+     * @param key The next keypress.
+     * @return True if a key was passed, false otherwise.
+     */
+    virtual bool GetNextKeypress(cec_keypress *key) = 0;
+
+    /*!
+     * @deprecated Use callback methods instead
+     * @brief Get the next CEC command that was received by the adapter.
+     * @param action The next command.
+     * @return True when a command was passed, false otherwise.
+     */
+    virtual bool GetNextCommand(cec_command *command) = 0;
+
   };
 };
 
@@ -424,7 +439,7 @@ extern "C" DECLSPEC void * CECInit(const char *strDeviceName, CEC::cec_device_ty
  * @param configuration The configuration to pass to libCEC
  * @return An instance of ICECAdapter or NULL on error.
  */
-extern "C" DECLSPEC void * CECInitialise(const CEC::libcec_configuration *configuration);
+extern "C" DECLSPEC void * CECInitialise(CEC::libcec_configuration *configuration);
 
 /*!
  * @brief Unload the CEC adapter library.