X-Git-Url: https://git.piment-noir.org/?a=blobdiff_plain;f=src%2Flib%2FLibCECC.cpp;h=ecf45654408ad56c08085704b552fe6ef4fd1a5a;hb=0303a29df2d5c7db34ef59ad297f04d4348d9401;hp=c1250cba7a953aa6432e13b59d4442d92872bf27;hpb=18203d17e6894d33725dac7553d981aee735e6be;p=deb_libcec.git

diff --git a/src/lib/LibCECC.cpp b/src/lib/LibCECC.cpp
index c1250cb..ecf4565 100644
--- a/src/lib/LibCECC.cpp
+++ b/src/lib/LibCECC.cpp
@@ -1,7 +1,7 @@
 /*
  * This file is part of the libCEC(R) library.
  *
- * libCEC(R) is Copyright (C) 2011 Pulse-Eight Limited.  All rights reserved.
+ * libCEC(R) is Copyright (C) 2011-2013 Pulse-Eight Limited.  All rights reserved.
  * libCEC(R) is an original work, containing original code.
  *
  * libCEC(R) is a trademark of Pulse-Eight Limited.
@@ -30,8 +30,9 @@
  *     http://www.pulse-eight.net/
  */
 
-#include <cec.h>
-#include <cecc.h>
+#include "env.h"
+#include "cec.h"
+#include "cecc.h"
 
 using namespace CEC;
 using namespace std;
@@ -42,15 +43,9 @@ using namespace std;
 //@{
 ICECAdapter *cec_parser;
 
-int cec_init(const char *strDeviceName, cec_logical_address iLogicalAddress /* = CECDEVICE_PLAYBACKDEVICE1 */, uint8_t iPhysicalAddress /* = CEC_DEFAULT_PHYSICAL_ADDRESS */)
+int cec_initialise(libcec_configuration *configuration)
 {
-  cec_parser = (ICECAdapter *) CECCreate(strDeviceName, iLogicalAddress, iPhysicalAddress);
-  return (cec_parser != NULL) ? 1 : 0;
-}
-
-int cec_init_typed(const char *strDeviceName, cec_device_type_list devicesTypes)
-{
-  cec_parser = (ICECAdapter *) CECInit(strDeviceName, devicesTypes);
+  cec_parser = (ICECAdapter *) CECInitialise(configuration);
   return (cec_parser != NULL) ? 1 : 0;
 }
 
@@ -74,6 +69,13 @@ void cec_close(void)
     cec_parser->Close();
 }
 
+int cec_enable_callbacks(void *cbParam, ICECCallbacks *callbacks)
+{
+  if (cec_parser)
+    return cec_parser->EnableCallbacks(cbParam, callbacks) ? 1 : 0;
+  return -1;
+}
+
 int8_t cec_find_adapters(cec_adapter *deviceList, uint8_t iBufSize, const char *strDevicePath /* = NULL */)
 {
   if (cec_parser)
@@ -95,150 +97,321 @@ int cec_start_bootloader(void)
   return -1;
 }
 
-int8_t cec_get_min_version(void)
+int cec_transmit(const CEC::cec_command *data)
 {
   if (cec_parser)
-    return cec_parser->GetMinLibVersion();
+    return cec_parser->Transmit(*data) ? 1 : 0;
   return -1;
 }
 
-int8_t cec_get_lib_version_major(void)
+int cec_set_logical_address(cec_logical_address iLogicalAddress /* = CECDEVICE_PLAYBACKDEVICE1 */)
 {
   if (cec_parser)
-    return cec_parser->GetLibVersionMajor();
+    return cec_parser->SetLogicalAddress(iLogicalAddress) ? 1 : 0;
   return -1;
 }
 
-int8_t cec_get_lib_version_minor(void)
+int cec_set_physical_address(uint16_t iPhysicalAddress /* = CEC_DEFAULT_PHYSICAL_ADDRESS */)
 {
   if (cec_parser)
-    return cec_parser->GetLibVersionMinor();
+    return cec_parser->SetPhysicalAddress(iPhysicalAddress) ? 1 : 0;
   return -1;
 }
 
-int cec_get_next_log_message(cec_log_message *message)
+int cec_power_on_devices(cec_logical_address address /* = CECDEVICE_TV */)
 {
   if (cec_parser)
-    return cec_parser->GetNextLogMessage(message) ? 1 : 0;
+    return cec_parser->PowerOnDevices(address) ? 1 : 0;
   return -1;
 }
 
-int cec_get_next_keypress(cec_keypress *key)
+int cec_standby_devices(cec_logical_address address /* = CECDEVICE_BROADCAST */)
 {
   if (cec_parser)
-    return cec_parser->GetNextKeypress(key) ? 1 : 0;
+    return cec_parser->StandbyDevices(address) ? 1 : 0;
   return -1;
 }
 
-int cec_get_next_command(cec_command *command)
+int cec_set_active_source(cec_device_type type)
 {
   if (cec_parser)
-    return cec_parser->GetNextCommand(command) ? 1 : 0;
+    return cec_parser->SetActiveSource(type) ? 1 : 0;
   return -1;
 }
 
-int cec_transmit(const CEC::cec_command &data)
+int cec_set_deck_control_mode(cec_deck_control_mode mode, int bSendUpdate) {
+  if (cec_parser)
+    return cec_parser->SetDeckControlMode(mode, bSendUpdate == 1) ? 1 : 0;
+  return -1;
+}
+
+int cec_set_deck_info(cec_deck_info info, int bSendUpdate) {
+  if (cec_parser)
+    return cec_parser->SetDeckInfo(info, bSendUpdate == 1) ? 1 : 0;
+  return -1;
+
+}
+
+int cec_set_inactive_view(void)
 {
   if (cec_parser)
-    return cec_parser->Transmit(data) ? 1 : 0;
+    return cec_parser->SetInactiveView() ? 1 : 0;
   return -1;
 }
 
-int cec_set_logical_address(cec_logical_address iLogicalAddress /* = CECDEVICE_PLAYBACKDEVICE1 */)
+int cec_set_menu_state(cec_menu_state state, int bSendUpdate) {
+  if (cec_parser)
+    return cec_parser->SetMenuState(state, bSendUpdate == 1) ? 1 : 0;
+  return -1;
+}
+
+int cec_set_osd_string(cec_logical_address iLogicalAddress, cec_display_control duration, const char *strMessage)
 {
   if (cec_parser)
-    return cec_parser->SetLogicalAddress(iLogicalAddress) ? 1 : 0;
+    return cec_parser->SetOSDString(iLogicalAddress, duration, strMessage) ? 1 : 0;
   return -1;
 }
 
-int cec_set_physical_address(uint16_t iPhysicalAddress /* = CEC_DEFAULT_PHYSICAL_ADDRESS */)
+int cec_switch_monitoring(int bEnable)
 {
   if (cec_parser)
-    return cec_parser->SetPhysicalAddress(iPhysicalAddress) ? 1 : 0;
+    return cec_parser->SwitchMonitoring(bEnable == 1) ? 1 : 0;
   return -1;
 }
 
-int cec_power_on_devices(cec_logical_address address /* = CECDEVICE_TV */)
+cec_version cec_get_device_cec_version(cec_logical_address iLogicalAddress)
 {
   if (cec_parser)
-    return cec_parser->PowerOnDevices(address) ? 1 : 0;
+    return cec_parser->GetDeviceCecVersion(iLogicalAddress);
+  return CEC_VERSION_UNKNOWN;
+}
+
+int cec_get_device_menu_language(cec_logical_address iLogicalAddress, cec_menu_language *language)
+{
+  if (cec_parser)
+    return cec_parser->GetDeviceMenuLanguage(iLogicalAddress, language) ? 1 : 0;
   return -1;
 }
 
-int cec_standby_devices(cec_logical_address address /* = CECDEVICE_BROADCAST */)
+uint64_t cec_get_device_vendor_id(cec_logical_address iLogicalAddress)
 {
   if (cec_parser)
-    return cec_parser->StandbyDevices(address) ? 1 : 0;
+    return cec_parser->GetDeviceVendorId(iLogicalAddress);
+  return 0;
+}
+
+uint16_t cec_get_device_physical_address(cec_logical_address iLogicalAddress)
+{
+  if (cec_parser)
+    return cec_parser->GetDevicePhysicalAddress(iLogicalAddress);
+  return 0;
+}
+
+cec_logical_address cec_get_active_source(void)
+{
+  if (cec_parser)
+    return cec_parser->GetActiveSource();
+  return CECDEVICE_UNKNOWN;
+}
+
+int cec_is_active_source(cec_logical_address iAddress)
+{
+  if (cec_parser)
+    return cec_parser->IsActiveSource(iAddress);
+  return false;
+}
+
+cec_power_status cec_get_device_power_status(cec_logical_address iLogicalAddress)
+{
+  if (cec_parser)
+    return cec_parser->GetDevicePowerStatus(iLogicalAddress);
+  return CEC_POWER_STATUS_UNKNOWN;
+}
+
+int cec_poll_device(cec_logical_address iLogicalAddress)
+{
+  if (cec_parser)
+    return cec_parser->PollDevice(iLogicalAddress) ? 1 : 0;
   return -1;
 }
 
-int cec_set_active_view(void)
+cec_logical_addresses cec_get_active_devices(void)
 {
+  cec_logical_addresses addresses;
+  addresses.Clear();
   if (cec_parser)
-    return cec_parser->SetActiveView() ? 1 : 0;
+    addresses = cec_parser->GetActiveDevices();
+  return addresses;
+}
+
+int cec_is_active_device(cec_logical_address iAddress)
+{
+  if (cec_parser)
+    return cec_parser->IsActiveDevice(iAddress) ? 1 : 0;
   return -1;
 }
 
-int cec_set_active_source(cec_device_type type)
+int cec_is_active_device_type(cec_device_type type)
 {
   if (cec_parser)
-    return cec_parser->SetActiveSource(type) ? 1 : 0;
+    return cec_parser->IsActiveDeviceType(type) ? 1 : 0;
   return -1;
 }
 
-int cec_set_inactive_view(void)
+int cec_set_hdmi_port(cec_logical_address iBaseDevice, uint8_t iPort)
 {
   if (cec_parser)
-    return cec_parser->SetInactiveView() ? 1 : 0;
+    return cec_parser->SetHDMIPort(iBaseDevice, iPort) ? 1 : 0;
   return -1;
 }
 
-int cec_set_osd_string(cec_logical_address iLogicalAddress, cec_display_control duration, const char *strMessage)
+int cec_volume_up(int bSendRelease)
 {
   if (cec_parser)
-    return cec_parser->SetOSDString(iLogicalAddress, duration, strMessage) ? 1 : 0;
+    return cec_parser->VolumeUp(bSendRelease == 1);
   return -1;
 }
 
-int cec_switch_monitoring(int bEnable)
+int cec_volume_down(int bSendRelease)
 {
   if (cec_parser)
-    return cec_parser->SwitchMonitoring(bEnable == 1) ? 1 : 0;
+    return cec_parser->VolumeDown(bSendRelease == 1);
   return -1;
 }
 
-cec_version cec_get_device_cec_version(cec_logical_address iLogicalAddress)
+int cec_mute_audio(int bSendRelease)
 {
   if (cec_parser)
-    return cec_parser->GetDeviceCecVersion(iLogicalAddress);
-  return CEC_VERSION_UNKNOWN;
+    return cec_parser->MuteAudio(bSendRelease == 1);
+  return -1;
 }
 
-int cec_get_device_menu_language(cec_logical_address iLogicalAddress, cec_menu_language *language)
+int cec_send_keypress(cec_logical_address iDestination, cec_user_control_code key, int bWait)
 {
   if (cec_parser)
-    return cec_parser->GetDeviceMenuLanguage(iLogicalAddress, language) ? 1 : 0;
+    return cec_parser->SendKeypress(iDestination, key, bWait == 1) ? 1 : 0;
   return -1;
 }
 
-uint64_t cec_get_device_vendor_id(cec_logical_address iLogicalAddress)
+int cec_send_key_release(cec_logical_address iDestination, int bWait)
 {
   if (cec_parser)
-    return cec_parser->GetDeviceVendorId(iLogicalAddress);
-  return 0;
+    return cec_parser->SendKeyRelease(iDestination, bWait == 1) ? 1 : 0;
+  return -1;
 }
 
-cec_power_status cec_get_device_power_status(cec_logical_address iLogicalAddress)
+cec_osd_name cec_get_device_osd_name(cec_logical_address iAddress)
 {
+  cec_osd_name retVal;
+  retVal.device = iAddress;
+  retVal.name[0] = 0;
+
   if (cec_parser)
-    return cec_parser->GetDevicePowerStatus(iLogicalAddress);
-  return CEC_POWER_STATUS_UNKNOWN;
+    retVal = cec_parser->GetDeviceOSDName(iAddress);
+
+  return retVal;
 }
 
-int cec_poll_device(cec_logical_address iLogicalAddress)
+int cec_set_stream_path_logical(CEC::cec_logical_address iAddress)
+{
+  return cec_parser ? (cec_parser->SetStreamPath(iAddress) ? 1 : 0) : -1;
+}
+
+int cec_set_stream_path_physical(uint16_t iPhysicalAddress)
+{
+  return cec_parser ? (cec_parser->SetStreamPath(iPhysicalAddress) ? 1 : 0) : -1;
+}
+
+cec_logical_addresses cec_get_logical_addresses(void)
+{
+  cec_logical_addresses addr;
+  addr.Clear();
+  if (cec_parser)
+    addr = cec_parser->GetLogicalAddresses();
+  return addr;
+}
+
+int cec_get_current_configuration(libcec_configuration *configuration)
+{
+  return cec_parser ? (cec_parser->GetCurrentConfiguration(configuration) ? 1 : 0) : -1;
+}
+
+int cec_can_persist_configuration(void)
+{
+  return cec_parser ? (cec_parser->CanPersistConfiguration() ? 1 : 0) : -1;
+}
+
+int cec_persist_configuration(libcec_configuration *configuration)
+{
+  return cec_parser ? (cec_parser->PersistConfiguration(configuration) ? 1 : 0) : -1;
+}
+
+int cec_set_configuration(const libcec_configuration *configuration)
+{
+  return cec_parser ? (cec_parser->SetConfiguration(configuration) ? 1 : 0) : -1;
+}
+
+void cec_rescan_devices(void)
+{
+  if (cec_parser)
+    cec_parser->RescanActiveDevices();
+}
+
+int cec_is_libcec_active_source(void)
+{
+  return cec_parser ? (cec_parser->IsLibCECActiveSource() ? 1 : 0) : -1;
+}
+
+int cec_get_device_information(const char *strPort, CEC::libcec_configuration *config, uint32_t iTimeoutMs)
+{
+  return cec_parser ? (cec_parser->GetDeviceInformation(strPort, config, iTimeoutMs) ? 1 : 0) : -1;
+}
+
+const char * cec_get_lib_info(void)
+{
+  return cec_parser ? cec_parser->GetLibInfo() : NULL;
+}
+
+void cec_init_video_standalone(void)
+{
+  if (cec_parser)
+    cec_parser->InitVideoStandalone();
+}
+
+uint16_t cec_get_adapter_vendor_id(void)
+{
+  return cec_parser ? cec_parser->GetAdapterVendorId() : 0;
+}
+
+uint16_t cec_get_adapter_product_id(void)
+{
+  return cec_parser ? cec_parser->GetAdapterProductId() : 0;
+}
+
+uint8_t cec_audio_toggle_mute(void)
+{
+  return cec_parser ? cec_parser->AudioToggleMute() : (uint8_t)CEC_AUDIO_VOLUME_STATUS_UNKNOWN;
+}
+
+uint8_t cec_audio_mute(void)
+{
+  return cec_parser ? cec_parser->AudioMute() : (uint8_t)CEC_AUDIO_VOLUME_STATUS_UNKNOWN;
+}
+
+uint8_t cec_audio_unmute(void)
+{
+  return cec_parser ? cec_parser->AudioUnmute() : (uint8_t)CEC_AUDIO_VOLUME_STATUS_UNKNOWN;
+}
+
+uint8_t cec_audio_get_status(void)
+{
+  return cec_parser ? cec_parser->AudioStatus() : (uint8_t)CEC_AUDIO_VOLUME_STATUS_UNKNOWN;
+}
+
+int8_t cec_detect_adapters(cec_adapter_descriptor *deviceList, uint8_t iBufSize, const char *strDevicePath, int bQuickScan)
 {
   if (cec_parser)
-    return cec_parser->PollDevice(iLogicalAddress);
+    return cec_parser->DetectAdapters(deviceList, iBufSize, strDevicePath, bQuickScan == 1);
   return -1;
 }