diff --git a/src/client/callmanager.cpp b/src/client/callmanager.cpp index 03db7663076348a18a0137c8e664b7cee7e9cc44..4d521e287864a8130e8cb6320f9b850595c450db 100644 --- a/src/client/callmanager.cpp +++ b/src/client/callmanager.cpp @@ -339,7 +339,7 @@ sendTextMessage(const std::string& callID, const std::string& message) #if HAVE_INSTANT_MESSAGING ring::Manager::instance().sendTextMessage(callID, message, "Me"); #else - RING_ERR("Could not send \"%s\" text message to %s since SFLphone daemon does not support it, please recompile with instant messaging support", message.c_str(), callID.c_str()); + RING_ERR("Could not send \"%s\" text message to %s since Ring daemon does not support it, please recompile with instant messaging support", message.c_str(), callID.c_str()); #endif } diff --git a/src/managerimpl.cpp b/src/managerimpl.cpp index 317b39eb70d2c805b7094bd220d2d433c6a56821..d595750580325738b82e13d78df385c4fe763fd0 100644 --- a/src/managerimpl.cpp +++ b/src/managerimpl.cpp @@ -214,7 +214,7 @@ ManagerImpl::ManagerImpl() : std::seed_seq seed {rdev(), rdev()}; rand_.seed(seed); - ring::libav_utils::sfl_avcodec_init(); + ring::libav_utils::ring_avcodec_init(); } ManagerImpl::~ManagerImpl() diff --git a/src/media/audio/audiolayer.h b/src/media/audio/audiolayer.h index dd448a3e6cf04a1ec71e685cfb34c16e5bda79f0..78fad4f1d386cd351517bf5502a47b4dbb0a2d47 100644 --- a/src/media/audio/audiolayer.h +++ b/src/media/audio/audiolayer.h @@ -238,7 +238,7 @@ class AudioLayer { bool isStarted_; /** - * Sample Rate SFLphone should send sound data to the sound card + * Sample Rate Ring should send sound data to the sound card */ AudioFormat audioFormat_; diff --git a/src/media/audio/coreaudio/corelayer.cpp b/src/media/audio/coreaudio/corelayer.cpp index d7d1ea4e25371cf39b6595c0ec09176d74f8ff05..beb40b7e72a05e9b7b71479078c38733b13cc494 100644 --- a/src/media/audio/coreaudio/corelayer.cpp +++ b/src/media/audio/coreaudio/corelayer.cpp @@ -486,7 +486,7 @@ void CoreLayer::read(AudioUnitRenderActionFlags* ioActionFlags, &size)); - // Add them to sflphone ringbuffer. + // Add them to Ring ringbuffer. const AudioFormat mainBufferFormat = Manager::instance().getRingBufferPool().getInternalAudioFormat(); bool resample = info.mSampleRate != mainBufferFormat.sample_rate; diff --git a/src/media/audio/jack/jacklayer.cpp b/src/media/audio/jack/jacklayer.cpp index 9208ff26b84597b19393305cd5cbdb34ab771ad4..3ace332b5cdf857263c5890069e22b44c989a8dc 100644 --- a/src/media/audio/jack/jacklayer.cpp +++ b/src/media/audio/jack/jacklayer.cpp @@ -268,7 +268,7 @@ JackLayer::ringbuffer_worker() // wait until process() signals more data // FIXME: this checks for spurious wakes, but the predicate - // is rather arbitrary. We should wait until sflphone has/needs data + // is rather arbitrary. We should wait until ring has/needs data // and jack has/needs data. data_ready_.wait(lock, [&] { // Note: lock is released while waiting, and held when woken diff --git a/src/media/libav_utils.cpp b/src/media/libav_utils.cpp index 60643219aad6564c5df53e105689ba04ac3de620..95af5d2080336c1a4c80c54ab2d4eec8f5f5bbc6 100644 --- a/src/media/libav_utils.cpp +++ b/src/media/libav_utils.cpp @@ -97,7 +97,7 @@ static void init_once() static std::once_flag already_called; -void sfl_avcodec_init() +void ring_avcodec_init() { std::call_once(already_called, init_once); } @@ -112,7 +112,7 @@ int libav_pixel_format(int fmt) return fmt; } -int sfl_pixel_format(int fmt) +int ring_pixel_format(int fmt) { switch (fmt) { case PIXEL_FORMAT(YUV420P): return video::VIDEO_PIXFMT_YUV420P; @@ -120,7 +120,7 @@ int sfl_pixel_format(int fmt) return fmt; } -void sfl_url_split(const char *url, +void ring_url_split(const char *url, char *hostname, size_t hostname_size, int *port, char *path, size_t path_size) { diff --git a/src/media/libav_utils.h b/src/media/libav_utils.h index 46bb441c3b3f731a82b28077b1a97c92c07cb57c..f12147b5d0f6d5f725a2b9b2faefb2179497e28d 100644 --- a/src/media/libav_utils.h +++ b/src/media/libav_utils.h @@ -37,15 +37,15 @@ namespace ring { namespace libav_utils { - void sfl_avcodec_init(); + void ring_avcodec_init(); int libav_pixel_format(int fmt); - int sfl_pixel_format(int fmt); + int ring_pixel_format(int fmt); const char *const DEFAULT_H264_PROFILE_LEVEL_ID = "profile-level-id=428014"; const char *const MAX_H264_PROFILE_LEVEL_ID = "profile-level-id=640034"; - void sfl_url_split(const char *url, + void ring_url_split(const char *url, char *hostname, size_t hostname_size, int *port, char *path, size_t path_size); diff --git a/src/media/media_buffer.cpp b/src/media/media_buffer.cpp index 4e1a2d43a7de17d7857a9407687414a03d0356d0..2a0df42b819f2dab7886f31c99bdfef7a8cb3c18 100644 --- a/src/media/media_buffer.cpp +++ b/src/media/media_buffer.cpp @@ -70,7 +70,7 @@ VideoFrame::size() const noexcept int VideoFrame::format() const noexcept { - return libav_utils::sfl_pixel_format(frame_->format); + return libav_utils::ring_pixel_format(frame_->format); } int diff --git a/src/media/media_decoder.cpp b/src/media/media_decoder.cpp index bf7c198100579755b232d6902b06d2b36f855036..c92564146730f82e7a0d931c525e0e1e3b948977 100644 --- a/src/media/media_decoder.cpp +++ b/src/media/media_decoder.cpp @@ -429,7 +429,7 @@ int MediaDecoder::getHeight() const { return decoderCtx_->height; } int MediaDecoder::getPixelFormat() const -{ return libav_utils::sfl_pixel_format(decoderCtx_->pix_fmt); } +{ return libav_utils::ring_pixel_format(decoderCtx_->pix_fmt); } void MediaDecoder::writeToRingBuffer(const AudioFrame& decodedFrame, diff --git a/src/media/media_encoder.cpp b/src/media/media_encoder.cpp index 3c81e3ed07f73ffd904afec4079491b9ea2c6633..963ea574f79867d844a88ff1cf211f5ec7035859 100644 --- a/src/media/media_encoder.cpp +++ b/src/media/media_encoder.cpp @@ -168,7 +168,7 @@ MediaEncoder::openOutput(const char *filename, // allocate buffers for both scaled (pre-encoder) and encoded frames const int width = encoderCtx_->width; const int height = encoderCtx_->height; - const int format = libav_utils::sfl_pixel_format((int)encoderCtx_->pix_fmt); + const int format = libav_utils::ring_pixel_format((int)encoderCtx_->pix_fmt); scaledFrameBufferSize_ = videoFrameSize(format, width, height); if (scaledFrameBufferSize_ <= FF_MIN_BUFFER_SIZE) throw MediaEncoderException("buffer too small"); diff --git a/src/media/socket_pair.cpp b/src/media/socket_pair.cpp index 6688104b5206792d4bf876f9debad197aa0e5240..b7f0ab1379f4345f55d22f01215258c196bd6fd9 100644 --- a/src/media/socket_pair.cpp +++ b/src/media/socket_pair.cpp @@ -246,7 +246,7 @@ void SocketPair::openSockets(const char *uri, int local_rtp_port) char path[1024]; int rtp_port; - libav_utils::sfl_url_split(uri, hostname, sizeof(hostname), &rtp_port, path, + libav_utils::ring_url_split(uri, hostname, sizeof(hostname), &rtp_port, path, sizeof(path)); const int rtcp_port = rtp_port + 1; diff --git a/src/preferences.cpp b/src/preferences.cpp index ef906a2a4cf7dfd2fde66648595a249ec3573aa0..473b252dcc9aeb3a538a66af63215462f6f1ebfc 100644 --- a/src/preferences.cpp +++ b/src/preferences.cpp @@ -247,7 +247,7 @@ HookPreference::HookPreference() : , numberEnabled_(false) , sipEnabled_(false) , urlCommand_("x-www-browser") - , urlSipField_("X-sflphone-url") + , urlSipField_("X-ring-url") {} HookPreference::HookPreference(const std::map<std::string, std::string> &settings) : diff --git a/src/ringdht/ringaccount.h b/src/ringdht/ringaccount.h index a2def3eafd3e30437525e12c63b49c84fc325be1..84cb1411a5b3cf17e6dbc5bb3956e142671b86ca 100644 --- a/src/ringdht/ringaccount.h +++ b/src/ringdht/ringaccount.h @@ -148,7 +148,7 @@ class RingAccount : public SIPAccountBase { std::string getToUri(const std::string& username) const; /** - * In the current version of SFLPhone, "srv" uri is obtained in the preformated + * In the current version of Ring, "srv" uri is obtained in the preformated * way: hostname:port. This method adds the correct scheme and append * the ;transport= parameter at the end of the uri, in accordance with RFC3261. * diff --git a/src/sip/sipaccount.h b/src/sip/sipaccount.h index 0d832a3cba9a6cb3775eba719c0fb9fcf6ab70cf..8aeb31e4ee8db82612daa35e30282206e5092fdf 100644 --- a/src/sip/sipaccount.h +++ b/src/sip/sipaccount.h @@ -383,7 +383,7 @@ class SIPAccount : public SIPAccountBase { std::string getToUri(const std::string& username) const; /** - * In the current version of SFLPhone, "srv" uri is obtained in the preformated + * In the current version of Ring, "srv" uri is obtained in the preformated * way: hostname:port. This method adds the correct scheme and append * the ;transport= parameter at the end of the uri, in accordance with RFC3261. * @@ -628,7 +628,7 @@ class SIPAccount : public SIPAccountBase { * If username is not provided, as it happens for Direct ip calls, * fetch the Real Name field of the user that is currently * running this program. - * @return std::string The login name under which SFLPhone is running. + * @return std::string The login name under which Ring is running. */ static std::string getLoginName(); diff --git a/src/sip/tlsvalidator.cpp b/src/sip/tlsvalidator.cpp index fdc560620c65d14c6651930c446f23ab6268b921..2837bf2dc1290218dd449ee765e68fc27dba36c0 100644 --- a/src/sip/tlsvalidator.cpp +++ b/src/sip/tlsvalidator.cpp @@ -916,7 +916,7 @@ TlsValidator::CheckResult TlsValidator::authorityMatch() */ TlsValidator::CheckResult TlsValidator::knownAuthority() { - // TODO SFLphone need a new boolean account setting "require trusted authority" or something defaulting to true + // TODO Ring need a new boolean account setting "require trusted authority" or something defaulting to true // using GNUTLS_CERT_SIGNER_NOT_FOUND is a temporary placeholder as it is close enough return TlsValidator::CheckResult(compareToCa() & GNUTLS_CERT_SIGNER_NOT_FOUND ? CheckValues::FAILED : CheckValues::PASSED, "");