mirrors/linphone-desktop
1
0
Fork 0
mirror of https://gitlab.linphone.org/BC/public/linphone-desktop.git synced 2026-01-17 11:28:07 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Clean logs.

Browse source
This commit is contained in:
Julien Wadel 2022-10-14 18:47:40 +02:00
parent 68413a6bfb
commit e070f910d6
17 changed files with 19 additions and 66 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
linphone-app/src/components/call/CallModel.cpp
View file

@ -1027,7 +1027,7 @@ void CallModel::updateConferenceVideoLayout(){
settings->setCameraMode(settings->getActiveSpeakerCameraMode());
}else
settings->setCameraMode(settings->getCallCameraMode());
qWarning() << "Changing layout from " << mConferenceVideoLayout << " into " << newLayout;
qDebug() << "Changing layout from " << mConferenceVideoLayout << " into " << newLayout;
mConferenceVideoLayout = newLayout;
emit conferenceVideoLayoutChanged();
emit snapshotEnabledChanged();

6
linphone-app/src/components/chat-room/ChatRoomInitializer.cpp
View file

@ -84,7 +84,7 @@ void ChatRoomInitializer::setAdmins(QList< std::shared_ptr<linphone::Address>> a
void ChatRoomInitializer::start(QSharedPointer<ChatRoomInitializer> initializer){
QObject * context = new QObject();
QObject::connect(initializer.get(), &ChatRoomInitializer::finished, context, [context, initializer](int state){
qInfo() << "[ChatRoomInitializer] initialized";
qDebug() << "[ChatRoomInitializer] initialized";
context->deleteLater();// This will destroy context and initializer
});
}
@ -97,12 +97,12 @@ void ChatRoomInitializer::checkInitialization(){
}
void ChatRoomInitializer::onConferenceJoined(const std::shared_ptr<linphone::ChatRoom> & chatRoom, const std::shared_ptr<const linphone::EventLog> & eventLog) {
qInfo() << "[ChatRoomInitializer] Conference has been set";
qDebug() << "[ChatRoomInitializer] Conference has been set";
setAdmins(mAdmins);
}
void ChatRoomInitializer::onStateChanged(const std::shared_ptr<linphone::ChatRoom> & chatRoom, linphone::ChatRoom::State newState) {
qInfo() << "[ChatRoomInitializer] State : " << (int)newState;
qDebug() << "[ChatRoomInitializer] State : " << (int)newState;
if( newState >= linphone::ChatRoom::State::Created || newState == linphone::ChatRoom::State::Instantiated) {
checkInitialization();
}

1
linphone-app/src/components/chat-room/ChatRoomListener.cpp
View file

@ -29,7 +29,6 @@
ChatRoomListener::ChatRoomListener(QObject * parent): QObject(parent){
}
ChatRoomListener::~ChatRoomListener(){
qDebug() << "Destroying ChatRoomListener " << this;
}
//---------------------------------------------------------------------------------------------------

8
linphone-app/src/components/participant/ParticipantDeviceListModel.cpp
View file

@ -102,7 +102,7 @@ bool ParticipantDeviceListModel::add(std::shared_ptr<linphone::ParticipantDevice
for(auto item : mList) {
auto deviceModel = item.objectCast<ParticipantDeviceModel>();
if(deviceModel->getDevice() == deviceToAdd) {
qWarning() << "Device already exist. Send video update event";
qDebug() << "Device already exist. Send video update event";
deviceModel->updateVideoEnabled();
return false;
}
@ -208,7 +208,7 @@ void ParticipantDeviceListModel::onSecurityLevelChanged(std::shared_ptr<const li
void ParticipantDeviceListModel::onParticipantAdded(const std::shared_ptr<const linphone::Participant> & participant){
std::list<std::shared_ptr<linphone::ParticipantDevice>> devices = participant->getDevices() ;
if(devices.size() == 0)
qWarning() << "Participant has no device. It will not be added : " << participant->getAddress()->asString().c_str();
qDebug() << "Participant has no device. It will not be added : " << participant->getAddress()->asString().c_str();
else
for(auto device : devices)
add(device);
@ -237,13 +237,13 @@ void ParticipantDeviceListModel::onParticipantDeviceAdded(const std::shared_ptr<
}
}
qWarning() << "No participant device found from linphone::ParticipantDevice at onParticipantDeviceAdded";
qDebug() << "No participant device found from linphone::ParticipantDevice at onParticipantDeviceAdded";
}
void ParticipantDeviceListModel::onParticipantDeviceRemoved(const std::shared_ptr<const linphone::ParticipantDevice> & participantDevice){
qDebug() << "Removing participant device : " << mList.count();
if(!remove(participantDevice))
qWarning() << "No participant device found from linphone::ParticipantDevice at onParticipantDeviceRemoved";
qDebug() << "No participant device found from linphone::ParticipantDevice at onParticipantDeviceRemoved";
}
void ParticipantDeviceListModel::onConferenceStateChanged(linphone::Conference::State newState){

6
linphone-app/src/components/participant/ParticipantDeviceListener.cpp
View file

@ -29,17 +29,17 @@ ParticipantDeviceListener::ParticipantDeviceListener(QObject *parent) : QObject(
//--------------------------------------------------------------------
void ParticipantDeviceListener::onIsSpeakingChanged(const std::shared_ptr<linphone::ParticipantDevice> & participantDevice, bool isSpeaking) {
qInfo() << "onIsSpeakingChanged " << participantDevice->getAddress()->asString().c_str() << " " << isSpeaking;
qDebug() << "onIsSpeakingChanged " << participantDevice->getAddress()->asString().c_str() << " " << isSpeaking;
emit isSpeakingChanged(participantDevice, isSpeaking);
}
void ParticipantDeviceListener::onIsMuted(const std::shared_ptr<linphone::ParticipantDevice> & participantDevice, bool isMutedVar) {
qInfo() << "onIsMuted " << isMutedVar << " vs " << participantDevice->getIsMuted() << " for " << participantDevice->getAddress()->asString().c_str();
qDebug() << "onIsMuted " << isMutedVar << " vs " << participantDevice->getIsMuted() << " for " << participantDevice->getAddress()->asString().c_str();
emit isMuted(participantDevice, isMutedVar);
}
void ParticipantDeviceListener::onStateChanged(const std::shared_ptr<linphone::ParticipantDevice> & participantDevice, linphone::ParticipantDeviceState state){
qInfo() << "onStateChanged: " << participantDevice->getAddress()->asString().c_str() << " " << (int)state;
qDebug() << "onStateChanged: " << participantDevice->getAddress()->asString().c_str() << " " << (int)state;
emit stateChanged(participantDevice, state);
}

2
linphone-app/src/components/participant/ParticipantDeviceModel.cpp
View file

@ -147,7 +147,7 @@ void ParticipantDeviceModel::updateVideoEnabled(){
)
|| isMe()) && !mIsPaused;
if( mIsVideoEnabled != enabled && mCall && mCall->getCall()->getState() == linphone::Call::State::StreamsRunning) {
qWarning() << "VideoEnabled: " << enabled << ", old=" << mIsVideoEnabled << (mParticipantDevice ? mParticipantDevice->getAddress()->asString().c_str() : "") << ", me=" << isMe() << ", CallState=" << (mCall ? (int)mCall->getCall()->getState() : -1);
qDebug() << "VideoEnabled: " << enabled << ", old=" << mIsVideoEnabled << (mParticipantDevice ? mParticipantDevice->getAddress()->asString().c_str() : "") << ", me=" << isMe() << ", CallState=" << (mCall ? (int)mCall->getCall()->getState() : -1);
mIsVideoEnabled = enabled;
emit videoEnabledChanged();
}

2
linphone-app/src/components/recorder/RecorderModel.cpp
View file

@ -86,7 +86,7 @@ void RecorderModel::start(){
}
void RecorderModel::pause(){
qWarning() << mRecorder->pause();
mRecorder->pause();
emit stateChanged();
}

2
linphone-app/src/components/timeline/TimelineListModel.cpp
View file

@ -119,7 +119,6 @@ bool TimelineListModel::removeRows (int row, int count, const QModelIndex &paren
for(auto timeline : oldTimelines)
if(timeline->mSelected) {
qWarning() << "Unselecting timemodel " << timeline;
timeline->setSelected(false);
}
@ -239,7 +238,6 @@ void TimelineListModel::onSelectedHasChanged(bool selected){
emit selectedChanged(qobject_cast<TimelineModel*>(sender()));
}
}else{// Do nothing
qWarning() << "Timeline selection (selected=" << selected << ") is more than 1 : " << mSelectedCount;
}
}

4
linphone-app/ui/modules/Linphone/Dialog/SipAddressDialog.qml
View file

@ -58,14 +58,14 @@ DialogPlus {
return UtilsCpp.hasCapability(entry.sipAddress, LinphoneEnums.FriendCapabilityLimeX3Dh)
},
handler: function (entry) {
console.log("Call selected: " +entry + "/"+entry.sipAddress)
console.debug("Call selected: " +entry + "/"+entry.sipAddress)
mainItem.addressSelectedCallback(entry.sipAddress)
exit(1)
},
}]
onEntryClicked: {
console.log("Call selected: " +entry + "/"+entry.sipAddress)
console.debug("Call selected: " +entry + "/"+entry.sipAddress)
mainItem.addressSelectedCallback(entry.sipAddress)
exit(1)
}

2
linphone-app/ui/modules/Linphone/Notifications/NotificationReceivedMessage.qml
View file

@ -84,7 +84,7 @@ Notification {
onClicked: notification._close(function () {
AccountSettingsModel.setDefaultAccountFromSipAddress(notification.localAddress)
notification.timelineModel.selected = true
console.log("Load conversation from notification")
console.debug("Load conversation from notification")
notification.notificationData.window.setView('Conversation', {
chatRoomModel:notification.timelineModel.getChatRoomModel()
})

2
linphone-app/ui/modules/Linphone/Presence/PresenceLevel.qml
View file

@ -9,7 +9,6 @@ import Linphone 1.0
Item {
property var level: null
property bool betterIcon : false
//onLevelChanged: console.log("Level change : "+Presence.getPresenceStatusAsString(level))
Icon {
anchors.centerIn: parent
@ -20,6 +19,5 @@ Item {
iconSize: parent.height > parent.width
? parent.width
: parent.height
//onIconChanged: console.log(Presence.getPresenceStatusAsString(level)+ "//" +icon)
}
}

10
linphone-app/ui/views/App/Calls/CallsWindow.js
View file

@ -67,26 +67,21 @@ function openWaitingRoom(model){
// -----------------------------------------------------------------------------
// Used to get Component based from Call Status
function getContent (call, conferenceInfoModel) {
console.log("Changing contents")
if (call == null) {
if(conferenceInfoModel) {
console.log("waitingRoom")
return waitingRoom
}
else{
console.log("null")
return null
}
}
var status = call.status
if (status == null) {
console.log(calls.conferenceModel.count > 0 ? "conference" : "null")
return calls.conferenceModel.count > 0 ? conference : null
}
var CallModel = Linphone.CallModel
if (status === CallModel.CallStatusIncoming) {
console.log("null")
return null;
}
if( window.conferenceInfoModel != call.conferenceInfoModel) {
@ -94,16 +89,11 @@ function getContent (call, conferenceInfoModel) {
return middlePane.sourceComponent // unchange. Wait for later decision on conference model (avoid binding loop on sourceComponent)
}else{
if(call.isConference){
console.log("incall")
return incall
}
if (status === CallModel.CallStatusOutgoing || (status === CallModel.CallStatusEnded && call.callError != '' )) {
console.log("waitingRoom. Is conference ? "+call.isConference)
return waitingRoom
}
console.log("incall")
return incall
}
}

2
linphone-app/ui/views/App/Calls/Incall.qml
View file

@ -316,7 +316,6 @@ Rectangle {
isRightReducedLayout: rightMenu.visible
isLeftReducedLayout: mainItem.listCallsOpened
cameraEnabled: !mainItem.isFullScreen
onCameraEnabledChanged: console.log(cameraEnabled)
}
}
RowLayout{
@ -332,7 +331,6 @@ Rectangle {
? activeSpeakerComponent
: gridComponent
: activeSpeakerComponent
onSourceComponentChanged: console.log("conferenceLayout: "+mainItem.callModel.conferenceVideoLayout + " => " +sourceComponent)
active: mainItem.callModel && !mainItem.isFullScreen
}
Rectangle{

31
linphone-app/ui/views/App/Calls/IncallActiveSpeaker.qml
View file

@ -29,7 +29,7 @@ Item {
property int participantCount: callModel.isConference ? allDevices.count + 1 : 2 // +me. allDevices==0 if !conference
onParticipantCountChanged: {console.log("Conf count: " +participantCount); Qt.callLater(allDevices.updateCurrentDevice)}
onParticipantCountChanged: {Qt.callLater(allDevices.updateCurrentDevice)}
property ParticipantDeviceProxyModel participantDevices : ParticipantDeviceProxyModel {
id: allDevices
@ -78,13 +78,8 @@ Item {
|| currentDevice && !currentDevice.videoEnabled
isVideoEnabled: !deactivateCamera
onDeactivateCameraChanged: console.log("deactivateCamera? "+deactivateCamera)
isPreview: !preview.visible && mainItem.participantCount == 1
onIsPreviewChanged: {
console.log("ispreview ? " +isPreview + "visible?"+preview.visible +", pCount="+mainItem.participantCount
+" / ready?" +mainItem.isConferenceReady
+" / allCount=" +allDevices.count
)
if( isPreview){
currentDevice = allDevices.me
cameraView.resetCamera()
@ -93,7 +88,6 @@ Item {
cameraView.resetCamera()
}
isCameraFromDevice: isPreview
onCurrentDeviceChanged: console.log("CurrentDevice: "+currentDevice)
isPaused: isPreview && callModel.pausedByUser
? false
: callModel.isConference
@ -101,19 +95,12 @@ Item {
(currentDevice && currentDevice.isPaused)
: callModel && !callModel.pausedByUser && (callModel.status === CallModel.CallStatusPaused)
onIsPausedChanged: console.log("ispaused ? " +isPaused + " = " +callModel.pausedByUser + " / " + (currentDevice ? currentDevice.isPaused : 'noDevice') +" / " +callModel.isConference + " / " +callModel.status )
quickTransition: true
showCloseButton: false
showActiveSpeakerOverlay: false // This is an active speaker. We don't need to show the indicator.
showCustomButton: false
avatarStickerBackgroundColor: isPreview ? IncallStyle.container.avatar.stickerPreviewBackgroundColor : IncallStyle.container.avatar.stickerBackgroundColor
avatarBackgroundColor: IncallStyle.container.avatar.backgroundColor
Component.onCompleted: console.log("Completed: "+isPaused + " = " +callModel.pausedByUser + " / " + (currentDevice ? currentDevice.isPaused : 'noDevice')
+" isPreview?" +isPreview
+" / Video?" +(currentDevice ? currentDevice.videoEnabled : "NoDevice") + "-"+(callModel ? callModel.videoEnabled : "NoCall")
+" / Camera?" +(currentDevice ? currentDevice.cameraEnabled : "NoDevice") + "-"+(callModel ? callModel.cameraEnabled : "NoCall")
+" / Deactivated?"+deactivateCamera
+" / " +callModel.isConference + " / " +callModel.status)
}
Item{// Need an item to not override Sticker internal states. States are needed for changing anchors.
id: preview
@ -125,14 +112,8 @@ Item {
height: visible ? miniViews.cellHeight : 0
width: 16 * height / 9
//property bool showMe : !(callModel && callModel.pausedByUser) && (callModel.isConference || callModel.localVideoEnabled)
visible: mainItem.isConferenceReady && allDevices.count >= 1
|| (!callModel.isConference && mainItem.callModel.cameraEnabled)// use videoEnabled if we want to show the preview sticker
onVisibleChanged: console.log("visible? "+visible + " / video?" +(callModel ? callModel.videoEnabled : "NoCall")
+ " / camera?" +(callModel ? callModel.cameraEnabled : "NoCall")
)
Loader{
anchors.fill: parent
@ -141,11 +122,6 @@ Item {
Sticker{
id: previewSticker
deactivateCamera: !mainItem.callModel || callModel.pausedByUser || !mainItem.callModel.cameraEnabled
//|| (!callModel.isConference && !mainItem.callModel.videoEnabled)
//|| (callModel.isConference && !mainItem.callModel.cameraEnabled)
//|| ( (callModel.isConference && !mainItem.callModel.cameraEnabled) || (!callModel.isConference && !mainItem.callModel.localVideoEnabled) )
onDeactivateCameraChanged: console.log(deactivateCamera + " = " +mainItem.callModel +" / " +mainItem.callModel.localVideoEnabled + " / " +mainItem.callModel.cameraEnabled)
currentDevice: allDevices.me
isPreview: true
callModel: mainItem.callModel
@ -175,10 +151,6 @@ Item {
property int cellHeight: 150
anchors.fill: parent
model : mainItem.callModel.isConference && mainItem.participantDevices.count > 1 ? mainItem.participantDevices : []
onModelChanged: {
console.log( mainItem.callModel.isConference+"/"+mainItem.callModel.localVideoEnabled + "/" +mainItem.callModel.cameraEnabled + " / " +count)
}
spacing: 15
verticalLayoutDirection: ListView.BottomToTop
fitCacheToContent: false
@ -210,7 +182,6 @@ Item {
callModel: modelData.isPreview ? null : mainItem.callModel
isCameraFromDevice: mainItem.callModel.isConference
isPaused: currentDevice && currentDevice.isPaused
onIsPausedChanged: console.log("paused:"+isPaused)
showCloseButton: false
showCustomButton: false
showAvatarBorder: true

1
linphone-app/ui/views/App/Calls/IncallFullscreen.qml
View file

@ -277,7 +277,6 @@ Window {
Layout.leftMargin: window.hideButtons ? 15 : 70
Layout.rightMargin: rightMenu.visible ? 15 : 70
callModel: conference.callModel
onWidthChanged: console.log("Width: "+width)
}
}
Component{

2
linphone-app/ui/views/App/Main/Contacts.qml
View file

@ -205,7 +205,7 @@ ColumnLayout {
Connections{
target: lastChatRoom
onStateChanged: if(state === 1) {
console.log("Load conversation from contacts")
console.debug("Load conversation from contacts")
window.setView('Conversation', {
chatRoomModel: lastChatRoom
})

2
linphone-app/ui/views/App/Main/MainWindow.qml
View file

@ -364,7 +364,7 @@ ApplicationWindow {
onEntrySelected:{
if( entry ) {
if( entry.selected){
console.log("Load conversation from entry selected on timeline")
console.debug("Load conversation from entry selected on timeline")
window.setView('Conversation', {
chatRoomModel:entry.chatRoomModel
})