Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
jami-daemon
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Iterations
Wiki
Requirements
Code
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Locked files
Deploy
Releases
Model registry
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
Repository analytics
Issue analytics
Insights
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
savoirfairelinux
jami-daemon
Commits
b5e083ec
Commit
b5e083ec
authored
10 years ago
by
Guillaume Roguez
Browse files
Options
Downloads
Patches
Plain Diff
tools: fix toggle video preview test in dringctrl.py
Refs #67717 Change-Id: I868cf9ccbe0dabebae3084acd8340f513bde2cdf
parent
dd54b60b
No related branches found
No related tags found
No related merge requests found
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
daemon/tools/dringctrl/controler.py
+5
-0
5 additions, 0 deletions
daemon/tools/dringctrl/controler.py
daemon/tools/dringctrl/dringctrl.py
+9
-2
9 additions, 2 deletions
daemon/tools/dringctrl/dringctrl.py
with
14 additions
and
2 deletions
daemon/tools/dringctrl/controler.py
+
5
−
0
View file @
b5e083ec
...
@@ -107,6 +107,8 @@ class DRingCtrl(Thread):
...
@@ -107,6 +107,8 @@ class DRingCtrl(Thread):
DBUS_DEAMON_PATH
+
'
/CallManager
'
,
introspect
=
False
)
DBUS_DEAMON_PATH
+
'
/CallManager
'
,
introspect
=
False
)
proxy_confmgr
=
bus
.
get_object
(
DBUS_DEAMON_OBJECT
,
proxy_confmgr
=
bus
.
get_object
(
DBUS_DEAMON_OBJECT
,
DBUS_DEAMON_PATH
+
'
/ConfigurationManager
'
,
introspect
=
False
)
DBUS_DEAMON_PATH
+
'
/ConfigurationManager
'
,
introspect
=
False
)
proxy_videomgr
=
bus
.
get_object
(
DBUS_DEAMON_OBJECT
,
DBUS_DEAMON_PATH
+
'
/VideoManager
'
,
introspect
=
False
)
self
.
instance
=
dbus
.
Interface
(
proxy_instance
,
self
.
instance
=
dbus
.
Interface
(
proxy_instance
,
DBUS_DEAMON_OBJECT
+
'
.Instance
'
)
DBUS_DEAMON_OBJECT
+
'
.Instance
'
)
...
@@ -114,6 +116,9 @@ class DRingCtrl(Thread):
...
@@ -114,6 +116,9 @@ class DRingCtrl(Thread):
DBUS_DEAMON_OBJECT
+
'
.CallManager
'
)
DBUS_DEAMON_OBJECT
+
'
.CallManager
'
)
self
.
configurationmanager
=
dbus
.
Interface
(
proxy_confmgr
,
self
.
configurationmanager
=
dbus
.
Interface
(
proxy_confmgr
,
DBUS_DEAMON_OBJECT
+
'
.ConfigurationManager
'
)
DBUS_DEAMON_OBJECT
+
'
.ConfigurationManager
'
)
if
proxy_videomgr
:
self
.
videomanager
=
dbus
.
Interface
(
proxy_videomgr
,
DBUS_DEAMON_OBJECT
+
'
.VideoManager
'
)
except
dbus
.
DBusException
as
e
:
except
dbus
.
DBusException
as
e
:
raise
DRingCtrlDBusError
(
"
Unable to bind to dring DBus API
"
)
raise
DRingCtrlDBusError
(
"
Unable to bind to dring DBus API
"
)
...
...
This diff is collapsed.
Click to expand it.
daemon/tools/dringctrl/dringctrl.py
+
9
−
2
View file @
b5e083ec
...
@@ -40,7 +40,6 @@ from gi.repository import GObject
...
@@ -40,7 +40,6 @@ from gi.repository import GObject
from
errors
import
*
from
errors
import
*
from
controler
import
DRingCtrl
from
controler
import
DRingCtrl
from
tester
import
DRingTester
from
tester
import
DRingTester
from
toggle_video_preview
import
DRingToggleVideo
def
printAccountDetails
(
account
):
def
printAccountDetails
(
account
):
details
=
ctrl
.
getAccountDetails
(
account
)
details
=
ctrl
.
getAccountDetails
(
account
)
...
@@ -183,7 +182,15 @@ if __name__ == "__main__":
...
@@ -183,7 +182,15 @@ if __name__ == "__main__":
DRingTester
().
start
(
ctrl
)
DRingTester
().
start
(
ctrl
)
if
args
.
toggleVideo
:
if
args
.
toggleVideo
:
DRingToggleVideo
().
start
()
if
not
ctrl
.
videomanager
:
print
(
"
Error: daemon without video support
"
)
sys
.
exit
(
1
)
import
time
while
True
:
time
.
sleep
(
2
)
ctrl
.
videomanager
.
startCamera
()
time
.
sleep
(
2
)
ctrl
.
videomanager
.
stopCamera
()
"""
"""
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment