diff options
| author | christian mueller <christian.ei.mueller@bmw.de> | 2012-02-09 12:54:59 +0100 |
|---|---|---|
| committer | christian mueller <christian.ei.mueller@bmw.de> | 2012-02-09 12:54:59 +0100 |
| commit | d4627908f2f405b7b184bd47b2216adf5d4df486 (patch) | |
| tree | d24ed57e508f35e66ccd58198451bbec5bd5f338 /AudioManagerDaemon/src/main.cpp | |
| parent | 84b90467e8e9dcaafaf75738f4bf9840365424b9 (diff) | |
| parent | 40ade5d852e6d4c781f33a20d8e4340d59ec07a8 (diff) | |
| download | audiomanager-d4627908f2f405b7b184bd47b2216adf5d4df486.tar.gz | |
Merge branch 'telnetserver'
Diffstat (limited to 'AudioManagerDaemon/src/main.cpp')
| -rw-r--r-- | AudioManagerDaemon/src/main.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/AudioManagerDaemon/src/main.cpp b/AudioManagerDaemon/src/main.cpp index 73e9baf..54c4639 100644 --- a/AudioManagerDaemon/src/main.cpp +++ b/AudioManagerDaemon/src/main.cpp @@ -278,7 +278,7 @@ int main(int argc, char *argv[]) RoutingReceiver iRoutingReceiver(&iDatabaseHandler, &iRoutingSender, &iControlSender, &iSocketHandler, &iDBusWrapper); ControlReceiver iControlReceiver(&iDatabaseHandler, &iRoutingSender, &iCommandSender, &iSocketHandler, &iRouter); #ifdef WITH_TELNET - TelnetServer iTelnetServer(&iSocketHandler,&iCommandSender,&iCommandReceiver,&iRoutingSender,&iRoutingReceiver,&iControlSender,&iControlReceiver,&iDatabaseHandler,telnetport,maxConnections); + TelnetServer iTelnetServer(&iSocketHandler,&iCommandSender,&iCommandReceiver,&iRoutingSender,&iRoutingReceiver,&iControlSender,&iControlReceiver,&iDatabaseHandler,&iRouter,telnetport,maxConnections); #endif #else /*WITH_SOCKETHANDLER_LOOP */ CommandReceiver iCommandReceiver(&iDatabaseHandler,&iControlSender,&iDBusWrapper); |