--- a/internetradio2.0/actionhandlerinc/iractionhandler.h	Tue Jul 06 14:07:20 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,85 +0,0 @@
-/*
-* Copyright (c) 2008-2008 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:  Action handler providing LIW based API for external use.
-*
-*/
-
-
-#ifndef IRACTIONHANDLER_H
-#define IRACTIONHANDLER_H
-
-#include <ahplugin.h>
-
-/**
- * Action handler provides LIW -based interface for external use (e.g. Homescreen) 
- * 
- * The action handler communicates with IR via IR's Publish & Subscribe API.
- * 
- */
-NONSHARABLE_CLASS( CIRActionHandler ) : public CAHPlugin
-    {
-public:
-    /**
-     * Two-phased constructor. 
-     */
-    static CIRActionHandler* NewL();
-
-    /**
-     * Destructor
-     */
-    ~CIRActionHandler();
-    
-    // From base class CAHPlugin
-    TInt ExecuteActionL( const CLiwMap* aMap );
-    
-private:
-    /**
-     * C++ constructor.
-     */
-    CIRActionHandler();
-    
-    /**
-     * Second phase constructor.
-     */
-    void ConstructL();
-    
-private:
-     
-    /**
-     * Mutes VRA.
-     */
-    void Stop();
-    
-    /**
-     * Unmutes VRA.
-     */
-    void Play();
-    
-     /**
-     * Invokes VRA to go to now playing view.
-     */
-    void StartToNowPlayingL();
-    
-    /**
-     * Extracts the value of the given mapname to given string.
-     * Reserves memory to argument aString.
-     * 
-     * @param aMap The map containing the mapname-string pairs.
-     * @param aString Descriptor where the value is extracted.
-     * @param aMapName The searched map name. 
-     */
-    TInt ExtractStringL( const CLiwMap* aMap, RBuf& aString, const TDesC8& aMapName );
-    };
-
-#endif /* IRACTIONHANDLER_H */

--- a/internetradio2.0/actionhandlerinc/iractionhandlerdefs.h	Tue Jul 06 14:07:20 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,32 +0,0 @@
-/*
-* Copyright (c) 2008-2008 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:  This file contains LIW string definitions for IRActionHandler.
-*
-*/
-
-
-#ifndef IRACTIONHANDLERDEFS_H
-#define IRACTIONHANDLERDEFS_H
-
-#include <e32base.h>
-
-// map keys
-_LIT8( KIRCommand, "command" );
-
-// map values
-_LIT( KIRCommandValueStop, "stop" );
-_LIT( KIRCommandValuePlay, "play" );
-_LIT( KIRCommandValueStartNowPlaying, "startnowplaying" );
-
-#endif /* IRACTIONHANDLERDEFS_H */

--- a/internetradio2.0/actionhandlersrc/iractionhandler.cpp	Tue Jul 06 14:07:20 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,273 +0,0 @@
-/*
-* Copyright (c) 2008-2008 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:  
-*
-*/
-
-
-#include <e32cmn.h>
-#include <e32property.h>
-#include <e32std.h>
-#include <w32std.h>
-#include <implementationproxy.h>
-#include <liwvariant.h>
-#include "irdebug.h"
-#include <apgtask.h>
-#include <apgcli.h>
-#include <apacmdln.h>
-
-
-#include "iractionhandler.h"
-#include "iractionhandler.hrh"
-#include "iractionhandlerdefs.h"
-#include "irpubsubkeys.h"
-
-_LIT8( KIRSpace, " " );
-_LIT8( KIRCommandLineActionHandler, "-a" );
-_LIT8( KIRCommandLineActionHandlerCommandStartNowPlayingView, "startnowplaying" );
-
-// ---------------------------------------------------------
-// CIRActionHandler::NewL
-// ---------------------------------------------------------
-//
-CIRActionHandler* CIRActionHandler::NewL()
-    {
-    CIRActionHandler* self = new ( ELeave ) CIRActionHandler(); 
-    CleanupStack::PushL( self );
-    
-    self->ConstructL();
-    
-    CleanupStack::Pop( self );
-    return self;
-    }
-
-// ---------------------------------------------------------
-// CIRActionHandler::~CIRActionHandler
-// ---------------------------------------------------------
-//
-CIRActionHandler::~CIRActionHandler()
-    {
-    }
-
-// ---------------------------------------------------------
-// CIRActionHandler::CIRActionHandler
-// ---------------------------------------------------------
-//
-CIRActionHandler:: CIRActionHandler()
-    {
-    
-    }
-    
-// ---------------------------------------------------------
-// CIRActionHandler::ConstructL
-// ---------------------------------------------------------
-//
-void CIRActionHandler::ConstructL()
-    {
-    }
-
-// ---------------------------------------------------------
-// CIRActionHandler::ExecuteActionL
-// ---------------------------------------------------------
-//
-TInt CIRActionHandler::ExecuteActionL( const CLiwMap* aMap )
-    {
-    IRRDEBUG2("InternetRadio -- CIRActionHandler::ExecuteActionL Entering", KNullDesC);
-
-    TInt retValue( KErrNone );
-    RBuf command;
-    CleanupClosePushL( command );
-    
-	retValue  = ExtractStringL( aMap, command, KIRCommand);    
-    
-    if  (retValue== KErrNone )
-        {
-        if ( !command.CompareF( KIRCommandValueStop) )
-            {
-            Stop();
-            }
-        else if ( !command.CompareF( KIRCommandValuePlay ) )
-            {
-            Play();
-            }
-
-        else if ( !command.CompareF( KIRCommandValueStartNowPlaying ) )
-            {
-            StartToNowPlayingL();
-            }
-        else
-            {
-            retValue = KErrNotSupported;
-            }
-        }
-    CleanupStack::PopAndDestroy( &command );
-    IRRDEBUG2("InternetRadio -- CIRActionHandler::ExecuteActionL exiting", KNullDesC);
-    return retValue;
-    }
-
-
-
-// ---------------------------------------------------------
-// CIRActionHandler::Mute
-// ---------------------------------------------------------
-//
-void CIRActionHandler::Stop()
-    {
-    IRRDEBUG2("CIRActionHandler::Stop entering", KNullDesC);
-      
-   	TInt err = RProperty::Set(KUidActiveInternetRadioApp, KIRPSControlSetPlayState, EIRStateStop );
-   	
-    IRRDEBUG2("CIRActionHandler::Stop exiting err =%d", err);
-	
-    }
-
-// ---------------------------------------------------------
-// CIRActionHandler::Unmute
-// ---------------------------------------------------------
-//
-void CIRActionHandler::Play()
-    {
-    IRRDEBUG2("CIRActionHandler::Play entering", KNullDesC);
-
-    TInt err = RProperty::Set(KUidActiveInternetRadioApp, KIRPSControlSetPlayState, EIRStatePlay);	
-  	
-    IRRDEBUG2("CIRActionHandler::Play exiting err=%d", err);
-
-    }
-
-
-
-// ---------------------------------------------------------
-// CIRActionHandler::StartToNowPlayingL
-// ---------------------------------------------------------
-//
-void CIRActionHandler::StartToNowPlayingL()
-    {
-    
-    IRRDEBUG2("CIRActionHandler::StartToNowPlayingL entering", KNullDesC);
-
-    RWsSession wsSession;
-                
-    User::LeaveIfError(wsSession.Connect() );
-    TApaTaskList taskList( wsSession );
-
-    TApaTask irTask = taskList.FindApp(KUidActiveInternetRadioApp);
-   
-   
-    IRRDEBUG2("CIRActionHandler::StartToNowPlayingL irTask.Exists()=%d", irTask.Exists());
-
-    TPtrC8 actionHandlerCmdId( KIRCommandLineActionHandler );
-    TPtrC8 spacePtr( KIRSpace );
-    
-    TPtrC8 startNowPlayingCmdvalue(
-    KIRCommandLineActionHandlerCommandStartNowPlayingView );
-
-    HBufC8* buf = HBufC8::NewLC(actionHandlerCmdId.Length()
-    			 + spacePtr.Length() + startNowPlayingCmdvalue.Length());
-    TPtr8 tail( buf->Des() );
-       
-    tail.Append( actionHandlerCmdId );
-    tail.Append( spacePtr );
-    tail.Append( startNowPlayingCmdvalue );
-
-    if ( !irTask.Exists() )
-        {
-        IRRDEBUG2("CIRActionHandler::StartToNowPlayingL !irTask.Exists", KNullDesC);
-
-        RApaLsSession apaSession;
-        CleanupClosePushL( apaSession );
-           
-        User::LeaveIfError( apaSession.Connect() );
-        User::LeaveIfError( apaSession.GetAllApps() );
-       
-        TApaAppInfo appInfo;
-        User::LeaveIfError( apaSession.GetAppInfo( appInfo, KUidActiveInternetRadioApp ) );
-
-      
-           
-        CApaCommandLine* internetRadioApplicationStartParams = CApaCommandLine::NewLC();
-        internetRadioApplicationStartParams->SetExecutableNameL( appInfo.iFullName );
-        // Start the application to the foreground
-        internetRadioApplicationStartParams->SetCommandL( EApaCommandRun );
-        internetRadioApplicationStartParams->SetTailEndL( tail );
-       
-        User::LeaveIfError( apaSession.StartApp( *internetRadioApplicationStartParams ) );
-    
-        IRRDEBUG2("CIRActionHandler::StartToNowPlayingL StartApp", KNullDesC);
-
-        CleanupStack::PopAndDestroy( internetRadioApplicationStartParams );
-        CleanupStack::PopAndDestroy( &apaSession );
-        }
-    else
-        {
-        IRRDEBUG2("CIRActionHandler::StartToNowPlayingL SendMessage", KNullDesC);
-
-        User::LeaveIfError( irTask.SendMessage( KUidActiveInternetRadioApp , tail ) );
-
-        }
-    CleanupStack::PopAndDestroy( buf );
-    wsSession.Close();
-
-    IRRDEBUG2("InternetRadio -- CIRActionHandler::StartToNowPlayingL exiting", KNullDesC);
-
-    }
-
-// ---------------------------------------------------------
-// CIRActionHandler::ExtractStringLC
-// ---------------------------------------------------------
-//
-TInt CIRActionHandler::ExtractStringL( const CLiwMap* aMap, RBuf& aString,
-										 const TDesC8& aMapName)
-    {
-    IRRDEBUG2("InternetRadio -- CIRActionHandler::ExtractStringL entering", KNullDesC);
-
-    TInt err( KErrNotFound );
-    TLiwVariant variant;
-    variant.PushL();
-    TPtrC tempString( KNullDesC );    
-    if ( aMap->FindL( aMapName, variant ) )
-        {
-        variant.Get( tempString );
-        aString.Close();
-        aString.CreateL( tempString );
-        err = KErrNone;
-        }
-    CleanupStack::PopAndDestroy( &variant );    
-    IRRDEBUG2("InternetRadio -- CIRActionHandler::ExtractStringL exiting", KNullDesC);
-   
-    return err;
-
-    }
-
-/** Provides a key-value pair table, that is used to identify the correct construction function for the requested interface. */
-const TImplementationProxy KIRActionHandlerImplementationTable[] =
-    {
-    /*lint -save -e611 (Warning -- Suspicious cast)*/
-    IMPLEMENTATION_PROXY_ENTRY( KIRActionHandlerImplementationUid, CIRActionHandler::NewL )
-    /*lint -restore*/
-    };
-
-const TImplementationProxy* ImplementationGroupProxy( TInt& aTableCount );
-
-// ---------------------------------------------------------------------------
-// Returns the implementations provided by this ECOM plugin DLL.
-// ---------------------------------------------------------------------------
-//
-EXPORT_C const TImplementationProxy* ImplementationGroupProxy( TInt& aTableCount )
-    {
-    IRRDEBUG2("InternetRadio -- CIRActionHandler::ImplementationGroupProxy", KNullDesC);
-
-    aTableCount = sizeof( KIRActionHandlerImplementationTable ) / sizeof( TImplementationProxy );
-    return KIRActionHandlerImplementationTable;
-    }

--- a/internetradio2.0/activeidleenginc/iractiveidleeng.h	Tue Jul 06 14:07:20 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,110 +0,0 @@
-/*
-* Copyright (c) 2006-2007 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:  ?Description
-*
-*/
-
-#ifndef IRACTIVEIDLEENG_H
-#define IRACTIVEIDLEENG_H
-
-#include "iractiveidleengpubsubnotifyhandler.h"
-
-class CIRActiveIdleEngPubSub;
-class MIRActiveIdleEngNotifyHandler;
-
-/**
-* Engine component for Internet Radio Active Idle plugin.
-*
-* This class is responsible for listening to relevant P&S keys and notifying the UI code whenever the listened keys change.
-* The actual listening is done by multiple CIRActiveIdleStatusObserver objects.
-*/
-NONSHARABLE_CLASS(CIRActiveIdleEng) : public CBase, 
-	public MIRActiveIdleEngPubSubNotifyHandler
-    {
-    public:
-        
-        /**
-        * Static constructor.
-        * @param    aObserver   The observer to be notified of the changes in the keys.
-        * @return   The newly created CIRActiveIdleEng object.
-        */
-    IMPORT_C static CIRActiveIdleEng* NewL( 
-    	MIRActiveIdleEngNotifyHandler& aObserver );
-        
-        /**
-        * Destructor.
-        */
-        IMPORT_C ~CIRActiveIdleEng();
-        
-        /**
-        * Construction finalizer.
-        * Must be called after CIRActiveIdleEng::NewL. 
-        */
-        IMPORT_C void SecondConstructL();
-        
-    protected: // From MIRActiveIdleStatusObserver
-        /**
-    * Invoked when an error occurred while retrieving the new 
-    * value of the key.
-    * @param    aCategory   The category of the key that changed.
-    * @param    aKey        The key that changed.
-    * @param    aError      The error code.
-        */
-    void HandlePropertyChangeErrorL( const TUid& aCategory, TUint aKey, 
-    	TInt aError );
-        
-        /**
-    * Invoked when the listened key is changed.
-    * @param    aCategory   The category of the key that changed.
-    * @param    aKey        The key that changed.
-    * @param    aText       The new value of the key.
-        */
-    void HandlePropertyChangeL( const TUid& aCategory, TUint aKey,
-    	const TDesC8& aText );
-        
-        /**
-    * Invoked when the listened key is changed.
-    * @param    aCategory   The category of the key that changed.
-    * @param    aKey        The key that changed.
-    * @param    aValue      The new value of the key.
-        */
-    void HandlePropertyChangeL( const TUid& aCategory, TUint aKey, 
-    	TInt aValue );
-
-	private:
-    
-        /**
-        * Constructor.
-    * @param    aObserver   The observer to be notified of the changes 
-    * in the keys.
-        */
-        CIRActiveIdleEng( MIRActiveIdleEngNotifyHandler& aObserver );
-    
-        /**
-        * Second-phase constructor.
-        */
-        void ConstructL();        
-        
-    protected:
-    
-        /** The observer to be notified of the changes in the listened keys. */
-        MIRActiveIdleEngNotifyHandler& iObserver;
-        /** Array of status observers. */
-        RPointerArray<CIRActiveIdleEngPubSub> iPropertyObserverArray;
-        
-        TInt		iVolume;
-
-    };
-
-#endif//IRACTIVEIDLEENG_H

--- a/internetradio2.0/activeidleenginc/iractiveidleengnotifyhandler.h	Tue Jul 06 14:07:20 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,75 +0,0 @@
-/*
-* Copyright (c) 2006-2007 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:  ?Description
-*
-*/
-
-
-#ifndef IRACTIVEIDLEENGNOTIFYHANDLER_H
-#define IRACTIVEIDLEENGNOTIFYHANDLER_H
-
-#include "irpubsubkeys.h"
-
-class CIRMetaData;
-
-/**
-* Observer interface for CIRActiveIdleEng.
-* The observer is notified about the changes in relevant keys through this interface.
-*/
-NONSHARABLE_CLASS(MIRActiveIdleEngNotifyHandler)
-    {
-
-public:
-        
-    /**
-    * Invoked when a new channel has been tuned into.
-    */
-    virtual void HandleChannelChangeL() = 0;
-    
-    /**
-    * Invoked when a new channel has been tuned into.
-    * @param    aVolume       The index of the volume level.
-    */
-    virtual void HandleVolumeChangeL( TInt aVolume ) = 0;
-    
-    /**
-    * Invoked when a new channel has been tuned into.
-    */
-    virtual void HandlePlayStopL( TIRStopPlayState aState ) = 0;
-    
-   /**
-    * Invoked when the application's running state has changed.
-    * @param    aRunningState   The new running state.
-    */
-    virtual void HandleApplicationRunningStateChangeL( 
-    			TIRPSApplicationRunningState aRunningState ) = 0;
-
-    /**
-     * Invoked when meta data is received.
-     *
-     * @param   aMetaData       The meta data that was received.
-     */
-    virtual void HandleMetaDataReceivedL( const CIRMetaData& aMetaData ) = 0;
-
-     /**
-     * Invoked when buffering starts or stops 
-     *
-     * @param   aValue  The state of buffering
-     */
-    virtual void HandleBufferingStateL(TIRBufferingState aState) = 0;
-
-    };
-
-#endif//IRACTIVEIDLEENGNOTIFYHANDLER_H
-           

--- a/internetradio2.0/activeidleenginc/iractiveidleengpubsub.h	Tue Jul 06 14:07:20 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,103 +0,0 @@
-/*
-* Copyright (c) 2006-2007 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:  ?Description
-*
-*/
-
-#ifndef IRACTIVEIDLEENGPUBSUB_H
-#define IRACTIVEIDLEENGPUBSUB_H
-
-#include <e32base.h>
-#include <e32property.h>
-
-class MIRActiveIdleEngPubSubNotifyHandler;
-
-#define KMAXLENGTH 256
-
-/**
-* Listens to one specified Publish & Subscribe key, notifying the observer whenever that key is changed.
-*/
-NONSHARABLE_CLASS(CIRActiveIdleEngPubSub) : public CActive
-    {
-    public:
-        
-        /**
-        * Static constructor.
-        * @param    aObserver   The observer to be notified of the changes in the listened key.
-        * @param    aCategory   The category of the key.
-        * @param    aKey        The key to listen to.
-        */
-    static CIRActiveIdleEngPubSub* NewL( MIRActiveIdleEngPubSubNotifyHandler& 
-    		aObserver, const TUid& aCategory, TUint aKey , 
-    		const RProperty::TType aPropertyType  );
-        
-        /**
-        * Destructor.
-        */
-        ~CIRActiveIdleEngPubSub();
-        
-        /**
-        * Construction finalizer.
-        * Subscribes the object to listen to the specified key.
-        */
-       	void SecondConstructL();
-        
-    protected: // From CActive
-
-        /**
-    *void RunL()
-    *The function is called by the active scheduler
-    *when a request completion event occurs,
-        */
-        void RunL();
-        
-        /**
-    *void DoCancel()
-    *Invoked when the active object is cancelled.
-        */
-        void DoCancel();
-        
-    private:
-
-        /**
-        * Constructor.    
-        * @param    aObserver   The observer to be notified of the changes in the listened key.
-        * @param    aCategory   The category of the key.
-        * @param    aKey        The key to listen to.
-        */
-    CIRActiveIdleEngPubSub( MIRActiveIdleEngPubSubNotifyHandler& aObserver, 
-    	const TUid& aCategory, TUint aKey, const RProperty::TType aPropertyType );
-        
-        /**
-        * Second-phase constructor.
-        */
-        void ConstructL();
-		
-    protected:
-
-        /** Handle to the property. */
-        RProperty iProperty;
-        RProperty::TType iPropertyType;
-        /** The observer to be notified of the changes in the listened key. */
-        MIRActiveIdleEngPubSubNotifyHandler& iObserver;
-        /** The category of the key to listen to. */
-        TUid iCategory;
-        /** The key to listen to. */
-        TUint iKey;
-        /** The cached value of the key. */
-        mutable TBuf8<KMAXLENGTH> iText;
-        TInt iValue;
-    };
-
-#endif//IRACTIVEIDLEENGPUBSUB_H

--- a/internetradio2.0/activeidleenginc/iractiveidleengpubsubnotifyhandler.h	Tue Jul 06 14:07:20 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,61 +0,0 @@
-/*
-* Copyright (c) 2006-2007 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:  ?Description
-*
-*/
-
-
-#ifndef IRACTIVEIDLEENGPUBSUBNOTIFYHANDLER_H
-#define IRACTIVEIDLEENGPUBSUBNOTIFYHANDLER_H
-
-#include <e32cmn.h>
-
-/**
-* Observer interface for CIRActiveIdleEngPubSub.
-* The observer is notified whenever the listened key is changed. If there was an error in getting the new value of the key,
-* the observer will be notified of it as well.
-*/
-NONSHARABLE_CLASS(MIRActiveIdleEngPubSubNotifyHandler)
-    {
-    public:
-
-        /**
-        * Invoked when the listened key is changed.
-        * @param    aCategory   The category of the key that changed.
-        * @param    aKey        The key that changed.
-        * @param    aValue      The new value of the key.
-        */
-    virtual void HandlePropertyChangeL( const TUid& aCategory, TUint aKey,
-    	 TInt aValue ) = 0;
-        
-        /**
-        * Invoked when the listened key is changed.
-        * @param    aCategory   The category of the key that changed.
-        * @param    aKey        The key that changed.
-        * @param    aText       The new value of the key.
-        */
-    virtual void HandlePropertyChangeL( const TUid& aCategory, TUint aKey,
-    	 const TDesC8& aText ) = 0;
-        
-        /**
-        * Invoked when an error occurred while retrieving the new value of the key.
-        * @param    aCategory   The category of the key that changed.
-        * @param    aKey        The key that changed.
-        * @param    aError      The error code.
-        */
-    virtual void HandlePropertyChangeErrorL( const TUid& aCategory,
-     TUint aKey, TInt aError ) = 0;
-    };
-
-#endif//IR_ACTIVEIDLEENGPUBSUBNOTIFYHANDLER

--- a/internetradio2.0/activeidleengsrc/iractiveidleeng.cpp	Tue Jul 06 14:07:20 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,209 +0,0 @@
-/*
-* Copyright (c) 2006-2007 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:  ?Description
-*
-*/
-
-
-#include "irmetadata.h"
-#include "irpubsubkeys.h"
-
-#include "iractiveidleeng.h"
-#include "iractiveidleengnotifyhandler.h"
-#include "iractiveidleengpubsub.h"
-#include "irdebug.h"
-
-
-// ---------------------------------------------------------------------------
-// CIRActiveIdleEng::CIRActiveIdleEng
-// Default Constructor.
-// ---------------------------------------------------------------------------
-//
-CIRActiveIdleEng::CIRActiveIdleEng( MIRActiveIdleEngNotifyHandler& aObserver )
-    : iObserver( aObserver )
-    {
-    }
-
-// ---------------------------------------------------------------------------
-// CIRActiveIdleEng::ConstructL
-// Second-phase constructor
-// ---------------------------------------------------------------------------
-//
-void CIRActiveIdleEng::ConstructL()
-    {
-    IRLOG_DEBUG( "CIRActiveIdleEng::ConstructL" );	
-    //Subscriber for application running state 
-    User::LeaveIfError(iPropertyObserverArray.Append( CIRActiveIdleEngPubSub::
-    	NewL( *this, KUidActiveInternetRadioApp, KIRPSDataApplicationRunning , 
-    	RProperty::EInt) ) );
-    //Subsciber for meta data
-    User::LeaveIfError( iPropertyObserverArray.Append( CIRActiveIdleEngPubSub::
-    	NewL( *this, KUidActiveInternetRadioApp, KIRPSMetaData, 
-    	RProperty::ELargeText)));
-    //Subsciber for the volume level 
-    User::LeaveIfError( iPropertyObserverArray.Append( CIRActiveIdleEngPubSub::
-    	NewL( *this, KUidActiveInternetRadioApp, KIRPSVolume , 
-    	RProperty::EInt) ) );
-    //Subsciber for the key KIRPSPlayStop at stop state
-    User::LeaveIfError( iPropertyObserverArray.Append( CIRActiveIdleEngPubSub::
-    	NewL( *this, KUidActiveInternetRadioApp, KIRPSPlayStop ,
-    	RProperty::EInt) ) );
-    //Subsciber for the channel name
-     User::LeaveIfError( iPropertyObserverArray.Append( CIRActiveIdleEngPubSub::
-    	NewL( *this, KUidActiveInternetRadioApp, KIRPSDataChannel, 
-    	RProperty::ELargeText) ) );
-    //Subscriber for favourite channel preset index 
-    User::LeaveIfError( iPropertyObserverArray.Append( CIRActiveIdleEngPubSub::
-    	NewL( *this, KUidActiveInternetRadioApp, KIRPSPresetIndex ,
-    	RProperty::EInt) ) );
-    
-    //Subscriber for favourite channel preset index 
-    User::LeaveIfError( iPropertyObserverArray.Append( CIRActiveIdleEngPubSub::
-    	NewL( *this, KUidActiveInternetRadioApp, KIRPSBufferingState ,
-    	RProperty::EInt) ) );
-    IRLOG_DEBUG( "CIRActiveIdleEng::ConstructL - Exiting." );	
-    }
-
-// ---------------------------------------------------------------------------
-// CIRActiveIdleEng::SecondConstructL()
-// Finalizes the construction of the object
-// ---------------------------------------------------------------------------
-//
-EXPORT_C void CIRActiveIdleEng::SecondConstructL()
-	{
-	
-	IRLOG_DEBUG( "CIRActiveIdleEng::SecondConstructL" );
-	for ( TInt i = 0; i < iPropertyObserverArray.Count(); i++ )
-		{
-		iPropertyObserverArray[i]->SecondConstructL();	
-		}
-	IRLOG_DEBUG( "CIRActiveIdleEng::SecondConstructL - Exiting." );
-	}
-
-// ---------------------------------------------------------------------------
-// CIRActiveIdleEng::NewL
-// Static constructor.
-// ---------------------------------------------------------------------------
-//
-EXPORT_C CIRActiveIdleEng* CIRActiveIdleEng::NewL( 
-	MIRActiveIdleEngNotifyHandler& aObserver )
-    {
-    IRLOG_DEBUG( "CIRActiveIdleEng::NewL" );
-    CIRActiveIdleEng* self = new ( ELeave ) CIRActiveIdleEng( aObserver );
-    CleanupStack::PushL( self );
-    self->ConstructL();
-    CleanupStack::Pop( self );
-	IRLOG_DEBUG( "CIRActiveIdleEng::NewL - Exiting." );
-    return self;
-    }
-
-// ---------------------------------------------------------------------------
-// CIRActiveIdleEng::~CIRActiveIdleEng()
-// standard C++ destructor
-// ---------------------------------------------------------------------------
-//
-EXPORT_C CIRActiveIdleEng::~CIRActiveIdleEng()
-    {
-    IRLOG_DEBUG( "CIRActiveIdleEng::~CIRActiveIdleEng" );
-    iPropertyObserverArray.ResetAndDestroy();
-    iPropertyObserverArray.Close();
-    IRLOG_DEBUG( "CIRActiveIdleEng::~CIRActiveIdleEng - Exiting." );
-    }
-
-// ---------------------------------------------------------------------------
-// CIRActiveIdleEng::HandlePropertyChangeL
-// Invoked when any listened P&S key is changed.
-// ---------------------------------------------------------------------------
-void CIRActiveIdleEng::HandlePropertyChangeL( const TUid& aCategory,
-											TUint aKey,const TDesC8& aText ) 
-	{
-	IRLOG_DEBUG( "CIRActiveIdleEng::HandlePropertyChangeL" );
-	if ( aCategory == KUidActiveInternetRadioApp )
-		{
-		if( aKey == KIRPSDataChannel )
-			{
-			iObserver.HandleChannelChangeL();
-			}
-		else if( aKey == KIRPSMetaData )
-			{
-			CIRMetaData* metaData = CIRMetaData::NewL( aText );
-			CleanupStack::PushL( metaData );
-			iObserver.HandleMetaDataReceivedL( *metaData );
-			CleanupStack::PopAndDestroy( metaData );
-			}
-		else
-			{
-			// To avoid PC lint error
-			}
-		}
-	IRLOG_DEBUG( "CIRActiveIdleEng::HandlePropertyChangeL - Exiting." );
-	}
-
-// ---------------------------------------------------------------------------
-// CIRActiveIdleEng::HandlePropertyChangeL
-// Invoked when any listened P&S key is changed.
-// ---------------------------------------------------------------------------
-//
-void CIRActiveIdleEng::HandlePropertyChangeL( 
-	const TUid& aCategory, TUint aKey, TInt aValue )
-	{
-	IRLOG_DEBUG( "CIRActiveIdleEng::HandlePropertyChangeL" );
-	if ( aCategory == KUidActiveInternetRadioApp )
-		{
-		if( aKey == KIRPSDataApplicationRunning)
-			{
-			iObserver.HandleApplicationRunningStateChangeL( 
-				static_cast<TIRPSApplicationRunningState>( aValue ) );				
-			}
-		else if( aKey == KIRPSVolume)
-			{
-			iObserver.HandleVolumeChangeL( aValue );
-			}
-		else if( aKey == KIRPSPlayStop)
-			{
-			iObserver.HandlePlayStopL( static_cast<TIRStopPlayState>( aValue ) );
-			}	   
-		else if( aKey == KIRPSBufferingState)
-			{
-			IRRDEBUG2("CIRActiveIdleEng::HandlePropertyChangeL KIRPSBufferingState=%d ",aValue);
-			iObserver.HandleBufferingStateL(static_cast<TIRBufferingState>(aValue));
-			}	   
-		else
-			{
-			// To avoid PC lint error
-			}
-		}
-	IRLOG_DEBUG( "CIRActiveIdleEng::HandlePropertyChangeL - Exiting." );
-	}
-
-// ---------------------------------------------------------------------------
-// CIRActiveIdleEng::HandlePropertyChangeErrorL
-// Invoked when an error has occured while fetching the new value of any listened P&S key.
-// ---------------------------------------------------------------------------
-//
-void CIRActiveIdleEng::HandlePropertyChangeErrorL( const TUid& /*aCategory*/,
-	TUint /*aKey*/, TInt aError )
-    {
-    IRLOG_DEBUG( "CIRActiveIdleEng::HandlePropertyChangeErrorL" );
-    if (aError < 0)
-    	{
-    	HandlePropertyChangeL(KUidActiveInternetRadioApp, 
-    		KIRPSDataApplicationRunning, EIRPSApplicationClosing);
-    	}
-    IRLOG_DEBUG( "CIRActiveIdleEng::HandlePropertyChangeErrorL" );
-    }
-
-
-
-

--- a/internetradio2.0/activeidleengsrc/iractiveidleengpubsub.cpp	Tue Jul 06 14:07:20 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,158 +0,0 @@
-/*
-* Copyright (c) 2006-2007 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:  ?Description
-*
-*/
-
-
-#include "iractiveidleengpubsub.h"
-#include "iractiveidleengpubsubnotifyhandler.h"
-#include "irdebug.h"
-
-// ==================== MEMBER FUNCTIONS ===================
-
-// ---------------------------------------------------------------------------
-// CIRActiveIdleEngPubSub::CIRActiveIdleEngPubSub
-// Constructor.
-// ---------------------------------------------------------------------------
-//
-CIRActiveIdleEngPubSub::CIRActiveIdleEngPubSub(
-	MIRActiveIdleEngPubSubNotifyHandler& aObserver, const TUid& aCategory, 
-	TUint aKey , const RProperty::TType aPropertyType): CActive( CActive::
-	EPriorityStandard ),  iPropertyType(aPropertyType),iObserver( aObserver ), 
-	iCategory( aCategory ), iKey( aKey )
-    {
-    }
-
-// ---------------------------------------------------------------------------
-// CIRActiveIdleEngPubSub::ConstructL
-// Second-phase constructor
-// ---------------------------------------------------------------------------
-//
-void CIRActiveIdleEngPubSub::ConstructL()
-    {
-    IRLOG_DEBUG( "CIRActiveIdleEngPubSub::ConstructL" );	
-    User::LeaveIfError( iProperty.Attach( iCategory, iKey ) );
-    CActiveScheduler::Add( this );
-    IRLOG_DEBUG( "CIRActiveIdleEngPubSub::ConstructL - Exiting." );	
-    }
-
-// ---------------------------------------------------------------------------
-// CIRActiveIdleEngPubSub::SecondConstructL()
-// Finalizes the construction of this object.
-// ---------------------------------------------------------------------------
-//
-void CIRActiveIdleEngPubSub::SecondConstructL()
-	{
-	IRLOG_DEBUG( "CIRActiveIdleEngPubSub::SecondConstructL" );	
-	if(!IsActive())	
-		{
-	    iProperty.Subscribe( iStatus );
-	    SetActive();	
-		}
-
-    IRLOG_DEBUG( "CIRActiveIdleEngPubSub::SecondConstructL - Exiting." );	
-	}
-
-// ---------------------------------------------------------------------------
-// CIRActiveIdleEngPubSub::NewL
-// Static constructor.
-// ---------------------------------------------------------------------------
-//
-CIRActiveIdleEngPubSub* CIRActiveIdleEngPubSub::NewL( 
-	MIRActiveIdleEngPubSubNotifyHandler& aObserver, const TUid& aCategory, 
-	TUint aKey, const RProperty::TType aPropertyType  )
-    {
-    IRLOG_DEBUG( "CIRActiveIdleEngPubSub::NewL" );	
-    CIRActiveIdleEngPubSub* self = new ( ELeave ) CIRActiveIdleEngPubSub( 
-    							aObserver, aCategory, aKey, aPropertyType );
-    CleanupStack::PushL( self );
-    self->ConstructL();
-    CleanupStack::Pop( self );
-    IRLOG_DEBUG( "CIRActiveIdleEngPubSub::NewL - Exiting." );	
-    return self;
-    }
-
-// ---------------------------------------------------------------------------
-// CIRActiveIdleEngPubSub::~CIRActiveIdleEngPubSub()
-// Destructor
-// ---------------------------------------------------------------------------
-//
-CIRActiveIdleEngPubSub::~CIRActiveIdleEngPubSub()
-    {
-    IRLOG_DEBUG( "CIRActiveIdleEngPubSub::~CIRActiveIdleEngPubSub" );	
-    Cancel();
-    iProperty.Close();
-    IRLOG_DEBUG( "CIRActiveIdleEngPubSub::~CIRActiveIdleEngPubSub - Exiting." );	
-    }
-
-// ---------------------------------------------------------------------------
-// CIRActiveIdleEngPubSub::DoCancel()
-// Invoked when the active object is cancelled.
-// ---------------------------------------------------------------------------
-//
-void CIRActiveIdleEngPubSub::DoCancel()
-    {
-    IRLOG_DEBUG( "CIRActiveIdleEngPubSub::DoCancel" );	
-    iProperty.Cancel();
-    IRLOG_DEBUG( "CIRActiveIdleEngPubSub::DoCancel - Exiting." );	
-    }
-
-// ---------------------------------------------------------------------------
-// CIRActiveIdleEngPubSub::RunL()
-// The function is called by the active scheduler when a request completion event occurs,
-// ---------------------------------------------------------------------------
-//
-void CIRActiveIdleEngPubSub::RunL()
-    {
-    IRLOG_DEBUG( "CIRActiveIdleEngPubSub::RunL" );	
-
-    iProperty.Subscribe( iStatus );
-    SetActive();
-    TInt err(KErrNone);
-    switch (iPropertyType)
-        {
-        // Subscribes the property of interger type 
-        case RProperty::EInt:
-	        {
-	        err = iProperty.Get( iValue );
-	        if (!err)
-            	{
-                iObserver.HandlePropertyChangeL( iCategory, iKey, iValue );
-             	}
-	        break;
-	        }
-	    // Subscribes the property of text type 
-	    case RProperty::ELargeText:
-	        {
-	        err = iProperty.Get( iText );
-	        if (!err)
-            	{
-                iObserver.HandlePropertyChangeL( iCategory, iKey, iText );
-             	}
-	        break;
-	        }
-	    default:
-	        {
-	        break;
-	        }
-        }
-    
-    if (err)
-    	{
-        iObserver.HandlePropertyChangeErrorL(iCategory, iKey, err);
-    	}
-	
-    IRLOG_DEBUG( "CIRActiveIdleEngPubSub::RunL - Exiting." );	
-    }

--- a/internetradio2.0/activeidleinc/iractiveidle.h	Tue Jul 06 14:07:20 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,232 +0,0 @@
-/*
-* Copyright (c) 2006-2007 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 content publisher for Internet Radio Active Idle plugin
-*
-*/
-
-
-#ifndef IRACTIVEIDLE_H
-#define IRACTIVEIDLE_H
-
-#include <aicontentpublisher.h>
-#include <aieventhandlerextension.h>
-#include <aipropertyextension.h>
-
-#include "iractiveidleengnotifyhandler.h"
-
-class CIRActiveIdleEng;
-class CIRActiveIdleStateDetector;
-class CIRMetaData;
-class MAiContentItemIterator;
-class MAiContentObserver;
-
-#define KMAXLENGTH 256
-
-/**
- *  Internet Radio Active Idle plugin
- *
- *  @lib iractiveidle.lib
- */
-class CIRActiveIdle : public CAiContentPublisher, 
-                      public MAiPropertyExtension,
-                      public MAiEventHandlerExtension,
-                      public MIRActiveIdleEngNotifyHandler
-    {
-public:
-
-    /**
-     * Two-phased constructor.
-     */
-    static CIRActiveIdle* NewL();
-
-    /**
-     * Destructor.
-     */
-    /*lint -save -e1509 (Warning -- base class destructor for class 'MAiPropertyExtension' is not virtual -- Effective C++ #14)
-                        (Warning -- base class destructor for class 'MAiEventHandlerExtension' is not virtual -- Effective C++ #14)*/
-    virtual ~CIRActiveIdle();
-    /*lint -restore*/
-
-	// from base class CAiContentPublisher
-	/**
-     *void Resume( TAiTransitionReason aReason )
-     *To actively publish data to observers. 
-     *@param aReason Defines set of reasons for plug-in state change.
-     */
-    void Resume( TAiTransitionReason aReason );
-    
-    /**
-     *void Suspend( TAiTransitionReason aReason )
-     *Cancels outstanding asynchronous operations
-     *@param aReason Defines set of reasons for plug-in state change.
-     */
-    void Suspend( TAiTransitionReason aReason );
-    
-    /**
-     *void Stop( TAiTransitionReason aReason )
-     *Frees all memory and CPU resources and close all open files.
-     *@param aReason Defines set of reasons for plug-in state change.
-     */
-    void Stop( TAiTransitionReason aReason );
-    
-    /**
-     *void SubscribeL( MAiContentObserver& aObserver )
-     *Adds the content observer / subscriber to plug-in.
-     *@param aObserver The observer to be notified of the changes in the keys.
-     */
-    void SubscribeL( MAiContentObserver& aObserver );
-    
-    /**
-     *void ConfigureL( RAiSettingsItemArray& aSettings )
-     *Configures the plug-in.
-     *@param aSettings setting items defined in the UI definition.
-     *This plugin takes ownership of the MAiPluginSettings objects 
-     *in the array.
-     */
-    void ConfigureL( RAiSettingsItemArray& aSettings );
-    
-    /**
-     *TAny* Extension( TUid aUid )
-     *Returns interface extension.
-     *@param aUid 
-     *@return Returns pointer to extension type
-     */
-    TAny* Extension( TUid aUid );
-
-	// from base class MAiPropertyExtension
-	/**
-     *TAny* GetPropertyL( TInt aProperty )
-     *Reads a plugin property.
-     *@param aProperty identification of property.
-     *@return Pointer to property value
-     */
-    TAny* GetPropertyL( TInt aProperty );
-    
-    /**
-     *void SetPropertyL( TInt aProperty, TAny* aValue )
-     *Sets a plugin property
-     *@param aProperty  identification of property.
-     *@param aValue contains pointer to property value.
-     */
-    void SetPropertyL( TInt aProperty, TAny* aValue );
-
-	// from base class MAiEventHandlerExtension
-	/**
-     *void HandleEvent( TInt aEvent, const TDesC& aParam )
-     *Sets a plugin property
-     *@param aEvent unique identifier of event from plug-in content model.
-     *@param aParam Parameters associated with event
-     */
-    void HandleEvent( TInt aEvent, const TDesC& aParam );
-
-// from base class MIRActiveIdleEngNotifyHandler
-
-    void HandleChannelChangeL();
-    void HandleMetaDataReceivedL( const CIRMetaData& aMetaData );
-    void HandleVolumeChangeL( const TInt aVolume );
-    void HandlePlayStopL( TIRStopPlayState aState );
-    void HandleApplicationRunningStateChangeL(  const TIRPSApplicationRunningState aRunningState );
-    void HandleBufferingStateL(TIRBufferingState aState );
-    
-   private:
-
-    /**
-     * Constructor.
-     */
-    CIRActiveIdle();
-
-    /**
-     * Second-phase constructor.
-     */
-    void ConstructL();
-
-    /**
-     * Initialize resource file for loading resources.
-     */
-    void InitializeResourceLoadingL();
-
-    /**
-     * Loads the required resources.
-     */
-    void LoadResourcesL();
-
-    /**
-     * Cleans all data fields from plugin.
-     */
-    void Clean();
-
-    /**
-     * Starts an application.
-     * @param aUid The uid value of the application
-     * @param aCommandLine The command line (if any) to be passed to the process
-     */
-    void StartApplicationL( const TUid& aUid, const TDesC8& aCommandLine );
-
-private: // data
-
-    /** IR's Active Idle engine. */
-    CIRActiveIdleEng*                   iEngine;
-
-    /** 
-     * Detects Internet Radio process termination
-     * Owned.
-     */
-    CIRActiveIdleStateDetector*         iIRTerminationDetector;
-    
-    /**
-     * Current meta data information.
-     * Owned.
-     */
-    CIRMetaData*                        iMetaData;
-     
-    /** Observers that are informed about changes state or new content available. */
-    RPointerArray<MAiContentObserver>   iObservers;
-    /** */
-    TAiPublisherInfo                    iInfo;
-    /** */
-    MAiContentItemIterator*             iContent;
-    /** */
-    MAiContentItemIterator*             iResources;
-    /** */
-    MAiContentItemIterator*             iEvents;
-    
-    /** Active Idle's resource offset. */
-    TInt                                iActiveIdleResourceOffset;
-    /** Internet Radio application running state */
-    TIRPSApplicationRunningState        iRunningState;
-    
- 	// Meta data info
-    TBuf 	<KMAXLENGTH> iChannelName;
-    TInt 	iPresetIndex;
-    
-    //Application volume level
-    enum TIRPSVolumeLevel
-    	{
-    	EVolumeLevel0 = 0,
-	    EVolumeLevel1,      
-	    EVolumeLevel2,   
-	    EVolumeLevel3,   
-	    EVolumeLevel4,   
-	    EVolumeLevel5,   
-	    EVolumeLevel6,   
-	    EVolumeLevel7,   
-	    EVolumeLevel8,   
-	    EVolumeLevel9,   
-	    EVolumeLevel10                    
-	    };
-    
-    TInt                                iLastSetVolume;
-    };
-
-#endif // IRACTIVEIDLE_H