- NO FUNCTIONAL CODE CHANGES!!!!
- changed code formating from tabs to spaces and others - used astyle with this option: --style=ansi --indent=spaces=2 -M --pad-oper --unpad-paren --pad-header --align-pointer=name --lineend=linux
This commit is contained in:
Andreas Volz
parent
b100e9d32a
commit
1c8e43e6d6
76 changed files with 5691 additions and 5492 deletions
|
|
@ -8,122 +8,122 @@
|
|||
#include <iostream>
|
||||
|
||||
HalManagerProxy::HalManagerProxy(DBus::Connection &connection)
|
||||
: DBus::InterfaceProxy("org.freedesktop.Hal.Manager"),
|
||||
DBus::ObjectProxy(connection, "/org/freedesktop/Hal/Manager", "org.freedesktop.Hal")
|
||||
: DBus::InterfaceProxy("org.freedesktop.Hal.Manager"),
|
||||
DBus::ObjectProxy(connection, "/org/freedesktop/Hal/Manager", "org.freedesktop.Hal")
|
||||
{
|
||||
connect_signal(HalManagerProxy, DeviceAdded, DeviceAddedCb);
|
||||
connect_signal(HalManagerProxy, DeviceRemoved, DeviceRemovedCb);
|
||||
connect_signal(HalManagerProxy, DeviceAdded, DeviceAddedCb);
|
||||
connect_signal(HalManagerProxy, DeviceRemoved, DeviceRemovedCb);
|
||||
|
||||
std::vector< std::string > devices = GetAllDevices();
|
||||
std::vector< std::string > devices = GetAllDevices();
|
||||
|
||||
std::vector< std::string >::iterator it;
|
||||
for (it = devices.begin(); it != devices.end(); ++it)
|
||||
{
|
||||
DBus::Path udi = *it;
|
||||
std::vector< std::string >::iterator it;
|
||||
for (it = devices.begin(); it != devices.end(); ++it)
|
||||
{
|
||||
DBus::Path udi = *it;
|
||||
|
||||
std::cout << "found device " << udi << std::endl;
|
||||
std::cout << "found device " << udi << std::endl;
|
||||
|
||||
_devices[udi] = new HalDeviceProxy(connection, udi);
|
||||
}
|
||||
_devices[udi] = new HalDeviceProxy(connection, udi);
|
||||
}
|
||||
}
|
||||
|
||||
std::vector< std::string > HalManagerProxy::GetAllDevices()
|
||||
{
|
||||
std::vector< std::string > udis;
|
||||
DBus::CallMessage call;
|
||||
std::vector< std::string > udis;
|
||||
DBus::CallMessage call;
|
||||
|
||||
call.member("GetAllDevices");
|
||||
call.member("GetAllDevices");
|
||||
|
||||
DBus::Message reply = invoke_method(call);
|
||||
DBus::MessageIter it = reply.reader();
|
||||
DBus::Message reply = invoke_method(call);
|
||||
DBus::MessageIter it = reply.reader();
|
||||
|
||||
it >> udis;
|
||||
return udis;
|
||||
it >> udis;
|
||||
return udis;
|
||||
}
|
||||
|
||||
void HalManagerProxy::DeviceAddedCb(const DBus::SignalMessage &sig)
|
||||
{
|
||||
DBus::MessageIter it = sig.reader();
|
||||
std::string devname;
|
||||
DBus::MessageIter it = sig.reader();
|
||||
std::string devname;
|
||||
|
||||
it >> devname;
|
||||
it >> devname;
|
||||
|
||||
DBus::Path udi(devname);
|
||||
DBus::Path udi(devname);
|
||||
|
||||
_devices[devname] = new HalDeviceProxy(conn(), udi);
|
||||
std::cout << "added device " << udi << std::endl;
|
||||
_devices[devname] = new HalDeviceProxy(conn(), udi);
|
||||
std::cout << "added device " << udi << std::endl;
|
||||
}
|
||||
|
||||
void HalManagerProxy::DeviceRemovedCb(const DBus::SignalMessage &sig)
|
||||
{
|
||||
DBus::MessageIter it = sig.reader();
|
||||
std::string devname;
|
||||
DBus::MessageIter it = sig.reader();
|
||||
std::string devname;
|
||||
|
||||
it >> devname;
|
||||
it >> devname;
|
||||
|
||||
std::cout << "removed device " << devname << std::endl;
|
||||
std::cout << "removed device " << devname << std::endl;
|
||||
|
||||
_devices.erase(devname);
|
||||
_devices.erase(devname);
|
||||
}
|
||||
|
||||
HalDeviceProxy::HalDeviceProxy(DBus::Connection &connection, DBus::Path &udi)
|
||||
: DBus::InterfaceProxy("org.freedesktop.Hal.Device"),
|
||||
DBus::ObjectProxy(connection, udi, "org.freedesktop.Hal")
|
||||
: DBus::InterfaceProxy("org.freedesktop.Hal.Device"),
|
||||
DBus::ObjectProxy(connection, udi, "org.freedesktop.Hal")
|
||||
{
|
||||
connect_signal(HalDeviceProxy, PropertyModified, PropertyModifiedCb);
|
||||
connect_signal(HalDeviceProxy, Condition, ConditionCb);
|
||||
connect_signal(HalDeviceProxy, PropertyModified, PropertyModifiedCb);
|
||||
connect_signal(HalDeviceProxy, Condition, ConditionCb);
|
||||
}
|
||||
|
||||
void HalDeviceProxy::PropertyModifiedCb(const DBus::SignalMessage &sig)
|
||||
{
|
||||
typedef DBus::Struct< std::string, bool, bool > HalProperty;
|
||||
typedef DBus::Struct< std::string, bool, bool > HalProperty;
|
||||
|
||||
DBus::MessageIter it = sig.reader();
|
||||
int32_t number;
|
||||
DBus::MessageIter it = sig.reader();
|
||||
int32_t number;
|
||||
|
||||
it >> number;
|
||||
it >> number;
|
||||
|
||||
DBus::MessageIter arr = it.recurse();
|
||||
DBus::MessageIter arr = it.recurse();
|
||||
|
||||
for (int i = 0; i < number; ++i, ++arr)
|
||||
{
|
||||
HalProperty hp;
|
||||
for (int i = 0; i < number; ++i, ++arr)
|
||||
{
|
||||
HalProperty hp;
|
||||
|
||||
arr >> hp;
|
||||
arr >> hp;
|
||||
|
||||
std::cout << "modified property " << hp._1 << " in " << path() << std::endl;
|
||||
}
|
||||
std::cout << "modified property " << hp._1 << " in " << path() << std::endl;
|
||||
}
|
||||
}
|
||||
|
||||
void HalDeviceProxy::ConditionCb(const DBus::SignalMessage &sig)
|
||||
{
|
||||
DBus::MessageIter it = sig.reader();
|
||||
std::string condition;
|
||||
DBus::MessageIter it = sig.reader();
|
||||
std::string condition;
|
||||
|
||||
it >> condition;
|
||||
it >> condition;
|
||||
|
||||
std::cout << "encountered condition " << condition << " in " << path() << std::endl;
|
||||
std::cout << "encountered condition " << condition << " in " << path() << std::endl;
|
||||
}
|
||||
|
||||
DBus::BusDispatcher dispatcher;
|
||||
|
||||
void niam(int sig)
|
||||
{
|
||||
dispatcher.leave();
|
||||
dispatcher.leave();
|
||||
}
|
||||
|
||||
int main()
|
||||
{
|
||||
signal(SIGTERM, niam);
|
||||
signal(SIGINT, niam);
|
||||
signal(SIGTERM, niam);
|
||||
signal(SIGINT, niam);
|
||||
|
||||
DBus::default_dispatcher = &dispatcher;
|
||||
DBus::default_dispatcher = &dispatcher;
|
||||
|
||||
DBus::Connection conn = DBus::Connection::SystemBus();
|
||||
DBus::Connection conn = DBus::Connection::SystemBus();
|
||||
|
||||
HalManagerProxy hal(conn);
|
||||
HalManagerProxy hal(conn);
|
||||
|
||||
dispatcher.enter();
|
||||
dispatcher.enter();
|
||||
|
||||
return 0;
|
||||
return 0;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -8,37 +8,37 @@
|
|||
class HalDeviceProxy;
|
||||
|
||||
class HalManagerProxy
|
||||
: public DBus::InterfaceProxy,
|
||||
: public DBus::InterfaceProxy,
|
||||
public DBus::ObjectProxy
|
||||
{
|
||||
public:
|
||||
|
||||
HalManagerProxy(DBus::Connection &connection);
|
||||
HalManagerProxy(DBus::Connection &connection);
|
||||
|
||||
std::vector< std::string > GetAllDevices();
|
||||
std::vector< std::string > GetAllDevices();
|
||||
|
||||
private:
|
||||
|
||||
void DeviceAddedCb(const DBus::SignalMessage &sig);
|
||||
void DeviceAddedCb(const DBus::SignalMessage &sig);
|
||||
|
||||
void DeviceRemovedCb(const DBus::SignalMessage &sig);
|
||||
void DeviceRemovedCb(const DBus::SignalMessage &sig);
|
||||
|
||||
std::map< std::string, DBus::RefPtr< HalDeviceProxy > > _devices;
|
||||
std::map< std::string, DBus::RefPtr< HalDeviceProxy > > _devices;
|
||||
};
|
||||
|
||||
class HalDeviceProxy
|
||||
: public DBus::InterfaceProxy,
|
||||
: public DBus::InterfaceProxy,
|
||||
public DBus::ObjectProxy
|
||||
{
|
||||
public:
|
||||
|
||||
HalDeviceProxy(DBus::Connection &connection, DBus::Path &udi);
|
||||
HalDeviceProxy(DBus::Connection &connection, DBus::Path &udi);
|
||||
|
||||
private:
|
||||
|
||||
void PropertyModifiedCb(const DBus::SignalMessage &sig);
|
||||
void PropertyModifiedCb(const DBus::SignalMessage &sig);
|
||||
|
||||
void ConditionCb(const DBus::SignalMessage &sig);
|
||||
void ConditionCb(const DBus::SignalMessage &sig);
|
||||
};
|
||||
|
||||
#endif//__DEMO_HAL_LISTEN_H
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue