Add UI classes to the build.
Adding some helper methods to the Local and remote devices git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@26011 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
@@ -49,19 +49,20 @@ class LocalDevice : public BluetoothDevice {
|
|||||||
ServiceRecord getRecord(Connection notifier);
|
ServiceRecord getRecord(Connection notifier);
|
||||||
void updateRecord(ServiceRecord srvRecord);
|
void updateRecord(ServiceRecord srvRecord);
|
||||||
*/
|
*/
|
||||||
|
|
||||||
private:
|
private:
|
||||||
LocalDevice(hci_id hid);
|
LocalDevice(hci_id hid);
|
||||||
|
hci_id GetID(void) {return hid;}
|
||||||
static LocalDevice* RequestLocalDeviceID(BMessage* request);
|
static LocalDevice* RequestLocalDeviceID(BMessage* request);
|
||||||
|
|
||||||
static BMessenger* sfMessenger;
|
static BMessenger* sfMessenger;
|
||||||
BMessenger* fMessenger;
|
BMessenger* fMessenger;
|
||||||
|
|
||||||
hci_id hid;
|
hci_id hid;
|
||||||
hci_id GetID(void) {return hid;}
|
|
||||||
|
|
||||||
friend class DiscoveryAgent;
|
friend class DiscoveryAgent;
|
||||||
friend class RemoteDevice;
|
friend class RemoteDevice;
|
||||||
|
friend class PincodeWindow;
|
||||||
};
|
};
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -25,7 +25,6 @@ class LocalDevice;
|
|||||||
class RemoteDevice : public BluetoothDevice {
|
class RemoteDevice : public BluetoothDevice {
|
||||||
|
|
||||||
public:
|
public:
|
||||||
|
|
||||||
static const int WAIT = B_BT_WAIT;
|
static const int WAIT = B_BT_WAIT;
|
||||||
static const int SUCCEEDED = B_BT_SUCCEEDED;
|
static const int SUCCEEDED = B_BT_SUCCEEDED;
|
||||||
|
|
||||||
@@ -48,17 +47,16 @@ class RemoteDevice : public BluetoothDevice {
|
|||||||
BString GetProperty(const char* property); /* Throwing */
|
BString GetProperty(const char* property); /* Throwing */
|
||||||
void GetProperty(const char* property, uint32* value); /* Throwing */
|
void GetProperty(const char* property, uint32* value); /* Throwing */
|
||||||
|
|
||||||
|
LocalDevice* GetLocalDeviceOwner();
|
||||||
protected:
|
protected:
|
||||||
RemoteDevice(BString address);
|
RemoteDevice(BString address);
|
||||||
RemoteDevice(bdaddr_t address);
|
RemoteDevice(bdaddr_t address);
|
||||||
|
|
||||||
/* Instances of this class only will be done by Discovery[Listener|Agent] TODO */
|
/* Instances of this class only would be instantiated by Discovery[Listener|Agent] */
|
||||||
friend class DiscoveryListener;
|
friend class DiscoveryListener;
|
||||||
|
|
||||||
private:
|
|
||||||
void SetLocalDeviceOwner(LocalDevice* ld);
|
void SetLocalDeviceOwner(LocalDevice* ld);
|
||||||
|
|
||||||
|
private:
|
||||||
|
|
||||||
LocalDevice* fDiscovererLocalDevice;
|
LocalDevice* fDiscovererLocalDevice;
|
||||||
|
|
||||||
|
|||||||
@@ -2,11 +2,16 @@ SubDir HAIKU_TOP src kits bluetooth ;
|
|||||||
|
|
||||||
SetSubDirSupportedPlatformsBeOSCompatible ;
|
SetSubDirSupportedPlatformsBeOSCompatible ;
|
||||||
|
|
||||||
if ! $(TARGET_PLATFORM_HAIKU_COMPATIBLE) {
|
#if ! $(TARGET_PLATFORM_HAIKU_COMPATIBLE) {
|
||||||
UseHeaders [ FDirName $(HAIKU_TOP) headers os ] : true ;
|
# UseHeaders [ FDirName $(HAIKU_TOP) headers os ] : true ;
|
||||||
}
|
#}
|
||||||
|
|
||||||
|
UsePrivateHeaders shared bluetooth ;
|
||||||
|
|
||||||
|
SubDirHdrs [ FDirName $(SUBDIR) UI ] ;
|
||||||
|
|
||||||
|
SEARCH_SOURCE += [ FDirName $(SUBDIR) UI ] ;
|
||||||
|
|
||||||
UsePrivateHeaders bluetooth shared ;
|
|
||||||
|
|
||||||
SharedLibrary libbluetooth.so :
|
SharedLibrary libbluetooth.so :
|
||||||
LocalDevice.cpp
|
LocalDevice.cpp
|
||||||
@@ -15,5 +20,8 @@ SharedLibrary libbluetooth.so :
|
|||||||
RemoteDevice.cpp
|
RemoteDevice.cpp
|
||||||
CommandManager.cpp
|
CommandManager.cpp
|
||||||
KitSupport.cpp
|
KitSupport.cpp
|
||||||
|
#UI
|
||||||
|
PincodeWindow.cpp
|
||||||
|
ConnectionIncoming.cpp
|
||||||
: be
|
: be
|
||||||
;
|
;
|
||||||
|
|||||||
@@ -134,6 +134,11 @@ RemoteDevice::IsEncrypted()
|
|||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
LocalDevice*
|
||||||
|
RemoteDevice::GetLocalDeviceOwner()
|
||||||
|
{
|
||||||
|
return fDiscovererLocalDevice;
|
||||||
|
}
|
||||||
|
|
||||||
/* Private */
|
/* Private */
|
||||||
void
|
void
|
||||||
|
|||||||
Reference in New Issue
Block a user