diff --git a/src/dbus/callmanager-introspec.xml b/src/dbus/callmanager-introspec.xml
index 1c2699687496bd7c013efb5de2b27e4c5a6206e2..1b8664640354dde871ff8267b8478fc61e6ede42 100644
--- a/src/dbus/callmanager-introspec.xml
+++ b/src/dbus/callmanager-introspec.xml
@@ -248,7 +248,7 @@
The conference ID
</tp:docstring>
</arg>
- <annotation name="com.trolltech.QtDBus.QtTypeName.Out0" value="MapStringString"/>
+ <annotation name="org.qtproject.QtDBus.QtTypeName.Out0" value="MapStringString"/>
<arg type="a{ss}" name="infos" direction="out">
<tp:docstring>
A map containing the ID of the conferences
@@ -377,7 +377,7 @@
The call ID.
</tp:docstring>
</arg>
- <annotation name="com.trolltech.QtDBus.QtTypeName.Out0" value="MapStringString"/>
+ <annotation name="org.qtproject.QtDBus.QtTypeName.Out0" value="MapStringString"/>
<arg type="a{ss}" name="infos" direction="out" tp:type="String_String_Map">
<tp:docstring xmlns="http://www.w3.org/1999/xhtml">
<p>A map containing the call details: </p>
@@ -776,7 +776,7 @@
<p>Signal sent adter a RTCP report has been received and computed.</p>
</tp:docstring>
<arg type="s" name="callID" />
- <annotation name="com.trolltech.QtDBus.QtTypeName.In1" value="MapStringInt"/>
+ <annotation name="org.qtproject.QtDBus.QtTypeName.In1" value="MapStringInt"/>
<arg type="a{si}" name="report" direction="out" tp:type="String_Integer_Map">
<tp:docstring xmlns="http://www.w3.org/1999/xhtml">
<p>A map containing RTCP stats: </p>
diff --git a/src/dbus/configurationmanager-introspec.xml b/src/dbus/configurationmanager-introspec.xml
index de4675229cab4f28ed90c99ecb633e61b8c5bfc7..8cc1c5dcd6b79c751f2441dc260a3473165dbec4 100644
--- a/src/dbus/configurationmanager-introspec.xml
+++ b/src/dbus/configurationmanager-introspec.xml
@@ -7,7 +7,7 @@
</tp:docstring>
<method name="getAccountTemplate" tp:name-for-bindings="getAccountTemplate">
- <annotation name="com.trolltech.QtDBus.QtTypeName.Out0" value="MapStringString"/>
+ <annotation name="org.qtproject.QtDBus.QtTypeName.Out0" value="MapStringString"/>
<arg type="a{ss}" name="details" direction="out" tp:type="String_String_Map">
</arg>
</method>
@@ -21,7 +21,7 @@
The account ID
</tp:docstring>
</arg>
- <annotation name="com.trolltech.QtDBus.QtTypeName.Out0" value="MapStringString"/>
+ <annotation name="org.qtproject.QtDBus.QtTypeName.Out0" value="MapStringString"/>
<arg type="a{ss}" name="details" direction="out" tp:type="String_String_Map">
<tp:docstring>
The available keys / parameters are:
@@ -77,7 +77,7 @@
<tp:rationale>Account settings are written to the configuration file when sflphone properly quits.</tp:rationale>
<tp:rationale>After calling this method, the core will emit the signal <tp:member-ref>accountsChanged</tp:member-ref> with the updated data. The client must subscribe to this signal and use it to update its internal data structure.</tp:rationale>
</tp:docstring>
- <annotation name="com.trolltech.QtDBus.QtTypeName.In1" value="MapStringString"/>
+ <annotation name="org.qtproject.QtDBus.QtTypeName.In1" value="MapStringString"/>
<arg type="s" name="accountID" direction="in">
</arg>
<arg type="a{ss}" name="details" direction="in" tp:type="String_String_Map">
@@ -87,7 +87,7 @@
<method name="setCredentials" tp:name-for-bindings="setCredentials">
<arg type="s" name="accountID" direction="in">
</arg>
- <annotation name="com.trolltech.QtDBus.QtTypeName.In1" value="VectorMapStringString"/>
+ <annotation name="org.qtproject.QtDBus.QtTypeName.In1" value="VectorMapStringString"/>
<arg type="aa{ss}" name="credentialInformation" direction="in" tp:type="String_String_Map">
</arg>
</method>
@@ -96,7 +96,7 @@
<tp:docstring>
Get configuration settings of the IP2IP_PROFILE. They are sligthly different from account settings since no VoIP accounts are involved.
</tp:docstring>
- <annotation name="com.trolltech.QtDBus.QtTypeName.Out0" value="MapStringString"/>
+ <annotation name="org.qtproject.QtDBus.QtTypeName.Out0" value="MapStringString"/>
<arg type="a{ss}" name="details" direction="out" tp:type="String_String_Map">
<tp:docstring>
Available parameters are:
@@ -131,7 +131,7 @@
<method name="getCredentials" tp:name-for-bindings="getCredentials">
<arg type="s" name="accountID" direction="in">
</arg>
- <annotation name="com.trolltech.QtDBus.QtTypeName.Out0" value="VectorMapStringString"/>
+ <annotation name="org.qtproject.QtDBus.QtTypeName.Out0" value="VectorMapStringString"/>
<arg type="aa{ss}" name="credentialInformation" direction="out">
</arg>
</method>
@@ -142,7 +142,7 @@
<tp:rationale>If no details are specified, the default parameters are used.</tp:rationale>
<tp:rationale>The core tries to register the account as soon it is created.</tp:rationale>
</tp:docstring>
- <annotation name="com.trolltech.QtDBus.QtTypeName.In0" value="MapStringString"/>
+ <annotation name="org.qtproject.QtDBus.QtTypeName.In0" value="MapStringString"/>
<arg type="a{ss}" name="details" direction="in" tp:type="String_String_Map">
<tp:docstring>
The new account settings
@@ -182,7 +182,7 @@
<tp:docstring>
Get a list of all created accounts, as stored by the core.
</tp:docstring>
- <annotation name="com.trolltech.QtDBus.QtTypeName.Out0" value="VectorString"/>
+ <annotation name="org.qtproject.QtDBus.QtTypeName.Out0" value="VectorString"/>
<arg type="as" name="list" direction="out">
<tp:docstring>
A list of account IDs
@@ -313,7 +313,7 @@
<method name="setAudioManager" tp:name-for-bindings="setAudioManager">
<arg type="s" name="api" direction="in">
</arg>
- <arg type="b" name="success" direction="out">
+ <arg type="b" name="successful" direction="out">
</arg>
</method>
@@ -350,7 +350,7 @@
<!-- Codecs-related methods -->
<method name="getAudioCodecList" tp:name-for-bindings="getAudioCodecList">
- <annotation name="com.trolltech.QtDBus.QtTypeName.Out0" value="VectorInt"/>
+ <annotation name="org.qtproject.QtDBus.QtTypeName.Out0" value="VectorInt"/>
<arg type="ai" name="list" direction="out">
</arg>
</method>
@@ -358,13 +358,13 @@
<method name="getAudioCodecDetails" tp:name-for-bindings="getAudioCodecDetails">
<arg type="i" name="payload" direction="in">
</arg>
- <annotation name="com.trolltech.QtDBus.QtTypeName.Out0" value="VectorString"/>
+ <annotation name="org.qtproject.QtDBus.QtTypeName.Out0" value="VectorString"/>
<arg type="as" name="details" direction="out">
</arg>
</method>
<method name="getActiveAudioCodecList" tp:name-for-bindings="getActiveAudioCodecList">
- <annotation name="com.trolltech.QtDBus.QtTypeName.Out0" value="VectorInt"/>
+ <annotation name="org.qtproject.QtDBus.QtTypeName.Out0" value="VectorInt"/>
<arg type="s" name="accountID" direction="in">
</arg>
<arg type="ai" name="list" direction="out">
@@ -372,7 +372,7 @@
</method>
<method name="setActiveAudioCodecList" tp:name-for-bindings="setActiveAudioCodecList">
- <annotation name="com.trolltech.QtDBus.QtTypeName.In0" value="VectorString"/>
+ <annotation name="org.qtproject.QtDBus.QtTypeName.In0" value="VectorString"/>
<arg type="as" name="list" direction="in">
</arg>
<arg type="s" name="accountID" direction="in">
@@ -382,7 +382,7 @@
<!-- Audio devices methods -->
<method name="getAudioPluginList" tp:name-for-bindings="getAudioPluginList">
- <annotation name="com.trolltech.QtDBus.QtTypeName.Out0" value="VectorString"/>
+ <annotation name="org.qtproject.QtDBus.QtTypeName.Out0" value="VectorString"/>
<arg type="as" name="list" direction="out">
</arg>
</method>
@@ -393,7 +393,7 @@
</method>
<method name="getAudioOutputDeviceList" tp:name-for-bindings="getAudioOutputDeviceList">
- <annotation name="com.trolltech.QtDBus.QtTypeName.Out0" value="VectorString"/>
+ <annotation name="org.qtproject.QtDBus.QtTypeName.Out0" value="VectorString"/>
<arg type="as" name="list" direction="out">
</arg>
</method>
@@ -414,14 +414,14 @@
</method>
<method name="getAudioInputDeviceList" tp:name-for-bindings="getAudioInputDeviceList">
- <annotation name="com.trolltech.QtDBus.QtTypeName.Out0" value="VectorString"/>
+ <annotation name="org.qtproject.QtDBus.QtTypeName.Out0" value="VectorString"/>
<arg type="as" name="list" direction="out">
</arg>
</method>
<method name="getCurrentAudioDevicesIndex" tp:name-for-bindings="getCurrentAudioDevicesIndex">
- <annotation name="com.trolltech.QtDBus.QtTypeName.Out0" value="VectorString"/>
+ <annotation name="org.qtproject.QtDBus.QtTypeName.Out0" value="VectorString"/>
<arg type="as" name="list" direction="out">
</arg>
</method>
@@ -447,7 +447,7 @@
<method name="getRingtoneList" tp:name-for-bindings="getRingtoneList">
<tp:added version="1.1.1"/>
- <annotation name="com.trolltech.QtDBus.QtTypeName.Out0" value="MapStringString"/>
+ <annotation name="org.qtproject.QtDBus.QtTypeName.Out0" value="MapStringString"/>
<tp:docstring>
Get a map [Path,Filename] of available ringtone. Note, set the ringtone with the complete path
</tp:docstring>
@@ -496,19 +496,19 @@
<!-- Hook configuration -->
<method name="getHookSettings" tp:name-for-bindings="getHookSettings">
- <annotation name="com.trolltech.QtDBus.QtTypeName.Out0" value="MapStringString"/>
+ <annotation name="org.qtproject.QtDBus.QtTypeName.Out0" value="MapStringString"/>
<arg type="a{ss}" name="settings" direction="out">
</arg>
</method>
<method name="setHookSettings" tp:name-for-bindings="setHookSettings">
- <annotation name="com.trolltech.QtDBus.QtTypeName.In0" value="MapStringString"/>
+ <annotation name="org.qtproject.QtDBus.QtTypeName.In0" value="MapStringString"/>
<arg type="a{ss}" name="settings" direction="in">
</arg>
</method>
<method name="getHistory" tp:name-for-bindings="getHistory">
- <annotation name="com.trolltech.QtDBus.QtTypeName.Out0" value="VectorMapStringString"/>
+ <annotation name="org.qtproject.QtDBus.QtTypeName.Out0" value="VectorMapStringString"/>
<!-- Return a List of type Dict<string, string> >...a List of Dicts -->
<arg type="aa{ss}" name="entries" direction="out"/>
</method>
@@ -569,25 +569,25 @@
<!-- TLS Methods -->
<method name="getSupportedTlsMethod" tp:name-for-bindings="getSupportedTlsMethod">
- <annotation name="com.trolltech.QtDBus.QtTypeName.Out0" value="VectorString"/>
+ <annotation name="org.qtproject.QtDBus.QtTypeName.Out0" value="VectorString"/>
<arg type="as" name="list" direction="out">
</arg>
</method>
<method name="getTlsSettingsDefault" tp:name-for-bindings="getTlsSettingsDefault">
- <annotation name="com.trolltech.QtDBus.QtTypeName.Out0" value="MapStringString"/>
+ <annotation name="org.qtproject.QtDBus.QtTypeName.Out0" value="MapStringString"/>
<arg type="a{ss}" name="details" direction="out">
</arg>
</method>
<method name="getTlsSettings" tp:name-for-bindings="getTlsSettings">
- <annotation name="com.trolltech.QtDBus.QtTypeName.Out0" value="MapStringString"/>
+ <annotation name="org.qtproject.QtDBus.QtTypeName.Out0" value="MapStringString"/>
<arg type="a{ss}" name="details" direction="out">
</arg>
</method>
<method name="setTlsSettings" tp:name-for-bindings="setTlsSettings">
- <annotation name="com.trolltech.QtDBus.QtTypeName.In0" value="MapStringString"/>
+ <annotation name="org.qtproject.QtDBus.QtTypeName.In0" value="MapStringString"/>
<arg type="a{ss}" name="details" direction="in">
</arg>
</method>
@@ -600,25 +600,25 @@
</method>
<method name="getAllIpInterface" tp:name-for-bindings="getAllIpInterface">
- <annotation name="com.trolltech.QtDBus.QtTypeName.Out0" value="VectorString"/>
+ <annotation name="org.qtproject.QtDBus.QtTypeName.Out0" value="VectorString"/>
<arg type="as" name="list" direction="out">
</arg>
</method>
<method name="getAllIpInterfaceByName" tp:name-for-bindings="getAllIpInterfaceByName">
- <annotation name="com.trolltech.QtDBus.QtTypeName.Out0" value="VectorString"/>
+ <annotation name="org.qtproject.QtDBus.QtTypeName.Out0" value="VectorString"/>
<arg type="as" name="list" direction="out">
</arg>
</method>
<method name="getShortcuts" tp:name-for-bindings="getShortcuts">
- <annotation name="com.trolltech.QtDBus.QtTypeName.Out0" value="MapStringString"/>
+ <annotation name="org.qtproject.QtDBus.QtTypeName.Out0" value="MapStringString"/>
<arg type="a{ss}" name="shortcutsMap" direction="out">
</arg>
</method>
<method name="setShortcuts" tp:name-for-bindings="setShortcuts">
- <annotation name="com.trolltech.QtDBus.QtTypeName.In0" value="MapStringString"/>
+ <annotation name="org.qtproject.QtDBus.QtTypeName.In0" value="MapStringString"/>
<arg type="a{ss}" name="shortcutsMap" direction="in">
</arg>
</method>
diff --git a/src/dbus/presencemanager-introspec.xml b/src/dbus/presencemanager-introspec.xml
index 2e714d002b1af1537f2c9848c5414daf50f8fed9..77b1527a43bd910c947cc7ff7dd99a2265e6f20c 100644
--- a/src/dbus/presencemanager-introspec.xml
+++ b/src/dbus/presencemanager-introspec.xml
@@ -65,12 +65,12 @@
New clients connecting to existing daemon need to be aware of active
subscriptions.
</tp:rationale>
- <annotation name="com.trolltech.QtDBus.QtTypeName.In0" value="VectorMapStringString">
+ <annotation name="org.qtproject.QtDBus.QtTypeName.In0" value="VectorMapStringString">
While there is more status than "Online" or "Offline", only those
</annotation>
<arg type="s" name="accountID" direction="in">
</arg>
- <annotation name="com.trolltech.QtDBus.QtTypeName.Out0" value="VectorMapStringString"/>
+ <annotation name="org.qtproject.QtDBus.QtTypeName.Out0" value="VectorMapStringString"/>
<arg type="aa{ss}" name="credentialInformation" direction="out" tp:type="String_String_Map">
<tp:docstring>
List of hashes map with the following key-value pairs:
@@ -85,13 +85,13 @@
<tp:rationale>Calling "subscribeClient" in a loop is too slow</tp:rationale>
<arg type="s" name="accountID" direction="in">
</arg>
- <annotation name="com.trolltech.QtDBus.QtTypeName.In1" value="VectorString"/>
+ <annotation name="org.qtproject.QtDBus.QtTypeName.In1" value="VectorString"/>
<arg type="as" name="uriList" direction="in">
<tp:docstring>
A list of SIP URIs
</tp:docstring>
</arg>
- <!--TODO<annotation name="com.trolltech.QtDBus.QtTypeName.Out0" value="VectorString"/>
+ <!--TODO<annotation name="org.qtproject.QtDBus.QtTypeName.Out0" value="VectorString"/>
<arg type="as" name="invalidUris" direction="out">
<tp:docstring>
List of invalid URIs. An URI must be a valid SIP URI. Clients should purge
diff --git a/src/dbus/videomanager-introspec.xml b/src/dbus/videomanager-introspec.xml
index 317592df60194bb82b76ea5eff056ef976fbe7f4..b7773f8379cff93f0e687fb2fede89979c021aed 100644
--- a/src/dbus/videomanager-introspec.xml
+++ b/src/dbus/videomanager-introspec.xml
@@ -5,54 +5,45 @@
<method name="getDeviceList" tp:name-for-bindings="getDeviceList">
<tp:docstring>Returns a list of the detected v4l2 devices</tp:docstring>
- <annotation name="com.trolltech.QtDBus.QtTypeName.Out0" value="VectorString"/>
+ <annotation name="org.qtproject.QtDBus.QtTypeName.Out0" value="VectorString"/>
<arg type="as" name="list" direction="out">
</arg>
</method>
<method name="getCapabilities" tp:name-for-bindings="getCapabilities">
<tp:docstring>Returns a map of map of array of strings, containing the capabilities (channel, size, rate) of a device</tp:docstring>
- <annotation name="com.trolltech.QtDBus.QtTypeName.Out0" value="MapStringMapStringVectorString"/>
+ <annotation name="org.qtproject.QtDBus.QtTypeName.Out0" value="MapStringMapStringVectorString"/>
<arg type="s" name="name" direction="in">
</arg>
<arg type="a{sa{sas}}" name="cap" direction="out">
</arg>
</method>
- <method name="getSettingsFor" tp:name-for-bindings="getSettingsFor">
+ <method name="getSettings" tp:name-for-bindings="getSettings">
<tp:docstring>Returns a map of settings for the given device name</tp:docstring>
- <annotation name="com.trolltech.QtDBus.QtTypeName.Out0" value="MapStringString"/>
+ <annotation name="org.qtproject.QtDBus.QtTypeName.Out0" value="MapStringString"/>
<arg type="s" name="device" direction="in">
</arg>
<arg type="a{ss}" name="map" direction="out">
</arg>
</method>
- <method name="getPreferences" tp:name-for-bindings="getPreferences">
- <tp:docstring>Returns a map of user preferences for the given device name</tp:docstring>
- <annotation name="com.trolltech.QtDBus.QtTypeName.Out0" value="MapStringString"/>
+ <method name="applySettings" tp:name-for-bindings="applySettings">
+ <tp:docstring>Set the preferred settings for a given device name</tp:docstring>
<arg type="s" name="name" direction="in">
</arg>
- <arg type="a{ss}" name="map" direction="out">
- </arg>
- </method>
-
- <method name="setPreferences" tp:name-for-bindings="setPreferences">
- <tp:docstring>Set the preferences of a given device name</tp:docstring>
- <arg type="s" name="name" direction="in">
- </arg>
- <annotation name="com.trolltech.QtDBus.QtTypeName.In1" value="MapStringString"/>
- <arg type="a{ss}" name="pref" direction="in">
+ <annotation name="org.qtproject.QtDBus.QtTypeName.In1" value="MapStringString"/>
+ <arg type="a{ss}" name="settings" direction="in">
</arg>
</method>
- <method name="getActiveDevice" tp:name-for-bindings="getActiveDevice">
- <arg type="s" name="device" direction="out">
+ <method name="getDefaultDevice" tp:name-for-bindings="getDefaultDevice">
+ <arg type="s" name="name" direction="out">
</arg>
</method>
- <method name="setActiveDevice" tp:name-for-bindings="setActiveDevice">
- <arg type="s" name="device" direction="in">
+ <method name="setDefaultDevice" tp:name-for-bindings="setDefaultDevice">
+ <arg type="s" name="name" direction="in">
</arg>
</method>
@@ -62,7 +53,7 @@
<tp:docstring>Gets the hashtable describing all the codecs and their parameters for a given account</tp:docstring>
<arg type="s" name="accountID" direction="in">
</arg>
- <annotation name="com.trolltech.QtDBus.QtTypeName.Out0" value="VectorMapStringString"/>
+ <annotation name="org.qtproject.QtDBus.QtTypeName.Out0" value="VectorMapStringString"/>
<arg type="aa{ss}" name="details" direction="out">
</arg>
</method>
@@ -71,7 +62,7 @@
<tp:docstring>Sets a vector of hashtables describing codecs and their parameters for a given account, one hashtable per codec</tp:docstring>
<arg type="s" name="accountID" direction="in">
</arg>
- <annotation name="com.trolltech.QtDBus.QtTypeName.In1" value="VectorMapStringString"/>
+ <annotation name="org.qtproject.QtDBus.QtTypeName.In1" value="VectorMapStringString"/>
<arg type="aa{ss}" name="details" direction="in">
</arg>
</method>
@@ -101,7 +92,7 @@
</method>
<method name="hasCameraStarted" tp:name-for-bindings="hasCameraStarted">
- <annotation name="com.trolltech.QtDBus.QtTypeName.Out0" value="Bool"/>
+ <annotation name="org.qtproject.QtDBus.QtTypeName.Out0" value="Bool"/>
<arg type="b" name="started" direction="out">
<tp:docstring>Returns true if the camera has already started, false otherwise</tp:docstring>
</arg>
diff --git a/src/video/videochannel.cpp b/src/video/videochannel.cpp
index 338e5174acd78d2fc2ee6b891bbac1e32567e893..63a7e05fb5e1635e0c1f7c592e201183f3db66cc 100644
--- a/src/video/videochannel.cpp
+++ b/src/video/videochannel.cpp
@@ -80,7 +80,7 @@ VideoResolution* VideoChannel::activeResolution()
//If it is the current device, then there is "current" resolution
if ((!m_pCurrentResolution) && m_pDevice->isActive()) {
VideoManagerInterface& interface = DBus::VideoManager::instance();
- const QString res = QMap<QString,QString>(interface.getPreferences(m_pDevice->id()))[VideoDevice::PreferenceNames::SIZE];
+ const QString res = QMap<QString,QString>(interface.getSettings(m_pDevice->id()))[VideoDevice::PreferenceNames::SIZE];
foreach(VideoResolution* r, validResolutions()) {
if (r->name() == res) {
m_pCurrentResolution = r;
diff --git a/src/video/videodevice.cpp b/src/video/videodevice.cpp
index 44652e0df5b1fcab44512eb07b47cefdb273c915..ecf7b1d48cddfea55aa17d3f604318d5f4f53d35 100644
--- a/src/video/videodevice.cpp
+++ b/src/video/videodevice.cpp
@@ -99,11 +99,11 @@ void VideoDevice::save()
{
//In case new (unsupported) fields are added, merge with existing
VideoManagerInterface& interface = DBus::VideoManager::instance();
- MapStringString pref = interface.getPreferences(m_DeviceId);
+ MapStringString pref = interface.getSettings(m_DeviceId);
pref[VideoDevice::PreferenceNames::CHANNEL] = activeChannel()->name();
pref[VideoDevice::PreferenceNames::SIZE ] = activeChannel()->activeResolution()->name();
pref[VideoDevice::PreferenceNames::RATE ] = activeChannel()->activeResolution()->activeRate()->name();
- interface.setPreferences(m_DeviceId,pref);
+ interface.applySettings(m_DeviceId,pref);
}
///Get the device id
@@ -116,7 +116,7 @@ const QString VideoDevice::id() const
const QString VideoDevice::name() const
{
VideoManagerInterface& interface = DBus::VideoManager::instance();
- return QMap<QString,QString>(interface.getPreferences(m_DeviceId))[PreferenceNames::NAME];;
+ return QMap<QString,QString>(interface.getSettings(m_DeviceId))[PreferenceNames::NAME];;
}
///Is this device the default one
@@ -146,7 +146,7 @@ VideoChannel* VideoDevice::activeChannel() const
{
if (!m_pCurrentChannel) {
VideoManagerInterface& interface = DBus::VideoManager::instance();
- const QString chan = QMap<QString,QString>(interface.getPreferences(m_DeviceId))[VideoDevice::PreferenceNames::CHANNEL];
+ const QString chan = QMap<QString,QString>(interface.getSettings(m_DeviceId))[VideoDevice::PreferenceNames::CHANNEL];
foreach(VideoChannel* c, m_lChannels) {
if (c->name() == chan) {
const_cast<VideoDevice*>(this)->m_pCurrentChannel = c;
diff --git a/src/video/videodevicemodel.cpp b/src/video/videodevicemodel.cpp
index 0f96a47ad73f587b87b628c99384d32beace332e..ad170cb3b1f49bb1896712b527691ea88aef4afb 100644
--- a/src/video/videodevicemodel.cpp
+++ b/src/video/videodevicemodel.cpp
@@ -88,7 +88,7 @@ void VideoDeviceModel::setActive(const QModelIndex& idx)
{
if (idx.isValid()) {
VideoManagerInterface& interface = DBus::VideoManager::instance();
- interface.setActiveDevice(m_lDevices[idx.row()]->id());
+ interface.setDefaultDevice(m_lDevices[idx.row()]->id());
m_pActiveDevice = m_lDevices[idx.row()];
emit changed();
emit currentIndexChanged(idx.row());
@@ -106,7 +106,7 @@ void VideoDeviceModel::setActive(const VideoDevice* device)
{
VideoManagerInterface& interface = DBus::VideoManager::instance();
- interface.setActiveDevice(device?device->id():VideoDevice::NONE);
+ interface.setDefaultDevice(device?device->id():VideoDevice::NONE);
m_pActiveDevice = const_cast<VideoDevice*>(device);
emit changed();
const int idx = m_lDevices.indexOf((VideoDevice*)device);
@@ -149,7 +149,7 @@ VideoDevice* VideoDeviceModel::activeDevice() const
{
if (!m_pActiveDevice) {
VideoManagerInterface& interface = DBus::VideoManager::instance();
- const QString deId = interface.getActiveDevice();
+ const QString deId = interface.getDefaultDevice();
if (!m_lDevices.size())
const_cast<VideoDeviceModel*>(this)->reload();
VideoDevice* dev = m_hDevices[deId];
diff --git a/src/video/videoresolution.cpp b/src/video/videoresolution.cpp
index cb2ccfb425fde666e1643957aca5208d0fb62602..08187d5e43c73d52d1b8bbd4a22dc9d664c4c2c1 100644
--- a/src/video/videoresolution.cpp
+++ b/src/video/videoresolution.cpp
@@ -100,7 +100,7 @@ VideoRate* VideoResolution::activeRate()
if (!m_pCurrentRate && m_pChannel && m_pChannel->device()->isActive()) {
VideoManagerInterface& interface = DBus::VideoManager::instance();
const QString rate = QMap<QString,QString>(
- interface.getPreferences(m_pChannel->device()->id()))[VideoDevice::PreferenceNames::RATE];
+ interface.getSettings(m_pChannel->device()->id()))[VideoDevice::PreferenceNames::RATE];
foreach(VideoRate* r, m_lValidRates) {
if (r->name() == rate) {
m_pCurrentRate = r;