summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorHenri Herscher <henri@oreka.org>2007-07-19 21:51:09 +0000
committerHenri Herscher <henri@oreka.org>2007-07-19 21:51:09 +0000
commit3c8349237ec0c5117f886eab2ed01f3767a0ccc0 (patch)
tree396625be17c10f12306e682f436b84e0682192f5
parentabf1495c5e6e33a93a0277ef301643e7ff2ab4dd (diff)
Fixed indentation.
git-svn-id: https://oreka.svn.sourceforge.net/svnroot/oreka/trunk@456 09dcff7a-b715-0410-9601-b79a96267cd0
-rw-r--r--orkbasecxx/Config.cpp18
1 files changed, 7 insertions, 11 deletions
diff --git a/orkbasecxx/Config.cpp b/orkbasecxx/Config.cpp
index 334864f..fa0ed42 100644
--- a/orkbasecxx/Config.cpp
+++ b/orkbasecxx/Config.cpp
@@ -49,7 +49,6 @@ Config::Config()
char hostname[40];
ACE_OS::hostname(hostname, 40);
- //ACE_OS::hostname(hostname, HOSTNAME_BUF_LEN);
m_serviceName = CStdString("orkaudio-") + hostname;
m_reportingRetryDelay = 5;
@@ -89,21 +88,18 @@ void Config::Define(Serializer* s)
s->IntValue(REPORTING_RETRY_DELAY_PARAM, m_reportingRetryDelay);
s->IntValue(CLIENT_TIMEOUT_PARAM, m_clientTimeout);
- /* As per Ticket 174, with reference to
- * http://wush.net/trac/grinob/wiki/MultipleOrkaudioPerServer
- */
- char *loggingPath = NULL;
+ char *loggingPath = NULL;
int pathSet = 0;
- loggingPath = ACE_OS::getenv("ORKAUDIO_LOGGING_PATH");
- if(loggingPath) {
- ACE_DIR* dir = ACE_OS::opendir(loggingPath);
- if(dir) {
- ACE_OS::closedir(dir);
+ loggingPath = ACE_OS::getenv("ORKAUDIO_LOGGING_PATH");
+ if(loggingPath) {
+ ACE_DIR* dir = ACE_OS::opendir(loggingPath);
+ if(dir) {
+ ACE_OS::closedir(dir);
m_audioOutputPath.Format("%s", loggingPath);
pathSet = 1;
- }
}
+ }
if(!pathSet)
s->StringValue(AUDIO_OUTPUT_PATH_PARAM, m_audioOutputPath);