Merge pull request #7 from og01/master

Deck control functions missing from C interface

diff --git a/include/cecc.h b/include/cecc.h
index 972c4a2cf414cec1dfe467cd6a18bb58ea199bbc..d433b3ebc50cfcf65482de567a116cf9cd5efafd 100644 (file)
--- a/include/cecc.h
+++ b/include/cecc.h
@@ -95,8 +95,26 @@ extern DECLSPEC int cec_set_active_source(CEC::cec_device_type type);
 extern DECLSPEC int cec_set_active_source(cec_device_type type);
 #endif
 
+#ifdef __cplusplus
+extern DECLSPEC int cec_set_deck_control_mode(CEC::cec_deck_control_mode mode, int bSendUpdate);
+#else
+extern DECLSPEC int cec_set_deck_control_mode(cec_deck_control_mode mode, int bSendUpdate);
+#endif
+
+#ifdef __cplusplus
+extern DECLSPEC int cec_set_deck_info(CEC::cec_deck_info info, int bSendUpdate);
+#else
+extern DECLSPEC int cec_set_deck_info(cec_deck_info info, int bSendUpdate);
+#endif
+
 extern DECLSPEC int cec_set_inactive_view(void);
 
+#ifdef __cplusplus
+extern DECLSPEC int cec_set_menu_state(CEC::cec_menu_state state, int bSendUpdate);
+#else
+extern DECLSPEC int cec_set_menu_state(cec_menu_state state, int bSendUpdate);
+#endif
+
 #ifdef __cplusplus
 extern DECLSPEC int cec_get_next_log_message(CEC::cec_log_message *message);
 #else

diff --git a/src/lib/LibCECC.cpp b/src/lib/LibCECC.cpp
index fdcc9e7a57bc0dcf4c2f239449272f93e2d47522..dc63c2927794ae768d1fd0698af1686036f6d778 100644 (file)
--- a/src/lib/LibCECC.cpp
+++ b/src/lib/LibCECC.cpp
@@ -186,6 +186,19 @@ int cec_set_active_source(cec_device_type type)
   return -1;
 }
 
+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)
@@ -193,6 +206,12 @@ int cec_set_inactive_view(void)
   return -1;
 }
 
+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)