Author: derek Date: Mon May 14 23:11:08 2007 New Revision: 252 Modified: sofaswitch/trunk/am/audio.cxx sofaswitch/trunk/am/comms.cxx sofaswitch/trunk/am/main.cxx Log: Fixes tidyups etc. Modified: sofaswitch/trunk/am/audio.cxx ============================================================================== --- sofaswitch/trunk/am/audio.cxx (original) +++ sofaswitch/trunk/am/audio.cxx Mon May 14 23:11:08 2007 @@ -27,7 +27,10 @@ * */ +#ifndef _PTLIB_H #include <ptlib.h> +#endif + #include "version.h" #include "audio.h" #include "main.h" Modified: sofaswitch/trunk/am/comms.cxx ============================================================================== --- sofaswitch/trunk/am/comms.cxx (original) +++ sofaswitch/trunk/am/comms.cxx Mon May 14 23:11:08 2007 @@ -23,7 +23,9 @@ * */ +#ifndef _PTLIB_H #include <ptlib.h> +#endif #ifdef __GNUC__ #pragma implementation "comms.h" Modified: sofaswitch/trunk/am/main.cxx ============================================================================== --- sofaswitch/trunk/am/main.cxx (original) +++ sofaswitch/trunk/am/main.cxx Mon May 14 23:11:08 2007 @@ -98,9 +98,6 @@ PTrace::Blocks | PTrace::Timestamp | PTrace::Thread | PTrace::FileAndLine); - - - PString server; if (args.HasOption("server")) { server = args.GetOptionString("server"); @@ -110,7 +107,7 @@ PTRACE(3, "Select a default server of localhost"); } - PString ourId; + PStringStream ourId; if (args.HasOption("id")) { ourId = args.GetOptionString("id"); PTRACE(3, "our ID is " << ourId); @@ -119,6 +116,8 @@ PTRACE(3, "Select a default ID of "<< ourId); } + ourId = server + PString("/") + ourId; + PString ourPassword; if (args.HasOption("password")) { ourPassword = args.GetOptionString("password");