repositories
/
deb_libcec.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'master' into release
[deb_libcec.git]
/
src
/
lib
/
LibCECC.cpp
diff --git
a/src/lib/LibCECC.cpp
b/src/lib/LibCECC.cpp
index b792044cdf0cd15ed1aab6d831ae6a1ac6a77e86..c95741c2356d930be974fe677db0636d5aa6fbea 100644
(file)
--- a/
src/lib/LibCECC.cpp
+++ b/
src/lib/LibCECC.cpp
@@
-42,12
+42,18
@@
using namespace std;
//@{
ICECAdapter *cec_parser;
//@{
ICECAdapter *cec_parser;
-int cec_init(const char *strDeviceName, cec_logical_address iLogicalAddress
/* = CECDEVICE_PLAYBACKDEVICE1 */, uint8_t iPhysicalAddress /* = CEC_DEFAULT_PHYSICAL_ADDRESS */
)
+int cec_init(const char *strDeviceName, cec_logical_address iLogicalAddress
, uint16_t iPhysicalAddress
)
{
cec_parser = (ICECAdapter *) CECCreate(strDeviceName, iLogicalAddress, iPhysicalAddress);
return (cec_parser != NULL) ? 1 : 0;
}
{
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);
+ return (cec_parser != NULL) ? 1 : 0;
+}
+
void cec_destroy(void)
{
cec_close();
void cec_destroy(void)
{
cec_close();
@@
-92,14
+98,14
@@
int cec_start_bootloader(void)
int8_t cec_get_min_version(void)
{
if (cec_parser)
int8_t cec_get_min_version(void)
{
if (cec_parser)
- return cec_parser->GetMinVersion();
+ return cec_parser->GetMin
Lib
Version();
return -1;
}
return -1;
}
-int8_t cec_get_lib_version(void)
+int8_t cec_get_lib_version
_major
(void)
{
if (cec_parser)
{
if (cec_parser)
- return cec_parser->GetLibVersion();
+ return cec_parser->GetLibVersion
Major
();
return -1;
}
return -1;
}
@@
-131,10
+137,10
@@
int cec_get_next_command(cec_command *command)
return -1;
}
return -1;
}
-int cec_transmit(const CEC::cec_command
&
data)
+int cec_transmit(const CEC::cec_command
*
data)
{
if (cec_parser)
{
if (cec_parser)
- return cec_parser->Transmit(data) ? 1 : 0;
+ return cec_parser->Transmit(
*
data) ? 1 : 0;
return -1;
}
return -1;
}
@@
-173,6
+179,13
@@
int cec_set_active_view(void)
return -1;
}
return -1;
}
+int cec_set_active_source(cec_device_type type)
+{
+ if (cec_parser)
+ return cec_parser->SetActiveSource(type) ? 1 : 0;
+ return -1;
+}
+
int cec_set_inactive_view(void)
{
if (cec_parser)
int cec_set_inactive_view(void)
{
if (cec_parser)
@@
-222,4
+235,11
@@
cec_power_status cec_get_device_power_status(cec_logical_address iLogicalAddress
return CEC_POWER_STATUS_UNKNOWN;
}
return CEC_POWER_STATUS_UNKNOWN;
}
+int cec_poll_device(cec_logical_address iLogicalAddress)
+{
+ if (cec_parser)
+ return cec_parser->PollDevice(iLogicalAddress);
+ return -1;
+}
+
//@}
//@}