jeka/utun2
1
0 Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Handle the tracked voice view during destruction and isolate test startup work

Browse Source
This commit is contained in:
evgeny committed 2026-10-28 00:59:00 +01:00
1 parent f624fd6a75
commit fee528194b
2 files changed
+12 -8
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

tools/chatgui/src/messagedelegate.cpp
+5 -3
View File
@@ -1084,10 +1084,12 @@ void MessageDelegate::paintBody(QPainter* painter, const QStyleOptionViewItem& o
auto* view = qobject_cast<QAbstractItemView*>(const_cast<QWidget*>(option.widget));
if (view && s_voiceView != view) {
s_voiceView = view;
QObject::connect(view, &QObject::destroyed, QCoreApplication::instance(), [] {
if (s_voiceView) return; // Уничтожен прежний view, текущий продолжает воспроизведение.
GUI_DEBUG("voice delegate: tracking view=%p", static_cast<void*>(view));
QObject::connect(view, &QObject::destroyed, QCoreApplication::instance(), [view] {
if (s_voiceView && s_voiceView.data() != view) return; // Другой текущий view продолжает воспроизведение.
s_voiceView = nullptr;
MessageDelegate::stopAllAutoPlay();
GUI_DEBUG("voice delegate: view destroyed, playback state released");
GUI_DEBUG("voice delegate: view=%p destroyed, playback state released", static_cast<void*>(view));
});
}
drawBubble(painter, L, option);
tools/chatgui/tests/test_desktop_commands.cpp
+7 -5
View File
@@ -225,7 +225,7 @@ private slots:
QTest::newRow(qPrintable(name + (temporary ? "-owned-source" : "-borrowed-source"))) << name << temporary;
}
void attachmentOwnership() {
QFETCH(QString, scenario); QFETCH(bool, temporary); DesktopCore core; QVERIFY(core.start());
QFETCH(QString, scenario); QFETCH(bool, temporary); std::atomic<int> releases{0}; DesktopCore core; QVERIFY(core.start());
const quint64 channel = chat_core_create_channel_auto(core.inst, "Attachment ownership"); QVERIFY(channel);
core.poll();
const QByteArray source = core.directory.filePath("recording.raw").toUtf8();
@@ -234,11 +234,10 @@ private slots:
#ifdef UTUN_TEST_DESKTOP_HOOKS
watching = true;
#endif
std::atomic<int> releases{0};
struct PcmOwner { std::atomic<int>* releases; int16_t samples[4800]; };
struct PcmOwner { std::atomic<int>* releases; int16_t samples[24000]; };
auto* owner = static_cast<PcmOwner*>(u_calloc(1, sizeof(PcmOwner))); QVERIFY(owner); owner->releases = &releases;
auto* request = static_cast<attachment_send_req*>(u_calloc(1, sizeof(attachment_send_req))); QVERIFY(request);
request->pcm = owner->samples; request->pcm_count = 4800; request->pcm_owner = owner;
request->pcm = owner->samples; request->pcm_count = 24000; request->pcm_owner = owner;
request->pcm_release = [](void* arg) { auto* pcm = static_cast<PcmOwner*>(arg); ++*pcm->releases; u_free(pcm); };
request->info.kind = ATTACHMENT_VOICE; request->request_id = 77;
qstrncpy(request->target, qPrintable(QString::number(channel)), sizeof(request->target));
@@ -399,7 +398,10 @@ private slots:
QFETCH(int, action); QFETCH(QString, scenario); QFETCH(bool, window);
DesktopCore core; QVERIFY(core.start());
std::unique_ptr<MainWindow> form;
if (window) form = std::make_unique<MainWindow>(nullptr, nullptr, QString()); // UtunNode остаётся владельцу fixture.
if (window) {
form = std::make_unique<MainWindow>(nullptr, nullptr, QString()); // UtunNode остаётся владельцу fixture.
core.poll(); QCoreApplication::processEvents(); // Отделить стартовые настройки media от проверяемой команды.
}
if (scenario == "unavailable") gui_bridge_set_inst(nullptr);
if (scenario == "stopped") uasync_mark_stopped(core.ua);
#ifdef UTUN_TEST_DESKTOP_HOOKS