Congegni/sintonia
7
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

modified acquirePlaylist() in TestStorageClient for gstreamer

Browse source
This commit is contained in:
fgerlits 2005-07-01 17:56:47 +00:00
parent 4554a90752
commit 713d54c3ba
2 changed files with 84 additions and 20 deletions
Download patch file Download diff file Expand all files Collapse all files

8
livesupport/modules/storage/etc/configure.ac
View file

@ -20,8 +20,8 @@ dnl along with LiveSupport; if not, write to the Free Software
dnl Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA dnl Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
dnl dnl
dnl dnl
dnl Author : $Author: maroy $ dnl Author : $Author: fgerlits $
dnl Version : $Revision: 1.4 $ dnl Version : $Revision: 1.5 $
dnl Location : $Source: /home/paul/cvs2svn-livesupport/newcvsrepo/livesupport/modules/storage/etc/configure.ac,v $ dnl Location : $Source: /home/paul/cvs2svn-livesupport/newcvsrepo/livesupport/modules/storage/etc/configure.ac,v $
dnl----------------------------------------------------------------------------- dnl-----------------------------------------------------------------------------
@ -35,14 +35,14 @@ dnl-----------------------------------------------------------------------------
AC_INIT(Storage, 1.0, bugs@campware.org) AC_INIT(Storage, 1.0, bugs@campware.org)
AC_PREREQ(2.59) AC_PREREQ(2.59)
AC_COPYRIGHT([Copyright (c) 2004 Media Development Loan Fund under the GNU GPL]) AC_COPYRIGHT([Copyright (c) 2004 Media Development Loan Fund under the GNU GPL])
AC_REVISION($Revision: 1.4 $) AC_REVISION($Revision: 1.5 $)
AC_CONFIG_SRCDIR(../src/StorageClientFactory.cxx) AC_CONFIG_SRCDIR(../src/StorageClientFactory.cxx)
AC_CONFIG_HEADERS(configure.h) AC_CONFIG_HEADERS(configure.h)
AC_PROG_CXX() AC_PROG_CXX()
AC_CHECK_HEADERS(getopt.h) AC_CHECK_HEADERS(getopt.h sys/time.h time.h)
PKG_CHECK_MODULES(LIBXMLPP,[libxml++-2.6 >= 2.6.0]) PKG_CHECK_MODULES(LIBXMLPP,[libxml++-2.6 >= 2.6.0])
AC_SUBST(LIBXMLPP_CFLAGS) AC_SUBST(LIBXMLPP_CFLAGS)

94
livesupport/modules/storage/src/TestStorageClient.cxx
View file

@ -22,7 +22,7 @@
Author : $Author: fgerlits $ Author : $Author: fgerlits $
Version : $Revision: 1.40 $ Version : $Revision: 1.41 $
Location : $Source: /home/paul/cvs2svn-livesupport/newcvsrepo/livesupport/modules/storage/src/TestStorageClient.cxx,v $ Location : $Source: /home/paul/cvs2svn-livesupport/newcvsrepo/livesupport/modules/storage/src/TestStorageClient.cxx,v $
------------------------------------------------------------------------------*/ ------------------------------------------------------------------------------*/
@ -42,6 +42,7 @@
#include <fstream> #include <fstream>
#include <boost/date_time/posix_time/posix_time.hpp> #include <boost/date_time/posix_time/posix_time.hpp>
#include "LiveSupport/Core/TimeConversion.h"
#include "LiveSupport/Core/XmlRpcInvalidArgumentException.h" #include "LiveSupport/Core/XmlRpcInvalidArgumentException.h"
#include "LiveSupport/Core/XmlRpcIOException.h" #include "LiveSupport/Core/XmlRpcIOException.h"
#include "TestStorageClient.h" #include "TestStorageClient.h"
@ -468,17 +469,9 @@ TestStorageClient :: acquirePlaylist(Ptr<SessionId>::Ref sessionId,
while (it != oldPlaylist->end()) { while (it != oldPlaylist->end()) {
Ptr<PlaylistElement>::Ref plElement = it->second; Ptr<PlaylistElement>::Ref plElement = it->second;
Ptr<FadeInfo>::Ref fadeInfo = plElement->getFadeInfo(); Ptr<time_duration>::Ref relativeOffset
= plElement->getRelativeOffset();
Ptr<time_duration>::Ref Ptr<FadeInfo>::Ref fadeInfo = plElement->getFadeInfo();
relativeOffset = plElement->getRelativeOffset();
long offsetMilliseconds = relativeOffset->total_milliseconds();
std::stringstream offsetStringStream;
offsetStringStream << offsetMilliseconds / 1000l
<< '.'
<< offsetMilliseconds % 1000
<< 's';
Ptr<Playable>::Ref playable; Ptr<Playable>::Ref playable;
switch (plElement->getType()) { switch (plElement->getType()) {
@ -503,12 +496,83 @@ TestStorageClient :: acquirePlaylist(Ptr<SessionId>::Ref sessionId,
= smilParNode->add_child(smilPlayableNodeName); = smilParNode->add_child(smilPlayableNodeName);
smilPlayableNode->set_attribute( smilPlayableNode->set_attribute(
smilPlayableUriAttrName, smilPlayableUriAttrName,
*(playable->getUri()) ); *playable->getUri() );
smilPlayableNode->set_attribute( smilPlayableNode->set_attribute(
smilRelativeOffsetAttrName, smilRelativeOffsetAttrName,
offsetStringStream.str() ); *TimeConversion::timeDurationToSmilString(
++it; relativeOffset ));
if (fadeInfo) {
Ptr<time_duration>::Ref fadeIn = fadeInfo->getFadeIn();
Ptr<time_duration>::Ref fadeOut = fadeInfo->getFadeOut();
if (fadeIn) {
xmlpp::Element* smilFadeInNode
= smilPlayableNode->add_child(
smilAnimateNodeName);
smilFadeInNode->set_attribute(
smilAnimateNameAttrName,
smilAnimateNameAttrValue );
smilFadeInNode->set_attribute(
smilAnimateFromAttrName,
"0%" );
smilFadeInNode->set_attribute(
smilAnimateToAttrName,
"100%" );
smilFadeInNode->set_attribute(
smilAnimateCalcModeAttrName,
smilAnimateCalcModeAttrValue );
smilFadeInNode->set_attribute(
smilAnimateBeginAttrName,
"0s" );
smilFadeInNode->set_attribute(
smilAnimateEndAttrName,
*TimeConversion::timeDurationToSmilString(
fadeIn ));
smilFadeInNode->set_attribute(
smilAnimateCalcModeAttrName,
smilAnimateCalcModeAttrValue );
smilFadeInNode->set_attribute(
smilAnimateFillAttrName,
smilAnimateFillAttrValue );
}
if (fadeOut) {
xmlpp::Element* smilFadeOutNode
= smilPlayableNode->add_child(
smilAnimateNodeName);
smilFadeOutNode->set_attribute(
smilAnimateNameAttrName,
smilAnimateNameAttrValue );
smilFadeOutNode->set_attribute(
smilAnimateFromAttrName,
"100%" );
smilFadeOutNode->set_attribute(
smilAnimateToAttrName,
"0%" );
smilFadeOutNode->set_attribute(
smilAnimateCalcModeAttrName,
smilAnimateCalcModeAttrValue );
Ptr<time_duration>::Ref playlength = playable->getPlaylength();
Ptr<time_duration>::Ref fadeBegin(new time_duration(
*playlength - *fadeOut ));
smilFadeOutNode->set_attribute(
smilAnimateBeginAttrName,
*TimeConversion::timeDurationToSmilString(
fadeBegin ));
smilFadeOutNode->set_attribute(
smilAnimateEndAttrName,
*TimeConversion::timeDurationToSmilString(
playlength ));
smilFadeOutNode->set_attribute(
smilAnimateCalcModeAttrName,
smilAnimateCalcModeAttrValue );
smilFadeOutNode->set_attribute(
smilAnimateFillAttrName,
smilAnimateFillAttrValue );
}
}
++it;
} }
std::stringstream fileName; std::stringstream fileName;