← Back to branch summary

~ubuntu-branches/ubuntu/wily/sflphone/wily

« back to all changes in this revision

Viewing changes to kde/src/lib/dbus/videomanager.cpp

  • Committer: Package Import Robot
  • Author(s): Jonathan Riddell
  • Date: 2015-01-07 14:51:16 UTC
  • mfrom: (4.3.5 sid)
  • Revision ID: package-import@ubuntu.com-20150107145116-yxnafinf4lrdvrmx
Tags: 1.4.1-0.1ubuntu1
* Merge with Debian, remaining changes:
 - Drop soprano, nepomuk build-dep
* Drop ubuntu patches, now upstream

Show diffs side-by-side

added added

removed removed

Lines of Context:
kde/src/lib/dbus/videomanager.cpp
17
17
 ***************************************************************************/
18
18
#include "videomanager.h"
19
19
 
20
 
VideoInterface* DBus::VideoManager::interface = nullptr;
 
20
VideoManagerInterface* DBus::VideoManager::interface = nullptr;
21
21
 
22
 
VideoInterface& DBus::VideoManager::instance()
 
22
VideoManagerInterface& DBus::VideoManager::instance()
23
23
{
24
24
   if (!dbus_metaTypeInit) registerCommTypes();
25
25
   if (!interface)
26
 
      interface = new VideoInterface("org.sflphone.SFLphone", "/org/sflphone/SFLphone/VideoControls", QDBusConnection::sessionBus());
 
26
      interface = new VideoManagerInterface("org.sflphone.SFLphone", "/org/sflphone/SFLphone/VideoManager", QDBusConnection::sessionBus());
27
27
   
28
28
   if(!interface->connection().isConnected()) {
29
29
      throw "Error : sflphoned not connected. Service " + interface->service() + " not connected. From instance interface.";