refs #382, reviewed audio context handling

* only init QDbusServer for P2P
* changed init order of contexts in runtime
* use "fake" signal to call setComVoiceRooms (remote in GUI)
* added slot to change voice room callsign
* used "org.swift" instead of "net.vatim" (just style)
* used const QString for serviceName
* added correct copyright header (just style)
This commit is contained in:
Klaus Basan
2015-02-13 02:29:50 +01:00
parent 067aecdeca
commit c47871b813
42 changed files with 391 additions and 234 deletions

View File

@@ -36,7 +36,7 @@ namespace BlackSimPlugin
class CSimulatorFs9Factory : public QObject, public BlackCore::ISimulatorFactory
{
Q_OBJECT
Q_PLUGIN_METADATA(IID "org.swift.PilotClient.BlackCore.SimulatorInterface")
Q_PLUGIN_METADATA(IID "org.swift.pilotclient.BlackCore.SimulatorInterface")
Q_INTERFACES(BlackCore::ISimulatorFactory)
public:

View File

@@ -28,7 +28,7 @@ namespace BlackSimPlugin
{
Q_OBJECT
// TODO: @RW, move this string into CProject please
Q_PLUGIN_METADATA(IID "org.swift.PilotClient.BlackCore.SimulatorInterface")
Q_PLUGIN_METADATA(IID "org.swift.pilotclient.BlackCore.SimulatorInterface")
Q_INTERFACES(BlackCore::ISimulatorFactory)
public:

View File

@@ -165,7 +165,7 @@ namespace BlackSimPlugin
class CSimulatorXPlaneFactory : public QObject, public BlackCore::ISimulatorFactory
{
Q_OBJECT
Q_PLUGIN_METADATA(IID "org.swift.PilotClient.BlackCore.SimulatorInterface")
Q_PLUGIN_METADATA(IID "org.swift.pilotclient.BlackCore.SimulatorInterface")
Q_INTERFACES(BlackCore::ISimulatorFactory)
public:

View File

@@ -7,7 +7,7 @@
#include "blackcore/dbus_server.h"
#include <QMetaMethod>
#define XBUS_SERVICE_SERVICENAME "net.vatsim.xbus"
#define XBUS_SERVICE_SERVICENAME "org.swift.xbus"
namespace BlackSimPlugin
{

View File

@@ -13,7 +13,7 @@
#include <functional>
//! \cond PRIVATE
#define XBUS_SERVICE_INTERFACENAME "net.vatsim.xbus.service"
#define XBUS_SERVICE_INTERFACENAME "org.swift.xbus.service"
#define XBUS_SERVICE_OBJECTPATH "/xbus"
//! \endcond

View File

@@ -7,7 +7,7 @@
#include "blackcore/dbus_server.h"
#include <QMetaMethod>
#define XBUS_SERVICENAME "net.vatsim.xbus"
#define XBUS_SERVICENAME "org.swift.xbus"
namespace BlackSimPlugin
{

View File

@@ -11,7 +11,7 @@
#include "blackmisc/genericdbusinterface.h"
//! \cond PRIVATE
#define XBUS_TRAFFIC_INTERFACENAME "net.vatsim.xbus.traffic"
#define XBUS_TRAFFIC_INTERFACENAME "org.swift.xbus.traffic"
#define XBUS_TRAFFIC_OBJECTPATH "/xbus/traffic"
//! \endcond