--- a/common/radio_global.h	Tue Aug 31 15:15:02 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,236 +0,0 @@
-/*
-* Copyright (c) 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:
-*
-*/
-
-#ifndef RADIO_GLOBAL_H_
-#define RADIO_GLOBAL_H_
-
-// System includes
-#include <QtGlobal>
-#include <qnamespace.h>
-
-// Constants
-
-/**
- * Radio frequency multiplier
- */
-const int FREQUENCY_MULTIPLIER = 1000000;
-
-/**
- * Desired amount of steps in the volume control in the UI
- */
-const int MAXIMUM_VOLUME_LEVEL = 20;
-
-/**
- * Default volume level that is used when no previous setting exists
- */
-const int DEFAULT_VOLUME_LEVEL = 4;
-
-/**
- * UIDs for checking the offline mode
- * Values copied from CoreApplicationUIsSDKCRKeys.h
- */
-const long int CENREP_CORE_APPLICATION_UIS = 0x101F876C;
-const unsigned long int ID_NETWORK_CONNECTION_ALLOWED = 0x00000001;
-enum NetworkConnectionAllowed { NetworkNotAllowed = 0, NetworkAllowed };
-
-/**
- * Roles used when interacting with the radio station model
- */
-namespace RadioRole
-{
-    enum Role
-    {
-        RadioStationRole = Qt::UserRole + 1,
-        ToggleFavoriteRole,
-        IsFavoriteRole
-    };
-}
-
-/**
- * Radio Text Plus tag ids
- */
-namespace RtPlus
-{
-    enum Tag
-    {
-        Dummy = 0,
-        Title = 1,
-        Artist = 4,
-        Band = 9,
-        Homepage = 39
-    };
-}
-
-namespace GenreTarget
-{
-    enum Target
-    {
-        Carousel,
-        StationsList,
-        HomeScreen
-    };
-}
-
-namespace Seek
-{
-    enum Direction
-    {
-        Down,
-        Up
-    };
-
-    enum State
-    {
-        NotSeeking,
-        SeekingUp,
-        SeekingDown
-    };
-}
-
-namespace Scan
-{
-    enum Status
-    {
-        NotScanning,
-        ScanningInMainView,
-        ScanningInStationsView
-    };
-}
-
-namespace StationSkip
-{
-    enum Mode
-    {
-        Previous,
-        Next,
-        PreviousFavorite,
-        NextFavorite
-    };
-}
-
-namespace TuneReason
-{
-    enum Reason
-    {
-        Unspecified,
-        FrequencyStrip,
-        ManualSeekUpdate,
-        ManualSeekTune,
-        StationCarousel,
-        StationsList,
-        Skip,
-        Seek,
-        StationScanInitialization,
-        StationScan,
-        StationScanFinalize,
-        StationScanNoStationsFound,
-        SkipFromEngine,
-        SkipFromWidget
-    };
-}
-
-namespace RadioRegion
-{
-    enum Region
-    {
-        None = -1,
-        Default,
-        Japan,
-        America,
-        Poland
-    };
-}
-
-namespace GenreEurope
-{
-    enum Europe
-    {
-        RdsNone,
-        RdsNews,
-        RdsCurrentAffairs,
-        RdsInformation,
-        RdsSport,
-        RdsEducation,
-        RdsDrama,
-        RdsCulture,
-        RdsScience,
-        RdsVariedSpeech,
-        RdsPopMusic,
-        RdsRockMusic,
-        RdsEasyListening,
-        RdsLightClassical,
-        RdsSeriousClassical,
-        RdsOtherMusic,
-        RdsWeather,
-        RdsFinance,
-        RdsChildrensProgrammes,
-        RdsSocialAffairs,
-        RdsReligion,
-        RdsPhoneIn,
-        RdsTravel,
-        RdsLeisure,
-        RdsJazzMusic,
-        RdsCountryMusic,
-        RdsNationalMusic,
-        RdsOldiesMusic,
-        RdsFolkMusic,
-        RdsDocumentary,
-        RdsAlarmTest,
-        RdsAlarm
-    };
-}
-
-namespace GenreAmerica
-{
-    enum America
-    {
-        RbdsNone,
-        RbdsNews,
-        RbdsInformation,
-        RbdsSports,
-        RbdsTalk,
-        RbdsRock,
-        RbdsClassicRock,
-        RbdsAdultHits,
-        RbdsSoftRock,
-        RbdsTop40,
-        RbdsCountry,
-        RbdsOldies,
-        RbdsSoft,
-        RbdsNostalgia,
-        RbdsJazz,
-        RbdsClassical,
-        RbdsRhythmAndBlues,
-        RbdsSoftRhythmAndBlues,
-        RbdsLanguage,
-        RbdsReligiousMusic,
-        RbdsReligiousTalk,
-        RbdsPersonality,
-        RbdsPublic,
-        RbdsCollege,
-        RbdsUnassigned1,
-        RbdsUnassigned2,
-        RbdsUnassigned3,
-        RbdsUnassigned4,
-        RbdsUnassigned5,
-        RbdsWeather,
-        RbdsEmergencyTest,
-        RbdsEmergency
-    };
-}
-
-#endif // RADIO_GLOBAL_H_

--- a/common/radiologger.cpp	Tue Aug 31 15:15:02 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,204 +0,0 @@
-/*
-* Copyright (c) 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:
-*
-*/
-
-// System includes
-#include <QDebug>
-
-// User includes
-#include "radiologger.h"
-
-/*!
- *
- */
-void RadioLogger::initCombinedLogger()
-{
-#if defined LOGGING_ENABLED && defined COMBINE_WITH_ENGINE_LOGGER && !defined BUILD_WIN32
-    TRAP_IGNORE( RadioEngineUtils::InitializeL() );
-    if ( !MRadioEngineLogger::Logger() ) {
-        qDebug() << "FMRadioUi: Cannot combine logs with engine. Engine logger not active";
-    }
-#endif // LOGGING_ENABLED
-}
-
-/*!
- *
- */
-void RadioLogger::releaseCombinedLogger()
-{
-#if defined LOGGING_ENABLED && defined COMBINE_WITH_ENGINE_LOGGER && !defined BUILD_WIN32
-    RadioEngineUtils::Release();
-#endif // LOGGING_ENABLED
-}
-
-/*!
- *    enum Mode { Normal, MethodEnter, MethodExit, DecIndent };
- */
-void RadioLogger::logMsg( const char* msg, Mode mode )
-{
-    Q_UNUSED( msg );
-    Q_UNUSED( mode );
-#if defined LOGGING_ENABLED && defined COMBINE_WITH_ENGINE_LOGGER && !defined BUILD_WIN32
-    MRadioEngineLogger* logger = MRadioEngineLogger::Logger();
-    if ( logger ) {
-        if ( mode == RadioLogger::Normal ) {
-            logger->AddIndent(KMarkerUi()).Add( msg ).Commit();
-        } else if ( mode == RadioLogger::MethodEnter ) {
-            logger->AddIndentClear( KMarkerUi() ).Add( msg ).Commit();
-            logger->IncIndent();
-        } else if ( mode == RadioLogger::MethodExit ) {
-            logger->DecIndent();
-            logger->AddIndentClear( KMarkerUi() ).Add( msg ).Commit();
-        } else if ( mode == RadioLogger::DecIndent ) {
-            logger->DecIndent();
-        } else {}
-    }
-#endif // LOGGING_ENABLED
-}
-
-
-#ifdef LOGGING_ENABLED
-
-#include <QString>
-#include <QFile>
-#include <QTextStream>
-#include <QDateTime>
-
-#ifdef TRACE_TO_FILE
-    QFile mDebugFile;
-    bool mFilterByLogMarker = false;
-#endif
-
-const char* KLogEnter = "\\ %s";
-const char* KLogExit = "/ %s";
-const char* KLogExitRet = "/ %s, Returning %s";
-const char* KLogExitException = "/ %s, Exception raised";
-const char* KLogLine = "| ";
-
-/*!
- *
- */
-#if defined(__WINS__)
-static QString formatString( const char* format, long val )
-{
-    if ( strcmp( format, "" ) == 0 ) {
-        return "";
-    }
-    QString string;
-    string.sprintf( format, val );
-    return string;
-}
-#endif
-
-/*!
- *
- */
-MethodLogger::MethodLogger( const char* function, const char* format ) :
-    mFunction( function ),
-    mFormat( format )
-{
-    QString msg;
-    msg.sprintf( KLogEnter, mFunction );
-    WRITELOG_METHOD_ENTER( msg );
-}
-
-/*!
- *
- */
-MethodLogger::~MethodLogger()
-{
-    if ( std::uncaught_exception() ) {
-        QString msg;
-        msg.sprintf( KLogExitException, mFunction );
-        WRITELOG_METHOD_EXIT( msg );
-    } else {
-        QString msg;
-        if ( strlen( mFormat ) > 0 ) {
-            #if defined(__WINS__)
-
-                long retVal = 0;
-                _asm( mov retVal, ebx );
-                msg.sprintf( KLogExitRet, mFunction, formatString( mFormat, retVal ) );
-                WRITELOG_METHOD_EXIT( msg );
-
-            #else
-                msg.sprintf( KLogExit, mFunction );
-                WRITELOG_METHOD_EXIT( msg );
-            #endif
-        } else {
-            msg.sprintf( KLogExit, mFunction );
-            WRITELOG_METHOD_EXIT( msg );
-        }
-    }
-}
-#else
-
-MethodLogger::MethodLogger( const char*, const char* )
-{
-}
-        
-MethodLogger::~MethodLogger()
-{
-}
-
-#endif // LOGGING_ENABLED
-
-
-#ifdef TRACE_TO_FILE
-
-/*!
- *
- */
-void FileLogger::installMessageHandler( const QString& fileName, bool filterByMarker )
-{
-    mDebugFile.setFileName( fileName );
-    mFilterByLogMarker = filterByMarker;
-
-    mDebugFile.open( QIODevice::Text | QIODevice::WriteOnly );
-
-    if ( mDebugFile.isOpen() ) {
-        qInstallMsgHandler( FileLogger::handleMessage );
-    }
-}
-
-/*!
- *
- */
-void FileLogger::uninstallMessageHandler()
-{
-    if ( mDebugFile.isOpen() ) {
-        qInstallMsgHandler( 0 );
-        mDebugFile.close();
-    }
-}
-
-/*!
- *
- */
-void FileLogger::handleMessage( QtMsgType type, const char* msg )
-{
-    QTextStream debugStream( &mDebugFile );
-    QDateTime dateTime( QDateTime::currentDateTime() );
-
-    if ( type == QtDebugMsg ) {
-        QString message( msg );
-        if ( mFilterByLogMarker && message.contains( QString( LOGMARKER ) ) )
-        {
-            debugStream << dateTime.toString("yyyy-MM-dd hh:mm:ss.zzz") << " : " << message << endl;
-        }
-    }
-}
-#endif // TRACE_TO_FILE

--- a/common/radiologger.h	Tue Aug 31 15:15:02 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,363 +0,0 @@
-/*
-* Copyright (c) 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:
-*
-*/
-
-#ifndef _RADIOLOGGER_H_
-#define _RADIOLOGGER_H_
-
-// System includes
-#include <QObject>
-
-/**
- * Logging level macro definitions
- * Level 1 - No level macro needed. The trace is shown when logging is on.
- * Level 2 - Wrap log line with LEVEL2 macro. Traces of level 1 and 2 are shown.
- * Level 3 - Wrap log line with LEVEL3 macro. Traces of level 1, 2 and 3 are shown.
- */
-#if LOGGING_LEVEL == 2
-#   define LEVEL2( expr ) expr
-#   define LEVEL3( expr )
-#elif LOGGING_LEVEL == 3
-#   define LEVEL2( expr ) expr
-#   define LEVEL3( expr ) expr
-#else
-#   define LEVEL2( expr )
-#   define LEVEL3( expr )
-#endif
-
-#if LOGGED_COMPONENT == 2
-#   define LOGMARKER "FMRadioHsWidget:"
-#   define WRAPPER_DLL_EXPORT
-#else
-#   define LOGMARKER "FMRadio:"
-#   ifdef BUILD_WRAPPER_DLL
-#       define WRAPPER_DLL_EXPORT Q_DECL_EXPORT
-#   else
-#       define WRAPPER_DLL_EXPORT Q_DECL_IMPORT
-#   endif
-#endif
-
-class WRAPPER_DLL_EXPORT RadioLogger
-{
-public:
-
-    enum Mode { Normal, MethodEnter, MethodExit, DecIndent };
-
-    static void initCombinedLogger();
-    static void releaseCombinedLogger();
-
-    static void logMsg( const char* msg, Mode mode = Normal );
-
-private:
-    RadioLogger();
-    ~RadioLogger();
-};
-
-// ============================================================================
-// START TIMESTAMP LOGGING
-// ============================================================================
-
-#ifdef TIMESTAMP_LOGGING_ENABLED
-
-#include <QTime>
-#include <QDebug>
-
-/**
- * Timestamp logging macro.
- * When the macro is defined, timestamp logging is on
- *
- * Example. These lines in the code...
- *  LOG_TIMESTAMP( "Start operation" );
- *  ...
- *  LOG_TIMESTAMP( "End operation" );
- *
- * ... print the following log lines
- *  FMRadio: Start operation "14:13:09.042"
- *  FMRadio: End operation "14:13:09.250"
- */
-//#define LOG_TIMESTAMP(comment) do{ qDebug() << LOGMARKER << comment << QTime::currentTime().toString("hh:mm:ss.zzz"); }while(0)
-#define LOG_TIMESTAMP(comment) LOG_FORMAT( comment ## " %s", GETSTRING( QTime::currentTime().toString("hh:mm:ss.zzz") ) )
-
-#else
-
-#define LOG_TIMESTAMP(comment)
-
-#endif // TIMESTAMP_LOGGING_ENABLED
-
-// ============================================================================
-// END TIMESTAMP LOGGING
-// ============================================================================
-
-// ============================================================================
-// START FULL LOGGING
-// ============================================================================
-
-#ifdef LOGGING_ENABLED
-
-#include <QtGlobal>
-#include <QDebug>
-
-// Macro to hide a function variable that is used only when debugging is enabled.
-// Expands to the variable name when debugging is enabled and to nothing when it is not
-#if LOGGING_LEVEL == 2
-#   define DEBUGVAR( var ) var
-#   define DEBUGVAR2( var ) var
-#   define DEBUGVAR3( var )
-#elif LOGGING_LEVEL == 3
-#   define DEBUGVAR( var ) var
-#   define DEBUGVAR2( var ) var
-#   define DEBUGVAR3( var ) var
-#else
-#   define DEBUGVAR( var ) var
-#   define DEBUGVAR2( var )
-#   define DEBUGVAR3( var )
-#endif
-
-// UI logs can be combined with engine logs by making the UI feed its log prints into
-// the engine logger. This requires that we initialize the radio engine utils right here
-// because the engine won't start up until much later. This is a bit ugly since the macros
-// call Symbian code directly, but it was considered to be worth it to see UI and engine
-// traces in the same file.
-#if defined COMBINE_WITH_ENGINE_LOGGER && defined LOGGING_ENABLED && !defined BUILD_WIN32
-#   include "../../../radioengine/utils/api/mradioenginelogger.h"
-#   include "../../../radioengine/utils/api/radioengineutils.h"
-#   define WRITELOG(msg) RadioLogger::logMsg( msg );
-#   define WRITELOG_METHOD_ENTER(msg) RadioLogger::logMsg( GETSTRING( msg ), RadioLogger::MethodEnter );
-#   define WRITELOG_METHOD_EXIT(msg) RadioLogger::logMsg( GETSTRING( msg ), RadioLogger::MethodExit );
-#   define LOGGER_DEC_INDENT RadioLogger::logMsg( "", RadioLogger::DecIndent );
-#   define WRITELOG_GETSTRING(msg) WRITELOG( GETSTRING( msg ) )
-#   define INIT_COMBINED_LOGGER RadioLogger::initCombinedLogger();
-#   define RELEASE_COMBINED_LOGGER RadioLogger::releaseCombinedLogger();
-#else
-#   define WRITELOG(msg) qDebug() << LOGMARKER << msg;
-#   define WRITELOG_METHOD_ENTER(msg) WRITELOG(msg)
-#   define WRITELOG_METHOD_EXIT(msg) WRITELOG(msg)
-#   define WRITELOG_GETSTRING(msg) WRITELOG(msg)
-#   define LOGGER_INC_INDENT
-#   define LOGGER_DEC_INDENT
-#   define INIT_COMBINED_LOGGER
-#   define RELEASE_COMBINED_LOGGER
-#endif
-
-// Macro that simply logs a string
-// Example:
-// LOG( "This is a test" );
-#define LOG(string) do{ WRITELOG( string ) }while(0)
-
-// Helper macro to get a const char* out of a QString so that it can be logged. Can be used with LOG_FORMAT()
-#define GETSTRING(qstring) qstring.toAscii().constData()
-
-// Macro that logs a string with multiple parameters
-// Examples:
-// LOG_FORMAT( "This is an integer %d, and this is a float with two digits %.2f", 42, 3.14 );
-// LOG_FORMAT( "This is a QString %s", GETSTRING(someQString) );
-#define LOG_FORMAT(fmt,args...) do{ QString tmp; WRITELOG_GETSTRING( tmp.sprintf(fmt,args) ) }while(0)
-
-// Macro that logs function enter, exit and exception
-// Example (Simply put it in the beginning of a function):
-// LOG_METHOD;
-// Output:
-// -> SomeFunction(int,const char*)
-// <- SomeFunction(int,const char*)
-// <- SomeFunction(int,const char*): Exception raised!
-#define LOG_METHOD MethodLogger ___methodLogger( __PRETTY_FUNCTION__, "" )
-
-// Same as the previous function logging macro with the addition of logging the return value
-// Note! The return value can only be retrieved in the emulator.
-// Example (Simply put it in the beginning of a function):
-// LOG_METHOD_RET( "%d" );
-// Output:
-// -> SomeFunction(int,const char*)
-// <- SomeFunction(int,const char*) returning 42
-#define LOG_METHOD_RET(fmt) MethodLogger ___methodLogger( __PRETTY_FUNCTION__, fmt )
-
-// Logs function enter but does not log exit or leave. This is meant to be lighter than LOG_METHOD macro
-#define LOG_METHOD_ENTER LOG_FORMAT( "Enter: %s", __PRETTY_FUNCTION__ )
-
-// Assert macro for logging. If the condition is false, the expression is performed
-// Example:
-// LOG_ASSERT( thisMustBeTrue, LOG_FORMAT( "OMG! That was not true: %d", thisMustBeTrue ) );
-#define LOG_ASSERT(cond,expr) do{ if (!cond) { expr; } }while(0)
-
-// Macro to log slot function caller by its class name.
-#define LOG_SLOT_CALLER do { \
-        QObject* caller = sender(); \
-        if ( caller ) { \
-            LOG_FORMAT( "SLOT %s called by %s. Objectname: %s", __PRETTY_FUNCTION__, \
-                caller->metaObject()->className(), GETSTRING( caller->objectName() ) ); \
-        } else { \
-            LOG_FORMAT( "SLOT %s called as regular function. ", __PRETTY_FUNCTION__ ); \
-        } \
-    } while (0)
-
-// Class declaration
-class WRAPPER_DLL_EXPORT MethodLogger
-{
-public:
-
-    MethodLogger( const char* function, const char* format );
-    ~MethodLogger();
-
-private:
-
-    const char* mFunction;
-    const char* mFormat;
-
-};
-
-#else // LOGGING_ENABLED
-
-#   define LOG(string)
-#   define GETSTRING(qstring)
-#   define LOG_FORMAT(fmt,args...)
-#   define LOG_METHOD
-#   define LOG_METHOD_RET(fmt)
-#   define LOG_METHOD_ENTER
-#   define LOG_ASSERT(cond,expr)
-#   define DEBUGVAR(a)
-#   define DEBUGVAR2(a)
-#   define DEBUGVAR3(a)
-#   define LOG_SLOT_CALLER
-#   define INIT_COMBINED_LOGGER
-#   define RELEASE_COMBINED_LOGGER
-
-
-// Dummy class
-class WRAPPER_DLL_EXPORT MethodLogger
-{
-public:
-    MethodLogger( const char*, const char* );
-    ~MethodLogger();
-};
-
-#endif // LOGGING_ENABLED
-
-#ifdef TRACE_TO_FILE
-
-#   define INSTALL_MESSAGE_HANDLER FileLogger::installMessageHandler(QString(TRACE_OUTPUT_FILE), FILTER_BY_LOGMARKER);
-#   define UNINSTALL_MESSAGE_HANDLER FileLogger::uninstallMessageHandler();
-
-// Class declaration
-class WRAPPER_DLL_EXPORT FileLogger
-{
-public:
-
-    static void installMessageHandler( const QString& fileName, bool filterByMarker = true );
-    static void uninstallMessageHandler();
-
-private:
-
-    static void handleMessage( QtMsgType type, const char* msg );
-
-};
-
-#else
-#   define INSTALL_MESSAGE_HANDLER
-#   define UNINSTALL_MESSAGE_HANDLER
-#endif // TRACE_TO_FILE
-
-// ============================================================================
-// END FULL LOGGING
-// ============================================================================
-
-class Radio
-{
-    Radio();
-    ~Radio();
-public:
-
-    // ============================================================================
-    // SIGNAL/SLOT CONNECT CHECKER
-    // ============================================================================
-    static bool connect( const QObject* sender, const char* signal,
-                         const QObject* receiver, const char* member,
-                         Qt::ConnectionType type = Qt::AutoConnection )
-    {
-        bool connected = QObject::connect( sender, signal, receiver, member, type );
-
-        #ifdef CONNECT_TEST_MODE
-
-        if ( !connected ) {
-            LOG( "Failed to make a signal-slot connection!" );
-            LOG_FORMAT( "sender: %s", sender->metaObject()->className() );
-            LOG_FORMAT( "signal: %s", signal );
-            LOG_FORMAT( "receiver: %s", receiver->metaObject()->className() );
-            LOG_FORMAT( "slot/signal: %s", signal );
-
-            #if CONNECT_TEST_MODE == 2
-                Q_ASSERT( false );
-            #endif
-
-            // ----------------------------------------------------------------
-            // SIGNAL-SLOT CONNECT FAILED!
-            // ----------------------------------------------------------------
-        }
-
-        #endif
-
-        return connected;
-    }
-
-    // ============================================================================
-    // SIGNAL/SLOT DISCONNECT CHECKER
-    // ============================================================================
-    static bool disconnect( const QObject* sender, const char* signal,
-                            const QObject* receiver, const char* member )
-    {
-        bool disconnected = QObject::disconnect( sender, signal, receiver, member );
-
-        #ifdef CONNECT_TEST_MODE
-
-        if ( !disconnected ) {
-            LOG( "Failed to disconnect a signal-slot connection!" );
-            LOG_FORMAT( "sender: %s", sender->metaObject()->className() );
-            LOG_FORMAT( "signal: %s", signal );
-            LOG_FORMAT( "receiver: %s", receiver->metaObject()->className() );
-            LOG_FORMAT( "slot/signal: %s", signal );
-
-            #if CONNECT_TEST_MODE == 2
-                Q_ASSERT( false );
-            #endif
-
-            // ----------------------------------------------------------------
-            // SIGNAL-SLOT DISCONNECT FAILED!
-            // ----------------------------------------------------------------
-        }
-
-        #endif
-
-        return disconnected;
-    }
-};
-
-#ifdef ENABLE_ASSERTS
-
-    #define RADIO_ASSERT(cond,where,what) Q_ASSERT_X(cond,where,what)
-
-#else
-#   ifdef LOGGING_ENABLED
-#       define RADIO_ASSERT(cond,where,what) \
-            do { \
-                if ( !cond ) { \
-                    LOG_FORMAT( "ASSERT Failed! %s, %s", where, what ); \
-                } \
-            } while ( false )
-#   else
-#       define RADIO_ASSERT(cond,where,what)
-#   endif // LOGGING_ENABLED
-#endif // ENABLE_ASSERTS
-
-#endif // _RADIOLOGGER_H_

--- a/common/radionotificationdata.h	Tue Aug 31 15:15:02 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,69 +0,0 @@
-/*
-* Copyright (c) 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:
-*
-*/
-
-#ifndef RADIONOTIFICATIONDATA_H
-#define RADIONOTIFICATIONDATA_H
-
-// System includes
-#include <QVariant>
-
-class RadioNotificationData
-{
-public:
-
-    RadioNotificationData() : mType( 0 ) {}
-    RadioNotificationData( int type, const QVariant& data ) :
-        mType( type ),
-        mData( data )
-    {}
-
-    virtual ~RadioNotificationData() {}
-
-    #ifndef BUILD_WIN32
-    template <typename Stream> void serialize( Stream& stream ) const;
-    template <typename Stream> void deserialize( Stream& stream );
-    #endif // BUILD_WIN32
-
-    int         mType;
-    QVariant    mData;
-
-};
-
-#ifndef BUILD_WIN32
-
-Q_DECLARE_USER_METATYPE(RadioNotificationData)
-
-template <typename Stream> void RadioNotificationData::serialize( Stream& stream ) const
-{
-    stream << mType;
-    stream << mData;
-}
-
-template <typename Stream> void RadioNotificationData::deserialize( Stream& stream )
-{
-    stream >> mType;
-    stream >> mData;
-}
-
-Q_IMPLEMENT_USER_METATYPE(RadioNotificationData)
-
-#else
-
-Q_DECLARE_METATYPE( RadioNotificationData )
-
-#endif // BUILD_WIN32
-#endif // RADIONOTIFICATIONDATA_H

--- a/common/radioservicedef.h	Tue Aug 31 15:15:02 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,79 +0,0 @@
-/*
-* Copyright (c) 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:
-*
-*/
-
-#ifndef RADIOSERVICES_H
-#define RADIOSERVICES_H
-
-#include <QLatin1String>
-
-static const QLatin1String RADIO_SERVICE( "fmradio" );
-static const QLatin1String RADIO_CONTROL_SERVICE( "com.nokia.symbian.IRadioControl" );
-static const QLatin1String RADIO_CONTROL_SERVICE_OPERATION( "command(int)" );
-static const QLatin1String RADIO_MONITOR_SERVICE( "com.nokia.symbian.IRadioMonitor" );
-static const QLatin1String RADIO_MONITOR_SERVICE_OPERATION( "requestNotifications()" );
-static const QLatin1String RADIO_MONITOR_SERVICE_REFRESH_OPERATION( "requestAllData()" );
-
-
-const long KRadioPSUid = 0x101FF976;
-const unsigned long KRadioStartupKey = 0x00000014;
-
-const quint32 NOKIA_VENDORID = VID_DEFAULT;
-
-namespace RadioServiceCommand
-{
-    enum CommandId
-    {
-        PowerOn,
-        PowerOff,
-        Previous,
-        Next,
-        SeekUp,
-        SeekDown,
-        Foreground,
-        Background,
-        Mute,
-        UnMute
-    };
-}
-
-namespace RadioServiceNotification
-{
-    enum Type {
-        FavoriteCount = 1,
-        CurrentIsFavorite,
-        RadioStatus,
-        Frequency,
-        Name,
-        Genre,
-        RadioText,
-        DynamicPS
-    };
-}
-
-namespace RadioStatus
-{
-    enum Status {
-        UnSpecified,
-        Playing,
-        Muted,
-        Seeking,
-        NoAntenna,
-        PoweringOff
-    };
-}
-
-#endif // RADIOSERVICES_H

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/fmradio/activeidleengine/bwins/fmradioactiveidleengine200u.def	Wed Sep 01 12:30:32 2010 +0100
@@ -0,0 +1,19 @@
+EXPORTS
+	?FrequencyDecimalCount@CFMRadioActiveIdleEngine@@QBE?AW4TFMRadioPSFrequencyDecimalCount@@XZ @ 1 NONAME ; enum TFMRadioPSFrequencyDecimalCount CFMRadioActiveIdleEngine::FrequencyDecimalCount(void) const
+	?SetMuteState@CFMRadioActiveIdleEngine@@QBEXW4TFMRadioPSRadioMuteState@@@Z @ 2 NONAME ; void CFMRadioActiveIdleEngine::SetMuteState(enum TFMRadioPSRadioMuteState) const
+	?Channel@CFMRadioActiveIdleEngine@@QBEHXZ @ 3 NONAME ; int CFMRadioActiveIdleEngine::Channel(void) const
+	??1CFMRadioActiveIdleEngine@@UAE@XZ @ 4 NONAME ; CFMRadioActiveIdleEngine::~CFMRadioActiveIdleEngine(void)
+	?Cancel@CFMRadioActiveIdleEngine@@QAEXXZ @ 5 NONAME ; void CFMRadioActiveIdleEngine::Cancel(void)
+	?ApplicationRunningState@CFMRadioActiveIdleEngine@@QBE?AW4TFMRadioPSApplicationRunningState@@XZ @ 6 NONAME ; enum TFMRadioPSApplicationRunningState CFMRadioActiveIdleEngine::ApplicationRunningState(void) const
+	?AdjustRadioVolume@CFMRadioActiveIdleEngine@@QBEXW4TFMRadioPSAdjustVolume@@@Z @ 7 NONAME ; void CFMRadioActiveIdleEngine::AdjustRadioVolume(enum TFMRadioPSAdjustVolume) const
+	?MuteState@CFMRadioActiveIdleEngine@@QBE?AW4TFMRadioPSRadioMuteState@@XZ @ 8 NONAME ; enum TFMRadioPSRadioMuteState CFMRadioActiveIdleEngine::MuteState(void) const
+	?ChannelName@CFMRadioActiveIdleEngine@@QBEABVTDesC16@@XZ @ 9 NONAME ; class TDesC16 const & CFMRadioActiveIdleEngine::ChannelName(void) const
+	?TuningState@CFMRadioActiveIdleEngine@@QBE?AW4TFMRadioPSTuningState@@XZ @ 10 NONAME ; enum TFMRadioPSTuningState CFMRadioActiveIdleEngine::TuningState(void) const
+	?NewL@CFMRadioActiveIdleEngine@@SAPAV1@AAVMFMRadioActiveIdleEngineNotifyHandler@@@Z @ 11 NONAME ; class CFMRadioActiveIdleEngine * CFMRadioActiveIdleEngine::NewL(class MFMRadioActiveIdleEngineNotifyHandler &)
+	?PowerState@CFMRadioActiveIdleEngine@@QBE?AW4TFMRadioPSRadioPowerState@@XZ @ 12 NONAME ; enum TFMRadioPSRadioPowerState CFMRadioActiveIdleEngine::PowerState(void) const
+	?AntennaStatus@CFMRadioActiveIdleEngine@@QBE?AW4TFMRadioPSHeadsetStatus@@XZ @ 13 NONAME ; enum TFMRadioPSHeadsetStatus CFMRadioActiveIdleEngine::AntennaStatus(void) const
+	?Frequency@CFMRadioActiveIdleEngine@@QBEHXZ @ 14 NONAME ; int CFMRadioActiveIdleEngine::Frequency(void) const
+	?RDSProgramService@CFMRadioActiveIdleEngine@@QBEABVTDesC16@@XZ @ 15 NONAME ; class TDesC16 const & CFMRadioActiveIdleEngine::RDSProgramService(void) const
+	?RadioVolume@CFMRadioActiveIdleEngine@@QBEHXZ @ 16 NONAME ; int CFMRadioActiveIdleEngine::RadioVolume(void) const
+	?ActivateL@CFMRadioActiveIdleEngine@@QAEXXZ @ 17 NONAME ; void CFMRadioActiveIdleEngine::ActivateL(void)
+

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/fmradio/activeidleengine/eabi/fmradioactiveidleengine200u.def	Wed Sep 01 12:30:32 2010 +0100
@@ -0,0 +1,23 @@
+EXPORTS
+	_ZN24CFMRadioActiveIdleEngine4NewLER37MFMRadioActiveIdleEngineNotifyHandler @ 1 NONAME
+	_ZN24CFMRadioActiveIdleEngine6CancelEv @ 2 NONAME
+	_ZN24CFMRadioActiveIdleEngine9ActivateLEv @ 3 NONAME
+	_ZN24CFMRadioActiveIdleEngineD0Ev @ 4 NONAME
+	_ZN24CFMRadioActiveIdleEngineD1Ev @ 5 NONAME
+	_ZN24CFMRadioActiveIdleEngineD2Ev @ 6 NONAME
+	_ZNK24CFMRadioActiveIdleEngine10PowerStateEv @ 7 NONAME
+	_ZNK24CFMRadioActiveIdleEngine11ChannelNameEv @ 8 NONAME
+	_ZNK24CFMRadioActiveIdleEngine11RadioVolumeEv @ 9 NONAME
+	_ZNK24CFMRadioActiveIdleEngine11TuningStateEv @ 10 NONAME
+	_ZNK24CFMRadioActiveIdleEngine12SetMuteStateE24TFMRadioPSRadioMuteState @ 11 NONAME
+	_ZNK24CFMRadioActiveIdleEngine13AntennaStatusEv @ 12 NONAME
+	_ZNK24CFMRadioActiveIdleEngine17AdjustRadioVolumeE22TFMRadioPSAdjustVolume @ 13 NONAME
+	_ZNK24CFMRadioActiveIdleEngine17RDSProgramServiceEv @ 14 NONAME
+	_ZNK24CFMRadioActiveIdleEngine21FrequencyDecimalCountEv @ 15 NONAME
+	_ZNK24CFMRadioActiveIdleEngine23ApplicationRunningStateEv @ 16 NONAME
+	_ZNK24CFMRadioActiveIdleEngine7ChannelEv @ 17 NONAME
+	_ZNK24CFMRadioActiveIdleEngine9FrequencyEv @ 18 NONAME
+	_ZNK24CFMRadioActiveIdleEngine9MuteStateEv @ 19 NONAME
+	_ZTI24CFMRadioPropertyObserver @ 20 NONAME ; #<TI>#
+	_ZTV24CFMRadioPropertyObserver @ 21 NONAME ; #<VT>#
+

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/fmradio/activeidleengine/group/bld.inf	Wed Sep 01 12:30:32 2010 +0100
@@ -0,0 +1,33 @@
+/*
+* Copyright (c) 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: Build configuration for FMRadio active idle engine
+*
+*/
+
+#include <platform_paths.hrh>
+
+// Platforms the component needs to be built on
+//
+
+PRJ_PLATFORMS
+DEFAULT
+
+PRJ_EXPORTS
+
+PRJ_MMPFILES
+fmradioactiveidleengine.mmp
+
+
+
+// End of file

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/fmradio/activeidleengine/group/fmradioactiveidleengine.mmp	Wed Sep 01 12:30:32 2010 +0100
@@ -0,0 +1,46 @@
+/*
+* Copyright (c) 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: Project definition file for project FMRadio active idle engine
+*
+*/
+
+
+// To get the APP_LAYER_SYSTEMINCLUDE-definition
+#include <platform_paths.hrh>
+#include "../../inc/fmradioactiveidle.hrh"
+ 
+TARGET          fmradioactiveidleengine200.dll
+TARGETTYPE      DLL
+UID             0x1000006C AI_UID_ECOM_IMPLEMENTATION_CONTENTPUBLISHER_FMRADIOPLUGIN
+VERSION         20.0
+
+CAPABILITY      CAP_GENERAL_DLL
+VENDORID        VID_DEFAULT
+
+PAGED
+
+SOURCEPATH      ../src
+SOURCE          fmradioactiveidleengine.cpp
+
+SOURCEPATH      ../../fmradioengine/src
+SOURCE          fmradiopropertyobserver.cpp
+
+USERINCLUDE     ../inc
+USERINCLUDE     ../../fmradioengine/inc
+
+// Default system include paths for application layer modules.
+APP_LAYER_SYSTEMINCLUDE
+
+LIBRARY         euser.lib
+DEBUGLIBRARY    flogger.lib
\ No newline at end of file

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/fmradio/activeidleengine/inc/fmradioactiveidleengine.h	Wed Sep 01 12:30:32 2010 +0100
@@ -0,0 +1,176 @@
+/*
+* Copyright (c) 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: Engine component for FMRadio Active Idle plugin.
+*
+*/
+
+
+#ifndef __FMRADIOACTIVEIDLEENGINE_H__
+#define __FMRADIOACTIVEIDLEENGINE_H__
+
+#include <e32base.h>
+#include <fmradiointernalpskeys.h>
+
+#include "fmradiopropertyobserver.h"
+
+class MFMRadioActiveIdleEngineNotifyHandler;
+
+
+/**
+* Engine component for FMRadio 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 CFMRadioPropertyObserver objects.
+* 
+* @lib fmradioactiveidleengine200.lib
+* 
+*/
+NONSHARABLE_CLASS(CFMRadioActiveIdleEngine) : public CBase, public MFMRadioPropertyChangeObserver
+    {
+    public:
+        
+        /**
+        * Static constructor.
+        * @param    aObserver   The observer to be notified of the changes in the keys.
+        * @return   The newly created CFMRadioActiveIdleEngine object.
+        */
+        IMPORT_C static CFMRadioActiveIdleEngine* NewL( MFMRadioActiveIdleEngineNotifyHandler& aObserver );
+        
+        /**
+        * Destructor.
+        */
+        IMPORT_C ~CFMRadioActiveIdleEngine();
+        
+        /**
+        * Activates subscription to P&S keys if not already active.
+        * Must be called after CFMRadioActiveIdleEngine::NewL, or after Cancel.
+        */
+        IMPORT_C void ActivateL();
+        
+        /**
+        * Stops subscribing to P&S keys.
+        */
+        IMPORT_C void Cancel();
+                
+        /**
+        * Returns the current volume level of the radio.
+        * @return   The current volume level of the radio.
+        */
+        IMPORT_C TInt RadioVolume() const;
+        
+        /**
+        * Sets the radio volume.
+        * @param    aVolume     The radio volume to set.
+        */
+        IMPORT_C void AdjustRadioVolume( TFMRadioPSAdjustVolume aVolume ) const;
+
+        /**
+        * Returns the current tuning state.
+        * @return   The current tuning state.
+        */
+        IMPORT_C TFMRadioPSTuningState TuningState() const;
+        
+        /**
+        * Returns the current frequency.
+        * @return   The current frequency.
+        */
+        IMPORT_C TInt Frequency() const;
+        
+        /**
+        * Returns the current channel ID.
+        * @return   The current channel ID.
+        */
+        IMPORT_C TInt Channel() const;
+        
+        /**
+        * Returns the current channel name.
+        * @return   The current channel name.
+         */
+        IMPORT_C const TDesC& ChannelName() const;
+        
+        /**
+        * Returns the current mute state.
+        * @return   The current mute state.
+        */
+        IMPORT_C TFMRadioPSRadioMuteState MuteState() const;
+        
+        /**
+        * Sets the mute state.
+        * @param    aMuteState  The mute state to set.
+        */
+        IMPORT_C void SetMuteState( TFMRadioPSRadioMuteState aMuteState ) const;
+        
+        /**
+        * Returns the antenna's current connectivity status. 
+        * @return   The antenna's current connectivity status.
+        */
+        IMPORT_C TFMRadioPSHeadsetStatus AntennaStatus() const;
+        
+        /**
+        * Returns the current frequency decimal count.
+        * @return   The current frequency decimal count.
+        */
+        IMPORT_C TFMRadioPSFrequencyDecimalCount FrequencyDecimalCount() const;
+        
+        /**
+        * Returns FM Radio application's running state.
+        * @return Application's running state.
+        */
+        IMPORT_C TFMRadioPSApplicationRunningState ApplicationRunningState() const;
+        
+        /**
+        * Returns the radio's power state.
+        * @return   The power state.
+        */
+        IMPORT_C TFMRadioPSRadioPowerState PowerState() const;
+        
+        /**
+        * Returns the RDS Program Service information.
+        * @return   RDS Program Service.
+        */
+        IMPORT_C const TDesC& RDSProgramService() const;
+
+    protected: 
+
+		// from base class MFMRadioPropertyChangeObserver
+        void HandlePropertyChangeL( const TUid& aCategory, TUint aKey, TInt aValue );
+        void HandlePropertyChangeL( const TUid& aCategory, TUint aKey, const TDesC8& aValue );
+        void HandlePropertyChangeL( const TUid& aCategory, TUint aKey, const TDesC& aValue );
+        void HandlePropertyChangeErrorL( const TUid& aCategory, TUint aKey, TInt aError );
+        
+    private:
+    
+        /**
+        * Constructor.
+        * @param    aObserver   The observer to be notified of the changes in the keys.
+        */
+        CFMRadioActiveIdleEngine( MFMRadioActiveIdleEngineNotifyHandler& aObserver );
+    
+        /**
+        * Second-phase constructor.
+        */
+        void ConstructL();        
+        
+    protected:
+    
+        /** The observer to be notified of the changes in the listened keys. */
+        MFMRadioActiveIdleEngineNotifyHandler& iObserver;
+        /** Array of status observers. */
+        RPointerArray<CFMRadioPropertyObserver> iPropertyObserverArray;
+
+	private:
+        
+    };
+
+#endif //__FMRADIOACTIVEIDLEENGINE_H__

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/fmradio/activeidleengine/inc/fmradioactiveidleenginenotifyhandler.h	Wed Sep 01 12:30:32 2010 +0100
@@ -0,0 +1,115 @@
+/*
+* Copyright (c) 2005-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: Observer interface for active idle engine
+*
+*/
+
+
+#ifndef __FMRADIOACTIVEIDLEENGINENOTIFYHANDLER_H__
+#define __FMRADIOACTIVEIDLEENGINENOTIFYHANDLER_H__
+
+#include <fmradiointernalpskeys.h>
+
+/**
+* Observer interface for active idle engine.
+* The observer is notified about the changes in relevant keys through this interface.
+*/
+NONSHARABLE_CLASS(MFMRadioActiveIdleEngineNotifyHandler)
+    {
+    public:
+    
+        /**
+        * Invoked when the radio volume has changed.
+        * @param    aVolume     The new radio volume.
+        */
+        virtual void HandleRadioVolumeChangeL( TInt aVolume ) = 0;
+        
+        /**
+        * Invoked when tuning has taken more than one second, or tuning was previously on, but now completed.
+        * @param    aTuningState    The new tuning state.
+        */
+        virtual void HandleTuningStateChangeL( TFMRadioPSTuningState aTuningState ) = 0;
+        
+        /**
+        * Invoked when a new channel has been tuned into.
+        * @param    aIndex      The index of the channel.
+        */
+        virtual void HandleChannelChangeL( TInt aIndex ) = 0;
+        
+        /**
+        * Invoked when a channel has been modifed.
+        * @param    aIndex    The index of the channel that was modified.
+        */
+        virtual void HandleChannelModifyL( TInt aIndex ) = 0;
+
+        /**
+        * Invoked when the frequency has changed.
+        * @param    aFrequency      The new frequency.
+        */
+        virtual void HandleFrequencyChangeL( TInt aFrequency ) = 0;
+        
+        /**
+        * Invoked when the muting state has changed.
+        * @param    aMuteState    The new mute state.
+        */
+        virtual void HandleMuteStateChangeL( TFMRadioPSRadioMuteState aMuteState ) = 0;
+
+        /**
+        * Invoked when the application's running state has changed.
+        * @param    aRunningState   The new running state.
+        */
+        virtual void HandleApplicationRunningStateChangeL( TFMRadioPSApplicationRunningState aRunningState ) = 0;
+
+        /**
+        * Invoked when the used decimal count is changed.
+        * @param    aDecimalCount   The new decimal count.
+        */
+        virtual void HandleFrequencyDecimalCountChangeL( TFMRadioPSFrequencyDecimalCount aDecimalCount ) = 0;
+        
+        /**
+        * Invoked when the antenna's connectivity status is changed.
+        * @param    aAntennaStatus      Antenna's new connectivity status.
+        */
+        virtual void HandleAntennaStatusChangeL( TFMRadioPSHeadsetStatus aAntennaStatus ) = 0;
+        
+        /**
+        * Invoked when radio's power state changes.
+        * @param    aPowerState      The new power state.
+        */
+        virtual void HandlePowerStateChangeL( TFMRadioPSRadioPowerState aPowerState ) = 0;
+        
+        /**
+        * Invoked when RDS Program Service information changes.
+        * @param    aProgramService      New Program Service info.
+        */
+        virtual void HandleRDSProgramServiceChangeL( const TDesC& aProgramService ) = 0;
+
+        /**
+        * Invoked when RDS Text information changes.
+        * @param    aRdsText      New Program Service info.
+        */        
+        virtual void HandleRDSRadioTextChangeL( const TDesC& aRdsText ) = 0;
+
+        /**
+        * Invoked when Channel name changes.
+        * @param    aName      New channel name.
+        */  
+        virtual void HandleChannelNameChangeL( const TDesC& aName ) = 0;
+        
+        virtual void HandlePresetListCountChangeL( TInt aPresetCount ) = 0;
+        virtual void HandlePresetListFocusChangeL( TInt aPresetFocus ) = 0;
+    };
+
+#endif // __FMRADIOACTIVEIDLEENGINENOTIFYHANDLER_H__
+           

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/fmradio/activeidleengine/src/fmradioactiveidleengine.cpp	Wed Sep 01 12:30:32 2010 +0100
@@ -0,0 +1,386 @@
+/*
+* Copyright (c) 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: FMRadio active idle engine
+*
+*/
+
+
+#include <e32std.h>
+
+#include "fmradioactiveidleengine.h"
+#include "fmradioactiveidleenginenotifyhandler.h"
+
+
+/**
+* Listing of the subscribed P&S values.
+* Changing the order of this enumeration requires changes to CFMRadioActiveIdleEngine::ConstructL as well.
+*/
+
+enum TFMRadioActiveIdleStatusObserverArray
+    {
+    //EFMRadioActiveIdleRadioVolumeObserver,       /**< Index of the radio volume observer. */
+    EFMRadioActiveIdleTuningStateObserver,       /**< Index of the tuning state observer. */
+    EFMRadioActiveIdleFrequencyObserver,         /**< Index of the current frequency observer. */
+    EFMRadioActiveIdleChannelChangeObserver,     /**< Index of the current channel observer. */
+    EFMRadioActiveIdleChannelModifyObserver,     /**< Index of the channel modified observer. */
+    EFMRadioActiveIdleMuteStateObserver,         /**< Index of the muting state observer. */
+    EFMRadioActiveIdleApplicationObserver,       /**< Index of the FM Radio application observer used to observer whether the application is running or not. */
+    EFMRadioActiveIdleHeadsetStatusObserver,     /**< Index of the antenna status observer. */
+    EFMRadioActiveIdleDecimalCountObserver,      /**< Index of the frequency decimal count observer. */
+    EFMRadioActiveIdlePowerStateObserver,        /**< Index of the power state observer. */
+    EFMRadioActiveIdleRDSProgramServiceObserver,  /**< Index of the RDS Program Service observer. */
+    EFMRadioPSDataRDSRadioText,
+    EFMRadioPSDataChannelName,
+    EFMRadioActiveIdlePresetListCountObserver,   /**< Index of the active preset list count observer */
+    EFMRadioActiveIdlePresetListFocusObserver   /**< Index of the active preset list focus observer */
+    };
+
+// ==================== LOCAL FUNCTIONS ====================
+
+// ================= MEMBER FUNCTIONS =======================
+
+// ---------------------------------------------------------------------------
+// Constructor.
+// ---------------------------------------------------------------------------
+//
+CFMRadioActiveIdleEngine::CFMRadioActiveIdleEngine( MFMRadioActiveIdleEngineNotifyHandler& aObserver )
+    : iObserver( aObserver )
+    {
+    }
+
+// ---------------------------------------------------------------------------
+// Second-phase constructor.
+// ---------------------------------------------------------------------------
+//
+void CFMRadioActiveIdleEngine::ConstructL()
+    {
+    //User::LeaveIfError( iPropertyObserverArray.Append( CFMRadioPropertyObserver::NewL( *this, KFMRadioEnginePSUid, KFMRadioPSDataVolume, CFMRadioPropertyObserver::EFMRadioPropertyInt ) ) );
+    User::LeaveIfError( iPropertyObserverArray.Append( CFMRadioPropertyObserver::NewL( *this, KFMRadioPSUid, KFMRadioPSDataTuningState, CFMRadioPropertyObserver::EFMRadioPropertyInt ) ) );
+    User::LeaveIfError( iPropertyObserverArray.Append( CFMRadioPropertyObserver::NewL( *this, KFMRadioPSUid, KFMRadioPSDataFrequency, CFMRadioPropertyObserver::EFMRadioPropertyInt ) ) );
+    User::LeaveIfError( iPropertyObserverArray.Append( CFMRadioPropertyObserver::NewL( *this, KFMRadioPSUid, KFMRadioPSDataChannel, CFMRadioPropertyObserver::EFMRadioPropertyInt ) ) );
+    User::LeaveIfError( iPropertyObserverArray.Append( CFMRadioPropertyObserver::NewL( *this, KFMRadioPSUid, KFMRadioPSDataChannelDataChanged, CFMRadioPropertyObserver::EFMRadioPropertyInt ) ) );
+    User::LeaveIfError( iPropertyObserverArray.Append( CFMRadioPropertyObserver::NewL( *this, KFMRadioPSUid, KFMRadioPSDataRadioMuteState, CFMRadioPropertyObserver::EFMRadioPropertyInt ) ) );
+    User::LeaveIfError( iPropertyObserverArray.Append( CFMRadioPropertyObserver::NewL( *this, KFMRadioPSUid, KFMRadioPSDataApplicationRunning, CFMRadioPropertyObserver::EFMRadioPropertyInt ) ) );
+    User::LeaveIfError( iPropertyObserverArray.Append( CFMRadioPropertyObserver::NewL( *this, KFMRadioPSUid, KFMRadioPSDataHeadsetStatus, CFMRadioPropertyObserver::EFMRadioPropertyInt ) ) );
+    User::LeaveIfError( iPropertyObserverArray.Append( CFMRadioPropertyObserver::NewL( *this, KFMRadioPSUid, KFMRadioPSDataFrequencyDecimalCount, CFMRadioPropertyObserver::EFMRadioPropertyInt ) ) );
+    User::LeaveIfError( iPropertyObserverArray.Append( CFMRadioPropertyObserver::NewL( *this, KFMRadioPSUid, KFMRadioPSDataRadioPowerState, CFMRadioPropertyObserver::EFMRadioPropertyInt ) ) );
+    User::LeaveIfError( iPropertyObserverArray.Append( CFMRadioPropertyObserver::NewL( *this, KFMRadioPSUid, KFMRadioPSDataRDSProgramService, CFMRadioPropertyObserver::EFMRadioPropertyText ) ) );
+    User::LeaveIfError( iPropertyObserverArray.Append( CFMRadioPropertyObserver::NewL( *this, KFMRadioPSUid, KFMRadioPSDataRDSRadioText, CFMRadioPropertyObserver::EFMRadioPropertyText ) ) );
+    User::LeaveIfError( iPropertyObserverArray.Append( CFMRadioPropertyObserver::NewL( *this, KFMRadioPSUid, KFMRadioPSDataChannelName, CFMRadioPropertyObserver::EFMRadioPropertyText ) ) );
+    User::LeaveIfError( iPropertyObserverArray.Append( CFMRadioPropertyObserver::NewL( *this, KFMRadioPSUid, KFMRadioActiveIdlePresetListCount, CFMRadioPropertyObserver::EFMRadioPropertyInt ) ) );
+    User::LeaveIfError( iPropertyObserverArray.Append( CFMRadioPropertyObserver::NewL( *this, KFMRadioPSUid, KFMRadioActiveIdlePresetListFocus, CFMRadioPropertyObserver::EFMRadioPropertyInt ) ) );
+    }
+
+// ---------------------------------------------------------------------------
+// Makes all pubsub objects to subscribe.
+// ---------------------------------------------------------------------------
+//
+EXPORT_C void CFMRadioActiveIdleEngine::ActivateL()
+	{
+	for ( TInt i = 0; i < iPropertyObserverArray.Count(); i++ )
+		{
+		iPropertyObserverArray[i]->ActivateL();
+		}
+	}
+
+// ---------------------------------------------------------------------------
+// Cancels all pubsub objects.
+// ---------------------------------------------------------------------------
+//
+EXPORT_C void CFMRadioActiveIdleEngine::Cancel()
+	{
+	for ( TInt i = 0; i < iPropertyObserverArray.Count(); i++ )
+		{
+		iPropertyObserverArray[i]->Cancel();	
+		}
+	}
+
+// ---------------------------------------------------------------------------
+// Static constructor.
+// ---------------------------------------------------------------------------
+//
+EXPORT_C CFMRadioActiveIdleEngine* CFMRadioActiveIdleEngine::NewL( MFMRadioActiveIdleEngineNotifyHandler& aObserver )
+    {
+    CFMRadioActiveIdleEngine* self = new ( ELeave ) CFMRadioActiveIdleEngine( aObserver );
+    CleanupStack::PushL( self );
+    self->ConstructL();
+    CleanupStack::Pop( self );
+    return self;
+    }
+
+// ---------------------------------------------------------------------------
+// Destructor.
+// ---------------------------------------------------------------------------
+//
+EXPORT_C CFMRadioActiveIdleEngine::~CFMRadioActiveIdleEngine()
+    {
+    iPropertyObserverArray.ResetAndDestroy();
+    iPropertyObserverArray.Close();
+	/*
+    if ( iServ )
+        {
+        iServ->Close();
+        }
+    delete iServ;
+    */
+    }
+
+// ---------------------------------------------------------------------------
+// Invoked when a listened integer P&S key is changed.
+// ---------------------------------------------------------------------------
+//
+void CFMRadioActiveIdleEngine::HandlePropertyChangeL( const TUid& aCategory, TUint aKey, TInt aValue )
+    {
+    if ( aCategory == KFMRadioPSUid )
+        {
+        switch ( aKey )
+            {/*
+            case KFMRadioPSDataVolume:
+                iObserver.HandleRadioVolumeChangeL( aValue );
+            break;*/
+                    
+            case KFMRadioPSDataTuningState:
+                iObserver.HandleTuningStateChangeL( static_cast<TFMRadioPSTuningState>( aValue ) );
+            break;
+
+            case KFMRadioPSDataFrequency:
+                iObserver.HandleFrequencyChangeL( aValue );
+            break;
+            
+            case KFMRadioPSDataChannel:
+                // Sync the cache values for channel name and index
+                iPropertyObserverArray[EFMRadioPSDataChannelName]->ValueDes( ETrue );
+                iObserver.HandleChannelChangeL( aValue );
+            break;
+
+            case KFMRadioPSDataChannelDataChanged:
+                iPropertyObserverArray[EFMRadioPSDataChannelName]->ValueDes( ETrue );
+                iObserver.HandleChannelModifyL( aValue );
+            break;
+
+            case KFMRadioPSDataRadioMuteState:
+                iObserver.HandleMuteStateChangeL( static_cast<TFMRadioPSRadioMuteState>( aValue ) );
+            break;
+
+            case KFMRadioPSDataApplicationRunning:
+                iObserver.HandleApplicationRunningStateChangeL( static_cast<TFMRadioPSApplicationRunningState>( aValue ) );
+            break;
+            
+            case KFMRadioPSDataHeadsetStatus:
+                iObserver.HandleAntennaStatusChangeL( static_cast<TFMRadioPSHeadsetStatus>( aValue ) );
+            break;
+        
+            case KFMRadioPSDataFrequencyDecimalCount:
+                iObserver.HandleFrequencyDecimalCountChangeL( static_cast<TFMRadioPSFrequencyDecimalCount>( aValue ) );
+            break;
+
+            case KFMRadioPSDataRadioPowerState:
+                iObserver.HandlePowerStateChangeL( static_cast<TFMRadioPSRadioPowerState>( aValue ) );
+            break;
+            
+            case KFMRadioActiveIdlePresetListCount:
+               iObserver.HandlePresetListCountChangeL( aValue );
+            break;
+            
+            case KFMRadioActiveIdlePresetListFocus:
+               //iObserver.HandlePresetListFocusChangeL( aValue );
+            break;
+            
+            default:
+            break;
+            }
+        }
+    }
+
+// ---------------------------------------------------------------------------
+// Invoked when a listened byte array P&S key is changed.
+// ---------------------------------------------------------------------------
+//
+//void CFMRadioActiveIdleEngine::HandlePropertyChangeL( const TUid& /*aCategory*/, TUint /*aKey*/, const TDesC8& /*aValue*/ )
+//    {
+//    }
+    
+// ---------------------------------------------------------------------------
+// Invoked when a listened text P&S key is changed.
+// ---------------------------------------------------------------------------
+//
+
+void CFMRadioActiveIdleEngine::HandlePropertyChangeL( const TUid& aCategory, TUint aKey, const TDesC& aValue )
+    {
+	if ( aCategory == KFMRadioPSUid )
+    	{
+    	switch ( aKey )
+    	    {
+            case KFMRadioPSDataRDSProgramService:
+    	        iObserver.HandleRDSProgramServiceChangeL( aValue );
+    	    break;
+            case KFMRadioPSDataRDSRadioText:
+                iObserver.HandleRDSRadioTextChangeL( aValue );
+                break;
+            case KFMRadioPSDataChannelName:
+                // Sync the cache valuse for channel name and index
+                iPropertyObserverArray[EFMRadioActiveIdleChannelChangeObserver]->ValueInt( ETrue );
+                iObserver.HandleChannelNameChangeL( aValue );
+                break;
+            default:
+            break;
+    	    }
+    	}
+
+    }
+// ---------------------------------------------------------------------------
+// Invoked when a listened text P&S key is changed.
+// ---------------------------------------------------------------------------
+//
+void CFMRadioActiveIdleEngine::HandlePropertyChangeL( const TUid&, TUint, const TDesC8&)
+    {
+    }
+    
+// ---------------------------------------------------------------------------
+// Invoked when an error has occured while fetching the new value of any listened P&S key.
+// ---------------------------------------------------------------------------
+//
+void CFMRadioActiveIdleEngine::HandlePropertyChangeErrorL( const TUid& /*aCategory*/, TUint /*aKey*/, TInt aError )
+    {
+    if (aError < 0)
+    	{
+    	// If any error should pass to this method, handle it like 'application shutdown'.
+    	// This situation will realize whenever the application is killed, by accident/by system/by an app crash
+    	// or due to change to offline mode.
+		HandlePropertyChangeL(KFMRadioPSUid, KFMRadioPSDataApplicationRunning, EFMRadioPSApplicationClosing);
+    	}
+    }
+
+// ---------------------------------------------------------------------------
+// Returns the current radio volume.
+// ---------------------------------------------------------------------------
+//
+EXPORT_C TInt CFMRadioActiveIdleEngine::RadioVolume() const
+    {
+    //return iPropertyObserverArray[EFMRadioActiveIdleRadioVolumeObserver]->ValueInt();
+    return 0;
+    }
+
+// ---------------------------------------------------------------------------
+// Sets the radio volume.
+// ---------------------------------------------------------------------------
+//
+EXPORT_C void CFMRadioActiveIdleEngine::AdjustRadioVolume( TFMRadioPSAdjustVolume aVolume ) const
+    {
+    RProperty::Set( KFMRadioPSUid, KFMRadioPSControlAdjustVolume, aVolume );
+    }
+
+
+// ---------------------------------------------------------------------------
+// Returns the current tuning state.
+// ---------------------------------------------------------------------------
+//
+EXPORT_C TFMRadioPSTuningState CFMRadioActiveIdleEngine::TuningState() const
+    {
+    return static_cast<TFMRadioPSTuningState>( iPropertyObserverArray[EFMRadioActiveIdleTuningStateObserver]->ValueInt() );
+    }
+
+// ---------------------------------------------------------------------------
+// Returns the current frequency.
+// ---------------------------------------------------------------------------
+//
+EXPORT_C TInt CFMRadioActiveIdleEngine::Frequency() const
+    {
+    return iPropertyObserverArray[EFMRadioActiveIdleFrequencyObserver]->ValueInt();
+    }
+
+// ---------------------------------------------------------------------------
+// Returns the currently active channel ID.
+// ---------------------------------------------------------------------------
+//
+EXPORT_C TInt CFMRadioActiveIdleEngine::Channel() const
+    {
+    return iPropertyObserverArray[EFMRadioActiveIdleChannelChangeObserver]->ValueInt();
+    }
+
+// ---------------------------------------------------------------------------
+// Returns the currently active channel name.
+// ---------------------------------------------------------------------------
+//
+EXPORT_C const TDesC& CFMRadioActiveIdleEngine::ChannelName() const
+    {
+    return iPropertyObserverArray[EFMRadioPSDataChannelName]->ValueDes();
+    }
+
+// ---------------------------------------------------------------------------
+// Returns the current mute state.
+// ---------------------------------------------------------------------------
+//
+EXPORT_C TFMRadioPSRadioMuteState CFMRadioActiveIdleEngine::MuteState() const
+    {
+    return static_cast<TFMRadioPSRadioMuteState>( iPropertyObserverArray[EFMRadioActiveIdleMuteStateObserver]->ValueInt() );
+    }
+
+// ---------------------------------------------------------------------------
+// Sets the mute state.
+// ---------------------------------------------------------------------------
+//
+EXPORT_C void CFMRadioActiveIdleEngine::SetMuteState( TFMRadioPSRadioMuteState aMuteState ) const
+    {
+    RProperty::Set( KFMRadioPSUid, KFMRadioPSControlSetRadioMuteState, aMuteState );
+    }
+
+// ---------------------------------------------------------------------------
+// Returns the current antenna connectivity status.
+// ---------------------------------------------------------------------------
+//
+EXPORT_C TFMRadioPSHeadsetStatus CFMRadioActiveIdleEngine::AntennaStatus() const
+    {
+    return static_cast<TFMRadioPSHeadsetStatus>( iPropertyObserverArray[EFMRadioActiveIdleHeadsetStatusObserver]->ValueInt() );
+    }
+
+// ---------------------------------------------------------------------------
+// Returns the current frequency decimal count.
+// ---------------------------------------------------------------------------
+//
+EXPORT_C TFMRadioPSFrequencyDecimalCount CFMRadioActiveIdleEngine::FrequencyDecimalCount() const
+    {
+    return static_cast<TFMRadioPSFrequencyDecimalCount>( iPropertyObserverArray[EFMRadioActiveIdleDecimalCountObserver]->ValueInt() );
+    }
+
+// ---------------------------------------------------------------------------
+// Returns FM Radio application's running state.
+// ---------------------------------------------------------------------------
+//
+EXPORT_C TFMRadioPSApplicationRunningState CFMRadioActiveIdleEngine::ApplicationRunningState() const
+    {
+    return static_cast<TFMRadioPSApplicationRunningState>( iPropertyObserverArray[EFMRadioActiveIdleApplicationObserver]->ValueInt() );
+    }
+
+// ---------------------------------------------------------------------------
+// Returns the radio's power state.
+// ---------------------------------------------------------------------------
+//
+EXPORT_C TFMRadioPSRadioPowerState CFMRadioActiveIdleEngine::PowerState() const
+    {
+    return static_cast<TFMRadioPSRadioPowerState>( iPropertyObserverArray[EFMRadioActiveIdlePowerStateObserver]->ValueInt() );
+    }
+
+// ---------------------------------------------------------------------------
+// Returns RDS Program Service information.
+// ---------------------------------------------------------------------------
+//
+
+EXPORT_C const TDesC& CFMRadioActiveIdleEngine::RDSProgramService() const
+    {
+    return iPropertyObserverArray[EFMRadioActiveIdleRDSProgramServiceObserver]->ValueDes();
+    }
+
+// ================= OTHER EXPORTED FUNCTIONS ==============
+