mirror of
https://gitlab.linphone.org/BC/public/linphone-desktop.git
synced 2026-01-27 16:59:21 +00:00
- Show logs in console if launched from it.
- Fix speaker icon in fullscreen. - Remove MouseArea from OpacityMask. - Fix crash on ZRTP and fix windows on SoundPlayer - fix Wasapi buffer
This commit is contained in:
parent
5bb35ff59a
commit
418a000eee
5 changed files with 58 additions and 48 deletions
|
|
@ -24,37 +24,58 @@
|
|||
#include <QQmlDebuggingEnabler>
|
||||
#endif
|
||||
#include <QSurfaceFormat>
|
||||
#ifdef _WIN32
|
||||
#include <Windows.h>
|
||||
FILE * gStream = NULL;
|
||||
#endif
|
||||
|
||||
#include "components/core/CoreManager.hpp"
|
||||
// =============================================================================
|
||||
|
||||
void cleanStream(){
|
||||
#ifdef _WIN32
|
||||
if(gStream) {
|
||||
fflush(stdout);
|
||||
fflush(stderr);
|
||||
fclose(gStream);
|
||||
}
|
||||
}
|
||||
#endif
|
||||
|
||||
int main (int argc, char *argv[]) {
|
||||
#ifdef __APPLE__
|
||||
qputenv("QT_ENABLE_GLYPH_CACHE_WORKAROUND", "1"); // On Mac, set this workaround to avoid glitches on M1, because of https://bugreports.qt.io/browse/QTBUG-89379
|
||||
#elif defined _WIN32
|
||||
// log in console only if launched from console
|
||||
if (AttachConsole(ATTACH_PARENT_PROCESS)) {
|
||||
freopen_s(&gStream, "CONOUT$", "w", stdout);
|
||||
freopen_s(&gStream, "CONOUT$", "w", stderr);
|
||||
}
|
||||
#endif
|
||||
AppController controller(argc, argv);
|
||||
AppController controller(argc, argv);
|
||||
#ifdef QT_QML_DEBUG
|
||||
QQmlDebuggingEnabler enabler;
|
||||
QQmlDebuggingEnabler enabler;
|
||||
#endif
|
||||
//QLoggingCategory::setFilterRules("*.debug=true;qml=false");
|
||||
App *app = controller.getApp();
|
||||
|
||||
if (app->isSecondary())
|
||||
{
|
||||
qInfo() << QStringLiteral("Running secondary app success. Kill it now.");
|
||||
return EXIT_SUCCESS;
|
||||
}
|
||||
|
||||
qInfo() << QStringLiteral("Running app...");
|
||||
|
||||
int ret;
|
||||
do {
|
||||
app->initContentApp();
|
||||
ret = app->exec();
|
||||
} while (ret == App::RestartCode);
|
||||
auto core = CoreManager::getInstance()->getCore();
|
||||
if(core && core->getGlobalState() == linphone::GlobalState::On)
|
||||
core->stop();
|
||||
|
||||
return ret;
|
||||
//QLoggingCategory::setFilterRules("*.debug=true;qml=false");
|
||||
App *app = controller.getApp();
|
||||
|
||||
if (app->isSecondary())
|
||||
{
|
||||
qInfo() << QStringLiteral("Running secondary app success. Kill it now.");
|
||||
cleanStream();
|
||||
return EXIT_SUCCESS;
|
||||
}
|
||||
|
||||
qInfo() << QStringLiteral("Running app...");
|
||||
|
||||
int ret;
|
||||
do {
|
||||
app->initContentApp();
|
||||
ret = app->exec();
|
||||
} while (ret == App::RestartCode);
|
||||
auto core = CoreManager::getInstance()->getCore();
|
||||
if(core && core->getGlobalState() == linphone::GlobalState::On)
|
||||
core->stop();
|
||||
cleanStream();
|
||||
return ret;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -129,7 +129,8 @@ void TimelineModel::setSelected(const bool& selected){
|
|||
<< ", ephemeralEnabled:" << mChatRoomModel->isEphemeralEnabled()
|
||||
<< ", isAdmin:"<< mChatRoomModel->isMeAdmin()
|
||||
<< ", canHandleParticipants:"<< mChatRoomModel->canHandleParticipants()
|
||||
<< ", isReadOnly:" << mChatRoomModel->isReadOnly();
|
||||
<< ", isReadOnly:" << mChatRoomModel->isReadOnly()
|
||||
<< ", state:" << mChatRoomModel->getState();
|
||||
}
|
||||
emit selectedChanged(mSelected);
|
||||
}
|
||||
|
|
|
|||
|
|
@ -256,18 +256,12 @@ Item {
|
|||
visible: !isCustom
|
||||
}
|
||||
|
||||
|
||||
|
||||
OpacityMask{
|
||||
anchors.fill: foregroundColor
|
||||
source: foregroundColor
|
||||
maskSource: icon
|
||||
visible: isCustom
|
||||
MouseArea{
|
||||
anchors.fill:parent
|
||||
hoverEnabled: true
|
||||
acceptedButtons: Qt.NoButton
|
||||
cursorShape: containsMouse ? Qt.PointingHandCursor : Qt.ArrowCursor
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
|
|
@ -277,19 +271,13 @@ Item {
|
|||
source: foregroundHiddenPartColor
|
||||
maskSource: icon
|
||||
visible: isCustom && percentageDisplayed != 100
|
||||
/*
|
||||
layer {
|
||||
enabled: true
|
||||
effect: ColorOverlay {
|
||||
color: "#80FFFFFF"
|
||||
}
|
||||
}*/
|
||||
MouseArea{
|
||||
anchors.fill:parent
|
||||
hoverEnabled: true
|
||||
acceptedButtons: Qt.NoButton
|
||||
cursorShape: containsMouse ? Qt.PointingHandCursor : Qt.ArrowCursor
|
||||
}
|
||||
|
||||
}
|
||||
MouseArea{
|
||||
anchors.fill:parent
|
||||
hoverEnabled: true
|
||||
acceptedButtons: Qt.NoButton
|
||||
cursorShape: containsMouse ? Qt.PointingHandCursor : Qt.ArrowCursor
|
||||
}
|
||||
TooltipArea {
|
||||
id:tooltip
|
||||
|
|
|
|||
|
|
@ -348,17 +348,17 @@ Window {
|
|||
Timer {
|
||||
interval: 50
|
||||
repeat: true
|
||||
running: speaker.enabled
|
||||
running: parent.enabled
|
||||
|
||||
onTriggered: parent.value = call.speakerVu
|
||||
}
|
||||
|
||||
enabled: speaker.enabled
|
||||
enabled: !speaker.muted
|
||||
}
|
||||
|
||||
ActionButton {
|
||||
id: speaker
|
||||
property bool muted : call && !call.speakerMuted
|
||||
property bool muted : call && call.speakerMuted
|
||||
isCustom: true
|
||||
backgroundRadius: 90
|
||||
colorSet: muted ? CallFullscreenStyle.buttons.speakerOff : CallFullscreenStyle.buttons.speakerOn
|
||||
|
|
|
|||
|
|
@ -1 +1 @@
|
|||
Subproject commit 813fc494f2a4d951eea6e99d4d1a6353a855c0b2
|
||||
Subproject commit 340bc9a1a682cfb5feb4751280e1b94693ee0ce1
|
||||
Loading…
Add table
Reference in a new issue