From 46317060061f1cdfc6a5c4e0244f33fe8e87afbe Mon Sep 17 00:00:00 2001
From: fgerlits <fgerlits@cfc7b370-4200-0410-a6e3-cb6bdb053afe>
Date: Mon, 8 Nov 2004 10:08:10 +0000
Subject: [PATCH] removed openForPlaying() and closeForPlaying() methods from
 Playlist class added acquirePlaylist() to StorageClientInterface

---
 .../core/include/LiveSupport/Core/Playlist.h  | 18 ++-----------
 .../LiveSupport/Core/StorageClientInterface.h | 26 +++++++++++++++----
 livesupport/modules/core/src/Playlist.cxx     | 23 +---------------
 3 files changed, 24 insertions(+), 43 deletions(-)

diff --git a/livesupport/modules/core/include/LiveSupport/Core/Playlist.h b/livesupport/modules/core/include/LiveSupport/Core/Playlist.h
index 98527b215..ebc3bae90 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.11 $
+    Version  : $Revision: 1.12 $
     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.
  *
  *  @author  $Author: fgerlits $
- *  @version $Revision: 1.11 $
+ *  @version $Revision: 1.12 $
  */
 class Playlist : public Configurable
 {
@@ -375,20 +375,6 @@ class Playlist : public Configurable
          */
          Ptr<xmlpp::Document>::Ref
          toSmil(void) const                     throw (std::logic_error);
-
-        /**
-         *  Open for playing.
-         */
-
-         Ptr<std::string>::Ref
-         openForPlaying(void) const             throw (std::logic_error);
-
-        /**
-         *  Close after playing.
-         */
-
-         void
-         closeForPlaying(void) const            throw (std::logic_error);
 };
 
 
diff --git a/livesupport/modules/core/include/LiveSupport/Core/StorageClientInterface.h b/livesupport/modules/core/include/LiveSupport/Core/StorageClientInterface.h
index 84b53caa6..71edca401 100644
--- a/livesupport/modules/core/include/LiveSupport/Core/StorageClientInterface.h
+++ b/livesupport/modules/core/include/LiveSupport/Core/StorageClientInterface.h
@@ -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/include/LiveSupport/Core/Attic/StorageClientInterface.h,v $
 
 ------------------------------------------------------------------------------*/
@@ -61,7 +61,7 @@ namespace Core {
  *  An interface for storage clients.
  *
  *  @author  $Author: fgerlits $
- *  @version $Revision: 1.8 $
+ *  @version $Revision: 1.9 $
  */
 class StorageClientInterface
 {
@@ -91,18 +91,34 @@ class StorageClientInterface
                                                                         = 0;
 
         /**
-         *  Release the lock on a playlist with the specified id.
+         *  Acquire the resources for the playlist
+         *  At this point, this does not do anything.
+         *
+         *  @param id the id of the playlist to release.
+         *  @return something
+         *  @exception std::invalid_argument if no playlist with the specified
+         *             specified id exists. 
+         */
+        virtual Ptr<std::string>::Ref
+        acquirePlaylist(Ptr<const UniqueId>::Ref id) const
+                                            throw (std::invalid_argument,
+                                                   std::logic_error)
+                                                                        = 0;
+
+        /**
+         *  Release the resources (audio clips, other playlists) used 
+         *  in a playlist.
+         *  At this point, this does not do anything.
          *
          *  @param id the id of the playlist to release.
          *  @exception std::invalid_argument if no playlist with the specified
-         *             id exists.
+         *             specified id exists. 
          */
         virtual void
         releasePlaylist(Ptr<const UniqueId>::Ref id) const
                                             throw (std::invalid_argument,
                                                    std::logic_error)
                                                                         = 0;
-
         /**
          *  Delete a playlist with the specified id.
          *
diff --git a/livesupport/modules/core/src/Playlist.cxx b/livesupport/modules/core/src/Playlist.cxx
index 39fcf094d..fdd928aae 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.10 $
+    Version  : $Revision: 1.11 $
     Location : $Source: /home/paul/cvs2svn-livesupport/newcvsrepo/livesupport/modules/core/src/Playlist.cxx,v $
 
 ------------------------------------------------------------------------------*/
@@ -405,24 +405,3 @@ Playlist::toSmil(void) const             throw (std::logic_error)
 
     return smilDocument;
 }
-
-
-/*------------------------------------------------------------------------------
- *  Open for playing.
- *----------------------------------------------------------------------------*/
-Ptr<std::string>::Ref
-Playlist :: openForPlaying(void) const                  throw (std::logic_error)
-{
-    Ptr<std::string>::Ref   returnValue(new std::string("/tmp/somefile.xml"));
-    return returnValue;
-}
-
-
-/*------------------------------------------------------------------------------
- *  Close after playing.
- *----------------------------------------------------------------------------*/
-void
-Playlist :: closeForPlaying(void) const                 throw (std::logic_error)
-{
-}
-