--- a/videoplayback/videoplaybackviews/src/mpxvideobaseplaybackview.cpp	Tue Apr 27 16:40:33 2010 +0300
+++ b/videoplayback/videoplaybackviews/src/mpxvideobaseplaybackview.cpp	Tue May 11 16:15:40 2010 +0300
@@ -16,7 +16,7 @@
 */
 
 
-// Version : %version: 75 %
+// Version : %version: 77 %
 
 
 //  Include Files
@@ -130,6 +130,12 @@
 {
     MPX_DEBUG(_L("CMPXVideoBasePlaybackView::~CMPXVideoBasePlaybackView()"));
 
+    if ( iClipName )
+    {
+        delete iClipName;
+        iClipName = NULL;
+    }
+
     if ( iCloseAO )
     {
         delete iCloseAO;
@@ -532,6 +538,12 @@
 
     iMediaRequested = EFalse;
     iPlaybackState = EPbStateNotInitialised;
+
+    if ( iClipName )
+    {
+        delete iClipName;
+        iClipName = NULL;
+    }
 }
 
 // -------------------------------------------------------------------------------------------------
@@ -867,18 +879,15 @@
             TMPXVideoPlaybackControlCommandIds cmdId = EMPXControlCmdTvOutDisconnected;
 
             TBool tvOutConnected( *aMessage->Value<TInt>( KMPXMediaVideoTvOutConnected ) );
-            TBool playbackAllowed = ETrue;
 
             if ( tvOutConnected )
             {
                 cmdId = EMPXControlCmdTvOutConnected;
-
-                playbackAllowed = *aMessage->Value<TInt>( KMPXMediaVideoTvOutPlayAllowed );
             }
 
             if ( iContainer )
             {
-                MPX_TRAPD( err, iContainer->HandleEventL( cmdId, playbackAllowed ) );
+                MPX_TRAPD( err, iContainer->HandleEventL( cmdId ) );
             }
             break;
         }
@@ -958,17 +967,6 @@
             DisplayInfoMessageL( R_MPX_VIDEO_CALL_ONGOING );
             break;
         }
-        case KMPXVideoTvOutPlaybackNotAllowed:
-        {
-            DisplayInfoMessageL( R_MPX_VIDEO_DRM_NO_TV_OUT );
-            break;
-        }
-        case KMPXVideoTvOutPlaybackNotAllowedClose:
-        {
-            DisplayErrorMessageL( R_MPX_VIDEO_DRM_NO_TV_OUT );
-            HandleClosePlaybackViewL();
-            break;
-        }
         default:
         {
             //
@@ -1216,15 +1214,6 @@
     }
 
     //
-    //  TV-Out Playback Allowed
-    //
-    if ( aMedia.IsSupported( KMPXMediaVideoTvOutPlayAllowed ) )
-    {
-        iFileDetails->iTvOutPlayAllowed =
-            aMedia.ValueTObjectL<TInt>( KMPXMediaVideoTvOutPlayAllowed );
-    }
-
-    //
     //  Video BitRate
     //
     if ( aMedia.IsSupported( KMPXMediaVideoBitRate ) )
@@ -1368,17 +1357,26 @@
     }
     else
     {
+        //
+        //  Retreive the clip name for all use cases
+        //
+        if ( aMedia.IsSupported( KMPXMediaGeneralUri ) )
+        {
+            if ( iClipName )
+            {
+                delete iClipName;
+                iClipName = NULL;
+            }
+            
+            TPtrC uri( aMedia.ValueText( KMPXMediaGeneralUri ) );
+            iClipName = uri.AllocL();
+        }
+
         if ( aMedia.IsSupported( KMPXMediaVideoError ) )
         {
             TInt error = aMedia.ValueTObjectL<TInt>( KMPXMediaVideoError );
 
-            // Reset the controls
-            iContainer->HandleCommandL( EMPXPbvCmdResetControls );
-
-            // Set the iMediaRequested flag to false
             iMediaRequested = EFalse;
-
-            // Handle the plugin error
             HandlePluginErrorL( error );
         }
         else
@@ -1974,10 +1972,10 @@
     TInt openError = KErrNotFound;
     RFs& fs = iCoeEnv->FsSession();
 
-    if ( iPlaylistView && iFileDetails->iClipName )
+    if ( iPlaylistView && iClipName )
     {
         openError = aFile.Open( fs,
-                                iFileDetails->iClipName->Des(),
+                                iClipName->Des(),
                                 EFileRead | EFileShareReadersOrWriters );
     }
     else
@@ -2002,11 +2000,14 @@
                 //
                 HBufC* tempFileName = s->UriL();
 
-                openError = aFile.Open( fs,
-                                        tempFileName->Des(),
-                                        EFileRead | EFileShareReadersOrWriters );
+                if ( tempFileName )
+                {
+                    openError = aFile.Open( fs,
+                                            tempFileName->Des(),
+                                            EFileRead | EFileShareReadersOrWriters );
 
-                delete tempFileName;
+                    delete tempFileName;
+                }
             }
         }
     }
@@ -2110,10 +2111,10 @@
     TInt openError = KErrNotFound;
     RFs& fs = iCoeEnv->FsSession();
 
-    if ( iPlaylistView && iFileDetails->iClipName )
+    if ( iPlaylistView && iClipName )
     {
         openError = aFile.Open( fs,
-                                iFileDetails->iClipName->Des(),
+                                iClipName->Des(),
                                 EFileRead | EFileShareReadersOrWriters );
     }
     else
@@ -2139,11 +2140,14 @@
                 //
                 HBufC* tempFileName = s->UriL();
 
-                openError = aFile.Open( fs,
-                                        tempFileName->Des(),
-                                        EFileRead | EFileShareReadersOrWriters );
+                if ( tempFileName )
+                {
+                    openError = aFile.Open( fs,
+                                            tempFileName->Des(),
+                                            EFileRead | EFileShareReadersOrWriters );
 
-                delete tempFileName;
+                    delete tempFileName;
+                }
             }
         }
     }