added discoverable property to devicemodel

diff --git a/bluetooth-qt.pro b/bluetooth-qt.pro
index 2845194..ae2e89d 100644 (file)
--- a/bluetooth-qt.pro
+++ b/bluetooth-qt.pro
@@ -34,7 +34,8 @@ HEADERS += agentadaptor.h \
        asyncagent.h \
        devicetypes.h \
     bluetoothdevice.h \
-    bluetoothdevicemodel.h
+       bluetoothdevicemodel.h \
+       audio.h
 SOURCES += agentadaptor.cpp \
        bluemanager.cpp \
        bluedevice.cpp \
@@ -46,7 +47,8 @@ SOURCES += agentadaptor.cpp \
        bluetoothbaseagent.cpp \
        asyncagent.cpp \
     bluetoothdevice.cpp \
-    bluetoothdevicemodel.cpp
+       bluetoothdevicemodel.cpp \
+       audio.cpp
 
 target.path = $$INSTALL_ROOT/usr/lib
 headers.path = $$INSTALL_ROOT/usr/include/bluetooth-qt/

diff --git a/bluetoothdevice.cpp b/bluetoothdevice.cpp
index 269645f..0930763 100644 (file)
--- a/bluetoothdevice.cpp
+++ b/bluetoothdevice.cpp
@@ -86,6 +86,13 @@ void BluetoothDevice::disconnect()
        m_device->Disconnect();
 }
 
+void BluetoothDevice::disconnectAudio()
+{
+       if(!audio) audio = new OrgBluezAudioInterface("org.bluez", m_device->path(), QDBusConnection::systemBus(), this);
+
+       audio->Disconnect();
+}
+
 QStringList BluetoothDevice::profiles()
 {
        QVariantMap props = m_device->GetProperties();

diff --git a/bluetoothdevice.h b/bluetoothdevice.h
index 9855eb9..6f9efdf 100644 (file)
--- a/bluetoothdevice.h
+++ b/bluetoothdevice.h
@@ -33,6 +33,7 @@ public slots:
        void connectAudioSrc();
        QString connectSerial();
        void disconnect();
+       void disconnectAudio();
 
        QStringList profiles();
        bool isProfileSupported(QString profile);

diff --git a/bluetoothdevicemodel.cpp b/bluetoothdevicemodel.cpp
index 7b05953..d4e70bb 100644 (file)
--- a/bluetoothdevicemodel.cpp
+++ b/bluetoothdevicemodel.cpp
@@ -92,9 +92,26 @@ BluetoothDevice* BluetoothDevicesModel::device(QString path)
                if(device->path() == path)
                        return device;
        }
+       qDebug()<<"Device not found for path: "<<path;
        return NULL;
 }
 
+void BluetoothDevicesModel::makeDiscoverable(bool discoverableValue)
+{
+       if(adapter) adapter->SetProperty("Discoverable", QDBusVariant(discoverableValue));
+}
+
+bool BluetoothDevicesModel::discoverable()
+{
+       if(adapter)
+       {
+               QVariantMap props = adapter->GetProperties();
+               return props["Discoverable"].toBool();
+       }
+
+       return false;
+}
+
 void BluetoothDevicesModel::adapterAdded(QDBusObjectPath path)
 {
        if(adapter && adapter->path() == path.path()) return;
@@ -110,6 +127,11 @@ void BluetoothDevicesModel::adapterAdded(QDBusObjectPath path)
                        QDBusConnection::systemBus(), this);
 
        connect(adapter,
+                       SIGNAL(PropertyChanged(QString,QDBusVariant)),
+                       this,
+                       SLOT(adapterPropertyChanged(QString,QDBusVariant)));
+
+       connect(adapter,
                SIGNAL(DeviceRemoved(QDBusObjectPath)),
                this,
                SLOT(deviceRemoved(QDBusObjectPath)));
@@ -187,3 +209,14 @@ void BluetoothDevicesModel::devicePropertyChanged(QString name, QVariant value)
 
        dataChanged(createIndex(row, 0),createIndex(row, 0));
 }
+
+
+void BluetoothDevicesModel::adapterPropertyChanged(QString name, QDBusVariant value)
+{
+       qDebug()<<"adapter property changed: "<<name<<" "<<value.variant();
+
+       if(name == "Discoverable")
+       {
+               discoverableChanged(value.variant().toBool());
+       }
+}

diff --git a/bluetoothdevicemodel.h b/bluetoothdevicemodel.h
index f8f2daf..f57b0f4 100644 (file)
--- a/bluetoothdevicemodel.h
+++ b/bluetoothdevicemodel.h
@@ -9,6 +9,8 @@
 class BluetoothDevicesModel : public QAbstractListModel
 {
     Q_OBJECT
+       Q_PROPERTY(bool discoverable READ discoverable WRITE makeDiscoverable NOTIFY discoverableChanged);
+
 public:
        explicit BluetoothDevicesModel(QObject *parent = 0);
 
@@ -30,6 +32,8 @@ public slots:
        QList<BluetoothDevice*> devices(){ return m_devices; }
 
        BluetoothDevice* device(QString path);
+       void makeDiscoverable(bool isDiscoverable);
+       bool discoverable();
 
 private slots:
        void adapterAdded(QDBusObjectPath);
@@ -38,9 +42,11 @@ private slots:
        void deviceRemoved(QDBusObjectPath);
 
        void devicePropertyChanged(QString name, QVariant value);
+       void adapterPropertyChanged(QString name, QDBusVariant value);
 
 signals:
        void devicePaired(BluetoothDevice* device);
+       void discoverableChanged(bool discoverable);
 
 private:
        OrgBluezManagerInterface *manager;

diff --git a/btprofiles.h b/btprofiles.h
index b6a4ac7..9a551b0 100644 (file)
--- a/btprofiles.h
+++ b/btprofiles.h
@@ -27,6 +27,7 @@ namespace BluetoothProfiles
        const char opush[] = "00001105-0000-1000-8000-00805f9b34fb";
        const char ftp[] = "00001106-0000-1000-8000-00805f9b34fb";
        const char panu[] = "00001115-0000-1000-8000-00805f9b34fb";
+       const char nap[] = "00001116-0000-1000-8000-00805f9b34fb";
        const char spp[] = "00001101-0000-1000-8000-00805f9b34fb";
 }
 #endif // BTPROFILES_H