From 62e24f984f9668598a3c1dea6dc5049af2b274db Mon Sep 17 00:00:00 2001
From: fgerlits <fgerlits@cfc7b370-4200-0410-a6e3-cb6bdb053afe>
Date: Thu, 25 Jan 2007 16:53:28 +0000
Subject: [PATCH] made the serial device configurable (part of #722)

---
 .../products/gLiveSupport/etc/campcaster-studio.xml | 12 ++++++++++++
 .../gLiveSupport/etc/campcaster-studio.xml.template | 12 ++++++++++++
 .../etc/campcaster-studio.xml.user-template         | 12 ++++++++++++
 .../src/products/gLiveSupport/src/GLiveSupport.cxx  | 13 ++++++++++---
 4 files changed, 46 insertions(+), 3 deletions(-)

diff --git a/campcaster/src/products/gLiveSupport/etc/campcaster-studio.xml b/campcaster/src/products/gLiveSupport/etc/campcaster-studio.xml
index 43bb4c646..93e878122 100644
--- a/campcaster/src/products/gLiveSupport/etc/campcaster-studio.xml
+++ b/campcaster/src/products/gLiveSupport/etc/campcaster-studio.xml
@@ -11,6 +11,9 @@
                                        outputPlayer,
                                        cuePlayer,
                                        stationLogo,
+                                       taskbarIcons,
+                                       testAudioUrl,
+                                       serialPort,
                                        metadataTypeContainer,
                                        keyboardShortcutList) >
 
@@ -92,9 +95,16 @@
 <!ELEMENT stationLogo    EMPTY >
 <!ATTLIST stationLogo    path    CDATA   #REQUIRED >
 
+<!ELEMENT taskbarIcons   (icon+)                   >
+<!ELEMENT icon           EMPTY                     >
+<!ATTLIST icon           path    CDATA   #REQUIRED >
+
 <!ELEMENT testAudioUrl   EMPTY >
 <!ATTLIST testAudioUrl   path    CDATA   #REQUIRED >
 
+<!ELEMENT serialPort     EMPTY                     >
+<!ATTLIST serialPort     path    CDATA   #REQUIRED >
+
 <!ELEMENT metadataTypeContainer           (metadataType+)       >
 
 <!ELEMENT metadataType                    (constraint?)         >
@@ -183,6 +193,8 @@
 
     <testAudioUrl   path = "file://var/testAudio.ogg" />
 
+    <serialPort     path = "/dev/ttyS0" />
+
     <metadataTypeContainer>
         <metadataType   dcName          = "dc:title"
                         id3Tag          = "TIT2"
diff --git a/campcaster/src/products/gLiveSupport/etc/campcaster-studio.xml.template b/campcaster/src/products/gLiveSupport/etc/campcaster-studio.xml.template
index db2334443..664f1cbaf 100644
--- a/campcaster/src/products/gLiveSupport/etc/campcaster-studio.xml.template
+++ b/campcaster/src/products/gLiveSupport/etc/campcaster-studio.xml.template
@@ -11,6 +11,9 @@
                                        outputPlayer,
                                        cuePlayer,
                                        stationLogo,
+                                       taskbarIcons,
+                                       testAudioUrl,
+                                       serialPort,
                                        metadataTypeContainer,
                                        keyboardShortcutList) >
 
@@ -92,9 +95,16 @@
 <!ELEMENT stationLogo    EMPTY >
 <!ATTLIST stationLogo    path    CDATA   #REQUIRED >
 
+<!ELEMENT taskbarIcons   (icon+)                   >
+<!ELEMENT icon           EMPTY                     >
+<!ATTLIST icon           path    CDATA   #REQUIRED >
+
 <!ELEMENT testAudioUrl   EMPTY >
 <!ATTLIST testAudioUrl   path    CDATA   #REQUIRED >
 
+<!ELEMENT serialPort     EMPTY                     >
+<!ATTLIST serialPort     path    CDATA   #REQUIRED >
+
 <!ELEMENT metadataTypeContainer           (metadataType+)       >
 
 <!ELEMENT metadataType                    (constraint?)         >
@@ -182,6 +192,8 @@
 
     <testAudioUrl   path = "file://ls_var_dir/Campcaster/testAudio.ogg" />
 
+    <serialPort     path = "/dev/ttyS0" />
+
     <metadataTypeContainer>
         <metadataType   dcName          = "dc:title"
                         id3Tag          = "TIT2"
diff --git a/campcaster/src/products/gLiveSupport/etc/campcaster-studio.xml.user-template b/campcaster/src/products/gLiveSupport/etc/campcaster-studio.xml.user-template
index 8d0119723..80916679c 100644
--- a/campcaster/src/products/gLiveSupport/etc/campcaster-studio.xml.user-template
+++ b/campcaster/src/products/gLiveSupport/etc/campcaster-studio.xml.user-template
@@ -11,6 +11,9 @@
                                        outputPlayer,
                                        cuePlayer,
                                        stationLogo,
+                                       taskbarIcons,
+                                       testAudioUrl,
+                                       serialPort,
                                        metadataTypeContainer,
                                        keyboardShortcutList) >
 
@@ -92,9 +95,16 @@
 <!ELEMENT stationLogo    EMPTY >
 <!ATTLIST stationLogo    path    CDATA   #REQUIRED >
 
+<!ELEMENT taskbarIcons   (icon+)                   >
+<!ELEMENT icon           EMPTY                     >
+<!ATTLIST icon           path    CDATA   #REQUIRED >
+
 <!ELEMENT testAudioUrl   EMPTY >
 <!ATTLIST testAudioUrl   path    CDATA   #REQUIRED >
 
+<!ELEMENT serialPort     EMPTY                     >
+<!ATTLIST serialPort     path    CDATA   #REQUIRED >
+
 <!ELEMENT metadataTypeContainer           (metadataType+)       >
 
 <!ELEMENT metadataType                    (constraint?)         >
@@ -182,6 +192,8 @@
 
     <testAudioUrl   path = "file:var/testAudio.ogg" />
 
+    <serialPort     path = "/dev/ttyS0" />
+
     <metadataTypeContainer>
         <metadataType   dcName          = "dc:title"
                         id3Tag          = "TIT2"
diff --git a/campcaster/src/products/gLiveSupport/src/GLiveSupport.cxx b/campcaster/src/products/gLiveSupport/src/GLiveSupport.cxx
index b02f7a4b6..0bdb0206a 100644
--- a/campcaster/src/products/gLiveSupport/src/GLiveSupport.cxx
+++ b/campcaster/src/products/gLiveSupport/src/GLiveSupport.cxx
@@ -185,7 +185,7 @@ const std::string   localeNotAvailableKey = "localeNotAvailableMsg";
 /*------------------------------------------------------------------------------
  *  The default serial device
  *----------------------------------------------------------------------------*/
-const std::string   defaultSerialDevice = "/dev/ttyS0";
+const std::string   serialPortConfigElementName = "serialPort";
 
 }
 
@@ -402,8 +402,15 @@ GLiveSupport :: configure(const xmlpp::Element    & element)
                            testAudioUrlElement->get_attribute("path")
                                               ->get_value() ));
 
-    // TODO: make this configurable
-    serialDevice.reset(new std::string(defaultSerialDevice));
+    // read the serial port's file name
+    nodes = element.get_children(serialPortConfigElementName);
+    if (nodes.size() < 1) {
+        throw std::invalid_argument("no serial port element");
+    }
+    const xmlpp::Element*  serialPortElement 
+                           = dynamic_cast<const xmlpp::Element*>(nodes.front());
+    serialDevice.reset(new std::string(serialPortElement->get_attribute("path")
+                                                        ->get_value() ));
 }