Skip to content
Snippets Groups Projects
Commit e178e398 authored by jpbl's avatar jpbl
Browse files

- Volume commands are conform to the wiki specification

- We now have an error when we get a disconnection.
parent cc281837
Branches
Tags
No related merge requests found
...@@ -68,7 +68,7 @@ JPushButton::transparize(const QString &image) ...@@ -68,7 +68,7 @@ JPushButton::transparize(const QString &image)
} }
void void
JPushButton::release(bool modify) JPushButton::release()
{ {
setPixmap(mImages[0]); setPixmap(mImages[0]);
/* /*
...@@ -80,7 +80,7 @@ JPushButton::release(bool modify) ...@@ -80,7 +80,7 @@ JPushButton::release(bool modify)
} }
void void
JPushButton::press(bool modify) JPushButton::press()
{ {
setPixmap(mImages[1]); setPixmap(mImages[1]);
/* /*
......
...@@ -51,8 +51,8 @@ public slots: ...@@ -51,8 +51,8 @@ public slots:
/** /**
* This function will switch the button * This function will switch the button
*/ */
virtual void press(bool modify = true); virtual void press();
virtual void release(bool modify = true); virtual void release();
virtual void setToggle(bool toggled); virtual void setToggle(bool toggled);
......
...@@ -33,8 +33,8 @@ SFLPhoneApp::SFLPhoneApp(int argc, char **argv) ...@@ -33,8 +33,8 @@ SFLPhoneApp::SFLPhoneApp(int argc, char **argv)
Requester::instance().registerObject< TemporaryRequest >(QString("hold")); Requester::instance().registerObject< TemporaryRequest >(QString("hold"));
Requester::instance().registerObject< TemporaryRequest >(QString("unhold")); Requester::instance().registerObject< TemporaryRequest >(QString("unhold"));
Requester::instance().registerObject< TemporaryRequest >(QString("senddtmf")); Requester::instance().registerObject< TemporaryRequest >(QString("senddtmf"));
Requester::instance().registerObject< Request >(QString("volume")); Requester::instance().registerObject< Request >(QString("setspkrvolume"));
Requester::instance().registerObject< Request >(QString("micvolume")); Requester::instance().registerObject< Request >(QString("setmicvolume"));
} }
void void
......
...@@ -79,7 +79,7 @@ Session::volume(unsigned int volume) const ...@@ -79,7 +79,7 @@ Session::volume(unsigned int volume) const
{ {
std::list< QString > args; std::list< QString > args;
args.push_back(QString("%1").arg(volume)); args.push_back(QString("%1").arg(volume));
return Requester::instance().send(mId, "volume", args); return Requester::instance().send(mId, "setspkrvolume", args);
} }
QString QString
...@@ -87,7 +87,7 @@ Session::micVolume(unsigned int volume) const ...@@ -87,7 +87,7 @@ Session::micVolume(unsigned int volume) const
{ {
std::list< QString > args; std::list< QString > args;
args.push_back(QString("%1").arg(volume)); args.push_back(QString("%1").arg(volume));
return Requester::instance().send(mId, "micvolume", args); return Requester::instance().send(mId, "setmicvolume", args);
} }
QString QString
......
...@@ -35,6 +35,8 @@ TCPSessionIO::TCPSessionIO(const QString &hostname, Q_UINT16 port) ...@@ -35,6 +35,8 @@ TCPSessionIO::TCPSessionIO(const QString &hostname, Q_UINT16 port)
this, SLOT(sendWaitingRequests())); this, SLOT(sendWaitingRequests()));
QObject::connect(mSocket, SIGNAL(connected()), QObject::connect(mSocket, SIGNAL(connected()),
this, SIGNAL(connected())); this, SIGNAL(connected()));
QObject::connect(mSocket, SIGNAL(connectionClosed()),
this, SIGNAL(disconnected()));
QObject::connect(mSocket, SIGNAL(error(int)), QObject::connect(mSocket, SIGNAL(error(int)),
this, SLOT(error(int))); this, SLOT(error(int)));
QObject::connect(mSocket, SIGNAL(error(int)), QObject::connect(mSocket, SIGNAL(error(int)),
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment