mirror of
https://gitlab.linphone.org/BC/public/linphone-desktop.git
synced 2026-04-29 14:26:22 +00:00
Clean logs.
This commit is contained in:
parent
68413a6bfb
commit
e070f910d6
17 changed files with 19 additions and 66 deletions
|
|
@ -1027,7 +1027,7 @@ void CallModel::updateConferenceVideoLayout(){
|
||||||
settings->setCameraMode(settings->getActiveSpeakerCameraMode());
|
settings->setCameraMode(settings->getActiveSpeakerCameraMode());
|
||||||
}else
|
}else
|
||||||
settings->setCameraMode(settings->getCallCameraMode());
|
settings->setCameraMode(settings->getCallCameraMode());
|
||||||
qWarning() << "Changing layout from " << mConferenceVideoLayout << " into " << newLayout;
|
qDebug() << "Changing layout from " << mConferenceVideoLayout << " into " << newLayout;
|
||||||
mConferenceVideoLayout = newLayout;
|
mConferenceVideoLayout = newLayout;
|
||||||
emit conferenceVideoLayoutChanged();
|
emit conferenceVideoLayoutChanged();
|
||||||
emit snapshotEnabledChanged();
|
emit snapshotEnabledChanged();
|
||||||
|
|
|
||||||
|
|
@ -84,7 +84,7 @@ void ChatRoomInitializer::setAdmins(QList< std::shared_ptr<linphone::Address>> a
|
||||||
void ChatRoomInitializer::start(QSharedPointer<ChatRoomInitializer> initializer){
|
void ChatRoomInitializer::start(QSharedPointer<ChatRoomInitializer> initializer){
|
||||||
QObject * context = new QObject();
|
QObject * context = new QObject();
|
||||||
QObject::connect(initializer.get(), &ChatRoomInitializer::finished, context, [context, initializer](int state){
|
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
|
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) {
|
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);
|
setAdmins(mAdmins);
|
||||||
}
|
}
|
||||||
|
|
||||||
void ChatRoomInitializer::onStateChanged(const std::shared_ptr<linphone::ChatRoom> & chatRoom, linphone::ChatRoom::State newState) {
|
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) {
|
if( newState >= linphone::ChatRoom::State::Created || newState == linphone::ChatRoom::State::Instantiated) {
|
||||||
checkInitialization();
|
checkInitialization();
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -29,7 +29,6 @@
|
||||||
ChatRoomListener::ChatRoomListener(QObject * parent): QObject(parent){
|
ChatRoomListener::ChatRoomListener(QObject * parent): QObject(parent){
|
||||||
}
|
}
|
||||||
ChatRoomListener::~ChatRoomListener(){
|
ChatRoomListener::~ChatRoomListener(){
|
||||||
qDebug() << "Destroying ChatRoomListener " << this;
|
|
||||||
}
|
}
|
||||||
//---------------------------------------------------------------------------------------------------
|
//---------------------------------------------------------------------------------------------------
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -102,7 +102,7 @@ bool ParticipantDeviceListModel::add(std::shared_ptr<linphone::ParticipantDevice
|
||||||
for(auto item : mList) {
|
for(auto item : mList) {
|
||||||
auto deviceModel = item.objectCast<ParticipantDeviceModel>();
|
auto deviceModel = item.objectCast<ParticipantDeviceModel>();
|
||||||
if(deviceModel->getDevice() == deviceToAdd) {
|
if(deviceModel->getDevice() == deviceToAdd) {
|
||||||
qWarning() << "Device already exist. Send video update event";
|
qDebug() << "Device already exist. Send video update event";
|
||||||
deviceModel->updateVideoEnabled();
|
deviceModel->updateVideoEnabled();
|
||||||
return false;
|
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){
|
void ParticipantDeviceListModel::onParticipantAdded(const std::shared_ptr<const linphone::Participant> & participant){
|
||||||
std::list<std::shared_ptr<linphone::ParticipantDevice>> devices = participant->getDevices() ;
|
std::list<std::shared_ptr<linphone::ParticipantDevice>> devices = participant->getDevices() ;
|
||||||
if(devices.size() == 0)
|
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
|
else
|
||||||
for(auto device : devices)
|
for(auto device : devices)
|
||||||
add(device);
|
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){
|
void ParticipantDeviceListModel::onParticipantDeviceRemoved(const std::shared_ptr<const linphone::ParticipantDevice> & participantDevice){
|
||||||
qDebug() << "Removing participant device : " << mList.count();
|
qDebug() << "Removing participant device : " << mList.count();
|
||||||
if(!remove(participantDevice))
|
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){
|
void ParticipantDeviceListModel::onConferenceStateChanged(linphone::Conference::State newState){
|
||||||
|
|
|
||||||
|
|
@ -29,17 +29,17 @@ ParticipantDeviceListener::ParticipantDeviceListener(QObject *parent) : QObject(
|
||||||
|
|
||||||
//--------------------------------------------------------------------
|
//--------------------------------------------------------------------
|
||||||
void ParticipantDeviceListener::onIsSpeakingChanged(const std::shared_ptr<linphone::ParticipantDevice> & participantDevice, bool isSpeaking) {
|
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);
|
emit isSpeakingChanged(participantDevice, isSpeaking);
|
||||||
}
|
}
|
||||||
|
|
||||||
void ParticipantDeviceListener::onIsMuted(const std::shared_ptr<linphone::ParticipantDevice> & participantDevice, bool isMutedVar) {
|
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);
|
emit isMuted(participantDevice, isMutedVar);
|
||||||
}
|
}
|
||||||
|
|
||||||
void ParticipantDeviceListener::onStateChanged(const std::shared_ptr<linphone::ParticipantDevice> & participantDevice, linphone::ParticipantDeviceState state){
|
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);
|
emit stateChanged(participantDevice, state);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -147,7 +147,7 @@ void ParticipantDeviceModel::updateVideoEnabled(){
|
||||||
)
|
)
|
||||||
|| isMe()) && !mIsPaused;
|
|| isMe()) && !mIsPaused;
|
||||||
if( mIsVideoEnabled != enabled && mCall && mCall->getCall()->getState() == linphone::Call::State::StreamsRunning) {
|
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;
|
mIsVideoEnabled = enabled;
|
||||||
emit videoEnabledChanged();
|
emit videoEnabledChanged();
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -86,7 +86,7 @@ void RecorderModel::start(){
|
||||||
}
|
}
|
||||||
|
|
||||||
void RecorderModel::pause(){
|
void RecorderModel::pause(){
|
||||||
qWarning() << mRecorder->pause();
|
mRecorder->pause();
|
||||||
emit stateChanged();
|
emit stateChanged();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -119,7 +119,6 @@ bool TimelineListModel::removeRows (int row, int count, const QModelIndex &paren
|
||||||
|
|
||||||
for(auto timeline : oldTimelines)
|
for(auto timeline : oldTimelines)
|
||||||
if(timeline->mSelected) {
|
if(timeline->mSelected) {
|
||||||
qWarning() << "Unselecting timemodel " << timeline;
|
|
||||||
timeline->setSelected(false);
|
timeline->setSelected(false);
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
@ -239,7 +238,6 @@ void TimelineListModel::onSelectedHasChanged(bool selected){
|
||||||
emit selectedChanged(qobject_cast<TimelineModel*>(sender()));
|
emit selectedChanged(qobject_cast<TimelineModel*>(sender()));
|
||||||
}
|
}
|
||||||
}else{// Do nothing
|
}else{// Do nothing
|
||||||
qWarning() << "Timeline selection (selected=" << selected << ") is more than 1 : " << mSelectedCount;
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -58,14 +58,14 @@ DialogPlus {
|
||||||
return UtilsCpp.hasCapability(entry.sipAddress, LinphoneEnums.FriendCapabilityLimeX3Dh)
|
return UtilsCpp.hasCapability(entry.sipAddress, LinphoneEnums.FriendCapabilityLimeX3Dh)
|
||||||
},
|
},
|
||||||
handler: function (entry) {
|
handler: function (entry) {
|
||||||
console.log("Call selected: " +entry + "/"+entry.sipAddress)
|
console.debug("Call selected: " +entry + "/"+entry.sipAddress)
|
||||||
mainItem.addressSelectedCallback(entry.sipAddress)
|
mainItem.addressSelectedCallback(entry.sipAddress)
|
||||||
exit(1)
|
exit(1)
|
||||||
},
|
},
|
||||||
}]
|
}]
|
||||||
|
|
||||||
onEntryClicked: {
|
onEntryClicked: {
|
||||||
console.log("Call selected: " +entry + "/"+entry.sipAddress)
|
console.debug("Call selected: " +entry + "/"+entry.sipAddress)
|
||||||
mainItem.addressSelectedCallback(entry.sipAddress)
|
mainItem.addressSelectedCallback(entry.sipAddress)
|
||||||
exit(1)
|
exit(1)
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -84,7 +84,7 @@ Notification {
|
||||||
onClicked: notification._close(function () {
|
onClicked: notification._close(function () {
|
||||||
AccountSettingsModel.setDefaultAccountFromSipAddress(notification.localAddress)
|
AccountSettingsModel.setDefaultAccountFromSipAddress(notification.localAddress)
|
||||||
notification.timelineModel.selected = true
|
notification.timelineModel.selected = true
|
||||||
console.log("Load conversation from notification")
|
console.debug("Load conversation from notification")
|
||||||
notification.notificationData.window.setView('Conversation', {
|
notification.notificationData.window.setView('Conversation', {
|
||||||
chatRoomModel:notification.timelineModel.getChatRoomModel()
|
chatRoomModel:notification.timelineModel.getChatRoomModel()
|
||||||
})
|
})
|
||||||
|
|
|
||||||
|
|
@ -9,7 +9,6 @@ import Linphone 1.0
|
||||||
Item {
|
Item {
|
||||||
property var level: null
|
property var level: null
|
||||||
property bool betterIcon : false
|
property bool betterIcon : false
|
||||||
//onLevelChanged: console.log("Level change : "+Presence.getPresenceStatusAsString(level))
|
|
||||||
|
|
||||||
Icon {
|
Icon {
|
||||||
anchors.centerIn: parent
|
anchors.centerIn: parent
|
||||||
|
|
@ -20,6 +19,5 @@ Item {
|
||||||
iconSize: parent.height > parent.width
|
iconSize: parent.height > parent.width
|
||||||
? parent.width
|
? parent.width
|
||||||
: parent.height
|
: parent.height
|
||||||
//onIconChanged: console.log(Presence.getPresenceStatusAsString(level)+ "//" +icon)
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -67,26 +67,21 @@ function openWaitingRoom(model){
|
||||||
// -----------------------------------------------------------------------------
|
// -----------------------------------------------------------------------------
|
||||||
// Used to get Component based from Call Status
|
// Used to get Component based from Call Status
|
||||||
function getContent (call, conferenceInfoModel) {
|
function getContent (call, conferenceInfoModel) {
|
||||||
console.log("Changing contents")
|
|
||||||
if (call == null) {
|
if (call == null) {
|
||||||
if(conferenceInfoModel) {
|
if(conferenceInfoModel) {
|
||||||
console.log("waitingRoom")
|
|
||||||
return waitingRoom
|
return waitingRoom
|
||||||
}
|
}
|
||||||
else{
|
else{
|
||||||
console.log("null")
|
|
||||||
return null
|
return null
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
var status = call.status
|
var status = call.status
|
||||||
if (status == null) {
|
if (status == null) {
|
||||||
console.log(calls.conferenceModel.count > 0 ? "conference" : "null")
|
|
||||||
return calls.conferenceModel.count > 0 ? conference : null
|
return calls.conferenceModel.count > 0 ? conference : null
|
||||||
}
|
}
|
||||||
var CallModel = Linphone.CallModel
|
var CallModel = Linphone.CallModel
|
||||||
if (status === CallModel.CallStatusIncoming) {
|
if (status === CallModel.CallStatusIncoming) {
|
||||||
console.log("null")
|
|
||||||
return null;
|
return null;
|
||||||
}
|
}
|
||||||
if( window.conferenceInfoModel != call.conferenceInfoModel) {
|
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)
|
return middlePane.sourceComponent // unchange. Wait for later decision on conference model (avoid binding loop on sourceComponent)
|
||||||
}else{
|
}else{
|
||||||
if(call.isConference){
|
if(call.isConference){
|
||||||
console.log("incall")
|
|
||||||
return incall
|
return incall
|
||||||
}
|
}
|
||||||
if (status === CallModel.CallStatusOutgoing || (status === CallModel.CallStatusEnded && call.callError != '' )) {
|
if (status === CallModel.CallStatusOutgoing || (status === CallModel.CallStatusEnded && call.callError != '' )) {
|
||||||
console.log("waitingRoom. Is conference ? "+call.isConference)
|
|
||||||
return waitingRoom
|
return waitingRoom
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
console.log("incall")
|
|
||||||
return incall
|
return incall
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -316,7 +316,6 @@ Rectangle {
|
||||||
isRightReducedLayout: rightMenu.visible
|
isRightReducedLayout: rightMenu.visible
|
||||||
isLeftReducedLayout: mainItem.listCallsOpened
|
isLeftReducedLayout: mainItem.listCallsOpened
|
||||||
cameraEnabled: !mainItem.isFullScreen
|
cameraEnabled: !mainItem.isFullScreen
|
||||||
onCameraEnabledChanged: console.log(cameraEnabled)
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
RowLayout{
|
RowLayout{
|
||||||
|
|
@ -332,7 +331,6 @@ Rectangle {
|
||||||
? activeSpeakerComponent
|
? activeSpeakerComponent
|
||||||
: gridComponent
|
: gridComponent
|
||||||
: activeSpeakerComponent
|
: activeSpeakerComponent
|
||||||
onSourceComponentChanged: console.log("conferenceLayout: "+mainItem.callModel.conferenceVideoLayout + " => " +sourceComponent)
|
|
||||||
active: mainItem.callModel && !mainItem.isFullScreen
|
active: mainItem.callModel && !mainItem.isFullScreen
|
||||||
}
|
}
|
||||||
Rectangle{
|
Rectangle{
|
||||||
|
|
|
||||||
|
|
@ -29,7 +29,7 @@ Item {
|
||||||
|
|
||||||
property int participantCount: callModel.isConference ? allDevices.count + 1 : 2 // +me. allDevices==0 if !conference
|
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 {
|
property ParticipantDeviceProxyModel participantDevices : ParticipantDeviceProxyModel {
|
||||||
id: allDevices
|
id: allDevices
|
||||||
|
|
@ -78,13 +78,8 @@ Item {
|
||||||
|| currentDevice && !currentDevice.videoEnabled
|
|| currentDevice && !currentDevice.videoEnabled
|
||||||
|
|
||||||
isVideoEnabled: !deactivateCamera
|
isVideoEnabled: !deactivateCamera
|
||||||
onDeactivateCameraChanged: console.log("deactivateCamera? "+deactivateCamera)
|
|
||||||
isPreview: !preview.visible && mainItem.participantCount == 1
|
isPreview: !preview.visible && mainItem.participantCount == 1
|
||||||
onIsPreviewChanged: {
|
onIsPreviewChanged: {
|
||||||
console.log("ispreview ? " +isPreview + "visible?"+preview.visible +", pCount="+mainItem.participantCount
|
|
||||||
+" / ready?" +mainItem.isConferenceReady
|
|
||||||
+" / allCount=" +allDevices.count
|
|
||||||
)
|
|
||||||
if( isPreview){
|
if( isPreview){
|
||||||
currentDevice = allDevices.me
|
currentDevice = allDevices.me
|
||||||
cameraView.resetCamera()
|
cameraView.resetCamera()
|
||||||
|
|
@ -93,7 +88,6 @@ Item {
|
||||||
cameraView.resetCamera()
|
cameraView.resetCamera()
|
||||||
}
|
}
|
||||||
isCameraFromDevice: isPreview
|
isCameraFromDevice: isPreview
|
||||||
onCurrentDeviceChanged: console.log("CurrentDevice: "+currentDevice)
|
|
||||||
isPaused: isPreview && callModel.pausedByUser
|
isPaused: isPreview && callModel.pausedByUser
|
||||||
? false
|
? false
|
||||||
: callModel.isConference
|
: callModel.isConference
|
||||||
|
|
@ -101,19 +95,12 @@ Item {
|
||||||
(currentDevice && currentDevice.isPaused)
|
(currentDevice && currentDevice.isPaused)
|
||||||
: callModel && !callModel.pausedByUser && (callModel.status === CallModel.CallStatusPaused)
|
: callModel && !callModel.pausedByUser && (callModel.status === CallModel.CallStatusPaused)
|
||||||
|
|
||||||
onIsPausedChanged: console.log("ispaused ? " +isPaused + " = " +callModel.pausedByUser + " / " + (currentDevice ? currentDevice.isPaused : 'noDevice') +" / " +callModel.isConference + " / " +callModel.status )
|
|
||||||
quickTransition: true
|
quickTransition: true
|
||||||
showCloseButton: false
|
showCloseButton: false
|
||||||
showActiveSpeakerOverlay: false // This is an active speaker. We don't need to show the indicator.
|
showActiveSpeakerOverlay: false // This is an active speaker. We don't need to show the indicator.
|
||||||
showCustomButton: false
|
showCustomButton: false
|
||||||
avatarStickerBackgroundColor: isPreview ? IncallStyle.container.avatar.stickerPreviewBackgroundColor : IncallStyle.container.avatar.stickerBackgroundColor
|
avatarStickerBackgroundColor: isPreview ? IncallStyle.container.avatar.stickerPreviewBackgroundColor : IncallStyle.container.avatar.stickerBackgroundColor
|
||||||
avatarBackgroundColor: IncallStyle.container.avatar.backgroundColor
|
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.
|
Item{// Need an item to not override Sticker internal states. States are needed for changing anchors.
|
||||||
id: preview
|
id: preview
|
||||||
|
|
@ -125,14 +112,8 @@ Item {
|
||||||
height: visible ? miniViews.cellHeight : 0
|
height: visible ? miniViews.cellHeight : 0
|
||||||
width: 16 * height / 9
|
width: 16 * height / 9
|
||||||
|
|
||||||
//property bool showMe : !(callModel && callModel.pausedByUser) && (callModel.isConference || callModel.localVideoEnabled)
|
|
||||||
|
|
||||||
visible: mainItem.isConferenceReady && allDevices.count >= 1
|
visible: mainItem.isConferenceReady && allDevices.count >= 1
|
||||||
|| (!callModel.isConference && mainItem.callModel.cameraEnabled)// use videoEnabled if we want to show the preview sticker
|
|| (!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{
|
Loader{
|
||||||
anchors.fill: parent
|
anchors.fill: parent
|
||||||
|
|
@ -141,11 +122,6 @@ Item {
|
||||||
Sticker{
|
Sticker{
|
||||||
id: previewSticker
|
id: previewSticker
|
||||||
deactivateCamera: !mainItem.callModel || callModel.pausedByUser || !mainItem.callModel.cameraEnabled
|
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
|
currentDevice: allDevices.me
|
||||||
isPreview: true
|
isPreview: true
|
||||||
callModel: mainItem.callModel
|
callModel: mainItem.callModel
|
||||||
|
|
@ -175,10 +151,6 @@ Item {
|
||||||
property int cellHeight: 150
|
property int cellHeight: 150
|
||||||
anchors.fill: parent
|
anchors.fill: parent
|
||||||
model : mainItem.callModel.isConference && mainItem.participantDevices.count > 1 ? mainItem.participantDevices : []
|
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
|
spacing: 15
|
||||||
verticalLayoutDirection: ListView.BottomToTop
|
verticalLayoutDirection: ListView.BottomToTop
|
||||||
fitCacheToContent: false
|
fitCacheToContent: false
|
||||||
|
|
@ -210,7 +182,6 @@ Item {
|
||||||
callModel: modelData.isPreview ? null : mainItem.callModel
|
callModel: modelData.isPreview ? null : mainItem.callModel
|
||||||
isCameraFromDevice: mainItem.callModel.isConference
|
isCameraFromDevice: mainItem.callModel.isConference
|
||||||
isPaused: currentDevice && currentDevice.isPaused
|
isPaused: currentDevice && currentDevice.isPaused
|
||||||
onIsPausedChanged: console.log("paused:"+isPaused)
|
|
||||||
showCloseButton: false
|
showCloseButton: false
|
||||||
showCustomButton: false
|
showCustomButton: false
|
||||||
showAvatarBorder: true
|
showAvatarBorder: true
|
||||||
|
|
|
||||||
|
|
@ -277,7 +277,6 @@ Window {
|
||||||
Layout.leftMargin: window.hideButtons ? 15 : 70
|
Layout.leftMargin: window.hideButtons ? 15 : 70
|
||||||
Layout.rightMargin: rightMenu.visible ? 15 : 70
|
Layout.rightMargin: rightMenu.visible ? 15 : 70
|
||||||
callModel: conference.callModel
|
callModel: conference.callModel
|
||||||
onWidthChanged: console.log("Width: "+width)
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
Component{
|
Component{
|
||||||
|
|
|
||||||
|
|
@ -205,7 +205,7 @@ ColumnLayout {
|
||||||
Connections{
|
Connections{
|
||||||
target: lastChatRoom
|
target: lastChatRoom
|
||||||
onStateChanged: if(state === 1) {
|
onStateChanged: if(state === 1) {
|
||||||
console.log("Load conversation from contacts")
|
console.debug("Load conversation from contacts")
|
||||||
window.setView('Conversation', {
|
window.setView('Conversation', {
|
||||||
chatRoomModel: lastChatRoom
|
chatRoomModel: lastChatRoom
|
||||||
})
|
})
|
||||||
|
|
|
||||||
|
|
@ -364,7 +364,7 @@ ApplicationWindow {
|
||||||
onEntrySelected:{
|
onEntrySelected:{
|
||||||
if( entry ) {
|
if( entry ) {
|
||||||
if( entry.selected){
|
if( entry.selected){
|
||||||
console.log("Load conversation from entry selected on timeline")
|
console.debug("Load conversation from entry selected on timeline")
|
||||||
window.setView('Conversation', {
|
window.setView('Conversation', {
|
||||||
chatRoomModel:entry.chatRoomModel
|
chatRoomModel:entry.chatRoomModel
|
||||||
})
|
})
|
||||||
|
|
|
||||||
Loading…
Add table
Reference in a new issue