diff options
| author | Christian Mueller <christian@lmuc329619u.(none)> | 2011-07-22 19:44:13 +0200 |
|---|---|---|
| committer | Christian Mueller <christian@lmuc329619u.(none)> | 2011-07-22 19:44:13 +0200 |
| commit | 2feaef3bb5f91af43573155106c73143597bdf3e (patch) | |
| tree | fd59b301174e9d0a1e6821feb3a3ccdf84ff7ee8 /AudioManagerDaemon | |
| parent | a34ffa9cf03c0685ee4751efb16eca8267e533c3 (diff) | |
| download | audiomanager-2feaef3bb5f91af43573155106c73143597bdf3e.tar.gz | |
- daily commit
- dbus working smooth now, implemented signal handling
- changed worker thread for dbus to wait for dbus events not to wakeup every 50 ms
Diffstat (limited to 'AudioManagerDaemon')
| -rw-r--r-- | AudioManagerDaemon/DataBaseHandler.cpp | 4 | ||||
| -rw-r--r-- | AudioManagerDaemon/Router.cpp | 14 |
2 files changed, 10 insertions, 8 deletions
diff --git a/AudioManagerDaemon/DataBaseHandler.cpp b/AudioManagerDaemon/DataBaseHandler.cpp index c1b1a7a..9da96f2 100644 --- a/AudioManagerDaemon/DataBaseHandler.cpp +++ b/AudioManagerDaemon/DataBaseHandler.cpp @@ -132,7 +132,7 @@ domain_t DataBaseHandler::insert_into_Domains_table(std::string DomainName, std: std::string command = "SELECT BusName,ID FROM " + std::string(DOMAIN_TABLE) + " WHERE DomainName='" + DomainName + "'"; - if (sqlite3_exec(m_database,command.c_str(),NULL,&query,NULL)!= SQLITE_OK) { + if (SQexecute(command)) { if (sqlite3_step(query)==SQLITE_ROW) { std::string name((const char*) sqlite3_column_text(query,0)); if (!name.empty()) { @@ -141,7 +141,7 @@ domain_t DataBaseHandler::insert_into_Domains_table(std::string DomainName, std: command = "UPDATE " + std::string(DOMAIN_TABLE) + "SET Busname=" + BusName + " Nodename=" + NodeName + " EarlyMode=" + _EarlyMode + " WHERE DomainName=" + DomainName; } } else { - command = "INSERT INTO " + std::string(DOMAIN_TABLE) + " (DomainName, BusName, NodeName, EarlyMode) VALUES ('" + DomainName + "','" + BusName + "'','" + NodeName + "','" + _EarlyMode + "')"; + command = "INSERT INTO " + std::string(DOMAIN_TABLE) + " (DomainName, BusName, NodeName, EarlyMode) VALUES ('" + DomainName + "','" + BusName + "','" + NodeName + "','" + _EarlyMode + "')"; } } diff --git a/AudioManagerDaemon/Router.cpp b/AudioManagerDaemon/Router.cpp index 7f1c234..b71ccad 100644 --- a/AudioManagerDaemon/Router.cpp +++ b/AudioManagerDaemon/Router.cpp @@ -284,12 +284,14 @@ void Bushandler::load_Bus_plugins() { } void Bushandler::StartupInterfaces() { -// foreach (Bus bus, Busses) -// { -// bus.sendInterface->startup_interface(m_receiver); -// DLT_LOG(AudioManager,DLT_LOG_INFO, DLT_STRING("Bushandler:Started Interface"), DLT_STRING(bus.Name.toAscii())); -// } -// emit signal_system_ready(); + std::list<Bus>::iterator busIter; + std::list<Bus>::iterator busStart=Busses.begin(); + std::list<Bus>::iterator busEnd=Busses.end(); + + for (busIter=busStart;busIter!=busEnd;busIter++) { + busIter->sendInterface->system_ready(); + DLT_LOG(AudioManager,DLT_LOG_INFO, DLT_STRING("Bushandler:Started Interface"), DLT_STRING(busIter->Name.c_str())); + } } void Bushandler::registerReceiver(RoutingReceiver * receiver) { |