From e859631c52f4efbf09d8726e8a2e5b7dce038acf Mon Sep 17 00:00:00 2001
From: jpbl <jpbl>
Date: Tue, 27 Sep 2005 17:52:58 +0000
Subject: [PATCH] we use playtone now
---
src/gui/official/PhoneLineButton.cpp | 2 --
src/gui/official/PhoneLineManagerImpl.cpp | 2 +-
src/gui/official/SFLPhoneApp.cpp | 3 ++-
src/gui/official/Session.cpp | 4 ++--
src/gui/official/Session.hpp | 2 +-
5 files changed, 6 insertions(+), 7 deletions(-)
diff --git a/src/gui/official/PhoneLineButton.cpp b/src/gui/official/PhoneLineButton.cpp
index c47a9a865f..6bc35aff72 100644
--- a/src/gui/official/PhoneLineButton.cpp
+++ b/src/gui/official/PhoneLineButton.cpp
@@ -23,7 +23,6 @@ PhoneLineButton::PhoneLineButton(const QPixmap &released,
void
PhoneLineButton::suspend()
{
- _debug("Swapping started.\n");
if(isPressed()) {
mFace = 1;
}
@@ -45,7 +44,6 @@ PhoneLineButton::swap()
void
PhoneLineButton::press()
{
- _debug("Pressed");
mTimer->stop();
JPushButton::press();
}
diff --git a/src/gui/official/PhoneLineManagerImpl.cpp b/src/gui/official/PhoneLineManagerImpl.cpp
index 49480081a8..f1dee1cb49 100644
--- a/src/gui/official/PhoneLineManagerImpl.cpp
+++ b/src/gui/official/PhoneLineManagerImpl.cpp
@@ -125,7 +125,7 @@ PhoneLineManagerImpl::selectLine(unsigned int line)
PhoneLineLocker guard(selectedLine);
selectedLine->select();
if(selectedLine->isAvailable()) {
- mSession.sendTone();
+ mSession.playTone();
}
}
}
diff --git a/src/gui/official/SFLPhoneApp.cpp b/src/gui/official/SFLPhoneApp.cpp
index 84b00ca234..abba2a69cb 100644
--- a/src/gui/official/SFLPhoneApp.cpp
+++ b/src/gui/official/SFLPhoneApp.cpp
@@ -14,9 +14,10 @@ SFLPhoneApp::SFLPhoneApp(int argc, char **argv)
, mAccount(mSession.getDefaultAccount())
{
PhoneLineManager::instance().setNbLines(NB_PHONELINES);
- Requester::instance().registerObject< Request >(std::string("sendtone"));
+ Requester::instance().registerObject< Request >(std::string("playtone"));
Requester::instance().registerObject< Request >(std::string("playdtmf"));
Requester::instance().registerObject< CallRelatedRequest >(std::string("senddtmf"));
+ Requester::instance().registerObject< CallRelatedRequest >(std::string("playdtmf"));
Requester::instance().registerObject< CallRelatedRequest >(std::string("call"));
Requester::instance().registerObject< CallRelatedRequest >(std::string("hold"));
Requester::instance().registerObject< CallRelatedRequest >(std::string("unhold"));
diff --git a/src/gui/official/Session.cpp b/src/gui/official/Session.cpp
index ddf12ce7b7..6151027f09 100644
--- a/src/gui/official/Session.cpp
+++ b/src/gui/official/Session.cpp
@@ -44,9 +44,9 @@ Session::id() const
}
std::string
-Session::sendTone() const
+Session::playTone() const
{
- return Requester::instance().send(mId, "sendtone", std::list< std::string >());
+ return Requester::instance().send(mId, "playtone", std::list< std::string >());
}
std::string
diff --git a/src/gui/official/Session.hpp b/src/gui/official/Session.hpp
index bc2a808df7..2c18a16e7e 100644
--- a/src/gui/official/Session.hpp
+++ b/src/gui/official/Session.hpp
@@ -48,7 +48,7 @@ class Session
Call createCall() const;
std::string id() const;
- std::string sendTone() const;
+ std::string playTone() const;
private:
std::string mId;
--
GitLab