| author | mickeyl <mickeyl> | 2005-07-11 14:05:50 (UTC) |
|---|---|---|
| committer | mickeyl <mickeyl> | 2005-07-11 14:05:50 (UTC) |
| commit | de58c11168d02f5e52624e68529c9e2eac7978f6 (patch) (side-by-side diff) | |
| tree | 8fdaf84de66d55259344ee1708cf753f5162e2b8 | |
| parent | 4a7503c5e64101a5fadcf8003e66bf447d796f95 (diff) | |
| download | opie-de58c11168d02f5e52624e68529c9e2eac7978f6.zip opie-de58c11168d02f5e52624e68529c9e2eac7978f6.tar.gz opie-de58c11168d02f5e52624e68529c9e2eac7978f6.tar.bz2 | |
don't link to libbluez since this would taint LGPL
| -rw-r--r-- | libopie2/opiebluez/obluetooth.cpp | 13 | ||||
| -rw-r--r-- | libopie2/opiebluez/obluetooth.h | 2 | ||||
| -rw-r--r-- | libopie2/opiebluez/opiebluez.pro | 6 |
3 files changed, 6 insertions, 15 deletions
diff --git a/libopie2/opiebluez/obluetooth.cpp b/libopie2/opiebluez/obluetooth.cpp index a161f86..fbc4f0a 100644 --- a/libopie2/opiebluez/obluetooth.cpp +++ b/libopie2/opiebluez/obluetooth.cpp @@ -45,7 +45,7 @@ using namespace Opie::Core; #include <sys/socket.h> namespace Opie { -namespace Shower { +namespace Bluez { /*====================================================================================== * OBluetooth @@ -115,12 +115,6 @@ void OBluetooth::synchronize() di.dev_id = ( dr + i )->dev_id; if ( ioctl( _fd, HCIGETDEVINFO, (void *) &di) < 0 ) continue; - if ( hci_test_bit(HCI_RAW, &di.flags) && !bacmp(&di.bdaddr, BDADDR_ANY)) - { - int dd = hci_open_dev(di.dev_id); - hci_read_bd_addr(dd, &di.bdaddr, 1000); - hci_close_dev(dd); - } odebug << "OBluetooth::synchronize() - found device #" << di.dev_id << oendl; _interfaces.insert( di.name, new OBluetoothInterface( this, di.name, (void*) &di ) ); } @@ -152,8 +146,9 @@ OBluetoothInterface::~OBluetoothInterface() QString OBluetoothInterface::macAddress() const { char addr[18]; - ba2str( &d->devinfo.bdaddr, addr); - return addr; + //ba2str( &d->devinfo.bdaddr, addr); + //return addr; + return "BLA"; } } diff --git a/libopie2/opiebluez/obluetooth.h b/libopie2/opiebluez/obluetooth.h index 30fdd18..10c8c49 100644 --- a/libopie2/opiebluez/obluetooth.h +++ b/libopie2/opiebluez/obluetooth.h @@ -34,7 +34,7 @@ #include <qdict.h> namespace Opie { -namespace Shower { +namespace Bluez { class OBluetoothInterface; diff --git a/libopie2/opiebluez/opiebluez.pro b/libopie2/opiebluez/opiebluez.pro index 6a37dee..8a52928 100644 --- a/libopie2/opiebluez/opiebluez.pro +++ b/libopie2/opiebluez/opiebluez.pro @@ -8,7 +8,7 @@ TARGET = opiebluez2 VERSION = 0.0.0 INCLUDEPATH += $(OPIEDIR)/include DEPENDPATH += $(OPIEDIR)/include -LIBS += -lopiecore2 -lbluetooth +LIBS += -lopiecore2 !contains( platform, x11 ) { include( $(OPIEDIR)/include.pro ) @@ -21,7 +21,3 @@ contains( platform, x11 ) { !isEmpty( LIBBLUEZ_INC_DIR ) { INCLUDEPATH = $$LIBBLUEZ_INC_DIR $$INCLUDEPATH } -!isEmpty( LIBBLUEZ_LIB_DIR ) { - LIBS = -L$$LIBBLUEZ_LIB_DIR $$LIBS -} - |