diff --git a/livesupport/modules/core/etc/fadeInfo.xml b/livesupport/modules/core/etc/fadeInfo.xml index c421771ea..595fa5a03 100644 --- a/livesupport/modules/core/etc/fadeInfo.xml +++ b/livesupport/modules/core/etc/fadeInfo.xml @@ -6,4 +6,5 @@ ]> - + diff --git a/livesupport/modules/core/etc/playlist.xml b/livesupport/modules/core/etc/playlist.xml index 49b4dcedb..c7c31c445 100644 --- a/livesupport/modules/core/etc/playlist.xml +++ b/livesupport/modules/core/etc/playlist.xml @@ -24,11 +24,11 @@ + playlength="00:00:34.000000" > + relativeOffset="00:00:00.000000" > @@ -47,9 +47,9 @@ + relativeOffset="00:00:00.000000" > diff --git a/livesupport/modules/core/etc/playlistElement.xml b/livesupport/modules/core/etc/playlistElement.xml index b968f39d3..543b3ec17 100644 --- a/livesupport/modules/core/etc/playlistElement.xml +++ b/livesupport/modules/core/etc/playlistElement.xml @@ -26,14 +26,14 @@ + relativeOffset="00:00:00.000000" > diff --git a/livesupport/modules/core/include/LiveSupport/Core/AudioClip.h b/livesupport/modules/core/include/LiveSupport/Core/AudioClip.h index cf8fd4192..364755847 100644 --- a/livesupport/modules/core/include/LiveSupport/Core/AudioClip.h +++ b/livesupport/modules/core/include/LiveSupport/Core/AudioClip.h @@ -22,7 +22,7 @@ Author : $Author: fgerlits $ - Version : $Revision: 1.22 $ + Version : $Revision: 1.23 $ Location : $Source: /home/paul/cvs2svn-livesupport/newcvsrepo/livesupport/modules/core/include/LiveSupport/Core/AudioClip.h,v $ ------------------------------------------------------------------------------*/ @@ -130,7 +130,7 @@ using namespace boost::posix_time; * * * @author $Author: fgerlits $ - * @version $Revision: 1.22 $ + * @version $Revision: 1.23 $ */ class AudioClip : public Configurable, public Playable @@ -183,6 +183,19 @@ class AudioClip : public Configurable, const std::string &name, const std::string &prefix) throw (); + /** + * Convert a time_duration to string, in format HH:MM:SS.ssssss. + */ + std::string + toFixedString(Ptr::Ref time) const throw () + { + if (time->fractional_seconds()) { + return to_simple_string(*time); + } else { + return to_simple_string(*time) + ".000000"; + } + } + public: /** diff --git a/livesupport/modules/core/include/LiveSupport/Core/FadeInfo.h b/livesupport/modules/core/include/LiveSupport/Core/FadeInfo.h index ef2151868..fd1df9af4 100644 --- a/livesupport/modules/core/include/LiveSupport/Core/FadeInfo.h +++ b/livesupport/modules/core/include/LiveSupport/Core/FadeInfo.h @@ -22,7 +22,7 @@ Author : $Author: fgerlits $ - Version : $Revision: 1.6 $ + Version : $Revision: 1.7 $ Location : $Source: /home/paul/cvs2svn-livesupport/newcvsrepo/livesupport/modules/core/include/LiveSupport/Core/FadeInfo.h,v $ ------------------------------------------------------------------------------*/ @@ -89,7 +89,7 @@ using namespace boost::posix_time; * * * @author $Author: fgerlits $ - * @version $Revision: 1.6 $ + * @version $Revision: 1.7 $ */ class FadeInfo : public Configurable { @@ -114,6 +114,19 @@ class FadeInfo : public Configurable */ Ptr::Ref fadeOut; + /** + * Convert a time_duration to string, in format HH:MM:SS.ssssss. + */ + std::string + toFixedString(Ptr::Ref time) const throw () + { + if (time->fractional_seconds()) { + return to_simple_string(*time); + } else { + return to_simple_string(*time) + ".000000"; + } + } + public: /** diff --git a/livesupport/modules/core/include/LiveSupport/Core/Playlist.h b/livesupport/modules/core/include/LiveSupport/Core/Playlist.h index e5671c45a..00023fd3f 100644 --- a/livesupport/modules/core/include/LiveSupport/Core/Playlist.h +++ b/livesupport/modules/core/include/LiveSupport/Core/Playlist.h @@ -22,7 +22,7 @@ Author : $Author: fgerlits $ - Version : $Revision: 1.32 $ + Version : $Revision: 1.33 $ Location : $Source: /home/paul/cvs2svn-livesupport/newcvsrepo/livesupport/modules/core/include/LiveSupport/Core/Playlist.h,v $ ------------------------------------------------------------------------------*/ @@ -128,7 +128,7 @@ using namespace boost::posix_time; * * * @author $Author: fgerlits $ - * @version $Revision: 1.32 $ + * @version $Revision: 1.33 $ */ class Playlist : public Configurable, public Playable @@ -237,6 +237,20 @@ class Playlist : public Configurable, find(Ptr::Ref playlistElementId) throw (); + /** + * Convert a time_duration to string, in format HH:MM:SS.ssssss. + */ + std::string + toFixedString(Ptr::Ref time) const + throw () + { + if (time->fractional_seconds()) { + return to_simple_string(*time); + } else { + return to_simple_string(*time) + ".000000"; + } + } + public: /** diff --git a/livesupport/modules/core/include/LiveSupport/Core/PlaylistElement.h b/livesupport/modules/core/include/LiveSupport/Core/PlaylistElement.h index 45e43804b..4426d210e 100644 --- a/livesupport/modules/core/include/LiveSupport/Core/PlaylistElement.h +++ b/livesupport/modules/core/include/LiveSupport/Core/PlaylistElement.h @@ -22,7 +22,7 @@ Author : $Author: fgerlits $ - Version : $Revision: 1.11 $ + Version : $Revision: 1.12 $ Location : $Source: /home/paul/cvs2svn-livesupport/newcvsrepo/livesupport/modules/core/include/LiveSupport/Core/PlaylistElement.h,v $ ------------------------------------------------------------------------------*/ @@ -104,7 +104,7 @@ class Playlist; * * * @author $Author: fgerlits $ - * @version $Revision: 1.11 $ + * @version $Revision: 1.12 $ */ class PlaylistElement : public Configurable { @@ -157,6 +157,19 @@ class PlaylistElement : public Configurable */ Ptr::Ref fadeInfo; + /** + * Convert a time_duration to string, in format HH:MM:SS.ssssss. + */ + std::string + toFixedString(Ptr::Ref time) const throw () + { + if (time->fractional_seconds()) { + return to_simple_string(*time); + } else { + return to_simple_string(*time) + ".000000"; + } + } + public: diff --git a/livesupport/modules/core/src/AudioClip.cxx b/livesupport/modules/core/src/AudioClip.cxx index dfed81d90..2715877c8 100644 --- a/livesupport/modules/core/src/AudioClip.cxx +++ b/livesupport/modules/core/src/AudioClip.cxx @@ -22,7 +22,7 @@ Author : $Author: fgerlits $ - Version : $Revision: 1.21 $ + Version : $Revision: 1.22 $ Location : $Source: /home/paul/cvs2svn-livesupport/newcvsrepo/livesupport/modules/core/src/AudioClip.cxx,v $ ------------------------------------------------------------------------------*/ @@ -161,7 +161,7 @@ AudioClip :: AudioClip(Ptr::Ref id, setMetadata(title, titleElementName, titleElementPrefix); Ptr::Ref playlengthString(new const Glib::ustring( - to_simple_string(*playlength) )); + toFixedString(playlength) )); setMetadata(playlengthString, extentElementName, extentElementPrefix); } @@ -184,7 +184,7 @@ AudioClip :: AudioClip(Ptr::Ref id, setMetadata(title, titleElementName, titleElementPrefix); Ptr::Ref playlengthString(new const Glib::ustring( - to_simple_string(*playlength) )); + toFixedString(playlength) )); setMetadata(playlengthString, extentElementName, extentElementPrefix); } @@ -204,7 +204,7 @@ AudioClip :: AudioClip(Ptr::Ref id, setMetadata(title, titleElementName, titleElementPrefix); Ptr::Ref playlengthString(new const Glib::ustring( - to_simple_string(*playlength) )); + toFixedString(playlength) )); setMetadata(playlengthString, extentElementName, extentElementPrefix); } @@ -522,7 +522,7 @@ AudioClip :: getXmlElementString(void) const throw () + std::string(*id) + "\" "); xmlString->append(playlengthAttrName + "=\"" - + to_simple_string(*playlength) + + toFixedString(playlength) + "\" "); xmlString->append(Glib::ustring(titleAttrName) + "=\"" + *title diff --git a/livesupport/modules/core/src/AudioClipTest.cxx b/livesupport/modules/core/src/AudioClipTest.cxx index fbc7b811a..aab535749 100644 --- a/livesupport/modules/core/src/AudioClipTest.cxx +++ b/livesupport/modules/core/src/AudioClipTest.cxx @@ -22,7 +22,7 @@ Author : $Author: fgerlits $ - Version : $Revision: 1.11 $ + Version : $Revision: 1.12 $ Location : $Source: /home/paul/cvs2svn-livesupport/newcvsrepo/livesupport/modules/core/src/AudioClipTest.cxx,v $ ------------------------------------------------------------------------------*/ @@ -133,7 +133,7 @@ AudioClipTest :: firstTest(void) CPPUNIT_ASSERT(*audioClip->getXmlElementString() == ""); } catch (std::invalid_argument &e) { diff --git a/livesupport/modules/core/src/FadeInfo.cxx b/livesupport/modules/core/src/FadeInfo.cxx index b7ac846e1..ce2be9a98 100644 --- a/livesupport/modules/core/src/FadeInfo.cxx +++ b/livesupport/modules/core/src/FadeInfo.cxx @@ -22,7 +22,7 @@ Author : $Author: fgerlits $ - Version : $Revision: 1.5 $ + Version : $Revision: 1.6 $ Location : $Source: /home/paul/cvs2svn-livesupport/newcvsrepo/livesupport/modules/core/src/FadeInfo.cxx,v $ ------------------------------------------------------------------------------*/ @@ -126,11 +126,11 @@ FadeInfo :: getXmlElementString(void) throw () + std::string(*id) + "\" "); xmlString->append(fadeInAttrName + "=\"" - + to_simple_string(*fadeIn) - + "\" "); + + toFixedString(fadeIn) + + "\" "); xmlString->append(fadeOutAttrName + "=\"" - + to_simple_string(*fadeOut) - + "\"/>"); + + toFixedString(fadeOut) + + "\"/>"); return xmlString; } diff --git a/livesupport/modules/core/src/FadeInfoTest.cxx b/livesupport/modules/core/src/FadeInfoTest.cxx index a20c212b0..e510b38ab 100644 --- a/livesupport/modules/core/src/FadeInfoTest.cxx +++ b/livesupport/modules/core/src/FadeInfoTest.cxx @@ -22,7 +22,7 @@ Author : $Author: fgerlits $ - Version : $Revision: 1.4 $ + Version : $Revision: 1.5 $ Location : $Source: /home/paul/cvs2svn-livesupport/newcvsrepo/livesupport/modules/core/src/FadeInfoTest.cxx,v $ ------------------------------------------------------------------------------*/ @@ -119,7 +119,7 @@ FadeInfoTest :: firstTest(void) CPPUNIT_ASSERT(*fadeInfo->getXmlElementString() == ""); } catch (std::invalid_argument &e) { diff --git a/livesupport/modules/core/src/Playlist.cxx b/livesupport/modules/core/src/Playlist.cxx index f94b97c7d..370be3929 100644 --- a/livesupport/modules/core/src/Playlist.cxx +++ b/livesupport/modules/core/src/Playlist.cxx @@ -22,7 +22,7 @@ Author : $Author: fgerlits $ - Version : $Revision: 1.31 $ + Version : $Revision: 1.32 $ Location : $Source: /home/paul/cvs2svn-livesupport/newcvsrepo/livesupport/modules/core/src/Playlist.cxx,v $ ------------------------------------------------------------------------------*/ @@ -244,7 +244,7 @@ Playlist :: setPlaylength(Ptr::Ref playlength) throw () { Ptr::Ref playlengthString(new const Glib::ustring( - to_simple_string(*playlength) )); + toFixedString(playlength) )); setMetadata(playlengthString, extentElementName, extentElementPrefix); } @@ -705,8 +705,9 @@ Playlist :: getXmlElementString(void) const throw () + std::string(*getId()) + "\" "); xmlString->append(playlengthAttrName + "=\"" - + to_simple_string(*getPlaylength()) + + toFixedString(getPlaylength()) + "\" "); + xmlString->append(Glib::ustring(titleAttrName) + "=\"" + *getTitle() + "\">\n"); diff --git a/livesupport/modules/core/src/PlaylistElement.cxx b/livesupport/modules/core/src/PlaylistElement.cxx index 4edf765e1..98fc3beaf 100644 --- a/livesupport/modules/core/src/PlaylistElement.cxx +++ b/livesupport/modules/core/src/PlaylistElement.cxx @@ -22,7 +22,7 @@ Author : $Author: fgerlits $ - Version : $Revision: 1.11 $ + Version : $Revision: 1.12 $ Location : $Source: /home/paul/cvs2svn-livesupport/newcvsrepo/livesupport/modules/core/src/PlaylistElement.cxx,v $ ------------------------------------------------------------------------------*/ @@ -199,8 +199,9 @@ PlaylistElement :: getXmlElementString(void) throw () + std::string(*id) + "\" "); xmlString->append(relativeOffsetAttrName + "=\"" - + to_simple_string(*relativeOffset) - + "\">\n"); + + toFixedString(relativeOffset) + + "\">\n"); + xmlString->append(*getPlayable()->getXmlElementString() + "\n"); if (fadeInfo) { xmlString->append(*fadeInfo->getXmlElementString() + "\n"); diff --git a/livesupport/modules/core/src/PlaylistElementTest.cxx b/livesupport/modules/core/src/PlaylistElementTest.cxx index c98bd627b..ac457e38b 100644 --- a/livesupport/modules/core/src/PlaylistElementTest.cxx +++ b/livesupport/modules/core/src/PlaylistElementTest.cxx @@ -22,7 +22,7 @@ Author : $Author: fgerlits $ - Version : $Revision: 1.8 $ + Version : $Revision: 1.9 $ Location : $Source: /home/paul/cvs2svn-livesupport/newcvsrepo/livesupport/modules/core/src/PlaylistElementTest.cxx,v $ ------------------------------------------------------------------------------*/ @@ -150,9 +150,9 @@ PlaylistElementTest :: firstTest(void) CPPUNIT_ASSERT(*playlistElement->getXmlElementString() == "\n" + "relativeOffset=\"00:00:00.000000\">\n" "\n" ""); diff --git a/livesupport/modules/core/src/PlaylistTest.cxx b/livesupport/modules/core/src/PlaylistTest.cxx index 1beed5416..bd195bec3 100644 --- a/livesupport/modules/core/src/PlaylistTest.cxx +++ b/livesupport/modules/core/src/PlaylistTest.cxx @@ -22,7 +22,7 @@ Author : $Author: fgerlits $ - Version : $Revision: 1.22 $ + Version : $Revision: 1.23 $ Location : $Source: /home/paul/cvs2svn-livesupport/newcvsrepo/livesupport/modules/core/src/PlaylistTest.cxx,v $ ------------------------------------------------------------------------------*/ @@ -115,20 +115,20 @@ PlaylistTest :: firstTest(void) CPPUNIT_ASSERT(playlist->valid()); CPPUNIT_ASSERT(*playlist->getXmlElementString() == -"\n" -"\n" -"\n" +"\n" +"\n" "\n" -"\n" -"\n" -"\n" +"\n" +"\n" "\n" -"\n" -"\n" -"\n" -"\n" +"\n" +"\n" +"\n" +"\n" "\n" "\n" "\n" diff --git a/livesupport/modules/storage/etc/storageClient.xml b/livesupport/modules/storage/etc/storageClient.xml index 6b3c6cdca..d8f9e0ae2 100644 --- a/livesupport/modules/storage/etc/storageClient.xml +++ b/livesupport/modules/storage/etc/storageClient.xml @@ -36,9 +36,9 @@ ]> - + - @@ -51,8 +51,8 @@ - - + @@ -60,16 +60,16 @@ - - + - -