From 2730bf6ef212af4e7f8fb00ee7c1e72c1b1703d1 Mon Sep 17 00:00:00 2001 From: ovari123 <ovari123@zoho.com> Date: Sun, 24 Nov 2024 04:46:32 -0400 Subject: [PATCH] misc: unify terminology MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 3-character ellipsis ... → 1-character ellipsis … smart quote ’ infos → info Setupping → Setting up try → attempt Change-Id: I97ed89b9e9b1193162c856b4bb143f6bab55666b GitLab: https://git.jami.net/savoirfairelinux/jami-client-qt/issues/1730 --- src/jamidht/jamiaccount.cpp | 4 ++-- src/media/audio/pulseaudio/audiostream.cpp | 4 ++-- src/media/audio/pulseaudio/pulselayer.cpp | 4 ++-- src/media/socket_pair.cpp | 2 +- src/media/video/video_receive_thread.cpp | 10 +++++----- 5 files changed, 12 insertions(+), 12 deletions(-) diff --git a/src/jamidht/jamiaccount.cpp b/src/jamidht/jamiaccount.cpp index 9a523acee..a15c92a6c 100644 --- a/src/jamidht/jamiaccount.cpp +++ b/src/jamidht/jamiaccount.cpp @@ -1831,7 +1831,7 @@ JamiAccount::doRegister_() return; } - JAMI_DEBUG("[Account {}] Starting account...", getAccountID()); + JAMI_DEBUG("[Account {}] Starting account…", getAccountID()); const auto& conf = config(); try { @@ -1900,7 +1900,7 @@ JamiAccount::doRegister_() if (conf.accountPeerDiscovery or conf.accountPublish) { peerDiscovery_ = std::make_shared<dht::PeerDiscovery>(); if (conf.accountPeerDiscovery) { - JAMI_LOG("[Account {}] starting Jami account discovery...", getAccountID()); + JAMI_LOG("[Account {}] starting Jami account discovery…", getAccountID()); startAccountDiscovery(); } if (conf.accountPublish) diff --git a/src/media/audio/pulseaudio/audiostream.cpp b/src/media/audio/pulseaudio/audiostream.cpp index 4e0cd4fdd..aec4b48f9 100644 --- a/src/media/audio/pulseaudio/audiostream.cpp +++ b/src/media/audio/pulseaudio/audiostream.cpp @@ -251,11 +251,11 @@ AudioStream::stateChanged(pa_stream* s) switch (pa_stream_get_state(s)) { case PA_STREAM_CREATING: - JAMI_DBG("Stream is creating..."); + JAMI_DBG("Stream is creating…"); break; case PA_STREAM_TERMINATED: - JAMI_DBG("Stream is terminating..."); + JAMI_DBG("Stream is terminating…"); break; case PA_STREAM_READY: diff --git a/src/media/audio/pulseaudio/pulselayer.cpp b/src/media/audio/pulseaudio/pulselayer.cpp index 7a020bcd1..08c91d86b 100644 --- a/src/media/audio/pulseaudio/pulselayer.cpp +++ b/src/media/audio/pulseaudio/pulselayer.cpp @@ -137,7 +137,7 @@ PulseLayer::contextStateChanged(pa_context* c) case PA_CONTEXT_CONNECTING: case PA_CONTEXT_AUTHORIZING: case PA_CONTEXT_SETTING_NAME: - JAMI_DBG("Waiting...."); + JAMI_DBG("Waiting…"); break; case PA_CONTEXT_READY: @@ -205,7 +205,7 @@ PulseLayer::updateServerInfo() { std::unique_lock lk(readyMtx_); if (not gettingServerInfo_) { - JAMI_DBG("Updating PulseAudio server infos"); + JAMI_DBG("Updating PulseAudio server info"); gettingServerInfo_ = true; if (auto op = pa_context_get_server_info(context_, server_info_callback, this)) pa_operation_unref(op); diff --git a/src/media/socket_pair.cpp b/src/media/socket_pair.cpp index f7ad76cf7..26774f981 100644 --- a/src/media/socket_pair.cpp +++ b/src/media/socket_pair.cpp @@ -527,7 +527,7 @@ SocketPair::readCallback(uint8_t* buf, int buf_size) } } - // No RTCP... try RTP + // No RTCP… attempt RTP if (!len and (datatype & static_cast<int>(DataType::RTP))) { len = readRtpData(buf, buf_size); fromRTCP = false; diff --git a/src/media/video/video_receive_thread.cpp b/src/media/video/video_receive_thread.cpp index bcb4f8b24..ff1cfece3 100644 --- a/src/media/video/video_receive_thread.cpp +++ b/src/media/video/video_receive_thread.cpp @@ -64,7 +64,7 @@ VideoReceiveThread::~VideoReceiveThread() void VideoReceiveThread::startLoop() { - JAMI_DBG("[%p] Starting receiver's loop", this); + JAMI_DBG("[%p] Starting receiver’s loop", this); loop_.start(); } @@ -73,10 +73,10 @@ VideoReceiveThread::stopLoop() { if (loop_.isStopping()) return; - JAMI_DBG("[%p] Stopping receiver's loop and waiting for the thread to exit ...", this); + JAMI_DBG("[%p] Stopping receiver’s loop and waiting for the thread to exit…", this); loop_.stop(); loop_.join(); - JAMI_DBG("[%p] Receiver's thread exited", this); + JAMI_DBG("[%p] Receiver’s thread exited", this); } // We do this setup here instead of the constructor because we don't want the @@ -84,7 +84,7 @@ VideoReceiveThread::stopLoop() bool VideoReceiveThread::setup() { - JAMI_DBG("[%p] Setupping video receiver", this); + JAMI_DBG("[%p] Setting up video receiver", this); videoDecoder_.reset(new MediaDecoder([this](const std::shared_ptr<MediaFrame>& frame) mutable { libav_utils::AVBufferPtr displayMatrix; @@ -241,7 +241,7 @@ VideoReceiveThread::configureVideoOutput() } if (videoDecoder_->setupVideo() < 0) { - JAMI_ERR("decoder IO startup failed"); + JAMI_ERR("Decoder IO startup failed"); stopLoop(); return false; } -- GitLab