From 8982bb034ec6566490e540c7ff726644fbb60263 Mon Sep 17 00:00:00 2001 From: evgeny Date: Mon, 5 Oct 2026 21:30:37 +0200 Subject: [PATCH] Move legacy sound and attachment errors to media --- tools/chatgui/src/inputbar.cpp | 2 +- tools/chatgui/src/sound_manager.cpp | 8 ++++---- tools/chatgui/src/voicemessageencoder.cpp | 2 +- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/tools/chatgui/src/inputbar.cpp b/tools/chatgui/src/inputbar.cpp index db918a6b..30bc3773 100644 --- a/tools/chatgui/src/inputbar.cpp +++ b/tools/chatgui/src/inputbar.cpp @@ -347,7 +347,7 @@ void InputBar::onAttachClicked() { GUI_INFO("InputBar: PM attachment selected name=%s bytes=%lld", qPrintable(fi.fileName()), (long long)fi.size()); return; } - if (fi.size() == 0) { DEBUG_WARN(DEBUG_CATEGORY_DEBUG, "InputBar::onAttachClicked: empty file"); return; } + if (fi.size() == 0) { DEBUG_WARN(DEBUG_CATEGORY_MEDIA, "InputBar::onAttachClicked: empty file"); return; } QString mediaPath = m_mediaDirBase + "/" + m_channelIdForRecord; VoiceEncoder::ensureMediaDir(mediaPath); diff --git a/tools/chatgui/src/sound_manager.cpp b/tools/chatgui/src/sound_manager.cpp index bc5a6e4a..d92437d4 100644 --- a/tools/chatgui/src/sound_manager.cpp +++ b/tools/chatgui/src/sound_manager.cpp @@ -437,14 +437,14 @@ bool SoundManager::loadSound(const QString& name, const QString& filePath) { void SoundManager::play(const QString& name) { if (!m_enabled) return; - if (!m_initialized) { DEBUG_WARN(DEBUG_CATEGORY_DEBUG, "SoundManager::play: not initialized"); return; } + if (!m_initialized) { DEBUG_WARN(DEBUG_CATEGORY_MEDIA, "SoundManager::play: not initialized"); return; } EventSettings es = m_eventSettings.value(name); if (!es.enabled) return; auto it = m_sounds.find(name); if (it == m_sounds.end()) { - DEBUG_WARN(DEBUG_CATEGORY_DEBUG, "SoundManager::play: sound '%s' not loaded", qPrintable(name)); + DEBUG_WARN(DEBUG_CATEGORY_MEDIA, "SoundManager::play: sound '%s' not loaded", qPrintable(name)); return; } @@ -461,7 +461,7 @@ void SoundManager::play(const QString& name) { void SoundManager::playLoop(const QString& name) { if (!m_enabled) return; - if (!m_initialized) { DEBUG_WARN(DEBUG_CATEGORY_DEBUG, "SoundManager::playLoop: not initialized"); return; } + if (!m_initialized) { DEBUG_WARN(DEBUG_CATEGORY_MEDIA, "SoundManager::playLoop: not initialized"); return; } /* остановить предыдущий цикл (иначе call_connecting + call_ringing звучат вместе) */ stopLoop(); @@ -471,7 +471,7 @@ void SoundManager::playLoop(const QString& name) { auto it = m_sounds.find(name); if (it == m_sounds.end()) { - DEBUG_WARN(DEBUG_CATEGORY_DEBUG, "SoundManager::playLoop: sound '%s' not loaded", qPrintable(name)); + DEBUG_WARN(DEBUG_CATEGORY_MEDIA, "SoundManager::playLoop: sound '%s' not loaded", qPrintable(name)); return; } diff --git a/tools/chatgui/src/voicemessageencoder.cpp b/tools/chatgui/src/voicemessageencoder.cpp index 6885b3ea..299842e4 100644 --- a/tools/chatgui/src/voicemessageencoder.cpp +++ b/tools/chatgui/src/voicemessageencoder.cpp @@ -11,6 +11,6 @@ int VoiceEncoder::preset() { return s_preset; } void VoiceEncoder::ensureMediaDir(const QString& dir) { QDir d; if (!d.mkpath(dir)) { - DEBUG_WARN(DEBUG_CATEGORY_DEBUG, "VoiceEncoder: cannot create media dir %s", qPrintable(dir)); + DEBUG_WARN(DEBUG_CATEGORY_MEDIA, "VoiceEncoder: cannot create media dir %s", qPrintable(dir)); } }