From b5e083ecc33896c6f6bc3ba74090816f8fd8395e Mon Sep 17 00:00:00 2001
From: Guillaume Roguez <guillaume.roguez@savoirfairelinux.com>
Date: Tue, 17 Mar 2015 17:05:05 -0400
Subject: [PATCH] tools: fix toggle video preview test in dringctrl.py
Refs #67717
Change-Id: I868cf9ccbe0dabebae3084acd8340f513bde2cdf
---
daemon/tools/dringctrl/controler.py | 5 +++++
daemon/tools/dringctrl/dringctrl.py | 11 +++++++++--
2 files changed, 14 insertions(+), 2 deletions(-)
diff --git a/daemon/tools/dringctrl/controler.py b/daemon/tools/dringctrl/controler.py
index 21672d8f71..98bd32113e 100644
--- a/daemon/tools/dringctrl/controler.py
+++ b/daemon/tools/dringctrl/controler.py
@@ -107,6 +107,8 @@ class DRingCtrl(Thread):
DBUS_DEAMON_PATH+'/CallManager', introspect=False)
proxy_confmgr = bus.get_object(DBUS_DEAMON_OBJECT,
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,
DBUS_DEAMON_OBJECT+'.Instance')
@@ -114,6 +116,9 @@ class DRingCtrl(Thread):
DBUS_DEAMON_OBJECT+'.CallManager')
self.configurationmanager = dbus.Interface(proxy_confmgr,
DBUS_DEAMON_OBJECT+'.ConfigurationManager')
+ if proxy_videomgr:
+ self.videomanager = dbus.Interface(proxy_videomgr,
+ DBUS_DEAMON_OBJECT+'.VideoManager')
except dbus.DBusException as e:
raise DRingCtrlDBusError("Unable to bind to dring DBus API")
diff --git a/daemon/tools/dringctrl/dringctrl.py b/daemon/tools/dringctrl/dringctrl.py
index 6309c97939..7e1e64f029 100755
--- a/daemon/tools/dringctrl/dringctrl.py
+++ b/daemon/tools/dringctrl/dringctrl.py
@@ -40,7 +40,6 @@ from gi.repository import GObject
from errors import *
from controler import DRingCtrl
from tester import DRingTester
-from toggle_video_preview import DRingToggleVideo
def printAccountDetails(account):
details = ctrl.getAccountDetails(account)
@@ -183,7 +182,15 @@ if __name__ == "__main__":
DRingTester().start(ctrl)
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()
"""
--
GitLab