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

removed the URIs from released playlists and audio clips 

added the XmlRpcServerMethod external to the Scheduler documentation
This commit is contained in:
fgerlits 2004-11-10 17:45:53 +00:00
parent 321955070f
commit 9db6d24725
12 changed files with 43 additions and 185 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
livesupport/modules/core/include/LiveSupport/Core/Playlist.h
View File

@ -22,7 +22,7 @@
Author : $Author: fgerlits $ Author : $Author: fgerlits $
Version : $Revision: 1.13 $ Version : $Revision: 1.14 $
Location : $Source: /home/paul/cvs2svn-livesupport/newcvsrepo/livesupport/modules/core/include/LiveSupport/Core/Playlist.h,v $ Location : $Source: /home/paul/cvs2svn-livesupport/newcvsrepo/livesupport/modules/core/include/LiveSupport/Core/Playlist.h,v $
------------------------------------------------------------------------------*/ ------------------------------------------------------------------------------*/
@ -71,7 +71,7 @@ using namespace boost::posix_time;
* the playlist. * the playlist.
* *
* @author $Author: fgerlits $ * @author $Author: fgerlits $
* @version $Revision: 1.13 $ * @version $Revision: 1.14 $
*/ */
class Playlist : public Configurable class Playlist : public Configurable
{ {
@ -398,14 +398,6 @@ class Playlist : public Configurable
*/ */
void void
revertToSavedCopy(void) throw (std::logic_error); revertToSavedCopy(void) throw (std::logic_error);
/**
* Return a SMIL XML document representation of the playlist.
* The playlist needs to be opened for playing first; otherwise
* an exception is thrown.
*/
Ptr<xmlpp::Document>::Ref
toSmil(void) const throw (std::logic_error);
}; };

6
livesupport/modules/core/include/LiveSupport/Core/PlaylistElement.h
View File

@ -22,7 +22,7 @@
Author : $Author: fgerlits $ Author : $Author: fgerlits $
Version : $Revision: 1.4 $ Version : $Revision: 1.5 $
Location : $Source: /home/paul/cvs2svn-livesupport/newcvsrepo/livesupport/modules/core/include/LiveSupport/Core/PlaylistElement.h,v $ Location : $Source: /home/paul/cvs2svn-livesupport/newcvsrepo/livesupport/modules/core/include/LiveSupport/Core/PlaylistElement.h,v $
------------------------------------------------------------------------------*/ ------------------------------------------------------------------------------*/
@ -74,7 +74,7 @@ using namespace LiveSupport::Core;
* An item in a playlist. * An item in a playlist.
* *
* @author $Author: fgerlits $ * @author $Author: fgerlits $
* @version $Revision: 1.4 $ * @version $Revision: 1.5 $
*/ */
class PlaylistElement : public Configurable class PlaylistElement : public Configurable
{ {
@ -218,7 +218,7 @@ class PlaylistElement : public Configurable
* *
* @return the audio clip associated with the element. * @return the audio clip associated with the element.
*/ */
Ptr<const AudioClip>::Ref Ptr<AudioClip>::Ref
getAudioClip(void) const throw () getAudioClip(void) const throw ()
{ {
return audioClip; return audioClip;

8
livesupport/modules/core/include/LiveSupport/Core/StorageClientInterface.h
View File

@ -22,7 +22,7 @@
Author : $Author: fgerlits $ Author : $Author: fgerlits $
Version : $Revision: 1.11 $ Version : $Revision: 1.12 $
Location : $Source: /home/paul/cvs2svn-livesupport/newcvsrepo/livesupport/modules/core/include/LiveSupport/Core/Attic/StorageClientInterface.h,v $ Location : $Source: /home/paul/cvs2svn-livesupport/newcvsrepo/livesupport/modules/core/include/LiveSupport/Core/Attic/StorageClientInterface.h,v $
------------------------------------------------------------------------------*/ ------------------------------------------------------------------------------*/
@ -61,7 +61,7 @@ namespace Core {
* An interface for storage clients. * An interface for storage clients.
* *
* @author $Author: fgerlits $ * @author $Author: fgerlits $
* @version $Revision: 1.11 $ * @version $Revision: 1.12 $
*/ */
class StorageClientInterface class StorageClientInterface
{ {
@ -114,7 +114,7 @@ class StorageClientInterface
* or the file does not exist, etc. * or the file does not exist, etc.
*/ */
virtual void virtual void
releasePlaylist(Ptr<const Playlist>::Ref playlist) const releasePlaylist(Ptr<Playlist>::Ref playlist) const
throw (std::logic_error) throw (std::logic_error)
= 0; = 0;
/** /**
@ -191,7 +191,7 @@ class StorageClientInterface
* or the file does not exist, etc. * or the file does not exist, etc.
*/ */
virtual void virtual void
releaseAudioClip(Ptr<const AudioClip>::Ref audioClip) const releaseAudioClip(Ptr<AudioClip>::Ref audioClip) const
throw (std::logic_error) throw (std::logic_error)
= 0; = 0;

93
livesupport/modules/core/src/Playlist.cxx
View File

@ -22,7 +22,7 @@
Author : $Author: fgerlits $ Author : $Author: fgerlits $
Version : $Revision: 1.12 $ Version : $Revision: 1.13 $
Location : $Source: /home/paul/cvs2svn-livesupport/newcvsrepo/livesupport/modules/core/src/Playlist.cxx,v $ Location : $Source: /home/paul/cvs2svn-livesupport/newcvsrepo/livesupport/modules/core/src/Playlist.cxx,v $
------------------------------------------------------------------------------*/ ------------------------------------------------------------------------------*/
@ -66,58 +66,6 @@ static const std::string playlengthAttrName = "playlength";
*/ */
static const std::string elementListAttrName = "playlistElement"; static const std::string elementListAttrName = "playlistElement";
/**
* The XML version used to create the SMIL file.
*/
static const std::string xmlVersion = "1.0";
/**
* The name of the SMIL root node.
*/
static const std::string smilRootNodeName = "smil";
/**
* The name of the SMIL language description attribute.
*/
static const std::string smilLanguageAttrName = "xmlns";
/**
* The value of the SMIL language description attribute.
*/
static const std::string smilLanguageAttrValue
= "http://www.w3.org/2001/SMIL20/Language";
/**
* The name of the SMIL real networks extension attribute.
*/
static const std::string smilExtensionsAttrName = "xmlns:rn";
/**
* The value of the SMIL real networks extension attribute.
*/
static const std::string smilExtensionsAttrValue
= "http://features.real.com/2001/SMIL20/Extensions";
/**
* The name of the body node in the SMIL file.
*/
static const std::string smilBodyNodeName = "body";
/**
* The name of the sequential audio clip list node in the SMIL file.
*/
static const std::string smilSeqNodeName = "seq";
/**
* The name of the audio clip element node in the SMIL file.
*/
static const std::string smilAudioClipNodeName = "audio";
/**
* The name of the attribute containing the URI of the audio clip element.
*/
static const std::string smilAudioClipUriAttrName = "src";
/* =============================================== local function prototypes */ /* =============================================== local function prototypes */
@ -364,42 +312,3 @@ Playlist::revertToSavedCopy(void) throw (std::logic_error)
savedCopy.reset(); savedCopy.reset();
} }
/*------------------------------------------------------------------------------
* Return a SMIL XML element representation of the playlist.
*----------------------------------------------------------------------------*/
Ptr<xmlpp::Document>::Ref
Playlist::toSmil(void) const throw (std::logic_error)
{
if (!isLockedForPlaying) {
throw (std::logic_error("playlist not open for playing"));
}
Ptr<xmlpp::Document>::Ref
smilDocument(new xmlpp::Document(xmlVersion));
xmlpp::Element * smilRootNode
= smilDocument->create_root_node(smilRootNodeName);
smilRootNode->set_attribute(smilLanguageAttrName,
smilLanguageAttrValue);
smilRootNode->set_attribute(smilExtensionsAttrName,
smilExtensionsAttrValue);
xmlpp::Element * smilBodyNode
= smilRootNode->add_child(smilBodyNodeName);
xmlpp::Element * smilSeqNode
= smilBodyNode->add_child(smilSeqNodeName);
PlaylistElementListType::const_iterator it = elementList->begin();
while (it != elementList->end()) {
xmlpp::Element * smilAudioClipNode
= smilSeqNode->add_child(smilAudioClipNodeName);
smilAudioClipNode->set_attribute(
smilAudioClipUriAttrName,
*(it->second->getAudioClip()->getUri()));
++it;
}
return smilDocument;
}

40
livesupport/modules/core/src/PlaylistTest.cxx
View File

@ -22,7 +22,7 @@
Author : $Author: fgerlits $ Author : $Author: fgerlits $
Version : $Revision: 1.11 $ Version : $Revision: 1.12 $
Location : $Source: /home/paul/cvs2svn-livesupport/newcvsrepo/livesupport/modules/core/src/PlaylistTest.cxx,v $ Location : $Source: /home/paul/cvs2svn-livesupport/newcvsrepo/livesupport/modules/core/src/PlaylistTest.cxx,v $
------------------------------------------------------------------------------*/ ------------------------------------------------------------------------------*/
@ -63,21 +63,6 @@ CPPUNIT_TEST_SUITE_REGISTRATION(PlaylistTest);
*/ */
static const std::string configFileName = "etc/playlist.xml"; static const std::string configFileName = "etc/playlist.xml";
/**
* The playlist in SMIL XML format.
*/
static const std::string smilPlaylist =
"<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n"
"<smil xmlns=\"http://www.w3.org/2001/SMIL20/Language\""
" xmlns:rn=\"http://features.real.com/2001/SMIL20/Extensions\">\n"
" <body>\n"
" <seq>\n"
" <audio src=\"file:var/test1.mp3\"/>\n"
" <audio src=\"file:var/test2.mp3\"/>\n"
" </seq>\n"
" </body>\n"
"</smil>\n";
/* =============================================== local function prototypes */ /* =============================================== local function prototypes */
@ -369,26 +354,3 @@ PlaylistTest :: fadeInfoTest(void)
catch (std::invalid_argument &e) { catch (std::invalid_argument &e) {
} }
} }
/*------------------------------------------------------------------------------
* Check if the conversion to SMIL works
*----------------------------------------------------------------------------*/
void
PlaylistTest :: toSmilTest(void)
throw (CPPUNIT_NS::Exception)
{
playlist->setLockedForPlaying(true);
std::string newSmilPlaylist;
try {
newSmilPlaylist = playlist->toSmil()
->write_to_string_formatted("UTF-8");
}
catch (std::logic_error &e) {
CPPUNIT_FAIL(e.what());
}
CPPUNIT_ASSERT(newSmilPlaylist == smilPlaylist);
playlist->setLockedForPlaying(false);
}

13
livesupport/modules/core/src/PlaylistTest.h
View File

@ -22,7 +22,7 @@
Author : $Author: fgerlits $ Author : $Author: fgerlits $
Version : $Revision: 1.7 $ Version : $Revision: 1.8 $
Location : $Source: /home/paul/cvs2svn-livesupport/newcvsrepo/livesupport/modules/core/src/PlaylistTest.h,v $ Location : $Source: /home/paul/cvs2svn-livesupport/newcvsrepo/livesupport/modules/core/src/PlaylistTest.h,v $
------------------------------------------------------------------------------*/ ------------------------------------------------------------------------------*/
@ -58,7 +58,7 @@ namespace Core {
* Unit test for the UploadPlaylistMetohd class. * Unit test for the UploadPlaylistMetohd class.
* *
* @author $Author: fgerlits $ * @author $Author: fgerlits $
* @version $Revision: 1.7 $ * @version $Revision: 1.8 $
* @see Playlist * @see Playlist
*/ */
class PlaylistTest : public CPPUNIT_NS::TestFixture class PlaylistTest : public CPPUNIT_NS::TestFixture
@ -69,7 +69,6 @@ class PlaylistTest : public CPPUNIT_NS::TestFixture
CPPUNIT_TEST(audioClipTest); CPPUNIT_TEST(audioClipTest);
CPPUNIT_TEST(savedCopyTest); CPPUNIT_TEST(savedCopyTest);
CPPUNIT_TEST(fadeInfoTest); CPPUNIT_TEST(fadeInfoTest);
CPPUNIT_TEST(toSmilTest);
CPPUNIT_TEST_SUITE_END(); CPPUNIT_TEST_SUITE_END();
private: private:
@ -121,14 +120,6 @@ class PlaylistTest : public CPPUNIT_NS::TestFixture
void void
fadeInfoTest(void) throw (CPPUNIT_NS::Exception); fadeInfoTest(void) throw (CPPUNIT_NS::Exception);
/**
* Check if the conversion to SMIL works.
*
* @exception CPPUNIT_NS::Exception on test failures.
*/
void
toSmilTest(void) throw (CPPUNIT_NS::Exception);
public: public:

17
livesupport/modules/storage/src/TestStorageClient.cxx
View File

@ -22,7 +22,7 @@
Author : $Author: fgerlits $ Author : $Author: fgerlits $
Version : $Revision: 1.12 $ Version : $Revision: 1.13 $
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 $
------------------------------------------------------------------------------*/ ------------------------------------------------------------------------------*/
@ -59,11 +59,6 @@ using namespace LiveSupport::Storage;
*----------------------------------------------------------------------------*/ *----------------------------------------------------------------------------*/
const std::string TestStorageClient::configElementNameStr = "testStorage"; const std::string TestStorageClient::configElementNameStr = "testStorage";
/*------------------------------------------------------------------------------
* The path to the local temp storage
*----------------------------------------------------------------------------*/
const std::string TestStorageClient::localTempStoragePath = "var/";
/*------------------------------------------------------------------------------ /*------------------------------------------------------------------------------
* The XML version used to create the SMIL file. * The XML version used to create the SMIL file.
*----------------------------------------------------------------------------*/ *----------------------------------------------------------------------------*/
@ -282,7 +277,7 @@ TestStorageClient :: acquirePlaylist(Ptr<const UniqueId>::Ref id) const
* Release a playlist. * Release a playlist.
*----------------------------------------------------------------------------*/ *----------------------------------------------------------------------------*/
void void
TestStorageClient :: releasePlaylist(Ptr<const Playlist>::Ref playlist) const TestStorageClient :: releasePlaylist(Ptr<Playlist>::Ref playlist) const
throw (std::logic_error) throw (std::logic_error)
{ {
if (! playlist->getUri()) { if (! playlist->getUri()) {
@ -311,6 +306,9 @@ TestStorageClient :: releasePlaylist(Ptr<const Playlist>::Ref playlist) const
++it; ++it;
} }
Ptr<std::string>::Ref nullPointer;
playlist->setUri(nullPointer);
if (badAudioClips) { if (badAudioClips) {
std::stringstream eMsg; std::stringstream eMsg;
eMsg << "could not release " << badAudioClips eMsg << "could not release " << badAudioClips
@ -450,12 +448,15 @@ TestStorageClient :: acquireAudioClip(Ptr<const UniqueId>::Ref id) const
* Release an audio clip. * Release an audio clip.
*----------------------------------------------------------------------------*/ *----------------------------------------------------------------------------*/
void void
TestStorageClient :: releaseAudioClip(Ptr<const AudioClip>::Ref audioClip) const TestStorageClient :: releaseAudioClip(Ptr<AudioClip>::Ref audioClip) const
throw (std::logic_error) throw (std::logic_error)
{ {
if (*(audioClip->getUri()) == "") { if (*(audioClip->getUri()) == "") {
throw std::logic_error("audio clip URI not found"); throw std::logic_error("audio clip URI not found");
} }
Ptr<std::string>::Ref nullPointer;
audioClip->setUri(nullPointer);
} }

8
livesupport/modules/storage/src/TestStorageClient.h
View File

@ -22,7 +22,7 @@
Author : $Author: fgerlits $ Author : $Author: fgerlits $
Version : $Revision: 1.11 $ Version : $Revision: 1.12 $
Location : $Source: /home/paul/cvs2svn-livesupport/newcvsrepo/livesupport/modules/storage/src/TestStorageClient.h,v $ Location : $Source: /home/paul/cvs2svn-livesupport/newcvsrepo/livesupport/modules/storage/src/TestStorageClient.h,v $
------------------------------------------------------------------------------*/ ------------------------------------------------------------------------------*/
@ -67,7 +67,7 @@ using namespace LiveSupport::Core;
* A dummy storage client, only used for test purposes. * A dummy storage client, only used for test purposes.
* *
* @author $Author: fgerlits $ * @author $Author: fgerlits $
* @version $Revision: 1.11 $ * @version $Revision: 1.12 $
*/ */
class TestStorageClient : class TestStorageClient :
virtual public Configurable, virtual public Configurable,
@ -191,7 +191,7 @@ class TestStorageClient :
* or the file does not exist, etc. * or the file does not exist, etc.
*/ */
virtual void virtual void
releasePlaylist(Ptr<const Playlist>::Ref playlist) const releasePlaylist(Ptr<Playlist>::Ref playlist) const
throw (std::logic_error); throw (std::logic_error);
/** /**
@ -268,7 +268,7 @@ class TestStorageClient :
* or the file does not exist, etc. * or the file does not exist, etc.
*/ */
virtual void virtual void
releaseAudioClip(Ptr<const AudioClip>::Ref audioClip) const releaseAudioClip(Ptr<AudioClip>::Ref audioClip) const
throw (std::logic_error); throw (std::logic_error);
/** /**

6
livesupport/modules/storage/src/TestStorageClientTest.cxx
View File

@ -22,7 +22,7 @@
Author : $Author: fgerlits $ Author : $Author: fgerlits $
Version : $Revision: 1.11 $ Version : $Revision: 1.12 $
Location : $Source: /home/paul/cvs2svn-livesupport/newcvsrepo/livesupport/modules/storage/src/TestStorageClientTest.cxx,v $ Location : $Source: /home/paul/cvs2svn-livesupport/newcvsrepo/livesupport/modules/storage/src/TestStorageClientTest.cxx,v $
------------------------------------------------------------------------------*/ ------------------------------------------------------------------------------*/
@ -288,8 +288,8 @@ TestStorageClientTest :: acquirePlaylistTest(void)
eMsg += e.what(); eMsg += e.what();
CPPUNIT_FAIL(eMsg); CPPUNIT_FAIL(eMsg);
} }
CPPUNIT_ASSERT(!playlist->getUri());
std::ifstream ifs2(playlist->getUri()->substr(7).c_str()); std::ifstream ifs2(savedTempFilePath.c_str());
if (ifs2) { if (ifs2) {
ifs2.close(); ifs2.close();
CPPUNIT_FAIL("temp file not destroyed correctly"); CPPUNIT_FAIL("temp file not destroyed correctly");

5
livesupport/products/scheduler/etc/Makefile.in
View File

@ -20,8 +20,8 @@
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
# #
# #
# Author : $Author: maroy $ # Author : $Author: fgerlits $
# Version : $Revision: 1.22 $ # Version : $Revision: 1.23 $
# Location : $Source: /home/paul/cvs2svn-livesupport/newcvsrepo/livesupport/products/scheduler/etc/Makefile.in,v $ # Location : $Source: /home/paul/cvs2svn-livesupport/newcvsrepo/livesupport/products/scheduler/etc/Makefile.in,v $
# #
# @configure_input@ # @configure_input@
@ -35,7 +35,6 @@ RM = rm -f
RMDIR = rm -rf RMDIR = rm -rf
DOXYGEN = doxygen DOXYGEN = doxygen
#------------------------------------------------------------------------------- #-------------------------------------------------------------------------------
# Basic directory and file definitions # Basic directory and file definitions
#------------------------------------------------------------------------------- #-------------------------------------------------------------------------------

8
livesupport/products/scheduler/etc/doxygen.config
View File

@ -20,8 +20,8 @@
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
# #
# #
# Author : $Author: maroy $ # Author : $Author: fgerlits $
# Version : $Revision: 1.2 $ # Version : $Revision: 1.3 $
# Location : $Source: /home/paul/cvs2svn-livesupport/newcvsrepo/livesupport/products/scheduler/etc/doxygen.config,v $ # Location : $Source: /home/paul/cvs2svn-livesupport/newcvsrepo/livesupport/products/scheduler/etc/doxygen.config,v $
#------------------------------------------------------------------------------- #-------------------------------------------------------------------------------
@ -977,7 +977,7 @@ SKIP_FUNCTION_MACROS = YES
# If a tag file is not located in the directory in which doxygen # If a tag file is not located in the directory in which doxygen
# is run, you must also specify the path to the tagfile here. # is run, you must also specify the path to the tagfile here.
TAGFILES = TAGFILES = ../../usr/share/doc/xmlrpc++/xmlrpc++.tag=../../../../../usr/share/doc/xmlrpc++
# When a file name is specified after GENERATE_TAGFILE, doxygen will create # When a file name is specified after GENERATE_TAGFILE, doxygen will create
# a tag file that is based on the input files it reads. # a tag file that is based on the input files it reads.
@ -988,7 +988,7 @@ GENERATE_TAGFILE =
# in the class index. If set to NO only the inherited external classes # in the class index. If set to NO only the inherited external classes
# will be listed. # will be listed.
ALLEXTERNALS = NO ALLEXTERNALS = YES
# If the EXTERNAL_GROUPS tag is set to YES all external groups will be listed # If the EXTERNAL_GROUPS tag is set to YES all external groups will be listed
# in the modules index. If set to NO, only the current project's groups will # in the modules index. If set to NO, only the current project's groups will

12
livesupport/tools/xmlrpc++/xmlrpc++-20040713/bin/install.sh
View File

@ -21,8 +21,8 @@
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
# #
# #
# Author : $Author: maroy $ # Author : $Author: fgerlits $
# Version : $Revision: 1.1 $ # Version : $Revision: 1.2 $
# Location : $Source: /home/paul/cvs2svn-livesupport/newcvsrepo/livesupport/tools/xmlrpc++/xmlrpc++-20040713/bin/Attic/install.sh,v $ # Location : $Source: /home/paul/cvs2svn-livesupport/newcvsrepo/livesupport/tools/xmlrpc++/xmlrpc++-20040713/bin/Attic/install.sh,v $
#------------------------------------------------------------------------------- #-------------------------------------------------------------------------------
#------------------------------------------------------------------------------- #-------------------------------------------------------------------------------
@ -37,10 +37,10 @@ installdir=`cd $basedir/../../../usr; pwd; cd -`
tmpdir=$basedir/tmp tmpdir=$basedir/tmp
etcdir=$basedir/etc etcdir=$basedir/etc
tar=$basedir/src/$product.tar.gz tar=$basedir/src/$product.tar.gz
docdir=$installdir/share/doc/xmlrpc++
echo "installing $product from $basedir to $installdir" echo "installing $product from $basedir to $installdir"
mkdir -p $tmpdir mkdir -p $tmpdir
cd $tmpdir cd $tmpdir
@ -51,6 +51,10 @@ patch -p1 < $etcdir/uninitialised_XmlRpcSource_ssl_ssl.patch
sh autogen.sh --prefix=$installdir sh autogen.sh --prefix=$installdir
make install make install
cd $docdir
doxytag -t xmlrpc++.tag XmlRpcServerMethod_8h-source.html \
classXmlRpc_1_1XmlRpcServerMethod.html \
classXmlRpc_1_1XmlRpcServerMethod-members.html
cd $basedir cd $basedir
rm -rf tmp rm -rf tmp