From 07f8f0ac8e390cbe0a011c9ba2f2d28b76ff89c3 Mon Sep 17 00:00:00 2001 From: Ghislain MARY Date: Tue, 15 Nov 2016 15:56:57 +0100 Subject: [PATCH] ringtoneplayer.h needs to be public. --- coreapi/CMakeLists.txt | 1 - coreapi/Makefile.am | 2 +- coreapi/help/Makefile.am | 2 +- coreapi/private.h | 2 +- include/CMakeLists.txt | 1 + include/linphone/Makefile.am | 1 + include/linphone/core.h | 2 +- {coreapi => include/linphone}/ringtoneplayer.h | 0 8 files changed, 6 insertions(+), 5 deletions(-) rename {coreapi => include/linphone}/ringtoneplayer.h (100%) diff --git a/coreapi/CMakeLists.txt b/coreapi/CMakeLists.txt index 16b55236b..042fd44b5 100644 --- a/coreapi/CMakeLists.txt +++ b/coreapi/CMakeLists.txt @@ -43,7 +43,6 @@ set(LINPHONE_PRIVATE_HEADER_FILES offeranswer.h private.h quality_reporting.h - ringtoneplayer.h sqlite3_bctbx_vfs.h vcard_private.h xml2lpc.h diff --git a/coreapi/Makefile.am b/coreapi/Makefile.am index ec52306ca..47e1f33ff 100644 --- a/coreapi/Makefile.am +++ b/coreapi/Makefile.am @@ -74,7 +74,7 @@ liblinphone_la_SOURCES=\ xmlrpc.c \ vtables.c \ carddav.c \ - ringtoneplayer.c ringtoneplayer.h\ + ringtoneplayer.c \ sqlite3_bctbx_vfs.c sqlite3_bctbx_vfs.h\ $(GITVERSION_FILE) diff --git a/coreapi/help/Makefile.am b/coreapi/help/Makefile.am index 432415927..3b26a8e6b 100644 --- a/coreapi/help/Makefile.am +++ b/coreapi/help/Makefile.am @@ -92,7 +92,7 @@ LINPHONE_TUTOS+=$(realtimetext_receiver_SOURCES) realtimetext_receiver_LDADD=$(helloworld_LDADD) AM_CFLAGS=\ - -I$(top_srcdir)/coreapi \ + -I$(top_srcdir)/include \ $(STRICT_OPTIONS) \ $(STRICT_OPTIONS_CC) \ $(ORTP_CFLAGS) \ diff --git a/coreapi/private.h b/coreapi/private.h index 1bbf7b8d9..492d7a56a 100644 --- a/coreapi/private.h +++ b/coreapi/private.h @@ -34,7 +34,7 @@ #include "sal/sal.h" #include "linphone/sipsetup.h" #include "quality_reporting.h" -#include "ringtoneplayer.h" +#include "linphone/ringtoneplayer.h" #include "vcard_private.h" #include "carddav.h" diff --git a/include/CMakeLists.txt b/include/CMakeLists.txt index 1d74a52c4..b0d941559 100644 --- a/include/CMakeLists.txt +++ b/include/CMakeLists.txt @@ -38,6 +38,7 @@ set(HEADER_FILES nat_policy.h presence.h proxy_config.h + ringtoneplayer.h sipsetup.h tunnel.h vcard.h diff --git a/include/linphone/Makefile.am b/include/linphone/Makefile.am index e54065de6..7afa7a327 100644 --- a/include/linphone/Makefile.am +++ b/include/linphone/Makefile.am @@ -18,6 +18,7 @@ linphone_include_HEADERS=\ nat_policy.h \ presence.h \ proxy_config.h \ + ringtoneplayer.h \ sipsetup.h \ tunnel.h \ vcard.h \ diff --git a/include/linphone/core.h b/include/linphone/core.h index fda4ee9f3..f2207b3af 100644 --- a/include/linphone/core.h +++ b/include/linphone/core.h @@ -4599,7 +4599,7 @@ LINPHONE_PUBLIC const char *linphone_core_get_tls_cert_path(const LinphoneCore * */ LINPHONE_PUBLIC const char *linphone_core_get_tls_key_path(const LinphoneCore *lc); -#include "ringtoneplayer.h" +#include "linphone/ringtoneplayer.h" #ifdef __cplusplus } diff --git a/coreapi/ringtoneplayer.h b/include/linphone/ringtoneplayer.h similarity index 100% rename from coreapi/ringtoneplayer.h rename to include/linphone/ringtoneplayer.h