Merge branch 'development'

[deb_libcec.git] / include / cecc.h

diff --git a/include/cecc.h b/include/cecc.h
index f2928ed7f22f2ac16782004d6cb8f96d0c8c3ce5..a4892c48b045ab13d276e1e32ee69738503c0b06 100644 (file)
--- a/include/cecc.h
+++ b/include/cecc.h
@@ -46,12 +46,6 @@ extern DECLSPEC int cec_initialise(CEC::libcec_configuration *configuration);
 extern DECLSPEC int cec_initialise(libcec_configuration *configuration);
 #endif
 
-#ifdef __cplusplus
-extern DECLSPEC int cec_init_typed(const char *strDeviceName, CEC::cec_device_type_list deviceTypes);
-#else
-extern DECLSPEC int cec_init_typed(const char *strDeviceName, cec_device_type_list deviceTypes);
-#endif
-
 extern DECLSPEC void cec_destroy(void);
 
 extern DECLSPEC int cec_open(const char *strPort, uint32_t iTimeout);
@@ -266,35 +260,21 @@ extern DECLSPEC int cec_set_configuration(const libcec_configuration *configurat
 
 extern DECLSPEC void cec_rescan_devices(void);
 
-////// deprecated methods, may be removed in a future version //////
-
-extern DECLSPEC int cec_enable_physical_address_detection(void);
-
-extern DECLSPEC int cec_set_active_view(void);
-
-extern DECLSPEC int8_t cec_get_min_lib_version(void);
-
-extern DECLSPEC int8_t cec_get_lib_version_major(void);
-
-extern DECLSPEC int8_t cec_get_lib_version_minor(void);
+extern DECLSPEC int cec_is_libcec_active_source(void);
 
 #ifdef __cplusplus
-extern DECLSPEC int cec_get_next_log_message(CEC::cec_log_message *message);
+extern DECLSPEC int cec_get_device_information(const char *strPort, CEC::libcec_configuration *config, uint32_t iTimeoutMs);
 #else
-extern DECLSPEC int cec_get_next_log_message(cec_log_message *message);
+extern DECLSPEC int cec_get_device_information(const char *strPort, libcec_configuration *config, uint32_t iTimeoutMs);
 #endif
 
-#ifdef __cplusplus
-extern DECLSPEC int cec_get_next_keypress(CEC::cec_keypress *key);
-#else
-extern DECLSPEC int cec_get_next_keypress(cec_keypress *key);
-#endif
+extern DECLSPEC const char * cec_get_lib_info(void);
 
-#ifdef __cplusplus
-extern DECLSPEC int cec_get_next_command(CEC::cec_command *command);
-#else
-extern DECLSPEC int cec_get_next_command(cec_command *command);
-#endif
+extern DECLSPEC void cec_init_video_standalone(void);
+
+extern DECLSPEC uint16_t cec_get_adapter_vendor_id(void);
+
+extern DECLSPEC uint16_t cec_get_adapter_product_id(void);
 
 #ifdef __cplusplus
 };