From f2f7914896c8a3d175fa521518967f4d1f7d43c3 Mon Sep 17 00:00:00 2001
From: fgerlits <fgerlits@cfc7b370-4200-0410-a6e3-cb6bdb053afe>
Date: Mon, 29 Nov 2004 12:26:39 +0000
Subject: [PATCH] Reverted to version 1.6.

---
 .../src/AddAudioClipToPlaylistMethod.cxx      | 43 ++++++++-----------
 .../src/AddAudioClipToPlaylistMethod.h        | 14 +++---
 2 files changed, 24 insertions(+), 33 deletions(-)

diff --git a/livesupport/products/scheduler/src/AddAudioClipToPlaylistMethod.cxx b/livesupport/products/scheduler/src/AddAudioClipToPlaylistMethod.cxx
index f86259092..61593776e 100644
--- a/livesupport/products/scheduler/src/AddAudioClipToPlaylistMethod.cxx
+++ b/livesupport/products/scheduler/src/AddAudioClipToPlaylistMethod.cxx
@@ -22,7 +22,7 @@
  
  
     Author   : $Author: fgerlits $
-    Version  : $Revision: 1.7 $
+    Version  : $Revision: 1.8 $
     Location : $Source: /home/paul/cvs2svn-livesupport/newcvsrepo/livesupport/products/scheduler/src/AddAudioClipToPlaylistMethod.cxx,v $
 
 ------------------------------------------------------------------------------*/
@@ -112,7 +112,7 @@ AddAudioClipToPlaylistMethod :: execute(XmlRpc::XmlRpcValue  & rootParameter,
         sessionId = XmlRpcTools::extractSessionId(parameters);
     }
     catch (std::invalid_argument &e) {
-        XmlRpcTools::markError(errorId+20, 
+        XmlRpcTools::markError(errorId+22, 
                                "missing session ID argument",
                                 returnValue);
         return;
@@ -158,10 +158,15 @@ AddAudioClipToPlaylistMethod :: execute(XmlRpc::XmlRpcValue  & rootParameter,
         playlist = storage->getPlaylist(sessionId, playlistId);
     }
     catch (std::invalid_argument &e) {
-        std::string eMsg = "AddAudioClipToPlaylistlaylist: ";
-        eMsg += "storage.getPlaylist() error:\n";
-        eMsg += e.what();
-        XmlRpcTools::markError(errorId+5, eMsg, returnValue);
+        XmlRpcTools::markError(errorId+5, "playlist not found", 
+                               returnValue);
+        return;
+    }
+
+    if (!playlist->canBeEdited()) {
+        XmlRpcTools::markError(errorId+6, 
+                               "playlist has not been opened for editing", 
+                               returnValue);
         return;
     }
 
@@ -170,32 +175,18 @@ AddAudioClipToPlaylistMethod :: execute(XmlRpc::XmlRpcValue  & rootParameter,
         audioClip = storage->getAudioClip(sessionId, audioClipId);
     }
     catch (std::invalid_argument &e) {
-        std::string eMsg = "AddAudioClipToPlaylistlaylist: ";
-        eMsg += "storage.getAudioClip() error:\n";
-        eMsg += e.what();
-        XmlRpcTools::markError(errorId+7, eMsg, returnValue);
+        XmlRpcTools::markError(errorId+7, "audio clip does not exist", 
+                               returnValue);
         return;
     }
 
-    try {
+    try {                                        // and finally, the beef
         playlist->addAudioClip(audioClip, relativeOffset);
     }
     catch(std::invalid_argument &e) {
-        std::string eMsg = "AddAudioClipToPlaylistlaylist: ";
-        eMsg += "playlist.addAudioClip() error:\n";
-        eMsg += e.what();
-        XmlRpcTools::markError(errorId+8, eMsg, returnValue);
-        return;
-    }
-
-    try {
-        storage->savePlaylist(sessionId, playlist);
-    }
-    catch (std::invalid_argument &e) {
-        std::string eMsg = "AddAudioClipToPlaylistlaylist: ";
-        eMsg += "storage.savePlaylist() error:\n";
-        eMsg += e.what();
-        XmlRpcTools::markError(errorId+10, eMsg, returnValue);
+        XmlRpcTools::markError(errorId+8,
+                               "two audio clips at the same relative offset",
+                               returnValue);
         return;
     }
 }
diff --git a/livesupport/products/scheduler/src/AddAudioClipToPlaylistMethod.h b/livesupport/products/scheduler/src/AddAudioClipToPlaylistMethod.h
index 854d11adf..c6aa69898 100644
--- a/livesupport/products/scheduler/src/AddAudioClipToPlaylistMethod.h
+++ b/livesupport/products/scheduler/src/AddAudioClipToPlaylistMethod.h
@@ -22,7 +22,7 @@
  
  
     Author   : $Author: fgerlits $
-    Version  : $Revision: 1.7 $
+    Version  : $Revision: 1.8 $
     Location : $Source: /home/paul/cvs2svn-livesupport/newcvsrepo/livesupport/products/scheduler/src/AddAudioClipToPlaylistMethod.h,v $
 
 ------------------------------------------------------------------------------*/
@@ -94,15 +94,15 @@ using namespace LiveSupport::Core;
  *     <li>302 - missing playlist ID argument </li>
  *     <li>303 - missing audio clip ID argument </li>
  *     <li>304 - missing relative offset argument </li>
- *     <li>305 - storage.getPlaylist() returned error message </li>
- *     <li>307 - storage.getAudioClip() returned error message </li>
- *     <li>308 - playlist.addAudioClip() returned error message </li>
- *     <li>310 - storage.savePlaylist() returned error message </li>
- *     <li>320 - missing session ID argument </li>
+ *     <li>305 - playlist not found </li>
+ *     <li>306 - playlist has not been opened for editing </li>
+ *     <li>307 - audio clip does not exist </li>
+ *     <li>308 - two audio clips at the same relative offset</li>
+ *     <li>322 - missing session ID argument </li>
  *  </ul>
  *
  *  @author  $Author: fgerlits $
- *  @version $Revision: 1.7 $
+ *  @version $Revision: 1.8 $
  */
 class AddAudioClipToPlaylistMethod : public XmlRpc::XmlRpcServerMethod
 {