repositories
/
deb_libcec.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
a483a2f
)
cec: a recording device inherits all the features of a playback device. changed defau...
author
Lars Op den Kamp
<lars@opdenkamp.eu>
Tue, 22 Nov 2011 00:28:55 +0000
(
01:28
+0100)
committer
Lars Op den Kamp
<lars@opdenkamp.eu>
Tue, 22 Nov 2011 00:28:55 +0000
(
01:28
+0100)
src/lib/devices/CECRecordingDevice.cpp
patch
|
blob
|
blame
|
history
src/lib/devices/CECRecordingDevice.h
patch
|
blob
|
blame
|
history
src/lib/implementations/CECCommandHandler.cpp
patch
|
blob
|
blame
|
history
src/testclient/main.cpp
patch
|
blob
|
blame
|
history
diff --git
a/src/lib/devices/CECRecordingDevice.cpp
b/src/lib/devices/CECRecordingDevice.cpp
index a5fd567b5e67c6c110346a32ff107cdd297ab9d6..cda372dd5192c3ba442eec1836a117d0306803f5 100644
(file)
--- a/
src/lib/devices/CECRecordingDevice.cpp
+++ b/
src/lib/devices/CECRecordingDevice.cpp
@@
-35,7
+35,7
@@
using namespace CEC;
CCECRecordingDevice::CCECRecordingDevice(CCECProcessor *processor, cec_logical_address address, uint16_t iPhysicalAddress /* = 0 */) :
using namespace CEC;
CCECRecordingDevice::CCECRecordingDevice(CCECProcessor *processor, cec_logical_address address, uint16_t iPhysicalAddress /* = 0 */) :
- CCEC
Bus
Device(processor, address, iPhysicalAddress)
+ CCEC
Playback
Device(processor, address, iPhysicalAddress)
{
m_type = CEC_DEVICE_TYPE_RECORDING_DEVICE;
}
{
m_type = CEC_DEVICE_TYPE_RECORDING_DEVICE;
}
diff --git
a/src/lib/devices/CECRecordingDevice.h
b/src/lib/devices/CECRecordingDevice.h
index 45c0407cd8341b6d9dc878ae3973cd13bf4a2d50..86bd80a84c3ceca8c2917bc4c2ea538e44c2f6a4 100644
(file)
--- a/
src/lib/devices/CECRecordingDevice.h
+++ b/
src/lib/devices/CECRecordingDevice.h
@@
-31,11
+31,11
@@
* http://www.pulse-eight.net/
*/
* http://www.pulse-eight.net/
*/
-#include "CEC
Bus
Device.h"
+#include "CEC
Playback
Device.h"
namespace CEC
{
namespace CEC
{
- class CCECRecordingDevice : public CCEC
Bus
Device
+ class CCECRecordingDevice : public CCEC
Playback
Device
{
public:
CCECRecordingDevice(CCECProcessor *processor, cec_logical_address address, uint16_t iPhysicalAddress = 0);
{
public:
CCECRecordingDevice(CCECProcessor *processor, cec_logical_address address, uint16_t iPhysicalAddress = 0);
diff --git
a/src/lib/implementations/CECCommandHandler.cpp
b/src/lib/implementations/CECCommandHandler.cpp
index 7e5c87224e8541e45e40305a0abdaafe0e849a34..4446c9d3ed9b4de4ce04f1b2dcbbf6fbb38f944c 100644
(file)
--- a/
src/lib/implementations/CECCommandHandler.cpp
+++ b/
src/lib/implementations/CECCommandHandler.cpp
@@
-194,7
+194,7
@@
bool CCECCommandHandler::HandleActiveSource(const cec_command &command)
bool CCECCommandHandler::HandleDeckControl(const cec_command &command)
{
CCECBusDevice *device = GetDevice(command.destination);
bool CCECCommandHandler::HandleDeckControl(const cec_command &command)
{
CCECBusDevice *device = GetDevice(command.destination);
- if (device &&
device->GetType() == CEC_DEVICE_TYPE_PLAYBACK_DEVICE
&& command.parameters.size > 0)
+ if (device &&
(device->GetType() == CEC_DEVICE_TYPE_PLAYBACK_DEVICE || device->GetType() == CEC_DEVICE_TYPE_RECORDING_DEVICE)
&& command.parameters.size > 0)
{
((CCECPlaybackDevice *) device)->SetDeckControlMode((cec_deck_control_mode) command.parameters[0]);
return true;
{
((CCECPlaybackDevice *) device)->SetDeckControlMode((cec_deck_control_mode) command.parameters[0]);
return true;
@@
-249,7
+249,7
@@
bool CCECCommandHandler::HandleGiveAudioStatus(const cec_command &command)
bool CCECCommandHandler::HandleGiveDeckStatus(const cec_command &command)
{
CCECBusDevice *device = GetDevice(command.destination);
bool CCECCommandHandler::HandleGiveDeckStatus(const cec_command &command)
{
CCECBusDevice *device = GetDevice(command.destination);
- if (device &&
device->GetType() == CEC_DEVICE_TYPE_PLAYBACK_DEVICE
)
+ if (device &&
(device->GetType() == CEC_DEVICE_TYPE_PLAYBACK_DEVICE || device->GetType() == CEC_DEVICE_TYPE_RECORDING_DEVICE)
)
return ((CCECPlaybackDevice *) device)->TransmitDeckStatus(command.initiator);
return false;
return ((CCECPlaybackDevice *) device)->TransmitDeckStatus(command.initiator);
return false;
diff --git
a/src/testclient/main.cpp
b/src/testclient/main.cpp
index aae5c007d9598ec2aba48420976df17e26a7bd54..73d69905186d177d6193b0d6c98f280ad6634aa5 100644
(file)
--- a/
src/testclient/main.cpp
+++ b/
src/testclient/main.cpp
@@
-403,8
+403,8
@@
int main (int argc, char *argv[])
if (typeList.IsEmpty())
{
if (!bSingleCommand)
if (typeList.IsEmpty())
{
if (!bSingleCommand)
- cout << "No device type given. Using '
playback
device'" << endl;
- typeList.add(CEC_DEVICE_TYPE_
PLAYBACK
_DEVICE);
+ cout << "No device type given. Using '
recording
device'" << endl;
+ typeList.add(CEC_DEVICE_TYPE_
RECORDING
_DEVICE);
}
ICECAdapter *parser = LibCecInit("CECTester", typeList);
}
ICECAdapter *parser = LibCecInit("CECTester", typeList);