Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Submit feedback
Sign in / Register
Toggle navigation
J
jami-daemon
Project overview
Project overview
Details
Activity
Releases
Cycle Analytics
Insights
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Locked Files
Issues
87
Issues
87
List
Boards
Labels
Milestones
Security & Compliance
Security & Compliance
Dependency List
Wiki
Wiki
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Commits
Issue Boards
Open sidebar
savoirfairelinux
jami-daemon
Commits
7ea7ad4c
Commit
7ea7ad4c
authored
Jun 29, 2006
by
yanmorin
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Patching m4/gwqt.m4 to use $QTDIR
parent
4a75cbbf
Changes
7
Hide whitespace changes
Inline
Side-by-side
Showing
7 changed files
with
63 additions
and
8 deletions
+63
-8
NEWS
NEWS
+3
-0
configure.ac
configure.ac
+2
-2
m4/gwqt.m4
m4/gwqt.m4
+1
-1
src/gui/qt/ConfigurationManagerImpl.cpp
src/gui/qt/ConfigurationManagerImpl.cpp
+21
-0
src/gui/qt/ConfigurationManagerImpl.hpp
src/gui/qt/ConfigurationManagerImpl.hpp
+5
-0
src/gui/qt/ConfigurationPanel.ui
src/gui/qt/ConfigurationPanel.ui
+19
-4
src/gui/qt/ConfigurationPanel.ui.h
src/gui/qt/ConfigurationPanel.ui.h
+12
-1
No files found.
NEWS
View file @
7ea7ad4c
SFLphoned (0.7.0) / 2006-..-..
* adding reload (sound driver) button
* fix: peer hangup remove flashing buttons
* removing old packaging stuff like FIXME or sflphone.spec.in
* fix: click on flashing buttons
* fix: send ringing, hangup, busy message
* fix for using call command two times in a row
...
...
configure.ac
View file @
7ea7ad4c
dnl SFLPhone - configure.ac for automake 1.9 and autoconf 2.59
dnl
dnl Process this file with autoconf to produce a configure script.
AC_PREREQ(2.59)
AC_INIT(
SFLPhone, 0.7, sflphoneteam@savoirfairelinux.com, sflphone
)
AC_PREREQ(2.59
e
)
AC_INIT(
[SFLPhone],[0.7],[sflphoneteam@savoirfairelinux.com],[sflphone]
)
AC_COPYRIGHT([[Copyright (c) Savoir-Faire Linux 2004-2006]])
AC_REVISION([$Revision$])
...
...
m4/gwqt.m4
View file @
7ea7ad4c
...
...
@@ -47,7 +47,7 @@ if test x"$QTDIR" = x ; then
QT_SEARCH2="/usr/share/$i /usr/lib/$i /usr/local/$i"
for j in $QT_SEARCH2; do
if test -f $j/include/qglobal.h -a x$QTDIR = x; then
QTDIR=$
i
QTDIR=$
j
break 2
fi
done
...
...
src/gui/qt/ConfigurationManagerImpl.cpp
View file @
7ea7ad4c
...
...
@@ -23,6 +23,7 @@
#include "DebugOutput.hpp"
#include "Session.hpp"
#include "taxidermy/Hunter.hpp"
#include "Request.hpp" // don't know if it's a good idea for this class to know request...
ConfigurationManagerImpl
::
ConfigurationManagerImpl
()
:
mSession
(
NULL
)
...
...
@@ -213,3 +214,23 @@ ConfigurationManagerImpl::get(const QString §ion,
return
value
;
}
void
ConfigurationManagerImpl
::
reloadSoundDriver
()
{
mAudioDevicesOut
.
clear
();
mAudioDevicesIn
.
clear
();
Request
*
r
;
r
=
mSession
->
list
(
"audiodevicein"
);
QObject
::
connect
(
r
,
SIGNAL
(
parsedEntry
(
QString
,
QString
,
QString
,
QString
,
QString
)),
this
,
SLOT
(
addAudioDeviceIn
(
QString
,
QString
,
QString
)));
QObject
::
connect
(
r
,
SIGNAL
(
success
(
QString
,
QString
)),
this
,
SIGNAL
(
audioDevicesInUpdated
()));
r
=
mSession
->
list
(
"audiodeviceout"
);
QObject
::
connect
(
r
,
SIGNAL
(
parsedEntry
(
QString
,
QString
,
QString
,
QString
,
QString
)),
this
,
SLOT
(
addAudioDeviceOut
(
QString
,
QString
,
QString
)));
QObject
::
connect
(
r
,
SIGNAL
(
success
(
QString
,
QString
)),
this
,
SIGNAL
(
audioDevicesOutUpdated
()));
}
src/gui/qt/ConfigurationManagerImpl.hpp
View file @
7ea7ad4c
...
...
@@ -158,6 +158,11 @@ public:
void
finishSave
();
/**
* Reload sound driver from audiodevice in/audiodevice out
*/
void
reloadSoundDriver
();
public
slots
:
void
add
(
const
ConfigEntry
&
entry
);
...
...
src/gui/qt/ConfigurationPanel.ui
View file @
7ea7ad4c
...
...
@@ -770,15 +770,22 @@
<property
name=
"enabled"
><bool>
true
</bool></property>
<property
name=
"text"
><string>
Test
</string></property>
</widget>
<widget
class=
"QLabel"
>
<widget
class=
"QPushButton"
>
<property
name=
"name"
><cstring>
buttonReloadSoundDriver
</cstring></property>
<property
name=
"enabled"
><bool>
true
</bool></property>
<property
name=
"text"
><string>
Reload
</string></property>
</widget>
</hbox>
</widget>
<widget
class=
"QLabel"
>
<property
name=
"name"
><cstring>
lblSoundDriver
</cstring></property>
<property
name=
"text"
><string></string></property>
<property
name=
"paletteForegroundColor"
><color><red>
255
</red><green>
0
</green><blue>
0
</blue></color></property>
</widget>
</hbox>
</widget>
</vbox>
</vbox>
</widget>
</widget>
<widget
class=
"QWidget"
>
<property
name=
"name"
>
...
...
@@ -1437,6 +1444,12 @@ Montreal, Quebec H2T 1S6, Canada</p></string>
<receiver>
ConfigurationPanel
</receiver>
<slot>
slotTestSoundDriver()
</slot>
</connection>
<connection>
<sender>
buttonReloadSoundDriver
</sender>
<signal>
clicked()
</signal>
<receiver>
ConfigurationPanel
</receiver>
<slot>
slotReloadSoundDriver()
</slot>
</connection>
<connection>
<sender>
buttonCancel
</sender>
<signal>
clicked()
</signal>
...
...
@@ -1491,6 +1504,7 @@ Montreal, Quebec H2T 1S6, Canada</p></string>
<tabstop>
cboDriverChoiceOut
</tabstop>
<tabstop>
cboDriverChoiceIn
</tabstop>
<tabstop>
buttonTestSoundDriver
</tabstop>
<tabstop>
buttonReloadSoundDriver
</tabstop>
<tabstop>
codec1
</tabstop>
<tabstop>
codec2
</tabstop>
<tabstop>
codec3
</tabstop>
...
...
@@ -1510,6 +1524,7 @@ Montreal, Quebec H2T 1S6, Canada</p></string>
<slot>
slotRegister()
</slot>
<slot>
slotRegisterReturn( bool, QString )
</slot>
<slot>
slotTestSoundDriver()
</slot>
<slot>
slotReloadSoundDriver()
</slot>
<slot>
slotSoundDriverReturn( bool, QString )
</slot>
<slot>
saveSlot()
</slot>
<slot>
changeTabSlot()
</slot>
...
...
src/gui/qt/ConfigurationPanel.ui.h
View file @
7ea7ad4c
...
...
@@ -396,7 +396,11 @@ ConfigurationPanel::slotRegisterReturn( bool hasError, QString )
lblError
->
show
();
}
void
ConfigurationPanel
::
slotTestSoundDriver
()
/**
* Test sound driver (save them before)
*/
void
ConfigurationPanel
::
slotTestSoundDriver
()
{
// save driver in configuration manager
if
(
cboDriverChoiceOut
->
currentText
()
!=
NULL
)
{
...
...
@@ -412,6 +416,13 @@ void ConfigurationPanel::slotTestSoundDriver()
emit
soundDriverChanged
();
}
void
ConfigurationPanel
::
slotReloadSoundDriver
()
{
ConfigurationManager
::
instance
().
reloadSoundDriver
();
}
void
ConfigurationPanel
::
slotSoundDriverReturn
(
bool
hasError
,
QString
message
)
{
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment