From da601b84bd465b71bfee56add371dfd1fd5e2e41 Mon Sep 17 00:00:00 2001
From: fgerlits <fgerlits@cfc7b370-4200-0410-a6e3-cb6bdb053afe>
Date: Fri, 15 Jun 2007 13:11:47 +0000
Subject: [PATCH] fixed the RDS problems, mostly

---
 campcaster/src/modules/core/src/RdsItem.cxx        |  2 +-
 .../src/products/gLiveSupport/src/GLiveSupport.cxx | 14 +++++++-------
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/campcaster/src/modules/core/src/RdsItem.cxx b/campcaster/src/modules/core/src/RdsItem.cxx
index 192435e38..2b73982f7 100644
--- a/campcaster/src/modules/core/src/RdsItem.cxx
+++ b/campcaster/src/modules/core/src/RdsItem.cxx
@@ -134,7 +134,7 @@ RdsItem :: toString(void)                                           throw ()
         rdsString->append(*key);
         rdsString->append("=");
         rdsString->append(*value);
-        rdsString->append("\n");
+        rdsString->append("\r\n");
     }
     
     return rdsString;
diff --git a/campcaster/src/products/gLiveSupport/src/GLiveSupport.cxx b/campcaster/src/products/gLiveSupport/src/GLiveSupport.cxx
index e4e267328..27a54e4a8 100644
--- a/campcaster/src/products/gLiveSupport/src/GLiveSupport.cxx
+++ b/campcaster/src/products/gLiveSupport/src/GLiveSupport.cxx
@@ -414,13 +414,6 @@ GLiveSupport :: configure(const xmlpp::Element    & element)
         optionsContainer->setOptionItem(OptionsContainer::serialDeviceName,
                                         serialDevice);
     }
-    // configure the serial port
-    // TODO: make this configurable
-    serialStream->SetBaudRate(LibSerial::SerialStreamBuf::BAUD_2400);
-    serialStream->SetCharSize(LibSerial::SerialStreamBuf::CHAR_SIZE_8);
-    serialStream->SetNumOfStopBits(1);
-    serialStream->SetParity(LibSerial::SerialStreamBuf::PARITY_NONE);
-    serialStream->SetFlowControl(LibSerial::SerialStreamBuf::FLOW_CONTROL_NONE);
 }
 
 
@@ -1824,7 +1817,14 @@ GLiveSupport :: writeToSerial(Ptr<const Glib::ustring>::Ref     message)
         serialDevice = optionsContainer->getOptionItem(
                                             OptionsContainer::serialDeviceName);
     try {
+        // TODO: move this to a separate class, and make it configurable
         serialStream->Open(*serialDevice);
+        serialStream->SetBaudRate(LibSerial::SerialStreamBuf::BAUD_2400);
+        serialStream->SetCharSize(LibSerial::SerialStreamBuf::CHAR_SIZE_8);
+        serialStream->SetNumOfStopBits(1);
+        serialStream->SetParity(LibSerial::SerialStreamBuf::PARITY_NONE);
+        serialStream->SetFlowControl(
+                                LibSerial::SerialStreamBuf::FLOW_CONTROL_NONE);
         (*serialStream) << *message;
         serialStream->flush();
         serialStream->Close();