diff --git a/src/account.cpp b/src/account.cpp index 2d713a86ba764d26bb5d7da19845081cd28a23be..60744241231a0144ee591864a0223ce3687738c8 100644 --- a/src/account.cpp +++ b/src/account.cpp @@ -47,7 +47,7 @@ #include "logger.h" #include "manager.h" -#include "client/signal.h" +#include "client/ring_signal.h" #include "account_schema.h" #include "string_utils.h" #include "config/yamlparser.h" diff --git a/src/client/Makefile.am b/src/client/Makefile.am index 6a6c0cbec8db17c03ea0af53e3b265781c2b789c..cb26ade38f45011af62f5f278d1c7aa052e2bbf4 100644 --- a/src/client/Makefile.am +++ b/src/client/Makefile.am @@ -3,7 +3,7 @@ include $(top_srcdir)/globals.mak noinst_LTLIBRARIES = libclient.la noinst_HEADERS = \ - signal.h + ring_signal.h PRESENCE_SRC = presencemanager.cpp @@ -13,7 +13,7 @@ noinst_HEADERS += videomanager.h endif libclient_la_SOURCES = \ - signal.cpp \ + ring_signal.cpp \ callmanager.cpp \ configurationmanager.cpp \ $(PRESENCE_SRC) \ diff --git a/src/client/callmanager.cpp b/src/client/callmanager.cpp index 4d521e287864a8130e8cb6320f9b850595c450db..36d0a753c3f7911421b0be07fd900e2bb55631d5 100644 --- a/src/client/callmanager.cpp +++ b/src/client/callmanager.cpp @@ -34,7 +34,7 @@ #include "callmanager_interface.h" #include "call_factory.h" -#include "client/signal.h" +#include "client/ring_signal.h" #include "sip/sipcall.h" #include "sip/sipvoiplink.h" diff --git a/src/client/configurationmanager.cpp b/src/client/configurationmanager.cpp index 9ffef7f813ea36dce4f7dd19d462a53ae10fca11..d74cae533108249893eb326539f7ee55256a4327 100644 --- a/src/client/configurationmanager.cpp +++ b/src/client/configurationmanager.cpp @@ -52,8 +52,8 @@ #include "security_const.h" #include "audio/audiolayer.h" #include "system_codec_container.h" -#include "client/signal.h" #include "account_const.h" +#include "client/ring_signal.h" #include diff --git a/src/client/presencemanager.cpp b/src/client/presencemanager.cpp index a4b1a56003a4105eae2e882405460d7ba03ce8c5..22182f9a0d9e717d6afb00af756748a06844ccd5 100644 --- a/src/client/presencemanager.cpp +++ b/src/client/presencemanager.cpp @@ -44,7 +44,7 @@ #include "sip/sipaccount.h" #include "sip/sippresence.h" #include "sip/pres_sub_client.h" -#include "client/signal.h" +#include "client/ring_signal.h" namespace DRing { diff --git a/src/client/signal.cpp b/src/client/ring_signal.cpp similarity index 99% rename from src/client/signal.cpp rename to src/client/ring_signal.cpp index ae5e99a988bf09671af644cd05c1aa9970783454..a5ef36daf229a54035139bdae4f636ec4f6c280b 100644 --- a/src/client/signal.cpp +++ b/src/client/ring_signal.cpp @@ -28,7 +28,7 @@ * as that of the covered work. */ -#include "signal.h" +#include "ring_signal.h" namespace ring { diff --git a/src/client/signal.h b/src/client/ring_signal.h similarity index 100% rename from src/client/signal.h rename to src/client/ring_signal.h diff --git a/src/client/videomanager.cpp b/src/client/videomanager.cpp index a6ec5f022a803fcae06650563479407876ce60de..b80893c7bb84468642af7a4e3745eba4ab88f67b 100644 --- a/src/client/videomanager.cpp +++ b/src/client/videomanager.cpp @@ -39,8 +39,8 @@ #include "logger.h" #include "manager.h" #include "system_codec_container.h" -#include "client/signal.h" #include "video/sinkclient.h" +#include "client/ring_signal.h" #include #include diff --git a/src/managerimpl.cpp b/src/managerimpl.cpp index d595750580325738b82e13d78df385c4fe763fd0..519422aa9dbc7a25adff8bcc3011f97805f7bdc7 100644 --- a/src/managerimpl.cpp +++ b/src/managerimpl.cpp @@ -77,7 +77,7 @@ #include "conference.h" #include "ice_transport.h" -#include "client/signal.h" +#include "client/ring_signal.h" #if HAVE_TLS #include "gnutls_support.h" diff --git a/src/media/audio/alsa/alsalayer.cpp b/src/media/audio/alsa/alsalayer.cpp index 05e3733972735747a162c7b4d2deb26700894923..272d1f49135b336d0fa761fc8e121ae61e0909e3 100644 --- a/src/media/audio/alsa/alsalayer.cpp +++ b/src/media/audio/alsa/alsalayer.cpp @@ -34,7 +34,7 @@ #include "logger.h" #include "manager.h" #include "noncopyable.h" -#include "client/signal.h" +#include "client/ring_signal.h" #include "audio/ringbufferpool.h" #include "audio/ringbuffer.h" #include "audio/resampler.h" diff --git a/src/media/audio/sound/audiofile.cpp b/src/media/audio/sound/audiofile.cpp index f4622b46285f6e60a8569d45765bf8cb8a472939..113237d5293b252facb12494fc29536c26144252 100644 --- a/src/media/audio/sound/audiofile.cpp +++ b/src/media/audio/sound/audiofile.cpp @@ -41,7 +41,7 @@ #include "audiofile.h" #include "audio/resampler.h" #include "manager.h" -#include "client/signal.h" +#include "client/ring_signal.h" #include "logger.h" diff --git a/src/media/video/video_device_monitor.cpp b/src/media/video/video_device_monitor.cpp index f8fdc07d394c88274c1e3fb3550cfcb5ca50d20e..fa5bbef028e4b50ac7ca42e50ff90f1aabd7684f 100644 --- a/src/media/video/video_device_monitor.cpp +++ b/src/media/video/video_device_monitor.cpp @@ -37,7 +37,7 @@ #include "manager.h" #include "client/videomanager.h" -#include "client/signal.h" +#include "client/ring_signal.h" #include "config/yamlparser.h" #include "logger.h" #include "video_device_monitor.h" diff --git a/src/media/video/video_input.cpp b/src/media/video/video_input.cpp index 934589d1e223b8e24362584b829f1adade5ef536..eb2aad83a941131278d62e3a51397a1099a2a9bf 100644 --- a/src/media/video/video_input.cpp +++ b/src/media/video/video_input.cpp @@ -36,7 +36,7 @@ #include "media_decoder.h" #include "manager.h" #include "client/videomanager.h" -#include "client/signal.h" +#include "client/ring_signal.h" #include "sinkclient.h" #include "logger.h" diff --git a/src/media/video/video_mixer.cpp b/src/media/video/video_mixer.cpp index f699550a899fe625133b83b2e54b7bfe36221ae8..9ab0c42ab0dfee443d3a4e6579ed19f2c6537229 100644 --- a/src/media/video/video_mixer.cpp +++ b/src/media/video/video_mixer.cpp @@ -35,7 +35,7 @@ #include "media_buffer.h" #include "logger.h" #include "client/videomanager.h" -#include "client/signal.h" +#include "client/ring_signal.h" #include "manager.h" #include "sinkclient.h" #include "logger.h" diff --git a/src/media/video/video_receive_thread.cpp b/src/media/video/video_receive_thread.cpp index 3500d3c4f811ced3b3bee9488a057886d7d851d5..35717e36ceaa1a4920bed82df66ef031307e0aa7 100644 --- a/src/media/video/video_receive_thread.cpp +++ b/src/media/video/video_receive_thread.cpp @@ -36,7 +36,7 @@ #include "socket_pair.h" #include "manager.h" #include "client/videomanager.h" -#include "client/signal.h" +#include "client/ring_signal.h" #include "sinkclient.h" #include "logger.h" diff --git a/src/ringdht/ringaccount.cpp b/src/ringdht/ringaccount.cpp index 9cd3e7777b24b1f33387496f6fd3d4722a582709..b9789e213a58ddfae724791ed91f29d0a03a6984 100644 --- a/src/ringdht/ringaccount.cpp +++ b/src/ringdht/ringaccount.cpp @@ -44,7 +44,7 @@ #include "sips_transport_ice.h" #include "ice_transport.h" -#include "client/signal.h" +#include "client/ring_signal.h" #include "upnp/upnp_control.h" #include "system_codec_container.h" diff --git a/src/sip/pres_sub_client.cpp b/src/sip/pres_sub_client.cpp index 6ba38107265325ccd4b1fdd2028813f260e5855b..318f55d0006a7d057b91d465e70c00465676e6dc 100644 --- a/src/sip/pres_sub_client.cpp +++ b/src/sip/pres_sub_client.cpp @@ -51,7 +51,7 @@ #include "sipvoiplink.h" #include "sip_utils.h" #include "manager.h" -#include "client/signal.h" +#include "client/ring_signal.h" #include "logger.h" diff --git a/src/sip/pres_sub_server.cpp b/src/sip/pres_sub_server.cpp index 6a5edf4c01272f85f46cf9dd1785d6e93df24608..eb3cf419d6f4c9f9723991bdf8124d9cbcba4e50 100644 --- a/src/sip/pres_sub_server.cpp +++ b/src/sip/pres_sub_server.cpp @@ -38,7 +38,7 @@ #include "sippresence.h" #include "logger.h" #include "pres_sub_server.h" -#include "client/signal.h" +#include "client/ring_signal.h" namespace ring { diff --git a/src/sip/sipaccount.cpp b/src/sip/sipaccount.cpp index 9066aa90530741b25652f4c5c9233a567e82ef9e..ad35de41578f29e2174664b8f73440b1abef21b7 100644 --- a/src/sip/sipaccount.cpp +++ b/src/sip/sipaccount.cpp @@ -55,7 +55,7 @@ #include "config/yamlparser.h" #include "logger.h" #include "manager.h" -#include "client/signal.h" +#include "client/ring_signal.h" #ifdef RING_VIDEO #include "libav_utils.h" diff --git a/src/sip/sipaccountbase.cpp b/src/sip/sipaccountbase.cpp index 6af744aca841a964d0e0d335760ca1be8e84edbf..f497069459bb7875491f609ec7e28dbf40950b07 100644 --- a/src/sip/sipaccountbase.cpp +++ b/src/sip/sipaccountbase.cpp @@ -43,7 +43,7 @@ #include "config/yamlparser.h" #include -#include "client/signal.h" +#include "client/ring_signal.h" #include "string_utils.h" #include diff --git a/src/sip/sipcall.cpp b/src/sip/sipcall.cpp index 16babd4d1d993538cd7635b54ff2380eceaffbef..71a3d7f8acdae474e53bb05f5299ab9940de2c10 100644 --- a/src/sip/sipcall.cpp +++ b/src/sip/sipcall.cpp @@ -54,7 +54,7 @@ #endif #include "dring/call_const.h" -#include "client/signal.h" +#include "client/ring_signal.h" #ifdef RING_VIDEO #include "client/videomanager.h" diff --git a/src/sip/sippresence.cpp b/src/sip/sippresence.cpp index 871ce2ec2e409e98dc01ec6e94ea757698094e8d..6027a2a5131f7dd94efe8d548e3163c6c90aa253 100644 --- a/src/sip/sippresence.cpp +++ b/src/sip/sippresence.cpp @@ -39,7 +39,7 @@ #include "pres_sub_server.h" #include "pres_sub_client.h" #include "sipvoiplink.h" -#include "client/signal.h" +#include "client/ring_signal.h" #include #include diff --git a/src/sip/sipvoiplink.cpp b/src/sip/sipvoiplink.cpp index 7632fbf95fb627312f99d4f18aada13819dec88a..e49f4c50c0aa231d730e968fabe735695b677e93 100644 --- a/src/sip/sipvoiplink.cpp +++ b/src/sip/sipvoiplink.cpp @@ -63,7 +63,7 @@ #include "client/videomanager.h" #endif -#include "client/signal.h" +#include "client/ring_signal.h" #include "pres_sub_server.h"