X-Git-Url: https://git.piment-noir.org/?a=blobdiff_plain;f=src%2Flib%2Fdevices%2FCECPlaybackDevice.cpp;h=1beed4f37221cdfdce1e74127b07c377afcf7198;hb=34fe491f051387fa870da9459ce53892f7bb03ab;hp=d96d5c9f374b3f34499238af4861f7f32e8fc987;hpb=28089abcc287456abfa31081b7978eced6e4a660;p=deb_libcec.git

diff --git a/src/lib/devices/CECPlaybackDevice.cpp b/src/lib/devices/CECPlaybackDevice.cpp
index d96d5c9..1beed4f 100644
--- a/src/lib/devices/CECPlaybackDevice.cpp
+++ b/src/lib/devices/CECPlaybackDevice.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-2012 Pulse-Eight Limited.  All rights reserved.
  * libCEC(R) is an original work, containing original code.
  *
  * libCEC(R) is a trademark of Pulse-Eight Limited.
@@ -33,22 +33,70 @@
 #include "CECPlaybackDevice.h"
 #include "../implementations/CECCommandHandler.h"
 #include "../CECProcessor.h"
+#include "../LibCEC.h"
+#include "../CECTypeUtils.h"
 
 using namespace CEC;
+using namespace PLATFORM;
 
-CCECPlaybackDevice::CCECPlaybackDevice(CCECProcessor *processor, cec_logical_address address, uint16_t iPhysicalAddress /* = 0 */) :
-    CCECBusDevice(processor, address, iPhysicalAddress)
+#define ToString(p) CCECTypeUtils::ToString(p)
+
+CCECPlaybackDevice::CCECPlaybackDevice(CCECProcessor *processor, cec_logical_address address, uint16_t iPhysicalAddress /* = CEC_INVALID_PHYSICAL_ADDRESS */) :
+    CCECBusDevice(processor, address, iPhysicalAddress),
+    m_deckStatus(CEC_DECK_INFO_STOP),
+    m_deckControlMode(CEC_DECK_CONTROL_MODE_STOP)
 {
   m_type = CEC_DEVICE_TYPE_PLAYBACK_DEVICE;
 }
 
+cec_deck_info CCECPlaybackDevice::GetDeckStatus(const cec_logical_address UNUSED(initiator))
+{
+  CLockObject lock(m_mutex);
+  return m_deckStatus;
+}
+
+void CCECPlaybackDevice::SetDeckStatus(cec_deck_info deckStatus)
+{
+  CLockObject lock(m_mutex);
+  if (m_deckStatus != deckStatus)
+  {
+    m_processor->GetLib()->AddLog(CEC_LOG_DEBUG, ">> %s (%X): deck status changed from '%s' to '%s'", GetLogicalAddressName(), m_iLogicalAddress, ToString(m_deckStatus), ToString(deckStatus));
+    m_deckStatus = deckStatus;
+  }
+}
+
+cec_deck_control_mode CCECPlaybackDevice::GetDeckControlMode(const cec_logical_address UNUSED(initiator))
+{
+  CLockObject lock(m_mutex);
+  return m_deckControlMode;
+}
+
+void CCECPlaybackDevice::SetDeckControlMode(cec_deck_control_mode mode)
+{
+  CLockObject lock(m_mutex);
+  if (m_deckControlMode != mode)
+  {
+    m_processor->GetLib()->AddLog(CEC_LOG_DEBUG, ">> %s (%X): deck control mode changed from '%s' to '%s'", GetLogicalAddressName(), m_iLogicalAddress, ToString(m_deckControlMode), ToString(mode));
+    m_deckControlMode = mode;
+  }
+}
+
 bool CCECPlaybackDevice::TransmitDeckStatus(cec_logical_address dest)
 {
-  // need to support opcodes play and deck control before doing anything with this
-  CStdString strLog;
-  strLog.Format("<< %s (%X) -> %s (%X): deck status feature abort", GetLogicalAddressName(), m_iLogicalAddress, CCECCommandHandler::ToString(dest), dest);
-  AddLog(CEC_LOG_NOTICE, strLog);
+  cec_deck_info state;
+  {
+    CLockObject lock(m_mutex);
+    m_processor->GetLib()->AddLog(CEC_LOG_NOTICE, "<< %s (%X) -> %s (%X): deck status '%s'", GetLogicalAddressName(), m_iLogicalAddress, ToString(dest), dest, ToString(m_deckStatus));
+    state = m_deckStatus;
+  }
+
+  return m_handler->TransmitDeckStatus(m_iLogicalAddress, dest, state);
+}
 
-  m_processor->TransmitAbort(dest, CEC_OPCODE_GIVE_DECK_STATUS);
-  return false;
+void CCECPlaybackDevice::ResetDeviceStatus(void)
+{
+  CLockObject lock(m_mutex);
+  m_deckStatus      = CEC_DECK_INFO_STOP;
+  m_deckControlMode = CEC_DECK_CONTROL_MODE_STOP;
+  CCECBusDevice::ResetDeviceStatus();
 }