X-Git-Url: https://git.piment-noir.org/?a=blobdiff_plain;f=src%2Flib%2Fdevices%2FCECRecordingDevice.cpp;h=a6431ec579a262f6fbb7cac3b83621dd581cddd4;hb=bfea6e0a8ee4bc9e40c64ea68f22db69ac3cb26f;hp=5639bc8dc920d29c057b46b3f541d039b60b908b;hpb=b492c10e731625d7c000654de2372b54339f7c8d;p=deb_libcec.git diff --git a/src/lib/devices/CECRecordingDevice.cpp b/src/lib/devices/CECRecordingDevice.cpp index 5639bc8..a6431ec 100644 --- a/src/lib/devices/CECRecordingDevice.cpp +++ b/src/lib/devices/CECRecordingDevice.cpp @@ -1,7 +1,7 @@ /* * This file is part of the libCEC(R) library. * - * libCEC(R) is Copyright (C) 2011-2012 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,39 +30,22 @@ * http://www.pulse-eight.net/ */ +#include "env.h" #include "CECRecordingDevice.h" using namespace CEC; +using namespace PLATFORM; -CCECRecordingDevice::CCECRecordingDevice(CCECProcessor *processor, cec_logical_address address, uint16_t iPhysicalAddress /* = 0 */) : - CCECBusDevice(processor, address, iPhysicalAddress), - m_playbackDevice(processor, address, iPhysicalAddress), +CCECRecordingDevice::CCECRecordingDevice(CCECProcessor *processor, cec_logical_address address, uint16_t iPhysicalAddress /* = CEC_INVALID_PHYSICAL_ADDRESS */) : + CCECPlaybackDevice(processor, address, iPhysicalAddress), m_tuner(processor, address, iPhysicalAddress) { m_type = CEC_DEVICE_TYPE_RECORDING_DEVICE; } -cec_deck_info CCECRecordingDevice::GetDeckStatus(void) +void CCECRecordingDevice::ResetDeviceStatus(void) { - return m_playbackDevice.GetDeckStatus(); -} - -cec_deck_control_mode CCECRecordingDevice::GetDeckControlMode(void) -{ - return m_playbackDevice.GetDeckControlMode(); -} - -void CCECRecordingDevice::SetDeckStatus(cec_deck_info deckStatus) -{ - m_playbackDevice.SetDeckStatus(deckStatus); -} - -void CCECRecordingDevice::SetDeckControlMode(cec_deck_control_mode mode) -{ - m_playbackDevice.SetDeckControlMode(mode); -} - -bool CCECRecordingDevice::TransmitDeckStatus(cec_logical_address dest) -{ - return m_playbackDevice.TransmitDeckStatus(dest); + CLockObject lock(m_mutex); + m_tuner.ResetDeviceStatus(); + CCECPlaybackDevice::ResetDeviceStatus(); }