retronetworking
/
yate
12
0
Fork 2
Code Issues Pull Requests Projects Releases Wiki Activity

Replaced default incoming ring sound file. 

git-svn-id: http://yate.null.ro/svn/yate/trunk@4325 acf43c95-373e-0410-b603-e72c3f656dc1
This commit is contained in:
marian 2011-04-19 14:23:09 +00:00
parent 50ab051a49
commit 9400006466
2 changed files with 22 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
engine/ClientLogic.cpp
View File

@ -4542,6 +4542,7 @@ bool DefaultLogic::action(Window* wnd, const String& name, NamedList* params)
} }
if (name == s_actionShowCallsList) { if (name == s_actionShowCallsList) {
if (Client::valid()) { if (Client::valid()) {
Client::self()->ringer(true,false);
Client::self()->setVisible("mainwindow",true,true); Client::self()->setVisible("mainwindow",true,true);
activatePageCalls(); activatePageCalls();
removeTrayIcon("incomingcall"); removeTrayIcon("incomingcall");
@ -4875,8 +4876,11 @@ bool DefaultLogic::select(Window* wnd, const String& name, const String& item,
ClientContact* c = 0; ClientContact* c = 0;
if (item == "tabChat") if (item == "tabChat")
c = selectedChatContact(*m_accounts,wnd); c = selectedChatContact(*m_accounts,wnd);
else if (isPageCallsActive(wnd,false)) else if (isPageCallsActive(wnd,false)) {
if (Client::valid())
Client::self()->ringer(true,false);
removeTrayIcon("incomingcall"); removeTrayIcon("incomingcall");
}
enableChatActions(c,false); enableChatActions(c,false);
return true; return true;
} }
@ -4896,8 +4900,10 @@ bool DefaultLogic::select(Window* wnd, const String& name, const String& item,
// Page changed in telephony tab // Page changed in telephony tab
if (name == "framePages") { if (name == "framePages") {
if (isPageCallsActive(wnd,true)) if (isPageCallsActive(wnd,true)) {
Client::self()->ringer(true,false);
removeTrayIcon("incomingcall"); removeTrayIcon("incomingcall");
}
return false; return false;
} }
@ -4912,8 +4918,10 @@ bool DefaultLogic::select(Window* wnd, const String& name, const String& item,
// Enable specific actions when a channel is selected // Enable specific actions when a channel is selected
if (name == s_channelList) { if (name == s_channelList) {
if (isPageCallsActive(wnd,true)) if (isPageCallsActive(wnd,true)) {
Client::self()->ringer(true,false);
removeTrayIcon("incomingcall"); removeTrayIcon("incomingcall");
}
updateSelectedChannel(&item); updateSelectedChannel(&item);
return true; return true;
} }
@ -6208,6 +6216,9 @@ bool DefaultLogic::handleClientChanUpdate(Message& msg, bool& stopLogic)
stopLogic = true; stopLogic = true;
return false; return false;
} }
// Ignore utility channels (playing sounds)
if (msg.getBoolValue("utility"))
return false;
int notif = ClientChannel::lookup(msg.getValue("notify")); int notif = ClientChannel::lookup(msg.getValue("notify"));
if (notif == ClientChannel::Destroyed) { if (notif == ClientChannel::Destroyed) {
if (!Client::valid()) if (!Client::valid())
@ -6726,8 +6737,8 @@ bool DefaultLogic::initializedClient()
setClientParam("callerid",Client::s_settings.getValue("default","callerid"),false,true); setClientParam("callerid",Client::s_settings.getValue("default","callerid"),false,true);
setClientParam("domain",Client::s_settings.getValue("default","domain"),false,true); setClientParam("domain",Client::s_settings.getValue("default","domain"),false,true);
// Create default ring sound // Create default ring sound
String ring = cGen->getValue("ringinfile",Client::s_soundPath + "ring.wav"); String ring = cGen->getValue("ringinfile",Client::s_soundPath + "ring.au");
Client::self()->createSound(Client::s_ringInName,ring); ClientSound::build(Client::s_ringInName,ring);
ring = cGen->getValue("ringoutfile",Client::s_soundPath + "tone.wav"); ring = cGen->getValue("ringoutfile",Client::s_soundPath + "tone.wav");
Client::self()->createSound(Client::s_ringOutName,ring); Client::self()->createSound(Client::s_ringOutName,ring);
@ -6900,8 +6911,12 @@ void DefaultLogic::updateSelectedChannel(const String* item)
Client::self()->getSelect(s_channelList,m_selectedChannel); Client::self()->getSelect(s_channelList,m_selectedChannel);
else else
m_selectedChannel = ""; m_selectedChannel = "";
if (old != m_selectedChannel) if (old == m_selectedChannel)
channelSelectionChanged(old); return;
// Stop incoming ringer
if (Client::valid())
Client::self()->ringer(true,false);
channelSelectionChanged(old);
} }
// Engine start notification. Connect startup accounts // Engine start notification. Connect startup accounts

BIN
share/sounds/ring.au Normal file
View File

Binary file not shown.