diff -r 3785f754ee62 -r 5360b7ddc251 upnpavcontroller/upnpavcontrollerclient/src/upnpavcontrollerfactory.cpp
--- a/upnpavcontroller/upnpavcontrollerclient/src/upnpavcontrollerfactory.cpp	Fri Sep 17 08:31:21 2010 +0300
+++ b/upnpavcontroller/upnpavcontrollerclient/src/upnpavcontrollerfactory.cpp	Mon Nov 01 12:37:49 2010 +0200
@@ -1,125 +1,76 @@
-/*
-* Copyright (c) 2006 Nokia Corporation and/or its subsidiary(-ies).
-* All rights reserved.
-* This component and the accompanying materials are made available
-* under the terms of "Eclipse Public License v1.0"
-* which accompanies this distribution, and is available
-* at the URL "http://www.eclipse.org/legal/epl-v10.html".
-*
-* Initial Contributors:
-* Nokia Corporation - initial contribution.
-*
-* Contributors:
-*
-* Description:      The factory for AVController client
-*
-*/
-
-
-
-
-
-
-// INCLUDES
-// upnpframework / avcontroller api
-#include "upnpavcontrollerfactory.h"
-#include "upnpavcontrollerglobals.h"
-
-// avcontroller internal
-#include "upnpavcontrolleractive.h"
-#include "upnpavcontrollerclient.h"
-
-
-// ======== MEMBER FUNCTIONS ========
-
-// --------------------------------------------------------------------------
-// UPnPAVControllerFactory::NewUPnPAVControllerL
-// Two-phase construct
-// --------------------------------------------------------------------------
-EXPORT_C MUPnPAVController* UPnPAVControllerFactory::NewUPnPAVControllerL()
-    {
-    return CUPnPAVControllerActive::NewL();
-    }
-    
-// --------------------------------------------------------------------------
-// UPnPAVControllerFactory::NewUPnPAVControllerLC
-// Two-phase construct
-// --------------------------------------------------------------------------
-EXPORT_C MUPnPAVController* UPnPAVControllerFactory::NewUPnPAVControllerLC()
-    {
-    return CUPnPAVControllerActive::NewLC();
-    }
-
-// --------------------------------------------------------------------------
-// UPnPAVControllerFactory::MSServicesInUse
-// See upnpavcontrollerfactory.h
-// --------------------------------------------------------------------------
-EXPORT_C TBool UPnPAVControllerFactory::MSServicesInUse()
-    {
-    TBool retVal = EFalse;
-    TFindServer findAVControllerServer( KAVControllerName );
-    TFullName name;
-
-    if ( findAVControllerServer.Next( name ) == KErrNone )
-        {
-        // Server already running, connect and check if it's using the local
-        // media server
-        RUPnPAVControllerClient avClient;
-        TInt err = avClient.Connect();
-        TBool inUse = EFalse;
-        TPckg<TBool> inUsePckg( inUse );
-        
-        if( err )
-            {
-            // Error in client/servers comms, let the client think that the
-            // local media server is in use
-            retVal = ETrue;            
-            }
-        else
-            {
-            err = avClient.MSServicesInUse( inUsePckg );
-            if( err )
-                {
-                // Error in client/servers comms, let the client think that the
-                // local media server is in use
-                retVal = ETrue;
-                }
-            else if( inUse )
-                {
-                // Local media server is in use
-                retVal = ETrue;
-                }                
-            }    
-        avClient.Close();
-        }
-    else
-        {
-        // Server not running, local media server is not used
-        }
-    return retVal;
-    }
-
-// --------------------------------------------------------------------------
-// UPnPAVControllerFactory::Status
-// See upnpavcontrollerfactory.h
-// --------------------------------------------------------------------------
-EXPORT_C TInt UPnPAVControllerFactory::Status(
-    TAVControllerServerStatus& aStatus )
-    {
-    TFindServer findAVControllerServer( KAVControllerName );
-    TFullName name;
-
-    if ( findAVControllerServer.Next( name ) == KErrNone )
-        {
-        // Server running
-        aStatus = EStatusActive;
-        }
-    else
-        {
-        // Server not running
-        aStatus = EStatusOffline;
-        }
-    return KErrNone;    
-    }
-
-// end of file
+/*
+* Copyright (c) 2006-2009 Nokia Corporation and/or its subsidiary(-ies).
+* All rights reserved.
+* This component and the accompanying materials are made available
+* under the terms of "Eclipse Public License v1.0"
+* which accompanies this distribution, and is available
+* at the URL "http://www.eclipse.org/legal/epl-v10.html".
+*
+* Initial Contributors:
+* Nokia Corporation - initial contribution.
+*
+* Contributors:
+*
+* Description:      The factory for AVController client
+*
+*/
+
+
+
+
+
+
+// INCLUDES
+// dlnasrv / avcontroller api
+#include "upnpavcontrollerfactory.h"
+#include "upnpavcontrollerglobals.h"
+
+// dlnasrv / avcontroller internal
+#include "upnpavcontrolleractive.h"
+#include "upnpavcontrollerclient.h"
+
+
+// ======== MEMBER FUNCTIONS ========
+
+// --------------------------------------------------------------------------
+// UPnPAVControllerFactory::NewUPnPAVControllerL
+// Two-phase construct
+// --------------------------------------------------------------------------
+EXPORT_C MUPnPAVController* UPnPAVControllerFactory::NewUPnPAVControllerL()
+    {
+    return CUPnPAVControllerActive::NewL();
+    }
+    
+// --------------------------------------------------------------------------
+// UPnPAVControllerFactory::NewUPnPAVControllerLC
+// Two-phase construct
+// --------------------------------------------------------------------------
+EXPORT_C MUPnPAVController* UPnPAVControllerFactory::NewUPnPAVControllerLC()
+    {
+    return CUPnPAVControllerActive::NewLC();
+    }
+
+// --------------------------------------------------------------------------
+// UPnPAVControllerFactory::Status
+// See upnpavcontrollerfactory.h
+// --------------------------------------------------------------------------
+EXPORT_C TInt UPnPAVControllerFactory::Status(
+    TAVControllerServerStatus& aStatus )
+    {
+    TFindServer findAVControllerServer( KAVControllerName );
+    TFullName name;
+
+    if ( findAVControllerServer.Next( name ) == KErrNone )
+        {
+        // Server running
+        aStatus = EStatusActive;
+        }
+    else
+        {
+        // Server not running
+        aStatus = EStatusOffline;
+        }
+    return KErrNone;    
+    }
+
+// end of file